From f7ed98d3f6a8c3ef2771dfa3149b6cc836260b87 Mon Sep 17 00:00:00 2001 From: Viperio <146665252+Viperio19@users.noreply.github.com> Date: Sun, 3 May 2026 21:34:21 +0200 Subject: [PATCH] Document unused battle park scripts (#1124) --- asm/macros/scrcmd.inc | 38 +-- generated/map_headers.txt | 6 +- generated/mart_frontier_id.txt | 4 +- generated/text_banks.txt | 6 +- generated/vars_flags.txt | 6 +- include/data/map_headers.h | 30 +- include/data/scripts/scrcmd.h | 10 +- include/unk_020494DC.h | 10 +- ...rk.json => events_unused_battle_park.json} | 40 +-- ..._battle_park_exchange_service_corner.json} | 22 +- ...nused_battle_park_gate_to_fight_area.json} | 14 +- res/field/events/meson.build | 6 +- res/field/events/zone_event.order | 6 +- res/field/scripts/meson.build | 12 +- res/field/scripts/scripts.order | 12 +- res/field/scripts/scripts_battle_frontier.s | 4 +- res/field/scripts/scripts_battle_park.s | 256 ----------------- ...ipts_battle_park_exchange_service_corner.s | 141 ---------- .../scripts_battle_park_gate_to_fight_area.s | 32 --- res/field/scripts/scripts_init_new_game.s | 4 +- ...rk.s => scripts_init_unused_battle_park.s} | 0 ...sed_battle_park_exchange_service_corner.s} | 0 ...t_unused_battle_park_gate_to_fight_area.s} | 0 res/field/scripts/scripts_scratch_off_cards.s | 4 +- .../scripts/scripts_unused_battle_park.s | 257 ++++++++++++++++++ ...used_battle_park_exchange_service_corner.s | 142 ++++++++++ ...ts_unused_battle_park_gate_to_fight_area.s | 32 +++ res/text/battle_park_gate_to_fight_area.json | 121 --------- res/text/menu_entries.json | 4 +- ...ttle_park.json => unused_battle_park.json} | 34 +-- ..._battle_park_exchange_service_corner.json} | 32 +-- ...unused_battle_park_gate_to_fight_area.json | 121 +++++++++ src/unk_020494DC.c | 169 ++++++------ 33 files changed, 790 insertions(+), 785 deletions(-) rename res/field/events/{events_battle_park.json => events_unused_battle_park.json} (85%) rename res/field/events/{events_battle_park_exchange_service_corner.json => events_unused_battle_park_exchange_service_corner.json} (85%) rename res/field/events/{events_battle_park_gate_to_fight_area.json => events_unused_battle_park_gate_to_fight_area.json} (86%) delete mode 100644 res/field/scripts/scripts_battle_park.s delete mode 100644 res/field/scripts/scripts_battle_park_exchange_service_corner.s delete mode 100644 res/field/scripts/scripts_battle_park_gate_to_fight_area.s rename res/field/scripts/{scripts_init_battle_park.s => scripts_init_unused_battle_park.s} (100%) rename res/field/scripts/{scripts_init_battle_park_exchange_service_corner.s => scripts_init_unused_battle_park_exchange_service_corner.s} (100%) rename res/field/scripts/{scripts_init_battle_park_gate_to_fight_area.s => scripts_init_unused_battle_park_gate_to_fight_area.s} (100%) create mode 100644 res/field/scripts/scripts_unused_battle_park.s create mode 100644 res/field/scripts/scripts_unused_battle_park_exchange_service_corner.s create mode 100644 res/field/scripts/scripts_unused_battle_park_gate_to_fight_area.s delete mode 100644 res/text/battle_park_gate_to_fight_area.json rename res/text/{battle_park.json => unused_battle_park.json} (79%) rename res/text/{battle_park_exchange_service_corner.json => unused_battle_park_exchange_service_corner.json} (69%) create mode 100644 res/text/unused_battle_park_gate_to_fight_area.json diff --git a/asm/macros/scrcmd.inc b/asm/macros/scrcmd.inc index 58d9cfb0ab..f020cc217e 100644 --- a/asm/macros/scrcmd.inc +++ b/asm/macros/scrcmd.inc @@ -3962,33 +3962,33 @@ .short SCRCMD_UPDATEBPDISPLAY .endm - .macro ScrCmd_297 arg0 - .short SCRCMD_297 - .short \arg0 + .macro GetBattlePoints destVar + .short SCRCMD_GETBATTLEPOINTS + .short \destVar .endm - .macro ScrCmd_298 arg0 - .short SCRCMD_298 - .short \arg0 + .macro GiveBattlePoints value + .short SCRCMD_GIVEBATTLEPOINTS + .short \value .endm - .macro ScrCmd_299 arg0 - .short SCRCMD_299 - .short \arg0 + .macro RemoveBattlePoints value + .short SCRCMD_REMOVEBATTLEPOINTS + .short \value .endm - .macro ScrCmd_29A arg0, arg1 - .short SCRCMD_29A - .short \arg0 - .short \arg1 + .macro CheckBattlePoints value, destVar + .short SCRCMD_CHECKBATTLEPOINTS + .short \value + .short \destVar .endm - .macro ScrCmd_29B arg0, arg1, arg2, arg3 - .short SCRCMD_29B - .short \arg0 - .short \arg1 - .short \arg2 - .short \arg3 + .macro GetExchangeServiceCornerItemAndCost martID, prizeID, item, cost + .short SCRCMD_GetExchangeServiceCornerItemAndCost + .short \martID + .short \prizeID + .short \item + .short \cost .endm .macro CalculateTrainerInfoAppearance variant, destVar diff --git a/generated/map_headers.txt b/generated/map_headers.txt index 8b77c9cd4b..3fe16a799d 100644 --- a/generated/map_headers.txt +++ b/generated/map_headers.txt @@ -190,7 +190,7 @@ MAP_HEADER_FIGHT_AREA MAP_HEADER_FIGHT_AREA_POKECENTER_1F MAP_HEADER_FIGHT_AREA_POKECENTER_2F MAP_HEADER_FIGHT_AREA_MART -MAP_HEADER_BATTLE_PARK_GATE_TO_FIGHT_AREA +MAP_HEADER_UNUSED_BATTLE_PARK_GATE_TO_FIGHT_AREA MAP_HEADER_ROUTE_225_GATE_TO_FIGHT_AREA MAP_HEADER_FIGHT_AREA_MIDDLE_HOUSE MAP_HEADER_FIGHT_AREA_SOUTH_HOUSE @@ -320,8 +320,8 @@ MAP_HEADER_LAKE_ACUITY MAP_HEADER_ACUITY_CAVERN MAP_HEADER_NEWMOON_ISLAND MAP_HEADER_NEWMOON_ISLAND_FOREST -MAP_HEADER_BATTLE_PARK -MAP_HEADER_BATTLE_PARK_EXCHANGE_SERVICE_CORNER +MAP_HEADER_UNUSED_BATTLE_PARK +MAP_HEADER_UNUSED_BATTLE_PARK_EXCHANGE_SERVICE_CORNER MAP_HEADER_UNKNOWN_324 MAP_HEADER_UNKNOWN_325 MAP_HEADER_BATTLE_TOWER diff --git a/generated/mart_frontier_id.txt b/generated/mart_frontier_id.txt index 23dd30f49c..4c1aed6f81 100644 --- a/generated/mart_frontier_id.txt +++ b/generated/mart_frontier_id.txt @@ -1,2 +1,2 @@ -MART_FRONTIER_ID_EXCHANGE_SERVICE_CORNER_UP -MART_FRONTIER_ID_EXCHANGE_SERVICE_CORNER_DOWN +MART_FRONTIER_ID_EXCHANGE_SERVICE_CORNER_RIGHT +MART_FRONTIER_ID_EXCHANGE_SERVICE_CORNER_LEFT diff --git a/generated/text_banks.txt b/generated/text_banks.txt index c7cdf8a5cd..643a7bb1f2 100644 --- a/generated/text_banks.txt +++ b/generated/text_banks.txt @@ -193,7 +193,7 @@ TEXT_BANK_POKEMON_LEAGUE_HALL_OF_FAME TEXT_BANK_FIGHT_AREA TEXT_BANK_FIGHT_AREA_MART TEXT_BANK_FIGHT_AREA_POKECENTER_1F -TEXT_BANK_BATTLE_PARK_GATE_TO_FIGHT_AREA +TEXT_BANK_UNUSED_BATTLE_PARK_GATE_TO_FIGHT_AREA TEXT_BANK_ROUTE_225_GATE_TO_FIGHT_AREA TEXT_BANK_FIGHT_AREA_MIDDLE_HOUSE TEXT_BANK_FIGHT_AREA_SOUTH_HOUSE @@ -300,8 +300,8 @@ TEXT_BANK_LAKE_ACUITY TEXT_BANK_ACUITY_CAVERN TEXT_BANK_NEWMOON_ISLAND TEXT_BANK_NEWMOON_ISLAND_FOREST -TEXT_BANK_BATTLE_PARK -TEXT_BANK_BATTLE_PARK_EXCHANGE_SERVICE_CORNER +TEXT_BANK_UNUSED_BATTLE_PARK +TEXT_BANK_UNUSED_BATTLE_PARK_EXCHANGE_SERVICE_CORNER TEXT_BANK_BATTLE_TOWER TEXT_BANK_BATTLE_TOWER_BATTLE_ROOM TEXT_BANK_BATTLE_TOWER_MULTI_BATTLE_ROOM diff --git a/generated/vars_flags.txt b/generated/vars_flags.txt index 4d429cb562..407add951f 100644 --- a/generated/vars_flags.txt +++ b/generated/vars_flags.txt @@ -628,8 +628,8 @@ FLAG_HIDE_ROUTE_215_JOGGER_SCOTT_NO_BATTLE FLAG_HIDE_ROUTE_215_JOGGER_SCOTT FLAG_HIDE_ROUTE_215_JOGGER_CRAIG_NO_BATTLE FLAG_HIDE_ROUTE_215_JOGGER_CRAIG -FLAG_UNK_0x0276 -FLAG_UNK_0x0277 +FLAG_HIDE_BATTLE_PARK_PALMER +FLAG_HIDE_BATTLE_PARK_RIVAL FLAG_HIDE_TURNBACK_CAVE_GIRATINA_ROOM_ITEM FLAG_HIDE_NEWMOON_ISLAND_SAILOR FLAG_HIDE_SNOWPOINT_CITY_SAILOR_SS_SPIRAL @@ -4369,7 +4369,7 @@ VAR_ACCESSORY_STARTER_MASK VAR_TURNBACK_CAVE_PILLARS_SEEN VAR_TURNBACK_CAVE_ROOMS_VISITED FLAG_GALACTIC_HQ_CONTROL_ROOM_STATE -VAR_UNK_0x410E +VAR_BATTLE_PARK_STATE VAR_PLAYER_HOUSE_POSTGAME_STATE VAR_OLD_CHATEAU_DINING_AREA_OLD_MAN_STATE VAR_OLD_CHATEAU_BACK_MIDDLE_EAST_ROOM_TWIN_STATE diff --git a/include/data/map_headers.h b/include/data/map_headers.h index f9981d822d..99ef68a801 100644 --- a/include/data/map_headers.h +++ b/include/data/map_headers.h @@ -4255,17 +4255,17 @@ static const MapHeader sMapHeaders[] = { .isEscapeRopeAllowed = FALSE, .isFlyAllowed = FALSE, }, - [MAP_HEADER_BATTLE_PARK_GATE_TO_FIGHT_AREA] = { + [MAP_HEADER_UNUSED_BATTLE_PARK_GATE_TO_FIGHT_AREA] = { .areaDataArchiveID = area_data_044, .unk_01 = 0xF, .mapMatrixID = map_matrix_250, - .scriptsArchiveID = scripts_battle_park_gate_to_fight_area, - .initScriptsArchiveID = scripts_init_battle_park_gate_to_fight_area, - .msgArchiveID = TEXT_BANK_BATTLE_PARK_GATE_TO_FIGHT_AREA, + .scriptsArchiveID = scripts_unused_battle_park_gate_to_fight_area, + .initScriptsArchiveID = scripts_init_unused_battle_park_gate_to_fight_area, + .msgArchiveID = TEXT_BANK_UNUSED_BATTLE_PARK_GATE_TO_FIGHT_AREA, .dayMusicID = SEQ_CITY11_D, .nightMusicID = SEQ_CITY11_N, .wildEncountersArchiveID = ENCOUNTERS_NONE, - .eventsArchiveID = events_battle_park_gate_to_fight_area, + .eventsArchiveID = events_unused_battle_park_gate_to_fight_area, .mapLabelTextID = LocationNames_Text_BattlePark, .mapLabelWindowID = MAP_LABEL_WINDOW_WATER, .weather = OVERWORLD_WEATHER_CLEAR, @@ -7115,17 +7115,17 @@ static const MapHeader sMapHeaders[] = { .isEscapeRopeAllowed = FALSE, .isFlyAllowed = FALSE, }, - [MAP_HEADER_BATTLE_PARK] = { + [MAP_HEADER_UNUSED_BATTLE_PARK] = { .areaDataArchiveID = area_data_064, .unk_01 = 0xF, .mapMatrixID = map_matrix_229, - .scriptsArchiveID = scripts_battle_park, - .initScriptsArchiveID = scripts_init_battle_park, - .msgArchiveID = TEXT_BANK_BATTLE_PARK, + .scriptsArchiveID = scripts_unused_battle_park, + .initScriptsArchiveID = scripts_init_unused_battle_park, + .msgArchiveID = TEXT_BANK_UNUSED_BATTLE_PARK, .dayMusicID = SEQ_CITY11_D, .nightMusicID = SEQ_CITY11_N, .wildEncountersArchiveID = ENCOUNTERS_NONE, - .eventsArchiveID = events_battle_park, + .eventsArchiveID = events_unused_battle_park, .mapLabelTextID = LocationNames_Text_BattlePark, .mapLabelWindowID = MAP_LABEL_WINDOW_PARK, .weather = OVERWORLD_WEATHER_CLEAR, @@ -7137,17 +7137,17 @@ static const MapHeader sMapHeaders[] = { .isEscapeRopeAllowed = FALSE, .isFlyAllowed = TRUE, }, - [MAP_HEADER_BATTLE_PARK_EXCHANGE_SERVICE_CORNER] = { + [MAP_HEADER_UNUSED_BATTLE_PARK_EXCHANGE_SERVICE_CORNER] = { .areaDataArchiveID = area_data_041, .unk_01 = 0xF, .mapMatrixID = map_matrix_231, - .scriptsArchiveID = scripts_battle_park_exchange_service_corner, - .initScriptsArchiveID = scripts_init_battle_park_exchange_service_corner, - .msgArchiveID = TEXT_BANK_BATTLE_PARK_EXCHANGE_SERVICE_CORNER, + .scriptsArchiveID = scripts_unused_battle_park_exchange_service_corner, + .initScriptsArchiveID = scripts_init_unused_battle_park_exchange_service_corner, + .msgArchiveID = TEXT_BANK_UNUSED_BATTLE_PARK_EXCHANGE_SERVICE_CORNER, .dayMusicID = SEQ_CITY11_D, .nightMusicID = SEQ_CITY11_N, .wildEncountersArchiveID = ENCOUNTERS_NONE, - .eventsArchiveID = events_battle_park_exchange_service_corner, + .eventsArchiveID = events_unused_battle_park_exchange_service_corner, .mapLabelTextID = LocationNames_Text_BattlePark, .mapLabelWindowID = MAP_LABEL_WINDOW_WATER, .weather = OVERWORLD_WEATHER_CLEAR, diff --git a/include/data/scripts/scrcmd.h b/include/data/scripts/scrcmd.h index fd301551d3..988aef33d1 100644 --- a/include/data/scripts/scrcmd.h +++ b/include/data/scripts/scrcmd.h @@ -668,11 +668,11 @@ ScriptCommand(SCRCMD_GETUNDERGROUNDTALKCOUNTER, ScrCm ScriptCommand(SCRCMD_SHOWBATTLEPOINTS, ScrCmd_ShowBattlePoints) ScriptCommand(SCRCMD_HIDEBATTLEPOINTS, ScrCmd_HideBattlePoints) ScriptCommand(SCRCMD_UPDATEBPDISPLAY, ScrCmd_UpdateBPDisplay) -ScriptCommand(SCRCMD_297, ScrCmd_297) -ScriptCommand(SCRCMD_298, ScrCmd_298) -ScriptCommand(SCRCMD_299, ScrCmd_299) -ScriptCommand(SCRCMD_29A, ScrCmd_29A) -ScriptCommand(SCRCMD_29B, ScrCmd_29B) +ScriptCommand(SCRCMD_GETBATTLEPOINTS, ScrCmd_GetBattlePoints) +ScriptCommand(SCRCMD_GIVEBATTLEPOINTS, ScrCmd_GiveBattlePoints) +ScriptCommand(SCRCMD_REMOVEBATTLEPOINTS, ScrCmd_RemoveBattlePoints) +ScriptCommand(SCRCMD_CHECKBATTLEPOINTS, ScrCmd_CheckBattlePoints) +ScriptCommand(SCRCMD_GetExchangeServiceCornerItemAndCost, ScrCmd_GetExchangeServiceCornerItemAndCost) ScriptCommand(SCRCMD_CALCULATETRAINERINFOAPPEARANCE, ScrCmd_CalculateTrainerInfoAppearance) ScriptCommand(SCRCMD_ADDMENUENTRY, ScrCmd_AddMenuEntry) ScriptCommand(SCRCMD_29E, ScrCmd_29E) diff --git a/include/unk_020494DC.h b/include/unk_020494DC.h index d71cf26531..92259d14e7 100644 --- a/include/unk_020494DC.h +++ b/include/unk_020494DC.h @@ -17,10 +17,10 @@ BOOL ScrCmd_1E4(ScriptContext *ctx); BOOL ScrCmd_ShowBattlePoints(ScriptContext *ctx); BOOL ScrCmd_HideBattlePoints(ScriptContext *ctx); BOOL ScrCmd_UpdateBPDisplay(ScriptContext *ctx); -BOOL ScrCmd_297(ScriptContext *ctx); -BOOL ScrCmd_298(ScriptContext *ctx); -BOOL ScrCmd_299(ScriptContext *ctx); -BOOL ScrCmd_29A(ScriptContext *ctx); -BOOL ScrCmd_29B(ScriptContext *ctx); +BOOL ScrCmd_GetBattlePoints(ScriptContext *ctx); +BOOL ScrCmd_GiveBattlePoints(ScriptContext *ctx); +BOOL ScrCmd_RemoveBattlePoints(ScriptContext *ctx); +BOOL ScrCmd_CheckBattlePoints(ScriptContext *ctx); +BOOL ScrCmd_GetExchangeServiceCornerItemAndCost(ScriptContext *ctx); #endif // POKEPLATINUM_UNK_020494DC_H diff --git a/res/field/events/events_battle_park.json b/res/field/events/events_unused_battle_park.json similarity index 85% rename from res/field/events/events_battle_park.json rename to res/field/events/events_unused_battle_park.json index f7147eac04..774c71e4c1 100644 --- a/res/field/events/events_battle_park.json +++ b/res/field/events/events_unused_battle_park.json @@ -2,7 +2,7 @@ "bg_events": [], "object_events": [ { - "id": "BATTLE_PARK_POKEFAN_M_0", + "id": "LOCALID_POKEFAN_M", "graphics_id": "OBJ_EVENT_GFX_POKEFAN_M", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -17,7 +17,7 @@ "y": 0 }, { - "id": "BATTLE_PARK_SIGNBOARD_1", + "id": "LOCALID_SIGNBOARD_EXCHANGE_SERVICE_CORNER_1", "graphics_id": "OBJ_EVENT_GFX_SIGNBOARD", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -32,7 +32,7 @@ "y": 0 }, { - "id": "BATTLE_PARK_BABY_IN_PRAM_2", + "id": "LOCALID_BABY_IN_PRAM", "graphics_id": "OBJ_EVENT_GFX_BABY_IN_PRAM", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -47,7 +47,7 @@ "y": 0 }, { - "id": "BATTLE_PARK_SIGNBOARD_3", + "id": "LOCALID_SIGNBOARD_BATTLE_TOWER", "graphics_id": "OBJ_EVENT_GFX_SIGNBOARD", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -62,7 +62,7 @@ "y": 0 }, { - "id": "BATTLE_PARK_BEAUTY_4", + "id": "LOCALID_BEAUTY", "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -77,7 +77,7 @@ "y": 0 }, { - "id": "BATTLE_PARK_EXPERT_F_5", + "id": "LOCALID_EXPERT_F", "graphics_id": "OBJ_EVENT_GFX_EXPERT_F", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -92,7 +92,7 @@ "y": 0 }, { - "id": "BATTLE_PARK_SCHOOL_KID_M_6", + "id": "LOCALID_SCHOOL_KID_M", "graphics_id": "OBJ_EVENT_GFX_SCHOOL_KID_M", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -107,7 +107,7 @@ "y": 0 }, { - "id": "BATTLE_PARK_MIDDLE_AGED_MAN_7", + "id": "LOCALID_MIDDLE_AGED_MAN", "graphics_id": "OBJ_EVENT_GFX_MIDDLE_AGED_MAN", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -122,7 +122,7 @@ "y": 0 }, { - "id": "BATTLE_PARK_BLACK_BELT_8", + "id": "LOCALID_BLACK_BELT", "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -137,7 +137,7 @@ "y": 0 }, { - "id": "BATTLE_PARK_ACE_TRAINER_M_9", + "id": "LOCALID_ACE_TRAINER_M", "graphics_id": "OBJ_EVENT_GFX_ACE_TRAINER_M", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -167,11 +167,11 @@ "y": 0 }, { - "id": "BATTLE_PARK_PALMER_11", + "id": "LOCALID_PALMER", "graphics_id": "OBJ_EVENT_GFX_PALMER", "movement_type": "MOVEMENT_TYPE_LOOK_NORTH", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x0276", + "hidden_flag": "FLAG_HIDE_BATTLE_PARK_PALMER", "script": 0, "initial_dir": 0, "data": [], @@ -182,11 +182,11 @@ "y": 0 }, { - "id": "BATTLE_PARK_RIVAL_12", + "id": "LOCALID_RIVAL", "graphics_id": "OBJ_EVENT_GFX_BARRY", "movement_type": "MOVEMENT_TYPE_LOOK_NORTH", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x0277", + "hidden_flag": "FLAG_HIDE_BATTLE_PARK_RIVAL", "script": 0, "initial_dir": 0, "data": [], @@ -197,7 +197,7 @@ "y": 0 }, { - "id": "BATTLE_PARK_SIGNBOARD_13", + "id": "LOCALID_SIGNBOARD_EXCHANGE_SERVICE_CORNER_2", "graphics_id": "OBJ_EVENT_GFX_SIGNBOARD", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -216,25 +216,25 @@ { "x": 20, "z": 33, - "dest_header_id": "MAP_HEADER_BATTLE_PARK_EXCHANGE_SERVICE_CORNER", + "dest_header_id": "MAP_HEADER_UNUSED_BATTLE_PARK_EXCHANGE_SERVICE_CORNER", "dest_warp_id": 0 }, { "x": 29, "z": 33, - "dest_header_id": "MAP_HEADER_BATTLE_PARK_EXCHANGE_SERVICE_CORNER", + "dest_header_id": "MAP_HEADER_UNUSED_BATTLE_PARK_EXCHANGE_SERVICE_CORNER", "dest_warp_id": 1 }, { "x": 24, "z": 53, - "dest_header_id": "MAP_HEADER_BATTLE_PARK_GATE_TO_FIGHT_AREA", + "dest_header_id": "MAP_HEADER_UNUSED_BATTLE_PARK_GATE_TO_FIGHT_AREA", "dest_warp_id": 0 }, { "x": 25, "z": 53, - "dest_header_id": "MAP_HEADER_BATTLE_PARK_GATE_TO_FIGHT_AREA", + "dest_header_id": "MAP_HEADER_UNUSED_BATTLE_PARK_GATE_TO_FIGHT_AREA", "dest_warp_id": 0 } ], @@ -246,7 +246,7 @@ "y": 0, "width": 4, "length": 1, - "var": "VAR_UNK_0x410E", + "var": "VAR_BATTLE_PARK_STATE", "value": 0 } ] diff --git a/res/field/events/events_battle_park_exchange_service_corner.json b/res/field/events/events_unused_battle_park_exchange_service_corner.json similarity index 85% rename from res/field/events/events_battle_park_exchange_service_corner.json rename to res/field/events/events_unused_battle_park_exchange_service_corner.json index 214101cdbe..a52933ebd1 100644 --- a/res/field/events/events_battle_park_exchange_service_corner.json +++ b/res/field/events/events_unused_battle_park_exchange_service_corner.json @@ -2,7 +2,7 @@ "bg_events": [], "object_events": [ { - "id": "BATTLE_PARK_EXCHANGE_SERVICE_CORNER_MAID_0", + "id": "LOCALID_MAID_NORTH", "graphics_id": "OBJ_EVENT_GFX_MAID", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -17,7 +17,7 @@ "y": 0 }, { - "id": "BATTLE_PARK_EXCHANGE_SERVICE_CORNER_MAID_1", + "id": "LOCALID_MAID_SOUTH", "graphics_id": "OBJ_EVENT_GFX_MAID", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -32,7 +32,7 @@ "y": 0 }, { - "id": "BATTLE_PARK_EXCHANGE_SERVICE_CORNER_TWIN_2", + "id": "LOCALID_TWIN", "graphics_id": "OBJ_EVENT_GFX_TWIN", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -47,7 +47,7 @@ "y": 0 }, { - "id": "BATTLE_PARK_EXCHANGE_SERVICE_CORNER_EXPERT_F_3", + "id": "LOCALID_EXPERT_F", "graphics_id": "OBJ_EVENT_GFX_EXPERT_F", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -62,7 +62,7 @@ "y": 0 }, { - "id": "BATTLE_PARK_EXCHANGE_SERVICE_CORNER_GENTLEMAN_4", + "id": "LOCALID_GENTLEMAN", "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -77,7 +77,7 @@ "y": 0 }, { - "id": "BATTLE_PARK_EXCHANGE_SERVICE_CORNER_SOCIALITE_5", + "id": "LOCALID_SOCIALITE", "graphics_id": "OBJ_EVENT_GFX_SOCIALITE", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -92,7 +92,7 @@ "y": 0 }, { - "id": "BATTLE_PARK_EXCHANGE_SERVICE_CORNER_CLOWN_6", + "id": "LOCALID_CLOWN", "graphics_id": "OBJ_EVENT_GFX_CLOWN", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -107,7 +107,7 @@ "y": 0 }, { - "id": "BATTLE_PARK_EXCHANGE_SERVICE_CORNER_COWGIRL_7", + "id": "LOCALID_COWGIRL", "graphics_id": "OBJ_EVENT_GFX_COWGIRL", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -122,7 +122,7 @@ "y": 0 }, { - "id": "BATTLE_PARK_EXCHANGE_SERVICE_CORNER_ROUGHNECK_8", + "id": "LOCALID_ROUGHNECK", "graphics_id": "OBJ_EVENT_GFX_ROUGHNECK", "movement_type": "MOVEMENT_TYPE_LOOK_NORTH_SOUTH_AND_WEST", "trainer_type": "TRAINER_TYPE_NONE", @@ -141,13 +141,13 @@ { "x": 5, "z": 17, - "dest_header_id": "MAP_HEADER_BATTLE_PARK", + "dest_header_id": "MAP_HEADER_UNUSED_BATTLE_PARK", "dest_warp_id": 0 }, { "x": 21, "z": 17, - "dest_header_id": "MAP_HEADER_BATTLE_PARK", + "dest_header_id": "MAP_HEADER_UNUSED_BATTLE_PARK", "dest_warp_id": 1 } ], diff --git a/res/field/events/events_battle_park_gate_to_fight_area.json b/res/field/events/events_unused_battle_park_gate_to_fight_area.json similarity index 86% rename from res/field/events/events_battle_park_gate_to_fight_area.json rename to res/field/events/events_unused_battle_park_gate_to_fight_area.json index c740405b63..931b251646 100644 --- a/res/field/events/events_battle_park_gate_to_fight_area.json +++ b/res/field/events/events_unused_battle_park_gate_to_fight_area.json @@ -2,7 +2,7 @@ "bg_events": [], "object_events": [ { - "id": "BATTLE_PARK_GATE_TO_FIGHT_AREA_MAID_0", + "id": "LOCALID_MAID_1", "graphics_id": "OBJ_EVENT_GFX_MAID", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -17,7 +17,7 @@ "y": 0 }, { - "id": "BATTLE_PARK_GATE_TO_FIGHT_AREA_MAID_1", + "id": "LOCALID_MAID_2", "graphics_id": "OBJ_EVENT_GFX_MAID", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -32,7 +32,7 @@ "y": 0 }, { - "id": "BATTLE_PARK_GATE_TO_FIGHT_AREA_MAID_2", + "id": "LOCALID_MAID_3", "graphics_id": "OBJ_EVENT_GFX_MAID", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -47,7 +47,7 @@ "y": 0 }, { - "id": "BATTLE_PARK_GATE_TO_FIGHT_AREA_MAID_3", + "id": "LOCALID_MAID_4", "graphics_id": "OBJ_EVENT_GFX_MAID", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -62,7 +62,7 @@ "y": 0 }, { - "id": "BATTLE_PARK_GATE_TO_FIGHT_AREA_COLLECTOR_4", + "id": "LOCALID_COLLECTOR", "graphics_id": "OBJ_EVENT_GFX_COLLECTOR", "movement_type": "MOVEMENT_TYPE_LOOK_NORTH_AND_WEST", "trainer_type": "TRAINER_TYPE_NONE", @@ -77,7 +77,7 @@ "y": 0 }, { - "id": "BATTLE_PARK_GATE_TO_FIGHT_AREA_MAID_5", + "id": "LOCALID_MAID_5", "graphics_id": "OBJ_EVENT_GFX_MAID", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -96,7 +96,7 @@ { "x": 5, "z": 2, - "dest_header_id": "MAP_HEADER_BATTLE_PARK", + "dest_header_id": "MAP_HEADER_UNUSED_BATTLE_PARK", "dest_warp_id": 2 } ], diff --git a/res/field/events/meson.build b/res/field/events/meson.build index ad2ec41b53..e89b09e152 100644 --- a/res/field/events/meson.build +++ b/res/field/events/meson.build @@ -197,7 +197,7 @@ events_files = files( 'events_fight_area_pokecenter_1f.json', 'events_fight_area_pokecenter_2f.json', 'events_fight_area_mart.json', - 'events_battle_park_gate_to_fight_area.json', + 'events_unused_battle_park_gate_to_fight_area.json', 'events_route_225_gate_to_fight_area.json', 'events_fight_area_middle_house.json', 'events_fight_area_south_house.json', @@ -316,8 +316,8 @@ events_files = files( 'events_acuity_cavern.json', 'events_newmoon_island.json', 'events_newmoon_island_forest.json', - 'events_battle_park.json', - 'events_battle_park_exchange_service_corner.json', + 'events_unused_battle_park.json', + 'events_unused_battle_park_exchange_service_corner.json', 'events_battle_tower.json', 'events_battle_tower_elevator.json', 'events_battle_tower_corridor.json', diff --git a/res/field/events/zone_event.order b/res/field/events/zone_event.order index 7337a958f7..5942cecff7 100644 --- a/res/field/events/zone_event.order +++ b/res/field/events/zone_event.order @@ -189,7 +189,7 @@ events_fight_area events_fight_area_pokecenter_1f events_fight_area_pokecenter_2f events_fight_area_mart -events_battle_park_gate_to_fight_area +events_unused_battle_park_gate_to_fight_area events_route_225_gate_to_fight_area events_fight_area_middle_house events_fight_area_south_house @@ -308,8 +308,8 @@ events_lake_acuity events_acuity_cavern events_newmoon_island events_newmoon_island_forest -events_battle_park -events_battle_park_exchange_service_corner +events_unused_battle_park +events_unused_battle_park_exchange_service_corner events_battle_tower events_battle_tower_elevator events_battle_tower_corridor diff --git a/res/field/scripts/meson.build b/res/field/scripts/meson.build index f5f3fad83b..a654687237 100644 --- a/res/field/scripts/meson.build +++ b/res/field/scripts/meson.build @@ -239,7 +239,7 @@ scr_seq_files = files( 'scripts_fight_area_pokecenter_1f.s', 'scripts_fight_area_pokecenter_2f.s', 'scripts_fight_area_pokecenter_b1f.s', - 'scripts_battle_park_gate_to_fight_area.s', + 'scripts_unused_battle_park_gate_to_fight_area.s', 'scripts_route_225_gate_to_fight_area.s', 'scripts_fight_area_middle_house.s', 'scripts_fight_area_south_house.s', @@ -397,8 +397,8 @@ scr_seq_files = files( 'scripts_acuity_cavern.s', 'scripts_newmoon_island.s', 'scripts_newmoon_island_forest.s', - 'scripts_battle_park.s', - 'scripts_battle_park_exchange_service_corner.s', + 'scripts_unused_battle_park.s', + 'scripts_unused_battle_park_exchange_service_corner.s', 'scripts_unk_0366.s', 'scripts_battle_tower.s', 'scripts_battle_tower_elevator.s', @@ -739,7 +739,7 @@ scr_seq_files = files( 'scripts_init_fight_area_pokecenter_1f.s', 'scripts_init_fight_area_pokecenter_2f.s', 'scripts_init_fight_area_pokecenter_b1f.s', - 'scripts_init_battle_park_gate_to_fight_area.s', + 'scripts_init_unused_battle_park_gate_to_fight_area.s', 'scripts_init_route_225_gate_to_fight_area.s', 'scripts_init_fight_area_middle_house.s', 'scripts_init_fight_area_south_house.s', @@ -894,8 +894,8 @@ scr_seq_files = files( 'scripts_init_acuity_cavern.s', 'scripts_init_newmoon_island.s', 'scripts_init_newmoon_island_forest.s', - 'scripts_init_battle_park.s', - 'scripts_init_battle_park_exchange_service_corner.s', + 'scripts_init_unused_battle_park.s', + 'scripts_init_unused_battle_park_exchange_service_corner.s', 'scripts_init_unk_0863.s', 'scripts_init_battle_tower.s', 'scripts_init_battle_tower_elevator.s', diff --git a/res/field/scripts/scripts.order b/res/field/scripts/scripts.order index 6df843a996..b79c6ab9f2 100644 --- a/res/field/scripts/scripts.order +++ b/res/field/scripts/scripts.order @@ -204,7 +204,7 @@ scripts_fight_area_mart scripts_fight_area_pokecenter_1f scripts_fight_area_pokecenter_2f scripts_fight_area_pokecenter_b1f -scripts_battle_park_gate_to_fight_area +scripts_unused_battle_park_gate_to_fight_area scripts_route_225_gate_to_fight_area scripts_fight_area_middle_house scripts_fight_area_south_house @@ -362,8 +362,8 @@ scripts_lake_acuity scripts_acuity_cavern scripts_newmoon_island scripts_newmoon_island_forest -scripts_battle_park -scripts_battle_park_exchange_service_corner +scripts_unused_battle_park +scripts_unused_battle_park_exchange_service_corner scripts_unk_0366 scripts_battle_tower scripts_battle_tower_elevator @@ -704,7 +704,7 @@ scripts_init_fight_area_mart scripts_init_fight_area_pokecenter_1f scripts_init_fight_area_pokecenter_2f scripts_init_fight_area_pokecenter_b1f -scripts_init_battle_park_gate_to_fight_area +scripts_init_unused_battle_park_gate_to_fight_area scripts_init_route_225_gate_to_fight_area scripts_init_fight_area_middle_house scripts_init_fight_area_south_house @@ -859,8 +859,8 @@ scripts_init_lake_acuity scripts_init_acuity_cavern scripts_init_newmoon_island scripts_init_newmoon_island_forest -scripts_init_battle_park -scripts_init_battle_park_exchange_service_corner +scripts_init_unused_battle_park +scripts_init_unused_battle_park_exchange_service_corner scripts_init_unk_0863 scripts_init_battle_tower scripts_init_battle_tower_elevator diff --git a/res/field/scripts/scripts_battle_frontier.s b/res/field/scripts/scripts_battle_frontier.s index 717d4e49bd..b652972f25 100644 --- a/res/field/scripts/scripts_battle_frontier.s +++ b/res/field/scripts/scripts_battle_frontier.s @@ -148,7 +148,7 @@ BattleFrontier_AttendantSouthwest: FacePlayer Message BattleFrontier_Text_TradeBPForPrizes CloseMessageWithoutErasing - PokeMartFrontier MART_FRONTIER_ID_EXCHANGE_SERVICE_CORNER_DOWN + PokeMartFrontier MART_FRONTIER_ID_EXCHANGE_SERVICE_CORNER_LEFT ReleaseAll End @@ -171,7 +171,7 @@ BattleFrontier_AttendantSoutheast: FacePlayer Message BattleFrontier_Text_TradeBPForPrizes2 CloseMessageWithoutErasing - PokeMartFrontier MART_FRONTIER_ID_EXCHANGE_SERVICE_CORNER_UP + PokeMartFrontier MART_FRONTIER_ID_EXCHANGE_SERVICE_CORNER_RIGHT ReleaseAll End diff --git a/res/field/scripts/scripts_battle_park.s b/res/field/scripts/scripts_battle_park.s deleted file mode 100644 index aa99a82687..0000000000 --- a/res/field/scripts/scripts_battle_park.s +++ /dev/null @@ -1,256 +0,0 @@ -#include "macros/scrcmd.inc" -#include "res/text/bank/battle_park.h" - - - ScriptEntry _0032 - ScriptEntry _0308 - ScriptEntry _03AD - ScriptEntry _03C4 - ScriptEntry _031B - ScriptEntry _032C - ScriptEntry _033D - ScriptEntry _0350 - ScriptEntry _0361 - ScriptEntry _0374 - ScriptEntry _0387 - ScriptEntry _039A - ScriptEntryEnd - -_0032: - LockAll - GetPlayerMapPos VAR_0x8004, VAR_0x8005 - CallIfEq VAR_0x8004, 23, _01A8 - CallIfEq VAR_0x8004, 24, _01BA - CallIfEq VAR_0x8004, 25, _01CC - CallIfEq VAR_0x8004, 26, _01DE - ClearFlag FLAG_UNK_0x0276 - AddObject 11 - LockObject 11 - ApplyMovement 11, _02C8 - ApplyMovement LOCALID_PLAYER, _0290 - WaitMovement - PlaySE SEQ_SE_DP_WALL_HIT2 - BufferPlayerName 1 - Message 0 - CloseMessage - WaitTime 30, VAR_RESULT - ApplyMovement 11, _02D0 - WaitMovement - Message 1 - CloseMessage - ApplyMovement 11, _02E0 - WaitMovement - Message 2 - ApplyMovement 11, _02E8 - WaitMovement - Message 3 - CloseMessage - GetPlayerMapPos VAR_0x8004, VAR_0x8005 - CallIfEq VAR_0x8004, 23, _01F0 - CallIfEq VAR_0x8004, 24, _0204 - CallIfEq VAR_0x8004, 25, _0218 - CallIfEq VAR_0x8004, 26, _022C - RemoveObject 11 - ClearFlag FLAG_UNK_0x0277 - AddObject 12 - LockObject 12 - ApplyMovement 12, _02C8 - ApplyMovement LOCALID_PLAYER, _0290 - WaitMovement - PlaySE SEQ_SE_DP_WALL_HIT2 - BufferRivalName 0 - BufferPlayerName 1 - Message 4 - CloseMessage - WaitTime 30, VAR_RESULT - CallIfLt VAR_STARK_MOUNTAIN_ROOM_3_STATE, 1, _019E - CallIfGe VAR_STARK_MOUNTAIN_ROOM_3_STATE, 1, _01A3 - CloseMessage - GetPlayerMapPos VAR_0x8004, VAR_0x8005 - CallIfEq VAR_0x8004, 23, _0240 - CallIfEq VAR_0x8004, 24, _0254 - CallIfEq VAR_0x8004, 25, _0268 - CallIfEq VAR_0x8004, 26, _027C - RemoveObject 12 - SetVar VAR_UNK_0x410E, 1 - ReleaseAll - End - -_019E: - Message 5 - Return - -_01A3: - Message 6 - Return - -_01A8: - SetObjectEventPos 11, 23, 41 - SetObjectEventPos 12, 23, 40 - Return - -_01BA: - SetObjectEventPos 11, 24, 41 - SetObjectEventPos 12, 24, 40 - Return - -_01CC: - SetObjectEventPos 11, 25, 41 - SetObjectEventPos 12, 25, 40 - Return - -_01DE: - SetObjectEventPos 11, 26, 41 - SetObjectEventPos 12, 26, 40 - Return - -_01F0: - ApplyMovement 11, _02F0 - ApplyMovement LOCALID_PLAYER, _02A8 - WaitMovement - Return - -_0204: - ApplyMovement 11, _02F0 - ApplyMovement LOCALID_PLAYER, _02A8 - WaitMovement - Return - -_0218: - ApplyMovement 11, _02FC - ApplyMovement LOCALID_PLAYER, _02B8 - WaitMovement - Return - -_022C: - ApplyMovement 11, _02FC - ApplyMovement LOCALID_PLAYER, _02B8 - WaitMovement - Return - -_0240: - ApplyMovement 12, _02F0 - ApplyMovement LOCALID_PLAYER, _02A8 - WaitMovement - Return - -_0254: - ApplyMovement 12, _02F0 - ApplyMovement LOCALID_PLAYER, _02A8 - WaitMovement - Return - -_0268: - ApplyMovement 12, _02FC - ApplyMovement LOCALID_PLAYER, _02B8 - WaitMovement - Return - -_027C: - ApplyMovement 12, _02FC - ApplyMovement LOCALID_PLAYER, _02B8 - WaitMovement - Return - - .balign 4, 0 -_0290: - Delay4 7 - WalkOnSpotFastSouth - LockDir - WalkFastNorth - UnlockDir - EndMovement - - .balign 4, 0 -_02A8: - Delay8 - WalkOnSpotNormalEast - WalkOnSpotNormalNorth - EndMovement - - .balign 4, 0 -_02B8: - Delay8 - WalkOnSpotNormalWest - WalkOnSpotNormalNorth - EndMovement - - .balign 4, 0 -_02C8: - WalkFastNorth 8 - EndMovement - - .balign 4, 0 -_02D0: - WalkOnSpotNormalWest - WalkOnSpotNormalEast - WalkOnSpotNormalSouth - EndMovement - - .balign 4, 0 -_02E0: - WalkOnSpotNormalNorth - EndMovement - - .balign 4, 0 -_02E8: - EmoteExclamationMark - EndMovement - - .balign 4, 0 -_02F0: - WalkFastEast - WalkFastNorth 8 - EndMovement - - .balign 4, 0 -_02FC: - WalkFastWest - WalkFastNorth 8 - EndMovement - -_0308: - NPCMessage 6 - End - -_031B: - EventMessage 9 - End - -_032C: - EventMessage 10 - End - -_033D: - NPCMessage 11 - End - -_0350: - EventMessage 12 - End - -_0361: - NPCMessage 13 - End - -_0374: - NPCMessage 14 - End - -_0387: - NPCMessage 15 - End - -_039A: - NPCMessage 16 - End - -_03AD: - ShowLandmarkSign 7 - End - -_03C4: - ShowLandmarkSign 8 - End - - .balign 4, 0 diff --git a/res/field/scripts/scripts_battle_park_exchange_service_corner.s b/res/field/scripts/scripts_battle_park_exchange_service_corner.s deleted file mode 100644 index f3429e7fb1..0000000000 --- a/res/field/scripts/scripts_battle_park_exchange_service_corner.s +++ /dev/null @@ -1,141 +0,0 @@ -#include "macros/scrcmd.inc" -#include "res/text/bank/battle_park_exchange_service_corner.h" - - - ScriptEntry _0024 - ScriptEntry _002A - ScriptEntry _0192 - ScriptEntry _01A5 - ScriptEntry _01B8 - ScriptEntry _01CB - ScriptEntry _01DE - ScriptEntry _01F1 - ScriptEntry _01F1 - -_0024: - GoTo _0044 - -_002A: - GoTo _0030 - -_0030: - PlaySE SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 15 - CloseMessageWithoutErasing - PokeMartFrontier MART_FRONTIER_ID_EXCHANGE_SERVICE_CORNER_UP - ReleaseAll - End - -_0044: - PlaySE SEQ_SE_CONFIRM - LockAll - FacePlayer - Message 15 - CloseMessageWithoutErasing - PokeMartFrontier MART_FRONTIER_ID_EXCHANGE_SERVICE_CORNER_DOWN - ReleaseAll - End - -BattleParkExchangeServiceCorner_Unused: - PlaySE SEQ_SE_CONFIRM - LockAll - FacePlayer - ShowBattlePoints 21, 1 - Message 0 -BattleParkExchangeServiceCorner_Unused2: - Message 1 - Call BattleParkExchangeServiceCorner_Unused8 - GoToIfEq VAR_RESULT, -2, BattleParkExchangeServiceCorner_Unused3 - GoToIfEq VAR_RESULT, VAR_MAP_LOCAL_1, BattleParkExchangeServiceCorner_Unused3 - SetVar VAR_MAP_LOCAL_3, VAR_RESULT - ScrCmd_29B VAR_MAP_LOCAL_0, VAR_MAP_LOCAL_3, VAR_0x8000, VAR_0x8001 - CallIfEq VAR_MAP_LOCAL_0, 0, BattleParkExchangeServiceCorner_Unused4 - CallIfEq VAR_MAP_LOCAL_0, 1, BattleParkExchangeServiceCorner_Unused5 - ShowYesNoMenu VAR_RESULT - GoToIfEq VAR_RESULT, 1, BattleParkExchangeServiceCorner_Unused2 - ScrCmd_29A VAR_0x8001, VAR_RESULT - GoToIfEq VAR_RESULT, 0, BattleParkExchangeServiceCorner_Unused6 - CanFitItem VAR_0x8000, 1, VAR_RESULT - GoToIfEq VAR_RESULT, 0, BattleParkExchangeServiceCorner_Unused7 - Message 3 - AddItem VAR_0x8000, 1, VAR_RESULT - ScrCmd_299 VAR_0x8001 - UpdateBPDisplay - GoTo BattleParkExchangeServiceCorner_Unused2 - -BattleParkExchangeServiceCorner_Unused3: - Message 6 - WaitButton - CloseMessage - HideBattlePoints - ReleaseAll - End - -BattleParkExchangeServiceCorner_Unused4: - BufferItemName 0, VAR_0x8000 - Message 2 - Return - -BattleParkExchangeServiceCorner_Unused5: - BufferItemName 0, VAR_0x8000 - BufferTMHMMoveName 1, VAR_0x8000 - Message 7 - Return - -BattleParkExchangeServiceCorner_Unused6: - Message 4 - GoTo BattleParkExchangeServiceCorner_Unused2 - -BattleParkExchangeServiceCorner_Unused7: - BufferItemName 0, VAR_0x8000 - Message 5 - GoTo BattleParkExchangeServiceCorner_Unused2 - -BattleParkExchangeServiceCorner_Unused8: - SetVar VAR_0x8008, 0 - SetVar VAR_0x8009, 0 - InitGlobalTextListMenu 1, 1, 0, VAR_RESULT -BattleParkExchangeServiceCorner_Unused9: - ScrCmd_29B VAR_MAP_LOCAL_0, VAR_0x8008, VAR_0x8000, VAR_0x8001 - BufferItemName 0, VAR_0x8000 - BufferVarPaddingDigits 1, VAR_0x8001, PADDING_MODE_SPACES, 3 - AddListMenuEntry 231, VAR_0x8008 - AddVar VAR_0x8008, 1 - GoToIfLt VAR_0x8008, VAR_MAP_LOCAL_1, BattleParkExchangeServiceCorner_Unused9 - AddListMenuEntry 232, VAR_0x8008 - ShowListMenu - Return - -_0192: - NPCMessage 8 - End - -_01A5: - NPCMessage 9 - End - -_01B8: - NPCMessage 10 - End - -_01CB: - NPCMessage 13 - End - -_01DE: - NPCMessage 14 - End - -_01F1: - PlaySE SEQ_SE_CONFIRM - LockAll - Message 11 - Message 12 - WaitButton - CloseMessage - ReleaseAll - End - - .balign 4, 0 diff --git a/res/field/scripts/scripts_battle_park_gate_to_fight_area.s b/res/field/scripts/scripts_battle_park_gate_to_fight_area.s deleted file mode 100644 index 9826c058f0..0000000000 --- a/res/field/scripts/scripts_battle_park_gate_to_fight_area.s +++ /dev/null @@ -1,32 +0,0 @@ -#include "macros/scrcmd.inc" - - - ScriptEntry _0020 - ScriptEntry _0022 - ScriptEntry _0024 - ScriptEntry _0026 - ScriptEntry _0028 - ScriptEntry _002A - ScriptEntry _001E - ScriptEntryEnd - -_001E: - End - -_0020: - End - -_0022: - End - -_0024: - End - -_0026: - End - -_0028: - End - -_002A: - End diff --git a/res/field/scripts/scripts_init_new_game.s b/res/field/scripts/scripts_init_new_game.s index bb5836a7d1..a8ebb789ae 100644 --- a/res/field/scripts/scripts_init_new_game.s +++ b/res/field/scripts/scripts_init_new_game.s @@ -80,8 +80,8 @@ _0006: SetFlag FLAG_HIDE_FLOAROMA_MEADOW_WORKS_KEY SetFlag FLAG_HIDE_BATTLE_TOWER_BATTLE_ROOM_OPPONENT SetFlag FLAG_HIDE_BATTLE_TOWER_TEALA - SetFlag FLAG_UNK_0x0276 - SetFlag FLAG_UNK_0x0277 + SetFlag FLAG_HIDE_BATTLE_PARK_PALMER + SetFlag FLAG_HIDE_BATTLE_PARK_RIVAL SetFlag FLAG_HIDE_BATTLEGROUND_BUCK SetFlag FLAG_HIDE_SURVIVAL_AREA_BUCK SetFlag FLAG_HIDE_SURVIVAL_AREA_RIVAL diff --git a/res/field/scripts/scripts_init_battle_park.s b/res/field/scripts/scripts_init_unused_battle_park.s similarity index 100% rename from res/field/scripts/scripts_init_battle_park.s rename to res/field/scripts/scripts_init_unused_battle_park.s diff --git a/res/field/scripts/scripts_init_battle_park_exchange_service_corner.s b/res/field/scripts/scripts_init_unused_battle_park_exchange_service_corner.s similarity index 100% rename from res/field/scripts/scripts_init_battle_park_exchange_service_corner.s rename to res/field/scripts/scripts_init_unused_battle_park_exchange_service_corner.s diff --git a/res/field/scripts/scripts_init_battle_park_gate_to_fight_area.s b/res/field/scripts/scripts_init_unused_battle_park_gate_to_fight_area.s similarity index 100% rename from res/field/scripts/scripts_init_battle_park_gate_to_fight_area.s rename to res/field/scripts/scripts_init_unused_battle_park_gate_to_fight_area.s diff --git a/res/field/scripts/scripts_scratch_off_cards.s b/res/field/scripts/scripts_scratch_off_cards.s index d830ff52d6..820a7135f6 100644 --- a/res/field/scripts/scripts_scratch_off_cards.s +++ b/res/field/scripts/scripts_scratch_off_cards.s @@ -42,9 +42,9 @@ _0085: Message 7 ShowYesNoMenu VAR_RESULT GoToIfEq VAR_RESULT, MENU_NO, _0152 - ScrCmd_29A 1, VAR_RESULT + CheckBattlePoints 1, VAR_RESULT GoToIfEq VAR_RESULT, 0, _0147 - ScrCmd_299 1 + RemoveBattlePoints 1 UpdateBPDisplay Message 10 FadeScreenOut diff --git a/res/field/scripts/scripts_unused_battle_park.s b/res/field/scripts/scripts_unused_battle_park.s new file mode 100644 index 0000000000..5b395cf884 --- /dev/null +++ b/res/field/scripts/scripts_unused_battle_park.s @@ -0,0 +1,257 @@ +#include "macros/scrcmd.inc" +#include "res/text/bank/unused_battle_park.h" +#include "res/field/events/events_unused_battle_park.h" + + + ScriptEntry BattlePark_TriggerPalmerRival + ScriptEntry BattlePark_Unused2 + ScriptEntry BattlePark_SignExchangeServiceCorner + ScriptEntry BattlePark_SignBattleTower + ScriptEntry BattlePark_Beauty + ScriptEntry BattlePark_SchoolKidM + ScriptEntry BattlePark_ExpertF + ScriptEntry BattlePark_BabyInPram + ScriptEntry BattlePark_PokefanM + ScriptEntry BattlePark_MiddleAgedMan + ScriptEntry BattlePark_AceTrainerM + ScriptEntry BattlePark_BlackBelt + ScriptEntryEnd + +BattlePark_TriggerPalmerRival: + LockAll + GetPlayerMapPos VAR_0x8004, VAR_0x8005 + CallIfEq VAR_0x8004, 23, BattlePark_SetPalmerRivalPositionX23 + CallIfEq VAR_0x8004, 24, BattlePark_SetPalmerRivalPositionX24 + CallIfEq VAR_0x8004, 25, BattlePark_SetPalmerRivalPositionX25 + CallIfEq VAR_0x8004, 26, BattlePark_SetPalmerRivalPositionX26 + ClearFlag FLAG_HIDE_BATTLE_PARK_PALMER + AddObject LOCALID_PALMER + LockObject LOCALID_PALMER + ApplyMovement LOCALID_PALMER, BattlePark_Movement_PalmerRivalEnter + ApplyMovement LOCALID_PLAYER, BattlePark_Movement_PlayerGetPushedBack + WaitMovement + PlaySE SEQ_SE_DP_WALL_HIT2 + BufferPlayerName 1 + Message BattlePark_Text_BigThudPalmer + CloseMessage + WaitTime 30, VAR_RESULT + ApplyMovement LOCALID_PALMER, BattlePark_Movement_PalmerLookAround + WaitMovement + Message BattlePark_Text_WhatThe + CloseMessage + ApplyMovement LOCALID_PALMER, BattlePark_Movement_PalmerWalkOnSpotNorth + WaitMovement + Message BattlePark_Text_SorryAboutThat + ApplyMovement LOCALID_PALMER, BattlePark_Movement_PalmerExclamationMark + WaitMovement + Message BattlePark_Text_YourePlayerFromTwinleaf + CloseMessage + GetPlayerMapPos VAR_0x8004, VAR_0x8005 + CallIfEq VAR_0x8004, 23, BattlePark_PalmerLeaveX23 + CallIfEq VAR_0x8004, 24, BattlePark_PalmerLeaveX24 + CallIfEq VAR_0x8004, 25, BattlePark_PalmerLeaveX25 + CallIfEq VAR_0x8004, 26, BattlePark_PalmerLeaveX26 + RemoveObject LOCALID_PALMER + ClearFlag FLAG_HIDE_BATTLE_PARK_RIVAL + AddObject LOCALID_RIVAL + LockObject LOCALID_RIVAL + ApplyMovement LOCALID_RIVAL, BattlePark_Movement_PalmerRivalEnter + ApplyMovement LOCALID_PLAYER, BattlePark_Movement_PlayerGetPushedBack + WaitMovement + PlaySE SEQ_SE_DP_WALL_HIT2 + BufferRivalName 0 + BufferPlayerName 1 + Message BattlePark_Text_BigThudRival + CloseMessage + WaitTime 30, VAR_RESULT + CallIfLt VAR_STARK_MOUNTAIN_ROOM_3_STATE, 1, BattlePark_MeasureUpBeforeStarkMountain + CallIfGe VAR_STARK_MOUNTAIN_ROOM_3_STATE, 1, BattlePark_MeasureUpForMyQuest + CloseMessage + GetPlayerMapPos VAR_0x8004, VAR_0x8005 + CallIfEq VAR_0x8004, 23, BattlePark_RivalLeaveX23 + CallIfEq VAR_0x8004, 24, BattlePark_RivalLeaveX24 + CallIfEq VAR_0x8004, 25, BattlePark_RivalLeaveX25 + CallIfEq VAR_0x8004, 26, BattlePark_RivalLeaveX26 + RemoveObject LOCALID_RIVAL + SetVar VAR_BATTLE_PARK_STATE, 1 + ReleaseAll + End + +BattlePark_MeasureUpBeforeStarkMountain: + Message BattlePark_Text_MeasureUpBeforeStarkMountain + Return + +BattlePark_MeasureUpForMyQuest: + Message BattlePark_Text_MeasureUpForMyQuest + Return + +BattlePark_SetPalmerRivalPositionX23: + SetObjectEventPos LOCALID_PALMER, 23, 41 + SetObjectEventPos LOCALID_RIVAL, 23, 40 + Return + +BattlePark_SetPalmerRivalPositionX24: + SetObjectEventPos LOCALID_PALMER, 24, 41 + SetObjectEventPos LOCALID_RIVAL, 24, 40 + Return + +BattlePark_SetPalmerRivalPositionX25: + SetObjectEventPos LOCALID_PALMER, 25, 41 + SetObjectEventPos LOCALID_RIVAL, 25, 40 + Return + +BattlePark_SetPalmerRivalPositionX26: + SetObjectEventPos LOCALID_PALMER, 26, 41 + SetObjectEventPos LOCALID_RIVAL, 26, 40 + Return + +BattlePark_PalmerLeaveX23: + ApplyMovement LOCALID_PALMER, BattlePark_Movement_PalmerRivalLeaveWest + ApplyMovement LOCALID_PLAYER, BattlePark_Movement_PlayerWatchPalmerRivalLeaveWest + WaitMovement + Return + +BattlePark_PalmerLeaveX24: + ApplyMovement LOCALID_PALMER, BattlePark_Movement_PalmerRivalLeaveWest + ApplyMovement LOCALID_PLAYER, BattlePark_Movement_PlayerWatchPalmerRivalLeaveWest + WaitMovement + Return + +BattlePark_PalmerLeaveX25: + ApplyMovement LOCALID_PALMER, BattlePark_Movement_PalmerRivalLeaveEast + ApplyMovement LOCALID_PLAYER, BattlePark_Movement_PlayerWatchPalmerRivalLeaveEast + WaitMovement + Return + +BattlePark_PalmerLeaveX26: + ApplyMovement LOCALID_PALMER, BattlePark_Movement_PalmerRivalLeaveEast + ApplyMovement LOCALID_PLAYER, BattlePark_Movement_PlayerWatchPalmerRivalLeaveEast + WaitMovement + Return + +BattlePark_RivalLeaveX23: + ApplyMovement LOCALID_RIVAL, BattlePark_Movement_PalmerRivalLeaveWest + ApplyMovement LOCALID_PLAYER, BattlePark_Movement_PlayerWatchPalmerRivalLeaveWest + WaitMovement + Return + +BattlePark_RivalLeaveX24: + ApplyMovement LOCALID_RIVAL, BattlePark_Movement_PalmerRivalLeaveWest + ApplyMovement LOCALID_PLAYER, BattlePark_Movement_PlayerWatchPalmerRivalLeaveWest + WaitMovement + Return + +BattlePark_RivalLeaveX25: + ApplyMovement LOCALID_RIVAL, BattlePark_Movement_PalmerRivalLeaveEast + ApplyMovement LOCALID_PLAYER, BattlePark_Movement_PlayerWatchPalmerRivalLeaveEast + WaitMovement + Return + +BattlePark_RivalLeaveX26: + ApplyMovement LOCALID_RIVAL, BattlePark_Movement_PalmerRivalLeaveEast + ApplyMovement LOCALID_PLAYER, BattlePark_Movement_PlayerWatchPalmerRivalLeaveEast + WaitMovement + Return + + .balign 4, 0 +BattlePark_Movement_PlayerGetPushedBack: + Delay4 7 + WalkOnSpotFastSouth + LockDir + WalkFastNorth + UnlockDir + EndMovement + + .balign 4, 0 +BattlePark_Movement_PlayerWatchPalmerRivalLeaveWest: + Delay8 + WalkOnSpotNormalEast + WalkOnSpotNormalNorth + EndMovement + + .balign 4, 0 +BattlePark_Movement_PlayerWatchPalmerRivalLeaveEast: + Delay8 + WalkOnSpotNormalWest + WalkOnSpotNormalNorth + EndMovement + + .balign 4, 0 +BattlePark_Movement_PalmerRivalEnter: + WalkFastNorth 8 + EndMovement + + .balign 4, 0 +BattlePark_Movement_PalmerLookAround: + WalkOnSpotNormalWest + WalkOnSpotNormalEast + WalkOnSpotNormalSouth + EndMovement + + .balign 4, 0 +BattlePark_Movement_PalmerWalkOnSpotNorth: + WalkOnSpotNormalNorth + EndMovement + + .balign 4, 0 +BattlePark_Movement_PalmerExclamationMark: + EmoteExclamationMark + EndMovement + + .balign 4, 0 +BattlePark_Movement_PalmerRivalLeaveWest: + WalkFastEast + WalkFastNorth 8 + EndMovement + + .balign 4, 0 +BattlePark_Movement_PalmerRivalLeaveEast: + WalkFastWest + WalkFastNorth 8 + EndMovement + +BattlePark_Unused2: + NPCMessage BattlePark_Text_MeasureUpForMyQuest + End + +BattlePark_Beauty: + EventMessage BattlePark_Text_SeventhTrainerIsBoss + End + +BattlePark_SchoolKidM: + EventMessage BattlePark_Text_BattleRealSuperstars + End + +BattlePark_ExpertF: + NPCMessage BattlePark_Text_EarnedLotsOfBP + End + +BattlePark_BabyInPram: + EventMessage BattlePark_Text_Aah + End + +BattlePark_PokefanM: + NPCMessage BattlePark_Text_ImABabysittingTrainer + End + +BattlePark_MiddleAgedMan: + NPCMessage BattlePark_Text_WorldsBestGatherHere + End + +BattlePark_AceTrainerM: + NPCMessage BattlePark_Text_NoDetailCanBeOverlooked + End + +BattlePark_BlackBelt: + NPCMessage BattlePark_Text_HookUpWithBeauty + End + +BattlePark_SignExchangeServiceCorner: + ShowLandmarkSign BattlePark_Text_SignExchangeServiceCorner + End + +BattlePark_SignBattleTower: + ShowLandmarkSign BattlePark_Text_SignBattleTower + End + + .balign 4, 0 diff --git a/res/field/scripts/scripts_unused_battle_park_exchange_service_corner.s b/res/field/scripts/scripts_unused_battle_park_exchange_service_corner.s new file mode 100644 index 0000000000..168209a65a --- /dev/null +++ b/res/field/scripts/scripts_unused_battle_park_exchange_service_corner.s @@ -0,0 +1,142 @@ +#include "macros/scrcmd.inc" +#include "res/text/bank/unused_battle_park_exchange_service_corner.h" +#include "res/text/bank/menu_entries.h" + + + ScriptEntry BattleParkExchangeServiceCorner_MaidNorth + ScriptEntry BattleParkExchangeServiceCorner_MaidSouth + ScriptEntry BattleParkExchangeServiceCorner_Gentleman + ScriptEntry BattleParkExchangeServiceCorner_Socialite + ScriptEntry BattleParkExchangeServiceCorner_Roughneck + ScriptEntry BattleParkExchangeServiceCorner_Cowgirl + ScriptEntry BattleParkExchangeServiceCorner_Clown + ScriptEntry BattleParkExchangeServiceCorner_TwinAndExpertF + ScriptEntry BattleParkExchangeServiceCorner_TwinAndExpertF + +BattleParkExchangeServiceCorner_MaidNorth: + GoTo BattleParkExchangeServiceCorner_PokeMartFrontierLeft + +BattleParkExchangeServiceCorner_MaidSouth: + GoTo BattleParkExchangeServiceCorner_PokeMartFrontierRight + +BattleParkExchangeServiceCorner_PokeMartFrontierRight: + PlaySE SEQ_SE_CONFIRM + LockAll + FacePlayer + Message BattleParkExchangeServiceCorner_Text_TradeBPForPrizes + CloseMessageWithoutErasing + PokeMartFrontier MART_FRONTIER_ID_EXCHANGE_SERVICE_CORNER_RIGHT + ReleaseAll + End + +BattleParkExchangeServiceCorner_PokeMartFrontierLeft: + PlaySE SEQ_SE_CONFIRM + LockAll + FacePlayer + Message BattleParkExchangeServiceCorner_Text_TradeBPForPrizes + CloseMessageWithoutErasing + PokeMartFrontier MART_FRONTIER_ID_EXCHANGE_SERVICE_CORNER_LEFT + ReleaseAll + End + +BattleParkExchangeServiceCorner_Unused: + PlaySE SEQ_SE_CONFIRM + LockAll + FacePlayer + ShowBattlePoints 21, 1 + Message BattleParkExchangeServiceCorner_Text_ExchangeBPForItems +BattleParkExchangeServiceCorner_UnusedWhichPrize: + Message BattleParkExchangeServiceCorner_Text_ExchangeBPForWhichPrize + Call BattleParkExchangeServiceCorner_UnusedInitPrizeMenu + GoToIfEq VAR_RESULT, -2, BattleParkExchangeServiceCorner_UnusedThanksForVisiting + GoToIfEq VAR_RESULT, VAR_MAP_LOCAL_1, BattleParkExchangeServiceCorner_UnusedThanksForVisiting + SetVar VAR_MAP_LOCAL_3, VAR_RESULT + GetExchangeServiceCornerItemAndCost VAR_MAP_LOCAL_0, VAR_MAP_LOCAL_3, VAR_0x8000, VAR_0x8001 + CallIfEq VAR_MAP_LOCAL_0, 0, BattleParkExchangeServiceCorner_UnusedYouveChosenThisItem + CallIfEq VAR_MAP_LOCAL_0, 1, BattleParkExchangeServiceCorner_UnusedYouveChosenThisTM + ShowYesNoMenu VAR_RESULT + GoToIfEq VAR_RESULT, MENU_NO, BattleParkExchangeServiceCorner_UnusedWhichPrize + CheckBattlePoints VAR_0x8001, VAR_RESULT + GoToIfEq VAR_RESULT, FALSE, BattleParkExchangeServiceCorner_UnusedNotEnoughBP + CanFitItem VAR_0x8000, 1, VAR_RESULT + GoToIfEq VAR_RESULT, FALSE, BattleParkExchangeServiceCorner_UnusedNoRoomForItem + Message BattleParkExchangeServiceCorner_Text_HereIsYourPrize + AddItem VAR_0x8000, 1, VAR_RESULT + RemoveBattlePoints VAR_0x8001 + UpdateBPDisplay + GoTo BattleParkExchangeServiceCorner_UnusedWhichPrize + +BattleParkExchangeServiceCorner_UnusedThanksForVisiting: + Message BattleParkExchangeServiceCorner_Text_ThanksForVisiting + WaitButton + CloseMessage + HideBattlePoints + ReleaseAll + End + +BattleParkExchangeServiceCorner_UnusedYouveChosenThisItem: + BufferItemName 0, VAR_0x8000 + Message BattleParkExchangeServiceCorner_Text_YouveChosenThisItem + Return + +BattleParkExchangeServiceCorner_UnusedYouveChosenThisTM: + BufferItemName 0, VAR_0x8000 + BufferTMHMMoveName 1, VAR_0x8000 + Message BattleParkExchangeServiceCorner_Text_YouveChosenThisTM + Return + +BattleParkExchangeServiceCorner_UnusedNotEnoughBP: + Message BattleParkExchangeServiceCorner_Text_NotEnoughBP + GoTo BattleParkExchangeServiceCorner_UnusedWhichPrize + +BattleParkExchangeServiceCorner_UnusedNoRoomForItem: + BufferItemName 0, VAR_0x8000 + Message BattleParkExchangeServiceCorner_Text_NoRoomForItem + GoTo BattleParkExchangeServiceCorner_UnusedWhichPrize + +BattleParkExchangeServiceCorner_UnusedInitPrizeMenu: + SetVar VAR_0x8008, 0 + SetVar VAR_0x8009, 0 + InitGlobalTextListMenu 1, 1, 0, VAR_RESULT +BattleParkExchangeServiceCorner_UnusedAddPrizeMenuEntries: + GetExchangeServiceCornerItemAndCost VAR_MAP_LOCAL_0, VAR_0x8008, VAR_0x8000, VAR_0x8001 + BufferItemName 0, VAR_0x8000 + BufferVarPaddingDigits 1, VAR_0x8001, PADDING_MODE_SPACES, 3 + AddListMenuEntry MenuEntries_Text_UnusedPrizeExchange_Prize, VAR_0x8008 + AddVar VAR_0x8008, 1 + GoToIfLt VAR_0x8008, VAR_MAP_LOCAL_1, BattleParkExchangeServiceCorner_UnusedAddPrizeMenuEntries + AddListMenuEntry MenuEntries_Text_UnusedPrizeExchange_NoThanks, VAR_0x8008 + ShowListMenu + Return + +BattleParkExchangeServiceCorner_Gentleman: + NPCMessage BattleParkExchangeServiceCorner_Text_WhatToGetToday + End + +BattleParkExchangeServiceCorner_Socialite: + NPCMessage BattleParkExchangeServiceCorner_Text_IMostCareAboutPower + End + +BattleParkExchangeServiceCorner_Roughneck: + NPCMessage BattleParkExchangeServiceCorner_Text_GrabPrizesHere + End + +BattleParkExchangeServiceCorner_Cowgirl: + NPCMessage BattleParkExchangeServiceCorner_Text_GirlIsLittleTerror + End + +BattleParkExchangeServiceCorner_Clown: + NPCMessage BattleParkExchangeServiceCorner_Text_BuildingIsSoGrand + End + +BattleParkExchangeServiceCorner_TwinAndExpertF: + PlaySE SEQ_SE_CONFIRM + LockAll + Message BattleParkExchangeServiceCorner_Text_HaveThisGrandma + Message BattleParkExchangeServiceCorner_Text_ThankYouDear + WaitButton + CloseMessage + ReleaseAll + End + + .balign 4, 0 diff --git a/res/field/scripts/scripts_unused_battle_park_gate_to_fight_area.s b/res/field/scripts/scripts_unused_battle_park_gate_to_fight_area.s new file mode 100644 index 0000000000..ee37a376ce --- /dev/null +++ b/res/field/scripts/scripts_unused_battle_park_gate_to_fight_area.s @@ -0,0 +1,32 @@ +#include "macros/scrcmd.inc" + + + ScriptEntry BattleParkGateToFightArea_Unused1 + ScriptEntry BattleParkGateToFightArea_Maid2 + ScriptEntry BattleParkGateToFightArea_Maid1 + ScriptEntry BattleParkGateToFightArea_Maid5 + ScriptEntry BattleParkGateToFightArea_Maid3And4 + ScriptEntry BattleParkGateToFightArea_Collector + ScriptEntry BattleParkGateToFightArea_Unused7 + ScriptEntryEnd + +BattleParkGateToFightArea_Unused7: + End + +BattleParkGateToFightArea_Unused1: + End + +BattleParkGateToFightArea_Maid2: + End + +BattleParkGateToFightArea_Maid1: + End + +BattleParkGateToFightArea_Maid5: + End + +BattleParkGateToFightArea_Maid3And4: + End + +BattleParkGateToFightArea_Collector: + End diff --git a/res/text/battle_park_gate_to_fight_area.json b/res/text/battle_park_gate_to_fight_area.json deleted file mode 100644 index 5a90f81a15..0000000000 --- a/res/text/battle_park_gate_to_fight_area.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "key": 50210, - "messages": [ - { - "id": "pl_msg_00000195_00000", - "garbage": 42 - }, - { - "id": "pl_msg_00000195_00001", - "garbage": 69 - }, - { - "id": "pl_msg_00000195_00002", - "garbage": 168 - }, - { - "id": "pl_msg_00000195_00003", - "garbage": 52 - }, - { - "id": "pl_msg_00000195_00004", - "garbage": 17 - }, - { - "id": "pl_msg_00000195_00005", - "garbage": 76 - }, - { - "id": "pl_msg_00000195_00006", - "garbage": 128 - }, - { - "id": "pl_msg_00000195_00007", - "garbage": 174 - }, - { - "id": "pl_msg_00000195_00008", - "garbage": 48 - }, - { - "id": "pl_msg_00000195_00009", - "garbage": 17 - }, - { - "id": "pl_msg_00000195_00010", - "garbage": 101 - }, - { - "id": "pl_msg_00000195_00011", - "garbage": 108 - }, - { - "id": "pl_msg_00000195_00012", - "garbage": 57 - }, - { - "id": "pl_msg_00000195_00013", - "garbage": 17 - }, - { - "id": "pl_msg_00000195_00014", - "garbage": 205 - }, - { - "id": "pl_msg_00000195_00015", - "garbage": 160 - }, - { - "id": "pl_msg_00000195_00016", - "garbage": 109 - }, - { - "id": "pl_msg_00000195_00017", - "garbage": 14 - }, - { - "id": "pl_msg_00000195_00018", - "garbage": 13 - }, - { - "id": "pl_msg_00000195_00019", - "en_US": "EXIT" - }, - { - "id": "pl_msg_00000195_00020", - "en_US": "BATTLE PARK" - }, - { - "id": "pl_msg_00000195_00021", - "en_US": "EXCHANGE SERVICE CORNER" - }, - { - "id": "pl_msg_00000195_00022", - "en_US": "BATTLE TOWER" - }, - { - "id": "pl_msg_00000195_00023", - "en_US": "POINT CARD" - }, - { - "id": "pl_msg_00000195_00024", - "en_US": "BP" - }, - { - "id": "pl_msg_00000195_00025", - "en_US": "LEVEL LIMIT" - }, - { - "id": "pl_msg_00000195_00026", - "en_US": "SPECIES & NUMBERS" - }, - { - "id": "pl_msg_00000195_00027", - "en_US": "HOLD ITEMS" - }, - { - "id": "pl_msg_00000195_00028", - "garbage": 51 - } - ] -} diff --git a/res/text/menu_entries.json b/res/text/menu_entries.json index 80e4a9863f..4bc188ef10 100644 --- a/res/text/menu_entries.json +++ b/res/text/menu_entries.json @@ -950,11 +950,11 @@ "en_US": "{STRVAR_1 53, 0, 0} BP" }, { - "id": "pl_msg_00000361_00231", + "id": "MenuEntries_Text_UnusedPrizeExchange_Prize", "en_US": "{STRVAR_1 8, 0, 0}{CURSOR_X 96}{STRVAR_1 52, 1, 0}BP" }, { - "id": "pl_msg_00000361_00232", + "id": "MenuEntries_Text_UnusedPrizeExchange_NoThanks", "en_US": "NO THANKS" }, { diff --git a/res/text/battle_park.json b/res/text/unused_battle_park.json similarity index 79% rename from res/text/battle_park.json rename to res/text/unused_battle_park.json index fdd32a77c0..3004e5a08d 100644 --- a/res/text/battle_park.json +++ b/res/text/unused_battle_park.json @@ -2,22 +2,22 @@ "key": 52138, "messages": [ { - "id": "pl_msg_00000302_00000", + "id": "BattlePark_Text_BigThudPalmer", "en_US": "{SIZE 200}Thud!!{SIZE 100}\r" }, { - "id": "pl_msg_00000302_00001", + "id": "BattlePark_Text_WhatThe", "en_US": "What the...\r" }, { - "id": "pl_msg_00000302_00002", + "id": "BattlePark_Text_SorryAboutThat", "en_US": [ "Whoops, sorry about that!\n", "I was in a rush.\r" ] }, { - "id": "pl_msg_00000302_00003", + "id": "BattlePark_Text_YourePlayerFromTwinleaf", "en_US": [ "Oh, wait a second...\n", "Aren’t you...\r", @@ -30,11 +30,11 @@ ] }, { - "id": "pl_msg_00000302_00004", + "id": "BattlePark_Text_BigThudRival", "en_US": "{SIZE 200}Thud!!{SIZE 100}\r" }, { - "id": "pl_msg_00000302_00005", + "id": "BattlePark_Text_MeasureUpBeforeStarkMountain", "en_US": [ "{STRVAR_1 3, 0, 0}: What the...\r", "Oh, hey, {STRVAR_1 3, 1, 0}!\r", @@ -52,7 +52,7 @@ ] }, { - "id": "pl_msg_00000302_00006", + "id": "BattlePark_Text_MeasureUpForMyQuest", "en_US": [ "{STRVAR_1 3, 0, 0}: What the...\r", "Oh, hey, {STRVAR_1 3, 1, 0}!\r", @@ -70,21 +70,21 @@ ] }, { - "id": "pl_msg_00000302_00007", + "id": "BattlePark_Text_SignExchangeServiceCorner", "en_US": [ "Exchange Service Corner\n", "A Cornucopia of Fabulous Prizes!" ] }, { - "id": "pl_msg_00000302_00008", + "id": "BattlePark_Text_SignBattleTower", "en_US": [ "Battle Tower\n", "Gather, All Ye Greatest!" ] }, { - "id": "pl_msg_00000302_00009", + "id": "BattlePark_Text_SeventhTrainerIsBoss", "en_US": [ "In the Battle Rooms, the seventh\n", "Trainer you face is the room’s boss.\r", @@ -93,7 +93,7 @@ ] }, { - "id": "pl_msg_00000302_00010", + "id": "BattlePark_Text_BattleRealSuperstars", "en_US": [ "If you get a big win streak at the\n", "Battle Tower, you get to battle\f", @@ -101,7 +101,7 @@ ] }, { - "id": "pl_msg_00000302_00011", + "id": "BattlePark_Text_EarnedLotsOfBP", "en_US": [ "Mwahahaha! We earned a lot of BP\n", "at the Battle Tower.\r", @@ -110,11 +110,11 @@ ] }, { - "id": "pl_msg_00000302_00012", + "id": "BattlePark_Text_Aah", "en_US": "Aah." }, { - "id": "pl_msg_00000302_00013", + "id": "BattlePark_Text_ImABabysittingTrainer", "en_US": [ "I’m a babysitting Trainer!\r", "I’m off to the Multi Battle Rooms\n", @@ -122,7 +122,7 @@ ] }, { - "id": "pl_msg_00000302_00014", + "id": "BattlePark_Text_WorldsBestGatherHere", "en_US": [ "I heard that the world’s best\n", "gather here for battles.\r", @@ -131,7 +131,7 @@ ] }, { - "id": "pl_msg_00000302_00015", + "id": "BattlePark_Text_NoDetailCanBeOverlooked", "en_US": [ "The types of Pokémon!\r", "The moves to be taught and used!\r", @@ -141,7 +141,7 @@ ] }, { - "id": "pl_msg_00000302_00016", + "id": "BattlePark_Text_HookUpWithBeauty", "en_US": [ "I’d love to hook up with a Beauty\n", "for the Multi Battle Rooms." diff --git a/res/text/battle_park_exchange_service_corner.json b/res/text/unused_battle_park_exchange_service_corner.json similarity index 69% rename from res/text/battle_park_exchange_service_corner.json rename to res/text/unused_battle_park_exchange_service_corner.json index 9a21bbd0bf..30b68bf09f 100644 --- a/res/text/battle_park_exchange_service_corner.json +++ b/res/text/unused_battle_park_exchange_service_corner.json @@ -2,7 +2,7 @@ "key": 9314, "messages": [ { - "id": "pl_msg_00000303_00000", + "id": "BattleParkExchangeServiceCorner_Text_ExchangeBPForItems", "en_US": [ "Welcome to the Exchange Service\n", "Corner!\r", @@ -11,39 +11,39 @@ ] }, { - "id": "pl_msg_00000303_00001", + "id": "BattleParkExchangeServiceCorner_Text_ExchangeBPForWhichPrize", "en_US": [ "Which prize would you like in\n", "exchange for your BP?" ] }, { - "id": "pl_msg_00000303_00002", + "id": "BattleParkExchangeServiceCorner_Text_YouveChosenThisItem", "en_US": [ "You’ve chosen the {STRVAR_1 8, 0, 0}.\n", "Is that correct?" ] }, { - "id": "pl_msg_00000303_00003", + "id": "BattleParkExchangeServiceCorner_Text_HereIsYourPrize", "en_US": "Here is your prize!\r" }, { - "id": "pl_msg_00000303_00004", + "id": "BattleParkExchangeServiceCorner_Text_NotEnoughBP", "en_US": [ "I’m so sorry...\n", "You don’t have enough BP...\r" ] }, { - "id": "pl_msg_00000303_00005", + "id": "BattleParkExchangeServiceCorner_Text_NoRoomForItem", "en_US": [ "Sorry, your Bag has no room for\n", "this {STRVAR_1 8, 0, 0}...\r" ] }, { - "id": "pl_msg_00000303_00006", + "id": "BattleParkExchangeServiceCorner_Text_ThanksForVisiting", "en_US": [ "Thank you for visiting.\r", "Please visit us again when you have\n", @@ -51,21 +51,21 @@ ] }, { - "id": "pl_msg_00000303_00007", + "id": "BattleParkExchangeServiceCorner_Text_YouveChosenThisTM", "en_US": [ "You’ve chosen {STRVAR_1 8, 0, 0},\n", "{STRVAR_1 6, 1, 0}. Is that correct?" ] }, { - "id": "pl_msg_00000303_00008", + "id": "BattleParkExchangeServiceCorner_Text_WhatToGetToday", "en_US": [ "What to get today...\n", "Perhaps a Technical Machine will do." ] }, { - "id": "pl_msg_00000303_00009", + "id": "BattleParkExchangeServiceCorner_Text_IMostCareAboutPower", "en_US": [ "What I most care about is the\n", "crushing power of my darling Pokémon.\r", @@ -74,7 +74,7 @@ ] }, { - "id": "pl_msg_00000303_00010", + "id": "BattleParkExchangeServiceCorner_Text_GrabPrizesHere", "en_US": [ "How’s it going?\r", "If things aren’t going well, why not\n", @@ -84,7 +84,7 @@ ] }, { - "id": "pl_msg_00000303_00011", + "id": "BattleParkExchangeServiceCorner_Text_HaveThisGrandma", "en_US": [ "Gramma, Gramma!\n", "I went and traded!\r", @@ -92,7 +92,7 @@ ] }, { - "id": "pl_msg_00000303_00012", + "id": "BattleParkExchangeServiceCorner_Text_ThankYouDear", "en_US": [ "Oh, what is it, dear?\n", "Oh, a Sludge Bomb...\r", @@ -104,7 +104,7 @@ ] }, { - "id": "pl_msg_00000303_00013", + "id": "BattleParkExchangeServiceCorner_Text_GirlIsLittleTerror", "en_US": [ "Did you see that little girl with her\n", "grandmother upstairs?\r", @@ -113,14 +113,14 @@ ] }, { - "id": "pl_msg_00000303_00014", + "id": "BattleParkExchangeServiceCorner_Text_BuildingIsSoGrand", "en_US": [ "This building is so grand...\n", "Why does it need to be so?" ] }, { - "id": "pl_msg_00000303_00015", + "id": "BattleParkExchangeServiceCorner_Text_TradeBPForPrizes", "en_US": [ "Welcome to the Exchange Service\n", "Corner!\r", diff --git a/res/text/unused_battle_park_gate_to_fight_area.json b/res/text/unused_battle_park_gate_to_fight_area.json new file mode 100644 index 0000000000..1499330965 --- /dev/null +++ b/res/text/unused_battle_park_gate_to_fight_area.json @@ -0,0 +1,121 @@ +{ + "key": 50210, + "messages": [ + { + "id": "BattleParkGateToFightArea_Text_Dummy0", + "garbage": 42 + }, + { + "id": "BattleParkGateToFightArea_Text_Dummy1", + "garbage": 69 + }, + { + "id": "BattleParkGateToFightArea_Text_Dummy2", + "garbage": 168 + }, + { + "id": "BattleParkGateToFightArea_Text_Dummy3", + "garbage": 52 + }, + { + "id": "BattleParkGateToFightArea_Text_Dummy4", + "garbage": 17 + }, + { + "id": "BattleParkGateToFightArea_Text_Dummy5", + "garbage": 76 + }, + { + "id": "BattleParkGateToFightArea_Text_Dummy6", + "garbage": 128 + }, + { + "id": "BattleParkGateToFightArea_Text_Dummy7", + "garbage": 174 + }, + { + "id": "BattleParkGateToFightArea_Text_Dummy8", + "garbage": 48 + }, + { + "id": "BattleParkGateToFightArea_Text_Dummy9", + "garbage": 17 + }, + { + "id": "BattleParkGateToFightArea_Text_Dummy10", + "garbage": 101 + }, + { + "id": "BattleParkGateToFightArea_Text_Dummy11", + "garbage": 108 + }, + { + "id": "BattleParkGateToFightArea_Text_Dummy12", + "garbage": 57 + }, + { + "id": "BattleParkGateToFightArea_Text_Dummy13", + "garbage": 17 + }, + { + "id": "BattleParkGateToFightArea_Text_Dummy14", + "garbage": 205 + }, + { + "id": "BattleParkGateToFightArea_Text_Dummy15", + "garbage": 160 + }, + { + "id": "BattleParkGateToFightArea_Text_Dummy16", + "garbage": 109 + }, + { + "id": "BattleParkGateToFightArea_Text_Dummy17", + "garbage": 14 + }, + { + "id": "BattleParkGateToFightArea_Text_Dummy18", + "garbage": 13 + }, + { + "id": "BattleParkGateToFightArea_Text_Exit", + "en_US": "EXIT" + }, + { + "id": "BattleParkGateToFightArea_Text_BattlePark", + "en_US": "BATTLE PARK" + }, + { + "id": "BattleParkGateToFightArea_Text_ExchangeServiceCorner", + "en_US": "EXCHANGE SERVICE CORNER" + }, + { + "id": "BattleParkGateToFightArea_Text_BattleTower", + "en_US": "BATTLE TOWER" + }, + { + "id": "BattleParkGateToFightArea_Text_PointCard", + "en_US": "POINT CARD" + }, + { + "id": "BattleParkGateToFightArea_Text_BP", + "en_US": "BP" + }, + { + "id": "BattleParkGateToFightArea_Text_LevelLimit", + "en_US": "LEVEL LIMIT" + }, + { + "id": "BattleParkGateToFightArea_Text_SpeciesAndNumbers", + "en_US": "SPECIES & NUMBERS" + }, + { + "id": "BattleParkGateToFightArea_Text_HoldItems", + "en_US": "HOLD ITEMS" + }, + { + "id": "BattleParkGateToFightArea_Text_Dummy28", + "garbage": 51 + } + ] +} diff --git a/src/unk_020494DC.c b/src/unk_020494DC.c index bcca3da090..d9de171e00 100644 --- a/src/unk_020494DC.c +++ b/src/unk_020494DC.c @@ -7,6 +7,7 @@ #include "generated/battle_tower_functions.h" #include "generated/battle_tower_modes.h" #include "generated/game_records.h" +#include "generated/items.h" #include "generated/object_events_gfx.h" #include "struct_defs/battle_tower.h" @@ -224,7 +225,7 @@ BOOL ScrCmd_1DF(ScriptContext *ctx) v3 = FieldSystem_GetVarPointer(ctx->fieldSystem, v0); *v3 = sub_0206BDBC(ctx->fieldSystem->saveData); - return 0; + return FALSE; } BOOL ScrCmd_1E0(ScriptContext *ctx) @@ -236,7 +237,7 @@ BOOL ScrCmd_1E0(ScriptContext *ctx) v3 = FieldSystem_GetVarPointer(ctx->fieldSystem, v0); *v3 = sub_0206BF04(ctx->fieldSystem->saveData); - return 0; + return FALSE; } BOOL ScrCmd_1E1(ScriptContext *ctx) @@ -323,10 +324,10 @@ static BOOL sub_02049A20(ScriptContext *ctx) battleTower->unk_8D4 = 0; *v2 = battleTower->unk_8D8; - return 1; + return TRUE; } - return 0; + return FALSE; } BOOL ScrCmd_1E3(ScriptContext *ctx) @@ -340,7 +341,7 @@ BOOL ScrCmd_1E3(ScriptContext *ctx) *v1 = v0.unk_00; *v2 = v0.unk_04; - return 0; + return FALSE; } BOOL ScrCmd_1E4(ScriptContext *ctx) @@ -413,119 +414,121 @@ BOOL ScrCmd_UpdateBPDisplay(ScriptContext *ctx) return FALSE; } -BOOL ScrCmd_297(ScriptContext *ctx) +BOOL ScrCmd_GetBattlePoints(ScriptContext *ctx) { FieldSystem *fieldSystem = ctx->fieldSystem; SaveData *saveData = fieldSystem->saveData; - u16 *v2 = ScriptContext_GetVarPointer(ctx); + u16 *destVar = ScriptContext_GetVarPointer(ctx); - *v2 = BattlePoints_ApplyFuncAndGet(sub_0202D750(saveData), 0, BATTLE_POINTS_FUNC_NONE); - return 0; + *destVar = BattlePoints_ApplyFuncAndGet(sub_0202D750(saveData), 0, BATTLE_POINTS_FUNC_NONE); + return FALSE; } -BOOL ScrCmd_298(ScriptContext *ctx) +BOOL ScrCmd_GiveBattlePoints(ScriptContext *ctx) { FieldSystem *fieldSystem = ctx->fieldSystem; SaveData *saveData = fieldSystem->saveData; - u16 v2 = ScriptContext_GetVar(ctx); + u16 value = ScriptContext_GetVar(ctx); - GameRecords_AddToRecordValue(SaveData_GetGameRecords(ctx->fieldSystem->saveData), RECORD_BATTLE_POINTS_RECEIVED, v2); - BattlePoints_ApplyFuncAndGet(sub_0202D750(saveData), v2, BATTLE_POINTS_FUNC_ADD); + GameRecords_AddToRecordValue(SaveData_GetGameRecords(ctx->fieldSystem->saveData), RECORD_BATTLE_POINTS_RECEIVED, value); + BattlePoints_ApplyFuncAndGet(sub_0202D750(saveData), value, BATTLE_POINTS_FUNC_ADD); - return 0; + return FALSE; } -BOOL ScrCmd_299(ScriptContext *ctx) +BOOL ScrCmd_RemoveBattlePoints(ScriptContext *ctx) { FieldSystem *fieldSystem = ctx->fieldSystem; SaveData *saveData = fieldSystem->saveData; - u16 v2 = ScriptContext_GetVar(ctx); + u16 value = ScriptContext_GetVar(ctx); - GameRecords_AddToRecordValue(SaveData_GetGameRecords(ctx->fieldSystem->saveData), RECORD_BATTLE_POINTS_SPENT, v2); - BattlePoints_ApplyFuncAndGet(sub_0202D750(saveData), v2, BATTLE_POINTS_FUNC_SUB); + GameRecords_AddToRecordValue(SaveData_GetGameRecords(ctx->fieldSystem->saveData), RECORD_BATTLE_POINTS_SPENT, value); + BattlePoints_ApplyFuncAndGet(sub_0202D750(saveData), value, BATTLE_POINTS_FUNC_SUB); - return 0; + return FALSE; } -BOOL ScrCmd_29A(ScriptContext *ctx) +BOOL ScrCmd_CheckBattlePoints(ScriptContext *ctx) { - u16 v0; + u16 battlePoints; FieldSystem *fieldSystem = ctx->fieldSystem; SaveData *saveData = fieldSystem->saveData; - u16 v3 = ScriptContext_GetVar(ctx); - u16 *v4 = ScriptContext_GetVarPointer(ctx); + u16 value = ScriptContext_GetVar(ctx); + u16 *destVar = ScriptContext_GetVarPointer(ctx); - v0 = BattlePoints_ApplyFuncAndGet( - sub_0202D750(saveData), 0, BATTLE_POINTS_FUNC_NONE); + battlePoints = BattlePoints_ApplyFuncAndGet(sub_0202D750(saveData), 0, BATTLE_POINTS_FUNC_NONE); - if (v0 < v3) { - *v4 = 0; + if (battlePoints < value) { + *destVar = FALSE; } else { - *v4 = 1; + *destVar = TRUE; } - return 0; + return FALSE; } -BOOL ScrCmd_29B(ScriptContext *ctx) +#define FRONTIER_MART_ITEMS_START_ID 0 +#define FRONTIER_MART_TMS_START_ID 26 + +BOOL ScrCmd_GetExchangeServiceCornerItemAndCost(ScriptContext *ctx) { - u8 v0 = 0; - u16 v1 = ScriptContext_GetVar(ctx); - u16 v2 = ScriptContext_GetVar(ctx); - u16 *v3 = ScriptContext_GetVarPointer(ctx); - u16 *v4 = ScriptContext_GetVarPointer(ctx); - static const u16 v5[][2] = { - { 0x2E, 0x1 }, - { 0x31, 0x1 }, - { 0x2F, 0x1 }, - { 0x34, 0x1 }, - { 0x30, 0x1 }, - { 0x2D, 0x1 }, - { 0x121, 0x10 }, - { 0x122, 0x10 }, - { 0x123, 0x10 }, - { 0x124, 0x10 }, - { 0x125, 0x10 }, - { 0x126, 0x10 }, - { 0x110, 0x10 }, - { 0x111, 0x10 }, - { 0xD6, 0x20 }, - { 0x10F, 0x20 }, - { 0xD5, 0x30 }, - { 0xDC, 0x30 }, - { 0xE6, 0x30 }, - { 0xE8, 0x30 }, - { 0x10A, 0x30 }, - { 0x113, 0x30 }, - { 0x11F, 0x30 }, - { 0x146, 0x30 }, - { 0x147, 0x30 }, - { 0x32, 0x30 }, - { 0x14D, 0x20 }, - { 0x190, 0x20 }, - { 0x184, 0x20 }, - { 0x174, 0x20 }, - { 0x16F, 0x28 }, - { 0x166, 0x28 }, - { 0x14F, 0x30 }, - { 0x14B, 0x30 }, - { 0x198, 0x40 }, - { 0x165, 0x40 }, - { 0x17C, 0x40 }, - { 0x16B, 0x50 }, - { 0x182, 0x50 }, - { 0x18E, 0x50 }, - { 0x161, 0x50 } + u8 startID = FRONTIER_MART_ITEMS_START_ID; + u16 martID = ScriptContext_GetVar(ctx); + u16 prizeID = ScriptContext_GetVar(ctx); + u16 *item = ScriptContext_GetVarPointer(ctx); + u16 *cost = ScriptContext_GetVarPointer(ctx); + static const u16 prizeList[][2] = { + [FRONTIER_MART_ITEMS_START_ID] = { ITEM_PROTEIN, 1 }, + { ITEM_CALCIUM, 1 }, + { ITEM_IRON, 1 }, + { ITEM_ZINC, 1 }, + { ITEM_CARBOS, 1 }, + { ITEM_HP_UP, 1 }, + { ITEM_POWER_BRACER, 16 }, + { ITEM_POWER_BELT, 16 }, + { ITEM_POWER_LENS, 16 }, + { ITEM_POWER_BAND, 16 }, + { ITEM_POWER_ANKLET, 16 }, + { ITEM_POWER_WEIGHT, 16 }, + { ITEM_TOXIC_ORB, 16 }, + { ITEM_FLAME_ORB, 16 }, + { ITEM_WHITE_HERB, 32 }, + { ITEM_POWER_HERB, 32 }, + { ITEM_BRIGHTPOWDER, 48 }, + { ITEM_CHOICE_BAND, 48 }, + { ITEM_FOCUS_BAND, 48 }, + { ITEM_SCOPE_LENS, 48 }, + { ITEM_MUSCLE_BAND, 48 }, + { ITEM_FOCUS_SASH, 48 }, + { ITEM_CHOICE_SCARF, 48 }, + { ITEM_RAZOR_CLAW, 48 }, + { ITEM_RAZOR_FANG, 48 }, + { ITEM_RARE_CANDY, 48 }, + [FRONTIER_MART_TMS_START_ID] = { ITEM_TM06, 32 }, // update FRONTIER_MART_TMS_START_ID when adding entries above this line + { ITEM_TM73, 32 }, + { ITEM_TM61, 32 }, + { ITEM_TM45, 32 }, + { ITEM_TM40, 40 }, + { ITEM_TM31, 40 }, + { ITEM_TM08, 48 }, + { ITEM_TM04, 48 }, + { ITEM_TM81, 64 }, + { ITEM_TM30, 64 }, + { ITEM_TM53, 64 }, + { ITEM_TM36, 80 }, + { ITEM_TM59, 80 }, + { ITEM_TM71, 80 }, + { ITEM_TM26, 80 } }; - if (v1 == 1) { - v0 = 26; + if (martID == 1) { + startID = FRONTIER_MART_TMS_START_ID; } else { - v0 = 0; + startID = FRONTIER_MART_ITEMS_START_ID; } - *v3 = v5[v0 + v2][0]; - *v4 = v5[v0 + v2][1]; + *item = prizeList[startID + prizeID][0]; + *cost = prizeList[startID + prizeID][1]; - return 0; + return FALSE; }