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
76 changes: 38 additions & 38 deletions asm/macros/scrcmd.inc
Original file line number Diff line number Diff line change
Expand Up @@ -1066,17 +1066,17 @@
.short 165
.endm

.macro ScrCmd_0A6 arg0, arg1, arg2
.macro DressUpPokemon slot, destVar, arg2
.short 166
.short \arg0
.short \arg1
.short \slot
.short \destVar
.short \arg2
.endm

.macro ScrCmd_0A7 arg0, arg1
.macro ShowDressUpPhoto slot, destVar
.short 167
.short \arg0
.short \arg1
.short \slot
.short \destVar
.endm

.macro ScrCmd_0A8 arg0, arg1
Expand Down Expand Up @@ -1803,10 +1803,10 @@
.short \destVar
.endm

.macro ScrCmd_12E arg0, arg1
.macro DressUpPhotoHasData slot, destVar
.short 302
.short \arg0
.short \arg1
.short \slot
.short \destVar
.endm

.macro ScrCmd_12F arg0, arg1
Expand All @@ -1824,9 +1824,9 @@
.short 305
.endm

.macro ScrCmd_132 arg0
.macro CheckPoketchEnabled destVar
.short 306
.short \arg0
.short \destVar
.endm

.macro RegisterPoketchApp appID
Expand Down Expand Up @@ -2502,9 +2502,9 @@
.short \arg0
.endm

.macro ScrCmd_1B5 arg0
.macro ShowRecordList listIndex
.short 437
.short \arg0
.short \listIndex
.endm

.macro GetTimeOfDay destVarID
Expand Down Expand Up @@ -3463,25 +3463,25 @@
.short 578
.endm

.macro ScrCmd_243 arg0, arg1, arg2
.macro ChooseCustomMessageWord unused, resultVar, destVar
.short 579
.short \arg0
.short \arg1
.short \arg2
.short \unused
.short \resultVar
.short \destVar
.endm

.macro ScrCmd_244 arg0, arg1, arg2, arg3
.macro ChooseTwoCustomMessageWords unused, resultVar, destVar1, destVar2
.short 580
.short \arg0
.short \arg1
.short \arg2
.short \arg3
.short \unused
.short \resultVar
.short \destVar1
.short \destVar2
.endm

.macro ScrCmd_245 arg0, arg1
.macro BufferCustomMessageWord idx, customMessageWord
.short 581
.short \arg0
.short \arg1
.short \idx
.short \customMessageWord
.endm

.macro GetGameVersion destVar
Expand All @@ -3501,13 +3501,13 @@
.short \slot
.endm

.macro ScrCmd_249 arg0, arg1, arg2, arg3, arg4
.macro GetWallpaperFromCustomMessageWords destVar, customMessageWord1, customMessageWord2, customMessageWord3, customMessageWord4
.short 585
.short \arg0
.short \arg1
.short \arg2
.short \arg3
.short \arg4
.short \destVar
.short \customMessageWord1
.short \customMessageWord2
.short \customMessageWord3
.short \customMessageWord4
.endm

.macro GetCapturedFlagCount destFlagCount
Expand Down Expand Up @@ -4082,13 +4082,13 @@
.endif
.endm

.macro ScrCmd_2AA arg0, arg1, arg2, arg3, arg4
.macro CheckIsMysteryGiftPhrase destVar, customMessageWord1, customMessageWord2, customMessageWord3, customMessageWord4
.short 682
.short \arg0
.short \arg1
.short \arg2
.short \arg3
.short \arg4
.short \destVar
.short \customMessageWord1
.short \customMessageWord2
.short \customMessageWord3
.short \customMessageWord4
.endm

.macro ScrCmd_2AB arg0
Expand Down Expand Up @@ -4692,7 +4692,7 @@
.short \arg0
.endm

.macro ScrCmd_316
.macro Dummy316
.short 790
.endm

