diff --git a/generated/text_banks.txt b/generated/text_banks.txt index 1ba1c9f29a..28eba705f2 100644 --- a/generated/text_banks.txt +++ b/generated/text_banks.txt @@ -9,13 +9,13 @@ TEXT_BANK_BAG TEXT_BANK_UNK_0008 TEXT_BANK_UNK_0009 TEXT_BANK_UNK_0010 -TEXT_BANK_UNK_0011 +TEXT_BANK_COMMUNICATION_CLUB TEXT_BANK_BALL_SEAL_NAMES TEXT_BANK_BALL_SEAL_NAMES_PLURAL TEXT_BANK_MAIN_MENU_ALERTS TEXT_BANK_UNK_0015 -TEXT_BANK_UNK_0016 -TEXT_BANK_UNK_0017 +TEXT_BANK_BATTLE_TOWER_RECORDS +TEXT_BANK_BG_EVENTS TEXT_BANK_POKEMON_STORAGE_SYSTEM TEXT_BANK_BOX_MESSAGES TEXT_BANK_UNK_0020 @@ -219,7 +219,7 @@ TEXT_BANK_CONTEST_REGISTRATION TEXT_BANK_CONTEST_RESULTS TEXT_BANK_STATUS_CONDITION_NAMES TEXT_BANK_OPTIONS_MENU -TEXT_BANK_UNK_0221 +TEXT_BANK_POKEMON_CENTER_2F_ATTENDANTS TEXT_BANK_OREBURGH_MINE_B1F TEXT_BANK_OREBURGH_MINE_B2F TEXT_BANK_VALLEY_WINDWORKS_OUTSIDE @@ -367,12 +367,12 @@ TEXT_BANK_BATTLE_FACTORY_SCENE TEXT_BANK_JOURNAL_ENTRIES TEXT_BANK_START_MENU TEXT_BANK_BATTLE_STRINGS -TEXT_BANK_POKEBALL_ITEMS +TEXT_BANK_VISIBLE_ITEMS TEXT_BANK_NPC_TRADE_NAMES TEXT_BANK_FURNITURE_NAMES TEXT_BANK_UNK_0372 TEXT_BANK_BLACK_OUT_SCENE -TEXT_BANK_UNK_0374 +TEXT_BANK_GROUP_CONNECTION TEXT_BANK_UNK_0375 TEXT_BANK_SPIN_TRADE TEXT_BANK_UNK_0377 @@ -428,9 +428,9 @@ TEXT_BANK_DUMMY_0426 TEXT_BANK_GENERIC_NAMES TEXT_BANK_UNK_0428 TEXT_BANK_FOLLOWER_PARTNERS -TEXT_BANK_UNK_0430 -TEXT_BANK_UNK_0431 -TEXT_BANK_UNK_0432 +TEXT_BANK_POKEMON_CENTER_B1F_ATTENDANTS +TEXT_BANK_RECORD_CHATOT_CRY +TEXT_BANK_POFFIN_COMMON TEXT_BANK_LOCATION_NAMES TEXT_BANK_MYSTERY_GIFT_EVENT_NAMES TEXT_BANK_SPECIAL_MET_LOCATION_NAMES @@ -537,7 +537,7 @@ TEXT_BANK_RIBBON_NAMES TEXT_BANK_DUMMY_0536 TEXT_BANK_BATTLE_ARCADE_SCENE TEXT_BANK_SAFARI_GAME -TEXT_BANK_UNK_0539 +TEXT_BANK_VS_SEEKER TEXT_BANK_UNK_0540 TEXT_BANK_SCRATCH_OFF_CARDS TEXT_BANK_UNK_0542 @@ -545,7 +545,7 @@ TEXT_BANK_UNK_0543 TEXT_BANK_UNK_0544 TEXT_BANK_SEQ_NAMES TEXT_BANK_UNK_0546 -TEXT_BANK_UNK_0547 +TEXT_BANK_DAY_CARE_COMMON TEXT_BANK_UNK_0548 TEXT_BANK_BATTLE_HALL_SCENE TEXT_BANK_MAIN_MENU_OPTIONS diff --git a/include/script_manager.h b/include/script_manager.h index 8a006908d1..284222c4bb 100644 --- a/include/script_manager.h +++ b/include/script_manager.h @@ -85,20 +85,36 @@ enum ScriptContextType { NUM_SCRIPT_CONTEXTS }; -#define SCRIPT_ID(chunk, id) ((SCRIPT_ID_OFFSET_##chunk) + id) -#define SCRIPT_ID_OFFSET_COMMON_SCRIPTS 2000 -#define SCRIPT_ID_OFFSET_SINGLE_BATTLES 3000 -#define SCRIPT_ID_OFFSET_DOUBLE_BATTLES 5000 -#define SCRIPT_ID_OFFSET_POKEBALL_ITEMS 7000 -#define SCRIPT_ID_OFFSET_HIDDEN_ITEMS 8000 -#define SCRIPT_ID_OFFSET_SAFARI_GAME 8800 -#define SCRIPT_ID_OFFSET_INIT_NEW_GAME 9600 -#define SCRIPT_ID_OFFSET_FOLLOWER_PARTNERS 9700 -#define SCRIPT_ID_OFFSET_POKEDEX_RATINGS 9950 -#define SCRIPT_ID_OFFSET_FIELD_MOVES 10000 -#define SCRIPT_ID_OFFSET_TV_BROADCAST 10100 -#define SCRIPT_ID_OFFSET_TV_REPORTER_INTERVIEWS 10150 -#define SCRIPT_ID_POKEMON_CENTER_DAILY_TRAINERS 10400 +#define SCRIPT_ID(chunk, id) ((SCRIPT_ID_OFFSET_##chunk) + id) +#define SCRIPT_ID_OFFSET_COMMON_SCRIPTS 2000 +#define SCRIPT_ID_OFFSET_BG_EVENTS 2500 +#define SCRIPT_ID_OFFSET_BERRY_TREE_INTERACTIONS 2800 +#define SCRIPT_ID_OFFSET_SINGLE_BATTLES 3000 +#define SCRIPT_ID_OFFSET_DOUBLE_BATTLES 5000 +#define SCRIPT_ID_OFFSET_VISIBLE_ITEMS 7000 +#define SCRIPT_ID_OFFSET_HIDDEN_ITEMS 8000 +#define SCRIPT_ID_OFFSET_SAFARI_GAME 8800 +#define SCRIPT_ID_OFFSET_RECORD_CHATOT_CRY 8900 +#define SCRIPT_ID_OFFSET_VS_SEEKER 8950 +#define SCRIPT_ID_OFFSET_POKE_RADAR 8970 +#define SCRIPT_ID_OFFSET_POKEMON_CENTER_2F_ATTENDANTS 9000 +#define SCRIPT_ID_OFFSET_COMMUNICATION_CLUB 9100 +#define SCRIPT_ID_OFFSET_POKEMON_CENTER_B1F_ATTENDANTS 9200 +#define SCRIPT_ID_OFFSET_GROUP_CONNECTION 9300 +#define SCRIPT_ID_OFFSET_POFFIN_COMMON 9400 +#define SCRIPT_ID_OFFSET_DAY_CARE_COMMON 9500 +#define SCRIPT_ID_OFFSET_INIT_NEW_GAME 9600 +#define SCRIPT_ID_OFFSET_FOLLOWER_PARTNERS 9700 +#define SCRIPT_ID_OFFSET_CONTEST_REGISTRATION 9800 +#define SCRIPT_ID_OFFSET_POKEDEX_RATINGS 9950 +#define SCRIPT_ID_OFFSET_FIELD_MOVES 10000 +#define SCRIPT_ID_OFFSET_TV_BROADCAST 10100 +#define SCRIPT_ID_OFFSET_TV_REPORTER_INTERVIEWS 10150 +#define SCRIPT_ID_OFFSET_MYSTERY_GIFT_DELIVERYMAN 10200 +#define SCRIPT_ID_OFFSET_COUNTERPART_TALK 10300 +#define SCRIPT_ID_OFFSET_POKEMON_CENTER_DAILY_TRAINERS 10400 +#define SCRIPT_ID_OFFSET_BATTLE_TOWER_RECORDS 10450 +#define SCRIPT_ID_OFFSET_SCRATCH_OFF_CARDS 10490 #define FLAG_OFFSET_HIDDEN_ITEMS 730 #define FLAG_OFFSET_TRAINER_DEFEATED 1360 diff --git a/res/field/scripts/meson.build b/res/field/scripts/meson.build index 1890c15f95..4840b95b36 100644 --- a/res/field/scripts/meson.build +++ b/res/field/scripts/meson.build @@ -33,8 +33,8 @@ scr_seq_target_name = 'scr_seq.narc' scr_seq_private_dir = relative_build_dir / scr_seq_target_name + '.p' scr_seq_files = files( - 'scripts_unk_0000.s', - 'scripts_unk_0001.s', + 'scripts_communication_club.s', + 'scripts_bg_events.s', 'scripts_jubilife_city.s', 'scripts_jubilife_city_mart.s', 'scripts_jubilife_city_unknown_house_1.s', @@ -245,8 +245,8 @@ scr_seq_files = files( 'scripts_fight_area_south_house.s', 'scripts_unk_0210.s', 'scripts_common.s', - 'scripts_unk_0212.s', - 'scripts_unk_0213.s', + 'scripts_contest_registration.s', + 'scripts_pokemon_center_2f_attendants.s', 'scripts_oreburgh_mine_b1f.s', 'scripts_oreburgh_mine_b2f.s', 'scripts_valley_windworks_outside.s', @@ -437,10 +437,10 @@ scr_seq_files = files( 'scripts_empty.s', 'scripts_unk_0402.s', 'scripts_unk_0403.s', - 'scripts_pokeball_items.s', + 'scripts_visible_items.s', 'scripts_unk_0405.s', - 'scripts_unk_0406.s', - 'scripts_unk_0407.s', + 'scripts_group_connection.s', + 'scripts_mystery_gift_deliveryman.s', 'scripts_hidden_items.s', 'scripts_field_moves.s', 'scripts_wifi_plaza_entrance.s', @@ -456,10 +456,10 @@ scr_seq_files = files( 'scripts_acuity_lakefront.s', 'scripts_unk_0421.s', 'scripts_follower_partners.s', - 'scripts_unk_0423.s', - 'scripts_unk_0424.s', - 'scripts_unk_0425.s', - 'scripts_unk_0426.s', + 'scripts_pokemon_center_b1f_attendants.s', + 'scripts_record_chatot_cry.s', + 'scripts_poke_radar.s', + 'scripts_poffin_common.s', 'scripts_route_201.s', 'scripts_route_202.s', 'scripts_route_203.s', @@ -531,10 +531,10 @@ scr_seq_files = files( 'scripts_route_229.s', 'scripts_unk_0496.s', 'scripts_safari_game.s', - 'scripts_unk_0498.s', - 'scripts_unk_0499.s', - 'scripts_unk_0500.s', - 'scripts_unk_0501.s', + 'scripts_vs_seeker.s', + 'scripts_scratch_off_cards.s', + 'scripts_battle_tower_records.s', + 'scripts_day_care_common.s', 'scripts_init_jubilife_city.s', 'scripts_init_jubilife_city_mart.s', 'scripts_init_jubilife_city_unknown_house_1.s', @@ -1084,7 +1084,7 @@ scr_seq_files = files( 'scripts_init_route_226.s', 'scripts_init_route_226_house.s', 'scripts_init_route_230.s', - 'scripts_unk_1051.s', + 'scripts_counterpart_talk.s', 'scripts_twinleaf_town.s', 'scripts_twinleaf_town_rival_house_1f.s', 'scripts_twinleaf_town_rival_house_2f.s', @@ -1147,7 +1147,7 @@ scr_seq_files = files( 'scripts_resort_area_ribbon_syndicate_elevator.s', 'scripts_villa.s', 'scripts_resort_area_house.s', - 'scripts_unk_1114.s', + 'scripts_battles.s', 'scripts_tv_broadcast.s', 'scripts_tv_reporter_interviews.s', 'scripts_underground.s', diff --git a/res/field/scripts/scripts.order b/res/field/scripts/scripts.order index 36fecc00e9..cd8343737b 100644 --- a/res/field/scripts/scripts.order +++ b/res/field/scripts/scripts.order @@ -1,5 +1,5 @@ -scripts_unk_0000 -scripts_unk_0001 +scripts_communication_club +scripts_bg_events scripts_jubilife_city scripts_jubilife_city_mart scripts_jubilife_city_unknown_house_1 @@ -210,8 +210,8 @@ scripts_fight_area_middle_house scripts_fight_area_south_house scripts_unk_0210 scripts_common -scripts_unk_0212 -scripts_unk_0213 +scripts_contest_registration +scripts_pokemon_center_2f_attendants scripts_oreburgh_mine_b1f scripts_oreburgh_mine_b2f scripts_valley_windworks_outside @@ -402,10 +402,10 @@ scripts_pokemon_center_daily_trainers scripts_empty scripts_unk_0402 scripts_unk_0403 -scripts_pokeball_items +scripts_visible_items scripts_unk_0405 -scripts_unk_0406 -scripts_unk_0407 +scripts_group_connection +scripts_mystery_gift_deliveryman scripts_hidden_items scripts_field_moves scripts_wifi_plaza_entrance @@ -421,10 +421,10 @@ scripts_grand_lake_valor_lakefront_west_house scripts_acuity_lakefront scripts_unk_0421 scripts_follower_partners -scripts_unk_0423 -scripts_unk_0424 -scripts_unk_0425 -scripts_unk_0426 +scripts_pokemon_center_b1f_attendants +scripts_record_chatot_cry +scripts_poke_radar +scripts_poffin_common scripts_route_201 scripts_route_202 scripts_route_203 @@ -496,10 +496,10 @@ scripts_route_228_south_house scripts_route_229 scripts_unk_0496 scripts_safari_game -scripts_unk_0498 -scripts_unk_0499 -scripts_unk_0500 -scripts_unk_0501 +scripts_vs_seeker +scripts_scratch_off_cards +scripts_battle_tower_records +scripts_day_care_common scripts_init_jubilife_city scripts_init_jubilife_city_mart scripts_init_jubilife_city_unknown_house_1 @@ -1049,7 +1049,7 @@ scripts_init_unk_1047 scripts_init_route_226 scripts_init_route_226_house scripts_init_route_230 -scripts_unk_1051 +scripts_counterpart_talk scripts_twinleaf_town scripts_twinleaf_town_rival_house_1f scripts_twinleaf_town_rival_house_2f @@ -1112,7 +1112,7 @@ scripts_resort_area_ribbon_syndicate_2f scripts_resort_area_ribbon_syndicate_elevator scripts_villa scripts_resort_area_house -scripts_unk_1114 +scripts_battles scripts_tv_broadcast scripts_tv_reporter_interviews scripts_underground diff --git a/res/field/scripts/scripts_unk_0500.s b/res/field/scripts/scripts_battle_tower_records.s similarity index 98% rename from res/field/scripts/scripts_unk_0500.s rename to res/field/scripts/scripts_battle_tower_records.s index 0257092e06..b5c7686e7c 100644 --- a/res/field/scripts/scripts_unk_0500.s +++ b/res/field/scripts/scripts_battle_tower_records.s @@ -1,5 +1,5 @@ #include "macros/scrcmd.inc" -#include "res/text/bank/unk_0016.h" +#include "res/text/bank/battle_tower_records.h" ScriptEntry _001A diff --git a/res/field/scripts/scripts_unk_1114.s b/res/field/scripts/scripts_battles.s similarity index 100% rename from res/field/scripts/scripts_unk_1114.s rename to res/field/scripts/scripts_battles.s diff --git a/res/field/scripts/scripts_unk_0001.s b/res/field/scripts/scripts_bg_events.s similarity index 97% rename from res/field/scripts/scripts_unk_0001.s rename to res/field/scripts/scripts_bg_events.s index d90882a7ac..cb8133b759 100644 --- a/res/field/scripts/scripts_unk_0001.s +++ b/res/field/scripts/scripts_bg_events.s @@ -1,5 +1,5 @@ #include "macros/scrcmd.inc" -#include "res/text/bank/unk_0017.h" +#include "res/text/bank/bg_events.h" ScriptEntry _0026 diff --git a/res/field/scripts/scripts_unk_0000.s b/res/field/scripts/scripts_communication_club.s similarity index 92% rename from res/field/scripts/scripts_unk_0000.s rename to res/field/scripts/scripts_communication_club.s index d2ad699942..db01fc2be6 100644 --- a/res/field/scripts/scripts_unk_0000.s +++ b/res/field/scripts/scripts_communication_club.s @@ -1,5 +1,5 @@ #include "macros/scrcmd.inc" -#include "res/text/bank/unk_0011.h" +#include "res/text/bank/communication_club.h" ScriptEntry _000E diff --git a/res/field/scripts/scripts_unk_0212.s b/res/field/scripts/scripts_contest_registration.s similarity index 100% rename from res/field/scripts/scripts_unk_0212.s rename to res/field/scripts/scripts_contest_registration.s diff --git a/res/field/scripts/scripts_unk_1051.s b/res/field/scripts/scripts_counterpart_talk.s similarity index 100% rename from res/field/scripts/scripts_unk_1051.s rename to res/field/scripts/scripts_counterpart_talk.s diff --git a/res/field/scripts/scripts_unk_0501.s b/res/field/scripts/scripts_day_care_common.s similarity index 99% rename from res/field/scripts/scripts_unk_0501.s rename to res/field/scripts/scripts_day_care_common.s index 2f9006d916..0d6648e22d 100644 --- a/res/field/scripts/scripts_unk_0501.s +++ b/res/field/scripts/scripts_day_care_common.s @@ -1,5 +1,5 @@ #include "macros/scrcmd.inc" -#include "res/text/bank/unk_0547.h" +#include "res/text/bank/day_care_common.h" #include "constants/daycare.h" diff --git a/res/field/scripts/scripts_unk_0406.s b/res/field/scripts/scripts_group_connection.s similarity index 98% rename from res/field/scripts/scripts_unk_0406.s rename to res/field/scripts/scripts_group_connection.s index b7841cea39..15b5f47463 100644 --- a/res/field/scripts/scripts_unk_0406.s +++ b/res/field/scripts/scripts_group_connection.s @@ -1,5 +1,5 @@ #include "macros/scrcmd.inc" -#include "res/text/bank/unk_0374.h" +#include "res/text/bank/group_connection.h" ScriptEntry _0006 diff --git a/res/field/scripts/scripts_unk_0407.s b/res/field/scripts/scripts_mystery_gift_deliveryman.s similarity index 100% rename from res/field/scripts/scripts_unk_0407.s rename to res/field/scripts/scripts_mystery_gift_deliveryman.s diff --git a/res/field/scripts/scripts_unk_0426.s b/res/field/scripts/scripts_poffin_common.s similarity index 98% rename from res/field/scripts/scripts_unk_0426.s rename to res/field/scripts/scripts_poffin_common.s index c6acf25e07..e405974329 100644 --- a/res/field/scripts/scripts_unk_0426.s +++ b/res/field/scripts/scripts_poffin_common.s @@ -1,5 +1,5 @@ #include "macros/scrcmd.inc" -#include "res/text/bank/unk_0432.h" +#include "res/text/bank/poffin_common.h" ScriptEntry _0008 diff --git a/res/field/scripts/scripts_unk_0425.s b/res/field/scripts/scripts_poke_radar.s similarity index 100% rename from res/field/scripts/scripts_unk_0425.s rename to res/field/scripts/scripts_poke_radar.s diff --git a/res/field/scripts/scripts_unk_0213.s b/res/field/scripts/scripts_pokemon_center_2f_attendants.s similarity index 99% rename from res/field/scripts/scripts_unk_0213.s rename to res/field/scripts/scripts_pokemon_center_2f_attendants.s index afedb5b622..b75883cff6 100644 --- a/res/field/scripts/scripts_unk_0213.s +++ b/res/field/scripts/scripts_pokemon_center_2f_attendants.s @@ -1,5 +1,5 @@ #include "macros/scrcmd.inc" -#include "res/text/bank/unk_0221.h" +#include "res/text/bank/pokemon_center_2f_attendants.h" #include "res/text/bank/menu_entries.h" #include "constants/map_object.h" diff --git a/res/field/scripts/scripts_unk_0423.s b/res/field/scripts/scripts_pokemon_center_b1f_attendants.s similarity index 99% rename from res/field/scripts/scripts_unk_0423.s rename to res/field/scripts/scripts_pokemon_center_b1f_attendants.s index 32c48641fb..dc7f5702b9 100644 --- a/res/field/scripts/scripts_unk_0423.s +++ b/res/field/scripts/scripts_pokemon_center_b1f_attendants.s @@ -1,5 +1,5 @@ #include "macros/scrcmd.inc" -#include "res/text/bank/unk_0430.h" +#include "res/text/bank/pokemon_center_b1f_attendants.h" ScriptEntry _001A diff --git a/res/field/scripts/scripts_unk_0424.s b/res/field/scripts/scripts_record_chatot_cry.s similarity index 96% rename from res/field/scripts/scripts_unk_0424.s rename to res/field/scripts/scripts_record_chatot_cry.s index 656476ed38..ccd126ed97 100644 --- a/res/field/scripts/scripts_unk_0424.s +++ b/res/field/scripts/scripts_record_chatot_cry.s @@ -1,5 +1,5 @@ #include "macros/scrcmd.inc" -#include "res/text/bank/unk_0431.h" +#include "res/text/bank/record_chatot_cry.h" ScriptEntry _0006 diff --git a/res/field/scripts/scripts_unk_0499.s b/res/field/scripts/scripts_scratch_off_cards.s similarity index 100% rename from res/field/scripts/scripts_unk_0499.s rename to res/field/scripts/scripts_scratch_off_cards.s diff --git a/res/field/scripts/scripts_pokeball_items.s b/res/field/scripts/scripts_visible_items.s similarity index 99% rename from res/field/scripts/scripts_pokeball_items.s rename to res/field/scripts/scripts_visible_items.s index 631452579d..ba2a760063 100644 --- a/res/field/scripts/scripts_pokeball_items.s +++ b/res/field/scripts/scripts_visible_items.s @@ -1,5 +1,5 @@ #include "macros/scrcmd.inc" -#include "res/text/bank/pokeball_items.h" +#include "res/text/bank/visible_items.h" ScriptEntry _0522 diff --git a/res/field/scripts/scripts_unk_0498.s b/res/field/scripts/scripts_vs_seeker.s similarity index 93% rename from res/field/scripts/scripts_unk_0498.s rename to res/field/scripts/scripts_vs_seeker.s index 3aac934652..046fc6f701 100644 --- a/res/field/scripts/scripts_unk_0498.s +++ b/res/field/scripts/scripts_vs_seeker.s @@ -1,5 +1,5 @@ #include "macros/scrcmd.inc" -#include "res/text/bank/unk_0539.h" +#include "res/text/bank/vs_seeker.h" ScriptEntry _0006 diff --git a/res/text/unk_0016.json b/res/text/battle_tower_records.json similarity index 100% rename from res/text/unk_0016.json rename to res/text/battle_tower_records.json diff --git a/res/text/unk_0017.json b/res/text/bg_events.json similarity index 100% rename from res/text/unk_0017.json rename to res/text/bg_events.json diff --git a/res/text/unk_0011.json b/res/text/communication_club.json similarity index 100% rename from res/text/unk_0011.json rename to res/text/communication_club.json diff --git a/res/text/unk_0547.json b/res/text/day_care_common.json similarity index 100% rename from res/text/unk_0547.json rename to res/text/day_care_common.json diff --git a/res/text/unk_0374.json b/res/text/group_connection.json similarity index 100% rename from res/text/unk_0374.json rename to res/text/group_connection.json diff --git a/res/text/unk_0432.json b/res/text/poffin_common.json similarity index 100% rename from res/text/unk_0432.json rename to res/text/poffin_common.json diff --git a/res/text/unk_0221.json b/res/text/pokemon_center_2f_attendants.json similarity index 100% rename from res/text/unk_0221.json rename to res/text/pokemon_center_2f_attendants.json diff --git a/res/text/unk_0430.json b/res/text/pokemon_center_b1f_attendants.json similarity index 100% rename from res/text/unk_0430.json rename to res/text/pokemon_center_b1f_attendants.json diff --git a/res/text/unk_0431.json b/res/text/record_chatot_cry.json similarity index 100% rename from res/text/unk_0431.json rename to res/text/record_chatot_cry.json diff --git a/res/text/pokeball_items.json b/res/text/visible_items.json similarity index 100% rename from res/text/pokeball_items.json rename to res/text/visible_items.json diff --git a/res/text/unk_0539.json b/res/text/vs_seeker.json similarity index 100% rename from res/text/unk_0539.json rename to res/text/vs_seeker.json diff --git a/src/encounter.c b/src/encounter.c index 915bea647a..e74a43128a 100644 --- a/src/encounter.c +++ b/src/encounter.c @@ -506,16 +506,16 @@ static BOOL FieldTask_SafariEncounter(FieldTask *task) case 6: if (*ballCount == 0) { if (encounter->dto->resultMask == BATTLE_RESULT_CAPTURED_MON) { - ScriptManager_Start(task, 8802, NULL, NULL); + ScriptManager_Start(task, SCRIPT_ID(SAFARI_GAME, 2), NULL, NULL); } else { - ScriptManager_Start(task, 8809, NULL, NULL); + ScriptManager_Start(task, SCRIPT_ID(SAFARI_GAME, 9), NULL, NULL); } } else { PCBoxes *pcBoxes = SaveData_GetPCBoxes(fieldSystem->saveData); Party *party = SaveData_GetParty(fieldSystem->saveData); if (PCBoxes_FirstEmptyBox(pcBoxes) == MAX_PC_BOXES && Party_GetCurrentCount(party) == MAX_PARTY_SIZE) { - ScriptManager_Start(task, 8822, NULL, NULL); + ScriptManager_Start(task, SCRIPT_ID(SAFARI_GAME, 22), NULL, NULL); } } diff --git a/src/field_comm_manager.c b/src/field_comm_manager.c index 461f4644f1..afa791e2b5 100644 --- a/src/field_comm_manager.c +++ b/src/field_comm_manager.c @@ -408,7 +408,7 @@ static void sub_02059B74(void) } } - ScriptManager_Set(sFieldCommMan->fieldSystem, 9102, NULL); + ScriptManager_Set(sFieldCommMan->fieldSystem, SCRIPT_ID(COMMUNICATION_CLUB, 2), NULL); } } } diff --git a/src/field_map_change.c b/src/field_map_change.c index d190001c72..b7698bed97 100644 --- a/src/field_map_change.c +++ b/src/field_map_change.c @@ -1142,7 +1142,7 @@ BOOL FieldTask_MapChangeToUnderground(FieldTask *task) switch (mapChangeUndergroundData->state) { case 0: - MessageLoader *msgLoader = MessageLoader_Init(MSG_LOADER_LOAD_ON_DEMAND, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_UNK_0221, HEAP_ID_FIELD2); + MessageLoader *msgLoader = MessageLoader_Init(MSG_LOADER_LOAD_ON_DEMAND, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_POKEMON_CENTER_2F_ATTENDANTS, HEAP_ID_FIELD2); mapChangeUndergroundData->unk_34 = MessageLoader_GetNewString(msgLoader, 124); MessageLoader_Free(msgLoader); @@ -1175,13 +1175,13 @@ BOOL FieldTask_MapChangeToUnderground(FieldTask *task) break; case 3: if (SaveData_OverwriteCheck(fieldSystem->saveData)) { - ScriptManager_Start(task, 2034, NULL, NULL); + ScriptManager_Start(task, SCRIPT_ID(COMMON_SCRIPTS, 34), NULL, NULL); } else { sub_020287E0(fieldSystem->saveData); mapChangeUndergroundData->saveInfoWin = SaveInfoWindow_New(fieldSystem, HEAP_ID_FIELD2, BG_LAYER_MAIN_3); SaveInfoWindow_Draw(mapChangeUndergroundData->saveInfoWin); mapChangeUndergroundData->unk_1C = 0; - ScriptManager_Start(task, 2005, NULL, &mapChangeUndergroundData->unk_1C); + ScriptManager_Start(task, SCRIPT_ID(COMMON_SCRIPTS, 5), NULL, &mapChangeUndergroundData->unk_1C); } mapChangeUndergroundData->state = 4; diff --git a/src/field_move_tasks.c b/src/field_move_tasks.c index 25ec31148e..38a2db2b55 100644 --- a/src/field_move_tasks.c +++ b/src/field_move_tasks.c @@ -305,7 +305,7 @@ static BOOL FieldMoves_CutTask(FieldTask *taskMan) FieldMoveTaskData *taskData = FieldTask_GetEnv(taskMan); FieldSystem *fieldSystem = FieldTask_GetFieldSystem(taskMan); - ScriptManager_Change(taskMan, 10008, taskData->mapObj); + ScriptManager_Change(taskMan, SCRIPT_ID(FIELD_MOVES, 8), taskData->mapObj); FieldSystem_SetScriptParameters(fieldSystem, taskData->fieldMoveMon.fieldMonId, 0, 0, 0); FieldMoves_FreeTaskData(taskData); @@ -395,7 +395,7 @@ static BOOL FieldMoves_SurfTask(FieldTask *taskMan) FieldMoveTaskData *taskData = FieldTask_GetEnv(taskMan); FieldSystem *fieldSystem = FieldTask_GetFieldSystem(taskMan); - ScriptManager_Change(taskMan, 10012, NULL); + ScriptManager_Change(taskMan, SCRIPT_ID(FIELD_MOVES, 12), NULL); FieldSystem_SetScriptParameters(fieldSystem, taskData->fieldMoveMon.fieldMonId, 0, 0, 0); FieldMoves_FreeTaskData(taskData); @@ -436,7 +436,7 @@ static BOOL FieldMoves_StrengthTask(FieldTask *param0) FieldMoveTaskData *taskData = FieldTask_GetEnv(param0); FieldSystem *fieldSystem = FieldTask_GetFieldSystem(param0); - ScriptManager_Change(param0, 10010, taskData->mapObj); + ScriptManager_Change(param0, SCRIPT_ID(FIELD_MOVES, 10), taskData->mapObj); FieldSystem_SetScriptParameters(fieldSystem, taskData->fieldMoveMon.fieldMonId, 0, 0, 0); FieldMoves_FreeTaskData(taskData); @@ -477,7 +477,7 @@ static BOOL FieldMoves_DefogTask(FieldTask *taskMan) FieldMoveTaskData *taskData = FieldTask_GetEnv(taskMan); FieldSystem *fieldSystem = FieldTask_GetFieldSystem(taskMan); - ScriptManager_Change(taskMan, 10014, NULL); + ScriptManager_Change(taskMan, SCRIPT_ID(FIELD_MOVES, 14), NULL); FieldSystem_SetScriptParameters(fieldSystem, taskData->fieldMoveMon.fieldMonId, 0, 0, 0); FieldMoves_FreeTaskData(taskData); @@ -522,7 +522,7 @@ static BOOL FieldMoves_RockSmashTask(FieldTask *taskMan) FieldMoveTaskData *taskData = FieldTask_GetEnv(taskMan); FieldSystem *fieldSystem = FieldTask_GetFieldSystem(taskMan); - ScriptManager_Change(taskMan, 10009, taskData->mapObj); + ScriptManager_Change(taskMan, SCRIPT_ID(FIELD_MOVES, 9), taskData->mapObj); FieldSystem_SetScriptParameters(fieldSystem, taskData->fieldMoveMon.fieldMonId, 0, 0, 0); FieldMoves_FreeTaskData(taskData); @@ -563,7 +563,7 @@ static BOOL FieldMoves_WaterfallTask(FieldTask *param0) FieldMoveTaskData *taskData = FieldTask_GetEnv(param0); FieldSystem *fieldSystem = FieldTask_GetFieldSystem(param0); - ScriptManager_Change(param0, 10013, NULL); + ScriptManager_Change(param0, SCRIPT_ID(FIELD_MOVES, 13), NULL); FieldSystem_SetScriptParameters(fieldSystem, taskData->fieldMoveMon.fieldMonId, 0, 0, 0); FieldMoves_FreeTaskData(taskData); @@ -608,7 +608,7 @@ static BOOL FieldMoves_RockClimbTask(FieldTask *taskMan) FieldMoveTaskData *taskData = FieldTask_GetEnv(taskMan); FieldSystem *fieldSystem = FieldTask_GetFieldSystem(taskMan); - ScriptManager_Change(taskMan, 10011, NULL); + ScriptManager_Change(taskMan, SCRIPT_ID(FIELD_MOVES, 11), NULL); FieldSystem_SetScriptParameters(fieldSystem, taskData->fieldMoveMon.fieldMonId, 0, 0, 0); FieldMoves_FreeTaskData(taskData); @@ -645,7 +645,7 @@ static BOOL FieldMoves_FlashTask(FieldTask *taskMan) FieldMoveTaskData *taskData = FieldTask_GetEnv(taskMan); FieldSystem *fieldSystem = FieldTask_GetFieldSystem(taskMan); - ScriptManager_Change(taskMan, 10015, NULL); + ScriptManager_Change(taskMan, SCRIPT_ID(FIELD_MOVES, 15), NULL); FieldSystem_SetScriptParameters(fieldSystem, taskData->fieldMoveMon.fieldMonId, 0, 0, 0); FieldMoves_FreeTaskData(taskData); @@ -803,7 +803,7 @@ static BOOL FieldMoves_ChatterTask(FieldTask *taskMan) FieldMoveTaskData *taskData = FieldTask_GetEnv(taskMan); FieldSystem *fieldSystem = FieldTask_GetFieldSystem(taskMan); - ScriptManager_Change(taskMan, 8900, NULL); + ScriptManager_Change(taskMan, SCRIPT_ID(RECORD_CHATOT_CRY, 0), NULL); FieldSystem_SetScriptParameters(fieldSystem, taskData->fieldMoveMon.fieldMonId, 0, 0, 0); FieldMoves_FreeTaskData(taskData); diff --git a/src/item_use_functions.c b/src/item_use_functions.c index 678536fbf2..b715806b9a 100644 --- a/src/item_use_functions.c +++ b/src/item_use_functions.c @@ -745,12 +745,12 @@ static void UseHoneyFromMenu(ItemMenuUseContext *usageContext, const ItemUseCont static void UseVsSeekerFromMenu(ItemMenuUseContext *usageContext, const ItemUseContext *additionalContext) { - sub_02068540(usageContext, additionalContext, 8950); + sub_02068540(usageContext, additionalContext, SCRIPT_ID(VS_SEEKER, 0)); } static BOOL UseVsSeekerInField(ItemFieldUseContext *usageContext) { - sub_02068584(usageContext, 8950); + sub_02068584(usageContext, SCRIPT_ID(VS_SEEKER, 0)); return FALSE; } @@ -969,12 +969,12 @@ static BOOL sub_020690F0(FieldTask *task) static void UseAzureFluteFromMenu(ItemMenuUseContext *usageContext, const ItemUseContext *additionalContext) { - sub_02068540(usageContext, additionalContext, 2039); + sub_02068540(usageContext, additionalContext, SCRIPT_ID(COMMON_SCRIPTS, 39)); } static BOOL UseAzureFluteInField(ItemFieldUseContext *usageContext) { - sub_02068584(usageContext, 2039); + sub_02068584(usageContext, SCRIPT_ID(COMMON_SCRIPTS, 39)); return FALSE; } diff --git a/src/overlay005/field_control.c b/src/overlay005/field_control.c index fa55a1bb3c..20a9996aea 100644 --- a/src/overlay005/field_control.c +++ b/src/overlay005/field_control.c @@ -392,7 +392,7 @@ BOOL FieldInput_Process_Colosseum(FieldInput *input, FieldSystem *fieldSystem) && input->transitionDir == DIR_SOUTH && TileBehavior_IsWarpEntranceSouth(Field_CurrentTileBehavior(fieldSystem))) { - ScriptManager_Set(fieldSystem, 9101, NULL); + ScriptManager_Set(fieldSystem, SCRIPT_ID(COMMUNICATION_CLUB, 1), NULL); return TRUE; } @@ -653,35 +653,35 @@ u16 Field_TileBehaviorToScript(FieldSystem *fieldSystem, u8 behavior) int playerDir = PlayerAvatar_GetDir(fieldSystem->playerAvatar); if (TileBehavior_IsPC(behavior) && playerDir == DIR_NORTH) { - return 2018; + return SCRIPT_ID(COMMON_SCRIPTS, 18); } else if (TileBehavior_IsSmallBookshelf1(behavior)) { - return 2500; + return SCRIPT_ID(BG_EVENTS, 0); } else if (TileBehavior_IsSmallBookshelf2(behavior)) { - return 2501; + return SCRIPT_ID(BG_EVENTS, 1); } else if (TileBehavior_IsBookshelf1(behavior)) { - return 2502; + return SCRIPT_ID(BG_EVENTS, 2); } else if (TileBehavior_IsBookshelf2(behavior)) { - return 2503; + return SCRIPT_ID(BG_EVENTS, 3); } else if (TileBehavior_IsTrashCan(behavior)) { - return 2504; + return SCRIPT_ID(BG_EVENTS, 4); } else if (TileBehavior_IsMartShelf1(behavior)) { - return 2505; + return SCRIPT_ID(BG_EVENTS, 5); } else if (TileBehavior_IsMartShelf2(behavior)) { - return 2506; + return SCRIPT_ID(BG_EVENTS, 6); } else if (TileBehavior_IsMartShelf3(behavior)) { - return 2507; + return SCRIPT_ID(BG_EVENTS, 7); } else if (TileBehavior_IsWaterfall(behavior)) { - return 10006; + return SCRIPT_ID(FIELD_MOVES, 6); } else if (TileBehavior_IsTownMap(behavior)) { - return 2508; + return SCRIPT_ID(BG_EVENTS, 8); } else if (TileBehavior_IsBikeParking(behavior)) { - return 2030; + return SCRIPT_ID(COMMON_SCRIPTS, 30); } else if (TileBehavior_IsTV(behavior) && playerDir == DIR_NORTH) { - return 10100; + return SCRIPT_ID(TV_BROADCAST, 0); } if (PlayerAvatar_CanUseRockClimb(behavior, playerDir)) { - return 10003; + return SCRIPT_ID(FIELD_MOVES, 3); } if (PlayerAvatar_GetPlayerState(fieldSystem->playerAvatar) != PLAYER_STATE_SURFING) { @@ -690,7 +690,7 @@ u16 Field_TileBehaviorToScript(FieldSystem *fieldSystem, u8 behavior) if (PlayerAvatar_CanUseSurf(fieldSystem->playerAvatar, distortionBehavior, behavior) && TrainerInfo_HasBadge(info, 3)) { if (Party_HasMonWithMove(SaveData_GetParty(fieldSystem->saveData), MOVE_SURF) != PARTY_SLOT_NONE) { - return 10004; + return SCRIPT_ID(FIELD_MOVES, 4); } } } @@ -834,7 +834,7 @@ static BOOL Field_UpdateDaycare(FieldSystem *fieldSystem) GameRecords_IncrementRecordValue(records, RECORD_EGGS_HATCHED); GameRecords_IncrementTrainerScore(records, TRAINER_SCORE_EVENT_UNK_15); - ScriptManager_Set(fieldSystem, 2031, NULL); + ScriptManager_Set(fieldSystem, SCRIPT_ID(COMMON_SCRIPTS, 31), NULL); return TRUE; } @@ -914,7 +914,7 @@ static BOOL Field_UpdatePoison(FieldSystem *fieldSystem) return FALSE; case FLDPSN_FAINTED: Field_DoPoisonEffect(fieldSystem->unk_04->unk_20); - ScriptManager_Set(fieldSystem, 2003, NULL); + ScriptManager_Set(fieldSystem, SCRIPT_ID(COMMON_SCRIPTS, 3), NULL); return TRUE; } @@ -930,7 +930,7 @@ static BOOL Field_UpdateSafari(FieldSystem *fieldSystem) u16 *balls = FieldOverworldState_GetSafariBallCount(SaveData_GetFieldOverworldState(fieldSystem->saveData)); if (*balls == 0) { - ScriptManager_Set(fieldSystem, 8802, NULL); + ScriptManager_Set(fieldSystem, SCRIPT_ID(SAFARI_GAME, 2), NULL); return TRUE; } @@ -938,7 +938,7 @@ static BOOL Field_UpdateSafari(FieldSystem *fieldSystem) (*steps)++; if (*steps >= 500) { - ScriptManager_Set(fieldSystem, 8801, NULL); + ScriptManager_Set(fieldSystem, SCRIPT_ID(SAFARI_GAME, 1), NULL); return TRUE; } diff --git a/src/overlay005/honey_tree.c b/src/overlay005/honey_tree.c index 230cdafa1d..744f5f82da 100644 --- a/src/overlay005/honey_tree.c +++ b/src/overlay005/honey_tree.c @@ -99,7 +99,7 @@ BOOL HoneyTree_TryInteract(FieldSystem *fieldSystem, int *eventId) int x, z; BOOL isFacingHoneyTree; - *eventId = SCRIPT_ID_OFFSET_COMMON_SCRIPTS + 8; + *eventId = SCRIPT_ID(COMMON_SCRIPTS, 8); x = Player_GetXPos(fieldSystem->playerAvatar); z = Player_GetZPos(fieldSystem->playerAvatar); diff --git a/src/overlay005/ov5_021F007C.c b/src/overlay005/ov5_021F007C.c index d2ed079cea..ad3b30a80e 100644 --- a/src/overlay005/ov5_021F007C.c +++ b/src/overlay005/ov5_021F007C.c @@ -536,12 +536,12 @@ BOOL ov5_021F0488(FieldTask *param0) v1->unk_0E--; if (v1->unk_0E < 0) { - ScriptManager_Start(param0, 2029, NULL, NULL); + ScriptManager_Start(param0, SCRIPT_ID(COMMON_SCRIPTS, 29), NULL, NULL); v1->unk_0C = 9; } break; case 8: - ScriptManager_Start(param0, 2028, NULL, NULL); + ScriptManager_Start(param0, SCRIPT_ID(COMMON_SCRIPTS, 28), NULL, NULL); v1->unk_0C = 9; break; case 9: diff --git a/src/overlay006/repel_step_update.c b/src/overlay006/repel_step_update.c index 536b953fad..aa08859a2b 100644 --- a/src/overlay006/repel_step_update.c +++ b/src/overlay006/repel_step_update.c @@ -17,7 +17,7 @@ BOOL Repel_UpdateSteps(SaveData *saveData, FieldSystem *fieldSystem) (*repelSteps)--; if (*repelSteps == 0) { - ScriptManager_Set(fieldSystem, 2032, NULL); + ScriptManager_Set(fieldSystem, SCRIPT_ID(COMMON_SCRIPTS, 32), NULL); return TRUE; } } diff --git a/src/overlay007/ov7_0224B4E8.c b/src/overlay007/ov7_0224B4E8.c index 8e0cf1ee81..5dc8dd54d7 100644 --- a/src/overlay007/ov7_0224B4E8.c +++ b/src/overlay007/ov7_0224B4E8.c @@ -557,7 +557,7 @@ static UnkStruct_ov7_0224B4E8 *ov7_0224BE10(FieldSystem *fieldSystem) v0->fieldSystem = fieldSystem; v0->fieldSystem->unk_B0 = NULL; v0->unk_64 = StringTemplate_Default(HEAP_ID_FIELD1); - v0->unk_68 = MessageLoader_Init(MSG_LOADER_PRELOAD_ENTIRE_BANK, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_UNK_0221, HEAP_ID_FIELD1); + v0->unk_68 = MessageLoader_Init(MSG_LOADER_PRELOAD_ENTIRE_BANK, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_POKEMON_CENTER_2F_ATTENDANTS, HEAP_ID_FIELD1); v0->unk_14 = String_Init((90 * 2), HEAP_ID_FIELD1); v0->unk_18 = String_Init((90 * 2), HEAP_ID_FIELD1); v0->unk_1C = String_Init((90 * 2), HEAP_ID_FIELD1); diff --git a/src/overlay008/ov8_02249960.c b/src/overlay008/ov8_02249960.c index d1418947d1..1769c3415b 100644 --- a/src/overlay008/ov8_02249960.c +++ b/src/overlay008/ov8_02249960.c @@ -3882,7 +3882,7 @@ BOOL ov8_0224C51C(FieldSystem *fieldSystem) if (v3 != -1) { int v9 = MapObject_GetScript(v7); - ScriptManager_Set(fieldSystem, 3928, v7); + ScriptManager_Set(fieldSystem, SCRIPT_ID(SINGLE_BATTLES, 928), v7); ScriptManager_SetApproachingTrainer(fieldSystem, v7, v3, v1, v9, Script_GetTrainerID(v9), 0, 0); return 1; } diff --git a/src/overlay110/ov110_021D0D80.c b/src/overlay110/ov110_021D0D80.c index 5ed1c641e6..5234cc203f 100644 --- a/src/overlay110/ov110_021D0D80.c +++ b/src/overlay110/ov110_021D0D80.c @@ -121,7 +121,7 @@ int ov110_021D0D80(ApplicationManager *appMan, int *param1) ov110_021D1180(v1); - v1->unk_110 = MessageLoader_Init(MSG_LOADER_LOAD_ON_DEMAND, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_UNK_0016, HEAP_ID_114); + v1->unk_110 = MessageLoader_Init(MSG_LOADER_LOAD_ON_DEMAND, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_BATTLE_TOWER_RECORDS, HEAP_ID_114); v1->unk_114 = StringTemplate_Default(HEAP_ID_114); v1->unk_118 = String_Init(800, HEAP_ID_114); v1->unk_11C = String_Init(800, HEAP_ID_114); diff --git a/src/pokeradar.c b/src/pokeradar.c index 2a1d88dc30..f33e6bb88c 100644 --- a/src/pokeradar.c +++ b/src/pokeradar.c @@ -425,7 +425,7 @@ BOOL RefreshRadarChain(FieldTask *taskMan) u8 *v2 = SpecialEncounter_GetRadarCharge(SaveData_GetSpecialEncounters(fieldSystem->saveData)); if (*v2 < RADAR_BATTERY_STEPS) { - ScriptManager_Start(taskMan, 8970, NULL, NULL); + ScriptManager_Start(taskMan, SCRIPT_ID(POKE_RADAR, 0), NULL, NULL); *(u16 *)FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_DATA_PARAMETER_0) = RADAR_BATTERY_STEPS - (*v2); *v1 = 4; } else { @@ -457,7 +457,7 @@ BOOL RefreshRadarChain(FieldTask *taskMan) return TRUE; break; case 3: - ScriptManager_Start(taskMan, 8971, NULL, NULL); + ScriptManager_Start(taskMan, SCRIPT_ID(POKE_RADAR, 1), NULL, NULL); *v1 = 4; break; } diff --git a/src/script_manager.c b/src/script_manager.c index 7ddcbad99a..c85d8f08de 100644 --- a/src/script_manager.c +++ b/src/script_manager.c @@ -30,36 +30,36 @@ // clang-format off #define SCRIPT_RANGE_TABLE(Entry) \ - Entry(10490, scripts_unk_0499, TEXT_BANK_SCRATCH_OFF_CARDS) \ - Entry(10450, scripts_unk_0500, TEXT_BANK_UNK_0016) \ - Entry(SCRIPT_ID_POKEMON_CENTER_DAILY_TRAINERS, scripts_pokemon_center_daily_trainers, TEXT_BANK_POKEMON_CENTER_DAILY_TRAINERS) \ - Entry(10300, scripts_unk_1051, TEXT_BANK_COUNTERPART_TALK) \ - Entry(10200, scripts_unk_0407, TEXT_BANK_MYSTERY_GIFT_DELIVERYMAN) \ - Entry(SCRIPT_ID_OFFSET_TV_REPORTER_INTERVIEWS, scripts_tv_reporter_interviews, TEXT_BANK_TV_REPORTER_INTERVIEWS) \ - Entry(SCRIPT_ID_OFFSET_TV_BROADCAST, scripts_tv_broadcast, TEXT_BANK_TV_PROGRAMS) \ - Entry(SCRIPT_ID_OFFSET_FIELD_MOVES, scripts_field_moves, TEXT_BANK_FIELD_MOVES) \ - Entry(SCRIPT_ID_OFFSET_POKEDEX_RATINGS, scripts_pokedex_ratings, TEXT_BANK_POKEDEX_RATINGS) \ - Entry(9900, scripts_unk_0397, TEXT_BANK_COMMON_STRINGS) \ - Entry(9800, scripts_unk_0212, TEXT_BANK_CONTEST_REGISTRATION) \ - Entry(SCRIPT_ID_OFFSET_FOLLOWER_PARTNERS, scripts_follower_partners, TEXT_BANK_FOLLOWER_PARTNERS) \ - Entry(SCRIPT_ID_OFFSET_INIT_NEW_GAME, scripts_init_new_game, TEXT_BANK_COMMON_STRINGS) \ - Entry(9500, scripts_unk_0501, TEXT_BANK_UNK_0547) \ - Entry(9400, scripts_unk_0426, TEXT_BANK_UNK_0432) \ - Entry(9300, scripts_unk_0406, TEXT_BANK_UNK_0374) \ - Entry(9200, scripts_unk_0423, TEXT_BANK_UNK_0430) \ - Entry(9100, scripts_unk_0000, TEXT_BANK_UNK_0011) \ - Entry(9000, scripts_unk_0213, TEXT_BANK_UNK_0221) \ - Entry(8970, scripts_unk_0425, TEXT_BANK_BAG) \ - Entry(8950, scripts_unk_0498, TEXT_BANK_UNK_0539) \ - Entry(8900, scripts_unk_0424, TEXT_BANK_UNK_0431) \ - Entry(SCRIPT_ID_OFFSET_SAFARI_GAME, scripts_safari_game, TEXT_BANK_SAFARI_GAME) \ - Entry(SCRIPT_ID_OFFSET_HIDDEN_ITEMS, scripts_hidden_items, TEXT_BANK_HIDDEN_ITEMS) \ - Entry(SCRIPT_ID_OFFSET_POKEBALL_ITEMS, scripts_pokeball_items, TEXT_BANK_POKEBALL_ITEMS) \ - Entry(SCRIPT_ID_OFFSET_DOUBLE_BATTLES, scripts_unk_1114, TEXT_BANK_COMMON_STRINGS) \ - Entry(SCRIPT_ID_OFFSET_SINGLE_BATTLES, scripts_unk_1114, TEXT_BANK_COMMON_STRINGS) \ - Entry(2800, scripts_berry_tree_interaction, TEXT_BANK_BERRY_TREES) \ - Entry(2500, scripts_unk_0001, TEXT_BANK_UNK_0017) \ - Entry(SCRIPT_ID_OFFSET_COMMON_SCRIPTS, scripts_common, TEXT_BANK_COMMON_STRINGS) + Entry(SCRIPT_ID_OFFSET_SCRATCH_OFF_CARDS, scripts_scratch_off_cards, TEXT_BANK_SCRATCH_OFF_CARDS) \ + Entry(SCRIPT_ID_OFFSET_BATTLE_TOWER_RECORDS, scripts_battle_tower_records, TEXT_BANK_BATTLE_TOWER_RECORDS) \ + Entry(SCRIPT_ID_OFFSET_POKEMON_CENTER_DAILY_TRAINERS, scripts_pokemon_center_daily_trainers, TEXT_BANK_POKEMON_CENTER_DAILY_TRAINERS) \ + Entry(SCRIPT_ID_OFFSET_COUNTERPART_TALK, scripts_counterpart_talk, TEXT_BANK_COUNTERPART_TALK) \ + Entry(SCRIPT_ID_OFFSET_MYSTERY_GIFT_DELIVERYMAN, scripts_mystery_gift_deliveryman, TEXT_BANK_MYSTERY_GIFT_DELIVERYMAN) \ + Entry(SCRIPT_ID_OFFSET_TV_REPORTER_INTERVIEWS, scripts_tv_reporter_interviews, TEXT_BANK_TV_REPORTER_INTERVIEWS) \ + Entry(SCRIPT_ID_OFFSET_TV_BROADCAST, scripts_tv_broadcast, TEXT_BANK_TV_PROGRAMS) \ + Entry(SCRIPT_ID_OFFSET_FIELD_MOVES, scripts_field_moves, TEXT_BANK_FIELD_MOVES) \ + Entry(SCRIPT_ID_OFFSET_POKEDEX_RATINGS, scripts_pokedex_ratings, TEXT_BANK_POKEDEX_RATINGS) \ + Entry(9900, scripts_unk_0397, TEXT_BANK_COMMON_STRINGS) \ + Entry(SCRIPT_ID_OFFSET_CONTEST_REGISTRATION, scripts_contest_registration, TEXT_BANK_CONTEST_REGISTRATION) \ + Entry(SCRIPT_ID_OFFSET_FOLLOWER_PARTNERS, scripts_follower_partners, TEXT_BANK_FOLLOWER_PARTNERS) \ + Entry(SCRIPT_ID_OFFSET_INIT_NEW_GAME, scripts_init_new_game, TEXT_BANK_COMMON_STRINGS) \ + Entry(SCRIPT_ID_OFFSET_DAY_CARE_COMMON, scripts_day_care_common, TEXT_BANK_DAY_CARE_COMMON) \ + Entry(SCRIPT_ID_OFFSET_POFFIN_COMMON, scripts_poffin_common, TEXT_BANK_POFFIN_COMMON) \ + Entry(SCRIPT_ID_OFFSET_GROUP_CONNECTION, scripts_group_connection, TEXT_BANK_GROUP_CONNECTION) \ + Entry(SCRIPT_ID_OFFSET_POKEMON_CENTER_B1F_ATTENDANTS, scripts_pokemon_center_b1f_attendants, TEXT_BANK_POKEMON_CENTER_B1F_ATTENDANTS) \ + Entry(SCRIPT_ID_OFFSET_COMMUNICATION_CLUB, scripts_communication_club, TEXT_BANK_COMMUNICATION_CLUB) \ + Entry(SCRIPT_ID_OFFSET_POKEMON_CENTER_2F_ATTENDANTS, scripts_pokemon_center_2f_attendants, TEXT_BANK_POKEMON_CENTER_2F_ATTENDANTS) \ + Entry(SCRIPT_ID_OFFSET_POKE_RADAR, scripts_poke_radar, TEXT_BANK_BAG) \ + Entry(SCRIPT_ID_OFFSET_VS_SEEKER, scripts_vs_seeker, TEXT_BANK_VS_SEEKER) \ + Entry(SCRIPT_ID_OFFSET_RECORD_CHATOT_CRY, scripts_record_chatot_cry, TEXT_BANK_RECORD_CHATOT_CRY) \ + Entry(SCRIPT_ID_OFFSET_SAFARI_GAME, scripts_safari_game, TEXT_BANK_SAFARI_GAME) \ + Entry(SCRIPT_ID_OFFSET_HIDDEN_ITEMS, scripts_hidden_items, TEXT_BANK_HIDDEN_ITEMS) \ + Entry(SCRIPT_ID_OFFSET_VISIBLE_ITEMS, scripts_visible_items, TEXT_BANK_VISIBLE_ITEMS) \ + Entry(SCRIPT_ID_OFFSET_DOUBLE_BATTLES, scripts_battles, TEXT_BANK_COMMON_STRINGS) \ + Entry(SCRIPT_ID_OFFSET_SINGLE_BATTLES, scripts_battles, TEXT_BANK_COMMON_STRINGS) \ + Entry(SCRIPT_ID_OFFSET_BERRY_TREE_INTERACTIONS, scripts_berry_tree_interaction, TEXT_BANK_BERRY_TREES) \ + Entry(SCRIPT_ID_OFFSET_BG_EVENTS, scripts_bg_events, TEXT_BANK_BG_EVENTS) \ + Entry(SCRIPT_ID_OFFSET_COMMON_SCRIPTS, scripts_common, TEXT_BANK_COMMON_STRINGS) // clang-format on static BOOL FieldTask_RunScript(FieldTask *taskManager); diff --git a/src/start_menu.c b/src/start_menu.c index c44ed9024b..84a35db885 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -1391,13 +1391,13 @@ static void StartMenu_Save(FieldTask *taskMan) SaveMenu *saveMenu; if (SaveData_OverwriteCheck(fieldSystem->saveData)) { - ScriptManager_Start(taskMan, 2034, NULL, NULL); + ScriptManager_Start(taskMan, SCRIPT_ID(COMMON_SCRIPTS, 34), NULL, NULL); } else { menu->taskData = Heap_Alloc(HEAP_ID_FIELD3, sizeof(SaveMenu)); saveMenu = menu->taskData; saveMenu->unk_04 = 0; - ScriptManager_Start(taskMan, 2005, NULL, &saveMenu->unk_04); + ScriptManager_Start(taskMan, SCRIPT_ID(COMMON_SCRIPTS, 5), NULL, &saveMenu->unk_04); } menu->state = START_MENU_STATE_SAVE_WAIT; @@ -1528,7 +1528,7 @@ static BOOL StartMenu_SelectRetire(FieldTask *taskMan) sub_0203B200(taskMan); if (SystemFlag_CheckSafariGameActive(SaveData_GetVarsFlags(fieldSystem->saveData)) == TRUE) { - ScriptManager_Change(taskMan, 8821, NULL); + ScriptManager_Change(taskMan, SCRIPT_ID(SAFARI_GAME, 21), NULL); } else { ScriptManager_Change(taskMan, 4, NULL); } diff --git a/src/unk_020528D0.c b/src/unk_020528D0.c index aa6d5b05d4..4ff4509464 100644 --- a/src/unk_020528D0.c +++ b/src/unk_020528D0.c @@ -243,9 +243,9 @@ BOOL FieldTask_BlackOutFromBattle(FieldTask *task) BrightnessController_SetScreenBrightness(0, GX_BLEND_PLANEMASK_BG0 | GX_BLEND_PLANEMASK_BG1 | GX_BLEND_PLANEMASK_BG2 | GX_BLEND_PLANEMASK_BG3 | GX_BLEND_PLANEMASK_OBJ | GX_BLEND_PLANEMASK_BD, BRIGHTNESS_BOTH_SCREENS); if (FieldOverworldState_GetDefaultWarpID() == FieldOverworldState_GetWarpId(SaveData_GetFieldOverworldState(fieldSystem->saveData))) { - ScriptManager_Start(task, 0x7E4, NULL, NULL); + ScriptManager_Start(task, SCRIPT_ID(COMMON_SCRIPTS, 20), NULL, NULL); } else { - ScriptManager_Start(task, 0x7E5, NULL, NULL); + ScriptManager_Start(task, SCRIPT_ID(COMMON_SCRIPTS, 21), NULL, NULL); } (*state)++; diff --git a/src/unk_0205A0D8.c b/src/unk_0205A0D8.c index 5a2b2f364c..0e2a052fb4 100644 --- a/src/unk_0205A0D8.c +++ b/src/unk_0205A0D8.c @@ -664,7 +664,7 @@ void sub_0205AB10(FieldSystem *fieldSystem, UnkFuncPtr_0205AB10 *param1) v0->fieldSystem = fieldSystem; v0->unk_08 = param1; v0->unk_28 = StringTemplate_Default(HEAP_ID_FIELD2); - v0->unk_2C = MessageLoader_Init(MSG_LOADER_PRELOAD_ENTIRE_BANK, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_UNK_0011, HEAP_ID_FIELD2); + v0->unk_2C = MessageLoader_Init(MSG_LOADER_PRELOAD_ENTIRE_BANK, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_COMMUNICATION_CLUB, HEAP_ID_FIELD2); v0->unk_0C = String_Init(100 * 2, HEAP_ID_FIELD2); v0->unk_10 = String_Init(100 * 2, HEAP_ID_FIELD2); @@ -1007,7 +1007,7 @@ static BOOL sub_0205B140(FieldTask *param0) switch (v1->unk_28) { case 0: v1->unk_18 = StringTemplate_Default(HEAP_ID_FIELD1); - v1->unk_1C = MessageLoader_Init(MSG_LOADER_PRELOAD_ENTIRE_BANK, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_UNK_0011, HEAP_ID_FIELD1); + v1->unk_1C = MessageLoader_Init(MSG_LOADER_PRELOAD_ENTIRE_BANK, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_COMMUNICATION_CLUB, HEAP_ID_FIELD1); v1->unk_00 = String_Init(100 * 2, HEAP_ID_FIELD1); v1->unk_04 = String_Init(100 * 2, HEAP_ID_FIELD1); diff --git a/src/unk_02067A84.c b/src/unk_02067A84.c index 0361970662..cd5b9182df 100644 --- a/src/unk_02067A84.c +++ b/src/unk_02067A84.c @@ -81,7 +81,7 @@ int sub_02067A84(FieldSystem *fieldSystem, BOOL param1) MapObject *v3; UnkStruct_02067C28 v4; - ScriptManager_Set(fieldSystem, 3928, v0.unk_14); + ScriptManager_Set(fieldSystem, SCRIPT_ID(SINGLE_BATTLES, 928), v0.unk_14); if ((param1 == 0) || (sub_02067BA8(fieldSystem, mapObjMan, playerAvatar, v0.unk_14, &v4) == 0)) { ScriptManager_SetApproachingTrainer(fieldSystem, v0.unk_14, v0.unk_00, v0.unk_04, v0.unk_08, v0.unk_0C, 0, 0); @@ -105,7 +105,7 @@ int sub_02067A84(FieldSystem *fieldSystem, BOOL param1) v5 = sub_02067F2C(fieldSystem, mapObjMan, v0.unk_14, v0.unk_0C); sub_02067C28(&v6, v5, v0.unk_00, v0.unk_04); - ScriptManager_Set(fieldSystem, 3928, v0.unk_14); + ScriptManager_Set(fieldSystem, SCRIPT_ID(SINGLE_BATTLES, 928), v0.unk_14); ScriptManager_SetApproachingTrainer(fieldSystem, v0.unk_14, v0.unk_00, v0.unk_04, v0.unk_08, v0.unk_0C, 1, 0); ScriptManager_SetApproachingTrainer(fieldSystem, v6.unk_14, v6.unk_00, v6.unk_04, v6.unk_08, v6.unk_0C, 1, 1);