Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions generated/text_banks.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -537,15 +537,15 @@ 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
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
Expand Down
44 changes: 30 additions & 14 deletions include/script_manager.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
34 changes: 17 additions & 17 deletions res/field/scripts/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down Expand Up @@ -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',
Expand Down Expand Up @@ -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',
Expand All @@ -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',
Expand Down Expand Up @@ -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',
Expand Down Expand Up @@ -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',
Expand Down Expand Up @@ -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',
Expand Down
34 changes: 17 additions & 17 deletions res/field/scripts/scripts.order
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "macros/scrcmd.inc"
#include "res/text/bank/unk_0017.h"
#include "res/text/bank/bg_events.h"


ScriptEntry _0026
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "macros/scrcmd.inc"
#include "res/text/bank/unk_0011.h"
#include "res/text/bank/communication_club.h"


ScriptEntry _000E
Expand Down
Original file line number Diff line number Diff line change
@@ -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"


Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "macros/scrcmd.inc"
#include "res/text/bank/unk_0374.h"
#include "res/text/bank/group_connection.h"


ScriptEntry _0006
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "macros/scrcmd.inc"
#include "res/text/bank/unk_0432.h"
#include "res/text/bank/poffin_common.h"


ScriptEntry _0008
Expand Down
Original file line number Diff line number Diff line change
@@ -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"

Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "macros/scrcmd.inc"
#include "res/text/bank/pokeball_items.h"
#include "res/text/bank/visible_items.h"


ScriptEntry _0522
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "macros/scrcmd.inc"
#include "res/text/bank/unk_0539.h"
#include "res/text/bank/vs_seeker.h"


ScriptEntry _0006
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
6 changes: 3 additions & 3 deletions src/encounter.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/field_comm_manager.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
}
Expand Down
Loading