Expand Down
2 changes: 1 addition & 1 deletion generated/game_records.txt
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ RECORD_UNK_050
RECORD_UNK_051
RECORD_UNK_052
RECORD_UNK_053
RECORD_UNK_054
RECORD_TIMES_DRESSED_UP_POKEMON
RECORD_UNK_055
RECORD_TIMES_STUCK_IN_DEEP_MUD
RECORD_UNK_057
Expand Down
4 changes: 2 additions & 2 deletions generated/object_events_gfx.txt
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,8 @@ OBJ_EVENT_GFX_UNK_107
OBJ_EVENT_GFX_UNK_108
OBJ_EVENT_GFX_UNK_109
OBJ_EVENT_GFX_UNK_110
OBJ_EVENT_GFX_UNK_111
OBJ_EVENT_GFX_UNK_112
OBJ_EVENT_GFX_POKECENTER_DAILY_TRAINER_1
OBJ_EVENT_GFX_POKECENTER_DAILY_TRAINER_2
OBJ_EVENT_GFX_UNK_113
OBJ_EVENT_GFX_UNK_114
OBJ_EVENT_GFX_UNK_115
Expand Down
2 changes: 1 addition & 1 deletion generated/text_banks.txt
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,7 @@ TEXT_BANK_BATTLE_STRINGS
TEXT_BANK_POKEBALL_ITEMS
TEXT_BANK_NPC_TRADE_NAMES
TEXT_BANK_FURNITURE_NAMES
TEXT_BANK_UNK_0372
TEXT_BANK_MYSTERY_GIFT_PHRASE
TEXT_BANK_BLACK_OUT_SCENE
TEXT_BANK_UNK_0374
TEXT_BANK_UNK_0375
Expand Down
30 changes: 15 additions & 15 deletions generated/vars_flags.txt
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ FLAG_UNK_0x007A
FLAG_UNK_0x007B
FLAG_UNK_0x007C
FLAG_OBTAINED_FANTINA_TM65
FLAG_UNK_0x007E
FLAG_OBTAINED_FOCUS_BAND
FLAG_UNK_0x007F
FLAG_UNK_0x0080
FLAG_UNK_0x0081
Expand All @@ -134,7 +134,7 @@ FLAG_OLD_ROD_OBTAINED
FLAG_UNK_0x0085
FLAG_UNK_0x0086
FLAG_TALKED_TO_MOM
FLAG_UNK_0x0088
FLAG_ENTERED_DRESSING_ROOM
FLAG_OBTAINED_ALL_BATTLE_FRONTIER_GOLD_PRINTS
FLAG_UNK_0x008A
FLAG_UNK_0x008B
Expand Down Expand Up @@ -189,7 +189,7 @@ FLAG_UNK_0x00BB
FLAG_UNK_0x00BC
FLAG_UNK_0x00BD
FLAG_UNK_0x00BE
FLAG_UNK_0x00BF
FLAG_OBTAINED_QUICK_CLAW
FLAG_UNK_0x00C0
FLAG_UNK_0x00C1
FLAG_UNK_0x00C2
Expand Down Expand Up @@ -315,7 +315,7 @@ FLAG_UNK_0x0139
FLAG_UNK_0x013A
FLAG_UNK_0x013B
FLAG_UNK_0x013C
FLAG_UNK_0x013D
VAR_OBTAINED_ACCESSORY_STARTER_MASK
FLAG_DEFEATED_COMMANDER_SATURN_VALOR_CAVERN
FLAG_UNK_0x013F
FLAG_UNK_0x0140
Expand Down Expand Up @@ -385,8 +385,8 @@ FLAG_UNK_0x017F
FLAG_UNK_0x0180
FLAG_HIDE_JUBILIFE_CITY_LOOKER
FLAG_UNK_0x0182
FLAG_UNK_0x0183
FLAG_UNK_0x0184
FLAG_HIDE_POKECENTER_DAILY_TRAINER_1
FLAG_HIDE_POKECENTER_DAILY_TRAINER_2
FLAG_VEILSTONE_STORE_B1F_HIDE_PROF_ROWAN
FLAG_HIDE_CANALAVE_LIBRARY_1F_LUCIAN
FLAG_UNK_0x0187
Expand Down Expand Up @@ -520,18 +520,18 @@ FLAG_HIDE_HEARTHOME_ROUTE_209_ROADBLOCK
FLAG_HIDE_HEARTHOME_ROUTE_209_GATE_RIVAL
FLAG_UNK_0x0208
FLAG_UNK_0x0209
FLAG_UNK_0x020A
FLAG_HIDE_MART_MYSTERY_GIFT_DELIVERYMAN
FLAG_UNK_0x020B
FLAG_UNK_0x020C
FLAG_UNK_0x020D
FLAG_UNK_0x020E
FLAG_UNK_0x020F
FLAG_UNK_0x0210
FLAG_UNK_0x0211
FLAG_UNK_0x0212
FLAG_HIDE_POKETCH_CO_1F_REPORTER
FLAG_UNK_0x0213
FLAG_UNK_0x0214
FLAG_UNK_0x0215
FLAG_HIDE_JUBILIFE_TV_2F_REPORTER
FLAG_UNK_0x0216
FLAG_UNK_0x0217
FLAG_UNK_0x0218
Expand Down Expand Up @@ -654,8 +654,8 @@ FLAG_HIDE_LAKE_VERITY_PROF_ROWAN
FLAG_HIDE_LAKE_VERITY_COUNTERPART
FLAG_UNK_0x028E
FLAG_UNK_0x028F
FLAG_UNK_0x0290
FLAG_UNK_0x0291
FLAG_HIDE_JUBILIFE_TV_3F_GLOBAL_RANKING_ROOM_WORKER
FLAG_HIDE_JUBILIFE_TV_3F_GROUP_RANKING_ROOM_WORKER
FLAG_UNK_0x0292
FLAG_UNK_0x0293
FLAG_UNK_0x0294
Expand Down Expand Up @@ -2729,7 +2729,7 @@ FLAG_UNK_0x0AA5
FLAG_UNK_0x0AA6
FLAG_UNK_0x0AA7
FLAG_UNK_0x0AA8
FLAG_UNK_0x0AA9
FLAG_CHECKED_LUCKY_NUMBER
FLAG_UNK_0x0AAA
FLAG_UNK_0x0AAB
FLAG_UNK_0x0AAC
Expand All @@ -2739,7 +2739,7 @@ FLAG_UNK_0x0AAF
FLAG_UNK_0x0AB0
FLAG_UNK_0x0AB1
FLAG_UNK_0x0AB2
FLAG_UNK_0x0AB3
FLAG_OBTAINED_LOTTERY_PRIZE
FLAG_UNK_0x0AB4
FLAG_AMITY_SQUARE_MAN_GIFT_RECEIVED
FLAG_UNK_0x0AB6
Expand Down Expand Up @@ -4341,7 +4341,7 @@ VAR_UNK_0x40EE
VAR_RIVAL_BEAT_SUNYSHORE_GYM
VAR_GTS_ACCESS_STATE
VAR_UNK_0x40F1
VAR_UNK_0x40F2
VAR_LOTTERY_PRIZE_ITEM
VAR_PAL_PARK_STATE
VAR_UNK_0x40F4
VAR_UNK_0x40F5
Expand All @@ -4365,7 +4365,7 @@ VAR_UNK_0x4106
VAR_VEILSTONE_STORE_MASK
VAR_UNK_0x4108
VAR_UNK_0x4109
VAR_UNK_0x410A
VAR_ACCESSORY_STARTER_MASK
VAR_TURNBACK_CAVE_PILLARS_SEEN
VAR_TURNBACK_CAVE_ROOMS_VISITED
VAR_UNK_0x410D
Expand Down
2 changes: 1 addition & 1 deletion include/overlay005/ov5_021F6454.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ BOOL ScrCmd_300(ScriptContext *param0);
BOOL ScrCmd_301(ScriptContext *param0);
BOOL ScrCmd_GetPartyMonForm2(ScriptContext *ctx);
BOOL ScrCmd_30F(ScriptContext *param0);
BOOL ScrCmd_316(ScriptContext *param0);
BOOL ScrCmd_Dummy316(ScriptContext *ctx);
BOOL ScrCmd_32C(ScriptContext *param0);
BOOL ScrCmd_32D(ScriptContext *param0);
BOOL ScrCmd_32E(ScriptContext *param0);
Expand Down
2 changes: 1 addition & 1 deletion res/field/events/events_battle_tower_elevator.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"object_events": [
{
"id": "BATTLE_TOWER_ELEVATOR_UNK_111_0",
"graphics_id": "OBJ_EVENT_GFX_UNK_111",
"graphics_id": "OBJ_EVENT_GFX_POKECENTER_DAILY_TRAINER_1",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
"hidden_flag": "0",
Expand Down
2 changes: 1 addition & 1 deletion res/field/events/events_canalave_city_mart.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
"graphics_id": "OBJ_EVENT_GFX_MYSTERY_GIFT_DELIVERYMAN",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
"hidden_flag": "FLAG_UNK_0x020A",
"hidden_flag": "FLAG_HIDE_MART_MYSTERY_GIFT_DELIVERYMAN",
"script": 10201,
"initial_dir": 1,
"data": [],
Expand Down
8 changes: 4 additions & 4 deletions res/field/events/events_canalave_city_pokecenter_1f.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,10 @@
},
{
"id": "CANALAVE_CITY_POKECENTER_1F_UNK_111_3",
"graphics_id": "OBJ_EVENT_GFX_UNK_111",
"graphics_id": "OBJ_EVENT_GFX_POKECENTER_DAILY_TRAINER_1",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
"hidden_flag": "FLAG_UNK_0x0183",
"hidden_flag": "FLAG_HIDE_POKECENTER_DAILY_TRAINER_1",
"script": 10401,
"initial_dir": 1,
"data": [],
Expand All @@ -63,10 +63,10 @@
},
{
"id": "CANALAVE_CITY_POKECENTER_1F_UNK_112_4",
"graphics_id": "OBJ_EVENT_GFX_UNK_112",
"graphics_id": "OBJ_EVENT_GFX_POKECENTER_DAILY_TRAINER_2",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
"hidden_flag": "FLAG_UNK_0x0184",
"hidden_flag": "FLAG_HIDE_POKECENTER_DAILY_TRAINER_2",
"script": 10402,
"initial_dir": 1,
"data": [],
Expand Down
8 changes: 4 additions & 4 deletions res/field/events/events_celestic_town_pokecenter_1f.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,10 @@
},
{
"id": "CELESTIC_TOWN_POKECENTER_1F_UNK_111_4",
"graphics_id": "OBJ_EVENT_GFX_UNK_111",
"graphics_id": "OBJ_EVENT_GFX_POKECENTER_DAILY_TRAINER_1",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
"hidden_flag": "FLAG_UNK_0x0183",
"hidden_flag": "FLAG_HIDE_POKECENTER_DAILY_TRAINER_1",
"script": 10401,
"initial_dir": 1,
"data": [],
Expand All @@ -78,10 +78,10 @@
},
{
"id": "CELESTIC_TOWN_POKECENTER_1F_UNK_112_5",
"graphics_id": "OBJ_EVENT_GFX_UNK_112",
"graphics_id": "OBJ_EVENT_GFX_POKECENTER_DAILY_TRAINER_2",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
"hidden_flag": "FLAG_UNK_0x0184",
"hidden_flag": "FLAG_HIDE_POKECENTER_DAILY_TRAINER_2",
"script": 10402,
"initial_dir": 1,
"data": [],
Expand Down
2 changes: 1 addition & 1 deletion res/field/events/events_eterna_city_mart.json
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
"graphics_id": "OBJ_EVENT_GFX_MYSTERY_GIFT_DELIVERYMAN",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
"hidden_flag": "FLAG_UNK_0x020A",
"hidden_flag": "FLAG_HIDE_MART_MYSTERY_GIFT_DELIVERYMAN",
"script": 10201,
"initial_dir": 1,
"data": [],
Expand Down
Loading