Skip to content
Merged
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
4 changes: 2 additions & 2 deletions generated/text_banks.txt
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,7 @@ TEXT_BANK_BATTLE_FACTORY_SCENE
TEXT_BANK_JOURNAL_ENTRIES
TEXT_BANK_START_MENU
TEXT_BANK_BATTLE_STRINGS
TEXT_BANK_UNK_0369
TEXT_BANK_POKEBALL_ITEMS
TEXT_BANK_NPC_TRADE_NAMES
TEXT_BANK_FURNITURE_NAMES
TEXT_BANK_UNK_0372
Expand All @@ -378,7 +378,7 @@ TEXT_BANK_SPIN_TRADE
TEXT_BANK_UNK_0377
TEXT_BANK_GYM_NAMES
TEXT_BANK_MYSTERY_GIFT_DELIVERYMAN
TEXT_BANK_UNK_0380
TEXT_BANK_HIDDEN_ITEMS
TEXT_BANK_FIELD_MOVES
TEXT_BANK_WIFI_PLAZA_ENTRANCE
TEXT_BANK_POKEDEX_RATINGS
Expand Down
40 changes: 20 additions & 20 deletions generated/vars_flags.txt
Original file line number Diff line number Diff line change
Expand Up @@ -239,9 +239,9 @@ FLAG_OBTAINED_COUPON_1
FLAG_OBTAINED_COUPON_2
FLAG_OBTAINED_COUPON_3
FLAG_TALKED_TO_COUNTERPART_SISTER_WITH_NATIONAL_DEX
FLAG_UNK_0x00F1
FLAG_UNK_0x00F2
FLAG_UNK_0x00F3
FLAG_TALKED_TO_TRAINERS_SCHOOL_RIVAL
FLAG_OBTAINED_FASHION_CASE
FLAG_OBTAINED_POKETCH
FLAG_UNK_0x00F4
FLAG_UNK_0x00F5
FLAG_UNK_0x00F6
Expand Down Expand Up @@ -275,7 +275,7 @@ FLAG_UNK_0x0111
FLAG_UNK_0x0112
FLAG_UNK_0x0113
FLAG_UNK_0x0114
FLAG_UNK_0x0115
FLAG_TALKED_TO_ROUTE_202_COUNTERPART
FLAG_UNK_0x0116
FLAG_UNK_0x0117
FLAG_UNK_0x0118
Expand Down Expand Up @@ -376,24 +376,24 @@ FLAG_HIDE_LAKE_VERITY_LOW_WATER_CYRUS
FLAG_HIDE_SANDGEM_TOWN_COUNTERPART
FLAG_HIDE_ROUTE_201_PROF_ROWAN
FLAG_HIDE_ROUTE_201_COUNTERPART
FLAG_HIDE_JUBILIFE_COUNTERPART
FLAG_HIDE_JUBILIFE_CITY_COUNTERPART
FLAG_UNK_0x017B
FLAG_UNK_0x017C
FLAG_HIDE_ROUTE_201_BRIEFCASE
FLAG_UNK_0x017E
FLAG_UNK_0x017F
FLAG_UNK_0x0180
FLAG_UNK_0x0181
FLAG_HIDE_JUBILIFE_CITY_LOOKER
FLAG_UNK_0x0182
FLAG_UNK_0x0183
FLAG_UNK_0x0184
FLAG_VEILSTONE_STORE_B1F_HIDE_PROF_ROWAN
FLAG_HIDE_CANALAVE_LIBRARY_1F_LUCIAN
FLAG_UNK_0x0187
FLAG_UNK_0x0188
FLAG_HIDE_ROUTE_202_COUNTERPART
FLAG_UNK_0x0189
FLAG_UNK_0x018A
FLAG_UNK_0x018B
FLAG_HIDE_JUBILIFE_CITY_COLLECTOR
FLAG_UNK_0x018C
FLAG_UNK_0x018D
FLAG_UNK_0x018E
Expand Down Expand Up @@ -499,9 +499,9 @@ FLAG_HIDE_TWINLEAF_TOWN_PLAYER_HOUSE_1F_RIVAL_MOM
FLAG_HIDE_TWINLEAF_TOWN_RIVAL_HOUSE_2F_RIVAL
FLAG_UNK_0x01F3
FLAG_UNK_0x01F4
FLAG_UNK_0x01F5
FLAG_UNK_0x01F6
FLAG_UNK_0x01F7
FLAG_HIDE_JUBILIFE_CITY_CLOWNS_1_AND_2
FLAG_HIDE_JUBILIFE_CITY_POKETCH_CO_PRESIDENT
FLAG_HIDE_POKETCH_CO_1F_POKETCH_CO_PRESIDENT
FLAG_UNK_0x01F8
FLAG_UNK_0x01F9
FLAG_UNK_0x01FA
Expand Down Expand Up @@ -566,7 +566,7 @@ FLAG_UNK_0x0234
FLAG_UNK_0x0235
FLAG_UNK_0x0236
FLAG_UNK_0x0237
FLAG_UNK_0x0238
FLAG_HIDE_JUBILIFE_CITY_CLOWN_3
FLAG_UNK_0x0239
FLAG_HIDE_POKEMON_LEAGUE_HALLWAY_TO_HALL_OF_FAME_CYNTHIA
FLAG_HIDE_POKEMON_LEAGUE_HALLWAY_TO_HALL_OF_FAME_PROF_ROWAN
Expand Down Expand Up @@ -1012,7 +1012,7 @@ FLAG_UNK_0x03F2
FLAG_UNK_0x03F3
FLAG_UNK_0x03F4
FLAG_UNK_0x03F5
FLAG_UNK_0x03F6
FLAG_OBTAINED_ROUTE_202_POTION
FLAG_UNK_0x03F7
FLAG_UNK_0x03F8
FLAG_UNK_0x03F9
Expand Down Expand Up @@ -1251,7 +1251,7 @@ FLAG_UNK_0x04E1
FLAG_UNK_0x04E2
FLAG_UNK_0x04E3
FLAG_UNK_0x04E4
FLAG_HIDE_LAKE_VERITY_POKEBALL
FLAG_OBTAINED_LAKE_VERITY_TM38
FLAG_UNK_0x04E6
FLAG_UNK_0x04E7
FLAG_UNK_0x04E8
Expand All @@ -1270,7 +1270,7 @@ FLAG_UNK_0x04F4
FLAG_UNK_0x04F5
FLAG_UNK_0x04F6
FLAG_UNK_0x04F7
FLAG_UNK_0x04F8
FLAG_OBTAINED_JUBILIFE_CITY_POTION
FLAG_UNK_0x04F9
FLAG_UNK_0x04FA
FLAG_UNK_0x04FB
Expand Down Expand Up @@ -4217,8 +4217,8 @@ VAR_UNK_0x4072
VAR_UNK_0x4073
VAR_UNK_0x4074
VAR_UNK_0x4075
VAR_JUBILIFE_LOOKER_PALPAD
VAR_JUBILIFE_STATE
VAR_JUBILIFE_LOOKER_PAL_PAD_STATE
VAR_JUBILIFE_CITY_STATE
VAR_CANALAVE_STATE
VAR_OREBURGH_STATE
VAR_UNK_0x407A
Expand All @@ -4234,7 +4234,7 @@ VAR_UNK_0x4083
VAR_UNK_0x4084
VAR_UNK_0x4085
VAR_FOLLOWER_RIVAL_STATE
VAR_UNK_0x4087
VAR_ROUTE_202_STATE
VAR_UNK_0x4088
VAR_UNK_0x4089
VAR_UNK_0x408A
Expand Down Expand Up @@ -4330,7 +4330,7 @@ VAR_UNK_0x40E3
VAR_FOLLOWER_MARLEY_TIMES_TALKED
VAR_UNK_0x40E5
VAR_TWINLEAF_TOWN_RIVAL_TRIGGER_STATE
VAR_UNK_0x40E7
VAR_POKETCH_CAMPAIGN_STATE
VAR_FOLLOWER_CHERYL_TIMES_TALKED
VAR_UNK_0x40E9
VAR_UNK_0x40EA
Expand All @@ -4339,7 +4339,7 @@ VAR_UNK_0x40EC
VAR_UNK_0x40ED
VAR_UNK_0x40EE
VAR_RIVAL_BEAT_SUNYSHORE_GYM
VAR_GTS_HAS_BADGES_CHECK_TEST
VAR_GTS_ACCESS_STATE
VAR_UNK_0x40F1
VAR_UNK_0x40F2
VAR_PAL_PARK_STATE
Expand Down
1 change: 1 addition & 0 deletions include/script_manager.h
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ enum ScriptContextType {
#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
Expand Down
Loading