From a036668e4210605f746a62f973626f092323a854 Mon Sep 17 00:00:00 2001 From: cbt6 <91667135+cbt6@users.noreply.github.com> Date: Fri, 12 Apr 2024 03:31:25 +0800 Subject: [PATCH 01/23] Add enum for map headers --- consts/map.json | 607 +++++++++++++++++++++++++++++++++++++++++++++ consts/meson.build | 1 + 2 files changed, 608 insertions(+) create mode 100644 consts/map.json diff --git a/consts/map.json b/consts/map.json new file mode 100644 index 0000000000..fdcfba5d63 --- /dev/null +++ b/consts/map.json @@ -0,0 +1,607 @@ +{ + "targets": { + "map": [ + "@MapHeader" + ] + }, + "definitions": { + "@MapHeader": { + "type": "enum", + "values": [ + "MAP_HEADER_EVERYWHERE", + "MAP_HEADER_NOTHING", + "MAP_HEADER_UNDERGROUND", + "MAP_HEADER_JUBILIFE_CITY", + "MAP_HEADER_JUBILIFE_CITY_MART", + "MAP_HEADER_JUBILIFE_CITY_UNKNOWN_HOUSE_1", + "MAP_HEADER_JUBILIFE_CITY_POKECENTER_1F", + "MAP_HEADER_JUBILIFE_CITY_POKECENTER_2F", + "MAP_HEADER_POKETCH_CO_1F", + "MAP_HEADER_POKETCH_CO_2F", + "MAP_HEADER_POKETCH_CO_3F", + "MAP_HEADER_JUBILIFE_TV_1F", + "MAP_HEADER_JUBILIFE_TV_2F", + "MAP_HEADER_JUBILIFE_TV_3F", + "MAP_HEADER_JUBILIFE_TV_4F", + "MAP_HEADER_JUBILIFE_TV_2F_GALLERY", + "MAP_HEADER_JUBILIFE_TV_3F_GLOBAL_RANKING_ROOM", + "MAP_HEADER_JUBILIFE_TV_3F_GROUP_RANKING_ROOM", + "MAP_HEADER_JUBILIFE_TV_ELEVATOR", + "MAP_HEADER_JUBILIFE_CITY_SOUTH_HOUSE_1F", + "MAP_HEADER_JUBILIFE_CITY_SOUTH_HOUSE_2F", + "MAP_HEADER_JUBILIFE_CITY_SOUTH_HOUSE_3F", + "MAP_HEADER_JUBILIFE_CITY_SOUTH_HOUSE_4F", + "MAP_HEADER_JUBILIFE_CITY_UNKNOWN_HOUSE_2", + "MAP_HEADER_JUBILIFE_CITY_CONDOMINIUMS_1F", + "MAP_HEADER_JUBILIFE_CITY_CONDOMINIUMS_2F", + "MAP_HEADER_JUBILIFE_CITY_CONDOMINIUMS_3F", + "MAP_HEADER_JUBILIFE_CITY_CONDOMINIUMS_4F", + "MAP_HEADER_GLOBAL_TERMINAL_1F", + "MAP_HEADER_TRAINERS_SCHOOL", + "MAP_HEADER_JUBILIFE_CITY_SOUTHWEST_HOUSE_1F", + "MAP_HEADER_JUBILIFE_CITY_UNKNOWN_HOUSE_3", + "MAP_HEADER_JUBILIFE_CITY_UNKNOWN_HOUSE_4", + "MAP_HEADER_CANALAVE_CITY", + "MAP_HEADER_CANALAVE_CITY_MART", + "MAP_HEADER_CANALAVE_CITY_GYM", + "MAP_HEADER_CANALAVE_CITY_POKECENTER_1F", + "MAP_HEADER_CANALAVE_CITY_POKECENTER_2F", + "MAP_HEADER_CANALAVE_LIBRARY_1F", + "MAP_HEADER_CANALAVE_LIBRARY_2F", + "MAP_HEADER_CANALAVE_LIBRARY_3F", + "MAP_HEADER_CANALAVE_CITY_SOUTHEAST_HOUSE", + "MAP_HEADER_CANALAVE_CITY_EAST_HOUSE", + "MAP_HEADER_CANALAVE_CITY_HARBOR_INN", + "MAP_HEADER_CANALAVE_CITY_SAILOR_ELDRITCH_HOUSE", + "MAP_HEADER_OREBURGH_CITY", + "MAP_HEADER_OREBURGH_CITY_MART", + "MAP_HEADER_OREBURGH_CITY_GYM", + "MAP_HEADER_OREBURGH_CITY_POKECENTER_1F", + "MAP_HEADER_OREBURGH_CITY_POKECENTER_2F", + "MAP_HEADER_OREBURGH_CITY_NORTHWEST_HOUSE_1F", + "MAP_HEADER_OREBURGH_CITY_NORTHWEST_HOUSE_2F", + "MAP_HEADER_OREBURGH_CITY_NORTHWEST_HOUSE_3F", + "MAP_HEADER_OREBURGH_CITY_NORTHWEST_HOUSE_4F", + "MAP_HEADER_OREBURGH_CITY_NORTH_HOUSE_1F", + "MAP_HEADER_OREBURGH_CITY_NORTH_HOUSE_2F", + "MAP_HEADER_OREBURGH_CITY_NORTH_HOUSE_3F", + "MAP_HEADER_OREBURGH_CITY_NORTH_HOUSE_4F", + "MAP_HEADER_OREBURGH_CITY_MIDDLE_HOUSE", + "MAP_HEADER_MINING_MUSEUM", + "MAP_HEADER_OREBURGH_CITY_WEST_HOUSE", + "MAP_HEADER_OREBURGH_CITY_EAST_HOUSE_1F", + "MAP_HEADER_OREBURGH_CITY_EAST_HOUSE_2F", + "MAP_HEADER_OREBURGH_CITY_EAST_HOUSE_3F", + "MAP_HEADER_OREBURGH_CITY_SOUTH_HOUSE", + "MAP_HEADER_ETERNA_CITY", + "MAP_HEADER_ETERNA_CITY_MART", + "MAP_HEADER_ETERNA_CITY_GYM", + "MAP_HEADER_ETERNA_CITY_DP_GYM", + "MAP_HEADER_ETERNA_CITY_POKECENTER_1F", + "MAP_HEADER_ETERNA_CITY_POKECENTER_2F", + "MAP_HEADER_CYCLE_SHOP", + "MAP_HEADER_TEAM_GALACTIC_ETERNA_BUILDING_1F", + "MAP_HEADER_TEAM_GALACTIC_ETERNA_BUILDING_2F", + "MAP_HEADER_TEAM_GALACTIC_ETERNA_BUILDING_3F", + "MAP_HEADER_TEAM_GALACTIC_ETERNA_BUILDING_4F", + "MAP_HEADER_ETERNA_CITY_CONDOMINIUMS_1F", + "MAP_HEADER_ETERNA_CITY_CONDOMINIUMS_2F", + "MAP_HEADER_ETERNA_CITY_CONDOMINIUMS_3F", + "MAP_HEADER_ETERNA_CITY_CONDOMINIUMS_4F", + "MAP_HEADER_ROUTE_206_CYCLING_ROAD_NORTH_GATE", + "MAP_HEADER_ETERNA_CITY_NORTH_HOUSE", + "MAP_HEADER_ETERNA_CITY_SOUTH_HOUSE", + "MAP_HEADER_ETERNA_CITY_EAST_HOUSE", + "MAP_HEADER_ETERNA_CITY_UNDERGROUND_MAN_HOUSE", + "MAP_HEADER_ETERNA_CITY_UNKNOWN_HOUSE", + "MAP_HEADER_HEARTHOME_CITY", + "MAP_HEADER_HEARTHOME_CITY_MART", + "MAP_HEADER_HEARTHOME_CITY_GYM_ENTRANCE_ROOM", + "MAP_HEADER_HEARTHOME_CITY_GYM_TRAINER_ROOM_1", + "MAP_HEADER_HEARTHOME_CITY_GYM_TRAINER_ROOM_2", + "MAP_HEADER_HEARTHOME_CITY_GYM_LEADER_ROOM", + "MAP_HEADER_HEARTHOME_CITY_DP_GYM_TRAINER_ROOM_1", + "MAP_HEADER_HEARTHOME_CITY_DP_GYM_ELEVATOR_ROOM_1", + "MAP_HEADER_HEARTHOME_CITY_DP_GYM_TRAINER_ROOM_2", + "MAP_HEADER_HEARTHOME_CITY_DP_GYM_ELEVATOR_ROOM_2", + "MAP_HEADER_HEARTHOME_CITY_DP_GYM_TRAINER_ROOM_3", + "MAP_HEADER_HEARTHOME_CITY_DP_GYM_TRAINER_ROOM_4", + "MAP_HEADER_HEARTHOME_CITY_DP_GYM_TRAINER_ROOM_5", + "MAP_HEADER_HEARTHOME_CITY_DP_GYM_TRAINER_ROOM_6", + "MAP_HEADER_HEARTHOME_CITY_DP_GYM_LEADER_ROOM", + "MAP_HEADER_HEARTHOME_CITY_POKECENTER_1F", + "MAP_HEADER_HEARTHOME_CITY_POKECENTER_2F", + "MAP_HEADER_HEARTHOME_CITY_SOUTHEAST_HOUSE_1F", + "MAP_HEADER_HEARTHOME_CITY_SOUTHEAST_HOUSE_2F", + "MAP_HEADER_HEARTHOME_CITY_SOUTHEAST_HOUSE_ELEVATOR", + "MAP_HEADER_HEARTHOME_CITY_POKEMON_FAN_CLUB", + "MAP_HEADER_HEARTHOME_CITY_WEST_GATE_TO_AMITY_SQUARE", + "MAP_HEADER_HEARTHOME_CITY_EAST_GATE_TO_AMITY_SQUARE", + "MAP_HEADER_ROUTE_208_GATE_TO_HEARTHOME_CITY", + "MAP_HEADER_ROUTE_209_GATE_TO_HEARTHOME_CITY", + "MAP_HEADER_ROUTE_212_GATE_TO_HEARTHOME_CITY", + "MAP_HEADER_HEARTHOME_CITY_NORTHEAST_HOUSE_1F", + "MAP_HEADER_HEARTHOME_CITY_NORTHEAST_HOUSE_2F", + "MAP_HEADER_HEARTHOME_CITY_NORTHEAST_HOUSE_ELEVATOR", + "MAP_HEADER_HEARTHOME_CITY_NORTHWEST_HOUSE", + "MAP_HEADER_POFFIN_HOUSE", + "MAP_HEADER_CONTEST_HALL_LOBBY", + "MAP_HEADER_CONTEST_HALL_STAGE_ONGOING_CONTEST", + "MAP_HEADER_FOREIGN_BUILDING", + "MAP_HEADER_PASTORIA_CITY", + "MAP_HEADER_PASTORIA_CITY_MART", + "MAP_HEADER_PASTORIA_CITY_GYM", + "MAP_HEADER_PASTORIA_CITY_POKECENTER_1F", + "MAP_HEADER_PASTORIA_CITY_POKECENTER_2F", + "MAP_HEADER_PASTORIA_CITY_OBSERVATORY_GATE_1F", + "MAP_HEADER_PASTORIA_CITY_OBSERVATORY_GATE_2F", + "MAP_HEADER_PASTORIA_CITY_SOUTHWEST_HOUSE", + "MAP_HEADER_PASTORIA_CITY_MIDDLE_HOUSE", + "MAP_HEADER_PASTORIA_CITY_EAST_HOUSE", + "MAP_HEADER_PASTORIA_CITY_NORTH_HOUSE", + "MAP_HEADER_PASTORIA_CITY_NORTHEAST_HOUSE", + "MAP_HEADER_VEILSTONE_CITY", + "MAP_HEADER_VEILSTONE_CITY_GYM", + "MAP_HEADER_VEILSTONE_CITY_POKECENTER_1F", + "MAP_HEADER_VEILSTONE_CITY_POKECENTER_2F", + "MAP_HEADER_GAME_CORNER", + "MAP_HEADER_VEILSTONE_STORE_1F", + "MAP_HEADER_VEILSTONE_STORE_2F", + "MAP_HEADER_VEILSTONE_STORE_3F", + "MAP_HEADER_VEILSTONE_STORE_4F", + "MAP_HEADER_VEILSTONE_STORE_5F", + "MAP_HEADER_VEILSTONE_STORE_ELEVATOR", + "MAP_HEADER_VEILSTONE_CITY_GALACTIC_WAREHOUSE", + "MAP_HEADER_VEILSTONE_CITY_PRIZE_EXCHANGE", + "MAP_HEADER_VEILSTONE_CITY_SOUTHEAST_HOUSE", + "MAP_HEADER_VEILSTONE_CITY_NORTHWEST_HOUSE", + "MAP_HEADER_VEILSTONE_CITY_NORTHEAST_HOUSE", + "MAP_HEADER_VEILSTONE_CITY_SOUTHWEST_HOUSE", + "MAP_HEADER_ROUTE_215_GATE_TO_VEILSTONE_CITY", + "MAP_HEADER_SUNYSHORE_CITY", + "MAP_HEADER_SUNYSHORE_CITY_POKECENTER_1F", + "MAP_HEADER_SUNYSHORE_CITY_POKECENTER_2F", + "MAP_HEADER_SUNYSHORE_CITY_MART", + "MAP_HEADER_SUNYSHORE_CITY_GYM_ROOM_1", + "MAP_HEADER_SUNYSHORE_CITY_GYM_ROOM_2", + "MAP_HEADER_SUNYSHORE_CITY_GYM_ROOM_3", + "MAP_HEADER_SUNYSHORE_MARKET", + "MAP_HEADER_SUNYSHORE_CITY_NORTHEAST_HOUSE", + "MAP_HEADER_SUNYSHORE_CITY_WEST_HOUSE", + "MAP_HEADER_SUNYSHORE_CITY_NORTHWEST_HOUSE", + "MAP_HEADER_SUNYSHORE_CITY_UNKNOWN_HOUSE_1", + "MAP_HEADER_SUNYSHORE_CITY_UNKNOWN_HOUSE_2", + "MAP_HEADER_SUNYSHORE_CITY_EAST_HOUSE", + "MAP_HEADER_VISTA_LIGHTHOUSE", + "MAP_HEADER_SNOWPOINT_CITY", + "MAP_HEADER_SNOWPOINT_CITY_MART", + "MAP_HEADER_SNOWPOINT_CITY_GYM", + "MAP_HEADER_SNOWPOINT_CITY_POKECENTER_1F", + "MAP_HEADER_SNOWPOINT_CITY_POKECENTER_2F", + "MAP_HEADER_SNOWPOINT_CITY_WEST_HOUSE", + "MAP_HEADER_SNOWPOINT_CITY_EAST_HOUSE", + "MAP_HEADER_POKEMON_LEAGUE", + "MAP_HEADER_POKEMON_LEAGUE_SOUTH_POKECENTER_1F", + "MAP_HEADER_POKEMON_LEAGUE_SOUTH_POKECENTER_2F", + "MAP_HEADER_POKEMON_LEAGUE_NORTH_POKECENTER_1F", + "MAP_HEADER_POKEMON_LEAGUE_ELEVATOR_TO_AARON_ROOM", + "MAP_HEADER_POKEMON_LEAGUE_AARON_ROOM", + "MAP_HEADER_POKEMON_LEAGUE_ELEVATOR_TO_BERTHA_ROOM", + "MAP_HEADER_POKEMON_LEAGUE_BERTHA_ROOM", + "MAP_HEADER_POKEMON_LEAGUE_ELEVATOR_TO_FLINT_ROOM", + "MAP_HEADER_POKEMON_LEAGUE_FLINT_ROOM", + "MAP_HEADER_POKEMON_LEAGUE_ELEVATOR_TO_LUCIAN_ROOM", + "MAP_HEADER_POKEMON_LEAGUE_LUCIAN_ROOM", + "MAP_HEADER_POKEMON_LEAGUE_ELEVATOR_TO_CHAMPION_ROOM", + "MAP_HEADER_POKEMON_LEAGUE_CHAMPION_ROOM", + "MAP_HEADER_POKEMON_LEAGUE_ELEVATOR_TO_HALL_OF_FAME", + "MAP_HEADER_POKEMON_LEAGUE_HALL_OF_FAME", + "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_ROUTE_225_GATE_TO_FIGHT_AREA", + "MAP_HEADER_FIGHT_AREA_MIDDLE_HOUSE", + "MAP_HEADER_FIGHT_AREA_SOUTH_HOUSE", + "MAP_HEADER_FIGHT_AREA_UNKNOWN_HOUSE", + "MAP_HEADER_UNKNOWN_197", + "MAP_HEADER_OREBURGH_MINE_B1F", + "MAP_HEADER_OREBURGH_MINE_B2F", + "MAP_HEADER_VALLEY_WINDWORKS_OUTSIDE", + "MAP_HEADER_VALLEY_WINDWORKS_BUILDING", + "MAP_HEADER_ETERNA_FOREST_OUTSIDE", + "MAP_HEADER_ETERNA_FOREST", + "MAP_HEADER_FUEGO_IRONWORKS_OUTSIDE", + "MAP_HEADER_FUEGO_IRONWORKS_BUILDING", + "MAP_HEADER_UNKNOWN_206", + "MAP_HEADER_MT_CORONET_1F_SOUTH", + "MAP_HEADER_MT_CORONET_2F", + "MAP_HEADER_MT_CORONET_3F", + "MAP_HEADER_MT_CORONET_OUTSIDE_NORTH", + "MAP_HEADER_MT_CORONET_OUTSIDE_SOUTH", + "MAP_HEADER_MT_CORONET_4F_ROOMS_1_AND_2", + "MAP_HEADER_MT_CORONET_4F_ROOM_3", + "MAP_HEADER_MT_CORONET_5F", + "MAP_HEADER_MT_CORONET_6F", + "MAP_HEADER_MT_CORONET_1F_TUNNEL_ROOM", + "MAP_HEADER_MT_CORONET_1F_NORTH_ROOM_2", + "MAP_HEADER_MT_CORONET_1F_NORTH_ROOM_1", + "MAP_HEADER_MT_CORONET_B1F", + "MAP_HEADER_SPEAR_PILLAR", + "MAP_HEADER_SPEAR_PILLAR_DISTORTED", + "MAP_HEADER_UNKNOWN_222", + "MAP_HEADER_PASTORIA_CITY_DP_GREAT_MARSH", + "MAP_HEADER_UNKNOWN_224", + "MAP_HEADER_SOLACEON_RUINS_MANIAC_TUNNEL_ROOM", + "MAP_HEADER_SOLACEON_RUINS_ROOM_1", + "MAP_HEADER_SOLACEON_RUINS_ROOM_2_NORTHEAST_DEAD_END", + "MAP_HEADER_SOLACEON_RUINS_ROOM_1_NORTHWEST_DEAD_END", + "MAP_HEADER_SOLACEON_RUINS_ROOM_2", + "MAP_HEADER_SOLACEON_RUINS_ROOM_1_SOUTHEAST_DEAD_END", + "MAP_HEADER_SOLACEON_RUINS_ROOM_3", + "MAP_HEADER_SOLACEON_RUINS_ROOM_2_SOUTHEAST_DEAD_END", + "MAP_HEADER_SOLACEON_RUINS_ROOM_6_SOUTHEAST_DEAD_END", + "MAP_HEADER_SOLACEON_RUINS_ROOM_5_SOUTHWEST_DEAD_END", + "MAP_HEADER_SOLACEON_RUINS_ROOM_3_NORTHWEST_DEAD_END", + "MAP_HEADER_SOLACEON_RUINS_ROOM_3_SOUTHWEST_DEAD_END", + "MAP_HEADER_SOLACEON_RUINS_ROOM_4", + "MAP_HEADER_SOLACEON_RUINS_ROOM_6", + "MAP_HEADER_SOLACEON_RUINS_ROOM_5", + "MAP_HEADER_SOLACEON_RUINS_ROOM_7", + "MAP_HEADER_SOLACEON_RUINS_ROOM_4_SOUTHEAST_DEAD_END", + "MAP_HEADER_SOLACEON_RUINS_ROOM_6_NORTHWEST_DEAD_END", + "MAP_HEADER_UNKNOWN_243", + "MAP_HEADER_VICTORY_ROAD_1F", + "MAP_HEADER_VICTORY_ROAD_2F", + "MAP_HEADER_VICTORY_ROAD_B1F", + "MAP_HEADER_VICTORY_ROAD_1F_ROOM_2", + "MAP_HEADER_VICTORY_ROAD_1F_ROOM_1", + "MAP_HEADER_VICTORY_ROAD_1F_ROOM_3", + "MAP_HEADER_UNKNOWN_250", + "MAP_HEADER_PAL_PARK", + "MAP_HEADER_UNKNOWN_252", + "MAP_HEADER_AMITY_SQUARE", + "MAP_HEADER_RAVAGED_PATH", + "MAP_HEADER_UNKNOWN_255", + "MAP_HEADER_FLOAROMA_MEADOW", + "MAP_HEADER_FLOAROMA_MEADOW_HOUSE", + "MAP_HEADER_OREBURGH_GATE_1F", + "MAP_HEADER_OREBURGH_GATE_B1F", + "MAP_HEADER_FULLMOON_ISLAND", + "MAP_HEADER_FULLMOON_ISLAND_FOREST", + "MAP_HEADER_STARK_MOUNTAIN_OUTSIDE", + "MAP_HEADER_STARK_MOUNTAIN_ROOM_1", + "MAP_HEADER_STARK_MOUNTAIN_ROOM_2", + "MAP_HEADER_STARK_MOUNTAIN_ROOM_3", + "MAP_HEADER_UNKNOWN_266", + "MAP_HEADER_SENDOFF_SPRING", + "MAP_HEADER_TURNBACK_CAVE_ENTRANCE", + "MAP_HEADER_TURNBACK_CAVE_PILLAR_ROOM", + "MAP_HEADER_TURNBACK_CAVE_GIRATINA_ROOM", + "MAP_HEADER_TURNBACK_CAVE_PILLAR_1_ROOM_1", + "MAP_HEADER_TURNBACK_CAVE_PILLAR_1_ROOM_2", + "MAP_HEADER_TURNBACK_CAVE_PILLAR_1_ROOM_3", + "MAP_HEADER_FLOWER_PARADISE", + "MAP_HEADER_UNKNOWN_275", + "MAP_HEADER_UNKNOWN_276", + "MAP_HEADER_UNKNOWN_277", + "MAP_HEADER_SNOWPOINT_TEMPLE_1F", + "MAP_HEADER_SNOWPOINT_TEMPLE_B1F", + "MAP_HEADER_SNOWPOINT_TEMPLE_B2F", + "MAP_HEADER_SNOWPOINT_TEMPLE_B3F", + "MAP_HEADER_SNOWPOINT_TEMPLE_B4F", + "MAP_HEADER_SNOWPOINT_TEMPLE_B5F", + "MAP_HEADER_WAYWARD_CAVE_1F", + "MAP_HEADER_WAYWARD_CAVE_B1F", + "MAP_HEADER_RUIN_MANIAC_CAVE_SHORT", + "MAP_HEADER_TROPHY_GARDEN", + "MAP_HEADER_IRON_ISLAND", + "MAP_HEADER_IRON_ISLAND_1F", + "MAP_HEADER_IRON_ISLAND_B1F_LEFT_ROOM", + "MAP_HEADER_IRON_ISLAND_B1F_RIGHT_ROOM", + "MAP_HEADER_IRON_ISLAND_B2F_RIGHT_ROOM", + "MAP_HEADER_IRON_ISLAND_B2F_LEFT_ROOM", + "MAP_HEADER_IRON_ISLAND_B3F", + "MAP_HEADER_OLD_CHATEAU", + "MAP_HEADER_OLD_CHATEAU_DINING_AREA", + "MAP_HEADER_OLD_CHATEAU_SIDE_ROOMS", + "MAP_HEADER_OLD_CHATEAU_CORRIDOR", + "MAP_HEADER_OLD_CHATEAU_BACK_WEST_ROOM", + "MAP_HEADER_OLD_CHATEAU_BACK_MIDDLE_WEST_ROOM", + "MAP_HEADER_OLD_CHATEAU_BACK_MIDDLE_ROOM", + "MAP_HEADER_OLD_CHATEAU_BACK_MIDDLE_EAST_ROOM", + "MAP_HEADER_OLD_CHATEAU_BACK_EAST_ROOM", + "MAP_HEADER_UNKNOWN_304", + "MAP_HEADER_GALACTIC_HQ_1F", + "MAP_HEADER_GALACTIC_HQ_2F", + "MAP_HEADER_GALACTIC_HQ_3F", + "MAP_HEADER_GALACTIC_HQ_4F", + "MAP_HEADER_GALACTIC_HQ_B1F", + "MAP_HEADER_GALACTIC_HQ_B2F", + "MAP_HEADER_LAKE_VERITY_LOW_WATER", + "MAP_HEADER_LAKE_VERITY", + "MAP_HEADER_VERITY_CAVERN", + "MAP_HEADER_LAKE_VALOR_DRAINED", + "MAP_HEADER_LAKE_VALOR", + "MAP_HEADER_VALOR_CAVERN", + "MAP_HEADER_LAKE_ACUITY_LOW_WATER", + "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_UNKNOWN_324", + "MAP_HEADER_UNKNOWN_325", + "MAP_HEADER_BATTLE_TOWER", + "MAP_HEADER_BATTLE_TOWER_ELEVATOR", + "MAP_HEADER_BATTLE_TOWER_CORRIDOR", + "MAP_HEADER_BATTLE_TOWER_CORRIDOR_MULTI", + "MAP_HEADER_BATTLE_TOWER_BATTLE_ROOM", + "MAP_HEADER_BATTLE_TOWER_MULTI_BATTLE_ROOM", + "MAP_HEADER_COMMUNICATION_CLUB_COLOSSEUM_2P", + "MAP_HEADER_COMMUNICATION_CLUB_COLOSSEUM_4P", + "MAP_HEADER_VERITY_LAKEFRONT", + "MAP_HEADER_VERITY_LAKEFRONT_UNKNOWN_HOUSE", + "MAP_HEADER_VALOR_LAKEFRONT", + "MAP_HEADER_RESTAURANT", + "MAP_HEADER_GRAND_LAKE_VALOR_LAKEFRONT_EAST_HOUSE", + "MAP_HEADER_GRAND_LAKE_VALOR_LAKEFRONT_WEST_HOUSE", + "MAP_HEADER_ACUITY_LAKEFRONT", + "MAP_HEADER_SPRING_PATH", + "MAP_HEADER_ROUTE_201", + "MAP_HEADER_ROUTE_202", + "MAP_HEADER_ROUTE_203", + "MAP_HEADER_ROUTE_204_SOUTH", + "MAP_HEADER_ROUTE_204_NORTH", + "MAP_HEADER_ROUTE_205_SOUTH", + "MAP_HEADER_ROUTE_205_HOUSE", + "MAP_HEADER_ROUTE_205_NORTH", + "MAP_HEADER_ROUTE_206", + "MAP_HEADER_ROUTE_206_CYCLING_ROAD_SOUTH_GATE", + "MAP_HEADER_GATE_BETWEEN_ETERNA_CITY_ROUTE_206", + "MAP_HEADER_ROUTE_207", + "MAP_HEADER_ROUTE_208", + "MAP_HEADER_ROUTE_208_HOUSE", + "MAP_HEADER_ROUTE_209", + "MAP_HEADER_ROUTE_209_LOST_TOWER_1F", + "MAP_HEADER_ROUTE_209_LOST_TOWER_2F", + "MAP_HEADER_ROUTE_209_LOST_TOWER_3F", + "MAP_HEADER_ROUTE_209_LOST_TOWER_4F", + "MAP_HEADER_ROUTE_209_LOST_TOWER_5F", + "MAP_HEADER_ROUTE_210_SOUTH", + "MAP_HEADER_ROUTE_210_NORTH", + "MAP_HEADER_ROUTE_210_GRANDMA_WILMA_HOUSE", + "MAP_HEADER_ROUTE_211_WEST", + "MAP_HEADER_ROUTE_211_EAST", + "MAP_HEADER_ROUTE_212_NORTH", + "MAP_HEADER_POKEMON_MANSION", + "MAP_HEADER_POKEMON_MANSION_MAIDS_ROOM", + "MAP_HEADER_POKEMON_MANSION_OFFICE", + "MAP_HEADER_ROUTE_212_SOUTH", + "MAP_HEADER_ROUTE_212_HOUSE", + "MAP_HEADER_ROUTE_213", + "MAP_HEADER_ROUTE_213_GATE_TO_PASTORIA_CITY", + "MAP_HEADER_FOOTSTEP_HOUSE", + "MAP_HEADER_GRAND_LAKE_ROUTE_213_LOBBY", + "MAP_HEADER_GRAND_LAKE_ROUTE_213_EAST_HOUSE", + "MAP_HEADER_GRAND_LAKE_ROUTE_213_NORTHWEST_HOUSE", + "MAP_HEADER_GRAND_LAKE_ROUTE_213_NORTHEAST_HOUSE", + "MAP_HEADER_ROUTE_214", + "MAP_HEADER_ROUTE_214_GATE_TO_VEILSTONE_CITY", + "MAP_HEADER_ROUTE_215", + "MAP_HEADER_ROUTE_216", + "MAP_HEADER_ROUTE_216_HOUSE", + "MAP_HEADER_ROUTE_217", + "MAP_HEADER_ROUTE_217_WEST_HOUSE", + "MAP_HEADER_ROUTE_217_NORTHEAST_HOUSE", + "MAP_HEADER_ROUTE_218", + "MAP_HEADER_ROUTE_218_GATE_TO_JUBILIFE_CITY", + "MAP_HEADER_ROUTE_218_GATE_TO_CANALAVE_CITY", + "MAP_HEADER_ROUTE_219", + "MAP_HEADER_ROUTE_221", + "MAP_HEADER_PAL_PARK_LOBBY", + "MAP_HEADER_ROUTE_221_HOUSE", + "MAP_HEADER_ROUTE_222", + "MAP_HEADER_ROUTE_222_WEST_HOUSE", + "MAP_HEADER_ROUTE_222_EAST_HOUSE", + "MAP_HEADER_ROUTE_222_GATE_TO_SUNYSHORE_CITY", + "MAP_HEADER_ROUTE_224", + "MAP_HEADER_ROUTE_225", + "MAP_HEADER_UNKNOWN_401", + "MAP_HEADER_UNKNOWN_402", + "MAP_HEADER_ROUTE_227", + "MAP_HEADER_UNKNOWN_404", + "MAP_HEADER_UNKNOWN_405", + "MAP_HEADER_ROUTE_228", + "MAP_HEADER_ROUTE_229", + "MAP_HEADER_UNKNOWN_408", + "MAP_HEADER_UNKNOWN_409", + "MAP_HEADER_RECORD_MIXING_ROOM", + "MAP_HEADER_TWINLEAF_TOWN", + "MAP_HEADER_TWINLEAF_TOWN_RIVAL_HOUSE_1F", + "MAP_HEADER_TWINLEAF_TOWN_RIVAL_HOUSE_2F", + "MAP_HEADER_TWINLEAF_TOWN_PLAYER_HOUSE_1F", + "MAP_HEADER_TWINLEAF_TOWN_PLAYER_HOUSE_2F", + "MAP_HEADER_TWINLEAF_TOWN_NORTHEAST_HOUSE", + "MAP_HEADER_TWINLEAF_TOWN_SOUTHWEST_HOUSE", + "MAP_HEADER_SANDGEM_TOWN", + "MAP_HEADER_SANDGEM_TOWN_MART", + "MAP_HEADER_SANDGEM_TOWN_POKECENTER_1F", + "MAP_HEADER_SANDGEM_TOWN_POKECENTER_2F", + "MAP_HEADER_SANDGEM_TOWN_POKEMON_RESEARCH_LAB", + "MAP_HEADER_SANDGEM_TOWN_COUNTERPART_HOUSE_1F", + "MAP_HEADER_SANDGEM_TOWN_COUNTERPART_HOUSE_2F", + "MAP_HEADER_SANDGEM_TOWN_HOUSE", + "MAP_HEADER_FLOAROMA_TOWN", + "MAP_HEADER_FLOAROMA_TOWN_MART", + "MAP_HEADER_FLOAROMA_TOWN_POKECENTER_1F", + "MAP_HEADER_FLOAROMA_TOWN_POKECENTER_2F", + "MAP_HEADER_FLOWER_SHOP", + "MAP_HEADER_FLOAROMA_TOWN_SOUTHEAST_HOUSE", + "MAP_HEADER_FLOAROMA_TOWN_MIDDLE_HOUSE", + "MAP_HEADER_SOLACEON_TOWN", + "MAP_HEADER_SOLACEON_TOWN_MART", + "MAP_HEADER_SOLACEON_TOWN_POKECENTER_1F", + "MAP_HEADER_SOLACEON_TOWN_POKECENTER_2F", + "MAP_HEADER_POKEMON_DAY_CARE", + "MAP_HEADER_SOLACEON_TOWN_NORTHEAST_HOUSE", + "MAP_HEADER_SOLACEON_TOWN_POKEMON_NEWS_PRESS", + "MAP_HEADER_SOLACEON_TOWN_NORTH_HOUSE", + "MAP_HEADER_SOLACEON_TOWN_EAST_HOUSE", + "MAP_HEADER_CELESTIC_TOWN", + "MAP_HEADER_CELESTIC_TOWN_POKECENTER_1F", + "MAP_HEADER_CELESTIC_TOWN_POKECENTER_2F", + "MAP_HEADER_CELESTIC_TOWN_NORTH_HOUSE", + "MAP_HEADER_CELESTIC_TOWN_NORTHWEST_HOUSE", + "MAP_HEADER_CELESTIC_TOWN_NORTHEAST_HOUSE", + "MAP_HEADER_CELESTIC_TOWN_SOUTHWEST_HOUSE", + "MAP_HEADER_CELESTIC_TOWN_CAVE", + "MAP_HEADER_SURVIVAL_AREA", + "MAP_HEADER_SURVIVAL_AREA_MART", + "MAP_HEADER_SURVIVAL_AREA_POKECENTER_1F", + "MAP_HEADER_SURVIVAL_AREA_POKECENTER_2F", + "MAP_HEADER_BATTLEGROUND", + "MAP_HEADER_SURVIVAL_AREA_SOUTH_HOUSE", + "MAP_HEADER_SURVIVAL_AREA_NORTH_HOUSE", + "MAP_HEADER_RESORT_AREA", + "MAP_HEADER_RESORT_AREA_MART", + "MAP_HEADER_RESORT_AREA_POKECENTER_1F", + "MAP_HEADER_RESORT_AREA_POKECENTER_2F", + "MAP_HEADER_RESORT_AREA_RIBBON_SYNDICATE_1F", + "MAP_HEADER_RESORT_AREA_RIBBON_SYNDICATE_2F", + "MAP_HEADER_RESORT_AREA_RIBBON_SYNDICATE_ELEVATOR", + "MAP_HEADER_VILLA", + "MAP_HEADER_RESORT_AREA_HOUSE", + "MAP_HEADER_UNION_ROOM", + "MAP_HEADER_ROUTE_220", + "MAP_HEADER_ROUTE_223", + "MAP_HEADER_ROUTE_226", + "MAP_HEADER_UNKNOWN_470", + "MAP_HEADER_ROUTE_230", + "MAP_HEADER_SEABREAK_PATH", + "MAP_HEADER_UNKNOWN_473", + "MAP_HEADER_JUBILIFE_CITY_POKECENTER_B1F", + "MAP_HEADER_CANALAVE_CITY_POKECENTER_B1F", + "MAP_HEADER_OREBURGH_CITY_POKECENTER_B1F", + "MAP_HEADER_ETERNA_CITY_POKECENTER_B1F", + "MAP_HEADER_HEARTHOME_CITY_POKECENTER_B1F", + "MAP_HEADER_PASTORIA_CITY_POKECENTER_B1F", + "MAP_HEADER_VEILSTONE_CITY_POKECENTER_B1F", + "MAP_HEADER_SUNYSHORE_CITY_POKECENTER_B1F", + "MAP_HEADER_SNOWPOINT_CITY_POKECENTER_B1F", + "MAP_HEADER_POKEMON_LEAGUE_SOUTH_POKECENTER_B1F", + "MAP_HEADER_FIGHT_AREA_POKECENTER_B1F", + "MAP_HEADER_SANDGEM_TOWN_POKECENTER_B1F", + "MAP_HEADER_FLOAROMA_TOWN_POKECENTER_B1F", + "MAP_HEADER_SOLACEON_TOWN_POKECENTER_B1F", + "MAP_HEADER_CELESTIC_TOWN_POKECENTER_B1F", + "MAP_HEADER_SURVIVAL_AREA_POKECENTER_B1F", + "MAP_HEADER_RESORT_AREA_POKECENTER_B1F", + "MAP_HEADER_CANALAVE_CITY_WEST_HOUSE", + "MAP_HEADER_CAFE", + "MAP_HEADER_BATTLE_TOWER_BATTLE_SALON", + "MAP_HEADER_GALACTIC_HQ_CONTROL_ROOM", + "MAP_HEADER_POKEMON_LEAGUE_NORTH_POKECENTER_2F", + "MAP_HEADER_POKEMON_LEAGUE_NORTH_POKECENTER_B1F", + "MAP_HEADER_GALACTIC_HQ_LABORATORY", + "MAP_HEADER_ROUTE_225_HOUSE", + "MAP_HEADER_ROUTE_226_HOUSE", + "MAP_HEADER_ROUTE_227_HOUSE", + "MAP_HEADER_ROUTE_228_GATE_TO_ROUTE_226", + "MAP_HEADER_ROUTE_228_NORTH_HOUSE", + "MAP_HEADER_ROUTE_228_SOUTH_HOUSE", + "MAP_HEADER_GREAT_MARSH_1", + "MAP_HEADER_GREAT_MARSH_2", + "MAP_HEADER_GREAT_MARSH_3", + "MAP_HEADER_GREAT_MARSH_4", + "MAP_HEADER_GREAT_MARSH_5", + "MAP_HEADER_GREAT_MARSH_6", + "MAP_HEADER_HALL_OF_ORIGIN", + "MAP_HEADER_UNKNOWN_511", + "MAP_HEADER_RUIN_MANIAC_CAVE_LONG", + "MAP_HEADER_MANIAC_TUNNEL", + "MAP_HEADER_IRON_ISLAND_HOUSE", + "MAP_HEADER_SOLACEON_RUINS_ROOM_5_SOUTHEAST_DEADEND", + "MAP_HEADER_VISTA_LIGHTHOUSE_ELEVATOR", + "MAP_HEADER_JUBILIFE_CITY_SOUTHWEST_HOUSE_2F", + "MAP_HEADER_TURNBACK_CAVE_PILLAR_1_ROOM_4", + "MAP_HEADER_TURNBACK_CAVE_PILLAR_1_ROOM_5", + "MAP_HEADER_TURNBACK_CAVE_PILLAR_1_ROOM_6", + "MAP_HEADER_TURNBACK_CAVE_PILLAR_2_ROOM_1", + "MAP_HEADER_TURNBACK_CAVE_PILLAR_2_ROOM_2", + "MAP_HEADER_TURNBACK_CAVE_PILLAR_2_ROOM_3", + "MAP_HEADER_TURNBACK_CAVE_PILLAR_2_ROOM_4", + "MAP_HEADER_TURNBACK_CAVE_PILLAR_2_ROOM_5", + "MAP_HEADER_TURNBACK_CAVE_PILLAR_2_ROOM_6", + "MAP_HEADER_TURNBACK_CAVE_PILLAR_3_ROOM_1", + "MAP_HEADER_TURNBACK_CAVE_PILLAR_3_ROOM_2", + "MAP_HEADER_TURNBACK_CAVE_PILLAR_3_ROOM_3", + "MAP_HEADER_TURNBACK_CAVE_PILLAR_3_ROOM_4", + "MAP_HEADER_TURNBACK_CAVE_PILLAR_3_ROOM_5", + "MAP_HEADER_TURNBACK_CAVE_PILLAR_3_ROOM_6", + "MAP_HEADER_UNKNOWN_533", + "MAP_HEADER_UNKNOWN_534", + "MAP_HEADER_UNKNOWN_535", + "MAP_HEADER_UNKNOWN_536", + "MAP_HEADER_UNKNOWN_537", + "MAP_HEADER_UNKNOWN_538", + "MAP_HEADER_UNKNOWN_539", + "MAP_HEADER_UNKNOWN_540", + "MAP_HEADER_UNKNOWN_541", + "MAP_HEADER_UNKNOWN_542", + "MAP_HEADER_UNKNOWN_543", + "MAP_HEADER_UNKNOWN_544", + "MAP_HEADER_UNKNOWN_545", + "MAP_HEADER_UNKNOWN_546", + "MAP_HEADER_UNKNOWN_547", + "MAP_HEADER_UNKNOWN_548", + "MAP_HEADER_UNKNOWN_549", + "MAP_HEADER_UNKNOWN_550", + "MAP_HEADER_UNKNOWN_551", + "MAP_HEADER_UNKNOWN_552", + "MAP_HEADER_UNKNOWN_553", + "MAP_HEADER_UNKNOWN_554", + "MAP_HEADER_UNKNOWN_555", + "MAP_HEADER_UNKNOWN_556", + "MAP_HEADER_UNKNOWN_557", + "MAP_HEADER_CONTEST_HALL_STAGE_NO_CONTEST", + "MAP_HEADER_BATTLE_FRONTIER", + "MAP_HEADER_BATTLE_FRONTIER_GATE_TO_FIGHT_AREA", + "MAP_HEADER_UNKNOWN_561", + "MAP_HEADER_BATTLE_FACTORY", + "MAP_HEADER_BATTLE_HALL", + "MAP_HEADER_BATTLE_CASTLE", + "MAP_HEADER_BATTLE_ARCADE", + "MAP_HEADER_VEILSTONE_STORE_B1F", + "MAP_HEADER_GLOBAL_TERMINAL_2F", + "MAP_HEADER_GLOBAL_TERMINAL_3F", + "MAP_HEADER_GALACTIC_HQ_HALL", + "MAP_HEADER_UNKNOWN_570", + "MAP_HEADER_ROTOMS_ROOM", + "MAP_HEADER_UNKNOWN_572", + "MAP_HEADER_DISTORTION_WORLD_1F", + "MAP_HEADER_DISTORTION_WORLD_B1F", + "MAP_HEADER_DISTORTION_WORLD_B2F", + "MAP_HEADER_DISTORTION_WORLD_B3F", + "MAP_HEADER_DISTORTION_WORLD_B4F", + "MAP_HEADER_UNKNOWN_578", + "MAP_HEADER_DISTORTION_WORLD_B5F", + "MAP_HEADER_DISTORTION_WORLD_B6F", + "MAP_HEADER_DISTORTION_WORLD_B7F", + "MAP_HEADER_DISTORTION_WORLD_GIRATINA_ROOM", + "MAP_HEADER_DISTORTION_WORLD_TURNBACK_CAVE_ROOM", + "MAP_HEADER_SPEAR_PILLAR_DIALGA", + "MAP_HEADER_SPEAR_PILLAR_PALKIA", + "MAP_HEADER_WIFI_PLAZA_ENTRANCE", + "MAP_HEADER_IRON_ISLAND_IRON_RUINS", + "MAP_HEADER_IRON_RUINS", + "MAP_HEADER_MT_CORONET_ICEBERG_RUINS", + "MAP_HEADER_ICEBERG_RUINS", + "MAP_HEADER_ROUTE_228_ROCK_PEAK_RUINS", + "MAP_HEADER_ROCK_PEAK_RUINS" + ] + } + } +} diff --git a/consts/meson.build b/consts/meson.build index dabef36599..0936c9f160 100644 --- a/consts/meson.build +++ b/consts/meson.build @@ -5,6 +5,7 @@ consts_manifests = files( 'trainer.json', 'sprites.json', 'movement.json', + 'map.json', ) gen_consts_root = meson.current_build_dir() / 'generated' From e3f48ae742d5b0b7cad1a6f448ff9dcf9bbb51b8 Mon Sep 17 00:00:00 2001 From: cbt6 <91667135+cbt6@users.noreply.github.com> Date: Fri, 12 Apr 2024 03:33:10 +0800 Subject: [PATCH 02/23] Use designated initializers in sMapHeaders --- include/data/map_headers.h | 2374 ++++++++++++++++++------------------ 1 file changed, 1188 insertions(+), 1186 deletions(-) diff --git a/include/data/map_headers.h b/include/data/map_headers.h index 2bdeec3c31..ec336495d3 100644 --- a/include/data/map_headers.h +++ b/include/data/map_headers.h @@ -1,5 +1,7 @@ +#include "consts/generated/c/map.h" + static const MapHeader sMapHeaders[] = { - { + [MAP_HEADER_EVERYWHERE] = { .unk_00 = 0x0, .unk_01 = 0x0, .mapMatrixID = 0x0, @@ -20,8 +22,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x1, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_NOTHING] = { .unk_00 = 0x0, .unk_01 = 0x0, .mapMatrixID = 0x0, @@ -42,8 +44,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_UNDERGROUND] = { .unk_00 = 0x2, .unk_01 = 0x2, .mapMatrixID = 0x2, @@ -64,8 +66,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_JUBILIFE_CITY] = { .unk_00 = 0x6, .unk_01 = 0x0, .mapMatrixID = 0x0, @@ -86,8 +88,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x1, - }, - { + }, + [MAP_HEADER_JUBILIFE_CITY_MART] = { .unk_00 = 0x16, .unk_01 = 0xF, .mapMatrixID = 122, @@ -108,8 +110,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_JUBILIFE_CITY_UNKNOWN_HOUSE_1] = { .unk_00 = 0x14, .unk_01 = 0x14, .mapMatrixID = 0x7B, @@ -130,8 +132,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_JUBILIFE_CITY_POKECENTER_1F] = { .unk_00 = 0x15, .unk_01 = 0xF, .mapMatrixID = 0x74, @@ -152,8 +154,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_JUBILIFE_CITY_POKECENTER_2F] = { .unk_00 = 0x15, .unk_01 = 0xF, .mapMatrixID = 0x75, @@ -174,8 +176,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_POKETCH_CO_1F] = { .unk_00 = 0x1F, .unk_01 = 0xF, .mapMatrixID = 0x8D, @@ -196,8 +198,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_POKETCH_CO_2F] = { .unk_00 = 0x1F, .unk_01 = 0xF, .mapMatrixID = 0x8E, @@ -218,8 +220,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_POKETCH_CO_3F] = { .unk_00 = 0x1F, .unk_01 = 0xF, .mapMatrixID = 143, @@ -240,8 +242,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_JUBILIFE_TV_1F] = { .unk_00 = 34, .unk_01 = 0xF, .mapMatrixID = 148, @@ -262,8 +264,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_JUBILIFE_TV_2F] = { .unk_00 = 34, .unk_01 = 0xF, .mapMatrixID = 149, @@ -284,8 +286,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_JUBILIFE_TV_3F] = { .unk_00 = 34, .unk_01 = 0xF, .mapMatrixID = 150, @@ -306,8 +308,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_JUBILIFE_TV_4F] = { .unk_00 = 34, .unk_01 = 0xF, .mapMatrixID = 151, @@ -328,8 +330,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_JUBILIFE_TV_2F_GALLERY] = { .unk_00 = 34, .unk_01 = 0xF, .mapMatrixID = 152, @@ -350,8 +352,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_JUBILIFE_TV_3F_GLOBAL_RANKING_ROOM] = { .unk_00 = 34, .unk_01 = 0xF, .mapMatrixID = 153, @@ -372,8 +374,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_JUBILIFE_TV_3F_GROUP_RANKING_ROOM] = { .unk_00 = 34, .unk_01 = 0xF, .mapMatrixID = 154, @@ -394,8 +396,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_JUBILIFE_TV_ELEVATOR] = { .unk_00 = 0x15, .unk_01 = 0xF, .mapMatrixID = 207, @@ -416,8 +418,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_JUBILIFE_CITY_SOUTH_HOUSE_1F] = { .unk_00 = 0x1F, .unk_01 = 0xF, .mapMatrixID = 132, @@ -438,8 +440,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_JUBILIFE_CITY_SOUTH_HOUSE_2F] = { .unk_00 = 0x1F, .unk_01 = 0xF, .mapMatrixID = 208, @@ -460,8 +462,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_JUBILIFE_CITY_SOUTH_HOUSE_3F] = { .unk_00 = 0x1F, .unk_01 = 0xF, .mapMatrixID = 208, @@ -482,8 +484,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_JUBILIFE_CITY_SOUTH_HOUSE_4F] = { .unk_00 = 0x1F, .unk_01 = 0xF, .mapMatrixID = 208, @@ -504,8 +506,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_JUBILIFE_CITY_UNKNOWN_HOUSE_2] = { .unk_00 = 0x14, .unk_01 = 0x14, .mapMatrixID = 125, @@ -526,8 +528,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_JUBILIFE_CITY_CONDOMINIUMS_1F] = { .unk_00 = 0x1F, .unk_01 = 0xF, .mapMatrixID = 132, @@ -548,8 +550,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_JUBILIFE_CITY_CONDOMINIUMS_2F] = { .unk_00 = 0x1F, .unk_01 = 0xF, .mapMatrixID = 208, @@ -570,8 +572,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_JUBILIFE_CITY_CONDOMINIUMS_3F] = { .unk_00 = 0x1F, .unk_01 = 0xF, .mapMatrixID = 208, @@ -592,8 +594,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_JUBILIFE_CITY_CONDOMINIUMS_4F] = { .unk_00 = 0x1F, .unk_01 = 0xF, .mapMatrixID = 208, @@ -614,8 +616,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_GLOBAL_TERMINAL_1F] = { .unk_00 = 40, .unk_01 = 0xF, .mapMatrixID = 205, @@ -636,8 +638,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_TRAINERS_SCHOOL] = { .unk_00 = 0x1F, .unk_01 = 0xF, .mapMatrixID = 140, @@ -658,8 +660,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_JUBILIFE_CITY_SOUTHWEST_HOUSE_1F] = { .unk_00 = 0x1F, .unk_01 = 0xF, .mapMatrixID = 132, @@ -680,8 +682,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_JUBILIFE_CITY_UNKNOWN_HOUSE_3] = { .unk_00 = 0x14, .unk_01 = 0x14, .mapMatrixID = 125, @@ -702,8 +704,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_JUBILIFE_CITY_UNKNOWN_HOUSE_4] = { .unk_00 = 0x14, .unk_01 = 0x14, .mapMatrixID = 125, @@ -724,8 +726,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_CANALAVE_CITY] = { .unk_00 = 0xF, .unk_01 = 0x9, .mapMatrixID = 0x0, @@ -746,8 +748,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x1, - }, - { + }, + [MAP_HEADER_CANALAVE_CITY_MART] = { .unk_00 = 0x16, .unk_01 = 0xF, .mapMatrixID = 122, @@ -768,8 +770,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_CANALAVE_CITY_GYM] = { .unk_00 = 0x18, .unk_01 = 0xF, .mapMatrixID = 112, @@ -790,8 +792,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_CANALAVE_CITY_POKECENTER_1F] = { .unk_00 = 0x15, .unk_01 = 0xF, .mapMatrixID = 0x74, @@ -812,8 +814,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_CANALAVE_CITY_POKECENTER_2F] = { .unk_00 = 0x15, .unk_01 = 0xF, .mapMatrixID = 0x75, @@ -834,8 +836,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_CANALAVE_LIBRARY_1F] = { .unk_00 = 0x1F, .unk_01 = 0xF, .mapMatrixID = 217, @@ -856,8 +858,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_CANALAVE_LIBRARY_2F] = { .unk_00 = 0x1F, .unk_01 = 0xF, .mapMatrixID = 218, @@ -878,8 +880,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_CANALAVE_LIBRARY_3F] = { .unk_00 = 0x1F, .unk_01 = 0xF, .mapMatrixID = 219, @@ -900,8 +902,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_CANALAVE_CITY_SOUTHEAST_HOUSE] = { .unk_00 = 0x14, .unk_01 = 0xF, .mapMatrixID = 0x7B, @@ -922,8 +924,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_CANALAVE_CITY_EAST_HOUSE] = { .unk_00 = 0x14, .unk_01 = 0xF, .mapMatrixID = 0x7B, @@ -944,8 +946,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_CANALAVE_CITY_HARBOR_INN] = { .unk_00 = 0x14, .unk_01 = 0xF, .mapMatrixID = 243, @@ -966,8 +968,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_CANALAVE_CITY_SAILOR_ELDRITCH_HOUSE] = { .unk_00 = 0x14, .unk_01 = 0xF, .mapMatrixID = 243, @@ -988,8 +990,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_OREBURGH_CITY] = { .unk_00 = 0x7, .unk_01 = 0x1, .mapMatrixID = 0x0, @@ -1010,8 +1012,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x1, - }, - { + }, + [MAP_HEADER_OREBURGH_CITY_MART] = { .unk_00 = 0x16, .unk_01 = 0xF, .mapMatrixID = 122, @@ -1032,8 +1034,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_OREBURGH_CITY_GYM] = { .unk_00 = 0x19, .unk_01 = 0xF, .mapMatrixID = 113, @@ -1054,8 +1056,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_OREBURGH_CITY_POKECENTER_1F] = { .unk_00 = 0x15, .unk_01 = 0xF, .mapMatrixID = 0x74, @@ -1076,8 +1078,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_OREBURGH_CITY_POKECENTER_2F] = { .unk_00 = 0x15, .unk_01 = 0xF, .mapMatrixID = 0x75, @@ -1098,8 +1100,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_OREBURGH_CITY_NORTHWEST_HOUSE_1F] = { .unk_00 = 0x1F, .unk_01 = 0xF, .mapMatrixID = 132, @@ -1120,8 +1122,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_OREBURGH_CITY_NORTHWEST_HOUSE_2F] = { .unk_00 = 0x1F, .unk_01 = 0xF, .mapMatrixID = 208, @@ -1142,8 +1144,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_OREBURGH_CITY_NORTHWEST_HOUSE_3F] = { .unk_00 = 0x1F, .unk_01 = 0xF, .mapMatrixID = 136, @@ -1164,8 +1166,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_OREBURGH_CITY_NORTHWEST_HOUSE_4F] = { .unk_00 = 0x1F, .unk_01 = 0xF, .mapMatrixID = 208, @@ -1186,8 +1188,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_OREBURGH_CITY_NORTH_HOUSE_1F] = { .unk_00 = 0x1F, .unk_01 = 0xF, .mapMatrixID = 132, @@ -1208,8 +1210,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_OREBURGH_CITY_NORTH_HOUSE_2F] = { .unk_00 = 0x1F, .unk_01 = 0xF, .mapMatrixID = 208, @@ -1230,8 +1232,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_OREBURGH_CITY_NORTH_HOUSE_3F] = { .unk_00 = 0x1F, .unk_01 = 0xF, .mapMatrixID = 136, @@ -1252,8 +1254,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_OREBURGH_CITY_NORTH_HOUSE_4F] = { .unk_00 = 0x1F, .unk_01 = 0xF, .mapMatrixID = 208, @@ -1274,8 +1276,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_OREBURGH_CITY_MIDDLE_HOUSE] = { .unk_00 = 0x14, .unk_01 = 0xF, .mapMatrixID = 0x7B, @@ -1296,8 +1298,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_MINING_MUSEUM] = { .unk_00 = 0x1F, .unk_01 = 0xF, .mapMatrixID = 155, @@ -1318,8 +1320,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_OREBURGH_CITY_WEST_HOUSE] = { .unk_00 = 0x14, .unk_01 = 0xF, .mapMatrixID = 0x7B, @@ -1340,8 +1342,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_OREBURGH_CITY_EAST_HOUSE_1F] = { .unk_00 = 0x1F, .unk_01 = 0xF, .mapMatrixID = 132, @@ -1362,8 +1364,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_OREBURGH_CITY_EAST_HOUSE_2F] = { .unk_00 = 0x1F, .unk_01 = 0xF, .mapMatrixID = 208, @@ -1384,8 +1386,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_OREBURGH_CITY_EAST_HOUSE_3F] = { .unk_00 = 0x1F, .unk_01 = 0xF, .mapMatrixID = 208, @@ -1406,8 +1408,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_OREBURGH_CITY_SOUTH_HOUSE] = { .unk_00 = 0x14, .unk_01 = 0xF, .mapMatrixID = 0x7B, @@ -1428,8 +1430,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_ETERNA_CITY] = { .unk_00 = 0x8, .unk_01 = 0x2, .mapMatrixID = 0x0, @@ -1450,8 +1452,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x1, - }, - { + }, + [MAP_HEADER_ETERNA_CITY_MART] = { .unk_00 = 0x16, .unk_01 = 0xF, .mapMatrixID = 122, @@ -1472,8 +1474,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_ETERNA_CITY_GYM] = { .unk_00 = 0x1A, .unk_01 = 0xF, .mapMatrixID = 220, @@ -1494,8 +1496,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_ETERNA_CITY_DP_GYM] = { .unk_00 = 0x1A, .unk_01 = 0xF, .mapMatrixID = 221, @@ -1516,8 +1518,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_ETERNA_CITY_POKECENTER_1F] = { .unk_00 = 0x15, .unk_01 = 0xF, .mapMatrixID = 0x74, @@ -1538,8 +1540,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_ETERNA_CITY_POKECENTER_2F] = { .unk_00 = 0x15, .unk_01 = 0xF, .mapMatrixID = 0x75, @@ -1560,8 +1562,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_CYCLE_SHOP] = { .unk_00 = 0x16, .unk_01 = 0xF, .mapMatrixID = 138, @@ -1582,8 +1584,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_TEAM_GALACTIC_ETERNA_BUILDING_1F] = { .unk_00 = 58, .unk_01 = 0xF, .mapMatrixID = 266, @@ -1604,8 +1606,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_TEAM_GALACTIC_ETERNA_BUILDING_2F] = { .unk_00 = 58, .unk_01 = 0xF, .mapMatrixID = 162, @@ -1626,8 +1628,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_TEAM_GALACTIC_ETERNA_BUILDING_3F] = { .unk_00 = 58, .unk_01 = 0xF, .mapMatrixID = 163, @@ -1648,8 +1650,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_TEAM_GALACTIC_ETERNA_BUILDING_4F] = { .unk_00 = 58, .unk_01 = 0xF, .mapMatrixID = 164, @@ -1670,8 +1672,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_ETERNA_CITY_CONDOMINIUMS_1F] = { .unk_00 = 0x1F, .unk_01 = 0xF, .mapMatrixID = 132, @@ -1692,8 +1694,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_ETERNA_CITY_CONDOMINIUMS_2F] = { .unk_00 = 0x1F, .unk_01 = 0xF, .mapMatrixID = 135, @@ -1714,8 +1716,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_ETERNA_CITY_CONDOMINIUMS_3F] = { .unk_00 = 0x1F, .unk_01 = 0xF, .mapMatrixID = 208, @@ -1736,8 +1738,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_ETERNA_CITY_CONDOMINIUMS_4F] = { .unk_00 = 0x1F, .unk_01 = 0xF, .mapMatrixID = 208, @@ -1758,8 +1760,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_ROUTE_206_CYCLING_ROAD_NORTH_GATE] = { .unk_00 = 50, .unk_01 = 0xF, .mapMatrixID = 259, @@ -1780,8 +1782,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_ETERNA_CITY_NORTH_HOUSE] = { .unk_00 = 0x14, .unk_01 = 0xF, .mapMatrixID = 170, @@ -1802,8 +1804,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_ETERNA_CITY_SOUTH_HOUSE] = { .unk_00 = 0x14, .unk_01 = 0xF, .mapMatrixID = 124, @@ -1824,8 +1826,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_ETERNA_CITY_EAST_HOUSE] = { .unk_00 = 0x14, .unk_01 = 0xF, .mapMatrixID = 124, @@ -1846,8 +1848,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_ETERNA_CITY_UNDERGROUND_MAN_HOUSE] = { .unk_00 = 43, .unk_01 = 0xF, .mapMatrixID = 248, @@ -1868,8 +1870,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_ETERNA_CITY_UNKNOWN_HOUSE] = { .unk_00 = 0x14, .unk_01 = 0x14, .mapMatrixID = 0x7B, @@ -1890,8 +1892,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_HEARTHOME_CITY] = { .unk_00 = 0x9, .unk_01 = 0x3, .mapMatrixID = 0x0, @@ -1912,8 +1914,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x1, - }, - { + }, + [MAP_HEADER_HEARTHOME_CITY_MART] = { .unk_00 = 0x16, .unk_01 = 0xF, .mapMatrixID = 122, @@ -1934,8 +1936,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_HEARTHOME_CITY_GYM_ENTRANCE_ROOM] = { .unk_00 = 0x1B, .unk_01 = 0xF, .mapMatrixID = 222, @@ -1956,8 +1958,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_HEARTHOME_CITY_GYM_TRAINER_ROOM_1] = { .unk_00 = 0x1B, .unk_01 = 0xF, .mapMatrixID = 223, @@ -1978,8 +1980,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_HEARTHOME_CITY_GYM_TRAINER_ROOM_2] = { .unk_00 = 0x1B, .unk_01 = 0xF, .mapMatrixID = 224, @@ -2000,8 +2002,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_HEARTHOME_CITY_GYM_LEADER_ROOM] = { .unk_00 = 0x1B, .unk_01 = 0xF, .mapMatrixID = 225, @@ -2022,8 +2024,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_HEARTHOME_CITY_DP_GYM_TRAINER_ROOM_1] = { .unk_00 = 0x1B, .unk_01 = 0xF, .mapMatrixID = 223, @@ -2044,8 +2046,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_HEARTHOME_CITY_DP_GYM_ELEVATOR_ROOM_1] = { .unk_00 = 0x1B, .unk_01 = 0xF, .mapMatrixID = 224, @@ -2066,8 +2068,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_HEARTHOME_CITY_DP_GYM_TRAINER_ROOM_2] = { .unk_00 = 0x1B, .unk_01 = 0xF, .mapMatrixID = 223, @@ -2088,8 +2090,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_HEARTHOME_CITY_DP_GYM_ELEVATOR_ROOM_2] = { .unk_00 = 0x1B, .unk_01 = 0xF, .mapMatrixID = 224, @@ -2110,8 +2112,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_HEARTHOME_CITY_DP_GYM_TRAINER_ROOM_3] = { .unk_00 = 0x1B, .unk_01 = 0xF, .mapMatrixID = 223, @@ -2132,8 +2134,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_HEARTHOME_CITY_DP_GYM_TRAINER_ROOM_4] = { .unk_00 = 0x1B, .unk_01 = 0xF, .mapMatrixID = 223, @@ -2154,8 +2156,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_HEARTHOME_CITY_DP_GYM_TRAINER_ROOM_5] = { .unk_00 = 0x1B, .unk_01 = 0xF, .mapMatrixID = 223, @@ -2176,8 +2178,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_HEARTHOME_CITY_DP_GYM_TRAINER_ROOM_6] = { .unk_00 = 0x1B, .unk_01 = 0xF, .mapMatrixID = 223, @@ -2198,8 +2200,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_HEARTHOME_CITY_DP_GYM_LEADER_ROOM] = { .unk_00 = 0x1B, .unk_01 = 0xF, .mapMatrixID = 225, @@ -2220,8 +2222,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_HEARTHOME_CITY_POKECENTER_1F] = { .unk_00 = 0x15, .unk_01 = 0xF, .mapMatrixID = 0x74, @@ -2242,8 +2244,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_HEARTHOME_CITY_POKECENTER_2F] = { .unk_00 = 0x15, .unk_01 = 0xF, .mapMatrixID = 0x75, @@ -2264,8 +2266,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_HEARTHOME_CITY_SOUTHEAST_HOUSE_1F] = { .unk_00 = 0x1F, .unk_01 = 0xF, .mapMatrixID = 209, @@ -2286,8 +2288,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_HEARTHOME_CITY_SOUTHEAST_HOUSE_2F] = { .unk_00 = 0x1F, .unk_01 = 0xF, .mapMatrixID = 210, @@ -2308,8 +2310,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_HEARTHOME_CITY_SOUTHEAST_HOUSE_ELEVATOR] = { .unk_00 = 0x15, .unk_01 = 0xF, .mapMatrixID = 207, @@ -2330,8 +2332,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_HEARTHOME_CITY_POKEMON_FAN_CLUB] = { .unk_00 = 0x14, .unk_01 = 0xF, .mapMatrixID = 156, @@ -2352,8 +2354,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_HEARTHOME_CITY_WEST_GATE_TO_AMITY_SQUARE] = { .unk_00 = 0x1F, .unk_01 = 0xF, .mapMatrixID = 157, @@ -2374,8 +2376,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_HEARTHOME_CITY_EAST_GATE_TO_AMITY_SQUARE] = { .unk_00 = 0x1F, .unk_01 = 0xF, .mapMatrixID = 157, @@ -2396,8 +2398,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_ROUTE_208_GATE_TO_HEARTHOME_CITY] = { .unk_00 = 50, .unk_01 = 0xF, .mapMatrixID = 258, @@ -2418,8 +2420,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_ROUTE_209_GATE_TO_HEARTHOME_CITY] = { .unk_00 = 50, .unk_01 = 0xF, .mapMatrixID = 258, @@ -2440,8 +2442,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_ROUTE_212_GATE_TO_HEARTHOME_CITY] = { .unk_00 = 50, .unk_01 = 0xF, .mapMatrixID = 257, @@ -2462,8 +2464,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_HEARTHOME_CITY_NORTHEAST_HOUSE_1F] = { .unk_00 = 0x1F, .unk_01 = 0xF, .mapMatrixID = 209, @@ -2484,8 +2486,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_HEARTHOME_CITY_NORTHEAST_HOUSE_2F] = { .unk_00 = 0x1F, .unk_01 = 0xF, .mapMatrixID = 210, @@ -2506,8 +2508,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_HEARTHOME_CITY_NORTHEAST_HOUSE_ELEVATOR] = { .unk_00 = 0x15, .unk_01 = 0xF, .mapMatrixID = 207, @@ -2528,8 +2530,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_HEARTHOME_CITY_NORTHWEST_HOUSE] = { .unk_00 = 43, .unk_01 = 0xF, .mapMatrixID = 245, @@ -2550,8 +2552,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_POFFIN_HOUSE] = { .unk_00 = 37, .unk_01 = 0xF, .mapMatrixID = 0xED, @@ -2572,8 +2574,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_CONTEST_HALL_LOBBY] = { .unk_00 = 32, .unk_01 = 0xF, .mapMatrixID = 165, @@ -2594,8 +2596,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_CONTEST_HALL_STAGE_ONGOING_CONTEST] = { .unk_00 = 32, .unk_01 = 0xF, .mapMatrixID = 166, @@ -2616,8 +2618,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_FOREIGN_BUILDING] = { .unk_00 = 35, .unk_01 = 0xF, .mapMatrixID = 167, @@ -2638,8 +2640,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_PASTORIA_CITY] = { .unk_00 = 0xC, .unk_01 = 0x6, .mapMatrixID = 0x0, @@ -2660,8 +2662,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x1, - }, - { + }, + [MAP_HEADER_PASTORIA_CITY_MART] = { .unk_00 = 0x16, .unk_01 = 0xF, .mapMatrixID = 206, @@ -2682,8 +2684,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_PASTORIA_CITY_GYM] = { .unk_00 = 0x17, .unk_01 = 0xF, .mapMatrixID = 111, @@ -2704,8 +2706,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_PASTORIA_CITY_POKECENTER_1F] = { .unk_00 = 0x15, .unk_01 = 0xF, .mapMatrixID = 0x74, @@ -2726,8 +2728,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_PASTORIA_CITY_POKECENTER_2F] = { .unk_00 = 0x15, .unk_01 = 0xF, .mapMatrixID = 0x75, @@ -2748,8 +2750,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_PASTORIA_CITY_OBSERVATORY_GATE_1F] = { .unk_00 = 39, .unk_01 = 0xF, .mapMatrixID = 181, @@ -2770,8 +2772,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_PASTORIA_CITY_OBSERVATORY_GATE_2F] = { .unk_00 = 39, .unk_01 = 0xF, .mapMatrixID = 182, @@ -2792,8 +2794,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_PASTORIA_CITY_SOUTHWEST_HOUSE] = { .unk_00 = 0x14, .unk_01 = 0xF, .mapMatrixID = 0x7B, @@ -2814,8 +2816,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_PASTORIA_CITY_MIDDLE_HOUSE] = { .unk_00 = 0x14, .unk_01 = 0xF, .mapMatrixID = 0x7B, @@ -2836,8 +2838,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_PASTORIA_CITY_EAST_HOUSE] = { .unk_00 = 0x14, .unk_01 = 0xF, .mapMatrixID = 125, @@ -2858,8 +2860,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_PASTORIA_CITY_NORTH_HOUSE] = { .unk_00 = 0x14, .unk_01 = 0xF, .mapMatrixID = 0x7B, @@ -2880,8 +2882,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_PASTORIA_CITY_NORTHEAST_HOUSE] = { .unk_00 = 0x14, .unk_01 = 0xF, .mapMatrixID = 0x7B, @@ -2902,8 +2904,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_VEILSTONE_CITY] = { .unk_00 = 11, .unk_01 = 0x5, .mapMatrixID = 0x0, @@ -2924,8 +2926,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x1, - }, - { + }, + [MAP_HEADER_VEILSTONE_CITY_GYM] = { .unk_00 = 29, .unk_01 = 0xF, .mapMatrixID = 115, @@ -2946,8 +2948,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_VEILSTONE_CITY_POKECENTER_1F] = { .unk_00 = 0x15, .unk_01 = 0xF, .mapMatrixID = 0x74, @@ -2968,8 +2970,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_VEILSTONE_CITY_POKECENTER_2F] = { .unk_00 = 0x15, .unk_01 = 0xF, .mapMatrixID = 0x75, @@ -2990,8 +2992,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_GAME_CORNER] = { .unk_00 = 0x16, .unk_01 = 0xF, .mapMatrixID = 139, @@ -3012,8 +3014,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_VEILSTONE_STORE_1F] = { .unk_00 = 0x16, .unk_01 = 0xF, .mapMatrixID = 172, @@ -3034,8 +3036,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_VEILSTONE_STORE_2F] = { .unk_00 = 0x16, .unk_01 = 0xF, .mapMatrixID = 173, @@ -3056,8 +3058,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_VEILSTONE_STORE_3F] = { .unk_00 = 0x16, .unk_01 = 0xF, .mapMatrixID = 174, @@ -3078,8 +3080,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_VEILSTONE_STORE_4F] = { .unk_00 = 0x16, .unk_01 = 0xF, .mapMatrixID = 175, @@ -3100,8 +3102,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_VEILSTONE_STORE_5F] = { .unk_00 = 0x16, .unk_01 = 0xF, .mapMatrixID = 176, @@ -3122,8 +3124,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_VEILSTONE_STORE_ELEVATOR] = { .unk_00 = 0x15, .unk_01 = 0xF, .mapMatrixID = 207, @@ -3144,8 +3146,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_VEILSTONE_CITY_GALACTIC_WAREHOUSE] = { .unk_00 = 0x1F, .unk_01 = 0xF, .mapMatrixID = 177, @@ -3166,8 +3168,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_VEILSTONE_CITY_PRIZE_EXCHANGE] = { .unk_00 = 0x16, .unk_01 = 0xF, .mapMatrixID = 204, @@ -3188,8 +3190,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_VEILSTONE_CITY_SOUTHEAST_HOUSE] = { .unk_00 = 0x14, .unk_01 = 0xF, .mapMatrixID = 125, @@ -3210,8 +3212,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_VEILSTONE_CITY_NORTHWEST_HOUSE] = { .unk_00 = 0x14, .unk_01 = 0xF, .mapMatrixID = 125, @@ -3232,8 +3234,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_VEILSTONE_CITY_NORTHEAST_HOUSE] = { .unk_00 = 0x14, .unk_01 = 0xF, .mapMatrixID = 0x7B, @@ -3254,8 +3256,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_VEILSTONE_CITY_SOUTHWEST_HOUSE] = { .unk_00 = 0x14, .unk_01 = 0xF, .mapMatrixID = 0x7B, @@ -3276,8 +3278,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_ROUTE_215_GATE_TO_VEILSTONE_CITY] = { .unk_00 = 50, .unk_01 = 0xF, .mapMatrixID = 258, @@ -3298,8 +3300,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_SUNYSHORE_CITY] = { .unk_00 = 0xD, .unk_01 = 0x7, .mapMatrixID = 0x0, @@ -3320,8 +3322,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x1, - }, - { + }, + [MAP_HEADER_SUNYSHORE_CITY_POKECENTER_1F] = { .unk_00 = 0x15, .unk_01 = 0xF, .mapMatrixID = 0x74, @@ -3342,8 +3344,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_SUNYSHORE_CITY_POKECENTER_2F] = { .unk_00 = 0x15, .unk_01 = 0xF, .mapMatrixID = 0x75, @@ -3364,8 +3366,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_SUNYSHORE_CITY_MART] = { .unk_00 = 0x16, .unk_01 = 0xF, .mapMatrixID = 122, @@ -3386,8 +3388,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_SUNYSHORE_CITY_GYM_ROOM_1] = { .unk_00 = 30, .unk_01 = 0xF, .mapMatrixID = 226, @@ -3408,8 +3410,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_SUNYSHORE_CITY_GYM_ROOM_2] = { .unk_00 = 30, .unk_01 = 0xF, .mapMatrixID = 227, @@ -3430,8 +3432,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_SUNYSHORE_CITY_GYM_ROOM_3] = { .unk_00 = 30, .unk_01 = 0xF, .mapMatrixID = 228, @@ -3452,8 +3454,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_SUNYSHORE_MARKET] = { .unk_00 = 38, .unk_01 = 0xF, .mapMatrixID = 203, @@ -3474,8 +3476,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_SUNYSHORE_CITY_NORTHEAST_HOUSE] = { .unk_00 = 0x14, .unk_01 = 0xF, .mapMatrixID = 243, @@ -3496,8 +3498,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_SUNYSHORE_CITY_WEST_HOUSE] = { .unk_00 = 43, .unk_01 = 0xF, .mapMatrixID = 248, @@ -3518,8 +3520,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_SUNYSHORE_CITY_NORTHWEST_HOUSE] = { .unk_00 = 0x14, .unk_01 = 0xF, .mapMatrixID = 243, @@ -3540,8 +3542,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_SUNYSHORE_CITY_UNKNOWN_HOUSE_1] = { .unk_00 = 0x14, .unk_01 = 0xF, .mapMatrixID = 243, @@ -3562,8 +3564,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_SUNYSHORE_CITY_UNKNOWN_HOUSE_2] = { .unk_00 = 0x14, .unk_01 = 0xF, .mapMatrixID = 243, @@ -3584,8 +3586,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_SUNYSHORE_CITY_EAST_HOUSE] = { .unk_00 = 0x14, .unk_01 = 0xF, .mapMatrixID = 125, @@ -3606,8 +3608,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_VISTA_LIGHTHOUSE] = { .unk_00 = 39, .unk_01 = 0xF, .mapMatrixID = 230, @@ -3628,8 +3630,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_SNOWPOINT_CITY] = { .unk_00 = 0xE, .unk_01 = 0x8, .mapMatrixID = 0x0, @@ -3650,8 +3652,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x1, - }, - { + }, + [MAP_HEADER_SNOWPOINT_CITY_MART] = { .unk_00 = 0x16, .unk_01 = 0xF, .mapMatrixID = 122, @@ -3672,8 +3674,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_SNOWPOINT_CITY_GYM] = { .unk_00 = 0x1C, .unk_01 = 0xF, .mapMatrixID = 114, @@ -3694,8 +3696,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_SNOWPOINT_CITY_POKECENTER_1F] = { .unk_00 = 0x15, .unk_01 = 0xF, .mapMatrixID = 0x74, @@ -3716,8 +3718,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_SNOWPOINT_CITY_POKECENTER_2F] = { .unk_00 = 0x15, .unk_01 = 0xF, .mapMatrixID = 0x75, @@ -3738,8 +3740,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_SNOWPOINT_CITY_WEST_HOUSE] = { .unk_00 = 0x14, .unk_01 = 0xF, .mapMatrixID = 0x7B, @@ -3760,8 +3762,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_SNOWPOINT_CITY_EAST_HOUSE] = { .unk_00 = 0x14, .unk_01 = 0xF, .mapMatrixID = 244, @@ -3782,8 +3784,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_POKEMON_LEAGUE] = { .unk_00 = 0xD, .unk_01 = 0xA, .mapMatrixID = 0x0, @@ -3804,8 +3806,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x1, - }, - { + }, + [MAP_HEADER_POKEMON_LEAGUE_SOUTH_POKECENTER_1F] = { .unk_00 = 0x15, .unk_01 = 0xF, .mapMatrixID = 0x74, @@ -3826,8 +3828,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_POKEMON_LEAGUE_SOUTH_POKECENTER_2F] = { .unk_00 = 0x15, .unk_01 = 0xF, .mapMatrixID = 0x75, @@ -3848,8 +3850,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_POKEMON_LEAGUE_NORTH_POKECENTER_1F] = { .unk_00 = 0x15, .unk_01 = 0xF, .mapMatrixID = 144, @@ -3870,8 +3872,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_POKEMON_LEAGUE_ELEVATOR_TO_AARON_ROOM] = { .unk_00 = 36, .unk_01 = 0xF, .mapMatrixID = 187, @@ -3892,8 +3894,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_POKEMON_LEAGUE_AARON_ROOM] = { .unk_00 = 36, .unk_01 = 0xF, .mapMatrixID = 183, @@ -3914,8 +3916,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_POKEMON_LEAGUE_ELEVATOR_TO_BERTHA_ROOM] = { .unk_00 = 36, .unk_01 = 0xF, .mapMatrixID = 188, @@ -3936,8 +3938,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_POKEMON_LEAGUE_BERTHA_ROOM] = { .unk_00 = 36, .unk_01 = 0xF, .mapMatrixID = 184, @@ -3958,8 +3960,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_POKEMON_LEAGUE_ELEVATOR_TO_FLINT_ROOM] = { .unk_00 = 36, .unk_01 = 0xF, .mapMatrixID = 188, @@ -3980,8 +3982,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_POKEMON_LEAGUE_FLINT_ROOM] = { .unk_00 = 36, .unk_01 = 0xF, .mapMatrixID = 185, @@ -4002,8 +4004,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_POKEMON_LEAGUE_ELEVATOR_TO_LUCIAN_ROOM] = { .unk_00 = 36, .unk_01 = 0xF, .mapMatrixID = 188, @@ -4024,8 +4026,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_POKEMON_LEAGUE_LUCIAN_ROOM] = { .unk_00 = 36, .unk_01 = 0xF, .mapMatrixID = 186, @@ -4046,8 +4048,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_POKEMON_LEAGUE_ELEVATOR_TO_CHAMPION_ROOM] = { .unk_00 = 36, .unk_01 = 0xF, .mapMatrixID = 189, @@ -4068,8 +4070,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_POKEMON_LEAGUE_CHAMPION_ROOM] = { .unk_00 = 36, .unk_01 = 0xF, .mapMatrixID = 190, @@ -4090,8 +4092,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_POKEMON_LEAGUE_ELEVATOR_TO_HALL_OF_FAME] = { .unk_00 = 36, .unk_01 = 0xF, .mapMatrixID = 192, @@ -4112,8 +4114,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_POKEMON_LEAGUE_HALL_OF_FAME] = { .unk_00 = 36, .unk_01 = 0xF, .mapMatrixID = 191, @@ -4134,8 +4136,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_FIGHT_AREA] = { .unk_00 = 0x13, .unk_01 = 0xD, .mapMatrixID = 0x0, @@ -4156,8 +4158,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x1, - }, - { + }, + [MAP_HEADER_FIGHT_AREA_POKECENTER_1F] = { .unk_00 = 0x15, .unk_01 = 0xF, .mapMatrixID = 0x74, @@ -4178,8 +4180,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_FIGHT_AREA_POKECENTER_2F] = { .unk_00 = 0x15, .unk_01 = 0xF, .mapMatrixID = 0x75, @@ -4200,8 +4202,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_FIGHT_AREA_MART] = { .unk_00 = 0x16, .unk_01 = 0xF, .mapMatrixID = 122, @@ -4222,8 +4224,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_BATTLE_PARK_GATE_TO_FIGHT_AREA] = { .unk_00 = 44, .unk_01 = 0xF, .mapMatrixID = 250, @@ -4244,8 +4246,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_ROUTE_225_GATE_TO_FIGHT_AREA] = { .unk_00 = 50, .unk_01 = 0xF, .mapMatrixID = 257, @@ -4266,8 +4268,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_FIGHT_AREA_MIDDLE_HOUSE] = { .unk_00 = 0x14, .unk_01 = 0xF, .mapMatrixID = 0x7B, @@ -4288,8 +4290,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_FIGHT_AREA_SOUTH_HOUSE] = { .unk_00 = 0x14, .unk_01 = 0xF, .mapMatrixID = 0x7B, @@ -4310,8 +4312,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_FIGHT_AREA_UNKNOWN_HOUSE] = { .unk_00 = 0x14, .unk_01 = 0xF, .mapMatrixID = 0x7B, @@ -4332,8 +4334,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_UNKNOWN_197] = { .unk_00 = 55, .unk_01 = 55, .mapMatrixID = 0x5, @@ -4354,8 +4356,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x1, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_OREBURGH_MINE_B1F] = { .unk_00 = 55, .unk_01 = 0xF, .mapMatrixID = 0x5, @@ -4376,8 +4378,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x1, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_OREBURGH_MINE_B2F] = { .unk_00 = 55, .unk_01 = 0xF, .mapMatrixID = 0x6, @@ -4398,8 +4400,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x1, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_VALLEY_WINDWORKS_OUTSIDE] = { .unk_00 = 0x8, .unk_01 = 0x2, .mapMatrixID = 0x0, @@ -4420,8 +4422,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x1, - }, - { + }, + [MAP_HEADER_VALLEY_WINDWORKS_BUILDING] = { .unk_00 = 0x1F, .unk_01 = 0xF, .mapMatrixID = 234, @@ -4442,8 +4444,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_ETERNA_FOREST_OUTSIDE] = { .unk_00 = 0x8, .unk_01 = 0x2, .mapMatrixID = 0x0, @@ -4464,8 +4466,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x1, - }, - { + }, + [MAP_HEADER_ETERNA_FOREST] = { .unk_00 = 54, .unk_01 = 0xF, .mapMatrixID = 0x7, @@ -4486,8 +4488,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x1, - }, - { + }, + [MAP_HEADER_FUEGO_IRONWORKS_OUTSIDE] = { .unk_00 = 0x8, .unk_01 = 0x2, .mapMatrixID = 0x0, @@ -4508,8 +4510,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x1, - }, - { + }, + [MAP_HEADER_FUEGO_IRONWORKS_BUILDING] = { .unk_00 = 67, .unk_01 = 0xF, .mapMatrixID = 0x8, @@ -4530,8 +4532,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_UNKNOWN_206] = { .unk_00 = 0x6, .unk_01 = 0x0, .mapMatrixID = 0x0, @@ -4552,8 +4554,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_MT_CORONET_1F_SOUTH] = { .unk_00 = 0x45, .unk_01 = 0xF, .mapMatrixID = 0x9, @@ -4574,8 +4576,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x1, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_MT_CORONET_2F] = { .unk_00 = 0x45, .unk_01 = 0xF, .mapMatrixID = 0xA, @@ -4596,8 +4598,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x1, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_MT_CORONET_3F] = { .unk_00 = 0x45, .unk_01 = 0xF, .mapMatrixID = 11, @@ -4618,8 +4620,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x1, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_MT_CORONET_OUTSIDE_NORTH] = { .unk_00 = 0xE, .unk_01 = 0x8, .mapMatrixID = 0xC, @@ -4640,8 +4642,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x1, - }, - { + }, + [MAP_HEADER_MT_CORONET_OUTSIDE_SOUTH] = { .unk_00 = 0xE, .unk_01 = 0x8, .mapMatrixID = 0xD, @@ -4662,8 +4664,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x1, - }, - { + }, + [MAP_HEADER_MT_CORONET_4F_ROOMS_1_AND_2] = { .unk_00 = 70, .unk_01 = 0xF, .mapMatrixID = 0xE, @@ -4684,8 +4686,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x1, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_MT_CORONET_4F_ROOM_3] = { .unk_00 = 70, .unk_01 = 0xF, .mapMatrixID = 0xF, @@ -4706,8 +4708,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x1, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_MT_CORONET_5F] = { .unk_00 = 70, .unk_01 = 0xF, .mapMatrixID = 0x10, @@ -4728,8 +4730,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x1, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_MT_CORONET_6F] = { .unk_00 = 70, .unk_01 = 0xF, .mapMatrixID = 0x11, @@ -4750,8 +4752,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x1, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_MT_CORONET_1F_TUNNEL_ROOM] = { .unk_00 = 0x45, .unk_01 = 0xF, .mapMatrixID = 0x12, @@ -4772,8 +4774,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x1, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_MT_CORONET_1F_NORTH_ROOM_2] = { .unk_00 = 0x45, .unk_01 = 0xF, .mapMatrixID = 0x13, @@ -4794,8 +4796,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x1, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_MT_CORONET_1F_NORTH_ROOM_1] = { .unk_00 = 0x45, .unk_01 = 0xF, .mapMatrixID = 0x14, @@ -4816,8 +4818,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x1, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_MT_CORONET_B1F] = { .unk_00 = 0x45, .unk_01 = 0xF, .mapMatrixID = 0x15, @@ -4838,8 +4840,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x1, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_SPEAR_PILLAR] = { .unk_00 = 0x3C, .unk_01 = 0xF, .mapMatrixID = 0x16, @@ -4860,8 +4862,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_SPEAR_PILLAR_DISTORTED] = { .unk_00 = 0x3C, .unk_01 = 0xF, .mapMatrixID = 0x17, @@ -4882,8 +4884,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_UNKNOWN_222] = { .unk_00 = 0xC, .unk_01 = 0x6, .mapMatrixID = 0x0, @@ -4904,8 +4906,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_PASTORIA_CITY_DP_GREAT_MARSH] = { .unk_00 = 63, .unk_01 = 0xF, .mapMatrixID = 0x18, @@ -4926,8 +4928,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_UNKNOWN_224] = { .unk_00 = 0xA, .unk_01 = 0x4, .mapMatrixID = 0x0, @@ -4948,8 +4950,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_SOLACEON_RUINS_MANIAC_TUNNEL_ROOM] = { .unk_00 = 56, .unk_01 = 0xF, .mapMatrixID = 0x19, @@ -4970,8 +4972,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x1, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_SOLACEON_RUINS_ROOM_1] = { .unk_00 = 56, .unk_01 = 0xF, .mapMatrixID = 0x1A, @@ -4992,8 +4994,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x1, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_SOLACEON_RUINS_ROOM_2_NORTHEAST_DEAD_END] = { .unk_00 = 56, .unk_01 = 0xF, .mapMatrixID = 40, @@ -5014,8 +5016,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x1, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_SOLACEON_RUINS_ROOM_1_NORTHWEST_DEAD_END] = { .unk_00 = 56, .unk_01 = 0xF, .mapMatrixID = 35, @@ -5036,8 +5038,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x1, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_SOLACEON_RUINS_ROOM_2] = { .unk_00 = 56, .unk_01 = 0xF, .mapMatrixID = 39, @@ -5058,8 +5060,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x1, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_SOLACEON_RUINS_ROOM_1_SOUTHEAST_DEAD_END] = { .unk_00 = 56, .unk_01 = 0xF, .mapMatrixID = 0x1F, @@ -5080,8 +5082,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x1, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_SOLACEON_RUINS_ROOM_3] = { .unk_00 = 56, .unk_01 = 0xF, .mapMatrixID = 34, @@ -5102,8 +5104,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x1, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_SOLACEON_RUINS_ROOM_2_SOUTHEAST_DEAD_END] = { .unk_00 = 56, .unk_01 = 0xF, .mapMatrixID = 0x1F, @@ -5124,8 +5126,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x1, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_SOLACEON_RUINS_ROOM_6_SOUTHEAST_DEAD_END] = { .unk_00 = 56, .unk_01 = 0xF, .mapMatrixID = 40, @@ -5146,8 +5148,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x1, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_SOLACEON_RUINS_ROOM_5_SOUTHWEST_DEAD_END] = { .unk_00 = 56, .unk_01 = 0xF, .mapMatrixID = 42, @@ -5168,8 +5170,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x1, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_SOLACEON_RUINS_ROOM_3_NORTHWEST_DEAD_END] = { .unk_00 = 56, .unk_01 = 0xF, .mapMatrixID = 35, @@ -5190,8 +5192,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x1, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_SOLACEON_RUINS_ROOM_3_SOUTHWEST_DEAD_END] = { .unk_00 = 56, .unk_01 = 0xF, .mapMatrixID = 35, @@ -5212,8 +5214,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x1, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_SOLACEON_RUINS_ROOM_4] = { .unk_00 = 56, .unk_01 = 0xF, .mapMatrixID = 36, @@ -5234,8 +5236,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x1, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_SOLACEON_RUINS_ROOM_6] = { .unk_00 = 56, .unk_01 = 0xF, .mapMatrixID = 34, @@ -5256,8 +5258,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x1, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_SOLACEON_RUINS_ROOM_5] = { .unk_00 = 56, .unk_01 = 0xF, .mapMatrixID = 30, @@ -5278,8 +5280,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x1, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_SOLACEON_RUINS_ROOM_7] = { .unk_00 = 56, .unk_01 = 0xF, .mapMatrixID = 41, @@ -5300,8 +5302,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x1, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_SOLACEON_RUINS_ROOM_4_SOUTHEAST_DEAD_END] = { .unk_00 = 56, .unk_01 = 0xF, .mapMatrixID = 0x1F, @@ -5322,8 +5324,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x1, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_SOLACEON_RUINS_ROOM_6_NORTHWEST_DEAD_END] = { .unk_00 = 56, .unk_01 = 0xF, .mapMatrixID = 35, @@ -5344,8 +5346,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x1, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_UNKNOWN_243] = { .unk_00 = 0xE, .unk_01 = 0x8, .mapMatrixID = 0x0, @@ -5366,8 +5368,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_VICTORY_ROAD_1F] = { .unk_00 = 71, .unk_01 = 0xF, .mapMatrixID = 43, @@ -5388,8 +5390,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x1, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_VICTORY_ROAD_2F] = { .unk_00 = 71, .unk_01 = 0xF, .mapMatrixID = 44, @@ -5410,8 +5412,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x1, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_VICTORY_ROAD_B1F] = { .unk_00 = 71, .unk_01 = 0xF, .mapMatrixID = 45, @@ -5432,8 +5434,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x1, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_VICTORY_ROAD_1F_ROOM_2] = { .unk_00 = 71, .unk_01 = 0xF, .mapMatrixID = 46, @@ -5454,8 +5456,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x1, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_VICTORY_ROAD_1F_ROOM_1] = { .unk_00 = 71, .unk_01 = 0xF, .mapMatrixID = 47, @@ -5476,8 +5478,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x1, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_VICTORY_ROAD_1F_ROOM_3] = { .unk_00 = 71, .unk_01 = 0xF, .mapMatrixID = 48, @@ -5498,8 +5500,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x1, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_UNKNOWN_250] = { .unk_00 = 0x4, .unk_01 = 0x4, .mapMatrixID = 49, @@ -5520,8 +5522,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x1, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_PAL_PARK] = { .unk_00 = 61, .unk_01 = 0xF, .mapMatrixID = 49, @@ -5542,8 +5544,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_UNKNOWN_252] = { .unk_00 = 0x9, .unk_01 = 0x3, .mapMatrixID = 0x0, @@ -5564,8 +5566,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_AMITY_SQUARE] = { .unk_00 = 59, .unk_01 = 0xF, .mapMatrixID = 50, @@ -5586,8 +5588,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_RAVAGED_PATH] = { .unk_00 = 53, .unk_01 = 0xF, .mapMatrixID = 51, @@ -5608,8 +5610,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x1, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_UNKNOWN_255] = { .unk_00 = 54, .unk_01 = 54, .mapMatrixID = 52, @@ -5630,8 +5632,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x1, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_FLOAROMA_MEADOW] = { .unk_00 = 0x8, .unk_01 = 0x2, .mapMatrixID = 52, @@ -5652,8 +5654,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x1, - }, - { + }, + [MAP_HEADER_FLOAROMA_MEADOW_HOUSE] = { .unk_00 = 0x14, .unk_01 = 0xF, .mapMatrixID = 0x7B, @@ -5674,8 +5676,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_OREBURGH_GATE_1F] = { .unk_00 = 53, .unk_01 = 0xF, .mapMatrixID = 0x3, @@ -5696,8 +5698,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x1, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_OREBURGH_GATE_B1F] = { .unk_00 = 53, .unk_01 = 0xF, .mapMatrixID = 0x4, @@ -5718,8 +5720,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x1, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_FULLMOON_ISLAND] = { .unk_00 = 0xF, .unk_01 = 0xF, .mapMatrixID = 0x0, @@ -5740,8 +5742,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_FULLMOON_ISLAND_FOREST] = { .unk_00 = 54, .unk_01 = 0xF, .mapMatrixID = 53, @@ -5762,8 +5764,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_STARK_MOUNTAIN_OUTSIDE] = { .unk_00 = 0x11, .unk_01 = 0xF, .mapMatrixID = 0x0, @@ -5784,8 +5786,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x1, - }, - { + }, + [MAP_HEADER_STARK_MOUNTAIN_ROOM_1] = { .unk_00 = 0x39, .unk_01 = 0xF, .mapMatrixID = 0x39, @@ -5806,8 +5808,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x1, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_STARK_MOUNTAIN_ROOM_2] = { .unk_00 = 0x39, .unk_01 = 0xF, .mapMatrixID = 58, @@ -5828,8 +5830,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x1, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_STARK_MOUNTAIN_ROOM_3] = { .unk_00 = 0x39, .unk_01 = 0xF, .mapMatrixID = 59, @@ -5850,8 +5852,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_UNKNOWN_266] = { .unk_00 = 0x12, .unk_01 = 0xC, .mapMatrixID = 0x0, @@ -5872,8 +5874,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_SENDOFF_SPRING] = { .unk_00 = 62, .unk_01 = 0xF, .mapMatrixID = 0x3C, @@ -5894,8 +5896,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x1, - }, - { + }, + [MAP_HEADER_TURNBACK_CAVE_ENTRANCE] = { .unk_00 = 56, .unk_01 = 0xF, .mapMatrixID = 61, @@ -5916,8 +5918,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_TURNBACK_CAVE_PILLAR_ROOM] = { .unk_00 = 56, .unk_01 = 0xF, .mapMatrixID = 62, @@ -5938,8 +5940,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_TURNBACK_CAVE_GIRATINA_ROOM] = { .unk_00 = 56, .unk_01 = 0xF, .mapMatrixID = 63, @@ -5960,8 +5962,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_TURNBACK_CAVE_PILLAR_1_ROOM_1] = { .unk_00 = 56, .unk_01 = 0xF, .mapMatrixID = 64, @@ -5982,8 +5984,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_TURNBACK_CAVE_PILLAR_1_ROOM_2] = { .unk_00 = 56, .unk_01 = 0xF, .mapMatrixID = 64, @@ -6004,8 +6006,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_TURNBACK_CAVE_PILLAR_1_ROOM_3] = { .unk_00 = 56, .unk_01 = 0xF, .mapMatrixID = 65, @@ -6026,8 +6028,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_FLOWER_PARADISE] = { .unk_00 = 0xD, .unk_01 = 0xA, .mapMatrixID = 0x0, @@ -6048,8 +6050,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x1, - }, - { + }, + [MAP_HEADER_UNKNOWN_275] = { .unk_00 = 0x14, .unk_01 = 0xF, .mapMatrixID = 0x7B, @@ -6070,8 +6072,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_UNKNOWN_276] = { .unk_00 = 11, .unk_01 = 0x5, .mapMatrixID = 0x0, @@ -6092,8 +6094,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_UNKNOWN_277] = { .unk_00 = 11, .unk_01 = 0x5, .mapMatrixID = 0x0, @@ -6114,8 +6116,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_SNOWPOINT_TEMPLE_1F] = { .unk_00 = 65, .unk_01 = 0xF, .mapMatrixID = 68, @@ -6136,8 +6138,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x1, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_SNOWPOINT_TEMPLE_B1F] = { .unk_00 = 65, .unk_01 = 0xF, .mapMatrixID = 0x45, @@ -6158,8 +6160,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x1, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_SNOWPOINT_TEMPLE_B2F] = { .unk_00 = 65, .unk_01 = 0xF, .mapMatrixID = 70, @@ -6180,8 +6182,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x1, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_SNOWPOINT_TEMPLE_B3F] = { .unk_00 = 65, .unk_01 = 0xF, .mapMatrixID = 71, @@ -6202,8 +6204,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x1, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_SNOWPOINT_TEMPLE_B4F] = { .unk_00 = 65, .unk_01 = 0xF, .mapMatrixID = 0x48, @@ -6224,8 +6226,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x1, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_SNOWPOINT_TEMPLE_B5F] = { .unk_00 = 65, .unk_01 = 0xF, .mapMatrixID = 73, @@ -6246,8 +6248,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x1, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_WAYWARD_CAVE_1F] = { .unk_00 = 53, .unk_01 = 0xF, .mapMatrixID = 0x4A, @@ -6268,8 +6270,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x1, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_WAYWARD_CAVE_B1F] = { .unk_00 = 53, .unk_01 = 0xF, .mapMatrixID = 75, @@ -6290,8 +6292,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x1, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_RUIN_MANIAC_CAVE_SHORT] = { .unk_00 = 53, .unk_01 = 0xF, .mapMatrixID = 76, @@ -6312,8 +6314,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x1, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_TROPHY_GARDEN] = { .unk_00 = 0xC, .unk_01 = 0xF, .mapMatrixID = 79, @@ -6334,8 +6336,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x1, - }, - { + }, + [MAP_HEADER_IRON_ISLAND] = { .unk_00 = 0xF, .unk_01 = 0xF, .mapMatrixID = 0x0, @@ -6356,8 +6358,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x1, - }, - { + }, + [MAP_HEADER_IRON_ISLAND_1F] = { .unk_00 = 0x48, .unk_01 = 0xF, .mapMatrixID = 80, @@ -6378,8 +6380,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x1, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_IRON_ISLAND_B1F_LEFT_ROOM] = { .unk_00 = 0x48, .unk_01 = 0xF, .mapMatrixID = 81, @@ -6400,8 +6402,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x1, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_IRON_ISLAND_B1F_RIGHT_ROOM] = { .unk_00 = 0x48, .unk_01 = 0xF, .mapMatrixID = 82, @@ -6422,8 +6424,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x1, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_IRON_ISLAND_B2F_RIGHT_ROOM] = { .unk_00 = 0x48, .unk_01 = 0xF, .mapMatrixID = 83, @@ -6444,8 +6446,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x1, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_IRON_ISLAND_B2F_LEFT_ROOM] = { .unk_00 = 0x48, .unk_01 = 0xF, .mapMatrixID = 84, @@ -6466,8 +6468,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x1, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_IRON_ISLAND_B3F] = { .unk_00 = 0x48, .unk_01 = 0xF, .mapMatrixID = 85, @@ -6488,8 +6490,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x1, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_OLD_CHATEAU] = { .unk_00 = 66, .unk_01 = 0xF, .mapMatrixID = 86, @@ -6510,8 +6512,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_OLD_CHATEAU_DINING_AREA] = { .unk_00 = 66, .unk_01 = 0xF, .mapMatrixID = 87, @@ -6532,8 +6534,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_OLD_CHATEAU_SIDE_ROOMS] = { .unk_00 = 66, .unk_01 = 0xF, .mapMatrixID = 88, @@ -6554,8 +6556,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_OLD_CHATEAU_CORRIDOR] = { .unk_00 = 66, .unk_01 = 0xF, .mapMatrixID = 89, @@ -6576,8 +6578,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_OLD_CHATEAU_BACK_WEST_ROOM] = { .unk_00 = 66, .unk_01 = 0xF, .mapMatrixID = 90, @@ -6598,8 +6600,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_OLD_CHATEAU_BACK_MIDDLE_WEST_ROOM] = { .unk_00 = 66, .unk_01 = 0xF, .mapMatrixID = 91, @@ -6620,8 +6622,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_OLD_CHATEAU_BACK_MIDDLE_ROOM] = { .unk_00 = 66, .unk_01 = 0xF, .mapMatrixID = 92, @@ -6642,8 +6644,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_OLD_CHATEAU_BACK_MIDDLE_EAST_ROOM] = { .unk_00 = 66, .unk_01 = 0xF, .mapMatrixID = 93, @@ -6664,8 +6666,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_OLD_CHATEAU_BACK_EAST_ROOM] = { .unk_00 = 66, .unk_01 = 0xF, .mapMatrixID = 94, @@ -6686,8 +6688,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_UNKNOWN_304] = { .unk_00 = 0x1F, .unk_01 = 0x1F, .mapMatrixID = 157, @@ -6708,8 +6710,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_GALACTIC_HQ_1F] = { .unk_00 = 58, .unk_01 = 0xF, .mapMatrixID = 95, @@ -6730,8 +6732,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_GALACTIC_HQ_2F] = { .unk_00 = 58, .unk_01 = 0xF, .mapMatrixID = 96, @@ -6752,8 +6754,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_GALACTIC_HQ_3F] = { .unk_00 = 58, .unk_01 = 0xF, .mapMatrixID = 97, @@ -6774,8 +6776,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_GALACTIC_HQ_4F] = { .unk_00 = 58, .unk_01 = 0xF, .mapMatrixID = 98, @@ -6796,8 +6798,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_GALACTIC_HQ_B1F] = { .unk_00 = 58, .unk_01 = 0xF, .mapMatrixID = 100, @@ -6818,8 +6820,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_GALACTIC_HQ_B2F] = { .unk_00 = 58, .unk_01 = 0xF, .mapMatrixID = 99, @@ -6840,8 +6842,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_LAKE_VERITY_LOW_WATER] = { .unk_00 = 62, .unk_01 = 0xF, .mapMatrixID = 101, @@ -6862,8 +6864,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x1, - }, - { + }, + [MAP_HEADER_LAKE_VERITY] = { .unk_00 = 62, .unk_01 = 0xF, .mapMatrixID = 102, @@ -6884,8 +6886,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x1, - }, - { + }, + [MAP_HEADER_VERITY_CAVERN] = { .unk_00 = 53, .unk_01 = 0xF, .mapMatrixID = 103, @@ -6906,8 +6908,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_LAKE_VALOR_DRAINED] = { .unk_00 = 62, .unk_01 = 0xF, .mapMatrixID = 104, @@ -6928,8 +6930,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x1, - }, - { + }, + [MAP_HEADER_LAKE_VALOR] = { .unk_00 = 62, .unk_01 = 0xF, .mapMatrixID = 105, @@ -6950,8 +6952,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x1, - }, - { + }, + [MAP_HEADER_VALOR_CAVERN] = { .unk_00 = 53, .unk_01 = 0xF, .mapMatrixID = 106, @@ -6972,8 +6974,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_LAKE_ACUITY_LOW_WATER] = { .unk_00 = 0xE, .unk_01 = 0xF, .mapMatrixID = 107, @@ -6994,8 +6996,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x1, - }, - { + }, + [MAP_HEADER_LAKE_ACUITY] = { .unk_00 = 0xE, .unk_01 = 0xF, .mapMatrixID = 108, @@ -7016,8 +7018,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x1, - }, - { + }, + [MAP_HEADER_ACUITY_CAVERN] = { .unk_00 = 53, .unk_01 = 0xF, .mapMatrixID = 109, @@ -7038,8 +7040,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_NEWMOON_ISLAND] = { .unk_00 = 0xF, .unk_01 = 0x9, .mapMatrixID = 0x0, @@ -7060,8 +7062,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_NEWMOON_ISLAND_FOREST] = { .unk_00 = 54, .unk_01 = 0xF, .mapMatrixID = 110, @@ -7082,8 +7084,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_BATTLE_PARK] = { .unk_00 = 64, .unk_01 = 0xF, .mapMatrixID = 229, @@ -7104,8 +7106,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x1, - }, - { + }, + [MAP_HEADER_BATTLE_PARK_EXCHANGE_SERVICE_CORNER] = { .unk_00 = 41, .unk_01 = 0xF, .mapMatrixID = 231, @@ -7126,8 +7128,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_UNKNOWN_324] = { .unk_00 = 33, .unk_01 = 0xF, .mapMatrixID = 232, @@ -7148,8 +7150,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_UNKNOWN_325] = { .unk_00 = 33, .unk_01 = 0xF, .mapMatrixID = 233, @@ -7170,8 +7172,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_BATTLE_TOWER] = { .unk_00 = 33, .unk_01 = 0xF, .mapMatrixID = 193, @@ -7192,8 +7194,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_BATTLE_TOWER_ELEVATOR] = { .unk_00 = 0x15, .unk_01 = 0xF, .mapMatrixID = 207, @@ -7214,8 +7216,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_BATTLE_TOWER_CORRIDOR] = { .unk_00 = 33, .unk_01 = 0xF, .mapMatrixID = 194, @@ -7236,8 +7238,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_BATTLE_TOWER_CORRIDOR_MULTI] = { .unk_00 = 33, .unk_01 = 0xF, .mapMatrixID = 195, @@ -7258,8 +7260,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_BATTLE_TOWER_BATTLE_ROOM] = { .unk_00 = 33, .unk_01 = 0xF, .mapMatrixID = 197, @@ -7280,8 +7282,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_BATTLE_TOWER_MULTI_BATTLE_ROOM] = { .unk_00 = 33, .unk_01 = 0xF, .mapMatrixID = 198, @@ -7302,8 +7304,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_COMMUNICATION_CLUB_COLOSSEUM_2P] = { .unk_00 = 0x5, .unk_01 = 0xE, .mapMatrixID = 118, @@ -7324,8 +7326,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_COMMUNICATION_CLUB_COLOSSEUM_4P] = { .unk_00 = 0x5, .unk_01 = 0xE, .mapMatrixID = 121, @@ -7346,8 +7348,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_VERITY_LAKEFRONT] = { .unk_00 = 0x6, .unk_01 = 0x0, .mapMatrixID = 0x0, @@ -7368,8 +7370,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x1, - }, - { + }, + [MAP_HEADER_VERITY_LAKEFRONT_UNKNOWN_HOUSE] = { .unk_00 = 0x14, .unk_01 = 0x14, .mapMatrixID = 0x7B, @@ -7390,8 +7392,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_VALOR_LAKEFRONT] = { .unk_00 = 0x12, .unk_01 = 0xC, .mapMatrixID = 0x0, @@ -7412,8 +7414,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x1, - }, - { + }, + [MAP_HEADER_RESTAURANT] = { .unk_00 = 35, .unk_01 = 0xF, .mapMatrixID = 147, @@ -7434,8 +7436,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_GRAND_LAKE_VALOR_LAKEFRONT_EAST_HOUSE] = { .unk_00 = 35, .unk_01 = 0xF, .mapMatrixID = 146, @@ -7456,8 +7458,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_GRAND_LAKE_VALOR_LAKEFRONT_WEST_HOUSE] = { .unk_00 = 35, .unk_01 = 0xF, .mapMatrixID = 146, @@ -7478,8 +7480,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_ACUITY_LAKEFRONT] = { .unk_00 = 0xE, .unk_01 = 0x8, .mapMatrixID = 0x0, @@ -7500,8 +7502,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x1, - }, - { + }, + [MAP_HEADER_SPRING_PATH] = { .unk_00 = 0x12, .unk_01 = 0xC, .mapMatrixID = 0x0, @@ -7522,8 +7524,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x1, - }, - { + }, + [MAP_HEADER_ROUTE_201] = { .unk_00 = 0x6, .unk_01 = 0x0, .mapMatrixID = 0x0, @@ -7544,8 +7546,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x1, - }, - { + }, + [MAP_HEADER_ROUTE_202] = { .unk_00 = 0x6, .unk_01 = 0x0, .mapMatrixID = 0x0, @@ -7566,8 +7568,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x1, - }, - { + }, + [MAP_HEADER_ROUTE_203] = { .unk_00 = 0x6, .unk_01 = 0x0, .mapMatrixID = 0x0, @@ -7588,8 +7590,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x1, - }, - { + }, + [MAP_HEADER_ROUTE_204_SOUTH] = { .unk_00 = 0x6, .unk_01 = 0x0, .mapMatrixID = 0x0, @@ -7610,8 +7612,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x1, .isFlyAllowed = 0x1, - }, - { + }, + [MAP_HEADER_ROUTE_204_NORTH] = { .unk_00 = 0x8, .unk_01 = 0x2, .mapMatrixID = 0x0, @@ -7632,8 +7634,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x1, .isFlyAllowed = 0x1, - }, - { + }, + [MAP_HEADER_ROUTE_205_SOUTH] = { .unk_00 = 0x8, .unk_01 = 0x2, .mapMatrixID = 0x0, @@ -7654,8 +7656,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x1, - }, - { + }, + [MAP_HEADER_ROUTE_205_HOUSE] = { .unk_00 = 0x14, .unk_01 = 0xF, .mapMatrixID = 243, @@ -7676,8 +7678,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_ROUTE_205_NORTH] = { .unk_00 = 0x8, .unk_01 = 0x2, .mapMatrixID = 0x0, @@ -7698,8 +7700,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x1, - }, - { + }, + [MAP_HEADER_ROUTE_206] = { .unk_00 = 0x7, .unk_01 = 0x1, .mapMatrixID = 0x0, @@ -7720,8 +7722,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x1, - }, - { + }, + [MAP_HEADER_ROUTE_206_CYCLING_ROAD_SOUTH_GATE] = { .unk_00 = 50, .unk_01 = 0xF, .mapMatrixID = 260, @@ -7742,8 +7744,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_GATE_BETWEEN_ETERNA_CITY_ROUTE_206] = { .unk_00 = 0x1F, .unk_01 = 0x1F, .mapMatrixID = 157, @@ -7764,8 +7766,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_ROUTE_207] = { .unk_00 = 0x7, .unk_01 = 0x1, .mapMatrixID = 0x0, @@ -7786,8 +7788,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x1, - }, - { + }, + [MAP_HEADER_ROUTE_208] = { .unk_00 = 0x9, .unk_01 = 0x3, .mapMatrixID = 0x0, @@ -7808,8 +7810,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x1, - }, - { + }, + [MAP_HEADER_ROUTE_208_HOUSE] = { .unk_00 = 43, .unk_01 = 0xF, .mapMatrixID = 249, @@ -7830,8 +7832,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_ROUTE_209] = { .unk_00 = 0xA, .unk_01 = 0x4, .mapMatrixID = 0x0, @@ -7852,8 +7854,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x1, - }, - { + }, + [MAP_HEADER_ROUTE_209_LOST_TOWER_1F] = { .unk_00 = 42, .unk_01 = 0xF, .mapMatrixID = 212, @@ -7874,8 +7876,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x1, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_ROUTE_209_LOST_TOWER_2F] = { .unk_00 = 42, .unk_01 = 0xF, .mapMatrixID = 213, @@ -7896,8 +7898,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x1, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_ROUTE_209_LOST_TOWER_3F] = { .unk_00 = 42, .unk_01 = 0xF, .mapMatrixID = 214, @@ -7918,8 +7920,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x1, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_ROUTE_209_LOST_TOWER_4F] = { .unk_00 = 42, .unk_01 = 0xF, .mapMatrixID = 215, @@ -7940,8 +7942,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x1, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_ROUTE_209_LOST_TOWER_5F] = { .unk_00 = 42, .unk_01 = 0xF, .mapMatrixID = 216, @@ -7962,8 +7964,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x1, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_ROUTE_210_SOUTH] = { .unk_00 = 0xA, .unk_01 = 0x4, .mapMatrixID = 0x0, @@ -7984,8 +7986,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x1, - }, - { + }, + [MAP_HEADER_ROUTE_210_NORTH] = { .unk_00 = 0xA, .unk_01 = 0x4, .mapMatrixID = 0x0, @@ -8006,8 +8008,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x1, - }, - { + }, + [MAP_HEADER_ROUTE_210_GRANDMA_WILMA_HOUSE] = { .unk_00 = 0x14, .unk_01 = 0xF, .mapMatrixID = 0x7B, @@ -8028,8 +8030,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_ROUTE_211_WEST] = { .unk_00 = 0x8, .unk_01 = 0x2, .mapMatrixID = 0x0, @@ -8050,8 +8052,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x1, - }, - { + }, + [MAP_HEADER_ROUTE_211_EAST] = { .unk_00 = 0xA, .unk_01 = 0x4, .mapMatrixID = 0x0, @@ -8072,8 +8074,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x1, - }, - { + }, + [MAP_HEADER_ROUTE_212_NORTH] = { .unk_00 = 0xC, .unk_01 = 0x6, .mapMatrixID = 0x0, @@ -8094,8 +8096,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x1, - }, - { + }, + [MAP_HEADER_POKEMON_MANSION] = { .unk_00 = 35, .unk_01 = 0xF, .mapMatrixID = 178, @@ -8116,8 +8118,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_POKEMON_MANSION_MAIDS_ROOM] = { .unk_00 = 35, .unk_01 = 0xF, .mapMatrixID = 179, @@ -8138,8 +8140,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_POKEMON_MANSION_OFFICE] = { .unk_00 = 35, .unk_01 = 0xF, .mapMatrixID = 180, @@ -8160,8 +8162,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_ROUTE_212_SOUTH] = { .unk_00 = 0xC, .unk_01 = 0x6, .mapMatrixID = 0x0, @@ -8182,8 +8184,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x1, - }, - { + }, + [MAP_HEADER_ROUTE_212_HOUSE] = { .unk_00 = 0x14, .unk_01 = 0xF, .mapMatrixID = 244, @@ -8204,8 +8206,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_ROUTE_213] = { .unk_00 = 0x12, .unk_01 = 0xC, .mapMatrixID = 0x0, @@ -8226,8 +8228,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x1, - }, - { + }, + [MAP_HEADER_ROUTE_213_GATE_TO_PASTORIA_CITY] = { .unk_00 = 50, .unk_01 = 0xF, .mapMatrixID = 258, @@ -8248,8 +8250,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_FOOTSTEP_HOUSE] = { .unk_00 = 43, .unk_01 = 0xF, .mapMatrixID = 247, @@ -8270,8 +8272,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_GRAND_LAKE_ROUTE_213_LOBBY] = { .unk_00 = 35, .unk_01 = 0xF, .mapMatrixID = 145, @@ -8292,8 +8294,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_GRAND_LAKE_ROUTE_213_EAST_HOUSE] = { .unk_00 = 35, .unk_01 = 0xF, .mapMatrixID = 146, @@ -8314,8 +8316,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_GRAND_LAKE_ROUTE_213_NORTHWEST_HOUSE] = { .unk_00 = 35, .unk_01 = 0xF, .mapMatrixID = 146, @@ -8336,8 +8338,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_GRAND_LAKE_ROUTE_213_NORTHEAST_HOUSE] = { .unk_00 = 35, .unk_01 = 0xF, .mapMatrixID = 146, @@ -8358,8 +8360,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_ROUTE_214] = { .unk_00 = 0x12, .unk_01 = 0xC, .mapMatrixID = 0x0, @@ -8380,8 +8382,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x1, - }, - { + }, + [MAP_HEADER_ROUTE_214_GATE_TO_VEILSTONE_CITY] = { .unk_00 = 50, .unk_01 = 0xF, .mapMatrixID = 257, @@ -8402,8 +8404,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_ROUTE_215] = { .unk_00 = 0xA, .unk_01 = 0x4, .mapMatrixID = 0x0, @@ -8424,8 +8426,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x1, - }, - { + }, + [MAP_HEADER_ROUTE_216] = { .unk_00 = 0xE, .unk_01 = 0x8, .mapMatrixID = 0x0, @@ -8446,8 +8448,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x1, - }, - { + }, + [MAP_HEADER_ROUTE_216_HOUSE] = { .unk_00 = 0x14, .unk_01 = 0xF, .mapMatrixID = 243, @@ -8468,8 +8470,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_ROUTE_217] = { .unk_00 = 0xE, .unk_01 = 0x8, .mapMatrixID = 0x0, @@ -8490,8 +8492,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x1, - }, - { + }, + [MAP_HEADER_ROUTE_217_WEST_HOUSE] = { .unk_00 = 0x14, .unk_01 = 0xF, .mapMatrixID = 124, @@ -8512,8 +8514,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_ROUTE_217_NORTHEAST_HOUSE] = { .unk_00 = 0x14, .unk_01 = 0xF, .mapMatrixID = 124, @@ -8534,8 +8536,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_ROUTE_218] = { .unk_00 = 0xF, .unk_01 = 0x9, .mapMatrixID = 0x0, @@ -8556,8 +8558,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x1, - }, - { + }, + [MAP_HEADER_ROUTE_218_GATE_TO_JUBILIFE_CITY] = { .unk_00 = 50, .unk_01 = 0xF, .mapMatrixID = 258, @@ -8578,8 +8580,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_ROUTE_218_GATE_TO_CANALAVE_CITY] = { .unk_00 = 50, .unk_01 = 0xF, .mapMatrixID = 258, @@ -8600,8 +8602,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_ROUTE_219] = { .unk_00 = 0x6, .unk_01 = 0x0, .mapMatrixID = 0x0, @@ -8622,8 +8624,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x1, - }, - { + }, + [MAP_HEADER_ROUTE_221] = { .unk_00 = 0x6, .unk_01 = 0x0, .mapMatrixID = 0x0, @@ -8644,8 +8646,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x1, - }, - { + }, + [MAP_HEADER_PAL_PARK_LOBBY] = { .unk_00 = 39, .unk_01 = 0xF, .mapMatrixID = 201, @@ -8666,8 +8668,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_ROUTE_221_HOUSE] = { .unk_00 = 0x14, .unk_01 = 0xF, .mapMatrixID = 244, @@ -8688,8 +8690,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_ROUTE_222] = { .unk_00 = 0x12, .unk_01 = 0xC, .mapMatrixID = 0x0, @@ -8710,8 +8712,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x1, - }, - { + }, + [MAP_HEADER_ROUTE_222_WEST_HOUSE] = { .unk_00 = 0x14, .unk_01 = 0xF, .mapMatrixID = 0x7B, @@ -8732,8 +8734,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_ROUTE_222_EAST_HOUSE] = { .unk_00 = 0x14, .unk_01 = 0xF, .mapMatrixID = 0x7B, @@ -8754,8 +8756,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_ROUTE_222_GATE_TO_SUNYSHORE_CITY] = { .unk_00 = 50, .unk_01 = 0xF, .mapMatrixID = 258, @@ -8776,8 +8778,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_ROUTE_224] = { .unk_00 = 0xD, .unk_01 = 0xA, .mapMatrixID = 0x0, @@ -8798,8 +8800,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x1, - }, - { + }, + [MAP_HEADER_ROUTE_225] = { .unk_00 = 0x11, .unk_01 = 11, .mapMatrixID = 0x0, @@ -8820,8 +8822,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x1, - }, - { + }, + [MAP_HEADER_UNKNOWN_401] = { .unk_00 = 0x11, .unk_01 = 11, .mapMatrixID = 0x0, @@ -8842,8 +8844,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_UNKNOWN_402] = { .unk_00 = 0x11, .unk_01 = 11, .mapMatrixID = 0x0, @@ -8864,8 +8866,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_ROUTE_227] = { .unk_00 = 0x11, .unk_01 = 11, .mapMatrixID = 0x0, @@ -8886,8 +8888,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x1, - }, - { + }, + [MAP_HEADER_UNKNOWN_404] = { .unk_00 = 0x11, .unk_01 = 11, .mapMatrixID = 0x0, @@ -8908,8 +8910,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_UNKNOWN_405] = { .unk_00 = 0x11, .unk_01 = 11, .mapMatrixID = 0x0, @@ -8930,8 +8932,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_ROUTE_228] = { .unk_00 = 0x13, .unk_01 = 0xD, .mapMatrixID = 0x0, @@ -8952,8 +8954,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x1, - }, - { + }, + [MAP_HEADER_ROUTE_229] = { .unk_00 = 0x13, .unk_01 = 0xD, .mapMatrixID = 0x0, @@ -8974,8 +8976,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x1, - }, - { + }, + [MAP_HEADER_UNKNOWN_408] = { .unk_00 = 0x13, .unk_01 = 0xD, .mapMatrixID = 0x0, @@ -8996,8 +8998,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_UNKNOWN_409] = { .unk_00 = 0x13, .unk_01 = 0xD, .mapMatrixID = 0x0, @@ -9018,8 +9020,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_RECORD_MIXING_ROOM] = { .unk_00 = 0x5, .unk_01 = 0xE, .mapMatrixID = 119, @@ -9040,8 +9042,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_TWINLEAF_TOWN] = { .unk_00 = 0x6, .unk_01 = 0x0, .mapMatrixID = 0x0, @@ -9062,8 +9064,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x1, - }, - { + }, + [MAP_HEADER_TWINLEAF_TOWN_RIVAL_HOUSE_1F] = { .unk_00 = 0x14, .unk_01 = 0xF, .mapMatrixID = 126, @@ -9084,8 +9086,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_TWINLEAF_TOWN_RIVAL_HOUSE_2F] = { .unk_00 = 0x14, .unk_01 = 0xF, .mapMatrixID = 127, @@ -9106,8 +9108,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_TWINLEAF_TOWN_PLAYER_HOUSE_1F] = { .unk_00 = 0x14, .unk_01 = 0xF, .mapMatrixID = 128, @@ -9128,8 +9130,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_TWINLEAF_TOWN_PLAYER_HOUSE_2F] = { .unk_00 = 0x14, .unk_01 = 0xF, .mapMatrixID = 129, @@ -9150,8 +9152,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_TWINLEAF_TOWN_NORTHEAST_HOUSE] = { .unk_00 = 0x14, .unk_01 = 0xF, .mapMatrixID = 0x7B, @@ -9172,8 +9174,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_TWINLEAF_TOWN_SOUTHWEST_HOUSE] = { .unk_00 = 0x14, .unk_01 = 0xF, .mapMatrixID = 0x7B, @@ -9194,8 +9196,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_SANDGEM_TOWN] = { .unk_00 = 0x6, .unk_01 = 0x0, .mapMatrixID = 0x0, @@ -9216,8 +9218,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x1, - }, - { + }, + [MAP_HEADER_SANDGEM_TOWN_MART] = { .unk_00 = 0x16, .unk_01 = 0xF, .mapMatrixID = 122, @@ -9238,8 +9240,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_SANDGEM_TOWN_POKECENTER_1F] = { .unk_00 = 0x15, .unk_01 = 0xF, .mapMatrixID = 0x74, @@ -9260,8 +9262,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_SANDGEM_TOWN_POKECENTER_2F] = { .unk_00 = 0x15, .unk_01 = 0xF, .mapMatrixID = 0x75, @@ -9282,8 +9284,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_SANDGEM_TOWN_POKEMON_RESEARCH_LAB] = { .unk_00 = 0x14, .unk_01 = 0xF, .mapMatrixID = 160, @@ -9304,8 +9306,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_SANDGEM_TOWN_COUNTERPART_HOUSE_1F] = { .unk_00 = 0x14, .unk_01 = 0xF, .mapMatrixID = 130, @@ -9326,8 +9328,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_SANDGEM_TOWN_COUNTERPART_HOUSE_2F] = { .unk_00 = 0x14, .unk_01 = 0xF, .mapMatrixID = 131, @@ -9348,8 +9350,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_SANDGEM_TOWN_HOUSE] = { .unk_00 = 0x14, .unk_01 = 0xF, .mapMatrixID = 0x7B, @@ -9370,8 +9372,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_FLOAROMA_TOWN] = { .unk_00 = 0x8, .unk_01 = 0x2, .mapMatrixID = 0x0, @@ -9392,8 +9394,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x1, - }, - { + }, + [MAP_HEADER_FLOAROMA_TOWN_MART] = { .unk_00 = 0x16, .unk_01 = 0xF, .mapMatrixID = 122, @@ -9414,8 +9416,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_FLOAROMA_TOWN_POKECENTER_1F] = { .unk_00 = 0x15, .unk_01 = 0xF, .mapMatrixID = 0x74, @@ -9436,8 +9438,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_FLOAROMA_TOWN_POKECENTER_2F] = { .unk_00 = 0x15, .unk_01 = 0xF, .mapMatrixID = 0x75, @@ -9458,8 +9460,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_FLOWER_SHOP] = { .unk_00 = 0x16, .unk_01 = 0xF, .mapMatrixID = 236, @@ -9480,8 +9482,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_FLOAROMA_TOWN_SOUTHEAST_HOUSE] = { .unk_00 = 0x14, .unk_01 = 0xF, .mapMatrixID = 0x7B, @@ -9502,8 +9504,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_FLOAROMA_TOWN_MIDDLE_HOUSE] = { .unk_00 = 0x14, .unk_01 = 0xF, .mapMatrixID = 0x7B, @@ -9524,8 +9526,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_SOLACEON_TOWN] = { .unk_00 = 0xA, .unk_01 = 0x4, .mapMatrixID = 0x0, @@ -9546,8 +9548,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x1, - }, - { + }, + [MAP_HEADER_SOLACEON_TOWN_MART] = { .unk_00 = 0x16, .unk_01 = 0xF, .mapMatrixID = 122, @@ -9568,8 +9570,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_SOLACEON_TOWN_POKECENTER_1F] = { .unk_00 = 0x15, .unk_01 = 0xF, .mapMatrixID = 0x74, @@ -9590,8 +9592,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_SOLACEON_TOWN_POKECENTER_2F] = { .unk_00 = 0x15, .unk_01 = 0xF, .mapMatrixID = 0x75, @@ -9612,8 +9614,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_POKEMON_DAY_CARE] = { .unk_00 = 0x16, .unk_01 = 0xF, .mapMatrixID = 137, @@ -9634,8 +9636,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_SOLACEON_TOWN_NORTHEAST_HOUSE] = { .unk_00 = 0x14, .unk_01 = 0xF, .mapMatrixID = 0x7B, @@ -9656,8 +9658,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_SOLACEON_TOWN_POKEMON_NEWS_PRESS] = { .unk_00 = 0x14, .unk_01 = 0xF, .mapMatrixID = 244, @@ -9678,8 +9680,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_SOLACEON_TOWN_NORTH_HOUSE] = { .unk_00 = 0x14, .unk_01 = 0xF, .mapMatrixID = 0x7B, @@ -9700,8 +9702,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_SOLACEON_TOWN_EAST_HOUSE] = { .unk_00 = 0x14, .unk_01 = 0xF, .mapMatrixID = 0x7B, @@ -9722,8 +9724,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_CELESTIC_TOWN] = { .unk_00 = 0xA, .unk_01 = 0x4, .mapMatrixID = 0x0, @@ -9744,8 +9746,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x1, - }, - { + }, + [MAP_HEADER_CELESTIC_TOWN_POKECENTER_1F] = { .unk_00 = 0x15, .unk_01 = 0xF, .mapMatrixID = 0x74, @@ -9766,8 +9768,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_CELESTIC_TOWN_POKECENTER_2F] = { .unk_00 = 0x15, .unk_01 = 0xF, .mapMatrixID = 0x75, @@ -9788,8 +9790,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_CELESTIC_TOWN_NORTH_HOUSE] = { .unk_00 = 0x14, .unk_01 = 0xF, .mapMatrixID = 168, @@ -9810,8 +9812,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_CELESTIC_TOWN_NORTHWEST_HOUSE] = { .unk_00 = 0x14, .unk_01 = 0xF, .mapMatrixID = 170, @@ -9832,8 +9834,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_CELESTIC_TOWN_NORTHEAST_HOUSE] = { .unk_00 = 0x14, .unk_01 = 0xF, .mapMatrixID = 124, @@ -9854,8 +9856,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_CELESTIC_TOWN_SOUTHWEST_HOUSE] = { .unk_00 = 0x14, .unk_01 = 0xF, .mapMatrixID = 124, @@ -9876,8 +9878,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_CELESTIC_TOWN_CAVE] = { .unk_00 = 56, .unk_01 = 0xF, .mapMatrixID = 169, @@ -9898,8 +9900,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_SURVIVAL_AREA] = { .unk_00 = 0x11, .unk_01 = 11, .mapMatrixID = 0x0, @@ -9920,8 +9922,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x1, - }, - { + }, + [MAP_HEADER_SURVIVAL_AREA_MART] = { .unk_00 = 0x16, .unk_01 = 0xF, .mapMatrixID = 122, @@ -9942,8 +9944,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_SURVIVAL_AREA_POKECENTER_1F] = { .unk_00 = 0x15, .unk_01 = 0xF, .mapMatrixID = 0x74, @@ -9964,8 +9966,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_SURVIVAL_AREA_POKECENTER_2F] = { .unk_00 = 0x15, .unk_01 = 0xF, .mapMatrixID = 0x75, @@ -9986,8 +9988,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_BATTLEGROUND] = { .unk_00 = 52, .unk_01 = 0xF, .mapMatrixID = 265, @@ -10008,8 +10010,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_SURVIVAL_AREA_SOUTH_HOUSE] = { .unk_00 = 0x14, .unk_01 = 0xF, .mapMatrixID = 125, @@ -10030,8 +10032,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_SURVIVAL_AREA_NORTH_HOUSE] = { .unk_00 = 0x14, .unk_01 = 0xF, .mapMatrixID = 244, @@ -10052,8 +10054,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_RESORT_AREA] = { .unk_00 = 0x13, .unk_01 = 0xD, .mapMatrixID = 0x0, @@ -10074,8 +10076,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x1, - }, - { + }, + [MAP_HEADER_RESORT_AREA_MART] = { .unk_00 = 0x16, .unk_01 = 0xF, .mapMatrixID = 122, @@ -10096,8 +10098,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_RESORT_AREA_POKECENTER_1F] = { .unk_00 = 0x15, .unk_01 = 0xF, .mapMatrixID = 0x74, @@ -10118,8 +10120,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_RESORT_AREA_POKECENTER_2F] = { .unk_00 = 0x15, .unk_01 = 0xF, .mapMatrixID = 0x75, @@ -10140,8 +10142,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_RESORT_AREA_RIBBON_SYNDICATE_1F] = { .unk_00 = 38, .unk_01 = 0xF, .mapMatrixID = 199, @@ -10162,8 +10164,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_RESORT_AREA_RIBBON_SYNDICATE_2F] = { .unk_00 = 38, .unk_01 = 0xF, .mapMatrixID = 200, @@ -10184,8 +10186,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_RESORT_AREA_RIBBON_SYNDICATE_ELEVATOR] = { .unk_00 = 0x15, .unk_01 = 0xF, .mapMatrixID = 207, @@ -10206,8 +10208,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_VILLA] = { .unk_00 = 51, .unk_01 = 0xF, .mapMatrixID = 264, @@ -10228,8 +10230,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_RESORT_AREA_HOUSE] = { .unk_00 = 0x14, .unk_01 = 0xF, .mapMatrixID = 0x7B, @@ -10250,8 +10252,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_UNION_ROOM] = { .unk_00 = 0x5, .unk_01 = 0xE, .mapMatrixID = 120, @@ -10272,8 +10274,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_ROUTE_220] = { .unk_00 = 0x6, .unk_01 = 0x0, .mapMatrixID = 0x0, @@ -10294,8 +10296,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x1, - }, - { + }, + [MAP_HEADER_ROUTE_223] = { .unk_00 = 0xD, .unk_01 = 0x7, .mapMatrixID = 0x0, @@ -10316,8 +10318,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x1, - }, - { + }, + [MAP_HEADER_ROUTE_226] = { .unk_00 = 0x11, .unk_01 = 11, .mapMatrixID = 0x0, @@ -10338,8 +10340,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x1, - }, - { + }, + [MAP_HEADER_UNKNOWN_470] = { .unk_00 = 0x13, .unk_01 = 0xD, .mapMatrixID = 0x0, @@ -10360,8 +10362,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_ROUTE_230] = { .unk_00 = 0x13, .unk_01 = 0xD, .mapMatrixID = 0x0, @@ -10382,8 +10384,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x1, - }, - { + }, + [MAP_HEADER_SEABREAK_PATH] = { .unk_00 = 0xD, .unk_01 = 0xD, .mapMatrixID = 0x0, @@ -10404,8 +10406,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x1, - }, - { + }, + [MAP_HEADER_UNKNOWN_473] = { .unk_00 = 0x13, .unk_01 = 0xD, .mapMatrixID = 0x0, @@ -10426,8 +10428,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_JUBILIFE_CITY_POKECENTER_B1F] = { .unk_00 = 0x15, .unk_01 = 0xF, .mapMatrixID = 235, @@ -10448,8 +10450,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_CANALAVE_CITY_POKECENTER_B1F] = { .unk_00 = 0x15, .unk_01 = 0xF, .mapMatrixID = 235, @@ -10470,8 +10472,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_OREBURGH_CITY_POKECENTER_B1F] = { .unk_00 = 0x15, .unk_01 = 0xF, .mapMatrixID = 235, @@ -10492,8 +10494,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_ETERNA_CITY_POKECENTER_B1F] = { .unk_00 = 0x15, .unk_01 = 0xF, .mapMatrixID = 235, @@ -10514,8 +10516,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_HEARTHOME_CITY_POKECENTER_B1F] = { .unk_00 = 0x15, .unk_01 = 0xF, .mapMatrixID = 235, @@ -10536,8 +10538,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_PASTORIA_CITY_POKECENTER_B1F] = { .unk_00 = 0x15, .unk_01 = 0xF, .mapMatrixID = 235, @@ -10558,8 +10560,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_VEILSTONE_CITY_POKECENTER_B1F] = { .unk_00 = 0x15, .unk_01 = 0xF, .mapMatrixID = 235, @@ -10580,8 +10582,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_SUNYSHORE_CITY_POKECENTER_B1F] = { .unk_00 = 0x15, .unk_01 = 0xF, .mapMatrixID = 235, @@ -10602,8 +10604,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_SNOWPOINT_CITY_POKECENTER_B1F] = { .unk_00 = 0x15, .unk_01 = 0xF, .mapMatrixID = 235, @@ -10624,8 +10626,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_POKEMON_LEAGUE_SOUTH_POKECENTER_B1F] = { .unk_00 = 0x15, .unk_01 = 0xF, .mapMatrixID = 235, @@ -10646,8 +10648,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_FIGHT_AREA_POKECENTER_B1F] = { .unk_00 = 0x15, .unk_01 = 0xF, .mapMatrixID = 235, @@ -10668,8 +10670,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_SANDGEM_TOWN_POKECENTER_B1F] = { .unk_00 = 0x15, .unk_01 = 0xF, .mapMatrixID = 235, @@ -10690,8 +10692,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_FLOAROMA_TOWN_POKECENTER_B1F] = { .unk_00 = 0x15, .unk_01 = 0xF, .mapMatrixID = 235, @@ -10712,8 +10714,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_SOLACEON_TOWN_POKECENTER_B1F] = { .unk_00 = 0x15, .unk_01 = 0xF, .mapMatrixID = 235, @@ -10734,8 +10736,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_CELESTIC_TOWN_POKECENTER_B1F] = { .unk_00 = 0x15, .unk_01 = 0xF, .mapMatrixID = 235, @@ -10756,8 +10758,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_SURVIVAL_AREA_POKECENTER_B1F] = { .unk_00 = 0x15, .unk_01 = 0xF, .mapMatrixID = 235, @@ -10778,8 +10780,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_RESORT_AREA_POKECENTER_B1F] = { .unk_00 = 0x15, .unk_01 = 0xF, .mapMatrixID = 235, @@ -10800,8 +10802,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_CANALAVE_CITY_WEST_HOUSE] = { .unk_00 = 0x14, .unk_01 = 0xF, .mapMatrixID = 124, @@ -10822,8 +10824,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_CAFE] = { .unk_00 = 35, .unk_01 = 0xF, .mapMatrixID = 171, @@ -10844,8 +10846,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_BATTLE_TOWER_BATTLE_SALON] = { .unk_00 = 33, .unk_01 = 0xF, .mapMatrixID = 196, @@ -10866,8 +10868,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_GALACTIC_HQ_CONTROL_ROOM] = { .unk_00 = 68, .unk_01 = 0xF, .mapMatrixID = 0xEE, @@ -10888,8 +10890,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_POKEMON_LEAGUE_NORTH_POKECENTER_2F] = { .unk_00 = 0x15, .unk_01 = 0xF, .mapMatrixID = 0x75, @@ -10910,8 +10912,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_POKEMON_LEAGUE_NORTH_POKECENTER_B1F] = { .unk_00 = 0x15, .unk_01 = 0xF, .mapMatrixID = 235, @@ -10932,8 +10934,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_GALACTIC_HQ_LABORATORY] = { .unk_00 = 68, .unk_01 = 0xF, .mapMatrixID = 0xEF, @@ -10954,8 +10956,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_ROUTE_225_HOUSE] = { .unk_00 = 0x14, .unk_01 = 0xF, .mapMatrixID = 0x7B, @@ -10976,8 +10978,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_ROUTE_226_HOUSE] = { .unk_00 = 0x14, .unk_01 = 0xF, .mapMatrixID = 244, @@ -10998,8 +11000,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_ROUTE_227_HOUSE] = { .unk_00 = 0x14, .unk_01 = 0xF, .mapMatrixID = 243, @@ -11020,8 +11022,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_ROUTE_228_GATE_TO_ROUTE_226] = { .unk_00 = 50, .unk_01 = 0xF, .mapMatrixID = 258, @@ -11042,8 +11044,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_ROUTE_228_NORTH_HOUSE] = { .unk_00 = 0x14, .unk_01 = 0xF, .mapMatrixID = 244, @@ -11064,8 +11066,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_ROUTE_228_SOUTH_HOUSE] = { .unk_00 = 0x14, .unk_01 = 0xF, .mapMatrixID = 125, @@ -11086,8 +11088,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_GREAT_MARSH_1] = { .unk_00 = 63, .unk_01 = 0xF, .mapMatrixID = 0xF0, @@ -11108,8 +11110,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_GREAT_MARSH_2] = { .unk_00 = 63, .unk_01 = 0xF, .mapMatrixID = 0xF0, @@ -11130,8 +11132,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_GREAT_MARSH_3] = { .unk_00 = 63, .unk_01 = 0xF, .mapMatrixID = 0xF0, @@ -11152,8 +11154,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_GREAT_MARSH_4] = { .unk_00 = 63, .unk_01 = 0xF, .mapMatrixID = 0xF0, @@ -11174,8 +11176,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_GREAT_MARSH_5] = { .unk_00 = 63, .unk_01 = 0xF, .mapMatrixID = 0xF0, @@ -11196,8 +11198,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_GREAT_MARSH_6] = { .unk_00 = 63, .unk_01 = 0xF, .mapMatrixID = 0xF0, @@ -11218,8 +11220,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_HALL_OF_ORIGIN] = { .unk_00 = 0x3C, .unk_01 = 0xF, .mapMatrixID = 241, @@ -11240,8 +11242,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_UNKNOWN_511] = { .unk_00 = 0x3C, .unk_01 = 0xF, .mapMatrixID = 242, @@ -11262,8 +11264,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_RUIN_MANIAC_CAVE_LONG] = { .unk_00 = 53, .unk_01 = 0xF, .mapMatrixID = 77, @@ -11284,8 +11286,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x1, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_MANIAC_TUNNEL] = { .unk_00 = 53, .unk_01 = 0xF, .mapMatrixID = 78, @@ -11306,8 +11308,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x1, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_IRON_ISLAND_HOUSE] = { .unk_00 = 0x14, .unk_01 = 0xF, .mapMatrixID = 243, @@ -11328,8 +11330,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_SOLACEON_RUINS_ROOM_5_SOUTHEAST_DEADEND] = { .unk_00 = 56, .unk_01 = 0xF, .mapMatrixID = 0x1F, @@ -11350,8 +11352,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x1, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_VISTA_LIGHTHOUSE_ELEVATOR] = { .unk_00 = 0x15, .unk_01 = 0xF, .mapMatrixID = 207, @@ -11372,8 +11374,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_JUBILIFE_CITY_SOUTHWEST_HOUSE_2F] = { .unk_00 = 0x1F, .unk_01 = 0xF, .mapMatrixID = 208, @@ -11394,8 +11396,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_TURNBACK_CAVE_PILLAR_1_ROOM_4] = { .unk_00 = 56, .unk_01 = 0xF, .mapMatrixID = 65, @@ -11416,8 +11418,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_TURNBACK_CAVE_PILLAR_1_ROOM_5] = { .unk_00 = 56, .unk_01 = 0xF, .mapMatrixID = 66, @@ -11438,8 +11440,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_TURNBACK_CAVE_PILLAR_1_ROOM_6] = { .unk_00 = 56, .unk_01 = 0xF, .mapMatrixID = 66, @@ -11460,8 +11462,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_TURNBACK_CAVE_PILLAR_2_ROOM_1] = { .unk_00 = 56, .unk_01 = 0xF, .mapMatrixID = 64, @@ -11482,8 +11484,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_TURNBACK_CAVE_PILLAR_2_ROOM_2] = { .unk_00 = 56, .unk_01 = 0xF, .mapMatrixID = 64, @@ -11504,8 +11506,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_TURNBACK_CAVE_PILLAR_2_ROOM_3] = { .unk_00 = 56, .unk_01 = 0xF, .mapMatrixID = 65, @@ -11526,8 +11528,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_TURNBACK_CAVE_PILLAR_2_ROOM_4] = { .unk_00 = 56, .unk_01 = 0xF, .mapMatrixID = 65, @@ -11548,8 +11550,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_TURNBACK_CAVE_PILLAR_2_ROOM_5] = { .unk_00 = 56, .unk_01 = 0xF, .mapMatrixID = 66, @@ -11570,8 +11572,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_TURNBACK_CAVE_PILLAR_2_ROOM_6] = { .unk_00 = 56, .unk_01 = 0xF, .mapMatrixID = 66, @@ -11592,8 +11594,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_TURNBACK_CAVE_PILLAR_3_ROOM_1] = { .unk_00 = 56, .unk_01 = 0xF, .mapMatrixID = 64, @@ -11614,8 +11616,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_TURNBACK_CAVE_PILLAR_3_ROOM_2] = { .unk_00 = 56, .unk_01 = 0xF, .mapMatrixID = 64, @@ -11636,8 +11638,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_TURNBACK_CAVE_PILLAR_3_ROOM_3] = { .unk_00 = 56, .unk_01 = 0xF, .mapMatrixID = 65, @@ -11658,8 +11660,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_TURNBACK_CAVE_PILLAR_3_ROOM_4] = { .unk_00 = 56, .unk_01 = 0xF, .mapMatrixID = 65, @@ -11680,8 +11682,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_TURNBACK_CAVE_PILLAR_3_ROOM_5] = { .unk_00 = 56, .unk_01 = 0xF, .mapMatrixID = 66, @@ -11702,8 +11704,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_TURNBACK_CAVE_PILLAR_3_ROOM_6] = { .unk_00 = 56, .unk_01 = 0xF, .mapMatrixID = 66, @@ -11724,8 +11726,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_UNKNOWN_533] = { .unk_00 = 56, .unk_01 = 0xF, .mapMatrixID = 64, @@ -11746,8 +11748,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x1, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_UNKNOWN_534] = { .unk_00 = 56, .unk_01 = 0xF, .mapMatrixID = 64, @@ -11768,8 +11770,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x1, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_UNKNOWN_535] = { .unk_00 = 56, .unk_01 = 0xF, .mapMatrixID = 65, @@ -11790,8 +11792,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x1, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_UNKNOWN_536] = { .unk_00 = 56, .unk_01 = 0xF, .mapMatrixID = 65, @@ -11812,8 +11814,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x1, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_UNKNOWN_537] = { .unk_00 = 56, .unk_01 = 0xF, .mapMatrixID = 66, @@ -11834,8 +11836,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x1, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_UNKNOWN_538] = { .unk_00 = 56, .unk_01 = 0xF, .mapMatrixID = 66, @@ -11856,8 +11858,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x1, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_UNKNOWN_539] = { .unk_00 = 56, .unk_01 = 0xF, .mapMatrixID = 64, @@ -11878,8 +11880,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x1, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_UNKNOWN_540] = { .unk_00 = 56, .unk_01 = 0xF, .mapMatrixID = 64, @@ -11900,8 +11902,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x1, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_UNKNOWN_541] = { .unk_00 = 56, .unk_01 = 0xF, .mapMatrixID = 65, @@ -11922,8 +11924,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x1, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_UNKNOWN_542] = { .unk_00 = 56, .unk_01 = 0xF, .mapMatrixID = 65, @@ -11944,8 +11946,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x1, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_UNKNOWN_543] = { .unk_00 = 56, .unk_01 = 0xF, .mapMatrixID = 66, @@ -11966,8 +11968,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x1, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_UNKNOWN_544] = { .unk_00 = 56, .unk_01 = 0xF, .mapMatrixID = 66, @@ -11988,8 +11990,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x1, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_UNKNOWN_545] = { .unk_00 = 56, .unk_01 = 0xF, .mapMatrixID = 64, @@ -12010,8 +12012,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x1, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_UNKNOWN_546] = { .unk_00 = 56, .unk_01 = 0xF, .mapMatrixID = 64, @@ -12032,8 +12034,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x1, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_UNKNOWN_547] = { .unk_00 = 56, .unk_01 = 0xF, .mapMatrixID = 65, @@ -12054,8 +12056,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x1, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_UNKNOWN_548] = { .unk_00 = 56, .unk_01 = 0xF, .mapMatrixID = 65, @@ -12076,8 +12078,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x1, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_UNKNOWN_549] = { .unk_00 = 56, .unk_01 = 0xF, .mapMatrixID = 66, @@ -12098,8 +12100,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x1, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_UNKNOWN_550] = { .unk_00 = 56, .unk_01 = 0xF, .mapMatrixID = 66, @@ -12120,8 +12122,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x1, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_UNKNOWN_551] = { .unk_00 = 56, .unk_01 = 0xF, .mapMatrixID = 64, @@ -12142,8 +12144,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x1, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_UNKNOWN_552] = { .unk_00 = 56, .unk_01 = 0xF, .mapMatrixID = 64, @@ -12164,8 +12166,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x1, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_UNKNOWN_553] = { .unk_00 = 56, .unk_01 = 0xF, .mapMatrixID = 65, @@ -12186,8 +12188,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x1, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_UNKNOWN_554] = { .unk_00 = 56, .unk_01 = 0xF, .mapMatrixID = 65, @@ -12208,8 +12210,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x1, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_UNKNOWN_555] = { .unk_00 = 56, .unk_01 = 0xF, .mapMatrixID = 66, @@ -12230,8 +12232,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x1, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_UNKNOWN_556] = { .unk_00 = 56, .unk_01 = 0xF, .mapMatrixID = 66, @@ -12252,8 +12254,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x1, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_UNKNOWN_557] = { .unk_00 = 56, .unk_01 = 0xF, .mapMatrixID = 66, @@ -12274,8 +12276,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x1, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_CONTEST_HALL_STAGE_NO_CONTEST] = { .unk_00 = 32, .unk_01 = 0xF, .mapMatrixID = 166, @@ -12296,8 +12298,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_BATTLE_FRONTIER] = { .unk_00 = 73, .unk_01 = 0xF, .mapMatrixID = 256, @@ -12318,8 +12320,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x1, - }, - { + }, + [MAP_HEADER_BATTLE_FRONTIER_GATE_TO_FIGHT_AREA] = { .unk_00 = 44, .unk_01 = 0xF, .mapMatrixID = 250, @@ -12340,8 +12342,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_UNKNOWN_561] = { .unk_00 = 45, .unk_01 = 0xF, .mapMatrixID = 251, @@ -12362,8 +12364,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_BATTLE_FACTORY] = { .unk_00 = 46, .unk_01 = 0xF, .mapMatrixID = 252, @@ -12384,8 +12386,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_BATTLE_HALL] = { .unk_00 = 47, .unk_01 = 0xF, .mapMatrixID = 253, @@ -12406,8 +12408,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_BATTLE_CASTLE] = { .unk_00 = 48, .unk_01 = 0xF, .mapMatrixID = 254, @@ -12428,8 +12430,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_BATTLE_ARCADE] = { .unk_00 = 49, .unk_01 = 0xF, .mapMatrixID = 255, @@ -12450,8 +12452,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_VEILSTONE_STORE_B1F] = { .unk_00 = 0x16, .unk_01 = 0xF, .mapMatrixID = 246, @@ -12472,8 +12474,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_GLOBAL_TERMINAL_2F] = { .unk_00 = 40, .unk_01 = 0xF, .mapMatrixID = 262, @@ -12494,8 +12496,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_GLOBAL_TERMINAL_3F] = { .unk_00 = 40, .unk_01 = 0xF, .mapMatrixID = 263, @@ -12516,8 +12518,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_GALACTIC_HQ_HALL] = { .unk_00 = 58, .unk_01 = 0xF, .mapMatrixID = 261, @@ -12538,8 +12540,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_UNKNOWN_570] = { .unk_00 = 0x4A, .unk_01 = 0xF, .mapMatrixID = 268, @@ -12560,8 +12562,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_ROTOMS_ROOM] = { .unk_00 = 58, .unk_01 = 0xF, .mapMatrixID = 267, @@ -12582,8 +12584,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_UNKNOWN_572] = { .unk_00 = 58, .unk_01 = 0xF, .mapMatrixID = 266, @@ -12604,8 +12606,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_DISTORTION_WORLD_1F] = { .unk_00 = 0x4A, .unk_01 = 0xF, .mapMatrixID = 269, @@ -12626,8 +12628,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_DISTORTION_WORLD_B1F] = { .unk_00 = 0x4A, .unk_01 = 0xF, .mapMatrixID = 270, @@ -12648,8 +12650,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_DISTORTION_WORLD_B2F] = { .unk_00 = 0x4A, .unk_01 = 0xF, .mapMatrixID = 271, @@ -12670,8 +12672,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_DISTORTION_WORLD_B3F] = { .unk_00 = 0x4A, .unk_01 = 0xF, .mapMatrixID = 272, @@ -12692,8 +12694,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_DISTORTION_WORLD_B4F] = { .unk_00 = 0x4A, .unk_01 = 0xF, .mapMatrixID = 273, @@ -12714,8 +12716,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_UNKNOWN_578] = { .unk_00 = 0x4A, .unk_01 = 0xF, .mapMatrixID = 274, @@ -12736,8 +12738,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_DISTORTION_WORLD_B5F] = { .unk_00 = 0x4A, .unk_01 = 0xF, .mapMatrixID = 275, @@ -12758,8 +12760,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_DISTORTION_WORLD_B6F] = { .unk_00 = 0x4A, .unk_01 = 0xF, .mapMatrixID = 0x114, @@ -12780,8 +12782,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_DISTORTION_WORLD_B7F] = { .unk_00 = 0x4A, .unk_01 = 0xF, .mapMatrixID = 0x115, @@ -12802,8 +12804,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_DISTORTION_WORLD_GIRATINA_ROOM] = { .unk_00 = 0x4A, .unk_01 = 0xF, .mapMatrixID = 0x116, @@ -12824,8 +12826,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_DISTORTION_WORLD_TURNBACK_CAVE_ROOM] = { .unk_00 = 0x4A, .unk_01 = 0xF, .mapMatrixID = 0x117, @@ -12846,8 +12848,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_SPEAR_PILLAR_DIALGA] = { .unk_00 = 0x3C, .unk_01 = 0xF, .mapMatrixID = 0x118, @@ -12868,8 +12870,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_SPEAR_PILLAR_PALKIA] = { .unk_00 = 0x3C, .unk_01 = 0xF, .mapMatrixID = 0x119, @@ -12890,8 +12892,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_WIFI_PLAZA_ENTRANCE] = { .unk_00 = 0x15, .unk_01 = 0xF, .mapMatrixID = 0x11A, @@ -12912,8 +12914,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x0, .isEscapeRopeAllowed = 0x0, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_IRON_ISLAND_IRON_RUINS] = { .unk_00 = 0x48, .unk_01 = 0xF, .mapMatrixID = 0x11B, @@ -12934,8 +12936,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x1, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_IRON_RUINS] = { .unk_00 = 0x48, .unk_01 = 0xF, .mapMatrixID = 0x11C, @@ -12956,8 +12958,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x1, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_MT_CORONET_ICEBERG_RUINS] = { .unk_00 = 0x45, .unk_01 = 0xF, .mapMatrixID = 0x11D, @@ -12978,8 +12980,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x1, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_ICEBERG_RUINS] = { .unk_00 = 0x45, .unk_01 = 0xF, .mapMatrixID = 0x11E, @@ -13000,8 +13002,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x1, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_ROUTE_228_ROCK_PEAK_RUINS] = { .unk_00 = 0x39, .unk_01 = 0xF, .mapMatrixID = 0x11F, @@ -13022,8 +13024,8 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x1, .isFlyAllowed = 0x0, - }, - { + }, + [MAP_HEADER_ROCK_PEAK_RUINS] = { .unk_00 = 0x39, .unk_01 = 0xF, .mapMatrixID = 288, @@ -13044,5 +13046,5 @@ static const MapHeader sMapHeaders[] = { .isRunningAllowed = 0x1, .isEscapeRopeAllowed = 0x1, .isFlyAllowed = 0x0, - }, + }, }; From c1e717f66b84f6a79c8540cf9e3f00175408339a Mon Sep 17 00:00:00 2001 From: Trainer Riley Date: Thu, 11 Apr 2024 23:14:59 -0700 Subject: [PATCH 03/23] Rename structs and consolidate headers --- include/overlay025/funcptr_ov25_02255ACC.h | 6 -- include/overlay025/ov25_02255ACC.h | 15 ---- include/overlay025/poketch_button.h | 27 +++++++ include/overlay025/poketch_system.h | 6 +- .../overlay025/struct_ov25_02255B34_decl.h | 6 -- platinum.us/main.lsf | 2 +- src/meson.build | 2 +- .../{ov25_02255ACC.c => poketch_button.c} | 77 ++++++++----------- src/overlay025/poketch_system.c | 5 +- src/overlay026/ov26_022561C0.c | 5 +- src/overlay027/ov27_022561C0.c | 5 +- src/overlay028/ov28_022561C0.c | 5 +- src/overlay029/ov29_022561C0.c | 5 +- src/overlay030/ov30_022561C0.c | 5 +- src/overlay035/ov35_022561C0.c | 5 +- src/overlay036/ov36_022561C0.c | 5 +- src/overlay037/ov37_022561C0.c | 5 +- src/overlay039/ov39_022561C0.c | 5 +- src/overlay041/ov41_022561C0.c | 5 +- src/overlay043/ov43_022561C0.c | 5 +- src/overlay044/ov44_022561C0.c | 5 +- src/overlay045/ov45_022561C0.c | 5 +- src/overlay046/ov46_022561C0.c | 5 +- src/overlay050/ov50_022561C0.c | 5 +- src/overlay053/ov53_022561C0.c | 5 +- src/overlay054/ov54_022561C0.c | 5 +- 26 files changed, 101 insertions(+), 130 deletions(-) delete mode 100644 include/overlay025/funcptr_ov25_02255ACC.h delete mode 100644 include/overlay025/ov25_02255ACC.h create mode 100644 include/overlay025/poketch_button.h delete mode 100644 include/overlay025/struct_ov25_02255B34_decl.h rename src/overlay025/{ov25_02255ACC.c => poketch_button.c} (61%) diff --git a/include/overlay025/funcptr_ov25_02255ACC.h b/include/overlay025/funcptr_ov25_02255ACC.h deleted file mode 100644 index ad98ab4fa9..0000000000 --- a/include/overlay025/funcptr_ov25_02255ACC.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef POKEPLATINUM_FUNCPTR_OV25_02255ACC_H -#define POKEPLATINUM_FUNCPTR_OV25_02255ACC_H - -typedef void (* UnkFuncPtr_ov25_02255ACC)(u32, u32, u32, void *); - -#endif // POKEPLATINUM_FUNCPTR_OV25_02255ACC_H diff --git a/include/overlay025/ov25_02255ACC.h b/include/overlay025/ov25_02255ACC.h deleted file mode 100644 index 5647ae6721..0000000000 --- a/include/overlay025/ov25_02255ACC.h +++ /dev/null @@ -1,15 +0,0 @@ -#ifndef POKEPLATINUM_OV25_02255ACC_H -#define POKEPLATINUM_OV25_02255ACC_H - -#include "struct_defs/union_02022594_020225E0.h" -#include "overlay025/funcptr_ov25_02255ACC.h" -#include "overlay025/struct_ov25_02255B34_decl.h" - -UnkStruct_ov25_02255B34 * ov25_02255ACC(const UnkUnion_020225E0 * param0, u32 param1, UnkFuncPtr_ov25_02255ACC param2, void * param3, u32 param4); -void ov25_02255B34(UnkStruct_ov25_02255B34 * param0); -void ov25_02255B50(UnkStruct_ov25_02255B34 * param0); -void ov25_02255C48(UnkStruct_ov25_02255B34 * param0, u32 param1, u32 param2, u16 param3); -void ov25_02255C5C(UnkStruct_ov25_02255B34 * param0, u32 param1, u16 param2); -void ov25_02255C68(UnkStruct_ov25_02255B34 * param0, u32 param1); - -#endif // POKEPLATINUM_OV25_02255ACC_H diff --git a/include/overlay025/poketch_button.h b/include/overlay025/poketch_button.h new file mode 100644 index 0000000000..885685529d --- /dev/null +++ b/include/overlay025/poketch_button.h @@ -0,0 +1,27 @@ +#ifndef POKEPLATINUM_OV25_02255ACC_H +#define POKEPLATINUM_OV25_02255ACC_H + +#include "struct_defs/union_02022594_020225E0.h" +#include "overlay025/poketch_button.h" + +typedef struct PoketchButton PoketchButton; + +typedef void (* PoketchButtonCallback)(u32, u32, u32, void *); + +typedef struct PoketchButtonManager { + const UnkUnion_020225E0 * unk_00; + PoketchButtonCallback unk_04; + u32 unk_08; + u32 unk_0C; + void * unk_10; + PoketchButton * unk_14; +} PoketchButtonManager; + +PoketchButtonManager * ov25_02255ACC(const UnkUnion_020225E0 * param0, u32 param1, PoketchButtonCallback param2, void * param3, u32 param4); +void ov25_02255B34(PoketchButtonManager * param0); +void ov25_02255B50(PoketchButtonManager * param0); +void ov25_02255C48(PoketchButtonManager * param0, u32 param1, u32 param2, u16 param3); +void ov25_02255C5C(PoketchButtonManager * param0, u32 param1, u16 param2); +void ov25_02255C68(PoketchButtonManager * param0, u32 param1); + +#endif // POKEPLATINUM_OV25_02255ACC_H diff --git a/include/overlay025/poketch_system.h b/include/overlay025/poketch_system.h index 404a88c38d..1cbd8c6df8 100644 --- a/include/overlay025/poketch_system.h +++ b/include/overlay025/poketch_system.h @@ -9,7 +9,7 @@ #include "overlay025/struct_ov25_02254560_decl.h" #include "overlay025/struct_ov25_02254560_1.h" -#include "overlay025/struct_ov25_02255B34_decl.h" +#include "overlay025/poketch_button.h" #include @@ -41,7 +41,7 @@ struct PoketchSystem { UnkStruct_ov25_02254560 * unk_1C; UnkStruct_ov25_02254560_1 unk_20; void * unk_24; - UnkStruct_ov25_02255B34 * unk_28; + PoketchButtonManager * unk_28; u32 unk_2C; u32 unk_30; PoketchSystem ** poketchSysPtr; @@ -74,7 +74,7 @@ void ov25_02254444(u32 param0, u32 param1); BOOL ov25_0225446C(u32 * param0, u32 * param1); BOOL ov25_022544BC(u32 * param0, u32 * param1); BOOL ov25_0225450C(const PoketchSystem *poketchSys); -void ov25_02254518(const PoketchSystem *poketchSys, UnkStruct_ov25_02255B34 * param1); +void ov25_02254518(const PoketchSystem *poketchSys, PoketchButtonManager * param1); BOOL ov25_02254534(const PoketchSystem *poketchSys); BOOL PoketchSystem_PedometerUpdated(const PoketchSystem *poketchSys); FieldSystem * PoketchSystem_FieldSystem(const PoketchSystem *poketchSys); diff --git a/include/overlay025/struct_ov25_02255B34_decl.h b/include/overlay025/struct_ov25_02255B34_decl.h deleted file mode 100644 index fd6fd0621e..0000000000 --- a/include/overlay025/struct_ov25_02255B34_decl.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef POKEPLATINUM_STRUCT_OV25_02255B34_DECL_H -#define POKEPLATINUM_STRUCT_OV25_02255B34_DECL_H - -typedef struct UnkStruct_ov25_02255B34_t UnkStruct_ov25_02255B34; - -#endif // POKEPLATINUM_STRUCT_OV25_02255B34_DECL_H diff --git a/platinum.us/main.lsf b/platinum.us/main.lsf index 3c5600fd42..c258a76d2b 100644 --- a/platinum.us/main.lsf +++ b/platinum.us/main.lsf @@ -875,7 +875,7 @@ Overlay overlay25 Object main.nef.p/src_overlay025_ov25_02254560.c.o Object main.nef.p/src_overlay025_ov25_02255090.c.o Object main.nef.p/src_overlay025_ov25_02255540.c.o - Object main.nef.p/src_overlay025_ov25_02255ACC.c.o + Object main.nef.p/src_overlay025_poketch_button.c.o Object main.nef.p/src_overlay025_ov25_02255DBC.c.o } diff --git a/src/meson.build b/src/meson.build index 7e708bcd8e..eb9932d006 100644 --- a/src/meson.build +++ b/src/meson.build @@ -666,7 +666,7 @@ pokeplatinum_c = files( 'overlay025/ov25_02254560.c', 'overlay025/ov25_02255090.c', 'overlay025/ov25_02255540.c', - 'overlay025/ov25_02255ACC.c', + 'overlay025/poketch_button.c', 'overlay025/ov25_02255DBC.c', 'overlay026/ov26_022561C0.c', 'overlay026/ov26_02256404.c', diff --git a/src/overlay025/ov25_02255ACC.c b/src/overlay025/poketch_button.c similarity index 61% rename from src/overlay025/ov25_02255ACC.c rename to src/overlay025/poketch_button.c index 1183ab7f54..1e0b2322f9 100644 --- a/src/overlay025/ov25_02255ACC.c +++ b/src/overlay025/poketch_button.c @@ -1,16 +1,14 @@ #include #include -#include "overlay025/struct_ov25_02255B34_decl.h" +#include "overlay025/poketch_button.h" #include "struct_defs/union_02022594_020225E0.h" -#include "overlay025/funcptr_ov25_02255ACC.h" #include "heap.h" #include "unk_02022594.h" -#include "overlay025/ov25_02255ACC.h" -typedef struct { +typedef struct PoketchButton { u8 unk_00; u8 unk_01; u8 unk_02; @@ -19,35 +17,26 @@ typedef struct { u16 unk_06; u16 unk_08[2]; u16 unk_0C; -} UnkStruct_ov25_02255C80; +} PoketchButton; -struct UnkStruct_ov25_02255B34_t { - const UnkUnion_020225E0 * unk_00; - UnkFuncPtr_ov25_02255ACC unk_04; - u32 unk_08; - u32 unk_0C; - void * unk_10; - UnkStruct_ov25_02255C80 * unk_14; -}; +static void ov25_02255C80(PoketchButton * param0); +static void ov25_02255CA0(PoketchButton * param0, u32 param1); +static void ov25_02255CA0(PoketchButton * param0, u32 param1); +static void ov25_02255CAC(PoketchButton * param0); +static u32 ov25_02255CC0(PoketchButton * param0); +static u32 ov25_02255CDC(PoketchButton * param0, BOOL param1, BOOL param2); +static u32 ov25_02255CF8(PoketchButton * param0, BOOL param1, BOOL param2); +static u32 ov25_02255D58(PoketchButton * param0, BOOL param1, BOOL param2); +static u32 ov25_02255D90(PoketchButton * param0, BOOL param1, BOOL param2); +static u32 ov25_02255DA8(PoketchButton * param0, BOOL param1, BOOL param2); -static void ov25_02255C80(UnkStruct_ov25_02255C80 * param0); -static void ov25_02255CA0(UnkStruct_ov25_02255C80 * param0, u32 param1); -static void ov25_02255CA0(UnkStruct_ov25_02255C80 * param0, u32 param1); -static void ov25_02255CAC(UnkStruct_ov25_02255C80 * param0); -static u32 ov25_02255CC0(UnkStruct_ov25_02255C80 * param0); -static u32 ov25_02255CDC(UnkStruct_ov25_02255C80 * param0, BOOL param1, BOOL param2); -static u32 ov25_02255CF8(UnkStruct_ov25_02255C80 * param0, BOOL param1, BOOL param2); -static u32 ov25_02255D58(UnkStruct_ov25_02255C80 * param0, BOOL param1, BOOL param2); -static u32 ov25_02255D90(UnkStruct_ov25_02255C80 * param0, BOOL param1, BOOL param2); -static u32 ov25_02255DA8(UnkStruct_ov25_02255C80 * param0, BOOL param1, BOOL param2); - -UnkStruct_ov25_02255B34 * ov25_02255ACC (const UnkUnion_020225E0 * param0, u32 param1, UnkFuncPtr_ov25_02255ACC param2, void * param3, u32 param4) +PoketchButtonManager * ov25_02255ACC (const UnkUnion_020225E0 * param0, u32 param1, PoketchButtonCallback param2, void * param3, u32 param4) { - UnkStruct_ov25_02255B34 * v0; + PoketchButtonManager * v0; GF_ASSERT(param1 > 0); - v0 = Heap_AllocFromHeap(param4, sizeof(UnkStruct_ov25_02255B34)); + v0 = Heap_AllocFromHeap(param4, sizeof(PoketchButtonManager)); if (v0) { v0->unk_08 = param4; @@ -55,7 +44,7 @@ UnkStruct_ov25_02255B34 * ov25_02255ACC (const UnkUnion_020225E0 * param0, u32 p v0->unk_00 = param0; v0->unk_0C = param1; v0->unk_10 = param3; - v0->unk_14 = Heap_AllocFromHeap(param4, sizeof(UnkStruct_ov25_02255C80) * param1); + v0->unk_14 = Heap_AllocFromHeap(param4, sizeof(PoketchButton) * param1); if (v0->unk_14) { u32 v1; @@ -72,16 +61,16 @@ UnkStruct_ov25_02255B34 * ov25_02255ACC (const UnkUnion_020225E0 * param0, u32 p return v0; } -void ov25_02255B34 (UnkStruct_ov25_02255B34 * param0) +void ov25_02255B34 (PoketchButtonManager * param0) { GF_ASSERT(param0); Heap_FreeToHeapExplicit(param0->unk_08, param0->unk_14); Heap_FreeToHeapExplicit(param0->unk_08, param0); } -void ov25_02255B50 (UnkStruct_ov25_02255B34 * param0) +void ov25_02255B50 (PoketchButtonManager * param0) { - static u32(*const v0[])(UnkStruct_ov25_02255C80 *, BOOL, BOOL) = { + static u32(*const v0[])(PoketchButton *, BOOL, BOOL) = { ov25_02255CDC, ov25_02255CF8, ov25_02255D58, @@ -135,23 +124,23 @@ void ov25_02255B50 (UnkStruct_ov25_02255B34 * param0) } } -void ov25_02255C48 (UnkStruct_ov25_02255B34 * param0, u32 param1, u32 param2, u16 param3) +void ov25_02255C48 (PoketchButtonManager * param0, u32 param1, u32 param2, u16 param3) { param0->unk_14[param1].unk_08[param2] = param3; } -void ov25_02255C5C (UnkStruct_ov25_02255B34 * param0, u32 param1, u16 param2) +void ov25_02255C5C (PoketchButtonManager * param0, u32 param1, u16 param2) { param0->unk_14[param1].unk_0C = param2; } -void ov25_02255C68 (UnkStruct_ov25_02255B34 * param0, u32 param1) +void ov25_02255C68 (PoketchButtonManager * param0, u32 param1) { param0->unk_14[param1].unk_04 = 0; param0->unk_14[param1].unk_00 = 4; } -static void ov25_02255C80 (UnkStruct_ov25_02255C80 * param0) +static void ov25_02255C80 (PoketchButton * param0) { u32 v0; @@ -168,25 +157,25 @@ static void ov25_02255C80 (UnkStruct_ov25_02255C80 * param0) param0->unk_0C = 0; } -static void ov25_02255CA0 (UnkStruct_ov25_02255C80 * param0, u32 param1) +static void ov25_02255CA0 (PoketchButton * param0, u32 param1) { param0->unk_00 = param1; param0->unk_04 = 0; } -static void ov25_02255CA8 (UnkStruct_ov25_02255C80 * param0, u32 param1) +static void ov25_02255CA8 (PoketchButton * param0, u32 param1) { param0->unk_00 = param1; } -static void ov25_02255CAC (UnkStruct_ov25_02255C80 * param0) +static void ov25_02255CAC (PoketchButton * param0) { if (param0->unk_04 < 0xffff) { param0->unk_04++; } } -static u32 ov25_02255CC0 (UnkStruct_ov25_02255C80 * param0) +static u32 ov25_02255CC0 (PoketchButton * param0) { u32 v0; @@ -199,7 +188,7 @@ static u32 ov25_02255CC0 (UnkStruct_ov25_02255C80 * param0) return 0; } -static u32 ov25_02255CDC (UnkStruct_ov25_02255C80 * param0, BOOL param1, BOOL param2) +static u32 ov25_02255CDC (PoketchButton * param0, BOOL param1, BOOL param2) { if (param0->unk_01) { if (param2) { @@ -211,7 +200,7 @@ static u32 ov25_02255CDC (UnkStruct_ov25_02255C80 * param0, BOOL param1, BOOL pa return 0; } -static u32 ov25_02255CF8 (UnkStruct_ov25_02255C80 * param0, BOOL param1, BOOL param2) +static u32 ov25_02255CF8 (PoketchButton * param0, BOOL param1, BOOL param2) { ov25_02255CAC(param0); @@ -243,7 +232,7 @@ static u32 ov25_02255CF8 (UnkStruct_ov25_02255C80 * param0, BOOL param1, BOOL pa return 0; } -static u32 ov25_02255D58 (UnkStruct_ov25_02255C80 * param0, BOOL param1, BOOL param2) +static u32 ov25_02255D58 (PoketchButton * param0, BOOL param1, BOOL param2) { ov25_02255CAC(param0); @@ -260,7 +249,7 @@ static u32 ov25_02255D58 (UnkStruct_ov25_02255C80 * param0, BOOL param1, BOOL pa return 0; } -static u32 ov25_02255D90 (UnkStruct_ov25_02255C80 * param0, BOOL param1, BOOL param2) +static u32 ov25_02255D90 (PoketchButton * param0, BOOL param1, BOOL param2) { if (param0->unk_01) { ov25_02255CAC(param0); @@ -271,7 +260,7 @@ static u32 ov25_02255D90 (UnkStruct_ov25_02255C80 * param0, BOOL param1, BOOL pa return 0; } -static u32 ov25_02255DA8 (UnkStruct_ov25_02255C80 * param0, BOOL param1, BOOL param2) +static u32 ov25_02255DA8 (PoketchButton * param0, BOOL param1, BOOL param2) { if (param0->unk_01 == 0) { ov25_02255CA0(param0, 0); diff --git a/src/overlay025/poketch_system.c b/src/overlay025/poketch_system.c index b20711ac91..516b265666 100644 --- a/src/overlay025/poketch_system.c +++ b/src/overlay025/poketch_system.c @@ -11,7 +11,7 @@ #include "savedata.h" #include "overlay025/poketch_system.h" #include "overlay025/struct_ov25_02254560_decl.h" -#include "overlay025/struct_ov25_02255B34_decl.h" +#include "overlay025/poketch_button.h" #include "struct_defs/union_02022594_020225E0.h" @@ -26,7 +26,6 @@ #include "unk_020508D4.h" #include "unk_02099D44.h" #include "overlay025/ov25_02254560.h" -#include "overlay025/ov25_02255ACC.h" FS_EXTERN_OVERLAY(overlay26); FS_EXTERN_OVERLAY(overlay27); @@ -740,7 +739,7 @@ BOOL ov25_0225450C (const PoketchSystem *poketchSys) return sub_020509A4(poketchSys->fieldSys); } -void ov25_02254518 (const PoketchSystem *poketchSys, UnkStruct_ov25_02255B34 * param1) +void ov25_02254518 (const PoketchSystem *poketchSys, PoketchButtonManager * param1) { if ((ov25_0225450C(poketchSys) == 0) && (poketchSys->unk_05 == 0)) { ov25_02255B50(param1); diff --git a/src/overlay026/ov26_022561C0.c b/src/overlay026/ov26_022561C0.c index a73e93573c..132db4d2d2 100644 --- a/src/overlay026/ov26_022561C0.c +++ b/src/overlay026/ov26_022561C0.c @@ -5,7 +5,7 @@ #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/sys_task.h" #include "overlay025/poketch_system.h" -#include "overlay025/struct_ov25_02255B34_decl.h" +#include "overlay025/poketch_button.h" #include "overlay026/struct_ov26_02256404_decl.h" #include "struct_defs/union_02022594_020225E0.h" @@ -14,7 +14,6 @@ #include "unk_0200D9E8.h" #include "rtc.h" #include "heap.h" -#include "overlay025/ov25_02255ACC.h" #include "overlay026/ov26_02256404.h" typedef struct { @@ -28,7 +27,7 @@ typedef struct { u8 unk_07; u32 unk_08; u32 unk_0C; - UnkStruct_ov25_02255B34 * unk_10; + PoketchButtonManager * unk_10; UnkStruct_ov26_02256404_1 unk_14; UnkStruct_ov26_02256404 * unk_24; PoketchSystem * unk_28; diff --git a/src/overlay027/ov27_022561C0.c b/src/overlay027/ov27_022561C0.c index fea92db5e6..2836cd452d 100644 --- a/src/overlay027/ov27_022561C0.c +++ b/src/overlay027/ov27_022561C0.c @@ -5,7 +5,7 @@ #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/sys_task.h" #include "overlay025/poketch_system.h" -#include "overlay025/struct_ov25_02255B34_decl.h" +#include "overlay025/poketch_button.h" #include "overlay027/struct_ov27_0225680C_decl.h" #include "struct_defs/union_02022594_020225E0.h" @@ -15,7 +15,6 @@ #include "heap.h" #include "unk_02022844.h" #include "unk_02099D44.h" -#include "overlay025/ov25_02255ACC.h" #include "overlay027/ov27_0225680C.h" typedef struct { @@ -40,7 +39,7 @@ typedef struct { u64 unk_14; UnkStruct_ov27_0225680C_1 unk_1C; UnkStruct_ov27_0225621C_sub1 unk_38; - UnkStruct_ov25_02255B34 * unk_5C; + PoketchButtonManager * unk_5C; UnkStruct_ov27_0225680C * unk_60; PoketchSystem * unk_64; } UnkStruct_ov27_0225621C; diff --git a/src/overlay028/ov28_022561C0.c b/src/overlay028/ov28_022561C0.c index e2d8790bd8..c5040c2c67 100644 --- a/src/overlay028/ov28_022561C0.c +++ b/src/overlay028/ov28_022561C0.c @@ -6,7 +6,7 @@ #include "struct_decls/sys_task.h" #include "struct_decls/pokedexdata_decl.h" #include "overlay025/poketch_system.h" -#include "overlay025/struct_ov25_02255B34_decl.h" +#include "overlay025/poketch_button.h" #include "overlay028/struct_ov28_0225697C_decl.h" #include "overlay028/struct_ov28_02256E9C_decl.h" @@ -18,7 +18,6 @@ #include "heap.h" #include "unk_0202631C.h" #include "pokemon.h" -#include "overlay025/ov25_02255ACC.h" #include "overlay028/ov28_0225697C.h" #include "overlay028/ov28_02256E9C.h" @@ -31,7 +30,7 @@ typedef struct { u8 unk_05; u16 unk_06; u32 unk_08; - UnkStruct_ov25_02255B34 * unk_0C; + PoketchButtonManager * unk_0C; PoketchSystem * unk_10; UnkStruct_ov28_0225697C * unk_14; UnkStruct_ov28_0225697C_1 unk_18; diff --git a/src/overlay029/ov29_022561C0.c b/src/overlay029/ov29_022561C0.c index a604a102a6..c5d37b2e3f 100644 --- a/src/overlay029/ov29_022561C0.c +++ b/src/overlay029/ov29_022561C0.c @@ -5,7 +5,7 @@ #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/sys_task.h" #include "overlay025/poketch_system.h" -#include "overlay025/struct_ov25_02255B34_decl.h" +#include "overlay025/poketch_button.h" #include "overlay029/struct_ov29_022566C8_decl.h" #include "struct_defs/union_02022594_020225E0.h" @@ -13,7 +13,6 @@ #include "unk_0200D9E8.h" #include "heap.h" -#include "overlay025/ov25_02255ACC.h" #include "overlay029/ov29_022566C8.h" typedef struct { @@ -25,7 +24,7 @@ typedef struct { UnkStruct_ov29_022566C8_1 unk_08; UnkStruct_ov29_022566C8 * unk_16F4; PoketchSystem * unk_16F8; - UnkStruct_ov25_02255B34 * unk_16FC; + PoketchButtonManager * unk_16FC; } UnkStruct_ov29_0225621C; static void NitroStaticInit(void); diff --git a/src/overlay030/ov30_022561C0.c b/src/overlay030/ov30_022561C0.c index 2e77984fc6..d9aacc5760 100644 --- a/src/overlay030/ov30_022561C0.c +++ b/src/overlay030/ov30_022561C0.c @@ -5,7 +5,7 @@ #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/sys_task.h" #include "overlay025/poketch_system.h" -#include "overlay025/struct_ov25_02255B34_decl.h" +#include "overlay025/poketch_button.h" #include "overlay030/struct_ov30_022563EC_decl.h" #include "struct_defs/union_02022594_020225E0.h" @@ -14,7 +14,6 @@ #include "unk_0200D9E8.h" #include "rtc.h" #include "heap.h" -#include "overlay025/ov25_02255ACC.h" #include "overlay030/ov30_022563EC.h" typedef struct { @@ -27,7 +26,7 @@ typedef struct { u8 unk_06; u32 unk_08; u32 unk_0C; - UnkStruct_ov25_02255B34 * unk_10; + PoketchButtonManager * unk_10; UnkStruct_ov30_022563EC_1 unk_14; UnkStruct_ov30_022563EC * unk_24; PoketchSystem * unk_28; diff --git a/src/overlay035/ov35_022561C0.c b/src/overlay035/ov35_022561C0.c index c0869bab8d..25cfee520f 100644 --- a/src/overlay035/ov35_022561C0.c +++ b/src/overlay035/ov35_022561C0.c @@ -5,7 +5,7 @@ #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/sys_task.h" #include "overlay025/poketch_system.h" -#include "overlay025/struct_ov25_02255B34_decl.h" +#include "overlay025/poketch_button.h" #include "overlay035/struct_ov35_02256410_decl.h" #include "struct_defs/union_02022594_020225E0.h" @@ -14,7 +14,6 @@ #include "unk_0200D9E8.h" #include "heap.h" #include "unk_02099D44.h" -#include "overlay025/ov25_02255ACC.h" #include "overlay035/ov35_02256410.h" typedef struct { @@ -25,7 +24,7 @@ typedef struct { UnkStruct_ov35_02256410_1 unk_08; UnkStruct_ov35_02256410 * unk_10; PoketchSystem * unk_14; - UnkStruct_ov25_02255B34 * unk_18; + PoketchButtonManager * unk_18; u32 unk_1C; } UnkStruct_ov35_0225621C; diff --git a/src/overlay036/ov36_022561C0.c b/src/overlay036/ov36_022561C0.c index 693c2da3a5..d837ef20c4 100644 --- a/src/overlay036/ov36_022561C0.c +++ b/src/overlay036/ov36_022561C0.c @@ -5,7 +5,7 @@ #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/sys_task.h" #include "overlay025/poketch_system.h" -#include "overlay025/struct_ov25_02255B34_decl.h" +#include "overlay025/poketch_button.h" #include "overlay036/poketch_app_pedometer.h" #include "struct_defs/union_02022594_020225E0.h" @@ -13,7 +13,6 @@ #include "unk_0200D9E8.h" #include "heap.h" #include "poketch_data.h" -#include "overlay025/ov25_02255ACC.h" typedef struct { u8 unk_00; @@ -22,7 +21,7 @@ typedef struct { UnkStruct_ov36_02256404_1 unk_04; UnkStruct_ov36_02256404 * unk_0C; PoketchSystem * unk_10; - UnkStruct_ov25_02255B34 * unk_14; + PoketchButtonManager * unk_14; u32 unk_18; PoketchData * unk_1C; } UnkStruct_ov36_0225621C; diff --git a/src/overlay037/ov37_022561C0.c b/src/overlay037/ov37_022561C0.c index c144785a85..338feb5337 100644 --- a/src/overlay037/ov37_022561C0.c +++ b/src/overlay037/ov37_022561C0.c @@ -5,7 +5,7 @@ #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/sys_task.h" #include "overlay025/poketch_system.h" -#include "overlay025/struct_ov25_02255B34_decl.h" +#include "overlay025/poketch_button.h" #include "overlay037/struct_ov37_022563D4_decl.h" #include "struct_defs/union_02022594_020225E0.h" @@ -13,7 +13,6 @@ #include "unk_0200D9E8.h" #include "heap.h" -#include "overlay025/ov25_02255ACC.h" #include "overlay037/ov37_022563D4.h" typedef struct { @@ -23,7 +22,7 @@ typedef struct { UnkStruct_ov37_022563D4_1 unk_04; UnkStruct_ov37_022563D4 * unk_08; PoketchSystem * unk_0C; - UnkStruct_ov25_02255B34 * unk_10; + PoketchButtonManager * unk_10; u32 unk_14; u32 unk_18; } UnkStruct_ov37_0225621C; diff --git a/src/overlay039/ov39_022561C0.c b/src/overlay039/ov39_022561C0.c index 5041b731dc..7a93c32313 100644 --- a/src/overlay039/ov39_022561C0.c +++ b/src/overlay039/ov39_022561C0.c @@ -5,7 +5,7 @@ #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/sys_task.h" #include "overlay025/poketch_system.h" -#include "overlay025/struct_ov25_02255B34_decl.h" +#include "overlay025/poketch_button.h" #include "overlay039/struct_ov39_022563DC_decl.h" #include "struct_defs/union_02022594_020225E0.h" @@ -13,7 +13,6 @@ #include "unk_0200D9E8.h" #include "heap.h" -#include "overlay025/ov25_02255ACC.h" #include "overlay039/ov39_022563DC.h" typedef struct { @@ -23,7 +22,7 @@ typedef struct { UnkStruct_ov39_022563DC_1 unk_04; UnkStruct_ov39_022563DC * unk_24; PoketchSystem * unk_28; - UnkStruct_ov25_02255B34 * unk_2C; + PoketchButtonManager * unk_2C; u32 unk_30; u32 unk_34; } UnkStruct_ov39_0225621C; diff --git a/src/overlay041/ov41_022561C0.c b/src/overlay041/ov41_022561C0.c index 0c05246790..9b5ae7ea24 100644 --- a/src/overlay041/ov41_022561C0.c +++ b/src/overlay041/ov41_022561C0.c @@ -5,7 +5,7 @@ #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/sys_task.h" #include "overlay025/poketch_system.h" -#include "overlay025/struct_ov25_02255B34_decl.h" +#include "overlay025/poketch_button.h" #include "overlay041/struct_ov41_022567B0_decl.h" #include "struct_defs/union_02022594_020225E0.h" @@ -13,7 +13,6 @@ #include "unk_0200D9E8.h" #include "heap.h" -#include "overlay025/ov25_02255ACC.h" #include "overlay041/ov41_022567B0.h" typedef struct { @@ -24,7 +23,7 @@ typedef struct { UnkStruct_ov41_022567B0_1 unk_04; UnkStruct_ov41_022567B0 * unk_5B7C; PoketchSystem * unk_5B80; - UnkStruct_ov25_02255B34 * unk_5B84; + PoketchButtonManager * unk_5B84; u32 unk_5B88; u32 unk_5B8C; } UnkStruct_ov41_02256220; diff --git a/src/overlay043/ov43_022561C0.c b/src/overlay043/ov43_022561C0.c index 5324283ff3..8d29fff392 100644 --- a/src/overlay043/ov43_022561C0.c +++ b/src/overlay043/ov43_022561C0.c @@ -5,7 +5,7 @@ #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/sys_task.h" #include "overlay025/poketch_system.h" -#include "overlay025/struct_ov25_02255B34_decl.h" +#include "overlay025/poketch_button.h" #include "overlay043/struct_ov43_02256544_decl.h" #include "struct_defs/union_02022594_020225E0.h" @@ -14,7 +14,6 @@ #include "unk_0200D9E8.h" #include "heap.h" #include "unk_02099D44.h" -#include "overlay025/ov25_02255ACC.h" #include "overlay043/ov43_02256544.h" typedef struct { @@ -25,7 +24,7 @@ typedef struct { UnkStruct_ov43_02256544_1 unk_08; UnkStruct_ov43_02256544 * unk_14; PoketchSystem * unk_18; - UnkStruct_ov25_02255B34 * unk_1C; + PoketchButtonManager * unk_1C; u32 unk_20; } UnkStruct_ov43_0225621C; diff --git a/src/overlay044/ov44_022561C0.c b/src/overlay044/ov44_022561C0.c index 2f5f8b6afc..4d7db2fe8f 100644 --- a/src/overlay044/ov44_022561C0.c +++ b/src/overlay044/ov44_022561C0.c @@ -7,7 +7,7 @@ #include "pokemon.h" #include "struct_decls/struct_party_decl.h" #include "overlay025/poketch_system.h" -#include "overlay025/struct_ov25_02255B34_decl.h" +#include "overlay025/poketch_button.h" #include "overlay044/struct_ov44_022565BC_decl.h" #include "struct_defs/union_02022594_020225E0.h" @@ -19,7 +19,6 @@ #include "pokemon_icon.h" #include "party.h" #include "overlay005/ov5_021E622C.h" -#include "overlay025/ov25_02255ACC.h" #include "overlay044/ov44_022565BC.h" typedef struct { @@ -29,7 +28,7 @@ typedef struct { UnkStruct_ov44_022565BC_1 unk_04; UnkStruct_ov44_022565BC * unk_38; PoketchSystem * unk_3C; - UnkStruct_ov25_02255B34 * unk_40; + PoketchButtonManager * unk_40; u16 unk_44; u16 unk_46; BoxPokemon * unk_48[6]; diff --git a/src/overlay045/ov45_022561C0.c b/src/overlay045/ov45_022561C0.c index 35dcb40173..3965e2a240 100644 --- a/src/overlay045/ov45_022561C0.c +++ b/src/overlay045/ov45_022561C0.c @@ -5,7 +5,7 @@ #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/sys_task.h" #include "overlay025/poketch_system.h" -#include "overlay025/struct_ov25_02255B34_decl.h" +#include "overlay025/poketch_button.h" #include "overlay045/struct_ov45_022566EC_decl.h" #include "struct_defs/union_02022594_020225E0.h" @@ -15,7 +15,6 @@ #include "rtc.h" #include "heap.h" #include "poketch_data.h" -#include "overlay025/ov25_02255ACC.h" #include "overlay045/ov45_022566EC.h" typedef struct { @@ -26,7 +25,7 @@ typedef struct { UnkStruct_ov45_022566EC * unk_08; PoketchSystem * unk_0C; PoketchData * unk_10; - UnkStruct_ov25_02255B34 * unk_14; + PoketchButtonManager * unk_14; u32 unk_18; u32 unk_1C; RTCTime unk_20; diff --git a/src/overlay046/ov46_022561C0.c b/src/overlay046/ov46_022561C0.c index 5dfcd9f650..f29b6835e2 100644 --- a/src/overlay046/ov46_022561C0.c +++ b/src/overlay046/ov46_022561C0.c @@ -7,7 +7,7 @@ #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/sys_task.h" #include "overlay025/poketch_system.h" -#include "overlay025/struct_ov25_02255B34_decl.h" +#include "overlay025/poketch_button.h" #include "overlay046/struct_ov46_02256BCC_decl.h" #include "struct_defs/union_02022594_020225E0.h" @@ -17,7 +17,6 @@ #include "heap.h" #include "unk_02022844.h" #include "unk_02099D44.h" -#include "overlay025/ov25_02255ACC.h" #include "overlay046/ov46_02256BCC.h" typedef struct { @@ -39,7 +38,7 @@ typedef struct { u32 unk_04; UnkStruct_ov46_02256BCC * unk_08; PoketchSystem * unk_0C; - UnkStruct_ov25_02255B34 * unk_10; + PoketchButtonManager * unk_10; u32 unk_14; u32 unk_18; u64 unk_1C; diff --git a/src/overlay050/ov50_022561C0.c b/src/overlay050/ov50_022561C0.c index 9482ce29dd..4597dfb7a7 100644 --- a/src/overlay050/ov50_022561C0.c +++ b/src/overlay050/ov50_022561C0.c @@ -5,7 +5,7 @@ #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/sys_task.h" #include "overlay025/poketch_system.h" -#include "overlay025/struct_ov25_02255B34_decl.h" +#include "overlay025/poketch_button.h" #include "overlay050/struct_ov50_02256510_decl.h" #include "struct_defs/union_02022594_020225E0.h" @@ -15,7 +15,6 @@ #include "rtc.h" #include "heap.h" #include "poketch_data.h" -#include "overlay025/ov25_02255ACC.h" #include "overlay050/ov50_02256510.h" typedef struct { @@ -26,7 +25,7 @@ typedef struct { UnkStruct_ov50_02256510 * unk_90; PoketchSystem * unk_94; PoketchData * unk_98; - UnkStruct_ov25_02255B34 * unk_9C; + PoketchButtonManager * unk_9C; u32 unk_A0; u32 unk_A4; u32 unk_A8; diff --git a/src/overlay053/ov53_022561C0.c b/src/overlay053/ov53_022561C0.c index 9cf3ffc1f1..d61feae925 100644 --- a/src/overlay053/ov53_022561C0.c +++ b/src/overlay053/ov53_022561C0.c @@ -6,7 +6,7 @@ #include "struct_decls/sys_task.h" #include "field/field_system_decl.h" #include "overlay025/poketch_system.h" -#include "overlay025/struct_ov25_02255B34_decl.h" +#include "overlay025/poketch_button.h" #include "overlay053/struct_ov53_02256420_decl.h" #include "struct_defs/union_02022594_020225E0.h" @@ -15,7 +15,6 @@ #include "unk_0200D9E8.h" #include "heap.h" #include "overlay006/ov6_022430C4.h" -#include "overlay025/ov25_02255ACC.h" #include "overlay053/ov53_02256420.h" typedef struct { @@ -25,7 +24,7 @@ typedef struct { UnkStruct_ov53_02256420_1 unk_04; UnkStruct_ov53_02256420 * unk_2C; PoketchSystem * unk_30; - UnkStruct_ov25_02255B34 * unk_34; + PoketchButtonManager * unk_34; u32 unk_38; u32 unk_3C; } UnkStruct_ov53_0225621C; diff --git a/src/overlay054/ov54_022561C0.c b/src/overlay054/ov54_022561C0.c index 00b7827084..858b77ab58 100644 --- a/src/overlay054/ov54_022561C0.c +++ b/src/overlay054/ov54_022561C0.c @@ -5,7 +5,7 @@ #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/sys_task.h" #include "overlay025/poketch_system.h" -#include "overlay025/struct_ov25_02255B34_decl.h" +#include "overlay025/poketch_button.h" #include "overlay054/struct_ov54_0225642C_decl.h" #include "struct_defs/union_02022594_020225E0.h" @@ -14,7 +14,6 @@ #include "unk_0200D9E8.h" #include "heap.h" #include "poketch_data.h" -#include "overlay025/ov25_02255ACC.h" #include "overlay054/ov54_0225642C.h" typedef struct { @@ -24,7 +23,7 @@ typedef struct { UnkStruct_ov54_0225642C_1 unk_04; UnkStruct_ov54_0225642C * unk_98; PoketchSystem * unk_9C; - UnkStruct_ov25_02255B34 * unk_A0; + PoketchButtonManager * unk_A0; u32 unk_A4; u32 unk_A8; } UnkStruct_ov54_0225621C; From b43e92646ae81a7cdca6a38a8bdbf2c0aaf5c278 Mon Sep 17 00:00:00 2001 From: Trainer Riley Date: Thu, 11 Apr 2024 23:21:18 -0700 Subject: [PATCH 04/23] Move Button struct to header --- include/overlay025/poketch_button.h | 13 +++++++++++-- src/overlay025/poketch_button.c | 11 ----------- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/include/overlay025/poketch_button.h b/include/overlay025/poketch_button.h index 885685529d..69316d8423 100644 --- a/include/overlay025/poketch_button.h +++ b/include/overlay025/poketch_button.h @@ -4,10 +4,19 @@ #include "struct_defs/union_02022594_020225E0.h" #include "overlay025/poketch_button.h" -typedef struct PoketchButton PoketchButton; - typedef void (* PoketchButtonCallback)(u32, u32, u32, void *); +typedef struct PoketchButton { + u8 unk_00; + u8 unk_01; + u8 unk_02; + u8 unk_03; + u16 unk_04; + u16 unk_06; + u16 unk_08[2]; + u16 unk_0C; +} PoketchButton; + typedef struct PoketchButtonManager { const UnkUnion_020225E0 * unk_00; PoketchButtonCallback unk_04; diff --git a/src/overlay025/poketch_button.c b/src/overlay025/poketch_button.c index 1e0b2322f9..7befa04998 100644 --- a/src/overlay025/poketch_button.c +++ b/src/overlay025/poketch_button.c @@ -8,17 +8,6 @@ #include "heap.h" #include "unk_02022594.h" -typedef struct PoketchButton { - u8 unk_00; - u8 unk_01; - u8 unk_02; - u8 unk_03; - u16 unk_04; - u16 unk_06; - u16 unk_08[2]; - u16 unk_0C; -} PoketchButton; - static void ov25_02255C80(PoketchButton * param0); static void ov25_02255CA0(PoketchButton * param0, u32 param1); static void ov25_02255CA0(PoketchButton * param0, u32 param1); From 4b25e5c53a63affd0fc76caa4ee3ac178fb1699a Mon Sep 17 00:00:00 2001 From: Trainer Riley Date: Thu, 11 Apr 2024 23:28:29 -0700 Subject: [PATCH 05/23] Header declaration and redundant include --- include/overlay025/poketch_button.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/include/overlay025/poketch_button.h b/include/overlay025/poketch_button.h index 69316d8423..6f410b9301 100644 --- a/include/overlay025/poketch_button.h +++ b/include/overlay025/poketch_button.h @@ -1,8 +1,7 @@ -#ifndef POKEPLATINUM_OV25_02255ACC_H -#define POKEPLATINUM_OV25_02255ACC_H +#ifndef POKEPLATINUM_POKETCH_BUTTON_H +#define POKEPLATINUM_POKETCH_BUTTON_H #include "struct_defs/union_02022594_020225E0.h" -#include "overlay025/poketch_button.h" typedef void (* PoketchButtonCallback)(u32, u32, u32, void *); @@ -33,4 +32,4 @@ void ov25_02255C48(PoketchButtonManager * param0, u32 param1, u32 param2, u16 pa void ov25_02255C5C(PoketchButtonManager * param0, u32 param1, u16 param2); void ov25_02255C68(PoketchButtonManager * param0, u32 param1); -#endif // POKEPLATINUM_OV25_02255ACC_H +#endif // POKEPLATINUM_POKETCH_BUTTON_H From 259843b40706c8694d8954b5225dcac2315fc43d Mon Sep 17 00:00:00 2001 From: Trainer Riley Date: Thu, 11 Apr 2024 23:33:52 -0700 Subject: [PATCH 06/23] Trivial variables in button manager --- include/overlay025/poketch_button.h | 4 +-- src/overlay025/poketch_button.c | 40 ++++++++++++++--------------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/include/overlay025/poketch_button.h b/include/overlay025/poketch_button.h index 6f410b9301..3cdd2d247f 100644 --- a/include/overlay025/poketch_button.h +++ b/include/overlay025/poketch_button.h @@ -18,11 +18,11 @@ typedef struct PoketchButton { typedef struct PoketchButtonManager { const UnkUnion_020225E0 * unk_00; - PoketchButtonCallback unk_04; + PoketchButtonCallback callback; u32 unk_08; u32 unk_0C; void * unk_10; - PoketchButton * unk_14; + PoketchButton * button; } PoketchButtonManager; PoketchButtonManager * ov25_02255ACC(const UnkUnion_020225E0 * param0, u32 param1, PoketchButtonCallback param2, void * param3, u32 param4); diff --git a/src/overlay025/poketch_button.c b/src/overlay025/poketch_button.c index 7befa04998..43675c8b1c 100644 --- a/src/overlay025/poketch_button.c +++ b/src/overlay025/poketch_button.c @@ -29,17 +29,17 @@ PoketchButtonManager * ov25_02255ACC (const UnkUnion_020225E0 * param0, u32 para if (v0) { v0->unk_08 = param4; - v0->unk_04 = param2; + v0->callback = param2; v0->unk_00 = param0; v0->unk_0C = param1; v0->unk_10 = param3; - v0->unk_14 = Heap_AllocFromHeap(param4, sizeof(PoketchButton) * param1); + v0->button = Heap_AllocFromHeap(param4, sizeof(PoketchButton) * param1); - if (v0->unk_14) { + if (v0->button) { u32 v1; for (v1 = 0; v1 < param1; v1++) { - ov25_02255C80(&v0->unk_14[v1]); + ov25_02255C80(&v0->button[v1]); } } else { Heap_FreeToHeapExplicit(param4, v0); @@ -53,7 +53,7 @@ PoketchButtonManager * ov25_02255ACC (const UnkUnion_020225E0 * param0, u32 para void ov25_02255B34 (PoketchButtonManager * param0) { GF_ASSERT(param0); - Heap_FreeToHeapExplicit(param0->unk_08, param0->unk_14); + Heap_FreeToHeapExplicit(param0->unk_08, param0->button); Heap_FreeToHeapExplicit(param0->unk_08, param0); } @@ -76,57 +76,57 @@ void ov25_02255B50 (PoketchButtonManager * param0) v2 = TouchScreen_Tapped(); for (v3 = 0; v3 < param0->unk_0C; v3++) { - param0->unk_14[v3].unk_02 = param0->unk_14[v3].unk_01; + param0->button[v3].unk_02 = param0->button[v3].unk_01; - if (param0->unk_14[v3].unk_01) { - param0->unk_14[v3].unk_01 = sub_02022734(¶m0->unk_00[v3]); + if (param0->button[v3].unk_01) { + param0->button[v3].unk_01 = sub_02022734(¶m0->unk_00[v3]); } else { - param0->unk_14[v3].unk_01 = sub_02022760(¶m0->unk_00[v3]); + param0->button[v3].unk_01 = sub_02022760(¶m0->unk_00[v3]); } } } else { v2 = 0; for (v3 = 0; v3 < param0->unk_0C; v3++) { - param0->unk_14[v3].unk_02 = param0->unk_14[v3].unk_01; - param0->unk_14[v3].unk_01 = 0; + param0->button[v3].unk_02 = param0->button[v3].unk_01; + param0->button[v3].unk_01 = 0; } } for (v3 = 0; v3 < param0->unk_0C; v3++) { - v4 = v0[param0->unk_14[v3].unk_00](¶m0->unk_14[v3], v1, v2); + v4 = v0[param0->button[v3].unk_00](¶m0->button[v3], v1, v2); - if (param0->unk_14[v3].unk_01 != param0->unk_14[v3].unk_02) { - v5 = param0->unk_14[v3].unk_01; + if (param0->button[v3].unk_01 != param0->button[v3].unk_02) { + v5 = param0->button[v3].unk_01; } else { v5 = 2; } if ((v4 != 0) || (v5 != 2)) { - param0->unk_04(v3, v4, v5, param0->unk_10); + param0->callback(v3, v4, v5, param0->unk_10); break; } } for (v3++; v3 < param0->unk_0C; v3++) { - v0[param0->unk_14[v3].unk_00](¶m0->unk_14[v3], v1, v2); + v0[param0->button[v3].unk_00](¶m0->button[v3], v1, v2); } } void ov25_02255C48 (PoketchButtonManager * param0, u32 param1, u32 param2, u16 param3) { - param0->unk_14[param1].unk_08[param2] = param3; + param0->button[param1].unk_08[param2] = param3; } void ov25_02255C5C (PoketchButtonManager * param0, u32 param1, u16 param2) { - param0->unk_14[param1].unk_0C = param2; + param0->button[param1].unk_0C = param2; } void ov25_02255C68 (PoketchButtonManager * param0, u32 param1) { - param0->unk_14[param1].unk_04 = 0; - param0->unk_14[param1].unk_00 = 4; + param0->button[param1].unk_04 = 0; + param0->button[param1].unk_00 = 4; } static void ov25_02255C80 (PoketchButton * param0) From dddec16bb67691142f03f835a06b371a22a2d7f2 Mon Sep 17 00:00:00 2001 From: cbt6 <91667135+cbt6@users.noreply.github.com> Date: Sun, 14 Apr 2024 12:55:14 +0800 Subject: [PATCH 07/23] Revert wrong use of macros for movements --- res/field/scripts/script_0101.s..s | 33 ------------------------------ res/field/scripts/script_0502.s | 2 +- res/field/scripts/script_0508.s | 2 +- res/field/scripts/script_0511.s | 2 +- res/field/scripts/script_0512.s | 2 +- res/field/scripts/script_0528.s | 2 +- res/field/scripts/script_0536.s | 4 ++-- res/field/scripts/script_0538.s | 2 +- res/field/scripts/script_0543.s | 2 +- res/field/scripts/script_0544.s | 2 +- res/field/scripts/script_0547.s | 2 +- res/field/scripts/script_0548.s | 2 +- res/field/scripts/script_0549.s | 2 +- res/field/scripts/script_0571.s | 2 +- res/field/scripts/script_0573.s | 2 +- res/field/scripts/script_0574.s | 4 ++-- res/field/scripts/script_0579.s | 2 +- res/field/scripts/script_0582.s | 2 +- res/field/scripts/script_0583.s | 4 ++-- res/field/scripts/script_0588.s | 2 +- res/field/scripts/script_0593.s | 2 +- res/field/scripts/script_0596.s | 2 +- res/field/scripts/script_0597.s | 2 +- res/field/scripts/script_0598.s | 2 +- res/field/scripts/script_0599.s | 2 +- res/field/scripts/script_0600.s | 2 +- res/field/scripts/script_0608.s | 2 +- res/field/scripts/script_0609.s | 2 +- res/field/scripts/script_0610.s | 2 +- res/field/scripts/script_0618.s | 4 ++-- res/field/scripts/script_0623.s | 2 +- res/field/scripts/script_0625.s | 2 +- res/field/scripts/script_0629.s | 2 +- res/field/scripts/script_0636.s | 2 +- res/field/scripts/script_0637.s | 2 +- res/field/scripts/script_0649.s | 2 +- res/field/scripts/script_0656.s | 2 +- res/field/scripts/script_0658.s | 2 +- res/field/scripts/script_0659.s | 2 +- res/field/scripts/script_0660.s | 2 +- res/field/scripts/script_0664.s | 2 +- res/field/scripts/script_0674.s | 2 +- res/field/scripts/script_0676.s | 2 +- res/field/scripts/script_0683.s | 2 +- res/field/scripts/script_0686.s | 2 +- res/field/scripts/script_0687.s | 2 +- res/field/scripts/script_0689.s | 2 +- res/field/scripts/script_0691.s | 2 +- res/field/scripts/script_0693.s | 2 +- res/field/scripts/script_0695.s | 2 +- res/field/scripts/script_0696.s | 2 +- res/field/scripts/script_0701.s | 2 +- res/field/scripts/script_0711.s | 2 +- res/field/scripts/script_0713.s | 6 +++--- res/field/scripts/script_0714.s | 2 +- res/field/scripts/script_0715.s | 2 +- res/field/scripts/script_0716.s | 2 +- res/field/scripts/script_0718.s | 2 +- res/field/scripts/script_0719.s | 2 +- res/field/scripts/script_0728.s | 4 ++-- res/field/scripts/script_0730.s | 4 ++-- res/field/scripts/script_0733.s | 4 ++-- res/field/scripts/script_0735.s | 4 ++-- res/field/scripts/script_0736.s | 2 +- res/field/scripts/script_0737.s | 2 +- res/field/scripts/script_0738.s | 2 +- res/field/scripts/script_0747.s | 2 +- res/field/scripts/script_0764.s | 2 +- res/field/scripts/script_0767.s | 2 +- res/field/scripts/script_0770.s | 2 +- res/field/scripts/script_0771.s | 2 +- res/field/scripts/script_0772.s | 2 +- res/field/scripts/script_0774.s | 2 +- res/field/scripts/script_0776.s | 2 +- res/field/scripts/script_0778.s | 2 +- res/field/scripts/script_0780.s | 2 +- res/field/scripts/script_0781.s | 2 +- res/field/scripts/script_0782.s | 2 +- res/field/scripts/script_0783.s | 4 ++-- res/field/scripts/script_0784.s | 2 +- res/field/scripts/script_0785.s | 2 +- res/field/scripts/script_0786.s | 2 +- res/field/scripts/script_0787.s | 2 +- res/field/scripts/script_0788.s | 4 ++-- res/field/scripts/script_0789.s | 2 +- res/field/scripts/script_0790.s | 2 +- res/field/scripts/script_0791.s | 2 +- res/field/scripts/script_0792.s | 2 +- res/field/scripts/script_0793.s | 2 +- res/field/scripts/script_0794.s | 2 +- res/field/scripts/script_0795.s | 2 +- res/field/scripts/script_0796.s | 2 +- res/field/scripts/script_0797.s | 2 +- res/field/scripts/script_0798.s | 2 +- res/field/scripts/script_0799.s | 2 +- res/field/scripts/script_0800.s | 2 +- res/field/scripts/script_0801.s | 2 +- res/field/scripts/script_0802.s | 2 +- res/field/scripts/script_0803.s | 2 +- res/field/scripts/script_0804.s | 2 +- res/field/scripts/script_0805.s | 2 +- res/field/scripts/script_0806.s | 2 +- res/field/scripts/script_0807.s | 4 ++-- res/field/scripts/script_0809.s | 2 +- res/field/scripts/script_0814.s | 2 +- res/field/scripts/script_0815.s | 2 +- res/field/scripts/script_0817.s | 2 +- res/field/scripts/script_0818.s | 2 +- res/field/scripts/script_0819.s | 2 +- res/field/scripts/script_0820.s | 2 +- res/field/scripts/script_0821.s | 2 +- res/field/scripts/script_0822.s | 2 +- res/field/scripts/script_0824.s | 2 +- res/field/scripts/script_0826.s | 2 +- res/field/scripts/script_0827.s | 4 ++-- res/field/scripts/script_0828.s | 2 +- res/field/scripts/script_0829.s | 2 +- res/field/scripts/script_0830.s | 2 +- res/field/scripts/script_0836.s | 2 +- res/field/scripts/script_0838.s | 2 +- res/field/scripts/script_0844.s | 4 ++-- res/field/scripts/script_0847.s | 2 +- res/field/scripts/script_0848.s | 4 ++-- res/field/scripts/script_0849.s | 4 ++-- res/field/scripts/script_0850.s | 2 +- res/field/scripts/script_0851.s | 2 +- res/field/scripts/script_0854.s | 4 ++-- res/field/scripts/script_0855.s | 2 +- res/field/scripts/script_0858.s | 4 ++-- res/field/scripts/script_0859.s | 2 +- res/field/scripts/script_0860.s | 4 ++-- res/field/scripts/script_0864.s | 4 ++-- res/field/scripts/script_0865.s | 2 +- res/field/scripts/script_0866.s | 4 ++-- res/field/scripts/script_0867.s | 4 ++-- res/field/scripts/script_0868.s | 4 ++-- res/field/scripts/script_0869.s | 4 ++-- res/field/scripts/script_0870.s | 4 ++-- res/field/scripts/script_0871.s | 2 +- res/field/scripts/script_0872.s | 2 +- res/field/scripts/script_0873.s | 2 +- res/field/scripts/script_0874.s | 6 +++--- res/field/scripts/script_0875.s | 2 +- res/field/scripts/script_0876.s | 2 +- res/field/scripts/script_0877.s | 2 +- res/field/scripts/script_0878.s | 2 +- res/field/scripts/script_0879.s | 2 +- res/field/scripts/script_0880.s | 2 +- res/field/scripts/script_0881.s | 2 +- res/field/scripts/script_0882.s | 2 +- res/field/scripts/script_0883.s | 2 +- res/field/scripts/script_0884.s | 2 +- res/field/scripts/script_0885.s | 2 +- res/field/scripts/script_0886.s | 4 ++-- res/field/scripts/script_0887.s | 2 +- res/field/scripts/script_0889.s | 2 +- res/field/scripts/script_0891.s | 2 +- res/field/scripts/script_0893.s | 2 +- res/field/scripts/script_0894.s | 2 +- res/field/scripts/script_0895.s | 2 +- res/field/scripts/script_0901.s | 4 ++-- res/field/scripts/script_0903.s | 4 ++-- res/field/scripts/script_0904.s | 2 +- res/field/scripts/script_0907.s | 4 ++-- res/field/scripts/script_0909.s | 2 +- res/field/scripts/script_0910.s | 2 +- res/field/scripts/script_0914.s | 2 +- res/field/scripts/script_0917.s | 4 ++-- res/field/scripts/script_0918.s | 2 +- res/field/scripts/script_0920.s | 2 +- res/field/scripts/script_0922.s | 2 +- res/field/scripts/script_0923.s | 2 +- res/field/scripts/script_0924.s | 2 +- res/field/scripts/script_0929.s | 2 +- res/field/scripts/script_0930.s | 2 +- res/field/scripts/script_0932.s | 2 +- res/field/scripts/script_0935.s | 2 +- res/field/scripts/script_0936.s | 2 +- res/field/scripts/script_0938.s | 2 +- res/field/scripts/script_0939.s | 2 +- res/field/scripts/script_0940.s | 2 +- res/field/scripts/script_0941.s | 2 +- res/field/scripts/script_0943.s | 2 +- res/field/scripts/script_0944.s | 2 +- res/field/scripts/script_0948.s | 4 ++-- res/field/scripts/script_0949.s | 2 +- res/field/scripts/script_0950.s | 2 +- res/field/scripts/script_0960.s | 2 +- res/field/scripts/script_0961.s | 2 +- res/field/scripts/script_0963.s | 2 +- res/field/scripts/script_0964.s | 2 +- res/field/scripts/script_0965.s | 2 +- res/field/scripts/script_0967.s | 4 ++-- res/field/scripts/script_0973.s | 4 ++-- res/field/scripts/script_0982.s | 2 +- res/field/scripts/script_0985.s | 2 +- res/field/scripts/script_0986.s | 2 +- res/field/scripts/script_0989.s | 2 +- res/field/scripts/script_0994.s | 2 +- res/field/scripts/script_0998.s | 2 +- res/field/scripts/script_1006.s | 4 ++-- res/field/scripts/script_1011.s | 2 +- res/field/scripts/script_1016.s | 2 +- res/field/scripts/script_1021.s | 2 +- res/field/scripts/script_1026.s | 4 ++-- res/field/scripts/script_1031.s | 2 +- res/field/scripts/script_1034.s | 2 +- res/field/scripts/script_1039.s | 2 +- res/field/scripts/script_1042.s | 2 +- res/field/scripts/script_1044.s | 4 ++-- res/field/scripts/script_1045.s | 6 +++--- res/field/scripts/script_1049.s | 2 +- 212 files changed, 252 insertions(+), 285 deletions(-) delete mode 100644 res/field/scripts/script_0101.s..s diff --git a/res/field/scripts/script_0101.s..s b/res/field/scripts/script_0101.s..s deleted file mode 100644 index 95fd1e17b4..0000000000 --- a/res/field/scripts/script_0101.s..s +++ /dev/null @@ -1,33 +0,0 @@ - .data - - .byte 0x10, 0x00, 0x00, 0x00, 0x23, 0x01, 0x00, 0x00, 0x5d, 0x01, 0x00, 0x00, 0x63, 0x01, 0x00, 0x00 - .byte 0xc8, 0x01, 0x00, 0x00, 0x49, 0x00, 0xdc, 0x05, 0x60, 0x00, 0x68, 0x00, 0xbd, 0x01, 0x0c, 0x80 - .byte 0x11, 0x00, 0x0c, 0x80, 0x00, 0x00, 0x1c, 0x00, 0x01, 0x29, 0x00, 0x00, 0x00, 0x11, 0x00, 0x0c - .byte 0x80, 0x01, 0x00, 0x1c, 0x00, 0x01, 0x2c, 0x00, 0x00, 0x00, 0x11, 0x00, 0x0c, 0x80, 0x02, 0x00 - .byte 0x1c, 0x00, 0x01, 0x2f, 0x00, 0x00, 0x00, 0x11, 0x00, 0x0c, 0x80, 0x03, 0x00, 0x1c, 0x00, 0x01 - .byte 0x32, 0x00, 0x00, 0x00, 0x02, 0x00, 0x5e, 0x00, 0x00, 0x00, 0x2e, 0x01, 0x00, 0x00, 0x5f, 0x00 - .byte 0x16, 0x00, 0x30, 0x00, 0x00, 0x00, 0x5e, 0x00, 0x00, 0x00, 0x32, 0x01, 0x00, 0x00, 0x5f, 0x00 - .byte 0x16, 0x00, 0x20, 0x00, 0x00, 0x00, 0x5e, 0x00, 0x00, 0x00, 0x36, 0x01, 0x00, 0x00, 0x5f, 0x00 - .byte 0x16, 0x00, 0x10, 0x00, 0x00, 0x00, 0x5e, 0x00, 0x00, 0x00, 0x3a, 0x01, 0x00, 0x00, 0x5f, 0x00 - .byte 0x16, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5b, 0x01, 0x04, 0x00, 0x0c, 0x80, 0x11, 0x00, 0x0c, 0x80 - .byte 0x01, 0x00, 0x1c, 0x00, 0x01, 0xca, 0x00, 0x00, 0x00, 0xcd, 0x01, 0x09, 0x00, 0x64, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x2c, 0x00, 0x00, 0x34, 0x00, 0xe5, 0x00, 0x3e, 0x01, 0x00, 0x00 - .byte 0xec, 0x00, 0x0c, 0x80, 0x11, 0x00, 0x0c, 0x80, 0x00, 0x00, 0x1c, 0x00, 0x01, 0x0b, 0x01, 0x00 - .byte 0x00, 0x2c, 0x00, 0x01, 0xcd, 0x00, 0x00, 0x2c, 0x00, 0x02, 0x4e, 0x00, 0x89, 0x04, 0x4f, 0x00 - .byte 0x5c, 0x01, 0x04, 0x00, 0x60, 0x02, 0x17, 0x00, 0x23, 0x00, 0x0a, 0x01, 0x23, 0x00, 0x18, 0x01 - .byte 0x23, 0x00, 0x1c, 0x01, 0x23, 0x00, 0x45, 0x01, 0x23, 0x00, 0x4a, 0x01, 0x23, 0x00, 0x54, 0x01 - .byte 0x23, 0x00, 0x57, 0x01, 0x23, 0x00, 0x65, 0x01, 0xcd, 0x01, 0x0a, 0x00, 0x64, 0x00, 0x3e, 0x01 - .byte 0x00, 0x00, 0x00, 0x00, 0x28, 0x00, 0x7b, 0x40, 0x01, 0x00, 0x1e, 0x00, 0x06, 0x02, 0x1f, 0x00 - .byte 0x07, 0x02, 0x2c, 0x00, 0x03, 0x16, 0x00, 0x00, 0x00, 0x00, 0x00, 0x28, 0x00, 0x04, 0x80, 0x88 - .byte 0x01, 0x28, 0x00, 0x05, 0x80, 0x01, 0x00, 0x7d, 0x00, 0x04, 0x80, 0x05, 0x80, 0x0c, 0x80, 0x11 - .byte 0x00, 0x0c, 0x80, 0x00, 0x00, 0x1c, 0x00, 0x01, 0x1d, 0x00, 0x00, 0x00, 0x14, 0x00, 0xfc, 0x07 - .byte 0x1e, 0x00, 0x7d, 0x00, 0xd1, 0x00, 0x00, 0x04, 0x80, 0xd3, 0x00, 0x01, 0x04, 0x80, 0x2c, 0x00 - .byte 0x04, 0x31, 0x00, 0x34, 0x00, 0x61, 0x00, 0x02, 0x00, 0x14, 0x00, 0xe1, 0x07, 0x34, 0x00, 0x61 - .byte 0x00, 0x02, 0x00, 0x20, 0x00, 0x7d, 0x00, 0x1c, 0x00, 0x00, 0xad, 0xff, 0xff, 0xff, 0x2c, 0x00 - .byte 0x05, 0x31, 0x00, 0x34, 0x00, 0x61, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x04, 0x00 - .byte 0x00, 0x00, 0x04, 0x00, 0x03, 0x00, 0x04, 0x00, 0x01, 0x00, 0x04, 0x00, 0xfe, 0x00, 0x00, 0x00 - .byte 0x03, 0x00, 0x04, 0x00, 0x01, 0x00, 0x04, 0x00, 0x02, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00 - .byte 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x02, 0x00, 0x04, 0x00, 0x01, 0x00, 0x04, 0x00 - .byte 0x03, 0x00, 0x04, 0x00, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x03, 0x00, 0x04, 0x00 - .byte 0x01, 0x00, 0x04, 0x00, 0x02, 0x00, 0x04, 0x00, 0xfe, 0x00, 0x00, 0x00, 0xeb, 0x00, 0x61, 0x00 - .byte 0x02, 0x00, 0x00, 0x00 diff --git a/res/field/scripts/script_0502.s b/res/field/scripts/script_0502.s index 33f5a87789..eb11fe2637 100644 --- a/res/field/scripts/script_0502.s +++ b/res/field/scripts/script_0502.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0508.s b/res/field/scripts/script_0508.s index 224d01ce60..e457f9e161 100644 --- a/res/field/scripts/script_0508.s +++ b/res/field/scripts/script_0508.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_005 0 + .short 5, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0511.s b/res/field/scripts/script_0511.s index 9bd729c0a1..e58dafb9cc 100644 --- a/res/field/scripts/script_0511.s +++ b/res/field/scripts/script_0511.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_008 0 + .short 8, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0512.s b/res/field/scripts/script_0512.s index 829610be54..2b1bbd715c 100644 --- a/res/field/scripts/script_0512.s +++ b/res/field/scripts/script_0512.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_004 0 + .short 4, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0528.s b/res/field/scripts/script_0528.s index 05b47377cf..ff50831566 100644 --- a/res/field/scripts/script_0528.s +++ b/res/field/scripts/script_0528.s @@ -3,7 +3,7 @@ .data .byte 3 - MoveAction_00D 0 + .short 13, 0 .byte 1 .long _000B-.-4 .byte 0 diff --git a/res/field/scripts/script_0536.s b/res/field/scripts/script_0536.s index 4a993ca3d0..67325ca394 100644 --- a/res/field/scripts/script_0536.s +++ b/res/field/scripts/script_0536.s @@ -3,9 +3,9 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 4 - MoveAction_018 0 + .short 24, 0 .byte 1 .long _0010-.-4 .byte 0 diff --git a/res/field/scripts/script_0538.s b/res/field/scripts/script_0538.s index 33f5a87789..eb11fe2637 100644 --- a/res/field/scripts/script_0538.s +++ b/res/field/scripts/script_0538.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0543.s b/res/field/scripts/script_0543.s index 402a604bf6..9ae91d88a6 100644 --- a/res/field/scripts/script_0543.s +++ b/res/field/scripts/script_0543.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_005 0 + .short 5, 0 .byte 1 .long _000B-.-4 .byte 0 diff --git a/res/field/scripts/script_0544.s b/res/field/scripts/script_0544.s index 943679c3fa..97dbb08a60 100644 --- a/res/field/scripts/script_0544.s +++ b/res/field/scripts/script_0544.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 1 .long _000B-.-4 .byte 0 diff --git a/res/field/scripts/script_0547.s b/res/field/scripts/script_0547.s index b2d0bb0aaa..ac8d047e05 100644 --- a/res/field/scripts/script_0547.s +++ b/res/field/scripts/script_0547.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 1 .long _000B-.-4 .byte 0 diff --git a/res/field/scripts/script_0548.s b/res/field/scripts/script_0548.s index 33f5a87789..eb11fe2637 100644 --- a/res/field/scripts/script_0548.s +++ b/res/field/scripts/script_0548.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0549.s b/res/field/scripts/script_0549.s index 5cd8055d62..30ac476d09 100644 --- a/res/field/scripts/script_0549.s +++ b/res/field/scripts/script_0549.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_002 0 + .short 2, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0571.s b/res/field/scripts/script_0571.s index 0c81637f41..a71529f73a 100644 --- a/res/field/scripts/script_0571.s +++ b/res/field/scripts/script_0571.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_015 0 + .short 21, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0573.s b/res/field/scripts/script_0573.s index 33f5a87789..eb11fe2637 100644 --- a/res/field/scripts/script_0573.s +++ b/res/field/scripts/script_0573.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0574.s b/res/field/scripts/script_0574.s index 3161008c48..a1afd7dde8 100644 --- a/res/field/scripts/script_0574.s +++ b/res/field/scripts/script_0574.s @@ -3,9 +3,9 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 4 - MoveAction_002 0 + .short 2, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0579.s b/res/field/scripts/script_0579.s index c49b550503..0461870d08 100644 --- a/res/field/scripts/script_0579.s +++ b/res/field/scripts/script_0579.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_007 0 + .short 7, 0 .byte 1 .long _000B-.-4 .byte 0 diff --git a/res/field/scripts/script_0582.s b/res/field/scripts/script_0582.s index dae1891661..82e3ace123 100644 --- a/res/field/scripts/script_0582.s +++ b/res/field/scripts/script_0582.s @@ -3,7 +3,7 @@ .data .byte 4 - MoveAction_001 0 + .short 1, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0583.s b/res/field/scripts/script_0583.s index f80bed968b..131525b36b 100644 --- a/res/field/scripts/script_0583.s +++ b/res/field/scripts/script_0583.s @@ -3,9 +3,9 @@ .data .byte 2 - MoveAction_007 0 + .short 7, 0 .byte 3 - MoveAction_008 0 + .short 8, 0 .byte 1 .long _0010-.-4 .byte 0 diff --git a/res/field/scripts/script_0588.s b/res/field/scripts/script_0588.s index 1cd4ad5a02..7a943829a6 100644 --- a/res/field/scripts/script_0588.s +++ b/res/field/scripts/script_0588.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 1 .long _000B-.-4 .byte 0 diff --git a/res/field/scripts/script_0593.s b/res/field/scripts/script_0593.s index 33f5a87789..eb11fe2637 100644 --- a/res/field/scripts/script_0593.s +++ b/res/field/scripts/script_0593.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0596.s b/res/field/scripts/script_0596.s index 33f5a87789..eb11fe2637 100644 --- a/res/field/scripts/script_0596.s +++ b/res/field/scripts/script_0596.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0597.s b/res/field/scripts/script_0597.s index 33f5a87789..eb11fe2637 100644 --- a/res/field/scripts/script_0597.s +++ b/res/field/scripts/script_0597.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0598.s b/res/field/scripts/script_0598.s index 27d48f6fa0..af86b8caff 100644 --- a/res/field/scripts/script_0598.s +++ b/res/field/scripts/script_0598.s @@ -3,7 +3,7 @@ .data .byte 4 - MoveAction_006 0 + .short 6, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0599.s b/res/field/scripts/script_0599.s index 33f5a87789..eb11fe2637 100644 --- a/res/field/scripts/script_0599.s +++ b/res/field/scripts/script_0599.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0600.s b/res/field/scripts/script_0600.s index 33f5a87789..eb11fe2637 100644 --- a/res/field/scripts/script_0600.s +++ b/res/field/scripts/script_0600.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0608.s b/res/field/scripts/script_0608.s index 084f73d180..1debde4cfe 100644 --- a/res/field/scripts/script_0608.s +++ b/res/field/scripts/script_0608.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_006 0 + .short 6, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0609.s b/res/field/scripts/script_0609.s index 829610be54..2b1bbd715c 100644 --- a/res/field/scripts/script_0609.s +++ b/res/field/scripts/script_0609.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_004 0 + .short 4, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0610.s b/res/field/scripts/script_0610.s index 538b48bdfd..3de22e2ca9 100644 --- a/res/field/scripts/script_0610.s +++ b/res/field/scripts/script_0610.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_003 0 + .short 3, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0618.s b/res/field/scripts/script_0618.s index 8d7b7059ca..7995d7aae3 100644 --- a/res/field/scripts/script_0618.s +++ b/res/field/scripts/script_0618.s @@ -3,9 +3,9 @@ .data .byte 2 - MoveAction_006 0 + .short 6, 0 .byte 3 - MoveAction_005 0 + .short 5, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0623.s b/res/field/scripts/script_0623.s index 03c4f5ae40..d46960c7b1 100644 --- a/res/field/scripts/script_0623.s +++ b/res/field/scripts/script_0623.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 1 .long _000B-.-4 .byte 0 diff --git a/res/field/scripts/script_0625.s b/res/field/scripts/script_0625.s index 33f5a87789..eb11fe2637 100644 --- a/res/field/scripts/script_0625.s +++ b/res/field/scripts/script_0625.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0629.s b/res/field/scripts/script_0629.s index c4e0974ea0..f75b19b4f4 100644 --- a/res/field/scripts/script_0629.s +++ b/res/field/scripts/script_0629.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_007 0 + .short 7, 0 .byte 1 .long _000B-.-4 .byte 0 diff --git a/res/field/scripts/script_0636.s b/res/field/scripts/script_0636.s index 5f05f64641..aee4499de0 100644 --- a/res/field/scripts/script_0636.s +++ b/res/field/scripts/script_0636.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 1 .long _000B-.-4 .byte 0 diff --git a/res/field/scripts/script_0637.s b/res/field/scripts/script_0637.s index 33f5a87789..eb11fe2637 100644 --- a/res/field/scripts/script_0637.s +++ b/res/field/scripts/script_0637.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0649.s b/res/field/scripts/script_0649.s index 8ad97f0d8b..149fd4a22d 100644 --- a/res/field/scripts/script_0649.s +++ b/res/field/scripts/script_0649.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_004 0 + .short 4, 0 .byte 1 .long _000B-.-4 .byte 0 diff --git a/res/field/scripts/script_0656.s b/res/field/scripts/script_0656.s index 812212c89c..9f0ba04617 100644 --- a/res/field/scripts/script_0656.s +++ b/res/field/scripts/script_0656.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_013 0 + .short 19, 0 .byte 1 .long _000B-.-4 .byte 0 diff --git a/res/field/scripts/script_0658.s b/res/field/scripts/script_0658.s index 33f5a87789..eb11fe2637 100644 --- a/res/field/scripts/script_0658.s +++ b/res/field/scripts/script_0658.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0659.s b/res/field/scripts/script_0659.s index 33f5a87789..eb11fe2637 100644 --- a/res/field/scripts/script_0659.s +++ b/res/field/scripts/script_0659.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0660.s b/res/field/scripts/script_0660.s index 33f5a87789..eb11fe2637 100644 --- a/res/field/scripts/script_0660.s +++ b/res/field/scripts/script_0660.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0664.s b/res/field/scripts/script_0664.s index 224d01ce60..e457f9e161 100644 --- a/res/field/scripts/script_0664.s +++ b/res/field/scripts/script_0664.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_005 0 + .short 5, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0674.s b/res/field/scripts/script_0674.s index 33f5a87789..eb11fe2637 100644 --- a/res/field/scripts/script_0674.s +++ b/res/field/scripts/script_0674.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0676.s b/res/field/scripts/script_0676.s index 33f5a87789..eb11fe2637 100644 --- a/res/field/scripts/script_0676.s +++ b/res/field/scripts/script_0676.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0683.s b/res/field/scripts/script_0683.s index 829610be54..2b1bbd715c 100644 --- a/res/field/scripts/script_0683.s +++ b/res/field/scripts/script_0683.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_004 0 + .short 4, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0686.s b/res/field/scripts/script_0686.s index 224d01ce60..e457f9e161 100644 --- a/res/field/scripts/script_0686.s +++ b/res/field/scripts/script_0686.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_005 0 + .short 5, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0687.s b/res/field/scripts/script_0687.s index 33f5a87789..eb11fe2637 100644 --- a/res/field/scripts/script_0687.s +++ b/res/field/scripts/script_0687.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0689.s b/res/field/scripts/script_0689.s index 33f5a87789..eb11fe2637 100644 --- a/res/field/scripts/script_0689.s +++ b/res/field/scripts/script_0689.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0691.s b/res/field/scripts/script_0691.s index 33f5a87789..eb11fe2637 100644 --- a/res/field/scripts/script_0691.s +++ b/res/field/scripts/script_0691.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0693.s b/res/field/scripts/script_0693.s index 33f5a87789..eb11fe2637 100644 --- a/res/field/scripts/script_0693.s +++ b/res/field/scripts/script_0693.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0695.s b/res/field/scripts/script_0695.s index 33f5a87789..eb11fe2637 100644 --- a/res/field/scripts/script_0695.s +++ b/res/field/scripts/script_0695.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0696.s b/res/field/scripts/script_0696.s index 0ae2f9320e..a705d52347 100644 --- a/res/field/scripts/script_0696.s +++ b/res/field/scripts/script_0696.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 1 .long _000B-.-4 .byte 0 diff --git a/res/field/scripts/script_0701.s b/res/field/scripts/script_0701.s index 816a1803a4..3412fc905e 100644 --- a/res/field/scripts/script_0701.s +++ b/res/field/scripts/script_0701.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_00F 0 + .short 15, 0 .byte 1 .long _000B-.-4 .byte 0 diff --git a/res/field/scripts/script_0711.s b/res/field/scripts/script_0711.s index 33f5a87789..eb11fe2637 100644 --- a/res/field/scripts/script_0711.s +++ b/res/field/scripts/script_0711.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0713.s b/res/field/scripts/script_0713.s index e9a2bb28f1..7422d64d68 100644 --- a/res/field/scripts/script_0713.s +++ b/res/field/scripts/script_0713.s @@ -3,11 +3,11 @@ .data .byte 4 - MoveAction_002 0 + .short 2, 0 .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 3 - MoveAction_007 0 + .short 7, 0 .byte 1 .long _0015-.-4 .byte 0 diff --git a/res/field/scripts/script_0714.s b/res/field/scripts/script_0714.s index 716a49358c..c3a51ef63b 100644 --- a/res/field/scripts/script_0714.s +++ b/res/field/scripts/script_0714.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 1 .long _000B-.-4 .byte 0 diff --git a/res/field/scripts/script_0715.s b/res/field/scripts/script_0715.s index 33f5a87789..eb11fe2637 100644 --- a/res/field/scripts/script_0715.s +++ b/res/field/scripts/script_0715.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0716.s b/res/field/scripts/script_0716.s index e41417b369..ec353f1a85 100644 --- a/res/field/scripts/script_0716.s +++ b/res/field/scripts/script_0716.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_00B 0 + .short 11, 0 .byte 1 .long _000B-.-4 .byte 0 diff --git a/res/field/scripts/script_0718.s b/res/field/scripts/script_0718.s index 33f5a87789..eb11fe2637 100644 --- a/res/field/scripts/script_0718.s +++ b/res/field/scripts/script_0718.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0719.s b/res/field/scripts/script_0719.s index 33f5a87789..eb11fe2637 100644 --- a/res/field/scripts/script_0719.s +++ b/res/field/scripts/script_0719.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0728.s b/res/field/scripts/script_0728.s index 3161008c48..a1afd7dde8 100644 --- a/res/field/scripts/script_0728.s +++ b/res/field/scripts/script_0728.s @@ -3,9 +3,9 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 4 - MoveAction_002 0 + .short 2, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0730.s b/res/field/scripts/script_0730.s index 309fc08406..9816127610 100644 --- a/res/field/scripts/script_0730.s +++ b/res/field/scripts/script_0730.s @@ -3,9 +3,9 @@ .data .byte 2 - MoveAction_002 0 + .short 2, 0 .byte 4 - MoveAction_003 0 + .short 3, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0733.s b/res/field/scripts/script_0733.s index 3161008c48..a1afd7dde8 100644 --- a/res/field/scripts/script_0733.s +++ b/res/field/scripts/script_0733.s @@ -3,9 +3,9 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 4 - MoveAction_002 0 + .short 2, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0735.s b/res/field/scripts/script_0735.s index 8258527bfa..bf454d8683 100644 --- a/res/field/scripts/script_0735.s +++ b/res/field/scripts/script_0735.s @@ -3,9 +3,9 @@ .data .byte 2 - MoveAction_003 0 + .short 3, 0 .byte 4 - MoveAction_001 0 + .short 1, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0736.s b/res/field/scripts/script_0736.s index 5cd8055d62..30ac476d09 100644 --- a/res/field/scripts/script_0736.s +++ b/res/field/scripts/script_0736.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_002 0 + .short 2, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0737.s b/res/field/scripts/script_0737.s index 5cd8055d62..30ac476d09 100644 --- a/res/field/scripts/script_0737.s +++ b/res/field/scripts/script_0737.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_002 0 + .short 2, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0738.s b/res/field/scripts/script_0738.s index 33f5a87789..eb11fe2637 100644 --- a/res/field/scripts/script_0738.s +++ b/res/field/scripts/script_0738.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0747.s b/res/field/scripts/script_0747.s index 33f5a87789..eb11fe2637 100644 --- a/res/field/scripts/script_0747.s +++ b/res/field/scripts/script_0747.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0764.s b/res/field/scripts/script_0764.s index 33f5a87789..eb11fe2637 100644 --- a/res/field/scripts/script_0764.s +++ b/res/field/scripts/script_0764.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0767.s b/res/field/scripts/script_0767.s index 829610be54..2b1bbd715c 100644 --- a/res/field/scripts/script_0767.s +++ b/res/field/scripts/script_0767.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_004 0 + .short 4, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0770.s b/res/field/scripts/script_0770.s index a880c1b536..238c0f7f6b 100644 --- a/res/field/scripts/script_0770.s +++ b/res/field/scripts/script_0770.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 1 .long _000B-.-4 .byte 0 diff --git a/res/field/scripts/script_0771.s b/res/field/scripts/script_0771.s index 33f5a87789..eb11fe2637 100644 --- a/res/field/scripts/script_0771.s +++ b/res/field/scripts/script_0771.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0772.s b/res/field/scripts/script_0772.s index 33f5a87789..eb11fe2637 100644 --- a/res/field/scripts/script_0772.s +++ b/res/field/scripts/script_0772.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0774.s b/res/field/scripts/script_0774.s index 33f5a87789..eb11fe2637 100644 --- a/res/field/scripts/script_0774.s +++ b/res/field/scripts/script_0774.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0776.s b/res/field/scripts/script_0776.s index 33f5a87789..eb11fe2637 100644 --- a/res/field/scripts/script_0776.s +++ b/res/field/scripts/script_0776.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0778.s b/res/field/scripts/script_0778.s index 33f5a87789..eb11fe2637 100644 --- a/res/field/scripts/script_0778.s +++ b/res/field/scripts/script_0778.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0780.s b/res/field/scripts/script_0780.s index 307bdf070d..ad667e0c7d 100644 --- a/res/field/scripts/script_0780.s +++ b/res/field/scripts/script_0780.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 1 .long _000B-.-4 .byte 0 diff --git a/res/field/scripts/script_0781.s b/res/field/scripts/script_0781.s index 450936815f..5b961a011c 100644 --- a/res/field/scripts/script_0781.s +++ b/res/field/scripts/script_0781.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 1 .long _000B-.-4 .byte 0 diff --git a/res/field/scripts/script_0782.s b/res/field/scripts/script_0782.s index 084f73d180..1debde4cfe 100644 --- a/res/field/scripts/script_0782.s +++ b/res/field/scripts/script_0782.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_006 0 + .short 6, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0783.s b/res/field/scripts/script_0783.s index a9020646ed..1c0c28e8cf 100644 --- a/res/field/scripts/script_0783.s +++ b/res/field/scripts/script_0783.s @@ -3,9 +3,9 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 4 - MoveAction_002 0 + .short 2, 0 .byte 1 .long _0010-.-4 .byte 0 diff --git a/res/field/scripts/script_0784.s b/res/field/scripts/script_0784.s index 33f5a87789..eb11fe2637 100644 --- a/res/field/scripts/script_0784.s +++ b/res/field/scripts/script_0784.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0785.s b/res/field/scripts/script_0785.s index 900b9b65c2..e71345d8e6 100644 --- a/res/field/scripts/script_0785.s +++ b/res/field/scripts/script_0785.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_003 0 + .short 3, 0 .byte 1 .long _000B-.-4 .byte 0 diff --git a/res/field/scripts/script_0786.s b/res/field/scripts/script_0786.s index 33f5a87789..eb11fe2637 100644 --- a/res/field/scripts/script_0786.s +++ b/res/field/scripts/script_0786.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0787.s b/res/field/scripts/script_0787.s index 33f5a87789..eb11fe2637 100644 --- a/res/field/scripts/script_0787.s +++ b/res/field/scripts/script_0787.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0788.s b/res/field/scripts/script_0788.s index 33553a17c5..5f5da6fc45 100644 --- a/res/field/scripts/script_0788.s +++ b/res/field/scripts/script_0788.s @@ -3,9 +3,9 @@ .data .byte 2 - MoveAction_005 0 + .short 5, 0 .byte 4 - MoveAction_001 0 + .short 1, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0789.s b/res/field/scripts/script_0789.s index 33f5a87789..eb11fe2637 100644 --- a/res/field/scripts/script_0789.s +++ b/res/field/scripts/script_0789.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0790.s b/res/field/scripts/script_0790.s index 33f5a87789..eb11fe2637 100644 --- a/res/field/scripts/script_0790.s +++ b/res/field/scripts/script_0790.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0791.s b/res/field/scripts/script_0791.s index 33f5a87789..eb11fe2637 100644 --- a/res/field/scripts/script_0791.s +++ b/res/field/scripts/script_0791.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0792.s b/res/field/scripts/script_0792.s index 33f5a87789..eb11fe2637 100644 --- a/res/field/scripts/script_0792.s +++ b/res/field/scripts/script_0792.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0793.s b/res/field/scripts/script_0793.s index 33f5a87789..eb11fe2637 100644 --- a/res/field/scripts/script_0793.s +++ b/res/field/scripts/script_0793.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0794.s b/res/field/scripts/script_0794.s index 33f5a87789..eb11fe2637 100644 --- a/res/field/scripts/script_0794.s +++ b/res/field/scripts/script_0794.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0795.s b/res/field/scripts/script_0795.s index 33f5a87789..eb11fe2637 100644 --- a/res/field/scripts/script_0795.s +++ b/res/field/scripts/script_0795.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0796.s b/res/field/scripts/script_0796.s index 33f5a87789..eb11fe2637 100644 --- a/res/field/scripts/script_0796.s +++ b/res/field/scripts/script_0796.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0797.s b/res/field/scripts/script_0797.s index 33f5a87789..eb11fe2637 100644 --- a/res/field/scripts/script_0797.s +++ b/res/field/scripts/script_0797.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0798.s b/res/field/scripts/script_0798.s index 33f5a87789..eb11fe2637 100644 --- a/res/field/scripts/script_0798.s +++ b/res/field/scripts/script_0798.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0799.s b/res/field/scripts/script_0799.s index 33f5a87789..eb11fe2637 100644 --- a/res/field/scripts/script_0799.s +++ b/res/field/scripts/script_0799.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0800.s b/res/field/scripts/script_0800.s index 33f5a87789..eb11fe2637 100644 --- a/res/field/scripts/script_0800.s +++ b/res/field/scripts/script_0800.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0801.s b/res/field/scripts/script_0801.s index 33f5a87789..eb11fe2637 100644 --- a/res/field/scripts/script_0801.s +++ b/res/field/scripts/script_0801.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0802.s b/res/field/scripts/script_0802.s index 33f5a87789..eb11fe2637 100644 --- a/res/field/scripts/script_0802.s +++ b/res/field/scripts/script_0802.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0803.s b/res/field/scripts/script_0803.s index 33f5a87789..eb11fe2637 100644 --- a/res/field/scripts/script_0803.s +++ b/res/field/scripts/script_0803.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0804.s b/res/field/scripts/script_0804.s index 33f5a87789..eb11fe2637 100644 --- a/res/field/scripts/script_0804.s +++ b/res/field/scripts/script_0804.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0805.s b/res/field/scripts/script_0805.s index 33f5a87789..eb11fe2637 100644 --- a/res/field/scripts/script_0805.s +++ b/res/field/scripts/script_0805.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0806.s b/res/field/scripts/script_0806.s index 33f5a87789..eb11fe2637 100644 --- a/res/field/scripts/script_0806.s +++ b/res/field/scripts/script_0806.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0807.s b/res/field/scripts/script_0807.s index 3161008c48..a1afd7dde8 100644 --- a/res/field/scripts/script_0807.s +++ b/res/field/scripts/script_0807.s @@ -3,9 +3,9 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 4 - MoveAction_002 0 + .short 2, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0809.s b/res/field/scripts/script_0809.s index 33f5a87789..eb11fe2637 100644 --- a/res/field/scripts/script_0809.s +++ b/res/field/scripts/script_0809.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0814.s b/res/field/scripts/script_0814.s index dae1891661..82e3ace123 100644 --- a/res/field/scripts/script_0814.s +++ b/res/field/scripts/script_0814.s @@ -3,7 +3,7 @@ .data .byte 4 - MoveAction_001 0 + .short 1, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0815.s b/res/field/scripts/script_0815.s index 33f5a87789..eb11fe2637 100644 --- a/res/field/scripts/script_0815.s +++ b/res/field/scripts/script_0815.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0817.s b/res/field/scripts/script_0817.s index 33f5a87789..eb11fe2637 100644 --- a/res/field/scripts/script_0817.s +++ b/res/field/scripts/script_0817.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0818.s b/res/field/scripts/script_0818.s index 5cd8055d62..30ac476d09 100644 --- a/res/field/scripts/script_0818.s +++ b/res/field/scripts/script_0818.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_002 0 + .short 2, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0819.s b/res/field/scripts/script_0819.s index 5cd8055d62..30ac476d09 100644 --- a/res/field/scripts/script_0819.s +++ b/res/field/scripts/script_0819.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_002 0 + .short 2, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0820.s b/res/field/scripts/script_0820.s index 33f5a87789..eb11fe2637 100644 --- a/res/field/scripts/script_0820.s +++ b/res/field/scripts/script_0820.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0821.s b/res/field/scripts/script_0821.s index 33f5a87789..eb11fe2637 100644 --- a/res/field/scripts/script_0821.s +++ b/res/field/scripts/script_0821.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0822.s b/res/field/scripts/script_0822.s index 33f5a87789..eb11fe2637 100644 --- a/res/field/scripts/script_0822.s +++ b/res/field/scripts/script_0822.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0824.s b/res/field/scripts/script_0824.s index 33f5a87789..eb11fe2637 100644 --- a/res/field/scripts/script_0824.s +++ b/res/field/scripts/script_0824.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0826.s b/res/field/scripts/script_0826.s index 33f5a87789..eb11fe2637 100644 --- a/res/field/scripts/script_0826.s +++ b/res/field/scripts/script_0826.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0827.s b/res/field/scripts/script_0827.s index 64cbdcca4c..6251f6d252 100644 --- a/res/field/scripts/script_0827.s +++ b/res/field/scripts/script_0827.s @@ -3,9 +3,9 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 4 - MoveAction_004 0 + .short 4, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0828.s b/res/field/scripts/script_0828.s index 33f5a87789..eb11fe2637 100644 --- a/res/field/scripts/script_0828.s +++ b/res/field/scripts/script_0828.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0829.s b/res/field/scripts/script_0829.s index 33f5a87789..eb11fe2637 100644 --- a/res/field/scripts/script_0829.s +++ b/res/field/scripts/script_0829.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0830.s b/res/field/scripts/script_0830.s index 6a86784918..c989eba242 100644 --- a/res/field/scripts/script_0830.s +++ b/res/field/scripts/script_0830.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 1 .long _000B-.-4 .byte 0 diff --git a/res/field/scripts/script_0836.s b/res/field/scripts/script_0836.s index 8ed75f399b..a773e1adef 100644 --- a/res/field/scripts/script_0836.s +++ b/res/field/scripts/script_0836.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 1 .long _000B-.-4 .byte 0 diff --git a/res/field/scripts/script_0838.s b/res/field/scripts/script_0838.s index 33f5a87789..eb11fe2637 100644 --- a/res/field/scripts/script_0838.s +++ b/res/field/scripts/script_0838.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0844.s b/res/field/scripts/script_0844.s index 55a84507e6..ce33ceb5f1 100644 --- a/res/field/scripts/script_0844.s +++ b/res/field/scripts/script_0844.s @@ -3,9 +3,9 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 3 - MoveAction_002 0 + .short 2, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0847.s b/res/field/scripts/script_0847.s index 33f5a87789..eb11fe2637 100644 --- a/res/field/scripts/script_0847.s +++ b/res/field/scripts/script_0847.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0848.s b/res/field/scripts/script_0848.s index 3bcf2dff38..016542ef24 100644 --- a/res/field/scripts/script_0848.s +++ b/res/field/scripts/script_0848.s @@ -3,9 +3,9 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 4 - MoveAction_002 0 + .short 2, 0 .byte 1 .long _0010-.-4 .byte 0 diff --git a/res/field/scripts/script_0849.s b/res/field/scripts/script_0849.s index df0a6a91a6..c5ef78db5c 100644 --- a/res/field/scripts/script_0849.s +++ b/res/field/scripts/script_0849.s @@ -3,9 +3,9 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 4 - MoveAction_002 0 + .short 2, 0 .byte 1 .long _0010-.-4 .byte 0 diff --git a/res/field/scripts/script_0850.s b/res/field/scripts/script_0850.s index 33f5a87789..eb11fe2637 100644 --- a/res/field/scripts/script_0850.s +++ b/res/field/scripts/script_0850.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0851.s b/res/field/scripts/script_0851.s index 33f5a87789..eb11fe2637 100644 --- a/res/field/scripts/script_0851.s +++ b/res/field/scripts/script_0851.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0854.s b/res/field/scripts/script_0854.s index 3161008c48..a1afd7dde8 100644 --- a/res/field/scripts/script_0854.s +++ b/res/field/scripts/script_0854.s @@ -3,9 +3,9 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 4 - MoveAction_002 0 + .short 2, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0855.s b/res/field/scripts/script_0855.s index 33f5a87789..eb11fe2637 100644 --- a/res/field/scripts/script_0855.s +++ b/res/field/scripts/script_0855.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0858.s b/res/field/scripts/script_0858.s index 3161008c48..a1afd7dde8 100644 --- a/res/field/scripts/script_0858.s +++ b/res/field/scripts/script_0858.s @@ -3,9 +3,9 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 4 - MoveAction_002 0 + .short 2, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0859.s b/res/field/scripts/script_0859.s index 33f5a87789..eb11fe2637 100644 --- a/res/field/scripts/script_0859.s +++ b/res/field/scripts/script_0859.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0860.s b/res/field/scripts/script_0860.s index 3161008c48..a1afd7dde8 100644 --- a/res/field/scripts/script_0860.s +++ b/res/field/scripts/script_0860.s @@ -3,9 +3,9 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 4 - MoveAction_002 0 + .short 2, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0864.s b/res/field/scripts/script_0864.s index 6478ad495f..3bc23fd2fb 100644 --- a/res/field/scripts/script_0864.s +++ b/res/field/scripts/script_0864.s @@ -3,9 +3,9 @@ .data .byte 2 - MoveAction_016 0 + .short 22, 0 .byte 3 - MoveAction_017 0 + .short 23, 0 .byte 1 .long _0010-.-4 .byte 0 diff --git a/res/field/scripts/script_0865.s b/res/field/scripts/script_0865.s index 5e5bf560ae..5b01f5c2ac 100644 --- a/res/field/scripts/script_0865.s +++ b/res/field/scripts/script_0865.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 1 .long _000B-.-4 .byte 0 diff --git a/res/field/scripts/script_0866.s b/res/field/scripts/script_0866.s index 0e7ecd38fc..cf4ec2b73a 100644 --- a/res/field/scripts/script_0866.s +++ b/res/field/scripts/script_0866.s @@ -3,9 +3,9 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 3 - MoveAction_002 0 + .short 2, 0 .byte 1 .long _0010-.-4 .byte 0 diff --git a/res/field/scripts/script_0867.s b/res/field/scripts/script_0867.s index a3784a6aff..d123fc8d58 100644 --- a/res/field/scripts/script_0867.s +++ b/res/field/scripts/script_0867.s @@ -3,9 +3,9 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 3 - MoveAction_002 0 + .short 2, 0 .byte 1 .long _0010-.-4 .byte 0 diff --git a/res/field/scripts/script_0868.s b/res/field/scripts/script_0868.s index 717699bdf9..7a4e4a98de 100644 --- a/res/field/scripts/script_0868.s +++ b/res/field/scripts/script_0868.s @@ -3,9 +3,9 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 3 - MoveAction_005 0 + .short 5, 0 .byte 1 .long _0010-.-4 .byte 0 diff --git a/res/field/scripts/script_0869.s b/res/field/scripts/script_0869.s index ad68572ef7..493b397177 100644 --- a/res/field/scripts/script_0869.s +++ b/res/field/scripts/script_0869.s @@ -3,9 +3,9 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 3 - MoveAction_002 0 + .short 2, 0 .byte 1 .long _0010-.-4 .byte 0 diff --git a/res/field/scripts/script_0870.s b/res/field/scripts/script_0870.s index f4b015f22b..a4361bc996 100644 --- a/res/field/scripts/script_0870.s +++ b/res/field/scripts/script_0870.s @@ -3,9 +3,9 @@ .data .byte 2 - MoveAction_007 0 + .short 7, 0 .byte 3 - MoveAction_008 0 + .short 8, 0 .byte 1 .long _0010-.-4 .byte 0 diff --git a/res/field/scripts/script_0871.s b/res/field/scripts/script_0871.s index 143e96d257..4329a77a5f 100644 --- a/res/field/scripts/script_0871.s +++ b/res/field/scripts/script_0871.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_026 0 + .short 38, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0872.s b/res/field/scripts/script_0872.s index f01434fb43..db3bcbda84 100644 --- a/res/field/scripts/script_0872.s +++ b/res/field/scripts/script_0872.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_00C 0 + .short 12, 0 .byte 1 .long _000B-.-4 .byte 0 diff --git a/res/field/scripts/script_0873.s b/res/field/scripts/script_0873.s index 53be63427c..a3c80bc8fd 100644 --- a/res/field/scripts/script_0873.s +++ b/res/field/scripts/script_0873.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_00E 0 + .short 14, 0 .byte 1 .long _000B-.-4 .byte 0 diff --git a/res/field/scripts/script_0874.s b/res/field/scripts/script_0874.s index d386aa3548..5998658686 100644 --- a/res/field/scripts/script_0874.s +++ b/res/field/scripts/script_0874.s @@ -3,11 +3,11 @@ .data .byte 4 - MoveAction_015 0 + .short 21, 0 .byte 2 - MoveAction_010 0 + .short 16, 0 .byte 3 - MoveAction_016 0 + .short 22, 0 .byte 1 .long _0015-.-4 .byte 0 diff --git a/res/field/scripts/script_0875.s b/res/field/scripts/script_0875.s index 8c24f6b898..4795020104 100644 --- a/res/field/scripts/script_0875.s +++ b/res/field/scripts/script_0875.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_00E 0 + .short 14, 0 .byte 1 .long _000B-.-4 .byte 0 diff --git a/res/field/scripts/script_0876.s b/res/field/scripts/script_0876.s index d3d380ba55..a9209ac76b 100644 --- a/res/field/scripts/script_0876.s +++ b/res/field/scripts/script_0876.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_00F 0 + .short 15, 0 .byte 1 .long _000B-.-4 .byte 0 diff --git a/res/field/scripts/script_0877.s b/res/field/scripts/script_0877.s index b8253b9a12..2ea2f31908 100644 --- a/res/field/scripts/script_0877.s +++ b/res/field/scripts/script_0877.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 1 .long _000B-.-4 .byte 0 diff --git a/res/field/scripts/script_0878.s b/res/field/scripts/script_0878.s index 9c955579d4..bb51508a4e 100644 --- a/res/field/scripts/script_0878.s +++ b/res/field/scripts/script_0878.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 1 .long _000B-.-4 .byte 0 diff --git a/res/field/scripts/script_0879.s b/res/field/scripts/script_0879.s index 33f5a87789..eb11fe2637 100644 --- a/res/field/scripts/script_0879.s +++ b/res/field/scripts/script_0879.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0880.s b/res/field/scripts/script_0880.s index 33f5a87789..eb11fe2637 100644 --- a/res/field/scripts/script_0880.s +++ b/res/field/scripts/script_0880.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0881.s b/res/field/scripts/script_0881.s index 33f5a87789..eb11fe2637 100644 --- a/res/field/scripts/script_0881.s +++ b/res/field/scripts/script_0881.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0882.s b/res/field/scripts/script_0882.s index 33f5a87789..eb11fe2637 100644 --- a/res/field/scripts/script_0882.s +++ b/res/field/scripts/script_0882.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0883.s b/res/field/scripts/script_0883.s index 33f5a87789..eb11fe2637 100644 --- a/res/field/scripts/script_0883.s +++ b/res/field/scripts/script_0883.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0884.s b/res/field/scripts/script_0884.s index 33f5a87789..eb11fe2637 100644 --- a/res/field/scripts/script_0884.s +++ b/res/field/scripts/script_0884.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0885.s b/res/field/scripts/script_0885.s index b47284e059..954d049a92 100644 --- a/res/field/scripts/script_0885.s +++ b/res/field/scripts/script_0885.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 1 .long _000B-.-4 .byte 0 diff --git a/res/field/scripts/script_0886.s b/res/field/scripts/script_0886.s index 3161008c48..a1afd7dde8 100644 --- a/res/field/scripts/script_0886.s +++ b/res/field/scripts/script_0886.s @@ -3,9 +3,9 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 4 - MoveAction_002 0 + .short 2, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0887.s b/res/field/scripts/script_0887.s index 33f5a87789..eb11fe2637 100644 --- a/res/field/scripts/script_0887.s +++ b/res/field/scripts/script_0887.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0889.s b/res/field/scripts/script_0889.s index 33f5a87789..eb11fe2637 100644 --- a/res/field/scripts/script_0889.s +++ b/res/field/scripts/script_0889.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0891.s b/res/field/scripts/script_0891.s index 33f5a87789..eb11fe2637 100644 --- a/res/field/scripts/script_0891.s +++ b/res/field/scripts/script_0891.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0893.s b/res/field/scripts/script_0893.s index 33f5a87789..eb11fe2637 100644 --- a/res/field/scripts/script_0893.s +++ b/res/field/scripts/script_0893.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0894.s b/res/field/scripts/script_0894.s index 33f5a87789..eb11fe2637 100644 --- a/res/field/scripts/script_0894.s +++ b/res/field/scripts/script_0894.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0895.s b/res/field/scripts/script_0895.s index 33f5a87789..eb11fe2637 100644 --- a/res/field/scripts/script_0895.s +++ b/res/field/scripts/script_0895.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0901.s b/res/field/scripts/script_0901.s index 30a1ff21b7..c5710964e5 100644 --- a/res/field/scripts/script_0901.s +++ b/res/field/scripts/script_0901.s @@ -3,9 +3,9 @@ .data .byte 4 - MoveAction_001 0 + .short 1, 0 .byte 2 - MoveAction_002 0 + .short 2, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0903.s b/res/field/scripts/script_0903.s index 7d41bc679a..5cc00ab060 100644 --- a/res/field/scripts/script_0903.s +++ b/res/field/scripts/script_0903.s @@ -3,9 +3,9 @@ .data .byte 4 - MoveAction_002 0 + .short 2, 0 .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0904.s b/res/field/scripts/script_0904.s index 5a949b35f8..d446cb9876 100644 --- a/res/field/scripts/script_0904.s +++ b/res/field/scripts/script_0904.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_002 0 + .short 2, 0 .byte 1 .long _000B-.-4 .byte 0 diff --git a/res/field/scripts/script_0907.s b/res/field/scripts/script_0907.s index 7d41bc679a..5cc00ab060 100644 --- a/res/field/scripts/script_0907.s +++ b/res/field/scripts/script_0907.s @@ -3,9 +3,9 @@ .data .byte 4 - MoveAction_002 0 + .short 2, 0 .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0909.s b/res/field/scripts/script_0909.s index 33f5a87789..eb11fe2637 100644 --- a/res/field/scripts/script_0909.s +++ b/res/field/scripts/script_0909.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0910.s b/res/field/scripts/script_0910.s index 33f5a87789..eb11fe2637 100644 --- a/res/field/scripts/script_0910.s +++ b/res/field/scripts/script_0910.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0914.s b/res/field/scripts/script_0914.s index 33f5a87789..eb11fe2637 100644 --- a/res/field/scripts/script_0914.s +++ b/res/field/scripts/script_0914.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0917.s b/res/field/scripts/script_0917.s index 4abec5f4eb..36dd9b343a 100644 --- a/res/field/scripts/script_0917.s +++ b/res/field/scripts/script_0917.s @@ -3,9 +3,9 @@ .data .byte 3 - MoveAction_002 0 + .short 2, 0 .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0918.s b/res/field/scripts/script_0918.s index 1cd4ad5a02..7a943829a6 100644 --- a/res/field/scripts/script_0918.s +++ b/res/field/scripts/script_0918.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 1 .long _000B-.-4 .byte 0 diff --git a/res/field/scripts/script_0920.s b/res/field/scripts/script_0920.s index 33f5a87789..eb11fe2637 100644 --- a/res/field/scripts/script_0920.s +++ b/res/field/scripts/script_0920.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0922.s b/res/field/scripts/script_0922.s index 33f5a87789..eb11fe2637 100644 --- a/res/field/scripts/script_0922.s +++ b/res/field/scripts/script_0922.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0923.s b/res/field/scripts/script_0923.s index 9bd729c0a1..e58dafb9cc 100644 --- a/res/field/scripts/script_0923.s +++ b/res/field/scripts/script_0923.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_008 0 + .short 8, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0924.s b/res/field/scripts/script_0924.s index 33f5a87789..eb11fe2637 100644 --- a/res/field/scripts/script_0924.s +++ b/res/field/scripts/script_0924.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0929.s b/res/field/scripts/script_0929.s index 6f72412a0a..283aabfed9 100644 --- a/res/field/scripts/script_0929.s +++ b/res/field/scripts/script_0929.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_007 0 + .short 7, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0930.s b/res/field/scripts/script_0930.s index 33f5a87789..eb11fe2637 100644 --- a/res/field/scripts/script_0930.s +++ b/res/field/scripts/script_0930.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0932.s b/res/field/scripts/script_0932.s index 33f5a87789..eb11fe2637 100644 --- a/res/field/scripts/script_0932.s +++ b/res/field/scripts/script_0932.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0935.s b/res/field/scripts/script_0935.s index edad63a2a8..270ef3995c 100644 --- a/res/field/scripts/script_0935.s +++ b/res/field/scripts/script_0935.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_00A 0 + .short 10, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0936.s b/res/field/scripts/script_0936.s index 33f5a87789..eb11fe2637 100644 --- a/res/field/scripts/script_0936.s +++ b/res/field/scripts/script_0936.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0938.s b/res/field/scripts/script_0938.s index 33f5a87789..eb11fe2637 100644 --- a/res/field/scripts/script_0938.s +++ b/res/field/scripts/script_0938.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0939.s b/res/field/scripts/script_0939.s index 6f72412a0a..283aabfed9 100644 --- a/res/field/scripts/script_0939.s +++ b/res/field/scripts/script_0939.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_007 0 + .short 7, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0940.s b/res/field/scripts/script_0940.s index 33f5a87789..eb11fe2637 100644 --- a/res/field/scripts/script_0940.s +++ b/res/field/scripts/script_0940.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0941.s b/res/field/scripts/script_0941.s index 33f5a87789..eb11fe2637 100644 --- a/res/field/scripts/script_0941.s +++ b/res/field/scripts/script_0941.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0943.s b/res/field/scripts/script_0943.s index 33f5a87789..eb11fe2637 100644 --- a/res/field/scripts/script_0943.s +++ b/res/field/scripts/script_0943.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0944.s b/res/field/scripts/script_0944.s index 33f5a87789..eb11fe2637 100644 --- a/res/field/scripts/script_0944.s +++ b/res/field/scripts/script_0944.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0948.s b/res/field/scripts/script_0948.s index 76c54f8f77..ecb0befe06 100644 --- a/res/field/scripts/script_0948.s +++ b/res/field/scripts/script_0948.s @@ -3,9 +3,9 @@ .data .byte 2 - MoveAction_003 0 + .short 3, 0 .byte 4 - MoveAction_004 0 + .short 4, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0949.s b/res/field/scripts/script_0949.s index 5cd8055d62..30ac476d09 100644 --- a/res/field/scripts/script_0949.s +++ b/res/field/scripts/script_0949.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_002 0 + .short 2, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0950.s b/res/field/scripts/script_0950.s index 6f72412a0a..283aabfed9 100644 --- a/res/field/scripts/script_0950.s +++ b/res/field/scripts/script_0950.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_007 0 + .short 7, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0960.s b/res/field/scripts/script_0960.s index 829610be54..2b1bbd715c 100644 --- a/res/field/scripts/script_0960.s +++ b/res/field/scripts/script_0960.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_004 0 + .short 4, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0961.s b/res/field/scripts/script_0961.s index 9b03dea53a..c412909410 100644 --- a/res/field/scripts/script_0961.s +++ b/res/field/scripts/script_0961.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 1 .long _000B-.-4 .byte 0 diff --git a/res/field/scripts/script_0963.s b/res/field/scripts/script_0963.s index 9bd729c0a1..e58dafb9cc 100644 --- a/res/field/scripts/script_0963.s +++ b/res/field/scripts/script_0963.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_008 0 + .short 8, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0964.s b/res/field/scripts/script_0964.s index 33f5a87789..eb11fe2637 100644 --- a/res/field/scripts/script_0964.s +++ b/res/field/scripts/script_0964.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0965.s b/res/field/scripts/script_0965.s index 33f5a87789..eb11fe2637 100644 --- a/res/field/scripts/script_0965.s +++ b/res/field/scripts/script_0965.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0967.s b/res/field/scripts/script_0967.s index 55a84507e6..ce33ceb5f1 100644 --- a/res/field/scripts/script_0967.s +++ b/res/field/scripts/script_0967.s @@ -3,9 +3,9 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 3 - MoveAction_002 0 + .short 2, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0973.s b/res/field/scripts/script_0973.s index 76c54f8f77..ecb0befe06 100644 --- a/res/field/scripts/script_0973.s +++ b/res/field/scripts/script_0973.s @@ -3,9 +3,9 @@ .data .byte 2 - MoveAction_003 0 + .short 3, 0 .byte 4 - MoveAction_004 0 + .short 4, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0982.s b/res/field/scripts/script_0982.s index 33f5a87789..eb11fe2637 100644 --- a/res/field/scripts/script_0982.s +++ b/res/field/scripts/script_0982.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0985.s b/res/field/scripts/script_0985.s index a7a45d03c5..e90dbf2f0e 100644 --- a/res/field/scripts/script_0985.s +++ b/res/field/scripts/script_0985.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 1 .long _000B-.-4 .byte 0 diff --git a/res/field/scripts/script_0986.s b/res/field/scripts/script_0986.s index d72721cf31..d92bdb1086 100644 --- a/res/field/scripts/script_0986.s +++ b/res/field/scripts/script_0986.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_005 0 + .short 5, 0 .byte 1 .long _000B-.-4 .byte 0 diff --git a/res/field/scripts/script_0989.s b/res/field/scripts/script_0989.s index 3ebb0df4bf..21302fdc69 100644 --- a/res/field/scripts/script_0989.s +++ b/res/field/scripts/script_0989.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 1 .long _000B-.-4 .byte 0 diff --git a/res/field/scripts/script_0994.s b/res/field/scripts/script_0994.s index 1a1c5f92c8..4bc25c33fd 100644 --- a/res/field/scripts/script_0994.s +++ b/res/field/scripts/script_0994.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 1 .long _000B-.-4 .byte 0 diff --git a/res/field/scripts/script_0998.s b/res/field/scripts/script_0998.s index 33f5a87789..eb11fe2637 100644 --- a/res/field/scripts/script_0998.s +++ b/res/field/scripts/script_0998.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_1006.s b/res/field/scripts/script_1006.s index 8f0b39820c..ad73c55873 100644 --- a/res/field/scripts/script_1006.s +++ b/res/field/scripts/script_1006.s @@ -3,9 +3,9 @@ .data .byte 2 - MoveAction_00A 0 + .short 10, 0 .byte 3 - MoveAction_00B 0 + .short 11, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_1011.s b/res/field/scripts/script_1011.s index 33f5a87789..eb11fe2637 100644 --- a/res/field/scripts/script_1011.s +++ b/res/field/scripts/script_1011.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_1016.s b/res/field/scripts/script_1016.s index 7581346eb9..130edb91d5 100644 --- a/res/field/scripts/script_1016.s +++ b/res/field/scripts/script_1016.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 1 .long _000B-.-4 .byte 0 diff --git a/res/field/scripts/script_1021.s b/res/field/scripts/script_1021.s index 224d01ce60..e457f9e161 100644 --- a/res/field/scripts/script_1021.s +++ b/res/field/scripts/script_1021.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_005 0 + .short 5, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_1026.s b/res/field/scripts/script_1026.s index c155082b22..75cc8932e7 100644 --- a/res/field/scripts/script_1026.s +++ b/res/field/scripts/script_1026.s @@ -3,9 +3,9 @@ .data .byte 2 - MoveAction_008 0 + .short 8, 0 .byte 4 - MoveAction_009 0 + .short 9, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_1031.s b/res/field/scripts/script_1031.s index 2f3de3069e..d2abfadf1a 100644 --- a/res/field/scripts/script_1031.s +++ b/res/field/scripts/script_1031.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_004 0 + .short 4, 0 .byte 1 .long _000B-.-4 .byte 0 diff --git a/res/field/scripts/script_1034.s b/res/field/scripts/script_1034.s index d7bf57e370..17a4f8d3b0 100644 --- a/res/field/scripts/script_1034.s +++ b/res/field/scripts/script_1034.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_00E 0 + .short 14, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_1039.s b/res/field/scripts/script_1039.s index db03be5d79..dab8c9fc3e 100644 --- a/res/field/scripts/script_1039.s +++ b/res/field/scripts/script_1039.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_008 0 + .short 8, 0 .byte 1 .long _000B-.-4 .byte 0 diff --git a/res/field/scripts/script_1042.s b/res/field/scripts/script_1042.s index c77876fc53..3387003593 100644 --- a/res/field/scripts/script_1042.s +++ b/res/field/scripts/script_1042.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 1 .long _000B-.-4 .byte 0 diff --git a/res/field/scripts/script_1044.s b/res/field/scripts/script_1044.s index 16e1c5e8aa..386872d9a9 100644 --- a/res/field/scripts/script_1044.s +++ b/res/field/scripts/script_1044.s @@ -3,9 +3,9 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 3 - MoveAction_002 0 + .short 2, 0 .byte 1 .long _0010-.-4 .byte 0 diff --git a/res/field/scripts/script_1045.s b/res/field/scripts/script_1045.s index 1e8a0a5a58..fda7595d82 100644 --- a/res/field/scripts/script_1045.s +++ b/res/field/scripts/script_1045.s @@ -3,11 +3,11 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 4 - MoveAction_002 0 + .short 2, 0 .byte 3 - MoveAction_003 0 + .short 3, 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_1049.s b/res/field/scripts/script_1049.s index 33f5a87789..eb11fe2637 100644 --- a/res/field/scripts/script_1049.s +++ b/res/field/scripts/script_1049.s @@ -3,7 +3,7 @@ .data .byte 2 - MoveAction_001 0 + .short 1, 0 .byte 0 .balign 4, 0 From 394c802aa4fb9e1e90e4b369078856bb8ad5839d Mon Sep 17 00:00:00 2001 From: cbt6 <91667135+cbt6@users.noreply.github.com> Date: Sun, 14 Apr 2024 12:58:14 +0800 Subject: [PATCH 08/23] "movement_range_y" -> "movement_range_z" --- res/field/events/events_0001.json | 42 ++++++------ res/field/events/events_0002.json | 66 +++++++++---------- res/field/events/events_0003.json | 12 ++-- res/field/events/events_0005.json | 14 ++-- res/field/events/events_0006.json | 6 +- res/field/events/events_0007.json | 10 +-- res/field/events/events_0008.json | 8 +-- res/field/events/events_0009.json | 6 +- res/field/events/events_0010.json | 10 +-- res/field/events/events_0011.json | 8 +-- res/field/events/events_0012.json | 8 +-- res/field/events/events_0013.json | 6 +- res/field/events/events_0014.json | 6 +- res/field/events/events_0015.json | 8 +-- res/field/events/events_0016.json | 6 +- res/field/events/events_0017.json | 2 +- res/field/events/events_0018.json | 6 +- res/field/events/events_0019.json | 6 +- res/field/events/events_0020.json | 2 +- res/field/events/events_0023.json | 8 +-- res/field/events/events_0024.json | 4 +- res/field/events/events_0025.json | 4 +- res/field/events/events_0026.json | 2 +- res/field/events/events_0027.json | 28 ++++---- res/field/events/events_0028.json | 18 +++--- res/field/events/events_0029.json | 6 +- res/field/events/events_0032.json | 38 +++++------ res/field/events/events_0033.json | 10 +-- res/field/events/events_0034.json | 18 +++--- res/field/events/events_0035.json | 14 ++-- res/field/events/events_0036.json | 6 +- res/field/events/events_0037.json | 6 +- res/field/events/events_0038.json | 4 +- res/field/events/events_0039.json | 10 +-- res/field/events/events_0040.json | 4 +- res/field/events/events_0041.json | 2 +- res/field/events/events_0042.json | 2 +- res/field/events/events_0043.json | 6 +- res/field/events/events_0044.json | 56 ++++++++-------- res/field/events/events_0045.json | 10 +-- res/field/events/events_0046.json | 8 +-- res/field/events/events_0047.json | 18 +++--- res/field/events/events_0048.json | 6 +- res/field/events/events_0049.json | 6 +- res/field/events/events_0050.json | 8 +-- res/field/events/events_0051.json | 4 +- res/field/events/events_0052.json | 6 +- res/field/events/events_0053.json | 6 +- res/field/events/events_0054.json | 6 +- res/field/events/events_0055.json | 6 +- res/field/events/events_0056.json | 2 +- res/field/events/events_0057.json | 4 +- res/field/events/events_0058.json | 16 ++--- res/field/events/events_0059.json | 6 +- res/field/events/events_0060.json | 6 +- res/field/events/events_0061.json | 6 +- res/field/events/events_0062.json | 4 +- res/field/events/events_0063.json | 2 +- res/field/events/events_0064.json | 68 ++++++++++---------- res/field/events/events_0065.json | 10 +-- res/field/events/events_0066.json | 10 +-- res/field/events/events_0068.json | 14 ++-- res/field/events/events_0069.json | 8 +-- res/field/events/events_0070.json | 6 +- res/field/events/events_0071.json | 14 ++-- res/field/events/events_0072.json | 10 +-- res/field/events/events_0073.json | 8 +-- res/field/events/events_0074.json | 14 ++-- res/field/events/events_0075.json | 6 +- res/field/events/events_0076.json | 6 +- res/field/events/events_0077.json | 8 +-- res/field/events/events_0078.json | 2 +- res/field/events/events_0079.json | 6 +- res/field/events/events_0080.json | 6 +- res/field/events/events_0081.json | 2 +- res/field/events/events_0082.json | 6 +- res/field/events/events_0083.json | 8 +-- res/field/events/events_0085.json | 72 ++++++++++----------- res/field/events/events_0086.json | 10 +-- res/field/events/events_0087.json | 2 +- res/field/events/events_0088.json | 4 +- res/field/events/events_0089.json | 8 +-- res/field/events/events_0090.json | 6 +- res/field/events/events_0091.json | 2 +- res/field/events/events_0093.json | 2 +- res/field/events/events_0095.json | 2 +- res/field/events/events_0096.json | 2 +- res/field/events/events_0097.json | 2 +- res/field/events/events_0098.json | 2 +- res/field/events/events_0099.json | 2 +- res/field/events/events_0100.json | 12 ++-- res/field/events/events_0101.json | 6 +- res/field/events/events_0102.json | 8 +-- res/field/events/events_0103.json | 4 +- res/field/events/events_0105.json | 12 ++-- res/field/events/events_0106.json | 8 +-- res/field/events/events_0107.json | 6 +- res/field/events/events_0108.json | 6 +- res/field/events/events_0109.json | 4 +- res/field/events/events_0110.json | 8 +-- res/field/events/events_0111.json | 16 ++--- res/field/events/events_0112.json | 8 +-- res/field/events/events_0114.json | 2 +- res/field/events/events_0115.json | 12 ++-- res/field/events/events_0116.json | 22 +++---- res/field/events/events_0117.json | 62 +++++++++--------- res/field/events/events_0118.json | 18 +++--- res/field/events/events_0119.json | 58 ++++++++--------- res/field/events/events_0120.json | 10 +-- res/field/events/events_0121.json | 16 ++--- res/field/events/events_0122.json | 10 +-- res/field/events/events_0123.json | 8 +-- res/field/events/events_0124.json | 6 +- res/field/events/events_0125.json | 8 +-- res/field/events/events_0126.json | 4 +- res/field/events/events_0127.json | 4 +- res/field/events/events_0128.json | 4 +- res/field/events/events_0129.json | 6 +- res/field/events/events_0130.json | 6 +- res/field/events/events_0131.json | 60 +++++++++--------- res/field/events/events_0132.json | 12 ++-- res/field/events/events_0133.json | 10 +-- res/field/events/events_0134.json | 6 +- res/field/events/events_0135.json | 18 +++--- res/field/events/events_0136.json | 12 ++-- res/field/events/events_0137.json | 14 ++-- res/field/events/events_0138.json | 12 ++-- res/field/events/events_0139.json | 12 ++-- res/field/events/events_0140.json | 8 +-- res/field/events/events_0141.json | 2 +- res/field/events/events_0142.json | 10 +-- res/field/events/events_0143.json | 6 +- res/field/events/events_0144.json | 4 +- res/field/events/events_0145.json | 6 +- res/field/events/events_0146.json | 4 +- res/field/events/events_0147.json | 6 +- res/field/events/events_0148.json | 2 +- res/field/events/events_0149.json | 42 ++++++------ res/field/events/events_0150.json | 12 ++-- res/field/events/events_0151.json | 6 +- res/field/events/events_0152.json | 10 +-- res/field/events/events_0153.json | 4 +- res/field/events/events_0154.json | 6 +- res/field/events/events_0155.json | 10 +-- res/field/events/events_0156.json | 10 +-- res/field/events/events_0157.json | 2 +- res/field/events/events_0158.json | 14 ++-- res/field/events/events_0159.json | 4 +- res/field/events/events_0160.json | 4 +- res/field/events/events_0161.json | 4 +- res/field/events/events_0162.json | 2 +- res/field/events/events_0163.json | 6 +- res/field/events/events_0164.json | 24 +++---- res/field/events/events_0165.json | 10 +-- res/field/events/events_0166.json | 54 ++++++++-------- res/field/events/events_0167.json | 14 ++-- res/field/events/events_0168.json | 6 +- res/field/events/events_0169.json | 4 +- res/field/events/events_0170.json | 4 +- res/field/events/events_0171.json | 4 +- res/field/events/events_0172.json | 6 +- res/field/events/events_0173.json | 6 +- res/field/events/events_0174.json | 14 ++-- res/field/events/events_0176.json | 6 +- res/field/events/events_0178.json | 6 +- res/field/events/events_0180.json | 6 +- res/field/events/events_0182.json | 6 +- res/field/events/events_0184.json | 2 +- res/field/events/events_0185.json | 4 +- res/field/events/events_0186.json | 4 +- res/field/events/events_0187.json | 64 +++++++++---------- res/field/events/events_0188.json | 12 ++-- res/field/events/events_0189.json | 6 +- res/field/events/events_0190.json | 8 +-- res/field/events/events_0191.json | 12 ++-- res/field/events/events_0192.json | 4 +- res/field/events/events_0193.json | 6 +- res/field/events/events_0194.json | 8 +-- res/field/events/events_0196.json | 8 +-- res/field/events/events_0197.json | 22 +++---- res/field/events/events_0198.json | 16 ++--- res/field/events/events_0199.json | 16 ++--- res/field/events/events_0200.json | 22 +++---- res/field/events/events_0201.json | 50 +++++++-------- res/field/events/events_0202.json | 10 +-- res/field/events/events_0203.json | 24 +++---- res/field/events/events_0204.json | 14 ++-- res/field/events/events_0205.json | 18 +++--- res/field/events/events_0206.json | 4 +- res/field/events/events_0207.json | 14 ++-- res/field/events/events_0208.json | 16 ++--- res/field/events/events_0209.json | 20 +++--- res/field/events/events_0211.json | 4 +- res/field/events/events_0212.json | 2 +- res/field/events/events_0213.json | 34 +++++----- res/field/events/events_0215.json | 38 +++++------ res/field/events/events_0216.json | 48 +++++++------- res/field/events/events_0217.json | 12 ++-- res/field/events/events_0218.json | 12 ++-- res/field/events/events_0224.json | 2 +- res/field/events/events_0226.json | 2 +- res/field/events/events_0235.json | 8 +-- res/field/events/events_0238.json | 24 +++---- res/field/events/events_0239.json | 64 +++++++++---------- res/field/events/events_0240.json | 16 ++--- res/field/events/events_0241.json | 58 ++++++++--------- res/field/events/events_0245.json | 2 +- res/field/events/events_0246.json | 32 +++++----- res/field/events/events_0247.json | 62 +++++++++--------- res/field/events/events_0249.json | 16 ++--- res/field/events/events_0250.json | 4 +- res/field/events/events_0251.json | 22 +++---- res/field/events/events_0252.json | 34 +++++----- res/field/events/events_0253.json | 8 +-- res/field/events/events_0254.json | 4 +- res/field/events/events_0255.json | 16 ++--- res/field/events/events_0256.json | 34 +++++----- res/field/events/events_0257.json | 62 +++++++++--------- res/field/events/events_0258.json | 22 +++---- res/field/events/events_0259.json | 2 +- res/field/events/events_0262.json | 4 +- res/field/events/events_0263.json | 22 +++---- res/field/events/events_0264.json | 22 +++---- res/field/events/events_0265.json | 26 ++++---- res/field/events/events_0266.json | 2 +- res/field/events/events_0268.json | 2 +- res/field/events/events_0269.json | 4 +- res/field/events/events_0271.json | 4 +- res/field/events/events_0272.json | 2 +- res/field/events/events_0273.json | 52 +++++++-------- res/field/events/events_0274.json | 6 +- res/field/events/events_0275.json | 4 +- res/field/events/events_0277.json | 4 +- res/field/events/events_0279.json | 6 +- res/field/events/events_0280.json | 8 +-- res/field/events/events_0281.json | 8 +-- res/field/events/events_0282.json | 34 +++++----- res/field/events/events_0283.json | 2 +- res/field/events/events_0285.json | 6 +- res/field/events/events_0286.json | 2 +- res/field/events/events_0288.json | 2 +- res/field/events/events_0289.json | 2 +- res/field/events/events_0291.json | 4 +- res/field/events/events_0292.json | 2 +- res/field/events/events_0293.json | 22 +++---- res/field/events/events_0294.json | 14 ++-- res/field/events/events_0295.json | 20 +++--- res/field/events/events_0296.json | 10 +-- res/field/events/events_0297.json | 2 +- res/field/events/events_0298.json | 18 +++--- res/field/events/events_0299.json | 14 ++-- res/field/events/events_0300.json | 18 +++--- res/field/events/events_0301.json | 4 +- res/field/events/events_0302.json | 60 +++++++++--------- res/field/events/events_0303.json | 2 +- res/field/events/events_0304.json | 4 +- res/field/events/events_0305.json | 4 +- res/field/events/events_0306.json | 6 +- res/field/events/events_0307.json | 2 +- res/field/events/events_0308.json | 8 +-- res/field/events/events_0309.json | 2 +- res/field/events/events_0310.json | 28 ++++---- res/field/events/events_0311.json | 18 +++--- res/field/events/events_0312.json | 30 ++++----- res/field/events/events_0313.json | 2 +- res/field/events/events_0314.json | 2 +- res/field/events/events_0315.json | 8 +-- res/field/events/events_0316.json | 6 +- res/field/events/events_0317.json | 12 ++-- res/field/events/events_0318.json | 2 +- res/field/events/events_0319.json | 2 +- res/field/events/events_0320.json | 2 +- res/field/events/events_0322.json | 24 +++---- res/field/events/events_0323.json | 38 +++++------ res/field/events/events_0324.json | 2 +- res/field/events/events_0325.json | 2 +- res/field/events/events_0326.json | 8 +-- res/field/events/events_0328.json | 26 ++++---- res/field/events/events_0329.json | 18 +++--- res/field/events/events_0330.json | 30 ++++----- res/field/events/events_0331.json | 20 +++--- res/field/events/events_0332.json | 24 +++---- res/field/events/events_0333.json | 64 +++++++++---------- res/field/events/events_0334.json | 4 +- res/field/events/events_0335.json | 24 +++---- res/field/events/events_0336.json | 48 +++++++------- res/field/events/events_0337.json | 6 +- res/field/events/events_0339.json | 54 ++++++++-------- res/field/events/events_0340.json | 48 +++++++------- res/field/events/events_0341.json | 8 +-- res/field/events/events_0342.json | 66 +++++++++---------- res/field/events/events_0343.json | 4 +- res/field/events/events_0344.json | 4 +- res/field/events/events_0345.json | 6 +- res/field/events/events_0346.json | 12 ++-- res/field/events/events_0347.json | 4 +- res/field/events/events_0348.json | 62 +++++++++--------- res/field/events/events_0349.json | 52 +++++++-------- res/field/events/events_0350.json | 2 +- res/field/events/events_0351.json | 16 ++--- res/field/events/events_0352.json | 44 ++++++------- res/field/events/events_0353.json | 60 +++++++++--------- res/field/events/events_0354.json | 14 ++-- res/field/events/events_0355.json | 6 +- res/field/events/events_0356.json | 8 +-- res/field/events/events_0357.json | 88 +++++++++++++------------- res/field/events/events_0358.json | 6 +- res/field/events/events_0359.json | 68 ++++++++++---------- res/field/events/events_0360.json | 4 +- res/field/events/events_0361.json | 2 +- res/field/events/events_0362.json | 6 +- res/field/events/events_0363.json | 2 +- res/field/events/events_0364.json | 6 +- res/field/events/events_0365.json | 4 +- res/field/events/events_0366.json | 56 ++++++++-------- res/field/events/events_0367.json | 4 +- res/field/events/events_0368.json | 58 ++++++++--------- res/field/events/events_0369.json | 34 +++++----- res/field/events/events_0370.json | 4 +- res/field/events/events_0371.json | 38 +++++------ res/field/events/events_0372.json | 2 +- res/field/events/events_0373.json | 2 +- res/field/events/events_0374.json | 42 ++++++------ res/field/events/events_0375.json | 4 +- res/field/events/events_0376.json | 4 +- res/field/events/events_0377.json | 8 +-- res/field/events/events_0378.json | 34 +++++----- res/field/events/events_0379.json | 18 +++--- res/field/events/events_0380.json | 2 +- res/field/events/events_0381.json | 64 +++++++++---------- res/field/events/events_0382.json | 14 ++-- res/field/events/events_0383.json | 2 +- res/field/events/events_0384.json | 4 +- res/field/events/events_0385.json | 44 ++++++------- res/field/events/events_0386.json | 62 +++++++++--------- res/field/events/events_0387.json | 26 ++++---- res/field/events/events_0388.json | 54 ++++++++-------- res/field/events/events_0389.json | 38 +++++------ res/field/events/events_0390.json | 16 ++--- res/field/events/events_0391.json | 2 +- res/field/events/events_0392.json | 2 +- res/field/events/events_0393.json | 4 +- res/field/events/events_0394.json | 2 +- res/field/events/events_0395.json | 2 +- res/field/events/events_0396.json | 4 +- res/field/events/events_0397.json | 30 ++++----- res/field/events/events_0398.json | 8 +-- res/field/events/events_0399.json | 10 +-- res/field/events/events_0400.json | 8 +-- res/field/events/events_0401.json | 10 +-- res/field/events/events_0402.json | 4 +- res/field/events/events_0404.json | 4 +- res/field/events/events_0405.json | 26 ++++---- res/field/events/events_0406.json | 10 +-- res/field/events/events_0407.json | 12 ++-- res/field/events/events_0408.json | 6 +- res/field/events/events_0409.json | 6 +- res/field/events/events_0410.json | 4 +- res/field/events/events_0411.json | 6 +- res/field/events/events_0412.json | 42 ++++++------ res/field/events/events_0413.json | 10 +-- res/field/events/events_0414.json | 12 ++-- res/field/events/events_0415.json | 6 +- res/field/events/events_0416.json | 4 +- res/field/events/events_0417.json | 4 +- res/field/events/events_0418.json | 4 +- res/field/events/events_0419.json | 4 +- res/field/events/events_0420.json | 4 +- res/field/events/events_0421.json | 24 +++---- res/field/events/events_0422.json | 12 ++-- res/field/events/events_0423.json | 6 +- res/field/events/events_0424.json | 8 +-- res/field/events/events_0425.json | 6 +- res/field/events/events_0426.json | 4 +- res/field/events/events_0427.json | 4 +- res/field/events/events_0428.json | 6 +- res/field/events/events_0429.json | 24 +++---- res/field/events/events_0430.json | 8 +-- res/field/events/events_0431.json | 8 +-- res/field/events/events_0432.json | 6 +- res/field/events/events_0433.json | 12 ++-- res/field/events/events_0434.json | 2 +- res/field/events/events_0435.json | 4 +- res/field/events/events_0436.json | 38 +++++------ res/field/events/events_0437.json | 2 +- res/field/events/events_0438.json | 10 +-- res/field/events/events_0439.json | 6 +- res/field/events/events_0440.json | 12 ++-- res/field/events/events_0441.json | 8 +-- res/field/events/events_0442.json | 2 +- res/field/events/events_0443.json | 34 +++++----- res/field/events/events_0444.json | 6 +- res/field/events/events_0445.json | 102 +++++++++++++++--------------- res/field/events/events_0446.json | 20 +++--- res/field/events/events_0447.json | 36 +++++------ res/field/events/events_0448.json | 32 +++++----- res/field/events/events_0449.json | 38 +++++------ res/field/events/events_0451.json | 6 +- res/field/events/events_0452.json | 6 +- res/field/events/events_0453.json | 8 +-- res/field/events/events_0454.json | 6 +- res/field/events/events_0455.json | 6 +- res/field/events/events_0456.json | 6 +- res/field/events/events_0457.json | 8 +-- res/field/events/events_0458.json | 6 +- res/field/events/events_0459.json | 6 +- res/field/events/events_0460.json | 6 +- res/field/events/events_0461.json | 6 +- res/field/events/events_0462.json | 6 +- res/field/events/events_0463.json | 6 +- res/field/events/events_0464.json | 6 +- res/field/events/events_0465.json | 6 +- res/field/events/events_0466.json | 6 +- res/field/events/events_0467.json | 6 +- res/field/events/events_0468.json | 2 +- res/field/events/events_0469.json | 12 ++-- res/field/events/events_0470.json | 12 ++-- res/field/events/events_0471.json | 10 +-- res/field/events/events_0472.json | 6 +- res/field/events/events_0473.json | 6 +- res/field/events/events_0474.json | 6 +- res/field/events/events_0475.json | 2 +- res/field/events/events_0476.json | 2 +- res/field/events/events_0477.json | 2 +- res/field/events/events_0478.json | 4 +- res/field/events/events_0479.json | 2 +- res/field/events/events_0480.json | 2 +- res/field/events/events_0481.json | 10 +-- res/field/events/events_0482.json | 8 +-- res/field/events/events_0483.json | 10 +-- res/field/events/events_0484.json | 10 +-- res/field/events/events_0485.json | 8 +-- res/field/events/events_0486.json | 12 ++-- res/field/events/events_0487.json | 2 +- res/field/events/events_0488.json | 4 +- res/field/events/events_0489.json | 4 +- res/field/events/events_0490.json | 2 +- res/field/events/events_0493.json | 8 +-- res/field/events/events_0494.json | 26 ++++---- res/field/events/events_0495.json | 26 ++++---- res/field/events/events_0496.json | 26 ++++---- res/field/events/events_0497.json | 60 +++++++++--------- res/field/events/events_0498.json | 58 ++++++++--------- res/field/events/events_0499.json | 58 ++++++++--------- res/field/events/events_0500.json | 58 ++++++++--------- res/field/events/events_0501.json | 60 +++++++++--------- res/field/events/events_0502.json | 60 +++++++++--------- res/field/events/events_0503.json | 60 +++++++++--------- res/field/events/events_0504.json | 58 ++++++++--------- res/field/events/events_0505.json | 60 +++++++++--------- res/field/events/events_0506.json | 60 +++++++++--------- res/field/events/events_0507.json | 60 +++++++++--------- res/field/events/events_0508.json | 60 +++++++++--------- res/field/events/events_0512.json | 8 +-- res/field/events/events_0513.json | 60 +++++++++--------- res/field/events/events_0514.json | 20 +++--- res/field/events/events_0515.json | 18 +++--- res/field/events/events_0516.json | 30 ++++----- res/field/events/events_0517.json | 18 +++--- res/field/events/events_0518.json | 24 +++---- res/field/events/events_0519.json | 20 +++--- res/field/events/events_0520.json | 18 +++--- res/field/events/events_0521.json | 18 +++--- res/field/events/events_0522.json | 72 ++++++++++----------- res/field/events/events_0523.json | 16 ++--- res/field/events/events_0527.json | 2 +- res/field/events/events_0528.json | 2 +- res/field/events/events_0530.json | 2 +- res/field/events/events_0532.json | 2 +- tools/json2bin/events.py | 2 +- 470 files changed, 3556 insertions(+), 3556 deletions(-) diff --git a/res/field/events/events_0001.json b/res/field/events/events_0001.json index 2f54d51186..5ce9b86d96 100644 --- a/res/field/events/events_0001.json +++ b/res/field/events/events_0001.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 311, "z": 358, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 392, "z": 121, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 73, "z": 133, "y": 0 @@ -52,7 +52,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 343, "z": 151, "y": 0 @@ -66,7 +66,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 200, "z": 185, "y": 0 @@ -80,7 +80,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 167, "z": 392, "y": 0 @@ -94,7 +94,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 437, "z": 400, "y": 0 @@ -108,7 +108,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 119, "z": 422, "y": 0 @@ -122,7 +122,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 247, "z": 249, "y": 0 @@ -136,7 +136,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 151, "z": 264, "y": 0 @@ -150,7 +150,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 360, "z": 279, "y": 0 @@ -164,7 +164,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 264, "z": 294, "y": 0 @@ -178,7 +178,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 247, "z": 264, "y": 0 @@ -192,7 +192,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 279, "z": 456, "y": 0 @@ -206,7 +206,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 232, "z": 87, "y": 0 @@ -220,7 +220,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 264, "z": 279, "y": 0 @@ -234,7 +234,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 1, "z": 1, "y": 0 @@ -248,7 +248,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 1, "y": 0 @@ -262,7 +262,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 2, "y": 0 @@ -276,7 +276,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 3, "y": 0 @@ -290,7 +290,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 4, "y": 0 diff --git a/res/field/events/events_0002.json b/res/field/events/events_0002.json index 7d0ff92a82..a8818bac7a 100644 --- a/res/field/events/events_0002.json +++ b/res/field/events/events_0002.json @@ -19,7 +19,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 145, "z": 761, "y": 0 @@ -33,7 +33,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 174, "z": 757, "y": 1 @@ -47,7 +47,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 145, "z": 791, "y": 1 @@ -61,7 +61,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 161, "z": 754, "y": 1 @@ -75,7 +75,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 172, "z": 780, "y": 1 @@ -89,7 +89,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 1, + "movement_range_z": 1, "x": 179, "z": 770, "y": 1 @@ -103,7 +103,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 169, "z": 766, "y": 1 @@ -117,7 +117,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 174, "z": 788, "y": 1 @@ -133,7 +133,7 @@ 8 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 176, "z": 744, "y": 0 @@ -149,7 +149,7 @@ 8 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 187, "z": 756, "y": 0 @@ -165,7 +165,7 @@ 8 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 132, "z": 756, "y": 0 @@ -181,7 +181,7 @@ 8 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 170, "z": 791, "y": 0 @@ -195,7 +195,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 177, "z": 755, "y": 0 @@ -209,7 +209,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 141, "z": 755, "y": 0 @@ -223,7 +223,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 167, "z": 755, "y": 0 @@ -237,7 +237,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 164, "z": 776, "y": 0 @@ -251,7 +251,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 175, "z": 740, "y": 1 @@ -265,7 +265,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 174, "z": 739, "y": 1 @@ -279,7 +279,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 174, "z": 740, "y": 1 @@ -296,7 +296,7 @@ 3 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 176, "z": 804, "y": 0 @@ -313,7 +313,7 @@ 2 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 198, "z": 756, "y": 0 @@ -327,7 +327,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 164, "z": 761, "y": 1 @@ -341,7 +341,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 147, "z": 780, "y": 0 @@ -355,7 +355,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 174, "z": 771, "y": 1 @@ -369,7 +369,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 183, "z": 769, "y": 1 @@ -383,7 +383,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 143, "z": 754, "y": 1 @@ -397,7 +397,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 154, "z": 778, "y": 1 @@ -411,7 +411,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 164, "z": 752, "y": 0 @@ -425,7 +425,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 180, "z": 782, "y": 0 @@ -439,7 +439,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 182, "z": 782, "y": 0 @@ -453,7 +453,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 173, "z": 753, "y": 0 @@ -467,7 +467,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 186, "z": 756, "y": 1 @@ -481,7 +481,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 142, "z": 766, "y": 0 diff --git a/res/field/events/events_0003.json b/res/field/events/events_0003.json index c1a5ffdc9e..5642b356bd 100644 --- a/res/field/events/events_0003.json +++ b/res/field/events/events_0003.json @@ -10,7 +10,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 7, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 3, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 3, "z": 5, "y": 0 @@ -52,7 +52,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 2, "z": 5, "y": 0 @@ -66,7 +66,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 7, "y": 0 @@ -80,7 +80,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 6, "z": 10, "y": 0 diff --git a/res/field/events/events_0005.json b/res/field/events/events_0005.json index f00e553800..eee020e20c 100644 --- a/res/field/events/events_0005.json +++ b/res/field/events/events_0005.json @@ -10,7 +10,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 1, + "movement_range_z": 1, "x": 14, "z": 6, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 7, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 10, "z": 8, "y": 0 @@ -52,7 +52,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 4, "y": 0 @@ -66,7 +66,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 13, "z": 10, "y": 0 @@ -80,7 +80,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 1, + "movement_range_z": 1, "x": 6, "z": 6, "y": 0 @@ -94,7 +94,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 1, + "movement_range_z": 1, "x": 5, "z": 6, "y": 0 diff --git a/res/field/events/events_0006.json b/res/field/events/events_0006.json index 398485457d..7ae7e9f013 100644 --- a/res/field/events/events_0006.json +++ b/res/field/events/events_0006.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 4, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 12, "z": 4, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 4, "y": 0 diff --git a/res/field/events/events_0007.json b/res/field/events/events_0007.json index 306e76c58a..dec4dc1795 100644 --- a/res/field/events/events_0007.json +++ b/res/field/events/events_0007.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 15, "z": 8, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 2, "z": 6, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 16, "z": 3, "y": 0 @@ -52,7 +52,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 18, "z": 5, "y": 0 @@ -66,7 +66,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 6, "z": 7, "y": 0 diff --git a/res/field/events/events_0008.json b/res/field/events/events_0008.json index aa93a348aa..3a017d95dd 100644 --- a/res/field/events/events_0008.json +++ b/res/field/events/events_0008.json @@ -10,7 +10,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 12, "z": 6, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 2, "z": 9, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 10, "y": 0 @@ -52,7 +52,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 11, "y": 0 diff --git a/res/field/events/events_0009.json b/res/field/events/events_0009.json index 3f5ed33afb..71eba99b8d 100644 --- a/res/field/events/events_0009.json +++ b/res/field/events/events_0009.json @@ -43,7 +43,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 2, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 5, "y": 0 @@ -57,7 +57,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 14, "z": 6, "y": 0 @@ -71,7 +71,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 6, "y": 0 diff --git a/res/field/events/events_0010.json b/res/field/events/events_0010.json index 19604f4b0e..7e7879d0da 100644 --- a/res/field/events/events_0010.json +++ b/res/field/events/events_0010.json @@ -10,7 +10,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 13, "z": 13, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 13, "z": 7, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 11, "y": 0 @@ -52,7 +52,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 9, "z": 7, "y": 0 @@ -66,7 +66,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 10, "y": 0 diff --git a/res/field/events/events_0011.json b/res/field/events/events_0011.json index d7e67724b3..333bf0be13 100644 --- a/res/field/events/events_0011.json +++ b/res/field/events/events_0011.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 2, - "movement_range_y": 2, + "movement_range_z": 2, "x": 11, "z": 14, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 12, "z": 6, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 2, "z": 3, "y": 0 @@ -52,7 +52,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 6, "y": 0 diff --git a/res/field/events/events_0012.json b/res/field/events/events_0012.json index faf8161950..05ed4923e8 100644 --- a/res/field/events/events_0012.json +++ b/res/field/events/events_0012.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 2, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 3, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 1, + "movement_range_z": 1, "x": 11, "z": 15, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 16, "z": 6, "y": 0 @@ -52,7 +52,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 10, "z": 15, "y": 0 diff --git a/res/field/events/events_0013.json b/res/field/events/events_0013.json index cfad6d760f..668361f4c0 100644 --- a/res/field/events/events_0013.json +++ b/res/field/events/events_0013.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 6, "z": 13, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 14, "z": 5, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 18, "z": 15, "y": 0 diff --git a/res/field/events/events_0014.json b/res/field/events/events_0014.json index 2390ee49fc..ef67df7957 100644 --- a/res/field/events/events_0014.json +++ b/res/field/events/events_0014.json @@ -99,7 +99,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 5, "y": 0 @@ -113,7 +113,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 15, "z": 10, "y": 0 @@ -127,7 +127,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 10, - "movement_range_y": 0, + "movement_range_z": 0, "x": 18, "z": 10, "y": 0 diff --git a/res/field/events/events_0015.json b/res/field/events/events_0015.json index f52ee8aa95..7c06cf6458 100644 --- a/res/field/events/events_0015.json +++ b/res/field/events/events_0015.json @@ -35,7 +35,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 1, + "movement_range_z": 1, "x": 2, "z": 7, "y": 0 @@ -49,7 +49,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 6, "z": 7, "y": 0 @@ -63,7 +63,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 1, + "movement_range_z": 1, "x": 13, "z": 7, "y": 0 @@ -77,7 +77,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 1, + "movement_range_z": 1, "x": 8, "z": 6, "y": 0 diff --git a/res/field/events/events_0016.json b/res/field/events/events_0016.json index e67cb252bb..9c22e1039d 100644 --- a/res/field/events/events_0016.json +++ b/res/field/events/events_0016.json @@ -35,7 +35,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 2, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 9, "y": 0 @@ -49,7 +49,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 2, - "movement_range_y": 0, + "movement_range_z": 0, "x": 14, "z": 7, "y": 0 @@ -63,7 +63,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 6, "y": 0 diff --git a/res/field/events/events_0017.json b/res/field/events/events_0017.json index c917ff7090..1dac0e02b1 100644 --- a/res/field/events/events_0017.json +++ b/res/field/events/events_0017.json @@ -19,7 +19,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 1, "z": 6, "y": 0 diff --git a/res/field/events/events_0018.json b/res/field/events/events_0018.json index 543e1883ba..51ac8d22df 100644 --- a/res/field/events/events_0018.json +++ b/res/field/events/events_0018.json @@ -10,7 +10,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 9, "y": 1 @@ -24,7 +24,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 9, "y": 1 @@ -38,7 +38,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 11, "z": 7, "y": 0 diff --git a/res/field/events/events_0019.json b/res/field/events/events_0019.json index 59018c13f9..d43e6efcf8 100644 --- a/res/field/events/events_0019.json +++ b/res/field/events/events_0019.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 8, "z": 8, "y": 1 @@ -24,7 +24,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 13, "z": 9, "y": 1 @@ -38,7 +38,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 16, "z": 8, "y": 0 diff --git a/res/field/events/events_0020.json b/res/field/events/events_0020.json index 5c143abbf9..1d46d44b1a 100644 --- a/res/field/events/events_0020.json +++ b/res/field/events/events_0020.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 5, "y": 0 diff --git a/res/field/events/events_0023.json b/res/field/events/events_0023.json index 7c08a86c47..34abef7c0b 100644 --- a/res/field/events/events_0023.json +++ b/res/field/events/events_0023.json @@ -10,7 +10,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 15, "z": 8, "y": 1 @@ -24,7 +24,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 9, "z": 6, "y": 1 @@ -38,7 +38,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 10, "z": 6, "y": 1 @@ -52,7 +52,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 8, "z": 6, "y": 1 diff --git a/res/field/events/events_0024.json b/res/field/events/events_0024.json index 0fcf74f6d6..e5725ab4d0 100644 --- a/res/field/events/events_0024.json +++ b/res/field/events/events_0024.json @@ -10,7 +10,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 11, "z": 11, "y": 1 @@ -24,7 +24,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 8, "z": 8, "y": 1 diff --git a/res/field/events/events_0025.json b/res/field/events/events_0025.json index f53bca495b..f69201220c 100644 --- a/res/field/events/events_0025.json +++ b/res/field/events/events_0025.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 6, "z": 12, "y": 1 @@ -24,7 +24,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 8, "z": 12, "y": 1 diff --git a/res/field/events/events_0026.json b/res/field/events/events_0026.json index 080844022b..7957b730b5 100644 --- a/res/field/events/events_0026.json +++ b/res/field/events/events_0026.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 6, "y": 0 diff --git a/res/field/events/events_0027.json b/res/field/events/events_0027.json index 0fcb35425f..d89302bdcd 100644 --- a/res/field/events/events_0027.json +++ b/res/field/events/events_0027.json @@ -99,7 +99,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 3, "y": 0 @@ -113,7 +113,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 9, "y": 0 @@ -127,7 +127,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 1, + "movement_range_z": 1, "x": 6, "z": 7, "y": 0 @@ -141,7 +141,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 2, - "movement_range_y": 2, + "movement_range_z": 2, "x": 3, "z": 13, "y": 0 @@ -155,7 +155,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 1, + "movement_range_z": 1, "x": 24, "z": 7, "y": 0 @@ -169,7 +169,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 6, "z": 12, "y": 0 @@ -183,7 +183,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 1, + "movement_range_z": 1, "x": 12, "z": 7, "y": 0 @@ -197,7 +197,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 9, "z": 15, "y": 0 @@ -211,7 +211,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 9, "z": 16, "y": 0 @@ -225,7 +225,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 25, "z": 12, "y": 0 @@ -239,7 +239,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 16, "z": 16, "y": 0 @@ -253,7 +253,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 13, "z": 3, "y": 0 @@ -267,7 +267,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 12, "z": 13, "y": 0 @@ -281,7 +281,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 15, "z": 10, "y": 0 diff --git a/res/field/events/events_0028.json b/res/field/events/events_0028.json index 198b0f671d..9d9cbb75a3 100644 --- a/res/field/events/events_0028.json +++ b/res/field/events/events_0028.json @@ -27,7 +27,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 4, "y": 0 @@ -41,7 +41,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 6, "z": 3, "y": 0 @@ -55,7 +55,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 14, "z": 9, "y": 0 @@ -69,7 +69,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 2, "z": 8, "y": 0 @@ -83,7 +83,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 8, "y": 0 @@ -97,7 +97,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 9, "y": 0 @@ -111,7 +111,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 12, "z": 4, "y": 0 @@ -125,7 +125,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 14, "z": 4, "y": 0 @@ -139,7 +139,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 1, "z": 4, "y": 0 diff --git a/res/field/events/events_0029.json b/res/field/events/events_0029.json index f3d085cf6e..c6de5d4a8c 100644 --- a/res/field/events/events_0029.json +++ b/res/field/events/events_0029.json @@ -10,7 +10,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 6, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 9, "z": 6, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 16, "z": 9, "y": 0 diff --git a/res/field/events/events_0032.json b/res/field/events/events_0032.json index 9b2ac22434..3ed5656d3f 100644 --- a/res/field/events/events_0032.json +++ b/res/field/events/events_0032.json @@ -27,7 +27,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 58, "z": 749, "y": 1 @@ -41,7 +41,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 52, "z": 717, "y": 1 @@ -55,7 +55,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 2, - "movement_range_y": 1, + "movement_range_z": 1, "x": 59, "z": 728, "y": 1 @@ -69,7 +69,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 1, + "movement_range_z": 1, "x": 33, "z": 730, "y": 1 @@ -83,7 +83,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 35, "z": 722, "y": 0 @@ -97,7 +97,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 36, "z": 732, "y": 0 @@ -111,7 +111,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 41, "z": 752, "y": 0 @@ -127,7 +127,7 @@ 9 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 54, "z": 754, "y": 0 @@ -141,7 +141,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 37, "z": 748, "y": 0 @@ -155,7 +155,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 52, "z": 718, "y": 1 @@ -169,7 +169,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 41, "z": 735, "y": 1 @@ -183,7 +183,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 37, "z": 723, "y": 1 @@ -197,7 +197,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 39, "z": 720, "y": 1 @@ -211,7 +211,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 38, "z": 720, "y": 1 @@ -225,7 +225,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 43, "z": 725, "y": 1 @@ -239,7 +239,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 34, "z": 762, "y": 0 @@ -253,7 +253,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 45, "z": 750, "y": 1 @@ -267,7 +267,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 56, "z": 714, "y": 0 @@ -281,7 +281,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 37, "z": 719, "y": 1 diff --git a/res/field/events/events_0033.json b/res/field/events/events_0033.json index e3bfc52ad6..7a7717dd2b 100644 --- a/res/field/events/events_0033.json +++ b/res/field/events/events_0033.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 2, "z": 8, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 2, + "movement_range_z": 2, "x": 6, "z": 6, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 5, "y": 0 @@ -52,7 +52,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 7, "y": 0 @@ -66,7 +66,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 2, "z": 5, "y": 0 diff --git a/res/field/events/events_0034.json b/res/field/events/events_0034.json index 846d9170da..1cc3daa05c 100644 --- a/res/field/events/events_0034.json +++ b/res/field/events/events_0034.json @@ -29,7 +29,7 @@ 1 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 24, "z": 3, "y": 20 @@ -43,7 +43,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 15, "z": 25, "y": 0 @@ -59,7 +59,7 @@ 2 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 14, "z": 3, "y": 10 @@ -75,7 +75,7 @@ 4 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 22, "z": 16, "y": 0 @@ -89,7 +89,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 16, "z": 3, "y": 30 @@ -105,7 +105,7 @@ 3 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 9, "z": 17, "y": 0 @@ -121,7 +121,7 @@ 2 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 27, "z": 25, "y": 0 @@ -137,7 +137,7 @@ 1 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 3, "y": 20 @@ -153,7 +153,7 @@ 3 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 27, "z": 5, "y": 10 diff --git a/res/field/events/events_0035.json b/res/field/events/events_0035.json index 351d3e4333..430bf95cf9 100644 --- a/res/field/events/events_0035.json +++ b/res/field/events/events_0035.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 1, + "movement_range_z": 1, "x": 11, "z": 9, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 4, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 2, "z": 6, "y": 0 @@ -52,7 +52,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 6, "z": 6, "y": 0 @@ -66,7 +66,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 6, "y": 0 @@ -80,7 +80,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 14, "z": 5, "y": 0 @@ -94,7 +94,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 15, "z": 5, "y": 0 diff --git a/res/field/events/events_0036.json b/res/field/events/events_0036.json index 58ed5f96b7..2a2f1d3f31 100644 --- a/res/field/events/events_0036.json +++ b/res/field/events/events_0036.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 4, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 12, "z": 4, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 4, "y": 0 diff --git a/res/field/events/events_0037.json b/res/field/events/events_0037.json index 360acdbd2c..1cfe8d36e4 100644 --- a/res/field/events/events_0037.json +++ b/res/field/events/events_0037.json @@ -179,7 +179,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 1, + "movement_range_z": 1, "x": 14, "z": 9, "y": 0 @@ -193,7 +193,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 2, "z": 5, "y": 0 @@ -207,7 +207,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 1, + "movement_range_z": 1, "x": 16, "z": 5, "y": 0 diff --git a/res/field/events/events_0038.json b/res/field/events/events_0038.json index 211fa673af..2fed84b527 100644 --- a/res/field/events/events_0038.json +++ b/res/field/events/events_0038.json @@ -291,7 +291,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 11, "z": 10, "y": 0 @@ -305,7 +305,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 2, "z": 5, "y": 0 diff --git a/res/field/events/events_0039.json b/res/field/events/events_0039.json index 8f6e5ceef1..944407d8f6 100644 --- a/res/field/events/events_0039.json +++ b/res/field/events/events_0039.json @@ -187,7 +187,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 15, "z": 5, "y": 0 @@ -201,7 +201,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 3, "z": 7, "y": 0 @@ -215,7 +215,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 8, "z": 10, "y": 0 @@ -229,7 +229,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 7, "z": 10, "y": 0 @@ -243,7 +243,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 2, "z": 3, "y": 0 diff --git a/res/field/events/events_0040.json b/res/field/events/events_0040.json index 0da13a2fc7..c890abb981 100644 --- a/res/field/events/events_0040.json +++ b/res/field/events/events_0040.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 2, "z": 4, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 8, "z": 7, "y": 0 diff --git a/res/field/events/events_0041.json b/res/field/events/events_0041.json index bc98950d45..0a7e0abcf8 100644 --- a/res/field/events/events_0041.json +++ b/res/field/events/events_0041.json @@ -10,7 +10,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 2, "z": 6, "y": 0 diff --git a/res/field/events/events_0042.json b/res/field/events/events_0042.json index bf86140908..6f1df73ff5 100644 --- a/res/field/events/events_0042.json +++ b/res/field/events/events_0042.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 7, "y": 0 diff --git a/res/field/events/events_0043.json b/res/field/events/events_0043.json index 6724eb4d38..ded44ab6d8 100644 --- a/res/field/events/events_0043.json +++ b/res/field/events/events_0043.json @@ -10,7 +10,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 3, - "movement_range_y": 3, + "movement_range_z": 3, "x": 5, "z": 5, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 4, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 8, "y": 0 diff --git a/res/field/events/events_0044.json b/res/field/events/events_0044.json index 263eb15f20..719b624dd6 100644 --- a/res/field/events/events_0044.json +++ b/res/field/events/events_0044.json @@ -43,7 +43,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 303, "z": 762, "y": 3 @@ -57,7 +57,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 2, + "movement_range_z": 2, "x": 288, "z": 754, "y": 5 @@ -71,7 +71,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 1, + "movement_range_z": 1, "x": 301, "z": 774, "y": 3 @@ -85,7 +85,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 282, "z": 757, "y": 3 @@ -99,7 +99,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 266, "z": 752, "y": 3 @@ -115,7 +115,7 @@ 10 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 260, "z": 747, "y": 0 @@ -129,7 +129,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 278, "z": 756, "y": 0 @@ -143,7 +143,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 301, "z": 748, "y": 0 @@ -157,7 +157,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 301, "z": 792, "y": 0 @@ -173,7 +173,7 @@ 10 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 300, "z": 737, "y": 0 @@ -187,7 +187,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 267, "z": 762, "y": 0 @@ -201,7 +201,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 265, "z": 762, "y": 0 @@ -215,7 +215,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 269, "z": 762, "y": 0 @@ -229,7 +229,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 316, "z": 789, "y": 0 @@ -243,7 +243,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 316, "z": 788, "y": 0 @@ -257,7 +257,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 267, "z": 761, "y": 3 @@ -271,7 +271,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 1, - "movement_range_y": 3, + "movement_range_z": 3, "x": 312, "z": 793, "y": 3 @@ -285,7 +285,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 3, - "movement_range_y": 0, + "movement_range_z": 0, "x": 292, "z": 755, "y": 5 @@ -299,7 +299,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 293, "z": 775, "y": 3 @@ -313,7 +313,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 3, + "movement_range_z": 3, "x": 306, "z": 777, "y": 3 @@ -327,7 +327,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 1, - "movement_range_y": 3, + "movement_range_z": 3, "x": 279, "z": 749, "y": 3 @@ -341,7 +341,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 2, + "movement_range_z": 2, "x": 292, "z": 759, "y": 5 @@ -355,7 +355,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 2, - "movement_range_y": 2, + "movement_range_z": 2, "x": 311, "z": 792, "y": 1 @@ -369,7 +369,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 295, "z": 774, "y": 0 @@ -383,7 +383,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 291, "z": 773, "y": 0 @@ -397,7 +397,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 2, - "movement_range_y": 2, + "movement_range_z": 2, "x": 312, "z": 782, "y": 1 @@ -411,7 +411,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 2, - "movement_range_y": 2, + "movement_range_z": 2, "x": 291, "z": 781, "y": 1 @@ -425,7 +425,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 307, "z": 757, "y": 0 diff --git a/res/field/events/events_0045.json b/res/field/events/events_0045.json index 8208c0d325..b8ba0ece74 100644 --- a/res/field/events/events_0045.json +++ b/res/field/events/events_0045.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 1, + "movement_range_z": 1, "x": 6, "z": 6, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 6, "z": 9, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 5, "y": 0 @@ -52,7 +52,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 2, "z": 5, "y": 0 @@ -66,7 +66,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 7, "y": 0 diff --git a/res/field/events/events_0046.json b/res/field/events/events_0046.json index 4bc02dabec..f97f308cb0 100644 --- a/res/field/events/events_0046.json +++ b/res/field/events/events_0046.json @@ -27,7 +27,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 3, "y": 0 @@ -41,7 +41,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 6, "z": 23, "y": 0 @@ -57,7 +57,7 @@ 3 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 18, "y": 0 @@ -73,7 +73,7 @@ 4 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 11, "y": 0 diff --git a/res/field/events/events_0047.json b/res/field/events/events_0047.json index 1eba49d852..60a56a919f 100644 --- a/res/field/events/events_0047.json +++ b/res/field/events/events_0047.json @@ -10,7 +10,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 9, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 3, "z": 6, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 11, "z": 8, "y": 0 @@ -52,7 +52,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 4, "y": 0 @@ -66,7 +66,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 12, "z": 12, "y": 0 @@ -80,7 +80,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 6, "z": 6, "y": 0 @@ -94,7 +94,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 6, "y": 0 @@ -108,7 +108,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 14, "z": 5, "y": 0 @@ -122,7 +122,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 15, "z": 5, "y": 0 diff --git a/res/field/events/events_0048.json b/res/field/events/events_0048.json index 0e34379589..b56d2827c6 100644 --- a/res/field/events/events_0048.json +++ b/res/field/events/events_0048.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 4, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 12, "z": 4, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 4, "y": 0 diff --git a/res/field/events/events_0049.json b/res/field/events/events_0049.json index 2c0fcf6500..dad9955cec 100644 --- a/res/field/events/events_0049.json +++ b/res/field/events/events_0049.json @@ -10,7 +10,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 14, "z": 8, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 5, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 10, "y": 0 diff --git a/res/field/events/events_0050.json b/res/field/events/events_0050.json index 975ec48085..65e94c784e 100644 --- a/res/field/events/events_0050.json +++ b/res/field/events/events_0050.json @@ -10,7 +10,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 10, "z": 8, "y": 1 @@ -24,7 +24,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 12, "z": 8, "y": 1 @@ -38,7 +38,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 5, "y": 1 @@ -52,7 +52,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 11, "z": 8, "y": 1 diff --git a/res/field/events/events_0051.json b/res/field/events/events_0051.json index 95f60311d9..06431a9e56 100644 --- a/res/field/events/events_0051.json +++ b/res/field/events/events_0051.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 4, "z": 11, "y": 1 @@ -24,7 +24,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 4, "z": 12, "y": 1 diff --git a/res/field/events/events_0052.json b/res/field/events/events_0052.json index e22d2f8f27..0bd00c9c72 100644 --- a/res/field/events/events_0052.json +++ b/res/field/events/events_0052.json @@ -10,7 +10,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 3, - "movement_range_y": 3, + "movement_range_z": 3, "x": 13, "z": 8, "y": 1 @@ -24,7 +24,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 3, - "movement_range_y": 3, + "movement_range_z": 3, "x": 13, "z": 10, "y": 1 @@ -38,7 +38,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 6, "z": 8, "y": 1 diff --git a/res/field/events/events_0053.json b/res/field/events/events_0053.json index 29084099c8..334b488489 100644 --- a/res/field/events/events_0053.json +++ b/res/field/events/events_0053.json @@ -10,7 +10,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 15, "z": 8, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 11, "z": 7, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 10, "y": 0 diff --git a/res/field/events/events_0054.json b/res/field/events/events_0054.json index 7a730a4504..e99ce4b9ad 100644 --- a/res/field/events/events_0054.json +++ b/res/field/events/events_0054.json @@ -10,7 +10,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 2, + "movement_range_z": 2, "x": 6, "z": 6, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 11, "z": 10, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 2, + "movement_range_z": 2, "x": 14, "z": 5, "y": 0 diff --git a/res/field/events/events_0055.json b/res/field/events/events_0055.json index 7e0d268b7b..31b7c2dfd1 100644 --- a/res/field/events/events_0055.json +++ b/res/field/events/events_0055.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 2, "z": 11, "y": 1 @@ -24,7 +24,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 13, "z": 11, "y": 1 @@ -38,7 +38,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 3, - "movement_range_y": 1, + "movement_range_z": 1, "x": 3, "z": 5, "y": 1 diff --git a/res/field/events/events_0056.json b/res/field/events/events_0056.json index b8038ae0d7..92d7dd711a 100644 --- a/res/field/events/events_0056.json +++ b/res/field/events/events_0056.json @@ -10,7 +10,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 10, "z": 11, "y": 0 diff --git a/res/field/events/events_0057.json b/res/field/events/events_0057.json index 5778f8d5c3..119e00bd9a 100644 --- a/res/field/events/events_0057.json +++ b/res/field/events/events_0057.json @@ -10,7 +10,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 8, "z": 6, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 2, "z": 4, "y": 0 diff --git a/res/field/events/events_0058.json b/res/field/events/events_0058.json index c8f89b880f..f7166c627f 100644 --- a/res/field/events/events_0058.json +++ b/res/field/events/events_0058.json @@ -267,7 +267,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 7, "y": 0 @@ -281,7 +281,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 9, "z": 7, "y": 0 @@ -295,7 +295,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 3, "y": 0 @@ -309,7 +309,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 6, "z": 3, "y": 0 @@ -323,7 +323,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 3, "y": 0 @@ -337,7 +337,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 7, "y": 0 @@ -351,7 +351,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 12, "y": 0 @@ -365,7 +365,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 16, "z": 15, "y": 0 diff --git a/res/field/events/events_0059.json b/res/field/events/events_0059.json index 437895edb5..e6446eeb5a 100644 --- a/res/field/events/events_0059.json +++ b/res/field/events/events_0059.json @@ -10,7 +10,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 6, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 5, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 6, "y": 0 diff --git a/res/field/events/events_0060.json b/res/field/events/events_0060.json index e9214227d6..bd0d131a78 100644 --- a/res/field/events/events_0060.json +++ b/res/field/events/events_0060.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 1, + "movement_range_z": 1, "x": 16, "z": 10, "y": 1 @@ -24,7 +24,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 14, "z": 7, "y": 1 @@ -38,7 +38,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 10, "z": 8, "y": 1 diff --git a/res/field/events/events_0061.json b/res/field/events/events_0061.json index 5361b20da6..8fef3b57ba 100644 --- a/res/field/events/events_0061.json +++ b/res/field/events/events_0061.json @@ -10,7 +10,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 8, "y": 1 @@ -24,7 +24,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 10, "z": 11, "y": 1 @@ -38,7 +38,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 16, "z": 5, "y": 1 diff --git a/res/field/events/events_0062.json b/res/field/events/events_0062.json index fe46162bbf..7c86ea37a9 100644 --- a/res/field/events/events_0062.json +++ b/res/field/events/events_0062.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 6, "z": 7, "y": 1 @@ -24,7 +24,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 15, "z": 4, "y": 1 diff --git a/res/field/events/events_0063.json b/res/field/events/events_0063.json index b08fe7a57b..e984a5183e 100644 --- a/res/field/events/events_0063.json +++ b/res/field/events/events_0063.json @@ -10,7 +10,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 2, + "movement_range_z": 2, "x": 5, "z": 5, "y": 0 diff --git a/res/field/events/events_0064.json b/res/field/events/events_0064.json index 053819c825..9b75630a57 100644 --- a/res/field/events/events_0064.json +++ b/res/field/events/events_0064.json @@ -51,7 +51,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 303, "z": 561, "y": 7 @@ -65,7 +65,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 300, "z": 550, "y": 7 @@ -79,7 +79,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 330, "z": 527, "y": 7 @@ -93,7 +93,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 331, "z": 539, "y": 7 @@ -107,7 +107,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 301, "z": 529, "y": 7 @@ -123,7 +123,7 @@ 1 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 308, "z": 562, "y": 0 @@ -139,7 +139,7 @@ 1 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 307, "z": 540, "y": 0 @@ -155,7 +155,7 @@ 11 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 293, "z": 530, "y": 0 @@ -171,7 +171,7 @@ 3 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 303, "z": 522, "y": 0 @@ -187,7 +187,7 @@ 11 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 344, "z": 530, "y": 0 @@ -201,7 +201,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 312, "z": 552, "y": 7 @@ -215,7 +215,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 1, + "movement_range_z": 1, "x": 308, "z": 552, "y": 7 @@ -229,7 +229,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 311, "z": 523, "y": 7 @@ -246,7 +246,7 @@ 1 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 281, "z": 532, "y": 0 @@ -260,7 +260,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 304, "z": 521, "y": 0 @@ -274,7 +274,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 305, "z": 521, "y": 0 @@ -288,7 +288,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 306, "z": 521, "y": 0 @@ -302,7 +302,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 313, "z": 515, "y": 0 @@ -316,7 +316,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 339, "z": 523, "y": 0 @@ -330,7 +330,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 319, "z": 538, "y": 0 @@ -344,7 +344,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 319, "z": 540, "y": 0 @@ -358,7 +358,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 327, "z": 516, "y": 0 @@ -372,7 +372,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 317, "z": 558, "y": 0 @@ -386,7 +386,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 315, "z": 535, "y": 7 @@ -400,7 +400,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 1, + "movement_range_z": 1, "x": 302, "z": 538, "y": 7 @@ -417,7 +417,7 @@ 2 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 353, "z": 531, "y": 0 @@ -433,7 +433,7 @@ 3 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 313, "z": 530, "y": 0 @@ -449,7 +449,7 @@ 3 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 313, "z": 549, "y": 0 @@ -463,7 +463,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 302, "z": 565, "y": 7 @@ -477,7 +477,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 339, "z": 524, "y": 0 @@ -491,7 +491,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 297, "z": 531, "y": 0 @@ -505,7 +505,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 312, "z": 563, "y": 7 @@ -519,7 +519,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 327, "z": 526, "y": 7 @@ -533,7 +533,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 299, "z": 531, "y": 7 diff --git a/res/field/events/events_0065.json b/res/field/events/events_0065.json index 7870baf347..78e49c66d2 100644 --- a/res/field/events/events_0065.json +++ b/res/field/events/events_0065.json @@ -10,7 +10,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 3, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 6, "z": 8, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 5, "y": 0 @@ -52,7 +52,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 2, "z": 5, "y": 0 @@ -66,7 +66,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 7, "y": 0 diff --git a/res/field/events/events_0066.json b/res/field/events/events_0066.json index 223d927f43..ba67c1ec0d 100644 --- a/res/field/events/events_0066.json +++ b/res/field/events/events_0066.json @@ -27,7 +27,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 9, "z": 25, "y": 0 @@ -41,7 +41,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 11, "z": 3, "y": 0 @@ -55,7 +55,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 14, "z": 22, "y": 0 @@ -69,7 +69,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 20, "z": 17, "y": 0 @@ -83,7 +83,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 2, "z": 7, "y": 0 diff --git a/res/field/events/events_0068.json b/res/field/events/events_0068.json index 3be81551f5..56a8ea7c6a 100644 --- a/res/field/events/events_0068.json +++ b/res/field/events/events_0068.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 8, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 2, + "movement_range_z": 2, "x": 14, "z": 6, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 8, "y": 0 @@ -52,7 +52,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 4, "y": 0 @@ -66,7 +66,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 1, + "movement_range_z": 1, "x": 10, "z": 9, "y": 0 @@ -80,7 +80,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 6, "z": 6, "y": 0 @@ -94,7 +94,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 6, "y": 0 diff --git a/res/field/events/events_0069.json b/res/field/events/events_0069.json index d6fe8ec2b3..90dab2a7df 100644 --- a/res/field/events/events_0069.json +++ b/res/field/events/events_0069.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 4, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 12, "z": 4, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 4, "y": 0 @@ -52,7 +52,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 10, "z": 10, "y": 0 diff --git a/res/field/events/events_0070.json b/res/field/events/events_0070.json index 811882b43d..87fd52c882 100644 --- a/res/field/events/events_0070.json +++ b/res/field/events/events_0070.json @@ -43,7 +43,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 5, "y": 0 @@ -57,7 +57,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 10, "y": 0 @@ -71,7 +71,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 2, "z": 10, "y": 0 diff --git a/res/field/events/events_0071.json b/res/field/events/events_0071.json index 6a58870cdf..5274e3be4d 100644 --- a/res/field/events/events_0071.json +++ b/res/field/events/events_0071.json @@ -19,7 +19,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 3, "z": 11, "y": 0 @@ -33,7 +33,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 10, "z": 11, "y": 0 @@ -49,7 +49,7 @@ 3 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 16, "z": 8, "y": 0 @@ -65,7 +65,7 @@ 3 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 12, "z": 8, "y": 0 @@ -79,7 +79,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 14, "z": 15, "y": 0 @@ -93,7 +93,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 14, "z": 15, "y": 0 @@ -107,7 +107,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 1, "z": 5, "y": 0 diff --git a/res/field/events/events_0072.json b/res/field/events/events_0072.json index 1d1b393bf6..4a90929929 100644 --- a/res/field/events/events_0072.json +++ b/res/field/events/events_0072.json @@ -19,7 +19,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 6, "y": 0 @@ -33,7 +33,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 19, "z": 8, "y": 0 @@ -47,7 +47,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 13, "z": 8, "y": 0 @@ -61,7 +61,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 6, "y": 0 @@ -75,7 +75,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 12, "y": 0 diff --git a/res/field/events/events_0073.json b/res/field/events/events_0073.json index e3407fac7c..0c3d274b50 100644 --- a/res/field/events/events_0073.json +++ b/res/field/events/events_0073.json @@ -19,7 +19,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 12, "z": 5, "y": 0 @@ -35,7 +35,7 @@ 3 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 7, "y": 0 @@ -51,7 +51,7 @@ 3 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 18, "z": 5, "y": 0 @@ -65,7 +65,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 10, "z": 8, "y": 0 diff --git a/res/field/events/events_0074.json b/res/field/events/events_0074.json index 2c1e173e25..ee14342dcb 100644 --- a/res/field/events/events_0074.json +++ b/res/field/events/events_0074.json @@ -19,7 +19,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 14, "z": 6, "y": 0 @@ -33,7 +33,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 13, "z": 5, "y": 0 @@ -47,7 +47,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 14, "z": 9, "y": 0 @@ -61,7 +61,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 15, "z": 5, "y": 0 @@ -75,7 +75,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 9, "z": 6, "y": 0 @@ -89,7 +89,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 6, "y": 0 @@ -103,7 +103,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 21, "z": 5, "y": 0 diff --git a/res/field/events/events_0075.json b/res/field/events/events_0075.json index db02dd2f9b..e864391022 100644 --- a/res/field/events/events_0075.json +++ b/res/field/events/events_0075.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 5, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 15, "z": 8, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 10, "y": 0 diff --git a/res/field/events/events_0076.json b/res/field/events/events_0076.json index 907502545d..467fb0637d 100644 --- a/res/field/events/events_0076.json +++ b/res/field/events/events_0076.json @@ -10,7 +10,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 17, "z": 11, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 6, "z": 4, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 6, "z": 11, "y": 0 diff --git a/res/field/events/events_0077.json b/res/field/events/events_0077.json index 7b0c23ac0d..588872a2a2 100644 --- a/res/field/events/events_0077.json +++ b/res/field/events/events_0077.json @@ -10,7 +10,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 5, "z": 9, "y": 1 @@ -24,7 +24,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 3, - "movement_range_y": 3, + "movement_range_z": 3, "x": 16, "z": 7, "y": 1 @@ -38,7 +38,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 10, "z": 7, "y": 1 @@ -52,7 +52,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 3, - "movement_range_y": 3, + "movement_range_z": 3, "x": 13, "z": 10, "y": 1 diff --git a/res/field/events/events_0078.json b/res/field/events/events_0078.json index 9a35ce137e..25823b825e 100644 --- a/res/field/events/events_0078.json +++ b/res/field/events/events_0078.json @@ -10,7 +10,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 18, "z": 8, "y": 0 diff --git a/res/field/events/events_0079.json b/res/field/events/events_0079.json index f4f91c0650..6c61469d91 100644 --- a/res/field/events/events_0079.json +++ b/res/field/events/events_0079.json @@ -10,7 +10,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 10, "z": 7, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 7, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 6, "z": 4, "y": 0 diff --git a/res/field/events/events_0080.json b/res/field/events/events_0080.json index 25c529b261..be4c7d2959 100644 --- a/res/field/events/events_0080.json +++ b/res/field/events/events_0080.json @@ -10,7 +10,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 1, + "movement_range_z": 1, "x": 6, "z": 6, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 4, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 4, "y": 0 diff --git a/res/field/events/events_0081.json b/res/field/events/events_0081.json index c39f992448..4b8d3b0486 100644 --- a/res/field/events/events_0081.json +++ b/res/field/events/events_0081.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 5, "y": 0 diff --git a/res/field/events/events_0082.json b/res/field/events/events_0082.json index e2b20d5643..24748a9f31 100644 --- a/res/field/events/events_0082.json +++ b/res/field/events/events_0082.json @@ -10,7 +10,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 5, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 5, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 7, "y": 0 diff --git a/res/field/events/events_0083.json b/res/field/events/events_0083.json index f14f852959..e06cb6007b 100644 --- a/res/field/events/events_0083.json +++ b/res/field/events/events_0083.json @@ -27,7 +27,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 7, "y": 0 @@ -41,7 +41,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 5, "y": 0 @@ -55,7 +55,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 6, "z": 5, "y": 0 @@ -69,7 +69,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 9, "z": 6, "y": 0 diff --git a/res/field/events/events_0085.json b/res/field/events/events_0085.json index edd15e0e25..d990bab80c 100644 --- a/res/field/events/events_0085.json +++ b/res/field/events/events_0085.json @@ -19,7 +19,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 487, "z": 714, "y": 7 @@ -33,7 +33,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 2, + "movement_range_z": 2, "x": 477, "z": 723, "y": 7 @@ -47,7 +47,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 499, "z": 710, "y": 7 @@ -61,7 +61,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 2, - "movement_range_y": 0, + "movement_range_z": 0, "x": 500, "z": 710, "y": 7 @@ -75,7 +75,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 2, + "movement_range_z": 2, "x": 491, "z": 694, "y": 7 @@ -89,7 +89,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 2, - "movement_range_y": 0, + "movement_range_z": 0, "x": 491, "z": 704, "y": 7 @@ -103,7 +103,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 2, - "movement_range_y": 0, + "movement_range_z": 0, "x": 470, "z": 705, "y": 7 @@ -117,7 +117,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 2, - "movement_range_y": 1, + "movement_range_z": 1, "x": 476, "z": 704, "y": 7 @@ -131,7 +131,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 2, - "movement_range_y": 0, + "movement_range_z": 0, "x": 463, "z": 714, "y": 7 @@ -145,7 +145,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 2, - "movement_range_y": 0, + "movement_range_z": 0, "x": 458, "z": 694, "y": 7 @@ -159,7 +159,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 2, - "movement_range_y": 0, + "movement_range_z": 0, "x": 458, "z": 695, "y": 7 @@ -175,7 +175,7 @@ 16 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 461, "z": 724, "y": 0 @@ -191,7 +191,7 @@ 10 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 498, "z": 725, "y": 0 @@ -205,7 +205,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 461, "z": 687, "y": 0 @@ -219,7 +219,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 476, "z": 693, "y": 0 @@ -233,7 +233,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 498, "z": 687, "y": 0 @@ -247,7 +247,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 486, "z": 710, "y": 0 @@ -261,7 +261,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 495, "z": 697, "y": 0 @@ -277,7 +277,7 @@ 12 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 481, "z": 723, "y": 0 @@ -291,7 +291,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 2, - "movement_range_y": 0, + "movement_range_z": 0, "x": 505, "z": 726, "y": 7 @@ -305,7 +305,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 2, - "movement_range_y": 0, + "movement_range_z": 0, "x": 505, "z": 727, "y": 7 @@ -319,7 +319,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 2, - "movement_range_y": 0, + "movement_range_z": 0, "x": 501, "z": 725, "y": 7 @@ -333,7 +333,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 472, "z": 687, "y": 0 @@ -347,7 +347,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 473, "z": 687, "y": 0 @@ -361,7 +361,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 485, "z": 687, "y": 0 @@ -375,7 +375,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 486, "z": 687, "y": 0 @@ -389,7 +389,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 463, "z": 701, "y": 0 @@ -403,7 +403,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 2, + "movement_range_z": 2, "x": 472, "z": 689, "y": 0 @@ -417,7 +417,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 2, - "movement_range_y": 0, + "movement_range_z": 0, "x": 473, "z": 715, "y": 7 @@ -431,7 +431,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 2, - "movement_range_y": 0, + "movement_range_z": 0, "x": 474, "z": 715, "y": 7 @@ -445,7 +445,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 470, "z": 711, "y": 0 @@ -459,7 +459,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 2, - "movement_range_y": 0, + "movement_range_z": 0, "x": 470, "z": 725, "y": 7 @@ -473,7 +473,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 2, - "movement_range_y": 0, + "movement_range_z": 0, "x": 470, "z": 725, "y": 7 @@ -487,7 +487,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 499, "z": 698, "y": 0 @@ -501,7 +501,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 2, - "movement_range_y": 0, + "movement_range_z": 0, "x": 483, "z": 708, "y": 7 @@ -515,7 +515,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 502, "z": 699, "y": 0 diff --git a/res/field/events/events_0086.json b/res/field/events/events_0086.json index dd22129841..ea2bdd29f6 100644 --- a/res/field/events/events_0086.json +++ b/res/field/events/events_0086.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 5, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 5, "z": 8, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 3, "y": 0 @@ -52,7 +52,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 2, "z": 5, "y": 0 @@ -66,7 +66,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 7, "y": 0 diff --git a/res/field/events/events_0087.json b/res/field/events/events_0087.json index def70a3cc8..8d424a4a0a 100644 --- a/res/field/events/events_0087.json +++ b/res/field/events/events_0087.json @@ -27,7 +27,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 6, "y": 0 diff --git a/res/field/events/events_0088.json b/res/field/events/events_0088.json index aa338c03ef..e014c6fc45 100644 --- a/res/field/events/events_0088.json +++ b/res/field/events/events_0088.json @@ -12,7 +12,7 @@ 2 ], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 12, "z": 7, "y": 0 @@ -28,7 +28,7 @@ 2 ], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 4, "z": 7, "y": 0 diff --git a/res/field/events/events_0089.json b/res/field/events/events_0089.json index 741a3b8f97..a64a61d01e 100644 --- a/res/field/events/events_0089.json +++ b/res/field/events/events_0089.json @@ -12,7 +12,7 @@ 2 ], "movement_range_x": 2, - "movement_range_y": 2, + "movement_range_z": 2, "x": 4, "z": 15, "y": 0 @@ -28,7 +28,7 @@ 2 ], "movement_range_x": 3, - "movement_range_y": 0, + "movement_range_z": 0, "x": 18, "z": 7, "y": 0 @@ -44,7 +44,7 @@ 2 ], "movement_range_x": 3, - "movement_range_y": 3, + "movement_range_z": 3, "x": 21, "z": 17, "y": 0 @@ -60,7 +60,7 @@ 2 ], "movement_range_x": 0, - "movement_range_y": 3, + "movement_range_z": 3, "x": 11, "z": 9, "y": 0 diff --git a/res/field/events/events_0090.json b/res/field/events/events_0090.json index 639d5737ca..0386ffcdd4 100644 --- a/res/field/events/events_0090.json +++ b/res/field/events/events_0090.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 10, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 10, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 9, "y": 0 diff --git a/res/field/events/events_0091.json b/res/field/events/events_0091.json index 0d15720dab..f8d2cc2f6e 100644 --- a/res/field/events/events_0091.json +++ b/res/field/events/events_0091.json @@ -12,7 +12,7 @@ 4 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 6, "y": 0 diff --git a/res/field/events/events_0093.json b/res/field/events/events_0093.json index adfba51eda..2ab2b23cf8 100644 --- a/res/field/events/events_0093.json +++ b/res/field/events/events_0093.json @@ -12,7 +12,7 @@ 4 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 6, "y": 0 diff --git a/res/field/events/events_0095.json b/res/field/events/events_0095.json index 7a6bac3c14..6919ec08d6 100644 --- a/res/field/events/events_0095.json +++ b/res/field/events/events_0095.json @@ -12,7 +12,7 @@ 4 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 6, "y": 0 diff --git a/res/field/events/events_0096.json b/res/field/events/events_0096.json index aa2df18d50..940174890c 100644 --- a/res/field/events/events_0096.json +++ b/res/field/events/events_0096.json @@ -12,7 +12,7 @@ 4 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 6, "y": 0 diff --git a/res/field/events/events_0097.json b/res/field/events/events_0097.json index 785915c106..89a59e75b4 100644 --- a/res/field/events/events_0097.json +++ b/res/field/events/events_0097.json @@ -12,7 +12,7 @@ 4 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 6, "y": 0 diff --git a/res/field/events/events_0098.json b/res/field/events/events_0098.json index c455d5d767..64e23812c8 100644 --- a/res/field/events/events_0098.json +++ b/res/field/events/events_0098.json @@ -12,7 +12,7 @@ 4 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 6, "y": 0 diff --git a/res/field/events/events_0099.json b/res/field/events/events_0099.json index 2f13d75379..2c54afb0cc 100644 --- a/res/field/events/events_0099.json +++ b/res/field/events/events_0099.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 9, "z": 5, "y": 0 diff --git a/res/field/events/events_0100.json b/res/field/events/events_0100.json index 6137d480d6..d0b94b9379 100644 --- a/res/field/events/events_0100.json +++ b/res/field/events/events_0100.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 4, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 1, + "movement_range_z": 1, "x": 10, "z": 8, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 9, "y": 0 @@ -52,7 +52,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 2, "z": 7, "y": 0 @@ -66,7 +66,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 6, "z": 6, "y": 0 @@ -80,7 +80,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 6, "y": 0 diff --git a/res/field/events/events_0101.json b/res/field/events/events_0101.json index 7414b7d681..36ebddea76 100644 --- a/res/field/events/events_0101.json +++ b/res/field/events/events_0101.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 4, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 12, "z": 4, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 4, "y": 0 diff --git a/res/field/events/events_0102.json b/res/field/events/events_0102.json index b5fc85df11..1df9a3c1e9 100644 --- a/res/field/events/events_0102.json +++ b/res/field/events/events_0102.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 2, + "movement_range_z": 2, "x": 12, "z": 9, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 10, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 20, "z": 7, "y": 0 @@ -52,7 +52,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 19, "z": 7, "y": 0 diff --git a/res/field/events/events_0103.json b/res/field/events/events_0103.json index e337ff544a..dfb986e6d1 100644 --- a/res/field/events/events_0103.json +++ b/res/field/events/events_0103.json @@ -10,7 +10,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 11, "z": 8, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 10, "z": 7, "y": 0 diff --git a/res/field/events/events_0105.json b/res/field/events/events_0105.json index 46432a1efe..c222c3e95c 100644 --- a/res/field/events/events_0105.json +++ b/res/field/events/events_0105.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 6, "z": 7, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 2, "z": 4, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 1, + "movement_range_z": 1, "x": 9, "z": 5, "y": 0 @@ -52,7 +52,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 7, "z": 13, "y": 0 @@ -66,7 +66,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 3, "z": 11, "y": 0 @@ -80,7 +80,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 17, "y": 0 diff --git a/res/field/events/events_0106.json b/res/field/events/events_0106.json index 0a5efcafd5..1370cca632 100644 --- a/res/field/events/events_0106.json +++ b/res/field/events/events_0106.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 6, "z": 3, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 6, "z": 8, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 6, "z": 7, "y": 0 @@ -52,7 +52,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 12, "y": 0 diff --git a/res/field/events/events_0107.json b/res/field/events/events_0107.json index 33b06b39db..25bf0a9818 100644 --- a/res/field/events/events_0107.json +++ b/res/field/events/events_0107.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 6, "z": 3, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 3, + "movement_range_z": 3, "x": 6, "z": 7, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 12, "y": 0 diff --git a/res/field/events/events_0108.json b/res/field/events/events_0108.json index 2e9320f5b5..d481ef5876 100644 --- a/res/field/events/events_0108.json +++ b/res/field/events/events_0108.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 2, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 9, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 6, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 6, "y": 0 diff --git a/res/field/events/events_0109.json b/res/field/events/events_0109.json index a692073f9b..8634eb120a 100644 --- a/res/field/events/events_0109.json +++ b/res/field/events/events_0109.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 9, "z": 4, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 7, "y": 0 diff --git a/res/field/events/events_0110.json b/res/field/events/events_0110.json index d42344bbb7..7fefd75f08 100644 --- a/res/field/events/events_0110.json +++ b/res/field/events/events_0110.json @@ -10,7 +10,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 1, + "movement_range_z": 1, "x": 4, "z": 4, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 1, + "movement_range_z": 1, "x": 6, "z": 7, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 1, - "movement_range_y": 2, + "movement_range_z": 2, "x": 5, "z": 12, "y": 0 @@ -52,7 +52,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 1, - "movement_range_y": 2, + "movement_range_z": 2, "x": 4, "z": 12, "y": 0 diff --git a/res/field/events/events_0111.json b/res/field/events/events_0111.json index cc55b59101..53184dfb6c 100644 --- a/res/field/events/events_0111.json +++ b/res/field/events/events_0111.json @@ -10,7 +10,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 6, "z": 10, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 10, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 11, "y": 0 @@ -52,7 +52,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 2, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 8, "y": 0 @@ -66,7 +66,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 12, "z": 9, "y": 0 @@ -80,7 +80,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 1, + "movement_range_z": 1, "x": 2, "z": 10, "y": 0 @@ -94,7 +94,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 1, - "movement_range_y": 2, + "movement_range_z": 2, "x": 15, "z": 10, "y": 0 @@ -108,7 +108,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 2, "z": 3, "y": 0 diff --git a/res/field/events/events_0112.json b/res/field/events/events_0112.json index 5e825d503a..432f7d0998 100644 --- a/res/field/events/events_0112.json +++ b/res/field/events/events_0112.json @@ -10,7 +10,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 8, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 12, "z": 4, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 3, - "movement_range_y": 0, + "movement_range_z": 0, "x": 11, "z": 8, "y": 0 @@ -52,7 +52,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 3, "z": 5, "y": 0 diff --git a/res/field/events/events_0114.json b/res/field/events/events_0114.json index 3ed16ad3f6..7a39c344ca 100644 --- a/res/field/events/events_0114.json +++ b/res/field/events/events_0114.json @@ -10,7 +10,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 5, "y": 0 diff --git a/res/field/events/events_0115.json b/res/field/events/events_0115.json index c4d26e79cb..7c2fab4aff 100644 --- a/res/field/events/events_0115.json +++ b/res/field/events/events_0115.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 2, - "movement_range_y": 1, + "movement_range_z": 1, "x": 6, "z": 5, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 11, "z": 8, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 11, "z": 9, "y": 0 @@ -52,7 +52,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 5, "z": 10, "y": 0 @@ -66,7 +66,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 10, "z": 13, "y": 0 @@ -80,7 +80,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 8, "y": 0 diff --git a/res/field/events/events_0116.json b/res/field/events/events_0116.json index 68eee43cbb..0519430038 100644 --- a/res/field/events/events_0116.json +++ b/res/field/events/events_0116.json @@ -59,7 +59,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 16, "z": 4, "y": 0 @@ -73,7 +73,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 4, "y": 0 @@ -87,7 +87,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 27, "z": 4, "y": 0 @@ -101,7 +101,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 28, "z": 9, "y": 0 @@ -115,7 +115,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 25, "z": 10, "y": 0 @@ -129,7 +129,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 16, "z": 10, "y": 0 @@ -143,7 +143,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 17, "z": 10, "y": 0 @@ -157,7 +157,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 18, "z": 13, "y": 0 @@ -171,7 +171,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 2, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 13, "y": 0 @@ -185,7 +185,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 2, + "movement_range_z": 2, "x": 16, "z": 6, "y": 0 @@ -199,7 +199,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 22, "z": 9, "y": 0 diff --git a/res/field/events/events_0117.json b/res/field/events/events_0117.json index b90a75d2b6..29a58918e2 100644 --- a/res/field/events/events_0117.json +++ b/res/field/events/events_0117.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 29, "z": 5, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 26, "z": 4, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 28, "z": 4, "y": 0 @@ -52,7 +52,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 30, "z": 4, "y": 0 @@ -66,7 +66,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 32, "z": 4, "y": 0 @@ -80,7 +80,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 30, "z": 5, "y": 0 @@ -94,7 +94,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 29, "z": 13, "y": 0 @@ -108,7 +108,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 29, "z": 14, "y": 0 @@ -122,7 +122,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 28, "z": 13, "y": 0 @@ -136,7 +136,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 31, "z": 13, "y": 0 @@ -150,7 +150,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 27, "z": 13, "y": 0 @@ -164,7 +164,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 32, "z": 13, "y": 0 @@ -178,7 +178,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 35, "z": 11, "y": 0 @@ -192,7 +192,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 33, "z": 13, "y": 0 @@ -206,7 +206,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 25, "z": 13, "y": 0 @@ -220,7 +220,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 34, "z": 13, "y": 0 @@ -234,7 +234,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 23, "z": 11, "y": 0 @@ -248,7 +248,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 35, "z": 12, "y": 0 @@ -262,7 +262,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 26, "z": 13, "y": 0 @@ -276,7 +276,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 23, "z": 12, "y": 0 @@ -290,7 +290,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 30, "z": 13, "y": 0 @@ -304,7 +304,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 24, "z": 14, "y": 0 @@ -318,7 +318,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 34, "z": 14, "y": 0 @@ -332,7 +332,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 30, "z": 14, "y": 0 @@ -346,7 +346,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 36, "z": 11, "y": 0 @@ -360,7 +360,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 26, "z": 14, "y": 0 @@ -374,7 +374,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 28, "z": 14, "y": 0 @@ -388,7 +388,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 22, "z": 11, "y": 0 @@ -402,7 +402,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 24, "z": 13, "y": 0 @@ -416,7 +416,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 32, "z": 14, "y": 0 @@ -430,7 +430,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 35, "z": 13, "y": 0 diff --git a/res/field/events/events_0118.json b/res/field/events/events_0118.json index f49feb8005..8c60916062 100644 --- a/res/field/events/events_0118.json +++ b/res/field/events/events_0118.json @@ -10,7 +10,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 9, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 13, "z": 9, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 1, + "movement_range_z": 1, "x": 2, "z": 14, "y": 0 @@ -52,7 +52,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 12, "y": 0 @@ -66,7 +66,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 6, "z": 15, "y": 0 @@ -80,7 +80,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 11, "z": 18, "y": 0 @@ -94,7 +94,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 8, "y": 0 @@ -108,7 +108,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 2, "z": 19, "y": 0 @@ -122,7 +122,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 15, "z": 10, "y": 0 diff --git a/res/field/events/events_0119.json b/res/field/events/events_0119.json index 392cb52deb..b5f0930a87 100644 --- a/res/field/events/events_0119.json +++ b/res/field/events/events_0119.json @@ -19,7 +19,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 592, "z": 819, "y": 0 @@ -33,7 +33,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 592, "z": 816, "y": 0 @@ -47,7 +47,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 603, "z": 824, "y": 0 @@ -61,7 +61,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 603, "z": 822, "y": 0 @@ -77,7 +77,7 @@ 13 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 604, "z": 828, "y": 0 @@ -91,7 +91,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 593, "z": 827, "y": 0 @@ -105,7 +105,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 613, "z": 810, "y": 0 @@ -119,7 +119,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 625, "z": 829, "y": 0 @@ -133,7 +133,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 609, "z": 841, "y": 0 @@ -147,7 +147,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 2, - "movement_range_y": 2, + "movement_range_z": 2, "x": 607, "z": 818, "y": 0 @@ -161,7 +161,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 2, - "movement_range_y": 0, + "movement_range_z": 0, "x": 599, "z": 828, "y": 0 @@ -175,7 +175,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 597, "z": 840, "y": 0 @@ -189,7 +189,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 596, "z": 840, "y": 0 @@ -205,7 +205,7 @@ 58 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 608, "z": 828, "y": 0 @@ -221,7 +221,7 @@ 59 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 611, "z": 828, "y": 0 @@ -237,7 +237,7 @@ 60 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 609, "z": 828, "y": 0 @@ -253,7 +253,7 @@ 61 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 610, "z": 828, "y": 0 @@ -267,7 +267,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 613, "z": 836, "y": 0 @@ -281,7 +281,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 595, "z": 847, "y": 0 @@ -295,7 +295,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 3, + "movement_range_z": 3, "x": 623, "z": 814, "y": 0 @@ -312,7 +312,7 @@ 1 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 570, "z": 845, "y": 0 @@ -326,7 +326,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 2, - "movement_range_y": 2, + "movement_range_z": 2, "x": 614, "z": 810, "y": 0 @@ -341,7 +341,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 570, "z": 852, "y": 0 @@ -355,7 +355,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 2, - "movement_range_y": 2, + "movement_range_z": 2, "x": 614, "z": 818, "y": 0 @@ -369,7 +369,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 2, - "movement_range_y": 0, + "movement_range_z": 0, "x": 607, "z": 833, "y": 0 @@ -383,7 +383,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 2, - "movement_range_y": 0, + "movement_range_z": 0, "x": 609, "z": 844, "y": 0 @@ -397,7 +397,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 2, - "movement_range_y": 0, + "movement_range_z": 0, "x": 589, "z": 828, "y": 0 @@ -411,7 +411,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 2, - "movement_range_y": 0, + "movement_range_z": 0, "x": 589, "z": 827, "y": 0 @@ -425,7 +425,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 2, - "movement_range_y": 2, + "movement_range_z": 2, "x": 611, "z": 821, "y": 0 diff --git a/res/field/events/events_0120.json b/res/field/events/events_0120.json index 9b9342f968..74b8f49a95 100644 --- a/res/field/events/events_0120.json +++ b/res/field/events/events_0120.json @@ -19,7 +19,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 5, "y": 0 @@ -33,7 +33,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 5, "z": 9, "y": 0 @@ -47,7 +47,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 8, "z": 7, "y": 0 @@ -61,7 +61,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 2, "z": 5, "y": 0 @@ -75,7 +75,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 7, "y": 0 diff --git a/res/field/events/events_0121.json b/res/field/events/events_0121.json index cfe4ec9e25..6770bf47e8 100644 --- a/res/field/events/events_0121.json +++ b/res/field/events/events_0121.json @@ -27,7 +27,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 13, "z": 4, "y": 0 @@ -41,7 +41,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 15, "z": 40, "y": 0 @@ -57,7 +57,7 @@ 2 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 11, "z": 33, "y": 0 @@ -73,7 +73,7 @@ 2 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 22, "y": 0 @@ -89,7 +89,7 @@ 2 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 21, "z": 33, "y": 0 @@ -105,7 +105,7 @@ 2 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 8, "y": 0 @@ -119,7 +119,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 19, "z": 18, "y": 0 @@ -133,7 +133,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 9, "z": 11, "y": 0 diff --git a/res/field/events/events_0122.json b/res/field/events/events_0122.json index 106c626327..fd31cde14f 100644 --- a/res/field/events/events_0122.json +++ b/res/field/events/events_0122.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 4, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 4, "z": 7, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 11, "z": 8, "y": 0 @@ -52,7 +52,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 6, "z": 6, "y": 0 @@ -66,7 +66,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 6, "y": 0 diff --git a/res/field/events/events_0123.json b/res/field/events/events_0123.json index ceefb1d59d..66d15ef318 100644 --- a/res/field/events/events_0123.json +++ b/res/field/events/events_0123.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 4, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 12, "z": 4, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 4, "y": 0 @@ -52,7 +52,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 2, - "movement_range_y": 0, + "movement_range_z": 0, "x": 10, "z": 9, "y": 0 diff --git a/res/field/events/events_0124.json b/res/field/events/events_0124.json index a09984aedf..621c2539cf 100644 --- a/res/field/events/events_0124.json +++ b/res/field/events/events_0124.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 2, "z": 7, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 2, "z": 6, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 1, "z": 9, "y": 0 diff --git a/res/field/events/events_0125.json b/res/field/events/events_0125.json index f4afdb4cbe..d06b97aa20 100644 --- a/res/field/events/events_0125.json +++ b/res/field/events/events_0125.json @@ -35,7 +35,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 10, "y": 0 @@ -49,7 +49,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 5, "y": 0 @@ -63,7 +63,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 9, "y": 0 @@ -77,7 +77,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 5, "y": 0 diff --git a/res/field/events/events_0126.json b/res/field/events/events_0126.json index 259464db68..e3575b5dcf 100644 --- a/res/field/events/events_0126.json +++ b/res/field/events/events_0126.json @@ -10,7 +10,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 5, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 7, "z": 6, "y": 0 diff --git a/res/field/events/events_0127.json b/res/field/events/events_0127.json index 1aaf14d8a6..0faf02fc76 100644 --- a/res/field/events/events_0127.json +++ b/res/field/events/events_0127.json @@ -10,7 +10,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 2, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 6, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 5, "y": 0 diff --git a/res/field/events/events_0128.json b/res/field/events/events_0128.json index 1fe8d823a8..6c344ce707 100644 --- a/res/field/events/events_0128.json +++ b/res/field/events/events_0128.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 3, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 4, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 2, "z": 4, "y": 0 diff --git a/res/field/events/events_0129.json b/res/field/events/events_0129.json index e7b87a7992..7af29e01b4 100644 --- a/res/field/events/events_0129.json +++ b/res/field/events/events_0129.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 6, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 4, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 5, "y": 0 diff --git a/res/field/events/events_0130.json b/res/field/events/events_0130.json index 9157f6d022..4d555a0b35 100644 --- a/res/field/events/events_0130.json +++ b/res/field/events/events_0130.json @@ -10,7 +10,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 5, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 1, + "movement_range_z": 1, "x": 8, "z": 6, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 3, "y": 0 diff --git a/res/field/events/events_0131.json b/res/field/events/events_0131.json index ae67692c28..dba00e569d 100644 --- a/res/field/events/events_0131.json +++ b/res/field/events/events_0131.json @@ -67,7 +67,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 3, + "movement_range_z": 3, "x": 722, "z": 614, "y": 7 @@ -81,7 +81,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 2, + "movement_range_z": 2, "x": 706, "z": 614, "y": 7 @@ -95,7 +95,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 2, - "movement_range_y": 0, + "movement_range_z": 0, "x": 701, "z": 618, "y": 7 @@ -109,7 +109,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 2, - "movement_range_y": 0, + "movement_range_z": 0, "x": 699, "z": 606, "y": 7 @@ -123,7 +123,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 2, - "movement_range_y": 0, + "movement_range_z": 0, "x": 710, "z": 605, "y": 7 @@ -137,7 +137,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 2, - "movement_range_y": 0, + "movement_range_z": 0, "x": 709, "z": 612, "y": 7 @@ -151,7 +151,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 2, - "movement_range_y": 0, + "movement_range_z": 0, "x": 682, "z": 614, "y": 7 @@ -165,7 +165,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 2, - "movement_range_y": 0, + "movement_range_z": 0, "x": 697, "z": 595, "y": 7 @@ -181,7 +181,7 @@ 14 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 697, "z": 612, "y": 0 @@ -197,7 +197,7 @@ 14 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 696, "z": 594, "y": 0 @@ -213,7 +213,7 @@ 14 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 719, "z": 593, "y": 0 @@ -229,7 +229,7 @@ 14 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 704, "z": 603, "y": 0 @@ -245,7 +245,7 @@ 14 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 688, "z": 611, "y": 0 @@ -261,7 +261,7 @@ 14 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 709, "z": 623, "y": 0 @@ -277,7 +277,7 @@ 14 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 714, "z": 623, "y": 0 @@ -293,7 +293,7 @@ 14 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 715, "z": 635, "y": 0 @@ -307,7 +307,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 710, "z": 635, "y": 0 @@ -321,7 +321,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 712, "z": 637, "y": 0 @@ -335,7 +335,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 690, "z": 613, "y": 0 @@ -349,7 +349,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 710, "z": 584, "y": 0 @@ -363,7 +363,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 2, - "movement_range_y": 0, + "movement_range_z": 0, "x": 697, "z": 597, "y": 7 @@ -377,7 +377,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 711, "z": 625, "y": 0 @@ -391,7 +391,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 687, "z": 624, "y": 0 @@ -405,7 +405,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 2, - "movement_range_y": 0, + "movement_range_z": 0, "x": 721, "z": 593, "y": 7 @@ -419,7 +419,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 1, - "movement_range_y": 2, + "movement_range_z": 2, "x": 720, "z": 632, "y": 7 @@ -433,7 +433,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 2, - "movement_range_y": 0, + "movement_range_z": 0, "x": 684, "z": 611, "y": 7 @@ -447,7 +447,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 2, - "movement_range_y": 0, + "movement_range_z": 0, "x": 692, "z": 603, "y": 7 @@ -461,7 +461,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 693, "z": 584, "y": 0 @@ -475,7 +475,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 2, - "movement_range_y": 0, + "movement_range_z": 0, "x": 705, "z": 632, "y": 7 @@ -489,7 +489,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 695, "z": 613, "y": 0 diff --git a/res/field/events/events_0132.json b/res/field/events/events_0132.json index 17f7a0ee1d..0a2bcaaeca 100644 --- a/res/field/events/events_0132.json +++ b/res/field/events/events_0132.json @@ -51,7 +51,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 12, "z": 4, "y": 0 @@ -65,7 +65,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 13, "z": 29, "y": 0 @@ -81,7 +81,7 @@ 3 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 15, "z": 23, "y": 0 @@ -97,7 +97,7 @@ 2 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 16, "z": 14, "y": 0 @@ -113,7 +113,7 @@ 2 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 2, "z": 9, "y": 0 @@ -129,7 +129,7 @@ 4 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 11, "z": 13, "y": 0 diff --git a/res/field/events/events_0133.json b/res/field/events/events_0133.json index 1dff0044a7..c745237b17 100644 --- a/res/field/events/events_0133.json +++ b/res/field/events/events_0133.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 4, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 3, "z": 6, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 10, "z": 8, "y": 0 @@ -52,7 +52,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 6, "z": 6, "y": 0 @@ -66,7 +66,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 6, "y": 0 diff --git a/res/field/events/events_0134.json b/res/field/events/events_0134.json index 5d724b4afb..8fb8831c4f 100644 --- a/res/field/events/events_0134.json +++ b/res/field/events/events_0134.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 4, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 12, "z": 4, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 4, "y": 0 diff --git a/res/field/events/events_0135.json b/res/field/events/events_0135.json index 9e55b62106..8c70051ab8 100644 --- a/res/field/events/events_0135.json +++ b/res/field/events/events_0135.json @@ -115,7 +115,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 2, "z": 4, "y": 0 @@ -129,7 +129,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 10, "z": 11, "y": 0 @@ -143,7 +143,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 8, "y": 0 @@ -157,7 +157,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 6, "z": 6, "y": 0 @@ -171,7 +171,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 11, "z": 7, "y": 0 @@ -185,7 +185,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 3, "y": 0 @@ -199,7 +199,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 6, "z": 9, "y": 0 @@ -213,7 +213,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 14, "z": 8, "y": 0 @@ -227,7 +227,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 9, "z": 8, "y": 0 diff --git a/res/field/events/events_0136.json b/res/field/events/events_0136.json index 222ad935e6..eddc62472c 100644 --- a/res/field/events/events_0136.json +++ b/res/field/events/events_0136.json @@ -27,7 +27,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 16, "z": 8, "y": 0 @@ -41,7 +41,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 17, "z": 11, "y": 0 @@ -55,7 +55,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 2, "z": 9, "y": 0 @@ -69,7 +69,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 11, "y": 0 @@ -83,7 +83,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 5, "y": 0 @@ -97,7 +97,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 2, "z": 5, "y": 0 diff --git a/res/field/events/events_0137.json b/res/field/events/events_0137.json index 90d454b5b9..65782b929f 100644 --- a/res/field/events/events_0137.json +++ b/res/field/events/events_0137.json @@ -19,7 +19,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 3, + "movement_range_z": 3, "x": 15, "z": 11, "y": 0 @@ -33,7 +33,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 1, + "movement_range_z": 1, "x": 5, "z": 11, "y": 0 @@ -47,7 +47,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 1, + "movement_range_z": 1, "x": 2, "z": 8, "y": 0 @@ -61,7 +61,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 1, + "movement_range_z": 1, "x": 18, "z": 6, "y": 0 @@ -75,7 +75,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 1, + "movement_range_z": 1, "x": 2, "z": 4, "y": 0 @@ -89,7 +89,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 1, + "movement_range_z": 1, "x": 2, "z": 6, "y": 0 @@ -103,7 +103,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 1, + "movement_range_z": 1, "x": 6, "z": 10, "y": 0 diff --git a/res/field/events/events_0138.json b/res/field/events/events_0138.json index 9c81b3a799..2cd8818aad 100644 --- a/res/field/events/events_0138.json +++ b/res/field/events/events_0138.json @@ -19,7 +19,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 18, "z": 6, "y": 0 @@ -33,7 +33,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 9, "z": 10, "y": 0 @@ -47,7 +47,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 2, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 4, "y": 0 @@ -61,7 +61,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 4, "y": 0 @@ -75,7 +75,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 11, "y": 0 @@ -89,7 +89,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 18, "z": 10, "y": 0 diff --git a/res/field/events/events_0139.json b/res/field/events/events_0139.json index db83fa3888..cc7be85ff2 100644 --- a/res/field/events/events_0139.json +++ b/res/field/events/events_0139.json @@ -19,7 +19,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 2, + "movement_range_z": 2, "x": 15, "z": 10, "y": 0 @@ -33,7 +33,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 16, "z": 11, "y": 0 @@ -47,7 +47,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 18, "z": 5, "y": 0 @@ -61,7 +61,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 5, "y": 0 @@ -75,7 +75,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 2, "z": 8, "y": 0 @@ -89,7 +89,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 6, "z": 11, "y": 0 diff --git a/res/field/events/events_0140.json b/res/field/events/events_0140.json index 28df68b902..ba13e2c486 100644 --- a/res/field/events/events_0140.json +++ b/res/field/events/events_0140.json @@ -35,7 +35,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 6, "y": 0 @@ -49,7 +49,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 1, - "movement_range_y": 2, + "movement_range_z": 2, "x": 14, "z": 8, "y": 0 @@ -63,7 +63,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 2, - "movement_range_y": 0, + "movement_range_z": 0, "x": 10, "z": 11, "y": 0 @@ -77,7 +77,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 2, - "movement_range_y": 0, + "movement_range_z": 0, "x": 9, "z": 11, "y": 0 diff --git a/res/field/events/events_0141.json b/res/field/events/events_0141.json index c73dc08008..dcb4f15aac 100644 --- a/res/field/events/events_0141.json +++ b/res/field/events/events_0141.json @@ -10,7 +10,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 1, "z": 6, "y": 0 diff --git a/res/field/events/events_0142.json b/res/field/events/events_0142.json index 5bd40dfb10..ef9ff398c4 100644 --- a/res/field/events/events_0142.json +++ b/res/field/events/events_0142.json @@ -10,7 +10,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 4, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 13, "z": 8, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 7, "y": 0 @@ -52,7 +52,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 9, "z": 7, "y": 0 @@ -66,7 +66,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 12, "z": 8, "y": 0 diff --git a/res/field/events/events_0143.json b/res/field/events/events_0143.json index a674644b44..6238bcb588 100644 --- a/res/field/events/events_0143.json +++ b/res/field/events/events_0143.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 4, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 2, "z": 7, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 7, "y": 0 diff --git a/res/field/events/events_0144.json b/res/field/events/events_0144.json index c383da5af2..a4f5544903 100644 --- a/res/field/events/events_0144.json +++ b/res/field/events/events_0144.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 6, "z": 6, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 4, "y": 0 diff --git a/res/field/events/events_0145.json b/res/field/events/events_0145.json index 7f57be9b23..4bfb624a36 100644 --- a/res/field/events/events_0145.json +++ b/res/field/events/events_0145.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 3, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 6, "z": 6, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 5, "y": 0 diff --git a/res/field/events/events_0146.json b/res/field/events/events_0146.json index 52b5b8a83a..c9d83e413f 100644 --- a/res/field/events/events_0146.json +++ b/res/field/events/events_0146.json @@ -10,7 +10,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 5, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 4, "y": 0 diff --git a/res/field/events/events_0147.json b/res/field/events/events_0147.json index f54d4c5f38..0ec4b91a69 100644 --- a/res/field/events/events_0147.json +++ b/res/field/events/events_0147.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 5, "z": 5, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 3, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 7, "z": 6, "y": 0 diff --git a/res/field/events/events_0148.json b/res/field/events/events_0148.json index 7d252af315..4447afe047 100644 --- a/res/field/events/events_0148.json +++ b/res/field/events/events_0148.json @@ -10,7 +10,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 7, "z": 8, "y": 0 diff --git a/res/field/events/events_0149.json b/res/field/events/events_0149.json index 2b3bfc10ef..cd835f9096 100644 --- a/res/field/events/events_0149.json +++ b/res/field/events/events_0149.json @@ -27,7 +27,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 883, "z": 770, "y": 7 @@ -41,7 +41,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 2, + "movement_range_z": 2, "x": 856, "z": 782, "y": 7 @@ -55,7 +55,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 4, - "movement_range_y": 0, + "movement_range_z": 0, "x": 848, "z": 785, "y": 7 @@ -69,7 +69,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 881, "z": 793, "y": 7 @@ -83,7 +83,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 848, "z": 763, "y": 0 @@ -99,7 +99,7 @@ 15 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 841, "z": 788, "y": 0 @@ -113,7 +113,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 847, "z": 748, "y": 0 @@ -127,7 +127,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 5, + "movement_range_z": 5, "x": 854, "z": 754, "y": 7 @@ -141,7 +141,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 882, "z": 790, "y": 0 @@ -155,7 +155,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 857, "z": 741, "y": 0 @@ -169,7 +169,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 853, "z": 751, "y": 0 @@ -183,7 +183,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 853, "z": 745, "y": 0 @@ -197,7 +197,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 853, "z": 755, "y": 0 @@ -211,7 +211,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 885, "z": 744, "y": 0 @@ -225,7 +225,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 885, "z": 770, "y": 0 @@ -239,7 +239,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 858, "z": 759, "y": 0 @@ -253,7 +253,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 884, "z": 794, "y": 0 @@ -267,7 +267,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 881, "z": 779, "y": 0 @@ -281,7 +281,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 4, - "movement_range_y": 0, + "movement_range_z": 0, "x": 845, "z": 748, "y": 7 @@ -295,7 +295,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 878, "z": 794, "y": 0 @@ -309,7 +309,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 855, "z": 747, "y": 0 diff --git a/res/field/events/events_0150.json b/res/field/events/events_0150.json index 06ea2a6d0c..c37a0fa2d6 100644 --- a/res/field/events/events_0150.json +++ b/res/field/events/events_0150.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 4, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 6, "z": 10, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 10, "z": 7, "y": 0 @@ -52,7 +52,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 6, "y": 0 @@ -66,7 +66,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 6, "z": 6, "y": 0 @@ -80,7 +80,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 6, "y": 0 diff --git a/res/field/events/events_0151.json b/res/field/events/events_0151.json index c3ed4a0114..be4ed638aa 100644 --- a/res/field/events/events_0151.json +++ b/res/field/events/events_0151.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 4, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 12, "z": 4, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 4, "y": 0 diff --git a/res/field/events/events_0152.json b/res/field/events/events_0152.json index 644cc8cb10..b3c5fec042 100644 --- a/res/field/events/events_0152.json +++ b/res/field/events/events_0152.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 5, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 6, "z": 8, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 7, "y": 0 @@ -52,7 +52,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 7, "y": 0 @@ -66,7 +66,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 2, "z": 5, "y": 0 diff --git a/res/field/events/events_0153.json b/res/field/events/events_0153.json index 1bc1ba4ab5..422b4db2a0 100644 --- a/res/field/events/events_0153.json +++ b/res/field/events/events_0153.json @@ -27,7 +27,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 11, "z": 13, "y": 0 @@ -43,7 +43,7 @@ 4 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 6, "z": 4, "y": 0 diff --git a/res/field/events/events_0154.json b/res/field/events/events_0154.json index 1a17de6f32..56f4957ffb 100644 --- a/res/field/events/events_0154.json +++ b/res/field/events/events_0154.json @@ -12,7 +12,7 @@ 3 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 5, "y": 0 @@ -28,7 +28,7 @@ 2 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 14, "z": 11, "y": 0 @@ -44,7 +44,7 @@ 1 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 12, "z": 4, "y": 0 diff --git a/res/field/events/events_0155.json b/res/field/events/events_0155.json index 5c6e5da942..5488f47fd6 100644 --- a/res/field/events/events_0155.json +++ b/res/field/events/events_0155.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 11, "z": 3, "y": 0 @@ -26,7 +26,7 @@ 3 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 23, "y": 0 @@ -42,7 +42,7 @@ 2 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 3, "y": 0 @@ -58,7 +58,7 @@ 2 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 16, "z": 23, "y": 0 @@ -74,7 +74,7 @@ 1 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 21, "z": 10, "y": 0 diff --git a/res/field/events/events_0156.json b/res/field/events/events_0156.json index b00ec22cd3..16f9e3b17b 100644 --- a/res/field/events/events_0156.json +++ b/res/field/events/events_0156.json @@ -10,7 +10,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 2, "z": 9, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 8, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 10, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 9, "y": 0 @@ -52,7 +52,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 1, "z": 5, "y": 0 @@ -66,7 +66,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 2, + "movement_range_z": 2, "x": 6, "z": 4, "y": 0 diff --git a/res/field/events/events_0157.json b/res/field/events/events_0157.json index 9281ac1f76..02ba325da2 100644 --- a/res/field/events/events_0157.json +++ b/res/field/events/events_0157.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 5, "y": 0 diff --git a/res/field/events/events_0158.json b/res/field/events/events_0158.json index adc07f25b2..80c3b3c586 100644 --- a/res/field/events/events_0158.json +++ b/res/field/events/events_0158.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 1, + "movement_range_z": 1, "x": 6, "z": 6, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 3, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 2, "z": 5, "y": 0 @@ -52,7 +52,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 2, "z": 7, "y": 0 @@ -66,7 +66,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 9, "z": 5, "y": 0 @@ -80,7 +80,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 9, "z": 6, "y": 0 @@ -94,7 +94,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 7, "y": 0 diff --git a/res/field/events/events_0159.json b/res/field/events/events_0159.json index 138d71fb28..e5084890e0 100644 --- a/res/field/events/events_0159.json +++ b/res/field/events/events_0159.json @@ -10,7 +10,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 5, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 1, "z": 5, "y": 0 diff --git a/res/field/events/events_0160.json b/res/field/events/events_0160.json index ffb68ce1b9..bc93a41309 100644 --- a/res/field/events/events_0160.json +++ b/res/field/events/events_0160.json @@ -10,7 +10,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 1, "z": 5, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 6, "z": 4, "y": 0 diff --git a/res/field/events/events_0161.json b/res/field/events/events_0161.json index 63836dcfab..9be8779272 100644 --- a/res/field/events/events_0161.json +++ b/res/field/events/events_0161.json @@ -10,7 +10,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 6, "z": 7, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 5, "y": 0 diff --git a/res/field/events/events_0162.json b/res/field/events/events_0162.json index e01108dd53..18d2693e78 100644 --- a/res/field/events/events_0162.json +++ b/res/field/events/events_0162.json @@ -10,7 +10,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 5, "z": 5, "y": 0 diff --git a/res/field/events/events_0163.json b/res/field/events/events_0163.json index 457bbb56e8..5fc65baa88 100644 --- a/res/field/events/events_0163.json +++ b/res/field/events/events_0163.json @@ -19,7 +19,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 9, "z": 3, "y": 0 @@ -33,7 +33,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 3, "y": 0 @@ -47,7 +47,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 6, "z": 4, "y": 0 diff --git a/res/field/events/events_0164.json b/res/field/events/events_0164.json index 7fa5bded39..d00cb1f250 100644 --- a/res/field/events/events_0164.json +++ b/res/field/events/events_0164.json @@ -19,7 +19,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 2, - "movement_range_y": 0, + "movement_range_z": 0, "x": 365, "z": 243, "y": 7 @@ -35,7 +35,7 @@ 16 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 360, "z": 240, "y": 0 @@ -49,7 +49,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 363, "z": 222, "y": 0 @@ -63,7 +63,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 361, "z": 216, "y": 7 @@ -77,7 +77,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 376, "z": 211, "y": 7 @@ -91,7 +91,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 1, + "movement_range_z": 1, "x": 373, "z": 228, "y": 7 @@ -105,7 +105,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 2, - "movement_range_y": 0, + "movement_range_z": 0, "x": 367, "z": 198, "y": 7 @@ -119,7 +119,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 366, "z": 208, "y": 7 @@ -133,7 +133,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 2, - "movement_range_y": 0, + "movement_range_z": 0, "x": 356, "z": 247, "y": 7 @@ -147,7 +147,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 355, "z": 221, "y": 7 @@ -161,7 +161,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 366, "z": 241, "y": 7 @@ -175,7 +175,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 372, "z": 245, "y": 0 diff --git a/res/field/events/events_0165.json b/res/field/events/events_0165.json index 44d3fcfc84..9e1b1f99cc 100644 --- a/res/field/events/events_0165.json +++ b/res/field/events/events_0165.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 5, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 5, "z": 9, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 9, "z": 8, "y": 0 @@ -52,7 +52,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 7, "y": 0 @@ -66,7 +66,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 2, "z": 5, "y": 0 diff --git a/res/field/events/events_0166.json b/res/field/events/events_0166.json index b3010d7ac1..e845b9f785 100644 --- a/res/field/events/events_0166.json +++ b/res/field/events/events_0166.json @@ -27,7 +27,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 11, "z": 3, "y": 0 @@ -41,7 +41,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 12, "z": 27, "y": 0 @@ -57,7 +57,7 @@ 1 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 17, "z": 3, "y": 0 @@ -73,7 +73,7 @@ 1 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 21, "z": 9, "y": 0 @@ -89,7 +89,7 @@ 1 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 6, "y": 0 @@ -105,7 +105,7 @@ 1 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 18, "z": 15, "y": 0 @@ -121,7 +121,7 @@ 1 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 16, "y": 0 @@ -137,7 +137,7 @@ 1 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 2, "z": 13, "y": 0 @@ -151,7 +151,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 12, "z": 18, "y": 0 @@ -165,7 +165,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 10, "z": 21, "y": 0 @@ -179,7 +179,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 17, "z": 19, "y": 0 @@ -193,7 +193,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 11, "z": 16, "y": 0 @@ -207,7 +207,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 11, "z": 14, "y": 0 @@ -221,7 +221,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 11, "z": 11, "y": 0 @@ -235,7 +235,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 11, "z": 8, "y": 0 @@ -249,7 +249,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 13, "z": 8, "y": 0 @@ -263,7 +263,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 10, "z": 8, "y": 0 @@ -277,7 +277,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 12, "z": 8, "y": 0 @@ -291,7 +291,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 9, "z": 4, "y": 0 @@ -305,7 +305,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 13, "z": 4, "y": 0 @@ -319,7 +319,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 10, "z": 15, "y": 0 @@ -333,7 +333,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 17, "z": 17, "y": 0 @@ -347,7 +347,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 17, "z": 18, "y": 0 @@ -361,7 +361,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 17, "z": 20, "y": 0 @@ -375,7 +375,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 12, "z": 21, "y": 0 @@ -389,7 +389,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 9, "z": 8, "y": 0 @@ -403,7 +403,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 20, "z": 23, "y": 0 diff --git a/res/field/events/events_0167.json b/res/field/events/events_0167.json index 2d8cd708bc..fe77e730c1 100644 --- a/res/field/events/events_0167.json +++ b/res/field/events/events_0167.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 4, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 3, "z": 6, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 12, "z": 11, "y": 0 @@ -52,7 +52,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 10, "z": 8, "y": 0 @@ -66,7 +66,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 7, "z": 6, "y": 0 @@ -80,7 +80,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 6, "z": 6, "y": 0 @@ -94,7 +94,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 6, "y": 0 diff --git a/res/field/events/events_0168.json b/res/field/events/events_0168.json index d785d8a233..830c3f435f 100644 --- a/res/field/events/events_0168.json +++ b/res/field/events/events_0168.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 4, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 12, "z": 4, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 4, "y": 0 diff --git a/res/field/events/events_0169.json b/res/field/events/events_0169.json index 5298318bba..f63eb37498 100644 --- a/res/field/events/events_0169.json +++ b/res/field/events/events_0169.json @@ -10,7 +10,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 6, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 5, "y": 0 diff --git a/res/field/events/events_0170.json b/res/field/events/events_0170.json index 037cc6abfa..61a0eac1ea 100644 --- a/res/field/events/events_0170.json +++ b/res/field/events/events_0170.json @@ -19,7 +19,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 5, "y": 0 @@ -33,7 +33,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 2, "z": 4, "y": 0 diff --git a/res/field/events/events_0171.json b/res/field/events/events_0171.json index 1c0148760b..43625c592b 100644 --- a/res/field/events/events_0171.json +++ b/res/field/events/events_0171.json @@ -83,7 +83,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 848, "z": 598, "y": 0 @@ -99,7 +99,7 @@ 3 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 849, "z": 580, "y": 0 diff --git a/res/field/events/events_0172.json b/res/field/events/events_0172.json index 09f047095f..8577b9e83b 100644 --- a/res/field/events/events_0172.json +++ b/res/field/events/events_0172.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 4, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 6, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 9, "z": 8, "y": 0 diff --git a/res/field/events/events_0173.json b/res/field/events/events_0173.json index c0207f70b1..b435320382 100644 --- a/res/field/events/events_0173.json +++ b/res/field/events/events_0173.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 4, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 12, "z": 4, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 4, "y": 0 diff --git a/res/field/events/events_0174.json b/res/field/events/events_0174.json index 5d7b2a469d..03e42df888 100644 --- a/res/field/events/events_0174.json +++ b/res/field/events/events_0174.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 11, "z": 3, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 16, "z": 1, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 17, "z": 1, "y": 0 @@ -52,7 +52,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 1, "y": 0 @@ -66,7 +66,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 6, "z": 9, "y": 0 @@ -80,7 +80,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 11, "z": 11, "y": 0 @@ -94,7 +94,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 17, "z": 8, "y": 0 diff --git a/res/field/events/events_0176.json b/res/field/events/events_0176.json index ba4be77687..5693ee9253 100644 --- a/res/field/events/events_0176.json +++ b/res/field/events/events_0176.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 5, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 12, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 2, "y": 0 diff --git a/res/field/events/events_0178.json b/res/field/events/events_0178.json index 4660eed05a..402542cac9 100644 --- a/res/field/events/events_0178.json +++ b/res/field/events/events_0178.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 5, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 12, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 2, "y": 0 diff --git a/res/field/events/events_0180.json b/res/field/events/events_0180.json index 6ce9d69134..d78d85414d 100644 --- a/res/field/events/events_0180.json +++ b/res/field/events/events_0180.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 5, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 2, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 12, "y": 0 diff --git a/res/field/events/events_0182.json b/res/field/events/events_0182.json index 1b0f80798e..4228e65516 100644 --- a/res/field/events/events_0182.json +++ b/res/field/events/events_0182.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 5, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 2, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 12, "y": 0 diff --git a/res/field/events/events_0184.json b/res/field/events/events_0184.json index d5855831d1..5bae78c009 100644 --- a/res/field/events/events_0184.json +++ b/res/field/events/events_0184.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 11, "y": 0 diff --git a/res/field/events/events_0185.json b/res/field/events/events_0185.json index 4114307bd7..88bf1a123c 100644 --- a/res/field/events/events_0185.json +++ b/res/field/events/events_0185.json @@ -10,7 +10,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 22, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 22, "y": 0 diff --git a/res/field/events/events_0186.json b/res/field/events/events_0186.json index 90234fa308..ef5b75cac5 100644 --- a/res/field/events/events_0186.json +++ b/res/field/events/events_0186.json @@ -10,7 +10,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 9, "z": 6, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 6, "y": 0 diff --git a/res/field/events/events_0187.json b/res/field/events/events_0187.json index 40a7957cf4..7e4533ae56 100644 --- a/res/field/events/events_0187.json +++ b/res/field/events/events_0187.json @@ -12,7 +12,7 @@ 18 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 633, "z": 433, "y": 0 @@ -28,7 +28,7 @@ 3 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 631, "z": 430, "y": 0 @@ -44,7 +44,7 @@ 3 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 652, "z": 426, "y": 0 @@ -58,7 +58,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 648, "z": 438, "y": 0 @@ -72,7 +72,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 648, "z": 437, "y": 0 @@ -86,7 +86,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 634, "z": 442, "y": 0 @@ -100,7 +100,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 628, "z": 423, "y": 0 @@ -114,7 +114,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 628, "z": 434, "y": 0 @@ -128,7 +128,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 657, "z": 426, "y": 0 @@ -144,7 +144,7 @@ 90 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 639, "z": 429, "y": 0 @@ -160,7 +160,7 @@ 91 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 640, "z": 429, "y": 0 @@ -176,7 +176,7 @@ 92 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 641, "z": 429, "y": 0 @@ -192,7 +192,7 @@ 93 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 642, "z": 429, "y": 0 @@ -206,7 +206,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 652, "z": 440, "y": 0 @@ -220,7 +220,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 1, - "movement_range_y": 2, + "movement_range_z": 2, "x": 658, "z": 428, "y": 0 @@ -234,7 +234,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 3, + "movement_range_z": 3, "x": 657, "z": 433, "y": 0 @@ -248,7 +248,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 1, - "movement_range_y": 2, + "movement_range_z": 2, "x": 650, "z": 431, "y": 0 @@ -262,7 +262,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 642, "z": 432, "y": 0 @@ -276,7 +276,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 619, "z": 435, "y": 0 @@ -290,7 +290,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 648, "z": 434, "y": 0 @@ -304,7 +304,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 617, "z": 434, "y": 0 @@ -318,7 +318,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 617, "z": 435, "y": 0 @@ -332,7 +332,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 629, "z": 429, "y": 0 @@ -346,7 +346,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 630, "z": 429, "y": 0 @@ -360,7 +360,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 655, "z": 424, "y": 0 @@ -374,7 +374,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 654, "z": 424, "y": 0 @@ -388,7 +388,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 655, "z": 423, "y": 0 @@ -402,7 +402,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 652, "z": 429, "y": 0 @@ -416,7 +416,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 651, "z": 428, "y": 0 @@ -430,7 +430,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 651, "z": 427, "y": 0 @@ -444,7 +444,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 657, "z": 428, "y": 0 @@ -458,7 +458,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 657, "z": 427, "y": 0 diff --git a/res/field/events/events_0188.json b/res/field/events/events_0188.json index e38dc955ee..c1326c107a 100644 --- a/res/field/events/events_0188.json +++ b/res/field/events/events_0188.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 4, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 10, "z": 8, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 6, "z": 9, "y": 0 @@ -52,7 +52,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 5, "y": 0 @@ -66,7 +66,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 6, "z": 6, "y": 0 @@ -80,7 +80,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 6, "y": 0 diff --git a/res/field/events/events_0189.json b/res/field/events/events_0189.json index 95b09a807c..0773e212b4 100644 --- a/res/field/events/events_0189.json +++ b/res/field/events/events_0189.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 4, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 12, "z": 4, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 4, "y": 0 diff --git a/res/field/events/events_0190.json b/res/field/events/events_0190.json index 4ed48f667d..62670ad3d1 100644 --- a/res/field/events/events_0190.json +++ b/res/field/events/events_0190.json @@ -10,7 +10,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 8, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 2, "z": 9, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 3, "z": 5, "y": 0 @@ -52,7 +52,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 7, "y": 0 diff --git a/res/field/events/events_0191.json b/res/field/events/events_0191.json index 3779d6c4fd..1b6de9bec2 100644 --- a/res/field/events/events_0191.json +++ b/res/field/events/events_0191.json @@ -10,7 +10,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 2, "z": 7, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 2, "z": 8, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 2, "z": 4, "y": 0 @@ -52,7 +52,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 4, "y": 0 @@ -66,7 +66,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 6, "z": 6, "y": 0 @@ -80,7 +80,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 8, "y": 0 diff --git a/res/field/events/events_0192.json b/res/field/events/events_0192.json index bba0576ffd..9e2496fcfc 100644 --- a/res/field/events/events_0192.json +++ b/res/field/events/events_0192.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 1, + "movement_range_z": 1, "x": 4, "z": 10, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 1, + "movement_range_z": 1, "x": 6, "z": 5, "y": 0 diff --git a/res/field/events/events_0193.json b/res/field/events/events_0193.json index 6fc3231881..4611c35695 100644 --- a/res/field/events/events_0193.json +++ b/res/field/events/events_0193.json @@ -10,7 +10,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 5, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 8, "z": 6, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 7, "y": 0 diff --git a/res/field/events/events_0194.json b/res/field/events/events_0194.json index f6b27a4c9d..817ca161ab 100644 --- a/res/field/events/events_0194.json +++ b/res/field/events/events_0194.json @@ -10,7 +10,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 6, "z": 5, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 2, "z": 6, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 2, "z": 5, "y": 0 @@ -52,7 +52,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 6, "y": 0 diff --git a/res/field/events/events_0196.json b/res/field/events/events_0196.json index 24992cc5a6..461ebcf813 100644 --- a/res/field/events/events_0196.json +++ b/res/field/events/events_0196.json @@ -10,7 +10,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 4, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 19, "z": 4, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 6, "z": 3, "y": 0 @@ -52,7 +52,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 13, "z": 4, "y": 0 diff --git a/res/field/events/events_0197.json b/res/field/events/events_0197.json index 0cd937128a..9e30b0e9d5 100644 --- a/res/field/events/events_0197.json +++ b/res/field/events/events_0197.json @@ -10,7 +10,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 18, "z": 28, "y": 1 @@ -24,7 +24,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 19, "z": 28, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 17, "z": 28, "y": 0 @@ -52,7 +52,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 28, "y": 0 @@ -66,7 +66,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 26, "z": 24, "y": 0 @@ -80,7 +80,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 28, "y": 1 @@ -94,7 +94,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 26, "z": 20, "y": 1 @@ -108,7 +108,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 21, "z": 15, "y": 1 @@ -122,7 +122,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 12, "z": 28, "y": 1 @@ -136,7 +136,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 20, "z": 15, "y": 1 @@ -150,7 +150,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 27, "z": 15, "y": 1 diff --git a/res/field/events/events_0198.json b/res/field/events/events_0198.json index e4f76c3204..7e4e023c6a 100644 --- a/res/field/events/events_0198.json +++ b/res/field/events/events_0198.json @@ -29,7 +29,7 @@ 3 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 243, "z": 655, "y": 0 @@ -43,7 +43,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 240, "z": 659, "y": 0 @@ -60,7 +60,7 @@ 2 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 215, "z": 659, "y": 0 @@ -74,7 +74,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 242, "z": 644, "y": 0 @@ -90,7 +90,7 @@ 3 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 241, "z": 660, "y": 0 @@ -104,7 +104,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 246, "z": 660, "y": 0 @@ -120,7 +120,7 @@ 3 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 242, "z": 659, "y": 0 @@ -134,7 +134,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 232, "z": 649, "y": 0 diff --git a/res/field/events/events_0199.json b/res/field/events/events_0199.json index 49ba654dac..ccd28a7772 100644 --- a/res/field/events/events_0199.json +++ b/res/field/events/events_0199.json @@ -27,7 +27,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 12, "z": 14, "y": 0 @@ -41,7 +41,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 20, "z": 7, "y": 0 @@ -55,7 +55,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 21, "z": 3, "y": 0 @@ -71,7 +71,7 @@ 2 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 8, "y": 0 @@ -87,7 +87,7 @@ 2 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 12, "z": 3, "y": 0 @@ -101,7 +101,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 10, "z": 8, "y": 0 @@ -115,7 +115,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 18, "z": 8, "y": 0 @@ -129,7 +129,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 21, "z": 5, "y": 0 diff --git a/res/field/events/events_0200.json b/res/field/events/events_0200.json index 8de47a5beb..139463d6c5 100644 --- a/res/field/events/events_0200.json +++ b/res/field/events/events_0200.json @@ -12,7 +12,7 @@ 7 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 231, "z": 554, "y": 0 @@ -28,7 +28,7 @@ 6 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 230, "z": 554, "y": 0 @@ -44,7 +44,7 @@ 8 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 232, "z": 554, "y": 0 @@ -60,7 +60,7 @@ 9 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 233, "z": 554, "y": 0 @@ -74,7 +74,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 246, "z": 540, "y": 0 @@ -88,7 +88,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 247, "z": 540, "y": 0 @@ -102,7 +102,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 216, "z": 566, "y": 0 @@ -116,7 +116,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 216, "z": 567, "y": 0 @@ -130,7 +130,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 243, "z": 569, "y": 0 @@ -144,7 +144,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 228, "z": 571, "y": 0 @@ -158,7 +158,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 2, - "movement_range_y": 0, + "movement_range_z": 0, "x": 232, "z": 560, "y": 0 diff --git a/res/field/events/events_0201.json b/res/field/events/events_0201.json index 482530ae26..8dcd1586f1 100644 --- a/res/field/events/events_0201.json +++ b/res/field/events/events_0201.json @@ -19,7 +19,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 28, "z": 83, "y": 0 @@ -33,7 +33,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 24, "z": 80, "y": 0 @@ -49,7 +49,7 @@ 2 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 37, "z": 67, "y": 0 @@ -65,7 +65,7 @@ 3 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 65, "z": 87, "y": 0 @@ -81,7 +81,7 @@ 2 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 74, "z": 67, "y": 0 @@ -97,7 +97,7 @@ 4 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 50, "z": 67, "y": 0 @@ -113,7 +113,7 @@ 2 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 40, "z": 67, "y": 0 @@ -129,7 +129,7 @@ 3 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 65, "z": 83, "y": 0 @@ -143,7 +143,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 15, "z": 81, "y": 0 @@ -157,7 +157,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 41, "z": 59, "y": 0 @@ -171,7 +171,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 50, "z": 85, "y": 0 @@ -185,7 +185,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 66, "z": 42, "y": 0 @@ -199,7 +199,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 29, "z": 82, "y": 0 @@ -213,7 +213,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 76, "z": 72, "y": 0 @@ -229,7 +229,7 @@ 4 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 55, "z": 67, "y": 0 @@ -245,7 +245,7 @@ 2 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 77, "z": 67, "y": 0 @@ -259,7 +259,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 17, "z": 66, "y": 0 @@ -273,7 +273,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 81, "z": 12, "y": 0 @@ -287,7 +287,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 84, "z": 82, "y": 0 @@ -301,7 +301,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 74, "z": 33, "y": 0 @@ -315,7 +315,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 75, "z": 33, "y": 0 @@ -329,7 +329,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 77, "z": 33, "y": 0 @@ -343,7 +343,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 36, "z": 64, "y": 0 @@ -357,7 +357,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 36, "z": 65, "y": 0 @@ -371,7 +371,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 73, "z": 33, "y": 0 diff --git a/res/field/events/events_0202.json b/res/field/events/events_0202.json index c7e6c5bd70..f27b2f61bc 100644 --- a/res/field/events/events_0202.json +++ b/res/field/events/events_0202.json @@ -29,7 +29,7 @@ 10 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 168, "z": 594, "y": 0 @@ -45,7 +45,7 @@ 11 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 169, "z": 594, "y": 0 @@ -61,7 +61,7 @@ 12 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 170, "z": 594, "y": 0 @@ -77,7 +77,7 @@ 13 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 171, "z": 594, "y": 0 @@ -91,7 +91,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 172, "z": 588, "y": 0 diff --git a/res/field/events/events_0203.json b/res/field/events/events_0203.json index 007e58a311..aa9ad22048 100644 --- a/res/field/events/events_0203.json +++ b/res/field/events/events_0203.json @@ -27,7 +27,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 21, "z": 21, "y": 0 @@ -41,7 +41,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 11, "z": 7, "y": 0 @@ -55,7 +55,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 46, "z": 20, "y": 0 @@ -69,7 +69,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 51, "z": 6, "y": 0 @@ -83,7 +83,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 25, "z": 19, "y": 0 @@ -99,7 +99,7 @@ 4 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 7, "y": 0 @@ -115,7 +115,7 @@ 4 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 26, "z": 6, "y": 0 @@ -131,7 +131,7 @@ 3 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 35, "z": 25, "y": 0 @@ -145,7 +145,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 40, "z": 18, "y": 0 @@ -159,7 +159,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 27, "z": 16, "y": 0 @@ -173,7 +173,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 44, "z": 6, "y": 0 @@ -187,7 +187,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 11, "z": 18, "y": 0 diff --git a/res/field/events/events_0204.json b/res/field/events/events_0204.json index fb5b07e8cd..a72b6b61e3 100644 --- a/res/field/events/events_0204.json +++ b/res/field/events/events_0204.json @@ -35,7 +35,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 16, "z": 23, "y": 0 @@ -49,7 +49,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 20, "z": 23, "y": 0 @@ -63,7 +63,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 24, "z": 23, "y": 0 @@ -77,7 +77,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 25, "z": 22, "y": 0 @@ -91,7 +91,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 13, "z": 9, "y": 0 @@ -105,7 +105,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 28, "z": 28, "y": 0 @@ -119,7 +119,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 15, "z": 17, "y": 0 diff --git a/res/field/events/events_0205.json b/res/field/events/events_0205.json index e73abfd3a2..0c0db08816 100644 --- a/res/field/events/events_0205.json +++ b/res/field/events/events_0205.json @@ -27,7 +27,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 31, "y": 0 @@ -41,7 +41,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 23, "z": 37, "y": 0 @@ -55,7 +55,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 55, "y": 0 @@ -69,7 +69,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 13, "z": 60, "y": 0 @@ -83,7 +83,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 23, "y": 0 @@ -97,7 +97,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 10, "z": 26, "y": 0 @@ -111,7 +111,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 6, "z": 24, "y": 0 @@ -125,7 +125,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 24, "y": 0 @@ -139,7 +139,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 14, "z": 45, "y": 0 diff --git a/res/field/events/events_0206.json b/res/field/events/events_0206.json index ff44e9b70e..d3ebba24d2 100644 --- a/res/field/events/events_0206.json +++ b/res/field/events/events_0206.json @@ -21,7 +21,7 @@ 2 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 15, "z": 15, "y": 0 @@ -37,7 +37,7 @@ 2 ], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 2, "z": 20, "y": 0 diff --git a/res/field/events/events_0207.json b/res/field/events/events_0207.json index 7d8e7fab91..aaf61e36b2 100644 --- a/res/field/events/events_0207.json +++ b/res/field/events/events_0207.json @@ -67,7 +67,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 42, "z": 44, "y": 0 @@ -81,7 +81,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 43, "z": 42, "y": 0 @@ -95,7 +95,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 45, "z": 43, "y": 0 @@ -109,7 +109,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 45, "z": 39, "y": 0 @@ -123,7 +123,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 42, "z": 37, "y": 0 @@ -137,7 +137,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 39, "z": 20, "y": 0 @@ -151,7 +151,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 35, "z": 17, "y": 0 diff --git a/res/field/events/events_0208.json b/res/field/events/events_0208.json index 790bdf3d0d..1285487be4 100644 --- a/res/field/events/events_0208.json +++ b/res/field/events/events_0208.json @@ -59,7 +59,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 13, "z": 31, "y": 0 @@ -73,7 +73,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 42, "z": 7, "y": 0 @@ -87,7 +87,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 43, "z": 5, "y": 0 @@ -101,7 +101,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 45, "z": 6, "y": 0 @@ -115,7 +115,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 45, "z": 2, "y": 0 @@ -129,7 +129,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 42, "z": 0, "y": 0 @@ -143,7 +143,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 47, "z": 0, "y": 0 @@ -157,7 +157,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 25, "z": 29, "y": 0 diff --git a/res/field/events/events_0209.json b/res/field/events/events_0209.json index 6bbde4fbf2..e86d98d695 100644 --- a/res/field/events/events_0209.json +++ b/res/field/events/events_0209.json @@ -75,7 +75,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 6, "z": 6, "y": 0 @@ -89,7 +89,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 8, "y": 0 @@ -103,7 +103,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 9, "y": 0 @@ -117,7 +117,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 26, "z": 19, "y": 0 @@ -131,7 +131,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 29, "z": 23, "y": 0 @@ -145,7 +145,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 30, "z": 24, "y": 0 @@ -162,7 +162,7 @@ 5 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 23, "z": 5, "y": 0 @@ -178,7 +178,7 @@ 4 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 10, "z": 7, "y": 0 @@ -192,7 +192,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 57, "z": 2, "y": 0 @@ -206,7 +206,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 61, "z": 2, "y": 0 diff --git a/res/field/events/events_0211.json b/res/field/events/events_0211.json index cf0998d2af..0b6e696236 100644 --- a/res/field/events/events_0211.json +++ b/res/field/events/events_0211.json @@ -29,7 +29,7 @@ 5 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 26, "z": 16, "y": 0 @@ -45,7 +45,7 @@ 3 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 20, "z": 22, "y": 0 diff --git a/res/field/events/events_0212.json b/res/field/events/events_0212.json index f147226d2f..1c053d662c 100644 --- a/res/field/events/events_0212.json +++ b/res/field/events/events_0212.json @@ -12,7 +12,7 @@ 6 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 10, "z": 15, "y": 0 diff --git a/res/field/events/events_0213.json b/res/field/events/events_0213.json index fbf49a34d1..30b3fd87c5 100644 --- a/res/field/events/events_0213.json +++ b/res/field/events/events_0213.json @@ -59,7 +59,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 6, "z": 7, "y": 0 @@ -73,7 +73,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 23, "y": 0 @@ -87,7 +87,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 25, "z": 6, "y": 0 @@ -101,7 +101,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 18, "z": 29, "y": 0 @@ -115,7 +115,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 17, "z": 30, "y": 0 @@ -129,7 +129,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 13, "z": 34, "y": 0 @@ -143,7 +143,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 15, "z": 35, "y": 0 @@ -157,7 +157,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 14, "z": 38, "y": 0 @@ -171,7 +171,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 15, "z": 41, "y": 0 @@ -185,7 +185,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 14, "z": 43, "y": 0 @@ -199,7 +199,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 26, "z": 54, "y": 0 @@ -213,7 +213,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 25, "z": 55, "y": 0 @@ -227,7 +227,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 6, "z": 57, "y": 0 @@ -243,7 +243,7 @@ 4 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 20, "z": 7, "y": 0 @@ -259,7 +259,7 @@ 4 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 48, "y": 0 @@ -276,7 +276,7 @@ 2 ], "movement_range_x": 0, - "movement_range_y": 10, + "movement_range_z": 10, "x": 25, "z": 31, "y": 0 @@ -290,7 +290,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 16, "z": 14, "y": 0 diff --git a/res/field/events/events_0215.json b/res/field/events/events_0215.json index 4d8e9d8d68..4d51627d05 100644 --- a/res/field/events/events_0215.json +++ b/res/field/events/events_0215.json @@ -51,7 +51,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 24, "z": 9, "y": 0 @@ -65,7 +65,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 22, "z": 26, "y": 0 @@ -79,7 +79,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 25, "z": 26, "y": 0 @@ -93,7 +93,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 26, "z": 27, "y": 0 @@ -107,7 +107,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 21, "z": 41, "y": 0 @@ -121,7 +121,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 10, "z": 36, "y": 0 @@ -135,7 +135,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 12, "z": 52, "y": 0 @@ -149,7 +149,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 29, "z": 30, "y": 0 @@ -163,7 +163,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 15, "z": 34, "y": 0 @@ -177,7 +177,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 18, "z": 39, "y": 0 @@ -191,7 +191,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 18, "z": 43, "y": 0 @@ -205,7 +205,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 14, "z": 26, "y": 0 @@ -219,7 +219,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 2, "z": 31, "y": 0 @@ -233,7 +233,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 28, "z": 43, "y": 0 @@ -247,7 +247,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 12, "z": 60, "y": 0 @@ -261,7 +261,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 19, "z": 41, "y": 0 @@ -275,7 +275,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 14, "z": 10, "y": 0 @@ -289,7 +289,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 14, "z": 11, "y": 0 @@ -303,7 +303,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 12, "z": 37, "y": 0 diff --git a/res/field/events/events_0216.json b/res/field/events/events_0216.json index 11eb16d6c1..11051b92a1 100644 --- a/res/field/events/events_0216.json +++ b/res/field/events/events_0216.json @@ -43,7 +43,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 2, "z": 4, "y": 0 @@ -57,7 +57,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 15, "y": 0 @@ -71,7 +71,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 13, "z": 17, "y": 0 @@ -85,7 +85,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 25, "z": 13, "y": 0 @@ -99,7 +99,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 28, "z": 14, "y": 0 @@ -113,7 +113,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 29, "z": 15, "y": 0 @@ -127,7 +127,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 6, "z": 23, "y": 0 @@ -141,7 +141,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 25, "y": 0 @@ -155,7 +155,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 28, "y": 0 @@ -169,7 +169,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 30, "y": 0 @@ -183,7 +183,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 34, "y": 0 @@ -197,7 +197,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 29, "z": 30, "y": 0 @@ -211,7 +211,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 43, "y": 0 @@ -225,7 +225,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 45, "y": 0 @@ -239,7 +239,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 57, "y": 0 @@ -253,7 +253,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 60, "y": 0 @@ -267,7 +267,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 17, "z": 12, "y": 0 @@ -281,7 +281,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 26, "y": 0 @@ -295,7 +295,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 17, "z": 11, "y": 0 @@ -309,7 +309,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 6, "z": 18, "y": 0 @@ -323,7 +323,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 22, "z": 36, "y": 0 @@ -337,7 +337,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 26, "z": 17, "y": 0 @@ -351,7 +351,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 29, "z": 32, "y": 0 @@ -365,7 +365,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 2, "z": 60, "y": 0 diff --git a/res/field/events/events_0217.json b/res/field/events/events_0217.json index f848969da9..83a13abc3d 100644 --- a/res/field/events/events_0217.json +++ b/res/field/events/events_0217.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 30, "z": 48, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 31, "z": 28, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 33, "z": 32, "y": 0 @@ -52,7 +52,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 32, "z": 48, "y": 0 @@ -66,7 +66,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 29, "z": 32, "y": 0 @@ -80,7 +80,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 30, "z": 35, "y": 0 diff --git a/res/field/events/events_0218.json b/res/field/events/events_0218.json index 84f522e769..cb5281c801 100644 --- a/res/field/events/events_0218.json +++ b/res/field/events/events_0218.json @@ -27,7 +27,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 31, "z": 30, "y": 0 @@ -41,7 +41,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 31, "z": 28, "y": 0 @@ -55,7 +55,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 29, "z": 33, "y": 0 @@ -69,7 +69,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 33, "z": 33, "y": 0 @@ -83,7 +83,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 30, "z": 48, "y": 0 @@ -97,7 +97,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 32, "z": 48, "y": 0 diff --git a/res/field/events/events_0224.json b/res/field/events/events_0224.json index 4303c29267..f8d8497089 100644 --- a/res/field/events/events_0224.json +++ b/res/field/events/events_0224.json @@ -10,7 +10,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 6, "y": 0 diff --git a/res/field/events/events_0226.json b/res/field/events/events_0226.json index 5373d64f74..5dc0eeaa84 100644 --- a/res/field/events/events_0226.json +++ b/res/field/events/events_0226.json @@ -12,7 +12,7 @@ 1 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 6, "y": 0 diff --git a/res/field/events/events_0235.json b/res/field/events/events_0235.json index 9ff5e484ee..e61c3d1a1c 100644 --- a/res/field/events/events_0235.json +++ b/res/field/events/events_0235.json @@ -35,7 +35,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 9, "y": 0 @@ -49,7 +49,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 6, "z": 9, "y": 0 @@ -63,7 +63,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 7, "y": 0 @@ -77,7 +77,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 6, "z": 7, "y": 0 diff --git a/res/field/events/events_0238.json b/res/field/events/events_0238.json index 6690ad7525..ce7c6af622 100644 --- a/res/field/events/events_0238.json +++ b/res/field/events/events_0238.json @@ -35,7 +35,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 42, "z": 48, "y": 0 @@ -49,7 +49,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 28, "z": 46, "y": 0 @@ -63,7 +63,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 61, "y": 0 @@ -77,7 +77,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 13, "z": 38, "y": 0 @@ -91,7 +91,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 44, "z": 36, "y": 0 @@ -107,7 +107,7 @@ 2 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 69, "y": 0 @@ -123,7 +123,7 @@ 1 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 30, "z": 41, "y": 0 @@ -139,7 +139,7 @@ 3 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 31, "z": 58, "y": 0 @@ -155,7 +155,7 @@ 2 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 10, "z": 42, "y": 0 @@ -171,7 +171,7 @@ 2 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 27, "z": 25, "y": 0 @@ -187,7 +187,7 @@ 3 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 40, "z": 31, "y": 0 @@ -201,7 +201,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 45, "z": 33, "y": 0 diff --git a/res/field/events/events_0239.json b/res/field/events/events_0239.json index bcf17f11b3..9e1b510276 100644 --- a/res/field/events/events_0239.json +++ b/res/field/events/events_0239.json @@ -27,7 +27,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 16, "z": 4, "y": 0 @@ -41,7 +41,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 5, "y": 0 @@ -55,7 +55,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 34, "z": 22, "y": 0 @@ -69,7 +69,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 43, "z": 12, "y": 0 @@ -85,7 +85,7 @@ 4 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 27, "y": 0 @@ -101,7 +101,7 @@ 4 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 15, "z": 37, "y": 0 @@ -117,7 +117,7 @@ 4 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 23, "z": 29, "y": 0 @@ -133,7 +133,7 @@ 2 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 57, "z": 20, "y": 0 @@ -149,7 +149,7 @@ 2 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 57, "z": 19, "y": 0 @@ -163,7 +163,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 18, "z": 3, "y": 0 @@ -177,7 +177,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 18, "z": 4, "y": 0 @@ -191,7 +191,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 18, "z": 5, "y": 0 @@ -205,7 +205,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 9, "z": 16, "y": 0 @@ -219,7 +219,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 14, "z": 16, "y": 0 @@ -233,7 +233,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 9, "z": 36, "y": 0 @@ -247,7 +247,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 16, "z": 28, "y": 0 @@ -261,7 +261,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 17, "z": 28, "y": 0 @@ -275,7 +275,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 16, "z": 29, "y": 0 @@ -289,7 +289,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 6, "z": 32, "y": 0 @@ -303,7 +303,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 32, "y": 0 @@ -317,7 +317,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 22, "z": 38, "y": 0 @@ -331,7 +331,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 23, "z": 37, "y": 0 @@ -345,7 +345,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 24, "z": 38, "y": 0 @@ -359,7 +359,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 41, "z": 34, "y": 0 @@ -373,7 +373,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 41, "z": 32, "y": 0 @@ -387,7 +387,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 42, "z": 30, "y": 0 @@ -401,7 +401,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 15, "z": 16, "y": 0 @@ -415,7 +415,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 16, "z": 19, "y": 0 @@ -429,7 +429,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 17, "z": 19, "y": 0 @@ -443,7 +443,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 34, "y": 0 @@ -457,7 +457,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 41, "z": 31, "y": 0 @@ -471,7 +471,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 9, "z": 10, "y": 0 diff --git a/res/field/events/events_0240.json b/res/field/events/events_0240.json index a0895d6ea7..2598e5d106 100644 --- a/res/field/events/events_0240.json +++ b/res/field/events/events_0240.json @@ -27,7 +27,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 13, "z": 18, "y": 0 @@ -43,7 +43,7 @@ 1 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 33, "z": 43, "y": 0 @@ -59,7 +59,7 @@ 1 ], "movement_range_x": 6, - "movement_range_y": 1, + "movement_range_z": 1, "x": 33, "z": 44, "y": 0 @@ -75,7 +75,7 @@ 3 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 10, "z": 6, "y": 0 @@ -91,7 +91,7 @@ 4 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 22, "z": 29, "y": 0 @@ -107,7 +107,7 @@ 2 ], "movement_range_x": 0, - "movement_range_y": 6, + "movement_range_z": 6, "x": 32, "z": 14, "y": 0 @@ -121,7 +121,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 33, "z": 16, "y": 0 @@ -135,7 +135,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 35, "z": 39, "y": 0 diff --git a/res/field/events/events_0241.json b/res/field/events/events_0241.json index a406d71ae9..ba54b1f6ee 100644 --- a/res/field/events/events_0241.json +++ b/res/field/events/events_0241.json @@ -51,7 +51,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 44, "z": 9, "y": 1 @@ -65,7 +65,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 14, "z": 7, "y": 1 @@ -79,7 +79,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 14, "z": 4, "y": 1 @@ -93,7 +93,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 27, "z": 60, "y": 1 @@ -109,7 +109,7 @@ 3 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 10, "z": 47, "y": 1 @@ -125,7 +125,7 @@ 3 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 6, "z": 47, "y": 1 @@ -141,7 +141,7 @@ 4 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 13, "y": 1 @@ -157,7 +157,7 @@ 1 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 6, "z": 17, "y": 1 @@ -173,7 +173,7 @@ 1 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 16, "z": 12, "y": 1 @@ -189,7 +189,7 @@ 1 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 16, "z": 10, "y": 1 @@ -205,7 +205,7 @@ 1 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 44, "z": 57, "y": 1 @@ -221,7 +221,7 @@ 1 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 42, "z": 57, "y": 1 @@ -237,7 +237,7 @@ 1 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 38, "z": 17, "y": 1 @@ -253,7 +253,7 @@ 1 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 36, "z": 17, "y": 1 @@ -269,7 +269,7 @@ 1 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 28, "z": 12, "y": 1 @@ -285,7 +285,7 @@ 1 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 28, "z": 10, "y": 1 @@ -301,7 +301,7 @@ 1 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 46, "z": 25, "y": 1 @@ -317,7 +317,7 @@ 1 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 46, "z": 23, "y": 1 @@ -331,7 +331,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 6, "z": 51, "y": 0 @@ -345,7 +345,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 31, "y": 1 @@ -359,7 +359,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 28, "y": 1 @@ -373,7 +373,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 25, "y": 1 @@ -387,7 +387,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 9, "y": 1 @@ -401,7 +401,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 10, "z": 7, "y": 1 @@ -415,7 +415,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 5, "y": 1 @@ -429,7 +429,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 12, "z": 32, "y": 1 @@ -443,7 +443,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 12, "z": 31, "y": 1 @@ -457,7 +457,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 21, "z": 11, "y": 1 @@ -471,7 +471,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 58, "y": 1 diff --git a/res/field/events/events_0245.json b/res/field/events/events_0245.json index eb3006ba4e..9be8a8c88e 100644 --- a/res/field/events/events_0245.json +++ b/res/field/events/events_0245.json @@ -10,7 +10,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 28, "z": 48, "y": 0 diff --git a/res/field/events/events_0246.json b/res/field/events/events_0246.json index 5f8244f089..0d57022f4f 100644 --- a/res/field/events/events_0246.json +++ b/res/field/events/events_0246.json @@ -10,7 +10,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 10, "z": 46, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 53, "z": 46, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 37, "z": 20, "y": 0 @@ -52,7 +52,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 27, "z": 36, "y": 0 @@ -66,7 +66,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 45, "z": 42, "y": 0 @@ -80,7 +80,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 12, "z": 45, "y": 0 @@ -94,7 +94,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 40, "z": 26, "y": 0 @@ -108,7 +108,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 41, "z": 26, "y": 0 @@ -122,7 +122,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 37, "z": 12, "y": 0 @@ -136,7 +136,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 36, "z": 12, "y": 0 @@ -150,7 +150,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 17, "z": 33, "y": 0 @@ -164,7 +164,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 16, "z": 33, "y": 0 @@ -178,7 +178,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 47, "z": 30, "y": 0 @@ -192,7 +192,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 48, "z": 30, "y": 0 @@ -206,7 +206,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 41, "z": 9, "y": 0 @@ -220,7 +220,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 20, "z": 13, "y": 0 diff --git a/res/field/events/events_0247.json b/res/field/events/events_0247.json index ac8cbd01ef..cd15071002 100644 --- a/res/field/events/events_0247.json +++ b/res/field/events/events_0247.json @@ -10,7 +10,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 23, "z": 44, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 22, "z": 43, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 22, "z": 42, "y": 0 @@ -52,7 +52,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 17, "z": 40, "y": 0 @@ -66,7 +66,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 12, "z": 41, "y": 0 @@ -80,7 +80,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 13, "z": 39, "y": 0 @@ -94,7 +94,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 9, "z": 40, "y": 0 @@ -108,7 +108,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 40, "y": 0 @@ -122,7 +122,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 10, "z": 39, "y": 0 @@ -136,7 +136,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 10, "z": 38, "y": 0 @@ -150,7 +150,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 38, "y": 0 @@ -164,7 +164,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 37, "y": 0 @@ -178,7 +178,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 12, "z": 37, "y": 0 @@ -192,7 +192,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 11, "z": 36, "y": 0 @@ -206,7 +206,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 24, "y": 0 @@ -220,7 +220,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 22, "y": 0 @@ -234,7 +234,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 2, "z": 20, "y": 0 @@ -248,7 +248,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 16, "y": 0 @@ -262,7 +262,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 13, "y": 0 @@ -276,7 +276,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 12, "y": 0 @@ -290,7 +290,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 8, "y": 0 @@ -304,7 +304,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 11, "z": 12, "y": 0 @@ -318,7 +318,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 12, "z": 12, "y": 0 @@ -332,7 +332,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 13, "z": 12, "y": 0 @@ -346,7 +346,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 11, "z": 13, "y": 0 @@ -360,7 +360,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 12, "z": 13, "y": 0 @@ -374,7 +374,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 13, "z": 13, "y": 0 @@ -388,7 +388,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 38, "y": 0 @@ -402,7 +402,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 17, "z": 11, "y": 0 @@ -416,7 +416,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 28, "z": 5, "y": 0 @@ -430,7 +430,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 22, "z": 44, "y": 0 diff --git a/res/field/events/events_0249.json b/res/field/events/events_0249.json index 9760c2725a..85f14379ad 100644 --- a/res/field/events/events_0249.json +++ b/res/field/events/events_0249.json @@ -99,7 +99,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 12, "z": 47, "y": 0 @@ -113,7 +113,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 13, "z": 47, "y": 0 @@ -127,7 +127,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 12, "z": 46, "y": 0 @@ -141,7 +141,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 13, "z": 47, "y": 0 @@ -155,7 +155,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 14, "z": 15, "y": 0 @@ -169,7 +169,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 46, "z": 28, "y": 0 @@ -183,7 +183,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 20, "z": 27, "y": 0 @@ -197,7 +197,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 11, "z": 35, "y": 0 diff --git a/res/field/events/events_0250.json b/res/field/events/events_0250.json index 0eafce8bb1..9cf5c150b2 100644 --- a/res/field/events/events_0250.json +++ b/res/field/events/events_0250.json @@ -10,7 +10,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 1, + "movement_range_z": 1, "x": 5, "z": 3, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 6, "z": 6, "y": 0 diff --git a/res/field/events/events_0251.json b/res/field/events/events_0251.json index 785474bf5e..8b12b7bc9a 100644 --- a/res/field/events/events_0251.json +++ b/res/field/events/events_0251.json @@ -12,7 +12,7 @@ 3 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 24, "z": 21, "y": 0 @@ -28,7 +28,7 @@ 3 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 17, "z": 25, "y": 1 @@ -42,7 +42,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 19, "z": 6, "y": 0 @@ -56,7 +56,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 14, "z": 4, "y": 0 @@ -70,7 +70,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 12, "z": 10, "y": 0 @@ -84,7 +84,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 11, "z": 11, "y": 0 @@ -98,7 +98,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 11, "z": 25, "y": 0 @@ -112,7 +112,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 13, "z": 26, "y": 0 @@ -126,7 +126,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 15, "z": 26, "y": 0 @@ -140,7 +140,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 25, "z": 24, "y": 0 @@ -154,7 +154,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 20, "y": 1 diff --git a/res/field/events/events_0252.json b/res/field/events/events_0252.json index 84e4f7fd9d..a1e1c5b067 100644 --- a/res/field/events/events_0252.json +++ b/res/field/events/events_0252.json @@ -12,7 +12,7 @@ 3 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 13, "z": 17, "y": 1 @@ -26,7 +26,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 9, "z": 12, "y": 0 @@ -40,7 +40,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 12, "y": 0 @@ -54,7 +54,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 19, "y": 0 @@ -68,7 +68,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 38, "z": 19, "y": 0 @@ -82,7 +82,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 28, "z": 18, "y": 0 @@ -96,7 +96,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 39, "z": 13, "y": 0 @@ -110,7 +110,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 43, "z": 13, "y": 0 @@ -124,7 +124,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 47, "z": 13, "y": 0 @@ -138,7 +138,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 53, "z": 10, "y": 0 @@ -152,7 +152,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 55, "z": 8, "y": 0 @@ -166,7 +166,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 9, "y": 0 @@ -180,7 +180,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 21, "y": 0 @@ -194,7 +194,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 23, "z": 10, "y": 0 @@ -208,7 +208,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 57, "z": 12, "y": 0 @@ -222,7 +222,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 37, "z": 12, "y": 0 @@ -236,7 +236,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 41, "z": 11, "y": 0 diff --git a/res/field/events/events_0253.json b/res/field/events/events_0253.json index c58bcf6a36..9275ab7edd 100644 --- a/res/field/events/events_0253.json +++ b/res/field/events/events_0253.json @@ -10,7 +10,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 40, "z": 277, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 40, "z": 276, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 40, "z": 275, "y": 0 @@ -52,7 +52,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 40, "z": 278, "y": 0 diff --git a/res/field/events/events_0254.json b/res/field/events/events_0254.json index 148a068854..b509ab8a15 100644 --- a/res/field/events/events_0254.json +++ b/res/field/events/events_0254.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 16, "z": 15, "y": 1 @@ -24,7 +24,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 16, "z": 15, "y": 1 diff --git a/res/field/events/events_0255.json b/res/field/events/events_0255.json index 1f66bbe8b1..fb70694609 100644 --- a/res/field/events/events_0255.json +++ b/res/field/events/events_0255.json @@ -10,7 +10,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 740, "z": 248, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 762, "z": 232, "y": 0 @@ -40,7 +40,7 @@ 1 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 749, "z": 248, "y": 0 @@ -54,7 +54,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 748, "z": 232, "y": 0 @@ -68,7 +68,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 751, "z": 232, "y": 0 @@ -82,7 +82,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 750, "z": 233, "y": 0 @@ -96,7 +96,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 742, "z": 232, "y": 0 @@ -110,7 +110,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 742, "z": 233, "y": 0 diff --git a/res/field/events/events_0256.json b/res/field/events/events_0256.json index 2c074fab4d..b22e706a05 100644 --- a/res/field/events/events_0256.json +++ b/res/field/events/events_0256.json @@ -19,7 +19,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 20, "z": 26, "y": 0 @@ -33,7 +33,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 11, "z": 11, "y": 0 @@ -47,7 +47,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 15, "z": 17, "y": 0 @@ -61,7 +61,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 18, "z": 15, "y": 0 @@ -75,7 +75,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 21, "z": 26, "y": 0 @@ -89,7 +89,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 26, "z": 15, "y": 0 @@ -103,7 +103,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 26, "z": 16, "y": 0 @@ -117,7 +117,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 26, "z": 17, "y": 0 @@ -131,7 +131,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 27, "z": 13, "y": 0 @@ -145,7 +145,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 18, "z": 9, "y": 0 @@ -159,7 +159,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 6, "z": 6, "y": 0 @@ -173,7 +173,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 23, "y": 0 @@ -187,7 +187,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 33, "z": 25, "y": 0 @@ -201,7 +201,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 25, "z": 7, "y": 0 @@ -215,7 +215,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 20, "z": 24, "y": 0 @@ -229,7 +229,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 19, "z": 24, "y": 0 @@ -243,7 +243,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 21, "z": 24, "y": 0 diff --git a/res/field/events/events_0257.json b/res/field/events/events_0257.json index e02ab5036f..d896f44bb5 100644 --- a/res/field/events/events_0257.json +++ b/res/field/events/events_0257.json @@ -67,7 +67,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 43, "z": 30, "y": 0 @@ -81,7 +81,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 20, "z": 30, "y": 0 @@ -95,7 +95,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 29, "z": 12, "y": 0 @@ -109,7 +109,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 53, "z": 52, "y": 0 @@ -123,7 +123,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 60, "z": 53, "y": 0 @@ -137,7 +137,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 41, "z": 15, "y": 0 @@ -151,7 +151,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 11, "z": 44, "y": 0 @@ -165,7 +165,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 49, "z": 49, "y": 0 @@ -179,7 +179,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 54, "z": 3, "y": 0 @@ -193,7 +193,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 12, "z": 76, "y": 0 @@ -207,7 +207,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 56, "z": 77, "y": 0 @@ -221,7 +221,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 69, "z": 55, "y": 0 @@ -235,7 +235,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 92, "z": 3, "y": 0 @@ -249,7 +249,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 38, "z": 44, "y": 0 @@ -263,7 +263,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 42, "z": 68, "y": 0 @@ -279,7 +279,7 @@ 3 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 31, "z": 73, "y": 0 @@ -295,7 +295,7 @@ 2 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 33, "z": 76, "y": 0 @@ -311,7 +311,7 @@ 1 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 52, "z": 11, "y": 0 @@ -327,7 +327,7 @@ 1 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 54, "z": 11, "y": 0 @@ -343,7 +343,7 @@ 2 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 86, "z": 75, "y": 0 @@ -359,7 +359,7 @@ 2 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 83, "z": 75, "y": 0 @@ -375,7 +375,7 @@ 3 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 48, "z": 53, "y": 0 @@ -391,7 +391,7 @@ 3 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 48, "z": 57, "y": 0 @@ -407,7 +407,7 @@ 3 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 13, "z": 36, "y": 0 @@ -423,7 +423,7 @@ 3 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 9, "z": 36, "y": 0 @@ -439,7 +439,7 @@ 1 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 15, "z": 22, "y": 0 @@ -455,7 +455,7 @@ 1 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 17, "z": 22, "y": 0 @@ -471,7 +471,7 @@ 1 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 77, "z": 64, "y": 0 @@ -487,7 +487,7 @@ 1 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 77, "z": 66, "y": 0 @@ -503,7 +503,7 @@ 5 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 62, "z": 10, "y": 0 @@ -519,7 +519,7 @@ 2 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 67, "z": 12, "y": 0 diff --git a/res/field/events/events_0258.json b/res/field/events/events_0258.json index 9634134b81..711c5b0b00 100644 --- a/res/field/events/events_0258.json +++ b/res/field/events/events_0258.json @@ -10,7 +10,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 9, "z": 13, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 6, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 6, "z": 16, "y": 0 @@ -52,7 +52,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 8, "y": 0 @@ -66,7 +66,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 10, "z": 13, "y": 0 @@ -80,7 +80,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 11, "y": 0 @@ -94,7 +94,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 10, "z": 13, "y": 0 @@ -108,7 +108,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 17, "y": 0 @@ -122,7 +122,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 17, "y": 0 @@ -136,7 +136,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 6, "z": 12, "y": 0 @@ -150,7 +150,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 12, "y": 0 diff --git a/res/field/events/events_0259.json b/res/field/events/events_0259.json index c6255715be..bd6b9f1c9a 100644 --- a/res/field/events/events_0259.json +++ b/res/field/events/events_0259.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 31, "z": 17, "y": 0 diff --git a/res/field/events/events_0262.json b/res/field/events/events_0262.json index 98bbe2f128..a6f6f64833 100644 --- a/res/field/events/events_0262.json +++ b/res/field/events/events_0262.json @@ -43,7 +43,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 11, "z": 14, "y": 0 @@ -57,7 +57,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 11, "z": 13, "y": 0 diff --git a/res/field/events/events_0263.json b/res/field/events/events_0263.json index ca2e1c16d1..8114989fae 100644 --- a/res/field/events/events_0263.json +++ b/res/field/events/events_0263.json @@ -10,7 +10,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 9, "z": 7, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 13, "z": 7, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 9, "z": 15, "y": 0 @@ -52,7 +52,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 12, "z": 6, "y": 0 @@ -66,7 +66,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 11, "z": 5, "y": 0 @@ -80,7 +80,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 10, "z": 6, "y": 0 @@ -94,7 +94,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 10, "z": 16, "y": 0 @@ -108,7 +108,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 11, "z": 17, "y": 0 @@ -122,7 +122,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 12, "z": 16, "y": 0 @@ -136,7 +136,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 13, "z": 15, "y": 0 @@ -150,7 +150,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 11, "z": 11, "y": 0 diff --git a/res/field/events/events_0264.json b/res/field/events/events_0264.json index 492fd8b0de..98c6b1362b 100644 --- a/res/field/events/events_0264.json +++ b/res/field/events/events_0264.json @@ -10,7 +10,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 9, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 13, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 15, "z": 9, "y": 0 @@ -52,7 +52,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 6, "z": 12, "y": 0 @@ -66,7 +66,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 11, "y": 0 @@ -80,7 +80,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 6, "z": 10, "y": 0 @@ -94,7 +94,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 15, "z": 13, "y": 0 @@ -108,7 +108,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 16, "z": 12, "y": 0 @@ -122,7 +122,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 17, "z": 11, "y": 0 @@ -136,7 +136,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 16, "z": 10, "y": 0 @@ -150,7 +150,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 11, "z": 11, "y": 0 diff --git a/res/field/events/events_0265.json b/res/field/events/events_0265.json index e3461a0dc2..3571e45607 100644 --- a/res/field/events/events_0265.json +++ b/res/field/events/events_0265.json @@ -10,7 +10,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 13, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 6, "z": 12, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 11, "y": 0 @@ -52,7 +52,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 10, "y": 0 @@ -66,7 +66,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 9, "y": 0 @@ -80,7 +80,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 2, "z": 8, "y": 0 @@ -94,7 +94,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 15, "z": 9, "y": 0 @@ -108,7 +108,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 16, "z": 10, "y": 0 @@ -122,7 +122,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 17, "z": 11, "y": 0 @@ -136,7 +136,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 18, "z": 12, "y": 0 @@ -150,7 +150,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 19, "z": 13, "y": 0 @@ -164,7 +164,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 20, "z": 14, "y": 0 @@ -178,7 +178,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 11, "z": 11, "y": 0 diff --git a/res/field/events/events_0266.json b/res/field/events/events_0266.json index 9a7365f664..d0ed010e36 100644 --- a/res/field/events/events_0266.json +++ b/res/field/events/events_0266.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 911, "z": 203, "y": 0 diff --git a/res/field/events/events_0268.json b/res/field/events/events_0268.json index c829dde833..76b1be076d 100644 --- a/res/field/events/events_0268.json +++ b/res/field/events/events_0268.json @@ -10,7 +10,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 12, "z": 13, "y": 0 diff --git a/res/field/events/events_0269.json b/res/field/events/events_0269.json index 8e49d68140..735ae770d8 100644 --- a/res/field/events/events_0269.json +++ b/res/field/events/events_0269.json @@ -10,7 +10,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 9, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 9, "z": 12, "y": 0 diff --git a/res/field/events/events_0271.json b/res/field/events/events_0271.json index 68c1d90735..700bed83fd 100644 --- a/res/field/events/events_0271.json +++ b/res/field/events/events_0271.json @@ -10,7 +10,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 11, "z": 18, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 17, "y": 0 diff --git a/res/field/events/events_0272.json b/res/field/events/events_0272.json index f32d6cccbb..9a02bfabe9 100644 --- a/res/field/events/events_0272.json +++ b/res/field/events/events_0272.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 11, "z": 12, "y": 0 diff --git a/res/field/events/events_0273.json b/res/field/events/events_0273.json index 757343c1cd..4397588320 100644 --- a/res/field/events/events_0273.json +++ b/res/field/events/events_0273.json @@ -59,7 +59,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 56, "z": 55, "y": 0 @@ -73,7 +73,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 44, "y": 0 @@ -87,7 +87,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 15, "y": 0 @@ -101,7 +101,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 44, "z": 15, "y": 0 @@ -115,7 +115,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 72, "z": 13, "y": 0 @@ -131,7 +131,7 @@ 2 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 2, "z": 14, "y": 0 @@ -147,7 +147,7 @@ 2 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 14, "y": 0 @@ -163,7 +163,7 @@ 2 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 2, "z": 42, "y": 0 @@ -179,7 +179,7 @@ 2 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 42, "y": 0 @@ -195,7 +195,7 @@ 2 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 17, "z": 38, "y": 0 @@ -211,7 +211,7 @@ 1 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 91, "z": 48, "y": 0 @@ -227,7 +227,7 @@ 3 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 73, "z": 30, "y": 0 @@ -243,7 +243,7 @@ 3 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 77, "z": 30, "y": 0 @@ -259,7 +259,7 @@ 1 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 93, "z": 48, "y": 0 @@ -275,7 +275,7 @@ 2 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 20, "z": 38, "y": 0 @@ -289,7 +289,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 38, "z": 42, "y": 0 @@ -303,7 +303,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 35, "z": 29, "y": 0 @@ -317,7 +317,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 16, "z": 29, "y": 0 @@ -331,7 +331,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 44, "y": 0 @@ -345,7 +345,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 26, "z": 16, "y": 0 @@ -359,7 +359,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 9, "z": 3, "y": 0 @@ -373,7 +373,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 31, "z": 3, "y": 0 @@ -387,7 +387,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 54, "z": 29, "y": 0 @@ -401,7 +401,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 57, "z": 40, "y": 0 @@ -415,7 +415,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 66, "z": 52, "y": 0 @@ -429,7 +429,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 88, "z": 27, "y": 0 diff --git a/res/field/events/events_0274.json b/res/field/events/events_0274.json index b88220447c..de5b1da51a 100644 --- a/res/field/events/events_0274.json +++ b/res/field/events/events_0274.json @@ -27,7 +27,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 22, "z": 9, "y": 0 @@ -41,7 +41,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 31, "z": 16, "y": 0 @@ -55,7 +55,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 33, "z": 8, "y": 0 diff --git a/res/field/events/events_0275.json b/res/field/events/events_0275.json index 42d5af1a37..4f318d1b7d 100644 --- a/res/field/events/events_0275.json +++ b/res/field/events/events_0275.json @@ -10,7 +10,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 3, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 7, "y": 0 diff --git a/res/field/events/events_0277.json b/res/field/events/events_0277.json index 9451b9131e..b78f0e1718 100644 --- a/res/field/events/events_0277.json +++ b/res/field/events/events_0277.json @@ -19,7 +19,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 99, "z": 502, "y": 0 @@ -33,7 +33,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 117, "z": 490, "y": 0 diff --git a/res/field/events/events_0279.json b/res/field/events/events_0279.json index 41040c6068..9de9ede335 100644 --- a/res/field/events/events_0279.json +++ b/res/field/events/events_0279.json @@ -10,7 +10,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 6, "y": 0 @@ -26,7 +26,7 @@ 2 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 11, "z": 13, "y": 0 @@ -40,7 +40,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 8, "y": 0 diff --git a/res/field/events/events_0280.json b/res/field/events/events_0280.json index 5a0e0ecbf7..28f874b885 100644 --- a/res/field/events/events_0280.json +++ b/res/field/events/events_0280.json @@ -19,7 +19,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 21, "z": 15, "y": 0 @@ -33,7 +33,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 2, "z": 17, "y": 0 @@ -49,7 +49,7 @@ 3 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 17, "z": 16, "y": 0 @@ -63,7 +63,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 21, "y": 0 diff --git a/res/field/events/events_0281.json b/res/field/events/events_0281.json index 6a7e4b7f10..9998e6891e 100644 --- a/res/field/events/events_0281.json +++ b/res/field/events/events_0281.json @@ -19,7 +19,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 16, "z": 2, "y": 0 @@ -33,7 +33,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 17, "y": 0 @@ -49,7 +49,7 @@ 2 ], "movement_range_x": 6, - "movement_range_y": 1, + "movement_range_z": 1, "x": 4, "z": 5, "y": 0 @@ -65,7 +65,7 @@ 3 ], "movement_range_x": 4, - "movement_range_y": 6, + "movement_range_z": 6, "x": 1, "z": 19, "y": 0 diff --git a/res/field/events/events_0282.json b/res/field/events/events_0282.json index 081ebdb6aa..fdc37d488b 100644 --- a/res/field/events/events_0282.json +++ b/res/field/events/events_0282.json @@ -35,7 +35,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 38, "z": 15, "y": 0 @@ -49,7 +49,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 9, "z": 3, "y": 0 @@ -63,7 +63,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 16, "y": 0 @@ -77,7 +77,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 21, "z": 38, "y": 0 @@ -91,7 +91,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 34, "z": 3, "y": 0 @@ -105,7 +105,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 19, "z": 40, "y": 0 @@ -119,7 +119,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 19, "z": 41, "y": 0 @@ -135,7 +135,7 @@ 2 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 26, "z": 2, "y": 0 @@ -151,7 +151,7 @@ 5 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 21, "z": 4, "y": 0 @@ -167,7 +167,7 @@ 2 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 36, "z": 18, "y": 0 @@ -183,7 +183,7 @@ 2 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 36, "z": 21, "y": 0 @@ -199,7 +199,7 @@ 1 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 15, "z": 25, "y": 0 @@ -215,7 +215,7 @@ 3 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 14, "z": 28, "y": 0 @@ -231,7 +231,7 @@ 3 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 23, "z": 31, "y": 0 @@ -247,7 +247,7 @@ 3 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 27, "z": 31, "y": 0 @@ -261,7 +261,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 17, "z": 19, "y": 0 @@ -275,7 +275,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 1, "z": 23, "y": 0 diff --git a/res/field/events/events_0283.json b/res/field/events/events_0283.json index 7ca5fc4c6b..2be822d178 100644 --- a/res/field/events/events_0283.json +++ b/res/field/events/events_0283.json @@ -10,7 +10,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 14, "z": 7, "y": 0 diff --git a/res/field/events/events_0285.json b/res/field/events/events_0285.json index 6db2de4c08..592c3d0d4d 100644 --- a/res/field/events/events_0285.json +++ b/res/field/events/events_0285.json @@ -19,7 +19,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 19, "z": 4, "y": 0 @@ -33,7 +33,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 3, "y": 0 @@ -47,7 +47,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 37, "z": 6, "y": 0 diff --git a/res/field/events/events_0286.json b/res/field/events/events_0286.json index b1f38f9db9..c0ae43ce19 100644 --- a/res/field/events/events_0286.json +++ b/res/field/events/events_0286.json @@ -19,7 +19,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 6, "y": 0 diff --git a/res/field/events/events_0288.json b/res/field/events/events_0288.json index 6e267f4271..a1559b7e93 100644 --- a/res/field/events/events_0288.json +++ b/res/field/events/events_0288.json @@ -10,7 +10,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 4, "y": 0 diff --git a/res/field/events/events_0289.json b/res/field/events/events_0289.json index 7a341e373b..3398d94f3d 100644 --- a/res/field/events/events_0289.json +++ b/res/field/events/events_0289.json @@ -27,7 +27,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 4, "y": 0 diff --git a/res/field/events/events_0291.json b/res/field/events/events_0291.json index c9a8b6671c..b713e42b60 100644 --- a/res/field/events/events_0291.json +++ b/res/field/events/events_0291.json @@ -10,7 +10,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 20, "z": 4, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 20, "z": 5, "y": 0 diff --git a/res/field/events/events_0292.json b/res/field/events/events_0292.json index c9b73ebb58..d9b44010c8 100644 --- a/res/field/events/events_0292.json +++ b/res/field/events/events_0292.json @@ -10,7 +10,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 10, "z": 4, "y": 0 diff --git a/res/field/events/events_0293.json b/res/field/events/events_0293.json index ad397497a1..c965765a50 100644 --- a/res/field/events/events_0293.json +++ b/res/field/events/events_0293.json @@ -27,7 +27,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 29, "z": 15, "y": 0 @@ -41,7 +41,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 11, "z": 18, "y": 0 @@ -55,7 +55,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 52, "z": 14, "y": 0 @@ -71,7 +71,7 @@ 2 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 41, "z": 7, "y": 0 @@ -87,7 +87,7 @@ 6 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 17, "z": 6, "y": 0 @@ -101,7 +101,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 22, "z": 18, "y": 0 @@ -115,7 +115,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 23, "z": 18, "y": 0 @@ -129,7 +129,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 2, "z": 19, "y": 0 @@ -143,7 +143,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 19, "z": 21, "y": 0 @@ -157,7 +157,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 3, - "movement_range_y": 0, + "movement_range_z": 0, "x": 33, "z": 19, "y": 0 @@ -171,7 +171,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 16, "z": 6, "y": 0 diff --git a/res/field/events/events_0294.json b/res/field/events/events_0294.json index 560f3528b6..753fa3075c 100644 --- a/res/field/events/events_0294.json +++ b/res/field/events/events_0294.json @@ -107,7 +107,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 48, "z": 21, "y": 0 @@ -123,7 +123,7 @@ 3 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 10, "z": 6, "y": 0 @@ -139,7 +139,7 @@ 4 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 21, "z": 16, "y": 0 @@ -155,7 +155,7 @@ 4 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 26, "z": 16, "y": 0 @@ -171,7 +171,7 @@ 2 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 32, "z": 6, "y": 0 @@ -185,7 +185,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 11, "y": 0 @@ -199,7 +199,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 41, "z": 17, "y": 0 diff --git a/res/field/events/events_0295.json b/res/field/events/events_0295.json index b8c1690a09..71fb10ec61 100644 --- a/res/field/events/events_0295.json +++ b/res/field/events/events_0295.json @@ -43,7 +43,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 15, "z": 6, "y": 0 @@ -57,7 +57,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 36, "z": 12, "y": 0 @@ -74,7 +74,7 @@ 2 ], "movement_range_x": 8, - "movement_range_y": 0, + "movement_range_z": 0, "x": 9, "z": 20, "y": 0 @@ -90,7 +90,7 @@ 3 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 42, "z": 7, "y": 0 @@ -106,7 +106,7 @@ 3 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 42, "z": 3, "y": 0 @@ -120,7 +120,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 27, "z": 19, "y": 0 @@ -134,7 +134,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 28, "z": 19, "y": 0 @@ -150,7 +150,7 @@ 3 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 6, "y": 0 @@ -164,7 +164,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 50, "z": 21, "y": 0 @@ -178,7 +178,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 38, "z": 20, "y": 0 diff --git a/res/field/events/events_0296.json b/res/field/events/events_0296.json index 148f78a699..9999762b2f 100644 --- a/res/field/events/events_0296.json +++ b/res/field/events/events_0296.json @@ -35,7 +35,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 8, "y": 0 @@ -49,7 +49,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 14, "y": 0 @@ -63,7 +63,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 9, "z": 14, "y": 0 @@ -77,7 +77,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 18, "z": 14, "y": 0 @@ -91,7 +91,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 19, "z": 14, "y": 0 diff --git a/res/field/events/events_0297.json b/res/field/events/events_0297.json index e7bcf507e4..b343afd760 100644 --- a/res/field/events/events_0297.json +++ b/res/field/events/events_0297.json @@ -10,7 +10,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 7, "y": 0 diff --git a/res/field/events/events_0298.json b/res/field/events/events_0298.json index aca4de366a..2ae6607f0b 100644 --- a/res/field/events/events_0298.json +++ b/res/field/events/events_0298.json @@ -10,7 +10,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 26, "z": 5, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 5, + "movement_range_z": 5, "x": 8, "z": 10, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 29, "z": 11, "y": 0 @@ -54,7 +54,7 @@ 5 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 40, "z": 15, "y": 0 @@ -70,7 +70,7 @@ 3 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 71, "z": 10, "y": 0 @@ -84,7 +84,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 20, "z": 5, "y": 0 @@ -98,7 +98,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 14, "z": 8, "y": 0 @@ -112,7 +112,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 15, "z": 8, "y": 0 @@ -126,7 +126,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 62, "z": 3, "y": 0 diff --git a/res/field/events/events_0299.json b/res/field/events/events_0299.json index 5da9645202..f3ed3d2554 100644 --- a/res/field/events/events_0299.json +++ b/res/field/events/events_0299.json @@ -10,7 +10,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 48, "z": 43, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 49, "z": 43, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 57, "z": 43, "y": 0 @@ -52,7 +52,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 48, "z": 51, "y": 0 @@ -66,7 +66,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 48, "z": 43, "y": 0 @@ -80,7 +80,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 47, "z": 54, "y": 0 @@ -94,7 +94,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 25, "z": 54, "y": 0 diff --git a/res/field/events/events_0300.json b/res/field/events/events_0300.json index e426315314..ea78d2b3a0 100644 --- a/res/field/events/events_0300.json +++ b/res/field/events/events_0300.json @@ -12,7 +12,7 @@ 6 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 43, "z": 49, "y": 0 @@ -28,7 +28,7 @@ 4 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 48, "z": 43, "y": 0 @@ -44,7 +44,7 @@ 6 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 50, "z": 49, "y": 0 @@ -60,7 +60,7 @@ 4 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 53, "z": 43, "y": 0 @@ -74,7 +74,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 25, "z": 54, "y": 0 @@ -88,7 +88,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 53, "z": 39, "y": 0 @@ -102,7 +102,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 54, "z": 38, "y": 0 @@ -116,7 +116,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 55, "z": 38, "y": 0 @@ -130,7 +130,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 47, "z": 51, "y": 0 diff --git a/res/field/events/events_0301.json b/res/field/events/events_0301.json index b107020cd8..372d2dfa7e 100644 --- a/res/field/events/events_0301.json +++ b/res/field/events/events_0301.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 12, "z": 13, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 12, "z": 22, "y": 0 diff --git a/res/field/events/events_0302.json b/res/field/events/events_0302.json index ea3998efba..5fd034955e 100644 --- a/res/field/events/events_0302.json +++ b/res/field/events/events_0302.json @@ -19,7 +19,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 34, "z": 34, "y": 0 @@ -33,7 +33,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 13, "z": 13, "y": 0 @@ -47,7 +47,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 36, "z": 13, "y": 0 @@ -61,7 +61,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 36, "z": 19, "y": 0 @@ -77,7 +77,7 @@ 4 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 17, "z": 32, "y": 0 @@ -93,7 +93,7 @@ 1 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 29, "z": 18, "y": 0 @@ -109,7 +109,7 @@ 3 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 25, "z": 35, "y": 0 @@ -123,7 +123,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 17, "z": 15, "y": 0 @@ -137,7 +137,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 27, "z": 36, "y": 0 @@ -151,7 +151,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 12, "z": 13, "y": 0 @@ -165,7 +165,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 10, "z": 11, "y": 0 @@ -179,7 +179,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 13, "z": 11, "y": 0 @@ -193,7 +193,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 11, "z": 12, "y": 0 @@ -207,7 +207,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 19, "z": 34, "y": 0 @@ -221,7 +221,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 38, "z": 44, "y": 0 @@ -235,7 +235,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 44, "z": 33, "y": 0 @@ -249,7 +249,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 12, "z": 10, "y": 0 @@ -263,7 +263,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 14, "z": 11, "y": 0 @@ -277,7 +277,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 12, "z": 11, "y": 0 @@ -291,7 +291,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 10, "z": 12, "y": 0 @@ -305,7 +305,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 12, "z": 12, "y": 0 @@ -319,7 +319,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 23, "z": 19, "y": 0 @@ -333,7 +333,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 21, "z": 29, "y": 0 @@ -347,7 +347,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 28, "z": 28, "y": 0 @@ -361,7 +361,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 31, "z": 25, "y": 0 @@ -375,7 +375,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 30, "z": 38, "y": 0 @@ -389,7 +389,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 29, "z": 36, "y": 0 @@ -403,7 +403,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 11, "z": 11, "y": 0 @@ -417,7 +417,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 40, "z": 28, "y": 0 @@ -431,7 +431,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 53, "z": 46, "y": 0 diff --git a/res/field/events/events_0303.json b/res/field/events/events_0303.json index 0d51d91bc1..31910543e4 100644 --- a/res/field/events/events_0303.json +++ b/res/field/events/events_0303.json @@ -10,7 +10,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 53, "z": 46, "y": 0 diff --git a/res/field/events/events_0304.json b/res/field/events/events_0304.json index 2552e242b1..4ca20c030f 100644 --- a/res/field/events/events_0304.json +++ b/res/field/events/events_0304.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 16, "z": 14, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 14, "z": 19, "y": 0 diff --git a/res/field/events/events_0305.json b/res/field/events/events_0305.json index 3e93664353..2a6342f05d 100644 --- a/res/field/events/events_0305.json +++ b/res/field/events/events_0305.json @@ -10,7 +10,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 16, "z": 46, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 38, "z": 8, "y": 0 diff --git a/res/field/events/events_0306.json b/res/field/events/events_0306.json index 4c714cf4f7..75666252c6 100644 --- a/res/field/events/events_0306.json +++ b/res/field/events/events_0306.json @@ -10,7 +10,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 38, "z": 8, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 17, "z": 44, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 17, "z": 45, "y": 0 diff --git a/res/field/events/events_0307.json b/res/field/events/events_0307.json index 3738a8d157..a06bd5bfd4 100644 --- a/res/field/events/events_0307.json +++ b/res/field/events/events_0307.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 14, "z": 10, "y": 0 diff --git a/res/field/events/events_0308.json b/res/field/events/events_0308.json index f5036cc209..506e5bc1d8 100644 --- a/res/field/events/events_0308.json +++ b/res/field/events/events_0308.json @@ -10,7 +10,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 151, "z": 277, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 151, "z": 278, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 151, "z": 276, "y": 0 @@ -52,7 +52,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 151, "z": 275, "y": 0 diff --git a/res/field/events/events_0309.json b/res/field/events/events_0309.json index b4f7a74c5e..2ae62a710e 100644 --- a/res/field/events/events_0309.json +++ b/res/field/events/events_0309.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 16, "z": 13, "y": 0 diff --git a/res/field/events/events_0310.json b/res/field/events/events_0310.json index 5095b8aae5..38a5dad27e 100644 --- a/res/field/events/events_0310.json +++ b/res/field/events/events_0310.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 34, "z": 39, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 22, "z": 35, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 35, "z": 39, "y": 0 @@ -52,7 +52,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 22, "z": 13, "y": 0 @@ -66,7 +66,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 1, + "movement_range_z": 1, "x": 29, "z": 15, "y": 0 @@ -80,7 +80,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 29, "z": 37, "y": 0 @@ -94,7 +94,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 1, + "movement_range_z": 1, "x": 28, "z": 15, "y": 0 @@ -108,7 +108,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 2, + "movement_range_z": 2, "x": 15, "z": 40, "y": 0 @@ -122,7 +122,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 14, "z": 47, "y": 0 @@ -136,7 +136,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 26, "z": 47, "y": 0 @@ -150,7 +150,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 10, "z": 52, "y": 0 @@ -164,7 +164,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 23, "z": 40, "y": 0 @@ -178,7 +178,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 24, "z": 40, "y": 0 @@ -192,7 +192,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 27, "z": 35, "y": 0 diff --git a/res/field/events/events_0311.json b/res/field/events/events_0311.json index 67e8bac765..9e66bd77c5 100644 --- a/res/field/events/events_0311.json +++ b/res/field/events/events_0311.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 4, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 22, "z": 4, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 17, "z": 4, "y": 0 @@ -52,7 +52,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 18, "z": 4, "y": 0 @@ -66,7 +66,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 3, "z": 14, "y": 0 @@ -80,7 +80,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 1, + "movement_range_z": 1, "x": 23, "z": 14, "y": 0 @@ -94,7 +94,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 2, - "movement_range_y": 0, + "movement_range_z": 0, "x": 13, "z": 7, "y": 0 @@ -108,7 +108,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 19, "z": 12, "y": 0 @@ -122,7 +122,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 11, "z": 3, "y": 0 diff --git a/res/field/events/events_0312.json b/res/field/events/events_0312.json index 31c2b93d64..16ff204fc2 100644 --- a/res/field/events/events_0312.json +++ b/res/field/events/events_0312.json @@ -35,7 +35,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 15, "z": 5, "y": 0 @@ -49,7 +49,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 11, "z": 5, "y": 0 @@ -63,7 +63,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 19, "z": 5, "y": 0 @@ -77,7 +77,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 16, "z": 6, "y": 0 @@ -91,7 +91,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 2, + "movement_range_z": 2, "x": 2, "z": 14, "y": 0 @@ -105,7 +105,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 13, "z": 14, "y": 0 @@ -119,7 +119,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 6, "z": 10, "y": 0 @@ -133,7 +133,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 25, "z": 13, "y": 0 @@ -147,7 +147,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 25, "z": 14, "y": 0 @@ -161,7 +161,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 19, "z": 16, "y": 0 @@ -175,7 +175,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 20, "z": 16, "y": 0 @@ -189,7 +189,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 2, - "movement_range_y": 2, + "movement_range_z": 2, "x": 9, "z": 13, "y": 0 @@ -203,7 +203,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 13, "z": 18, "y": 0 @@ -217,7 +217,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 20, "z": 11, "y": 0 @@ -231,7 +231,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 24, "z": 7, "y": 0 diff --git a/res/field/events/events_0313.json b/res/field/events/events_0313.json index a54788c8e8..488e5872f1 100644 --- a/res/field/events/events_0313.json +++ b/res/field/events/events_0313.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 4, "y": 0 diff --git a/res/field/events/events_0314.json b/res/field/events/events_0314.json index 9f58f53fb8..d04b5ae8d8 100644 --- a/res/field/events/events_0314.json +++ b/res/field/events/events_0314.json @@ -10,7 +10,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 2, "z": 1, "y": 0 diff --git a/res/field/events/events_0315.json b/res/field/events/events_0315.json index b00a94f1f0..77a7aa4b06 100644 --- a/res/field/events/events_0315.json +++ b/res/field/events/events_0315.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 1, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 14, "z": 1, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 1, "y": 0 @@ -52,7 +52,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 14, "z": 1, "y": 0 diff --git a/res/field/events/events_0316.json b/res/field/events/events_0316.json index b3253b48f1..a61863ac66 100644 --- a/res/field/events/events_0316.json +++ b/res/field/events/events_0316.json @@ -10,7 +10,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 2, "z": 6, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 2, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 10, "y": 0 diff --git a/res/field/events/events_0317.json b/res/field/events/events_0317.json index 86d70c98d7..9490227177 100644 --- a/res/field/events/events_0317.json +++ b/res/field/events/events_0317.json @@ -10,7 +10,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 2, "z": 5, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 2, "z": 6, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 9, "y": 0 @@ -52,7 +52,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 9, "y": 0 @@ -66,7 +66,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 2, "y": 0 @@ -80,7 +80,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 2, "y": 0 diff --git a/res/field/events/events_0318.json b/res/field/events/events_0318.json index 94fd843091..2a5bad6f90 100644 --- a/res/field/events/events_0318.json +++ b/res/field/events/events_0318.json @@ -10,7 +10,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 12, "z": 4, "y": 0 diff --git a/res/field/events/events_0319.json b/res/field/events/events_0319.json index be89b2e04a..a850ee2bae 100644 --- a/res/field/events/events_0319.json +++ b/res/field/events/events_0319.json @@ -10,7 +10,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 12, "z": 4, "y": 0 diff --git a/res/field/events/events_0320.json b/res/field/events/events_0320.json index ed1f1e1a90..d89f765fa5 100644 --- a/res/field/events/events_0320.json +++ b/res/field/events/events_0320.json @@ -21,7 +21,7 @@ 3 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 79, "z": 846, "y": 0 diff --git a/res/field/events/events_0322.json b/res/field/events/events_0322.json index ce9a0f5516..214c99fa7d 100644 --- a/res/field/events/events_0322.json +++ b/res/field/events/events_0322.json @@ -43,7 +43,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 723, "z": 760, "y": 0 @@ -57,7 +57,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 718, "z": 760, "y": 0 @@ -71,7 +71,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 718, "z": 761, "y": 0 @@ -85,7 +85,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 712, "z": 783, "y": 0 @@ -99,7 +99,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 717, "z": 748, "y": 0 @@ -113,7 +113,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 719, "z": 790, "y": 0 @@ -128,7 +128,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 694, "z": 804, "y": 0 @@ -142,7 +142,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 704, "z": 792, "y": 0 @@ -156,7 +156,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 715, "z": 782, "y": 0 @@ -170,7 +170,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 724, "z": 788, "y": 0 @@ -184,7 +184,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 723, "z": 777, "y": 0 @@ -198,7 +198,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 712, "z": 780, "y": 0 diff --git a/res/field/events/events_0323.json b/res/field/events/events_0323.json index ac2819e6b1..5e487304a7 100644 --- a/res/field/events/events_0323.json +++ b/res/field/events/events_0323.json @@ -10,7 +10,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 13, "z": 3, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 15, "z": 3, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 3, "y": 0 @@ -52,7 +52,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 10, "z": 3, "y": 0 @@ -66,7 +66,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 17, "z": 8, "y": 0 @@ -80,7 +80,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 15, "z": 8, "y": 0 @@ -94,7 +94,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 3, "y": 0 @@ -108,7 +108,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 11, "y": 0 @@ -122,7 +122,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 6, "z": 11, "y": 0 @@ -136,7 +136,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 3, "y": 0 @@ -150,7 +150,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 6, "y": 0 @@ -164,7 +164,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 1, "z": 8, "y": 0 @@ -178,7 +178,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 8, "y": 0 @@ -192,7 +192,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 13, "z": 6, "y": 0 @@ -206,7 +206,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 12, "z": 11, "y": 0 @@ -220,7 +220,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 11, "z": 6, "y": 0 @@ -234,7 +234,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 14, "z": 11, "y": 0 @@ -248,7 +248,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 6, "y": 0 @@ -262,7 +262,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 10, "z": 12, "y": 0 diff --git a/res/field/events/events_0324.json b/res/field/events/events_0324.json index 2251633630..5efc46c291 100644 --- a/res/field/events/events_0324.json +++ b/res/field/events/events_0324.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 5, "z": 3, "y": 0 diff --git a/res/field/events/events_0325.json b/res/field/events/events_0325.json index 7a099aba19..f5a026b332 100644 --- a/res/field/events/events_0325.json +++ b/res/field/events/events_0325.json @@ -10,7 +10,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 3, "y": 0 diff --git a/res/field/events/events_0326.json b/res/field/events/events_0326.json index 113ee21cbe..805037cc27 100644 --- a/res/field/events/events_0326.json +++ b/res/field/events/events_0326.json @@ -10,7 +10,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 340, "z": 230, "y": 0 @@ -26,7 +26,7 @@ 3 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 309, "z": 242, "y": 0 @@ -40,7 +40,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 310, "z": 237, "y": 0 @@ -54,7 +54,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 323, "z": 235, "y": 0 diff --git a/res/field/events/events_0328.json b/res/field/events/events_0328.json index ef18ed0e65..a3d415d30d 100644 --- a/res/field/events/events_0328.json +++ b/res/field/events/events_0328.json @@ -10,7 +10,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 123, "z": 854, "y": 1 @@ -24,7 +24,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 140, "z": 842, "y": 1 @@ -38,7 +38,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 112, "z": 855, "y": 1 @@ -54,7 +54,7 @@ 4 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 109, "z": 856, "y": 0 @@ -70,7 +70,7 @@ 1 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 151, "z": 843, "y": 0 @@ -84,7 +84,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 105, "z": 853, "y": 0 @@ -98,7 +98,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 105, "z": 853, "y": 0 @@ -113,7 +113,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 165, "z": 843, "y": 0 @@ -128,7 +128,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 108, "z": 869, "y": 0 @@ -142,7 +142,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 153, "z": 847, "y": 1 @@ -156,7 +156,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 136, "z": 851, "y": 0 @@ -170,7 +170,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 2, - "movement_range_y": 0, + "movement_range_z": 0, "x": 142, "z": 855, "y": 0 @@ -184,7 +184,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 112, "z": 854, "y": 0 diff --git a/res/field/events/events_0329.json b/res/field/events/events_0329.json index 26c16a54bb..f025e8e0f2 100644 --- a/res/field/events/events_0329.json +++ b/res/field/events/events_0329.json @@ -21,7 +21,7 @@ 5 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 166, "z": 813, "y": 1 @@ -37,7 +37,7 @@ 4 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 181, "z": 818, "y": 1 @@ -53,7 +53,7 @@ 5 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 185, "z": 804, "y": 1 @@ -67,7 +67,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 174, "z": 827, "y": 1 @@ -83,7 +83,7 @@ 4 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 183, "z": 825, "y": 0 @@ -99,7 +99,7 @@ 3 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 176, "z": 804, "y": 0 @@ -113,7 +113,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 174, "z": 816, "y": 0 @@ -127,7 +127,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 169, "z": 808, "y": 0 @@ -141,7 +141,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 162, "z": 806, "y": 0 diff --git a/res/field/events/events_0330.json b/res/field/events/events_0330.json index 5ca3ca0bc0..f8860d4822 100644 --- a/res/field/events/events_0330.json +++ b/res/field/events/events_0330.json @@ -12,7 +12,7 @@ 5 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 234, "z": 757, "y": 0 @@ -28,7 +28,7 @@ 2 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 204, "z": 750, "y": 1 @@ -44,7 +44,7 @@ 1 ], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 243, "z": 757, "y": 0 @@ -60,7 +60,7 @@ 4 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 222, "z": 756, "y": 4 @@ -76,7 +76,7 @@ 5 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 240, "z": 748, "y": 1 @@ -90,7 +90,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 201, "z": 757, "y": 1 @@ -106,7 +106,7 @@ 2 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 200, "z": 756, "y": 0 @@ -122,7 +122,7 @@ 1 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 244, "z": 747, "y": 0 @@ -136,7 +136,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 238, "z": 752, "y": 0 @@ -150,7 +150,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 217, "z": 750, "y": 0 @@ -164,7 +164,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 222, "z": 745, "y": 0 @@ -178,7 +178,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 211, "z": 750, "y": 0 @@ -192,7 +192,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 206, "z": 757, "y": 0 @@ -209,7 +209,7 @@ 8 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 187, "z": 756, "y": 0 @@ -223,7 +223,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 231, "z": 754, "y": 0 diff --git a/res/field/events/events_0331.json b/res/field/events/events_0331.json index 5458844c8c..2c4b910676 100644 --- a/res/field/events/events_0331.json +++ b/res/field/events/events_0331.json @@ -12,7 +12,7 @@ 3 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 172, "z": 725, "y": 1 @@ -28,7 +28,7 @@ 5 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 171, "z": 712, "y": 1 @@ -44,7 +44,7 @@ 3 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 167, "z": 722, "y": 1 @@ -58,7 +58,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 173, "z": 706, "y": 0 @@ -74,7 +74,7 @@ 4 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 174, "z": 721, "y": 0 @@ -88,7 +88,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 170, "z": 706, "y": 0 @@ -102,7 +102,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 175, "z": 700, "y": 0 @@ -116,7 +116,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 162, "z": 732, "y": 0 @@ -130,7 +130,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 189, "z": 716, "y": 0 @@ -144,7 +144,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 177, "z": 722, "y": 0 diff --git a/res/field/events/events_0332.json b/res/field/events/events_0332.json index 348e440810..d670e66a47 100644 --- a/res/field/events/events_0332.json +++ b/res/field/events/events_0332.json @@ -12,7 +12,7 @@ 1 ], "movement_range_x": 4, - "movement_range_y": 0, + "movement_range_z": 0, "x": 182, "z": 685, "y": 5 @@ -28,7 +28,7 @@ 4 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 177, "z": 692, "y": 5 @@ -44,7 +44,7 @@ 3 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 175, "z": 679, "y": 5 @@ -60,7 +60,7 @@ 4 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 176, "z": 679, "y": 5 @@ -74,7 +74,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 175, "z": 700, "y": 5 @@ -90,7 +90,7 @@ 13 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 177, "z": 681, "y": 0 @@ -104,7 +104,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 170, "z": 706, "y": 0 @@ -118,7 +118,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 173, "z": 706, "y": 0 @@ -132,7 +132,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 181, "z": 678, "y": 0 @@ -146,7 +146,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 162, "z": 682, "y": 0 @@ -160,7 +160,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 191, "z": 676, "y": 0 @@ -174,7 +174,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 180, "z": 695, "y": 0 diff --git a/res/field/events/events_0333.json b/res/field/events/events_0333.json index 9b614e144c..61b17c4db6 100644 --- a/res/field/events/events_0333.json +++ b/res/field/events/events_0333.json @@ -21,7 +21,7 @@ 4 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 210, "z": 637, "y": 5 @@ -37,7 +37,7 @@ 3 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 215, "z": 633, "y": 5 @@ -53,7 +53,7 @@ 4 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 215, "z": 646, "y": 6 @@ -69,7 +69,7 @@ 2 ], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 215, "z": 619, "y": 7 @@ -85,7 +85,7 @@ 2 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 208, "z": 610, "y": 7 @@ -101,7 +101,7 @@ 2 ], "movement_range_x": 2, - "movement_range_y": 5, + "movement_range_z": 5, "x": 207, "z": 598, "y": 7 @@ -117,7 +117,7 @@ 2 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 215, "z": 659, "y": 0 @@ -133,7 +133,7 @@ 3 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 209, "z": 587, "y": 0 @@ -147,7 +147,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 209, "z": 584, "y": 0 @@ -161,7 +161,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 209, "z": 623, "y": 0 @@ -175,7 +175,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 204, "z": 618, "y": 0 @@ -189,7 +189,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 213, "z": 640, "y": 0 @@ -203,7 +203,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 218, "z": 653, "y": 5 @@ -217,7 +217,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 216, "z": 653, "y": 5 @@ -233,7 +233,7 @@ 2 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 202, "z": 658, "y": 0 @@ -249,7 +249,7 @@ 3 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 203, "z": 658, "y": 0 @@ -265,7 +265,7 @@ 4 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 211, "z": 614, "y": 0 @@ -281,7 +281,7 @@ 5 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 212, "z": 614, "y": 0 @@ -295,7 +295,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 211, "z": 661, "y": 0 @@ -312,7 +312,7 @@ 3 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 189, "z": 655, "y": 0 @@ -328,7 +328,7 @@ 3 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 208, "z": 595, "y": 7 @@ -344,7 +344,7 @@ 2 ], "movement_range_x": 3, - "movement_range_y": 3, + "movement_range_z": 3, "x": 206, "z": 625, "y": 6 @@ -358,7 +358,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 212, "z": 623, "y": 0 @@ -372,7 +372,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 219, "z": 618, "y": 0 @@ -386,7 +386,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 212, "z": 622, "y": 0 @@ -400,7 +400,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 219, "z": 596, "y": 0 @@ -414,7 +414,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 219, "z": 597, "y": 0 @@ -428,7 +428,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 220, "z": 600, "y": 0 @@ -442,7 +442,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 219, "z": 619, "y": 0 @@ -456,7 +456,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 219, "z": 608, "y": 0 @@ -470,7 +470,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 203, "z": 603, "y": 0 @@ -484,7 +484,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 212, "z": 653, "y": 0 diff --git a/res/field/events/events_0334.json b/res/field/events/events_0334.json index 36890e320d..5f4627af19 100644 --- a/res/field/events/events_0334.json +++ b/res/field/events/events_0334.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 6, "z": 5, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 5, "y": 0 diff --git a/res/field/events/events_0335.json b/res/field/events/events_0335.json index d9198e087b..5f85562e88 100644 --- a/res/field/events/events_0335.json +++ b/res/field/events/events_0335.json @@ -19,7 +19,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 274, "z": 531, "y": 7 @@ -33,7 +33,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 270, "z": 532, "y": 7 @@ -47,7 +47,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 277, "z": 535, "y": 7 @@ -63,7 +63,7 @@ 2 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 262, "z": 523, "y": 0 @@ -79,7 +79,7 @@ 1 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 281, "z": 532, "y": 0 @@ -93,7 +93,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 267, "z": 532, "y": 7 @@ -107,7 +107,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 274, "z": 541, "y": 0 @@ -123,7 +123,7 @@ 14 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 277, "z": 519, "y": 0 @@ -139,7 +139,7 @@ 15 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 278, "z": 519, "y": 0 @@ -155,7 +155,7 @@ 16 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 279, "z": 519, "y": 0 @@ -171,7 +171,7 @@ 17 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 280, "z": 519, "y": 0 @@ -188,7 +188,7 @@ 11 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 293, "z": 530, "y": 0 diff --git a/res/field/events/events_0336.json b/res/field/events/events_0336.json index 9d0b551d00..8861c664b7 100644 --- a/res/field/events/events_0336.json +++ b/res/field/events/events_0336.json @@ -29,7 +29,7 @@ 4 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 302, "z": 601, "y": 9 @@ -45,7 +45,7 @@ 1 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 299, "z": 611, "y": 8 @@ -61,7 +61,7 @@ 5 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 304, "z": 622, "y": 7 @@ -77,7 +77,7 @@ 2 ], "movement_range_x": 7, - "movement_range_y": 0, + "movement_range_z": 0, "x": 299, "z": 631, "y": 7 @@ -93,7 +93,7 @@ 3 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 303, "z": 644, "y": 6 @@ -109,7 +109,7 @@ 1 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 306, "z": 675, "y": 3 @@ -125,7 +125,7 @@ 1 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 300, "z": 660, "y": 4 @@ -141,7 +141,7 @@ 3 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 299, "z": 669, "y": 4 @@ -157,7 +157,7 @@ 4 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 305, "z": 700, "y": 0 @@ -173,7 +173,7 @@ 3 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 302, "z": 578, "y": 0 @@ -187,7 +187,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 310, "z": 690, "y": 0 @@ -201,7 +201,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 311, "z": 690, "y": 0 @@ -215,7 +215,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 312, "z": 679, "y": 0 @@ -229,7 +229,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 292, "z": 623, "y": 0 @@ -243,7 +243,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 313, "z": 679, "y": 0 @@ -259,7 +259,7 @@ 18 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 293, "z": 627, "y": 0 @@ -275,7 +275,7 @@ 19 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 294, "z": 627, "y": 0 @@ -291,7 +291,7 @@ 20 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 295, "z": 691, "y": 0 @@ -307,7 +307,7 @@ 21 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 296, "z": 691, "y": 0 @@ -322,7 +322,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 313, "z": 711, "y": 0 @@ -336,7 +336,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 302, "z": 652, "y": 0 @@ -350,7 +350,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 314, "z": 631, "y": 0 @@ -366,7 +366,7 @@ 2 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 311, "z": 622, "y": 0 @@ -380,7 +380,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 292, "z": 643, "y": 0 diff --git a/res/field/events/events_0337.json b/res/field/events/events_0337.json index 38c20ef2d3..05d23cc998 100644 --- a/res/field/events/events_0337.json +++ b/res/field/events/events_0337.json @@ -10,7 +10,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 7, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 11, "z": 7, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 9, "z": 9, "y": 0 diff --git a/res/field/events/events_0339.json b/res/field/events/events_0339.json index a1550ce0c6..2dde20c313 100644 --- a/res/field/events/events_0339.json +++ b/res/field/events/events_0339.json @@ -53,7 +53,7 @@ 5 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 320, "z": 716, "y": 5 @@ -69,7 +69,7 @@ 5 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 320, "z": 710, "y": 5 @@ -85,7 +85,7 @@ 2 ], "movement_range_x": 6, - "movement_range_y": 1, + "movement_range_z": 1, "x": 325, "z": 725, "y": 5 @@ -101,7 +101,7 @@ 6 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 329, "z": 715, "y": 0 @@ -117,7 +117,7 @@ 2 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 319, "z": 721, "y": 7 @@ -133,7 +133,7 @@ 2 ], "movement_range_x": 4, - "movement_range_y": 0, + "movement_range_z": 0, "x": 336, "z": 722, "y": 6 @@ -149,7 +149,7 @@ 4 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 297, "z": 726, "y": 0 @@ -165,7 +165,7 @@ 1 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 340, "z": 711, "y": 0 @@ -179,7 +179,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 313, "z": 711, "y": 0 @@ -193,7 +193,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 291, "z": 711, "y": 0 @@ -207,7 +207,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 323, "z": 730, "y": 0 @@ -221,7 +221,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 335, "z": 725, "y": 0 @@ -237,7 +237,7 @@ 23 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 290, "z": 706, "y": 0 @@ -253,7 +253,7 @@ 22 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 291, "z": 706, "y": 0 @@ -269,7 +269,7 @@ 25 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 292, "z": 706, "y": 0 @@ -285,7 +285,7 @@ 24 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 293, "z": 706, "y": 0 @@ -302,7 +302,7 @@ 4 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 305, "z": 700, "y": 0 @@ -319,7 +319,7 @@ 10 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 300, "z": 737, "y": 0 @@ -333,7 +333,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 301, "z": 716, "y": 0 @@ -347,7 +347,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 326, "z": 728, "y": 0 @@ -361,7 +361,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 327, "z": 728, "y": 0 @@ -375,7 +375,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 328, "z": 728, "y": 0 @@ -389,7 +389,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 326, "z": 715, "y": 0 @@ -403,7 +403,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 328, "z": 715, "y": 0 @@ -417,7 +417,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 307, "z": 723, "y": 0 @@ -431,7 +431,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 327, "z": 715, "y": 0 @@ -445,7 +445,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 348, "z": 727, "y": 0 diff --git a/res/field/events/events_0340.json b/res/field/events/events_0340.json index ecbdda9287..e7dba4f07c 100644 --- a/res/field/events/events_0340.json +++ b/res/field/events/events_0340.json @@ -29,7 +29,7 @@ 2 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 420, "z": 722, "y": 0 @@ -45,7 +45,7 @@ 2 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 390, "z": 719, "y": 0 @@ -61,7 +61,7 @@ 2 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 408, "z": 723, "y": 0 @@ -77,7 +77,7 @@ 2 ], "movement_range_x": 5, - "movement_range_y": 1, + "movement_range_z": 1, "x": 405, "z": 714, "y": 0 @@ -91,7 +91,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 413, "z": 727, "y": 0 @@ -107,7 +107,7 @@ 2 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 433, "z": 720, "y": 0 @@ -123,7 +123,7 @@ 4 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 439, "z": 724, "y": 0 @@ -137,7 +137,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 419, "z": 713, "y": 0 @@ -151,7 +151,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 420, "z": 714, "y": 0 @@ -165,7 +165,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 420, "z": 715, "y": 0 @@ -181,7 +181,7 @@ 1 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 444, "z": 724, "y": 0 @@ -195,7 +195,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 439, "z": 716, "y": 0 @@ -211,7 +211,7 @@ 2 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 392, "z": 723, "y": 0 @@ -227,7 +227,7 @@ 26 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 435, "z": 714, "y": 0 @@ -243,7 +243,7 @@ 27 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 436, "z": 714, "y": 0 @@ -259,7 +259,7 @@ 28 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 437, "z": 714, "y": 0 @@ -275,7 +275,7 @@ 29 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 438, "z": 714, "y": 0 @@ -289,7 +289,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 416, "z": 714, "y": 0 @@ -303,7 +303,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 401, "z": 705, "y": 0 @@ -317,7 +317,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 399, "z": 720, "y": 0 @@ -331,7 +331,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 390, "z": 717, "y": 0 @@ -345,7 +345,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 391, "z": 718, "y": 0 @@ -359,7 +359,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 437, "z": 733, "y": 0 @@ -373,7 +373,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 434, "z": 716, "y": 0 diff --git a/res/field/events/events_0341.json b/res/field/events/events_0341.json index 8ae980fdb7..9cc4ead4f7 100644 --- a/res/field/events/events_0341.json +++ b/res/field/events/events_0341.json @@ -10,7 +10,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 5, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 7, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 5, "y": 0 @@ -52,7 +52,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 6, "y": 0 diff --git a/res/field/events/events_0342.json b/res/field/events/events_0342.json index 8675711554..27038e86bf 100644 --- a/res/field/events/events_0342.json +++ b/res/field/events/events_0342.json @@ -77,7 +77,7 @@ 3 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 522, "z": 725, "y": 0 @@ -93,7 +93,7 @@ 5 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 554, "z": 711, "y": 0 @@ -109,7 +109,7 @@ 2 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 560, "z": 690, "y": 0 @@ -125,7 +125,7 @@ 4 ], "movement_range_x": 8, - "movement_range_y": 7, + "movement_range_z": 7, "x": 540, "z": 716, "y": 0 @@ -141,7 +141,7 @@ 1 ], "movement_range_x": 5, - "movement_range_y": 0, + "movement_range_z": 0, "x": 561, "z": 715, "y": 0 @@ -155,7 +155,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 552, "z": 722, "y": 0 @@ -171,7 +171,7 @@ 4 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 544, "z": 720, "y": 0 @@ -187,7 +187,7 @@ 2 ], "movement_range_x": 3, - "movement_range_y": 3, + "movement_range_z": 3, "x": 561, "z": 685, "y": 0 @@ -203,7 +203,7 @@ 2 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 561, "z": 684, "y": 0 @@ -219,7 +219,7 @@ 2 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 519, "z": 724, "y": 0 @@ -235,7 +235,7 @@ 3 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 563, "z": 678, "y": 0 @@ -249,7 +249,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 573, "z": 690, "y": 0 @@ -263,7 +263,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 527, "z": 708, "y": 0 @@ -277,7 +277,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 557, "z": 720, "y": 0 @@ -291,7 +291,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 572, "z": 692, "y": 0 @@ -305,7 +305,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 548, "z": 674, "y": 0 @@ -319,7 +319,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 568, "z": 726, "y": 0 @@ -335,7 +335,7 @@ 30 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 530, "z": 712, "y": 0 @@ -351,7 +351,7 @@ 31 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 531, "z": 712, "y": 0 @@ -367,7 +367,7 @@ 32 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 566, "z": 697, "y": 0 @@ -383,7 +383,7 @@ 33 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 567, "z": 697, "y": 0 @@ -397,7 +397,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 570, "z": 685, "y": 0 @@ -413,7 +413,7 @@ 4 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 545, "z": 720, "y": 0 @@ -430,7 +430,7 @@ 4 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 564, "z": 667, "y": 0 @@ -444,7 +444,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 540, "z": 712, "y": 0 @@ -458,7 +458,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 541, "z": 712, "y": 0 @@ -472,7 +472,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 565, "z": 702, "y": 0 @@ -486,7 +486,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 565, "z": 700, "y": 0 @@ -500,7 +500,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 532, "z": 727, "y": 0 @@ -516,7 +516,7 @@ 4 ], "movement_range_x": 8, - "movement_range_y": 7, + "movement_range_z": 7, "x": 540, "z": 716, "y": 0 @@ -532,7 +532,7 @@ 2 ], "movement_range_x": 5, - "movement_range_y": 0, + "movement_range_z": 0, "x": 561, "z": 715, "y": 0 @@ -546,7 +546,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 564, "z": 709, "y": 0 @@ -560,7 +560,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 556, "z": 703, "y": 0 diff --git a/res/field/events/events_0343.json b/res/field/events/events_0343.json index 4b9008d138..3c0be89443 100644 --- a/res/field/events/events_0343.json +++ b/res/field/events/events_0343.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 9, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 2, "z": 4, "y": 0 diff --git a/res/field/events/events_0344.json b/res/field/events/events_0344.json index dbdf9d6c96..355f096d64 100644 --- a/res/field/events/events_0344.json +++ b/res/field/events/events_0344.json @@ -19,7 +19,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 7, "y": 0 @@ -35,7 +35,7 @@ 2 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 10, "y": 0 diff --git a/res/field/events/events_0345.json b/res/field/events/events_0345.json index c4dd77d7b4..fc42b87370 100644 --- a/res/field/events/events_0345.json +++ b/res/field/events/events_0345.json @@ -10,7 +10,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 1, "z": 13, "y": 0 @@ -26,7 +26,7 @@ 1 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 6, "y": 0 @@ -42,7 +42,7 @@ 2 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 14, "y": 0 diff --git a/res/field/events/events_0346.json b/res/field/events/events_0346.json index 54329fd0af..fe9128d19f 100644 --- a/res/field/events/events_0346.json +++ b/res/field/events/events_0346.json @@ -19,7 +19,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 6, "z": 12, "y": 0 @@ -35,7 +35,7 @@ 2 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 9, "z": 11, "y": 0 @@ -51,7 +51,7 @@ 1 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 9, "y": 0 @@ -67,7 +67,7 @@ 1 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 9, "y": 0 @@ -83,7 +83,7 @@ 2 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 13, "z": 13, "y": 0 @@ -99,7 +99,7 @@ 2 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 13, "z": 14, "y": 0 diff --git a/res/field/events/events_0347.json b/res/field/events/events_0347.json index d130282edb..35165f8abd 100644 --- a/res/field/events/events_0347.json +++ b/res/field/events/events_0347.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 9, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 9, "y": 0 diff --git a/res/field/events/events_0348.json b/res/field/events/events_0348.json index 821bf20bc7..adb1bc3195 100644 --- a/res/field/events/events_0348.json +++ b/res/field/events/events_0348.json @@ -53,7 +53,7 @@ 1 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 562, "z": 570, "y": 0 @@ -69,7 +69,7 @@ 1 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 550, "z": 571, "y": 0 @@ -85,7 +85,7 @@ 3 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 558, "z": 609, "y": 0 @@ -101,7 +101,7 @@ 3 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 557, "z": 609, "y": 0 @@ -117,7 +117,7 @@ 1 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 572, "z": 562, "y": 0 @@ -133,7 +133,7 @@ 2 ], "movement_range_x": 7, - "movement_range_y": 0, + "movement_range_z": 0, "x": 571, "z": 624, "y": 0 @@ -149,7 +149,7 @@ 2 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 554, "z": 604, "y": 0 @@ -165,7 +165,7 @@ 3 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 563, "z": 601, "y": 0 @@ -181,7 +181,7 @@ 1 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 563, "z": 616, "y": 0 @@ -197,7 +197,7 @@ 1 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 563, "z": 615, "y": 0 @@ -213,7 +213,7 @@ 4 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 563, "z": 631, "y": 0 @@ -227,7 +227,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 546, "z": 578, "y": 0 @@ -241,7 +241,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 554, "z": 598, "y": 0 @@ -255,7 +255,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 564, "z": 596, "y": 0 @@ -269,7 +269,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 575, "z": 546, "y": 0 @@ -285,7 +285,7 @@ 38 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 570, "z": 627, "y": 0 @@ -301,7 +301,7 @@ 39 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 571, "z": 627, "y": 0 @@ -317,7 +317,7 @@ 40 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 572, "z": 627, "y": 0 @@ -333,7 +333,7 @@ 41 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 573, "z": 627, "y": 0 @@ -349,7 +349,7 @@ 3 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 561, "z": 587, "y": 0 @@ -365,7 +365,7 @@ 3 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 561, "z": 580, "y": 0 @@ -379,7 +379,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 566, "z": 612, "y": 0 @@ -393,7 +393,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 562, "z": 565, "y": 0 @@ -408,7 +408,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 556, "z": 645, "y": 0 @@ -424,7 +424,7 @@ 3 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 555, "z": 627, "y": 0 @@ -441,7 +441,7 @@ 6 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 580, "z": 596, "y": 0 @@ -457,7 +457,7 @@ 3 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 560, "z": 587, "y": 0 @@ -473,7 +473,7 @@ 3 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 561, "z": 585, "y": 0 @@ -489,7 +489,7 @@ 3 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 560, "z": 586, "y": 0 @@ -504,7 +504,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 570, "z": 535, "y": 0 @@ -520,7 +520,7 @@ 2 ], "movement_range_x": 7, - "movement_range_y": 0, + "movement_range_z": 0, "x": 571, "z": 624, "y": 0 diff --git a/res/field/events/events_0349.json b/res/field/events/events_0349.json index f6e7228814..6d136d4725 100644 --- a/res/field/events/events_0349.json +++ b/res/field/events/events_0349.json @@ -29,7 +29,7 @@ 4 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 534, "z": 522, "y": 0 @@ -45,7 +45,7 @@ 2 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 547, "z": 534, "y": 0 @@ -61,7 +61,7 @@ 1 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 564, "z": 531, "y": 0 @@ -77,7 +77,7 @@ 1 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 525, "z": 534, "y": 0 @@ -93,7 +93,7 @@ 1 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 499, "z": 521, "y": 0 @@ -109,7 +109,7 @@ 3 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 560, "z": 522, "y": 0 @@ -125,7 +125,7 @@ 2 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 511, "z": 533, "y": 0 @@ -139,7 +139,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 537, "z": 528, "y": 8 @@ -155,7 +155,7 @@ 2 ], "movement_range_x": 3, - "movement_range_y": 1, + "movement_range_z": 1, "x": 537, "z": 529, "y": 8 @@ -171,7 +171,7 @@ 3 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 494, "z": 528, "y": 0 @@ -188,7 +188,7 @@ 2 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 518, "z": 540, "y": 0 @@ -204,7 +204,7 @@ 2 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 488, "z": 529, "y": 0 @@ -218,7 +218,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 562, "z": 516, "y": 0 @@ -232,7 +232,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 497, "z": 540, "y": 0 @@ -246,7 +246,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 559, "z": 531, "y": 0 @@ -260,7 +260,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 527, "z": 535, "y": 0 @@ -274,7 +274,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 497, "z": 533, "y": 0 @@ -288,7 +288,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 493, "z": 540, "y": 0 @@ -304,7 +304,7 @@ 42 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 492, "z": 520, "y": 0 @@ -320,7 +320,7 @@ 43 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 493, "z": 520, "y": 0 @@ -336,7 +336,7 @@ 44 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 494, "z": 520, "y": 0 @@ -352,7 +352,7 @@ 45 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 495, "z": 520, "y": 0 @@ -366,7 +366,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 498, "z": 541, "y": 0 @@ -380,7 +380,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 570, "z": 535, "y": 0 @@ -394,7 +394,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 562, "z": 526, "y": 0 @@ -408,7 +408,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 551, "z": 536, "y": 0 diff --git a/res/field/events/events_0350.json b/res/field/events/events_0350.json index c43689ed4b..03615f532d 100644 --- a/res/field/events/events_0350.json +++ b/res/field/events/events_0350.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 5, "y": 0 diff --git a/res/field/events/events_0351.json b/res/field/events/events_0351.json index d643291774..e4c9a7ed79 100644 --- a/res/field/events/events_0351.json +++ b/res/field/events/events_0351.json @@ -29,7 +29,7 @@ 2 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 367, "z": 523, "y": 0 @@ -45,7 +45,7 @@ 4 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 377, "z": 529, "y": 0 @@ -61,7 +61,7 @@ 1 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 361, "z": 525, "y": 0 @@ -77,7 +77,7 @@ 1 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 379, "z": 531, "y": 0 @@ -91,7 +91,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 379, "z": 527, "y": 0 @@ -105,7 +105,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 368, "z": 535, "y": 0 @@ -122,7 +122,7 @@ 11 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 344, "z": 530, "y": 0 @@ -138,7 +138,7 @@ 2 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 353, "z": 531, "y": 0 diff --git a/res/field/events/events_0352.json b/res/field/events/events_0352.json index 8bb5aa0357..ad8d6db09b 100644 --- a/res/field/events/events_0352.json +++ b/res/field/events/events_0352.json @@ -21,7 +21,7 @@ 2 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 432, "z": 520, "y": 0 @@ -37,7 +37,7 @@ 1 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 425, "z": 520, "y": 0 @@ -53,7 +53,7 @@ 2 ], "movement_range_x": 9, - "movement_range_y": 0, + "movement_range_z": 0, "x": 428, "z": 540, "y": 0 @@ -67,7 +67,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 423, "z": 533, "y": 0 @@ -81,7 +81,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 438, "z": 522, "y": 0 @@ -95,7 +95,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 431, "z": 519, "y": 0 @@ -109,7 +109,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 429, "z": 519, "y": 0 @@ -123,7 +123,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 435, "z": 522, "y": 0 @@ -137,7 +137,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 430, "z": 520, "y": 0 @@ -151,7 +151,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 427, "z": 526, "y": 0 @@ -165,7 +165,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 426, "z": 530, "y": 0 @@ -181,7 +181,7 @@ 2 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 420, "z": 526, "y": 0 @@ -195,7 +195,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 424, "z": 514, "y": 0 @@ -211,7 +211,7 @@ 46 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 435, "z": 524, "y": 0 @@ -227,7 +227,7 @@ 47 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 436, "z": 524, "y": 0 @@ -243,7 +243,7 @@ 48 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 437, "z": 524, "y": 0 @@ -259,7 +259,7 @@ 49 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 438, "z": 524, "y": 0 @@ -273,7 +273,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 430, "z": 529, "y": 0 @@ -287,7 +287,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 438, "z": 520, "y": 0 @@ -303,7 +303,7 @@ 2 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 429, "z": 525, "y": 0 @@ -319,7 +319,7 @@ 1 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 440, "z": 526, "y": 0 @@ -333,7 +333,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 433, "z": 535, "y": 0 diff --git a/res/field/events/events_0353.json b/res/field/events/events_0353.json index 1eb07f282c..b6e6b08f7c 100644 --- a/res/field/events/events_0353.json +++ b/res/field/events/events_0353.json @@ -29,7 +29,7 @@ 1 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 472, "z": 780, "y": 0 @@ -45,7 +45,7 @@ 1 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 474, "z": 780, "y": 0 @@ -61,7 +61,7 @@ 2 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 455, "z": 796, "y": 0 @@ -77,7 +77,7 @@ 3 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 458, "z": 796, "y": 0 @@ -93,7 +93,7 @@ 3 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 458, "z": 759, "y": 0 @@ -109,7 +109,7 @@ 3 ], "movement_range_x": 3, - "movement_range_y": 4, + "movement_range_z": 4, "x": 458, "z": 777, "y": 0 @@ -126,7 +126,7 @@ 1 ], "movement_range_x": 0, - "movement_range_y": 6, + "movement_range_z": 6, "x": 460, "z": 787, "y": 0 @@ -142,7 +142,7 @@ 2 ], "movement_range_x": 9, - "movement_range_y": 0, + "movement_range_z": 0, "x": 466, "z": 797, "y": 0 @@ -158,7 +158,7 @@ 3 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 455, "z": 744, "y": 0 @@ -172,7 +172,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 468, "z": 803, "y": 0 @@ -186,7 +186,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 459, "z": 822, "y": 0 @@ -200,7 +200,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 454, "z": 807, "y": 0 @@ -214,7 +214,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 456, "z": 791, "y": 0 @@ -228,7 +228,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 450, "z": 777, "y": 0 @@ -244,7 +244,7 @@ 51 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 460, "z": 797, "y": 0 @@ -260,7 +260,7 @@ 50 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 461, "z": 797, "y": 0 @@ -276,7 +276,7 @@ 53 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 448, "z": 817, "y": 0 @@ -292,7 +292,7 @@ 52 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 449, "z": 817, "y": 0 @@ -306,7 +306,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 459, "z": 821, "y": 0 @@ -320,7 +320,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 456, "z": 826, "y": 0 @@ -334,7 +334,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 461, "z": 826, "y": 0 @@ -348,7 +348,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 464, "z": 826, "y": 0 @@ -362,7 +362,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 2, - "movement_range_y": 0, + "movement_range_z": 0, "x": 461, "z": 805, "y": 0 @@ -376,7 +376,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 454, "z": 748, "y": 0 @@ -392,7 +392,7 @@ 3 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 458, "z": 759, "y": 0 @@ -408,7 +408,7 @@ 3 ], "movement_range_x": 3, - "movement_range_y": 4, + "movement_range_z": 4, "x": 458, "z": 777, "y": 0 @@ -425,7 +425,7 @@ 1 ], "movement_range_x": 0, - "movement_range_y": 6, + "movement_range_z": 6, "x": 460, "z": 787, "y": 0 @@ -441,7 +441,7 @@ 2 ], "movement_range_x": 9, - "movement_range_y": 0, + "movement_range_z": 0, "x": 466, "z": 797, "y": 0 @@ -455,7 +455,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 476, "z": 768, "y": 0 @@ -469,7 +469,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 461, "z": 766, "y": 0 diff --git a/res/field/events/events_0354.json b/res/field/events/events_0354.json index 8b63894348..8c4161b605 100644 --- a/res/field/events/events_0354.json +++ b/res/field/events/events_0354.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 49, "z": 6, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 34, "z": 6, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 1, "z": 7, "y": 0 @@ -52,7 +52,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 56, "z": 7, "y": 0 @@ -66,7 +66,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 1, "z": 7, "y": 0 @@ -80,7 +80,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 1, "z": 7, "y": 0 @@ -94,7 +94,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 3, - "movement_range_y": 0, + "movement_range_z": 0, "x": 42, "z": 6, "y": 0 diff --git a/res/field/events/events_0355.json b/res/field/events/events_0355.json index 6e52c8c217..87c10df405 100644 --- a/res/field/events/events_0355.json +++ b/res/field/events/events_0355.json @@ -67,7 +67,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 3, "y": 0 @@ -81,7 +81,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 2, - "movement_range_y": 2, + "movement_range_z": 2, "x": 11, "z": 6, "y": 0 @@ -95,7 +95,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 20, "z": 7, "y": 0 diff --git a/res/field/events/events_0356.json b/res/field/events/events_0356.json index ff30251ee3..bfc347122b 100644 --- a/res/field/events/events_0356.json +++ b/res/field/events/events_0356.json @@ -27,7 +27,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 21, "z": 3, "y": 0 @@ -41,7 +41,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 16, "z": 8, "y": 0 @@ -55,7 +55,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 15, "z": 8, "y": 0 @@ -69,7 +69,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 17, "z": 4, "y": 0 diff --git a/res/field/events/events_0357.json b/res/field/events/events_0357.json index d09c54100b..59f58f78ca 100644 --- a/res/field/events/events_0357.json +++ b/res/field/events/events_0357.json @@ -75,7 +75,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 507, "z": 851, "y": 0 @@ -89,7 +89,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 500, "z": 847, "y": 0 @@ -103,7 +103,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 499, "z": 856, "y": 0 @@ -119,7 +119,7 @@ 2 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 551, "z": 855, "y": 0 @@ -135,7 +135,7 @@ 2 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 457, "z": 842, "y": 0 @@ -151,7 +151,7 @@ 2 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 457, "z": 845, "y": 0 @@ -167,7 +167,7 @@ 2 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 474, "z": 838, "y": 0 @@ -183,7 +183,7 @@ 3 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 458, "z": 856, "y": 0 @@ -199,7 +199,7 @@ 3 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 492, "z": 853, "y": 0 @@ -215,7 +215,7 @@ 1 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 570, "z": 845, "y": 0 @@ -229,7 +229,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 516, "z": 847, "y": 0 @@ -243,7 +243,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 463, "z": 848, "y": 0 @@ -257,7 +257,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 496, "z": 840, "y": 0 @@ -271,7 +271,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 496, "z": 841, "y": 0 @@ -285,7 +285,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 525, "z": 836, "y": 0 @@ -299,7 +299,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 533, "z": 837, "y": 0 @@ -313,7 +313,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 536, "z": 838, "y": 0 @@ -327,7 +327,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 549, "z": 839, "y": 0 @@ -341,7 +341,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 560, "z": 859, "y": 0 @@ -355,7 +355,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 561, "z": 859, "y": 0 @@ -369,7 +369,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 455, "z": 860, "y": 0 @@ -383,7 +383,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 475, "z": 852, "y": 0 @@ -397,7 +397,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 507, "z": 846, "y": 0 @@ -411,7 +411,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 522, "z": 842, "y": 0 @@ -425,7 +425,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 545, "z": 835, "y": 0 @@ -439,7 +439,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 547, "z": 862, "y": 0 @@ -453,7 +453,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 558, "z": 844, "y": 0 @@ -469,7 +469,7 @@ 54 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 559, "z": 854, "y": 0 @@ -485,7 +485,7 @@ 55 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 560, "z": 854, "y": 0 @@ -501,7 +501,7 @@ 56 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 561, "z": 854, "y": 0 @@ -517,7 +517,7 @@ 57 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 562, "z": 854, "y": 0 @@ -533,7 +533,7 @@ 2 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 541, "z": 839, "y": 0 @@ -549,7 +549,7 @@ 3 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 520, "z": 848, "y": 0 @@ -565,7 +565,7 @@ 2 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 528, "z": 837, "y": 0 @@ -580,7 +580,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 456, "z": 826, "y": 0 @@ -595,7 +595,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 462, "z": 826, "y": 0 @@ -610,7 +610,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 464, "z": 826, "y": 0 @@ -624,7 +624,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 494, "z": 844, "y": 0 @@ -638,7 +638,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 543, "z": 851, "y": 0 @@ -652,7 +652,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 570, "z": 852, "y": 0 @@ -668,7 +668,7 @@ 2 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 474, "z": 838, "y": 0 @@ -682,7 +682,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 523, "z": 850, "y": 0 @@ -696,7 +696,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 531, "z": 849, "y": 0 @@ -710,7 +710,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 452, "z": 840, "y": 0 diff --git a/res/field/events/events_0358.json b/res/field/events/events_0358.json index 2702ccca49..d534b14334 100644 --- a/res/field/events/events_0358.json +++ b/res/field/events/events_0358.json @@ -27,7 +27,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 3, "z": 4, "y": 0 @@ -41,7 +41,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 6, "y": 0 @@ -55,7 +55,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 7, "y": 0 diff --git a/res/field/events/events_0359.json b/res/field/events/events_0359.json index 06ec045f93..0ec36ad991 100644 --- a/res/field/events/events_0359.json +++ b/res/field/events/events_0359.json @@ -109,7 +109,7 @@ 2 ], "movement_range_x": 8, - "movement_range_y": 1, + "movement_range_z": 1, "x": 691, "z": 858, "y": 0 @@ -125,7 +125,7 @@ 4 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 725, "z": 842, "y": 0 @@ -141,7 +141,7 @@ 4 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 730, "z": 842, "y": 0 @@ -158,7 +158,7 @@ 1 ], "movement_range_x": 5, - "movement_range_y": 0, + "movement_range_z": 0, "x": 702, "z": 851, "y": 0 @@ -174,7 +174,7 @@ 3 ], "movement_range_x": 9, - "movement_range_y": 0, + "movement_range_z": 0, "x": 703, "z": 832, "y": 0 @@ -190,7 +190,7 @@ 4 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 704, "z": 827, "y": 0 @@ -206,7 +206,7 @@ 5 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 668, "z": 827, "y": 0 @@ -220,7 +220,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 665, "z": 845, "y": 0 @@ -236,7 +236,7 @@ 3 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 717, "z": 854, "y": 0 @@ -250,7 +250,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 655, "z": 828, "y": 0 @@ -264,7 +264,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 677, "z": 827, "y": 0 @@ -278,7 +278,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 665, "z": 839, "y": 0 @@ -292,7 +292,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 669, "z": 842, "y": 0 @@ -306,7 +306,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 662, "z": 843, "y": 0 @@ -320,7 +320,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 663, "z": 844, "y": 0 @@ -336,7 +336,7 @@ 2 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 651, "z": 810, "y": 0 @@ -350,7 +350,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 665, "z": 835, "y": 0 @@ -364,7 +364,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 704, "z": 819, "y": 0 @@ -380,7 +380,7 @@ 62 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 656, "z": 808, "y": 0 @@ -396,7 +396,7 @@ 64 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 657, "z": 808, "y": 0 @@ -412,7 +412,7 @@ 65 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 658, "z": 808, "y": 0 @@ -428,7 +428,7 @@ 63 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 659, "z": 808, "y": 0 @@ -442,7 +442,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 677, "z": 831, "y": 0 @@ -456,7 +456,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 700, "z": 818, "y": 0 @@ -470,7 +470,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 686, "z": 851, "y": 0 @@ -484,7 +484,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 726, "z": 837, "y": 0 @@ -498,7 +498,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 689, "z": 826, "y": 0 @@ -512,7 +512,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 690, "z": 811, "y": 0 @@ -526,7 +526,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 717, "z": 813, "y": 0 @@ -540,7 +540,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 677, "z": 837, "y": 0 @@ -554,7 +554,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 683, "z": 833, "y": 0 @@ -568,7 +568,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 694, "z": 804, "y": 0 @@ -582,7 +582,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 677, "z": 823, "y": 0 @@ -596,7 +596,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 671, "z": 835, "y": 0 diff --git a/res/field/events/events_0360.json b/res/field/events/events_0360.json index c0bc494df8..84b33949fd 100644 --- a/res/field/events/events_0360.json +++ b/res/field/events/events_0360.json @@ -10,7 +10,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 2, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 5, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 2, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 8, "y": 0 diff --git a/res/field/events/events_0361.json b/res/field/events/events_0361.json index 1b1291f7f0..53b6b63e02 100644 --- a/res/field/events/events_0361.json +++ b/res/field/events/events_0361.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 6, "y": 0 diff --git a/res/field/events/events_0362.json b/res/field/events/events_0362.json index c6fd789c29..757a634e23 100644 --- a/res/field/events/events_0362.json +++ b/res/field/events/events_0362.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 5, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 11, "z": 4, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 9, "z": 4, "y": 0 diff --git a/res/field/events/events_0363.json b/res/field/events/events_0363.json index 30b4f3e977..1520ba2d65 100644 --- a/res/field/events/events_0363.json +++ b/res/field/events/events_0363.json @@ -10,7 +10,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 5, "y": 0 diff --git a/res/field/events/events_0364.json b/res/field/events/events_0364.json index 01f5660125..b1028f9959 100644 --- a/res/field/events/events_0364.json +++ b/res/field/events/events_0364.json @@ -10,7 +10,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 2, "z": 3, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 6, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 5, "z": 5, "y": 0 diff --git a/res/field/events/events_0365.json b/res/field/events/events_0365.json index 94186891e2..5e8172598f 100644 --- a/res/field/events/events_0365.json +++ b/res/field/events/events_0365.json @@ -19,7 +19,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 1, + "movement_range_z": 1, "x": 4, "z": 4, "y": 0 @@ -33,7 +33,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 6, "z": 5, "y": 0 diff --git a/res/field/events/events_0366.json b/res/field/events/events_0366.json index 7464d5dddf..a3faf43ece 100644 --- a/res/field/events/events_0366.json +++ b/res/field/events/events_0366.json @@ -37,7 +37,7 @@ 2 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 726, "z": 676, "y": 0 @@ -53,7 +53,7 @@ 1 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 731, "z": 719, "y": 0 @@ -70,7 +70,7 @@ 6 ], "movement_range_x": 0, - "movement_range_y": 6, + "movement_range_z": 6, "x": 729, "z": 685, "y": 0 @@ -86,7 +86,7 @@ 4 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 714, "z": 691, "y": 0 @@ -102,7 +102,7 @@ 3 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 721, "z": 709, "y": 0 @@ -118,7 +118,7 @@ 3 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 719, "z": 701, "y": 0 @@ -134,7 +134,7 @@ 1 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 731, "z": 688, "y": 0 @@ -151,7 +151,7 @@ 2 ], "movement_range_x": 0, - "movement_range_y": 4, + "movement_range_z": 4, "x": 731, "z": 694, "y": 0 @@ -167,7 +167,7 @@ 5 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 721, "z": 660, "y": 0 @@ -181,7 +181,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 712, "z": 681, "y": 0 @@ -195,7 +195,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 711, "z": 682, "y": 0 @@ -211,7 +211,7 @@ 3 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 716, "z": 656, "y": 0 @@ -227,7 +227,7 @@ 4 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 726, "z": 717, "y": 0 @@ -243,7 +243,7 @@ 66 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 728, "z": 660, "y": 0 @@ -259,7 +259,7 @@ 67 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 729, "z": 660, "y": 0 @@ -275,7 +275,7 @@ 68 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 730, "z": 660, "y": 0 @@ -291,7 +291,7 @@ 69 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 731, "z": 660, "y": 0 @@ -305,7 +305,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 731, "z": 648, "y": 0 @@ -319,7 +319,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 725, "z": 678, "y": 0 @@ -333,7 +333,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 722, "z": 727, "y": 0 @@ -347,7 +347,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 724, "z": 701, "y": 0 @@ -361,7 +361,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 711, "z": 707, "y": 0 @@ -375,7 +375,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 711, "z": 706, "y": 0 @@ -389,7 +389,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 711, "z": 705, "y": 0 @@ -403,7 +403,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 711, "z": 676, "y": 0 @@ -417,7 +417,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 711, "z": 677, "y": 0 @@ -431,7 +431,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 711, "z": 678, "y": 0 @@ -445,7 +445,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 711, "z": 687, "y": 0 diff --git a/res/field/events/events_0367.json b/res/field/events/events_0367.json index 49e8873960..7beeceeef3 100644 --- a/res/field/events/events_0367.json +++ b/res/field/events/events_0367.json @@ -10,7 +10,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 3, + "movement_range_z": 3, "x": 6, "z": 8, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 4, "y": 0 diff --git a/res/field/events/events_0368.json b/res/field/events/events_0368.json index accd563f40..93568fb91b 100644 --- a/res/field/events/events_0368.json +++ b/res/field/events/events_0368.json @@ -37,7 +37,7 @@ 3 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 607, "z": 584, "y": 0 @@ -53,7 +53,7 @@ 3 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 621, "z": 578, "y": 0 @@ -69,7 +69,7 @@ 2 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 643, "z": 582, "y": 0 @@ -85,7 +85,7 @@ 3 ], "movement_range_x": 9, - "movement_range_y": 4, + "movement_range_z": 4, "x": 654, "z": 589, "y": 0 @@ -101,7 +101,7 @@ 3 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 589, "z": 590, "y": 0 @@ -117,7 +117,7 @@ 2 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 648, "z": 599, "y": 0 @@ -133,7 +133,7 @@ 2 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 648, "z": 596, "y": 0 @@ -149,7 +149,7 @@ 3 ], "movement_range_x": 5, - "movement_range_y": 3, + "movement_range_z": 3, "x": 603, "z": 593, "y": 0 @@ -165,7 +165,7 @@ 6 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 580, "z": 596, "y": 0 @@ -181,7 +181,7 @@ 1 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 658, "z": 596, "y": 0 @@ -195,7 +195,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 611, "z": 578, "y": 0 @@ -209,7 +209,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 621, "z": 594, "y": 0 @@ -223,7 +223,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 634, "z": 578, "y": 0 @@ -237,7 +237,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 657, "z": 588, "y": 0 @@ -251,7 +251,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 657, "z": 589, "y": 0 @@ -267,7 +267,7 @@ 70 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 628, "z": 592, "y": 0 @@ -283,7 +283,7 @@ 71 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 629, "z": 592, "y": 0 @@ -299,7 +299,7 @@ 72 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 660, "z": 593, "y": 0 @@ -315,7 +315,7 @@ 73 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 661, "z": 593, "y": 0 @@ -329,7 +329,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 626, "z": 599, "y": 0 @@ -343,7 +343,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 637, "z": 596, "y": 0 @@ -357,7 +357,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 600, "z": 591, "y": 0 @@ -371,7 +371,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 661, "z": 587, "y": 0 @@ -385,7 +385,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 611, "z": 598, "y": 0 @@ -399,7 +399,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 620, "z": 580, "y": 0 @@ -415,7 +415,7 @@ 3 ], "movement_range_x": 9, - "movement_range_y": 4, + "movement_range_z": 4, "x": 654, "z": 589, "y": 0 @@ -431,7 +431,7 @@ 3 ], "movement_range_x": 5, - "movement_range_y": 3, + "movement_range_z": 3, "x": 603, "z": 593, "y": 0 @@ -445,7 +445,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 619, "z": 585, "y": 0 @@ -459,7 +459,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 660, "z": 576, "y": 0 diff --git a/res/field/events/events_0369.json b/res/field/events/events_0369.json index f3a9bf9b10..b529be0ea1 100644 --- a/res/field/events/events_0369.json +++ b/res/field/events/events_0369.json @@ -21,7 +21,7 @@ 3 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 355, "z": 402, "y": 0 @@ -37,7 +37,7 @@ 4 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 328, "z": 405, "y": 0 @@ -53,7 +53,7 @@ 3 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 337, "z": 392, "y": 0 @@ -69,7 +69,7 @@ 2 ], "movement_range_x": 7, - "movement_range_y": 0, + "movement_range_z": 0, "x": 350, "z": 392, "y": 0 @@ -85,7 +85,7 @@ 2 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 299, "z": 394, "y": 0 @@ -101,7 +101,7 @@ 2 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 344, "z": 411, "y": 0 @@ -117,7 +117,7 @@ 2 ], "movement_range_x": 12, - "movement_range_y": 4, + "movement_range_z": 4, "x": 342, "z": 385, "y": 0 @@ -133,7 +133,7 @@ 1 ], "movement_range_x": 4, - "movement_range_y": 2, + "movement_range_z": 2, "x": 311, "z": 402, "y": 0 @@ -149,7 +149,7 @@ 2 ], "movement_range_x": 7, - "movement_range_y": 4, + "movement_range_z": 4, "x": 366, "z": 391, "y": 0 @@ -165,7 +165,7 @@ 1 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 375, "z": 402, "y": 0 @@ -179,7 +179,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 305, "z": 399, "y": 0 @@ -193,7 +193,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 377, "z": 392, "y": 0 @@ -207,7 +207,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 342, "z": 396, "y": 0 @@ -221,7 +221,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 358, "z": 389, "y": 0 @@ -235,7 +235,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 367, "z": 386, "y": 0 @@ -249,7 +249,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 369, "z": 397, "y": 0 @@ -263,7 +263,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 331, "z": 411, "y": 0 diff --git a/res/field/events/events_0370.json b/res/field/events/events_0370.json index 24f39831bb..bcf2396f21 100644 --- a/res/field/events/events_0370.json +++ b/res/field/events/events_0370.json @@ -27,7 +27,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 5, "y": 0 @@ -41,7 +41,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 1, + "movement_range_z": 1, "x": 6, "z": 4, "y": 0 diff --git a/res/field/events/events_0371.json b/res/field/events/events_0371.json index ddcbd141f3..c2720dc3e4 100644 --- a/res/field/events/events_0371.json +++ b/res/field/events/events_0371.json @@ -93,7 +93,7 @@ 3 ], "movement_range_x": 2, - "movement_range_y": 8, + "movement_range_z": 8, "x": 318, "z": 344, "y": 0 @@ -109,7 +109,7 @@ 4 ], "movement_range_x": 4, - "movement_range_y": 6, + "movement_range_z": 6, "x": 294, "z": 296, "y": 0 @@ -125,7 +125,7 @@ 2 ], "movement_range_x": 4, - "movement_range_y": 6, + "movement_range_z": 6, "x": 314, "z": 296, "y": 0 @@ -141,7 +141,7 @@ 3 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 291, "z": 344, "y": 0 @@ -157,7 +157,7 @@ 1 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 310, "z": 351, "y": 0 @@ -173,7 +173,7 @@ 1 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 290, "z": 321, "y": 0 @@ -189,7 +189,7 @@ 2 ], "movement_range_x": 0, - "movement_range_y": 8, + "movement_range_z": 8, "x": 291, "z": 273, "y": 0 @@ -205,7 +205,7 @@ 3 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 307, "z": 369, "y": 0 @@ -221,7 +221,7 @@ 5 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 302, "z": 267, "y": 0 @@ -237,7 +237,7 @@ 10 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 292, "z": 270, "y": 0 @@ -251,7 +251,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 296, "z": 305, "y": 0 @@ -265,7 +265,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 305, "z": 330, "y": 0 @@ -279,7 +279,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 300, "z": 316, "y": 0 @@ -293,7 +293,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 313, "z": 275, "y": 0 @@ -307,7 +307,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 313, "z": 281, "y": 0 @@ -321,7 +321,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 305, "z": 383, "y": 0 @@ -335,7 +335,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 297, "z": 358, "y": 0 @@ -349,7 +349,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 311, "z": 350, "y": 0 @@ -363,7 +363,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 316, "z": 309, "y": 0 diff --git a/res/field/events/events_0372.json b/res/field/events/events_0372.json index b4b42510ef..cbadbdf4c2 100644 --- a/res/field/events/events_0372.json +++ b/res/field/events/events_0372.json @@ -10,7 +10,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 5, "y": 0 diff --git a/res/field/events/events_0373.json b/res/field/events/events_0373.json index 7b68f8bf02..2a48375a4a 100644 --- a/res/field/events/events_0373.json +++ b/res/field/events/events_0373.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 5, "y": 0 diff --git a/res/field/events/events_0374.json b/res/field/events/events_0374.json index f460157536..f2298f8764 100644 --- a/res/field/events/events_0374.json +++ b/res/field/events/events_0374.json @@ -12,7 +12,7 @@ 4 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 80, "z": 753, "y": 0 @@ -28,7 +28,7 @@ 3 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 76, "z": 746, "y": 0 @@ -42,7 +42,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 93, "z": 757, "y": 0 @@ -56,7 +56,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 93, "z": 751, "y": 0 @@ -72,7 +72,7 @@ 1 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 119, "z": 756, "y": 0 @@ -88,7 +88,7 @@ 2 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 72, "z": 752, "y": 0 @@ -102,7 +102,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 117, "z": 744, "y": 0 @@ -116,7 +116,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 93, "z": 759, "y": 0 @@ -132,7 +132,7 @@ 74 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 87, "z": 752, "y": 0 @@ -148,7 +148,7 @@ 75 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 88, "z": 752, "y": 0 @@ -164,7 +164,7 @@ 76 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 89, "z": 752, "y": 0 @@ -180,7 +180,7 @@ 77 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 90, "z": 752, "y": 0 @@ -194,7 +194,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 74, "z": 744, "y": 0 @@ -208,7 +208,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 74, "z": 749, "y": 0 @@ -222,7 +222,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 73, "z": 753, "y": 0 @@ -236,7 +236,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 73, "z": 754, "y": 0 @@ -250,7 +250,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 72, "z": 755, "y": 0 @@ -264,7 +264,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 73, "z": 756, "y": 0 @@ -278,7 +278,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 71, "z": 756, "y": 0 @@ -292,7 +292,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 73, "z": 757, "y": 0 @@ -306,7 +306,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 104, "z": 748, "y": 0 diff --git a/res/field/events/events_0375.json b/res/field/events/events_0375.json index f4bce03171..715ea58cf0 100644 --- a/res/field/events/events_0375.json +++ b/res/field/events/events_0375.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 2, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 6, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 8, "y": 0 diff --git a/res/field/events/events_0376.json b/res/field/events/events_0376.json index 6d3439d2a2..4911229af0 100644 --- a/res/field/events/events_0376.json +++ b/res/field/events/events_0376.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 2, "z": 5, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 7, "y": 0 diff --git a/res/field/events/events_0377.json b/res/field/events/events_0377.json index 77e310244c..5681e0e343 100644 --- a/res/field/events/events_0377.json +++ b/res/field/events/events_0377.json @@ -21,7 +21,7 @@ 3 ], "movement_range_x": 4, - "movement_range_y": 0, + "movement_range_z": 0, "x": 171, "z": 887, "y": 0 @@ -37,7 +37,7 @@ 3 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 176, "z": 887, "y": 0 @@ -53,7 +53,7 @@ 4 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 179, "z": 866, "y": 0 @@ -67,7 +67,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 169, "z": 877, "y": 0 diff --git a/res/field/events/events_0378.json b/res/field/events/events_0378.json index 475f661f2d..67ba84704c 100644 --- a/res/field/events/events_0378.json +++ b/res/field/events/events_0378.json @@ -53,7 +53,7 @@ 2 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 235, "z": 912, "y": 0 @@ -69,7 +69,7 @@ 3 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 237, "z": 922, "y": 0 @@ -83,7 +83,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 250, "z": 919, "y": 1 @@ -99,7 +99,7 @@ 3 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 288, "z": 915, "y": 1 @@ -115,7 +115,7 @@ 3 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 305, "z": 917, "y": 1 @@ -131,7 +131,7 @@ 3 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 277, "z": 923, "y": 1 @@ -145,7 +145,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 308, "z": 913, "y": 0 @@ -159,7 +159,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 239, "z": 908, "y": 0 @@ -173,7 +173,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 295, "z": 922, "y": 0 @@ -187,7 +187,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 256, "z": 916, "y": 0 @@ -203,7 +203,7 @@ 78 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 278, "z": 918, "y": 0 @@ -219,7 +219,7 @@ 79 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 279, "z": 918, "y": 0 @@ -235,7 +235,7 @@ 80 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 280, "z": 918, "y": 0 @@ -251,7 +251,7 @@ 81 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 281, "z": 918, "y": 0 @@ -265,7 +265,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 250, "z": 902, "y": 0 @@ -279,7 +279,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 306, "z": 912, "y": 0 @@ -293,7 +293,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 307, "z": 912, "y": 0 diff --git a/res/field/events/events_0379.json b/res/field/events/events_0379.json index c73580e313..6063436747 100644 --- a/res/field/events/events_0379.json +++ b/res/field/events/events_0379.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 16, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 15, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 12, "z": 17, "y": 0 @@ -52,7 +52,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 2, "z": 11, "y": 0 @@ -66,7 +66,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 9, "z": 4, "y": 0 @@ -80,7 +80,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 8, "z": 4, "y": 0 @@ -94,7 +94,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 3, "z": 4, "y": 0 @@ -108,7 +108,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 7, "z": 11, "y": 0 @@ -122,7 +122,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 14, "z": 4, "y": 0 diff --git a/res/field/events/events_0380.json b/res/field/events/events_0380.json index adc510cd2f..1fb85d6e71 100644 --- a/res/field/events/events_0380.json +++ b/res/field/events/events_0380.json @@ -19,7 +19,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 2, "z": 5, "y": 0 diff --git a/res/field/events/events_0381.json b/res/field/events/events_0381.json index 6170aa6258..adaef1fbc9 100644 --- a/res/field/events/events_0381.json +++ b/res/field/events/events_0381.json @@ -75,7 +75,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 777, "z": 790, "y": 0 @@ -89,7 +89,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 761, "z": 789, "y": 0 @@ -103,7 +103,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 769, "z": 789, "y": 0 @@ -117,7 +117,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 782, "z": 790, "y": 0 @@ -133,7 +133,7 @@ 2 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 771, "z": 777, "y": 0 @@ -149,7 +149,7 @@ 3 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 812, "z": 781, "y": 0 @@ -165,7 +165,7 @@ 6 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 751, "z": 782, "y": 0 @@ -181,7 +181,7 @@ 2 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 814, "z": 785, "y": 0 @@ -198,7 +198,7 @@ 2 ], "movement_range_x": 8, - "movement_range_y": 0, + "movement_range_z": 0, "x": 794, "z": 778, "y": 0 @@ -214,7 +214,7 @@ 2 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 787, "z": 788, "y": 0 @@ -230,7 +230,7 @@ 3 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 808, "z": 781, "y": 0 @@ -246,7 +246,7 @@ 9 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 821, "z": 784, "y": 0 @@ -262,7 +262,7 @@ 2 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 749, "z": 787, "y": 0 @@ -276,7 +276,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 793, "z": 784, "y": 0 @@ -290,7 +290,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 804, "z": 784, "y": 0 @@ -304,7 +304,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 801, "z": 791, "y": 0 @@ -318,7 +318,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 789, "z": 785, "y": 0 @@ -332,7 +332,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 804, "z": 792, "y": 0 @@ -346,7 +346,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 814, "z": 775, "y": 0 @@ -360,7 +360,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 785, "z": 781, "y": 0 @@ -374,7 +374,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 816, "z": 783, "y": 0 @@ -390,7 +390,7 @@ 82 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 760, "z": 772, "y": 0 @@ -406,7 +406,7 @@ 83 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 761, "z": 772, "y": 0 @@ -422,7 +422,7 @@ 84 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 762, "z": 772, "y": 0 @@ -438,7 +438,7 @@ 85 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 763, "z": 772, "y": 0 @@ -452,7 +452,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 788, "z": 781, "y": 0 @@ -466,7 +466,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 775, "z": 780, "y": 0 @@ -480,7 +480,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 773, "z": 780, "y": 0 @@ -494,7 +494,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 771, "z": 780, "y": 0 @@ -511,7 +511,7 @@ 2 ], "movement_range_x": 8, - "movement_range_y": 0, + "movement_range_z": 0, "x": 794, "z": 778, "y": 0 @@ -525,7 +525,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 809, "z": 790, "y": 0 @@ -539,7 +539,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 798, "z": 782, "y": 0 diff --git a/res/field/events/events_0382.json b/res/field/events/events_0382.json index 0239233d12..4d82c6e4e0 100644 --- a/res/field/events/events_0382.json +++ b/res/field/events/events_0382.json @@ -10,7 +10,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 5, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 2, "z": 7, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 1, "z": 4, "y": 0 @@ -52,7 +52,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 7, "z": 7, "y": 0 @@ -66,7 +66,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 5, "y": 0 @@ -80,7 +80,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 5, "y": 0 @@ -94,7 +94,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 3, "y": 0 diff --git a/res/field/events/events_0383.json b/res/field/events/events_0383.json index 030306afbd..8c14326488 100644 --- a/res/field/events/events_0383.json +++ b/res/field/events/events_0383.json @@ -10,7 +10,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 5, "y": 0 diff --git a/res/field/events/events_0384.json b/res/field/events/events_0384.json index 4c666d4d24..bd6dfe5f4a 100644 --- a/res/field/events/events_0384.json +++ b/res/field/events/events_0384.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 5, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 3, - "movement_range_y": 0, + "movement_range_z": 0, "x": 6, "z": 8, "y": 0 diff --git a/res/field/events/events_0385.json b/res/field/events/events_0385.json index 2f5d569599..69b09ca80a 100644 --- a/res/field/events/events_0385.json +++ b/res/field/events/events_0385.json @@ -75,7 +75,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 884, "z": 570, "y": 0 @@ -89,7 +89,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 869, "z": 530, "y": 0 @@ -103,7 +103,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 907, "z": 509, "y": 0 @@ -117,7 +117,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 909, "z": 492, "y": 0 @@ -133,7 +133,7 @@ 86 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 906, "z": 522, "y": 0 @@ -149,7 +149,7 @@ 87 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 907, "z": 522, "y": 0 @@ -165,7 +165,7 @@ 88 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 908, "z": 522, "y": 0 @@ -181,7 +181,7 @@ 89 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 909, "z": 522, "y": 0 @@ -197,7 +197,7 @@ 3 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 883, "z": 547, "y": 0 @@ -213,7 +213,7 @@ 4 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 875, "z": 529, "y": 0 @@ -229,7 +229,7 @@ 2 ], "movement_range_x": 10, - "movement_range_y": 2, + "movement_range_z": 2, "x": 901, "z": 532, "y": 0 @@ -245,7 +245,7 @@ 3 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 885, "z": 533, "y": 0 @@ -261,7 +261,7 @@ 2 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 869, "z": 536, "y": 0 @@ -277,7 +277,7 @@ 6 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 915, "z": 518, "y": 0 @@ -293,7 +293,7 @@ 4 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 913, "z": 522, "y": 0 @@ -309,7 +309,7 @@ 3 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 904, "z": 511, "y": 0 @@ -323,7 +323,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 911, "z": 480, "y": 0 @@ -337,7 +337,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 923, "z": 503, "y": 0 @@ -351,7 +351,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 904, "z": 524, "y": 0 @@ -365,7 +365,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 914, "z": 509, "y": 0 @@ -379,7 +379,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 877, "z": 541, "y": 0 @@ -393,7 +393,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 907, "z": 493, "y": 0 diff --git a/res/field/events/events_0386.json b/res/field/events/events_0386.json index a31910aa10..fb42d3f1de 100644 --- a/res/field/events/events_0386.json +++ b/res/field/events/events_0386.json @@ -45,7 +45,7 @@ 4 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 628, "z": 410, "y": 0 @@ -61,7 +61,7 @@ 1 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 630, "z": 330, "y": 0 @@ -75,7 +75,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 611, "z": 410, "y": 0 @@ -89,7 +89,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 637, "z": 394, "y": 0 @@ -103,7 +103,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 618, "z": 399, "y": 0 @@ -117,7 +117,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 610, "z": 368, "y": 0 @@ -131,7 +131,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 610, "z": 350, "y": 0 @@ -145,7 +145,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 628, "z": 321, "y": 0 @@ -161,7 +161,7 @@ 97 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 610, "z": 337, "y": 0 @@ -177,7 +177,7 @@ 96 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 613, "z": 337, "y": 0 @@ -193,7 +193,7 @@ 95 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 611, "z": 337, "y": 0 @@ -209,7 +209,7 @@ 94 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 612, "z": 337, "y": 0 @@ -223,7 +223,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 611, "z": 388, "y": 0 @@ -237,7 +237,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 632, "z": 394, "y": 0 @@ -251,7 +251,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 632, "z": 395, "y": 0 @@ -265,7 +265,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 613, "z": 368, "y": 0 @@ -279,7 +279,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 613, "z": 369, "y": 0 @@ -293,7 +293,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 614, "z": 339, "y": 0 @@ -307,7 +307,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 614, "z": 340, "y": 0 @@ -324,7 +324,7 @@ 2 ], "movement_range_x": 4, - "movement_range_y": 0, + "movement_range_z": 0, "x": 612, "z": 377, "y": 0 @@ -340,7 +340,7 @@ 4 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 628, "z": 392, "y": 0 @@ -356,7 +356,7 @@ 4 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 628, "z": 397, "y": 0 @@ -372,7 +372,7 @@ 2 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 631, "z": 392, "y": 0 @@ -388,7 +388,7 @@ 3 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 627, "z": 322, "y": 0 @@ -404,7 +404,7 @@ 4 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 619, "z": 340, "y": 0 @@ -421,7 +421,7 @@ 6 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 646, "z": 338, "y": 0 @@ -437,7 +437,7 @@ 2 ], "movement_range_x": 2, - "movement_range_y": 6, + "movement_range_z": 6, "x": 612, "z": 397, "y": 0 @@ -453,7 +453,7 @@ 3 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 624, "z": 367, "y": 0 @@ -467,7 +467,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 634, "z": 361, "y": 0 @@ -481,7 +481,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 635, "z": 361, "y": 0 @@ -495,7 +495,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 630, "z": 338, "y": 0 diff --git a/res/field/events/events_0387.json b/res/field/events/events_0387.json index 01da6b925d..6de3315b39 100644 --- a/res/field/events/events_0387.json +++ b/res/field/events/events_0387.json @@ -37,7 +37,7 @@ 3 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 755, "z": 314, "y": 0 @@ -51,7 +51,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 759, "z": 283, "y": 0 @@ -65,7 +65,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 745, "z": 295, "y": 0 @@ -79,7 +79,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 739, "z": 305, "y": 0 @@ -93,7 +93,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 738, "z": 305, "y": 0 @@ -109,7 +109,7 @@ 2 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 756, "z": 308, "y": 0 @@ -125,7 +125,7 @@ 2 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 747, "z": 311, "y": 0 @@ -141,7 +141,7 @@ 2 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 764, "z": 266, "y": 0 @@ -157,7 +157,7 @@ 2 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 752, "z": 295, "y": 0 @@ -171,7 +171,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 754, "z": 297, "y": 0 @@ -185,7 +185,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 754, "z": 296, "y": 0 @@ -199,7 +199,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 758, "z": 275, "y": 0 @@ -213,7 +213,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 751, "z": 271, "y": 0 diff --git a/res/field/events/events_0388.json b/res/field/events/events_0388.json index 8e4aa628ee..96f537e7cc 100644 --- a/res/field/events/events_0388.json +++ b/res/field/events/events_0388.json @@ -61,7 +61,7 @@ 2 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 779, "z": 329, "y": 0 @@ -77,7 +77,7 @@ 4 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 786, "z": 406, "y": 0 @@ -91,7 +91,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 793, "z": 372, "y": 0 @@ -105,7 +105,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 781, "z": 352, "y": 0 @@ -119,7 +119,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 782, "z": 352, "y": 0 @@ -133,7 +133,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 783, "z": 353, "y": 0 @@ -147,7 +147,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 786, "z": 333, "y": 0 @@ -161,7 +161,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 796, "z": 346, "y": 0 @@ -175,7 +175,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 794, "z": 385, "y": 0 @@ -189,7 +189,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 780, "z": 345, "y": 0 @@ -203,7 +203,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 779, "z": 380, "y": 0 @@ -219,7 +219,7 @@ 102 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 779, "z": 389, "y": 0 @@ -235,7 +235,7 @@ 103 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 782, "z": 389, "y": 0 @@ -251,7 +251,7 @@ 104 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 780, "z": 389, "y": 0 @@ -267,7 +267,7 @@ 105 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 781, "z": 389, "y": 0 @@ -283,7 +283,7 @@ 3 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 779, "z": 325, "y": 0 @@ -299,7 +299,7 @@ 2 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 773, "z": 346, "y": 0 @@ -315,7 +315,7 @@ 2 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 789, "z": 375, "y": 0 @@ -331,7 +331,7 @@ 2 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 786, "z": 375, "y": 0 @@ -347,7 +347,7 @@ 4 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 796, "z": 327, "y": 0 @@ -363,7 +363,7 @@ 5 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 785, "z": 398, "y": 0 @@ -379,7 +379,7 @@ 4 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 795, "z": 394, "y": 0 @@ -395,7 +395,7 @@ 1 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 776, "z": 338, "y": 0 @@ -409,7 +409,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 785, "z": 390, "y": 0 @@ -423,7 +423,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 786, "z": 390, "y": 0 @@ -437,7 +437,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 772, "z": 384, "y": 0 @@ -451,7 +451,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 773, "z": 384, "y": 0 diff --git a/res/field/events/events_0389.json b/res/field/events/events_0389.json index 8351681d28..827eeaf3e8 100644 --- a/res/field/events/events_0389.json +++ b/res/field/events/events_0389.json @@ -19,7 +19,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 820, "z": 439, "y": 0 @@ -35,7 +35,7 @@ 11 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 800, "z": 434, "y": 0 @@ -49,7 +49,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 814, "z": 431, "y": 0 @@ -63,7 +63,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 820, "z": 438, "y": 0 @@ -77,7 +77,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 808, "z": 427, "y": 0 @@ -91,7 +91,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 821, "z": 437, "y": 0 @@ -105,7 +105,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 826, "z": 437, "y": 0 @@ -119,7 +119,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 816, "z": 426, "y": 0 @@ -133,7 +133,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 828, "z": 420, "y": 0 @@ -147,7 +147,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 828, "z": 438, "y": 0 @@ -163,7 +163,7 @@ 106 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 810, "z": 434, "y": 0 @@ -179,7 +179,7 @@ 107 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 811, "z": 434, "y": 0 @@ -195,7 +195,7 @@ 108 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 812, "z": 434, "y": 0 @@ -211,7 +211,7 @@ 109 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 813, "z": 434, "y": 0 @@ -227,7 +227,7 @@ 3 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 829, "z": 433, "y": 0 @@ -243,7 +243,7 @@ 4 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 796, "z": 432, "y": 0 @@ -259,7 +259,7 @@ 4 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 801, "z": 432, "y": 0 @@ -275,7 +275,7 @@ 3 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 820, "z": 418, "y": 0 @@ -292,7 +292,7 @@ 7 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 805, "z": 451, "y": 0 diff --git a/res/field/events/events_0390.json b/res/field/events/events_0390.json index 51bc0a453e..5bd232e336 100644 --- a/res/field/events/events_0390.json +++ b/res/field/events/events_0390.json @@ -19,7 +19,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 119, "z": 878, "y": 1 @@ -33,7 +33,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 2, + "movement_range_z": 2, "x": 108, "z": 889, "y": 1 @@ -47,7 +47,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 105, "z": 875, "y": 0 @@ -61,7 +61,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 108, "z": 869, "y": 0 @@ -77,7 +77,7 @@ 1 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 112, "z": 878, "y": 0 @@ -91,7 +91,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 114, "z": 885, "y": 0 @@ -105,7 +105,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 109, "z": 875, "y": 0 @@ -122,7 +122,7 @@ 4 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 109, "z": 856, "y": 0 diff --git a/res/field/events/events_0391.json b/res/field/events/events_0391.json index 1e294272fc..b5a2861f72 100644 --- a/res/field/events/events_0391.json +++ b/res/field/events/events_0391.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 6, "y": 0 diff --git a/res/field/events/events_0392.json b/res/field/events/events_0392.json index 987c81b689..94a659eb0d 100644 --- a/res/field/events/events_0392.json +++ b/res/field/events/events_0392.json @@ -27,7 +27,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 9, "z": 5, "y": 0 diff --git a/res/field/events/events_0393.json b/res/field/events/events_0393.json index 6d01b370da..16d94686c4 100644 --- a/res/field/events/events_0393.json +++ b/res/field/events/events_0393.json @@ -75,7 +75,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 7, "z": 8, "y": 1 @@ -89,7 +89,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 6, "z": 10, "y": 1 diff --git a/res/field/events/events_0394.json b/res/field/events/events_0394.json index 54c10b89da..d95d0ddf2c 100644 --- a/res/field/events/events_0394.json +++ b/res/field/events/events_0394.json @@ -51,7 +51,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 10, "z": 4, "y": 0 diff --git a/res/field/events/events_0395.json b/res/field/events/events_0395.json index 72a9c9229f..035e6c039f 100644 --- a/res/field/events/events_0395.json +++ b/res/field/events/events_0395.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 8, "z": 6, "y": 0 diff --git a/res/field/events/events_0396.json b/res/field/events/events_0396.json index 755e3fe0fd..9240c79695 100644 --- a/res/field/events/events_0396.json +++ b/res/field/events/events_0396.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 5, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 2, + "movement_range_z": 2, "x": 8, "z": 6, "y": 0 diff --git a/res/field/events/events_0397.json b/res/field/events/events_0397.json index a864b53858..293b8b2944 100644 --- a/res/field/events/events_0397.json +++ b/res/field/events/events_0397.json @@ -10,7 +10,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 187, "z": 855, "y": 1 @@ -24,7 +24,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 2, - "movement_range_y": 0, + "movement_range_z": 0, "x": 171, "z": 854, "y": 1 @@ -38,7 +38,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 183, "z": 852, "y": 1 @@ -52,7 +52,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 168, "z": 842, "y": 1 @@ -66,7 +66,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 168, "z": 845, "y": 1 @@ -80,7 +80,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 165, "z": 843, "y": 0 @@ -94,7 +94,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 174, "z": 854, "y": 0 @@ -110,7 +110,7 @@ 2 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 182, "z": 854, "y": 0 @@ -127,7 +127,7 @@ 4 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 179, "z": 866, "y": 0 @@ -144,7 +144,7 @@ 4 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 183, "z": 825, "y": 0 @@ -161,7 +161,7 @@ 1 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 151, "z": 843, "y": 0 @@ -176,7 +176,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 153, "z": 847, "y": 0 @@ -190,7 +190,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 180, "z": 842, "y": 0 @@ -204,7 +204,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 185, "z": 842, "y": 0 @@ -218,7 +218,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 168, "z": 842, "y": 0 diff --git a/res/field/events/events_0398.json b/res/field/events/events_0398.json index 243c7362b3..128cb37bd8 100644 --- a/res/field/events/events_0398.json +++ b/res/field/events/events_0398.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 3, "z": 5, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 6, "z": 9, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 1, + "movement_range_z": 1, "x": 9, "z": 6, "y": 0 @@ -52,7 +52,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 7, "y": 0 diff --git a/res/field/events/events_0399.json b/res/field/events/events_0399.json index 51cc57f2b1..d4e5bb0e07 100644 --- a/res/field/events/events_0399.json +++ b/res/field/events/events_0399.json @@ -10,7 +10,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 6, "z": 6, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 13, "z": 5, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 11, "y": 0 @@ -52,7 +52,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 4, "y": 0 @@ -66,7 +66,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 13, "z": 10, "y": 0 diff --git a/res/field/events/events_0400.json b/res/field/events/events_0400.json index 44e21aea13..322c7e5752 100644 --- a/res/field/events/events_0400.json +++ b/res/field/events/events_0400.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 4, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 12, "z": 4, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 4, "y": 0 @@ -52,7 +52,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 2, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 9, "y": 0 diff --git a/res/field/events/events_0401.json b/res/field/events/events_0401.json index 113baa052e..8f2f4ed693 100644 --- a/res/field/events/events_0401.json +++ b/res/field/events/events_0401.json @@ -59,7 +59,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 5, "y": 0 @@ -73,7 +73,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 2, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 12, "y": 0 @@ -87,7 +87,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 2, - "movement_range_y": 0, + "movement_range_z": 0, "x": 10, "z": 12, "y": 0 @@ -101,7 +101,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 14, "y": 0 @@ -115,7 +115,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 14, "y": 0 diff --git a/res/field/events/events_0402.json b/res/field/events/events_0402.json index 7525e196f1..4c32375465 100644 --- a/res/field/events/events_0402.json +++ b/res/field/events/events_0402.json @@ -10,7 +10,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 9, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 1, + "movement_range_z": 1, "x": 5, "z": 7, "y": 0 diff --git a/res/field/events/events_0404.json b/res/field/events/events_0404.json index 2dea68d05d..75947b0c38 100644 --- a/res/field/events/events_0404.json +++ b/res/field/events/events_0404.json @@ -10,7 +10,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 5, "z": 5, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 1, + "movement_range_z": 1, "x": 8, "z": 4, "y": 0 diff --git a/res/field/events/events_0405.json b/res/field/events/events_0405.json index 61aab98998..a3785b5280 100644 --- a/res/field/events/events_0405.json +++ b/res/field/events/events_0405.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 179, "z": 661, "y": 5 @@ -24,7 +24,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 170, "z": 645, "y": 5 @@ -38,7 +38,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 176, "z": 656, "y": 5 @@ -52,7 +52,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 170, "z": 659, "y": 5 @@ -66,7 +66,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 183, "z": 651, "y": 5 @@ -80,7 +80,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 178, "z": 651, "y": 0 @@ -96,7 +96,7 @@ 1 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 182, "z": 651, "y": 0 @@ -110,7 +110,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 1, - "movement_range_y": 4, + "movement_range_z": 4, "x": 162, "z": 641, "y": 5 @@ -124,7 +124,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 1, - "movement_range_y": 4, + "movement_range_z": 4, "x": 163, "z": 641, "y": 5 @@ -140,7 +140,7 @@ 3 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 173, "z": 659, "y": 0 @@ -154,7 +154,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 177, "z": 651, "y": 0 @@ -170,7 +170,7 @@ 3 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 189, "z": 655, "y": 0 @@ -184,7 +184,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 166, "z": 650, "y": 0 diff --git a/res/field/events/events_0406.json b/res/field/events/events_0406.json index 67bb342ff4..b65f3cddbe 100644 --- a/res/field/events/events_0406.json +++ b/res/field/events/events_0406.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 1, + "movement_range_z": 1, "x": 6, "z": 8, "y": 0 @@ -26,7 +26,7 @@ 2 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 9, "z": 6, "y": 0 @@ -40,7 +40,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 5, "y": 0 @@ -54,7 +54,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 2, "z": 5, "y": 0 @@ -68,7 +68,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 7, "y": 0 diff --git a/res/field/events/events_0407.json b/res/field/events/events_0407.json index e3a5f23fbd..c98deafd6e 100644 --- a/res/field/events/events_0407.json +++ b/res/field/events/events_0407.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 9, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 1, + "movement_range_z": 1, "x": 12, "z": 8, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 4, "y": 0 @@ -52,7 +52,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 1, "z": 6, "y": 0 @@ -66,7 +66,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 6, "z": 6, "y": 0 @@ -80,7 +80,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 6, "y": 0 diff --git a/res/field/events/events_0408.json b/res/field/events/events_0408.json index 699fbfc0e9..6923c407ea 100644 --- a/res/field/events/events_0408.json +++ b/res/field/events/events_0408.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 4, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 12, "z": 4, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 4, "y": 0 diff --git a/res/field/events/events_0409.json b/res/field/events/events_0409.json index aee39cf130..9688dfa11e 100644 --- a/res/field/events/events_0409.json +++ b/res/field/events/events_0409.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 14, "z": 4, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 2, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 7, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 1, + "movement_range_z": 1, "x": 14, "z": 8, "y": 0 diff --git a/res/field/events/events_0410.json b/res/field/events/events_0410.json index 5d1199c5e7..a0e2d69b81 100644 --- a/res/field/events/events_0410.json +++ b/res/field/events/events_0410.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 1, + "movement_range_z": 1, "x": 8, "z": 6, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 5, "y": 0 diff --git a/res/field/events/events_0411.json b/res/field/events/events_0411.json index b46567609b..9fbc3e8d3e 100644 --- a/res/field/events/events_0411.json +++ b/res/field/events/events_0411.json @@ -10,7 +10,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 6, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 2, "z": 3, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 3, "y": 0 diff --git a/res/field/events/events_0412.json b/res/field/events/events_0412.json index edd211ee8b..e1c904e649 100644 --- a/res/field/events/events_0412.json +++ b/res/field/events/events_0412.json @@ -19,7 +19,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 2, + "movement_range_z": 2, "x": 563, "z": 652, "y": 7 @@ -33,7 +33,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 551, "z": 658, "y": 7 @@ -47,7 +47,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 2, - "movement_range_y": 0, + "movement_range_z": 0, "x": 569, "z": 659, "y": 7 @@ -61,7 +61,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 555, "z": 648, "y": 0 @@ -77,7 +77,7 @@ 4 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 564, "z": 667, "y": 0 @@ -91,7 +91,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 556, "z": 645, "y": 0 @@ -105,7 +105,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 569, "z": 656, "y": 0 @@ -119,7 +119,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 2, + "movement_range_z": 2, "x": 559, "z": 653, "y": 7 @@ -133,7 +133,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 2, + "movement_range_z": 2, "x": 558, "z": 659, "y": 7 @@ -149,7 +149,7 @@ 34 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 565, "z": 663, "y": 0 @@ -165,7 +165,7 @@ 35 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 566, "z": 663, "y": 0 @@ -181,7 +181,7 @@ 36 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 567, "z": 663, "y": 0 @@ -197,7 +197,7 @@ 37 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 568, "z": 663, "y": 0 @@ -214,7 +214,7 @@ 3 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 563, "z": 678, "y": 0 @@ -228,7 +228,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 1, + "movement_range_z": 1, "x": 569, "z": 650, "y": 7 @@ -242,7 +242,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 3, + "movement_range_z": 3, "x": 549, "z": 659, "y": 0 @@ -256,7 +256,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 4, - "movement_range_y": 0, + "movement_range_z": 0, "x": 552, "z": 652, "y": 0 @@ -270,7 +270,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 553, "z": 655, "y": 0 @@ -284,7 +284,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 2, + "movement_range_z": 2, "x": 560, "z": 659, "y": 7 @@ -298,7 +298,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 584, "z": 662, "y": 0 @@ -312,7 +312,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 594, "z": 653, "y": 0 diff --git a/res/field/events/events_0413.json b/res/field/events/events_0413.json index 3508a4f452..6cbf01da0d 100644 --- a/res/field/events/events_0413.json +++ b/res/field/events/events_0413.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 5, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 7, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 5, "z": 9, "y": 0 @@ -52,7 +52,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 2, "z": 5, "y": 0 @@ -66,7 +66,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 7, "y": 0 diff --git a/res/field/events/events_0414.json b/res/field/events/events_0414.json index 045d0e2689..33aac15887 100644 --- a/res/field/events/events_0414.json +++ b/res/field/events/events_0414.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 4, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 13, "z": 7, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 9, "y": 0 @@ -52,7 +52,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 6, "z": 6, "y": 0 @@ -66,7 +66,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 6, "y": 0 @@ -80,7 +80,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 11, "z": 11, "y": 0 diff --git a/res/field/events/events_0415.json b/res/field/events/events_0415.json index e381611bb8..ec70bb20ed 100644 --- a/res/field/events/events_0415.json +++ b/res/field/events/events_0415.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 4, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 12, "z": 4, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 4, "y": 0 diff --git a/res/field/events/events_0416.json b/res/field/events/events_0416.json index 6a8a7819ca..6d4067aee8 100644 --- a/res/field/events/events_0416.json +++ b/res/field/events/events_0416.json @@ -19,7 +19,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 9, "z": 4, "y": 0 @@ -33,7 +33,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 9, "y": 0 diff --git a/res/field/events/events_0417.json b/res/field/events/events_0417.json index 711fd9b3f9..69b20a4c1b 100644 --- a/res/field/events/events_0417.json +++ b/res/field/events/events_0417.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 5, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 2, + "movement_range_z": 2, "x": 7, "z": 6, "y": 0 diff --git a/res/field/events/events_0418.json b/res/field/events/events_0418.json index caec942e1b..18580a09e5 100644 --- a/res/field/events/events_0418.json +++ b/res/field/events/events_0418.json @@ -19,7 +19,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 2, "z": 5, "y": 0 @@ -33,7 +33,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 4, "z": 3, "y": 0 diff --git a/res/field/events/events_0419.json b/res/field/events/events_0419.json index 773b775dc0..d651648f62 100644 --- a/res/field/events/events_0419.json +++ b/res/field/events/events_0419.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 5, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 6, "y": 0 diff --git a/res/field/events/events_0420.json b/res/field/events/events_0420.json index 8bbec7ff10..e8dc182650 100644 --- a/res/field/events/events_0420.json +++ b/res/field/events/events_0420.json @@ -10,7 +10,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 5, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 2, "z": 5, "y": 0 diff --git a/res/field/events/events_0421.json b/res/field/events/events_0421.json index b92231aa69..886122ea0d 100644 --- a/res/field/events/events_0421.json +++ b/res/field/events/events_0421.json @@ -67,7 +67,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 3, - "movement_range_y": 0, + "movement_range_z": 0, "x": 469, "z": 518, "y": 7 @@ -81,7 +81,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 454, "z": 541, "y": 0 @@ -95,7 +95,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 2, - "movement_range_y": 0, + "movement_range_z": 0, "x": 463, "z": 522, "y": 7 @@ -109,7 +109,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 2, - "movement_range_y": 0, + "movement_range_z": 0, "x": 462, "z": 538, "y": 7 @@ -123,7 +123,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 2, - "movement_range_y": 0, + "movement_range_z": 0, "x": 466, "z": 522, "y": 7 @@ -139,7 +139,7 @@ 5 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 466, "z": 537, "y": 0 @@ -156,7 +156,7 @@ 2 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 488, "z": 529, "y": 0 @@ -173,7 +173,7 @@ 1 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 440, "z": 526, "y": 0 @@ -187,7 +187,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 2, + "movement_range_z": 2, "x": 454, "z": 516, "y": 0 @@ -201,7 +201,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 476, "z": 542, "y": 0 @@ -215,7 +215,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 470, "z": 542, "y": 0 @@ -229,7 +229,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 469, "z": 533, "y": 0 diff --git a/res/field/events/events_0422.json b/res/field/events/events_0422.json index 7f7b71c6ea..67c566654a 100644 --- a/res/field/events/events_0422.json +++ b/res/field/events/events_0422.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 4, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 11, "z": 7, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 1, + "movement_range_z": 1, "x": 10, "z": 10, "y": 0 @@ -52,7 +52,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 8, "y": 0 @@ -66,7 +66,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 6, "z": 6, "y": 0 @@ -80,7 +80,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 6, "y": 0 diff --git a/res/field/events/events_0423.json b/res/field/events/events_0423.json index 3568c6fda8..8b1b848a59 100644 --- a/res/field/events/events_0423.json +++ b/res/field/events/events_0423.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 4, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 12, "z": 4, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 4, "y": 0 diff --git a/res/field/events/events_0424.json b/res/field/events/events_0424.json index 56d3b39702..dc29e7878e 100644 --- a/res/field/events/events_0424.json +++ b/res/field/events/events_0424.json @@ -19,7 +19,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 7, "y": 0 @@ -33,7 +33,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 2, "z": 6, "y": 0 @@ -47,7 +47,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 4, "y": 0 @@ -61,7 +61,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 6, "y": 0 diff --git a/res/field/events/events_0425.json b/res/field/events/events_0425.json index 0e7aadafad..8adfc1856e 100644 --- a/res/field/events/events_0425.json +++ b/res/field/events/events_0425.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 2, "z": 4, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 4, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 1, + "movement_range_z": 1, "x": 7, "z": 6, "y": 0 diff --git a/res/field/events/events_0426.json b/res/field/events/events_0426.json index 31069ee81d..f9d9b3116c 100644 --- a/res/field/events/events_0426.json +++ b/res/field/events/events_0426.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 6, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 2, "z": 5, "y": 0 diff --git a/res/field/events/events_0427.json b/res/field/events/events_0427.json index 44921aad55..c172dca113 100644 --- a/res/field/events/events_0427.json +++ b/res/field/events/events_0427.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 2, "z": 5, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 1, + "movement_range_z": 1, "x": 7, "z": 6, "y": 0 diff --git a/res/field/events/events_0428.json b/res/field/events/events_0428.json index b73dc39437..cfca08ca89 100644 --- a/res/field/events/events_0428.json +++ b/res/field/events/events_0428.json @@ -27,7 +27,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 10, "z": 3, "y": 0 @@ -41,7 +41,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 9, "z": 3, "y": 0 @@ -55,7 +55,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 9, "z": 10, "y": 0 diff --git a/res/field/events/events_0429.json b/res/field/events/events_0429.json index 9e0cbc0185..6e6c153828 100644 --- a/res/field/events/events_0429.json +++ b/res/field/events/events_0429.json @@ -29,7 +29,7 @@ 6 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 646, "z": 338, "y": 0 @@ -43,7 +43,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 660, "z": 327, "y": 0 @@ -57,7 +57,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 652, "z": 327, "y": 0 @@ -71,7 +71,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 659, "z": 350, "y": 0 @@ -85,7 +85,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 652, "z": 341, "y": 0 @@ -99,7 +99,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 667, "z": 338, "y": 0 @@ -116,7 +116,7 @@ 2 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 679, "z": 340, "y": 0 @@ -130,7 +130,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 651, "z": 348, "y": 0 @@ -144,7 +144,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 652, "z": 339, "y": 0 @@ -158,7 +158,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 662, "z": 335, "y": 0 @@ -172,7 +172,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 649, "z": 324, "y": 0 @@ -186,7 +186,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 651, "z": 339, "y": 0 diff --git a/res/field/events/events_0430.json b/res/field/events/events_0430.json index de073fb4e7..1dda549192 100644 --- a/res/field/events/events_0430.json +++ b/res/field/events/events_0430.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 3, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 7, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 3, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 3, "z": 5, "y": 0 @@ -52,7 +52,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 7, "y": 0 diff --git a/res/field/events/events_0431.json b/res/field/events/events_0431.json index ae0e5d3c18..664c4e7ba3 100644 --- a/res/field/events/events_0431.json +++ b/res/field/events/events_0431.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 4, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 1, "z": 5, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 10, "z": 8, "y": 0 @@ -52,7 +52,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 9, "y": 0 diff --git a/res/field/events/events_0432.json b/res/field/events/events_0432.json index a63299f8a5..5aded2a02d 100644 --- a/res/field/events/events_0432.json +++ b/res/field/events/events_0432.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 4, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 12, "z": 4, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 4, "y": 0 diff --git a/res/field/events/events_0433.json b/res/field/events/events_0433.json index e9152b6e0b..dd760ba407 100644 --- a/res/field/events/events_0433.json +++ b/res/field/events/events_0433.json @@ -10,7 +10,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 13, "z": 9, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 11, "z": 8, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 2, "z": 9, "y": 0 @@ -52,7 +52,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 6, "z": 8, "y": 0 @@ -66,7 +66,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 9, "z": 7, "y": 0 @@ -80,7 +80,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 11, "z": 5, "y": 0 diff --git a/res/field/events/events_0434.json b/res/field/events/events_0434.json index 7cb66e5042..735dcf270e 100644 --- a/res/field/events/events_0434.json +++ b/res/field/events/events_0434.json @@ -10,7 +10,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 4, "z": 5, "y": 0 diff --git a/res/field/events/events_0435.json b/res/field/events/events_0435.json index a80015721f..55fcff614f 100644 --- a/res/field/events/events_0435.json +++ b/res/field/events/events_0435.json @@ -27,7 +27,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 4, "y": 0 @@ -41,7 +41,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 5, "y": 0 diff --git a/res/field/events/events_0436.json b/res/field/events/events_0436.json index 8cd18660f8..434689afdb 100644 --- a/res/field/events/events_0436.json +++ b/res/field/events/events_0436.json @@ -29,7 +29,7 @@ 7 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 805, "z": 451, "y": 0 @@ -43,7 +43,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 813, "z": 457, "y": 0 @@ -57,7 +57,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 815, "z": 462, "y": 0 @@ -71,7 +71,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 2, + "movement_range_z": 2, "x": 806, "z": 458, "y": 0 @@ -85,7 +85,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 3, - "movement_range_y": 0, + "movement_range_z": 0, "x": 822, "z": 459, "y": 0 @@ -99,7 +99,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 3, - "movement_range_y": 0, + "movement_range_z": 0, "x": 809, "z": 477, "y": 0 @@ -113,7 +113,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 806, "z": 471, "y": 0 @@ -129,7 +129,7 @@ 110 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 828, "z": 469, "y": 0 @@ -145,7 +145,7 @@ 111 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 816, "z": 469, "y": 0 @@ -161,7 +161,7 @@ 112 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 817, "z": 469, "y": 0 @@ -177,7 +177,7 @@ 113 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 827, "z": 469, "y": 0 @@ -191,7 +191,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 816, "z": 455, "y": 0 @@ -205,7 +205,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 810, "z": 471, "y": 0 @@ -219,7 +219,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 816, "z": 473, "y": 0 @@ -233,7 +233,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 821, "z": 473, "y": 0 @@ -247,7 +247,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 822, "z": 473, "y": 0 @@ -261,7 +261,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 823, "z": 473, "y": 0 @@ -275,7 +275,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 822, "z": 472, "y": 0 @@ -289,7 +289,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 822, "z": 474, "y": 0 diff --git a/res/field/events/events_0437.json b/res/field/events/events_0437.json index ce81651f38..b4ff517a39 100644 --- a/res/field/events/events_0437.json +++ b/res/field/events/events_0437.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 5, "y": 0 diff --git a/res/field/events/events_0438.json b/res/field/events/events_0438.json index 74a6db16e3..ea5d2be045 100644 --- a/res/field/events/events_0438.json +++ b/res/field/events/events_0438.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 4, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 6, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 11, "z": 9, "y": 0 @@ -52,7 +52,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 6, "y": 0 @@ -66,7 +66,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 6, "y": 0 diff --git a/res/field/events/events_0439.json b/res/field/events/events_0439.json index 4883d6339f..0deeb3b7e2 100644 --- a/res/field/events/events_0439.json +++ b/res/field/events/events_0439.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 4, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 12, "z": 4, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 4, "y": 0 diff --git a/res/field/events/events_0440.json b/res/field/events/events_0440.json index 68e4c7411f..018feab242 100644 --- a/res/field/events/events_0440.json +++ b/res/field/events/events_0440.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 15, "z": 14, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 15, "z": 4, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 2, - "movement_range_y": 1, + "movement_range_z": 1, "x": 23, "z": 5, "y": 0 @@ -52,7 +52,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 2, - "movement_range_y": 1, + "movement_range_z": 1, "x": 6, "z": 13, "y": 0 @@ -66,7 +66,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 3, + "movement_range_z": 3, "x": 10, "z": 11, "y": 0 @@ -80,7 +80,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 25, "z": 6, "y": 0 diff --git a/res/field/events/events_0441.json b/res/field/events/events_0441.json index a97f5b9feb..82ca33b951 100644 --- a/res/field/events/events_0441.json +++ b/res/field/events/events_0441.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 16, "z": 5, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 3, - "movement_range_y": 0, + "movement_range_z": 0, "x": 12, "z": 7, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 12, "z": 5, "y": 0 @@ -52,7 +52,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 16, "z": 12, "y": 0 diff --git a/res/field/events/events_0442.json b/res/field/events/events_0442.json index c73dc08008..dcb4f15aac 100644 --- a/res/field/events/events_0442.json +++ b/res/field/events/events_0442.json @@ -10,7 +10,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 1, "z": 6, "y": 0 diff --git a/res/field/events/events_0443.json b/res/field/events/events_0443.json index bb41dae6bb..c0de82372d 100644 --- a/res/field/events/events_0443.json +++ b/res/field/events/events_0443.json @@ -35,7 +35,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 6, "y": 0 @@ -49,7 +49,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 3, "y": 0 @@ -63,7 +63,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 17, "z": 4, "y": 0 @@ -77,7 +77,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 11, "z": 4, "y": 0 @@ -91,7 +91,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 18, "z": 10, "y": 0 @@ -105,7 +105,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 8, "z": 6, "y": 0 @@ -119,7 +119,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 6, "z": 6, "y": 0 @@ -133,7 +133,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 9, "z": 6, "y": 0 @@ -147,7 +147,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 9, "z": 11, "y": 0 @@ -161,7 +161,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 19, "z": 4, "y": 0 @@ -175,7 +175,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 6, "z": 6, "y": 0 @@ -189,7 +189,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 13, "z": 4, "y": 0 @@ -203,7 +203,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 5, "y": 0 @@ -217,7 +217,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 14, "z": 4, "y": 0 @@ -231,7 +231,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 9, "z": 6, "y": 0 @@ -245,7 +245,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 10, "z": 8, "y": 0 @@ -259,7 +259,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 12, "z": 7, "y": 0 diff --git a/res/field/events/events_0444.json b/res/field/events/events_0444.json index 0081365b62..b045c50189 100644 --- a/res/field/events/events_0444.json +++ b/res/field/events/events_0444.json @@ -10,7 +10,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 6, "z": 4, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 2, "z": 5, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 7, "y": 0 diff --git a/res/field/events/events_0445.json b/res/field/events/events_0445.json index 4cd5473e62..d08c7a35bd 100644 --- a/res/field/events/events_0445.json +++ b/res/field/events/events_0445.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 3, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 12, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 11, "z": 9, "y": 0 @@ -52,7 +52,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 9, "y": 0 @@ -66,7 +66,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 14, "z": 6, "y": 0 @@ -80,7 +80,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 6, "z": 4, "y": 0 @@ -94,7 +94,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 13, "z": 12, "y": 0 @@ -108,7 +108,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 2, "z": 6, "y": 0 @@ -122,7 +122,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 10, "z": 4, "y": 0 @@ -136,7 +136,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 7, "y": 0 @@ -150,7 +150,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 11, "y": 0 @@ -164,7 +164,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 12, "y": 0 @@ -178,7 +178,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 13, "y": 0 @@ -192,7 +192,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 2, "z": 12, "y": 0 @@ -206,7 +206,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 11, "y": 0 @@ -220,7 +220,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 12, "z": 9, "y": 0 @@ -234,7 +234,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 11, "z": 10, "y": 0 @@ -248,7 +248,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 10, "z": 9, "y": 0 @@ -262,7 +262,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 11, "z": 8, "y": 0 @@ -276,7 +276,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 6, "z": 9, "y": 0 @@ -290,7 +290,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 10, "y": 0 @@ -304,7 +304,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 9, "y": 0 @@ -318,7 +318,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 8, "y": 0 @@ -332,7 +332,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 15, "z": 6, "y": 0 @@ -346,7 +346,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 14, "z": 7, "y": 0 @@ -360,7 +360,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 13, "z": 6, "y": 0 @@ -374,7 +374,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 14, "z": 5, "y": 0 @@ -388,7 +388,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 4, "y": 0 @@ -402,7 +402,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 6, "z": 5, "y": 0 @@ -416,7 +416,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 4, "y": 0 @@ -430,7 +430,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 6, "z": 3, "y": 0 @@ -444,7 +444,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 14, "z": 12, "y": 0 @@ -458,7 +458,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 13, "z": 13, "y": 0 @@ -472,7 +472,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 12, "z": 12, "y": 0 @@ -486,7 +486,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 13, "z": 11, "y": 0 @@ -500,7 +500,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 6, "y": 0 @@ -514,7 +514,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 2, "z": 7, "y": 0 @@ -528,7 +528,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 1, "z": 6, "y": 0 @@ -542,7 +542,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 2, "z": 5, "y": 0 @@ -556,7 +556,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 11, "z": 4, "y": 0 @@ -570,7 +570,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 10, "z": 5, "y": 0 @@ -584,7 +584,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 9, "z": 4, "y": 0 @@ -598,7 +598,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 10, "z": 3, "y": 0 @@ -612,7 +612,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 9, "z": 7, "y": 0 @@ -626,7 +626,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 8, "y": 0 @@ -640,7 +640,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 7, "y": 0 @@ -654,7 +654,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 6, "y": 0 @@ -668,7 +668,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 9, "z": 11, "y": 0 @@ -682,7 +682,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 12, "y": 0 @@ -696,7 +696,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 11, "y": 0 @@ -710,7 +710,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 10, "y": 0 diff --git a/res/field/events/events_0446.json b/res/field/events/events_0446.json index 996d52f564..a43dad530f 100644 --- a/res/field/events/events_0446.json +++ b/res/field/events/events_0446.json @@ -29,7 +29,7 @@ 5 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 211, "z": 917, "y": 0 @@ -46,7 +46,7 @@ 2 ], "movement_range_x": 7, - "movement_range_y": 0, + "movement_range_z": 0, "x": 198, "z": 911, "y": 0 @@ -62,7 +62,7 @@ 3 ], "movement_range_x": 7, - "movement_range_y": 0, + "movement_range_z": 0, "x": 175, "z": 905, "y": 0 @@ -78,7 +78,7 @@ 3 ], "movement_range_x": 5, - "movement_range_y": 0, + "movement_range_z": 0, "x": 169, "z": 907, "y": 0 @@ -94,7 +94,7 @@ 3 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 185, "z": 918, "y": 0 @@ -110,7 +110,7 @@ 2 ], "movement_range_x": 6, - "movement_range_y": 1, + "movement_range_z": 1, "x": 204, "z": 903, "y": 0 @@ -126,7 +126,7 @@ 5 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 211, "z": 911, "y": 0 @@ -140,7 +140,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 199, "z": 917, "y": 0 @@ -154,7 +154,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 171, "z": 918, "y": 0 @@ -168,7 +168,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 180, "z": 910, "y": 0 diff --git a/res/field/events/events_0447.json b/res/field/events/events_0447.json index 435fb71095..b57fbe8afb 100644 --- a/res/field/events/events_0447.json +++ b/res/field/events/events_0447.json @@ -29,7 +29,7 @@ 5 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 837, "z": 664, "y": 0 @@ -45,7 +45,7 @@ 3 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 844, "z": 682, "y": 0 @@ -61,7 +61,7 @@ 2 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 861, "z": 655, "y": 0 @@ -77,7 +77,7 @@ 6 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 854, "z": 689, "y": 0 @@ -93,7 +93,7 @@ 3 ], "movement_range_x": 6, - "movement_range_y": 0, + "movement_range_z": 0, "x": 850, "z": 622, "y": 0 @@ -109,7 +109,7 @@ 5 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 844, "z": 698, "y": 0 @@ -125,7 +125,7 @@ 3 ], "movement_range_x": 8, - "movement_range_y": 0, + "movement_range_z": 0, "x": 847, "z": 723, "y": 0 @@ -141,7 +141,7 @@ 2 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 851, "z": 715, "y": 0 @@ -157,7 +157,7 @@ 6 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 847, "z": 689, "y": 0 @@ -174,7 +174,7 @@ 5 ], "movement_range_x": 5, - "movement_range_y": 0, + "movement_range_z": 0, "x": 848, "z": 668, "y": 0 @@ -190,7 +190,7 @@ 3 ], "movement_range_x": 7, - "movement_range_y": 5, + "movement_range_z": 5, "x": 855, "z": 636, "y": 0 @@ -206,7 +206,7 @@ 4 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 843, "z": 642, "y": 0 @@ -220,7 +220,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 840, "z": 684, "y": 0 @@ -234,7 +234,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 850, "z": 649, "y": 0 @@ -250,7 +250,7 @@ 2 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 847, "z": 655, "y": 0 @@ -265,7 +265,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 853, "z": 740, "y": 0 @@ -279,7 +279,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 842, "z": 636, "y": 0 @@ -293,7 +293,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 858, "z": 630, "y": 0 diff --git a/res/field/events/events_0448.json b/res/field/events/events_0448.json index 41446485bb..1ba45f4891 100644 --- a/res/field/events/events_0448.json +++ b/res/field/events/events_0448.json @@ -53,7 +53,7 @@ 2 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 679, "z": 341, "y": 0 @@ -67,7 +67,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 717, "z": 339, "y": 0 @@ -81,7 +81,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 690, "z": 344, "y": 0 @@ -95,7 +95,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 693, "z": 333, "y": 0 @@ -111,7 +111,7 @@ 98 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 689, "z": 328, "y": 0 @@ -127,7 +127,7 @@ 99 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 692, "z": 328, "y": 0 @@ -143,7 +143,7 @@ 100 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 690, "z": 328, "y": 0 @@ -159,7 +159,7 @@ 101 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 691, "z": 328, "y": 0 @@ -175,7 +175,7 @@ 2 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 727, "z": 342, "y": 0 @@ -192,7 +192,7 @@ 3 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 755, "z": 314, "y": 0 @@ -208,7 +208,7 @@ 1 ], "movement_range_x": 4, - "movement_range_y": 0, + "movement_range_z": 0, "x": 689, "z": 335, "y": 0 @@ -224,7 +224,7 @@ 2 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 707, "z": 331, "y": 0 @@ -240,7 +240,7 @@ 1 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 707, "z": 329, "y": 0 @@ -255,7 +255,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 667, "z": 338, "y": 0 @@ -271,7 +271,7 @@ 18 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 760, "z": 327, "y": 0 @@ -287,7 +287,7 @@ 2 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 760, "z": 342, "y": 0 diff --git a/res/field/events/events_0449.json b/res/field/events/events_0449.json index 070508bd9a..29080862d3 100644 --- a/res/field/events/events_0449.json +++ b/res/field/events/events_0449.json @@ -27,7 +27,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 710, "z": 425, "y": 0 @@ -41,7 +41,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 716, "z": 419, "y": 0 @@ -55,7 +55,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 725, "z": 428, "y": 0 @@ -69,7 +69,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 729, "z": 431, "y": 0 @@ -83,7 +83,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 727, "z": 427, "y": 0 @@ -99,7 +99,7 @@ 114 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 684, "z": 420, "y": 0 @@ -115,7 +115,7 @@ 115 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 685, "z": 420, "y": 0 @@ -131,7 +131,7 @@ 116 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 686, "z": 420, "y": 0 @@ -147,7 +147,7 @@ 117 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 687, "z": 420, "y": 0 @@ -163,7 +163,7 @@ 3 ], "movement_range_x": 10, - "movement_range_y": 2, + "movement_range_z": 2, "x": 731, "z": 440, "y": 0 @@ -179,7 +179,7 @@ 3 ], "movement_range_x": 13, - "movement_range_y": 6, + "movement_range_z": 6, "x": 734, "z": 433, "y": 0 @@ -195,7 +195,7 @@ 4 ], "movement_range_x": 1, - "movement_range_y": 8, + "movement_range_z": 8, "x": 750, "z": 430, "y": 0 @@ -211,7 +211,7 @@ 4 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 699, "z": 438, "y": 0 @@ -227,7 +227,7 @@ 4 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 699, "z": 433, "y": 0 @@ -244,7 +244,7 @@ 3 ], "movement_range_x": 3, - "movement_range_y": 0, + "movement_range_z": 0, "x": 738, "z": 425, "y": 0 @@ -260,7 +260,7 @@ 2 ], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 680, "z": 429, "y": 0 @@ -274,7 +274,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 682, "z": 430, "y": 0 @@ -288,7 +288,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 682, "z": 431, "y": 0 @@ -302,7 +302,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 708, "z": 431, "y": 0 diff --git a/res/field/events/events_0451.json b/res/field/events/events_0451.json index 98d3c1c913..c31ee8ef1f 100644 --- a/res/field/events/events_0451.json +++ b/res/field/events/events_0451.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 4, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 4, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 12, "z": 4, "y": 0 diff --git a/res/field/events/events_0452.json b/res/field/events/events_0452.json index ea6427890d..a74023eb74 100644 --- a/res/field/events/events_0452.json +++ b/res/field/events/events_0452.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 4, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 4, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 12, "z": 4, "y": 0 diff --git a/res/field/events/events_0453.json b/res/field/events/events_0453.json index 64f591f36a..ccdd8a9dec 100644 --- a/res/field/events/events_0453.json +++ b/res/field/events/events_0453.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 4, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 4, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 12, "z": 4, "y": 0 @@ -52,7 +52,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 9, "y": 0 diff --git a/res/field/events/events_0454.json b/res/field/events/events_0454.json index 7e43490822..abe30fd026 100644 --- a/res/field/events/events_0454.json +++ b/res/field/events/events_0454.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 4, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 4, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 12, "z": 4, "y": 0 diff --git a/res/field/events/events_0455.json b/res/field/events/events_0455.json index 30a06ea92b..05540a453d 100644 --- a/res/field/events/events_0455.json +++ b/res/field/events/events_0455.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 4, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 4, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 12, "z": 4, "y": 0 diff --git a/res/field/events/events_0456.json b/res/field/events/events_0456.json index f9172c7c04..07311076e6 100644 --- a/res/field/events/events_0456.json +++ b/res/field/events/events_0456.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 4, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 4, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 12, "z": 4, "y": 0 diff --git a/res/field/events/events_0457.json b/res/field/events/events_0457.json index 8428fa63a1..dfc28e08e1 100644 --- a/res/field/events/events_0457.json +++ b/res/field/events/events_0457.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 4, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 4, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 12, "z": 4, "y": 0 @@ -52,7 +52,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 6, "z": 8, "y": 0 diff --git a/res/field/events/events_0458.json b/res/field/events/events_0458.json index 4dc6084d6c..da38813e2b 100644 --- a/res/field/events/events_0458.json +++ b/res/field/events/events_0458.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 4, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 4, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 12, "z": 4, "y": 0 diff --git a/res/field/events/events_0459.json b/res/field/events/events_0459.json index b90a8c135b..0ea7ec811c 100644 --- a/res/field/events/events_0459.json +++ b/res/field/events/events_0459.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 4, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 4, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 12, "z": 4, "y": 0 diff --git a/res/field/events/events_0460.json b/res/field/events/events_0460.json index fd3ee892ce..ceb88d35e7 100644 --- a/res/field/events/events_0460.json +++ b/res/field/events/events_0460.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 4, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 4, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 12, "z": 4, "y": 0 diff --git a/res/field/events/events_0461.json b/res/field/events/events_0461.json index 32b10006a8..f541e43e59 100644 --- a/res/field/events/events_0461.json +++ b/res/field/events/events_0461.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 4, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 4, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 12, "z": 4, "y": 0 diff --git a/res/field/events/events_0462.json b/res/field/events/events_0462.json index 21a196a6fb..728944421c 100644 --- a/res/field/events/events_0462.json +++ b/res/field/events/events_0462.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 4, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 4, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 12, "z": 4, "y": 0 diff --git a/res/field/events/events_0463.json b/res/field/events/events_0463.json index 349589a9eb..5a131ba173 100644 --- a/res/field/events/events_0463.json +++ b/res/field/events/events_0463.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 4, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 4, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 12, "z": 4, "y": 0 diff --git a/res/field/events/events_0464.json b/res/field/events/events_0464.json index 1adfc06c6c..4aa939a1a5 100644 --- a/res/field/events/events_0464.json +++ b/res/field/events/events_0464.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 4, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 4, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 12, "z": 4, "y": 0 diff --git a/res/field/events/events_0465.json b/res/field/events/events_0465.json index 4357a0b1ed..a58648a61e 100644 --- a/res/field/events/events_0465.json +++ b/res/field/events/events_0465.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 4, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 4, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 12, "z": 4, "y": 0 diff --git a/res/field/events/events_0466.json b/res/field/events/events_0466.json index 949e43c2a0..dc0d61d261 100644 --- a/res/field/events/events_0466.json +++ b/res/field/events/events_0466.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 4, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 4, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 12, "z": 4, "y": 0 diff --git a/res/field/events/events_0467.json b/res/field/events/events_0467.json index 99bf5f21d4..1906a33aee 100644 --- a/res/field/events/events_0467.json +++ b/res/field/events/events_0467.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 4, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 4, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 12, "z": 4, "y": 0 diff --git a/res/field/events/events_0468.json b/res/field/events/events_0468.json index 5af4857e11..a7dbce8d5d 100644 --- a/res/field/events/events_0468.json +++ b/res/field/events/events_0468.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 5, "y": 0 diff --git a/res/field/events/events_0469.json b/res/field/events/events_0469.json index 6d855508a9..96cd043264 100644 --- a/res/field/events/events_0469.json +++ b/res/field/events/events_0469.json @@ -10,7 +10,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 7, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 4, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 1, "z": 4, "y": 0 @@ -52,7 +52,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 4, "y": 0 @@ -66,7 +66,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 3, "y": 0 @@ -80,7 +80,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 6, "y": 0 diff --git a/res/field/events/events_0470.json b/res/field/events/events_0470.json index 3d223f537f..92ffcead46 100644 --- a/res/field/events/events_0470.json +++ b/res/field/events/events_0470.json @@ -10,7 +10,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 1, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 13, "z": 10, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 6, "y": 0 @@ -52,7 +52,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 11, "z": 8, "y": 0 @@ -66,7 +66,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 2, "z": 10, "y": 0 @@ -80,7 +80,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 9, "y": 0 diff --git a/res/field/events/events_0471.json b/res/field/events/events_0471.json index f99c8101d9..c9e26d7b54 100644 --- a/res/field/events/events_0471.json +++ b/res/field/events/events_0471.json @@ -43,7 +43,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 6, "y": 0 @@ -57,7 +57,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 14, "z": 4, "y": 0 @@ -71,7 +71,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 2, "z": 4, "y": 0 @@ -85,7 +85,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 10, "y": 0 @@ -99,7 +99,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 6, "y": 0 diff --git a/res/field/events/events_0472.json b/res/field/events/events_0472.json index 99148d1c5c..824d1aa9f8 100644 --- a/res/field/events/events_0472.json +++ b/res/field/events/events_0472.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 4, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 12, "z": 4, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 4, "y": 0 diff --git a/res/field/events/events_0473.json b/res/field/events/events_0473.json index 914ee01910..4555537e44 100644 --- a/res/field/events/events_0473.json +++ b/res/field/events/events_0473.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 4, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 4, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 12, "z": 4, "y": 0 diff --git a/res/field/events/events_0474.json b/res/field/events/events_0474.json index cd9752e759..63c6f8d453 100644 --- a/res/field/events/events_0474.json +++ b/res/field/events/events_0474.json @@ -91,7 +91,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 2, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 13, "y": 0 @@ -105,7 +105,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 3, + "movement_range_z": 3, "x": 36, "z": 10, "y": 0 @@ -119,7 +119,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 6, "z": 8, "y": 0 diff --git a/res/field/events/events_0475.json b/res/field/events/events_0475.json index aeae582c98..ea1e83e696 100644 --- a/res/field/events/events_0475.json +++ b/res/field/events/events_0475.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 6, "y": 0 diff --git a/res/field/events/events_0476.json b/res/field/events/events_0476.json index 12e375b51c..0c762d061c 100644 --- a/res/field/events/events_0476.json +++ b/res/field/events/events_0476.json @@ -19,7 +19,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 2, "z": 5, "y": 0 diff --git a/res/field/events/events_0477.json b/res/field/events/events_0477.json index a032e8cbd6..ee1d0562e4 100644 --- a/res/field/events/events_0477.json +++ b/res/field/events/events_0477.json @@ -10,7 +10,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 5, "y": 0 diff --git a/res/field/events/events_0478.json b/res/field/events/events_0478.json index ade8b50921..7ae4064698 100644 --- a/res/field/events/events_0478.json +++ b/res/field/events/events_0478.json @@ -10,7 +10,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 3, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 8, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 6, "y": 0 diff --git a/res/field/events/events_0479.json b/res/field/events/events_0479.json index b675670018..76f1e00013 100644 --- a/res/field/events/events_0479.json +++ b/res/field/events/events_0479.json @@ -19,7 +19,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 2, "z": 5, "y": 0 diff --git a/res/field/events/events_0480.json b/res/field/events/events_0480.json index 2c59f50d72..9ab9ab3771 100644 --- a/res/field/events/events_0480.json +++ b/res/field/events/events_0480.json @@ -43,7 +43,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 2, "z": 3, "y": 0 diff --git a/res/field/events/events_0481.json b/res/field/events/events_0481.json index f97fef1256..38bffe5415 100644 --- a/res/field/events/events_0481.json +++ b/res/field/events/events_0481.json @@ -27,7 +27,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 48, "z": 38, "y": 0 @@ -41,7 +41,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 49, "z": 54, "y": 0 @@ -55,7 +55,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 61, "z": 46, "y": 0 @@ -69,7 +69,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 55, "z": 58, "y": 0 @@ -84,7 +84,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 70, "z": 46, "y": 0 diff --git a/res/field/events/events_0482.json b/res/field/events/events_0482.json index 6c01681bce..7f70e3afae 100644 --- a/res/field/events/events_0482.json +++ b/res/field/events/events_0482.json @@ -27,7 +27,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 76, "z": 36, "y": 0 @@ -41,7 +41,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 70, "z": 46, "y": 0 @@ -55,7 +55,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 85, "z": 43, "y": 0 @@ -70,7 +70,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 61, "z": 46, "y": 0 diff --git a/res/field/events/events_0483.json b/res/field/events/events_0483.json index c5d90ef419..c5ea5dc2a2 100644 --- a/res/field/events/events_0483.json +++ b/res/field/events/events_0483.json @@ -27,7 +27,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 38, "z": 79, "y": 0 @@ -41,7 +41,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 59, "z": 86, "y": 0 @@ -55,7 +55,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 1, + "movement_range_z": 1, "x": 38, "z": 75, "y": 0 @@ -69,7 +69,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 55, "z": 58, "y": 0 @@ -84,7 +84,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 71, "z": 86, "y": 0 diff --git a/res/field/events/events_0484.json b/res/field/events/events_0484.json index 747f555af5..d719580a2f 100644 --- a/res/field/events/events_0484.json +++ b/res/field/events/events_0484.json @@ -27,7 +27,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 80, "z": 78, "y": 0 @@ -41,7 +41,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 83, "z": 86, "y": 0 @@ -55,7 +55,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 71, "z": 86, "y": 0 @@ -69,7 +69,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 83, "z": 82, "y": 0 @@ -84,7 +84,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 59, "z": 86, "y": 0 diff --git a/res/field/events/events_0485.json b/res/field/events/events_0485.json index b30341ee0e..843a35c723 100644 --- a/res/field/events/events_0485.json +++ b/res/field/events/events_0485.json @@ -27,7 +27,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 47, "z": 112, "y": 0 @@ -41,7 +41,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 63, "z": 113, "y": 0 @@ -55,7 +55,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 62, "z": 115, "y": 0 @@ -70,7 +70,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 72, "z": 113, "y": 0 diff --git a/res/field/events/events_0486.json b/res/field/events/events_0486.json index 04382b6015..5019cd7439 100644 --- a/res/field/events/events_0486.json +++ b/res/field/events/events_0486.json @@ -27,7 +27,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 91, "z": 105, "y": 0 @@ -41,7 +41,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 72, "z": 113, "y": 0 @@ -55,7 +55,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 74, "z": 115, "y": 0 @@ -70,7 +70,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 62, "z": 115, "y": 0 @@ -85,7 +85,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 63, "z": 113, "y": 0 @@ -100,7 +100,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 72, "z": 86, "y": 0 diff --git a/res/field/events/events_0487.json b/res/field/events/events_0487.json index 0f931cd3cd..70c6ef8852 100644 --- a/res/field/events/events_0487.json +++ b/res/field/events/events_0487.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 31, "z": 27, "y": 16 diff --git a/res/field/events/events_0488.json b/res/field/events/events_0488.json index a52fd4bee3..18254b298e 100644 --- a/res/field/events/events_0488.json +++ b/res/field/events/events_0488.json @@ -10,7 +10,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 7, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 58, "z": 3, "y": 0 diff --git a/res/field/events/events_0489.json b/res/field/events/events_0489.json index b9ec020745..c935d7faef 100644 --- a/res/field/events/events_0489.json +++ b/res/field/events/events_0489.json @@ -10,7 +10,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 6, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 90, "z": 3, "y": 0 diff --git a/res/field/events/events_0490.json b/res/field/events/events_0490.json index 226f324fd8..4d9e8f2b27 100644 --- a/res/field/events/events_0490.json +++ b/res/field/events/events_0490.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 5, "y": 0 diff --git a/res/field/events/events_0493.json b/res/field/events/events_0493.json index 4b9d6cb969..75ee31fb6e 100644 --- a/res/field/events/events_0493.json +++ b/res/field/events/events_0493.json @@ -10,7 +10,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 8, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 8, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 13, "z": 6, "y": 0 @@ -52,7 +52,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 12, "z": 11, "y": 0 diff --git a/res/field/events/events_0494.json b/res/field/events/events_0494.json index f39287abcb..b1a5af8f26 100644 --- a/res/field/events/events_0494.json +++ b/res/field/events/events_0494.json @@ -10,7 +10,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 11, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 6, "z": 10, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 9, "y": 0 @@ -52,7 +52,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 12, "y": 0 @@ -66,7 +66,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 13, "y": 0 @@ -80,7 +80,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 2, "z": 14, "y": 0 @@ -94,7 +94,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 18, "z": 10, "y": 0 @@ -108,7 +108,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 20, "z": 8, "y": 0 @@ -122,7 +122,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 19, "z": 9, "y": 0 @@ -136,7 +136,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 15, "z": 13, "y": 0 @@ -150,7 +150,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 16, "z": 12, "y": 0 @@ -164,7 +164,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 17, "z": 11, "y": 0 @@ -178,7 +178,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 11, "z": 11, "y": 0 diff --git a/res/field/events/events_0495.json b/res/field/events/events_0495.json index 00192cdff1..3da25db83a 100644 --- a/res/field/events/events_0495.json +++ b/res/field/events/events_0495.json @@ -10,7 +10,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 11, "z": 5, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 12, "z": 6, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 13, "z": 7, "y": 0 @@ -52,7 +52,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 10, "z": 4, "y": 0 @@ -66,7 +66,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 9, "z": 3, "y": 0 @@ -80,7 +80,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 2, "y": 0 @@ -94,7 +94,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 13, "z": 19, "y": 0 @@ -108,7 +108,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 9, "z": 15, "y": 0 @@ -122,7 +122,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 14, "z": 20, "y": 0 @@ -136,7 +136,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 10, "z": 16, "y": 0 @@ -150,7 +150,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 11, "z": 17, "y": 0 @@ -164,7 +164,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 12, "z": 18, "y": 0 @@ -178,7 +178,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 11, "z": 11, "y": 0 diff --git a/res/field/events/events_0496.json b/res/field/events/events_0496.json index 8e9e91239e..3bb82c9149 100644 --- a/res/field/events/events_0496.json +++ b/res/field/events/events_0496.json @@ -10,7 +10,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 11, "z": 5, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 10, "z": 6, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 9, "z": 7, "y": 0 @@ -52,7 +52,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 12, "z": 4, "y": 0 @@ -66,7 +66,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 13, "z": 3, "y": 0 @@ -80,7 +80,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 14, "z": 2, "y": 0 @@ -94,7 +94,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 9, "z": 19, "y": 0 @@ -108,7 +108,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 13, "z": 15, "y": 0 @@ -122,7 +122,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 20, "y": 0 @@ -136,7 +136,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 12, "z": 16, "y": 0 @@ -150,7 +150,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 11, "z": 17, "y": 0 @@ -164,7 +164,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 10, "z": 18, "y": 0 @@ -178,7 +178,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 11, "z": 11, "y": 0 diff --git a/res/field/events/events_0497.json b/res/field/events/events_0497.json index 5846226091..b15c217b96 100644 --- a/res/field/events/events_0497.json +++ b/res/field/events/events_0497.json @@ -10,7 +10,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 2, "z": 8, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 6, "z": 10, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 9, "z": 3, "y": 0 @@ -52,7 +52,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 2, "y": 0 @@ -66,7 +66,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 20, "z": 7, "y": 0 @@ -80,7 +80,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 18, "z": 2, "y": 0 @@ -94,7 +94,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 13, "z": 3, "y": 0 @@ -108,7 +108,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 16, "z": 4, "y": 0 @@ -122,7 +122,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 11, "z": 17, "y": 0 @@ -136,7 +136,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 18, "z": 10, "y": 0 @@ -150,7 +150,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 2, "z": 15, "y": 0 @@ -164,7 +164,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 10, "y": 0 @@ -178,7 +178,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 11, "z": 5, "y": 0 @@ -192,7 +192,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 17, "z": 11, "y": 0 @@ -206,7 +206,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 11, "z": 6, "y": 0 @@ -220,7 +220,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 6, "z": 4, "y": 0 @@ -234,7 +234,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 6, "z": 18, "y": 0 @@ -248,7 +248,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 18, "z": 20, "y": 0 @@ -262,7 +262,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 9, "z": 19, "y": 0 @@ -276,7 +276,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 20, "y": 0 @@ -290,7 +290,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 11, "z": 16, "y": 0 @@ -304,7 +304,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 6, "z": 12, "y": 0 @@ -318,7 +318,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 12, "y": 0 @@ -332,7 +332,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 13, "z": 19, "y": 0 @@ -346,7 +346,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 16, "z": 18, "y": 0 @@ -360,7 +360,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 20, "z": 15, "y": 0 @@ -374,7 +374,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 11, "y": 0 @@ -388,7 +388,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 16, "z": 10, "y": 0 @@ -402,7 +402,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 16, "z": 12, "y": 0 @@ -416,7 +416,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 18, "z": 12, "y": 0 diff --git a/res/field/events/events_0498.json b/res/field/events/events_0498.json index c3890324e4..5046528f68 100644 --- a/res/field/events/events_0498.json +++ b/res/field/events/events_0498.json @@ -10,7 +10,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 3, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 11, "z": 5, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 2, "y": 0 @@ -52,7 +52,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 7, "y": 0 @@ -66,7 +66,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 19, "z": 7, "y": 0 @@ -80,7 +80,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 11, "z": 11, "y": 0 @@ -94,7 +94,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 15, "z": 3, "y": 0 @@ -108,7 +108,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 14, "z": 4, "y": 0 @@ -122,7 +122,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 19, "y": 0 @@ -136,7 +136,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 18, "z": 8, "y": 0 @@ -150,7 +150,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 2, "z": 8, "y": 0 @@ -164,7 +164,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 15, "y": 0 @@ -178,7 +178,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 14, "z": 2, "y": 0 @@ -192,7 +192,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 18, "z": 14, "y": 0 @@ -206,7 +206,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 4, "y": 0 @@ -220,7 +220,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 8, "y": 0 @@ -234,7 +234,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 17, "z": 11, "y": 0 @@ -248,7 +248,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 15, "z": 19, "y": 0 @@ -262,7 +262,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 18, "y": 0 @@ -276,7 +276,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 20, "y": 0 @@ -290,7 +290,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 11, "z": 16, "y": 0 @@ -304,7 +304,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 14, "y": 0 @@ -318,7 +318,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 11, "y": 0 @@ -332,7 +332,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 20, "z": 14, "y": 0 @@ -346,7 +346,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 14, "z": 20, "y": 0 @@ -360,7 +360,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 19, "z": 15, "y": 0 @@ -374,7 +374,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 14, "z": 18, "y": 0 @@ -388,7 +388,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 2, "z": 14, "y": 0 @@ -402,7 +402,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 20, "z": 8, "y": 0 diff --git a/res/field/events/events_0499.json b/res/field/events/events_0499.json index 7c4f5901f6..946cc99023 100644 --- a/res/field/events/events_0499.json +++ b/res/field/events/events_0499.json @@ -10,7 +10,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 17, "z": 17, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 6, "z": 2, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 9, "z": 5, "y": 0 @@ -52,7 +52,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 3, "y": 0 @@ -66,7 +66,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 4, "y": 0 @@ -80,7 +80,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 15, "z": 7, "y": 0 @@ -94,7 +94,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 13, "z": 5, "y": 0 @@ -108,7 +108,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 14, "z": 6, "y": 0 @@ -122,7 +122,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 10, "z": 17, "y": 0 @@ -136,7 +136,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 11, "z": 11, "y": 0 @@ -150,7 +150,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 11, "z": 17, "y": 0 @@ -164,7 +164,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 7, "y": 0 @@ -178,7 +178,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 12, "z": 5, "y": 0 @@ -192,7 +192,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 16, "z": 16, "y": 0 @@ -206,7 +206,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 10, "z": 5, "y": 0 @@ -220,7 +220,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 4, "y": 0 @@ -234,7 +234,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 15, "z": 19, "y": 0 @@ -248,7 +248,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 5, "y": 0 @@ -262,7 +262,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 15, "y": 0 @@ -276,7 +276,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 16, "y": 0 @@ -290,7 +290,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 9, "z": 17, "y": 0 @@ -304,7 +304,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 6, "z": 6, "y": 0 @@ -318,7 +318,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 15, "z": 15, "y": 0 @@ -332,7 +332,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 12, "z": 17, "y": 0 @@ -346,7 +346,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 13, "z": 17, "y": 0 @@ -360,7 +360,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 18, "z": 18, "y": 0 @@ -374,7 +374,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 14, "z": 18, "y": 0 @@ -388,7 +388,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 11, "z": 5, "y": 0 @@ -402,7 +402,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 16, "z": 20, "y": 0 diff --git a/res/field/events/events_0500.json b/res/field/events/events_0500.json index b2bef9060f..1836a18db7 100644 --- a/res/field/events/events_0500.json +++ b/res/field/events/events_0500.json @@ -10,7 +10,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 18, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 16, "z": 2, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 9, "z": 5, "y": 0 @@ -52,7 +52,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 15, "z": 3, "y": 0 @@ -66,7 +66,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 16, "z": 6, "y": 0 @@ -80,7 +80,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 15, "z": 7, "y": 0 @@ -94,7 +94,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 13, "z": 5, "y": 0 @@ -108,7 +108,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 14, "z": 4, "y": 0 @@ -122,7 +122,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 17, "y": 0 @@ -136,7 +136,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 11, "z": 11, "y": 0 @@ -150,7 +150,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 11, "z": 17, "y": 0 @@ -164,7 +164,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 7, "y": 0 @@ -178,7 +178,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 12, "z": 5, "y": 0 @@ -192,7 +192,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 6, "z": 16, "y": 0 @@ -206,7 +206,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 10, "z": 5, "y": 0 @@ -220,7 +220,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 6, "y": 0 @@ -234,7 +234,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 19, "y": 0 @@ -248,7 +248,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 17, "z": 5, "y": 0 @@ -262,7 +262,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 12, "z": 17, "y": 0 @@ -276,7 +276,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 9, "z": 17, "y": 0 @@ -290,7 +290,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 18, "y": 0 @@ -304,7 +304,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 18, "z": 4, "y": 0 @@ -318,7 +318,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 15, "z": 15, "y": 0 @@ -332,7 +332,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 10, "z": 17, "y": 0 @@ -346,7 +346,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 13, "z": 17, "y": 0 @@ -360,7 +360,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 15, "y": 0 @@ -374,7 +374,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 14, "z": 16, "y": 0 @@ -388,7 +388,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 11, "z": 5, "y": 0 @@ -402,7 +402,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 6, "z": 20, "y": 0 diff --git a/res/field/events/events_0501.json b/res/field/events/events_0501.json index 7903e3e620..e7209b19c0 100644 --- a/res/field/events/events_0501.json +++ b/res/field/events/events_0501.json @@ -10,7 +10,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 8, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 17, "z": 6, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 9, "y": 0 @@ -52,7 +52,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 20, "z": 15, "y": 0 @@ -66,7 +66,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 18, "z": 7, "y": 0 @@ -80,7 +80,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 2, "z": 7, "y": 0 @@ -94,7 +94,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 11, "z": 4, "y": 0 @@ -108,7 +108,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 10, "z": 16, "y": 0 @@ -122,7 +122,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 14, "y": 0 @@ -136,7 +136,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 13, "z": 19, "y": 0 @@ -150,7 +150,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 18, "z": 13, "y": 0 @@ -164,7 +164,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 6, "z": 11, "y": 0 @@ -178,7 +178,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 12, "z": 5, "y": 0 @@ -192,7 +192,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 11, "z": 17, "y": 0 @@ -206,7 +206,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 16, "y": 0 @@ -220,7 +220,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 10, "y": 0 @@ -234,7 +234,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 14, "z": 20, "y": 0 @@ -248,7 +248,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 13, "z": 6, "y": 0 @@ -262,7 +262,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 17, "z": 12, "y": 0 @@ -276,7 +276,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 12, "z": 18, "y": 0 @@ -290,7 +290,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 9, "z": 2, "y": 0 @@ -304,7 +304,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 19, "z": 8, "y": 0 @@ -318,7 +318,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 18, "z": 9, "y": 0 @@ -332,7 +332,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 19, "z": 14, "y": 0 @@ -346,7 +346,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 16, "z": 11, "y": 0 @@ -360,7 +360,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 12, "y": 0 @@ -374,7 +374,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 17, "z": 10, "y": 0 @@ -388,7 +388,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 15, "y": 0 @@ -402,7 +402,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 10, "z": 3, "y": 0 @@ -416,7 +416,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 13, "y": 0 diff --git a/res/field/events/events_0502.json b/res/field/events/events_0502.json index c138b5299f..d92a9bef3a 100644 --- a/res/field/events/events_0502.json +++ b/res/field/events/events_0502.json @@ -10,7 +10,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 8, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 17, "z": 16, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 9, "y": 0 @@ -52,7 +52,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 18, "z": 15, "y": 0 @@ -66,7 +66,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 20, "z": 7, "y": 0 @@ -80,7 +80,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 2, "z": 15, "y": 0 @@ -94,7 +94,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 11, "z": 4, "y": 0 @@ -108,7 +108,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 12, "z": 16, "y": 0 @@ -122,7 +122,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 14, "y": 0 @@ -136,7 +136,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 9, "z": 19, "y": 0 @@ -150,7 +150,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 18, "z": 13, "y": 0 @@ -164,7 +164,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 6, "z": 11, "y": 0 @@ -178,7 +178,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 10, "z": 5, "y": 0 @@ -192,7 +192,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 11, "z": 17, "y": 0 @@ -206,7 +206,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 6, "y": 0 @@ -220,7 +220,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 10, "y": 0 @@ -234,7 +234,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 20, "y": 0 @@ -248,7 +248,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 9, "z": 6, "y": 0 @@ -262,7 +262,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 17, "z": 12, "y": 0 @@ -276,7 +276,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 10, "z": 18, "y": 0 @@ -290,7 +290,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 12, "z": 3, "y": 0 @@ -304,7 +304,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 19, "z": 8, "y": 0 @@ -318,7 +318,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 18, "z": 9, "y": 0 @@ -332,7 +332,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 19, "z": 14, "y": 0 @@ -346,7 +346,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 16, "z": 11, "y": 0 @@ -360,7 +360,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 12, "y": 0 @@ -374,7 +374,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 17, "z": 10, "y": 0 @@ -388,7 +388,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 7, "y": 0 @@ -402,7 +402,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 13, "z": 2, "y": 0 @@ -416,7 +416,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 13, "y": 0 diff --git a/res/field/events/events_0503.json b/res/field/events/events_0503.json index ec0faeaf80..217378cda6 100644 --- a/res/field/events/events_0503.json +++ b/res/field/events/events_0503.json @@ -10,7 +10,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 9, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 20, "z": 20, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 11, "y": 0 @@ -52,7 +52,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 17, "z": 19, "y": 0 @@ -66,7 +66,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 15, "z": 13, "y": 0 @@ -80,7 +80,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 13, "y": 0 @@ -94,7 +94,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 13, "z": 3, "y": 0 @@ -108,7 +108,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 13, "z": 15, "y": 0 @@ -122,7 +122,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 20, "y": 0 @@ -136,7 +136,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 9, "z": 15, "y": 0 @@ -150,7 +150,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 19, "z": 13, "y": 0 @@ -164,7 +164,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 13, "y": 0 @@ -178,7 +178,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 11, "z": 5, "y": 0 @@ -192,7 +192,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 13, "z": 19, "y": 0 @@ -206,7 +206,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 13, "z": 7, "y": 0 @@ -220,7 +220,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 9, "y": 0 @@ -234,7 +234,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 9, "z": 19, "y": 0 @@ -248,7 +248,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 9, "z": 7, "y": 0 @@ -262,7 +262,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 19, "z": 3, "y": 0 @@ -276,7 +276,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 11, "z": 17, "y": 0 @@ -290,7 +290,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 6, "z": 19, "y": 0 @@ -304,7 +304,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 19, "z": 9, "y": 0 @@ -318,7 +318,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 17, "z": 6, "y": 0 @@ -332,7 +332,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 17, "z": 16, "y": 0 @@ -346,7 +346,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 17, "z": 11, "y": 0 @@ -360,7 +360,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 16, "y": 0 @@ -374,7 +374,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 15, "z": 9, "y": 0 @@ -388,7 +388,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 3, "y": 0 @@ -402,7 +402,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 9, "z": 3, "y": 0 @@ -416,7 +416,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 6, "y": 0 diff --git a/res/field/events/events_0504.json b/res/field/events/events_0504.json index 33c1186b65..20b7c7dec3 100644 --- a/res/field/events/events_0504.json +++ b/res/field/events/events_0504.json @@ -10,7 +10,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 2, "z": 5, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 11, "z": 4, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 11, "y": 0 @@ -52,7 +52,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 11, "z": 11, "y": 0 @@ -66,7 +66,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 18, "z": 11, "y": 0 @@ -80,7 +80,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 2, "z": 17, "y": 0 @@ -94,7 +94,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 20, "z": 5, "y": 0 @@ -108,7 +108,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 12, "z": 17, "y": 0 @@ -122,7 +122,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 15, "z": 8, "y": 0 @@ -136,7 +136,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 11, "z": 18, "y": 0 @@ -150,7 +150,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 15, "z": 14, "y": 0 @@ -164,7 +164,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 17, "z": 10, "y": 0 @@ -178,7 +178,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 13, "z": 6, "y": 0 @@ -192,7 +192,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 12, "y": 0 @@ -206,7 +206,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 17, "z": 12, "y": 0 @@ -220,7 +220,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 15, "y": 0 @@ -234,7 +234,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 10, "z": 17, "y": 0 @@ -248,7 +248,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 12, "z": 5, "y": 0 @@ -262,7 +262,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 18, "z": 7, "y": 0 @@ -276,7 +276,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 14, "y": 0 @@ -290,7 +290,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 8, "y": 0 @@ -304,7 +304,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 18, "z": 15, "y": 0 @@ -318,7 +318,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 9, "z": 6, "y": 0 @@ -332,7 +332,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 10, "y": 0 @@ -346,7 +346,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 20, "z": 17, "y": 0 @@ -360,7 +360,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 9, "z": 16, "y": 0 @@ -374,7 +374,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 13, "z": 16, "y": 0 @@ -388,7 +388,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 7, "y": 0 @@ -402,7 +402,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 10, "z": 5, "y": 0 diff --git a/res/field/events/events_0505.json b/res/field/events/events_0505.json index 35835d88cb..ea858cb60c 100644 --- a/res/field/events/events_0505.json +++ b/res/field/events/events_0505.json @@ -10,7 +10,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 7, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 15, "z": 7, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 19, "y": 0 @@ -52,7 +52,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 15, "y": 0 @@ -66,7 +66,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 17, "z": 17, "y": 0 @@ -80,7 +80,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 5, "y": 0 @@ -94,7 +94,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 17, "z": 5, "y": 0 @@ -108,7 +108,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 13, "z": 19, "y": 0 @@ -122,7 +122,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 19, "z": 7, "y": 0 @@ -136,7 +136,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 11, "z": 17, "y": 0 @@ -150,7 +150,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 19, "z": 15, "y": 0 @@ -164,7 +164,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 15, "z": 3, "y": 0 @@ -178,7 +178,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 13, "z": 7, "y": 0 @@ -192,7 +192,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 19, "y": 0 @@ -206,7 +206,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 15, "z": 15, "y": 0 @@ -220,7 +220,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 15, "y": 0 @@ -234,7 +234,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 9, "z": 19, "y": 0 @@ -248,7 +248,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 13, "z": 3, "y": 0 @@ -262,7 +262,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 19, "z": 3, "y": 0 @@ -276,7 +276,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 17, "y": 0 @@ -290,7 +290,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 3, "y": 0 @@ -304,7 +304,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 15, "z": 19, "y": 0 @@ -318,7 +318,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 9, "z": 7, "y": 0 @@ -332,7 +332,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 3, "y": 0 @@ -346,7 +346,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 19, "z": 19, "y": 0 @@ -360,7 +360,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 9, "z": 15, "y": 0 @@ -374,7 +374,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 13, "z": 15, "y": 0 @@ -388,7 +388,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 7, "y": 0 @@ -402,7 +402,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 9, "z": 3, "y": 0 @@ -416,7 +416,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 11, "z": 5, "y": 0 diff --git a/res/field/events/events_0506.json b/res/field/events/events_0506.json index 3988389408..323ce340ac 100644 --- a/res/field/events/events_0506.json +++ b/res/field/events/events_0506.json @@ -10,7 +10,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 9, "z": 5, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 13, "z": 5, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 19, "y": 0 @@ -52,7 +52,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 18, "y": 0 @@ -66,7 +66,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 16, "z": 18, "y": 0 @@ -80,7 +80,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 6, "z": 4, "y": 0 @@ -94,7 +94,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 16, "z": 5, "y": 0 @@ -108,7 +108,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 13, "z": 17, "y": 0 @@ -122,7 +122,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 18, "z": 3, "y": 0 @@ -136,7 +136,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 11, "z": 17, "y": 0 @@ -150,7 +150,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 17, "z": 19, "y": 0 @@ -164,7 +164,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 14, "z": 5, "y": 0 @@ -178,7 +178,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 12, "z": 5, "y": 0 @@ -192,7 +192,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 17, "y": 0 @@ -206,7 +206,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 10, "z": 17, "y": 0 @@ -220,7 +220,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 17, "y": 0 @@ -234,7 +234,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 9, "z": 17, "y": 0 @@ -248,7 +248,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 15, "z": 5, "y": 0 @@ -262,7 +262,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 17, "z": 4, "y": 0 @@ -276,7 +276,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 6, "z": 17, "y": 0 @@ -290,7 +290,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 5, "y": 0 @@ -304,7 +304,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 15, "z": 17, "y": 0 @@ -318,7 +318,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 10, "z": 5, "y": 0 @@ -332,7 +332,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 2, "y": 0 @@ -346,7 +346,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 18, "z": 20, "y": 0 @@ -360,7 +360,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 12, "z": 17, "y": 0 @@ -374,7 +374,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 14, "z": 17, "y": 0 @@ -388,7 +388,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 3, "y": 0 @@ -402,7 +402,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 5, "y": 0 @@ -416,7 +416,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 11, "z": 5, "y": 0 diff --git a/res/field/events/events_0507.json b/res/field/events/events_0507.json index 47f7d39e74..171607ea44 100644 --- a/res/field/events/events_0507.json +++ b/res/field/events/events_0507.json @@ -10,7 +10,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 7, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 3, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 15, "y": 0 @@ -52,7 +52,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 17, "y": 0 @@ -66,7 +66,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 15, "z": 7, "y": 0 @@ -80,7 +80,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 11, "y": 0 @@ -94,7 +94,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 17, "z": 11, "y": 0 @@ -108,7 +108,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 17, "z": 5, "y": 0 @@ -122,7 +122,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 19, "z": 9, "y": 0 @@ -136,7 +136,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 15, "z": 15, "y": 0 @@ -150,7 +150,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 19, "z": 7, "y": 0 @@ -164,7 +164,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 15, "y": 0 @@ -178,7 +178,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 3, "y": 0 @@ -192,7 +192,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 19, "y": 0 @@ -206,7 +206,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 19, "z": 15, "y": 0 @@ -220,7 +220,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 15, "z": 19, "y": 0 @@ -234,7 +234,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 19, "z": 19, "y": 0 @@ -248,7 +248,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 15, "z": 13, "y": 0 @@ -262,7 +262,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 15, "z": 9, "y": 0 @@ -276,7 +276,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 19, "y": 0 @@ -290,7 +290,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 13, "y": 0 @@ -304,7 +304,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 19, "z": 3, "y": 0 @@ -318,7 +318,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 7, "y": 0 @@ -332,7 +332,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 9, "y": 0 @@ -346,7 +346,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 19, "z": 13, "y": 0 @@ -360,7 +360,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 17, "z": 17, "y": 0 @@ -374,7 +374,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 15, "z": 3, "y": 0 @@ -388,7 +388,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 9, "y": 0 @@ -402,7 +402,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 13, "y": 0 @@ -416,7 +416,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 5, "y": 0 diff --git a/res/field/events/events_0508.json b/res/field/events/events_0508.json index af69e5b81c..8a1f6e11c4 100644 --- a/res/field/events/events_0508.json +++ b/res/field/events/events_0508.json @@ -10,7 +10,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 8, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 5, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 15, "y": 0 @@ -52,7 +52,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 13, "y": 0 @@ -66,7 +66,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 18, "z": 6, "y": 0 @@ -80,7 +80,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 10, "y": 0 @@ -94,7 +94,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 17, "z": 11, "y": 0 @@ -108,7 +108,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 20, "z": 4, "y": 0 @@ -122,7 +122,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 17, "z": 9, "y": 0 @@ -136,7 +136,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 17, "z": 12, "y": 0 @@ -150,7 +150,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 17, "z": 8, "y": 0 @@ -164,7 +164,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 12, "y": 0 @@ -178,7 +178,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 4, "y": 0 @@ -192,7 +192,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 16, "y": 0 @@ -206,7 +206,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 17, "z": 14, "y": 0 @@ -220,7 +220,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 19, "z": 17, "y": 0 @@ -234,7 +234,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 17, "z": 15, "y": 0 @@ -248,7 +248,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 17, "z": 10, "y": 0 @@ -262,7 +262,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 17, "z": 7, "y": 0 @@ -276,7 +276,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 14, "y": 0 @@ -290,7 +290,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 17, "y": 0 @@ -304,7 +304,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 19, "z": 5, "y": 0 @@ -318,7 +318,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 2, "z": 18, "y": 0 @@ -332,7 +332,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 9, "y": 0 @@ -346,7 +346,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 17, "z": 13, "y": 0 @@ -360,7 +360,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 18, "z": 16, "y": 0 @@ -374,7 +374,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 19, "z": 18, "y": 0 @@ -388,7 +388,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 7, "y": 0 @@ -402,7 +402,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 11, "y": 0 @@ -416,7 +416,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 6, "y": 0 diff --git a/res/field/events/events_0512.json b/res/field/events/events_0512.json index 7a270bff61..adc1cbe8cc 100644 --- a/res/field/events/events_0512.json +++ b/res/field/events/events_0512.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 2, + "movement_range_z": 2, "x": 40, "z": 6, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 18, "z": 8, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 2, - "movement_range_y": 0, + "movement_range_z": 0, "x": 31, "z": 8, "y": 0 @@ -52,7 +52,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 24, "z": 14, "y": 0 diff --git a/res/field/events/events_0513.json b/res/field/events/events_0513.json index 602c771535..797257ba1b 100644 --- a/res/field/events/events_0513.json +++ b/res/field/events/events_0513.json @@ -171,7 +171,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 25, "z": 32, "y": 0 @@ -185,7 +185,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 47, "z": 19, "y": 0 @@ -199,7 +199,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 44, "z": 50, "y": 0 @@ -213,7 +213,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 49, "z": 64, "y": 0 @@ -227,7 +227,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 48, "z": 64, "y": 0 @@ -241,7 +241,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 3, - "movement_range_y": 0, + "movement_range_z": 0, "x": 41, "z": 57, "y": 0 @@ -255,7 +255,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 59, "z": 45, "y": 0 @@ -269,7 +269,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 50, "z": 19, "y": 0 @@ -283,7 +283,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 1, + "movement_range_z": 1, "x": 26, "z": 30, "y": 0 @@ -297,7 +297,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 1, + "movement_range_z": 1, "x": 67, "z": 39, "y": 0 @@ -311,7 +311,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 3, - "movement_range_y": 3, + "movement_range_z": 3, "x": 38, "z": 23, "y": 0 @@ -325,7 +325,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 45, "z": 43, "y": 0 @@ -339,7 +339,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 45, "z": 37, "y": 0 @@ -353,7 +353,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 52, "z": 43, "y": 0 @@ -367,7 +367,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 2, - "movement_range_y": 0, + "movement_range_z": 0, "x": 60, "z": 29, "y": 0 @@ -381,7 +381,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 59, "z": 18, "y": 0 @@ -395,7 +395,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 1, + "movement_range_z": 1, "x": 38, "z": 37, "y": 0 @@ -409,7 +409,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 55, "z": 38, "y": 0 @@ -423,7 +423,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 54, "z": 49, "y": 0 @@ -437,7 +437,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 2, - "movement_range_y": 0, + "movement_range_z": 0, "x": 66, "z": 50, "y": 0 @@ -451,7 +451,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 2, - "movement_range_y": 1, + "movement_range_z": 1, "x": 60, "z": 37, "y": 0 @@ -465,7 +465,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 2, - "movement_range_y": 0, + "movement_range_z": 0, "x": 45, "z": 46, "y": 0 @@ -479,7 +479,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 2, - "movement_range_y": 0, + "movement_range_z": 0, "x": 44, "z": 61, "y": 0 @@ -493,7 +493,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 2, + "movement_range_z": 2, "x": 54, "z": 59, "y": 0 @@ -507,7 +507,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 35, "z": 57, "y": 0 @@ -521,7 +521,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 62, "z": 57, "y": 0 @@ -535,7 +535,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 72, "z": 32, "y": 0 @@ -549,7 +549,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 2, + "movement_range_z": 2, "x": 42, "z": 41, "y": 0 @@ -563,7 +563,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 1, + "movement_range_z": 1, "x": 31, "z": 40, "y": 0 @@ -577,7 +577,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 1, + "movement_range_z": 1, "x": 25, "z": 36, "y": 0 diff --git a/res/field/events/events_0514.json b/res/field/events/events_0514.json index c89f358ec5..2c02acad85 100644 --- a/res/field/events/events_0514.json +++ b/res/field/events/events_0514.json @@ -10,7 +10,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 2, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 6, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 2, - "movement_range_y": 0, + "movement_range_z": 0, "x": 11, "z": 6, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 4, "y": 0 @@ -52,7 +52,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 2, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 13, "y": 0 @@ -66,7 +66,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 2, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 15, "y": 0 @@ -80,7 +80,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 2, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 17, "y": 0 @@ -94,7 +94,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 2, - "movement_range_y": 0, + "movement_range_z": 0, "x": 9, "z": 13, "y": 0 @@ -108,7 +108,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 2, - "movement_range_y": 0, + "movement_range_z": 0, "x": 9, "z": 15, "y": 0 @@ -122,7 +122,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 2, - "movement_range_y": 0, + "movement_range_z": 0, "x": 9, "z": 17, "y": 0 @@ -136,7 +136,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 11, "z": 3, "y": 0 diff --git a/res/field/events/events_0515.json b/res/field/events/events_0515.json index 578f5de5b1..c937899f4f 100644 --- a/res/field/events/events_0515.json +++ b/res/field/events/events_0515.json @@ -19,7 +19,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 21, "z": 6, "y": 0 @@ -33,7 +33,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 23, "z": 6, "y": 0 @@ -47,7 +47,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 16, "z": 5, "y": 0 @@ -61,7 +61,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 15, "z": 12, "y": 0 @@ -75,7 +75,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 25, "z": 9, "y": 0 @@ -89,7 +89,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 1, "z": 12, "y": 0 @@ -103,7 +103,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 1, "z": 11, "y": 0 @@ -117,7 +117,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 18, "z": 9, "y": 0 @@ -131,7 +131,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 22, "z": 11, "y": 0 diff --git a/res/field/events/events_0516.json b/res/field/events/events_0516.json index 1fa5fd45fb..430207715c 100644 --- a/res/field/events/events_0516.json +++ b/res/field/events/events_0516.json @@ -19,7 +19,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 6, "z": 9, "y": 0 @@ -33,7 +33,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 6, "z": 10, "y": 0 @@ -47,7 +47,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 2, "z": 5, "y": 0 @@ -61,7 +61,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 2, - "movement_range_y": 0, + "movement_range_z": 0, "x": 3, "z": 7, "y": 0 @@ -75,7 +75,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 15, "z": 5, "y": 0 @@ -89,7 +89,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 15, "z": 6, "y": 0 @@ -103,7 +103,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 1, + "movement_range_z": 1, "x": 20, "z": 4, "y": 0 @@ -117,7 +117,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 1, + "movement_range_z": 1, "x": 23, "z": 11, "y": 0 @@ -131,7 +131,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 10, "z": 3, "y": 0 @@ -145,7 +145,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 6, "z": 6, "y": 0 @@ -159,7 +159,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 25, "z": 7, "y": 0 @@ -173,7 +173,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 25, "z": 4, "y": 0 @@ -187,7 +187,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 18, "z": 11, "y": 0 @@ -201,7 +201,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 4, "z": 6, "y": 0 @@ -215,7 +215,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 8, "z": 8, "y": 0 diff --git a/res/field/events/events_0517.json b/res/field/events/events_0517.json index 9ba4e6f1f9..85b827e7bb 100644 --- a/res/field/events/events_0517.json +++ b/res/field/events/events_0517.json @@ -19,7 +19,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 9, "y": 0 @@ -33,7 +33,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 10, "y": 0 @@ -47,7 +47,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 14, "z": 13, "y": 0 @@ -61,7 +61,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 2, - "movement_range_y": 0, + "movement_range_z": 0, "x": 2, "z": 14, "y": 0 @@ -75,7 +75,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 8, "z": 12, "y": 0 @@ -89,7 +89,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 2, + "movement_range_z": 2, "x": 12, "z": 4, "y": 0 @@ -103,7 +103,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 1, + "movement_range_z": 1, "x": 20, "z": 5, "y": 0 @@ -117,7 +117,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 2, + "movement_range_z": 2, "x": 14, "z": 5, "y": 0 @@ -131,7 +131,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 2, - "movement_range_y": 0, + "movement_range_z": 0, "x": 9, "z": 7, "y": 0 diff --git a/res/field/events/events_0518.json b/res/field/events/events_0518.json index c17db0680c..afa90b6692 100644 --- a/res/field/events/events_0518.json +++ b/res/field/events/events_0518.json @@ -19,7 +19,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 14, "z": 5, "y": 0 @@ -33,7 +33,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 15, "z": 5, "y": 0 @@ -47,7 +47,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 19, "z": 9, "y": 0 @@ -61,7 +61,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 3, - "movement_range_y": 0, + "movement_range_z": 0, "x": 2, "z": 12, "y": 0 @@ -75,7 +75,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 2, "z": 14, "y": 0 @@ -89,7 +89,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 14, "y": 0 @@ -103,7 +103,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 1, + "movement_range_z": 1, "x": 12, "z": 3, "y": 0 @@ -117,7 +117,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 3, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 11, "y": 0 @@ -131,7 +131,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 21, "z": 14, "y": 0 @@ -145,7 +145,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 1, - "movement_range_y": 0, + "movement_range_z": 0, "x": 19, "z": 6, "y": 0 @@ -159,7 +159,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 13, "z": 8, "y": 0 @@ -173,7 +173,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 13, "z": 9, "y": 0 diff --git a/res/field/events/events_0519.json b/res/field/events/events_0519.json index 7dd8c97f4f..52c882aa7b 100644 --- a/res/field/events/events_0519.json +++ b/res/field/events/events_0519.json @@ -19,7 +19,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 15, "z": 6, "y": 0 @@ -33,7 +33,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 20, "z": 11, "y": 0 @@ -47,7 +47,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 15, "z": 11, "y": 0 @@ -61,7 +61,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 3, "z": 8, "y": 0 @@ -75,7 +75,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 6, "y": 0 @@ -89,7 +89,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 11, "y": 0 @@ -103,7 +103,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 20, "z": 6, "y": 0 @@ -117,7 +117,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 16, "z": 9, "y": 0 @@ -131,7 +131,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 1, - "movement_range_y": 1, + "movement_range_z": 1, "x": 21, "z": 13, "y": 0 @@ -145,7 +145,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 15, "z": 4, "y": 0 diff --git a/res/field/events/events_0520.json b/res/field/events/events_0520.json index 5930c60f56..4dac36fe50 100644 --- a/res/field/events/events_0520.json +++ b/res/field/events/events_0520.json @@ -91,7 +91,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 10, "z": 6, "y": 0 @@ -105,7 +105,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 11, "z": 17, "y": 0 @@ -119,7 +119,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 13, "z": 10, "y": 0 @@ -133,7 +133,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 15, "y": 0 @@ -147,7 +147,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 13, "z": 15, "y": 0 @@ -161,7 +161,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 10, "z": 14, "y": 0 @@ -175,7 +175,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 5, "z": 8, "y": 0 @@ -189,7 +189,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 2, - "movement_range_y": 0, + "movement_range_z": 0, "x": 20, "z": 11, "y": 0 @@ -203,7 +203,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 2, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 4, "y": 0 diff --git a/res/field/events/events_0521.json b/res/field/events/events_0521.json index fbd3dca980..8f4deea049 100644 --- a/res/field/events/events_0521.json +++ b/res/field/events/events_0521.json @@ -59,7 +59,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 2, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 16, "y": 0 @@ -73,7 +73,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 18, "z": 10, "y": 0 @@ -87,7 +87,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 2, + "movement_range_z": 2, "x": 15, "z": 10, "y": 0 @@ -101,7 +101,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 6, "z": 6, "y": 0 @@ -115,7 +115,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 1, + "movement_range_z": 1, "x": 4, "z": 11, "y": 0 @@ -129,7 +129,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 6, "z": 5, "y": 0 @@ -143,7 +143,7 @@ "initial_dir": 3, "data": [], "movement_range_x": 0, - "movement_range_y": 1, + "movement_range_z": 1, "x": 4, "z": 10, "y": 0 @@ -157,7 +157,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 1, + "movement_range_z": 1, "x": 11, "z": 10, "y": 0 @@ -171,7 +171,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 2, - "movement_range_y": 0, + "movement_range_z": 0, "x": 9, "z": 6, "y": 0 diff --git a/res/field/events/events_0522.json b/res/field/events/events_0522.json index 6eb0cab444..772dde5a77 100644 --- a/res/field/events/events_0522.json +++ b/res/field/events/events_0522.json @@ -10,7 +10,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 11, "z": 10, "y": 0 @@ -24,7 +24,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 16, "z": 10, "y": 0 @@ -38,7 +38,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 17, "z": 3, "y": 0 @@ -52,7 +52,7 @@ "initial_dir": 2, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 19, "z": 12, "y": 0 @@ -66,7 +66,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 11, "z": 9, "y": 0 @@ -80,7 +80,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 11, "z": 11, "y": 0 @@ -94,7 +94,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 13, "z": 10, "y": 0 @@ -108,7 +108,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 11, "z": 12, "y": 0 @@ -122,7 +122,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 13, "z": 11, "y": 0 @@ -136,7 +136,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 13, "z": 12, "y": 0 @@ -150,7 +150,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 13, "z": 9, "y": 0 @@ -164,7 +164,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 11, "z": 13, "y": 0 @@ -178,7 +178,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 11, "z": 14, "y": 0 @@ -192,7 +192,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 11, "z": 15, "y": 0 @@ -206,7 +206,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 11, "z": 16, "y": 0 @@ -220,7 +220,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 13, "z": 13, "y": 0 @@ -234,7 +234,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 13, "z": 14, "y": 0 @@ -248,7 +248,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 13, "z": 15, "y": 0 @@ -262,7 +262,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 13, "z": 16, "y": 0 @@ -276,7 +276,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 16, "z": 9, "y": 0 @@ -290,7 +290,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 13, "z": 16, "y": 0 @@ -304,7 +304,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 16, "z": 13, "y": 0 @@ -318,7 +318,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 10, "z": 11, "y": 0 @@ -332,7 +332,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 10, "z": 15, "y": 0 @@ -346,7 +346,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 16, "z": 14, "y": 0 @@ -360,7 +360,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 10, "z": 12, "y": 0 @@ -374,7 +374,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 10, "z": 9, "y": 0 @@ -388,7 +388,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 14, "z": 17, "y": 0 @@ -402,7 +402,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 11, "z": 17, "y": 0 @@ -416,7 +416,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 16, "z": 15, "y": 0 @@ -430,7 +430,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 10, "z": 14, "y": 0 @@ -444,7 +444,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 13, "z": 10, "y": 0 @@ -458,7 +458,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 13, "z": 13, "y": 0 @@ -472,7 +472,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 13, "z": 9, "y": 0 @@ -486,7 +486,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 13, "z": 11, "y": 0 @@ -500,7 +500,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 16, "z": 11, "y": 0 diff --git a/res/field/events/events_0523.json b/res/field/events/events_0523.json index 4697364835..8958a596d1 100644 --- a/res/field/events/events_0523.json +++ b/res/field/events/events_0523.json @@ -51,7 +51,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 4, "z": 6, "y": 0 @@ -65,7 +65,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 6, "z": 6, "y": 0 @@ -79,7 +79,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 8, "z": 6, "y": 0 @@ -93,7 +93,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 10, "z": 6, "y": 0 @@ -107,7 +107,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 12, "z": 6, "y": 0 @@ -121,7 +121,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 11, "z": 9, "y": 0 @@ -135,7 +135,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 11, "y": 0 @@ -149,7 +149,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 13, "z": 5, "y": 0 diff --git a/res/field/events/events_0527.json b/res/field/events/events_0527.json index 61f55ef50f..f2cb2c0899 100644 --- a/res/field/events/events_0527.json +++ b/res/field/events/events_0527.json @@ -10,7 +10,7 @@ "initial_dir": 1, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 20, "z": 10, "y": 0 diff --git a/res/field/events/events_0528.json b/res/field/events/events_0528.json index 7ad4650a2a..0bd4f3332e 100644 --- a/res/field/events/events_0528.json +++ b/res/field/events/events_0528.json @@ -19,7 +19,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 7, "y": 0 diff --git a/res/field/events/events_0530.json b/res/field/events/events_0530.json index 70760132cc..879b6b9977 100644 --- a/res/field/events/events_0530.json +++ b/res/field/events/events_0530.json @@ -19,7 +19,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 7, "y": 0 diff --git a/res/field/events/events_0532.json b/res/field/events/events_0532.json index 8c2928b233..51f99e4b88 100644 --- a/res/field/events/events_0532.json +++ b/res/field/events/events_0532.json @@ -19,7 +19,7 @@ "initial_dir": 0, "data": [], "movement_range_x": 0, - "movement_range_y": 0, + "movement_range_z": 0, "x": 7, "z": 7, "y": 0 diff --git a/tools/json2bin/events.py b/tools/json2bin/events.py index aea312ede2..0476682a72 100644 --- a/tools/json2bin/events.py +++ b/tools/json2bin/events.py @@ -36,7 +36,7 @@ def parse_object_events(obj_events: Sequence[Mapping], *args) -> bytes: obj_bytes.extend(j2b.parse_int(obj_data[1] if len(obj_data) > 1 else 0, 2)) obj_bytes.extend(j2b.parse_int(obj_data[2] if len(obj_data) > 2 else 0, 2)) obj_bytes.extend(j2b.parse_int(obj['movement_range_x'], 2)) - obj_bytes.extend(j2b.parse_int(obj['movement_range_y'], 2)) + obj_bytes.extend(j2b.parse_int(obj['movement_range_z'], 2)) obj_bytes.extend(j2b.parse_int(obj['x'], 2)) obj_bytes.extend(j2b.parse_int(obj['z'], 2)) obj_bytes.extend(j2b.parse_int(obj['y'] * 0x10000, 4)) From a4dec2033b3d3112397fddac108ee30f21d1fe0d Mon Sep 17 00:00:00 2001 From: Trainer Riley Date: Sat, 13 Apr 2024 22:49:32 -0700 Subject: [PATCH 09/23] Document PoketchButton and PoketchButtonManager, name Touch Screen location structs --- include/overlay019/struct_ov19_021D6104.h | 6 +- include/overlay021/ov21_021D0D80.h | 4 +- include/overlay022/struct_ov22_02259D2C.h | 4 +- include/overlay025/poketch_button.h | 70 +++-- include/overlay062/const_ov62_022491F0.h | 4 +- .../overlay062/struct_ov62_022307C0_sub1.h | 4 +- include/overlay062/struct_ov62_0223118C.h | 4 +- .../overlay062/struct_ov62_02246BF4_sub1.h | 4 +- .../overlay062/struct_ov62_02246BF4_sub2.h | 4 +- include/overlay062/struct_ov62_02248CDC.h | 4 +- include/overlay076/ov76_0223B140.h | 4 +- include/overlay076/struct_ov76_0223B52C.h | 4 +- include/overlay076/struct_ov76_0223C398.h | 4 +- include/struct_defs/struct_020298D8.h | 4 +- include/struct_defs/struct_02089688_sub1.h | 4 +- include/struct_defs/struct_0208AF44.h | 4 +- include/struct_defs/union_02022594.h | 2 +- include/struct_defs/union_02022594_020225E0.h | 2 +- include/struct_defs/union_020225E0.h | 2 +- include/unk_02022594.h | 36 ++- include/unk_02023FCC.h | 4 +- src/battle/ov16_0226871C.c | 93 +++--- src/overlay013/ov13_0221FC20.c | 25 +- src/overlay013/ov13_022264F4.c | 15 +- src/overlay017/ov17_0223F7E4.c | 17 +- src/overlay017/ov17_022492DC.c | 7 +- src/overlay019/ov19_021D0D80.c | 8 +- src/overlay019/ov19_021D603C.c | 18 +- src/overlay020/ov20_021D0D80.c | 4 +- src/overlay021/ov21_021D0D80.c | 12 +- src/overlay021/ov21_021D76B0.c | 14 +- src/overlay021/ov21_021D94BC.c | 18 +- src/overlay021/ov21_021DDD2C.c | 18 +- src/overlay021/ov21_021E1924.c | 6 +- src/overlay021/ov21_021E29DC.c | 6 +- src/overlay021/ov21_021E4CA4.c | 31 +- src/overlay021/ov21_021E68F4.c | 6 +- src/overlay021/ov21_021E8484.c | 6 +- src/overlay022/ov22_02254DE0.c | 21 +- src/overlay022/ov22_022578F4.c | 25 +- src/overlay022/ov22_02257F50.c | 25 +- src/overlay022/ov22_02259098.c | 33 +- src/overlay022/ov22_02259C58.c | 14 +- src/overlay025/poketch_button.c | 289 +++++++++--------- src/overlay025/poketch_system.c | 17 +- src/overlay026/ov26_022561C0.c | 8 +- src/overlay027/ov27_022561C0.c | 12 +- src/overlay028/ov28_022561C0.c | 8 +- src/overlay029/ov29_022561C0.c | 8 +- src/overlay030/ov30_022561C0.c | 8 +- src/overlay035/ov35_022561C0.c | 8 +- src/overlay036/ov36_022561C0.c | 8 +- src/overlay037/ov37_022561C0.c | 8 +- src/overlay039/ov39_022561C0.c | 8 +- src/overlay041/ov41_022561C0.c | 8 +- src/overlay043/ov43_022561C0.c | 8 +- src/overlay044/ov44_022561C0.c | 8 +- src/overlay045/ov45_022561C0.c | 16 +- src/overlay046/ov46_022561C0.c | 24 +- src/overlay050/ov50_022561C0.c | 8 +- src/overlay053/ov53_022561C0.c | 8 +- src/overlay054/ov54_022561C0.c | 8 +- src/overlay056/ov56_022561C0.c | 7 +- src/overlay058/ov58_021D0D80.c | 9 +- src/overlay062/ov62_0222F2C0.c | 24 +- src/overlay062/ov62_02231690.c | 11 +- src/overlay062/ov62_02234A10.c | 2 +- src/overlay062/ov62_02235278.c | 9 +- src/overlay062/ov62_02235E64.c | 11 +- src/overlay062/ov62_02237D24.c | 27 +- src/overlay062/ov62_02239D60.c | 11 +- src/overlay062/ov62_0223CAEC.c | 4 +- src/overlay062/ov62_0223DFA8.c | 17 +- src/overlay062/ov62_02241204.c | 35 ++- src/overlay062/ov62_02246B00.c | 42 +-- src/overlay062/ov62_02247D74.c | 13 +- src/overlay065/ov65_0222DCE0.c | 6 +- src/overlay070/ov70_0225D9A4.c | 4 +- src/overlay071/ov71_0223B140.c | 21 +- src/overlay072/ov72_0223D7A0.c | 7 +- src/overlay076/ov76_0223B140.c | 29 +- src/overlay076/ov76_0223B870.c | 12 +- src/overlay076/ov76_0223D338.c | 7 +- src/overlay079/ov79_021D0D80.c | 5 +- src/overlay080/ov80_021D1458.c | 7 +- src/overlay084/ov84_0223B5A0.c | 21 +- src/overlay088/ov88_0223B140.c | 5 +- src/overlay094/ov94_02243EF8.c | 5 +- src/overlay097/ov97_02233B18.c | 19 +- src/overlay108/ov108_02241AE0.c | 5 +- src/overlay111/ov111_021D0D80.c | 21 +- src/overlay113/ov113_02260620.c | 5 +- src/overlay116/ov116_02262A8C.c | 9 +- src/unk_02015920.c | 12 +- src/unk_02022594.c | 94 +++--- src/unk_02023FCC.c | 15 +- src/unk_0207E0B8.c | 5 +- src/unk_02089604.c | 10 +- src/unk_0208A3F4.c | 32 +- src/unk_020920C0.c | 11 +- 100 files changed, 833 insertions(+), 826 deletions(-) diff --git a/include/overlay019/struct_ov19_021D6104.h b/include/overlay019/struct_ov19_021D6104.h index 33204cce47..631842fd81 100644 --- a/include/overlay019/struct_ov19_021D6104.h +++ b/include/overlay019/struct_ov19_021D6104.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_STRUCT_OV19_021D6104_H #define POKEPLATINUM_STRUCT_OV19_021D6104_H -#include "struct_defs/union_02022594_020225E0.h" +#include "unk_02022594.h" typedef struct UnkStruct_ov19_021D6104_t { u32 unk_00; @@ -15,8 +15,8 @@ typedef struct UnkStruct_ov19_021D6104_t { u16 unk_20; u8 padding_22[2]; int unk_24; - UnkUnion_020225E0 unk_28; - UnkUnion_020225E0 unk_2C; + TouchScreenHitTable unk_28; + TouchScreenHitTable unk_2C; int (* unk_30)(struct UnkStruct_ov19_021D6104_t *, BOOL, BOOL); } UnkStruct_ov19_021D6104; diff --git a/include/overlay021/ov21_021D0D80.h b/include/overlay021/ov21_021D0D80.h index 334e2c0133..eb01559964 100644 --- a/include/overlay021/ov21_021D0D80.h +++ b/include/overlay021/ov21_021D0D80.h @@ -4,7 +4,7 @@ #include "overlay_manager.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_02022550_decl.h" -#include "struct_defs/union_02022594_020225E0.h" +#include "unk_02022594.h" #include "strbuf.h" #include "struct_defs/struct_0205AA50.h" #include "overlay021/struct_ov21_021D0D80_1.h" @@ -49,7 +49,7 @@ UnkStruct_ov21_021E68F4 * ov21_021D1430(UnkStruct_ov21_021D0F60 * param0, int pa void ov21_021D144C(GraphicElementData * param0, int param1); void ov21_021D1498(GraphicElementData * param0, UnkStruct_ov21_021D4CA0 * param1, int param2); void ov21_021D1524(GraphicElementData * param0, UnkStruct_ov21_021D4CA0 * param1, int param2, int param3, int param4); -void ov21_021D154C(UnkUnion_020225E0 * param0, int param1, int param2, int param3, int param4); +void ov21_021D154C(TouchScreenHitTable *hitTable, int param1, int param2, int param3, int param4); void ov21_021D1558(UnkStruct_ov21_021D157C * param0, BGL * param1, int param2, NNSG2dScreenData * param3, int param4, int param5, int param6, int param7, int param8); BOOL ov21_021D157C(UnkStruct_ov21_021D157C * param0); void ov21_021D1650(Window * param0, int param1, int param2, int param3); diff --git a/include/overlay022/struct_ov22_02259D2C.h b/include/overlay022/struct_ov22_02259D2C.h index 019ee2a03f..a200b7f533 100644 --- a/include/overlay022/struct_ov22_02259D2C.h +++ b/include/overlay022/struct_ov22_02259D2C.h @@ -2,7 +2,7 @@ #define POKEPLATINUM_STRUCT_OV22_02259D2C_H #include "struct_decls/struct_02012744_decl.h" -#include "struct_defs/union_02022594_020225E0.h" +#include "unk_02022594.h" #include "struct_decls/struct_02023FCC_decl.h" #include "overlay022/struct_ov22_02259C58.h" #include "overlay022/struct_ov22_0225A154.h" @@ -13,7 +13,7 @@ typedef struct { BOOL unk_60; UnkStruct_02012744 * unk_64; UnkStruct_02023FCC * unk_68; - UnkUnion_020225E0 unk_6C[5]; + TouchScreenHitTable unk_6C[5]; } UnkStruct_ov22_02259D2C; #endif // POKEPLATINUM_STRUCT_OV22_02259D2C_H diff --git a/include/overlay025/poketch_button.h b/include/overlay025/poketch_button.h index 3cdd2d247f..3f354a08d8 100644 --- a/include/overlay025/poketch_button.h +++ b/include/overlay025/poketch_button.h @@ -1,35 +1,65 @@ #ifndef POKEPLATINUM_POKETCH_BUTTON_H #define POKEPLATINUM_POKETCH_BUTTON_H -#include "struct_defs/union_02022594_020225E0.h" +#include "unk_02022594.h" + +#define BUTTON_TIMER_MAX 0xffff +#define BUTTON_MANAGER_NUM_TIMERS_PER_BUTTON 2 typedef void (* PoketchButtonCallback)(u32, u32, u32, void *); +enum ButtonManagerState { + BUTTON_MANAGER_STATE_NULL = 0, + BUTTON_MANAGER_STATE_TOUCH, + BUTTON_MANAGER_STATE_OUT, + BUTTON_MANAGER_STATE_TAP, + BUTTON_MANAGER_STATE_DOUBLETAP, + BUTTON_MANAGER_STATE_TIMER0, + BUTTON_MANAGER_STATE_TIMER1, + BUTTON_MANAGER_STATE_REPEAT, +}; + +/** Button states similar to a game input */ +enum ButtonTouchState { + BUTTON_TOUCH_PRESSED = 0, //!< up last frame, down this frame + BUTTON_TOUCH_RELEASED, //!< down last frame, up this frame + BUTTON_TOUCH_DOWN, //!< down last frame, down this frame +}; + +/** States in the Button State Machine */ +enum ButtonEventState { + BUTTON_STATE_IDLE = 0, + BUTTON_STATE_TAP, + BUTTON_STATE_CHECK_DOUBLETAP, + BUTTON_STATE_DOUBLETAP, + BUTTON_STATE_RESET, +}; + typedef struct PoketchButton { - u8 unk_00; - u8 unk_01; - u8 unk_02; - u8 unk_03; - u16 unk_04; - u16 unk_06; - u16 unk_08[2]; - u16 unk_0C; + u8 state; + u8 screenTouched; + u8 prevScreenTouched; + u8 unk_03; // unused + u16 timer; + u16 doubleTapTime; + u16 timerDurations[BUTTON_MANAGER_NUM_TIMERS_PER_BUTTON]; + u16 repeatTime; } PoketchButton; typedef struct PoketchButtonManager { - const UnkUnion_020225E0 * unk_00; + const TouchScreenHitTable * hitTable; PoketchButtonCallback callback; - u32 unk_08; - u32 unk_0C; - void * unk_10; - PoketchButton * button; + u32 heapID; + u32 numButtons; + void * buttonCallbackData; + PoketchButton * buttons; } PoketchButtonManager; -PoketchButtonManager * ov25_02255ACC(const UnkUnion_020225E0 * param0, u32 param1, PoketchButtonCallback param2, void * param3, u32 param4); -void ov25_02255B34(PoketchButtonManager * param0); -void ov25_02255B50(PoketchButtonManager * param0); -void ov25_02255C48(PoketchButtonManager * param0, u32 param1, u32 param2, u16 param3); -void ov25_02255C5C(PoketchButtonManager * param0, u32 param1, u16 param2); -void ov25_02255C68(PoketchButtonManager * param0, u32 param1); +PoketchButtonManager * PoketchButtonManager_Create(const TouchScreenHitTable *hitTable, u32 numButtons, PoketchButtonCallback callback, void *callbackData, u32 heapID); +void PoketchButtonManager_Destroy(PoketchButtonManager *buttonManager); +void PoketchButtonManager_Update(PoketchButtonManager *buttonManager); +void PoketchButtonManager_ButtonTimer(PoketchButtonManager *buttonManager, u32 buttonIndex, u32 timerIndex, u16 time); +void PoketchButtonManager_RepeatTime(PoketchButtonManager *buttonManager, u32 index, u16 repeatTime); +void PoketchButtonManager_ResetButtonState(PoketchButtonManager *buttonManager, u32 index); #endif // POKEPLATINUM_POKETCH_BUTTON_H diff --git a/include/overlay062/const_ov62_022491F0.h b/include/overlay062/const_ov62_022491F0.h index fc7a68ff9e..ea9f715511 100644 --- a/include/overlay062/const_ov62_022491F0.h +++ b/include/overlay062/const_ov62_022491F0.h @@ -1,8 +1,8 @@ #ifndef POKEPLATINUM_CONST_OV62_022491F0_H #define POKEPLATINUM_CONST_OV62_022491F0_H -#include "struct_defs/union_02022594_020225E0.h" +#include "unk_02022594.h" -extern const UnkUnion_02022594 Unk_ov62_022491F0[9]; +extern const TouchScreenRect Unk_ov62_022491F0[9]; #endif // POKEPLATINUM_CONST_OV62_022491F0_H diff --git a/include/overlay062/struct_ov62_022307C0_sub1.h b/include/overlay062/struct_ov62_022307C0_sub1.h index 904c20f834..f1709d6643 100644 --- a/include/overlay062/struct_ov62_022307C0_sub1.h +++ b/include/overlay062/struct_ov62_022307C0_sub1.h @@ -5,13 +5,13 @@ #include "struct_decls/struct_02012B20_decl.h" #include "struct_decls/font_oam.h" #include "struct_defs/sprite_manager_allocation.h" -#include "struct_defs/union_02022594_020225E0.h" +#include "unk_02022594.h" typedef struct { CellActorData * unk_00; u8 padding_04[8]; BOOL unk_0C; - UnkUnion_02022594 * unk_10; + TouchScreenRect * unk_10; FontOAM * unk_14; UnkStruct_02012B20 * unk_18; SpriteManagerAllocation unk_1C; diff --git a/include/overlay062/struct_ov62_0223118C.h b/include/overlay062/struct_ov62_0223118C.h index 0a8d5fe9d8..2e65e777f5 100644 --- a/include/overlay062/struct_ov62_0223118C.h +++ b/include/overlay062/struct_ov62_0223118C.h @@ -9,7 +9,7 @@ #include "struct_decls/struct_0200C704_decl.h" #include "struct_decls/struct_02012744_decl.h" #include "struct_decls/struct_02018340_decl.h" -#include "struct_defs/union_02022594_020225E0.h" +#include "unk_02022594.h" #include "struct_decls/struct_02023FCC_decl.h" #include "struct_defs/struct_0207C690.h" #include "overlay062/struct_ov62_0223118C_sub1.h" @@ -25,7 +25,7 @@ typedef struct { BGL * unk_10; PaletteData * unk_14; UnkStruct_02023FCC * unk_18; - UnkUnion_02022594 unk_1C[5]; + TouchScreenRect unk_1C[5]; BOOL unk_30; MessageLoader * unk_34; MessageLoader * unk_38; diff --git a/include/overlay062/struct_ov62_02246BF4_sub1.h b/include/overlay062/struct_ov62_02246BF4_sub1.h index 786bf43518..b0043e5daa 100644 --- a/include/overlay062/struct_ov62_02246BF4_sub1.h +++ b/include/overlay062/struct_ov62_02246BF4_sub1.h @@ -2,7 +2,7 @@ #define POKEPLATINUM_STRUCT_OV62_02246BF4_SUB1_H #include "struct_decls/cell_actor_data.h" -#include "struct_defs/union_02022594_020225E0.h" +#include "unk_02022594.h" #include "overlay062/struct_ov62_02246BF4_sub1_sub1.h" typedef struct { @@ -10,7 +10,7 @@ typedef struct { int unk_04; BOOL unk_08; CellActorData * unk_0C; - UnkUnion_02022594 * unk_10; + TouchScreenRect * unk_10; UnkStruct_ov62_02246BF4_sub1_sub1 unk_14; u8 padding_1A[2]; } UnkStruct_ov62_02246BF4_sub1; diff --git a/include/overlay062/struct_ov62_02246BF4_sub2.h b/include/overlay062/struct_ov62_02246BF4_sub2.h index 7ddf661f6a..0742cd6c9a 100644 --- a/include/overlay062/struct_ov62_02246BF4_sub2.h +++ b/include/overlay062/struct_ov62_02246BF4_sub2.h @@ -6,7 +6,7 @@ #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" #include "struct_decls/struct_02018340_decl.h" -#include "struct_defs/union_02022594_020225E0.h" +#include "unk_02022594.h" #include "struct_decls/struct_02023FCC_decl.h" typedef struct { @@ -16,7 +16,7 @@ typedef struct { BGL * unk_0C; PaletteData * unk_10; UnkStruct_02023FCC * unk_14; - UnkUnion_02022594 unk_18[24]; + TouchScreenRect unk_18[24]; BOOL unk_78; } UnkStruct_ov62_02246BF4_sub2; diff --git a/include/overlay062/struct_ov62_02248CDC.h b/include/overlay062/struct_ov62_02248CDC.h index 5e522ebb1f..46b6d4578c 100644 --- a/include/overlay062/struct_ov62_02248CDC.h +++ b/include/overlay062/struct_ov62_02248CDC.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_STRUCT_OV62_02248CDC_H #define POKEPLATINUM_STRUCT_OV62_02248CDC_H -#include "struct_defs/union_02022594_020225E0.h" +#include "unk_02022594.h" #include "overlay062/struct_ov62_02249380.h" typedef struct { @@ -15,7 +15,7 @@ typedef struct { int unk_1C; int unk_20; u32 unk_24; - const UnkUnion_02022594 * unk_28; + const TouchScreenRect * unk_28; } UnkStruct_ov62_02248CDC; #endif // POKEPLATINUM_STRUCT_OV62_02248CDC_H diff --git a/include/overlay076/ov76_0223B140.h b/include/overlay076/ov76_0223B140.h index 71ea7a0cc5..f95f7d80ee 100644 --- a/include/overlay076/ov76_0223B140.h +++ b/include/overlay076/ov76_0223B140.h @@ -2,11 +2,11 @@ #define POKEPLATINUM_OV76_0223B140_H #include "struct_decls/cell_actor_data.h" -#include "struct_defs/union_02022594_020225E0.h" +#include "unk_02022594.h" #include "struct_defs/struct_0202CA28.h" #include "overlay076/struct_ov76_0223DE00.h" -void ov76_0223B184(UnkUnion_02022594 * param0, CellActorData * param1, BOOL param2); +void ov76_0223B184(TouchScreenRect *rect, CellActorData * param1, BOOL param2); void ov76_0223B1E0(UnkStruct_ov76_0223DE00 * param0); void ov76_0223B208(UnkStruct_ov76_0223DE00 * param0); int ov76_0223B278(UnkStruct_ov76_0223DE00 * param0, u8 param1); diff --git a/include/overlay076/struct_ov76_0223B52C.h b/include/overlay076/struct_ov76_0223B52C.h index cddf31c240..d53d99a774 100644 --- a/include/overlay076/struct_ov76_0223B52C.h +++ b/include/overlay076/struct_ov76_0223B52C.h @@ -2,7 +2,7 @@ #define POKEPLATINUM_STRUCT_OV76_0223B52C_H #include "struct_decls/cell_actor_data.h" -#include "struct_defs/union_02022594_020225E0.h" +#include "unk_02022594.h" typedef struct { BOOL unk_00; @@ -11,7 +11,7 @@ typedef struct { u8 unk_06; u8 padding_07; CellActorData * unk_08; - UnkUnion_02022594 * unk_0C; + TouchScreenRect * unk_0C; } UnkStruct_ov76_0223B52C; #endif // POKEPLATINUM_STRUCT_OV76_0223B52C_H diff --git a/include/overlay076/struct_ov76_0223C398.h b/include/overlay076/struct_ov76_0223C398.h index b5722faa1c..deae8abfd5 100644 --- a/include/overlay076/struct_ov76_0223C398.h +++ b/include/overlay076/struct_ov76_0223C398.h @@ -14,7 +14,7 @@ #include "struct_decls/pokemon_animation_sys_decl.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_defs/sprite_manager_allocation.h" -#include "struct_defs/union_02022594_020225E0.h" +#include "unk_02022594.h" #include "struct_decls/struct_02023FCC_decl.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0207C690.h" @@ -37,7 +37,7 @@ typedef struct { int unk_D8; UnkStruct_ov22_02258A48 unk_DC; UnkStruct_02023FCC * unk_F8; - UnkUnion_02022594 unk_FC[21]; + TouchScreenRect unk_FC[21]; UnkStruct_02015920 * unk_150; UnkStruct_ov12_02235FE0 * unk_154; BallRotation * unk_158; diff --git a/include/struct_defs/struct_020298D8.h b/include/struct_defs/struct_020298D8.h index 3e561d1481..a8b11e324f 100644 --- a/include/struct_defs/struct_020298D8.h +++ b/include/struct_defs/struct_020298D8.h @@ -2,13 +2,13 @@ #define POKEPLATINUM_STRUCT_020298D8_H #include "struct_decls/sprite_decl.h" -#include "struct_defs/union_02022594_020225E0.h" +#include "unk_02022594.h" #include "pokemon.h" #include "overlay022/struct_ov22_022596B0.h" typedef struct { Sprite * unk_00; - UnkUnion_020225E0 unk_04; + TouchScreenHitTable unk_04; UnkStruct_ov22_022596B0 unk_08; Pokemon * unk_0C; } UnkStruct_020298D8; diff --git a/include/struct_defs/struct_02089688_sub1.h b/include/struct_defs/struct_02089688_sub1.h index c2c0ee9314..0e71cf5235 100644 --- a/include/struct_defs/struct_02089688_sub1.h +++ b/include/struct_defs/struct_02089688_sub1.h @@ -9,7 +9,7 @@ #include "struct_decls/font_oam.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_defs/sprite_manager_allocation.h" -#include "struct_defs/union_02022594_020225E0.h" +#include "unk_02022594.h" #include "struct_decls/struct_02023FCC_decl.h" #include "struct_defs/struct_0205AA50.h" @@ -20,7 +20,7 @@ typedef struct { BGL * unk_0C; PaletteData * unk_10; UnkStruct_02023FCC * unk_14; - UnkUnion_02022594 unk_18[28]; + TouchScreenRect unk_18[28]; BOOL unk_88; UnkStruct_02012744 * unk_8C; FontOAM * unk_90[2]; diff --git a/include/struct_defs/struct_0208AF44.h b/include/struct_defs/struct_0208AF44.h index 4c647d25bf..9d30ab675b 100644 --- a/include/struct_defs/struct_0208AF44.h +++ b/include/struct_defs/struct_0208AF44.h @@ -2,7 +2,7 @@ #define POKEPLATINUM_STRUCT_0208AF44_H #include "struct_decls/cell_actor_data.h" -#include "struct_defs/union_02022594_020225E0.h" +#include "unk_02022594.h" #include "struct_defs/struct_0208AF44_sub1.h" typedef struct { @@ -10,7 +10,7 @@ typedef struct { int unk_04; BOOL unk_08; CellActorData * unk_0C; - UnkUnion_02022594 * unk_10; + TouchScreenRect * unk_10; UnkStruct_0208AF44_sub1 unk_14; } UnkStruct_0208AF44; diff --git a/include/struct_defs/union_02022594.h b/include/struct_defs/union_02022594.h index 6ef4142863..5a9e5ad41b 100644 --- a/include/struct_defs/union_02022594.h +++ b/include/struct_defs/union_02022594.h @@ -15,6 +15,6 @@ typedef union { u8 unk_02; u8 unk_03; } val2; -} UnkUnion_02022594, UnkUnion_020225E0; +} TouchScreenRect, TouchScreenHitTable; #endif // POKEPLATINUM_UNION_02022594_H diff --git a/include/struct_defs/union_02022594_020225E0.h b/include/struct_defs/union_02022594_020225E0.h index 3d8a0a4d16..a377139918 100644 --- a/include/struct_defs/union_02022594_020225E0.h +++ b/include/struct_defs/union_02022594_020225E0.h @@ -15,6 +15,6 @@ typedef union { u8 unk_02; u8 unk_03; } val2; -} UnkUnion_02022594, UnkUnion_020225E0; +} TouchScreenRect, TouchScreenHitTable; #endif // POKEPLATINUM_UNION_02022594_020225E0_H diff --git a/include/struct_defs/union_020225E0.h b/include/struct_defs/union_020225E0.h index 1d91af3705..7fe7dd1523 100644 --- a/include/struct_defs/union_020225E0.h +++ b/include/struct_defs/union_020225E0.h @@ -15,6 +15,6 @@ typedef union { u8 unk_02; u8 unk_03; } val2; -} UnkUnion_02022594, UnkUnion_020225E0; +} TouchScreenRect, TouchScreenHitTable; #endif // POKEPLATINUM_UNION_020225E0_H diff --git a/include/unk_02022594.h b/include/unk_02022594.h index b2cac5b915..bf7759e8fd 100644 --- a/include/unk_02022594.h +++ b/include/unk_02022594.h @@ -1,15 +1,31 @@ #ifndef POKEPLATINUM_UNK_02022594_H #define POKEPLATINUM_UNK_02022594_H -#include "struct_defs/union_02022594_020225E0.h" +#define TOUCHSCREEN_USE_CIRCLE 0xfe -int sub_02022644(const UnkUnion_02022594 * param0); -int sub_02022664(const UnkUnion_02022594 * param0); -int sub_02022684(const UnkUnion_020225E0 * param0); -int sub_020226DC(const UnkUnion_020225E0 * param0); -BOOL sub_02022734(const UnkUnion_020225E0 * param0); -BOOL sub_02022760(const UnkUnion_020225E0 * param0); -BOOL sub_0202278C(void); +typedef union { + struct { + u8 top; + u8 bottom; + u8 left; + u8 right; + } rect; + + struct { + u8 code; + u8 x; + u8 y; + u8 r; + } circle; +} TouchScreenRect, TouchScreenHitTable; + +int sub_02022644(const TouchScreenRect *rect); +int sub_02022664(const TouchScreenRect *rect); +int sub_02022684(const TouchScreenHitTable *hitTable); +int sub_020226DC(const TouchScreenHitTable *hitTable); +BOOL TouchScreen_LocationHeld(const TouchScreenHitTable *hitTable); +BOOL TouchScreen_LocationPressed(const TouchScreenHitTable *hitTable); +BOOL TouchScreen_Touched(void); /** * @brief Check if the touch screen is tapped. @@ -19,7 +35,7 @@ BOOL sub_0202278C(void); BOOL TouchScreen_Tapped(void); BOOL sub_020227A4(u32 * param0, u32 * param1); BOOL sub_020227C0(u32 * param0, u32 * param1); -int sub_020227DC(const UnkUnion_020225E0 * param0, u32 param1, u32 param2); -BOOL sub_02022830(const UnkUnion_020225E0 * param0, u32 param1, u32 param2); +int sub_020227DC(const TouchScreenHitTable *hitTable, u32 param1, u32 param2); +BOOL sub_02022830(const TouchScreenHitTable *hitTable, u32 param1, u32 param2); #endif // POKEPLATINUM_UNK_02022594_H diff --git a/include/unk_02023FCC.h b/include/unk_02023FCC.h index 33a2d7b1bc..edb735dd55 100644 --- a/include/unk_02023FCC.h +++ b/include/unk_02023FCC.h @@ -1,11 +1,11 @@ #ifndef POKEPLATINUM_UNK_02023FCC_H #define POKEPLATINUM_UNK_02023FCC_H -#include "struct_defs/union_02022594_020225E0.h" +#include "unk_02022594.h" #include "functypes/funcptr_02023FCC.h" #include "struct_decls/struct_02023FCC_decl.h" -UnkStruct_02023FCC * sub_02023FCC(const UnkUnion_020225E0 * param0, u32 param1, UnkFuncPtr_02023FCC param2, void * param3, u32 param4); +UnkStruct_02023FCC * sub_02023FCC(const TouchScreenHitTable *hitTable, u32 param1, UnkFuncPtr_02023FCC param2, void * param3, u32 param4); void sub_02024034(UnkStruct_02023FCC * param0); void sub_0202404C(UnkStruct_02023FCC * param0); diff --git a/src/battle/ov16_0226871C.c b/src/battle/ov16_0226871C.c index db614f1b5d..ddf36f0b47 100644 --- a/src/battle/ov16_0226871C.c +++ b/src/battle/ov16_0226871C.c @@ -26,7 +26,7 @@ #include "struct_defs/struct_020127E8.h" #include "functypes/sys_task_func.h" #include "struct_defs/sprite_manager_allocation.h" -#include "struct_defs/union_02022594_020225E0.h" +#include "unk_02022594.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0209C370.h" #include "battle/struct_ov16_02260C00.h" @@ -57,7 +57,6 @@ #include "unk_0201D670.h" #include "unk_0201E86C.h" #include "unk_020218BC.h" -#include "unk_02022594.h" #include "strbuf.h" #include "pokemon.h" #include "move_table.h" @@ -280,7 +279,7 @@ typedef struct { }; u16 unk_0C_val2[4]; }; - const UnkUnion_02022594 * unk_14; + const TouchScreenRect * unk_14; const int * unk_18; const u8 * unk_1C; int (* unk_20)(UnkStruct_ov16_02268A14 * param0, int param1); @@ -430,7 +429,7 @@ static const UnkStruct_ov97_0222DB78 Unk_ov16_02270540[] = { {0x0, 0x0, 0x800, 0x0, 0x1, GX_BG_COLORMODE_16, GX_BG_SCRBASE_0x7800, GX_BG_CHARBASE_0x00000, GX_BG_EXTPLTT_01, 0x0, 0x0, 0x0, 0x0} }; -static const UnkUnion_02022594 Unk_ov16_02270350[] = { +static const TouchScreenRect Unk_ov16_02270350[] = { {0x18, 0x90, 0x0, 0xFF}, {0x90, 0xC0, 0x0, 0x50}, {0x90, 0xC0, 0xB0, 0xFF}, @@ -457,12 +456,12 @@ __attribute__((aligned(4))) static const u8 Unk_ov16_022701EC[2][3] = { {0x1, 0x3, 0x2} }; -static const UnkUnion_02022594 Unk_ov16_02270214[] = { +static const TouchScreenRect Unk_ov16_02270214[] = { {0x18, 0x90, 0x0, 0xFF}, {0xFF, 0x0, 0x0, 0x0} }; -static const UnkUnion_02022594 Unk_ov16_02270258[] = { +static const TouchScreenRect Unk_ov16_02270258[] = { {0x28, 0x80, 0x18, 0xE8}, {0x98, 0xC0, 0x58, 0xA8}, {0xFF, 0x0, 0x0, 0x0} @@ -483,7 +482,7 @@ __attribute__((aligned(4))) static const u8 Unk_ov16_022701CC[2][1] = { {0x1} }; -static const UnkUnion_02022594 Unk_ov16_0227038C[] = { +static const TouchScreenRect Unk_ov16_0227038C[] = { {0x98, 0xC0, 0x8, 0xF8}, {0x18, 0x50, 0x0, 0x80}, {0x18, 0x50, 0x80, 0xFF}, @@ -514,7 +513,7 @@ __attribute__((aligned(4))) static const u8 Unk_ov16_022701E4[3][2] = { {0x0, 0x0} }; -static const UnkUnion_02022594 Unk_ov16_0227024C[] = { +static const TouchScreenRect Unk_ov16_0227024C[] = { {0x28, 0x60, 0x8, 0xF8}, {0x70, 0xA8, 0x8, 0xF8}, {0xFF, 0x0, 0x0, 0x0} @@ -535,7 +534,7 @@ __attribute__((aligned(4))) static const u8 Unk_ov16_022701C8[2][1] = { {0x1} }; -static const UnkUnion_02022594 Unk_ov16_022703BC[] = { +static const TouchScreenRect Unk_ov16_022703BC[] = { {0x58, 0x90, 0x0, 0x78}, {0x8, 0x50, 0x88, 0xFF}, {0x58, 0x90, 0x88, 0xFF}, @@ -566,7 +565,7 @@ __attribute__((aligned(4))) static const u8 Unk_ov16_022701DC[3][2] = { {0x4, 0x4} }; -static const UnkUnion_02022594 Unk_ov16_02270204[] = { +static const TouchScreenRect Unk_ov16_02270204[] = { {0x98, 0xC0, 0x0, 0xFF}, {0xFF, 0x0, 0x0, 0x0} }; @@ -3834,7 +3833,7 @@ static int ov16_0226BEC0 (UnkStruct_ov16_02268A14 * param0, int param1) v0->unk_02 = v6->unk_00; v0->unk_01 = v6->unk_01; v4 = Unk_ov16_022701EC[v0->unk_01][v0->unk_02]; - ov16_0226DD9C(param0->unk_6B8, v2->unk_14[v4].val1.unk_02 + 8, v2->unk_14[v4].val1.unk_03 - 8, v2->unk_14[v4].val1.unk_00 + 8, v2->unk_14[v4].val1.unk_01 - 8, ((192 + 80) << FX32_SHIFT)); + ov16_0226DD9C(param0->unk_6B8, v2->unk_14[v4].rect.left + 8, v2->unk_14[v4].rect.right - 8, v2->unk_14[v4].rect.top + 8, v2->unk_14[v4].rect.bottom - 8, ((192 + 80) << FX32_SHIFT)); return 0xffffffff; } @@ -3874,13 +3873,13 @@ static int ov16_0226BEC0 (UnkStruct_ov16_02268A14 * param0, int param1) case PAD_KEY_LEFT: case PAD_KEY_RIGHT: v4 = Unk_ov16_022701EC[v0->unk_01][v0->unk_02]; - ov16_0226DD9C(param0->unk_6B8, v2->unk_14[v4].val1.unk_02 + 8, v2->unk_14[v4].val1.unk_03 - 8, v2->unk_14[v4].val1.unk_00 + 8, v2->unk_14[v4].val1.unk_01 - 8, ((192 + 80) << FX32_SHIFT)); + ov16_0226DD9C(param0->unk_6B8, v2->unk_14[v4].rect.left + 8, v2->unk_14[v4].rect.right - 8, v2->unk_14[v4].rect.top + 8, v2->unk_14[v4].rect.bottom - 8, ((192 + 80) << FX32_SHIFT)); break; case PAD_BUTTON_A: return Unk_ov16_022701EC[v0->unk_01][v0->unk_02]; case PAD_BUTTON_B: if (param0->unk_66F == 1) { - for (v3 = 0; v3 < v2->unk_14[v3].val1.unk_00 != 0xff; v3++) { + for (v3 = 0; v3 < v2->unk_14[v3].rect.top != 0xff; v3++) { if (4 == v2->unk_18[v3]) { return v3; } @@ -3929,7 +3928,7 @@ static int ov16_0226C100 (UnkStruct_ov16_02268A14 * param0, int param1) v0->unk_02 = 0; v0->unk_01 = 0; v4 = Unk_ov16_022701CC[v0->unk_01][v0->unk_02]; - ov16_0226DD9C(param0->unk_6B8, v2->unk_14[v4].val1.unk_02 + 8, v2->unk_14[v4].val1.unk_03 - 8, v2->unk_14[v4].val1.unk_00 + 8, v2->unk_14[v4].val1.unk_01 - 8, ((192 + 80) << FX32_SHIFT)); + ov16_0226DD9C(param0->unk_6B8, v2->unk_14[v4].rect.left + 8, v2->unk_14[v4].rect.right - 8, v2->unk_14[v4].rect.top + 8, v2->unk_14[v4].rect.bottom - 8, ((192 + 80) << FX32_SHIFT)); return 0xffffffff; } @@ -3941,7 +3940,7 @@ static int ov16_0226C100 (UnkStruct_ov16_02268A14 * param0, int param1) case PAD_KEY_LEFT: case PAD_KEY_RIGHT: v4 = Unk_ov16_022701CC[v0->unk_01][v0->unk_02]; - ov16_0226DD9C(param0->unk_6B8, v2->unk_14[v4].val1.unk_02 + 8, v2->unk_14[v4].val1.unk_03 - 8, v2->unk_14[v4].val1.unk_00 + 8, v2->unk_14[v4].val1.unk_01 - 8, ((192 + 80) << FX32_SHIFT)); + ov16_0226DD9C(param0->unk_6B8, v2->unk_14[v4].rect.left + 8, v2->unk_14[v4].rect.right - 8, v2->unk_14[v4].rect.top + 8, v2->unk_14[v4].rect.bottom - 8, ((192 + 80) << FX32_SHIFT)); break; case PAD_BUTTON_A: return Unk_ov16_022701CC[v0->unk_01][v0->unk_02]; @@ -3980,7 +3979,7 @@ static int ov16_0226C1F8 (UnkStruct_ov16_02268A14 * param0, int param1) v3 = Unk_ov16_022701E4[v0->unk_01][v0->unk_02]; } - ov16_0226DD9C(param0->unk_6B8, v2->unk_14[v3].val1.unk_02 + 8, v2->unk_14[v3].val1.unk_03 - 8, v2->unk_14[v3].val1.unk_00 + 8, v2->unk_14[v3].val1.unk_01 - 8, ((192 + 80) << FX32_SHIFT)); + ov16_0226DD9C(param0->unk_6B8, v2->unk_14[v3].rect.left + 8, v2->unk_14[v3].rect.right - 8, v2->unk_14[v3].rect.top + 8, v2->unk_14[v3].rect.bottom - 8, ((192 + 80) << FX32_SHIFT)); return 0xffffffff; } @@ -3993,12 +3992,12 @@ static int ov16_0226C1F8 (UnkStruct_ov16_02268A14 * param0, int param1) case PAD_KEY_LEFT: case PAD_KEY_RIGHT: v3 = Unk_ov16_022701E4[v0->unk_01][v0->unk_02]; - ov16_0226DD9C(param0->unk_6B8, v2->unk_14[v3].val1.unk_02 + 8, v2->unk_14[v3].val1.unk_03 - 8, v2->unk_14[v3].val1.unk_00 + 8, v2->unk_14[v3].val1.unk_01 - 8, ((192 + 80) << FX32_SHIFT)); + ov16_0226DD9C(param0->unk_6B8, v2->unk_14[v3].rect.left + 8, v2->unk_14[v3].rect.right - 8, v2->unk_14[v3].rect.top + 8, v2->unk_14[v3].rect.bottom - 8, ((192 + 80) << FX32_SHIFT)); break; case PAD_BUTTON_A: return Unk_ov16_022701E4[v0->unk_01][v0->unk_02]; case PAD_BUTTON_B: - for (v4 = 0; v4 < v2->unk_14[v4].val1.unk_00 != 0xff; v4++) { + for (v4 = 0; v4 < v2->unk_14[v4].rect.top != 0xff; v4++) { if (0xff == v2->unk_18[v4]) { return v4; } @@ -4089,20 +4088,20 @@ static int ov16_0226C3C8 (UnkStruct_ov16_02268A14 * param0, int param1) v12 = 2; if ((v7[5 - 2] == 1) && (v7[3 - 2] == 1)) { - v21 = v2->unk_14[3].val1.unk_02 + 8; - v22 = v2->unk_14[1].val1.unk_03 - 8; - v19 = v2->unk_14[3].val1.unk_00 + 8; - v20 = v2->unk_14[3].val1.unk_01 - 8; + v21 = v2->unk_14[3].rect.left + 8; + v22 = v2->unk_14[1].rect.right - 8; + v19 = v2->unk_14[3].rect.top + 8; + v20 = v2->unk_14[3].rect.bottom - 8; } else if ((v7[5 - 2] == 1) && (v7[3 - 2] == 0)) { - v21 = v2->unk_14[3].val1.unk_02 + 8; - v22 = v2->unk_14[3].val1.unk_03 - 8; - v19 = v2->unk_14[3].val1.unk_00 + 8; - v20 = v2->unk_14[3].val1.unk_01 - 8; + v21 = v2->unk_14[3].rect.left + 8; + v22 = v2->unk_14[3].rect.right - 8; + v19 = v2->unk_14[3].rect.top + 8; + v20 = v2->unk_14[3].rect.bottom - 8; } else if ((v7[5 - 2] == 0) && (v7[3 - 2] == 1)) { - v21 = v2->unk_14[1].val1.unk_02 + 8; - v22 = v2->unk_14[1].val1.unk_03 - 8; - v19 = v2->unk_14[1].val1.unk_00 + 8; - v20 = v2->unk_14[1].val1.unk_01 - 8; + v21 = v2->unk_14[1].rect.left + 8; + v22 = v2->unk_14[1].rect.right - 8; + v19 = v2->unk_14[1].rect.top + 8; + v20 = v2->unk_14[1].rect.bottom - 8; } else { v21 = -1; v22 = -1; @@ -4111,20 +4110,20 @@ static int ov16_0226C3C8 (UnkStruct_ov16_02268A14 * param0, int param1) } if ((v7[2 - 2] == 1) && (v7[4 - 2] == 1)) { - v25 = v2->unk_14[0].val1.unk_02 + 8; - v26 = v2->unk_14[2].val1.unk_03 - 8; - v23 = v2->unk_14[0].val1.unk_00 + 8; - v24 = v2->unk_14[0].val1.unk_01 - 8; + v25 = v2->unk_14[0].rect.left + 8; + v26 = v2->unk_14[2].rect.right - 8; + v23 = v2->unk_14[0].rect.top + 8; + v24 = v2->unk_14[0].rect.bottom - 8; } else if ((v7[2 - 2] == 1) && (v7[4 - 2] == 0)) { - v25 = v2->unk_14[0].val1.unk_02 + 8; - v26 = v2->unk_14[0].val1.unk_03 - 8; - v23 = v2->unk_14[0].val1.unk_00 + 8; - v24 = v2->unk_14[0].val1.unk_01 - 8; + v25 = v2->unk_14[0].rect.left + 8; + v26 = v2->unk_14[0].rect.right - 8; + v23 = v2->unk_14[0].rect.top + 8; + v24 = v2->unk_14[0].rect.bottom - 8; } else if ((v7[2 - 2] == 0) && (v7[4 - 2] == 1)) { - v25 = v2->unk_14[2].val1.unk_02 + 8; - v26 = v2->unk_14[2].val1.unk_03 - 8; - v23 = v2->unk_14[2].val1.unk_00 + 8; - v24 = v2->unk_14[2].val1.unk_01 - 8; + v25 = v2->unk_14[2].rect.left + 8; + v26 = v2->unk_14[2].rect.right - 8; + v23 = v2->unk_14[2].rect.top + 8; + v24 = v2->unk_14[2].rect.bottom - 8; } else { v25 = -1; v26 = -1; @@ -4208,7 +4207,7 @@ static int ov16_0226C3C8 (UnkStruct_ov16_02268A14 * param0, int param1) } v4 = Unk_ov16_022701DC[v0->unk_01][v0->unk_02]; - ov16_0226DD9C(param0->unk_6B8, v2->unk_14[v4].val1.unk_02 + 8, v2->unk_14[v4].val1.unk_03 - 8, v2->unk_14[v4].val1.unk_00 + 8, v2->unk_14[v4].val1.unk_01 - 8, ((192 + 80) << FX32_SHIFT)); + ov16_0226DD9C(param0->unk_6B8, v2->unk_14[v4].rect.left + 8, v2->unk_14[v4].rect.right - 8, v2->unk_14[v4].rect.top + 8, v2->unk_14[v4].rect.bottom - 8, ((192 + 80) << FX32_SHIFT)); } else { v0->unk_02 = 0; v0->unk_01 = 0; @@ -4242,7 +4241,7 @@ static int ov16_0226C3C8 (UnkStruct_ov16_02268A14 * param0, int param1) case PAD_KEY_RIGHT: if (v5 == 0) { v4 = Unk_ov16_022701DC[v0->unk_01][v0->unk_02]; - ov16_0226DD9C(param0->unk_6B8, v2->unk_14[v4].val1.unk_02 + 8, v2->unk_14[v4].val1.unk_03 - 8, v2->unk_14[v4].val1.unk_00 + 8, v2->unk_14[v4].val1.unk_01 - 8, ((192 + 80) << FX32_SHIFT)); + ov16_0226DD9C(param0->unk_6B8, v2->unk_14[v4].rect.left + 8, v2->unk_14[v4].rect.right - 8, v2->unk_14[v4].rect.top + 8, v2->unk_14[v4].rect.bottom - 8, ((192 + 80) << FX32_SHIFT)); } else { if (v0->unk_01 == 0) { if (((v27 == -1) && (v28 == -1)) || (v17 == -1)) { @@ -4259,7 +4258,7 @@ static int ov16_0226C3C8 (UnkStruct_ov16_02268A14 * param0, int param1) ov16_0226DE04(param0->unk_6B8); } } else { - ov16_0226DD9C(param0->unk_6B8, v2->unk_14[4].val1.unk_02 + 8, v2->unk_14[4].val1.unk_03 - 8, v2->unk_14[4].val1.unk_00 + 8, v2->unk_14[4].val1.unk_01 - 8, ((192 + 80) << FX32_SHIFT)); + ov16_0226DD9C(param0->unk_6B8, v2->unk_14[4].rect.left + 8, v2->unk_14[4].rect.right - 8, v2->unk_14[4].rect.top + 8, v2->unk_14[4].rect.bottom - 8, ((192 + 80) << FX32_SHIFT)); ov16_0226DE04(param0->unk_6B8); } } @@ -4328,7 +4327,7 @@ static int ov16_0226CA14 (UnkStruct_ov16_02268A14 * param0, int param1) if (param1 == 1) { v3 = Unk_ov16_022701C8[v0->unk_01][v0->unk_02]; - ov16_0226DD9C(param0->unk_6B8, v2->unk_14[v3].val1.unk_02 + 8, v2->unk_14[v3].val1.unk_03 - 8, v2->unk_14[v3].val1.unk_00 + 8, v2->unk_14[v3].val1.unk_01 - 8, ((192 + 80) << FX32_SHIFT)); + ov16_0226DD9C(param0->unk_6B8, v2->unk_14[v3].rect.left + 8, v2->unk_14[v3].rect.right - 8, v2->unk_14[v3].rect.top + 8, v2->unk_14[v3].rect.bottom - 8, ((192 + 80) << FX32_SHIFT)); return 0xffffffff; } @@ -4340,7 +4339,7 @@ static int ov16_0226CA14 (UnkStruct_ov16_02268A14 * param0, int param1) case PAD_KEY_LEFT: case PAD_KEY_RIGHT: v3 = Unk_ov16_022701C8[v0->unk_01][v0->unk_02]; - ov16_0226DD9C(param0->unk_6B8, v2->unk_14[v3].val1.unk_02 + 8, v2->unk_14[v3].val1.unk_03 - 8, v2->unk_14[v3].val1.unk_00 + 8, v2->unk_14[v3].val1.unk_01 - 8, ((192 + 80) << FX32_SHIFT)); + ov16_0226DD9C(param0->unk_6B8, v2->unk_14[v3].rect.left + 8, v2->unk_14[v3].rect.right - 8, v2->unk_14[v3].rect.top + 8, v2->unk_14[v3].rect.bottom - 8, ((192 + 80) << FX32_SHIFT)); break; case PAD_BUTTON_A: v3 = Unk_ov16_022701C8[v0->unk_01][v0->unk_02]; diff --git a/src/overlay013/ov13_0221FC20.c b/src/overlay013/ov13_0221FC20.c index 539632d60e..27df2c445f 100644 --- a/src/overlay013/ov13_0221FC20.c +++ b/src/overlay013/ov13_0221FC20.c @@ -8,7 +8,7 @@ #include "struct_decls/sys_task.h" #include "struct_decls/battle_system.h" -#include "struct_defs/union_02022594_020225E0.h" +#include "unk_02022594.h" #include "overlay013/struct_ov13_0221FC20.h" #include "overlay013/struct_ov13_022213F0.h" #include "overlay013/struct_ov13_02221ED0.h" @@ -32,7 +32,6 @@ #include "unk_0201CCF0.h" #include "unk_0201D670.h" #include "gx_layers.h" -#include "unk_02022594.h" #include "strbuf.h" #include "pokemon.h" #include "move_table.h" @@ -89,7 +88,7 @@ static u8 ov13_022212C4(UnkStruct_ov13_022213F0 * param0); static u8 ov13_0222130C(UnkStruct_ov13_022213F0 * param0); static u8 ov13_0222139C(UnkStruct_ov13_022213F0 * param0); static u8 ov13_02221354(UnkStruct_ov13_022213F0 * param0); -static int ov13_022213E4(UnkStruct_ov13_022213F0 * param0, const UnkUnion_02022594 * param1); +static int ov13_022213E4(UnkStruct_ov13_022213F0 * param0, const TouchScreenRect *rect); static void ov13_022216C0(UnkStruct_ov13_022213F0 * param0, u8 param1); static void ov13_02221738(UnkStruct_ov13_022213F0 * param0, u8 param1); static u8 ov13_022217A4(UnkStruct_ov13_022213F0 * param0); @@ -103,7 +102,7 @@ static void ov13_02221A3C(UnkStruct_ov13_022213F0 * param0); static u8 ov13_0222194C(UnkStruct_ov13_022213F0 * param0); static void ov13_02221A54(BattleSystem * param0, u16 param1, u16 param2, u32 param3); -static const UnkUnion_02022594 Unk_ov13_02228DEC[] = { +static const TouchScreenRect Unk_ov13_02228DEC[] = { {0x0, 0x2F, 0x0, 0x7F}, {0x8, 0x37, 0x80, 0xFF}, {0x30, 0x5F, 0x0, 0x7F}, @@ -114,7 +113,7 @@ static const UnkUnion_02022594 Unk_ov13_02228DEC[] = { {0xFF, 0x0, 0x0, 0x0} }; -static const UnkUnion_02022594 Unk_ov13_02228D24[] = { +static const TouchScreenRect Unk_ov13_02228D24[] = { {0x8, 0x8F, 0x8, 0xF7}, {0x98, 0xBF, 0x0, 0x67}, {0x98, 0xBF, 0x68, 0xCF}, @@ -122,7 +121,7 @@ static const UnkUnion_02022594 Unk_ov13_02228D24[] = { {0xFF, 0x0, 0x0, 0x0} }; -static const UnkUnion_02022594 Unk_ov13_02228D38[] = { +static const TouchScreenRect Unk_ov13_02228D38[] = { {0x98, 0xBF, 0x0, 0x27}, {0x98, 0xBF, 0x28, 0x4F}, {0x98, 0xBF, 0x60, 0xC7}, @@ -130,7 +129,7 @@ static const UnkUnion_02022594 Unk_ov13_02228D38[] = { {0xFF, 0x0, 0x0, 0x0} }; -static const UnkUnion_02022594 Unk_ov13_02228E2C[] = { +static const TouchScreenRect Unk_ov13_02228E2C[] = { {0x30, 0x5F, 0x0, 0x7F}, {0x30, 0x5F, 0x80, 0xFF}, {0x60, 0x8F, 0x0, 0x7F}, @@ -142,7 +141,7 @@ static const UnkUnion_02022594 Unk_ov13_02228E2C[] = { {0xFF, 0x0, 0x0, 0x0} }; -static const UnkUnion_02022594 Unk_ov13_02228D4C[] = { +static const TouchScreenRect Unk_ov13_02228D4C[] = { {0x98, 0xA7, 0x58, 0x7F}, {0x98, 0xA7, 0x80, 0xA7}, {0xA8, 0xB7, 0x58, 0x7F}, @@ -151,7 +150,7 @@ static const UnkUnion_02022594 Unk_ov13_02228D4C[] = { {0xFF, 0x0, 0x0, 0x0} }; -static const UnkUnion_02022594 Unk_ov13_02228E0C[] = { +static const TouchScreenRect Unk_ov13_02228E0C[] = { {0x30, 0x5F, 0x0, 0x7F}, {0x30, 0x5F, 0x80, 0xFF}, {0x60, 0x8F, 0x0, 0x7F}, @@ -162,14 +161,14 @@ static const UnkUnion_02022594 Unk_ov13_02228E0C[] = { {0xFF, 0x0, 0x0, 0x0} }; -static const UnkUnion_02022594 Unk_ov13_02228D14[] = { +static const TouchScreenRect Unk_ov13_02228D14[] = { {0x98, 0xBF, 0x0, 0xCF}, {0x0, 0x27, 0xB8, 0xFF}, {0x98, 0xBF, 0xD8, 0xFF}, {0xFF, 0x0, 0x0, 0x0} }; -static const UnkUnion_02022594 Unk_ov13_02228D64[] = { +static const TouchScreenRect Unk_ov13_02228D64[] = { {0x30, 0x5F, 0x0, 0x7F}, {0x30, 0x5F, 0x80, 0xFF}, {0x60, 0x8F, 0x0, 0x7F}, @@ -1376,9 +1375,9 @@ static u8 ov13_0222139C (UnkStruct_ov13_022213F0 * param0) return (u8)v0; } -static int ov13_022213E4 (UnkStruct_ov13_022213F0 * param0, const UnkUnion_02022594 * param1) +static int ov13_022213E4 (UnkStruct_ov13_022213F0 * param0, const TouchScreenRect *rect) { - int v0 = sub_02022664(param1); + int v0 = sub_02022664(rect); return v0; } diff --git a/src/overlay013/ov13_022264F4.c b/src/overlay013/ov13_022264F4.c index 9833d42338..51da6afc58 100644 --- a/src/overlay013/ov13_022264F4.c +++ b/src/overlay013/ov13_022264F4.c @@ -14,7 +14,7 @@ #include "struct_decls/battle_system.h" #include "struct_decls/struct_0207D99C_decl.h" -#include "struct_defs/union_02022594_020225E0.h" +#include "unk_02022594.h" #include "overlay013/struct_ov13_022264F4.h" #include "overlay013/struct_ov13_02227244.h" #include "overlay084/struct_ov84_0223BA5C.h" @@ -36,7 +36,6 @@ #include "unk_0201CCF0.h" #include "unk_0201D670.h" #include "gx_layers.h" -#include "unk_02022594.h" #include "strbuf.h" #include "pokemon.h" #include "unk_020797C8.h" @@ -77,10 +76,10 @@ static void ov13_022270F8(UnkStruct_ov13_02227244 * param0); static u8 ov13_02226A5C(UnkStruct_ov13_02227244 * param0); static void ov13_02227118(UnkStruct_ov13_02227244 * param0, u8 param1); static void ov13_022271D0(UnkStruct_ov13_02227244 * param0, u8 param1); -static int ov13_02227238(UnkStruct_ov13_02227244 * param0, const UnkUnion_02022594 * param1); +static int ov13_02227238(UnkStruct_ov13_02227244 * param0, const TouchScreenRect *rect); static void ov13_02227260(BattleSystem * param0, u16 param1, u16 param2, u32 param3); -static const UnkUnion_02022594 Unk_ov13_02229A1C[] = { +static const TouchScreenRect Unk_ov13_02229A1C[] = { {0x8, 0x4F, 0x0, 0x7F}, {0x50, 0x97, 0x0, 0x7F}, {0x8, 0x4F, 0x80, 0xFF}, @@ -90,7 +89,7 @@ static const UnkUnion_02022594 Unk_ov13_02229A1C[] = { {0xFF, 0x0, 0x0, 0x0} }; -static const UnkUnion_02022594 Unk_ov13_02229A38[] = { +static const TouchScreenRect Unk_ov13_02229A38[] = { {0x8, 0x37, 0x0, 0x7F}, {0x8, 0x37, 0x80, 0xFF}, {0x38, 0x67, 0x0, 0x7F}, @@ -103,7 +102,7 @@ static const UnkUnion_02022594 Unk_ov13_02229A38[] = { {0xFF, 0x0, 0x0, 0x0} }; -static const UnkUnion_02022594 Unk_ov13_022299AC[] = { +static const TouchScreenRect Unk_ov13_022299AC[] = { {0x98, 0xBF, 0x0, 0xCF}, {0x98, 0xBF, 0xD8, 0xFF}, {0xFF, 0x0, 0x0, 0x0} @@ -827,9 +826,9 @@ static void ov13_022271D0 (UnkStruct_ov13_02227244 * param0, u8 param1) ov13_02227E68(param0, param0->unk_114C); } -static int ov13_02227238 (UnkStruct_ov13_02227244 * param0, const UnkUnion_02022594 * param1) +static int ov13_02227238 (UnkStruct_ov13_02227244 * param0, const TouchScreenRect *rect) { - int v0 = sub_02022664(param1); + int v0 = sub_02022664(rect); return v0; } diff --git a/src/overlay017/ov17_0223F7E4.c b/src/overlay017/ov17_0223F7E4.c index 59d1e45037..90199ef08c 100644 --- a/src/overlay017/ov17_0223F7E4.c +++ b/src/overlay017/ov17_0223F7E4.c @@ -19,7 +19,7 @@ #include "struct_defs/struct_020127E8.h" #include "functypes/sys_task_func.h" #include "struct_defs/sprite_manager_allocation.h" -#include "struct_defs/union_02022594_020225E0.h" +#include "unk_02022594.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02095C48.h" #include "overlay017/struct_ov17_0223F88C.h" @@ -41,7 +41,6 @@ #include "unk_02018340.h" #include "unk_0201D670.h" #include "unk_0201E86C.h" -#include "unk_02022594.h" #include "strbuf.h" #include "pokemon.h" #include "move_table.h" @@ -173,7 +172,7 @@ typedef struct { }; u16 unk_0C_val2[4]; }; - const UnkUnion_02022594 * unk_14; + const TouchScreenRect * unk_14; const int * unk_18; const u8 * unk_1C; int (* unk_20)(UnkStruct_ov17_0223F7E4 * param0, int param1); @@ -364,7 +363,7 @@ static const UnkStruct_ov97_0222DB78 Unk_ov17_02253448[] = { {0x0, 0x0, 0x800, 0x0, 0x1, GX_BG_COLORMODE_16, GX_BG_SCRBASE_0x7800, GX_BG_CHARBASE_0x00000, GX_BG_EXTPLTT_01, 0x0, 0x0, 0x0, 0x0} }; -static const UnkUnion_02022594 Unk_ov17_022532D0[] = { +static const TouchScreenRect Unk_ov17_022532D0[] = { {0x8, 0x60, 0x8, 0x78}, {0x8, 0x60, 0x88, 0xF8}, {0x68, 0xC0, 0x8, 0x78}, @@ -391,7 +390,7 @@ __attribute__((aligned(4))) static const u8 Unk_ov17_0225323C[2][2] = { {0x2, 0x3} }; -static const UnkUnion_02022594 Unk_ov17_022532A8[] = { +static const TouchScreenRect Unk_ov17_022532A8[] = { {0x8, 0x80, 0x0, 0x50}, {0x8, 0x80, 0x58, 0xA8}, {0x8, 0x80, 0xB0, 0xFF}, @@ -1588,7 +1587,7 @@ static int ov17_02240D04 (UnkStruct_ov17_0223F7E4 * param0, int param1) v3 = Unk_ov17_0225323C[v0->unk_01][v0->unk_02]; } - ov17_02252C78(param0->unk_2FC, v2->unk_14[v3].val1.unk_02 + 8, v2->unk_14[v3].val1.unk_03 - 8, v2->unk_14[v3].val1.unk_00 + 8, v2->unk_14[v3].val1.unk_01 - 8, (((192 + 80) << FX32_SHIFT))); + ov17_02252C78(param0->unk_2FC, v2->unk_14[v3].rect.left + 8, v2->unk_14[v3].rect.right - 8, v2->unk_14[v3].rect.top + 8, v2->unk_14[v3].rect.bottom - 8, (((192 + 80) << FX32_SHIFT))); return 0xffffffff; } @@ -1602,7 +1601,7 @@ static int ov17_02240D04 (UnkStruct_ov17_0223F7E4 * param0, int param1) case PAD_KEY_LEFT: case PAD_KEY_RIGHT: v3 = Unk_ov17_0225323C[v0->unk_01][v0->unk_02]; - ov17_02252C78(param0->unk_2FC, v2->unk_14[v3].val1.unk_02 + 8, v2->unk_14[v3].val1.unk_03 - 8, v2->unk_14[v3].val1.unk_00 + 8, v2->unk_14[v3].val1.unk_01 - 8, (((192 + 80) << FX32_SHIFT))); + ov17_02252C78(param0->unk_2FC, v2->unk_14[v3].rect.left + 8, v2->unk_14[v3].rect.right - 8, v2->unk_14[v3].rect.top + 8, v2->unk_14[v3].rect.bottom - 8, (((192 + 80) << FX32_SHIFT))); break; case PAD_BUTTON_A: return Unk_ov17_0225323C[v0->unk_01][v0->unk_02]; @@ -1648,7 +1647,7 @@ static int ov17_02240EA4 (UnkStruct_ov17_0223F7E4 * param0, int param1) v0->unk_02 = v6->unk_02; v0->unk_01 = v6->unk_03; v3 = Unk_ov17_02253240[v0->unk_01][v0->unk_02]; - ov17_02252C78(param0->unk_2FC, v2->unk_14[v3].val1.unk_02 + 8, v2->unk_14[v3].val1.unk_03 - 8, v2->unk_14[v3].val1.unk_00 + 8, v2->unk_14[v3].val1.unk_01 - 8, (((192 + 80) << FX32_SHIFT))); + ov17_02252C78(param0->unk_2FC, v2->unk_14[v3].rect.left + 8, v2->unk_14[v3].rect.right - 8, v2->unk_14[v3].rect.top + 8, v2->unk_14[v3].rect.bottom - 8, (((192 + 80) << FX32_SHIFT))); return 0xffffffff; } @@ -1661,7 +1660,7 @@ static int ov17_02240EA4 (UnkStruct_ov17_0223F7E4 * param0, int param1) case PAD_KEY_LEFT: case PAD_KEY_RIGHT: v3 = Unk_ov17_02253240[v0->unk_01][v0->unk_02]; - ov17_02252C78(param0->unk_2FC, v2->unk_14[v3].val1.unk_02 + 8, v2->unk_14[v3].val1.unk_03 - 8, v2->unk_14[v3].val1.unk_00 + 8, v2->unk_14[v3].val1.unk_01 - 8, (((192 + 80) << FX32_SHIFT))); + ov17_02252C78(param0->unk_2FC, v2->unk_14[v3].rect.left + 8, v2->unk_14[v3].rect.right - 8, v2->unk_14[v3].rect.top + 8, v2->unk_14[v3].rect.bottom - 8, (((192 + 80) << FX32_SHIFT))); break; case PAD_BUTTON_A: return Unk_ov17_02253240[v0->unk_01][v0->unk_02]; diff --git a/src/overlay017/ov17_022492DC.c b/src/overlay017/ov17_022492DC.c index a0779d3f0c..2972c58b09 100644 --- a/src/overlay017/ov17_022492DC.c +++ b/src/overlay017/ov17_022492DC.c @@ -16,7 +16,7 @@ #include "struct_defs/struct_020127E8.h" #include "functypes/sys_task_func.h" #include "struct_defs/sprite_manager_allocation.h" -#include "struct_defs/union_02022594_020225E0.h" +#include "unk_02022594.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02095C48.h" #include "overlay017/struct_ov17_0224A1EC.h" @@ -33,7 +33,6 @@ #include "unk_02018340.h" #include "unk_0201D670.h" #include "unk_0201E86C.h" -#include "unk_02022594.h" #include "strbuf.h" #include "unk_02094EDC.h" #include "overlay017/ov17_022492DC.h" @@ -129,7 +128,7 @@ typedef struct { }; u16 unk_0C_val2[4]; }; - const UnkUnion_02022594 * unk_14; + const TouchScreenRect * unk_14; const int * unk_18; void (* unk_1C)(UnkStruct_ov17_022492DC * param0, int param1, int param2); int (* unk_20)(UnkStruct_ov17_022492DC * param0, int param1); @@ -221,7 +220,7 @@ static const UnkStruct_ov97_0222DB78 Unk_ov17_022545C0[] = { } }; -static const UnkUnion_02022594 Unk_ov17_02254564[] = { +static const TouchScreenRect Unk_ov17_02254564[] = { {0x0, 0x50, 0x58, 0xA8}, {0x60, 0xB0, 0x58, 0xA8}, {0x28, 0x78, 0x8, 0x58}, diff --git a/src/overlay019/ov19_021D0D80.c b/src/overlay019/ov19_021D0D80.c index c2bba889aa..94f8e20e66 100644 --- a/src/overlay019/ov19_021D0D80.c +++ b/src/overlay019/ov19_021D0D80.c @@ -24,7 +24,7 @@ #include "overlay084/const_ov84_02241130.h" #include "constdata/const_020F2DAC.h" -#include "struct_defs/union_02022594_020225E0.h" +#include "unk_02022594.h" #include "struct_defs/options.h" #include "struct_defs/struct_02042434.h" #include "struct_defs/struct_0208737C.h" @@ -72,20 +72,20 @@ FS_EXTERN_OVERLAY(overlay84); -static const UnkUnion_020225E0 Unk_ov19_021DFDF6[] = { +static const TouchScreenHitTable Unk_ov19_021DFDF6[] = { {0xFE, 0x0, 0xB8, 0x28}, {0xFE, 0xFF, 0xB8, 0x28}, {0xFF, 0x0, 0x0, 0x0} }; -static const UnkUnion_020225E0 Unk_ov19_021DFE02[] = { +static const TouchScreenHitTable Unk_ov19_021DFE02[] = { {0xFE, 0x0, 0xB8, 0x28}, {0xFE, 0xFF, 0xB8, 0x28}, {0xFE, 0x80, 0xB2, 0xC}, {0xFF, 0x0, 0x0, 0x0} }; -static const UnkUnion_020225E0 Unk_ov19_021DFE12[] = { +static const TouchScreenHitTable Unk_ov19_021DFE12[] = { {0xFE, 0x98, 0xA8, 0x10}, {0xFE, 0xA3, 0x86, 0x10}, {0xFE, 0xB8, 0x68, 0x10}, diff --git a/src/overlay019/ov19_021D603C.c b/src/overlay019/ov19_021D603C.c index 79c4f76f78..17aa10b55e 100644 --- a/src/overlay019/ov19_021D603C.c +++ b/src/overlay019/ov19_021D603C.c @@ -22,14 +22,14 @@ void ov19_021D603C (UnkStruct_ov19_021D6104 * param0, int param1, int param2, in param0->unk_18 = param2; param0->unk_04 = param1; param0->unk_08 = param2; - param0->unk_28.val2.unk_00 = 0xfe; - param0->unk_28.val2.unk_01 = param1; - param0->unk_28.val2.unk_02 = param2; - param0->unk_28.val2.unk_03 = param3; - param0->unk_2C.val2.unk_00 = 0xfe; - param0->unk_2C.val2.unk_01 = param1; - param0->unk_2C.val2.unk_02 = param2; - param0->unk_2C.val2.unk_03 = param4; + param0->unk_28.circle.code = TOUCHSCREEN_USE_CIRCLE; + param0->unk_28.circle.x = param1; + param0->unk_28.circle.y = param2; + param0->unk_28.circle.r = param3; + param0->unk_2C.circle.code = TOUCHSCREEN_USE_CIRCLE; + param0->unk_2C.circle.x = param1; + param0->unk_2C.circle.y = param2; + param0->unk_2C.circle.r = param4; if (param1 < 128) { param0->unk_24 = 1; @@ -42,7 +42,7 @@ int ov19_021D60A8 (UnkStruct_ov19_021D6104 * param0) { BOOL v0, v1; - if ((sub_02022734(¶m0->unk_2C) == 1) && (sub_02022734(¶m0->unk_28) == 0)) { + if ((TouchScreen_LocationHeld(¶m0->unk_2C) == 1) && (TouchScreen_LocationHeld(¶m0->unk_28) == 0)) { u32 v2, v3; v0 = 1; diff --git a/src/overlay020/ov20_021D0D80.c b/src/overlay020/ov20_021D0D80.c index fa37313aa7..7c6c373a86 100644 --- a/src/overlay020/ov20_021D0D80.c +++ b/src/overlay020/ov20_021D0D80.c @@ -10,7 +10,7 @@ #include "overlay020/struct_ov20_021D2128_decl.h" #include "struct_defs/sentence.h" -#include "struct_defs/union_02022594_020225E0.h" +#include "unk_02022594.h" #include "unk_020041CC.h" #include "unk_02005474.h" @@ -224,7 +224,7 @@ int ov20_021D0EA8 (OverlayManager * param0, int * param1) static UnkStruct_ov20_021D16E8 * ov20_021D0EC8 (OverlayManager * param0) { - static const UnkUnion_020225E0 v0[] = { + static const TouchScreenHitTable v0[] = { {24, 80, 24, 112}, {112, 168, 24, 112}, {40, 72, 176, 208}, diff --git a/src/overlay021/ov21_021D0D80.c b/src/overlay021/ov21_021D0D80.c index 7a52dbfa6c..9385a066e2 100644 --- a/src/overlay021/ov21_021D0D80.c +++ b/src/overlay021/ov21_021D0D80.c @@ -12,7 +12,7 @@ #include "overlay021/struct_ov21_021D423C_decl.h" #include "overlay021/struct_ov21_021D4C0C_decl.h" -#include "struct_defs/union_02022594_020225E0.h" +#include "unk_02022594.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02099F80.h" #include "overlay021/struct_ov21_021D0D80.h" @@ -606,12 +606,12 @@ void ov21_021D1524 (GraphicElementData * param0, UnkStruct_ov21_021D4CA0 * param } } -void ov21_021D154C (UnkUnion_020225E0 * param0, int param1, int param2, int param3, int param4) +void ov21_021D154C (TouchScreenHitTable *hitTable, int param1, int param2, int param3, int param4) { - param0->val1.unk_00 = param1; - param0->val1.unk_01 = param2; - param0->val1.unk_02 = param3; - param0->val1.unk_03 = param4; + hitTable->rect.top = param1; + hitTable->rect.bottom = param2; + hitTable->rect.left = param3; + hitTable->rect.right = param4; } void ov21_021D1558 (UnkStruct_ov21_021D157C * param0, BGL * param1, int param2, NNSG2dScreenData * param3, int param4, int param5, int param6, int param7, int param8) diff --git a/src/overlay021/ov21_021D76B0.c b/src/overlay021/ov21_021D76B0.c index fd1b2a3bfb..2374ecf803 100644 --- a/src/overlay021/ov21_021D76B0.c +++ b/src/overlay021/ov21_021D76B0.c @@ -10,7 +10,7 @@ #include "struct_decls/struct_02023FCC_decl.h" #include "overlay021/struct_ov21_021D0F60_decl.h" -#include "struct_defs/union_02022594_020225E0.h" +#include "unk_02022594.h" #include "struct_defs/struct_0205AA50.h" #include "overlay019/struct_ov19_021DA864.h" #include "overlay021/struct_ov21_021D13FC.h" @@ -59,7 +59,7 @@ typedef struct { typedef struct { UnkStruct_02023FCC * unk_00; void * unk_04; - UnkUnion_020225E0 * unk_08; + TouchScreenHitTable * unk_08; int unk_0C; int unk_10; int unk_14; @@ -392,7 +392,7 @@ static void ov21_021D7A64 (UnkStruct_ov21_021D7A64 * param0, UnkStruct_ov21_021D { UnkStruct_ov21_021D7B8C * v0; - param0->unk_08 = Heap_AllocFromHeap(param2, sizeof(UnkUnion_020225E0) * 7); + param0->unk_08 = Heap_AllocFromHeap(param2, sizeof(TouchScreenHitTable) * 7); ov21_021D154C(¶m0->unk_08[0], 40 - (48 / 2), 40 + (48 / 2), 48 - (96 / 2), 48 + (96 / 2)); ov21_021D154C(¶m0->unk_08[1], 88 - (48 / 2), 88 + (48 / 2), 48 - (96 / 2), 48 + (96 / 2)); @@ -400,10 +400,10 @@ static void ov21_021D7A64 (UnkStruct_ov21_021D7A64 * param0, UnkStruct_ov21_021D ov21_021D154C(¶m0->unk_08[3], 64 - (16 / 2), 64 + (16 / 2), 124 - (16 / 2), 124 + (16 / 2)); ov21_021D154C(¶m0->unk_08[4], 146 - (16 / 2), 146 + (16 / 2), 124 - (16 / 2), 124 + (16 / 2)); - param0->unk_08[5].val2.unk_00 = 0xfe; - param0->unk_08[5].val2.unk_01 = (128 + 120); - param0->unk_08[5].val2.unk_02 = (104 + -0); - param0->unk_08[5].val2.unk_03 = 104; + param0->unk_08[5].circle.code = TOUCHSCREEN_USE_CIRCLE; + param0->unk_08[5].circle.x = (128 + 120); + param0->unk_08[5].circle.y = (104 + -0); + param0->unk_08[5].circle.r = 104; ov21_021D154C(¶m0->unk_08[6], (8 - 8), (8 - 8) + 16, (124 - 8), (124 - 8) + 64); diff --git a/src/overlay021/ov21_021D94BC.c b/src/overlay021/ov21_021D94BC.c index 48326eedc2..9b184a4ae6 100644 --- a/src/overlay021/ov21_021D94BC.c +++ b/src/overlay021/ov21_021D94BC.c @@ -11,7 +11,7 @@ #include "overlay021/struct_ov21_021D4C0C_decl.h" #include "overlay021/struct_ov21_021D4EE4_decl.h" -#include "struct_defs/union_02022594_020225E0.h" +#include "unk_02022594.h" #include "struct_defs/struct_0205AA50.h" #include "overlay019/struct_ov19_021DA864.h" #include "overlay021/struct_ov21_021D13FC.h" @@ -66,9 +66,9 @@ typedef struct { typedef struct { UnkStruct_02023FCC * unk_00; - UnkUnion_020225E0 * unk_04; + TouchScreenHitTable * unk_04; UnkStruct_02023FCC * unk_08; - UnkUnion_020225E0 * unk_0C; + TouchScreenHitTable * unk_0C; UnkStruct_ov21_021D9D18 unk_10; UnkStruct_ov21_021D4EE4 * unk_18; UnkStruct_ov21_021D4FE4 * unk_1C; @@ -696,7 +696,7 @@ static void ov21_021D9BB0 (UnkStruct_ov21_021D9B24 * param0, UnkStruct_ov21_021D static void ov21_021D9BEC (UnkStruct_ov21_021D9B24 * param0, UnkStruct_ov21_021D95B8 * param1, int param2) { - param0->unk_04 = Heap_AllocFromHeap(param2, sizeof(UnkUnion_020225E0) * 6); + param0->unk_04 = Heap_AllocFromHeap(param2, sizeof(TouchScreenHitTable) * 6); ov21_021D154C(¶m0->unk_04[1], 48 - (32 / 2), 48 + (32 / 2), 224 - (64 / 2), 224 + (64 / 2)); ov21_021D154C(¶m0->unk_04[0], 16 - (32 / 2), 16 + (32 / 2), 212 - (48 / 2), 212 + (48 / 2)); @@ -803,7 +803,7 @@ static void ov21_021D9D78 (UnkStruct_ov21_021D9B24 * param0, UnkStruct_ov21_021D int v0, v1; int v2, v3; - param0->unk_0C = Heap_AllocFromHeap(param2, sizeof(UnkUnion_020225E0) * 6); + param0->unk_0C = Heap_AllocFromHeap(param2, sizeof(TouchScreenHitTable) * 6); for (v0 = 0; v0 < 3; v0++) { v3 = 48 + (v0 * (48 - 16)); @@ -886,7 +886,7 @@ static void ov21_021D9EB4 (UnkStruct_ov21_021D9B24 * param0, UnkStruct_ov21_021D int v0, v1; int v2, v3; - param0->unk_0C = Heap_AllocFromHeap(param2, sizeof(UnkUnion_020225E0) * 10); + param0->unk_0C = Heap_AllocFromHeap(param2, sizeof(TouchScreenHitTable) * 10); for (v0 = 0; v0 < 5; v0++) { v3 = 16 + (v0 * (48 - 16)); @@ -986,7 +986,7 @@ static void ov21_021DA018 (UnkStruct_ov21_021D9B24 * param0, UnkStruct_ov21_021D int v0, v1; int v2, v3; - param0->unk_0C = Heap_AllocFromHeap(param2, sizeof(UnkUnion_020225E0) * 11); + param0->unk_0C = Heap_AllocFromHeap(param2, sizeof(TouchScreenHitTable) * 11); for (v0 = 0; v0 < 5; v0++) { v3 = 16 + (v0 * (48 - 16)); @@ -1100,7 +1100,7 @@ static void ov21_021DA1C8 (UnkStruct_ov21_021D9B24 * param0, UnkStruct_ov21_021D int v0, v1; int v2, v3; - param0->unk_0C = Heap_AllocFromHeap(param2, sizeof(UnkUnion_020225E0) * 10); + param0->unk_0C = Heap_AllocFromHeap(param2, sizeof(TouchScreenHitTable) * 10); for (v0 = 0; v0 < 4; v0++) { v3 = 16 + (v0 * (48 - 16)); @@ -1219,7 +1219,7 @@ static void ov21_021DA38C (UnkStruct_ov21_021D9B24 * param0, UnkStruct_ov21_021D int v0, v1; int v2, v3; - param0->unk_0C = Heap_AllocFromHeap(param2, sizeof(UnkUnion_020225E0) * 15); + param0->unk_0C = Heap_AllocFromHeap(param2, sizeof(TouchScreenHitTable) * 15); for (v0 = 0; v0 < 5; v0++) { v3 = 16 + (v0 * (48 - 16)); diff --git a/src/overlay021/ov21_021DDD2C.c b/src/overlay021/ov21_021DDD2C.c index 6027913118..8e444d463a 100644 --- a/src/overlay021/ov21_021DDD2C.c +++ b/src/overlay021/ov21_021DDD2C.c @@ -9,7 +9,7 @@ #include "struct_decls/struct_02023FCC_decl.h" #include "overlay021/struct_ov21_021D0F60_decl.h" -#include "struct_defs/union_02022594_020225E0.h" +#include "unk_02022594.h" #include "overlay019/struct_ov19_021DA864.h" #include "overlay021/struct_ov21_021D13FC.h" #include "overlay021/struct_ov21_021D3320.h" @@ -58,7 +58,7 @@ typedef struct { int unk_08; int unk_0C; UnkStruct_02023FCC * unk_10; - UnkUnion_020225E0 * unk_14; + TouchScreenHitTable * unk_14; UnkStruct_ov21_021DDE4C_sub1 unk_18; int unk_20; BOOL unk_24; @@ -460,11 +460,11 @@ static void ov21_021DE2E0 (UnkStruct_ov21_021DDEC8 * param0) static void ov21_021DE2EC (UnkStruct_ov21_021DDE4C * param0, UnkStruct_ov21_021DDDA4 * param1, int param2) { - param0->unk_14 = Heap_AllocFromHeap(param2, sizeof(UnkUnion_020225E0) * 1); - param0->unk_14[0].val2.unk_00 = 0xfe; - param0->unk_14[0].val2.unk_01 = param0->unk_00; - param0->unk_14[0].val2.unk_02 = param0->unk_04; - param0->unk_14[0].val2.unk_03 = 32; + param0->unk_14 = Heap_AllocFromHeap(param2, sizeof(TouchScreenHitTable) * 1); + param0->unk_14[0].circle.code = TOUCHSCREEN_USE_CIRCLE; + param0->unk_14[0].circle.x = param0->unk_00; + param0->unk_14[0].circle.y = param0->unk_04; + param0->unk_14[0].circle.r = 32; param0->unk_18.unk_00 = param1; param0->unk_18.unk_04 = param0; param0->unk_10 = sub_02023FCC(param0->unk_14, 1, ov21_021DE44C, ¶m0->unk_18, param2); @@ -475,8 +475,8 @@ static void ov21_021DE334 (UnkStruct_ov21_021DDE4C * param0, UnkStruct_ov21_021D sub_0202404C(param0->unk_10); ov21_021DE3D0(param0, param1); - param0->unk_14[0].val2.unk_01 = param0->unk_00; - param0->unk_14[0].val2.unk_02 = param0->unk_04; + param0->unk_14[0].circle.x = param0->unk_00; + param0->unk_14[0].circle.y = param0->unk_04; } static void ov21_021DE358 (UnkStruct_ov21_021DDE4C * param0, UnkStruct_ov21_021DDDA4 * param1) diff --git a/src/overlay021/ov21_021E1924.c b/src/overlay021/ov21_021E1924.c index f76e048dca..4d3ac30d56 100644 --- a/src/overlay021/ov21_021E1924.c +++ b/src/overlay021/ov21_021E1924.c @@ -9,7 +9,7 @@ #include "struct_decls/struct_02023FCC_decl.h" #include "overlay021/struct_ov21_021D0F60_decl.h" -#include "struct_defs/union_02022594_020225E0.h" +#include "unk_02022594.h" #include "struct_defs/struct_0205AA50.h" #include "overlay019/struct_ov19_021DA864.h" #include "overlay021/struct_ov21_021D13FC.h" @@ -67,7 +67,7 @@ typedef struct { typedef struct { UnkStruct_02023FCC * unk_00; - UnkUnion_020225E0 * unk_04; + TouchScreenHitTable * unk_04; UnkStruct_ov21_021E1E8C unk_08; int unk_10; int unk_14[8]; @@ -433,7 +433,7 @@ static int ov21_021E1CB8 (void * param0, UnkStruct_ov21_021E6B20 * param1, const static void ov21_021E1D40 (UnkStruct_ov21_021E1E74 * param0, UnkStruct_ov21_021E1A7C * param1, int param2) { - param0->unk_04 = Heap_AllocFromHeap(param2, sizeof(UnkUnion_020225E0) * 8); + param0->unk_04 = Heap_AllocFromHeap(param2, sizeof(TouchScreenHitTable) * 8); ov21_021D154C(¶m0->unk_04[0], 132 - (40 / 2), 132 + (40 / 2), 128 - (160 / 2), 128 + (160 / 2)); ov21_021D154C(¶m0->unk_04[1], 76 - (40 / 2), 76 + (40 / 2), 128 - (160 / 2), 128 + (160 / 2)); diff --git a/src/overlay021/ov21_021E29DC.c b/src/overlay021/ov21_021E29DC.c index fea8254959..78f98ecf5d 100644 --- a/src/overlay021/ov21_021E29DC.c +++ b/src/overlay021/ov21_021E29DC.c @@ -10,7 +10,7 @@ #include "overlay021/struct_ov21_021D0F60_decl.h" #include "overlay021/struct_ov21_021D4EE4_decl.h" -#include "struct_defs/union_02022594_020225E0.h" +#include "unk_02022594.h" #include "struct_defs/struct_0205AA50.h" #include "overlay019/struct_ov19_021DA864.h" #include "overlay021/struct_ov21_021D13FC.h" @@ -101,7 +101,7 @@ typedef struct { typedef struct { UnkStruct_02023FCC * unk_00; - UnkUnion_020225E0 * unk_04; + TouchScreenHitTable * unk_04; UnkStruct_ov21_021E37CC unk_08; int unk_10; UnkStruct_ov21_021D4EE4 * unk_14; @@ -1046,7 +1046,7 @@ static int ov21_021E3604 (void * param0, UnkStruct_ov21_021E6B20 * param1, const static void ov21_021E3688 (UnkStruct_ov21_021E37B4 * param0, UnkStruct_ov21_021E342C * param1, int param2) { - param0->unk_04 = Heap_AllocFromHeap(param2, sizeof(UnkUnion_020225E0) * 6); + param0->unk_04 = Heap_AllocFromHeap(param2, sizeof(TouchScreenHitTable) * 6); ov21_021D154C(¶m0->unk_04[0], 24 - (32 / 2), 24 + (32 / 2), 28 - (40 / 2), 28 + (40 / 2)); ov21_021D154C(¶m0->unk_04[5], 24 - (32 / 2), 24 + (32 / 2), 228 - (40 / 2), 228 + (40 / 2)); diff --git a/src/overlay021/ov21_021E4CA4.c b/src/overlay021/ov21_021E4CA4.c index aaeaf66b5f..90505abefa 100644 --- a/src/overlay021/ov21_021E4CA4.c +++ b/src/overlay021/ov21_021E4CA4.c @@ -9,7 +9,7 @@ #include "struct_decls/struct_02023FCC_decl.h" #include "overlay021/struct_ov21_021D0F60_decl.h" -#include "struct_defs/union_02022594_020225E0.h" +#include "unk_02022594.h" #include "struct_defs/struct_0205AA50.h" #include "overlay019/struct_ov19_021DA864.h" #include "overlay021/struct_ov21_021D13FC.h" @@ -36,7 +36,6 @@ #include "unk_0201DBEC.h" #include "unk_0201F834.h" #include "unk_020218BC.h" -#include "unk_02022594.h" #include "unk_02023FCC.h" #include "overlay021/ov21_021D0D80.h" #include "overlay021/ov21_021D1FA4.h" @@ -63,9 +62,9 @@ typedef struct { typedef struct { UnkStruct_02023FCC * unk_00; - UnkUnion_020225E0 * unk_04; + TouchScreenHitTable * unk_04; UnkStruct_ov21_021E5228 unk_08; - UnkUnion_020225E0 * unk_10; + TouchScreenHitTable * unk_10; UnkStruct_02023FCC * unk_14; int unk_18[2]; BOOL unk_20; @@ -498,20 +497,20 @@ static BOOL ov21_021E50EC (UnkStruct_ov21_021E5004 * param0, UnkStruct_ov21_021E static void ov21_021E5128 (UnkStruct_ov21_021E51DC * param0, UnkStruct_ov21_021E4D90 * param1, int param2) { - param0->unk_04 = Heap_AllocFromHeap(param2, sizeof(UnkUnion_020225E0) * 3); - param0->unk_10 = Heap_AllocFromHeap(param2, sizeof(UnkUnion_020225E0) * 2); + param0->unk_04 = Heap_AllocFromHeap(param2, sizeof(TouchScreenHitTable) * 3); + param0->unk_10 = Heap_AllocFromHeap(param2, sizeof(TouchScreenHitTable) * 2); ov21_021D154C(¶m0->unk_04[0], 67 - 14, 67 + 14, 64 - 42, 64 + 42); - param0->unk_04[1].val2.unk_00 = 0xfe; - param0->unk_04[1].val2.unk_01 = 51; - param0->unk_04[1].val2.unk_02 = 157; - param0->unk_04[1].val2.unk_03 = 32; + param0->unk_04[1].circle.code = TOUCHSCREEN_USE_CIRCLE; + param0->unk_04[1].circle.x = 51; + param0->unk_04[1].circle.y = 157; + param0->unk_04[1].circle.r = 32; - param0->unk_04[2].val2.unk_00 = 0xfe; - param0->unk_04[2].val2.unk_01 = (131 - -48); - param0->unk_04[2].val2.unk_02 = (99 - -16) + 8; - param0->unk_04[2].val2.unk_03 = 72; + param0->unk_04[2].circle.code = TOUCHSCREEN_USE_CIRCLE; + param0->unk_04[2].circle.x = (131 - -48); + param0->unk_04[2].circle.y = (99 - -16) + 8; + param0->unk_04[2].circle.r = 72; ov21_021D154C(¶m0->unk_10[0], 131 - 24, 131 + 24, 180 - 24, 180 + 24); ov21_021D154C(¶m0->unk_10[1], 166 - 16, 166 + 16, 230 - 16, 230 + 16); @@ -645,8 +644,8 @@ static void ov21_021E530C (u32 param0, UnkStruct_ov21_021E4D90 * param1, UnkStru break; case 2: if (param2->unk_2C) { - param2->unk_20 = sub_02022734(¶m2->unk_10[0]); - param2->unk_20 |= sub_02022734(¶m2->unk_10[1]); + param2->unk_20 = TouchScreen_LocationHeld(¶m2->unk_10[0]); + param2->unk_20 |= TouchScreen_LocationHeld(¶m2->unk_10[1]); } else { param2->unk_20 = 1; } diff --git a/src/overlay021/ov21_021E68F4.c b/src/overlay021/ov21_021E68F4.c index e4d8c4c000..2968578b94 100644 --- a/src/overlay021/ov21_021E68F4.c +++ b/src/overlay021/ov21_021E68F4.c @@ -9,7 +9,7 @@ #include "struct_decls/struct_02023FCC_decl.h" #include "overlay021/struct_ov21_021D0F60_decl.h" -#include "struct_defs/union_02022594_020225E0.h" +#include "unk_02022594.h" #include "struct_defs/struct_0205AA50.h" #include "overlay019/struct_ov19_021DA864.h" #include "overlay021/struct_ov21_021D13FC.h" @@ -61,7 +61,7 @@ typedef struct { typedef struct { UnkStruct_02023FCC * unk_00; - UnkUnion_020225E0 * unk_04; + TouchScreenHitTable * unk_04; UnkStruct_ov21_021E6E04 unk_08; int unk_10[2]; } UnkStruct_ov21_021E6DAC; @@ -417,7 +417,7 @@ static BOOL ov21_021E6D1C (UnkStruct_ov21_021E6C60 * param0, UnkStruct_ov21_021E static void ov21_021E6D58 (UnkStruct_ov21_021E6DAC * param0, UnkStruct_ov21_021E6A20 * param1, int param2) { - param0->unk_04 = Heap_AllocFromHeap(param2, sizeof(UnkUnion_020225E0) * 2); + param0->unk_04 = Heap_AllocFromHeap(param2, sizeof(TouchScreenHitTable) * 2); ov21_021D154C(¶m0->unk_04[0], 120 - (112 / 2), 120 + (112 / 2), 68 - (120 / 2), 68 + (120 / 2)); ov21_021D154C(¶m0->unk_04[1], 120 - (112 / 2), 120 + (112 / 2), 188 - (120 / 2), 188 + (120 / 2)); diff --git a/src/overlay021/ov21_021E8484.c b/src/overlay021/ov21_021E8484.c index 6af764963f..2da9ebf404 100644 --- a/src/overlay021/ov21_021E8484.c +++ b/src/overlay021/ov21_021E8484.c @@ -9,7 +9,7 @@ #include "struct_decls/struct_02023FCC_decl.h" #include "overlay021/struct_ov21_021D0F60_decl.h" -#include "struct_defs/union_02022594_020225E0.h" +#include "unk_02022594.h" #include "struct_defs/struct_0205AA50.h" #include "overlay019/struct_ov19_021DA864.h" #include "overlay021/struct_ov21_021D13FC.h" @@ -60,7 +60,7 @@ typedef struct { typedef struct { UnkStruct_02023FCC * unk_00; - UnkUnion_020225E0 * unk_04; + TouchScreenHitTable * unk_04; UnkStruct_ov21_021E88E8 unk_08; int unk_10[1]; BOOL unk_14; @@ -405,7 +405,7 @@ static BOOL ov21_021E8830 (UnkStruct_ov21_021E8794 * param0, UnkStruct_ov21_021E static void ov21_021E886C (UnkStruct_ov21_021E88B0 * param0, UnkStruct_ov21_021E8570 * param1, int param2) { - param0->unk_04 = Heap_AllocFromHeap(param2, sizeof(UnkUnion_020225E0) * 1); + param0->unk_04 = Heap_AllocFromHeap(param2, sizeof(TouchScreenHitTable) * 1); ov21_021D154C(¶m0->unk_04[0], 144 - (80 / 2), 144 + (80 / 2), 128 - (240 / 2), 128 + (240 / 2)); diff --git a/src/overlay022/ov22_02254DE0.c b/src/overlay022/ov22_02254DE0.c index ef5411d580..d7d90056af 100644 --- a/src/overlay022/ov22_02254DE0.c +++ b/src/overlay022/ov22_02254DE0.c @@ -5,7 +5,7 @@ #include "struct_decls/struct_02015214_decl.h" -#include "struct_defs/union_02022594_020225E0.h" +#include "unk_02022594.h" #include "overlay021/struct_ov21_021E7F40.h" #include "overlay022/struct_ov22_02254DE0.h" #include "overlay022/struct_ov22_0225500C.h" @@ -13,13 +13,12 @@ #include "unk_02015064.h" #include "heap.h" -#include "unk_02022594.h" #include "overlay022/ov22_02254DE0.h" #include "overlay022/ov22_02255094.h" static UnkStruct_ov22_02255040 * ov22_02254FE0(UnkStruct_ov22_02254DE0 * param0); static UnkStruct_02015214 * ov22_0225500C(UnkStruct_ov22_0225500C * param0); -static void ov22_02255040(UnkStruct_ov22_02255040 * param0, UnkUnion_020225E0 * param1); +static void ov22_02255040(UnkStruct_ov22_02255040 * param0, TouchScreenHitTable *hitTable); UnkStruct_ov22_02254DE0 * ov22_02254DE0 (int param0, int param1) { @@ -55,10 +54,10 @@ UnkStruct_ov22_02255040 * ov22_02254E20 (UnkStruct_ov22_0225500C * param0) BOOL ov22_02254E44 (UnkStruct_ov22_02255040 * param0) { - UnkUnion_020225E0 v0; + TouchScreenHitTable v0; ov22_02255040(param0, &v0); - return sub_02022734(&v0); + return TouchScreen_LocationHeld(&v0); } BOOL ov22_02254E54 (UnkStruct_ov22_02255040 * param0, int * param1, int * param2, NNSG2dCharacterData * param3) @@ -97,7 +96,7 @@ BOOL ov22_02254E54 (UnkStruct_ov22_02255040 * param0, int * param1, int * param2 BOOL ov22_02254EDC (UnkStruct_ov22_02255040 * param0, int param1, int param2) { - UnkUnion_020225E0 v0; + TouchScreenHitTable v0; ov22_02255040(param0, &v0); return sub_02022830(&v0, param1, param2); @@ -202,13 +201,13 @@ static UnkStruct_02015214 * ov22_0225500C (UnkStruct_ov22_0225500C * param0) return sub_02015214(&v0); } -static void ov22_02255040 (UnkStruct_ov22_02255040 * param0, UnkUnion_020225E0 * param1) +static void ov22_02255040 (UnkStruct_ov22_02255040 * param0, TouchScreenHitTable *hitTable) { NNSG2dSVec2 v0 = sub_0201525C(param0->unk_04); NNSG2dSVec2 v1 = sub_02015280(param0->unk_04); - param1->val1.unk_00 = v0.y; - param1->val1.unk_01 = v0.y + v1.y; - param1->val1.unk_02 = v0.x; - param1->val1.unk_03 = v0.x + v1.x; + hitTable->rect.top = v0.y; + hitTable->rect.bottom = v0.y + v1.y; + hitTable->rect.left = v0.x; + hitTable->rect.right = v0.x + v1.x; } diff --git a/src/overlay022/ov22_022578F4.c b/src/overlay022/ov22_022578F4.c index 0963ffdc2b..880fc0b634 100644 --- a/src/overlay022/ov22_022578F4.c +++ b/src/overlay022/ov22_022578F4.c @@ -4,7 +4,7 @@ #include "pokemon.h" #include "struct_defs/archived_sprite.h" -#include "struct_defs/union_02022594_020225E0.h" +#include "unk_02022594.h" #include "struct_defs/struct_020298D8.h" #include "overlay022/struct_ov22_0225500C.h" #include "overlay022/struct_ov22_02255040.h" @@ -15,7 +15,6 @@ #include "unk_0200762C.h" #include "unk_02015064.h" -#include "unk_02022594.h" #include "overlay022/ov22_02254DE0.h" #include "overlay022/ov22_02255D44.h" #include "overlay022/ov22_022578F4.h" @@ -248,24 +247,24 @@ void ov22_02257B74 (UnkStruct_ov22_02257964 * param0, int param1) BOOL ov22_02257BE8 (UnkStruct_ov22_02257964 * param0) { - UnkUnion_020225E0 v0; + TouchScreenHitTable v0; - v0.val1.unk_00 = (16 + 2); - v0.val1.unk_01 = (16 + 2) + (129 - (2 * 2)); - v0.val1.unk_02 = (136 + 2); - v0.val1.unk_03 = (136 + 2) + (112 - (2 * 2)); + v0.rect.top = (16 + 2); + v0.rect.bottom = (16 + 2) + (129 - (2 * 2)); + v0.rect.left = (136 + 2); + v0.rect.right = (136 + 2) + (112 - (2 * 2)); - return sub_02022734(&v0); + return TouchScreen_LocationHeld(&v0); } BOOL ov22_02257C04 (UnkStruct_ov22_02257964 * param0, int param1, int param2) { - UnkUnion_020225E0 v0; + TouchScreenHitTable v0; - v0.val1.unk_00 = (16 + 2); - v0.val1.unk_01 = (16 + 2) + (129 - (2 * 2)); - v0.val1.unk_02 = (136 + 2); - v0.val1.unk_03 = (136 + 2) + (112 - (2 * 2)); + v0.rect.top = (16 + 2); + v0.rect.bottom = (16 + 2) + (129 - (2 * 2)); + v0.rect.left = (136 + 2); + v0.rect.right = (136 + 2) + (112 - (2 * 2)); return sub_02022830(&v0, param1, param2); } diff --git a/src/overlay022/ov22_02257F50.c b/src/overlay022/ov22_02257F50.c index 2489d8e300..e7fc431960 100644 --- a/src/overlay022/ov22_02257F50.c +++ b/src/overlay022/ov22_02257F50.c @@ -3,7 +3,7 @@ #include "struct_decls/sys_task.h" -#include "struct_defs/union_02022594_020225E0.h" +#include "unk_02022594.h" #include "overlay022/struct_ov22_0225500C.h" #include "overlay022/struct_ov22_02255040.h" #include "overlay022/struct_ov22_02257F50.h" @@ -17,7 +17,6 @@ #include "heap.h" #include "unk_0201CCF0.h" #include "unk_0201D15C.h" -#include "unk_02022594.h" #include "overlay022/ov22_02254DE0.h" #include "overlay022/ov22_02257F50.h" #include "overlay022/ov22_0225894C.h" @@ -318,24 +317,24 @@ void ov22_022582C0 (UnkStruct_ov22_02257F50 * param0, int param1, int param2) BOOL ov22_022582E8 (UnkStruct_ov22_02257F50 * param0) { - UnkUnion_020225E0 v0; + TouchScreenHitTable v0; - v0.val1.unk_00 = (16 + 2); - v0.val1.unk_01 = (16 + 2) + (129 - (2 * 2)); - v0.val1.unk_02 = (8 + 2); - v0.val1.unk_03 = (8 + 2) + (112 - (2 * 2)); + v0.rect.top = (16 + 2); + v0.rect.bottom = (16 + 2) + (129 - (2 * 2)); + v0.rect.left = (8 + 2); + v0.rect.right = (8 + 2) + (112 - (2 * 2)); - return sub_02022734(&v0); + return TouchScreen_LocationHeld(&v0); } BOOL ov22_02258304 (UnkStruct_ov22_02257F50 * param0, int param1, int param2) { - UnkUnion_020225E0 v0; + TouchScreenHitTable v0; - v0.val1.unk_00 = (16 + 2); - v0.val1.unk_01 = (16 + 2) + (129 - (2 * 2)); - v0.val1.unk_02 = (8 + 2); - v0.val1.unk_03 = (8 + 2) + (112 - (2 * 2)); + v0.rect.top = (16 + 2); + v0.rect.bottom = (16 + 2) + (129 - (2 * 2)); + v0.rect.left = (8 + 2); + v0.rect.right = (8 + 2) + (112 - (2 * 2)); return sub_02022830(&v0, param1, param2); } diff --git a/src/overlay022/ov22_02259098.c b/src/overlay022/ov22_02259098.c index 9137ebf4c6..3a80b48082 100644 --- a/src/overlay022/ov22_02259098.c +++ b/src/overlay022/ov22_02259098.c @@ -7,7 +7,7 @@ #include "pokemon.h" #include "struct_defs/archived_sprite.h" -#include "struct_defs/union_02022594_020225E0.h" +#include "unk_02022594.h" #include "struct_defs/struct_020298D8.h" #include "overlay022/struct_ov22_022596B0.h" #include "overlay022/struct_ov22_0225A0E4.h" @@ -15,13 +15,12 @@ #include "unk_02006E3C.h" #include "unk_0200762C.h" #include "heap.h" -#include "unk_02022594.h" #include "pokemon.h" #include "overlay022/ov22_02255094.h" #include "overlay022/ov22_02259098.h" static int ov22_0225936C(char * param0, int param1); -static void ov22_02259448(UnkUnion_02022594 * param0, int param1, int param2, int param3, int param4); +static void ov22_02259448(TouchScreenRect *rect, int param1, int param2, int param3, int param4); static void ov22_022593B8(char * param0, int param1, int param2, UnkStruct_ov22_022596B0 * param3); void ov22_02259098 (UnkStruct_ov22_0225A0E4 * param0, ArchivedSprite * param1) @@ -55,10 +54,10 @@ void ov22_022590D4 (UnkStruct_020298D8 * param0, UnkStruct_02007768 * param1, Po v1 /= 2; v2 /= 2; - param0->unk_04.val1.unk_00 = 56 - v2; - param0->unk_04.val1.unk_01 = 56 + v2; - param0->unk_04.val1.unk_02 = 192 - v1; - param0->unk_04.val1.unk_03 = 192 + v1; + param0->unk_04.rect.top = 56 - v2; + param0->unk_04.rect.bottom = 56 + v2; + param0->unk_04.rect.left = 192 - v1; + param0->unk_04.rect.right = 192 + v1; ov22_02259448(¶m0->unk_04, 192, 56, v1, v2); } @@ -120,7 +119,7 @@ void ov22_022591EC (UnkStruct_020298D8 * param0, int param1, int param2) BOOL ov22_02259238 (UnkStruct_020298D8 * param0) { - return sub_02022734(¶m0->unk_04); + return TouchScreen_LocationHeld(¶m0->unk_04); } BOOL ov22_02259244 (UnkStruct_020298D8 * param0, int param1, int param2) @@ -266,29 +265,29 @@ static void ov22_022593B8 (char * param0, int param1, int param2, UnkStruct_ov22 } } -static void ov22_02259448 (UnkUnion_02022594 * param0, int param1, int param2, int param3, int param4) +static void ov22_02259448 (TouchScreenRect *rect, int param1, int param2, int param3, int param4) { if ((param2 - param4) >= 0) { - param0->val1.unk_00 = param2 - param4; + rect->rect.top = param2 - param4; } else { - param0->val1.unk_00 = 0; + rect->rect.top = 0; } if ((param2 + param4) <= 191) { - param0->val1.unk_01 = param2 + param4; + rect->rect.bottom = param2 + param4; } else { - param0->val1.unk_01 = 191; + rect->rect.bottom = 191; } if ((param1 - param3) >= 0) { - param0->val1.unk_02 = param1 - param3; + rect->rect.left = param1 - param3; } else { - param0->val1.unk_02 = 0; + rect->rect.left = 0; } if ((param1 + param3) <= 255) { - param0->val1.unk_03 = param1 + param3; + rect->rect.right = param1 + param3; } else { - param0->val1.unk_03 = 255; + rect->rect.right = 255; } } diff --git a/src/overlay022/ov22_02259C58.c b/src/overlay022/ov22_02259C58.c index a66547a7a9..02039abb0c 100644 --- a/src/overlay022/ov22_02259C58.c +++ b/src/overlay022/ov22_02259C58.c @@ -7,7 +7,7 @@ #include "strbuf.h" #include "struct_defs/struct_020127E8.h" -#include "struct_defs/union_02022594_020225E0.h" +#include "unk_02022594.h" #include "struct_defs/struct_0205AA50.h" #include "overlay019/struct_ov19_021DA864.h" #include "overlay022/struct_ov22_02259C58.h" @@ -41,7 +41,7 @@ static void ov22_02259D94(UnkStruct_ov22_02259C58 * param0, void * param1); static void ov22_0225A0E4(UnkStruct_ov22_02259C58 * param0, int param1, UnkStruct_ov22_0225A0E4 * param2, int param3, int param4, int param5, int param6); static void ov22_0225A154(UnkStruct_ov22_0225A154 * param0, int param1, UnkStruct_ov22_0225A0E4 * param2, const UnkStruct_02012744 * param3, const Window * param4, int param5, int param6, int param7, int param8); -static void ov22_0225A200(UnkUnion_020225E0 * param0, int param1, int param2, int param3, int param4, int param5); +static void ov22_0225A200(TouchScreenHitTable *hitTable, int param1, int param2, int param3, int param4, int param5); static void ov22_0225A218(UnkStruct_ov22_0225A0E4 * param0); static void ov22_0225A2A8(UnkStruct_ov22_0225A0E4 * param0); static Window * ov22_0225A348(UnkStruct_ov22_0225A0E4 * param0, u32 param1, u32 param2, u32 param3, int param4, int param5); @@ -441,12 +441,12 @@ asm static void ov22_0225A154 (UnkStruct_ov22_0225A154 * param0, int param1, Unk pop {r4, r5, r6, pc} } -static void ov22_0225A200 (UnkUnion_020225E0 * param0, int param1, int param2, int param3, int param4, int param5) +static void ov22_0225A200 (TouchScreenHitTable *hitTable, int param1, int param2, int param3, int param4, int param5) { - param0[param1].val1.unk_00 = param3; - param0[param1].val1.unk_02 = param2; - param0[param1].val1.unk_01 = param3 + param5; - param0[param1].val1.unk_03 = param2 + param4; + hitTable[param1].rect.top = param3; + hitTable[param1].rect.left = param2; + hitTable[param1].rect.bottom = param3 + param5; + hitTable[param1].rect.right = param2 + param4; } static void ov22_0225A218 (UnkStruct_ov22_0225A0E4 * param0) diff --git a/src/overlay025/poketch_button.c b/src/overlay025/poketch_button.c index 43675c8b1c..396971d4cd 100644 --- a/src/overlay025/poketch_button.c +++ b/src/overlay025/poketch_button.c @@ -3,257 +3,258 @@ #include "overlay025/poketch_button.h" -#include "struct_defs/union_02022594_020225E0.h" - -#include "heap.h" #include "unk_02022594.h" -static void ov25_02255C80(PoketchButton * param0); -static void ov25_02255CA0(PoketchButton * param0, u32 param1); -static void ov25_02255CA0(PoketchButton * param0, u32 param1); -static void ov25_02255CAC(PoketchButton * param0); -static u32 ov25_02255CC0(PoketchButton * param0); -static u32 ov25_02255CDC(PoketchButton * param0, BOOL param1, BOOL param2); -static u32 ov25_02255CF8(PoketchButton * param0, BOOL param1, BOOL param2); -static u32 ov25_02255D58(PoketchButton * param0, BOOL param1, BOOL param2); -static u32 ov25_02255D90(PoketchButton * param0, BOOL param1, BOOL param2); -static u32 ov25_02255DA8(PoketchButton * param0, BOOL param1, BOOL param2); +#include "heap.h" -PoketchButtonManager * ov25_02255ACC (const UnkUnion_020225E0 * param0, u32 param1, PoketchButtonCallback param2, void * param3, u32 param4) +static void PoketchButton_Init(PoketchButton *button); +static void PoketchButton_ChangeState(PoketchButton *button, u32 state); +static void PoketchButton_IncrementTimer(PoketchButton *button); +static u32 PoketchButton_CheckTimers(PoketchButton *button); +static u32 Button_OnIdle(PoketchButton *button, BOOL touched, BOOL tapped); +static u32 Button_OnPressed(PoketchButton *button, BOOL touched, BOOL tapped); +static u32 Button_OnCheckDoubleTap(PoketchButton *button, BOOL touched, BOOL tapped); +static u32 Button_OnDoubleTap(PoketchButton *button, BOOL touched, BOOL tapped); +static u32 Button_OnReset(PoketchButton *button, BOOL touched, BOOL tapped); + +PoketchButtonManager* PoketchButtonManager_Create(const TouchScreenHitTable *hitTable, u32 numButtons, PoketchButtonCallback callback, void *callbackData, u32 heapID) { - PoketchButtonManager * v0; + PoketchButtonManager *buttonManager; - GF_ASSERT(param1 > 0); + GF_ASSERT(numButtons > 0); - v0 = Heap_AllocFromHeap(param4, sizeof(PoketchButtonManager)); + buttonManager = Heap_AllocFromHeap(heapID, sizeof(PoketchButtonManager)); - if (v0) { - v0->unk_08 = param4; - v0->callback = param2; - v0->unk_00 = param0; - v0->unk_0C = param1; - v0->unk_10 = param3; - v0->button = Heap_AllocFromHeap(param4, sizeof(PoketchButton) * param1); + if (buttonManager) { + buttonManager->heapID = heapID; + buttonManager->callback = callback; + buttonManager->hitTable = hitTable; + buttonManager->numButtons = numButtons; + buttonManager->buttonCallbackData = callbackData; + buttonManager->buttons = Heap_AllocFromHeap(heapID, sizeof(PoketchButton) * numButtons); - if (v0->button) { - u32 v1; - - for (v1 = 0; v1 < param1; v1++) { - ov25_02255C80(&v0->button[v1]); + if (buttonManager->buttons) { + for (u32 i = 0; i < numButtons; i++) { + PoketchButton_Init(&buttonManager->buttons[i]); } } else { - Heap_FreeToHeapExplicit(param4, v0); - v0 = NULL; + Heap_FreeToHeapExplicit(heapID, buttonManager); + buttonManager = NULL; } } - return v0; + return buttonManager; } -void ov25_02255B34 (PoketchButtonManager * param0) +void PoketchButtonManager_Destroy(PoketchButtonManager *buttonManager) { - GF_ASSERT(param0); - Heap_FreeToHeapExplicit(param0->unk_08, param0->button); - Heap_FreeToHeapExplicit(param0->unk_08, param0); + GF_ASSERT(buttonManager); + Heap_FreeToHeapExplicit(buttonManager->heapID, buttonManager->buttons); + Heap_FreeToHeapExplicit(buttonManager->heapID, buttonManager); } -void ov25_02255B50 (PoketchButtonManager * param0) +// These functions all return ButtonManagerState values. +typedef u32(*const ButtonEvent[])(PoketchButton *button, BOOL touched, BOOL tapped); +static ButtonEvent sButtonEvents = { + Button_OnIdle, + Button_OnPressed, + Button_OnCheckDoubleTap, + Button_OnDoubleTap, + Button_OnReset +}; + +void PoketchButtonManager_Update(PoketchButtonManager *buttonManager) { - static u32(*const v0[])(PoketchButton *, BOOL, BOOL) = { - ov25_02255CDC, - ov25_02255CF8, - ov25_02255D58, - ov25_02255D90, - ov25_02255DA8 - }; + BOOL touched, tapped; + u32 i, button_state, touch_state; - BOOL v1, v2; - u32 v3, v4, v5; + touched = TouchScreen_Touched(); - v1 = sub_0202278C(); + // If we touched the screen this frame, check the location and update the button states accordingly + if (touched) { + tapped = TouchScreen_Tapped(); - if (v1) { - v2 = TouchScreen_Tapped(); + for (i = 0; i < buttonManager->numButtons; i++) { + buttonManager->buttons[i].prevScreenTouched = buttonManager->buttons[i].screenTouched; - for (v3 = 0; v3 < param0->unk_0C; v3++) { - param0->button[v3].unk_02 = param0->button[v3].unk_01; - - if (param0->button[v3].unk_01) { - param0->button[v3].unk_01 = sub_02022734(¶m0->unk_00[v3]); + if (buttonManager->buttons[i].screenTouched) { + buttonManager->buttons[i].screenTouched = TouchScreen_LocationHeld(&buttonManager->hitTable[i]); } else { - param0->button[v3].unk_01 = sub_02022760(¶m0->unk_00[v3]); + buttonManager->buttons[i].screenTouched = TouchScreen_LocationPressed(&buttonManager->hitTable[i]); } } + // Didn't touch the screen--just update the button states } else { - v2 = 0; + tapped = FALSE; - for (v3 = 0; v3 < param0->unk_0C; v3++) { - param0->button[v3].unk_02 = param0->button[v3].unk_01; - param0->button[v3].unk_01 = 0; + for (i = 0; i < buttonManager->numButtons; i++) { + buttonManager->buttons[i].prevScreenTouched = buttonManager->buttons[i].screenTouched; + buttonManager->buttons[i].screenTouched = FALSE; } } - for (v3 = 0; v3 < param0->unk_0C; v3++) { - v4 = v0[param0->button[v3].unk_00](¶m0->button[v3], v1, v2); + // Call Buttons's state machine function, and then optionally the button manager's currently set callback after that. + for (i = 0; i < buttonManager->numButtons; i++) { + button_state = sButtonEvents[buttonManager->buttons[i].state](&buttonManager->buttons[i], touched, tapped); - if (param0->button[v3].unk_01 != param0->button[v3].unk_02) { - v5 = param0->button[v3].unk_01; + if (buttonManager->buttons[i].screenTouched != buttonManager->buttons[i].prevScreenTouched) { + touch_state = buttonManager->buttons[i].screenTouched; } else { - v5 = 2; + touch_state = BUTTON_TOUCH_DOWN; } - if ((v4 != 0) || (v5 != 2)) { - param0->callback(v3, v4, v5, param0->unk_10); + // We only call the button manager's callback once per update, and only if a button's state changed + if ((button_state != BUTTON_MANAGER_STATE_NULL) || (touch_state != BUTTON_TOUCH_DOWN)) { + buttonManager->callback(i, button_state, touch_state, buttonManager->buttonCallbackData); break; } } - for (v3++; v3 < param0->unk_0C; v3++) { - v0[param0->button[v3].unk_00](¶m0->button[v3], v1, v2); + // Call the state functions for the rest of the buttons + for (i++; i < buttonManager->numButtons; i++) { + sButtonEvents[buttonManager->buttons[i].state](&buttonManager->buttons[i], touched, tapped); } } -void ov25_02255C48 (PoketchButtonManager * param0, u32 param1, u32 param2, u16 param3) +void PoketchButtonManager_ButtonTimer(PoketchButtonManager *buttonManager, u32 buttonIndex, u32 timerIndex, u16 time) { - param0->button[param1].unk_08[param2] = param3; + buttonManager->buttons[buttonIndex].timerDurations[timerIndex] = time; } -void ov25_02255C5C (PoketchButtonManager * param0, u32 param1, u16 param2) +void PoketchButtonManager_RepeatTime(PoketchButtonManager *buttonManager, u32 index, u16 repeatTime) { - param0->button[param1].unk_0C = param2; + buttonManager->buttons[index].repeatTime = repeatTime; } -void ov25_02255C68 (PoketchButtonManager * param0, u32 param1) +void PoketchButtonManager_ResetButtonState(PoketchButtonManager *buttonManager, u32 index) { - param0->button[param1].unk_04 = 0; - param0->button[param1].unk_00 = 4; + buttonManager->buttons[index].timer = 0; + buttonManager->buttons[index].state = BUTTON_STATE_RESET; } -static void ov25_02255C80 (PoketchButton * param0) +static void PoketchButton_Init(PoketchButton *button) { - u32 v0; + button->state = 0; + button->screenTouched = FALSE; + button->prevScreenTouched = FALSE; + button->timer = 0; + button->doubleTapTime = 0; - param0->unk_00 = 0; - param0->unk_01 = 0; - param0->unk_02 = 0; - param0->unk_04 = 0; - param0->unk_06 = 0; - - for (v0 = 0; v0 < 2; v0++) { - param0->unk_08[v0] = 0; + for (u32 i = 0; i < BUTTON_MANAGER_NUM_TIMERS_PER_BUTTON; i++) { + button->timerDurations[i] = 0; } - param0->unk_0C = 0; + button->repeatTime = 0; } -static void ov25_02255CA0 (PoketchButton * param0, u32 param1) +/** Use enum ButtonManagerState for state input. */ +static void PoketchButton_ChangeState(PoketchButton *button, u32 state) { - param0->unk_00 = param1; - param0->unk_04 = 0; + button->state = state; + button->timer = 0; } -static void ov25_02255CA8 (PoketchButton * param0, u32 param1) +/** Use enum ButtonManagerState for state input. */ +static void PoketchButton_ChangeState_NoReset(PoketchButton *button, u32 state) { - param0->unk_00 = param1; + button->state = state; } -static void ov25_02255CAC (PoketchButton * param0) +static void PoketchButton_IncrementTimer(PoketchButton *button) { - if (param0->unk_04 < 0xffff) { - param0->unk_04++; + if (button->timer < BUTTON_TIMER_MAX) { + button->timer++; } } -static u32 ov25_02255CC0 (PoketchButton * param0) +static u32 PoketchButton_CheckTimers(PoketchButton *button) { - u32 v0; - - for (v0 = 0; v0 < 2; v0++) { - if (param0->unk_08[v0] == param0->unk_04) { - return 5 + v0; + for (u32 i = 0; i < BUTTON_MANAGER_NUM_TIMERS_PER_BUTTON; i++) { + if (button->timerDurations[i] == button->timer) { + return BUTTON_MANAGER_STATE_TIMER0 + i; } } - return 0; + return BUTTON_MANAGER_STATE_NULL; } -static u32 ov25_02255CDC (PoketchButton * param0, BOOL param1, BOOL param2) +static u32 Button_OnIdle(PoketchButton *button, BOOL touched, BOOL tapped) { - if (param0->unk_01) { - if (param2) { - ov25_02255CA0(param0, 1); - return 1; + if (button->screenTouched) { + if (tapped) { + PoketchButton_ChangeState(button, BUTTON_STATE_TAP); + return BUTTON_MANAGER_STATE_TOUCH; } } - return 0; + return BUTTON_MANAGER_STATE_NULL; } -static u32 ov25_02255CF8 (PoketchButton * param0, BOOL param1, BOOL param2) +static u32 Button_OnPressed(PoketchButton *button, BOOL touched, BOOL tapped) { - ov25_02255CAC(param0); + PoketchButton_IncrementTimer(button); - if (param0->unk_01) { - u32 v0; + if (button->screenTouched) { + u32 timer_event = PoketchButton_CheckTimers(button); - v0 = ov25_02255CC0(param0); - - if (v0 != 0) { - return v0; + if (timer_event != BUTTON_MANAGER_STATE_NULL) { + return timer_event; } - if ((param0->unk_0C != 0) && (param0->unk_04 >= param0->unk_0C)) { - param0->unk_04 = 0; - return 7; + if ((button->repeatTime != 0) && (button->timer >= button->repeatTime)) { + button->timer = 0; + return BUTTON_MANAGER_STATE_REPEAT; } - } else if (param1) { - ov25_02255CA0(param0, 0); - return 2; + } else if (touched) { + PoketchButton_ChangeState(button, BUTTON_STATE_IDLE); + return BUTTON_MANAGER_STATE_OUT; } else { - if (param0->unk_06) { - ov25_02255CA8(param0, 2); + // We don't reset the timer because we want to check for double tap with the same timer + if (button->doubleTapTime) { + PoketchButton_ChangeState_NoReset(button, BUTTON_STATE_CHECK_DOUBLETAP); } else { - ov25_02255CA0(param0, 0); - return 3; + PoketchButton_ChangeState(button, BUTTON_STATE_IDLE); + return BUTTON_MANAGER_STATE_TAP; } } - return 0; + return BUTTON_MANAGER_STATE_NULL; } -static u32 ov25_02255D58 (PoketchButton * param0, BOOL param1, BOOL param2) +static u32 Button_OnCheckDoubleTap(PoketchButton *button, BOOL touched, BOOL tapped) { - ov25_02255CAC(param0); + PoketchButton_IncrementTimer(button); - if (param0->unk_04 > param0->unk_06) { - ov25_02255CA0(param0, 0); - return 3; + // Missed the double tap window + if (button->timer > button->doubleTapTime) { + PoketchButton_ChangeState(button, BUTTON_STATE_IDLE); + return BUTTON_MANAGER_STATE_TAP; } - if (param0->unk_01 && param2) { - ov25_02255CA0(param0, 3); - return 4; + if (button->screenTouched && tapped) { + PoketchButton_ChangeState(button, BUTTON_STATE_DOUBLETAP); + return BUTTON_MANAGER_STATE_DOUBLETAP; } - return 0; + return BUTTON_MANAGER_STATE_NULL; } -static u32 ov25_02255D90 (PoketchButton * param0, BOOL param1, BOOL param2) +static u32 Button_OnDoubleTap(PoketchButton *button, BOOL touched, BOOL tapped) { - if (param0->unk_01) { - ov25_02255CAC(param0); + if (button->screenTouched) { + PoketchButton_IncrementTimer(button); } else { - ov25_02255CA0(param0, 0); + PoketchButton_ChangeState(button, BUTTON_STATE_IDLE); } - return 0; + return BUTTON_MANAGER_STATE_NULL; } -static u32 ov25_02255DA8 (PoketchButton * param0, BOOL param1, BOOL param2) +static u32 Button_OnReset(PoketchButton *button, BOOL touched, BOOL tapped) { - if (param0->unk_01 == 0) { - ov25_02255CA0(param0, 0); + if (button->screenTouched == FALSE) { + PoketchButton_ChangeState(button, BUTTON_STATE_IDLE); } - return 0; + return BUTTON_MANAGER_STATE_NULL; } diff --git a/src/overlay025/poketch_system.c b/src/overlay025/poketch_system.c index 516b265666..3e68913d48 100644 --- a/src/overlay025/poketch_system.c +++ b/src/overlay025/poketch_system.c @@ -13,14 +13,13 @@ #include "overlay025/struct_ov25_02254560_decl.h" #include "overlay025/poketch_button.h" -#include "struct_defs/union_02022594_020225E0.h" +#include "unk_02022594.h" #include "unk_02005474.h" #include "game_overlay.h" #include "unk_0200D9E8.h" #include "heap.h" #include "unk_0201E3D8.h" -#include "unk_02022594.h" #include "unk_02025E08.h" #include "trainer_info.h" #include "unk_020508D4.h" @@ -555,16 +554,16 @@ void ov25_02254274 (UnkFuncPtr_ov25_02254274 param0, void * param1) static BOOL ov25_02254284 (PoketchSystem *poketchSys) { - static const UnkUnion_020225E0 v0[] = { + static const TouchScreenHitTable v0[] = { {4 * 8, 12 * 8, 28 * 8, 255}, {12 * 8, 20 * 8, 28 * 8, 255}, {16, 175, 16, 207} }; - poketchSys->unk_28 = ov25_02255ACC(v0, NELEMS(v0), ov25_022542E4, poketchSys, 7); + poketchSys->unk_28 = PoketchButtonManager_Create(v0, NELEMS(v0), ov25_022542E4, poketchSys, 7); if (poketchSys->unk_28 != NULL) { - ov25_02255C48(poketchSys->unk_28, 0, 0, 7); + PoketchButtonManager_ButtonTimer(poketchSys->unk_28, 0, 0, 7); poketchSys->unk_2C = 0xffffffff; poketchSys->unk_30 = 0xffffffff; return 1; @@ -575,13 +574,13 @@ static BOOL ov25_02254284 (PoketchSystem *poketchSys) static void ov25_022542C8 (PoketchSystem *poketchSys) { - ov25_02255B34(poketchSys->unk_28); + PoketchButtonManager_Destroy(poketchSys->unk_28); } static void ov25_022542D4 (PoketchSystem *poketchSys) { poketchSys->unk_08 = 0; - ov25_02255B50(poketchSys->unk_28); + PoketchButtonManager_Update(poketchSys->unk_28); } static void ov25_022542E4 (u32 param0, u32 param1, u32 param2, void * param3) @@ -641,7 +640,7 @@ static void ov25_022542E4 (u32 param0, u32 param1, u32 param2, void * param3) switch (param1) { case 5: - ov25_02255C68(v0->unk_28, 0); + PoketchButtonManager_ResetButtonState(v0->unk_28, 0); break; case 3: if ((v0->unk_30 == 6) || (v0->unk_30 == 9)) { @@ -742,7 +741,7 @@ BOOL ov25_0225450C (const PoketchSystem *poketchSys) void ov25_02254518 (const PoketchSystem *poketchSys, PoketchButtonManager * param1) { if ((ov25_0225450C(poketchSys) == 0) && (poketchSys->unk_05 == 0)) { - ov25_02255B50(param1); + PoketchButtonManager_Update(param1); } } diff --git a/src/overlay026/ov26_022561C0.c b/src/overlay026/ov26_022561C0.c index 132db4d2d2..ba1e30d999 100644 --- a/src/overlay026/ov26_022561C0.c +++ b/src/overlay026/ov26_022561C0.c @@ -8,7 +8,7 @@ #include "overlay025/poketch_button.h" #include "overlay026/struct_ov26_02256404_decl.h" -#include "struct_defs/union_02022594_020225E0.h" +#include "unk_02022594.h" #include "overlay026/struct_ov26_02256404_1.h" #include "unk_0200D9E8.h" @@ -46,7 +46,7 @@ static BOOL ov26_02256330(UnkStruct_ov26_0225621C * param0); static BOOL ov26_02256370(UnkStruct_ov26_0225621C * param0); static BOOL ov26_022563D0(UnkStruct_ov26_0225621C * param0); -static const UnkUnion_020225E0 Unk_ov26_02256718[] = { +static const TouchScreenHitTable Unk_ov26_02256718[] = { {0x10, 0xAF, 0x10, 0xCF} }; @@ -96,7 +96,7 @@ static BOOL ov26_0225621C (UnkStruct_ov26_0225621C * param0, PoketchSystem * par param0->unk_06 = param0->unk_14.unk_00.minute; param0->unk_05 = param0->unk_14.unk_00.hour; - param0->unk_10 = ov25_02255ACC(Unk_ov26_02256718, NELEMS(Unk_ov26_02256718), ov26_02256300, param0, 8); + param0->unk_10 = PoketchButtonManager_Create(Unk_ov26_02256718, NELEMS(Unk_ov26_02256718), ov26_02256300, param0, 8); if (param0->unk_10 == NULL) { return 0; @@ -112,7 +112,7 @@ static BOOL ov26_0225621C (UnkStruct_ov26_0225621C * param0, PoketchSystem * par static void ov26_022562A4 (UnkStruct_ov26_0225621C * param0) { ov26_0225649C(param0->unk_24); - ov25_02255B34(param0->unk_10); + PoketchButtonManager_Destroy(param0->unk_10); Heap_FreeToHeap(param0); } diff --git a/src/overlay027/ov27_022561C0.c b/src/overlay027/ov27_022561C0.c index 2836cd452d..53336ea838 100644 --- a/src/overlay027/ov27_022561C0.c +++ b/src/overlay027/ov27_022561C0.c @@ -8,7 +8,7 @@ #include "overlay025/poketch_button.h" #include "overlay027/struct_ov27_0225680C_decl.h" -#include "struct_defs/union_02022594_020225E0.h" +#include "unk_02022594.h" #include "overlay027/struct_ov27_0225680C_1.h" #include "unk_0200D9E8.h" @@ -371,15 +371,15 @@ static BOOL ov27_022565D0 (UnkStruct_ov27_0225621C * param0) static BOOL ov27_02256608 (UnkStruct_ov27_0225621C * param0) { - static const UnkUnion_020225E0 v0[] = { + static const TouchScreenHitTable v0[] = { {0xfe, 112, 112, 39}, }; - param0->unk_5C = ov25_02255ACC(v0, NELEMS(v0), ov27_02256660, param0, 8); + param0->unk_5C = PoketchButtonManager_Create(v0, NELEMS(v0), ov27_02256660, param0, 8); if (param0->unk_5C != NULL) { - ov25_02255C48(param0->unk_5C, 0, 0, 15); - ov25_02255C48(param0->unk_5C, 0, 1, 75); + PoketchButtonManager_ButtonTimer(param0->unk_5C, 0, 0, 15); + PoketchButtonManager_ButtonTimer(param0->unk_5C, 0, 1, 75); param0->unk_04 = 0; return 1; } @@ -389,7 +389,7 @@ static BOOL ov27_02256608 (UnkStruct_ov27_0225621C * param0) static void ov27_02256654 (UnkStruct_ov27_0225621C * param0) { - ov25_02255B34(param0->unk_5C); + PoketchButtonManager_Destroy(param0->unk_5C); } static void ov27_02256660 (u32 param0, u32 param1, u32 param2, void * param3) diff --git a/src/overlay028/ov28_022561C0.c b/src/overlay028/ov28_022561C0.c index c5040c2c67..6ed0f545f8 100644 --- a/src/overlay028/ov28_022561C0.c +++ b/src/overlay028/ov28_022561C0.c @@ -10,7 +10,7 @@ #include "overlay028/struct_ov28_0225697C_decl.h" #include "overlay028/struct_ov28_02256E9C_decl.h" -#include "struct_defs/union_02022594_020225E0.h" +#include "unk_02022594.h" #include "overlay028/struct_ov28_0225697C_1.h" #include "constants/species.h" @@ -56,7 +56,7 @@ static BOOL ov28_02256888(UnkStruct_ov28_02256210 * param0, u32 param1); static BOOL ov28_022568E0(UnkStruct_ov28_02256210 * param0); static void ov28_02256914(UnkStruct_ov28_02256210 * param0, const UnkStruct_ov28_02256E9C * param1); -static const UnkUnion_020225E0 Unk_ov28_02257658[] = { +static const TouchScreenHitTable Unk_ov28_02257658[] = { {0x90, 0xAF, 0x20, 0x5F}, {0x70, 0x8F, 0x20, 0x3F}, {0x70, 0x8F, 0x40, 0x5F}, @@ -117,7 +117,7 @@ static BOOL ov28_02256210 (UnkStruct_ov28_02256210 * param0, u32 param1, BGL * p return 0; } - param0->unk_0C = ov25_02255ACC(Unk_ov28_02257658, NELEMS(Unk_ov28_02257658), ov28_02256344, param0, 8); + param0->unk_0C = PoketchButtonManager_Create(Unk_ov28_02257658, NELEMS(Unk_ov28_02257658), ov28_02256344, param0, 8); if (param0->unk_0C == NULL) { return 0; @@ -142,7 +142,7 @@ static void ov28_02256298 (UnkStruct_ov28_02256210 * param0) } if (param0->unk_0C) { - ov25_02255B34(param0->unk_0C); + PoketchButtonManager_Destroy(param0->unk_0C); } ov28_022569AC(param0->unk_14); diff --git a/src/overlay029/ov29_022561C0.c b/src/overlay029/ov29_022561C0.c index c5d37b2e3f..4e5adc814b 100644 --- a/src/overlay029/ov29_022561C0.c +++ b/src/overlay029/ov29_022561C0.c @@ -8,7 +8,7 @@ #include "overlay025/poketch_button.h" #include "overlay029/struct_ov29_022566C8_decl.h" -#include "struct_defs/union_02022594_020225E0.h" +#include "unk_02022594.h" #include "overlay029/struct_ov29_022566C8_1.h" #include "unk_0200D9E8.h" @@ -43,7 +43,7 @@ static BOOL ov29_02256460(UnkStruct_ov29_0225621C * param0); static void ov29_022564F4(UnkStruct_ov29_0225621C * param0, u32 param1, u32 param2, u32 param3, u32 param4); static BOOL ov29_0225668C(UnkStruct_ov29_0225621C * param0); -static const UnkUnion_020225E0 Unk_ov29_02256B3C[] = { +static const TouchScreenHitTable Unk_ov29_02256B3C[] = { {0x18, 0x58, 0xB4, 0xCC}, {0x68, 0xA8, 0xB4, 0xCC} }; @@ -85,7 +85,7 @@ static BOOL ov29_0225621C (UnkStruct_ov29_0225621C * param0, PoketchSystem * par param0->unk_01 = 0; param0->unk_02 = 0; param0->unk_03 = 0; - param0->unk_16FC = ov25_02255ACC(Unk_ov29_02256B3C, NELEMS(Unk_ov29_02256B3C), ov29_022562F4, param0, 8); + param0->unk_16FC = PoketchButtonManager_Create(Unk_ov29_02256B3C, NELEMS(Unk_ov29_02256B3C), ov29_022562F4, param0, 8); param0->unk_16F8 = param1; return 1; @@ -96,7 +96,7 @@ static BOOL ov29_0225621C (UnkStruct_ov29_0225621C * param0, PoketchSystem * par static void ov29_02256288 (UnkStruct_ov29_0225621C * param0) { - ov25_02255B34(param0->unk_16FC); + PoketchButtonManager_Destroy(param0->unk_16FC); ov29_02256770(param0->unk_16F4); Heap_FreeToHeap(param0); } diff --git a/src/overlay030/ov30_022561C0.c b/src/overlay030/ov30_022561C0.c index d9aacc5760..9d1a7fbd15 100644 --- a/src/overlay030/ov30_022561C0.c +++ b/src/overlay030/ov30_022561C0.c @@ -8,7 +8,7 @@ #include "overlay025/poketch_button.h" #include "overlay030/struct_ov30_022563EC_decl.h" -#include "struct_defs/union_02022594_020225E0.h" +#include "unk_02022594.h" #include "overlay030/struct_ov30_022563EC_1.h" #include "unk_0200D9E8.h" @@ -45,7 +45,7 @@ static BOOL ov30_02256324(UnkStruct_ov30_0225621C * param0); static BOOL ov30_02256364(UnkStruct_ov30_0225621C * param0); static BOOL ov30_022563B8(UnkStruct_ov30_0225621C * param0); -static const UnkUnion_020225E0 Unk_ov30_02256678[] = { +static const TouchScreenHitTable Unk_ov30_02256678[] = { {0x10, 0xAF, 0x10, 0xCF} }; @@ -93,7 +93,7 @@ static BOOL ov30_0225621C (UnkStruct_ov30_0225621C * param0, PoketchSystem * par } param0->unk_05 = param0->unk_14.unk_00.minute; - param0->unk_10 = ov25_02255ACC(Unk_ov30_02256678, NELEMS(Unk_ov30_02256678), ov30_022562F4, param0, 8); + param0->unk_10 = PoketchButtonManager_Create(Unk_ov30_02256678, NELEMS(Unk_ov30_02256678), ov30_022562F4, param0, 8); if (param0->unk_10 == NULL) { return 0; @@ -109,7 +109,7 @@ static BOOL ov30_0225621C (UnkStruct_ov30_0225621C * param0, PoketchSystem * par static void ov30_02256298 (UnkStruct_ov30_0225621C * param0) { ov30_02256444(param0->unk_24); - ov25_02255B34(param0->unk_10); + PoketchButtonManager_Destroy(param0->unk_10); Heap_FreeToHeap(param0); } diff --git a/src/overlay035/ov35_022561C0.c b/src/overlay035/ov35_022561C0.c index 25cfee520f..ed9b00cbed 100644 --- a/src/overlay035/ov35_022561C0.c +++ b/src/overlay035/ov35_022561C0.c @@ -8,7 +8,7 @@ #include "overlay025/poketch_button.h" #include "overlay035/struct_ov35_02256410_decl.h" -#include "struct_defs/union_02022594_020225E0.h" +#include "unk_02022594.h" #include "overlay035/struct_ov35_02256410_1.h" #include "unk_0200D9E8.h" @@ -66,7 +66,7 @@ static BOOL ov35_022561D4 (void ** param0, PoketchSystem * param1, BGL * param2, static BOOL ov35_0225621C (UnkStruct_ov35_0225621C * param0, PoketchSystem * param1, BGL * param2, u32 param3) { - static const UnkUnion_020225E0 v0[] = { + static const TouchScreenHitTable v0[] = { { 128 - (56 / 2), 128 + (56 / 2), @@ -87,7 +87,7 @@ static BOOL ov35_0225621C (UnkStruct_ov35_0225621C * param0, PoketchSystem * par param0->unk_00 = 0; param0->unk_01 = 0; param0->unk_02 = 0; - param0->unk_18 = ov25_02255ACC(v0, NELEMS(v0), ov35_02256284, param0, 8); + param0->unk_18 = PoketchButtonManager_Create(v0, NELEMS(v0), ov35_02256284, param0, 8); param0->unk_1C = 0; param0->unk_14 = param1; @@ -109,7 +109,7 @@ static void ov35_02256284 (u32 param0, u32 param1, u32 param2, void * param3) static void ov35_0225628C (UnkStruct_ov35_0225621C * param0) { sub_02099D54(param0->unk_04, (u8 *)(&(param0->unk_08.unk_00)), sizeof(u32)); - ov25_02255B34(param0->unk_18); + PoketchButtonManager_Destroy(param0->unk_18); ov35_0225644C(param0->unk_10); Heap_FreeToHeap(param0); } diff --git a/src/overlay036/ov36_022561C0.c b/src/overlay036/ov36_022561C0.c index d837ef20c4..ae5bf8efd8 100644 --- a/src/overlay036/ov36_022561C0.c +++ b/src/overlay036/ov36_022561C0.c @@ -8,7 +8,7 @@ #include "overlay025/poketch_button.h" #include "overlay036/poketch_app_pedometer.h" -#include "struct_defs/union_02022594_020225E0.h" +#include "unk_02022594.h" #include "unk_0200D9E8.h" #include "heap.h" @@ -64,7 +64,7 @@ static BOOL ov36_022561D4 (void ** param0, PoketchSystem * param1, BGL * param2, static BOOL ov36_0225621C (UnkStruct_ov36_0225621C * param0, PoketchSystem * param1, BGL * param2, u32 param3) { - static const UnkUnion_020225E0 v0[] = { + static const TouchScreenHitTable v0[] = { { 128 - (56 / 2), 128 + (56 / 2), @@ -82,7 +82,7 @@ static BOOL ov36_0225621C (UnkStruct_ov36_0225621C * param0, PoketchSystem * par param0->unk_00 = 0; param0->unk_01 = 0; param0->unk_02 = 0; - param0->unk_14 = ov25_02255ACC(v0, NELEMS(v0), ov36_02256278, param0, 8); + param0->unk_14 = PoketchButtonManager_Create(v0, NELEMS(v0), ov36_02256278, param0, 8); param0->unk_18 = 0; return 1; @@ -102,7 +102,7 @@ static void ov36_02256278 (u32 param0, u32 param1, u32 param2, void * param3) static void ov36_02256280 (UnkStruct_ov36_0225621C * param0) { - ov25_02255B34(param0->unk_14); + PoketchButtonManager_Destroy(param0->unk_14); ov36_02256440(param0->unk_0C); Heap_FreeToHeap(param0); diff --git a/src/overlay037/ov37_022561C0.c b/src/overlay037/ov37_022561C0.c index 338feb5337..ac1c4ddda1 100644 --- a/src/overlay037/ov37_022561C0.c +++ b/src/overlay037/ov37_022561C0.c @@ -8,7 +8,7 @@ #include "overlay025/poketch_button.h" #include "overlay037/struct_ov37_022563D4_decl.h" -#include "struct_defs/union_02022594_020225E0.h" +#include "unk_02022594.h" #include "overlay037/struct_ov37_022563D4_1.h" #include "unk_0200D9E8.h" @@ -65,7 +65,7 @@ static BOOL ov37_022561D4 (void ** param0, PoketchSystem * param1, BGL * param2, static BOOL ov37_0225621C (UnkStruct_ov37_0225621C * param0, PoketchSystem * param1, BGL * param2, u32 param3) { - static const UnkUnion_020225E0 v0[] = { + static const TouchScreenHitTable v0[] = { {72, 104, 92, 132}, {104, 136, 92, 132}, }; @@ -78,7 +78,7 @@ static BOOL ov37_0225621C (UnkStruct_ov37_0225621C * param0, PoketchSystem * par param0->unk_00 = 0; param0->unk_01 = 0; param0->unk_02 = 0; - param0->unk_10 = ov25_02255ACC(v0, NELEMS(v0), ov37_02256298, param0, 8); + param0->unk_10 = PoketchButtonManager_Create(v0, NELEMS(v0), ov37_02256298, param0, 8); param0->unk_14 = 0; param0->unk_0C = param1; @@ -90,7 +90,7 @@ static BOOL ov37_0225621C (UnkStruct_ov37_0225621C * param0, PoketchSystem * par static void ov37_02256280 (UnkStruct_ov37_0225621C * param0) { - ov25_02255B34(param0->unk_10); + PoketchButtonManager_Destroy(param0->unk_10); ov37_02256410(param0->unk_08); Heap_FreeToHeap(param0); } diff --git a/src/overlay039/ov39_022561C0.c b/src/overlay039/ov39_022561C0.c index 7a93c32313..f95f8a5abc 100644 --- a/src/overlay039/ov39_022561C0.c +++ b/src/overlay039/ov39_022561C0.c @@ -8,7 +8,7 @@ #include "overlay025/poketch_button.h" #include "overlay039/struct_ov39_022563DC_decl.h" -#include "struct_defs/union_02022594_020225E0.h" +#include "unk_02022594.h" #include "overlay039/struct_ov39_022563DC_1.h" #include "unk_0200D9E8.h" @@ -66,7 +66,7 @@ static BOOL ov39_022561D4 (void ** param0, PoketchSystem * param1, BGL * param2, static BOOL ov39_0225621C (UnkStruct_ov39_0225621C * param0, PoketchSystem * param1, BGL * param2, u32 param3) { if (ov39_022563DC(&(param0->unk_24), &(param0->unk_04), param2)) { - static const UnkUnion_020225E0 v0[] = { + static const TouchScreenHitTable v0[] = { {16, 64, 16, 64}, {16, 64, 160, 208}, {72, 120, 16, 64}, @@ -80,7 +80,7 @@ static BOOL ov39_0225621C (UnkStruct_ov39_0225621C * param0, PoketchSystem * par param0->unk_01 = 0; param0->unk_02 = 0; param0->unk_28 = param1; - param0->unk_2C = ov25_02255ACC(v0, NELEMS(v0), ov39_02256284, param0, 8); + param0->unk_2C = PoketchButtonManager_Create(v0, NELEMS(v0), ov39_02256284, param0, 8); param0->unk_30 = 0; for (v1 = 0; v1 < 6; v1++) { @@ -96,7 +96,7 @@ static BOOL ov39_0225621C (UnkStruct_ov39_0225621C * param0, PoketchSystem * par static void ov39_02256268 (UnkStruct_ov39_0225621C * param0) { if (param0->unk_2C) { - ov25_02255B34(param0->unk_2C); + PoketchButtonManager_Destroy(param0->unk_2C); } ov39_0225640C(param0->unk_24); diff --git a/src/overlay041/ov41_022561C0.c b/src/overlay041/ov41_022561C0.c index 9b5ae7ea24..5d018ba867 100644 --- a/src/overlay041/ov41_022561C0.c +++ b/src/overlay041/ov41_022561C0.c @@ -8,7 +8,7 @@ #include "overlay025/poketch_button.h" #include "overlay041/struct_ov41_022567B0_decl.h" -#include "struct_defs/union_02022594_020225E0.h" +#include "unk_02022594.h" #include "overlay041/struct_ov41_022567B0_1.h" #include "unk_0200D9E8.h" @@ -70,7 +70,7 @@ static BOOL ov41_022561D4 (void ** param0, PoketchSystem * param1, BGL * param2, static BOOL ov41_02256220 (UnkStruct_ov41_02256220 * param0, PoketchSystem * param1, BGL * param2, u32 param3) { - static const UnkUnion_020225E0 v0[] = { + static const TouchScreenHitTable v0[] = { {34, 66, 167, 207}, {80, 112, 167, 207}, {126, 158, 167, 207} @@ -89,7 +89,7 @@ static BOOL ov41_02256220 (UnkStruct_ov41_02256220 * param0, PoketchSystem * par ov41_02256790(¶m0->unk_04); - param0->unk_5B84 = ov25_02255ACC(v0, NELEMS(v0), ov41_02256300, param0, 8); + param0->unk_5B84 = PoketchButtonManager_Create(v0, NELEMS(v0), ov41_02256300, param0, 8); param0->unk_5B88 = 0; param0->unk_5B80 = param1; @@ -101,7 +101,7 @@ static BOOL ov41_02256220 (UnkStruct_ov41_02256220 * param0, PoketchSystem * par static void ov41_02256294 (UnkStruct_ov41_02256220 * param0) { - ov25_02255B34(param0->unk_5B84); + PoketchButtonManager_Destroy(param0->unk_5B84); ov41_022567F8(param0->unk_5B7C); Heap_FreeToHeap(param0); } diff --git a/src/overlay043/ov43_022561C0.c b/src/overlay043/ov43_022561C0.c index 8d29fff392..cdd92fd2c3 100644 --- a/src/overlay043/ov43_022561C0.c +++ b/src/overlay043/ov43_022561C0.c @@ -8,7 +8,7 @@ #include "overlay025/poketch_button.h" #include "overlay043/struct_ov43_02256544_decl.h" -#include "struct_defs/union_02022594_020225E0.h" +#include "unk_02022594.h" #include "overlay043/struct_ov43_02256544_1.h" #include "unk_0200D9E8.h" @@ -69,7 +69,7 @@ static BOOL ov43_022561D4 (void ** param0, PoketchSystem * param1, BGL * param2, static BOOL ov43_0225621C (UnkStruct_ov43_0225621C * param0, PoketchSystem * param1, BGL * param2, u32 param3) { - static const UnkUnion_020225E0 v0[] = { + static const TouchScreenHitTable v0[] = { {112, 144, 16, 40}, {112, 144, 104, 128}, {24, 56, 96, 120}, @@ -88,7 +88,7 @@ static BOOL ov43_0225621C (UnkStruct_ov43_0225621C * param0, PoketchSystem * par param0->unk_00 = 0; param0->unk_01 = 0; param0->unk_02 = 0; - param0->unk_1C = ov25_02255ACC(v0, NELEMS(v0), ov43_02256308, param0, 8); + param0->unk_1C = PoketchButtonManager_Create(v0, NELEMS(v0), ov43_02256308, param0, 8); param0->unk_20 = 0; param0->unk_18 = param1; @@ -110,7 +110,7 @@ static void ov43_02256288 (UnkStruct_ov43_02256544_1 * param0) static void ov43_022562A8 (UnkStruct_ov43_0225621C * param0) { sub_02099D54(param0->unk_04, &(param0->unk_08), sizeof(param0->unk_08)); - ov25_02255B34(param0->unk_1C); + PoketchButtonManager_Destroy(param0->unk_1C); ov43_02256680(param0->unk_14); Heap_FreeToHeap(param0); } diff --git a/src/overlay044/ov44_022561C0.c b/src/overlay044/ov44_022561C0.c index 4d7db2fe8f..ba49d53fe7 100644 --- a/src/overlay044/ov44_022561C0.c +++ b/src/overlay044/ov44_022561C0.c @@ -10,7 +10,7 @@ #include "overlay025/poketch_button.h" #include "overlay044/struct_ov44_022565BC_decl.h" -#include "struct_defs/union_02022594_020225E0.h" +#include "unk_02022594.h" #include "overlay044/struct_ov44_022565BC_1.h" #include "unk_0200D9E8.h" @@ -101,7 +101,7 @@ static BOOL ov44_0225621C (UnkStruct_ov44_0225621C * param0, PoketchSystem * par param0->unk_04.unk_33 = (param0->unk_04.unk_30 > 1) ? 1 : 0; if (ov44_022565BC(&(param0->unk_38), &(param0->unk_04), param2)) { - static const UnkUnion_020225E0 v4[] = { + static const TouchScreenHitTable v4[] = { {128, 168, 92, 132}, {130, 164, 24, 72}, {130, 164, 152, 200} @@ -110,7 +110,7 @@ static BOOL ov44_0225621C (UnkStruct_ov44_0225621C * param0, PoketchSystem * par param0->unk_00 = 0; param0->unk_01 = 0; param0->unk_02 = 0; - param0->unk_40 = ov25_02255ACC(v4, NELEMS(v4), ov44_0225632C, param0, 8); + param0->unk_40 = PoketchButtonManager_Create(v4, NELEMS(v4), ov44_0225632C, param0, 8); param0->unk_46 = 0; param0->unk_3C = param1; @@ -122,7 +122,7 @@ static BOOL ov44_0225621C (UnkStruct_ov44_0225621C * param0, PoketchSystem * par static void ov44_02256314 (UnkStruct_ov44_0225621C * param0) { - ov25_02255B34(param0->unk_40); + PoketchButtonManager_Destroy(param0->unk_40); ov44_022565F8(param0->unk_38); Heap_FreeToHeap(param0); } diff --git a/src/overlay045/ov45_022561C0.c b/src/overlay045/ov45_022561C0.c index 3965e2a240..324a1e374e 100644 --- a/src/overlay045/ov45_022561C0.c +++ b/src/overlay045/ov45_022561C0.c @@ -8,7 +8,7 @@ #include "overlay025/poketch_button.h" #include "overlay045/struct_ov45_022566EC_decl.h" -#include "struct_defs/union_02022594_020225E0.h" +#include "unk_02022594.h" #include "overlay045/struct_ov45_022566EC_1.h" #include "unk_0200D9E8.h" @@ -78,7 +78,7 @@ static BOOL ov45_022561D4 (void ** param0, PoketchSystem * param1, BGL * param2, static BOOL ov45_0225621C (UnkStruct_ov45_022561D4 * param0, PoketchSystem * param1, BGL * param2, u32 param3) { - static const UnkUnion_020225E0 v0[] = { + static const TouchScreenHitTable v0[] = { {72, 104, 176, 208, }, {104, 136, 176, 208, }, {112, 128, 64, 80, }, @@ -102,13 +102,13 @@ static BOOL ov45_0225621C (UnkStruct_ov45_022561D4 * param0, PoketchSystem * par param0->unk_00 = 0; param0->unk_01 = 0; param0->unk_02 = 0; - param0->unk_14 = ov25_02255ACC(v0, NELEMS(v0), ov45_02256310, param0, 8); + param0->unk_14 = PoketchButtonManager_Create(v0, NELEMS(v0), ov45_02256310, param0, 8); param0->unk_1C = 0; - ov25_02255C5C(param0->unk_14, 2, 4); - ov25_02255C5C(param0->unk_14, 3, 4); - ov25_02255C5C(param0->unk_14, 4, 4); - ov25_02255C5C(param0->unk_14, 5, 4); + PoketchButtonManager_RepeatTime(param0->unk_14, 2, 4); + PoketchButtonManager_RepeatTime(param0->unk_14, 3, 4); + PoketchButtonManager_RepeatTime(param0->unk_14, 4, 4); + PoketchButtonManager_RepeatTime(param0->unk_14, 5, 4); param0->unk_2C = 0; param0->unk_30 = 0; @@ -140,7 +140,7 @@ static void ov45_022562C0 (UnkStruct_ov45_022566EC_1 * param0) static void ov45_022562F8 (UnkStruct_ov45_022561D4 * param0) { - ov25_02255B34(param0->unk_14); + PoketchButtonManager_Destroy(param0->unk_14); ov45_02256728(param0->unk_08); Heap_FreeToHeap(param0); diff --git a/src/overlay046/ov46_022561C0.c b/src/overlay046/ov46_022561C0.c index f29b6835e2..7502eea8d0 100644 --- a/src/overlay046/ov46_022561C0.c +++ b/src/overlay046/ov46_022561C0.c @@ -10,7 +10,7 @@ #include "overlay025/poketch_button.h" #include "overlay046/struct_ov46_02256BCC_decl.h" -#include "struct_defs/union_02022594_020225E0.h" +#include "unk_02022594.h" #include "overlay046/struct_ov46_02256BCC_1.h" #include "unk_0200D9E8.h" @@ -175,7 +175,7 @@ static void ov46_022562D4 (UnkStruct_ov46_0225621C * param0) static BOOL ov46_02256310 (UnkStruct_ov46_0225621C * param0, PoketchSystem * param1, BGL * param2, u32 param3) { - static const UnkUnion_020225E0 v0[] = { + static const TouchScreenHitTable v0[] = { {144, 176, 16, 80}, {144, 176, 80, 144}, {144, 176, 144, 208}, @@ -196,17 +196,17 @@ static BOOL ov46_02256310 (UnkStruct_ov46_0225621C * param0, PoketchSystem * par param0->unk_00 = 0; param0->unk_01 = 0; param0->unk_03 = 0; - param0->unk_10 = ov25_02255ACC(v0, NELEMS(v0), ov46_022563D8, param0, 8); + param0->unk_10 = PoketchButtonManager_Create(v0, NELEMS(v0), ov46_022563D8, param0, 8); param0->unk_18 = 0; - ov25_02255C5C(param0->unk_10, 3, 4); - ov25_02255C5C(param0->unk_10, 5, 4); - ov25_02255C5C(param0->unk_10, 4, 4); - ov25_02255C5C(param0->unk_10, 6, 4); - ov25_02255C5C(param0->unk_10, 7, 4); - ov25_02255C5C(param0->unk_10, 9, 4); - ov25_02255C5C(param0->unk_10, 8, 4); - ov25_02255C5C(param0->unk_10, 10, 4); + PoketchButtonManager_RepeatTime(param0->unk_10, 3, 4); + PoketchButtonManager_RepeatTime(param0->unk_10, 5, 4); + PoketchButtonManager_RepeatTime(param0->unk_10, 4, 4); + PoketchButtonManager_RepeatTime(param0->unk_10, 6, 4); + PoketchButtonManager_RepeatTime(param0->unk_10, 7, 4); + PoketchButtonManager_RepeatTime(param0->unk_10, 9, 4); + PoketchButtonManager_RepeatTime(param0->unk_10, 8, 4); + PoketchButtonManager_RepeatTime(param0->unk_10, 10, 4); param0->unk_0C = param1; return 1; @@ -218,7 +218,7 @@ static BOOL ov46_02256310 (UnkStruct_ov46_0225621C * param0, PoketchSystem * par static void ov46_022563B8 (UnkStruct_ov46_0225621C * param0) { ov46_02256270(param0, ¶m0->unk_48); - ov25_02255B34(param0->unk_10); + PoketchButtonManager_Destroy(param0->unk_10); ov46_02256C0C(param0->unk_08); Heap_FreeToHeap(param0); diff --git a/src/overlay050/ov50_022561C0.c b/src/overlay050/ov50_022561C0.c index 4597dfb7a7..213a1bf3a4 100644 --- a/src/overlay050/ov50_022561C0.c +++ b/src/overlay050/ov50_022561C0.c @@ -8,7 +8,7 @@ #include "overlay025/poketch_button.h" #include "overlay050/struct_ov50_02256510_decl.h" -#include "struct_defs/union_02022594_020225E0.h" +#include "unk_02022594.h" #include "overlay050/struct_ov50_02256510_1.h" #include "unk_0200D9E8.h" @@ -71,7 +71,7 @@ static BOOL ov50_022561D4 (void ** param0, PoketchSystem * param1, BGL * param2, static BOOL ov50_0225621C (UnkStruct_ov50_022561D4 * param0, PoketchSystem * param1, BGL * param2, u32 param3) { - static const UnkUnion_020225E0 v0[] = { + static const TouchScreenHitTable v0[] = { {((5 + 3 * 0) * 8), ((5 + 3 * 0 + 2) * 8), ((4 + 3 * 0) * 8), ((4 + 3 * 0 + 2) * 8)}, {((5 + 3 * 0) * 8), ((5 + 3 * 0 + 2) * 8), ((4 + 3 * 1) * 8), ((4 + 3 * 1 + 2) * 8)}, {((5 + 3 * 0) * 8), ((5 + 3 * 0 + 2) * 8), ((4 + 3 * 2) * 8), ((4 + 3 * 2 + 2) * 8)}, @@ -123,7 +123,7 @@ static BOOL ov50_0225621C (UnkStruct_ov50_022561D4 * param0, PoketchSystem * par param0->unk_00 = 0; param0->unk_01 = 0; param0->unk_02 = 0; - param0->unk_9C = ov25_02255ACC(v0, NELEMS(v0), ov50_02256360, param0, 8); + param0->unk_9C = PoketchButtonManager_Create(v0, NELEMS(v0), ov50_02256360, param0, 8); param0->unk_A0 = 0; param0->unk_94 = param1; @@ -165,7 +165,7 @@ static void ov50_022562AC (UnkStruct_ov50_02256510_1 * param0, UnkStruct_ov50_02 static void ov50_02256340 (UnkStruct_ov50_022561D4 * param0) { - ov25_02255B34(param0->unk_9C); + PoketchButtonManager_Destroy(param0->unk_9C); ov50_0225654C(param0->unk_90); Heap_FreeToHeap(param0); diff --git a/src/overlay053/ov53_022561C0.c b/src/overlay053/ov53_022561C0.c index d61feae925..d5aacc0529 100644 --- a/src/overlay053/ov53_022561C0.c +++ b/src/overlay053/ov53_022561C0.c @@ -9,7 +9,7 @@ #include "overlay025/poketch_button.h" #include "overlay053/struct_ov53_02256420_decl.h" -#include "struct_defs/union_02022594_020225E0.h" +#include "unk_02022594.h" #include "overlay053/struct_ov53_02256420_1.h" #include "unk_0200D9E8.h" @@ -67,7 +67,7 @@ static BOOL ov53_022561D4 (void ** param0, PoketchSystem * param1, BGL * param2, static BOOL ov53_0225621C (UnkStruct_ov53_0225621C * param0, PoketchSystem * param1, BGL * param2, u32 param3) { - static const UnkUnion_020225E0 v0[] = { + static const TouchScreenHitTable v0[] = { { (80 - (36 / 2)), (80 + (36 / 2)), @@ -110,7 +110,7 @@ static BOOL ov53_0225621C (UnkStruct_ov53_0225621C * param0, PoketchSystem * par param0->unk_00 = 0; param0->unk_01 = 0; param0->unk_02 = 0; - param0->unk_34 = ov25_02255ACC(v0, NELEMS(v0), ov53_02256314, param0, 8); + param0->unk_34 = PoketchButtonManager_Create(v0, NELEMS(v0), ov53_02256314, param0, 8); param0->unk_38 = 0; param0->unk_3C = 0; param0->unk_30 = param1; @@ -123,7 +123,7 @@ static BOOL ov53_0225621C (UnkStruct_ov53_0225621C * param0, PoketchSystem * par static void ov53_022562B8 (UnkStruct_ov53_0225621C * param0) { - ov25_02255B34(param0->unk_34); + PoketchButtonManager_Destroy(param0->unk_34); ov53_02256454(param0->unk_2C); Heap_FreeToHeap(param0); diff --git a/src/overlay054/ov54_022561C0.c b/src/overlay054/ov54_022561C0.c index 858b77ab58..40ca663b36 100644 --- a/src/overlay054/ov54_022561C0.c +++ b/src/overlay054/ov54_022561C0.c @@ -8,7 +8,7 @@ #include "overlay025/poketch_button.h" #include "overlay054/struct_ov54_0225642C_decl.h" -#include "struct_defs/union_02022594_020225E0.h" +#include "unk_02022594.h" #include "overlay054/struct_ov54_0225642C_1.h" #include "unk_0200D9E8.h" @@ -66,7 +66,7 @@ static BOOL ov54_022561D4 (void ** param0, PoketchSystem * param1, BGL * param2, static BOOL ov54_0225621C (UnkStruct_ov54_0225621C * param0, PoketchSystem * param1, BGL * param2, u32 param3) { - static const UnkUnion_020225E0 v0[] = { + static const TouchScreenHitTable v0[] = { { ((48 + 48 * 2) - (36 / 2)), ((48 + 48 * 2) + (36 / 2)), @@ -155,7 +155,7 @@ static BOOL ov54_0225621C (UnkStruct_ov54_0225621C * param0, PoketchSystem * par param0->unk_00 = 0; param0->unk_01 = 0; param0->unk_02 = 0; - param0->unk_A0 = ov25_02255ACC(v0, NELEMS(v0), ov54_02256340, param0, 8); + param0->unk_A0 = PoketchButtonManager_Create(v0, NELEMS(v0), ov54_02256340, param0, 8); param0->unk_A4 = 0; param0->unk_A8 = 0; param0->unk_9C = param1; @@ -168,7 +168,7 @@ static BOOL ov54_0225621C (UnkStruct_ov54_0225621C * param0, PoketchSystem * par static void ov54_022562D4 (UnkStruct_ov54_0225621C * param0) { - ov25_02255B34(param0->unk_A0); + PoketchButtonManager_Destroy(param0->unk_A0); ov54_02256460(param0->unk_98); Heap_FreeToHeap(param0); diff --git a/src/overlay056/ov56_022561C0.c b/src/overlay056/ov56_022561C0.c index bc7e111f85..94cb5cd258 100644 --- a/src/overlay056/ov56_022561C0.c +++ b/src/overlay056/ov56_022561C0.c @@ -18,7 +18,7 @@ #include "struct_defs/struct_0200C738.h" #include "struct_defs/sentence.h" -#include "struct_defs/union_02022594_020225E0.h" +#include "unk_02022594.h" #include "struct_defs/struct_0203330C.h" #include "field/field_system.h" #include "struct_defs/struct_0205AA50.h" @@ -47,7 +47,6 @@ #include "unk_0201D670.h" #include "gx_layers.h" #include "unk_020218BC.h" -#include "unk_02022594.h" #include "strbuf.h" #include "unk_02025E08.h" #include "trainer_info.h" @@ -515,7 +514,7 @@ static void ov56_022568E0 (UnkStruct_ov56_02256468 * param0) } } -static const UnkUnion_02022594 Unk_ov56_02257264[] = { +static const TouchScreenRect Unk_ov56_02257264[] = { {0x0, 0x20, 0xE8, 0xF8}, {0xA0, 0x20, 0xE8, 0xF8}, {0x0, 0x40, 0x0, 0xE8}, @@ -525,7 +524,7 @@ static const UnkUnion_02022594 Unk_ov56_02257264[] = { {0xff, 0x0, 0x0, 0x0} }; -static const UnkUnion_02022594 Unk_ov56_02257250[] = { +static const TouchScreenRect Unk_ov56_02257250[] = { {0x30, 0x90, 0xE8, 0x100}, {0x0, 0x40, 0x0, 0xE8}, {0x40, 0x80, 0x0, 0xE8}, diff --git a/src/overlay058/ov58_021D0D80.c b/src/overlay058/ov58_021D0D80.c index ee6ffe41de..b2171109c3 100644 --- a/src/overlay058/ov58_021D0D80.c +++ b/src/overlay058/ov58_021D0D80.c @@ -11,7 +11,7 @@ #include "struct_decls/struct_02095EAC_decl.h" #include "struct_defs/struct_02015958.h" -#include "struct_defs/union_02022594_020225E0.h" +#include "unk_02022594.h" #include "struct_defs/struct_0203DDFC.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02095EAC_t.h" @@ -51,7 +51,6 @@ #include "unk_0201F834.h" #include "gx_layers.h" #include "unk_020218BC.h" -#include "unk_02022594.h" #include "strbuf.h" #include "trainer_info.h" #include "unk_020279FC.h" @@ -785,7 +784,7 @@ static void ov58_021D1A10 (GraphicElementData * param0, int param1, int param2) sub_02021C50(param0, &v0); } -static const UnkUnion_02022594 Unk_ov58_021D2EB8[] = { +static const TouchScreenRect Unk_ov58_021D2EB8[] = { {0x96, 0xBD, 0x0, 0x17}, {0x96, 0xBD, 0x18, 0x2F}, {0x96, 0xBD, 0x30, 0x47}, @@ -801,12 +800,12 @@ static const UnkUnion_02022594 Unk_ov58_021D2EB8[] = { {0xFF, 0x0, 0x0, 0x0} }; -static const UnkUnion_02022594 Unk_ov58_021D2DD4[] = { +static const TouchScreenRect Unk_ov58_021D2DD4[] = { {0x30, 0x70, 0xC8, 0xF8}, {0xFF, 0x0, 0x0, 0x0} }; -static const UnkUnion_02022594 Unk_ov58_021D2DDC[] = { +static const TouchScreenRect Unk_ov58_021D2DDC[] = { {0x10, 0x88, 0x8, 0xF8}, {0xFF, 0x0, 0x0, 0x0} }; diff --git a/src/overlay062/ov62_0222F2C0.c b/src/overlay062/ov62_0222F2C0.c index 0270ab0914..673df0ad02 100644 --- a/src/overlay062/ov62_0222F2C0.c +++ b/src/overlay062/ov62_0222F2C0.c @@ -696,19 +696,19 @@ void ov62_0222FF7C (UnkStruct_0208C06C * param0) for (v0 = 0; v0 < 5; v0++) { if (param0->unk_818[v0].unk_00 == 0) { - param0->unk_534.unk_C8[v0].unk_10->val1.unk_00 = 0; - param0->unk_534.unk_C8[v0].unk_10->val1.unk_01 = 0; - param0->unk_534.unk_C8[v0].unk_10->val1.unk_02 = 0; - param0->unk_534.unk_C8[v0].unk_10->val1.unk_03 = 0; + param0->unk_534.unk_C8[v0].unk_10->rect.top = 0; + param0->unk_534.unk_C8[v0].unk_10->rect.bottom = 0; + param0->unk_534.unk_C8[v0].unk_10->rect.left = 0; + param0->unk_534.unk_C8[v0].unk_10->rect.right = 0; continue; } SpriteActor_GetSpritePositionXY(param0->unk_534.unk_C8[v0].unk_00, &v1, &v2); - param0->unk_534.unk_C8[v0].unk_10->val1.unk_00 = v2 - 16; - param0->unk_534.unk_C8[v0].unk_10->val1.unk_01 = v2 + 16; - param0->unk_534.unk_C8[v0].unk_10->val1.unk_02 = v1 - 0; - param0->unk_534.unk_C8[v0].unk_10->val1.unk_03 = v1 + 160; + param0->unk_534.unk_C8[v0].unk_10->rect.top = v2 - 16; + param0->unk_534.unk_C8[v0].unk_10->rect.bottom = v2 + 16; + param0->unk_534.unk_C8[v0].unk_10->rect.left = v1 - 0; + param0->unk_534.unk_C8[v0].unk_10->rect.right = v1 + 160; } } @@ -719,10 +719,10 @@ void ov62_02230014 (UnkStruct_0208C06C * param0) for (v0 = 0; v0 < 5; v0++) { SpriteActor_GetSpritePositionXY(param0->unk_534.unk_C8[v0].unk_00, &v1, &v2); - param0->unk_534.unk_C8[v0].unk_10->val1.unk_00 = 0; - param0->unk_534.unk_C8[v0].unk_10->val1.unk_01 = 0; - param0->unk_534.unk_C8[v0].unk_10->val1.unk_02 = 0; - param0->unk_534.unk_C8[v0].unk_10->val1.unk_03 = 0; + param0->unk_534.unk_C8[v0].unk_10->rect.top = 0; + param0->unk_534.unk_C8[v0].unk_10->rect.bottom = 0; + param0->unk_534.unk_C8[v0].unk_10->rect.left = 0; + param0->unk_534.unk_C8[v0].unk_10->rect.right = 0; } } diff --git a/src/overlay062/ov62_02231690.c b/src/overlay062/ov62_02231690.c index eed1310bee..dccdcb0a0b 100644 --- a/src/overlay062/ov62_02231690.c +++ b/src/overlay062/ov62_02231690.c @@ -19,7 +19,7 @@ #include "struct_defs/struct_0200D0F4.h" #include "struct_defs/sentence.h" -#include "struct_defs/union_02022594_020225E0.h" +#include "unk_02022594.h" #include "struct_defs/struct_02030A80.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0208B878.h" @@ -53,7 +53,6 @@ #include "unk_02018340.h" #include "unk_0201D670.h" #include "gx_layers.h" -#include "unk_02022594.h" #include "strbuf.h" #include "savedata_misc.h" #include "unk_0202CD50.h" @@ -2029,7 +2028,7 @@ int ov62_02232F68 (UnkStruct_ov62_02233310 * param0, UnkStruct_0208C06C * param1 if (param0->unk_28->unk_28 != NULL) { for (v0 = 0; v0 < param0->unk_10; v0++) { - if (sub_02022760(¶m0->unk_28->unk_28[v0])) { + if (TouchScreen_LocationPressed(¶m0->unk_28->unk_28[v0])) { ov62_02234520(param1); v1 = param0->unk_28->unk_00[param0->unk_08 + v0].unk_04; } @@ -2434,7 +2433,7 @@ void ov62_02233608 (UnkStruct_ov62_0223359C * param0, u32 param1) } } -static const UnkUnion_020225E0 Unk_ov62_022488F0[] = { +static const TouchScreenHitTable Unk_ov62_022488F0[] = { {0x8, 0x80, 0x8, 0x20}, {0x8, 0x80, 0xE0, 0xF8} }; @@ -2479,8 +2478,8 @@ void ov62_02233664 (UnkStruct_ov62_0223359C * param0) return; } - if (sub_02022734(&Unk_ov62_022488F0[0]) - || sub_02022734(&Unk_ov62_022488F0[1])) { + if (TouchScreen_LocationHeld(&Unk_ov62_022488F0[0]) + || TouchScreen_LocationHeld(&Unk_ov62_022488F0[1])) { v4 = 1; } diff --git a/src/overlay062/ov62_02234A10.c b/src/overlay062/ov62_02234A10.c index 2d1b6533d3..4862df4e7b 100644 --- a/src/overlay062/ov62_02234A10.c +++ b/src/overlay062/ov62_02234A10.c @@ -133,7 +133,7 @@ static BOOL ov62_02234AB4 (UnkStruct_0208C06C * param0) } break; case 6: - if (sub_0202278C() == 1) { + if (TouchScreen_Touched() == 1) { ov62_02234A90(param0); sub_0208B9E0(param0->unk_6F0, 0); sub_0208BA54(param0->unk_6F4); diff --git a/src/overlay062/ov62_02235278.c b/src/overlay062/ov62_02235278.c index 3c0b735f0b..4f3fe550b1 100644 --- a/src/overlay062/ov62_02235278.c +++ b/src/overlay062/ov62_02235278.c @@ -5,7 +5,7 @@ #include "struct_decls/sys_task.h" -#include "struct_defs/union_02022594_020225E0.h" +#include "unk_02022594.h" #include "struct_defs/struct_0208C06C.h" #include "overlay062/struct_ov62_022354A4.h" #include "overlay062/struct_ov62_02235580.h" @@ -18,7 +18,6 @@ #include "unk_02012744.h" #include "heap.h" #include "gx_layers.h" -#include "unk_02022594.h" #include "unk_0208B284.h" #include "overlay062/ov62_0222F2C0.h" #include "overlay062/ov62_022300D8.h" @@ -66,16 +65,16 @@ static BOOL ov62_02235278 (UnkStruct_0208C06C * param0) static int ov62_022352DC (void) { - static const UnkUnion_020225E0 v0[] = { + static const TouchScreenHitTable v0[] = { {0, 192, 0, 8}, {0, 192, 248, 256}, }; - if (sub_02022734(&v0[0])) { + if (TouchScreen_LocationHeld(&v0[0])) { return 1; } - if (sub_02022734(&v0[1])) { + if (TouchScreen_LocationHeld(&v0[1])) { return 2; } diff --git a/src/overlay062/ov62_02235E64.c b/src/overlay062/ov62_02235E64.c index a2935da56b..9051c6dd32 100644 --- a/src/overlay062/ov62_02235E64.c +++ b/src/overlay062/ov62_02235E64.c @@ -6,7 +6,7 @@ #include "strbuf.h" #include "struct_decls/struct_02023FCC_decl.h" -#include "struct_defs/union_02022594_020225E0.h" +#include "unk_02022594.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0208C06C.h" #include "overlay062/struct_ov62_022312B0.h" @@ -23,7 +23,6 @@ #include "unk_02018340.h" #include "unk_0201D670.h" #include "gx_layers.h" -#include "unk_02022594.h" #include "strbuf.h" #include "unk_02023FCC.h" #include "savedata.h" @@ -78,7 +77,7 @@ BOOL(*const Unk_ov62_02248C28[])(UnkStruct_0208C06C *) = { ov62_02236920, }; -static const UnkUnion_02022594 Unk_ov62_02248C1C[] = { +static const TouchScreenRect Unk_ov62_02248C1C[] = { {0x10, 0x30, 0x40, 0xC8}, {0x40, 0x70, 0x58, 0xA8}, {0x98, 0xB8, 0x50, 0xB0} @@ -278,7 +277,7 @@ static BOOL ov62_0223618C (UnkStruct_0208C06C * param0) return 0; } -static const UnkUnion_02022594 Unk_ov62_02248C14[] = { +static const TouchScreenRect Unk_ov62_02248C14[] = { {0x28, 0x48, 0x20, 0x78}, {0x28, 0x48, 0x90, 0xE8} }; @@ -382,7 +381,7 @@ static BOOL ov62_022363CC (UnkStruct_0208C06C * param0) sub_02003A2C(param0->unk_14.unk_14, 3, 0xC, v0->unk_08, param0->unk_14.unk_44); break; case 4: - if (sub_02022760(&Unk_ov62_02248C14[0])) { + if (TouchScreen_LocationPressed(&Unk_ov62_02248C14[0])) { v0->unk_198 = 1; ov62_02234520(param0); @@ -393,7 +392,7 @@ static BOOL ov62_022363CC (UnkStruct_0208C06C * param0) } param0->unk_08++; - } else if (sub_02022760(&Unk_ov62_02248C14[1])) { + } else if (TouchScreen_LocationPressed(&Unk_ov62_02248C14[1])) { v0->unk_198 = 2; ov62_02234520(param0); diff --git a/src/overlay062/ov62_02237D24.c b/src/overlay062/ov62_02237D24.c index 0428b0b8d5..da7c307530 100644 --- a/src/overlay062/ov62_02237D24.c +++ b/src/overlay062/ov62_02237D24.c @@ -11,7 +11,7 @@ #include "overlay062/const_ov62_022491F0.h" -#include "struct_defs/union_02022594_020225E0.h" +#include "unk_02022594.h" #include "struct_defs/struct_02030A80.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0208C06C.h" @@ -39,7 +39,6 @@ #include "unk_0201D670.h" #include "unk_0201DBEC.h" #include "gx_layers.h" -#include "unk_02022594.h" #include "strbuf.h" #include "unk_02023FCC.h" #include "unk_0202419C.h" @@ -165,16 +164,16 @@ BOOL(*const Unk_ov62_02248D20[])(UnkStruct_0208C06C *) = { ov62_0223921C, }; -static const UnkUnion_02022594 Unk_ov62_02248CB0[] = { +static const TouchScreenRect Unk_ov62_02248CB0[] = { {0x98, 0xB8, 0x20, 0x80}, {0x98, 0xB8, 0x80, 0xE0} }; -static const UnkUnion_02022594 Unk_ov62_02248CAC[] = { +static const TouchScreenRect Unk_ov62_02248CAC[] = { {0x98, 0xB8, 0x50, 0xB0} }; -static const UnkUnion_02022594 Unk_ov62_02248CC4[] = { +static const TouchScreenRect Unk_ov62_02248CC4[] = { {0x18, 0x28, 0x38, 0xC0}, {0x28, 0x38, 0x38, 0xC0}, {0x38, 0x48, 0x38, 0xC0}, @@ -183,7 +182,7 @@ static const UnkUnion_02022594 Unk_ov62_02248CC4[] = { {0x68, 0x78, 0x38, 0xC0} }; -static const UnkUnion_02022594 Unk_ov62_02248CB8[] = { +static const TouchScreenRect Unk_ov62_02248CB8[] = { {0x10, 0x30, 0x38, 0xC8}, {0x48, 0x68, 0x18, 0x48}, {0x48, 0x68, 0xB8, 0xE8} @@ -343,12 +342,12 @@ static BOOL ov62_02238048 (UnkStruct_0208C06C * param0) { UnkStruct_ov62_02237D24 * v0 = param0->unk_860; - if (sub_02022760(&Unk_ov62_02248CB0[0])) { + if (TouchScreen_LocationPressed(&Unk_ov62_02248CB0[0])) { ov62_02234520(param0); ov62_0222FB60(param0, 5); } - if (sub_02022760(&Unk_ov62_02248CB0[1])) { + if (TouchScreen_LocationPressed(&Unk_ov62_02248CB0[1])) { ov62_02234520(param0); ov62_0222FB60(param0, 4); } @@ -624,7 +623,7 @@ static BOOL ov62_02238610 (UnkStruct_0208C06C * param0) case 2: sub_0202404C(v0->unk_1D0[0]); - if (sub_02022760(&Unk_ov62_02248CAC[0]) + if (TouchScreen_LocationPressed(&Unk_ov62_02248CAC[0]) || (v0->unk_1D4.unk_10 == 1)) { ov62_02234520(param0); param0->unk_08++; @@ -707,7 +706,7 @@ static BOOL ov62_02238794 (UnkStruct_0208C06C * param0) } } - if (sub_02022760(&Unk_ov62_02248CAC[0])) { + if (TouchScreen_LocationPressed(&Unk_ov62_02248CAC[0])) { ov62_02234520(param0); param0->unk_08++; } @@ -960,17 +959,17 @@ static BOOL ov62_02238E54 (UnkStruct_0208C06C * param0) { UnkStruct_ov62_02237D24 * v0 = param0->unk_860; - if (sub_02022760(&Unk_ov62_02248CAC[0])) { + if (TouchScreen_LocationPressed(&Unk_ov62_02248CAC[0])) { ov62_02234520(param0); ov62_0222FB60(param0, 9); } - if (sub_02022760(&Unk_ov62_02248CB8[0])) { + if (TouchScreen_LocationPressed(&Unk_ov62_02248CB8[0])) { ov62_02234520(param0); ov62_0222FB60(param0, 10); } - if (sub_02022760(&Unk_ov62_02248CB8[1])) { + if (TouchScreen_LocationPressed(&Unk_ov62_02248CB8[1])) { if (v0->unk_230.unk_04 != 0) { v0->unk_230.unk_04--; } else { @@ -981,7 +980,7 @@ static BOOL ov62_02238E54 (UnkStruct_0208C06C * param0) ov62_0222FB60(param0, 11); } - if (sub_02022760(&Unk_ov62_02248CB8[2])) { + if (TouchScreen_LocationPressed(&Unk_ov62_02248CB8[2])) { v0->unk_230.unk_04++; v0->unk_230.unk_04 %= v0->unk_2E4; ov62_02234520(param0); diff --git a/src/overlay062/ov62_02239D60.c b/src/overlay062/ov62_02239D60.c index cfdf1e307d..ddb22c7484 100644 --- a/src/overlay062/ov62_02239D60.c +++ b/src/overlay062/ov62_02239D60.c @@ -14,7 +14,7 @@ #include "struct_defs/archived_sprite.h" #include "struct_defs/struct_0200D0F4.h" -#include "struct_defs/union_02022594_020225E0.h" +#include "unk_02022594.h" #include "struct_defs/struct_02030A80.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0208C06C.h" @@ -39,7 +39,6 @@ #include "unk_02018340.h" #include "unk_0201D670.h" #include "gx_layers.h" -#include "unk_02022594.h" #include "strbuf.h" #include "unk_02023FCC.h" #include "savedata/save_table.h" @@ -217,14 +216,14 @@ static void ov62_02239DBC (UnkStruct_ov62_02239DBC * param0) } } -static const UnkUnion_02022594 Unk_ov62_02248DB4[] = { +static const TouchScreenRect Unk_ov62_02248DB4[] = { {0x20, 0x40, 0x18, 0x48}, {0x20, 0x40, 0xB8, 0xE0}, {0x98, 0xB8, 0x20, 0x80}, {0x98, 0xB8, 0x80, 0xE0} }; -static const UnkUnion_02022594 Unk_ov62_02248DDC[] = { +static const TouchScreenRect Unk_ov62_02248DDC[] = { {0x18, 0x28, 0x18, 0x68}, {0x18, 0x28, 0x90, 0xD0}, {0x40, 0x50, 0x18, 0x68}, @@ -234,13 +233,13 @@ static const UnkUnion_02022594 Unk_ov62_02248DDC[] = { {0x98, 0xB8, 0x50, 0xB0} }; -static const UnkUnion_02022594 Unk_ov62_02248D6C[] = { +static const TouchScreenRect Unk_ov62_02248D6C[] = { {0x10, 0x30, 0x58, 0xA8}, {0x40, 0x70, 0x58, 0xA8}, {0x98, 0xB8, 0x50, 0xB0} }; -static const UnkUnion_02022594 Unk_ov62_02248D54[] = { +static const TouchScreenRect Unk_ov62_02248D54[] = { {0x20, 0x60, 0x48, 0xB8}, {0x98, 0xB8, 0x50, 0xB0} }; diff --git a/src/overlay062/ov62_0223CAEC.c b/src/overlay062/ov62_0223CAEC.c index 3f8b2895b5..1e6f0643fb 100644 --- a/src/overlay062/ov62_0223CAEC.c +++ b/src/overlay062/ov62_0223CAEC.c @@ -7,7 +7,7 @@ #include "strbuf.h" #include "struct_decls/struct_02023FCC_decl.h" -#include "struct_defs/union_02022594_020225E0.h" +#include "unk_02022594.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0208C06C.h" #include "overlay061/struct_ov61_0222BDAC.h" @@ -850,7 +850,7 @@ static void ov62_0223D518 (UnkStruct_ov62_0223D518 * param0) param0->unk_20 = v0[param0->unk_14]; } -static const UnkUnion_02022594 Unk_ov62_02248E94[] = { +static const TouchScreenRect Unk_ov62_02248E94[] = { {0x18, 0x38, 0x30, 0xD0}, {0x50, 0x70, 0x30, 0xD0}, {0x98, 0xB8, 0x50, 0xB0} diff --git a/src/overlay062/ov62_0223DFA8.c b/src/overlay062/ov62_0223DFA8.c index 9ec798cdf6..0ba58f3134 100644 --- a/src/overlay062/ov62_0223DFA8.c +++ b/src/overlay062/ov62_0223DFA8.c @@ -8,7 +8,7 @@ #include "struct_decls/struct_02023FCC_decl.h" #include "struct_decls/struct_0202F41C_decl.h" -#include "struct_defs/union_02022594_020225E0.h" +#include "unk_02022594.h" #include "struct_defs/struct_02030A80.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0208C06C.h" @@ -36,7 +36,6 @@ #include "unk_02018340.h" #include "unk_0201D670.h" #include "gx_layers.h" -#include "unk_02022594.h" #include "strbuf.h" #include "unk_02023FCC.h" #include "unk_0202F1D4.h" @@ -90,30 +89,30 @@ static const UnkStruct_ov62_02248CDC Unk_ov62_02248FD8 = { NULL }; -static const UnkUnion_02022594 Unk_ov62_02248FC8[] = { +static const TouchScreenRect Unk_ov62_02248FC8[] = { {0x10, 0x30, 0x40, 0xC8}, {0x40, 0x70, 0x58, 0xA8}, {0x98, 0xB8, 0x80, 0xE0}, {0x98, 0xB8, 0x20, 0x80} }; -static const UnkUnion_02022594 Unk_ov62_02248F98[] = { +static const TouchScreenRect Unk_ov62_02248F98[] = { {0x19, 0x39, 0x32, 0xD2}, {0x3D, 0x5D, 0x32, 0xD2}, {0x61, 0x81, 0x32, 0xD2}, {0x85, 0xA5, 0x32, 0xD2} }; -static const UnkUnion_02022594 Unk_ov62_02248F84[] = { +static const TouchScreenRect Unk_ov62_02248F84[] = { {0x28, 0x48, 0x20, 0x78}, {0x28, 0x48, 0x90, 0xE8} }; -static const UnkUnion_02022594 Unk_ov62_02248F80[] = { +static const TouchScreenRect Unk_ov62_02248F80[] = { {0x98, 0xB8, 0x50, 0xB0} }; -static const UnkUnion_02022594 Unk_ov62_02248F7C[] = { +static const TouchScreenRect Unk_ov62_02248F7C[] = { {0x20, 0x60, 0x50, 0xB0} }; @@ -1287,7 +1286,7 @@ static BOOL ov62_0223F984 (UnkStruct_0208C06C * param0) sub_0208B8EC(param0->unk_6F0, 16, 76 + (param0->unk_14.unk_48C.unk_38.unk_04 * 24)); ov62_02240E30(param0); - if (sub_02022760(&Unk_ov62_02248F7C[0])) { + if (TouchScreen_LocationPressed(&Unk_ov62_02248F7C[0])) { ov62_02234520(param0); if (param0->unk_8B4.unk_1D58[param0->unk_14.unk_48C.unk_38.unk_00] != NULL) { v0->unk_1FBC = 6; @@ -1296,7 +1295,7 @@ static BOOL ov62_0223F984 (UnkStruct_0208C06C * param0) } } - if (sub_02022760(&Unk_ov62_02248F80[0])) { + if (TouchScreen_LocationPressed(&Unk_ov62_02248F80[0])) { ov62_02234520(param0); v0->unk_1FBC = 5; param0->unk_08++; diff --git a/src/overlay062/ov62_02241204.c b/src/overlay062/ov62_02241204.c index 4e15776439..1f57826e7a 100644 --- a/src/overlay062/ov62_02241204.c +++ b/src/overlay062/ov62_02241204.c @@ -13,7 +13,7 @@ #include "overlay062/const_ov62_022491F0.h" -#include "struct_defs/union_02022594_020225E0.h" +#include "unk_02022594.h" #include "struct_defs/struct_02030A80.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0208C06C.h" @@ -43,7 +43,6 @@ #include "unk_02018340.h" #include "unk_0201D670.h" #include "gx_layers.h" -#include "unk_02022594.h" #include "strbuf.h" #include "unk_02023FCC.h" #include "unk_02025E08.h" @@ -234,34 +233,34 @@ static u16 Unk_ov62_02249944[] = { 0x1ED }; -static const UnkUnion_02022594 Unk_ov62_0224919C[] = { +static const TouchScreenRect Unk_ov62_0224919C[] = { {0x10, 0x30, 0x40, 0xC8}, {0x40, 0x70, 0x58, 0xA8}, {0x98, 0xB8, 0x80, 0xE0}, {0x98, 0xB8, 0x20, 0x80} }; -static const UnkUnion_02022594 Unk_ov62_0224915C[] = { +static const TouchScreenRect Unk_ov62_0224915C[] = { {0x19, 0x39, 0x32, 0xD2}, {0x3D, 0x5D, 0x32, 0xD2}, {0x61, 0x81, 0x32, 0xD2}, {0x85, 0xA5, 0x32, 0xD2} }; -static const UnkUnion_02022594 Unk_ov62_0224913C[] = { +static const TouchScreenRect Unk_ov62_0224913C[] = { {0x28, 0x48, 0x20, 0x78}, {0x28, 0x48, 0x90, 0xE8} }; -static const UnkUnion_02022594 Unk_ov62_02249138[] = { +static const TouchScreenRect Unk_ov62_02249138[] = { {0x98, 0xB8, 0x50, 0xB0} }; -static const UnkUnion_02022594 Unk_ov62_02249134[] = { +static const TouchScreenRect Unk_ov62_02249134[] = { {0x20, 0x60, 0x50, 0xB0} }; -static const UnkUnion_02022594 Unk_ov62_022491AC[] = { +static const TouchScreenRect Unk_ov62_022491AC[] = { {0x10, 0x30, 0x28, 0xD8}, {0x38, 0x58, 0x28, 0xD8}, {0x60, 0x80, 0x28, 0xD8}, @@ -269,7 +268,7 @@ static const UnkUnion_02022594 Unk_ov62_022491AC[] = { {0x98, 0xB8, 0x80, 0xE0} }; -const UnkUnion_02022594 Unk_ov62_022491F0[9] = { +const TouchScreenRect Unk_ov62_022491F0[9] = { {0x18, 0x30, 0x28, 0x48}, {0x18, 0x30, 0x70, 0x90}, {0x18, 0x30, 0xB8, 0xD8}, @@ -1052,7 +1051,7 @@ static const UnkStruct_ov62_02249380 Unk_ov62_022494A8[] = { {0xBF, UnkEnum_0202F510_32, 0x0} }; -static const UnkUnion_02022594 Unk_ov62_02249150[] = { +static const TouchScreenRect Unk_ov62_02249150[] = { {0x18, 0x38, 0x30, 0xD0}, {0x38, 0x58, 0x30, 0xD0}, {0x58, 0x78, 0x30, 0xD0} @@ -1134,7 +1133,7 @@ static BOOL ov62_022420B0 (UnkStruct_0208C06C * param0) } } - if (sub_02022760(&Unk_ov62_02249138[0])) { + if (TouchScreen_LocationPressed(&Unk_ov62_02249138[0])) { ov62_02234520(param0); param0->unk_08++; } @@ -1164,7 +1163,7 @@ static BOOL ov62_022420B0 (UnkStruct_0208C06C * param0) return 0; } -static const UnkUnion_02022594 Unk_ov62_022491C0[] = { +static const TouchScreenRect Unk_ov62_022491C0[] = { {0x18, 0x28, 0x38, 0xC0}, {0x28, 0x38, 0x38, 0xC0}, {0x38, 0x48, 0x38, 0xC0}, @@ -1370,7 +1369,7 @@ static BOOL ov62_02242400 (UnkStruct_0208C06C * param0) case 2: sub_0202404C(v0->unk_608[1]); - if (sub_02022760(&Unk_ov62_02249138[0]) + if (TouchScreen_LocationPressed(&Unk_ov62_02249138[0]) || (v0->unk_4C8.unk_10 == 1)) { ov62_02234520(param0); param0->unk_08++; @@ -1456,7 +1455,7 @@ static BOOL ov62_02242534 (UnkStruct_0208C06C * param0) } } - if (sub_02022760(&Unk_ov62_02249138[0])) { + if (TouchScreen_LocationPressed(&Unk_ov62_02249138[0])) { v0->unk_4C0 = 0xffff; ov62_02234520(param0); param0->unk_08++; @@ -1623,7 +1622,7 @@ static const UnkStruct_ov62_02249380 Unk_ov62_0224918C[] = { {0x10, 0xD, 0x0} }; -static const UnkUnion_02022594 Unk_ov62_02249130[] = { +static const TouchScreenRect Unk_ov62_02249130[] = { {0x18, 0x38, 0x38, 0xC8} }; @@ -1684,7 +1683,7 @@ static BOOL ov62_02242970 (UnkStruct_0208C06C * param0) } } - if (sub_02022760(&Unk_ov62_02249138[0])) { + if (TouchScreen_LocationPressed(&Unk_ov62_02249138[0])) { ov62_02234520(param0); param0->unk_08++; } @@ -1936,13 +1935,13 @@ static BOOL ov62_02242F74 (UnkStruct_0208C06C * param0) sub_0208B8EC(param0->unk_6F0, 16, 76 + (param0->unk_14.unk_48C.unk_38.unk_04 * 24)); ov62_022414C0(param0); - if (sub_02022760(&Unk_ov62_02249134[0])) { + if (TouchScreen_LocationPressed(&Unk_ov62_02249134[0])) { ov62_02234520(param0); v0->unk_0C = 17; param0->unk_08++; } - if (sub_02022760(&Unk_ov62_02249138[0])) { + if (TouchScreen_LocationPressed(&Unk_ov62_02249138[0])) { ov62_02234520(param0); v0->unk_0C = 16; param0->unk_08++; diff --git a/src/overlay062/ov62_02246B00.c b/src/overlay062/ov62_02246B00.c index c08298326a..6d086e6e6d 100644 --- a/src/overlay062/ov62_02246B00.c +++ b/src/overlay062/ov62_02246B00.c @@ -413,20 +413,20 @@ void ov62_02247220 (UnkStruct_ov62_02246BF4 * param0) }; for ( ; v0 < 24; v0++) { - param0->unk_220.unk_18[v0].val1.unk_00 = v1[v0 - 12][1] - v1[v0 - 12][3]; - param0->unk_220.unk_18[v0].val1.unk_02 = v1[v0 - 12][0] - v1[v0 - 12][2]; - param0->unk_220.unk_18[v0].val1.unk_01 = v1[v0 - 12][1] + v1[v0 - 12][3]; - param0->unk_220.unk_18[v0].val1.unk_03 = v1[v0 - 12][0] + v1[v0 - 12][2]; + param0->unk_220.unk_18[v0].rect.top = v1[v0 - 12][1] - v1[v0 - 12][3]; + param0->unk_220.unk_18[v0].rect.left = v1[v0 - 12][0] - v1[v0 - 12][2]; + param0->unk_220.unk_18[v0].rect.bottom = v1[v0 - 12][1] + v1[v0 - 12][3]; + param0->unk_220.unk_18[v0].rect.right = v1[v0 - 12][0] + v1[v0 - 12][2]; } - param0->unk_220.unk_18[22].val1.unk_00 = 152; - param0->unk_220.unk_18[22].val1.unk_02 = 32; - param0->unk_220.unk_18[22].val1.unk_01 = 152 + 32; - param0->unk_220.unk_18[22].val1.unk_03 = 128; - param0->unk_220.unk_18[23].val1.unk_00 = 152; - param0->unk_220.unk_18[23].val1.unk_02 = 128; - param0->unk_220.unk_18[23].val1.unk_01 = 152 + 32; - param0->unk_220.unk_18[23].val1.unk_03 = 224; + param0->unk_220.unk_18[22].rect.top = 152; + param0->unk_220.unk_18[22].rect.left = 32; + param0->unk_220.unk_18[22].rect.bottom = 152 + 32; + param0->unk_220.unk_18[22].rect.right = 128; + param0->unk_220.unk_18[23].rect.top = 152; + param0->unk_220.unk_18[23].rect.left = 128; + param0->unk_220.unk_18[23].rect.bottom = 152 + 32; + param0->unk_220.unk_18[23].rect.right = 224; } param0->unk_220.unk_14 = sub_02023FCC(param0->unk_220.unk_18, 24, ov62_0224730C, param0, 102); @@ -762,8 +762,8 @@ void ov62_022479D4 (UnkStruct_ov62_02246BF4 * param0, int param1) { s16 v0, v1; - v0 = (param0->unk_220.unk_18[param1 + 12].val1.unk_02 + param0->unk_220.unk_18[param1 + 12].val1.unk_03) / 2; - v1 = (param0->unk_220.unk_18[param1 + 12].val1.unk_00 + param0->unk_220.unk_18[param1 + 12].val1.unk_01) / 2; + v0 = (param0->unk_220.unk_18[param1 + 12].rect.left + param0->unk_220.unk_18[param1 + 12].rect.right) / 2; + v1 = (param0->unk_220.unk_18[param1 + 12].rect.top + param0->unk_220.unk_18[param1 + 12].rect.bottom) / 2; SpriteActor_SetSpritePositionXY(param0->unk_188[1].unk_0C, v0 - 0, v1 - 8); } @@ -772,8 +772,8 @@ void ov62_02247A20 (UnkStruct_ov62_02246BF4 * param0, int param1, int param2) { s16 v0, v1; - v0 = (param0->unk_220.unk_18[param1 + 12].val1.unk_02 + param0->unk_220.unk_18[param1 + 12].val1.unk_03) / 2; - v1 = (param0->unk_220.unk_18[param1 + 12].val1.unk_00 + param0->unk_220.unk_18[param1 + 12].val1.unk_01) / 2; + v0 = (param0->unk_220.unk_18[param1 + 12].rect.left + param0->unk_220.unk_18[param1 + 12].rect.right) / 2; + v1 = (param0->unk_220.unk_18[param1 + 12].rect.top + param0->unk_220.unk_18[param1 + 12].rect.bottom) / 2; SpriteActor_SetSpritePositionXY(param0->unk_188[param2].unk_0C, v0 - 0, v1 - 8); } @@ -923,13 +923,13 @@ static inline void inline_ov62_02247CE0 (UnkStruct_ov62_02246BF4 * param0, int p SpriteActor_GetSpritePositionXY(v2->unk_0C, &v0, &v1); - v2->unk_10->val1.unk_00 = v1 - param3; - v2->unk_10->val1.unk_02 = v0 - param2; - v2->unk_10->val1.unk_01 = v1 + param3; - v2->unk_10->val1.unk_03 = v0 + param2; + v2->unk_10->rect.top = v1 - param3; + v2->unk_10->rect.left = v0 - param2; + v2->unk_10->rect.bottom = v1 + param3; + v2->unk_10->rect.right = v0 + param2; if (param1 == 0) { - v2->unk_10->val1.unk_02 -= 4; + v2->unk_10->rect.left -= 4; } } diff --git a/src/overlay062/ov62_02247D74.c b/src/overlay062/ov62_02247D74.c index fc951e214c..5875d111d6 100644 --- a/src/overlay062/ov62_02247D74.c +++ b/src/overlay062/ov62_02247D74.c @@ -5,7 +5,7 @@ #include "strbuf.h" -#include "struct_defs/union_02022594_020225E0.h" +#include "unk_02022594.h" #include "struct_defs/struct_02030A80.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0208C06C.h" @@ -18,7 +18,6 @@ #include "unk_02018340.h" #include "unk_0201D670.h" #include "gx_layers.h" -#include "unk_02022594.h" #include "strbuf.h" #include "unk_02030A80.h" #include "overlay062/ov62_0222F2C0.h" @@ -194,7 +193,7 @@ static BOOL ov62_02247FFC (UnkStruct_0208C06C * param0) return 0; } -static const UnkUnion_02022594 Unk_ov62_02249788[] = { +static const TouchScreenRect Unk_ov62_02249788[] = { {0x28, 0x48, 0x20, 0x78}, {0x28, 0x48, 0x90, 0xE8} }; @@ -227,11 +226,11 @@ static BOOL ov62_02248114 (UnkStruct_0208C06C * param0) sub_02003A2C(param0->unk_14.unk_14, 3, 0xC, v0->unk_08, param0->unk_14.unk_44); break; case 2: - if (sub_02022760(&Unk_ov62_02249788[0])) { + if (TouchScreen_LocationPressed(&Unk_ov62_02249788[0])) { ov62_02234520(param0); ov62_02247DD8(param0, 283, 0); param0->unk_08++; - } else if (sub_02022760(&Unk_ov62_02249788[1])) { + } else if (TouchScreen_LocationPressed(&Unk_ov62_02249788[1])) { ov62_02234520(param0); v0->unk_0C = 1; ov62_02247DB4(param0); @@ -240,12 +239,12 @@ static BOOL ov62_02248114 (UnkStruct_0208C06C * param0) break; case 3: - if (sub_02022760(&Unk_ov62_02249788[0])) { + if (TouchScreen_LocationPressed(&Unk_ov62_02249788[0])) { ov62_02234520(param0); ov62_022342BC(param0); v0->unk_0C = 0; param0->unk_08++; - } else if (sub_02022760(&Unk_ov62_02249788[1])) { + } else if (TouchScreen_LocationPressed(&Unk_ov62_02249788[1])) { ov62_02234520(param0); ov62_02247DB4(param0); v0->unk_0C = 1; diff --git a/src/overlay065/ov65_0222DCE0.c b/src/overlay065/ov65_0222DCE0.c index 8fd019d228..41869b496f 100644 --- a/src/overlay065/ov65_0222DCE0.c +++ b/src/overlay065/ov65_0222DCE0.c @@ -24,7 +24,7 @@ #include "overlay065/struct_ov65_0222EBE0_decl.h" #include "struct_defs/struct_020127E8.h" -#include "struct_defs/union_02022594_020225E0.h" +#include "unk_02022594.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0207DFAC.h" #include "struct_defs/struct_0207E060.h" @@ -302,7 +302,7 @@ static const u8 Unk_ov65_02238930[3] = { 0x5 }; -static const UnkUnion_020225E0 Unk_ov65_0223895C[3] = { +static const TouchScreenHitTable Unk_ov65_0223895C[3] = { {0xA0, 0xC0, 0x8, 0x40}, {0xA0, 0xC0, 0x50, 0xB0}, {0xA0, 0xC0, 0xC0, 0xF8} @@ -4940,7 +4940,7 @@ static BOOL ov65_02232FCC (const UnkStruct_ov65_0222EBE0 * param0) static void ov65_02232FE0 (UnkStruct_ov65_0222EBE0 * param0, NARC * param1, u32 param2) { - static const UnkUnion_020225E0 v0[8] = { + static const TouchScreenHitTable v0[8] = { {0, 47, 0, 119}, {48, 95, 0, 119}, {96, 143, 0, 119}, diff --git a/src/overlay070/ov70_0225D9A4.c b/src/overlay070/ov70_0225D9A4.c index e7dd37ef2e..302d9fa01e 100644 --- a/src/overlay070/ov70_0225D9A4.c +++ b/src/overlay070/ov70_0225D9A4.c @@ -32,7 +32,7 @@ #include "struct_defs/struct_0200C738.h" #include "struct_defs/struct_02013A04_t.h" -#include "struct_defs/union_02022594_020225E0.h" +#include "unk_02022594.h" #include "struct_defs/options.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0207C690.h" @@ -3092,7 +3092,7 @@ static void ov70_02260744 (UnkStruct_ov70_02260744 * param0, UnkStruct_ov70_0225 } { - static const UnkUnion_020225E0 v1 = {32, 160, 40, 216}; + static const TouchScreenHitTable v1 = {32, 160, 40, 216}; param0->unk_1C = sub_02023FCC(&v1, 1, ov70_02260A50, param0, param3); } diff --git a/src/overlay071/ov71_0223B140.c b/src/overlay071/ov71_0223B140.c index 4eff0f4639..9a9d422073 100644 --- a/src/overlay071/ov71_0223B140.c +++ b/src/overlay071/ov71_0223B140.c @@ -7,7 +7,7 @@ #include "message.h" #include "struct_decls/struct_02018340_decl.h" -#include "struct_defs/union_02022594_020225E0.h" +#include "unk_02022594.h" #include "struct_defs/struct_02099F80.h" #include "overlay071/struct_ov71_0223B620.h" #include "overlay071/struct_ov71_0223C444.h" @@ -29,7 +29,6 @@ #include "unk_0201E3D8.h" #include "gx_layers.h" #include "unk_020218BC.h" -#include "unk_02022594.h" #include "strbuf.h" #include "unk_020393C8.h" #include "overlay071/ov71_0223B140.h" @@ -38,7 +37,7 @@ #include "overlay071/ov71_0223D324.h" typedef struct { - const UnkUnion_02022594 * unk_00[2]; + const TouchScreenRect * unk_00[2]; } UnkStruct_ov71_0223D4D0; static void ov71_0223B620(UnkStruct_ov71_0223B620 * param0); @@ -71,8 +70,8 @@ static void ov71_0223C4DC(const u8 * param0, u8 * param1); static void ov71_0223C530(BGL * param0, const int param1, const u8 * param2); static void ov71_0223C594(const int param0); static void ov71_0223C5A4(UnkStruct_ov71_0223B620 * param0, const u8 param1); -static int ov71_0223C60C(BGL * param0, const UnkUnion_02022594 * param1); -static int ov71_0223C654(BGL * param0, const UnkUnion_02022594 * param1); +static int ov71_0223C60C(BGL * param0, const TouchScreenRect *rect); +static int ov71_0223C654(BGL * param0, const TouchScreenRect *rect); static const u8 Unk_ov71_0223D4B0[5] = { 0x1, @@ -82,7 +81,7 @@ static const u8 Unk_ov71_0223D4B0[5] = { 0xF }; -static const UnkUnion_02022594 Unk_ov71_0223D5A4[] = { +static const TouchScreenRect Unk_ov71_0223D5A4[] = { {0x98, 0xB7, 0x78, 0x97}, {0x28, 0x4F, 0x18, 0x3F}, {0x28, 0x4F, 0x50, 0x77}, @@ -95,7 +94,7 @@ static const UnkUnion_02022594 Unk_ov71_0223D5A4[] = { {0xFF, 0x0, 0x0, 0x0} }; -static const UnkUnion_02022594 Unk_ov71_0223D4C0[] = { +static const TouchScreenRect Unk_ov71_0223D4C0[] = { {0x98, 0xB7, 0x78, 0x97}, {0xFF, 0x0, 0x0, 0x0} }; @@ -1324,9 +1323,9 @@ static void ov71_0223C5A4 (UnkStruct_ov71_0223B620 * param0, const u8 param1) param0->unk_3382 = (param0->unk_3382 + 1) % 30; } -static int ov71_0223C60C (BGL * param0, const UnkUnion_02022594 * param1) +static int ov71_0223C60C (BGL * param0, const TouchScreenRect *rect) { - int v0 = sub_02022664(param1); + int v0 = sub_02022664(rect); if (v0 != 0xffffffff) { if (v0 != 0) { @@ -1343,9 +1342,9 @@ static int ov71_0223C60C (BGL * param0, const UnkUnion_02022594 * param1) return v0; } -static int ov71_0223C654 (BGL * param0, const UnkUnion_02022594 * param1) +static int ov71_0223C654 (BGL * param0, const TouchScreenRect *rect) { - int v0 = sub_02022644(param1); + int v0 = sub_02022644(rect); if (v0 != 0xffffffff) { if (v0 != 0) { diff --git a/src/overlay072/ov72_0223D7A0.c b/src/overlay072/ov72_0223D7A0.c index d2e87ee577..7ddda935bd 100644 --- a/src/overlay072/ov72_0223D7A0.c +++ b/src/overlay072/ov72_0223D7A0.c @@ -15,7 +15,7 @@ #include "overlay072/struct_ov72_0223DB98_decl.h" #include "struct_defs/struct_02015958.h" -#include "struct_defs/union_02022594_020225E0.h" +#include "unk_02022594.h" #include "struct_defs/options.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02099F80.h" @@ -56,7 +56,6 @@ #include "unk_0201F834.h" #include "gx_layers.h" #include "unk_020218BC.h" -#include "unk_02022594.h" #include "strbuf.h" #include "unk_02025E08.h" #include "unk_020279FC.h" @@ -642,14 +641,14 @@ static void inline_ov72_0223E2A4 (UnkStruct_ov72_0223DB98 * param0, int param1) VecFx32 v0; } -static const UnkUnion_02022594 Unk_ov72_0223EB4A[] = { +static const TouchScreenRect Unk_ov72_0223EB4A[] = { {0x96, 0xBD, 0xC0, 0xFF}, {0xFF, 0x0, 0x0, 0x0}, {0x96, 0xBD, 0x0, 0x5F}, {0x96, 0xBD, 0x60, 0xBF} }; -static const UnkUnion_02022594 Unk_ov72_0223EB42[] = { +static const TouchScreenRect Unk_ov72_0223EB42[] = { {0x48, 0x88, 0x20, 0xE0}, {0xFF, 0x0, 0x0, 0x0} }; diff --git a/src/overlay076/ov76_0223B140.c b/src/overlay076/ov76_0223B140.c index fb2e80a31b..b3a8424f98 100644 --- a/src/overlay076/ov76_0223B140.c +++ b/src/overlay076/ov76_0223B140.c @@ -9,7 +9,7 @@ #include "struct_decls/struct_0200C704_decl.h" #include "struct_defs/struct_0200D0F4.h" -#include "struct_defs/union_02022594_020225E0.h" +#include "unk_02022594.h" #include "struct_defs/struct_0202CA28.h" #include "overlay076/struct_ov76_0223B52C.h" #include "overlay076/struct_ov76_0223DE00.h" @@ -17,7 +17,6 @@ #include "game_overlay.h" #include "unk_0200C6E4.h" -#include "unk_02022594.h" #include "unk_0202C9F4.h" #include "unk_02097B18.h" #include "overlay012/ov12_02237E54.h" @@ -32,23 +31,23 @@ static void NitroStaticInit (void) Overlay_LoadByID(FS_OVERLAY_ID(overlay12), 2); } -static void ov76_0223B15C (UnkUnion_02022594 * param0, u8 param1, u8 param2) +static void ov76_0223B15C (TouchScreenRect *rect, u8 param1, u8 param2) { - param0->val1.unk_00 = param2 - 10; - param0->val1.unk_02 = param1 - 10; - param0->val1.unk_01 = param2 + 10; - param0->val1.unk_03 = param1 + 10; + rect->rect.top = param2 - 10; + rect->rect.left = param1 - 10; + rect->rect.bottom = param2 + 10; + rect->rect.right = param1 + 10; } -static void ov76_0223B174 (UnkUnion_02022594 * param0) +static void ov76_0223B174 (TouchScreenRect *rect) { - param0->val1.unk_00 = 0; - param0->val1.unk_02 = 0; - param0->val1.unk_01 = 192; - param0->val1.unk_03 = 255; + rect->rect.top = 0; + rect->rect.left = 0; + rect->rect.bottom = 192; + rect->rect.right = 255; } -void ov76_0223B184 (UnkUnion_02022594 * param0, CellActorData * param1, BOOL param2) +void ov76_0223B184 (TouchScreenRect *rect, CellActorData * param1, BOOL param2) { s16 v0, v1; @@ -59,10 +58,10 @@ void ov76_0223B184 (UnkUnion_02022594 * param0, CellActorData * param1, BOOL par if (param2 == 1) { SpriteActor_SetSpritePositionXY(param1, gCoreSys.touchX, gCoreSys.touchY); SpriteActor_GetSpritePositionXY(param1, &v0, &v1); - ov76_0223B174(param0); + ov76_0223B174(rect); } else { SpriteActor_GetSpritePositionXY(param1, &v0, &v1); - ov76_0223B15C(param0, v0, v1); + ov76_0223B15C(rect, v0, v1); } } diff --git a/src/overlay076/ov76_0223B870.c b/src/overlay076/ov76_0223B870.c index 079db844ec..3335361915 100644 --- a/src/overlay076/ov76_0223B870.c +++ b/src/overlay076/ov76_0223B870.c @@ -15,7 +15,7 @@ #include "struct_defs/struct_0200D0F4.h" #include "struct_defs/struct_020127E8.h" -#include "struct_defs/union_02022594_020225E0.h" +#include "unk_02022594.h" #include "struct_defs/struct_0202CA28.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0207C690.h" @@ -100,16 +100,16 @@ void ov76_0223D16C(UnkStruct_ov76_0223DE00 * param0); void ov76_0223D318(UnkStruct_ov76_0223DE00 * param0); void ov76_0223D31C(UnkStruct_ov76_0223DE00 * param0); -static void ov76_0223B870 (UnkUnion_02022594 * param0, CellActorData * param1, int param2, int param3) +static void ov76_0223B870 (TouchScreenRect *rect, CellActorData * param1, int param2, int param3) { s16 v0, v1; SpriteActor_GetSpritePositionXY(param1, &v0, &v1); - param0->val1.unk_00 = v1 - param3; - param0->val1.unk_01 = v1 + param3; - param0->val1.unk_02 = v0 - param2; - param0->val1.unk_03 = v0 + param2; + rect->rect.top = v1 - param3; + rect->rect.bottom = v1 + param3; + rect->rect.left = v0 - param2; + rect->rect.right = v0 + param2; } void ov76_0223B8A8 (UnkStruct_ov76_0223DE00 * param0) diff --git a/src/overlay076/ov76_0223D338.c b/src/overlay076/ov76_0223D338.c index eb8fab0c7f..d368eccdc5 100644 --- a/src/overlay076/ov76_0223D338.c +++ b/src/overlay076/ov76_0223D338.c @@ -16,7 +16,7 @@ #include "struct_defs/archived_sprite.h" #include "struct_defs/struct_0200D0F4.h" #include "struct_defs/struct_02015958.h" -#include "struct_defs/union_02022594_020225E0.h" +#include "unk_02022594.h" #include "struct_defs/struct_0202CA28.h" #include "struct_defs/struct_0202CA64.h" #include "struct_defs/struct_02099F80.h" @@ -46,7 +46,6 @@ #include "unk_02018340.h" #include "unk_0201DBEC.h" #include "gx_layers.h" -#include "unk_02022594.h" #include "unk_02023FCC.h" #include "unk_0202C9F4.h" #include "unk_0202CD50.h" @@ -676,7 +675,7 @@ void ov76_0223DCB8 (UnkStruct_ov76_0223DE00 * param0, BOOL param1) param0->unk_D4.unk_04 = param1; } -static const UnkUnion_02022594 Unk_ov76_0223EE44[] = { +static const TouchScreenRect Unk_ov76_0223EE44[] = { {16, 32, 8, 24}, {16, 32, 64, 80}, {40, 56, 8, 24}, @@ -695,7 +694,7 @@ static const UnkUnion_02022594 Unk_ov76_0223EE44[] = { void ov76_0223DCC0 (UnkStruct_ov76_0223DE00 * param0) { int v0; - const UnkUnion_02022594 v1 = {0, 0, 0, 0}; + const TouchScreenRect v1 = {0, 0, 0, 0}; for (v0 = 0; v0 < 13; v0++) { param0->unk_D4.unk_FC[v0] = Unk_ov76_0223EE44[v0]; diff --git a/src/overlay079/ov79_021D0D80.c b/src/overlay079/ov79_021D0D80.c index 3fa60e520e..d14f6e02c8 100644 --- a/src/overlay079/ov79_021D0D80.c +++ b/src/overlay079/ov79_021D0D80.c @@ -5,7 +5,7 @@ #include "struct_decls/struct_02006C24_decl.h" -#include "struct_defs/union_02022594_020225E0.h" +#include "unk_02022594.h" #include "struct_defs/struct_0203D9B8.h" #include "struct_defs/struct_02099F80.h" #include "overlay007/struct_ov7_0224F358.h" @@ -33,7 +33,6 @@ #include "unk_0201E3D8.h" #include "gx_layers.h" #include "unk_020218BC.h" -#include "unk_02022594.h" #include "strbuf.h" #include "unk_020279FC.h" #include "unk_0208C098.h" @@ -215,7 +214,7 @@ static int ov79_021D0FB0 (UnkStruct_ov79_021D0E1C * param0) { int v0; u16 v1; - static const UnkUnion_02022594 v2[] = { + static const TouchScreenRect v2[] = { {0x22, 0x3E, 0x60, 0xA0}, {0x52, 0x6E, 0xA0, 0xE0}, {0x94, 0xB0, 0x88, 0xC8}, diff --git a/src/overlay080/ov80_021D1458.c b/src/overlay080/ov80_021D1458.c index fc92381307..ce5231014a 100644 --- a/src/overlay080/ov80_021D1458.c +++ b/src/overlay080/ov80_021D1458.c @@ -8,7 +8,7 @@ #include "strbuf.h" #include "struct_decls/struct_02039EBC_decl.h" -#include "struct_defs/union_02022594_020225E0.h" +#include "unk_02022594.h" #include "struct_defs/struct_0205AA50.h" #include "overlay007/struct_ov7_0224F358.h" #include "overlay080/struct_ov80_021D1478_sub1.h" @@ -29,7 +29,6 @@ #include "unk_02018340.h" #include "unk_0201D670.h" #include "unk_020218BC.h" -#include "unk_02022594.h" #include "strbuf.h" #include "unk_02039C80.h" #include "unk_02071CFC.h" @@ -382,7 +381,7 @@ static int ov80_021D1848 (UnkStruct_ov80_021D2A08 * param0, int param1) { int v0; u16 v1; - static const UnkUnion_02022594 v2[] = { + static const TouchScreenRect v2[] = { {0, 191, 0, 255}, {10 * 8, (10 + 7) * 8, 13 * 8, (13 + 6) * 8}, {0xff, 0, 0, 0} @@ -411,7 +410,7 @@ static BOOL ov80_021D18A0 (UnkStruct_ov80_021D2A08 * param0) return 0; } - if (sub_0202278C()) { + if (TouchScreen_Touched()) { if ((v0->unk_14 == 0) && (ov80_021D1848(param0, v0->unk_10) != 0xffffffff)) { ov80_021D273C(param0, v0->unk_10); v0->unk_14 = 3; diff --git a/src/overlay084/ov84_0223B5A0.c b/src/overlay084/ov84_0223B5A0.c index d6597b667a..47c657cde7 100644 --- a/src/overlay084/ov84_0223B5A0.c +++ b/src/overlay084/ov84_0223B5A0.c @@ -10,7 +10,7 @@ #include "overlay084/const_ov84_02241130.h" -#include "struct_defs/union_02022594_020225E0.h" +#include "unk_02022594.h" #include "struct_defs/struct_0202D7B0.h" #include "functypes/funcptr_02069238.h" #include "struct_defs/struct_0207CB08.h" @@ -47,7 +47,6 @@ #include "unk_0201DBEC.h" #include "unk_0201E3D8.h" #include "gx_layers.h" -#include "unk_02022594.h" #include "strbuf.h" #include "unk_02025E08.h" #include "trainer_info.h" @@ -65,7 +64,7 @@ typedef struct { const u8 * unk_00; - const UnkUnion_02022594 * unk_04; + const TouchScreenRect * unk_04; } UnkStruct_ov84_022410C8; typedef int (* UnkFuncPtr_ov84_0223DA04)(UnkStruct_ov84_0223B5A0 *); @@ -210,7 +209,7 @@ static const u8 Unk_ov84_02241140[] = { 0x4 }; -static const UnkUnion_02022594 Unk_ov84_02240FE8[] = { +static const TouchScreenRect Unk_ov84_02240FE8[] = { {0x20, 0x47, 0x8, 0x2F}, {0x50, 0x77, 0x10, 0x37}, {0x78, 0x9F, 0x28, 0x4F}, @@ -233,7 +232,7 @@ static const u8 Unk_ov84_02241110[] = { 0x4 }; -static const UnkUnion_02022594 Unk_ov84_02240ED0[] = { +static const TouchScreenRect Unk_ov84_02240ED0[] = { {0x20, 0x47, 0x8, 0x2F}, {0x78, 0x9F, 0x28, 0x4F}, {0x78, 0x9F, 0xB0, 0xD7}, @@ -246,7 +245,7 @@ static const u8 Unk_ov84_02240E94[] = { 0x12 }; -static const UnkUnion_02022594 Unk_ov84_02240EA0[] = { +static const TouchScreenRect Unk_ov84_02240EA0[] = { {0x90, 0xB7, 0x88, 0xAF}, {0xFF, 0x0, 0x0, 0x0} }; @@ -268,7 +267,7 @@ static const u8 Unk_ov84_02241120[] = { 0x4 }; -static const UnkUnion_02022594 Unk_ov84_02240FC8[] = { +static const TouchScreenRect Unk_ov84_02240FC8[] = { {0x50, 0x77, 0x10, 0x37}, {0x78, 0x9F, 0x28, 0x4F}, {0x90, 0xB7, 0x50, 0x77}, @@ -373,18 +372,18 @@ static const u16 Unk_ov84_02241096[] = { 0x1002 }; -static const UnkUnion_02022594 Unk_ov84_02240E98[] = { +static const TouchScreenRect Unk_ov84_02240E98[] = { {0x38, 0x67, 0x68, 0x97}, {0xFF, 0x0, 0x0, 0x0} }; -static const UnkUnion_020225E0 Unk_ov84_02240EA8[] = { +static const TouchScreenHitTable Unk_ov84_02240EA8[] = { {0xFE, 0x80, 0x50, 0x1A}, {0xFE, 0x80, 0x50, 0x40}, {0xFF, 0x0, 0x0, 0x0} }; -static const UnkUnion_020225E0 Unk_ov84_02240EB4[] = { +static const TouchScreenHitTable Unk_ov84_02240EB4[] = { {0xFE, 0x80, 0x50, 0x10}, {0xFE, 0x80, 0x50, 0x50}, {0xFF, 0x0, 0x0, 0x0} @@ -1398,7 +1397,7 @@ static u8 ov84_0223C920 (UnkStruct_ov84_0223B5A0 * param0) v0 = ¶m0->unk_429; - if (sub_0202278C() == 0) { + if (TouchScreen_Touched() == 0) { v0->unk_07_4 = 1; } diff --git a/src/overlay088/ov88_0223B140.c b/src/overlay088/ov88_0223B140.c index 735482b0f3..04f5eb9a80 100644 --- a/src/overlay088/ov88_0223B140.c +++ b/src/overlay088/ov88_0223B140.c @@ -24,7 +24,7 @@ #include "constdata/const_020F410C.h" #include "struct_defs/archived_sprite.h" -#include "struct_defs/union_02022594_020225E0.h" +#include "unk_02022594.h" #include "struct_defs/struct_02027F8C.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02081CF4.h" @@ -70,7 +70,6 @@ #include "unk_0201F834.h" #include "gx_layers.h" #include "unk_020218BC.h" -#include "unk_02022594.h" #include "strbuf.h" #include "trainer_info.h" #include "unk_020279FC.h" @@ -1513,7 +1512,7 @@ static void ov88_0223CE34 (u32 * param0) } } -static const UnkUnion_02022594 Unk_ov88_0223EE28[] = { +static const TouchScreenRect Unk_ov88_0223EE28[] = { {0x38, 0x88, 0x18, 0x68}, {0xFF, 0x0, 0x0, 0x0} }; diff --git a/src/overlay094/ov94_02243EF8.c b/src/overlay094/ov94_02243EF8.c index 444ae55a4c..e3f7a78b74 100644 --- a/src/overlay094/ov94_02243EF8.c +++ b/src/overlay094/ov94_02243EF8.c @@ -5,7 +5,7 @@ #include "struct_decls/sys_task.h" #include "struct_decls/struct_02022550_decl.h" -#include "struct_defs/union_02022594_020225E0.h" +#include "unk_02022594.h" #include "overlay094/struct_ov94_0223FD4C.h" #include "overlay115/struct_ov115_02261520.h" @@ -15,7 +15,6 @@ #include "heap.h" #include "unk_0201CCF0.h" #include "unk_020218BC.h" -#include "unk_02022594.h" #include "unk_0205C980.h" #include "overlay094/ov94_0223BCB0.h" #include "overlay094/ov94_02243EF8.h" @@ -213,7 +212,7 @@ static void ov94_022441A0 (GraphicElementData * param0, int param1, int param2) sub_02021C50(param0, &v0); } -static const UnkUnion_02022594 Unk_ov94_0224633E[] = { +static const TouchScreenRect Unk_ov94_0224633E[] = { {0x26, 0x46, 0x70, 0x90}, {0x27, 0x47, 0x50, 0x70}, {0x27, 0x47, 0x90, 0xB0}, diff --git a/src/overlay097/ov97_02233B18.c b/src/overlay097/ov97_02233B18.c index e0e52ce58a..4825aed5fa 100644 --- a/src/overlay097/ov97_02233B18.c +++ b/src/overlay097/ov97_02233B18.c @@ -20,7 +20,7 @@ #include "struct_defs/struct_0200C738.h" #include "struct_defs/struct_02015958.h" -#include "struct_defs/union_02022594_020225E0.h" +#include "unk_02022594.h" #include "struct_defs/options.h" #include "struct_defs/struct_0203CC84.h" #include "struct_defs/struct_0205AA50.h" @@ -60,7 +60,6 @@ #include "unk_0201F834.h" #include "gx_layers.h" #include "unk_020218BC.h" -#include "unk_02022594.h" #include "strbuf.h" #include "savedata/save_table.h" #include "savedata.h" @@ -146,7 +145,7 @@ typedef struct { UnkStruct_02009DC8 * unk_1D0[6]; UnkStruct_ov19_021DA864 unk_1E8; UnkStruct_ov97_02234A2C_sub1 unk_20C[30]; - UnkUnion_02022594 unk_374[34]; + TouchScreenRect unk_374[34]; GraphicElementData * unk_3FC[4]; GraphicElementData * unk_40C[4]; GraphicElementData * unk_41C[4]; @@ -582,12 +581,12 @@ static int ov97_0223416C (UnkStruct_ov97_02234A2C * param0, int param1, int para return GetGBABoxMonData(&(param0->unk_E8E0->boxes[param1][param2]), 0, NULL); } -static void ov97_02234190 (UnkUnion_02022594 * param0, int param1, int param2, int param3, int param4) +static void ov97_02234190 (TouchScreenRect *rect, int param1, int param2, int param3, int param4) { - param0->val1.unk_00 = param2 - param4 / 2; - param0->val1.unk_02 = param1 - param3 / 2; - param0->val1.unk_01 = param2 + param4 / 2; - param0->val1.unk_03 = param1 + param3 / 2; + rect->rect.top = param2 - param4 / 2; + rect->rect.left = param1 - param3 / 2; + rect->rect.bottom = param2 + param4 / 2; + rect->rect.right = param1 + param3 / 2; } static void * ov97_022341B4 (u32 param0, u32 param1, NNSG2dCharacterData ** param2, u32 param3) @@ -829,7 +828,7 @@ static void ov97_0223468C (UnkStruct_ov97_02234A2C * param0) ov97_02234190(¶m0->unk_374[(30 + 1)], 24, 176, 32, 32); param0->unk_41C[0] = ov97_02234638(param0, 24, 176, 0, 1); - param0->unk_374[(30 + 3)].val1.unk_00 = 0xff; + param0->unk_374[(30 + 3)].rect.top = 0xff; for (v0 = 0; v0 < 6; v0++) { param0->unk_42C[v0].unk_00 = ov97_02234638(param0, 36 * v0, 64, 9, 0); @@ -1984,7 +1983,7 @@ static int ov97_022356E8 (OverlayManager * param0, int * param1) break; case 13: - v0 = sub_02022664((const UnkUnion_02022594 *)v3->unk_374); + v0 = sub_02022664((const TouchScreenRect *)v3->unk_374); if (v0 != 0xffffffff) { if (v0 < 30) { diff --git a/src/overlay108/ov108_02241AE0.c b/src/overlay108/ov108_02241AE0.c index 9ec22c99cc..31f655a21e 100644 --- a/src/overlay108/ov108_02241AE0.c +++ b/src/overlay108/ov108_02241AE0.c @@ -21,7 +21,7 @@ #include "overlay108/struct_ov108_02243594_decl.h" #include "struct_defs/struct_02013A04_t.h" -#include "struct_defs/union_02022594_020225E0.h" +#include "unk_02022594.h" #include "struct_defs/options.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02081CF4.h" @@ -50,7 +50,6 @@ #include "unk_0201DBEC.h" #include "gx_layers.h" #include "unk_020218BC.h" -#include "unk_02022594.h" #include "strbuf.h" #include "unk_02025E08.h" #include "unk_02030494.h" @@ -282,7 +281,7 @@ static u16 ov108_02242B1C(UnkStruct_ov108_02241DB0 * param0); static u8 Unk_ov108_022437A0; static u8 Unk_ov108_022437A1; -static const UnkUnion_020225E0 Unk_ov108_02243687[] = { +static const TouchScreenHitTable Unk_ov108_02243687[] = { {0xfe, 0x80, 0x60, 0x20}, {0xff, 0x0, 0x0, 0x0} }; diff --git a/src/overlay111/ov111_021D0D80.c b/src/overlay111/ov111_021D0D80.c index 6b4df528e9..0a341e365d 100644 --- a/src/overlay111/ov111_021D0D80.c +++ b/src/overlay111/ov111_021D0D80.c @@ -13,7 +13,7 @@ #include "overlay111/struct_ov111_021D33F4_decl.h" #include "struct_defs/struct_02015958.h" -#include "struct_defs/union_02022594_020225E0.h" +#include "unk_02022594.h" #include "struct_defs/options.h" #include "struct_defs/struct_0203E608.h" #include "struct_defs/struct_0205AA50.h" @@ -48,7 +48,6 @@ #include "unk_0201E3D8.h" #include "gx_layers.h" #include "unk_020218BC.h" -#include "unk_02022594.h" #include "strbuf.h" #include "unk_02025E08.h" #include "unk_020279FC.h" @@ -272,7 +271,7 @@ static const u16 Unk_ov111_021D37E4[] = { 0xC8 }; -static const UnkUnion_02022594 Unk_ov111_021D364C[5] = { +static const TouchScreenRect Unk_ov111_021D364C[5] = { {0x2A, 0x9A, 0x0, 0x50}, {0x2A, 0x9A, 0x58, 0x8A}, {0x2A, 0x9A, 0x90, 0xC3}, @@ -280,17 +279,17 @@ static const UnkUnion_02022594 Unk_ov111_021D364C[5] = { {0xFF, 0x0, 0x0, 0x0} }; -static const UnkUnion_02022594 Unk_ov111_021D3618[] = { +static const TouchScreenRect Unk_ov111_021D3618[] = { {0xA4, 0xBF, 0x4C, 0xB4}, {0xFF, 0x0, 0x0, 0x0} }; -static const UnkUnion_02022594 Unk_ov111_021D3610[] = { +static const TouchScreenRect Unk_ov111_021D3610[] = { {0xA4, 0xBF, 0x5E, 0xA4}, {0xFF, 0x0, 0x0, 0x0} }; -static const UnkUnion_02022594 Unk_ov111_021D3794[] = { +static const TouchScreenRect Unk_ov111_021D3794[] = { {0x15, 0x36, 0x20, 0x59}, {0x15, 0x36, 0x66, 0x9D}, {0x15, 0x36, 0xAA, 0xE3}, @@ -527,7 +526,7 @@ static BOOL ov111_021D10B8 (UnkStruct_ov111_021D0F7C * param0) param0->unk_0F--; } - v3 = sub_02022644((const UnkUnion_02022594 *)Unk_ov111_021D364C); + v3 = sub_02022644((const TouchScreenRect *)Unk_ov111_021D364C); if (v3 != 0xffffffff) { GXLayers_EngineAToggleLayers((GX_PLANEMASK_BG2), 0); @@ -754,7 +753,7 @@ static BOOL ov111_021D1508 (UnkStruct_ov111_021D0F7C * param0) break; case 3: sub_0201E564(¶m0->unk_424, 4, 2); - v1 = sub_02022644((const UnkUnion_02022594 *)Unk_ov111_021D3794); + v1 = sub_02022644((const TouchScreenRect *)Unk_ov111_021D3794); if (v1 != 0xffffffff) { if (ov111_021D2918(param0) < 3) { @@ -811,7 +810,7 @@ static BOOL ov111_021D1508 (UnkStruct_ov111_021D0F7C * param0) } if (param0->unk_0E == (3 - 1)) { - v1 = sub_02022664((const UnkUnion_02022594 *)Unk_ov111_021D3610); + v1 = sub_02022664((const TouchScreenRect *)Unk_ov111_021D3610); if (v1 != 0xffffffff) { ov111_021D350C(param0->unk_3A0, 1); @@ -826,7 +825,7 @@ static BOOL ov111_021D1508 (UnkStruct_ov111_021D0F7C * param0) break; } } else { - v1 = sub_02022664((const UnkUnion_02022594 *)Unk_ov111_021D3618); + v1 = sub_02022664((const TouchScreenRect *)Unk_ov111_021D3618); if (v1 != 0xffffffff) { ov111_021D350C(param0->unk_3A0, 1); @@ -930,7 +929,7 @@ static BOOL ov111_021D1508 (UnkStruct_ov111_021D0F7C * param0) } break; case 11: - if (sub_0202278C() == 0) { + if (TouchScreen_Touched() == 0) { param0->unk_08 = 3; } break; diff --git a/src/overlay113/ov113_02260620.c b/src/overlay113/ov113_02260620.c index 2db4fe981c..2ddc4ff964 100644 --- a/src/overlay113/ov113_02260620.c +++ b/src/overlay113/ov113_02260620.c @@ -7,7 +7,7 @@ #include "overlay066/struct_ov66_0222DFF8_decl.h" #include "overlay066/struct_ov66_0222E71C_decl.h" -#include "struct_defs/union_02022594_020225E0.h" +#include "unk_02022594.h" #include "struct_defs/struct_0205AA50.h" #include "overlay113/struct_ov113_02260818.h" #include "overlay113/struct_ov113_02260D90.h" @@ -18,7 +18,6 @@ #include "heap.h" #include "unk_02018340.h" #include "unk_0201D670.h" -#include "unk_02022594.h" #include "strbuf.h" #include "trainer_info.h" #include "overlay066/ov66_0222DDF0.h" @@ -535,7 +534,7 @@ static const UnkStruct_ov113_02260D90 Unk_ov113_02260D90[NATIONAL_DEX_COUNT + 1] { 0x1, 0x0 } }; -static const UnkUnion_02022594 Unk_ov113_02260D4C[] = { +static const TouchScreenRect Unk_ov113_02260D4C[] = { {0xA0, 0xC0, 0x0, 0x20}, {0xA0, 0xC0, 0x20, 0x40}, {0xA0, 0xC0, 0x40, 0x60}, diff --git a/src/overlay116/ov116_02262A8C.c b/src/overlay116/ov116_02262A8C.c index ee75450000..fe106cf0ac 100644 --- a/src/overlay116/ov116_02262A8C.c +++ b/src/overlay116/ov116_02262A8C.c @@ -5,7 +5,7 @@ #include "struct_decls/sys_task.h" -#include "struct_defs/union_02022594_020225E0.h" +#include "unk_02022594.h" #include "overlay116/struct_ov116_02260490.h" #include "overlay116/struct_ov116_02262A8C.h" #include "overlay116/struct_ov116_02262CB8.h" @@ -21,7 +21,6 @@ #include "unk_020170BC.h" #include "heap.h" #include "unk_0201D15C.h" -#include "unk_02022594.h" #include "communication_system.h" #include "overlay116/ov116_02261870.h" #include "overlay116/ov116_02262A8C.h" @@ -993,12 +992,12 @@ void ov116_02263B30 (UnkStruct_ov116_02262A8C * param0) } } -static const UnkUnion_020225E0 Unk_ov116_02267B38[] = { +static const TouchScreenHitTable Unk_ov116_02267B38[] = { {0xFE, 0x80, 0x80, 0x30}, {0xFF, 0x0, 0x0, 0x0} }; -static const UnkUnion_020225E0 Unk_ov116_02267B40[] = { +static const TouchScreenHitTable Unk_ov116_02267B40[] = { {0xFE, 0x80, 0x80, 0x40}, {0xFF, 0x0, 0x0, 0x0} }; @@ -1010,7 +1009,7 @@ void ov116_02263BA0 (UnkStruct_ov116_02262A8C * param0) s16 v2, v3; BOOL v4; BOOL v5 = sub_020227A4(&v0, &v1); - UnkUnion_020225E0 * v6; + TouchScreenHitTable * v6; int v7; param0->unk_279C.unk_A4 = 0; diff --git a/src/unk_02015920.c b/src/unk_02015920.c index 095c9c3c86..3e56b899d3 100644 --- a/src/unk_02015920.c +++ b/src/unk_02015920.c @@ -6,7 +6,7 @@ #include "struct_decls/struct_02023FCC_decl.h" #include "struct_defs/struct_02015958.h" -#include "struct_defs/union_02022594_020225E0.h" +#include "unk_02022594.h" #include "unk_02005474.h" #include "unk_02006E3C.h" @@ -65,7 +65,7 @@ typedef struct { typedef struct UnkStruct_02015920_t { UnkStruct_02023FCC * unk_00; - UnkUnion_020225E0 unk_04[2]; + TouchScreenHitTable unk_04[2]; UnkStruct_02015C38 unk_0C[2]; BGL * unk_7C; u32 unk_80; @@ -258,10 +258,10 @@ static void sub_02015BA4 (UnkStruct_02015920 * param0, const UnkStruct_02015958 int v0; for (v0 = 0; v0 < 2; v0++) { - param0->unk_04[v0].val1.unk_00 = (param0->unk_99 * 8) + (v0 * 40); - param0->unk_04[v0].val1.unk_01 = (param0->unk_99 * 8) + (v0 * 40) + (4 * 8); - param0->unk_04[v0].val1.unk_02 = (param0->unk_98 * 8); - param0->unk_04[v0].val1.unk_03 = (param0->unk_98 * 8) + (6 * 8); + param0->unk_04[v0].rect.top = (param0->unk_99 * 8) + (v0 * 40); + param0->unk_04[v0].rect.bottom = (param0->unk_99 * 8) + (v0 * 40) + (4 * 8); + param0->unk_04[v0].rect.left = (param0->unk_98 * 8); + param0->unk_04[v0].rect.right = (param0->unk_98 * 8) + (6 * 8); } param0->unk_00 = sub_02023FCC(param0->unk_04, 2, sub_02015C08, param0, param0->unk_84); diff --git a/src/unk_02022594.c b/src/unk_02022594.c index 07bbaaecfc..f2245c095b 100644 --- a/src/unk_02022594.c +++ b/src/unk_02022594.c @@ -3,20 +3,18 @@ #include "core_sys.h" -#include "struct_defs/union_02022594_020225E0.h" - #include "unk_02022594.h" -static int sub_02022594(const UnkUnion_02022594 * param0, u32 param1, u32 param2); -static BOOL sub_020225E0(const UnkUnion_020225E0 * param0, u32 param1, u32 param2); -static BOOL sub_0202260C(const UnkUnion_020225E0 * param0, u32 param1, u32 param2); +static int sub_02022594(const TouchScreenRect *rect, u32 param1, u32 param2); +static BOOL sub_020225E0(const TouchScreenHitTable *hitTable, u32 param1, u32 param2); +static BOOL sub_0202260C(const TouchScreenHitTable *hitTable, u32 param1, u32 param2); -static int sub_02022594 (const UnkUnion_02022594 * param0, u32 param1, u32 param2) +static int sub_02022594 (const TouchScreenRect *rect, u32 param1, u32 param2) { int v0; - for (v0 = 0; param0[v0].val1.unk_00 != 0xff; v0++) { - if (((u32)(param1 - param0[v0].val1.unk_02) < (u32)(param0[v0].val1.unk_03 - param0[v0].val1.unk_02)) & ((u32)(param2 - param0[v0].val1.unk_00) < (u32)(param0[v0].val1.unk_01 - param0[v0].val1.unk_00))) { + for (v0 = 0; rect[v0].rect.top != 0xff; v0++) { + if (((u32)(param1 - rect[v0].rect.left) < (u32)(rect[v0].rect.right - rect[v0].rect.left)) & ((u32)(param2 - rect[v0].rect.top) < (u32)(rect[v0].rect.bottom - rect[v0].rect.top))) { return v0; } } @@ -24,57 +22,57 @@ static int sub_02022594 (const UnkUnion_02022594 * param0, u32 param1, u32 param return 0xffffffff; } -static BOOL sub_020225E0 (const UnkUnion_020225E0 * param0, u32 param1, u32 param2) +static BOOL sub_020225E0 (const TouchScreenHitTable *hitTable, u32 param1, u32 param2) { - param1 = (param0->val2.unk_01 - param1) * (param0->val2.unk_01 - param1); - param2 = (param0->val2.unk_02 - param2) * (param0->val2.unk_02 - param2); + param1 = (hitTable->circle.x - param1) * (hitTable->circle.x - param1); + param2 = (hitTable->circle.y - param2) * (hitTable->circle.y - param2); - if (param1 + param2 < (param0->val2.unk_03 * param0->val2.unk_03)) { + if (param1 + param2 < (hitTable->circle.r * hitTable->circle.r)) { return 1; } return 0; } -static BOOL sub_0202260C (const UnkUnion_020225E0 * param0, u32 param1, u32 param2) +static BOOL sub_0202260C (const TouchScreenHitTable *hitTable, u32 param1, u32 param2) { - if (((u32)(param1 - param0->val1.unk_02) < (u32)(param0->val1.unk_03 - param0->val1.unk_02)) & ((u32)(param2 - param0->val1.unk_00) < (u32)(param0->val1.unk_01 - param0->val1.unk_00))) { + if (((u32)(param1 - hitTable->rect.left) < (u32)(hitTable->rect.right - hitTable->rect.left)) & ((u32)(param2 - hitTable->rect.top) < (u32)(hitTable->rect.bottom - hitTable->rect.top))) { return 1; } return 0; } -int sub_02022644 (const UnkUnion_02022594 * param0) +int sub_02022644 (const TouchScreenRect *rect) { if (gCoreSys.touchHeld) { - return sub_02022594(param0, gCoreSys.touchX, gCoreSys.touchY); + return sub_02022594(rect, gCoreSys.touchX, gCoreSys.touchY); } return 0xffffffff; } -int sub_02022664 (const UnkUnion_02022594 * param0) +int sub_02022664 (const TouchScreenRect *rect) { if (gCoreSys.touchPressed) { - return sub_02022594(param0, gCoreSys.touchX, gCoreSys.touchY); + return sub_02022594(rect, gCoreSys.touchX, gCoreSys.touchY); } return 0xffffffff; } -int sub_02022684 (const UnkUnion_020225E0 * param0) +int sub_02022684 (const TouchScreenHitTable *hitTable) { if (gCoreSys.touchHeld) { int v0; - for (v0 = 0; param0[v0].val2.unk_00 != 0xff; v0++) { - if (param0[v0].val2.unk_00 == 0xfe) { - if (sub_020225E0(¶m0[v0], gCoreSys.touchX, gCoreSys.touchY)) { + for (v0 = 0; hitTable[v0].circle.code != 0xff; v0++) { + if (hitTable[v0].circle.code == TOUCHSCREEN_USE_CIRCLE) { + if (sub_020225E0(&hitTable[v0], gCoreSys.touchX, gCoreSys.touchY)) { return v0; } } else { - if (sub_0202260C(¶m0[v0], gCoreSys.touchX, gCoreSys.touchY)) { + if (sub_0202260C(&hitTable[v0], gCoreSys.touchX, gCoreSys.touchY)) { return v0; } } @@ -84,18 +82,18 @@ int sub_02022684 (const UnkUnion_020225E0 * param0) return 0xffffffff; } -int sub_020226DC (const UnkUnion_020225E0 * param0) +int sub_020226DC (const TouchScreenHitTable *hitTable) { if (gCoreSys.touchPressed) { int v0; - for (v0 = 0; param0[v0].val2.unk_00 != 0xff; v0++) { - if (param0[v0].val2.unk_00 == 0xfe) { - if (sub_020225E0(¶m0[v0], gCoreSys.touchX, gCoreSys.touchY)) { + for (v0 = 0; hitTable[v0].circle.code != 0xff; v0++) { + if (hitTable[v0].circle.code == TOUCHSCREEN_USE_CIRCLE) { + if (sub_020225E0(&hitTable[v0], gCoreSys.touchX, gCoreSys.touchY)) { return v0; } } else { - if (sub_0202260C(¶m0[v0], gCoreSys.touchX, gCoreSys.touchY)) { + if (sub_0202260C(&hitTable[v0], gCoreSys.touchX, gCoreSys.touchY)) { return v0; } } @@ -105,33 +103,33 @@ int sub_020226DC (const UnkUnion_020225E0 * param0) return 0xffffffff; } -BOOL sub_02022734 (const UnkUnion_020225E0 * param0) +BOOL TouchScreen_LocationHeld(const TouchScreenHitTable *hitTable) { if (gCoreSys.touchHeld) { - if (param0->val2.unk_00 == 0xfe) { - return sub_020225E0(param0, gCoreSys.touchX, gCoreSys.touchY); + if (hitTable->circle.code == TOUCHSCREEN_USE_CIRCLE) { + return sub_020225E0(hitTable, gCoreSys.touchX, gCoreSys.touchY); } else { - return sub_0202260C(param0, gCoreSys.touchX, gCoreSys.touchY); + return sub_0202260C(hitTable, gCoreSys.touchX, gCoreSys.touchY); } } - return 0; + return FALSE; } -BOOL sub_02022760 (const UnkUnion_020225E0 * param0) +BOOL TouchScreen_LocationPressed(const TouchScreenHitTable *hitTable) { if (gCoreSys.touchPressed) { - if (param0->val2.unk_00 == 0xfe) { - return sub_020225E0(param0, gCoreSys.touchX, gCoreSys.touchY); + if (hitTable->circle.code == TOUCHSCREEN_USE_CIRCLE) { + return sub_020225E0(hitTable, gCoreSys.touchX, gCoreSys.touchY); } else { - return sub_0202260C(param0, gCoreSys.touchX, gCoreSys.touchY); + return sub_0202260C(hitTable, gCoreSys.touchX, gCoreSys.touchY); } } - return 0; + return FALSE; } -BOOL sub_0202278C (void) +BOOL TouchScreen_Touched(void) { return gCoreSys.touchHeld; } @@ -163,17 +161,17 @@ BOOL sub_020227C0 (u32 * param0, u32 * param1) return 0; } -int sub_020227DC (const UnkUnion_020225E0 * param0, u32 param1, u32 param2) +int sub_020227DC (const TouchScreenHitTable *hitTable, u32 param1, u32 param2) { int v0; - for (v0 = 0; param0[v0].val2.unk_00 != 0xff; v0++) { - if (param0[v0].val2.unk_00 == 0xfe) { - if (sub_020225E0(¶m0[v0], param1, param2)) { + for (v0 = 0; hitTable[v0].circle.code != 0xff; v0++) { + if (hitTable[v0].circle.code == TOUCHSCREEN_USE_CIRCLE) { + if (sub_020225E0(&hitTable[v0], param1, param2)) { return v0; } } else { - if (sub_0202260C(¶m0[v0], param1, param2)) { + if (sub_0202260C(&hitTable[v0], param1, param2)) { return v0; } } @@ -182,12 +180,12 @@ int sub_020227DC (const UnkUnion_020225E0 * param0, u32 param1, u32 param2) return 0xffffffff; } -BOOL sub_02022830 (const UnkUnion_020225E0 * param0, u32 param1, u32 param2) +BOOL sub_02022830 (const TouchScreenHitTable *hitTable, u32 param1, u32 param2) { - if (param0->val2.unk_00 == 0xfe) { - return sub_020225E0(param0, param1, param2); + if (hitTable->circle.code == TOUCHSCREEN_USE_CIRCLE) { + return sub_020225E0(hitTable, param1, param2); } else { - return sub_0202260C(param0, param1, param2); + return sub_0202260C(hitTable, param1, param2); } return 0; diff --git a/src/unk_02023FCC.c b/src/unk_02023FCC.c index 9dcedcc151..a88997628b 100644 --- a/src/unk_02023FCC.c +++ b/src/unk_02023FCC.c @@ -1,11 +1,10 @@ #include #include -#include "struct_defs/union_02022594_020225E0.h" +#include "unk_02022594.h" #include "functypes/funcptr_02023FCC.h" #include "heap.h" -#include "unk_02022594.h" #include "unk_02023FCC.h" typedef struct { @@ -15,7 +14,7 @@ typedef struct { } UnkStruct_02024028; typedef struct UnkStruct_02023FCC_t { - const UnkUnion_020225E0 * unk_00; + const TouchScreenHitTable * unk_00; u32 unk_04; UnkFuncPtr_02023FCC unk_08; void * unk_0C; @@ -27,7 +26,7 @@ static u32 sub_020240F4(UnkStruct_02024028 * param0, BOOL param1, BOOL param2); static u32 sub_02024110(UnkStruct_02024028 * param0, BOOL param1, BOOL param2); static void sub_02024144(UnkStruct_02024028 * param0, u32 param1); -UnkStruct_02023FCC * sub_02023FCC (const UnkUnion_020225E0 * param0, u32 param1, UnkFuncPtr_02023FCC param2, void * param3, u32 param4) +UnkStruct_02023FCC * sub_02023FCC (const TouchScreenHitTable *hitTable, u32 param1, UnkFuncPtr_02023FCC param2, void * param3, u32 param4) { UnkStruct_02023FCC * v0; @@ -36,7 +35,7 @@ UnkStruct_02023FCC * sub_02023FCC (const UnkUnion_020225E0 * param0, u32 param1, v0 = Heap_AllocFromHeap(param4, sizeof(UnkStruct_02023FCC)); if (v0) { - v0->unk_00 = param0; + v0->unk_00 = hitTable; v0->unk_04 = param1; v0->unk_08 = param2; v0->unk_0C = param3; @@ -82,16 +81,16 @@ void sub_0202404C (UnkStruct_02023FCC * param0) BOOL v1, v2; u32 v3, v4; - v1 = sub_0202278C(); + v1 = TouchScreen_Touched(); if (v1) { v2 = TouchScreen_Tapped(); for (v3 = 0; v3 < param0->unk_04; v3++) { if (param0->unk_10[v3].unk_01) { - param0->unk_10[v3].unk_01 = sub_02022734(¶m0->unk_00[v3]); + param0->unk_10[v3].unk_01 = TouchScreen_LocationHeld(¶m0->unk_00[v3]); } else { - param0->unk_10[v3].unk_01 = sub_02022760(¶m0->unk_00[v3]); + param0->unk_10[v3].unk_01 = TouchScreen_LocationPressed(¶m0->unk_00[v3]); } } } else { diff --git a/src/unk_0207E0B8.c b/src/unk_0207E0B8.c index 7408bd77a4..5d5c327a01 100644 --- a/src/unk_0207E0B8.c +++ b/src/unk_0207E0B8.c @@ -10,7 +10,7 @@ #include "constdata/const_020F1E88.h" -#include "struct_defs/union_02022594_020225E0.h" +#include "unk_02022594.h" #include "field/field_system.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0207C690.h" @@ -45,7 +45,6 @@ #include "unk_0201E3D8.h" #include "gx_layers.h" #include "unk_020218BC.h" -#include "unk_02022594.h" #include "strbuf.h" #include "unk_02024220.h" #include "unk_0202602C.h" @@ -2270,7 +2269,7 @@ static const u8 Unk_020F1BB8[6][2] = { {0x1A, 0x11} }; -static const UnkUnion_02022594 Unk_020F1C94[] = { +static const TouchScreenRect Unk_020F1C94[] = { {0x18, 0x3F, 0x8, 0x2F}, {0x18, 0x3F, 0xD0, 0xF7}, {0x50, 0x77, 0x8, 0x2F}, diff --git a/src/unk_02089604.c b/src/unk_02089604.c index 16ef0889a4..fb5dcb2e79 100644 --- a/src/unk_02089604.c +++ b/src/unk_02089604.c @@ -496,7 +496,7 @@ asm void sub_02089C20 (UnkStruct_02089688 * param0) ldr r0, [r0, #0x48] cmp r0, #0 beq _02089C80 - bl sub_0202278C + bl TouchScreen_Touched cmp r0, #0 beq _02089C82 _02089C80: @@ -983,10 +983,10 @@ void sub_0208A0B8 (UnkStruct_02089688 * param0) }; for ( ; v0 < 0x1c; v0++) { - param0->unk_2C0.unk_18[v0].val1.unk_00 = v1[v0 - 16][1] - v1[v0 - 16][3]; - param0->unk_2C0.unk_18[v0].val1.unk_02 = v1[v0 - 16][0] - v1[v0 - 16][2]; - param0->unk_2C0.unk_18[v0].val1.unk_01 = v1[v0 - 16][1] + v1[v0 - 16][3]; - param0->unk_2C0.unk_18[v0].val1.unk_03 = v1[v0 - 16][0] + v1[v0 - 16][2]; + param0->unk_2C0.unk_18[v0].rect.top = v1[v0 - 16][1] - v1[v0 - 16][3]; + param0->unk_2C0.unk_18[v0].rect.left = v1[v0 - 16][0] - v1[v0 - 16][2]; + param0->unk_2C0.unk_18[v0].rect.bottom = v1[v0 - 16][1] + v1[v0 - 16][3]; + param0->unk_2C0.unk_18[v0].rect.right = v1[v0 - 16][0] + v1[v0 - 16][2]; } } diff --git a/src/unk_0208A3F4.c b/src/unk_0208A3F4.c index 9dd6359f07..6741d1a697 100644 --- a/src/unk_0208A3F4.c +++ b/src/unk_0208A3F4.c @@ -390,15 +390,15 @@ void sub_0208A9BC (UnkStruct_02089688 * param0) { s16 v4, v5; - v4 = (param0->unk_2C0.unk_18[26].val1.unk_02 + param0->unk_2C0.unk_18[26].val1.unk_03) / 2; - v5 = (param0->unk_2C0.unk_18[26].val1.unk_00 + param0->unk_2C0.unk_18[26].val1.unk_01) / 2; + v4 = (param0->unk_2C0.unk_18[26].rect.left + param0->unk_2C0.unk_18[26].rect.right) / 2; + v5 = (param0->unk_2C0.unk_18[26].rect.top + param0->unk_2C0.unk_18[26].rect.bottom) / 2; SpriteActor_SetSpritePositionXY(param0->unk_240[0].unk_0C, v4, v5); sub_0200D364(param0->unk_240[0].unk_0C, 0); sub_0200D330(param0->unk_240[0].unk_0C); - v4 = (param0->unk_2C0.unk_18[27].val1.unk_02 + param0->unk_2C0.unk_18[27].val1.unk_03) / 2; - v5 = (param0->unk_2C0.unk_18[27].val1.unk_00 + param0->unk_2C0.unk_18[27].val1.unk_01) / 2; + v4 = (param0->unk_2C0.unk_18[27].rect.left + param0->unk_2C0.unk_18[27].rect.right) / 2; + v5 = (param0->unk_2C0.unk_18[27].rect.top + param0->unk_2C0.unk_18[27].rect.bottom) / 2; SpriteActor_SetSpritePositionXY(param0->unk_240[1].unk_0C, v4, v5); sub_0200D364(param0->unk_240[1].unk_0C, 0); @@ -435,8 +435,8 @@ void sub_0208AB2C (UnkStruct_02089688 * param0, int param1) { s16 v0, v1; - v0 = (param0->unk_2C0.unk_18[param1 + 16].val1.unk_02 + param0->unk_2C0.unk_18[param1 + 16].val1.unk_03) / 2; - v1 = (param0->unk_2C0.unk_18[param1 + 16].val1.unk_00 + param0->unk_2C0.unk_18[param1 + 16].val1.unk_01) / 2; + v0 = (param0->unk_2C0.unk_18[param1 + 16].rect.left + param0->unk_2C0.unk_18[param1 + 16].rect.right) / 2; + v1 = (param0->unk_2C0.unk_18[param1 + 16].rect.top + param0->unk_2C0.unk_18[param1 + 16].rect.bottom) / 2; SpriteActor_SetSpritePositionXY(param0->unk_1F0[1].unk_0C, v0, v1); } @@ -445,8 +445,8 @@ void sub_0208AB6C (UnkStruct_02089688 * param0, int param1, int param2) { s16 v0, v1; - v0 = (param0->unk_2C0.unk_18[param1 + 16].val1.unk_02 + param0->unk_2C0.unk_18[param1 + 16].val1.unk_03) / 2; - v1 = (param0->unk_2C0.unk_18[param1 + 16].val1.unk_00 + param0->unk_2C0.unk_18[param1 + 16].val1.unk_01) / 2; + v0 = (param0->unk_2C0.unk_18[param1 + 16].rect.left + param0->unk_2C0.unk_18[param1 + 16].rect.right) / 2; + v1 = (param0->unk_2C0.unk_18[param1 + 16].rect.top + param0->unk_2C0.unk_18[param1 + 16].rect.bottom) / 2; SpriteActor_SetSpritePositionXY(param0->unk_1F0[param2].unk_0C, v0, v1); } @@ -516,9 +516,9 @@ void sub_0208AC8C (UnkStruct_02089688 * param0) s16 v1, v2; for (v0 = 0; v0 < 2; v0++) { - v1 = (param0->unk_2C0.unk_18[v0 + 26].val1.unk_02 + param0->unk_2C0.unk_18[v0 + 26].val1.unk_03) / 2; + v1 = (param0->unk_2C0.unk_18[v0 + 26].rect.left + param0->unk_2C0.unk_18[v0 + 26].rect.right) / 2; v1 -= 40; - v2 = (param0->unk_2C0.unk_18[v0 + 26].val1.unk_00 + param0->unk_2C0.unk_18[v0 + 26].val1.unk_01) / 2; + v2 = (param0->unk_2C0.unk_18[v0 + 26].rect.top + param0->unk_2C0.unk_18[v0 + 26].rect.bottom) / 2; v2 -= 7; switch (param0->unk_240[v0].unk_00) { @@ -646,10 +646,10 @@ static inline void inline_0208AF44 (UnkStruct_02089688 * param0, int param1, s16 SpriteActor_GetSpritePositionXY(v2->unk_0C, &v0, &v1); - v2->unk_10->val1.unk_00 = v1 - param3; - v2->unk_10->val1.unk_02 = v0 - param2; - v2->unk_10->val1.unk_01 = v1 + param3; - v2->unk_10->val1.unk_03 = v0 + param2; + v2->unk_10->rect.top = v1 - param3; + v2->unk_10->rect.left = v0 - param2; + v2->unk_10->rect.bottom = v1 + param3; + v2->unk_10->rect.right = v0 + param2; } void sub_0208AF44 (UnkStruct_02089688 * param0) @@ -723,9 +723,9 @@ void sub_0208B090 (UnkStruct_02089688 * param0, int param1, int param2, int para sub_0201ED94(v5, 1, NNS_G2D_VRAM_TYPE_2DMAIN, ¶m0->unk_2C0.unk_98[param1]); - v0 = (param0->unk_2C0.unk_18[param1 + 26].val1.unk_02 + param0->unk_2C0.unk_18[param1 + 26].val1.unk_03) / 2; + v0 = (param0->unk_2C0.unk_18[param1 + 26].rect.left + param0->unk_2C0.unk_18[param1 + 26].rect.right) / 2; v0 -= 40; - v1 = (param0->unk_2C0.unk_18[param1 + 26].val1.unk_00 + param0->unk_2C0.unk_18[param1 + 26].val1.unk_01) / 2; + v1 = (param0->unk_2C0.unk_18[param1 + 26].rect.top + param0->unk_2C0.unk_18[param1 + 26].rect.bottom) / 2; v1 -= 7; v2.unk_00 = param0->unk_2C0.unk_8C; diff --git a/src/unk_020920C0.c b/src/unk_020920C0.c index 104359f88f..f41235fe6b 100644 --- a/src/unk_020920C0.c +++ b/src/unk_020920C0.c @@ -3,12 +3,11 @@ #include "core_sys.h" -#include "struct_defs/union_02022594_020225E0.h" +#include "unk_02022594.h" #include "struct_defs/pokemon_summary_app.h" #include "unk_02005474.h" #include "unk_02018340.h" -#include "unk_02022594.h" #include "unk_0208EA44.h" #include "unk_020920C0.h" @@ -55,7 +54,7 @@ static const UnkStruct_020F5164 * Unk_02100D84[] = { Unk_020F5128 }; -static const UnkUnion_02022594 Unk_020F5188[] = { +static const TouchScreenRect Unk_020F5188[] = { {0x20, 0x47, 0x8, 0x2F}, {0x50, 0x77, 0x10, 0x37}, {0x78, 0x9F, 0x28, 0x4F}, @@ -67,7 +66,7 @@ static const UnkUnion_02022594 Unk_020F5188[] = { {0xFF, 0x0, 0x0, 0x0} }; -static const UnkUnion_02022594 Unk_020F5134[] = { +static const TouchScreenRect Unk_020F5134[] = { {0x48, 0x6F, 0xC, 0x33}, {0x78, 0x9F, 0x2C, 0x53}, {0x90, 0xB7, 0x6C, 0x93}, @@ -76,13 +75,13 @@ static const UnkUnion_02022594 Unk_020F5134[] = { {0xFF, 0x0, 0x0, 0x0} }; -static const UnkUnion_02022594 Unk_020F511C[] = { +static const TouchScreenRect Unk_020F511C[] = { {0x90, 0xB7, 0x50, 0x77}, {0x90, 0xB7, 0x88, 0xAF}, {0xFF, 0x0, 0x0, 0x0} }; -static const UnkUnion_02022594 * Unk_02100D78[] = { +static const TouchScreenRect * Unk_02100D78[] = { Unk_020F5188, Unk_020F5134, Unk_020F511C From 877f06144c531c471392a274baeea38bd0d37d05 Mon Sep 17 00:00:00 2001 From: Trainer Riley Date: Sat, 13 Apr 2024 23:07:00 -0700 Subject: [PATCH 10/23] Rename touch_screen file --- include/overlay019/struct_ov19_021D6104.h | 2 +- include/overlay021/ov21_021D0D80.h | 2 +- include/overlay022/struct_ov22_02259D2C.h | 2 +- include/overlay025/poketch_button.h | 2 +- include/overlay062/const_ov62_022491F0.h | 2 +- .../overlay062/struct_ov62_022307C0_sub1.h | 2 +- include/overlay062/struct_ov62_0223118C.h | 2 +- .../overlay062/struct_ov62_02246BF4_sub1.h | 2 +- .../overlay062/struct_ov62_02246BF4_sub2.h | 2 +- include/overlay062/struct_ov62_02248CDC.h | 2 +- include/overlay076/ov76_0223B140.h | 2 +- include/overlay076/struct_ov76_0223B52C.h | 2 +- include/overlay076/struct_ov76_0223C398.h | 2 +- include/struct_defs/struct_020298D8.h | 2 +- include/struct_defs/struct_02089688_sub1.h | 2 +- include/struct_defs/struct_0208AF44.h | 2 +- include/struct_defs/union_020225E0.h | 20 ------------------- include/{unk_02022594.h => touch_screen.h} | 4 ++-- include/unk_02023FCC.h | 2 +- platinum.us/main.lsf | 2 +- src/battle/battle_script.c | 2 +- src/battle/ov16_0226871C.c | 2 +- src/meson.build | 2 +- src/overlay013/ov13_0221FC20.c | 2 +- src/overlay013/ov13_022264F4.c | 2 +- src/overlay017/ov17_0223F7E4.c | 2 +- src/overlay017/ov17_022492DC.c | 2 +- src/overlay019/ov19_021D0D80.c | 2 +- src/overlay019/ov19_021D603C.c | 2 +- src/overlay020/ov20_021D0D80.c | 2 +- src/overlay021/ov21_021D0D80.c | 2 +- src/overlay021/ov21_021D76B0.c | 2 +- src/overlay021/ov21_021D94BC.c | 2 +- src/overlay021/ov21_021DDD2C.c | 2 +- src/overlay021/ov21_021E1924.c | 2 +- src/overlay021/ov21_021E29DC.c | 2 +- src/overlay021/ov21_021E4CA4.c | 2 +- src/overlay021/ov21_021E68F4.c | 2 +- src/overlay021/ov21_021E8484.c | 2 +- src/overlay022/ov22_02254DE0.c | 2 +- src/overlay022/ov22_022578F4.c | 2 +- src/overlay022/ov22_02257F50.c | 2 +- src/overlay022/ov22_02259098.c | 2 +- src/overlay022/ov22_02259C58.c | 2 +- src/overlay025/poketch_button.c | 2 +- src/overlay025/poketch_system.c | 2 +- src/overlay026/ov26_022561C0.c | 2 +- src/overlay027/ov27_022561C0.c | 2 +- src/overlay028/ov28_022561C0.c | 2 +- src/overlay029/ov29_022561C0.c | 2 +- src/overlay030/ov30_022561C0.c | 2 +- src/overlay031/ov31_022561C0.c | 2 +- src/overlay032/ov32_022561C0.c | 2 +- src/overlay033/ov33_022561C0.c | 2 +- src/overlay034/ov34_022561C0.c | 2 +- src/overlay035/ov35_022561C0.c | 2 +- src/overlay036/ov36_022561C0.c | 2 +- src/overlay037/ov37_022561C0.c | 2 +- src/overlay039/ov39_022561C0.c | 2 +- src/overlay040/ov40_022561C0.c | 2 +- src/overlay041/ov41_022561C0.c | 2 +- src/overlay043/ov43_022561C0.c | 2 +- src/overlay044/ov44_022561C0.c | 2 +- src/overlay045/ov45_022561C0.c | 2 +- src/overlay046/ov46_022561C0.c | 2 +- src/overlay049/ov49_022561C0.c | 2 +- src/overlay050/ov50_022561C0.c | 2 +- src/overlay052/ov52_022561C0.c | 2 +- src/overlay053/ov53_022561C0.c | 2 +- src/overlay054/ov54_022561C0.c | 2 +- src/overlay056/ov56_022561C0.c | 2 +- src/overlay058/ov58_021D0D80.c | 2 +- src/overlay062/ov62_02231690.c | 2 +- src/overlay062/ov62_02234A10.c | 2 +- src/overlay062/ov62_02235278.c | 2 +- src/overlay062/ov62_02235E64.c | 2 +- src/overlay062/ov62_02236CBC.c | 2 +- src/overlay062/ov62_02237D24.c | 2 +- src/overlay062/ov62_02239D60.c | 2 +- src/overlay062/ov62_0223CAEC.c | 2 +- src/overlay062/ov62_0223DFA8.c | 2 +- src/overlay062/ov62_02241204.c | 2 +- src/overlay062/ov62_02247D74.c | 2 +- src/overlay065/ov65_0222DCE0.c | 2 +- src/overlay070/ov70_0225D9A4.c | 2 +- src/overlay071/ov71_0223B140.c | 2 +- src/overlay072/ov72_0223D7A0.c | 2 +- src/overlay076/ov76_0223B140.c | 2 +- src/overlay076/ov76_0223B870.c | 2 +- src/overlay076/ov76_0223D338.c | 2 +- src/overlay079/ov79_021D0D80.c | 2 +- src/overlay080/ov80_021D1458.c | 2 +- src/overlay084/ov84_0223B5A0.c | 2 +- src/overlay088/ov88_0223B140.c | 2 +- src/overlay094/ov94_02243EF8.c | 2 +- src/overlay097/ov97_02233B18.c | 2 +- src/overlay108/ov108_02241AE0.c | 2 +- src/overlay111/ov111_021D0D80.c | 2 +- src/overlay113/ov113_02260620.c | 2 +- src/overlay116/ov116_02262A8C.c | 2 +- src/{unk_02022594.c => touch_screen.c} | 2 +- src/unk_02015920.c | 2 +- src/unk_02023FCC.c | 2 +- src/unk_0207E0B8.c | 2 +- src/unk_02089604.c | 2 +- src/unk_020920C0.c | 2 +- 106 files changed, 106 insertions(+), 126 deletions(-) delete mode 100644 include/struct_defs/union_020225E0.h rename include/{unk_02022594.h => touch_screen.h} (93%) rename src/{unk_02022594.c => touch_screen.c} (99%) diff --git a/include/overlay019/struct_ov19_021D6104.h b/include/overlay019/struct_ov19_021D6104.h index 631842fd81..678ab43626 100644 --- a/include/overlay019/struct_ov19_021D6104.h +++ b/include/overlay019/struct_ov19_021D6104.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_STRUCT_OV19_021D6104_H #define POKEPLATINUM_STRUCT_OV19_021D6104_H -#include "unk_02022594.h" +#include "touch_screen.h" typedef struct UnkStruct_ov19_021D6104_t { u32 unk_00; diff --git a/include/overlay021/ov21_021D0D80.h b/include/overlay021/ov21_021D0D80.h index eb01559964..c90cff0b82 100644 --- a/include/overlay021/ov21_021D0D80.h +++ b/include/overlay021/ov21_021D0D80.h @@ -4,7 +4,7 @@ #include "overlay_manager.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_02022550_decl.h" -#include "unk_02022594.h" +#include "touch_screen.h" #include "strbuf.h" #include "struct_defs/struct_0205AA50.h" #include "overlay021/struct_ov21_021D0D80_1.h" diff --git a/include/overlay022/struct_ov22_02259D2C.h b/include/overlay022/struct_ov22_02259D2C.h index a200b7f533..4c4e5c8a88 100644 --- a/include/overlay022/struct_ov22_02259D2C.h +++ b/include/overlay022/struct_ov22_02259D2C.h @@ -2,7 +2,7 @@ #define POKEPLATINUM_STRUCT_OV22_02259D2C_H #include "struct_decls/struct_02012744_decl.h" -#include "unk_02022594.h" +#include "touch_screen.h" #include "struct_decls/struct_02023FCC_decl.h" #include "overlay022/struct_ov22_02259C58.h" #include "overlay022/struct_ov22_0225A154.h" diff --git a/include/overlay025/poketch_button.h b/include/overlay025/poketch_button.h index 3f354a08d8..f579a81993 100644 --- a/include/overlay025/poketch_button.h +++ b/include/overlay025/poketch_button.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_POKETCH_BUTTON_H #define POKEPLATINUM_POKETCH_BUTTON_H -#include "unk_02022594.h" +#include "touch_screen.h" #define BUTTON_TIMER_MAX 0xffff #define BUTTON_MANAGER_NUM_TIMERS_PER_BUTTON 2 diff --git a/include/overlay062/const_ov62_022491F0.h b/include/overlay062/const_ov62_022491F0.h index ea9f715511..210bd46983 100644 --- a/include/overlay062/const_ov62_022491F0.h +++ b/include/overlay062/const_ov62_022491F0.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_CONST_OV62_022491F0_H #define POKEPLATINUM_CONST_OV62_022491F0_H -#include "unk_02022594.h" +#include "touch_screen.h" extern const TouchScreenRect Unk_ov62_022491F0[9]; diff --git a/include/overlay062/struct_ov62_022307C0_sub1.h b/include/overlay062/struct_ov62_022307C0_sub1.h index f1709d6643..70a7bb8373 100644 --- a/include/overlay062/struct_ov62_022307C0_sub1.h +++ b/include/overlay062/struct_ov62_022307C0_sub1.h @@ -5,7 +5,7 @@ #include "struct_decls/struct_02012B20_decl.h" #include "struct_decls/font_oam.h" #include "struct_defs/sprite_manager_allocation.h" -#include "unk_02022594.h" +#include "touch_screen.h" typedef struct { CellActorData * unk_00; diff --git a/include/overlay062/struct_ov62_0223118C.h b/include/overlay062/struct_ov62_0223118C.h index 2e65e777f5..e6adda4d85 100644 --- a/include/overlay062/struct_ov62_0223118C.h +++ b/include/overlay062/struct_ov62_0223118C.h @@ -9,7 +9,7 @@ #include "struct_decls/struct_0200C704_decl.h" #include "struct_decls/struct_02012744_decl.h" #include "struct_decls/struct_02018340_decl.h" -#include "unk_02022594.h" +#include "touch_screen.h" #include "struct_decls/struct_02023FCC_decl.h" #include "struct_defs/struct_0207C690.h" #include "overlay062/struct_ov62_0223118C_sub1.h" diff --git a/include/overlay062/struct_ov62_02246BF4_sub1.h b/include/overlay062/struct_ov62_02246BF4_sub1.h index b0043e5daa..fa36684315 100644 --- a/include/overlay062/struct_ov62_02246BF4_sub1.h +++ b/include/overlay062/struct_ov62_02246BF4_sub1.h @@ -2,7 +2,7 @@ #define POKEPLATINUM_STRUCT_OV62_02246BF4_SUB1_H #include "struct_decls/cell_actor_data.h" -#include "unk_02022594.h" +#include "touch_screen.h" #include "overlay062/struct_ov62_02246BF4_sub1_sub1.h" typedef struct { diff --git a/include/overlay062/struct_ov62_02246BF4_sub2.h b/include/overlay062/struct_ov62_02246BF4_sub2.h index 0742cd6c9a..d9a6918101 100644 --- a/include/overlay062/struct_ov62_02246BF4_sub2.h +++ b/include/overlay062/struct_ov62_02246BF4_sub2.h @@ -6,7 +6,7 @@ #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" #include "struct_decls/struct_02018340_decl.h" -#include "unk_02022594.h" +#include "touch_screen.h" #include "struct_decls/struct_02023FCC_decl.h" typedef struct { diff --git a/include/overlay062/struct_ov62_02248CDC.h b/include/overlay062/struct_ov62_02248CDC.h index 46b6d4578c..f4b83b7c94 100644 --- a/include/overlay062/struct_ov62_02248CDC.h +++ b/include/overlay062/struct_ov62_02248CDC.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_STRUCT_OV62_02248CDC_H #define POKEPLATINUM_STRUCT_OV62_02248CDC_H -#include "unk_02022594.h" +#include "touch_screen.h" #include "overlay062/struct_ov62_02249380.h" typedef struct { diff --git a/include/overlay076/ov76_0223B140.h b/include/overlay076/ov76_0223B140.h index f95f7d80ee..10da79803c 100644 --- a/include/overlay076/ov76_0223B140.h +++ b/include/overlay076/ov76_0223B140.h @@ -2,7 +2,7 @@ #define POKEPLATINUM_OV76_0223B140_H #include "struct_decls/cell_actor_data.h" -#include "unk_02022594.h" +#include "touch_screen.h" #include "struct_defs/struct_0202CA28.h" #include "overlay076/struct_ov76_0223DE00.h" diff --git a/include/overlay076/struct_ov76_0223B52C.h b/include/overlay076/struct_ov76_0223B52C.h index d53d99a774..686b0b46cc 100644 --- a/include/overlay076/struct_ov76_0223B52C.h +++ b/include/overlay076/struct_ov76_0223B52C.h @@ -2,7 +2,7 @@ #define POKEPLATINUM_STRUCT_OV76_0223B52C_H #include "struct_decls/cell_actor_data.h" -#include "unk_02022594.h" +#include "touch_screen.h" typedef struct { BOOL unk_00; diff --git a/include/overlay076/struct_ov76_0223C398.h b/include/overlay076/struct_ov76_0223C398.h index deae8abfd5..dbaa548679 100644 --- a/include/overlay076/struct_ov76_0223C398.h +++ b/include/overlay076/struct_ov76_0223C398.h @@ -14,7 +14,7 @@ #include "struct_decls/pokemon_animation_sys_decl.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_defs/sprite_manager_allocation.h" -#include "unk_02022594.h" +#include "touch_screen.h" #include "struct_decls/struct_02023FCC_decl.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0207C690.h" diff --git a/include/struct_defs/struct_020298D8.h b/include/struct_defs/struct_020298D8.h index a8b11e324f..a694589deb 100644 --- a/include/struct_defs/struct_020298D8.h +++ b/include/struct_defs/struct_020298D8.h @@ -2,7 +2,7 @@ #define POKEPLATINUM_STRUCT_020298D8_H #include "struct_decls/sprite_decl.h" -#include "unk_02022594.h" +#include "touch_screen.h" #include "pokemon.h" #include "overlay022/struct_ov22_022596B0.h" diff --git a/include/struct_defs/struct_02089688_sub1.h b/include/struct_defs/struct_02089688_sub1.h index 0e71cf5235..f40829afd6 100644 --- a/include/struct_defs/struct_02089688_sub1.h +++ b/include/struct_defs/struct_02089688_sub1.h @@ -9,7 +9,7 @@ #include "struct_decls/font_oam.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_defs/sprite_manager_allocation.h" -#include "unk_02022594.h" +#include "touch_screen.h" #include "struct_decls/struct_02023FCC_decl.h" #include "struct_defs/struct_0205AA50.h" diff --git a/include/struct_defs/struct_0208AF44.h b/include/struct_defs/struct_0208AF44.h index 9d30ab675b..2b97fb1d48 100644 --- a/include/struct_defs/struct_0208AF44.h +++ b/include/struct_defs/struct_0208AF44.h @@ -2,7 +2,7 @@ #define POKEPLATINUM_STRUCT_0208AF44_H #include "struct_decls/cell_actor_data.h" -#include "unk_02022594.h" +#include "touch_screen.h" #include "struct_defs/struct_0208AF44_sub1.h" typedef struct { diff --git a/include/struct_defs/union_020225E0.h b/include/struct_defs/union_020225E0.h deleted file mode 100644 index 7fe7dd1523..0000000000 --- a/include/struct_defs/union_020225E0.h +++ /dev/null @@ -1,20 +0,0 @@ -#ifndef POKEPLATINUM_UNION_020225E0_H -#define POKEPLATINUM_UNION_020225E0_H - -typedef union { - struct { - u8 unk_00; - u8 unk_01; - u8 unk_02; - u8 unk_03; - } val1; - - struct { - u8 unk_00; - u8 unk_01; - u8 unk_02; - u8 unk_03; - } val2; -} TouchScreenRect, TouchScreenHitTable; - -#endif // POKEPLATINUM_UNION_020225E0_H diff --git a/include/unk_02022594.h b/include/touch_screen.h similarity index 93% rename from include/unk_02022594.h rename to include/touch_screen.h index bf7759e8fd..d1f70808e3 100644 --- a/include/unk_02022594.h +++ b/include/touch_screen.h @@ -1,5 +1,5 @@ -#ifndef POKEPLATINUM_UNK_02022594_H -#define POKEPLATINUM_UNK_02022594_H +#ifndef POKEPLATINUM_TOUCH_SCREEN_H +#define POKEPLATINUM_TOUCH_SCREEN_H #define TOUCHSCREEN_USE_CIRCLE 0xfe diff --git a/include/unk_02023FCC.h b/include/unk_02023FCC.h index edb735dd55..cc3ed3d357 100644 --- a/include/unk_02023FCC.h +++ b/include/unk_02023FCC.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_UNK_02023FCC_H #define POKEPLATINUM_UNK_02023FCC_H -#include "unk_02022594.h" +#include "touch_screen.h" #include "functypes/funcptr_02023FCC.h" #include "struct_decls/struct_02023FCC_decl.h" diff --git a/platinum.us/main.lsf b/platinum.us/main.lsf index c258a76d2b..c16e67fe9c 100644 --- a/platinum.us/main.lsf +++ b/platinum.us/main.lsf @@ -88,7 +88,7 @@ Static main Object main.nef.p/src_unk_02020020.c.o Object main.nef.p/src_unk_02020AEC.c.o Object main.nef.p/src_unk_020218BC.c.o - Object main.nef.p/src_unk_02022594.c.o + Object main.nef.p/src_touch_screen.c.o Object main.nef.p/src_unk_02022844.c.o Object main.nef.p/src_error_handling.c.o Object main.nef.p/src_unk_0202298C.c.o diff --git a/src/battle/battle_script.c b/src/battle/battle_script.c index 19413f9e47..a335a89dd7 100644 --- a/src/battle/battle_script.c +++ b/src/battle/battle_script.c @@ -76,7 +76,7 @@ #include "unk_0201D670.h" #include "unk_0201E86C.h" #include "unk_020218BC.h" -#include "unk_02022594.h" +#include "touch_screen.h" #include "unk_020797C8.h" #include "pokemon_icon.h" #include "unk_0207A274.h" diff --git a/src/battle/ov16_0226871C.c b/src/battle/ov16_0226871C.c index ddf36f0b47..02e60c41d6 100644 --- a/src/battle/ov16_0226871C.c +++ b/src/battle/ov16_0226871C.c @@ -26,7 +26,7 @@ #include "struct_defs/struct_020127E8.h" #include "functypes/sys_task_func.h" #include "struct_defs/sprite_manager_allocation.h" -#include "unk_02022594.h" +#include "touch_screen.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0209C370.h" #include "battle/struct_ov16_02260C00.h" diff --git a/src/meson.build b/src/meson.build index eb9932d006..3999d2b5f8 100644 --- a/src/meson.build +++ b/src/meson.build @@ -82,7 +82,7 @@ pokeplatinum_c = files( 'unk_02020020.c', 'unk_02020AEC.c', 'unk_020218BC.c', - 'unk_02022594.c', + 'touch_screen.c', 'unk_02022844.c', 'unk_0202298C.c', 'unk_0202309C.c', diff --git a/src/overlay013/ov13_0221FC20.c b/src/overlay013/ov13_0221FC20.c index 27df2c445f..68d565f662 100644 --- a/src/overlay013/ov13_0221FC20.c +++ b/src/overlay013/ov13_0221FC20.c @@ -8,7 +8,7 @@ #include "struct_decls/sys_task.h" #include "struct_decls/battle_system.h" -#include "unk_02022594.h" +#include "touch_screen.h" #include "overlay013/struct_ov13_0221FC20.h" #include "overlay013/struct_ov13_022213F0.h" #include "overlay013/struct_ov13_02221ED0.h" diff --git a/src/overlay013/ov13_022264F4.c b/src/overlay013/ov13_022264F4.c index 51da6afc58..5c86f488d3 100644 --- a/src/overlay013/ov13_022264F4.c +++ b/src/overlay013/ov13_022264F4.c @@ -14,7 +14,7 @@ #include "struct_decls/battle_system.h" #include "struct_decls/struct_0207D99C_decl.h" -#include "unk_02022594.h" +#include "touch_screen.h" #include "overlay013/struct_ov13_022264F4.h" #include "overlay013/struct_ov13_02227244.h" #include "overlay084/struct_ov84_0223BA5C.h" diff --git a/src/overlay017/ov17_0223F7E4.c b/src/overlay017/ov17_0223F7E4.c index 90199ef08c..ddfb2978c1 100644 --- a/src/overlay017/ov17_0223F7E4.c +++ b/src/overlay017/ov17_0223F7E4.c @@ -19,7 +19,7 @@ #include "struct_defs/struct_020127E8.h" #include "functypes/sys_task_func.h" #include "struct_defs/sprite_manager_allocation.h" -#include "unk_02022594.h" +#include "touch_screen.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02095C48.h" #include "overlay017/struct_ov17_0223F88C.h" diff --git a/src/overlay017/ov17_022492DC.c b/src/overlay017/ov17_022492DC.c index 2972c58b09..3b8ee7beb1 100644 --- a/src/overlay017/ov17_022492DC.c +++ b/src/overlay017/ov17_022492DC.c @@ -16,7 +16,7 @@ #include "struct_defs/struct_020127E8.h" #include "functypes/sys_task_func.h" #include "struct_defs/sprite_manager_allocation.h" -#include "unk_02022594.h" +#include "touch_screen.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02095C48.h" #include "overlay017/struct_ov17_0224A1EC.h" diff --git a/src/overlay019/ov19_021D0D80.c b/src/overlay019/ov19_021D0D80.c index 94f8e20e66..d5319eabe4 100644 --- a/src/overlay019/ov19_021D0D80.c +++ b/src/overlay019/ov19_021D0D80.c @@ -24,7 +24,7 @@ #include "overlay084/const_ov84_02241130.h" #include "constdata/const_020F2DAC.h" -#include "unk_02022594.h" +#include "touch_screen.h" #include "struct_defs/options.h" #include "struct_defs/struct_02042434.h" #include "struct_defs/struct_0208737C.h" diff --git a/src/overlay019/ov19_021D603C.c b/src/overlay019/ov19_021D603C.c index 17aa10b55e..cc970a4c91 100644 --- a/src/overlay019/ov19_021D603C.c +++ b/src/overlay019/ov19_021D603C.c @@ -3,7 +3,7 @@ #include "overlay019/struct_ov19_021D6104.h" -#include "unk_02022594.h" +#include "touch_screen.h" #include "overlay019/ov19_021D603C.h" static void ov19_021D60FC(UnkStruct_ov19_021D6104 * param0, int (* func)(UnkStruct_ov19_021D6104 *, BOOL, BOOL)); diff --git a/src/overlay020/ov20_021D0D80.c b/src/overlay020/ov20_021D0D80.c index 7c6c373a86..ce9e019679 100644 --- a/src/overlay020/ov20_021D0D80.c +++ b/src/overlay020/ov20_021D0D80.c @@ -10,7 +10,7 @@ #include "overlay020/struct_ov20_021D2128_decl.h" #include "struct_defs/sentence.h" -#include "unk_02022594.h" +#include "touch_screen.h" #include "unk_020041CC.h" #include "unk_02005474.h" diff --git a/src/overlay021/ov21_021D0D80.c b/src/overlay021/ov21_021D0D80.c index 9385a066e2..50035618bb 100644 --- a/src/overlay021/ov21_021D0D80.c +++ b/src/overlay021/ov21_021D0D80.c @@ -12,7 +12,7 @@ #include "overlay021/struct_ov21_021D423C_decl.h" #include "overlay021/struct_ov21_021D4C0C_decl.h" -#include "unk_02022594.h" +#include "touch_screen.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02099F80.h" #include "overlay021/struct_ov21_021D0D80.h" diff --git a/src/overlay021/ov21_021D76B0.c b/src/overlay021/ov21_021D76B0.c index 2374ecf803..1af96f2764 100644 --- a/src/overlay021/ov21_021D76B0.c +++ b/src/overlay021/ov21_021D76B0.c @@ -10,7 +10,7 @@ #include "struct_decls/struct_02023FCC_decl.h" #include "overlay021/struct_ov21_021D0F60_decl.h" -#include "unk_02022594.h" +#include "touch_screen.h" #include "struct_defs/struct_0205AA50.h" #include "overlay019/struct_ov19_021DA864.h" #include "overlay021/struct_ov21_021D13FC.h" diff --git a/src/overlay021/ov21_021D94BC.c b/src/overlay021/ov21_021D94BC.c index 9b184a4ae6..b09497cde3 100644 --- a/src/overlay021/ov21_021D94BC.c +++ b/src/overlay021/ov21_021D94BC.c @@ -11,7 +11,7 @@ #include "overlay021/struct_ov21_021D4C0C_decl.h" #include "overlay021/struct_ov21_021D4EE4_decl.h" -#include "unk_02022594.h" +#include "touch_screen.h" #include "struct_defs/struct_0205AA50.h" #include "overlay019/struct_ov19_021DA864.h" #include "overlay021/struct_ov21_021D13FC.h" diff --git a/src/overlay021/ov21_021DDD2C.c b/src/overlay021/ov21_021DDD2C.c index 8e444d463a..e2f100ee7d 100644 --- a/src/overlay021/ov21_021DDD2C.c +++ b/src/overlay021/ov21_021DDD2C.c @@ -9,7 +9,7 @@ #include "struct_decls/struct_02023FCC_decl.h" #include "overlay021/struct_ov21_021D0F60_decl.h" -#include "unk_02022594.h" +#include "touch_screen.h" #include "overlay019/struct_ov19_021DA864.h" #include "overlay021/struct_ov21_021D13FC.h" #include "overlay021/struct_ov21_021D3320.h" diff --git a/src/overlay021/ov21_021E1924.c b/src/overlay021/ov21_021E1924.c index 4d3ac30d56..1a99b24d55 100644 --- a/src/overlay021/ov21_021E1924.c +++ b/src/overlay021/ov21_021E1924.c @@ -9,7 +9,7 @@ #include "struct_decls/struct_02023FCC_decl.h" #include "overlay021/struct_ov21_021D0F60_decl.h" -#include "unk_02022594.h" +#include "touch_screen.h" #include "struct_defs/struct_0205AA50.h" #include "overlay019/struct_ov19_021DA864.h" #include "overlay021/struct_ov21_021D13FC.h" diff --git a/src/overlay021/ov21_021E29DC.c b/src/overlay021/ov21_021E29DC.c index 78f98ecf5d..a6b2436d92 100644 --- a/src/overlay021/ov21_021E29DC.c +++ b/src/overlay021/ov21_021E29DC.c @@ -10,7 +10,7 @@ #include "overlay021/struct_ov21_021D0F60_decl.h" #include "overlay021/struct_ov21_021D4EE4_decl.h" -#include "unk_02022594.h" +#include "touch_screen.h" #include "struct_defs/struct_0205AA50.h" #include "overlay019/struct_ov19_021DA864.h" #include "overlay021/struct_ov21_021D13FC.h" diff --git a/src/overlay021/ov21_021E4CA4.c b/src/overlay021/ov21_021E4CA4.c index 90505abefa..512f46bb8b 100644 --- a/src/overlay021/ov21_021E4CA4.c +++ b/src/overlay021/ov21_021E4CA4.c @@ -9,7 +9,7 @@ #include "struct_decls/struct_02023FCC_decl.h" #include "overlay021/struct_ov21_021D0F60_decl.h" -#include "unk_02022594.h" +#include "touch_screen.h" #include "struct_defs/struct_0205AA50.h" #include "overlay019/struct_ov19_021DA864.h" #include "overlay021/struct_ov21_021D13FC.h" diff --git a/src/overlay021/ov21_021E68F4.c b/src/overlay021/ov21_021E68F4.c index 2968578b94..ac370e8f0f 100644 --- a/src/overlay021/ov21_021E68F4.c +++ b/src/overlay021/ov21_021E68F4.c @@ -9,7 +9,7 @@ #include "struct_decls/struct_02023FCC_decl.h" #include "overlay021/struct_ov21_021D0F60_decl.h" -#include "unk_02022594.h" +#include "touch_screen.h" #include "struct_defs/struct_0205AA50.h" #include "overlay019/struct_ov19_021DA864.h" #include "overlay021/struct_ov21_021D13FC.h" diff --git a/src/overlay021/ov21_021E8484.c b/src/overlay021/ov21_021E8484.c index 2da9ebf404..0b2468df84 100644 --- a/src/overlay021/ov21_021E8484.c +++ b/src/overlay021/ov21_021E8484.c @@ -9,7 +9,7 @@ #include "struct_decls/struct_02023FCC_decl.h" #include "overlay021/struct_ov21_021D0F60_decl.h" -#include "unk_02022594.h" +#include "touch_screen.h" #include "struct_defs/struct_0205AA50.h" #include "overlay019/struct_ov19_021DA864.h" #include "overlay021/struct_ov21_021D13FC.h" diff --git a/src/overlay022/ov22_02254DE0.c b/src/overlay022/ov22_02254DE0.c index d7d90056af..592b5af534 100644 --- a/src/overlay022/ov22_02254DE0.c +++ b/src/overlay022/ov22_02254DE0.c @@ -5,7 +5,7 @@ #include "struct_decls/struct_02015214_decl.h" -#include "unk_02022594.h" +#include "touch_screen.h" #include "overlay021/struct_ov21_021E7F40.h" #include "overlay022/struct_ov22_02254DE0.h" #include "overlay022/struct_ov22_0225500C.h" diff --git a/src/overlay022/ov22_022578F4.c b/src/overlay022/ov22_022578F4.c index 880fc0b634..7a0a31314b 100644 --- a/src/overlay022/ov22_022578F4.c +++ b/src/overlay022/ov22_022578F4.c @@ -4,7 +4,7 @@ #include "pokemon.h" #include "struct_defs/archived_sprite.h" -#include "unk_02022594.h" +#include "touch_screen.h" #include "struct_defs/struct_020298D8.h" #include "overlay022/struct_ov22_0225500C.h" #include "overlay022/struct_ov22_02255040.h" diff --git a/src/overlay022/ov22_02257F50.c b/src/overlay022/ov22_02257F50.c index e7fc431960..3bbc9a3199 100644 --- a/src/overlay022/ov22_02257F50.c +++ b/src/overlay022/ov22_02257F50.c @@ -3,7 +3,7 @@ #include "struct_decls/sys_task.h" -#include "unk_02022594.h" +#include "touch_screen.h" #include "overlay022/struct_ov22_0225500C.h" #include "overlay022/struct_ov22_02255040.h" #include "overlay022/struct_ov22_02257F50.h" diff --git a/src/overlay022/ov22_02259098.c b/src/overlay022/ov22_02259098.c index 3a80b48082..545b77cc38 100644 --- a/src/overlay022/ov22_02259098.c +++ b/src/overlay022/ov22_02259098.c @@ -7,7 +7,7 @@ #include "pokemon.h" #include "struct_defs/archived_sprite.h" -#include "unk_02022594.h" +#include "touch_screen.h" #include "struct_defs/struct_020298D8.h" #include "overlay022/struct_ov22_022596B0.h" #include "overlay022/struct_ov22_0225A0E4.h" diff --git a/src/overlay022/ov22_02259C58.c b/src/overlay022/ov22_02259C58.c index 02039abb0c..41fc0237cd 100644 --- a/src/overlay022/ov22_02259C58.c +++ b/src/overlay022/ov22_02259C58.c @@ -7,7 +7,7 @@ #include "strbuf.h" #include "struct_defs/struct_020127E8.h" -#include "unk_02022594.h" +#include "touch_screen.h" #include "struct_defs/struct_0205AA50.h" #include "overlay019/struct_ov19_021DA864.h" #include "overlay022/struct_ov22_02259C58.h" diff --git a/src/overlay025/poketch_button.c b/src/overlay025/poketch_button.c index 396971d4cd..4283ba0342 100644 --- a/src/overlay025/poketch_button.c +++ b/src/overlay025/poketch_button.c @@ -3,7 +3,7 @@ #include "overlay025/poketch_button.h" -#include "unk_02022594.h" +#include "touch_screen.h" #include "heap.h" diff --git a/src/overlay025/poketch_system.c b/src/overlay025/poketch_system.c index 3e68913d48..a21fb1180a 100644 --- a/src/overlay025/poketch_system.c +++ b/src/overlay025/poketch_system.c @@ -13,7 +13,7 @@ #include "overlay025/struct_ov25_02254560_decl.h" #include "overlay025/poketch_button.h" -#include "unk_02022594.h" +#include "touch_screen.h" #include "unk_02005474.h" #include "game_overlay.h" diff --git a/src/overlay026/ov26_022561C0.c b/src/overlay026/ov26_022561C0.c index ba1e30d999..5a69aff6f0 100644 --- a/src/overlay026/ov26_022561C0.c +++ b/src/overlay026/ov26_022561C0.c @@ -8,7 +8,7 @@ #include "overlay025/poketch_button.h" #include "overlay026/struct_ov26_02256404_decl.h" -#include "unk_02022594.h" +#include "touch_screen.h" #include "overlay026/struct_ov26_02256404_1.h" #include "unk_0200D9E8.h" diff --git a/src/overlay027/ov27_022561C0.c b/src/overlay027/ov27_022561C0.c index 53336ea838..8db898c8d2 100644 --- a/src/overlay027/ov27_022561C0.c +++ b/src/overlay027/ov27_022561C0.c @@ -8,7 +8,7 @@ #include "overlay025/poketch_button.h" #include "overlay027/struct_ov27_0225680C_decl.h" -#include "unk_02022594.h" +#include "touch_screen.h" #include "overlay027/struct_ov27_0225680C_1.h" #include "unk_0200D9E8.h" diff --git a/src/overlay028/ov28_022561C0.c b/src/overlay028/ov28_022561C0.c index 6ed0f545f8..527d5ac1b5 100644 --- a/src/overlay028/ov28_022561C0.c +++ b/src/overlay028/ov28_022561C0.c @@ -10,7 +10,7 @@ #include "overlay028/struct_ov28_0225697C_decl.h" #include "overlay028/struct_ov28_02256E9C_decl.h" -#include "unk_02022594.h" +#include "touch_screen.h" #include "overlay028/struct_ov28_0225697C_1.h" #include "constants/species.h" diff --git a/src/overlay029/ov29_022561C0.c b/src/overlay029/ov29_022561C0.c index 4e5adc814b..8de890cd17 100644 --- a/src/overlay029/ov29_022561C0.c +++ b/src/overlay029/ov29_022561C0.c @@ -8,7 +8,7 @@ #include "overlay025/poketch_button.h" #include "overlay029/struct_ov29_022566C8_decl.h" -#include "unk_02022594.h" +#include "touch_screen.h" #include "overlay029/struct_ov29_022566C8_1.h" #include "unk_0200D9E8.h" diff --git a/src/overlay030/ov30_022561C0.c b/src/overlay030/ov30_022561C0.c index 9d1a7fbd15..bc60e75ff6 100644 --- a/src/overlay030/ov30_022561C0.c +++ b/src/overlay030/ov30_022561C0.c @@ -8,7 +8,7 @@ #include "overlay025/poketch_button.h" #include "overlay030/struct_ov30_022563EC_decl.h" -#include "unk_02022594.h" +#include "touch_screen.h" #include "overlay030/struct_ov30_022563EC_1.h" #include "unk_0200D9E8.h" diff --git a/src/overlay031/ov31_022561C0.c b/src/overlay031/ov31_022561C0.c index af89a3c676..83ded70854 100644 --- a/src/overlay031/ov31_022561C0.c +++ b/src/overlay031/ov31_022561C0.c @@ -13,7 +13,7 @@ #include "unk_0200D9E8.h" #include "heap.h" -#include "unk_02022594.h" +#include "touch_screen.h" #include "poketch_data.h" #include "overlay031/ov31_02256554.h" diff --git a/src/overlay032/ov32_022561C0.c b/src/overlay032/ov32_022561C0.c index 7744d7dd07..8ee56f7587 100644 --- a/src/overlay032/ov32_022561C0.c +++ b/src/overlay032/ov32_022561C0.c @@ -13,7 +13,7 @@ #include "unk_0200D9E8.h" #include "heap.h" -#include "unk_02022594.h" +#include "touch_screen.h" #include "pokemon.h" #include "pokemon_icon.h" #include "party.h" diff --git a/src/overlay033/ov33_022561C0.c b/src/overlay033/ov33_022561C0.c index 10fdf1610d..f650610dfe 100644 --- a/src/overlay033/ov33_022561C0.c +++ b/src/overlay033/ov33_022561C0.c @@ -13,7 +13,7 @@ #include "unk_0200D9E8.h" #include "heap.h" -#include "unk_02022594.h" +#include "touch_screen.h" #include "savedata.h" #include "pokemon.h" #include "pokemon_icon.h" diff --git a/src/overlay034/ov34_022561C0.c b/src/overlay034/ov34_022561C0.c index 426d4fa580..05a383f91b 100644 --- a/src/overlay034/ov34_022561C0.c +++ b/src/overlay034/ov34_022561C0.c @@ -12,7 +12,7 @@ #include "unk_0200D9E8.h" #include "heap.h" -#include "unk_02022594.h" +#include "touch_screen.h" #include "unk_0203E880.h" #include "overlay034/ov34_02256540.h" diff --git a/src/overlay035/ov35_022561C0.c b/src/overlay035/ov35_022561C0.c index ed9b00cbed..4803d75a49 100644 --- a/src/overlay035/ov35_022561C0.c +++ b/src/overlay035/ov35_022561C0.c @@ -8,7 +8,7 @@ #include "overlay025/poketch_button.h" #include "overlay035/struct_ov35_02256410_decl.h" -#include "unk_02022594.h" +#include "touch_screen.h" #include "overlay035/struct_ov35_02256410_1.h" #include "unk_0200D9E8.h" diff --git a/src/overlay036/ov36_022561C0.c b/src/overlay036/ov36_022561C0.c index ae5bf8efd8..087f546e09 100644 --- a/src/overlay036/ov36_022561C0.c +++ b/src/overlay036/ov36_022561C0.c @@ -8,7 +8,7 @@ #include "overlay025/poketch_button.h" #include "overlay036/poketch_app_pedometer.h" -#include "unk_02022594.h" +#include "touch_screen.h" #include "unk_0200D9E8.h" #include "heap.h" diff --git a/src/overlay037/ov37_022561C0.c b/src/overlay037/ov37_022561C0.c index ac1c4ddda1..8d0ae823c9 100644 --- a/src/overlay037/ov37_022561C0.c +++ b/src/overlay037/ov37_022561C0.c @@ -8,7 +8,7 @@ #include "overlay025/poketch_button.h" #include "overlay037/struct_ov37_022563D4_decl.h" -#include "unk_02022594.h" +#include "touch_screen.h" #include "overlay037/struct_ov37_022563D4_1.h" #include "unk_0200D9E8.h" diff --git a/src/overlay039/ov39_022561C0.c b/src/overlay039/ov39_022561C0.c index f95f8a5abc..6392ac56c4 100644 --- a/src/overlay039/ov39_022561C0.c +++ b/src/overlay039/ov39_022561C0.c @@ -8,7 +8,7 @@ #include "overlay025/poketch_button.h" #include "overlay039/struct_ov39_022563DC_decl.h" -#include "unk_02022594.h" +#include "touch_screen.h" #include "overlay039/struct_ov39_022563DC_1.h" #include "unk_0200D9E8.h" diff --git a/src/overlay040/ov40_022561C0.c b/src/overlay040/ov40_022561C0.c index b91806794a..288093d7cc 100644 --- a/src/overlay040/ov40_022561C0.c +++ b/src/overlay040/ov40_022561C0.c @@ -14,7 +14,7 @@ #include "unk_0200D9E8.h" #include "heap.h" -#include "unk_02022594.h" +#include "touch_screen.h" #include "unk_020261E4.h" #include "pokemon.h" #include "pokemon_icon.h" diff --git a/src/overlay041/ov41_022561C0.c b/src/overlay041/ov41_022561C0.c index 5d018ba867..ee2d06095e 100644 --- a/src/overlay041/ov41_022561C0.c +++ b/src/overlay041/ov41_022561C0.c @@ -8,7 +8,7 @@ #include "overlay025/poketch_button.h" #include "overlay041/struct_ov41_022567B0_decl.h" -#include "unk_02022594.h" +#include "touch_screen.h" #include "overlay041/struct_ov41_022567B0_1.h" #include "unk_0200D9E8.h" diff --git a/src/overlay043/ov43_022561C0.c b/src/overlay043/ov43_022561C0.c index cdd92fd2c3..ebd4324f77 100644 --- a/src/overlay043/ov43_022561C0.c +++ b/src/overlay043/ov43_022561C0.c @@ -8,7 +8,7 @@ #include "overlay025/poketch_button.h" #include "overlay043/struct_ov43_02256544_decl.h" -#include "unk_02022594.h" +#include "touch_screen.h" #include "overlay043/struct_ov43_02256544_1.h" #include "unk_0200D9E8.h" diff --git a/src/overlay044/ov44_022561C0.c b/src/overlay044/ov44_022561C0.c index ba49d53fe7..f16205a100 100644 --- a/src/overlay044/ov44_022561C0.c +++ b/src/overlay044/ov44_022561C0.c @@ -10,7 +10,7 @@ #include "overlay025/poketch_button.h" #include "overlay044/struct_ov44_022565BC_decl.h" -#include "unk_02022594.h" +#include "touch_screen.h" #include "overlay044/struct_ov44_022565BC_1.h" #include "unk_0200D9E8.h" diff --git a/src/overlay045/ov45_022561C0.c b/src/overlay045/ov45_022561C0.c index 324a1e374e..7d058b1dfc 100644 --- a/src/overlay045/ov45_022561C0.c +++ b/src/overlay045/ov45_022561C0.c @@ -8,7 +8,7 @@ #include "overlay025/poketch_button.h" #include "overlay045/struct_ov45_022566EC_decl.h" -#include "unk_02022594.h" +#include "touch_screen.h" #include "overlay045/struct_ov45_022566EC_1.h" #include "unk_0200D9E8.h" diff --git a/src/overlay046/ov46_022561C0.c b/src/overlay046/ov46_022561C0.c index 7502eea8d0..e2ece14c31 100644 --- a/src/overlay046/ov46_022561C0.c +++ b/src/overlay046/ov46_022561C0.c @@ -10,7 +10,7 @@ #include "overlay025/poketch_button.h" #include "overlay046/struct_ov46_02256BCC_decl.h" -#include "unk_02022594.h" +#include "touch_screen.h" #include "overlay046/struct_ov46_02256BCC_1.h" #include "unk_0200D9E8.h" diff --git a/src/overlay049/ov49_022561C0.c b/src/overlay049/ov49_022561C0.c index d55720ccfb..382d4975f0 100644 --- a/src/overlay049/ov49_022561C0.c +++ b/src/overlay049/ov49_022561C0.c @@ -11,7 +11,7 @@ #include "unk_0200D9E8.h" #include "heap.h" -#include "unk_02022594.h" +#include "touch_screen.h" #include "poketch_data.h" #include "overlay049/ov49_022563D4.h" diff --git a/src/overlay050/ov50_022561C0.c b/src/overlay050/ov50_022561C0.c index 213a1bf3a4..03d19c6047 100644 --- a/src/overlay050/ov50_022561C0.c +++ b/src/overlay050/ov50_022561C0.c @@ -8,7 +8,7 @@ #include "overlay025/poketch_button.h" #include "overlay050/struct_ov50_02256510_decl.h" -#include "unk_02022594.h" +#include "touch_screen.h" #include "overlay050/struct_ov50_02256510_1.h" #include "unk_0200D9E8.h" diff --git a/src/overlay052/ov52_022561C0.c b/src/overlay052/ov52_022561C0.c index c83f21100f..e0541331d9 100644 --- a/src/overlay052/ov52_022561C0.c +++ b/src/overlay052/ov52_022561C0.c @@ -12,7 +12,7 @@ #include "unk_0200D9E8.h" #include "heap.h" -#include "unk_02022594.h" +#include "touch_screen.h" #include "unk_02033200.h" #include "communication_system.h" #include "unk_020366A0.h" diff --git a/src/overlay053/ov53_022561C0.c b/src/overlay053/ov53_022561C0.c index d5aacc0529..c4d488a046 100644 --- a/src/overlay053/ov53_022561C0.c +++ b/src/overlay053/ov53_022561C0.c @@ -9,7 +9,7 @@ #include "overlay025/poketch_button.h" #include "overlay053/struct_ov53_02256420_decl.h" -#include "unk_02022594.h" +#include "touch_screen.h" #include "overlay053/struct_ov53_02256420_1.h" #include "unk_0200D9E8.h" diff --git a/src/overlay054/ov54_022561C0.c b/src/overlay054/ov54_022561C0.c index 40ca663b36..e5a2de1196 100644 --- a/src/overlay054/ov54_022561C0.c +++ b/src/overlay054/ov54_022561C0.c @@ -8,7 +8,7 @@ #include "overlay025/poketch_button.h" #include "overlay054/struct_ov54_0225642C_decl.h" -#include "unk_02022594.h" +#include "touch_screen.h" #include "overlay054/struct_ov54_0225642C_1.h" #include "unk_0200D9E8.h" diff --git a/src/overlay056/ov56_022561C0.c b/src/overlay056/ov56_022561C0.c index 94cb5cd258..fb4e09282e 100644 --- a/src/overlay056/ov56_022561C0.c +++ b/src/overlay056/ov56_022561C0.c @@ -18,7 +18,7 @@ #include "struct_defs/struct_0200C738.h" #include "struct_defs/sentence.h" -#include "unk_02022594.h" +#include "touch_screen.h" #include "struct_defs/struct_0203330C.h" #include "field/field_system.h" #include "struct_defs/struct_0205AA50.h" diff --git a/src/overlay058/ov58_021D0D80.c b/src/overlay058/ov58_021D0D80.c index b2171109c3..31bdc19f3f 100644 --- a/src/overlay058/ov58_021D0D80.c +++ b/src/overlay058/ov58_021D0D80.c @@ -11,7 +11,7 @@ #include "struct_decls/struct_02095EAC_decl.h" #include "struct_defs/struct_02015958.h" -#include "unk_02022594.h" +#include "touch_screen.h" #include "struct_defs/struct_0203DDFC.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02095EAC_t.h" diff --git a/src/overlay062/ov62_02231690.c b/src/overlay062/ov62_02231690.c index dccdcb0a0b..ba8ea24064 100644 --- a/src/overlay062/ov62_02231690.c +++ b/src/overlay062/ov62_02231690.c @@ -19,7 +19,7 @@ #include "struct_defs/struct_0200D0F4.h" #include "struct_defs/sentence.h" -#include "unk_02022594.h" +#include "touch_screen.h" #include "struct_defs/struct_02030A80.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0208B878.h" diff --git a/src/overlay062/ov62_02234A10.c b/src/overlay062/ov62_02234A10.c index 4862df4e7b..13e1ba8a88 100644 --- a/src/overlay062/ov62_02234A10.c +++ b/src/overlay062/ov62_02234A10.c @@ -21,7 +21,7 @@ #include "unk_0201D15C.h" #include "unk_0201D670.h" #include "gx_layers.h" -#include "unk_02022594.h" +#include "touch_screen.h" #include "strbuf.h" #include "unk_0208B284.h" #include "overlay062/ov62_0222F2C0.h" diff --git a/src/overlay062/ov62_02235278.c b/src/overlay062/ov62_02235278.c index 4f3fe550b1..443225ea2e 100644 --- a/src/overlay062/ov62_02235278.c +++ b/src/overlay062/ov62_02235278.c @@ -5,7 +5,7 @@ #include "struct_decls/sys_task.h" -#include "unk_02022594.h" +#include "touch_screen.h" #include "struct_defs/struct_0208C06C.h" #include "overlay062/struct_ov62_022354A4.h" #include "overlay062/struct_ov62_02235580.h" diff --git a/src/overlay062/ov62_02235E64.c b/src/overlay062/ov62_02235E64.c index 9051c6dd32..b365cbe3d6 100644 --- a/src/overlay062/ov62_02235E64.c +++ b/src/overlay062/ov62_02235E64.c @@ -6,7 +6,7 @@ #include "strbuf.h" #include "struct_decls/struct_02023FCC_decl.h" -#include "unk_02022594.h" +#include "touch_screen.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0208C06C.h" #include "overlay062/struct_ov62_022312B0.h" diff --git a/src/overlay062/ov62_02236CBC.c b/src/overlay062/ov62_02236CBC.c index d321ba48c6..35aa45bb7b 100644 --- a/src/overlay062/ov62_02236CBC.c +++ b/src/overlay062/ov62_02236CBC.c @@ -25,7 +25,7 @@ #include "unk_02018340.h" #include "unk_0201D15C.h" #include "gx_layers.h" -#include "unk_02022594.h" +#include "touch_screen.h" #include "unk_0202D05C.h" #include "unk_02030A80.h" #include "unk_020507CC.h" diff --git a/src/overlay062/ov62_02237D24.c b/src/overlay062/ov62_02237D24.c index da7c307530..939843a4a0 100644 --- a/src/overlay062/ov62_02237D24.c +++ b/src/overlay062/ov62_02237D24.c @@ -11,7 +11,7 @@ #include "overlay062/const_ov62_022491F0.h" -#include "unk_02022594.h" +#include "touch_screen.h" #include "struct_defs/struct_02030A80.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0208C06C.h" diff --git a/src/overlay062/ov62_02239D60.c b/src/overlay062/ov62_02239D60.c index ddb22c7484..191ac47df1 100644 --- a/src/overlay062/ov62_02239D60.c +++ b/src/overlay062/ov62_02239D60.c @@ -14,7 +14,7 @@ #include "struct_defs/archived_sprite.h" #include "struct_defs/struct_0200D0F4.h" -#include "unk_02022594.h" +#include "touch_screen.h" #include "struct_defs/struct_02030A80.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0208C06C.h" diff --git a/src/overlay062/ov62_0223CAEC.c b/src/overlay062/ov62_0223CAEC.c index 1e6f0643fb..26f48f5d13 100644 --- a/src/overlay062/ov62_0223CAEC.c +++ b/src/overlay062/ov62_0223CAEC.c @@ -7,7 +7,7 @@ #include "strbuf.h" #include "struct_decls/struct_02023FCC_decl.h" -#include "unk_02022594.h" +#include "touch_screen.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0208C06C.h" #include "overlay061/struct_ov61_0222BDAC.h" diff --git a/src/overlay062/ov62_0223DFA8.c b/src/overlay062/ov62_0223DFA8.c index 0ba58f3134..114df5db12 100644 --- a/src/overlay062/ov62_0223DFA8.c +++ b/src/overlay062/ov62_0223DFA8.c @@ -8,7 +8,7 @@ #include "struct_decls/struct_02023FCC_decl.h" #include "struct_decls/struct_0202F41C_decl.h" -#include "unk_02022594.h" +#include "touch_screen.h" #include "struct_defs/struct_02030A80.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0208C06C.h" diff --git a/src/overlay062/ov62_02241204.c b/src/overlay062/ov62_02241204.c index 1f57826e7a..bfe87bee4e 100644 --- a/src/overlay062/ov62_02241204.c +++ b/src/overlay062/ov62_02241204.c @@ -13,7 +13,7 @@ #include "overlay062/const_ov62_022491F0.h" -#include "unk_02022594.h" +#include "touch_screen.h" #include "struct_defs/struct_02030A80.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0208C06C.h" diff --git a/src/overlay062/ov62_02247D74.c b/src/overlay062/ov62_02247D74.c index 5875d111d6..b67aefc906 100644 --- a/src/overlay062/ov62_02247D74.c +++ b/src/overlay062/ov62_02247D74.c @@ -5,7 +5,7 @@ #include "strbuf.h" -#include "unk_02022594.h" +#include "touch_screen.h" #include "struct_defs/struct_02030A80.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0208C06C.h" diff --git a/src/overlay065/ov65_0222DCE0.c b/src/overlay065/ov65_0222DCE0.c index 41869b496f..97635e759b 100644 --- a/src/overlay065/ov65_0222DCE0.c +++ b/src/overlay065/ov65_0222DCE0.c @@ -24,7 +24,7 @@ #include "overlay065/struct_ov65_0222EBE0_decl.h" #include "struct_defs/struct_020127E8.h" -#include "unk_02022594.h" +#include "touch_screen.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0207DFAC.h" #include "struct_defs/struct_0207E060.h" diff --git a/src/overlay070/ov70_0225D9A4.c b/src/overlay070/ov70_0225D9A4.c index 302d9fa01e..ff2df811f3 100644 --- a/src/overlay070/ov70_0225D9A4.c +++ b/src/overlay070/ov70_0225D9A4.c @@ -32,7 +32,7 @@ #include "struct_defs/struct_0200C738.h" #include "struct_defs/struct_02013A04_t.h" -#include "unk_02022594.h" +#include "touch_screen.h" #include "struct_defs/options.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0207C690.h" diff --git a/src/overlay071/ov71_0223B140.c b/src/overlay071/ov71_0223B140.c index 9a9d422073..334cb5de4d 100644 --- a/src/overlay071/ov71_0223B140.c +++ b/src/overlay071/ov71_0223B140.c @@ -7,7 +7,7 @@ #include "message.h" #include "struct_decls/struct_02018340_decl.h" -#include "unk_02022594.h" +#include "touch_screen.h" #include "struct_defs/struct_02099F80.h" #include "overlay071/struct_ov71_0223B620.h" #include "overlay071/struct_ov71_0223C444.h" diff --git a/src/overlay072/ov72_0223D7A0.c b/src/overlay072/ov72_0223D7A0.c index 7ddda935bd..f9d89e5f27 100644 --- a/src/overlay072/ov72_0223D7A0.c +++ b/src/overlay072/ov72_0223D7A0.c @@ -15,7 +15,7 @@ #include "overlay072/struct_ov72_0223DB98_decl.h" #include "struct_defs/struct_02015958.h" -#include "unk_02022594.h" +#include "touch_screen.h" #include "struct_defs/options.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02099F80.h" diff --git a/src/overlay076/ov76_0223B140.c b/src/overlay076/ov76_0223B140.c index b3a8424f98..2130cb46a2 100644 --- a/src/overlay076/ov76_0223B140.c +++ b/src/overlay076/ov76_0223B140.c @@ -9,7 +9,7 @@ #include "struct_decls/struct_0200C704_decl.h" #include "struct_defs/struct_0200D0F4.h" -#include "unk_02022594.h" +#include "touch_screen.h" #include "struct_defs/struct_0202CA28.h" #include "overlay076/struct_ov76_0223B52C.h" #include "overlay076/struct_ov76_0223DE00.h" diff --git a/src/overlay076/ov76_0223B870.c b/src/overlay076/ov76_0223B870.c index 3335361915..4640ac6e69 100644 --- a/src/overlay076/ov76_0223B870.c +++ b/src/overlay076/ov76_0223B870.c @@ -15,7 +15,7 @@ #include "struct_defs/struct_0200D0F4.h" #include "struct_defs/struct_020127E8.h" -#include "unk_02022594.h" +#include "touch_screen.h" #include "struct_defs/struct_0202CA28.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0207C690.h" diff --git a/src/overlay076/ov76_0223D338.c b/src/overlay076/ov76_0223D338.c index d368eccdc5..b87fa70adb 100644 --- a/src/overlay076/ov76_0223D338.c +++ b/src/overlay076/ov76_0223D338.c @@ -16,7 +16,7 @@ #include "struct_defs/archived_sprite.h" #include "struct_defs/struct_0200D0F4.h" #include "struct_defs/struct_02015958.h" -#include "unk_02022594.h" +#include "touch_screen.h" #include "struct_defs/struct_0202CA28.h" #include "struct_defs/struct_0202CA64.h" #include "struct_defs/struct_02099F80.h" diff --git a/src/overlay079/ov79_021D0D80.c b/src/overlay079/ov79_021D0D80.c index d14f6e02c8..979d2f73e9 100644 --- a/src/overlay079/ov79_021D0D80.c +++ b/src/overlay079/ov79_021D0D80.c @@ -5,7 +5,7 @@ #include "struct_decls/struct_02006C24_decl.h" -#include "unk_02022594.h" +#include "touch_screen.h" #include "struct_defs/struct_0203D9B8.h" #include "struct_defs/struct_02099F80.h" #include "overlay007/struct_ov7_0224F358.h" diff --git a/src/overlay080/ov80_021D1458.c b/src/overlay080/ov80_021D1458.c index ce5231014a..b1321b3f51 100644 --- a/src/overlay080/ov80_021D1458.c +++ b/src/overlay080/ov80_021D1458.c @@ -8,7 +8,7 @@ #include "strbuf.h" #include "struct_decls/struct_02039EBC_decl.h" -#include "unk_02022594.h" +#include "touch_screen.h" #include "struct_defs/struct_0205AA50.h" #include "overlay007/struct_ov7_0224F358.h" #include "overlay080/struct_ov80_021D1478_sub1.h" diff --git a/src/overlay084/ov84_0223B5A0.c b/src/overlay084/ov84_0223B5A0.c index 47c657cde7..bb3e670a78 100644 --- a/src/overlay084/ov84_0223B5A0.c +++ b/src/overlay084/ov84_0223B5A0.c @@ -10,7 +10,7 @@ #include "overlay084/const_ov84_02241130.h" -#include "unk_02022594.h" +#include "touch_screen.h" #include "struct_defs/struct_0202D7B0.h" #include "functypes/funcptr_02069238.h" #include "struct_defs/struct_0207CB08.h" diff --git a/src/overlay088/ov88_0223B140.c b/src/overlay088/ov88_0223B140.c index 04f5eb9a80..46a9ba3a86 100644 --- a/src/overlay088/ov88_0223B140.c +++ b/src/overlay088/ov88_0223B140.c @@ -24,7 +24,7 @@ #include "constdata/const_020F410C.h" #include "struct_defs/archived_sprite.h" -#include "unk_02022594.h" +#include "touch_screen.h" #include "struct_defs/struct_02027F8C.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02081CF4.h" diff --git a/src/overlay094/ov94_02243EF8.c b/src/overlay094/ov94_02243EF8.c index e3f7a78b74..dabeaf5490 100644 --- a/src/overlay094/ov94_02243EF8.c +++ b/src/overlay094/ov94_02243EF8.c @@ -5,7 +5,7 @@ #include "struct_decls/sys_task.h" #include "struct_decls/struct_02022550_decl.h" -#include "unk_02022594.h" +#include "touch_screen.h" #include "overlay094/struct_ov94_0223FD4C.h" #include "overlay115/struct_ov115_02261520.h" diff --git a/src/overlay097/ov97_02233B18.c b/src/overlay097/ov97_02233B18.c index 4825aed5fa..9604678618 100644 --- a/src/overlay097/ov97_02233B18.c +++ b/src/overlay097/ov97_02233B18.c @@ -20,7 +20,7 @@ #include "struct_defs/struct_0200C738.h" #include "struct_defs/struct_02015958.h" -#include "unk_02022594.h" +#include "touch_screen.h" #include "struct_defs/options.h" #include "struct_defs/struct_0203CC84.h" #include "struct_defs/struct_0205AA50.h" diff --git a/src/overlay108/ov108_02241AE0.c b/src/overlay108/ov108_02241AE0.c index 31f655a21e..f5c857513d 100644 --- a/src/overlay108/ov108_02241AE0.c +++ b/src/overlay108/ov108_02241AE0.c @@ -21,7 +21,7 @@ #include "overlay108/struct_ov108_02243594_decl.h" #include "struct_defs/struct_02013A04_t.h" -#include "unk_02022594.h" +#include "touch_screen.h" #include "struct_defs/options.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02081CF4.h" diff --git a/src/overlay111/ov111_021D0D80.c b/src/overlay111/ov111_021D0D80.c index 0a341e365d..6f6fe51fde 100644 --- a/src/overlay111/ov111_021D0D80.c +++ b/src/overlay111/ov111_021D0D80.c @@ -13,7 +13,7 @@ #include "overlay111/struct_ov111_021D33F4_decl.h" #include "struct_defs/struct_02015958.h" -#include "unk_02022594.h" +#include "touch_screen.h" #include "struct_defs/options.h" #include "struct_defs/struct_0203E608.h" #include "struct_defs/struct_0205AA50.h" diff --git a/src/overlay113/ov113_02260620.c b/src/overlay113/ov113_02260620.c index 2ddc4ff964..30b5184f4b 100644 --- a/src/overlay113/ov113_02260620.c +++ b/src/overlay113/ov113_02260620.c @@ -7,7 +7,7 @@ #include "overlay066/struct_ov66_0222DFF8_decl.h" #include "overlay066/struct_ov66_0222E71C_decl.h" -#include "unk_02022594.h" +#include "touch_screen.h" #include "struct_defs/struct_0205AA50.h" #include "overlay113/struct_ov113_02260818.h" #include "overlay113/struct_ov113_02260D90.h" diff --git a/src/overlay116/ov116_02262A8C.c b/src/overlay116/ov116_02262A8C.c index fe106cf0ac..acff56b5fb 100644 --- a/src/overlay116/ov116_02262A8C.c +++ b/src/overlay116/ov116_02262A8C.c @@ -5,7 +5,7 @@ #include "struct_decls/sys_task.h" -#include "unk_02022594.h" +#include "touch_screen.h" #include "overlay116/struct_ov116_02260490.h" #include "overlay116/struct_ov116_02262A8C.h" #include "overlay116/struct_ov116_02262CB8.h" diff --git a/src/unk_02022594.c b/src/touch_screen.c similarity index 99% rename from src/unk_02022594.c rename to src/touch_screen.c index f2245c095b..18fb198a53 100644 --- a/src/unk_02022594.c +++ b/src/touch_screen.c @@ -3,7 +3,7 @@ #include "core_sys.h" -#include "unk_02022594.h" +#include "touch_screen.h" static int sub_02022594(const TouchScreenRect *rect, u32 param1, u32 param2); static BOOL sub_020225E0(const TouchScreenHitTable *hitTable, u32 param1, u32 param2); diff --git a/src/unk_02015920.c b/src/unk_02015920.c index 3e56b899d3..b896e46c59 100644 --- a/src/unk_02015920.c +++ b/src/unk_02015920.c @@ -6,7 +6,7 @@ #include "struct_decls/struct_02023FCC_decl.h" #include "struct_defs/struct_02015958.h" -#include "unk_02022594.h" +#include "touch_screen.h" #include "unk_02005474.h" #include "unk_02006E3C.h" diff --git a/src/unk_02023FCC.c b/src/unk_02023FCC.c index a88997628b..98bcaa3f36 100644 --- a/src/unk_02023FCC.c +++ b/src/unk_02023FCC.c @@ -1,7 +1,7 @@ #include #include -#include "unk_02022594.h" +#include "touch_screen.h" #include "functypes/funcptr_02023FCC.h" #include "heap.h" diff --git a/src/unk_0207E0B8.c b/src/unk_0207E0B8.c index 5d5c327a01..6f7d9593ad 100644 --- a/src/unk_0207E0B8.c +++ b/src/unk_0207E0B8.c @@ -10,7 +10,7 @@ #include "constdata/const_020F1E88.h" -#include "unk_02022594.h" +#include "touch_screen.h" #include "field/field_system.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0207C690.h" diff --git a/src/unk_02089604.c b/src/unk_02089604.c index fb5dcb2e79..6883daa6da 100644 --- a/src/unk_02089604.c +++ b/src/unk_02089604.c @@ -12,7 +12,7 @@ #include "unk_0200C6E4.h" #include "unk_0200F174.h" #include "heap.h" -#include "unk_02022594.h" +#include "touch_screen.h" #include "strbuf.h" #include "unk_02023FCC.h" #include "unk_020393C8.h" diff --git a/src/unk_020920C0.c b/src/unk_020920C0.c index f41235fe6b..b86ecc950f 100644 --- a/src/unk_020920C0.c +++ b/src/unk_020920C0.c @@ -3,7 +3,7 @@ #include "core_sys.h" -#include "unk_02022594.h" +#include "touch_screen.h" #include "struct_defs/pokemon_summary_app.h" #include "unk_02005474.h" From 09decbd936cbcbf21487cd99d232b857b6fd4a60 Mon Sep 17 00:00:00 2001 From: Trainer Riley Date: Sat, 13 Apr 2024 23:42:09 -0700 Subject: [PATCH 11/23] Use button state enum in init --- src/overlay025/poketch_button.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/overlay025/poketch_button.c b/src/overlay025/poketch_button.c index 4283ba0342..b7a930c731 100644 --- a/src/overlay025/poketch_button.c +++ b/src/overlay025/poketch_button.c @@ -134,7 +134,7 @@ void PoketchButtonManager_ResetButtonState(PoketchButtonManager *buttonManager, static void PoketchButton_Init(PoketchButton *button) { - button->state = 0; + button->state = BUTTON_STATE_IDLE; button->screenTouched = FALSE; button->prevScreenTouched = FALSE; button->timer = 0; @@ -147,14 +147,14 @@ static void PoketchButton_Init(PoketchButton *button) button->repeatTime = 0; } -/** Use enum ButtonManagerState for state input. */ +/** Use enum ButtonEventState for state input. */ static void PoketchButton_ChangeState(PoketchButton *button, u32 state) { button->state = state; button->timer = 0; } -/** Use enum ButtonManagerState for state input. */ +/** Use enum ButtonEventState for state input. */ static void PoketchButton_ChangeState_NoReset(PoketchButton *button, u32 state) { button->state = state; From 554577e5098fd3d0a7aa29229aa8b0e40b116b6c Mon Sep 17 00:00:00 2001 From: RavePossum Date: Sat, 13 Apr 2024 19:27:23 -0400 Subject: [PATCH 12/23] move options struct definition to options file, mass rename to game_options --- include/battle/ov16_0223DF00.h | 2 +- include/{unk_020279FC.h => game_options.h} | 17 +++++++++++++---- include/overlay006/battle_params.h | 2 +- include/overlay006/struct_ov6_02246254.h | 2 +- include/overlay007/struct_ov7_0224D008.h | 2 +- include/overlay022/struct_ov22_02256BAC.h | 2 +- include/overlay062/ov62_02246B00.h | 2 +- include/overlay062/struct_ov62_02246B00.h | 2 +- include/overlay072/struct_ov72_0223DB98_t.h | 2 +- include/overlay082/struct_ov82_0223B164.h | 2 +- include/overlay084/struct_ov84_0223B5A0.h | 2 +- include/overlay088/ov88_0223E9C4.h | 2 +- include/overlay088/struct_ov88_0223C370.h | 2 +- include/overlay097/struct_ov97_0222D04C.h | 2 +- include/overlay098/struct_ov98_02246E88.h | 2 +- include/overlay104/struct_ov104_02230BE4.h | 2 +- include/struct_defs/battle_system.h | 2 +- include/struct_defs/options.h | 18 +++++++++--------- include/struct_defs/pokemon_summary.h | 2 +- include/struct_defs/struct_0202F298.h | 2 +- include/struct_defs/struct_0203D9B8.h | 2 +- include/struct_defs/struct_0203DA00.h | 2 +- include/struct_defs/struct_0203DDFC.h | 2 +- include/struct_defs/struct_0203DE34.h | 2 +- include/struct_defs/struct_0203E0FC.h | 2 +- include/struct_defs/struct_0203E2FC.h | 2 +- include/struct_defs/struct_020425E0.h | 2 +- include/struct_defs/struct_0206BC70.h | 2 +- include/struct_defs/struct_0207AE68_t.h | 2 +- include/struct_defs/struct_0208737C.h | 2 +- include/struct_defs/struct_02089438.h | 2 +- include/struct_defs/struct_02093800.h | 2 +- include/struct_defs/struct_02093BBC.h | 2 +- include/struct_defs/struct_02095C48.h | 2 +- include/struct_defs/struct_020978D8.h | 2 +- include/struct_defs/struct_02097F18.h | 2 +- include/struct_defs/struct_020985E4.h | 2 +- include/struct_defs/struct_02098C44.h | 2 +- include/struct_defs/struct_020997B8.h | 2 +- include/struct_defs/struct_0209C194_1.h | 2 +- include/unk_02003B60.h | 2 +- include/unk_02025E08.h | 2 +- include/unk_0205D8CC.h | 2 +- include/unk_0207AE68.h | 2 +- include/unk_0208694C.h | 2 +- include/unk_020890F4.h | 2 +- platinum.us/main.lsf | 2 +- src/battle/ov16_0223B140.c | 2 +- src/battle/ov16_0223DF00.c | 3 +-- src/{unk_020279FC.c => game_options.c} | 3 +-- src/meson.build | 2 +- src/overlay005/ov5_021DD42C.c | 2 +- src/overlay005/ov5_021EA874.c | 2 +- src/overlay007/ov7_0224BE9C.c | 3 +-- src/overlay007/ov7_0224CD28.c | 2 +- src/overlay010/ov10_0221F800.c | 2 +- src/overlay017/ov17_0223CB1C.c | 2 +- src/overlay017/ov17_0223DAD0.c | 2 +- src/overlay017/ov17_022413D8.c | 2 +- src/overlay017/ov17_022476F8.c | 2 +- src/overlay017/ov17_0224A0FC.c | 2 +- src/overlay017/ov17_02250744.c | 2 +- src/overlay019/ov19_021D0D80.c | 3 +-- src/overlay022/ov22_02255D44.c | 3 +-- src/overlay022/ov22_0225A428.c | 3 +-- src/overlay023/ov23_02241F74.c | 2 +- src/overlay057/ov57_021D0D80.c | 2 +- src/overlay058/ov58_021D0D80.c | 2 +- src/overlay059/ov59_021D0D80.c | 2 +- src/overlay061/ov61_0222BF44.c | 2 +- src/overlay062/ov62_02246B00.c | 2 +- src/overlay064/ov64_0222DCE0.c | 2 +- src/overlay065/ov65_0222DCE0.c | 2 +- src/overlay065/ov65_0223648C.c | 2 +- src/overlay067/ov67_0225C700.c | 3 +-- src/overlay068/ov68_0225C700.c | 3 +-- src/overlay069/ov69_0225C700.c | 3 +-- src/overlay070/ov70_0225D9A4.c | 3 +-- src/overlay072/ov72_0223D7A0.c | 3 +-- src/overlay073/ov73_021D0D80.c | 3 +-- src/overlay074/ov74_021D0D80.c | 3 +-- src/overlay075/ov75_021D0D80.c | 2 +- src/overlay078/ov78_021D0D80.c | 2 +- src/overlay079/ov79_021D0D80.c | 2 +- src/overlay083/ov83_0223B5A0.c | 2 +- src/overlay084/ov84_0223B5A0.c | 2 +- src/overlay084/ov84_0223F040.c | 2 +- src/overlay088/ov88_0223B140.c | 2 +- src/overlay088/ov88_0223E9C4.c | 3 +-- src/overlay090/ov90_021D0D80.c | 2 +- src/overlay091/ov91_021D0D80.c | 2 +- src/overlay092/ov92_021D0D80.c | 3 +-- src/overlay094/ov94_0223BCB0.c | 2 +- src/overlay094/ov94_0223C610.c | 2 +- src/overlay094/ov94_0223D0C4.c | 2 +- src/overlay094/ov94_0223DC04.c | 2 +- src/overlay094/ov94_0223E46C.c | 2 +- src/overlay094/ov94_0223FB48.c | 2 +- src/overlay094/ov94_022414B8.c | 2 +- src/overlay094/ov94_02242AD0.c | 2 +- src/overlay094/ov94_02244950.c | 2 +- src/overlay095/ov95_02246C20.c | 2 +- src/overlay096/ov96_0223BCE0.c | 2 +- src/overlay097/ov97_0222C174.c | 3 +-- src/overlay097/ov97_0222D30C.c | 2 +- src/overlay097/ov97_02230410.c | 3 +-- src/overlay097/ov97_02233B18.c | 3 +-- src/overlay098/ov98_022471C8.c | 2 +- src/overlay100/ov100_021D0D80.c | 2 +- src/overlay100/ov100_021D46C8.c | 2 +- src/overlay104/ov104_02231F74.c | 2 +- src/overlay104/ov104_0223C2D4.c | 2 +- src/overlay105/ov105_02241AE0.c | 3 +-- src/overlay106/ov106_02241AE0.c | 3 +-- src/overlay107/ov107_02241AE0.c | 3 +-- src/overlay107/ov107_02245EB0.c | 3 +-- src/overlay108/ov108_02241AE0.c | 2 +- src/overlay109/ov109_021D3D50.c | 2 +- src/overlay110/ov110_021D0D80.c | 2 +- src/overlay111/ov111_021D0D80.c | 3 +-- src/overlay113/ov113_0225C700.c | 2 +- src/overlay114/ov114_0225C700.c | 2 +- src/pokemon_summary_app.c | 2 +- src/unk_02003B60.c | 2 +- src/unk_02025E08.c | 3 +-- src/unk_0202F1D4.c | 2 +- src/unk_0203D1B8.c | 3 +-- src/unk_02051D8C.c | 3 +-- src/unk_02052C6C.c | 2 +- src/unk_0205D8CC.c | 3 +-- src/unk_020683F4.c | 2 +- src/unk_0206F314.c | 2 +- src/unk_020722AC.c | 2 +- src/unk_0207AE68.c | 3 +-- src/unk_0207E0B8.c | 2 +- src/unk_020819DC.c | 2 +- src/unk_0208694C.c | 3 +-- src/unk_020890F4.c | 2 +- src/unk_0208A3F4.c | 2 +- src/unk_0209747C.c | 2 +- src/unk_02097B18.c | 2 +- src/unk_02098218.c | 2 +- src/unk_020989DC.c | 2 +- src/unk_0209C194.c | 2 +- 144 files changed, 164 insertions(+), 184 deletions(-) rename include/{unk_020279FC.h => game_options.h} (72%) rename src/{unk_020279FC.c => game_options.c} (97%) diff --git a/include/battle/ov16_0223DF00.h b/include/battle/ov16_0223DF00.h index 4183ae88db..6ac3377a69 100644 --- a/include/battle/ov16_0223DF00.h +++ b/include/battle/ov16_0223DF00.h @@ -16,7 +16,7 @@ #include "strbuf.h" #include "trainer_info.h" #include "struct_decls/pokedexdata_decl.h" -#include "struct_defs/options.h" +#include "game_options.h" #include "struct_defs/chatot_cry.h" #include "struct_defs/struct_0205AA50.h" #include "pokemon.h" diff --git a/include/unk_020279FC.h b/include/game_options.h similarity index 72% rename from include/unk_020279FC.h rename to include/game_options.h index fc71fb9dec..6b38b8452d 100644 --- a/include/unk_020279FC.h +++ b/include/game_options.h @@ -1,9 +1,18 @@ -#ifndef POKEPLATINUM_UNK_020279FC_H -#define POKEPLATINUM_UNK_020279FC_H +#ifndef POKEPLATINUM_GAME_OPTIONS_H +#define POKEPLATINUM_GAME_OPTIONS_H -#include "struct_defs/options.h" #include "savedata.h" +typedef struct Options { + u16 textSpeed : 4; + u16 soundMethod : 2; + u16 battleStyle : 1; + u16 battleScene : 1; + u16 buttonMode : 2; + u16 frame : 5; + u16 : 1; +} Options; + Options * sub_020279FC(u32 param0); void sub_02027A10(const Options * param0, Options * param1); void sub_02027A1C(Options * param0); @@ -22,4 +31,4 @@ void sub_02027B38(Options * param0, int param1); int sub_02027B50(const Options * param0); void sub_02027B58(Options * param0, int param1); -#endif // POKEPLATINUM_UNK_020279FC_H +#endif // POKEPLATINUM_GAME_OPTIONS_H diff --git a/include/overlay006/battle_params.h b/include/overlay006/battle_params.h index 0edba10eef..8275192042 100644 --- a/include/overlay006/battle_params.h +++ b/include/overlay006/battle_params.h @@ -3,7 +3,7 @@ #include "trainer_info.h" #include "struct_decls/pokedexdata_decl.h" -#include "struct_defs/options.h" +#include "game_options.h" #include "struct_decls/struct_02027F8C_decl.h" #include "struct_decls/struct_0202B628_decl.h" #include "struct_decls/struct_0202C878_decl.h" diff --git a/include/overlay006/struct_ov6_02246254.h b/include/overlay006/struct_ov6_02246254.h index f9405724a0..6818c866dd 100644 --- a/include/overlay006/struct_ov6_02246254.h +++ b/include/overlay006/struct_ov6_02246254.h @@ -2,7 +2,7 @@ #define POKEPLATINUM_STRUCT_OV6_02246254_H #include "trainer_info.h" -#include "struct_defs/options.h" +#include "game_options.h" #include "pokemon.h" typedef struct { diff --git a/include/overlay007/struct_ov7_0224D008.h b/include/overlay007/struct_ov7_0224D008.h index 637d43ea9c..b5158a05b1 100644 --- a/include/overlay007/struct_ov7_0224D008.h +++ b/include/overlay007/struct_ov7_0224D008.h @@ -12,7 +12,7 @@ #include "struct_decls/struct_02022550_decl.h" #include "strbuf.h" #include "trainer_info.h" -#include "struct_defs/options.h" +#include "game_options.h" #include "struct_decls/struct_0202B628_decl.h" #include "struct_decls/struct_0202CD88_decl.h" #include "struct_decls/struct_020507E4_decl.h" diff --git a/include/overlay022/struct_ov22_02256BAC.h b/include/overlay022/struct_ov22_02256BAC.h index 610b2a6de5..b8744c8d5f 100644 --- a/include/overlay022/struct_ov22_02256BAC.h +++ b/include/overlay022/struct_ov22_02256BAC.h @@ -5,7 +5,7 @@ #include "struct_decls/struct_02009714_decl.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_020218BC_decl.h" -#include "struct_defs/options.h" +#include "game_options.h" #include "struct_defs/struct_02095C60.h" typedef struct { diff --git a/include/overlay062/ov62_02246B00.h b/include/overlay062/ov62_02246B00.h index 3e7e0cb5ef..f6fa87c118 100644 --- a/include/overlay062/ov62_02246B00.h +++ b/include/overlay062/ov62_02246B00.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_OV62_02246B00_H #define POKEPLATINUM_OV62_02246B00_H -#include "struct_defs/options.h" +#include "game_options.h" #include "overlay062/struct_ov62_02246B00.h" #include "overlay062/struct_ov62_02246BF4.h" diff --git a/include/overlay062/struct_ov62_02246B00.h b/include/overlay062/struct_ov62_02246B00.h index ac783c2fcf..edb822cc71 100644 --- a/include/overlay062/struct_ov62_02246B00.h +++ b/include/overlay062/struct_ov62_02246B00.h @@ -2,7 +2,7 @@ #define POKEPLATINUM_STRUCT_OV62_02246B00_H #include "strbuf.h" -#include "struct_defs/options.h" +#include "game_options.h" typedef struct { int unk_00; diff --git a/include/overlay072/struct_ov72_0223DB98_t.h b/include/overlay072/struct_ov72_0223DB98_t.h index 76605a97ed..da2ea32101 100644 --- a/include/overlay072/struct_ov72_0223DB98_t.h +++ b/include/overlay072/struct_ov72_0223DB98_t.h @@ -11,7 +11,7 @@ #include "struct_decls/struct_020218BC_decl.h" #include "struct_decls/struct_02022550_decl.h" #include "strbuf.h" -#include "struct_defs/options.h" +#include "game_options.h" #include "struct_decls/struct_0202CD88_decl.h" #include "struct_defs/struct_0205AA50.h" #include "overlay019/struct_ov19_021DA864.h" diff --git a/include/overlay082/struct_ov82_0223B164.h b/include/overlay082/struct_ov82_0223B164.h index 5e7ac8e1cb..ed2f296eaa 100644 --- a/include/overlay082/struct_ov82_0223B164.h +++ b/include/overlay082/struct_ov82_0223B164.h @@ -2,7 +2,7 @@ #define POKEPLATINUM_STRUCT_OV82_0223B164_H #include "trainer_info.h" -#include "struct_defs/options.h" +#include "game_options.h" #include "struct_decls/struct_0202AB28_decl.h" #include "struct_decls/struct_0202B628_decl.h" #include "struct_decls/struct_0207D3C0_decl.h" diff --git a/include/overlay084/struct_ov84_0223B5A0.h b/include/overlay084/struct_ov84_0223B5A0.h index 4c8e5dad0e..89fdfaa8b1 100644 --- a/include/overlay084/struct_ov84_0223B5A0.h +++ b/include/overlay084/struct_ov84_0223B5A0.h @@ -14,7 +14,7 @@ #include "struct_decls/struct_02018340_decl.h" #include "strbuf.h" #include "trainer_info.h" -#include "struct_defs/options.h" +#include "game_options.h" #include "struct_defs/struct_0205AA50.h" #include "struct_decls/struct_0207CB08_decl.h" #include "struct_decls/struct_0207D3C0_decl.h" diff --git a/include/overlay088/ov88_0223E9C4.h b/include/overlay088/ov88_0223E9C4.h index a05593429f..72116dd8d4 100644 --- a/include/overlay088/ov88_0223E9C4.h +++ b/include/overlay088/ov88_0223E9C4.h @@ -7,7 +7,7 @@ #include "struct_decls/struct_02013A04_decl.h" #include "struct_decls/struct_02018340_decl.h" #include "strbuf.h" -#include "struct_defs/options.h" +#include "game_options.h" #include "struct_defs/struct_0205AA50.h" void ov88_0223E9C4(BGL * param0, Window * param1, Options * param2); diff --git a/include/overlay088/struct_ov88_0223C370.h b/include/overlay088/struct_ov88_0223C370.h index b186e30363..25d5125224 100644 --- a/include/overlay088/struct_ov88_0223C370.h +++ b/include/overlay088/struct_ov88_0223C370.h @@ -3,7 +3,7 @@ #include "trainer_info.h" #include "struct_decls/pokedexdata_decl.h" -#include "struct_defs/options.h" +#include "game_options.h" #include "struct_decls/struct_02027F8C_decl.h" #include "struct_decls/struct_0202B628_decl.h" #include "struct_decls/struct_0202C878_decl.h" diff --git a/include/overlay097/struct_ov97_0222D04C.h b/include/overlay097/struct_ov97_0222D04C.h index f657adf403..52243a9532 100644 --- a/include/overlay097/struct_ov97_0222D04C.h +++ b/include/overlay097/struct_ov97_0222D04C.h @@ -12,7 +12,7 @@ #include "struct_decls/struct_020218BC_decl.h" #include "struct_decls/struct_02022550_decl.h" #include "strbuf.h" -#include "struct_defs/options.h" +#include "game_options.h" #include "struct_defs/struct_0205AA50.h" #include "savedata.h" #include "overlay019/struct_ov19_021DA864.h" diff --git a/include/overlay098/struct_ov98_02246E88.h b/include/overlay098/struct_ov98_02246E88.h index f13c73634d..23ca53241d 100644 --- a/include/overlay098/struct_ov98_02246E88.h +++ b/include/overlay098/struct_ov98_02246E88.h @@ -3,7 +3,7 @@ #include "overlay_manager.h" #include "strbuf.h" -#include "struct_defs/options.h" +#include "game_options.h" #include "savedata.h" #include "overlay096/struct_ov96_0223B574.h" #include "overlay096/struct_ov96_0223B574_1.h" diff --git a/include/overlay104/struct_ov104_02230BE4.h b/include/overlay104/struct_ov104_02230BE4.h index 1d29197e0f..a49f8eb300 100644 --- a/include/overlay104/struct_ov104_02230BE4.h +++ b/include/overlay104/struct_ov104_02230BE4.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_STRUCT_OV104_02230BE4_H #define POKEPLATINUM_STRUCT_OV104_02230BE4_H -#include "struct_defs/options.h" +#include "game_options.h" #include "struct_decls/struct_0202B628_decl.h" #include "field/field_system_decl.h" #include "struct_decls/struct_0207D99C_decl.h" diff --git a/include/struct_defs/battle_system.h b/include/struct_defs/battle_system.h index 0a2e936eca..66289d3b98 100644 --- a/include/struct_defs/battle_system.h +++ b/include/struct_defs/battle_system.h @@ -17,7 +17,7 @@ #include "strbuf.h" #include "trainer_info.h" #include "struct_decls/pokedexdata_decl.h" -#include "struct_defs/options.h" +#include "game_options.h" #include "struct_decls/struct_02027F8C_decl.h" #include "struct_defs/chatot_cry.h" #include "struct_decls/struct_0202CD88_decl.h" diff --git a/include/struct_defs/options.h b/include/struct_defs/options.h index b48318cdc2..19ed5fd595 100644 --- a/include/struct_defs/options.h +++ b/include/struct_defs/options.h @@ -1,14 +1,14 @@ #ifndef POKEPLATINUM_STRUCT_DEFS_OPTIONS_H #define POKEPLATINUM_STRUCT_DEFS_OPTIONS_H -typedef struct Options { - u16 textSpeed : 4; - u16 soundMethod : 2; - u16 battleStyle : 1; - u16 battleScene : 1; - u16 buttonMode : 2; - u16 frame : 5; - u16 : 1; -} Options; +// typedef struct Options { +// u16 textSpeed : 4; +// u16 soundMethod : 2; +// u16 battleStyle : 1; +// u16 battleScene : 1; +// u16 buttonMode : 2; +// u16 frame : 5; +// u16 : 1; +// } Options; #endif // POKEPLATINUM_STRUCT_DEFS_OPTIONS_H diff --git a/include/struct_defs/pokemon_summary.h b/include/struct_defs/pokemon_summary.h index a1f3892f61..dfa3cabf90 100644 --- a/include/struct_defs/pokemon_summary.h +++ b/include/struct_defs/pokemon_summary.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_STRUCT_POKEMON_SUMMARY_H #define POKEPLATINUM_STRUCT_POKEMON_SUMMARY_H -#include "struct_defs/options.h" +#include "game_options.h" #include "struct_defs/chatot_cry.h" typedef struct PokemonSummary { diff --git a/include/struct_defs/struct_0202F298.h b/include/struct_defs/struct_0202F298.h index c535c1e6e6..f809478747 100644 --- a/include/struct_defs/struct_0202F298.h +++ b/include/struct_defs/struct_0202F298.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_STRUCT_0202F298_H #define POKEPLATINUM_STRUCT_0202F298_H -#include "struct_defs/options.h" +#include "game_options.h" #include "struct_defs/struct_0202F298_sub1.h" #include "struct_defs/struct_0202FAA8.h" #include "struct_defs/struct_0202FAA8_sub1.h" diff --git a/include/struct_defs/struct_0203D9B8.h b/include/struct_defs/struct_0203D9B8.h index 238fd910a4..1610d09c35 100644 --- a/include/struct_defs/struct_0203D9B8.h +++ b/include/struct_defs/struct_0203D9B8.h @@ -2,7 +2,7 @@ #define POKEPLATINUM_STRUCT_0203D9B8_H #include "trainer_info.h" -#include "struct_defs/options.h" +#include "game_options.h" #include "struct_decls/struct_0202AB28_decl.h" #include "struct_decls/struct_party_decl.h" #include "struct_decls/struct_0207D3C0_decl.h" diff --git a/include/struct_defs/struct_0203DA00.h b/include/struct_defs/struct_0203DA00.h index b13159363b..2c7ade0859 100644 --- a/include/struct_defs/struct_0203DA00.h +++ b/include/struct_defs/struct_0203DA00.h @@ -2,7 +2,7 @@ #define POKEPLATINUM_STRUCT_0203DA00_H #include "trainer_info.h" -#include "struct_defs/options.h" +#include "game_options.h" #include "struct_decls/struct_02029C68_decl.h" #include "struct_decls/struct_02029D04_decl.h" #include "struct_decls/struct_0202CD88_decl.h" diff --git a/include/struct_defs/struct_0203DDFC.h b/include/struct_defs/struct_0203DDFC.h index 78359fd0d3..6472bb7ae5 100644 --- a/include/struct_defs/struct_0203DDFC.h +++ b/include/struct_defs/struct_0203DDFC.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_STRUCT_0203DDFC_H #define POKEPLATINUM_STRUCT_0203DDFC_H -#include "struct_defs/options.h" +#include "game_options.h" #include "struct_decls/struct_0202B628_decl.h" #include "struct_decls/struct_0205C22C_decl.h" diff --git a/include/struct_defs/struct_0203DE34.h b/include/struct_defs/struct_0203DE34.h index 6aba830f37..334005e4ed 100644 --- a/include/struct_defs/struct_0203DE34.h +++ b/include/struct_defs/struct_0203DE34.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_STRUCT_0203DE34_H #define POKEPLATINUM_STRUCT_0203DE34_H -#include "struct_defs/options.h" +#include "game_options.h" #include "struct_decls/struct_0202B628_decl.h" #include "struct_decls/struct_0202CD88_decl.h" #include "struct_decls/struct_0205C22C_decl.h" diff --git a/include/struct_defs/struct_0203E0FC.h b/include/struct_defs/struct_0203E0FC.h index ed2c2fbebf..8916a28bd9 100644 --- a/include/struct_defs/struct_0203E0FC.h +++ b/include/struct_defs/struct_0203E0FC.h @@ -4,7 +4,7 @@ #include "struct_decls/struct_02025CCC_decl.h" #include "trainer_info.h" #include "struct_decls/pokedexdata_decl.h" -#include "struct_defs/options.h" +#include "game_options.h" #include "struct_decls/struct_0202B370_decl.h" #include "struct_decls/struct_0202B628_decl.h" #include "struct_decls/struct_0202C878_decl.h" diff --git a/include/struct_defs/struct_0203E2FC.h b/include/struct_defs/struct_0203E2FC.h index 6ce4ba3d24..0227ecd68c 100644 --- a/include/struct_defs/struct_0203E2FC.h +++ b/include/struct_defs/struct_0203E2FC.h @@ -2,7 +2,7 @@ #define POKEPLATINUM_STRUCT_0203E2FC_H #include "trainer_info.h" -#include "struct_defs/options.h" +#include "game_options.h" #include "pokemon.h" typedef struct { diff --git a/include/struct_defs/struct_020425E0.h b/include/struct_defs/struct_020425E0.h index 91087fdb24..09a257acff 100644 --- a/include/struct_defs/struct_020425E0.h +++ b/include/struct_defs/struct_020425E0.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_STRUCT_020425E0_H #define POKEPLATINUM_STRUCT_020425E0_H -#include "struct_defs/options.h" +#include "game_options.h" typedef struct { int unk_00; diff --git a/include/struct_defs/struct_0206BC70.h b/include/struct_defs/struct_0206BC70.h index 519e1e9428..76ea7cc41b 100644 --- a/include/struct_defs/struct_0206BC70.h +++ b/include/struct_defs/struct_0206BC70.h @@ -2,7 +2,7 @@ #define POKEPLATINUM_STRUCT_0206BC70_H #include "struct_decls/struct_02025CCC_decl.h" -#include "struct_defs/options.h" +#include "game_options.h" #include "struct_decls/struct_0202D750_decl.h" #include "struct_decls/struct_0202D764_decl.h" #include "savedata.h" diff --git a/include/struct_defs/struct_0207AE68_t.h b/include/struct_defs/struct_0207AE68_t.h index 01966aeea5..2a00ee40be 100644 --- a/include/struct_defs/struct_0207AE68_t.h +++ b/include/struct_defs/struct_0207AE68_t.h @@ -11,7 +11,7 @@ #include "struct_decls/struct_02018340_decl.h" #include "strbuf.h" #include "struct_decls/pokedexdata_decl.h" -#include "struct_defs/options.h" +#include "game_options.h" #include "struct_decls/struct_0202CD88_decl.h" #include "poketch_data.h" #include "struct_defs/struct_0205AA50.h" diff --git a/include/struct_defs/struct_0208737C.h b/include/struct_defs/struct_0208737C.h index 9c04ef0eb5..45841367c8 100644 --- a/include/struct_defs/struct_0208737C.h +++ b/include/struct_defs/struct_0208737C.h @@ -2,7 +2,7 @@ #define POKEPLATINUM_STRUCT_0208737C_H #include "strbuf.h" -#include "struct_defs/options.h" +#include "game_options.h" #include "struct_decls/struct_020797DC_decl.h" typedef struct { diff --git a/include/struct_defs/struct_02089438.h b/include/struct_defs/struct_02089438.h index 0ae542c867..aed7e5aa4e 100644 --- a/include/struct_defs/struct_02089438.h +++ b/include/struct_defs/struct_02089438.h @@ -2,7 +2,7 @@ #define POKEPLATINUM_STRUCT_02089438_H #include "strbuf.h" -#include "struct_defs/options.h" +#include "game_options.h" typedef struct { int unk_00; diff --git a/include/struct_defs/struct_02093800.h b/include/struct_defs/struct_02093800.h index 0768a33014..84cf6790a6 100644 --- a/include/struct_defs/struct_02093800.h +++ b/include/struct_defs/struct_02093800.h @@ -3,7 +3,7 @@ #include "strbuf.h" #include "trainer_info.h" -#include "struct_defs/options.h" +#include "game_options.h" #include "struct_decls/struct_0202A750_decl.h" #include "pokemon.h" #include "savedata.h" diff --git a/include/struct_defs/struct_02093BBC.h b/include/struct_defs/struct_02093BBC.h index d6d456befb..9e7594e8e8 100644 --- a/include/struct_defs/struct_02093BBC.h +++ b/include/struct_defs/struct_02093BBC.h @@ -2,7 +2,7 @@ #define POKEPLATINUM_STRUCT_02093BBC_H #include "trainer_info.h" -#include "struct_defs/options.h" +#include "game_options.h" #include "struct_decls/struct_02029C88_decl.h" #include "struct_decls/struct_02029D04_decl.h" #include "pokemon.h" diff --git a/include/struct_defs/struct_02095C48.h b/include/struct_defs/struct_02095C48.h index b1932c8da7..d673035cf5 100644 --- a/include/struct_defs/struct_02095C48.h +++ b/include/struct_defs/struct_02095C48.h @@ -3,7 +3,7 @@ #include "struct_decls/sys_task.h" #include "trainer_info.h" -#include "struct_defs/options.h" +#include "game_options.h" #include "struct_decls/struct_0202A750_decl.h" #include "pokemon.h" #include "struct_decls/struct_party_decl.h" diff --git a/include/struct_defs/struct_020978D8.h b/include/struct_defs/struct_020978D8.h index 2b16cd1488..a7c64c2066 100644 --- a/include/struct_defs/struct_020978D8.h +++ b/include/struct_defs/struct_020978D8.h @@ -3,7 +3,7 @@ #include "struct_defs/sentence.h" #include "strbuf.h" -#include "struct_defs/options.h" +#include "game_options.h" #include "struct_defs/union_02028328.h" typedef struct { diff --git a/include/struct_defs/struct_02097F18.h b/include/struct_defs/struct_02097F18.h index 73e94fb907..74504fc788 100644 --- a/include/struct_defs/struct_02097F18.h +++ b/include/struct_defs/struct_02097F18.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_STRUCT_02097F18_H #define POKEPLATINUM_STRUCT_02097F18_H -#include "struct_defs/options.h" +#include "game_options.h" #include "struct_decls/struct_0202CA1C_decl.h" #include "pokemon.h" #include "struct_decls/struct_party_decl.h" diff --git a/include/struct_defs/struct_020985E4.h b/include/struct_defs/struct_020985E4.h index 9d0f72e085..dfe7a48314 100644 --- a/include/struct_defs/struct_020985E4.h +++ b/include/struct_defs/struct_020985E4.h @@ -2,7 +2,7 @@ #define POKEPLATINUM_STRUCT_020985E4_H #include "trainer_info.h" -#include "struct_defs/options.h" +#include "game_options.h" typedef struct { int unk_00; diff --git a/include/struct_defs/struct_02098C44.h b/include/struct_defs/struct_02098C44.h index 7158bdbc32..fe9bb4ad26 100644 --- a/include/struct_defs/struct_02098C44.h +++ b/include/struct_defs/struct_02098C44.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_STRUCT_02098C44_H #define POKEPLATINUM_STRUCT_02098C44_H -#include "struct_defs/options.h" +#include "game_options.h" #include "struct_decls/struct_party_decl.h" typedef struct { diff --git a/include/struct_defs/struct_020997B8.h b/include/struct_defs/struct_020997B8.h index fd5924f121..0bb4301a81 100644 --- a/include/struct_defs/struct_020997B8.h +++ b/include/struct_defs/struct_020997B8.h @@ -2,7 +2,7 @@ #define POKEPLATINUM_STRUCT_020997B8_H #include "trainer_info.h" -#include "struct_defs/options.h" +#include "game_options.h" #include "pokemon.h" typedef struct { diff --git a/include/struct_defs/struct_0209C194_1.h b/include/struct_defs/struct_0209C194_1.h index 4408d6a4a8..5e714ab46a 100644 --- a/include/struct_defs/struct_0209C194_1.h +++ b/include/struct_defs/struct_0209C194_1.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_STRUCT_0209C194_1_H #define POKEPLATINUM_STRUCT_0209C194_1_H -#include "struct_defs/options.h" +#include "game_options.h" #include "struct_decls/struct_0202B628_decl.h" #include "struct_decls/struct_0202CD88_decl.h" #include "field/field_system_decl.h" diff --git a/include/unk_02003B60.h b/include/unk_02003B60.h index ec18717d64..a9c77ff437 100644 --- a/include/unk_02003B60.h +++ b/include/unk_02003B60.h @@ -2,7 +2,7 @@ #define POKEPLATINUM_UNK_02003B60_H #include "struct_decls/struct_02003D54_decl.h" -#include "struct_defs/options.h" +#include "game_options.h" #include "struct_defs/chatot_cry.h" #include diff --git a/include/unk_02025E08.h b/include/unk_02025E08.h index f38793b613..03f647782f 100644 --- a/include/unk_02025E08.h +++ b/include/unk_02025E08.h @@ -4,7 +4,7 @@ #include "struct_decls/struct_02025E0C_decl.h" #include "struct_decls/struct_02025E5C_decl.h" #include "trainer_info.h" -#include "struct_defs/options.h" +#include "game_options.h" #include "savedata.h" int Player_SaveSize(void); diff --git a/include/unk_0205D8CC.h b/include/unk_0205D8CC.h index de7aac202c..3ee3a94069 100644 --- a/include/unk_0205D8CC.h +++ b/include/unk_0205D8CC.h @@ -3,7 +3,7 @@ #include "struct_decls/struct_02018340_decl.h" #include "strbuf.h" -#include "struct_defs/options.h" +#include "game_options.h" #include "struct_defs/struct_0205AA50.h" void sub_0205D8CC(u32 param0, u32 param1); diff --git a/include/unk_0207AE68.h b/include/unk_0207AE68.h index 1add67d23f..3fdc19ea59 100644 --- a/include/unk_0207AE68.h +++ b/include/unk_0207AE68.h @@ -2,7 +2,7 @@ #define POKEPLATINUM_UNK_0207AE68_H #include "struct_decls/pokedexdata_decl.h" -#include "struct_defs/options.h" +#include "game_options.h" #include "struct_decls/struct_0202CD88_decl.h" #include "poketch_data.h" #include "pokemon.h" diff --git a/include/unk_0208694C.h b/include/unk_0208694C.h index fb088079fc..7d6ec741c0 100644 --- a/include/unk_0208694C.h +++ b/include/unk_0208694C.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_UNK_0208694C_H #define POKEPLATINUM_UNK_0208694C_H -#include "struct_defs/options.h" +#include "game_options.h" #include "struct_defs/struct_0208737C.h" UnkStruct_0208737C * sub_0208712C(int param0, int param1, int param2, int param3, Options * param4); diff --git a/include/unk_020890F4.h b/include/unk_020890F4.h index 64470f52e5..df333ed8f1 100644 --- a/include/unk_020890F4.h +++ b/include/unk_020890F4.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_UNK_020890F4_H #define POKEPLATINUM_UNK_020890F4_H -#include "struct_defs/options.h" +#include "game_options.h" #include "struct_defs/struct_02089438.h" UnkStruct_02089438 * sub_020893B4(int param0, int param1, int param2[], Options * param3, u32 param4, u32 param5); diff --git a/platinum.us/main.lsf b/platinum.us/main.lsf index 3c5600fd42..966fe75380 100644 --- a/platinum.us/main.lsf +++ b/platinum.us/main.lsf @@ -111,7 +111,7 @@ Static main Object main.nef.p/src_unk_020261E4.c.o Object main.nef.p/src_unk_0202631C.c.o Object main.nef.p/src_savedata_misc.c.o - Object main.nef.p/src_unk_020279FC.c.o + Object main.nef.p/src_game_options.c.o Object main.nef.p/src_unk_02027B70.c.o Object main.nef.p/src_unk_02027F50.c.o Object main.nef.p/src_unk_02027F84.c.o diff --git a/src/battle/ov16_0223B140.c b/src/battle/ov16_0223B140.c index 7f394ddf45..bd2273a124 100644 --- a/src/battle/ov16_0223B140.c +++ b/src/battle/ov16_0223B140.c @@ -65,7 +65,7 @@ #include "unk_02024220.h" #include "trainer_info.h" #include "unk_0202631C.h" -#include "unk_020279FC.h" +#include "game_options.h" #include "unk_0202CD50.h" #include "unk_0202F1D4.h" #include "unk_02033200.h" diff --git a/src/battle/ov16_0223DF00.c b/src/battle/ov16_0223DF00.c index faede45a5a..00fa1c4f88 100644 --- a/src/battle/ov16_0223DF00.c +++ b/src/battle/ov16_0223DF00.c @@ -36,7 +36,6 @@ #include "struct_defs/struct_0200D0F4.h" #include "struct_defs/struct_0201D738.h" -#include "struct_defs/options.h" #include "struct_defs/struct_0205AA50.h" #include "pokemon.h" #include "struct_defs/trainer_data.h" @@ -62,7 +61,7 @@ #include "strbuf.h" #include "trainer_info.h" #include "unk_0202631C.h" -#include "unk_020279FC.h" +#include "game_options.h" #include "unk_0202CD50.h" #include "unk_0202F1D4.h" #include "poketch_data.h" diff --git a/src/unk_020279FC.c b/src/game_options.c similarity index 97% rename from src/unk_020279FC.c rename to src/game_options.c index 73a01fae04..a026f37c4e 100644 --- a/src/unk_020279FC.c +++ b/src/game_options.c @@ -5,11 +5,10 @@ #include "savedata.h" -#include "struct_defs/options.h" #include "heap.h" #include "unk_02025E08.h" -#include "unk_020279FC.h" +#include "game_options.h" Options * sub_020279FC (u32 param0) { diff --git a/src/meson.build b/src/meson.build index 7e708bcd8e..af2a21a48f 100644 --- a/src/meson.build +++ b/src/meson.build @@ -103,7 +103,7 @@ pokeplatinum_c = files( 'unk_020261E4.c', 'unk_0202631C.c', 'savedata_misc.c', - 'unk_020279FC.c', + 'game_options.c', 'unk_02027B70.c', 'unk_02027F50.c', 'unk_02027F84.c', diff --git a/src/overlay005/ov5_021DD42C.c b/src/overlay005/ov5_021DD42C.c index 1c53453a9c..68cebedc8b 100644 --- a/src/overlay005/ov5_021DD42C.c +++ b/src/overlay005/ov5_021DD42C.c @@ -18,7 +18,7 @@ #include "unk_0201D670.h" #include "strbuf.h" #include "unk_02025E08.h" -#include "unk_020279FC.h" +#include "game_options.h" #include "unk_0203E880.h" #include "unk_0205D8CC.h" #include "overlay005/ov5_021DD42C.h" diff --git a/src/overlay005/ov5_021EA874.c b/src/overlay005/ov5_021EA874.c index 6c4d5ba596..8aafa06ff7 100644 --- a/src/overlay005/ov5_021EA874.c +++ b/src/overlay005/ov5_021EA874.c @@ -30,7 +30,7 @@ #include "strbuf.h" #include "unk_02025E08.h" #include "trainer_info.h" -#include "unk_020279FC.h" +#include "game_options.h" #include "unk_0202ACE0.h" #include "unk_0203061C.h" #include "communication_information.h" diff --git a/src/overlay007/ov7_0224BE9C.c b/src/overlay007/ov7_0224BE9C.c index 43fc00d5b5..80b45ed982 100644 --- a/src/overlay007/ov7_0224BE9C.c +++ b/src/overlay007/ov7_0224BE9C.c @@ -21,7 +21,6 @@ #include "struct_defs/struct_0200C738.h" #include "struct_defs/struct_02013A04_t.h" -#include "struct_defs/options.h" #include "struct_defs/struct_0205AA50.h" #include "overlay019/struct_ov19_021DA864.h" #include "overlay061/struct_ov61_0222C884.h" @@ -45,7 +44,7 @@ #include "unk_020218BC.h" #include "strbuf.h" #include "unk_02025E08.h" -#include "unk_020279FC.h" +#include "game_options.h" #include "unk_020298BC.h" #include "unk_0205D8CC.h" #include "unk_0207D3B8.h" diff --git a/src/overlay007/ov7_0224CD28.c b/src/overlay007/ov7_0224CD28.c index 7883a10e7a..ebb150b2c0 100644 --- a/src/overlay007/ov7_0224CD28.c +++ b/src/overlay007/ov7_0224CD28.c @@ -42,7 +42,7 @@ #include "strbuf.h" #include "unk_02025E08.h" #include "trainer_info.h" -#include "unk_020279FC.h" +#include "game_options.h" #include "unk_0202854C.h" #include "unk_0202B604.h" #include "unk_0202C9F4.h" diff --git a/src/overlay010/ov10_0221F800.c b/src/overlay010/ov10_0221F800.c index 309733904e..3e55cfd9f1 100644 --- a/src/overlay010/ov10_0221F800.c +++ b/src/overlay010/ov10_0221F800.c @@ -60,7 +60,7 @@ #include "unk_0202419C.h" #include "unk_02024220.h" #include "trainer_info.h" -#include "unk_020279FC.h" +#include "game_options.h" #include "unk_0202B604.h" #include "unk_0202F1D4.h" #include "communication_information.h" diff --git a/src/overlay017/ov17_0223CB1C.c b/src/overlay017/ov17_0223CB1C.c index 82fe223f96..acb5188633 100644 --- a/src/overlay017/ov17_0223CB1C.c +++ b/src/overlay017/ov17_0223CB1C.c @@ -38,7 +38,7 @@ #include "unk_0201E3D8.h" #include "gx_layers.h" #include "strbuf.h" -#include "unk_020279FC.h" +#include "game_options.h" #include "unk_020366A0.h" #include "unk_020393C8.h" #include "unk_020933F8.h" diff --git a/src/overlay017/ov17_0223DAD0.c b/src/overlay017/ov17_0223DAD0.c index 3b01d347eb..67f7ad0c44 100644 --- a/src/overlay017/ov17_0223DAD0.c +++ b/src/overlay017/ov17_0223DAD0.c @@ -45,7 +45,7 @@ #include "gx_layers.h" #include "unk_02020020.h" #include "strbuf.h" -#include "unk_020279FC.h" +#include "game_options.h" #include "unk_020366A0.h" #include "unk_020393C8.h" #include "pokemon.h" diff --git a/src/overlay017/ov17_022413D8.c b/src/overlay017/ov17_022413D8.c index 298b298ef8..21d099f9df 100644 --- a/src/overlay017/ov17_022413D8.c +++ b/src/overlay017/ov17_022413D8.c @@ -43,7 +43,7 @@ #include "unk_0201D15C.h" #include "unk_0201D670.h" #include "strbuf.h" -#include "unk_020279FC.h" +#include "game_options.h" #include "pokemon.h" #include "unk_0208C098.h" #include "unk_02094EDC.h" diff --git a/src/overlay017/ov17_022476F8.c b/src/overlay017/ov17_022476F8.c index 10b73efab8..045737af10 100644 --- a/src/overlay017/ov17_022476F8.c +++ b/src/overlay017/ov17_022476F8.c @@ -27,7 +27,7 @@ #include "unk_0201D15C.h" #include "unk_0201D670.h" #include "strbuf.h" -#include "unk_020279FC.h" +#include "game_options.h" #include "pokemon.h" #include "overlay017/ov17_022476F8.h" diff --git a/src/overlay017/ov17_0224A0FC.c b/src/overlay017/ov17_0224A0FC.c index f921083231..bc7d2f1b4e 100644 --- a/src/overlay017/ov17_0224A0FC.c +++ b/src/overlay017/ov17_0224A0FC.c @@ -54,7 +54,7 @@ #include "unk_0201D670.h" #include "unk_020218BC.h" #include "strbuf.h" -#include "unk_020279FC.h" +#include "game_options.h" #include "pokemon.h" #include "unk_020933F8.h" #include "unk_02094EDC.h" diff --git a/src/overlay017/ov17_02250744.c b/src/overlay017/ov17_02250744.c index 7fb54d7314..1c53ec07d4 100644 --- a/src/overlay017/ov17_02250744.c +++ b/src/overlay017/ov17_02250744.c @@ -33,7 +33,7 @@ #include "unk_0201D670.h" #include "unk_020218BC.h" #include "strbuf.h" -#include "unk_020279FC.h" +#include "game_options.h" #include "pokemon.h" #include "pokemon_icon.h" #include "unk_020933F8.h" diff --git a/src/overlay019/ov19_021D0D80.c b/src/overlay019/ov19_021D0D80.c index c2bba889aa..e97c4f7d3a 100644 --- a/src/overlay019/ov19_021D0D80.c +++ b/src/overlay019/ov19_021D0D80.c @@ -25,7 +25,6 @@ #include "constdata/const_020F2DAC.h" #include "struct_defs/union_02022594_020225E0.h" -#include "struct_defs/options.h" #include "struct_defs/struct_02042434.h" #include "struct_defs/struct_0208737C.h" #include "struct_defs/pokemon_summary.h" @@ -53,7 +52,7 @@ #include "savedata/save_table.h" #include "savedata.h" #include "unk_02025E08.h" -#include "unk_020279FC.h" +#include "game_options.h" #include "unk_0202CC64.h" #include "unk_0202D778.h" #include "pokemon.h" diff --git a/src/overlay022/ov22_02255D44.c b/src/overlay022/ov22_02255D44.c index 7d0bbccaab..d5c1535b1b 100644 --- a/src/overlay022/ov22_02255D44.c +++ b/src/overlay022/ov22_02255D44.c @@ -14,7 +14,6 @@ #include "struct_defs/archived_sprite.h" #include "struct_defs/struct_02015958.h" -#include "struct_defs/options.h" #include "struct_defs/struct_0203DA00.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02093BBC.h" @@ -62,7 +61,7 @@ #include "unk_020218BC.h" #include "strbuf.h" #include "trainer_info.h" -#include "unk_020279FC.h" +#include "game_options.h" #include "unk_020298BC.h" #include "unk_0202CD50.h" #include "unk_020363E8.h" diff --git a/src/overlay022/ov22_0225A428.c b/src/overlay022/ov22_0225A428.c index ccf403a2ac..7c48bcf1e9 100644 --- a/src/overlay022/ov22_0225A428.c +++ b/src/overlay022/ov22_0225A428.c @@ -9,7 +9,6 @@ #include "struct_decls/struct_020218BC_decl.h" #include "strbuf.h" -#include "struct_defs/options.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02095C60.h" #include "overlay019/struct_ov19_021DA864.h" @@ -35,7 +34,7 @@ #include "unk_0201D670.h" #include "unk_020218BC.h" #include "strbuf.h" -#include "unk_020279FC.h" +#include "game_options.h" #include "unk_02095AF0.h" #include "overlay022/ov22_022597BC.h" #include "overlay022/ov22_0225A428.h" diff --git a/src/overlay023/ov23_02241F74.c b/src/overlay023/ov23_02241F74.c index 7eb81b9609..f224a8ffd1 100644 --- a/src/overlay023/ov23_02241F74.c +++ b/src/overlay023/ov23_02241F74.c @@ -28,7 +28,7 @@ #include "heap.h" #include "strbuf.h" #include "unk_02025E08.h" -#include "unk_020279FC.h" +#include "game_options.h" #include "unk_0202854C.h" #include "unk_02030EE0.h" #include "communication_information.h" diff --git a/src/overlay057/ov57_021D0D80.c b/src/overlay057/ov57_021D0D80.c index 6325b76383..48775fdd2d 100644 --- a/src/overlay057/ov57_021D0D80.c +++ b/src/overlay057/ov57_021D0D80.c @@ -26,7 +26,7 @@ #include "unk_02025E08.h" #include "trainer_info.h" #include "savedata_misc.h" -#include "unk_020279FC.h" +#include "game_options.h" #include "unk_02027B70.h" #include "unk_0202B37C.h" #include "unk_0205C980.h" diff --git a/src/overlay058/ov58_021D0D80.c b/src/overlay058/ov58_021D0D80.c index ee6ffe41de..fcdacc5977 100644 --- a/src/overlay058/ov58_021D0D80.c +++ b/src/overlay058/ov58_021D0D80.c @@ -54,7 +54,7 @@ #include "unk_02022594.h" #include "strbuf.h" #include "trainer_info.h" -#include "unk_020279FC.h" +#include "game_options.h" #include "unk_0202B604.h" #include "unk_02030EE0.h" #include "communication_information.h" diff --git a/src/overlay059/ov59_021D0D80.c b/src/overlay059/ov59_021D0D80.c index 62cf3d184f..da7b4a40d8 100644 --- a/src/overlay059/ov59_021D0D80.c +++ b/src/overlay059/ov59_021D0D80.c @@ -51,7 +51,7 @@ #include "unk_020218BC.h" #include "strbuf.h" #include "trainer_info.h" -#include "unk_020279FC.h" +#include "game_options.h" #include "unk_0202B604.h" #include "unk_0202CD50.h" #include "unk_02030EE0.h" diff --git a/src/overlay061/ov61_0222BF44.c b/src/overlay061/ov61_0222BF44.c index a0c13b632a..ce3b1fe50a 100644 --- a/src/overlay061/ov61_0222BF44.c +++ b/src/overlay061/ov61_0222BF44.c @@ -45,7 +45,7 @@ #include "strbuf.h" #include "unk_02025CB0.h" #include "unk_02025E08.h" -#include "unk_020279FC.h" +#include "game_options.h" #include "unk_0202ACE0.h" #include "unk_020366A0.h" #include "unk_02038FFC.h" diff --git a/src/overlay062/ov62_02246B00.c b/src/overlay062/ov62_02246B00.c index c08298326a..98222a7b89 100644 --- a/src/overlay062/ov62_02246B00.c +++ b/src/overlay062/ov62_02246B00.c @@ -11,7 +11,7 @@ #include "strbuf.h" #include "struct_defs/struct_0200D0F4.h" -#include "struct_defs/options.h" +#include "game_options.h" #include "overlay062/struct_ov62_02246B00.h" #include "overlay062/struct_ov62_02246BF4.h" #include "overlay062/struct_ov62_02246BF4_sub1.h" diff --git a/src/overlay064/ov64_0222DCE0.c b/src/overlay064/ov64_0222DCE0.c index 8f43da55a3..fab1ec3885 100644 --- a/src/overlay064/ov64_0222DCE0.c +++ b/src/overlay064/ov64_0222DCE0.c @@ -77,7 +77,7 @@ #include "strbuf.h" #include "unk_02025E08.h" #include "trainer_info.h" -#include "unk_020279FC.h" +#include "game_options.h" #include "unk_0202ACE0.h" #include "unk_0203061C.h" #include "unk_0203909C.h" diff --git a/src/overlay065/ov65_0222DCE0.c b/src/overlay065/ov65_0222DCE0.c index 46835ea60a..a12d14452a 100644 --- a/src/overlay065/ov65_0222DCE0.c +++ b/src/overlay065/ov65_0222DCE0.c @@ -82,7 +82,7 @@ #include "unk_02025E08.h" #include "trainer_info.h" #include "unk_0202631C.h" -#include "unk_020279FC.h" +#include "game_options.h" #include "poffin.h" #include "unk_0202ACE0.h" #include "unk_0202B604.h" diff --git a/src/overlay065/ov65_0223648C.c b/src/overlay065/ov65_0223648C.c index 74d4a991de..60e4cbf75c 100644 --- a/src/overlay065/ov65_0223648C.c +++ b/src/overlay065/ov65_0223648C.c @@ -61,7 +61,7 @@ #include "strbuf.h" #include "unk_02025E08.h" #include "trainer_info.h" -#include "unk_020279FC.h" +#include "game_options.h" #include "unk_0202B604.h" #include "communication_information.h" #include "communication_system.h" diff --git a/src/overlay067/ov67_0225C700.c b/src/overlay067/ov67_0225C700.c index c63d7302ca..b9909d6c9e 100644 --- a/src/overlay067/ov67_0225C700.c +++ b/src/overlay067/ov67_0225C700.c @@ -13,7 +13,6 @@ #include "savedata.h" #include "overlay066/struct_ov66_0222E71C_decl.h" -#include "struct_defs/options.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02099F80.h" #include "overlay061/struct_ov61_0222C3B0.h" @@ -42,7 +41,7 @@ #include "gx_layers.h" #include "strbuf.h" #include "unk_02025E08.h" -#include "unk_020279FC.h" +#include "game_options.h" #include "unk_0202CD50.h" #include "unk_020366A0.h" #include "unk_020393C8.h" diff --git a/src/overlay068/ov68_0225C700.c b/src/overlay068/ov68_0225C700.c index 367d5661ae..035b4976bf 100644 --- a/src/overlay068/ov68_0225C700.c +++ b/src/overlay068/ov68_0225C700.c @@ -21,7 +21,6 @@ #include "overlay066/struct_ov66_0222E71C_decl.h" #include "struct_defs/struct_0200C738.h" -#include "struct_defs/options.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02099F80.h" #include "overlay019/struct_ov19_021DA864.h" @@ -60,7 +59,7 @@ #include "strbuf.h" #include "unk_02025E08.h" #include "trainer_info.h" -#include "unk_020279FC.h" +#include "game_options.h" #include "unk_02030EA4.h" #include "unk_020393C8.h" #include "overlay066/ov66_0222DDF0.h" diff --git a/src/overlay069/ov69_0225C700.c b/src/overlay069/ov69_0225C700.c index dd1b4e1f4a..e57cd83cad 100644 --- a/src/overlay069/ov69_0225C700.c +++ b/src/overlay069/ov69_0225C700.c @@ -21,7 +21,6 @@ #include "struct_defs/struct_02015958.h" #include "struct_defs/struct_020170F4.h" #include "struct_defs/struct_02017294.h" -#include "struct_defs/options.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0207C690.h" #include "struct_defs/struct_02099F80.h" @@ -68,7 +67,7 @@ #include "unk_0202419C.h" #include "unk_02024220.h" #include "unk_02025E08.h" -#include "unk_020279FC.h" +#include "game_options.h" #include "unk_0202C858.h" #include "unk_020393C8.h" #include "unk_020996D0.h" diff --git a/src/overlay070/ov70_0225D9A4.c b/src/overlay070/ov70_0225D9A4.c index e7dd37ef2e..6c6130605e 100644 --- a/src/overlay070/ov70_0225D9A4.c +++ b/src/overlay070/ov70_0225D9A4.c @@ -33,7 +33,6 @@ #include "struct_defs/struct_0200C738.h" #include "struct_defs/struct_02013A04_t.h" #include "struct_defs/union_02022594_020225E0.h" -#include "struct_defs/options.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0207C690.h" #include "struct_defs/struct_02099F80.h" @@ -83,7 +82,7 @@ #include "unk_02024220.h" #include "unk_02025E08.h" #include "trainer_info.h" -#include "unk_020279FC.h" +#include "game_options.h" #include "unk_020366A0.h" #include "unk_020393C8.h" #include "pokemon.h" diff --git a/src/overlay072/ov72_0223D7A0.c b/src/overlay072/ov72_0223D7A0.c index d2e87ee577..55a1c99972 100644 --- a/src/overlay072/ov72_0223D7A0.c +++ b/src/overlay072/ov72_0223D7A0.c @@ -16,7 +16,6 @@ #include "struct_defs/struct_02015958.h" #include "struct_defs/union_02022594_020225E0.h" -#include "struct_defs/options.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02099F80.h" #include "overlay022/struct_ov22_022559F8.h" @@ -59,7 +58,7 @@ #include "unk_02022594.h" #include "strbuf.h" #include "unk_02025E08.h" -#include "unk_020279FC.h" +#include "game_options.h" #include "unk_0202C7FC.h" #include "unk_0202CD50.h" #include "overlay072/ov72_0223D7A0.h" diff --git a/src/overlay073/ov73_021D0D80.c b/src/overlay073/ov73_021D0D80.c index cc5bc3562c..05ddf2ac99 100644 --- a/src/overlay073/ov73_021D0D80.c +++ b/src/overlay073/ov73_021D0D80.c @@ -18,7 +18,6 @@ #include "struct_defs/archived_sprite.h" #include "struct_defs/struct_02013A04_t.h" #include "struct_defs/struct_02015958.h" -#include "struct_defs/options.h" #include "struct_defs/struct_0203CC84.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0208737C.h" @@ -55,7 +54,7 @@ #include "unk_02025E08.h" #include "trainer_info.h" #include "savedata_misc.h" -#include "unk_020279FC.h" +#include "game_options.h" #include "pokemon.h" #include "unk_0208694C.h" diff --git a/src/overlay074/ov74_021D0D80.c b/src/overlay074/ov74_021D0D80.c index 0fb7ad1624..97a65bf534 100644 --- a/src/overlay074/ov74_021D0D80.c +++ b/src/overlay074/ov74_021D0D80.c @@ -12,7 +12,6 @@ #include "strbuf.h" #include "struct_defs/struct_0200D0F4.h" -#include "struct_defs/options.h" #include "struct_defs/struct_0203D8EC.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02099F80.h" @@ -38,7 +37,7 @@ #include "unk_0201DBEC.h" #include "gx_layers.h" #include "strbuf.h" -#include "unk_020279FC.h" +#include "game_options.h" #include "unk_020393C8.h" #include "overlay074/ov74_021D0D80.h" diff --git a/src/overlay075/ov75_021D0D80.c b/src/overlay075/ov75_021D0D80.c index 1b2ca26c75..73ceb1741f 100644 --- a/src/overlay075/ov75_021D0D80.c +++ b/src/overlay075/ov75_021D0D80.c @@ -48,7 +48,7 @@ #include "unk_0201DBEC.h" #include "gx_layers.h" #include "strbuf.h" -#include "unk_020279FC.h" +#include "game_options.h" #include "unk_020393C8.h" #include "pokemon_icon.h" #include "overlay075/ov75_021D0D80.h" diff --git a/src/overlay078/ov78_021D0D80.c b/src/overlay078/ov78_021D0D80.c index 121985888c..32ef7a7a8e 100644 --- a/src/overlay078/ov78_021D0D80.c +++ b/src/overlay078/ov78_021D0D80.c @@ -69,7 +69,7 @@ #include "unk_020218BC.h" #include "strbuf.h" #include "unk_0202419C.h" -#include "unk_020279FC.h" +#include "game_options.h" #include "pokemon.h" #include "overlay078/ov78_021D0D80.h" diff --git a/src/overlay079/ov79_021D0D80.c b/src/overlay079/ov79_021D0D80.c index 3fa60e520e..8adc81565a 100644 --- a/src/overlay079/ov79_021D0D80.c +++ b/src/overlay079/ov79_021D0D80.c @@ -35,7 +35,7 @@ #include "unk_020218BC.h" #include "unk_02022594.h" #include "strbuf.h" -#include "unk_020279FC.h" +#include "game_options.h" #include "unk_0208C098.h" #include "unk_02098FFC.h" #include "overlay079/ov79_021D0D80.h" diff --git a/src/overlay083/ov83_0223B5A0.c b/src/overlay083/ov83_0223B5A0.c index 5c8429b668..1253643a15 100644 --- a/src/overlay083/ov83_0223B5A0.c +++ b/src/overlay083/ov83_0223B5A0.c @@ -22,7 +22,7 @@ #include "gx_layers.h" #include "unk_020218BC.h" #include "savedata/save_table.h" -#include "unk_020279FC.h" +#include "game_options.h" #include "poffin.h" #include "unk_0202ACE0.h" #include "unk_0202B604.h" diff --git a/src/overlay084/ov84_0223B5A0.c b/src/overlay084/ov84_0223B5A0.c index d6597b667a..9d33ce97d7 100644 --- a/src/overlay084/ov84_0223B5A0.c +++ b/src/overlay084/ov84_0223B5A0.c @@ -51,7 +51,7 @@ #include "strbuf.h" #include "unk_02025E08.h" #include "trainer_info.h" -#include "unk_020279FC.h" +#include "game_options.h" #include "unk_0202D7A8.h" #include "unk_020393C8.h" #include "unk_020683F4.h" diff --git a/src/overlay084/ov84_0223F040.c b/src/overlay084/ov84_0223F040.c index cd6dac7624..79556d324f 100644 --- a/src/overlay084/ov84_0223F040.c +++ b/src/overlay084/ov84_0223F040.c @@ -26,7 +26,7 @@ #include "unk_0201D670.h" #include "strbuf.h" #include "trainer_info.h" -#include "unk_020279FC.h" +#include "game_options.h" #include "poffin.h" #include "move_table.h" #include "item.h" diff --git a/src/overlay088/ov88_0223B140.c b/src/overlay088/ov88_0223B140.c index 735482b0f3..d5e5ae166c 100644 --- a/src/overlay088/ov88_0223B140.c +++ b/src/overlay088/ov88_0223B140.c @@ -73,7 +73,7 @@ #include "unk_02022594.h" #include "strbuf.h" #include "trainer_info.h" -#include "unk_020279FC.h" +#include "game_options.h" #include "unk_0202ACE0.h" #include "unk_0202B604.h" #include "unk_0202CC64.h" diff --git a/src/overlay088/ov88_0223E9C4.c b/src/overlay088/ov88_0223E9C4.c index 9039a88950..7e042dd1c4 100644 --- a/src/overlay088/ov88_0223E9C4.c +++ b/src/overlay088/ov88_0223E9C4.c @@ -9,7 +9,6 @@ #include "strbuf.h" #include "struct_defs/struct_02013A04_t.h" -#include "struct_defs/options.h" #include "struct_defs/struct_0205AA50.h" #include "overlay061/struct_ov61_0222C884.h" #include "overlay084/struct_ov84_02240FA8.h" @@ -23,7 +22,7 @@ #include "unk_02018340.h" #include "unk_0201D670.h" #include "strbuf.h" -#include "unk_020279FC.h" +#include "game_options.h" #include "overlay088/ov88_0223E9C4.h" static void ov88_0223EE14(UnkStruct_0200112C * param0, u32 param1, u8 param2); diff --git a/src/overlay090/ov90_021D0D80.c b/src/overlay090/ov90_021D0D80.c index 103471787e..86c03d948f 100644 --- a/src/overlay090/ov90_021D0D80.c +++ b/src/overlay090/ov90_021D0D80.c @@ -16,7 +16,7 @@ #include "struct_decls/struct_0203068C_decl.h" #include "struct_defs/sentence.h" -#include "struct_defs/options.h" +#include "game_options.h" #include "struct_defs/struct_02049A68.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02099F80.h" diff --git a/src/overlay091/ov91_021D0D80.c b/src/overlay091/ov91_021D0D80.c index 7ef425141d..d2ca51aeae 100644 --- a/src/overlay091/ov91_021D0D80.c +++ b/src/overlay091/ov91_021D0D80.c @@ -53,7 +53,7 @@ #include "gx_layers.h" #include "unk_020218BC.h" #include "strbuf.h" -#include "unk_020279FC.h" +#include "game_options.h" #include "pokemon.h" #include "move_table.h" #include "unk_0207C908.h" diff --git a/src/overlay092/ov92_021D0D80.c b/src/overlay092/ov92_021D0D80.c index 245e9c4f94..437f005448 100644 --- a/src/overlay092/ov92_021D0D80.c +++ b/src/overlay092/ov92_021D0D80.c @@ -15,7 +15,6 @@ #include "savedata.h" #include "struct_defs/struct_02013A04_t.h" -#include "struct_defs/options.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02099F80.h" #include "overlay061/struct_ov61_0222C884.h" @@ -49,7 +48,7 @@ #include "strbuf.h" #include "unk_0202419C.h" #include "unk_02025E08.h" -#include "unk_020279FC.h" +#include "game_options.h" #include "unk_0202C858.h" #include "unk_020996D0.h" #include "overlay092/ov92_021D0D80.h" diff --git a/src/overlay094/ov94_0223BCB0.c b/src/overlay094/ov94_0223BCB0.c index cb953870d6..6f19829c4d 100644 --- a/src/overlay094/ov94_0223BCB0.c +++ b/src/overlay094/ov94_0223BCB0.c @@ -40,7 +40,7 @@ #include "gx_layers.h" #include "unk_020218BC.h" #include "trainer_info.h" -#include "unk_020279FC.h" +#include "game_options.h" #include "unk_02033200.h" #include "unk_020797C8.h" #include "pokemon_icon.h" diff --git a/src/overlay094/ov94_0223C610.c b/src/overlay094/ov94_0223C610.c index 7eeff46fe5..da59b911ab 100644 --- a/src/overlay094/ov94_0223C610.c +++ b/src/overlay094/ov94_0223C610.c @@ -30,7 +30,7 @@ #include "unk_020218BC.h" #include "strbuf.h" #include "trainer_info.h" -#include "unk_020279FC.h" +#include "game_options.h" #include "unk_020393C8.h" #include "overlay094/ov94_0223BCB0.h" #include "overlay094/ov94_0223C610.h" diff --git a/src/overlay094/ov94_0223D0C4.c b/src/overlay094/ov94_0223D0C4.c index d90e464dd5..acb0d67028 100644 --- a/src/overlay094/ov94_0223D0C4.c +++ b/src/overlay094/ov94_0223D0C4.c @@ -37,7 +37,7 @@ #include "unk_0201D670.h" #include "unk_020218BC.h" #include "strbuf.h" -#include "unk_020279FC.h" +#include "game_options.h" #include "unk_020393C8.h" #include "pokemon.h" #include "party.h" diff --git a/src/overlay094/ov94_0223DC04.c b/src/overlay094/ov94_0223DC04.c index 986fb7ee8a..19bf151b61 100644 --- a/src/overlay094/ov94_0223DC04.c +++ b/src/overlay094/ov94_0223DC04.c @@ -29,7 +29,7 @@ #include "unk_0201D670.h" #include "unk_020218BC.h" #include "strbuf.h" -#include "unk_020279FC.h" +#include "game_options.h" #include "unk_020393C8.h" #include "pokemon.h" #include "overlay094/ov94_0223BCB0.h" diff --git a/src/overlay094/ov94_0223E46C.c b/src/overlay094/ov94_0223E46C.c index 0388264ccc..7d809eda21 100644 --- a/src/overlay094/ov94_0223E46C.c +++ b/src/overlay094/ov94_0223E46C.c @@ -35,7 +35,7 @@ #include "unk_0201D670.h" #include "unk_020218BC.h" #include "strbuf.h" -#include "unk_020279FC.h" +#include "game_options.h" #include "unk_0202DA40.h" #include "unk_020366A0.h" #include "unk_020393C8.h" diff --git a/src/overlay094/ov94_0223FB48.c b/src/overlay094/ov94_0223FB48.c index 596a6f5657..9c4c0efdfb 100644 --- a/src/overlay094/ov94_0223FB48.c +++ b/src/overlay094/ov94_0223FB48.c @@ -39,7 +39,7 @@ #include "gx_layers.h" #include "unk_020218BC.h" #include "strbuf.h" -#include "unk_020279FC.h" +#include "game_options.h" #include "unk_020393C8.h" #include "pokemon.h" #include "unk_020797C8.h" diff --git a/src/overlay094/ov94_022414B8.c b/src/overlay094/ov94_022414B8.c index 1f71306259..2c91f40798 100644 --- a/src/overlay094/ov94_022414B8.c +++ b/src/overlay094/ov94_022414B8.c @@ -46,7 +46,7 @@ #include "strbuf.h" #include "trainer_info.h" #include "unk_0202631C.h" -#include "unk_020279FC.h" +#include "game_options.h" #include "unk_0202C858.h" #include "unk_020393C8.h" #include "pokemon.h" diff --git a/src/overlay094/ov94_02242AD0.c b/src/overlay094/ov94_02242AD0.c index a25cb42f93..12784ccaec 100644 --- a/src/overlay094/ov94_02242AD0.c +++ b/src/overlay094/ov94_02242AD0.c @@ -31,7 +31,7 @@ #include "strbuf.h" #include "savedata/save_table.h" #include "savedata.h" -#include "unk_020279FC.h" +#include "game_options.h" #include "unk_0202B604.h" #include "unk_0202CC64.h" #include "unk_0202CD50.h" diff --git a/src/overlay094/ov94_02244950.c b/src/overlay094/ov94_02244950.c index fd68550dca..91109f1b18 100644 --- a/src/overlay094/ov94_02244950.c +++ b/src/overlay094/ov94_02244950.c @@ -27,7 +27,7 @@ #include "gx_layers.h" #include "strbuf.h" #include "unk_02025CB0.h" -#include "unk_020279FC.h" +#include "game_options.h" #include "unk_0202ACE0.h" #include "unk_02030CE8.h" #include "unk_020366A0.h" diff --git a/src/overlay095/ov95_02246C20.c b/src/overlay095/ov95_02246C20.c index 84db9685fc..f9f8b4ef87 100644 --- a/src/overlay095/ov95_02246C20.c +++ b/src/overlay095/ov95_02246C20.c @@ -38,7 +38,7 @@ #include "gx_layers.h" #include "unk_020218BC.h" #include "strbuf.h" -#include "unk_020279FC.h" +#include "game_options.h" #include "unk_020393C8.h" #include "pokemon.h" #include "overlay095/ov95_02246C20.h" diff --git a/src/overlay096/ov96_0223BCE0.c b/src/overlay096/ov96_0223BCE0.c index 45672cd891..aad2a30f7d 100644 --- a/src/overlay096/ov96_0223BCE0.c +++ b/src/overlay096/ov96_0223BCE0.c @@ -35,7 +35,7 @@ #include "strbuf.h" #include "savedata.h" #include "unk_02025CB0.h" -#include "unk_020279FC.h" +#include "game_options.h" #include "unk_0202D05C.h" #include "unk_02030CE8.h" #include "unk_020366A0.h" diff --git a/src/overlay097/ov97_0222C174.c b/src/overlay097/ov97_0222C174.c index 3eb3205201..732f792c01 100644 --- a/src/overlay097/ov97_0222C174.c +++ b/src/overlay097/ov97_0222C174.c @@ -16,7 +16,6 @@ #include "overlay077/const_ov77_021D742C.h" -#include "struct_defs/options.h" #include "struct_defs/struct_0202DBAC.h" #include "struct_defs/struct_0202DF40.h" #include "struct_defs/struct_0203CC84.h" @@ -48,7 +47,7 @@ #include "unk_02025E08.h" #include "trainer_info.h" #include "unk_0202631C.h" -#include "unk_020279FC.h" +#include "game_options.h" #include "unk_0202DAB4.h" #include "unk_02033200.h" #include "unk_020393C8.h" diff --git a/src/overlay097/ov97_0222D30C.c b/src/overlay097/ov97_0222D30C.c index 7a8f394637..eb292ec13e 100644 --- a/src/overlay097/ov97_0222D30C.c +++ b/src/overlay097/ov97_0222D30C.c @@ -59,7 +59,7 @@ #include "strbuf.h" #include "savedata/save_table.h" #include "unk_02025E08.h" -#include "unk_020279FC.h" +#include "game_options.h" #include "unk_0202DAB4.h" #include "unk_02033200.h" #include "communication_system.h" diff --git a/src/overlay097/ov97_02230410.c b/src/overlay097/ov97_02230410.c index c57d89f326..11cee208e4 100644 --- a/src/overlay097/ov97_02230410.c +++ b/src/overlay097/ov97_02230410.c @@ -20,7 +20,6 @@ #include "struct_defs/struct_0200C738.h" #include "struct_defs/struct_02013A04_t.h" -#include "struct_defs/options.h" #include "struct_defs/struct_0202DBAC.h" #include "struct_defs/struct_0203CC84.h" #include "struct_defs/struct_0205AA50.h" @@ -54,7 +53,7 @@ #include "savedata.h" #include "unk_02025E08.h" #include "trainer_info.h" -#include "unk_020279FC.h" +#include "game_options.h" #include "unk_0202DAB4.h" #include "communication_information.h" #include "unk_02033200.h" diff --git a/src/overlay097/ov97_02233B18.c b/src/overlay097/ov97_02233B18.c index e0e52ce58a..22c5e97685 100644 --- a/src/overlay097/ov97_02233B18.c +++ b/src/overlay097/ov97_02233B18.c @@ -21,7 +21,6 @@ #include "struct_defs/struct_0200C738.h" #include "struct_defs/struct_02015958.h" #include "struct_defs/union_02022594_020225E0.h" -#include "struct_defs/options.h" #include "struct_defs/struct_0203CC84.h" #include "struct_defs/struct_0205AA50.h" #include "pokemon.h" @@ -65,7 +64,7 @@ #include "savedata/save_table.h" #include "savedata.h" #include "unk_02025E08.h" -#include "unk_020279FC.h" +#include "game_options.h" #include "unk_0202EEC0.h" #include "pokemon.h" #include "pokemon_icon.h" diff --git a/src/overlay098/ov98_022471C8.c b/src/overlay098/ov98_022471C8.c index ac60746994..68910cce9e 100644 --- a/src/overlay098/ov98_022471C8.c +++ b/src/overlay098/ov98_022471C8.c @@ -52,7 +52,7 @@ #include "savedata.h" #include "unk_02025CB0.h" #include "unk_02025E08.h" -#include "unk_020279FC.h" +#include "game_options.h" #include "unk_0202ACE0.h" #include "unk_02030CE8.h" #include "unk_020366A0.h" diff --git a/src/overlay100/ov100_021D0D80.c b/src/overlay100/ov100_021D0D80.c index a43ff954cb..b281fb34fe 100644 --- a/src/overlay100/ov100_021D0D80.c +++ b/src/overlay100/ov100_021D0D80.c @@ -30,7 +30,7 @@ #include "gx_layers.h" #include "unk_02020020.h" #include "unk_02024220.h" -#include "unk_020279FC.h" +#include "game_options.h" #include "overlay100/ov100_021D0D80.h" #include "overlay100/ov100_021D13E4.h" #include "overlay100/ov100_021D1C44.h" diff --git a/src/overlay100/ov100_021D46C8.c b/src/overlay100/ov100_021D46C8.c index 4aab0f597f..099fde7a00 100644 --- a/src/overlay100/ov100_021D46C8.c +++ b/src/overlay100/ov100_021D46C8.c @@ -25,7 +25,7 @@ #include "unk_02020020.h" #include "strbuf.h" #include "trainer_info.h" -#include "unk_020279FC.h" +#include "game_options.h" #include "overlay100/ov100_021D44C0.h" #include "overlay100/ov100_021D46C8.h" diff --git a/src/overlay104/ov104_02231F74.c b/src/overlay104/ov104_02231F74.c index c20d84f5da..6d6eb3e606 100644 --- a/src/overlay104/ov104_02231F74.c +++ b/src/overlay104/ov104_02231F74.c @@ -58,7 +58,7 @@ #include "unk_020218BC.h" #include "strbuf.h" #include "unk_02025E08.h" -#include "unk_020279FC.h" +#include "game_options.h" #include "pokemon.h" #include "pokemon_icon.h" #include "unk_0207E0B8.h" diff --git a/src/overlay104/ov104_0223C2D4.c b/src/overlay104/ov104_0223C2D4.c index 2cf4791550..95146d6d75 100644 --- a/src/overlay104/ov104_0223C2D4.c +++ b/src/overlay104/ov104_0223C2D4.c @@ -48,7 +48,7 @@ #include "unk_0202419C.h" #include "unk_02024220.h" #include "unk_02025E08.h" -#include "unk_020279FC.h" +#include "game_options.h" #include "unk_020393C8.h" #include "unk_0209B6F8.h" #include "overlay063/ov63_0222BCE8.h" diff --git a/src/overlay105/ov105_02241AE0.c b/src/overlay105/ov105_02241AE0.c index 9ca1ee1b27..681280481b 100644 --- a/src/overlay105/ov105_02241AE0.c +++ b/src/overlay105/ov105_02241AE0.c @@ -20,7 +20,6 @@ #include "constdata/const_020F410C.h" #include "struct_defs/struct_02013A04_t.h" -#include "struct_defs/options.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0207C690.h" #include "struct_defs/struct_02081CF4.h" @@ -57,7 +56,7 @@ #include "unk_02024220.h" #include "unk_02025E08.h" #include "trainer_info.h" -#include "unk_020279FC.h" +#include "game_options.h" #include "communication_information.h" #include "communication_system.h" #include "unk_020363E8.h" diff --git a/src/overlay106/ov106_02241AE0.c b/src/overlay106/ov106_02241AE0.c index b68eb1d549..c64f701cb0 100644 --- a/src/overlay106/ov106_02241AE0.c +++ b/src/overlay106/ov106_02241AE0.c @@ -17,7 +17,6 @@ #include "constdata/const_020F410C.h" #include "struct_defs/struct_02013A04_t.h" -#include "struct_defs/options.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02081CF4.h" #include "struct_defs/pokemon_summary.h" @@ -52,7 +51,7 @@ #include "strbuf.h" #include "unk_02025E08.h" #include "trainer_info.h" -#include "unk_020279FC.h" +#include "game_options.h" #include "unk_02030108.h" #include "communication_system.h" #include "unk_020363E8.h" diff --git a/src/overlay107/ov107_02241AE0.c b/src/overlay107/ov107_02241AE0.c index f920d14b89..a99481fe5c 100644 --- a/src/overlay107/ov107_02241AE0.c +++ b/src/overlay107/ov107_02241AE0.c @@ -23,7 +23,6 @@ #include "overlay107/struct_ov107_02249B8C_decl.h" #include "struct_defs/struct_02013A04_t.h" -#include "struct_defs/options.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02081CF4.h" #include "struct_defs/struct_02099F80.h" @@ -60,7 +59,7 @@ #include "strbuf.h" #include "unk_02025E08.h" #include "trainer_info.h" -#include "unk_020279FC.h" +#include "game_options.h" #include "unk_020302D0.h" #include "unk_0203061C.h" #include "communication_information.h" diff --git a/src/overlay107/ov107_02245EB0.c b/src/overlay107/ov107_02245EB0.c index c705a944fb..e55259588b 100644 --- a/src/overlay107/ov107_02245EB0.c +++ b/src/overlay107/ov107_02245EB0.c @@ -23,7 +23,6 @@ #include "overlay107/struct_ov107_02249B8C_decl.h" #include "struct_defs/struct_02013A04_t.h" -#include "struct_defs/options.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02081CF4.h" #include "struct_defs/struct_02099F80.h" @@ -60,7 +59,7 @@ #include "strbuf.h" #include "unk_02025E08.h" #include "trainer_info.h" -#include "unk_020279FC.h" +#include "game_options.h" #include "unk_020302D0.h" #include "unk_0203061C.h" #include "communication_information.h" diff --git a/src/overlay108/ov108_02241AE0.c b/src/overlay108/ov108_02241AE0.c index 9ec22c99cc..8bd1aa9b62 100644 --- a/src/overlay108/ov108_02241AE0.c +++ b/src/overlay108/ov108_02241AE0.c @@ -22,7 +22,7 @@ #include "struct_defs/struct_02013A04_t.h" #include "struct_defs/union_02022594_020225E0.h" -#include "struct_defs/options.h" +#include "game_options.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02081CF4.h" #include "struct_defs/struct_02099F80.h" diff --git a/src/overlay109/ov109_021D3D50.c b/src/overlay109/ov109_021D3D50.c index 4b583fef8e..9cebd43e56 100644 --- a/src/overlay109/ov109_021D3D50.c +++ b/src/overlay109/ov109_021D3D50.c @@ -52,7 +52,7 @@ #include "unk_020218BC.h" #include "strbuf.h" #include "trainer_info.h" -#include "unk_020279FC.h" +#include "game_options.h" #include "unk_0202B604.h" #include "unk_0202CD50.h" #include "unk_02030EE0.h" diff --git a/src/overlay110/ov110_021D0D80.c b/src/overlay110/ov110_021D0D80.c index 6496ad8d12..049defcc59 100644 --- a/src/overlay110/ov110_021D0D80.c +++ b/src/overlay110/ov110_021D0D80.c @@ -13,7 +13,7 @@ #include "struct_decls/struct_020308A0_decl.h" #include "savedata.h" -#include "struct_defs/options.h" +#include "game_options.h" #include "struct_defs/struct_0203E564.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02099F80.h" diff --git a/src/overlay111/ov111_021D0D80.c b/src/overlay111/ov111_021D0D80.c index 6b4df528e9..6d0ac21f6e 100644 --- a/src/overlay111/ov111_021D0D80.c +++ b/src/overlay111/ov111_021D0D80.c @@ -14,7 +14,6 @@ #include "struct_defs/struct_02015958.h" #include "struct_defs/union_02022594_020225E0.h" -#include "struct_defs/options.h" #include "struct_defs/struct_0203E608.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02099F80.h" @@ -51,7 +50,7 @@ #include "unk_02022594.h" #include "strbuf.h" #include "unk_02025E08.h" -#include "unk_020279FC.h" +#include "game_options.h" #include "overlay111/ov111_021D0D80.h" #include "overlay111/ov111_021D2F80.h" #include "overlay111/ov111_021D33F4.h" diff --git a/src/overlay113/ov113_0225C700.c b/src/overlay113/ov113_0225C700.c index b3193bdf38..632cd1e80f 100644 --- a/src/overlay113/ov113_0225C700.c +++ b/src/overlay113/ov113_0225C700.c @@ -78,7 +78,7 @@ #include "unk_0202419C.h" #include "unk_02024220.h" #include "unk_02025E08.h" -#include "unk_020279FC.h" +#include "game_options.h" #include "unk_020393C8.h" #include "pokemon.h" #include "party.h" diff --git a/src/overlay114/ov114_0225C700.c b/src/overlay114/ov114_0225C700.c index b812b10a5f..038dd8ecab 100644 --- a/src/overlay114/ov114_0225C700.c +++ b/src/overlay114/ov114_0225C700.c @@ -61,7 +61,7 @@ #include "unk_020218BC.h" #include "strbuf.h" #include "unk_02025E08.h" -#include "unk_020279FC.h" +#include "game_options.h" #include "unk_0202ACE0.h" #include "communication_information.h" #include "communication_system.h" diff --git a/src/pokemon_summary_app.c b/src/pokemon_summary_app.c index a4b12faa70..78c68bd9fc 100644 --- a/src/pokemon_summary_app.c +++ b/src/pokemon_summary_app.c @@ -41,7 +41,7 @@ #include "unk_020218BC.h" #include "strbuf.h" #include "trainer_info.h" -#include "unk_020279FC.h" +#include "game_options.h" #include "unk_020393C8.h" #include "unk_020507CC.h" #include "unk_0206A8DC.h" diff --git a/src/unk_02003B60.c b/src/unk_02003B60.c index a7afd0fb9a..7efd5ebeab 100644 --- a/src/unk_02003B60.c +++ b/src/unk_02003B60.c @@ -6,7 +6,7 @@ #include "struct_defs/chatot_cry.h" #include "struct_defs/struct_020052C8.h" -#include "struct_defs/options.h" +#include "game_options.h" #include "unk_02003B60.h" #include "unk_020041CC.h" diff --git a/src/unk_02025E08.c b/src/unk_02025E08.c index bea6edd2e6..04c5622f80 100644 --- a/src/unk_02025E08.c +++ b/src/unk_02025E08.c @@ -5,12 +5,11 @@ #include "savedata.h" #include "struct_defs/struct_02025E5C.h" -#include "struct_defs/options.h" #include "savedata.h" #include "unk_02025E08.h" #include "trainer_info.h" -#include "unk_020279FC.h" +#include "game_options.h" #include "coins.h" #include "unk_0202CBE4.h" diff --git a/src/unk_0202F1D4.c b/src/unk_0202F1D4.c index 21dcad43a7..9b21ba30ae 100644 --- a/src/unk_0202F1D4.c +++ b/src/unk_0202F1D4.c @@ -28,7 +28,7 @@ #include "trainer_info.h" #include "unk_02026150.h" #include "unk_0202631C.h" -#include "unk_020279FC.h" +#include "game_options.h" #include "unk_0202F1D4.h" #include "pokemon.h" #include "party.h" diff --git a/src/unk_0203D1B8.c b/src/unk_0203D1B8.c index 87eafc8cdc..bd09da6a1b 100644 --- a/src/unk_0203D1B8.c +++ b/src/unk_0203D1B8.c @@ -29,7 +29,6 @@ #include "overlay084/const_ov84_02241130.h" #include "constdata/const_020F2DAC.h" -#include "struct_defs/options.h" #include "struct_defs/struct_0202DF8C.h" #include "field/field_system.h" #include "struct_defs/struct_0203D8AC.h" @@ -77,7 +76,7 @@ #include "trainer_info.h" #include "unk_0202631C.h" #include "savedata_misc.h" -#include "unk_020279FC.h" +#include "game_options.h" #include "unk_02028124.h" #include "unk_020298BC.h" #include "unk_0202ACE0.h" diff --git a/src/unk_02051D8C.c b/src/unk_02051D8C.c index fff880ed47..5fc6304eeb 100644 --- a/src/unk_02051D8C.c +++ b/src/unk_02051D8C.c @@ -17,7 +17,6 @@ #include "savedata.h" #include "struct_defs/struct_0202610C.h" -#include "struct_defs/options.h" #include "field/field_system.h" #include "struct_defs/struct_02055BA8.h" #include "struct_defs/struct_0205EC34.h" @@ -37,7 +36,7 @@ #include "trainer_info.h" #include "unk_0202602C.h" #include "unk_0202631C.h" -#include "unk_020279FC.h" +#include "game_options.h" #include "unk_02027F84.h" #include "unk_0202C858.h" #include "unk_0202CC64.h" diff --git a/src/unk_02052C6C.c b/src/unk_02052C6C.c index ecb0b09aef..b77a58036d 100644 --- a/src/unk_02052C6C.c +++ b/src/unk_02052C6C.c @@ -9,7 +9,7 @@ #include "struct_decls/struct_020508D4_decl.h" #include "struct_decls/struct_party_decl.h" -#include "struct_defs/options.h" +#include "game_options.h" #include "struct_defs/struct_0202DF8C.h" #include "field/field_system.h" #include "struct_defs/struct_0203E234.h" diff --git a/src/unk_0205D8CC.c b/src/unk_0205D8CC.c index d87e0021f5..be4720e6e2 100644 --- a/src/unk_0205D8CC.c +++ b/src/unk_0205D8CC.c @@ -4,7 +4,6 @@ #include "struct_decls/struct_02018340_decl.h" #include "strbuf.h" -#include "struct_defs/options.h" #include "struct_defs/struct_0205AA50.h" #include "unk_02002328.h" @@ -12,7 +11,7 @@ #include "unk_0200DA60.h" #include "unk_02018340.h" #include "unk_0201D670.h" -#include "unk_020279FC.h" +#include "game_options.h" #include "unk_0205D8CC.h" void sub_0205D8CC (u32 param0, u32 param1) diff --git a/src/unk_020683F4.c b/src/unk_020683F4.c index e60bb9c272..b3f6db8e63 100644 --- a/src/unk_020683F4.c +++ b/src/unk_020683F4.c @@ -11,7 +11,7 @@ #include "constdata/const_020F1E88.h" -#include "struct_defs/options.h" +#include "game_options.h" #include "functypes/funcptr_0203BC5C.h" #include "field/field_system.h" #include "struct_defs/struct_0203D9B8.h" diff --git a/src/unk_0206F314.c b/src/unk_0206F314.c index f24b792e6d..dda73164f5 100644 --- a/src/unk_0206F314.c +++ b/src/unk_0206F314.c @@ -42,7 +42,7 @@ #include "unk_020218BC.h" #include "strbuf.h" #include "unk_02025E08.h" -#include "unk_020279FC.h" +#include "game_options.h" #include "unk_0202E840.h" #include "unk_020508D4.h" #include "unk_0206F314.h" diff --git a/src/unk_020722AC.c b/src/unk_020722AC.c index 0cec3c2951..78baae7ee3 100644 --- a/src/unk_020722AC.c +++ b/src/unk_020722AC.c @@ -47,7 +47,7 @@ #include "unk_0201D670.h" #include "strbuf.h" #include "unk_02025E08.h" -#include "unk_020279FC.h" +#include "game_options.h" #include "unk_02028124.h" #include "unk_0203CC84.h" #include "unk_0203D1B8.h" diff --git a/src/unk_0207AE68.c b/src/unk_0207AE68.c index 886e966c1b..03c4b7aaea 100644 --- a/src/unk_0207AE68.c +++ b/src/unk_0207AE68.c @@ -18,7 +18,6 @@ #include "struct_defs/sprite_animation_frame.h" #include "struct_defs/archived_sprite.h" #include "struct_defs/struct_0201D738.h" -#include "struct_defs/options.h" #include "struct_defs/struct_0202818C.h" #include "struct_defs/struct_0202CA28.h" #include "struct_defs/struct_0207AE68_t.h" @@ -55,7 +54,7 @@ #include "unk_020241F0.h" #include "unk_02024220.h" #include "unk_0202631C.h" -#include "unk_020279FC.h" +#include "game_options.h" #include "unk_02028124.h" #include "unk_0202CD50.h" #include "unk_020393C8.h" diff --git a/src/unk_0207E0B8.c b/src/unk_0207E0B8.c index 7408bd77a4..aae3dffe83 100644 --- a/src/unk_0207E0B8.c +++ b/src/unk_0207E0B8.c @@ -49,7 +49,7 @@ #include "strbuf.h" #include "unk_02024220.h" #include "unk_0202602C.h" -#include "unk_020279FC.h" +#include "game_options.h" #include "unk_0202B604.h" #include "unk_020393C8.h" #include "unk_0206B9D8.h" diff --git a/src/unk_020819DC.c b/src/unk_020819DC.c index 735d595426..4f353efb1e 100644 --- a/src/unk_020819DC.c +++ b/src/unk_020819DC.c @@ -23,7 +23,7 @@ #include "unk_02018340.h" #include "unk_0201D670.h" #include "strbuf.h" -#include "unk_020279FC.h" +#include "game_options.h" #include "pokemon.h" #include "party.h" #include "unk_0207E0B8.h" diff --git a/src/unk_0208694C.c b/src/unk_0208694C.c index d767061b1c..0dc428c4b8 100644 --- a/src/unk_0208694C.c +++ b/src/unk_0208694C.c @@ -18,7 +18,6 @@ #include "constdata/const_020F2DAC.h" #include "struct_defs/struct_0200C738.h" -#include "struct_defs/options.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0208737C.h" #include "struct_defs/struct_02099F80.h" @@ -59,7 +58,7 @@ #include "gx_layers.h" #include "unk_020218BC.h" #include "strbuf.h" -#include "unk_020279FC.h" +#include "game_options.h" #include "pokemon.h" #include "unk_020797C8.h" #include "pokemon_icon.h" diff --git a/src/unk_020890F4.c b/src/unk_020890F4.c index 2bc6a1ce92..2998b9c24b 100644 --- a/src/unk_020890F4.c +++ b/src/unk_020890F4.c @@ -8,7 +8,7 @@ #include "constdata/const_020F2DBC.h" -#include "struct_defs/options.h" +#include "game_options.h" #include "struct_defs/struct_02089438.h" #include "struct_defs/struct_02089688.h" #include "struct_defs/struct_02099F80.h" diff --git a/src/unk_0208A3F4.c b/src/unk_0208A3F4.c index 9dd6359f07..da1b44c1c6 100644 --- a/src/unk_0208A3F4.c +++ b/src/unk_0208A3F4.c @@ -33,7 +33,7 @@ #include "unk_0201D670.h" #include "unk_0201E86C.h" #include "strbuf.h" -#include "unk_020279FC.h" +#include "game_options.h" #include "unk_0208A3F4.h" void sub_0208A3F4 (UnkStruct_02089688 * param0) diff --git a/src/unk_0209747C.c b/src/unk_0209747C.c index baab85e189..e09d0a8e84 100644 --- a/src/unk_0209747C.c +++ b/src/unk_0209747C.c @@ -13,7 +13,7 @@ #include "heap.h" #include "unk_02025E08.h" #include "unk_0202631C.h" -#include "unk_020279FC.h" +#include "game_options.h" #include "unk_020507CC.h" #include "unk_0206A8DC.h" #include "unk_0209747C.h" diff --git a/src/unk_02097B18.c b/src/unk_02097B18.c index 119a5b8a03..33a2f75187 100644 --- a/src/unk_02097B18.c +++ b/src/unk_02097B18.c @@ -34,7 +34,7 @@ #include "unk_02024220.h" #include "savedata/save_table.h" #include "unk_02025E08.h" -#include "unk_020279FC.h" +#include "game_options.h" #include "unk_02028124.h" #include "unk_0202C9F4.h" #include "unk_020508D4.h" diff --git a/src/unk_02098218.c b/src/unk_02098218.c index 36c9494c2b..2be4d2dd89 100644 --- a/src/unk_02098218.c +++ b/src/unk_02098218.c @@ -28,7 +28,7 @@ #include "gx_layers.h" #include "unk_02024220.h" #include "unk_02025E08.h" -#include "unk_020279FC.h" +#include "game_options.h" #include "unk_0202CD50.h" #include "unk_0202F180.h" #include "map_header.h" diff --git a/src/unk_020989DC.c b/src/unk_020989DC.c index 68f0ae51f2..47262a9489 100644 --- a/src/unk_020989DC.c +++ b/src/unk_020989DC.c @@ -21,7 +21,7 @@ #include "string_template.h" #include "heap.h" #include "unk_02025E08.h" -#include "unk_020279FC.h" +#include "game_options.h" #include "poffin.h" #include "pokemon.h" #include "party.h" diff --git a/src/unk_0209C194.c b/src/unk_0209C194.c index c12f637097..6aaa4c649e 100644 --- a/src/unk_0209C194.c +++ b/src/unk_0209C194.c @@ -9,7 +9,7 @@ #include "heap.h" #include "unk_02025E08.h" -#include "unk_020279FC.h" +#include "game_options.h" #include "unk_0202B604.h" #include "unk_0202CD50.h" #include "unk_020366A0.h" From 30b684ed8a5a80f3dca4088be5dfffd7b984f087 Mon Sep 17 00:00:00 2001 From: RavePossum Date: Sun, 14 Apr 2024 08:31:56 -0400 Subject: [PATCH 13/23] document options, add constants file for options --- include/constants/game_options.h | 54 ++++++++++++++ include/game_options.h | 34 ++++----- src/battle/ov16_0223DF00.c | 4 +- src/game_options.c | 118 +++++++++++++++---------------- src/overlay057/ov57_021D0D80.c | 2 +- src/overlay074/ov74_021D0D80.c | 28 ++++---- src/unk_02025E08.c | 2 +- src/unk_0202F1D4.c | 4 +- src/unk_02051D8C.c | 10 +-- 9 files changed, 154 insertions(+), 102 deletions(-) create mode 100644 include/constants/game_options.h diff --git a/include/constants/game_options.h b/include/constants/game_options.h new file mode 100644 index 0000000000..2b1ddf4b2c --- /dev/null +++ b/include/constants/game_options.h @@ -0,0 +1,54 @@ +#ifndef POKEPLATINUM_CONSTANTS_GAME_OPTIONS_H +#define POKEPLATINUM_CONSTANTS_GAME_OPTIONS_H + +enum OptionsTextSpeed { + OPTIONS_TEXT_SPEED_SLOW = 0, + OPTIONS_TEXT_SPEED_NORMAL, + OPTIONS_TEXT_SPEED_FAST +}; + +enum OptionsSoundMethod { + OPTIONS_SOUND_METHOD_STEREO = 0, + OPTIONS_SOUND_METHOD_MONO +}; + +enum OptionsBattleStyle { + OPTIONS_BATTLE_STYLE_SHIFT = 0, + OPTIONS_BATTLE_STYLE_SET +}; + +enum OptionsBattleScene { + OPTIONS_BATTLE_SCENE_ON = 0, + OPTIONS_BATTLE_SCENE_OFF +}; + +enum OptionsButtonMode { + OPTIONS_BUTTON_MODE_NORMAL = 0, + OPTIONS_BUTTON_MODE_START_IS_X, + OPTIONS_BUTTON_MODE_L_IS_A +}; + +enum OptionsFrame { + OPTIONS_FRAME_1 = 0, + OPTIONS_FRAME_2, + OPTIONS_FRAME_3, + OPTIONS_FRAME_4, + OPTIONS_FRAME_5, + OPTIONS_FRAME_6, + OPTIONS_FRAME_7, + OPTIONS_FRAME_8, + OPTIONS_FRAME_9, + OPTIONS_FRAME_10, + OPTIONS_FRAME_11, + OPTIONS_FRAME_12, + OPTIONS_FRAME_13, + OPTIONS_FRAME_14, + OPTIONS_FRAME_15, + OPTIONS_FRAME_16, + OPTIONS_FRAME_17, + OPTIONS_FRAME_18, + OPTIONS_FRAME_19, + OPTIONS_FRAME_20 +}; + +#endif // POKEPLATINUM_CONSTANTS_GAME_OPTIONS_H diff --git a/include/game_options.h b/include/game_options.h index 6b38b8452d..8c5bbd1891 100644 --- a/include/game_options.h +++ b/include/game_options.h @@ -13,22 +13,22 @@ typedef struct Options { u16 : 1; } Options; -Options * sub_020279FC(u32 param0); -void sub_02027A10(const Options * param0, Options * param1); -void sub_02027A1C(Options * param0); -void sub_02027A68(SaveData * param0, int param1); -int sub_02027AA4(const Options * param0); -void sub_02027AAC(Options * param0, int param1); -u8 sub_02027AC0(const Options * param0); -int sub_02027ADC(const Options * param0); -void sub_02027AE4(Options * param0, int param1); -int GameConfig_BattleAnimations(const Options * param0); -void sub_02027B00(Options * param0, int param1); -int sub_02027B14(const Options * param0); -void sub_02027B1C(Options * param0, int param1); -int sub_02027B30(const Options * param0); -void sub_02027B38(Options * param0, int param1); -int sub_02027B50(const Options * param0); -void sub_02027B58(Options * param0, int param1); +Options* Options_AllocMemory(u32 heapID); +void Options_Copy(const Options *src, Options *dest); +void Options_Init(Options *options); +void Options_SetSystemButtonMode(SaveData *saveData, int buttonMode); +int Options_TextSpeed(const Options *options); +void Options_SetTextSpeed(Options *options, int textSpeed); +u8 sub_02027AC0(const Options *options); +int Options_SoundMethod(const Options *options); +void Options_SetSoundMethod(Options *options, int soundMethod); +int Options_BattleScene(const Options *options); +void Options_SetBattleScene(Options *options, int battleScene); +int Options_BattleStyle(const Options *options); +void Options_SetBattleStyle(Options *options, int battleStyle); +int Options_ButtonMode(const Options *options); +void Options_SetButtonMode(Options *options, int buttonMode); +int sub_02027B50(const Options *options); +void Options_SetFrame(Options *options, int frame); #endif // POKEPLATINUM_GAME_OPTIONS_H diff --git a/src/battle/ov16_0223DF00.c b/src/battle/ov16_0223DF00.c index 00fa1c4f88..7d804400b9 100644 --- a/src/battle/ov16_0223DF00.c +++ b/src/battle/ov16_0223DF00.c @@ -1027,7 +1027,7 @@ BOOL BattleSystem_AnimationsOn(BattleSystem *battleSys) return TRUE; } - return GameConfig_BattleAnimations(battleSys->unk_1B0) == 0; + return Options_BattleScene(battleSys->unk_1B0) == 0; } int ov16_0223EDE0 (BattleSystem * param0) @@ -1046,7 +1046,7 @@ u8 BattleSystem_TextSpeed (BattleSystem * param0) int BattleSystem_Ruleset (BattleSystem * param0) { - return sub_02027B14(param0->unk_1B0); + return Options_BattleStyle(param0->unk_1B0); } PokemonAnimationSys * ov16_0223EE28 (BattleSystem * param0) diff --git a/src/game_options.c b/src/game_options.c index a026f37c4e..3065fa43e4 100644 --- a/src/game_options.c +++ b/src/game_options.c @@ -1,133 +1,131 @@ #include #include + +#include "constants/game_options.h" + #include "core_sys.h" - #include "savedata.h" - - #include "heap.h" #include "unk_02025E08.h" #include "game_options.h" +#include "core_sys.h" -Options * sub_020279FC (u32 param0) +Options* Options_AllocMemory (u32 heapID) { - Options * v0; + Options *options = Heap_AllocFromHeap(heapID, sizeof(Options)); + Options_Init(options); - v0 = Heap_AllocFromHeap(param0, sizeof(Options)); - sub_02027A1C(v0); - - return v0; + return options; } -void sub_02027A10 (const Options * param0, Options * param1) +void Options_Copy (const Options *src, Options *dest) { - MI_CpuCopy8(param0, param1, sizeof(Options)); + MI_CpuCopy8(src, dest, sizeof(Options)); } -void sub_02027A1C (Options * param0) +void Options_Init (Options *options) { - MI_CpuFill8(param0, 0, sizeof(Options)); + MI_CpuFill8(options, 0, sizeof(Options)); - param0->textSpeed = 1; - param0->soundMethod = 0; - param0->battleStyle = 0; - param0->battleScene = 0; - param0->buttonMode = 0; - param0->frame = 0; + options->textSpeed = OPTIONS_TEXT_SPEED_NORMAL; + options->soundMethod = OPTIONS_SOUND_METHOD_STEREO; + options->battleStyle = OPTIONS_BATTLE_STYLE_SHIFT; + options->battleScene = OPTIONS_BATTLE_SCENE_ON; + options->buttonMode = OPTIONS_BUTTON_MODE_NORMAL; + options->frame = OPTIONS_FRAME_1; } -void sub_02027A68 (SaveData * param0, int param1) +void Options_SetSystemButtonMode (SaveData *saveData, int buttonMode) { - Options * v0; - - if (param0 != NULL) { - param1 = sub_02027B30(sub_02025E44(param0)); + if (saveData != NULL) { + buttonMode = Options_ButtonMode(sub_02025E44(saveData)); } - switch (param1) { - case 1: - gCoreSys.buttonMode = 1; + switch (buttonMode) { + case OPTIONS_BUTTON_MODE_START_IS_X: + gCoreSys.buttonMode = BUTTON_MODE_START_IS_X; break; - case 2: - gCoreSys.buttonMode = 3; + case OPTIONS_BUTTON_MODE_L_IS_A: + gCoreSys.buttonMode = BUTTON_MODE_L_IS_A; break; - case 0: + case OPTIONS_BUTTON_MODE_NORMAL: default: - gCoreSys.buttonMode = 0; + gCoreSys.buttonMode = BUTTON_MODE_NORMAL; break; } } -int sub_02027AA4 (const Options * param0) +int Options_TextSpeed (const Options *options) { - return param0->textSpeed; + return options->textSpeed; } -void sub_02027AAC (Options * param0, int param1) +void Options_SetTextSpeed (Options *options, int textSpeed) { - param0->textSpeed = param1; + options->textSpeed = textSpeed; } - -u8 sub_02027AC0 (const Options * param0) +//ravetodo Options_GetTextFrameDelay +u8 sub_02027AC0 (const Options *options) { - int v0 = sub_02027AA4(param0); + int speed = Options_TextSpeed(options); - if (v0 == 0) { + if (speed == OPTIONS_TEXT_SPEED_SLOW) { return 8; - } else if (v0 == 1) { + } else if (speed == OPTIONS_TEXT_SPEED_NORMAL) { return 4; } else { return 1; } } -int sub_02027ADC (const Options * param0) +int Options_SoundMethod (const Options *options) { - return param0->soundMethod; + return options->soundMethod; } -void sub_02027AE4 (Options * param0, int param1) +void Options_SetSoundMethod (Options *options, int soundMethod) { - param0->soundMethod = param1; + options->soundMethod = soundMethod; } -int GameConfig_BattleAnimations (const Options * param0) +int Options_BattleScene (const Options *options) { - return param0->battleScene; + return options->battleScene; } -void sub_02027B00 (Options * param0, int param1) +void Options_SetBattleScene (Options *options, int battleScene) { - param0->battleScene = param1; + options->battleScene = battleScene; } -int sub_02027B14 (const Options * param0) +int Options_BattleStyle (const Options *options) { - return param0->battleStyle; + return options->battleStyle; } -void sub_02027B1C (Options * param0, int param1) +void Options_SetBattleStyle (Options *options, int battleStyle) { - param0->battleStyle = param1; + options->battleStyle = battleStyle; } -int sub_02027B30 (const Options * param0) +int Options_ButtonMode (const Options *options) { - return param0->buttonMode; + return options->buttonMode; } -void sub_02027B38 (Options * param0, int param1) +void Options_SetButtonMode (Options *options, int buttonMode) { - param0->buttonMode = param1; + options->buttonMode = buttonMode; } -int sub_02027B50 (const Options * param0) +//ravetodo Options_Frame +int sub_02027B50 (const Options *options) { - return param0->frame; + return options->frame; } -void sub_02027B58 (Options * param0, int param1) +void Options_SetFrame (Options *options, int frame) { - param0->frame = param1; + options->frame = frame; } diff --git a/src/overlay057/ov57_021D0D80.c b/src/overlay057/ov57_021D0D80.c index 48775fdd2d..d378a43769 100644 --- a/src/overlay057/ov57_021D0D80.c +++ b/src/overlay057/ov57_021D0D80.c @@ -130,7 +130,7 @@ static int ov57_021D0E34 (OverlayManager * param0, int * param1) UnkStruct_02025CCC * v1 = sub_02025CCC(v0); ov57_021D0F30(77, v0); - sub_02027A68(v0, 0); + Options_SetSystemButtonMode(v0, 0); if (!sub_02025D10(v1) || !sub_02025D40(v1)) { sub_02025DE8(sub_02025CD8(v0)); diff --git a/src/overlay074/ov74_021D0D80.c b/src/overlay074/ov74_021D0D80.c index 97a65bf534..876ed09bc3 100644 --- a/src/overlay074/ov74_021D0D80.c +++ b/src/overlay074/ov74_021D0D80.c @@ -110,11 +110,11 @@ int ov74_021D0D80 (OverlayManager * param0, int * param1) v0 = OverlayManager_NewData(param0, sizeof(UnkStruct_ov74_021D0D80), 38); memset(v0, 0, sizeof(UnkStruct_ov74_021D0D80)); - v0->unk_18.unk_00_0 = sub_02027AA4(v1); - v0->unk_18.unk_00_6 = GameConfig_BattleAnimations(v1); - v0->unk_18.unk_00_7 = sub_02027B14(v1); - v0->unk_18.unk_00_4 = sub_02027ADC(v1); - v0->unk_18.unk_00_8 = sub_02027B30(v1); + v0->unk_18.unk_00_0 = Options_TextSpeed(v1); + v0->unk_18.unk_00_6 = Options_BattleScene(v1); + v0->unk_18.unk_00_7 = Options_BattleStyle(v1); + v0->unk_18.unk_00_4 = Options_SoundMethod(v1); + v0->unk_18.unk_00_8 = Options_ButtonMode(v1); v0->unk_18.unk_00_10 = sub_02027B50(v1); v0->unk_00 = 38; v0->unk_1C = v1; @@ -137,14 +137,14 @@ int ov74_021D0E58 (OverlayManager * param0, int * param1) v0->unk_18.unk_00_10 = v0->unk_5C[5].unk_02; } - sub_02027AAC(v0->unk_1C, v0->unk_18.unk_00_0); - sub_02027B00(v0->unk_1C, v0->unk_18.unk_00_6); - sub_02027B1C(v0->unk_1C, v0->unk_18.unk_00_7); - sub_02027AE4(v0->unk_1C, v0->unk_18.unk_00_4); - sub_02027B38(v0->unk_1C, v0->unk_18.unk_00_8); - sub_02027B58(v0->unk_1C, v0->unk_18.unk_00_10); + Options_SetTextSpeed(v0->unk_1C, v0->unk_18.unk_00_0); + Options_SetBattleScene(v0->unk_1C, v0->unk_18.unk_00_6); + Options_SetBattleStyle(v0->unk_1C, v0->unk_18.unk_00_7); + Options_SetSoundMethod(v0->unk_1C, v0->unk_18.unk_00_4); + Options_SetButtonMode(v0->unk_1C, v0->unk_18.unk_00_8); + Options_SetFrame(v0->unk_1C, v0->unk_18.unk_00_10); sub_02004FB8(v0->unk_18.unk_00_4); - sub_02027A68(NULL, v0->unk_18.unk_00_8); + Options_SetSystemButtonMode(NULL, v0->unk_18.unk_00_8); sub_02002AC8(1); OverlayManager_FreeData(param0); Heap_Destroy(v0->unk_00); @@ -632,9 +632,9 @@ static void ov74_021D17CC (UnkStruct_ov74_021D0D80 * param0, u16 param1) if (param1 == 1) { sub_02004FB8(param0->unk_5C[param1].unk_02); } else if (param1 == 4) { - sub_02027A68(NULL, param0->unk_5C[param1].unk_02); + Options_SetSystemButtonMode(NULL, param0->unk_5C[param1].unk_02); } else if (param1 == 0) { - sub_02027AAC(param0->unk_1C, param0->unk_5C[param1].unk_02); + Options_SetTextSpeed(param0->unk_1C, param0->unk_5C[param1].unk_02); ov74_021D1BE4(param0, param1, 0); } diff --git a/src/unk_02025E08.c b/src/unk_02025E08.c index 04c5622f80..ebbe3b642a 100644 --- a/src/unk_02025E08.c +++ b/src/unk_02025E08.c @@ -29,7 +29,7 @@ void Player_Init (UnkStruct_02025E0C * param0) { MI_CpuClearFast(param0, sizeof(UnkStruct_02025E0C)); - sub_02027A1C(¶m0->unk_00); + Options_Init(¶m0->unk_00); TrainerInfo_Init(¶m0->unk_04); Coins_Init(¶m0->unk_24); sub_0202CBE4(¶m0->unk_26); diff --git a/src/unk_0202F1D4.c b/src/unk_0202F1D4.c index 9b21ba30ae..2249adda86 100644 --- a/src/unk_0202F1D4.c +++ b/src/unk_0202F1D4.c @@ -494,7 +494,7 @@ void sub_0202F8AC (BattleParams * param0) v2->unk_14C[v0] = Sound_Chatter(param0->unk_F0[v0]); } - sub_02027A10(param0->unk_108, &v1->unk_1BE8); + Options_Copy(param0->unk_108, &v1->unk_1BE8); } void sub_0202FAA8 (int param0, u32 param1) @@ -572,7 +572,7 @@ void sub_0202FAFC (BattleParams * param0, SaveData * param1) param0->unk_194[v0] = v1->unk_00.unk_14C[v0]; } - sub_02027A10(sub_02025E44(param1), param0->unk_108); + Options_Copy(sub_02025E44(param1), param0->unk_108); param0->unk_108->frame = v1->unk_1BE8.frame; if (param0->unk_108->frame >= 20) { diff --git a/src/unk_02051D8C.c b/src/unk_02051D8C.c index 5fc6304eeb..461373de6c 100644 --- a/src/unk_02051D8C.c +++ b/src/unk_02051D8C.c @@ -104,7 +104,7 @@ BattleParams * sub_02051D8C (int param0, u32 param1) v1->unk_E0 = sub_0207D3C0(param0); v1->unk_E8 = sub_02026324(param0); - v1->unk_108 = sub_020279FC(param0); + v1->unk_108 = Options_AllocMemory(param0); v1->unk_10C = sub_0206D140(param0); v1->unk_E4 = NULL; v1->unk_190 = NULL; @@ -173,7 +173,7 @@ BattleParams * sub_02051F4C (int param0, const FieldSystem * param1) MessageLoader_Free(v2); TrainerInfo_SetGender(v4->unk_D0[0], TrainerInfo_Gender(v0) ^ 1); sub_0205281C(v4, param1); - sub_02027A10(v1, v4->unk_108); + Options_Copy(v1, v4->unk_108); v4->unk_138 = sub_02055BA8(param1); sub_0207D570(v4->unk_E0, 4, 20, param0); @@ -276,7 +276,7 @@ void sub_020521B8 (BattleParams * param0, const FieldSystem * param1, SaveData * sub_02052164(param0, v1, 0); sub_0207D3EC(v2, param0->unk_E0); sub_02026338(v3, param0->unk_E8); - sub_02027A10(v5, param0->unk_108); + Options_Copy(v5, param0->unk_108); sub_020521A4(param0, v4, 0); param0->unk_EC = SaveData_PCBoxes(param2); @@ -337,7 +337,7 @@ void sub_02052348 (BattleParams * param0, const FieldSystem * param1, int param2 Heap_FreeToHeap(v8); sub_0207D3EC(v4, param0->unk_E0); sub_02026338(v5, param0->unk_E8); - sub_02027A10(v7, param0->unk_108); + Options_Copy(v7, param0->unk_108); sub_020521A4(param0, v6, 0); param0->unk_EC = SaveData_PCBoxes(param1->saveData); @@ -407,7 +407,7 @@ void sub_020524E4 (BattleParams * param0, const FieldSystem * param1, const Part sub_0207D3EC(v1, param0->unk_E0); sub_02026338(v2, param0->unk_E8); - sub_02027A10(v4, param0->unk_108); + Options_Copy(v4, param0->unk_108); sub_020521A4(param0, v3, 0); param0->unk_EC = SaveData_PCBoxes(param1->saveData); From 36cfcbfaec750d0ff549a4b24091c12ca01290b9 Mon Sep 17 00:00:00 2001 From: RavePossum Date: Sun, 14 Apr 2024 08:33:37 -0400 Subject: [PATCH 14/23] mass renames for options --- include/game_options.h | 4 ++-- src/battle/ov16_0223B140.c | 2 +- src/battle/ov16_0223DF00.c | 4 ++-- src/game_options.c | 7 +++--- src/overlay005/ov5_021DD42C.c | 2 +- src/overlay005/ov5_021EA874.c | 2 +- src/overlay007/ov7_0224BE9C.c | 4 ++-- src/overlay007/ov7_0224CD28.c | 2 +- src/overlay010/ov10_0221F800.c | 2 +- src/overlay017/ov17_0223CB1C.c | 2 +- src/overlay017/ov17_0223DAD0.c | 2 +- src/overlay017/ov17_022413D8.c | 2 +- src/overlay017/ov17_022476F8.c | 2 +- src/overlay017/ov17_0224A0FC.c | 2 +- src/overlay017/ov17_02250744.c | 6 +++--- src/overlay019/ov19_021D0D80.c | 2 +- src/overlay022/ov22_02255D44.c | 4 ++-- src/overlay022/ov22_0225A428.c | 6 +++--- src/overlay023/ov23_02241F74.c | 2 +- src/overlay058/ov58_021D0D80.c | 2 +- src/overlay059/ov59_021D0D80.c | 2 +- src/overlay061/ov61_0222BF44.c | 2 +- src/overlay064/ov64_0222DCE0.c | 6 +++--- src/overlay065/ov65_0222DCE0.c | 4 ++-- src/overlay065/ov65_0223648C.c | 8 +++---- src/overlay067/ov67_0225C700.c | 4 ++-- src/overlay068/ov68_0225C700.c | 4 ++-- src/overlay069/ov69_0225C700.c | 4 ++-- src/overlay070/ov70_0225D9A4.c | 4 ++-- src/overlay072/ov72_0223D7A0.c | 4 ++-- src/overlay073/ov73_021D0D80.c | 2 +- src/overlay074/ov74_021D0D80.c | 4 ++-- src/overlay075/ov75_021D0D80.c | 4 ++-- src/overlay078/ov78_021D0D80.c | 4 ++-- src/overlay079/ov79_021D0D80.c | 4 ++-- src/overlay083/ov83_0223B5A0.c | 4 ++-- src/overlay084/ov84_0223B5A0.c | 2 +- src/overlay084/ov84_0223F040.c | 2 +- src/overlay088/ov88_0223B140.c | 2 +- src/overlay088/ov88_0223E9C4.c | 2 +- src/overlay091/ov91_021D0D80.c | 4 ++-- src/overlay092/ov92_021D0D80.c | 4 ++-- src/overlay094/ov94_0223BCB0.c | 2 +- src/overlay094/ov94_0223C610.c | 2 +- src/overlay094/ov94_0223D0C4.c | 2 +- src/overlay094/ov94_0223DC04.c | 2 +- src/overlay094/ov94_0223E46C.c | 2 +- src/overlay094/ov94_0223FB48.c | 2 +- src/overlay094/ov94_022414B8.c | 2 +- src/overlay094/ov94_02242AD0.c | 2 +- src/overlay094/ov94_02244950.c | 2 +- src/overlay095/ov95_02246C20.c | 2 +- src/overlay096/ov96_0223BCE0.c | 2 +- src/overlay097/ov97_0222C174.c | 2 +- src/overlay097/ov97_0222D30C.c | 2 +- src/overlay097/ov97_02230410.c | 2 +- src/overlay097/ov97_02233B18.c | 2 +- src/overlay098/ov98_022471C8.c | 2 +- src/overlay100/ov100_021D0D80.c | 2 +- src/overlay100/ov100_021D46C8.c | 2 +- src/overlay104/ov104_02231F74.c | 4 ++-- src/overlay104/ov104_0223C2D4.c | 2 +- src/overlay105/ov105_02241AE0.c | 14 ++++++------ src/overlay106/ov106_02241AE0.c | 10 ++++----- src/overlay107/ov107_02241AE0.c | 38 ++++++++++++++++----------------- src/overlay107/ov107_02245EB0.c | 22 +++++++++---------- src/overlay109/ov109_021D3D50.c | 2 +- src/overlay111/ov111_021D0D80.c | 2 +- src/overlay113/ov113_0225C700.c | 6 +++--- src/overlay114/ov114_0225C700.c | 2 +- src/pokemon_summary_app.c | 4 ++-- src/unk_0203D1B8.c | 2 +- src/unk_0205D8CC.c | 4 ++-- src/unk_0206F314.c | 4 ++-- src/unk_020722AC.c | 4 ++-- src/unk_0207AE68.c | 4 ++-- src/unk_0207E0B8.c | 2 +- src/unk_020819DC.c | 2 +- src/unk_0208694C.c | 2 +- src/unk_0208A3F4.c | 2 +- src/unk_0209747C.c | 2 +- src/unk_02097B18.c | 2 +- src/unk_02098218.c | 4 ++-- src/unk_020989DC.c | 4 ++-- src/unk_0209C194.c | 2 +- 85 files changed, 161 insertions(+), 162 deletions(-) diff --git a/include/game_options.h b/include/game_options.h index 8c5bbd1891..8f067f6bcc 100644 --- a/include/game_options.h +++ b/include/game_options.h @@ -19,7 +19,7 @@ void Options_Init(Options *options); void Options_SetSystemButtonMode(SaveData *saveData, int buttonMode); int Options_TextSpeed(const Options *options); void Options_SetTextSpeed(Options *options, int textSpeed); -u8 sub_02027AC0(const Options *options); +u8 Options_GetTextFrameDelay(const Options *options); int Options_SoundMethod(const Options *options); void Options_SetSoundMethod(Options *options, int soundMethod); int Options_BattleScene(const Options *options); @@ -28,7 +28,7 @@ int Options_BattleStyle(const Options *options); void Options_SetBattleStyle(Options *options, int battleStyle); int Options_ButtonMode(const Options *options); void Options_SetButtonMode(Options *options, int buttonMode); -int sub_02027B50(const Options *options); +int Options_Frame(const Options *options); void Options_SetFrame(Options *options, int frame); #endif // POKEPLATINUM_GAME_OPTIONS_H diff --git a/src/battle/ov16_0223B140.c b/src/battle/ov16_0223B140.c index bd2273a124..e34e135864 100644 --- a/src/battle/ov16_0223B140.c +++ b/src/battle/ov16_0223B140.c @@ -1728,7 +1728,7 @@ static void ov16_0223D10C (OverlayManager * param0, BattleParams * param1) { int v4; - v4 = sub_02027B50(param1->unk_108); + v4 = Options_Frame(param1->unk_108); sub_0200E218(v0->unk_04, 1, 1, 10, v4, 5); PaletteSys_LoadPalette(v0->unk_0C, 14, 7, 5, 0, 0x20, 0xb * 0x10); diff --git a/src/battle/ov16_0223DF00.c b/src/battle/ov16_0223DF00.c index 7d804400b9..a4b0c90eb9 100644 --- a/src/battle/ov16_0223DF00.c +++ b/src/battle/ov16_0223DF00.c @@ -1032,7 +1032,7 @@ BOOL BattleSystem_AnimationsOn(BattleSystem *battleSys) int ov16_0223EDE0 (BattleSystem * param0) { - return sub_02027B50(param0->unk_1B0); + return Options_Frame(param0->unk_1B0); } u8 BattleSystem_TextSpeed (BattleSystem * param0) @@ -1041,7 +1041,7 @@ u8 BattleSystem_TextSpeed (BattleSystem * param0) return 1; } - return sub_02027AC0(param0->unk_1B0); + return Options_GetTextFrameDelay(param0->unk_1B0); } int BattleSystem_Ruleset (BattleSystem * param0) diff --git a/src/game_options.c b/src/game_options.c index 3065fa43e4..3350d3eea7 100644 --- a/src/game_options.c +++ b/src/game_options.c @@ -65,8 +65,8 @@ void Options_SetTextSpeed (Options *options, int textSpeed) { options->textSpeed = textSpeed; } -//ravetodo Options_GetTextFrameDelay -u8 sub_02027AC0 (const Options *options) + +u8 Options_GetTextFrameDelay (const Options *options) { int speed = Options_TextSpeed(options); @@ -119,8 +119,7 @@ void Options_SetButtonMode (Options *options, int buttonMode) options->buttonMode = buttonMode; } -//ravetodo Options_Frame -int sub_02027B50 (const Options *options) +int Options_Frame (const Options *options) { return options->frame; } diff --git a/src/overlay005/ov5_021DD42C.c b/src/overlay005/ov5_021DD42C.c index 68cebedc8b..08cb886203 100644 --- a/src/overlay005/ov5_021DD42C.c +++ b/src/overlay005/ov5_021DD42C.c @@ -110,7 +110,7 @@ void ov5_021DD530 (UnkStruct_0203E724 * param0, StringTemplate * param1, u8 para static u8 ov5_021DD574 (UnkStruct_0203E724 * param0) { - return sub_02027AC0(sub_02025E44(param0->unk_34->saveData)); + return Options_GetTextFrameDelay(sub_02025E44(param0->unk_34->saveData)); } static void ov5_021DD588 (FieldSystem * param0, UnkStruct_ov5_021DD648 * param1) diff --git a/src/overlay005/ov5_021EA874.c b/src/overlay005/ov5_021EA874.c index 8aafa06ff7..dd7e3edcbd 100644 --- a/src/overlay005/ov5_021EA874.c +++ b/src/overlay005/ov5_021EA874.c @@ -78,7 +78,7 @@ static BOOL ov5_021EA874 (UnkStruct_ov5_021EAE78 * param0) param0->unk_8C = 0; - sub_0200DD0C(param0->unk_30->unk_08, 3, (512 - (18 + 12)), 10, sub_02027B50(sub_02025E44(param0->unk_34)), 4); + sub_0200DD0C(param0->unk_30->unk_08, 3, (512 - (18 + 12)), 10, Options_Frame(sub_02025E44(param0->unk_34)), 4); sub_0200DAA4(param0->unk_30->unk_08, 3, 1024 - (18 + 12) - 9, 11, 0, 4); param0->unk_48 = 1; diff --git a/src/overlay007/ov7_0224BE9C.c b/src/overlay007/ov7_0224BE9C.c index 80b45ed982..bc05fe7191 100644 --- a/src/overlay007/ov7_0224BE9C.c +++ b/src/overlay007/ov7_0224BE9C.c @@ -372,8 +372,8 @@ static void ov7_0224C338 (UnkStruct_ov7_0224BEFC * param0) { Options * v0 = sub_02025E44(param0->unk_08); - param0->unk_1B0 = sub_02027B50(v0); - param0->unk_1B4 = sub_02027AC0(v0); + param0->unk_1B0 = Options_Frame(v0); + param0->unk_1B4 = Options_GetTextFrameDelay(v0); } static void ov7_0224C35C (UnkStruct_ov7_0224BEFC * param0) diff --git a/src/overlay007/ov7_0224CD28.c b/src/overlay007/ov7_0224CD28.c index ebb150b2c0..39d98cbfcb 100644 --- a/src/overlay007/ov7_0224CD28.c +++ b/src/overlay007/ov7_0224CD28.c @@ -503,7 +503,7 @@ static void ov7_0224D474 (UnkStruct_ov7_0224D008 * param0) } sub_0200DAA4(param0->unk_00, 3, (1 + (18 + 12)), 11, 0, 11); - sub_0200DD0C(param0->unk_00, 3, 1, 10, sub_02027B50(param0->unk_278), 11); + sub_0200DD0C(param0->unk_00, 3, 1, 10, Options_Frame(param0->unk_278), 11); NARC_dtor(v0); } diff --git a/src/overlay010/ov10_0221F800.c b/src/overlay010/ov10_0221F800.c index 3e55cfd9f1..927dbf310b 100644 --- a/src/overlay010/ov10_0221F800.c +++ b/src/overlay010/ov10_0221F800.c @@ -1452,7 +1452,7 @@ static void ov10_02220F1C (UnkStruct_ov10_0221FB28 * param0) int v0; GF_ASSERT(param0->unk_B9C == GX_BG0_AS_2D && param0->unk_00 != NULL && param0->unk_00->unk_00 != NULL && param0->unk_00->unk_00->unk_108 != NULL); - v0 = sub_02027B50(param0->unk_00->unk_00->unk_108); + v0 = Options_Frame(param0->unk_00->unk_00->unk_108); sub_0200DD0C(param0->unk_0C, 0, 1, 15, v0, param0->unk_00->unk_24); sub_02003070(param0->unk_08, 0, 15 * 16, 0x20 * 1); diff --git a/src/overlay017/ov17_0223CB1C.c b/src/overlay017/ov17_0223CB1C.c index acb5188633..20766b08bd 100644 --- a/src/overlay017/ov17_0223CB1C.c +++ b/src/overlay017/ov17_0223CB1C.c @@ -599,7 +599,7 @@ static void ov17_0223D4A8 (UnkStruct_ov17_02247A48 * param0, NARC * param1) PaletteSys_LoadPalette(param0->unk_0C.unk_44, 45, 35, 22, 0, 0, 0); PaletteSys_LoadPalette(param0->unk_0C.unk_44, 45, 36, 22, 0, 0x20, 13 * 16); - v0 = sub_02027B50(param0->unk_00->unk_196C); + v0 = Options_Frame(param0->unk_00->unk_196C); sub_0200DD0C(param0->unk_0C.unk_24, 1, 1, 15, v0, 22); PaletteSys_LoadPalette(param0->unk_0C.unk_44, 38, sub_0200DD08(v0), 22, 0, 0x20, 14 * 16); diff --git a/src/overlay017/ov17_0223DAD0.c b/src/overlay017/ov17_0223DAD0.c index 67f7ad0c44..94cc4aec87 100644 --- a/src/overlay017/ov17_0223DAD0.c +++ b/src/overlay017/ov17_0223DAD0.c @@ -802,7 +802,7 @@ static void ov17_0223E67C (UnkStruct_ov17_0224DF54 * param0, NARC * param1) PaletteSys_LoadPalette(param0->unk_14.unk_90, 45, 32, 23, 0, 0, 0); PaletteSys_LoadPalette(param0->unk_14.unk_90, 45, 36, 23, 0, 0x20, 13 * 16); - v0 = sub_02027B50(param0->unk_00->unk_196C); + v0 = Options_Frame(param0->unk_00->unk_196C); sub_0200DD0C(param0->unk_14.unk_60, 1, 1, 15, v0, 23); PaletteSys_LoadPalette(param0->unk_14.unk_90, 38, sub_0200DD08(v0), 23, 0, 0x20, 14 * 16); ov17_0224C848(param0); diff --git a/src/overlay017/ov17_022413D8.c b/src/overlay017/ov17_022413D8.c index 21d099f9df..0701a8614a 100644 --- a/src/overlay017/ov17_022413D8.c +++ b/src/overlay017/ov17_022413D8.c @@ -1520,7 +1520,7 @@ static void ov17_02242DC0 (UnkStruct_ov17_02246F24 * param0, MessageLoader * par v1 = 0; } else { if (param0->unk_00->unk_155 == 0) { - v1 = sub_02027AC0(param0->unk_00->unk_196C); + v1 = Options_GetTextFrameDelay(param0->unk_00->unk_196C); } else { v1 = 1; } diff --git a/src/overlay017/ov17_022476F8.c b/src/overlay017/ov17_022476F8.c index 045737af10..111741ce5a 100644 --- a/src/overlay017/ov17_022476F8.c +++ b/src/overlay017/ov17_022476F8.c @@ -210,7 +210,7 @@ static void ov17_02247990 (UnkStruct_ov17_02247A48 * param0, MessageLoader * par int v1; if (param0->unk_00->unk_155 == 0) { - v1 = sub_02027AC0(param0->unk_00->unk_196C); + v1 = Options_GetTextFrameDelay(param0->unk_00->unk_196C); } else { v1 = 1; } diff --git a/src/overlay017/ov17_0224A0FC.c b/src/overlay017/ov17_0224A0FC.c index bc7d2f1b4e..9c084629a8 100644 --- a/src/overlay017/ov17_0224A0FC.c +++ b/src/overlay017/ov17_0224A0FC.c @@ -1936,7 +1936,7 @@ static void ov17_0224C244 (UnkStruct_ov17_0224DF54 * param0, MessageLoader * par int v1; if (param0->unk_00->unk_155 == 0) { - v1 = sub_02027AC0(param0->unk_00->unk_196C); + v1 = Options_GetTextFrameDelay(param0->unk_00->unk_196C); } else { v1 = 1; } diff --git a/src/overlay017/ov17_02250744.c b/src/overlay017/ov17_02250744.c index 1c53ec07d4..5b7d2b0fe8 100644 --- a/src/overlay017/ov17_02250744.c +++ b/src/overlay017/ov17_02250744.c @@ -245,7 +245,7 @@ static void ov17_022508E4 (UnkStruct_ov17_0224FCA0 * param0, MessageLoader * par int v1; if (param0->unk_00->unk_155 == 0) { - v1 = sub_02027AC0(param0->unk_00->unk_196C); + v1 = Options_GetTextFrameDelay(param0->unk_00->unk_196C); } else { v1 = 1; } @@ -291,7 +291,7 @@ void ov17_022509AC (UnkStruct_ov17_0224FCA0 * param0) PaletteSys_LoadPalette(param0->unk_10.unk_C0, 45, 35, 24, 0, 0, 0); PaletteSys_LoadPalette(param0->unk_10.unk_C0, 45, 36, 24, 0, 0x20, 13 * 16); - v0 = sub_02027B50(param0->unk_00->unk_196C); + v0 = Options_Frame(param0->unk_00->unk_196C); sub_0200DD0C(param0->unk_10.unk_20, 1, 1, 15, v0, 24); PaletteSys_LoadPalette(param0->unk_10.unk_C0, 38, sub_0200DD08(v0), 24, 0, 0x20, 14 * 16); @@ -330,7 +330,7 @@ void ov17_02250B00 (UnkStruct_ov17_0224FCA0 * param0) PaletteSys_LoadPalette(param0->unk_10.unk_C0, 45, 39, 24, 0, 0, 0); PaletteSys_LoadPalette(param0->unk_10.unk_C0, 45, 36, 24, 0, 0x20, 13 * 16); - v0 = sub_02027B50(param0->unk_00->unk_196C); + v0 = Options_Frame(param0->unk_00->unk_196C); sub_0200DD0C(param0->unk_10.unk_20, 1, 1, 15, v0, 24); PaletteSys_LoadPalette(param0->unk_10.unk_C0, 38, sub_0200DD08(v0), 24, 0, 0x20, 14 * 16); diff --git a/src/overlay019/ov19_021D0D80.c b/src/overlay019/ov19_021D0D80.c index e97c4f7d3a..b88140838b 100644 --- a/src/overlay019/ov19_021D0D80.c +++ b/src/overlay019/ov19_021D0D80.c @@ -4429,7 +4429,7 @@ const StringTemplate * ov19_021D5DF0 (const UnkStruct_ov19_021D5DF8 * param0) int ov19_021D5DF8 (const UnkStruct_ov19_021D5DF8 * param0) { - return sub_02027B50(param0->unk_1A4); + return Options_Frame(param0->unk_1A4); } u32 ov19_021D5E08 (const UnkStruct_ov19_021D4DF0 * param0) diff --git a/src/overlay022/ov22_02255D44.c b/src/overlay022/ov22_02255D44.c index d5c1535b1b..18b1904e5d 100644 --- a/src/overlay022/ov22_02255D44.c +++ b/src/overlay022/ov22_02255D44.c @@ -1341,7 +1341,7 @@ static void ov22_022572A0 (UnkStruct_ov22_02255D44 * param0, u32 param1, u8 para { MessageLoader * v0; Strbuf* v1; - int v2 = sub_02027B50(param0->unk_738); + int v2 = Options_Frame(param0->unk_738); sub_02002E98(0, 7 * 32, 14); BGL_AddWindow(param0->unk_00.unk_40, param0->unk_718, 3, param2, param3, param4, param5, 7, (0 + (29 * 4) + (18 + 12))); @@ -1396,7 +1396,7 @@ static u32 ov22_022573EC (UnkStruct_ov22_02255D44 * param0, u32 param1) StringTemplate_Format(param0->unk_744, param0->unk_740, v3); if (param0->unk_734->unk_16 == 0) { - v2 = sub_02027AC0(param0->unk_738); + v2 = Options_GetTextFrameDelay(param0->unk_738); } else { v2 = 1; } diff --git a/src/overlay022/ov22_0225A428.c b/src/overlay022/ov22_0225A428.c index 7c48bcf1e9..34dd46d72c 100644 --- a/src/overlay022/ov22_0225A428.c +++ b/src/overlay022/ov22_0225A428.c @@ -101,8 +101,8 @@ void ov22_0225A428 (UnkStruct_ov22_0225A428 * param0, UnkStruct_ov22_02256BAC * ov22_0225A718(param1->unk_00, param1->unk_0C); - param0->unk_13C = sub_02027B50(param1->unk_0C); - param0->unk_140 = sub_02027AC0(param1->unk_0C); + param0->unk_13C = Options_Frame(param1->unk_0C); + param0->unk_140 = Options_GetTextFrameDelay(param1->unk_0C); param0->unk_138 |= param2; } @@ -203,7 +203,7 @@ static void ov22_0225A6E0 (UnkStruct_ov22_022597BC * param0, BGL * param1) static void ov22_0225A718 (BGL * param0, const Options * param1) { - int v0 = sub_02027B50(param1); + int v0 = Options_Frame(param1); sub_0200DD0C(param0, 5, 1, 1, v0, 14); sub_02002E98(4, 2 * 32, 14); diff --git a/src/overlay023/ov23_02241F74.c b/src/overlay023/ov23_02241F74.c index f224a8ffd1..da344119c0 100644 --- a/src/overlay023/ov23_02241F74.c +++ b/src/overlay023/ov23_02241F74.c @@ -126,7 +126,7 @@ static UnkStruct_ov23_02257748 * Unk_ov23_02257748 = NULL; static void ov23_02241F74 (UnkStruct_ov23_02257748 * param0, FieldSystem * param1) { - u8 v0 = sub_02027AC0(sub_02025E44(param1->saveData)); + u8 v0 = Options_GetTextFrameDelay(sub_02025E44(param1->saveData)); int v1; Unk_ov23_02257748 = param0; diff --git a/src/overlay058/ov58_021D0D80.c b/src/overlay058/ov58_021D0D80.c index fcdacc5977..74ef61732d 100644 --- a/src/overlay058/ov58_021D0D80.c +++ b/src/overlay058/ov58_021D0D80.c @@ -604,7 +604,7 @@ static void ov58_021D142C (UnkStruct_02095EAC * param0, NARC * param1) sub_0200710C(param1, 4, v0, 2, 0, 32 * 24 * 2, 1, 39); sub_020070E8(param1, 3, v0, 5, 0, 32 * 8 * 0x20, 1, 39); sub_0200710C(param1, 5, v0, 5, 0, 32 * 24 * 2, 1, 39); - sub_0200DD0C(v0, 0, 1, 10, sub_02027B50(param0->unk_08->unk_08), 39); + sub_0200DD0C(v0, 0, 1, 10, Options_Frame(param0->unk_08->unk_08), 39); sub_0200DAA4(v0, 0, 1 + (18 + 12), 11, 0, 39); } diff --git a/src/overlay059/ov59_021D0D80.c b/src/overlay059/ov59_021D0D80.c index da7b4a40d8..8affb92934 100644 --- a/src/overlay059/ov59_021D0D80.c +++ b/src/overlay059/ov59_021D0D80.c @@ -585,7 +585,7 @@ static void ov59_021D1388 (UnkStruct_020961E8 * param0, NARC * param1) sub_02006E60(12, 11, v0, 6, 0, 0, 1, 51); sub_020070E8(param1, 2, v0, 1, 0, 32 * 8 * 0x20, 1, 51); sub_0200710C(param1, 3, v0, 1, 0, 32 * 24 * 2, 1, 51); - sub_0200DD0C(v0, 0, 1, 10, sub_02027B50(param0->unk_08->unk_08), 51); + sub_0200DD0C(v0, 0, 1, 10, Options_Frame(param0->unk_08->unk_08), 51); sub_0200DAA4(v0, 0, 1 + (18 + 12), 11, 0, 51); } diff --git a/src/overlay061/ov61_0222BF44.c b/src/overlay061/ov61_0222BF44.c index ce3b1fe50a..0e4a892576 100644 --- a/src/overlay061/ov61_0222BF44.c +++ b/src/overlay061/ov61_0222BF44.c @@ -445,7 +445,7 @@ static void ov61_0222C3B0 (UnkStruct_ov61_0222C664 * param0) sub_02007130(v1, 3, 4, 0, 0, 117); sub_02002E98(0, 13 * 0x20, 117); sub_02002E98(4, 13 * 0x20, 117); - sub_0200DD0C(v0, 0, 1, 10, sub_02027B50(sub_02025E44(param0->unk_00->unk_00->unk_04)), 117); + sub_0200DD0C(v0, 0, 1, 10, Options_Frame(sub_02025E44(param0->unk_00->unk_00->unk_04)), 117); sub_0200DAA4(v0, 0, (1 + (18 + 12)), 11, 0, 117); sub_020070E8(v1, 2, v0, 1, 0, 0, 0, 117); sub_0200710C(v1, 5, v0, 1, 0, 32 * 24 * 2, 0, 117); diff --git a/src/overlay064/ov64_0222DCE0.c b/src/overlay064/ov64_0222DCE0.c index fab1ec3885..ce1a39bb88 100644 --- a/src/overlay064/ov64_0222DCE0.c +++ b/src/overlay064/ov64_0222DCE0.c @@ -1075,7 +1075,7 @@ static void ov64_0222E620 (UnkStruct_ov64_0222E21C * param0, const UnkStruct_ov6 { int v0; - v0 = sub_02027B50(sub_02025E44(param1->unk_00)); + v0 = Options_Frame(sub_02025E44(param1->unk_00)); sub_02002E98(0, 7 * 0x20, param2); sub_0200DD0C(param0->unk_00, Unk_ov64_02232258[1], (1 + 9), 8, v0, param2); @@ -1500,7 +1500,7 @@ asm static void ov64_0222EC94 (UnkStruct_ov64_0222F038 * param0, UnkStruct_ov64_ str r0, [r1, #0x38] ldr r0, [r5, #0] bl sub_02025E44 - bl sub_02027AC0 + bl Options_GetTextFrameDelay ldr r1, [sp, #0x14] str r0, [r1, #0x34] ldr r1, [sp, #0x1c] @@ -1751,7 +1751,7 @@ static BOOL ov64_0222F068 (UnkStruct_ov64_0222F038 * param0, UnkStruct_ov64_0222 static void ov64_0222F09C (UnkStruct_ov64_0222F0C4 * param0, UnkStruct_ov64_0222E060 * param1, UnkStruct_ov64_0222E21C * param2, u32 param3) { - param0->unk_DC = sub_02027AC0(sub_02025E44(param1->unk_00)); + param0->unk_DC = Options_GetTextFrameDelay(sub_02025E44(param1->unk_00)); ov64_0222F414(param0, param1, param2, param3); } diff --git a/src/overlay065/ov65_0222DCE0.c b/src/overlay065/ov65_0222DCE0.c index a12d14452a..696d006096 100644 --- a/src/overlay065/ov65_0222DCE0.c +++ b/src/overlay065/ov65_0222DCE0.c @@ -1478,7 +1478,7 @@ static void ov65_0222ECA8 (UnkStruct_ov65_0222EBE0 * param0, NARC * param1) sub_0200710C(param1, 11, v0, 4, 0, 0, 0, 54); { - int v1 = sub_02027B50(sub_02025E44(param0->unk_160)); + int v1 = Options_Frame(sub_02025E44(param0->unk_160)); sub_0200DD0C(v0, 2, (512 - (18 + 12)), 10, v1, 54); sub_0200DAA4(v0, 2, ((512 - (18 + 12)) - 9), 11, 0, 54); @@ -4737,7 +4737,7 @@ static int ov65_02232B28 (UnkStruct_ov65_0222EBE0 * param0, int param1) static void ov65_02232B58 (UnkStruct_ov65_0222EBE0 * param0, int param1, BOOL param2) { - u8 v0 = sub_02027AC0(sub_02025E44(param0->unk_160)); + u8 v0 = Options_GetTextFrameDelay(sub_02025E44(param0->unk_160)); ov65_02232F50(param0); diff --git a/src/overlay065/ov65_0223648C.c b/src/overlay065/ov65_0223648C.c index 60e4cbf75c..7bc9d1550d 100644 --- a/src/overlay065/ov65_0223648C.c +++ b/src/overlay065/ov65_0223648C.c @@ -759,7 +759,7 @@ static void ov65_02236A28 (UnkStruct_ov65_02236840 * param0, const UnkStruct_020 sub_02002E98(0, 1 * 0x20, param2); - v0 = sub_02027B50(sub_02025E44(param1->unk_08)); + v0 = Options_Frame(sub_02025E44(param1->unk_08)); sub_0200DD0C(param0->unk_00, 1, 1, 2, v0, param2); sub_0200DAA4(param0->unk_00, 1, (1 + (18 + 12)), 3, 0, param2); @@ -805,7 +805,7 @@ static void ov65_02236C10 (UnkStruct_ov65_02236840 * param0, const UnkStruct_020 param0->unk_0C = Strbuf_Init(256, param2); param0->unk_10 = Strbuf_Init(256, param2); param0->unk_14 = 0xff; - param0->unk_16 = sub_02027AC0(sub_02025E44(param1->unk_08)); + param0->unk_16 = Options_GetTextFrameDelay(sub_02025E44(param1->unk_08)); } static void ov65_02236C5C (UnkStruct_ov65_02236840 * param0) @@ -921,7 +921,7 @@ static void ov65_02236E50 (UnkStruct_ov65_02236840 * param0, const UnkStruct_020 sub_0201A9A4(¶m0->unk_1F0); Strbuf_Free(v0); - v1 = sub_02027B50(sub_02025E44(param1->unk_08)); + v1 = Options_Frame(sub_02025E44(param1->unk_08)); sub_0200DD0C(param0->unk_00, 1, 1, 2, v1, param4); @@ -1521,7 +1521,7 @@ static void ov65_022378C4 (UnkStruct_ov65_022367A8 * param0, const UnkStruct_020 DeleteWaitDial(param0->unk_30.unk_24C); param0->unk_30.unk_24C = NULL; - v0 = sub_02027B50(sub_02025E44(param1->unk_08)); + v0 = Options_Frame(sub_02025E44(param1->unk_08)); sub_0200DD0C(param0->unk_30.unk_00, 1, 1, 2, v0, param2); } diff --git a/src/overlay067/ov67_0225C700.c b/src/overlay067/ov67_0225C700.c index b9909d6c9e..a9b8aae7c4 100644 --- a/src/overlay067/ov67_0225C700.c +++ b/src/overlay067/ov67_0225C700.c @@ -592,7 +592,7 @@ static void ov67_0225CE30 (UnkStruct_ov67_0225D154 * param0, u32 param1) u8 v2; v1 = sub_02025E44(param0->unk_00); - v2 = sub_02027B50(v1); + v2 = Options_Frame(v1); sub_02002E7C(0, 12 * 32, param1); sub_02002E98(0, 11 * 32, param1); @@ -647,7 +647,7 @@ static void ov67_0225D188 (UnkStruct_ov67_0225D210 * param0, BGL * param1, u32 p param0->unk_18 = Strbuf_Init(256, param10); param0->unk_1C = Strbuf_Init(256, param10); param0->unk_20 = param2; - param0->unk_28 = sub_02027AC0(sub_02025E44(param9)); + param0->unk_28 = Options_GetTextFrameDelay(sub_02025E44(param9)); param0->unk_2C = 0; BGL_AddWindow(param1, ¶m0->unk_08, Unk_ov67_0225D3F4[1], param4, param5, param6, param7, 11, param8); diff --git a/src/overlay068/ov68_0225C700.c b/src/overlay068/ov68_0225C700.c index 035b4976bf..5bdc03a9f4 100644 --- a/src/overlay068/ov68_0225C700.c +++ b/src/overlay068/ov68_0225C700.c @@ -504,7 +504,7 @@ static void ov68_0225C9A0 (UnkStruct_ov68_0225C91C * param0, Options * param1, u sub_02002E98(0, 4 * 0x20, param2); { - u8 v1 = sub_02027B50(param1); + u8 v1 = Options_Frame(param1); sub_0200DD0C(param0->unk_00, 1, 1, 5, v1, param2); } @@ -921,7 +921,7 @@ static void ov68_0225D128 (UnkStruct_ov68_0225D128 * param0, UnkStruct_ov68_0225 Options * v0; v0 = sub_02025E44(param2); - param0->unk_04 = sub_02027AC0(v0); + param0->unk_04 = Options_GetTextFrameDelay(v0); } } diff --git a/src/overlay069/ov69_0225C700.c b/src/overlay069/ov69_0225C700.c index e57cd83cad..e9f1a2efd0 100644 --- a/src/overlay069/ov69_0225C700.c +++ b/src/overlay069/ov69_0225C700.c @@ -1459,7 +1459,7 @@ static void ov69_0225D3A4 (UnkStruct_ov69_0225D35C * param0, Options * param1, u sub_0200DAA4(param0->unk_00, 1, ((1 + (18 + 12))), 0, 0, param2); { - u8 v1 = sub_02027B50(param1); + u8 v1 = Options_Frame(param1); sub_0200DD0C(param0->unk_00, 4, 10, 10, v1, param2); sub_0200DD0C(param0->unk_00, 1, 1, 2, v1, param2); @@ -1962,7 +1962,7 @@ static void ov69_0225DD60 (UnkStruct_ov69_0225DDC8 * param0, UnkStruct_ov69_0225 Options * v0; v0 = sub_02025E44(param3); - param0->unk_08 = sub_02027AC0(v0); + param0->unk_08 = Options_GetTextFrameDelay(v0); } param0->unk_0C = Strbuf_Init(128, param4); diff --git a/src/overlay070/ov70_0225D9A4.c b/src/overlay070/ov70_0225D9A4.c index 6c6130605e..268cd0e281 100644 --- a/src/overlay070/ov70_0225D9A4.c +++ b/src/overlay070/ov70_0225D9A4.c @@ -1315,7 +1315,7 @@ static void ov70_0225E4EC (UnkStruct_ov70_0225E4EC * param0, SaveData * param1, u8 v2; v1 = sub_02025E44(param1); - v2 = sub_02027B50(v1); + v2 = Options_Frame(v1); sub_02002E7C(0, 5 * 32, param2); sub_02002E98(0, 4 * 32, param2); @@ -1549,7 +1549,7 @@ static void ov70_0225E9C8 (UnkStruct_ov70_0225E9C8 * param0, UnkStruct_ov70_0225 Options * v0; v0 = sub_02025E44(param2); - param0->unk_14 = sub_02027AC0(v0); + param0->unk_14 = Options_GetTextFrameDelay(v0); } } diff --git a/src/overlay072/ov72_0223D7A0.c b/src/overlay072/ov72_0223D7A0.c index 55a1c99972..44cf93f61a 100644 --- a/src/overlay072/ov72_0223D7A0.c +++ b/src/overlay072/ov72_0223D7A0.c @@ -459,7 +459,7 @@ static void ov72_0223DCA8 (UnkStruct_ov72_0223DB98 * param0, NARC * param1) sub_0200710C(param1, 5, v0, 2, 0, 32 * 24 * 2, 1, 39); sub_020070E8(param1, 4, v0, 5, 0, 32 * 8 * 0x20, 1, 39); sub_0200710C(param1, 6, v0, 5, 0, 32 * 24 * 2, 1, 39); - sub_0200DD0C(v0, 0, 1, 10, sub_02027B50(param0->unk_0C), 39); + sub_0200DD0C(v0, 0, 1, 10, Options_Frame(param0->unk_0C), 39); sub_0200DAA4(v0, 0, 1 + (18 + 12), 11, 0, 39); } @@ -1107,7 +1107,7 @@ static void ov72_0223E930 (UnkStruct_ov72_0223DB98 * param0, int param1) BGL_FillWindow(¶m0->unk_338, 0xf0f); sub_0200E060(¶m0->unk_338, 0, 1, 10); - param0->unk_38 = PrintStringSimple(¶m0->unk_338, 1, param0->unk_34, 0, 0, sub_02027AC0(param0->unk_0C), NULL); + param0->unk_38 = PrintStringSimple(¶m0->unk_338, 1, param0->unk_34, 0, 0, Options_GetTextFrameDelay(param0->unk_0C), NULL); } static int ov72_0223E99C (int param0) diff --git a/src/overlay073/ov73_021D0D80.c b/src/overlay073/ov73_021D0D80.c index 05ddf2ac99..5c4650e4c7 100644 --- a/src/overlay073/ov73_021D0D80.c +++ b/src/overlay073/ov73_021D0D80.c @@ -726,7 +726,7 @@ static BOOL ov73_021D1510 (UnkStruct_ov73_021D1058 * param0, u32 param1, int par Strbuf_Free(v1); } - param0->unk_58 = PrintStringSimple(¶m0->unk_1C, 1, param0->unk_5C, 0, 0, (sub_02027AC0(param0->unk_08)), NULL); + param0->unk_58 = PrintStringSimple(¶m0->unk_1C, 1, param0->unk_5C, 0, 0, (Options_GetTextFrameDelay(param0->unk_08)), NULL); param0->unk_50 = 1; break; case 1: diff --git a/src/overlay074/ov74_021D0D80.c b/src/overlay074/ov74_021D0D80.c index 876ed09bc3..57bfa97817 100644 --- a/src/overlay074/ov74_021D0D80.c +++ b/src/overlay074/ov74_021D0D80.c @@ -115,7 +115,7 @@ int ov74_021D0D80 (OverlayManager * param0, int * param1) v0->unk_18.unk_00_7 = Options_BattleStyle(v1); v0->unk_18.unk_00_4 = Options_SoundMethod(v1); v0->unk_18.unk_00_8 = Options_ButtonMode(v1); - v0->unk_18.unk_00_10 = sub_02027B50(v1); + v0->unk_18.unk_00_10 = Options_Frame(v1); v0->unk_00 = 38; v0->unk_1C = v1; @@ -674,7 +674,7 @@ static void ov74_021D1968 (UnkStruct_ov74_021D0D80 * param0, u16 param1, BOOL pa sub_0201D730(param0->unk_2AC); } - v2 = sub_02027AC0(param0->unk_1C); + v2 = Options_GetTextFrameDelay(param0->unk_1C); BGL_FillWindow(&(param0->unk_2C[2]), 15); diff --git a/src/overlay075/ov75_021D0D80.c b/src/overlay075/ov75_021D0D80.c index 73ceb1741f..2ac127b9ad 100644 --- a/src/overlay075/ov75_021D0D80.c +++ b/src/overlay075/ov75_021D0D80.c @@ -145,8 +145,8 @@ int ov75_021D0D80 (OverlayManager * param0, int * param1) v1->unk_12 = v1->unk_1C->unk_03; v1->unk_17 = v1->unk_16 = v1->unk_11; v1->unk_1C->unk_00 = 0xFFFF; - v1->unk_10 = sub_02027AC0(v1->unk_1C->unk_04); - v1->unk_0A = sub_02027B50(v1->unk_1C->unk_04); + v1->unk_10 = Options_GetTextFrameDelay(v1->unk_1C->unk_04); + v1->unk_0A = Options_Frame(v1->unk_1C->unk_04); sub_02002AC8(1); return 1; diff --git a/src/overlay078/ov78_021D0D80.c b/src/overlay078/ov78_021D0D80.c index 32ef7a7a8e..98baad7e0f 100644 --- a/src/overlay078/ov78_021D0D80.c +++ b/src/overlay078/ov78_021D0D80.c @@ -293,8 +293,8 @@ int ov78_021D0D80 (OverlayManager * param0, int * param1) Heap_FndInitAllocatorForExpHeap(&v0->unk_2B4, 47, 32); v1 = OverlayManager_Args(param0); - v0->unk_700 = sub_02027B50(v1->unk_04); - v0->unk_704 = sub_02027AC0(v1->unk_04); + v0->unk_700 = Options_Frame(v1->unk_04); + v0->unk_704 = Options_GetTextFrameDelay(v1->unk_04); sub_0201DBEC(8, 47); SetMainCallback(ov78_021D1058, v0); diff --git a/src/overlay079/ov79_021D0D80.c b/src/overlay079/ov79_021D0D80.c index 8adc81565a..a5d032970f 100644 --- a/src/overlay079/ov79_021D0D80.c +++ b/src/overlay079/ov79_021D0D80.c @@ -660,7 +660,7 @@ static void ov79_021D14A4 (UnkStruct_ov79_021D0E1C * param0) }; sub_0200DAA4(param0->unk_24, 1, 1 + 18 + 12, 15, 0, param0->unk_00); - sub_0200DD0C(param0->unk_24, 1, 1, 14, sub_02027B50(param0->unk_20->unk_18), param0->unk_00); + sub_0200DD0C(param0->unk_24, 1, 1, 14, Options_Frame(param0->unk_20->unk_18), param0->unk_00); sub_02002E7C(0, 13 * 32, param0->unk_00); sub_02002E98(0, 12 * 32, param0->unk_00); sub_02002E7C(4, 13 * 32, param0->unk_00); @@ -710,7 +710,7 @@ static void ov79_021D1568 (UnkStruct_ov79_021D0E1C * param0) param0->unk_30.unk_38[v0] = MessageLoader_GetNewStrbuf(param0->unk_2C, 17 + v0); } - param0->unk_30.unk_4C = sub_02027AC0(param0->unk_20->unk_18); + param0->unk_30.unk_4C = Options_GetTextFrameDelay(param0->unk_20->unk_18); } static void ov79_021D1618 (UnkStruct_ov79_021D0E1C * param0) diff --git a/src/overlay083/ov83_0223B5A0.c b/src/overlay083/ov83_0223B5A0.c index 1253643a15..648c70cb80 100644 --- a/src/overlay083/ov83_0223B5A0.c +++ b/src/overlay083/ov83_0223B5A0.c @@ -128,8 +128,8 @@ int ov83_0223B5B0 (OverlayManager * param0, int * param1) sub_0203632C(1); } - v1->unk_24 = sub_02027B50(v0->unk_10->unk_18); - v1->unk_28 = sub_02027AC0(v0->unk_10->unk_18); + v1->unk_24 = Options_Frame(v0->unk_10->unk_18); + v1->unk_28 = Options_GetTextFrameDelay(v0->unk_10->unk_18); v1->unk_31C = 1; SetMainCallback(ov83_0223B5A0, v0); diff --git a/src/overlay084/ov84_0223B5A0.c b/src/overlay084/ov84_0223B5A0.c index 9d33ce97d7..5f93763404 100644 --- a/src/overlay084/ov84_0223B5A0.c +++ b/src/overlay084/ov84_0223B5A0.c @@ -828,7 +828,7 @@ static void ov84_0223BC1C (UnkStruct_ov84_0223B5A0 * param0) sub_02007130(param0->unk_D4, 22, 0, 16 * 13 * 2, 32, 6); sub_02002E98(0, 11 * 32, 6); sub_0200DAA4(param0->unk_00, 0, 1024 - 9, 14, 0, 6); - sub_0200DD0C(param0->unk_00, 0, 1024 - 9 - (18 + 12), 12, sub_02027B50(param0->unk_D0), 6); + sub_0200DD0C(param0->unk_00, 0, 1024 - 9 - (18 + 12), 12, Options_Frame(param0->unk_D0), 6); sub_020070E8(param0->unk_D4, 15, param0->unk_00, 5, 0, 0, 0, 6); sub_02007130(param0->unk_D4, 16, 4, 0, 0, 6); sub_0200710C(param0->unk_D4, 17, param0->unk_00, 5, 0, 0, 0, 6); diff --git a/src/overlay084/ov84_0223F040.c b/src/overlay084/ov84_0223F040.c index 79556d324f..fce8c53a20 100644 --- a/src/overlay084/ov84_0223F040.c +++ b/src/overlay084/ov84_0223F040.c @@ -590,7 +590,7 @@ u8 ov84_022400A0 (UnkStruct_ov84_0223B5A0 * param0) sub_02002AC8(1); sub_02002AE4(0); - v0 = PrintStringSimple(¶m0->unk_04[6], 1, param0->unk_3F8, 0, 0, sub_02027AC0(param0->unk_D0), ov84_022400E0); + v0 = PrintStringSimple(¶m0->unk_04[6], 1, param0->unk_3F8, 0, 0, Options_GetTextFrameDelay(param0->unk_D0), ov84_022400E0); return v0; } diff --git a/src/overlay088/ov88_0223B140.c b/src/overlay088/ov88_0223B140.c index d5e5ae166c..a218f18e32 100644 --- a/src/overlay088/ov88_0223B140.c +++ b/src/overlay088/ov88_0223B140.c @@ -389,7 +389,7 @@ static void ov88_0223B3C0 (UnkStruct_02095E80 * param0) ov88_0223B4F0(param0); ov88_0223B320(param0); - sub_0200DD0C(param0->unk_174, 0, (512 - (9 + (18 + 12))), 10, sub_02027B50(param0->unk_08->unk_18), 26); + sub_0200DD0C(param0->unk_174, 0, (512 - (9 + (18 + 12))), 10, Options_Frame(param0->unk_08->unk_18), 26); sub_0200DAA4(param0->unk_174, 0, (512 - 9), 11, 0, 26); ov88_0223ECBC(¶m0->unk_49C[21], 15, 1, param0->unk_184, param0->unk_178); diff --git a/src/overlay088/ov88_0223E9C4.c b/src/overlay088/ov88_0223E9C4.c index 7e042dd1c4..0762855a8c 100644 --- a/src/overlay088/ov88_0223E9C4.c +++ b/src/overlay088/ov88_0223E9C4.c @@ -68,7 +68,7 @@ void ov88_0223E9C4 (BGL * param0, Window * param1, Options * param2) BGL_AddWindow(param0, ¶m1[6], 1, 26, 21, 5, 2, 8, ((1 + (10 * 2)) + (10 * 2))); BGL_FillWindow(¶m1[6], 0); - sub_0200DD0C(param0, 0, (512 - (9 + (18 + 12))), 10, sub_02027B50(param2), 26); + sub_0200DD0C(param0, 0, (512 - (9 + (18 + 12))), 10, Options_Frame(param2), 26); sub_0200DAA4(param0, 0, (512 - 9), 11, 0, 26); BGL_AddWindow(param0, ¶m1[21], 0, 2, 21, 20, 2, 13, 1); diff --git a/src/overlay091/ov91_021D0D80.c b/src/overlay091/ov91_021D0D80.c index d2ca51aeae..892c5847ff 100644 --- a/src/overlay091/ov91_021D0D80.c +++ b/src/overlay091/ov91_021D0D80.c @@ -617,7 +617,7 @@ static void ov91_021D10C8 (UnkStruct_ov91_021D0ED8 * param0, NARC * param1) sub_02007130(param1, 12, 0, 0, 0, 67); sub_02002E98(0, 14 * 32, 67); sub_0200DAA4(param0->unk_04, 0, 1, 12, 0, 67); - sub_0200DD0C(param0->unk_04, 0, (1 + 9), 13, sub_02027B50(param0->unk_00->unk_08), 67); + sub_0200DD0C(param0->unk_04, 0, (1 + 9), 13, Options_Frame(param0->unk_00->unk_08), 67); } static void ov91_021D1154 (UnkStruct_ov91_021D0ED8 * param0) @@ -1166,7 +1166,7 @@ static void ov91_021D1DF8 (UnkStruct_ov91_021D0ED8 * param0, u32 param1) sub_02002AC8(1); sub_02002AE4(0); - param0->unk_185 = PrintStringSimple(¶m0->unk_08[12], 1, param0->unk_100, 0, 0, sub_02027AC0(param0->unk_00->unk_08), ov91_021D1E50); + param0->unk_185 = PrintStringSimple(¶m0->unk_08[12], 1, param0->unk_100, 0, 0, Options_GetTextFrameDelay(param0->unk_00->unk_08), ov91_021D1E50); } static BOOL ov91_021D1E50 (UnkStruct_0201D738 * param0, u16 param1) diff --git a/src/overlay092/ov92_021D0D80.c b/src/overlay092/ov92_021D0D80.c index 437f005448..239d71d916 100644 --- a/src/overlay092/ov92_021D0D80.c +++ b/src/overlay092/ov92_021D0D80.c @@ -947,7 +947,7 @@ static void ov92_021D1888 (UnkStruct_ov92_021D1B24 * param0, NARC * param1) sub_020070E8(param1, 5, param0->unk_B810, 7, 0, 0, 0, param0->unk_00); sub_02007130(param1, 6, 4, 0 * (2 * 16), (2 * 16) * 4, param0->unk_00); sub_0200710C(param1, 7, param0->unk_B810, 7, 0, 0, 0, param0->unk_00); - sub_0200DD0C(param0->unk_B810, 6, (512 - ((18 + 12))), 6, sub_02027B50(param0->unk_08), param0->unk_00); + sub_0200DD0C(param0->unk_B810, 6, (512 - ((18 + 12))), 6, Options_Frame(param0->unk_08), param0->unk_00); sub_0200DAA4(param0->unk_B810, 6, ((512 - ((18 + 12))) - 9), 7, 0, param0->unk_00); sub_02002E7C(4, 4 * (2 * 16), param0->unk_00); sub_02019690(6, 32, 0, param0->unk_00); @@ -1020,7 +1020,7 @@ static BOOL ov92_021D1B70 (UnkStruct_ov92_021D1B24 * param0, u32 param1, int par BGL_WindowColor(¶m0->unk_B814, 15, 0, 0, 27 * 8, 4 * 8); param0->unk_B86C = Strbuf_Init(0x400, param0->unk_00); MessageLoader_GetStrbuf(param0->unk_B860, param1, param0->unk_B86C); - param0->unk_B868 = PrintStringSimple(¶m0->unk_B814, 1, param0->unk_B86C, 0, 0, sub_02027AC0(param0->unk_08), NULL); + param0->unk_B868 = PrintStringSimple(¶m0->unk_B814, 1, param0->unk_B86C, 0, 0, Options_GetTextFrameDelay(param0->unk_08), NULL); param0->unk_B864 = 1; break; case 1: diff --git a/src/overlay094/ov94_0223BCB0.c b/src/overlay094/ov94_0223BCB0.c index 6f19829c4d..06b83006c0 100644 --- a/src/overlay094/ov94_0223BCB0.c +++ b/src/overlay094/ov94_0223BCB0.c @@ -492,7 +492,7 @@ void ov94_0223C4C8 (UnkStruct_ov94_0223FD4C * param0) int ov94_0223C4D4 (UnkStruct_ov94_0223FD4C * param0) { - return sub_02027AC0(param0->unk_00->unk_24); + return Options_GetTextFrameDelay(param0->unk_00->unk_24); } static void ov94_0223C4E0 (UnkStruct_ov94_0223FD4C * param0) diff --git a/src/overlay094/ov94_0223C610.c b/src/overlay094/ov94_0223C610.c index da59b911ab..c8601c83ad 100644 --- a/src/overlay094/ov94_0223C610.c +++ b/src/overlay094/ov94_0223C610.c @@ -287,7 +287,7 @@ static void ov94_0223C888 (UnkStruct_ov94_0223FD4C * param0) sub_02007130(v1, 4, 0, 0, 16 * 3 * 2, 62); sub_02002E98(0, 13 * 0x20, 62); - sub_0200DD0C(v0, 0, 1, 10, sub_02027B50(param0->unk_00->unk_24), 62); + sub_0200DD0C(v0, 0, 1, 10, Options_Frame(param0->unk_00->unk_24), 62); sub_0200DAA4(v0, 0, (1 + (18 + 12)), 11, 0, 62); sub_020070E8(v1, 14, v0, 1, 0, 16 * 6 * 0x20, 1, 62); sub_0200710C(v1, 30, v0, 1, 0, 32 * 24 * 2, 1, 62); diff --git a/src/overlay094/ov94_0223D0C4.c b/src/overlay094/ov94_0223D0C4.c index acb0d67028..ccabb4267d 100644 --- a/src/overlay094/ov94_0223D0C4.c +++ b/src/overlay094/ov94_0223D0C4.c @@ -249,7 +249,7 @@ static void ov94_0223D2E8 (UnkStruct_ov94_0223FD4C * param0) sub_02007130(v1, 7, 0, 0, 16 * 3 * 2, 62); sub_02007130(v1, 5, 4, 0, 16 * 8 * 2, 62); sub_02002E98(0, 13 * 0x20, 62); - sub_0200DD0C(v0, 0, 1, 10, sub_02027B50(param0->unk_00->unk_24), 62); + sub_0200DD0C(v0, 0, 1, 10, Options_Frame(param0->unk_00->unk_24), 62); sub_0200DAA4(v0, 0, (1 + (18 + 12)), 11, 0, 62); sub_020070E8(v1, 17, v0, 1, 0, 16 * 5 * 0x20, 1, 62); sub_0200710C(v1, 25, v0, 1, 0, 32 * 24 * 2, 1, 62); diff --git a/src/overlay094/ov94_0223DC04.c b/src/overlay094/ov94_0223DC04.c index 19bf151b61..a30ce09852 100644 --- a/src/overlay094/ov94_0223DC04.c +++ b/src/overlay094/ov94_0223DC04.c @@ -215,7 +215,7 @@ static void ov94_0223DE04 (UnkStruct_ov94_0223FD4C * param0) BGL * v0 = param0->unk_04; sub_02002E98(0, 13 * 0x20, 62); - sub_0200DD0C(v0, 0, 1, 10, sub_02027B50(param0->unk_00->unk_24), 62); + sub_0200DD0C(v0, 0, 1, 10, Options_Frame(param0->unk_00->unk_24), 62); sub_0200DAA4(v0, 0, (1 + (18 + 12)), 11, 0, 62); sub_02006E3C(104, 17, v0, 1, 0, 16 * 5 * 0x20, 1, 62); sub_02006E84(104, 7, 0, 0, 16 * 3 * 2, 62); diff --git a/src/overlay094/ov94_0223E46C.c b/src/overlay094/ov94_0223E46C.c index 7d809eda21..cd8b365e75 100644 --- a/src/overlay094/ov94_0223E46C.c +++ b/src/overlay094/ov94_0223E46C.c @@ -285,7 +285,7 @@ static void ov94_0223E6B8 (UnkStruct_ov94_0223FD4C * param0) sub_02007130(v1, 3, 0, 0, 16 * 3 * 2, 62); sub_02007130(v1, 5, 4, 0, 16 * 8 * 2, 62); sub_02002E98(0, 13 * 0x20, 62); - sub_0200DD0C(v0, 0, 1, 10, sub_02027B50(param0->unk_00->unk_24), 62); + sub_0200DD0C(v0, 0, 1, 10, Options_Frame(param0->unk_00->unk_24), 62); sub_0200DAA4(v0, 0, (1 + (18 + 12)), 11, 0, 62); sub_020070E8(v1, 13, v0, 1, 0, 16 * 5 * 0x20, 1, 62); sub_0200710C(v1, 26, v0, 1, 0, 32 * 24 * 2, 1, 62); diff --git a/src/overlay094/ov94_0223FB48.c b/src/overlay094/ov94_0223FB48.c index 9c4c0efdfb..1d2feacbbe 100644 --- a/src/overlay094/ov94_0223FB48.c +++ b/src/overlay094/ov94_0223FB48.c @@ -307,7 +307,7 @@ static void ov94_0223FD4C (UnkStruct_ov94_0223FD4C * param0) sub_02007130(v1, 2, 0, 0, 16 * 3 * 2, 62); sub_02007130(v1, 5, 4, 0, 16 * 8 * 2, 62); sub_02002E98(0, 13 * 0x20, 62); - sub_0200DD0C(v0, 0, 1, 10, sub_02027B50(param0->unk_00->unk_24), 62); + sub_0200DD0C(v0, 0, 1, 10, Options_Frame(param0->unk_00->unk_24), 62); sub_0200DAA4(v0, 0, (1 + (18 + 12)), 11, 0, 62); sub_020070E8(v1, 12, v0, 1, 0, 16 * 5 * 0x20, 1, 62); sub_0200710C(v1, 24, v0, 1, 0, 32 * 24 * 2, 1, 62); diff --git a/src/overlay094/ov94_022414B8.c b/src/overlay094/ov94_022414B8.c index 2c91f40798..1faba5cf4b 100644 --- a/src/overlay094/ov94_022414B8.c +++ b/src/overlay094/ov94_022414B8.c @@ -464,7 +464,7 @@ static void ov94_0224170C (UnkStruct_ov94_0223FD4C * param0) sub_02006E84(104, 1, 0, 0, 16 * 3 * 2, 62); sub_02002E98(0, 13 * 0x20, 62); - sub_0200DD0C(v0, 0, 1, 10, sub_02027B50(param0->unk_00->unk_24), 62); + sub_0200DD0C(v0, 0, 1, 10, Options_Frame(param0->unk_00->unk_24), 62); sub_0200DAA4(v0, 0, (1 + (18 + 12)), 11, 0, 62); sub_02006E3C(104, 11, v0, 1, 0, 16 * 5 * 0x20, 1, 62); sub_02006E60(104, 23, v0, 1, 0, 32 * 24 * 2, 1, 62); diff --git a/src/overlay094/ov94_02242AD0.c b/src/overlay094/ov94_02242AD0.c index 12784ccaec..c4d7eb2c88 100644 --- a/src/overlay094/ov94_02242AD0.c +++ b/src/overlay094/ov94_02242AD0.c @@ -332,7 +332,7 @@ static void ov94_02242CAC (UnkStruct_ov94_0223FD4C * param0) sub_02006E84(104, 0, 0, 0, 16 * 3 * 2, 62); sub_02002E98(0, 13 * 0x20, 62); - sub_0200DD0C(v0, 0, 1, 10, sub_02027B50(param0->unk_00->unk_24), 62); + sub_0200DD0C(v0, 0, 1, 10, Options_Frame(param0->unk_00->unk_24), 62); sub_0200DAA4(v0, 0, (1 + (18 + 12)), 11, 0, 62); if (param0->unk_10F0 == 0) { diff --git a/src/overlay094/ov94_02244950.c b/src/overlay094/ov94_02244950.c index 91109f1b18..76e47aee9a 100644 --- a/src/overlay094/ov94_02244950.c +++ b/src/overlay094/ov94_02244950.c @@ -283,7 +283,7 @@ static void ov94_02244B8C (UnkStruct_ov94_0223FD4C * param0) sub_02007130(v1, 3, 4, 0, 0, 62); sub_02002E98(0, 13 * 0x20, 62); sub_02002E98(4, 13 * 0x20, 62); - sub_0200DD0C(v0, 0, 1, 10, sub_02027B50(param0->unk_00->unk_24), 62); + sub_0200DD0C(v0, 0, 1, 10, Options_Frame(param0->unk_00->unk_24), 62); sub_0200DAA4(v0, 0, (1 + (18 + 12)), 11, 0, 62); sub_020070E8(v1, 2, v0, 1, 0, 0, 0, 62); sub_0200710C(v1, 5, v0, 1, 0, 32 * 24 * 2, 0, 62); diff --git a/src/overlay095/ov95_02246C20.c b/src/overlay095/ov95_02246C20.c index f9f8b4ef87..024e039204 100644 --- a/src/overlay095/ov95_02246C20.c +++ b/src/overlay095/ov95_02246C20.c @@ -724,7 +724,7 @@ u16 ov95_02247668 (UnkStruct_ov95_02247628 * param0) int ov95_02247674 (UnkStruct_ov95_02247628 * param0) { - return sub_02027B50(param0->unk_00->unk_14); + return Options_Frame(param0->unk_00->unk_14); } int ov95_02247680 (UnkStruct_ov95_02247628 * param0) diff --git a/src/overlay096/ov96_0223BCE0.c b/src/overlay096/ov96_0223BCE0.c index aad2a30f7d..d4fa7a3241 100644 --- a/src/overlay096/ov96_0223BCE0.c +++ b/src/overlay096/ov96_0223BCE0.c @@ -361,7 +361,7 @@ static void ov96_0223BF40 (UnkStruct_ov96_0223BF40 * param0) sub_02007130(v1, 3, 4, 0, 0, 68); sub_02002E98(0, 13 * 0x20, 68); sub_02002E98(4, 13 * 0x20, 68); - sub_0200DD0C(v0, 0, 1, 14, sub_02027B50(param0->unk_00->unk_10), 68); + sub_0200DD0C(v0, 0, 1, 14, Options_Frame(param0->unk_00->unk_10), 68); sub_0200DAA4(v0, 0, (1 + (18 + 12)), 11, 0, 68); sub_020070E8(v1, 2, v0, 1, 0, 0, 0, 68); sub_0200710C(v1, 5, v0, 1, 0, 32 * 24 * 2, 0, 68); diff --git a/src/overlay097/ov97_0222C174.c b/src/overlay097/ov97_0222C174.c index 732f792c01..c9e88ffc3a 100644 --- a/src/overlay097/ov97_0222C174.c +++ b/src/overlay097/ov97_0222C174.c @@ -554,7 +554,7 @@ static void ov97_0222C254 (UnkStruct_ov97_0222C388 * param0) sub_02002E7C(0, 0 * 32, param0->unk_00); sub_0200DAA4(param0->unk_04, 0, 1, 1, 0, param0->unk_00); - v0 = sub_02027B50(param0->unk_14); + v0 = Options_Frame(param0->unk_14); sub_0200DD0C(param0->unk_04, 0, (1 + 9), 2, v0, param0->unk_00); sub_02006E84(116, 0, 0, 16 * 2 * 8, 16 * 2, param0->unk_00); diff --git a/src/overlay097/ov97_0222D30C.c b/src/overlay097/ov97_0222D30C.c index eb292ec13e..edc5c21baf 100644 --- a/src/overlay097/ov97_0222D30C.c +++ b/src/overlay097/ov97_0222D30C.c @@ -938,7 +938,7 @@ static BOOL ov97_0222DFD4 (OverlayManager * param0, UnkStruct_ov97_0222D04C * pa sub_02002E7C(0, 0 * 32, 86); sub_02002E7C(0, 1 * 32, 86); - v0 = sub_02027B50(param1->unk_08); + v0 = Options_Frame(param1->unk_08); sub_0200DD0C(param1->unk_00, 0, 1, 2, v0, 86); sub_0200DAA4(param1->unk_00, 0, (1 + (18 + 12)), 3, 1, 86); diff --git a/src/overlay097/ov97_02230410.c b/src/overlay097/ov97_02230410.c index 11cee208e4..0b25bb0ff4 100644 --- a/src/overlay097/ov97_02230410.c +++ b/src/overlay097/ov97_02230410.c @@ -1044,7 +1044,7 @@ static int ov97_0223161C (OverlayManager * param0, int * param1) v4->unk_2C04 = ((UnkStruct_0203CC84 *)OverlayManager_Args(param0))->unk_08; v4->unk_2C00 = SaveData_MysteryGift(v4->unk_2C04); v4->unk_2C08 = sub_02025E44(v4->unk_2C04); - v4->unk_2C0C = sub_02027B50(v4->unk_2C08); + v4->unk_2C0C = Options_Frame(v4->unk_2C08); v4->unk_2C14[0] = sub_0202DB00(v4->unk_2C00, 0); v4->unk_2C14[1] = sub_0202DB00(v4->unk_2C00, 1); diff --git a/src/overlay097/ov97_02233B18.c b/src/overlay097/ov97_02233B18.c index 22c5e97685..36ce30964e 100644 --- a/src/overlay097/ov97_02233B18.c +++ b/src/overlay097/ov97_02233B18.c @@ -1799,7 +1799,7 @@ static int ov97_02235624 (OverlayManager * param0, int * param1) v0->unk_10 = ((UnkStruct_0203CC84 *)OverlayManager_Args(param0))->unk_08; v0->unk_14 = SaveData_GetTrainerInfo(v0->unk_10); v0->unk_18 = sub_02025E44(v0->unk_10); - v0->unk_1C = sub_02027B50(v0->unk_18); + v0->unk_1C = Options_Frame(v0->unk_18); v0->unk_12668 = Strbuf_Init(256, 78); v0->unk_1266C = Strbuf_Init(256, 78); diff --git a/src/overlay098/ov98_022471C8.c b/src/overlay098/ov98_022471C8.c index 68910cce9e..1cf12c9fb1 100644 --- a/src/overlay098/ov98_022471C8.c +++ b/src/overlay098/ov98_022471C8.c @@ -652,7 +652,7 @@ static void ov98_02247704 (UnkStruct_ov98_02247704 * param0) sub_02007130(v1, 3, 4, 0, 0, 109); sub_02002E98(0, 13 * 0x20, 109); sub_02002E98(4, 13 * 0x20, 109); - sub_0200DD0C(v0, 0, 1, 10, sub_02027B50(param0->unk_00->unk_08), 109); + sub_0200DD0C(v0, 0, 1, 10, Options_Frame(param0->unk_00->unk_08), 109); sub_0200DAA4(v0, 0, (1 + (18 + 12)), 11, 0, 109); sub_0200DAA4(v0, 2, (1 + (18 + 12)), 11, 0, 109); sub_020070E8(v1, 2, v0, 1, 0, 0, 0, 109); diff --git a/src/overlay100/ov100_021D0D80.c b/src/overlay100/ov100_021D0D80.c index b281fb34fe..4d81e66f9a 100644 --- a/src/overlay100/ov100_021D0D80.c +++ b/src/overlay100/ov100_021D0D80.c @@ -72,7 +72,7 @@ int ov100_021D0D80 (OverlayManager * param0, int * param1) { Window * v1 = &v0->unk_0C.unk_30; - int v2 = sub_02027B50(v0->unk_D0->unk_04); + int v2 = Options_Frame(v0->unk_D0->unk_04); Window_Init(v1); BGL_AddWindow(v0->unk_0C.unk_0C, v1, 1, 2, 19, 27, 4, 14, 1); diff --git a/src/overlay100/ov100_021D46C8.c b/src/overlay100/ov100_021D46C8.c index 099fde7a00..b4d899e884 100644 --- a/src/overlay100/ov100_021D46C8.c +++ b/src/overlay100/ov100_021D46C8.c @@ -52,7 +52,7 @@ int ov100_021D46C8 (UnkStruct_ov100_021D46C8 * param0, UnkStruct_020985E4 * para Strbuf_Copy(v3, v2); } - v4 = sub_02027AC0(param1->unk_04); + v4 = Options_GetTextFrameDelay(param1->unk_04); BGL_FillWindow(¶m0->unk_30, 0xFF); v0 = PrintStringSimple(¶m0->unk_30, 1, v3, 0, 0, v4, NULL); diff --git a/src/overlay104/ov104_02231F74.c b/src/overlay104/ov104_02231F74.c index 6d6eb3e606..b2db1b5a21 100644 --- a/src/overlay104/ov104_02231F74.c +++ b/src/overlay104/ov104_02231F74.c @@ -158,7 +158,7 @@ void ov104_02231F74 (UnkStruct_ov104_022320B4 * param0, const MessageLoader * pa v4 = sub_0209B970(v3->unk_08); - v0 = sub_02027AC0(v4->unk_04); + v0 = Options_GetTextFrameDelay(v4->unk_04); v1 = 0; v2 = 1; } else { @@ -1095,7 +1095,7 @@ void ov104_0223310C (UnkStruct_ov104_0222E930 * param0, u16 * param1, u32 param2 ov104_02231F74(param0->unk_00, v1, param1[1], 1, NULL); MessageLoader_Free(v1); } else { - v0 = sub_02027AC0(sub_02025E44(v2->unk_08)); + v0 = Options_GetTextFrameDelay(sub_02025E44(v2->unk_08)); ov104_022320B4(param0->unk_00, v0, param1[0], param1[1], param1[2], param1[3], 1); } diff --git a/src/overlay104/ov104_0223C2D4.c b/src/overlay104/ov104_0223C2D4.c index 95146d6d75..459c352dda 100644 --- a/src/overlay104/ov104_0223C2D4.c +++ b/src/overlay104/ov104_0223C2D4.c @@ -624,7 +624,7 @@ static void ov104_0223CB80 (UnkStruct_ov104_0223C4CC * param0) v0 = sub_0209B970(param0->unk_08); - sub_0200DD0C(param0->unk_00, 1, (1024 - (18 + 12)), 11, sub_02027B50(v0->unk_04), 94); + sub_0200DD0C(param0->unk_00, 1, (1024 - (18 + 12)), 11, Options_Frame(v0->unk_04), 94); sub_02003070(param0->unk_04, 0, 11 * 16, 0x20); } diff --git a/src/overlay105/ov105_02241AE0.c b/src/overlay105/ov105_02241AE0.c index 681280481b..798fb435e8 100644 --- a/src/overlay105/ov105_02241AE0.c +++ b/src/overlay105/ov105_02241AE0.c @@ -768,7 +768,7 @@ static void ov105_0224227C (UnkStruct_ov105_02241FF4 * param0) } ov105_02244FF8(param0, ¶m0->unk_50[2 + param0->unk_11], ov105_022461A0(param0->unk_30C), 0, 0, 15, 2, 0, 0, param0->unk_31C); - ov105_0224628C(¶m0->unk_50[5], sub_02027B50(param0->unk_138)); + ov105_0224628C(¶m0->unk_50[5], Options_Frame(param0->unk_138)); ov105_02244EE8(param0, 0, (param0->unk_11 + 1)); param0->unk_10 = ov105_02244D14(param0, 0); @@ -818,7 +818,7 @@ static void ov105_022424CC (UnkStruct_ov105_02241FF4 * param0) int v0; ov105_02245528(param0, 0); - ov105_0224628C(¶m0->unk_50[5], sub_02027B50(param0->unk_138)); + ov105_0224628C(¶m0->unk_50[5], Options_Frame(param0->unk_138)); if (ov104_0223AED4(param0->unk_09) == 0) { param0->unk_30C = ov105_02245FB8(¶m0->unk_144, param0->unk_1A, ((NELEMS(Unk_ov105_02246340)) - 1), 2, param0->unk_334, Unk_ov105_02246340, Unk_ov105_022462D0); @@ -1642,7 +1642,7 @@ static BOOL ov105_02243A3C (UnkStruct_ov105_02241FF4 * param0) v3 = ov105_022461A0(param0->unk_30C); ov105_02244FF8(param0, ¶m0->unk_50[2], v3, 0, 0, 15, 2, 0, 0, param0->unk_320); - ov105_0224628C(¶m0->unk_50[5], sub_02027B50(param0->unk_138)); + ov105_0224628C(¶m0->unk_50[5], Options_Frame(param0->unk_138)); param0->unk_10 = ov105_02244D14(param0, 13); param0->unk_08++; @@ -1766,7 +1766,7 @@ static void ov105_02243DE4 (UnkStruct_ov105_02241FF4 * param0) ov105_02246260(param0->unk_4C, ¶m0->unk_50[7]); param0->unk_10 = ov105_02244C60(param0, ¶m0->unk_50[7], 23, 1, 1, 0xFF, 1, 2, 15, 0); param0->unk_10 = ov105_02244CC0(param0, ¶m0->unk_50[7], 24, 1, 1 + 16, 0xFF, 1, 2, 15, 0); - ov105_0224628C(¶m0->unk_50[5], sub_02027B50(param0->unk_138)); + ov105_0224628C(¶m0->unk_50[5], Options_Frame(param0->unk_138)); param0->unk_10 = ov105_02244D14(param0, 13); sub_0201A9A4(¶m0->unk_50[7]); } @@ -1782,7 +1782,7 @@ static BOOL ov105_02243E84 (UnkStruct_ov105_02241FF4 * param0) sub_0201A9A4(¶m0->unk_50[2]); sub_02007DC8(param0->unk_12C[0]); - ov105_0224628C(¶m0->unk_50[5], sub_02027B50(param0->unk_138)); + ov105_0224628C(¶m0->unk_50[5], Options_Frame(param0->unk_138)); param0->unk_10 = ov105_02244D14(param0, 10); ov105_02246074(param0->unk_30C, 0); @@ -2105,9 +2105,9 @@ static BOOL ov105_02244424 (UnkStruct_ov105_02241FF4 * param0) v2 = Pokemon_GetBoxPokemon(v1); ov105_02244F00(param0, 2, v2); - ov105_0224628C(¶m0->unk_50[5], sub_02027B50(param0->unk_138)); + ov105_0224628C(¶m0->unk_50[5], Options_Frame(param0->unk_138)); - param0->unk_10 = ov105_02244C60(param0, ¶m0->unk_50[5], 16, 1, 1, sub_02027AC0(sub_02025E44(param0->unk_13C)), 1, 2, 15, 1); + param0->unk_10 = ov105_02244C60(param0, ¶m0->unk_50[5], 16, 1, 1, Options_GetTextFrameDelay(sub_02025E44(param0->unk_13C)), 1, 2, 15, 1); sub_0201A9A4(¶m0->unk_50[5]); diff --git a/src/overlay106/ov106_02241AE0.c b/src/overlay106/ov106_02241AE0.c index c64f701cb0..ce01449d3d 100644 --- a/src/overlay106/ov106_02241AE0.c +++ b/src/overlay106/ov106_02241AE0.c @@ -464,7 +464,7 @@ static BOOL ov106_02241E5C (UnkStruct_ov106_02243118 * param0) param0->unk_08 = 3; break; } else { - ov106_02243758(¶m0->unk_4C[0], sub_02027B50(param0->unk_B4)); + ov106_02243758(¶m0->unk_4C[0], Options_Frame(param0->unk_B4)); param0->unk_0A = ov106_02242978(param0, 0, 1); param0->unk_1A = param0->unk_0D; param0->unk_17 = 1; @@ -504,8 +504,8 @@ static BOOL ov106_02241E5C (UnkStruct_ov106_02243118 * param0) } break; case 4: - ov106_02243758(¶m0->unk_4C[0], sub_02027B50(param0->unk_B4)); - param0->unk_0A = ov106_02242918(param0, ¶m0->unk_4C[0], 32, 1, 1, sub_02027AC0(sub_02025E44(param0->unk_B8)), 1, 2, 15, 1); + ov106_02243758(¶m0->unk_4C[0], Options_Frame(param0->unk_B4)); + param0->unk_0A = ov106_02242918(param0, ¶m0->unk_4C[0], 32, 1, 1, Options_GetTextFrameDelay(sub_02025E44(param0->unk_B8)), 1, 2, 15, 1); sub_0201A954(¶m0->unk_4C[0]); param0->unk_08 = 5; break; @@ -579,7 +579,7 @@ static BOOL ov106_02242108 (UnkStruct_ov106_02243118 * param0) break; case 3: ov106_02243664(param0->unk_284, 0); - ov106_02243758(¶m0->unk_4C[0], sub_02027B50(param0->unk_B4)); + ov106_02243758(¶m0->unk_4C[0], Options_Frame(param0->unk_B4)); ov104_0222E5D0(param0->unk_24, 0); param0->unk_0A = ov106_02242978(param0, 11, 1); @@ -1638,7 +1638,7 @@ static void ov106_02243224 (UnkStruct_ov106_02243118 * param0) int v1; ov106_02243664(param0->unk_284, 0); - ov106_02243758(¶m0->unk_4C[0], sub_02027B50(param0->unk_B4)); + ov106_02243758(¶m0->unk_4C[0], Options_Frame(param0->unk_B4)); StringTemplate_SetPokemonTypeName(param0->unk_24, 0, ov104_0223B5A4(param0->unk_0D)); v0 = sub_020301E0(ov106_02243090(param0->unk_0D), param0->unk_294); diff --git a/src/overlay107/ov107_02241AE0.c b/src/overlay107/ov107_02241AE0.c index a99481fe5c..195cbf3822 100644 --- a/src/overlay107/ov107_02241AE0.c +++ b/src/overlay107/ov107_02241AE0.c @@ -530,7 +530,7 @@ int ov107_02241BD4 (OverlayManager * param0, int * param1) v0->unk_0E_2 = 0; } - ov107_02249DBC(&v0->unk_50[6], sub_02027B50(v0->unk_1C8)); + ov107_02249DBC(&v0->unk_50[6], Options_Frame(v0->unk_1C8)); ov104_0222E5D0(v0->unk_24, 0); v0->unk_0A = ov107_02243918(v0, 8, 1); @@ -809,7 +809,7 @@ static BOOL ov107_02241EC8 (UnkStruct_ov107_02241D6C * param0) case 3: param0->unk_13 = v6; ov107_02244094(param0); - ov107_02249DBC(¶m0->unk_50[6], sub_02027B50(param0->unk_1C8)); + ov107_02249DBC(¶m0->unk_50[6], Options_Frame(param0->unk_1C8)); v2 = ov107_02249CAC(param0->unk_1CC, param0->unk_09, 0); @@ -855,14 +855,14 @@ static BOOL ov107_02241EC8 (UnkStruct_ov107_02241D6C * param0) v2 = ov107_02249CAC(param0->unk_1CC, param0->unk_09, 0); if (v2 < Unk_ov107_02249FF0[param0->unk_16][0]) { - ov107_02249DBC(¶m0->unk_50[6], sub_02027B50(param0->unk_1C8)); + ov107_02249DBC(¶m0->unk_50[6], Options_Frame(param0->unk_1C8)); param0->unk_0A = ov107_02243918(param0, 33, 1); param0->unk_08 = 7; break; } if (v3 < Unk_ov107_02249E0C[param0->unk_16]) { - ov107_02249DBC(¶m0->unk_50[6], sub_02027B50(param0->unk_1C8)); + ov107_02249DBC(¶m0->unk_50[6], Options_Frame(param0->unk_1C8)); param0->unk_0A = ov107_02243918(param0, 32, 1); param0->unk_08 = 7; break; @@ -923,7 +923,7 @@ static BOOL ov107_02241EC8 (UnkStruct_ov107_02241D6C * param0) if (v3 < Unk_ov107_02249E46[0][v2]) { ov107_02245618(param0); - ov107_02249DBC(¶m0->unk_50[6], sub_02027B50(param0->unk_1C8)); + ov107_02249DBC(¶m0->unk_50[6], Options_Frame(param0->unk_1C8)); param0->unk_0A = ov107_02243918(param0, 41, 1); param0->unk_08 = 7; break; @@ -1000,7 +1000,7 @@ static BOOL ov107_02241EC8 (UnkStruct_ov107_02241D6C * param0) v2 = ov107_02249CAC(param0->unk_1CC, param0->unk_09, 1); if (v2 == 1) { - ov107_02249DBC(¶m0->unk_50[6], sub_02027B50(param0->unk_1C8)); + ov107_02249DBC(¶m0->unk_50[6], Options_Frame(param0->unk_1C8)); param0->unk_0A = ov107_02243918(param0, 54, 1); param0->unk_08 = 14; return 0; @@ -1042,7 +1042,7 @@ static BOOL ov107_02241EC8 (UnkStruct_ov107_02241D6C * param0) default: sub_0201AD10(¶m0->unk_50[12]); - ov107_02249DBC(¶m0->unk_50[6], sub_02027B50(param0->unk_1C8)); + ov107_02249DBC(¶m0->unk_50[6], Options_Frame(param0->unk_1C8)); ov107_02244A74(param0, 0, ov107_02244D5C(param0, param0->unk_16, param0->unk_13), 3, 0); param0->unk_0A = ov107_02243918(param0, 55, 1); @@ -1066,7 +1066,7 @@ static BOOL ov107_02241EC8 (UnkStruct_ov107_02241D6C * param0) v3 = sub_02030698(param0->unk_04, sub_0205E630(param0->unk_09), sub_0205E6A8(sub_0205E630(param0->unk_09))); if (v3 < ov107_02244D5C(param0, param0->unk_16, param0->unk_13)) { - ov107_02249DBC(¶m0->unk_50[6], sub_02027B50(param0->unk_1C8)); + ov107_02249DBC(¶m0->unk_50[6], Options_Frame(param0->unk_1C8)); param0->unk_0A = ov107_02243918(param0, 32, 1); ov107_02249BAC(param0->unk_3F0, 0); @@ -1077,7 +1077,7 @@ static BOOL ov107_02241EC8 (UnkStruct_ov107_02241D6C * param0) if (Pokemon_GetValue(v7, MON_DATA_HELD_ITEM, NULL) == 0) { if (ov104_0223BA14(param0->unk_09) == 0) { ov107_02244120(param0); - ov107_02249DBC(¶m0->unk_50[6], sub_02027B50(param0->unk_1C8)); + ov107_02249DBC(¶m0->unk_50[6], Options_Frame(param0->unk_1C8)); ov104_0223BC2C(param0->unk_04, param0->unk_09, ov107_02244D5C(param0, param0->unk_16, param0->unk_13)); ov107_02245780(param0, ¶m0->unk_50[0]); ov107_022455A0(param0, param0->unk_0D, ov107_02244DE0(param0, param0->unk_16, param0->unk_13)); @@ -1118,7 +1118,7 @@ static BOOL ov107_02241EC8 (UnkStruct_ov107_02241D6C * param0) if (v3 < Unk_ov107_02249E46[1][v2]) { ov107_02245618(param0); - ov107_02249DBC(¶m0->unk_50[6], sub_02027B50(param0->unk_1C8)); + ov107_02249DBC(¶m0->unk_50[6], Options_Frame(param0->unk_1C8)); param0->unk_0A = ov107_02243918(param0, 41, 1); param0->unk_08 = 14; break; @@ -1190,7 +1190,7 @@ static BOOL ov107_02241EC8 (UnkStruct_ov107_02241D6C * param0) if (ov104_0223BA14(param0->unk_09) == 0) { ov107_02244120(param0); - ov107_02249DBC(¶m0->unk_50[6], sub_02027B50(param0->unk_1C8)); + ov107_02249DBC(¶m0->unk_50[6], Options_Frame(param0->unk_1C8)); ov104_0223BC2C(param0->unk_04, param0->unk_09, ov107_02244D5C(param0, param0->unk_16, param0->unk_13)); ov107_02245780(param0, ¶m0->unk_50[0]); ov107_022455A0(param0, param0->unk_0D, ov107_02244DE0(param0, param0->unk_16, param0->unk_13)); @@ -2305,7 +2305,7 @@ static void ov107_02243FA4 (UnkStruct_ov107_02241D6C * param0) { param0->unk_0A = ov107_022437CC(param0, ¶m0->unk_50[1], 6, 16, 1 + 4, 0xFF, 1, 2, 0, 0, 1); - ov107_02249DBC(¶m0->unk_50[7], sub_02027B50(param0->unk_1C8)); + ov107_02249DBC(¶m0->unk_50[7], Options_Frame(param0->unk_1C8)); param0->unk_0A = ov107_0224379C(param0, ¶m0->unk_50[7], 5, 1, 1, 0xFF, 1, 2, 15, 1); } @@ -2317,7 +2317,7 @@ static void ov107_0224400C (UnkStruct_ov107_02241D6C * param0) static void ov107_02244018 (UnkStruct_ov107_02241D6C * param0) { - ov107_02249DBC(¶m0->unk_50[8], sub_02027B50(param0->unk_1C8)); + ov107_02249DBC(¶m0->unk_50[8], Options_Frame(param0->unk_1C8)); param0->unk_16 = 0; ov107_02244944(param0); @@ -2336,7 +2336,7 @@ static void ov107_0224403C (UnkStruct_ov107_02241D6C * param0) static void ov107_02244064 (UnkStruct_ov107_02241D6C * param0) { - ov107_02249DBC(¶m0->unk_50[6], sub_02027B50(param0->unk_1C8)); + ov107_02249DBC(¶m0->unk_50[6], Options_Frame(param0->unk_1C8)); param0->unk_0A = ov107_02243918(param0, 24, 1); param0->unk_16 = 0; @@ -2353,7 +2353,7 @@ static void ov107_02244094 (UnkStruct_ov107_02241D6C * param0) static void ov107_0224409C (UnkStruct_ov107_02241D6C * param0) { - ov107_02249DBC(¶m0->unk_50[6], sub_02027B50(param0->unk_1C8)); + ov107_02249DBC(¶m0->unk_50[6], Options_Frame(param0->unk_1C8)); param0->unk_16 = 0; ov107_02244780(param0); @@ -3612,7 +3612,7 @@ static void ov107_022454F8 (UnkStruct_ov107_02241D6C * param0, u8 param1, u8 par v0 = ov107_02249CAC(param0->unk_1CC, param0->unk_09, 0); ov107_02244A8C(param0, 0, Pokemon_GetBoxPokemon(v1)); - ov107_02249DBC(¶m0->unk_50[6], sub_02027B50(param0->unk_1C8)); + ov107_02249DBC(¶m0->unk_50[6], Options_Frame(param0->unk_1C8)); param0->unk_0A = ov107_02243918(param0, Unk_ov107_02249E00[param2 - 1], 1); @@ -4054,12 +4054,12 @@ static void ov107_022459D0 (UnkStruct_ov107_02241D6C * param0, u8 param1, u8 par case 1: case 2: case 3: - ov107_02249DBC(¶m0->unk_50[6], sub_02027B50(param0->unk_1C8)); + ov107_02249DBC(¶m0->unk_50[6], Options_Frame(param0->unk_1C8)); ov107_022454F8(param0, v0, param2); break; case 6: case 7: - ov107_02249DBC(¶m0->unk_50[6], sub_02027B50(param0->unk_1C8)); + ov107_02249DBC(¶m0->unk_50[6], Options_Frame(param0->unk_1C8)); ov107_022455A0(param0, v0, param0->unk_10); break; case 9: @@ -4212,7 +4212,7 @@ static void ov107_02245C94 (UnkStruct_ov107_02241D6C * param0, u8 param1, u8 par ov107_02245618(param0); ov107_02245780(param0, ¶m0->unk_50[0]); - ov107_02249DBC(¶m0->unk_50[6], sub_02027B50(param0->unk_1C8)); + ov107_02249DBC(¶m0->unk_50[6], Options_Frame(param0->unk_1C8)); param0->unk_0A = ov107_02243918(param0, Unk_ov107_02249E34[v2][v4], 1); diff --git a/src/overlay107/ov107_02245EB0.c b/src/overlay107/ov107_02245EB0.c index e55259588b..0a230a289e 100644 --- a/src/overlay107/ov107_02245EB0.c +++ b/src/overlay107/ov107_02245EB0.c @@ -325,7 +325,7 @@ int ov107_02245FD0 (OverlayManager * param0, int * param1) v0->unk_0F_0 = 0; } - ov107_02249DBC(&v0->unk_50[7], sub_02027B50(v0->unk_148)); + ov107_02249DBC(&v0->unk_50[7], Options_Frame(v0->unk_148)); ov104_0222E5D0(v0->unk_24, 0); v0->unk_0A = ov107_022477CC(v0, 7, 1); ov107_02248350(v0, param1, 3); @@ -842,7 +842,7 @@ static BOOL ov107_022462CC (UnkStruct_ov107_02246170 * param0) if (v1 < 50) { ov107_02248BB4(param0); - ov107_02249DBC(¶m0->unk_50[7], sub_02027B50(param0->unk_148)); + ov107_02249DBC(¶m0->unk_50[7], Options_Frame(param0->unk_148)); param0->unk_0A = ov107_022477CC(param0, 69, 1); param0->unk_08 = 14; break; @@ -2209,7 +2209,7 @@ static void ov107_022481FC (UnkStruct_ov107_02246170 * param0, Window * param1, static void ov107_02248240 (UnkStruct_ov107_02246170 * param0) { param0->unk_0A = ov107_02247680(param0, ¶m0->unk_50[1], 5, 16, 1 + 4, 0xFF, 1, 2, 0, 0, 1); - ov107_02249DBC(¶m0->unk_50[8], sub_02027B50(param0->unk_148)); + ov107_02249DBC(¶m0->unk_50[8], Options_Frame(param0->unk_148)); param0->unk_0A = ov107_02247650(param0, ¶m0->unk_50[8], 4, 1, 1, 0xFF, 1, 2, 15, 1); } @@ -2221,7 +2221,7 @@ static void ov107_022482A4 (UnkStruct_ov107_02246170 * param0) static void ov107_022482B0 (UnkStruct_ov107_02246170 * param0) { - ov107_02249DBC(¶m0->unk_50[9], sub_02027B50(param0->unk_148)); + ov107_02249DBC(¶m0->unk_50[9], Options_Frame(param0->unk_148)); param0->unk_18 = 0; ov107_02247E5C(param0); @@ -2241,7 +2241,7 @@ static void ov107_022482D4 (UnkStruct_ov107_02246170 * param0) static void ov107_022482FC (UnkStruct_ov107_02246170 * param0) { - ov107_02249DBC(¶m0->unk_50[7], sub_02027B50(param0->unk_148)); + ov107_02249DBC(¶m0->unk_50[7], Options_Frame(param0->unk_148)); param0->unk_0A = ov107_02247650(param0, ¶m0->unk_50[7], 37, 1, 1, 0xff, 1, 2, 15, 1); param0->unk_18 = 0; @@ -2840,7 +2840,7 @@ static void ov107_02248A8C (UnkStruct_ov107_02246170 * param0, u8 param1) { Pokemon * v0; - ov107_02249DBC(¶m0->unk_50[7], sub_02027B50(param0->unk_148)); + ov107_02249DBC(¶m0->unk_50[7], Options_Frame(param0->unk_148)); v0 = Party_GetPokemonBySlotIndex(param0->unk_3DC, ov107_02249C98(param0->unk_14, param1)); ov107_02248104(param0, 0, Pokemon_GetBoxPokemon(v0)); @@ -2880,7 +2880,7 @@ static void ov107_02248B50 (UnkStruct_ov107_02246170 * param0, u8 param1) { Pokemon * v0; - ov107_02249DBC(¶m0->unk_50[7], sub_02027B50(param0->unk_148)); + ov107_02249DBC(¶m0->unk_50[7], Options_Frame(param0->unk_148)); v0 = Party_GetPokemonBySlotIndex(param0->unk_3DC, ov107_02249C98(param0->unk_14, param1)); ov107_02248104(param0, 0, Pokemon_GetBoxPokemon(v0)); @@ -2908,7 +2908,7 @@ static void ov107_02248BB4 (UnkStruct_ov107_02246170 * param0) static void ov107_02248BEC (UnkStruct_ov107_02246170 * param0) { - ov107_02249DBC(¶m0->unk_50[7], sub_02027B50(param0->unk_148)); + ov107_02249DBC(¶m0->unk_50[7], Options_Frame(param0->unk_148)); return; } @@ -3301,7 +3301,7 @@ static void ov107_02249024 (UnkStruct_ov107_02246170 * param0, u8 param1) v0 = Party_GetPokemonBySlotIndex(param0->unk_3DC, ov107_02249C98(param0->unk_14, param1)); - ov107_02249DBC(¶m0->unk_50[7], sub_02027B50(param0->unk_148)); + ov107_02249DBC(¶m0->unk_50[7], Options_Frame(param0->unk_148)); ov107_02248104(param0, 0, Pokemon_GetBoxPokemon(v0)); param0->unk_0A = ov107_022477CC(param0, 20, 1); @@ -3324,7 +3324,7 @@ static void ov107_022490E8 (UnkStruct_ov107_02246170 * param0, u8 param1, u8 par u32 v0; Pokemon * v1; - ov107_02249DBC(¶m0->unk_50[7], sub_02027B50(param0->unk_148)); + ov107_02249DBC(¶m0->unk_50[7], Options_Frame(param0->unk_148)); v1 = Party_GetPokemonBySlotIndex(param0->unk_3DC, ov107_02249C98(param0->unk_14, param1)); ov107_02248104(param0, 0, Pokemon_GetBoxPokemon(v1)); @@ -3519,7 +3519,7 @@ static void ov107_022493CC (UnkStruct_ov107_02246170 * param0, u8 param1, u8 par ov107_02248BB4(param0); ov107_02248C08(param0, ¶m0->unk_50[0]); - ov107_02249DBC(¶m0->unk_50[7], sub_02027B50(param0->unk_148)); + ov107_02249DBC(¶m0->unk_50[7], Options_Frame(param0->unk_148)); param0->unk_0A = ov107_022477CC(param0, Unk_ov107_0224A0DC[v2][v4], 1); return; diff --git a/src/overlay109/ov109_021D3D50.c b/src/overlay109/ov109_021D3D50.c index 9cebd43e56..d6672ccfbf 100644 --- a/src/overlay109/ov109_021D3D50.c +++ b/src/overlay109/ov109_021D3D50.c @@ -582,7 +582,7 @@ static void ov109_021D4300 (UnkStruct_ov109_021D5140 * param0, NARC * param1) sub_020070E8(param1, 2, v0, 1, 0, 32 * 8 * 0x20, 1, 95); sub_0200710C(param1, 3, v0, 1, 0, 32 * 24 * 2, 1, 95); sub_0200DD0C(v0, 0, 1, 10, - sub_02027B50(param0->unk_0C->unk_14.unk_10), 95); + Options_Frame(param0->unk_0C->unk_14.unk_10), 95); sub_0200DAA4(v0, 0, 1 + (18 + 12), 11, 0, 95); } diff --git a/src/overlay111/ov111_021D0D80.c b/src/overlay111/ov111_021D0D80.c index 6d0ac21f6e..58cbcb5729 100644 --- a/src/overlay111/ov111_021D0D80.c +++ b/src/overlay111/ov111_021D0D80.c @@ -478,7 +478,7 @@ static BOOL ov111_021D0FC8 (UnkStruct_ov111_021D0F7C * param0) ov111_021D3468(param0->unk_390[v0], (20 + v0)); } - ov111_021D35C0(¶m0->unk_5C[15], sub_02027B50(param0->unk_164)); + ov111_021D35C0(¶m0->unk_5C[15], Options_Frame(param0->unk_164)); ov111_021D24D4(param0); GXLayers_EngineBToggleLayers((GX_PLANEMASK_BG0), 1); param0->unk_12 = (4 - 1); diff --git a/src/overlay113/ov113_0225C700.c b/src/overlay113/ov113_0225C700.c index 632cd1e80f..48a628aa73 100644 --- a/src/overlay113/ov113_0225C700.c +++ b/src/overlay113/ov113_0225C700.c @@ -520,7 +520,7 @@ int ov113_0225CA04 (OverlayManager * param0, int * param1) BGL_FillWindow(&v0->unk_B4, 0xf); sub_0200E060(&v0->unk_B4, 0, 1, 14); MessageLoader_GetStrbuf(v0->unk_30, 2, v0->unk_C4); - v0->unk_C8 = PrintStringSimple(&v0->unk_B4, 1, v0->unk_C4, 0, 0, sub_02027AC0(sub_02025E44(v0->unk_04)), NULL); + v0->unk_C8 = PrintStringSimple(&v0->unk_B4, 1, v0->unk_C4, 0, 0, Options_GetTextFrameDelay(sub_02025E44(v0->unk_04)), NULL); (*param1)++; break; case 4: @@ -570,7 +570,7 @@ int ov113_0225CA04 (OverlayManager * param0, int * param1) BGL_FillWindow(&v0->unk_B4, 0xf); sub_0200E060(&v0->unk_B4, 0, 1, 14); MessageLoader_GetStrbuf(v0->unk_30, 3, v0->unk_C4); - v0->unk_C8 = PrintStringSimple(&v0->unk_B4, 1, v0->unk_C4, 0, 0, sub_02027AC0(sub_02025E44(v0->unk_04)), NULL); + v0->unk_C8 = PrintStringSimple(&v0->unk_B4, 1, v0->unk_C4, 0, 0, Options_GetTextFrameDelay(sub_02025E44(v0->unk_04)), NULL); (*param1)++; break; case 7: @@ -921,7 +921,7 @@ static void ov113_0225D160 (UnkStruct_ov113_0225DBCC * param0, NARC * param1) { int v2; - v2 = sub_02027B50(sub_02025E44(param0->unk_04)); + v2 = Options_Frame(sub_02025E44(param0->unk_04)); PaletteSys_LoadPalette(param0->unk_0C, 38, sub_0200DD08(v2), 118, 0, 0x20, 14 * 16); sub_0200DD0C(param0->unk_08, 1, 1, 14, v2, 118); diff --git a/src/overlay114/ov114_0225C700.c b/src/overlay114/ov114_0225C700.c index 038dd8ecab..a59b93a3ec 100644 --- a/src/overlay114/ov114_0225C700.c +++ b/src/overlay114/ov114_0225C700.c @@ -1535,7 +1535,7 @@ static void ov114_0225D254 (UnkStruct_ov114_0225D084 * param0, u32 param1, Windo static void ov114_0225D290 (UnkStruct_ov114_0225D338 * param0, UnkStruct_ov114_0225CEF0 * param1, SaveData * param2, BOOL param3, u32 param4) { - u32 v0 = sub_02027B50(sub_02025E44(param2)); + u32 v0 = Options_Frame(sub_02025E44(param2)); u32 v1; int v2; u8 v3; diff --git a/src/pokemon_summary_app.c b/src/pokemon_summary_app.c index 78c68bd9fc..ee92cbfd01 100644 --- a/src/pokemon_summary_app.c +++ b/src/pokemon_summary_app.c @@ -934,7 +934,7 @@ static int sub_0208CF78 (PokemonSummaryApp * param0) } sub_02002E98(0, 14 * 32, 19); - sub_0200DD0C(param0->bgl, 1, (1024 - (18 + 12)), 13, sub_02027B50(param0->data->options), 19); + sub_0200DD0C(param0->bgl, 1, (1024 - (18 + 12)), 13, Options_Frame(param0->data->options), 19); if (param0->subscreen == 0) { sub_02091610(param0, 0xfe); @@ -2174,7 +2174,7 @@ static int sub_0208E958 (PokemonSummaryApp * param0) { if (param0->monData.sheen == 255) { sub_02002E98(0, 14 * 32, 19); - sub_0200DD0C(param0->bgl, 1, (1024 - (18 + 12)), 13, sub_02027B50(param0->data->options), 19); + sub_0200DD0C(param0->bgl, 1, (1024 - (18 + 12)), 13, Options_Frame(param0->data->options), 19); sub_02091610(param0, 0xff); param0->data->returnMode = 1; diff --git a/src/unk_0203D1B8.c b/src/unk_0203D1B8.c index bd09da6a1b..23153eae77 100644 --- a/src/unk_0203D1B8.c +++ b/src/unk_0203D1B8.c @@ -1622,7 +1622,7 @@ void sub_0203E414 (TaskManager * param0, int param1) v2->unk_04 = GetTimestamp(); v2->unk_0C.unk_08 = sub_0202CD88(v0->saveData); v2->unk_0C.unk_0C = 0; - v2->unk_0C.unk_10 = sub_02027B50(v1); + v2->unk_0C.unk_10 = Options_Frame(v1); v2->unk_0C.unk_04 = sub_0203E484(v0->saveData, param1); sub_0202CFEC(sub_0202CD88(v0->saveData), 5); diff --git a/src/unk_0205D8CC.c b/src/unk_0205D8CC.c index be4720e6e2..8a4ec30ca7 100644 --- a/src/unk_0205D8CC.c +++ b/src/unk_0205D8CC.c @@ -35,7 +35,7 @@ void sub_0205D8F4 (BGL * param0, Window * param1, u32 param2) void sub_0205D944 (Window * param0, const Options * param1) { - sub_0200DD0C(param0->unk_00, sub_0201C290(param0), 1024 - (18 + 12), 10, sub_02027B50(param1), 4); + sub_0200DD0C(param0->unk_00, sub_0201C290(param0), 1024 - (18 + 12), 10, Options_Frame(param1), 4); sub_0205D988(param0); sub_0200E060(param0, 0, 1024 - (18 + 12), 10); } @@ -53,7 +53,7 @@ u8 sub_0205D994 (Window * param0, Strbuf *param1, const Options * param2, u8 par sub_02002AE4(0); sub_02002B20(0); - v0 = PrintStringSimple(param0, 1, param1, 0, 0, sub_02027AC0(param2), NULL); + v0 = PrintStringSimple(param0, 1, param1, 0, 0, Options_GetTextFrameDelay(param2), NULL); return v0; } diff --git a/src/unk_0206F314.c b/src/unk_0206F314.c index dda73164f5..242eb2db0b 100644 --- a/src/unk_0206F314.c +++ b/src/unk_0206F314.c @@ -213,8 +213,8 @@ static int sub_0206F314 (UnkStruct_0206F314 * param0, FieldSystem * param1, u16 v0->unk_CC = param1; v0->unk_D0 = param1->unk_08; v0->unk_304 = sub_0202E8C0(v1); - v0->unk_1A = sub_02027AC0(sub_02025E44(v1)); - v0->unk_1C = sub_02027B50(sub_02025E44(v1)); + v0->unk_1A = Options_GetTextFrameDelay(sub_02025E44(v1)); + v0->unk_1C = Options_Frame(sub_02025E44(v1)); param0->unk_08 = v0; diff --git a/src/unk_020722AC.c b/src/unk_020722AC.c index 78baae7ee3..9e3a82561e 100644 --- a/src/unk_020722AC.c +++ b/src/unk_020722AC.c @@ -223,8 +223,8 @@ void sub_020722AC (void * param0, int * param1) v0->unk_00 = 43; v0->unk_19 = 0; v0->unk_1A = 0xFF; - v0->unk_16 = sub_02027AC0(sub_02025E44(v1)); - v0->unk_14 = sub_02027B50(sub_02025E44(v1)); + v0->unk_16 = Options_GetTextFrameDelay(sub_02025E44(v1)); + v0->unk_14 = Options_Frame(sub_02025E44(v1)); sub_02072ED0(v0->unk_1C, 20, v0->unk_00); sub_02072F30(v0, v1, v0->unk_00); diff --git a/src/unk_0207AE68.c b/src/unk_0207AE68.c index 03c4b7aaea..87631ffc14 100644 --- a/src/unk_0207AE68.c +++ b/src/unk_0207AE68.c @@ -893,7 +893,7 @@ static void sub_0207C1CC (UnkStruct_0207AE68 * param0, BGL * param1) int v8 = 8; int v9 = 3; - v4 = sub_02027B50(param0->unk_2C); + v4 = Options_Frame(param0->unk_2C); sub_0200E218(param1, 1, 1, 10, v4, param0->unk_5C); sub_02006E3C(v5, v6, param1, v9, 0, 0, 1, param0->unk_5C); @@ -988,7 +988,7 @@ static u8 sub_0207C584 (UnkStruct_0207AE68 * param0, int param1) Heap_FreeToHeap(v0); BGL_FillWindow(param0->unk_04, 0xff); - return PrintStringSimple(param0->unk_04, 1, param0->unk_10, 0, 0, sub_02027AC0(param0->unk_2C), sub_0207C5CC); + return PrintStringSimple(param0->unk_04, 1, param0->unk_10, 0, 0, Options_GetTextFrameDelay(param0->unk_2C), sub_0207C5CC); } static BOOL sub_0207C5CC (UnkStruct_0201D738 * param0, u16 param1) diff --git a/src/unk_0207E0B8.c b/src/unk_0207E0B8.c index aae3dffe83..01721c0181 100644 --- a/src/unk_0207E0B8.c +++ b/src/unk_0207E0B8.c @@ -938,7 +938,7 @@ static void sub_0207EB6C (GameWindowLayout * param0, NARC * param1) sub_02002E98(0, 13 * 32, 12); sub_0200DAA4(param0->unk_00, 0, 1, 14, 0, 12); - sub_0200DD0C(param0->unk_00, 0, (1 + 9), 15, sub_02027B50(param0->unk_5A4->unk_0C), 12); + sub_0200DD0C(param0->unk_00, 0, (1 + 9), 15, Options_Frame(param0->unk_5A4->unk_0C), 12); sub_020070E8(param1, 3, param0->unk_00, 4, 0, 0, 0, 12); sub_02007130(param1, 4, 4, 0x20, 0x20, 12); sub_020070E8(param1, 12, param0->unk_00, 5, 0, 0, 0, 12); diff --git a/src/unk_020819DC.c b/src/unk_020819DC.c index 4f353efb1e..0dda48bda7 100644 --- a/src/unk_020819DC.c +++ b/src/unk_020819DC.c @@ -620,7 +620,7 @@ void sub_0208274C (GameWindowLayout * param0) sub_02002AC8(1); sub_02002AE4(0); param0->unk_B10 = PrintStringSimple( - ¶m0->unk_04[34], 1, param0->unk_6A4, 0, 0, sub_02027AC0(param0->unk_5A4->unk_0C), sub_0208279C); + ¶m0->unk_04[34], 1, param0->unk_6A4, 0, 0, Options_GetTextFrameDelay(param0->unk_5A4->unk_0C), sub_0208279C); } static BOOL sub_0208279C (UnkStruct_0201D738 * param0, u16 param1) diff --git a/src/unk_0208694C.c b/src/unk_0208694C.c index 0dc428c4b8..26f8b7b49c 100644 --- a/src/unk_0208694C.c +++ b/src/unk_0208694C.c @@ -1527,7 +1527,7 @@ static void sub_0208769C (UnkStruct_02087A10 * param0, NARC * param1) sub_0200710C(param1, 6, v0, 1, 0, (32 * 14 * 2), 1, 18); sub_0200710C(param1, 7, v0, 0, 0, (32 * 14 * 2), 1, 18); sub_02002E98(0, 12 * 32, 18); - sub_0200DD0C(param0->unk_160, 4, ((32 * 8)), 10, sub_02027B50(param0->unk_18), 18); + sub_0200DD0C(param0->unk_160, 4, ((32 * 8)), 10, Options_Frame(param0->unk_18), 18); sub_02002E98(4, 12 * 32, 18); param0->unk_510 = sub_020071B4(param1, 16, 1, ¶m0->unk_514, 18); diff --git a/src/unk_0208A3F4.c b/src/unk_0208A3F4.c index da1b44c1c6..24daa5a241 100644 --- a/src/unk_0208A3F4.c +++ b/src/unk_0208A3F4.c @@ -104,7 +104,7 @@ void sub_0208A490 (UnkStruct_02089688 * param0) SpriteRenderer_LoadAnimResObjFromOpenNarc(v2, v3, v0, 11, 0, 1002); { - int v5 = sub_02027B50(param0->unk_38C.unk_20); + int v5 = Options_Frame(param0->unk_38C.unk_20); sub_0200DD0C(v1, 4, 1, 10, v5, 101); PaletteSys_LoadPalette(v4, 38, sub_0200DD08(v5), 101, 1, 0x20, 11 * 16); diff --git a/src/unk_0209747C.c b/src/unk_0209747C.c index e09d0a8e84..e939623450 100644 --- a/src/unk_0209747C.c +++ b/src/unk_0209747C.c @@ -45,7 +45,7 @@ UnkStruct_0209747C * sub_0209747C (u32 param0, u32 param1, SaveData * param2, u3 v0->unk_05 = 0; v0->unk_02 = 1; v0->unk_03 = 0; - v0->unk_08 = sub_02027B50(sub_02025E44(param2)); + v0->unk_08 = Options_Frame(sub_02025E44(param2)); if (param0 == 2) { sub_02014A9C(&v0->unk_14, 3); diff --git a/src/unk_02097B18.c b/src/unk_02097B18.c index 33a2f75187..16875f4845 100644 --- a/src/unk_02097B18.c +++ b/src/unk_02097B18.c @@ -160,7 +160,7 @@ static int sub_02097B18 (OverlayManager * param0, int * param1) { int v7; - v7 = sub_02027B50(v0->unk_00->unk_24); + v7 = Options_Frame(v0->unk_00->unk_24); ov76_0223C8EC(v0->unk_D4.unk_10, v0->unk_D4.unk_14, v7); ov76_0223C974(v0->unk_D4.unk_10, v0->unk_D4.unk_14, v7); } diff --git a/src/unk_02098218.c b/src/unk_02098218.c index 2be4d2dd89..2a10b7702c 100644 --- a/src/unk_02098218.c +++ b/src/unk_02098218.c @@ -72,8 +72,8 @@ static int sub_02098218 (OverlayManager * param0, int * param1) v0 = OverlayManager_Args(param0); v1->unk_00 = v0; - v1->unk_04.unk_0C = sub_02027AC0(v1->unk_00->unk_0C.unk_04); - v1->unk_04.unk_10 = sub_02027B50(v1->unk_00->unk_0C.unk_04); + v1->unk_04.unk_0C = Options_GetTextFrameDelay(v1->unk_00->unk_0C.unk_04); + v1->unk_04.unk_10 = Options_Frame(v1->unk_00->unk_0C.unk_04); v1->unk_04.unk_34 = ov119_021D0DD4(); v1->unk_04.unk_38 = sub_0200762C(71); v1->unk_04.unk_3C = NARC_ctor(NARC_INDEX_POKETOOL__POKE_EDIT__PL_POKE_DATA, 71); diff --git a/src/unk_020989DC.c b/src/unk_020989DC.c index 47262a9489..6405c8d32a 100644 --- a/src/unk_020989DC.c +++ b/src/unk_020989DC.c @@ -387,8 +387,8 @@ static int sub_02098D7C (UnkStruct_02098BE4 * param0) v1->unk_08 = param0->unk_0C->unk_1C[param0->unk_0C->unk_01].unk_02; v1->unk_04 = sub_0202AC70(param0->unk_0C->unk_08, param0->unk_0C->unk_1C[param0->unk_0C->unk_01].unk_00, param0->unk_00); v1->unk_00 = Party_GetPokemonBySlotIndex(param0->unk_0C->unk_10, param0->unk_08); - v1->unk_0A = sub_02027AC0(param0->unk_0C->unk_18); - v1->unk_0B = sub_02027B50(param0->unk_0C->unk_18); + v1->unk_0A = Options_GetTextFrameDelay(param0->unk_0C->unk_18); + v1->unk_0B = Options_Frame(param0->unk_0C->unk_18); param0->unk_14 = OverlayManager_New(&v0, v1, param0->unk_00); param0->unk_10 = v1; diff --git a/src/unk_0209C194.c b/src/unk_0209C194.c index 6aaa4c649e..6a4f984f6e 100644 --- a/src/unk_0209C194.c +++ b/src/unk_0209C194.c @@ -74,7 +74,7 @@ void * sub_0209C1EC (FieldSystem * param0) v0->unk_08.unk_10 = sub_02025E44(param0->saveData); v0->unk_08.unk_14 = sub_0202CD88(param0->saveData); v0->unk_08.unk_18 = sub_0202B628(param0->saveData); - v0->unk_08.unk_04 = sub_02027B50(v0->unk_08.unk_10); + v0->unk_08.unk_04 = Options_Frame(v0->unk_08.unk_10); v0->unk_08.unk_1C = param0; return v0; From dc486fa0e44979d71ee8156619a30202d3955dcf Mon Sep 17 00:00:00 2001 From: RavePossum Date: Sun, 14 Apr 2024 08:51:11 -0400 Subject: [PATCH 15/23] delete options struct def, find a couple random places for new enum labels --- include/struct_defs/options.h | 14 -------------- src/battle/ov16_0223DF00.c | 3 ++- src/overlay057/ov57_021D0D80.c | 3 ++- 3 files changed, 4 insertions(+), 16 deletions(-) delete mode 100644 include/struct_defs/options.h diff --git a/include/struct_defs/options.h b/include/struct_defs/options.h deleted file mode 100644 index 19ed5fd595..0000000000 --- a/include/struct_defs/options.h +++ /dev/null @@ -1,14 +0,0 @@ -#ifndef POKEPLATINUM_STRUCT_DEFS_OPTIONS_H -#define POKEPLATINUM_STRUCT_DEFS_OPTIONS_H - -// typedef struct Options { -// u16 textSpeed : 4; -// u16 soundMethod : 2; -// u16 battleStyle : 1; -// u16 battleScene : 1; -// u16 buttonMode : 2; -// u16 frame : 5; -// u16 : 1; -// } Options; - -#endif // POKEPLATINUM_STRUCT_DEFS_OPTIONS_H diff --git a/src/battle/ov16_0223DF00.c b/src/battle/ov16_0223DF00.c index a4b0c90eb9..8eb068b7d3 100644 --- a/src/battle/ov16_0223DF00.c +++ b/src/battle/ov16_0223DF00.c @@ -9,6 +9,7 @@ #include "constants/battle.h" #include "constants/heap.h" #include "constants/items.h" +#include "constants/game_options.h" #include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02007768_decl.h" @@ -1027,7 +1028,7 @@ BOOL BattleSystem_AnimationsOn(BattleSystem *battleSys) return TRUE; } - return Options_BattleScene(battleSys->unk_1B0) == 0; + return Options_BattleScene(battleSys->unk_1B0) == OPTIONS_BATTLE_SCENE_ON; } int ov16_0223EDE0 (BattleSystem * param0) diff --git a/src/overlay057/ov57_021D0D80.c b/src/overlay057/ov57_021D0D80.c index d378a43769..3e370abc83 100644 --- a/src/overlay057/ov57_021D0D80.c +++ b/src/overlay057/ov57_021D0D80.c @@ -34,6 +34,7 @@ #include "pokemon.h" #include "party.h" #include "overlay057/ov57_021D0F30.h" +#include "constants/game_options.h" static int ov57_021D0D80(OverlayManager * param0, int * param1); static int ov57_021D0D98(OverlayManager * param0, int * param1); @@ -130,7 +131,7 @@ static int ov57_021D0E34 (OverlayManager * param0, int * param1) UnkStruct_02025CCC * v1 = sub_02025CCC(v0); ov57_021D0F30(77, v0); - Options_SetSystemButtonMode(v0, 0); + Options_SetSystemButtonMode(v0, OPTIONS_BUTTON_MODE_NORMAL); if (!sub_02025D10(v1) || !sub_02025D40(v1)) { sub_02025DE8(sub_02025CD8(v0)); From 97a4370166c56fb0fcea4dc301cad7887492a739 Mon Sep 17 00:00:00 2001 From: RavePossum Date: Sun, 14 Apr 2024 10:52:53 -0400 Subject: [PATCH 16/23] Options_GetTextFrameDelay -> Options_TextFrameDelay --- include/game_options.h | 2 +- src/battle/ov16_0223DF00.c | 2 +- src/game_options.c | 2 +- src/overlay005/ov5_021DD42C.c | 2 +- src/overlay007/ov7_0224BE9C.c | 2 +- src/overlay017/ov17_022413D8.c | 2 +- src/overlay017/ov17_022476F8.c | 2 +- src/overlay017/ov17_0224A0FC.c | 2 +- src/overlay017/ov17_02250744.c | 2 +- src/overlay022/ov22_02255D44.c | 2 +- src/overlay022/ov22_0225A428.c | 2 +- src/overlay023/ov23_02241F74.c | 2 +- src/overlay064/ov64_0222DCE0.c | 4 ++-- src/overlay065/ov65_0222DCE0.c | 2 +- src/overlay065/ov65_0223648C.c | 2 +- src/overlay067/ov67_0225C700.c | 2 +- src/overlay068/ov68_0225C700.c | 2 +- src/overlay069/ov69_0225C700.c | 2 +- src/overlay070/ov70_0225D9A4.c | 2 +- src/overlay072/ov72_0223D7A0.c | 2 +- src/overlay073/ov73_021D0D80.c | 2 +- src/overlay074/ov74_021D0D80.c | 2 +- src/overlay075/ov75_021D0D80.c | 2 +- src/overlay078/ov78_021D0D80.c | 2 +- src/overlay079/ov79_021D0D80.c | 2 +- src/overlay083/ov83_0223B5A0.c | 2 +- src/overlay084/ov84_0223F040.c | 2 +- src/overlay091/ov91_021D0D80.c | 2 +- src/overlay092/ov92_021D0D80.c | 2 +- src/overlay094/ov94_0223BCB0.c | 2 +- src/overlay100/ov100_021D46C8.c | 2 +- src/overlay104/ov104_02231F74.c | 4 ++-- src/overlay105/ov105_02241AE0.c | 2 +- src/overlay106/ov106_02241AE0.c | 2 +- src/overlay113/ov113_0225C700.c | 4 ++-- src/unk_0205D8CC.c | 2 +- src/unk_0206F314.c | 2 +- src/unk_020722AC.c | 2 +- src/unk_0207AE68.c | 2 +- src/unk_020819DC.c | 2 +- src/unk_02098218.c | 2 +- src/unk_020989DC.c | 2 +- 42 files changed, 45 insertions(+), 45 deletions(-) diff --git a/include/game_options.h b/include/game_options.h index 8f067f6bcc..318dd6ecc1 100644 --- a/include/game_options.h +++ b/include/game_options.h @@ -19,7 +19,7 @@ void Options_Init(Options *options); void Options_SetSystemButtonMode(SaveData *saveData, int buttonMode); int Options_TextSpeed(const Options *options); void Options_SetTextSpeed(Options *options, int textSpeed); -u8 Options_GetTextFrameDelay(const Options *options); +u8 Options_TextFrameDelay(const Options *options); int Options_SoundMethod(const Options *options); void Options_SetSoundMethod(Options *options, int soundMethod); int Options_BattleScene(const Options *options); diff --git a/src/battle/ov16_0223DF00.c b/src/battle/ov16_0223DF00.c index 8eb068b7d3..38ecbad655 100644 --- a/src/battle/ov16_0223DF00.c +++ b/src/battle/ov16_0223DF00.c @@ -1042,7 +1042,7 @@ u8 BattleSystem_TextSpeed (BattleSystem * param0) return 1; } - return Options_GetTextFrameDelay(param0->unk_1B0); + return Options_TextFrameDelay(param0->unk_1B0); } int BattleSystem_Ruleset (BattleSystem * param0) diff --git a/src/game_options.c b/src/game_options.c index 3350d3eea7..fe1755e1b2 100644 --- a/src/game_options.c +++ b/src/game_options.c @@ -66,7 +66,7 @@ void Options_SetTextSpeed (Options *options, int textSpeed) options->textSpeed = textSpeed; } -u8 Options_GetTextFrameDelay (const Options *options) +u8 Options_TextFrameDelay (const Options *options) { int speed = Options_TextSpeed(options); diff --git a/src/overlay005/ov5_021DD42C.c b/src/overlay005/ov5_021DD42C.c index 08cb886203..f24dd58b69 100644 --- a/src/overlay005/ov5_021DD42C.c +++ b/src/overlay005/ov5_021DD42C.c @@ -110,7 +110,7 @@ void ov5_021DD530 (UnkStruct_0203E724 * param0, StringTemplate * param1, u8 para static u8 ov5_021DD574 (UnkStruct_0203E724 * param0) { - return Options_GetTextFrameDelay(sub_02025E44(param0->unk_34->saveData)); + return Options_TextFrameDelay(sub_02025E44(param0->unk_34->saveData)); } static void ov5_021DD588 (FieldSystem * param0, UnkStruct_ov5_021DD648 * param1) diff --git a/src/overlay007/ov7_0224BE9C.c b/src/overlay007/ov7_0224BE9C.c index bc05fe7191..1fda9c1ae1 100644 --- a/src/overlay007/ov7_0224BE9C.c +++ b/src/overlay007/ov7_0224BE9C.c @@ -373,7 +373,7 @@ static void ov7_0224C338 (UnkStruct_ov7_0224BEFC * param0) Options * v0 = sub_02025E44(param0->unk_08); param0->unk_1B0 = Options_Frame(v0); - param0->unk_1B4 = Options_GetTextFrameDelay(v0); + param0->unk_1B4 = Options_TextFrameDelay(v0); } static void ov7_0224C35C (UnkStruct_ov7_0224BEFC * param0) diff --git a/src/overlay017/ov17_022413D8.c b/src/overlay017/ov17_022413D8.c index 0701a8614a..6f2f7ae829 100644 --- a/src/overlay017/ov17_022413D8.c +++ b/src/overlay017/ov17_022413D8.c @@ -1520,7 +1520,7 @@ static void ov17_02242DC0 (UnkStruct_ov17_02246F24 * param0, MessageLoader * par v1 = 0; } else { if (param0->unk_00->unk_155 == 0) { - v1 = Options_GetTextFrameDelay(param0->unk_00->unk_196C); + v1 = Options_TextFrameDelay(param0->unk_00->unk_196C); } else { v1 = 1; } diff --git a/src/overlay017/ov17_022476F8.c b/src/overlay017/ov17_022476F8.c index 111741ce5a..d31119b2c9 100644 --- a/src/overlay017/ov17_022476F8.c +++ b/src/overlay017/ov17_022476F8.c @@ -210,7 +210,7 @@ static void ov17_02247990 (UnkStruct_ov17_02247A48 * param0, MessageLoader * par int v1; if (param0->unk_00->unk_155 == 0) { - v1 = Options_GetTextFrameDelay(param0->unk_00->unk_196C); + v1 = Options_TextFrameDelay(param0->unk_00->unk_196C); } else { v1 = 1; } diff --git a/src/overlay017/ov17_0224A0FC.c b/src/overlay017/ov17_0224A0FC.c index 9c084629a8..2f7a677e2d 100644 --- a/src/overlay017/ov17_0224A0FC.c +++ b/src/overlay017/ov17_0224A0FC.c @@ -1936,7 +1936,7 @@ static void ov17_0224C244 (UnkStruct_ov17_0224DF54 * param0, MessageLoader * par int v1; if (param0->unk_00->unk_155 == 0) { - v1 = Options_GetTextFrameDelay(param0->unk_00->unk_196C); + v1 = Options_TextFrameDelay(param0->unk_00->unk_196C); } else { v1 = 1; } diff --git a/src/overlay017/ov17_02250744.c b/src/overlay017/ov17_02250744.c index 5b7d2b0fe8..0ee0f9befc 100644 --- a/src/overlay017/ov17_02250744.c +++ b/src/overlay017/ov17_02250744.c @@ -245,7 +245,7 @@ static void ov17_022508E4 (UnkStruct_ov17_0224FCA0 * param0, MessageLoader * par int v1; if (param0->unk_00->unk_155 == 0) { - v1 = Options_GetTextFrameDelay(param0->unk_00->unk_196C); + v1 = Options_TextFrameDelay(param0->unk_00->unk_196C); } else { v1 = 1; } diff --git a/src/overlay022/ov22_02255D44.c b/src/overlay022/ov22_02255D44.c index 18b1904e5d..85335ef414 100644 --- a/src/overlay022/ov22_02255D44.c +++ b/src/overlay022/ov22_02255D44.c @@ -1396,7 +1396,7 @@ static u32 ov22_022573EC (UnkStruct_ov22_02255D44 * param0, u32 param1) StringTemplate_Format(param0->unk_744, param0->unk_740, v3); if (param0->unk_734->unk_16 == 0) { - v2 = Options_GetTextFrameDelay(param0->unk_738); + v2 = Options_TextFrameDelay(param0->unk_738); } else { v2 = 1; } diff --git a/src/overlay022/ov22_0225A428.c b/src/overlay022/ov22_0225A428.c index 34dd46d72c..136b2c41c7 100644 --- a/src/overlay022/ov22_0225A428.c +++ b/src/overlay022/ov22_0225A428.c @@ -102,7 +102,7 @@ void ov22_0225A428 (UnkStruct_ov22_0225A428 * param0, UnkStruct_ov22_02256BAC * ov22_0225A718(param1->unk_00, param1->unk_0C); param0->unk_13C = Options_Frame(param1->unk_0C); - param0->unk_140 = Options_GetTextFrameDelay(param1->unk_0C); + param0->unk_140 = Options_TextFrameDelay(param1->unk_0C); param0->unk_138 |= param2; } diff --git a/src/overlay023/ov23_02241F74.c b/src/overlay023/ov23_02241F74.c index da344119c0..439d2e20c7 100644 --- a/src/overlay023/ov23_02241F74.c +++ b/src/overlay023/ov23_02241F74.c @@ -126,7 +126,7 @@ static UnkStruct_ov23_02257748 * Unk_ov23_02257748 = NULL; static void ov23_02241F74 (UnkStruct_ov23_02257748 * param0, FieldSystem * param1) { - u8 v0 = Options_GetTextFrameDelay(sub_02025E44(param1->saveData)); + u8 v0 = Options_TextFrameDelay(sub_02025E44(param1->saveData)); int v1; Unk_ov23_02257748 = param0; diff --git a/src/overlay064/ov64_0222DCE0.c b/src/overlay064/ov64_0222DCE0.c index ce1a39bb88..13fa29842a 100644 --- a/src/overlay064/ov64_0222DCE0.c +++ b/src/overlay064/ov64_0222DCE0.c @@ -1500,7 +1500,7 @@ asm static void ov64_0222EC94 (UnkStruct_ov64_0222F038 * param0, UnkStruct_ov64_ str r0, [r1, #0x38] ldr r0, [r5, #0] bl sub_02025E44 - bl Options_GetTextFrameDelay + bl Options_TextFrameDelay ldr r1, [sp, #0x14] str r0, [r1, #0x34] ldr r1, [sp, #0x1c] @@ -1751,7 +1751,7 @@ static BOOL ov64_0222F068 (UnkStruct_ov64_0222F038 * param0, UnkStruct_ov64_0222 static void ov64_0222F09C (UnkStruct_ov64_0222F0C4 * param0, UnkStruct_ov64_0222E060 * param1, UnkStruct_ov64_0222E21C * param2, u32 param3) { - param0->unk_DC = Options_GetTextFrameDelay(sub_02025E44(param1->unk_00)); + param0->unk_DC = Options_TextFrameDelay(sub_02025E44(param1->unk_00)); ov64_0222F414(param0, param1, param2, param3); } diff --git a/src/overlay065/ov65_0222DCE0.c b/src/overlay065/ov65_0222DCE0.c index 696d006096..b0fa22408a 100644 --- a/src/overlay065/ov65_0222DCE0.c +++ b/src/overlay065/ov65_0222DCE0.c @@ -4737,7 +4737,7 @@ static int ov65_02232B28 (UnkStruct_ov65_0222EBE0 * param0, int param1) static void ov65_02232B58 (UnkStruct_ov65_0222EBE0 * param0, int param1, BOOL param2) { - u8 v0 = Options_GetTextFrameDelay(sub_02025E44(param0->unk_160)); + u8 v0 = Options_TextFrameDelay(sub_02025E44(param0->unk_160)); ov65_02232F50(param0); diff --git a/src/overlay065/ov65_0223648C.c b/src/overlay065/ov65_0223648C.c index 7bc9d1550d..8e7483ed88 100644 --- a/src/overlay065/ov65_0223648C.c +++ b/src/overlay065/ov65_0223648C.c @@ -805,7 +805,7 @@ static void ov65_02236C10 (UnkStruct_ov65_02236840 * param0, const UnkStruct_020 param0->unk_0C = Strbuf_Init(256, param2); param0->unk_10 = Strbuf_Init(256, param2); param0->unk_14 = 0xff; - param0->unk_16 = Options_GetTextFrameDelay(sub_02025E44(param1->unk_08)); + param0->unk_16 = Options_TextFrameDelay(sub_02025E44(param1->unk_08)); } static void ov65_02236C5C (UnkStruct_ov65_02236840 * param0) diff --git a/src/overlay067/ov67_0225C700.c b/src/overlay067/ov67_0225C700.c index a9b8aae7c4..0e343c42dc 100644 --- a/src/overlay067/ov67_0225C700.c +++ b/src/overlay067/ov67_0225C700.c @@ -647,7 +647,7 @@ static void ov67_0225D188 (UnkStruct_ov67_0225D210 * param0, BGL * param1, u32 p param0->unk_18 = Strbuf_Init(256, param10); param0->unk_1C = Strbuf_Init(256, param10); param0->unk_20 = param2; - param0->unk_28 = Options_GetTextFrameDelay(sub_02025E44(param9)); + param0->unk_28 = Options_TextFrameDelay(sub_02025E44(param9)); param0->unk_2C = 0; BGL_AddWindow(param1, ¶m0->unk_08, Unk_ov67_0225D3F4[1], param4, param5, param6, param7, 11, param8); diff --git a/src/overlay068/ov68_0225C700.c b/src/overlay068/ov68_0225C700.c index 5bdc03a9f4..a3d2bac820 100644 --- a/src/overlay068/ov68_0225C700.c +++ b/src/overlay068/ov68_0225C700.c @@ -921,7 +921,7 @@ static void ov68_0225D128 (UnkStruct_ov68_0225D128 * param0, UnkStruct_ov68_0225 Options * v0; v0 = sub_02025E44(param2); - param0->unk_04 = Options_GetTextFrameDelay(v0); + param0->unk_04 = Options_TextFrameDelay(v0); } } diff --git a/src/overlay069/ov69_0225C700.c b/src/overlay069/ov69_0225C700.c index e9f1a2efd0..c3cc1daa0a 100644 --- a/src/overlay069/ov69_0225C700.c +++ b/src/overlay069/ov69_0225C700.c @@ -1962,7 +1962,7 @@ static void ov69_0225DD60 (UnkStruct_ov69_0225DDC8 * param0, UnkStruct_ov69_0225 Options * v0; v0 = sub_02025E44(param3); - param0->unk_08 = Options_GetTextFrameDelay(v0); + param0->unk_08 = Options_TextFrameDelay(v0); } param0->unk_0C = Strbuf_Init(128, param4); diff --git a/src/overlay070/ov70_0225D9A4.c b/src/overlay070/ov70_0225D9A4.c index 268cd0e281..4712dd3a94 100644 --- a/src/overlay070/ov70_0225D9A4.c +++ b/src/overlay070/ov70_0225D9A4.c @@ -1549,7 +1549,7 @@ static void ov70_0225E9C8 (UnkStruct_ov70_0225E9C8 * param0, UnkStruct_ov70_0225 Options * v0; v0 = sub_02025E44(param2); - param0->unk_14 = Options_GetTextFrameDelay(v0); + param0->unk_14 = Options_TextFrameDelay(v0); } } diff --git a/src/overlay072/ov72_0223D7A0.c b/src/overlay072/ov72_0223D7A0.c index 44cf93f61a..62bfa969b8 100644 --- a/src/overlay072/ov72_0223D7A0.c +++ b/src/overlay072/ov72_0223D7A0.c @@ -1107,7 +1107,7 @@ static void ov72_0223E930 (UnkStruct_ov72_0223DB98 * param0, int param1) BGL_FillWindow(¶m0->unk_338, 0xf0f); sub_0200E060(¶m0->unk_338, 0, 1, 10); - param0->unk_38 = PrintStringSimple(¶m0->unk_338, 1, param0->unk_34, 0, 0, Options_GetTextFrameDelay(param0->unk_0C), NULL); + param0->unk_38 = PrintStringSimple(¶m0->unk_338, 1, param0->unk_34, 0, 0, Options_TextFrameDelay(param0->unk_0C), NULL); } static int ov72_0223E99C (int param0) diff --git a/src/overlay073/ov73_021D0D80.c b/src/overlay073/ov73_021D0D80.c index 5c4650e4c7..dab0938f26 100644 --- a/src/overlay073/ov73_021D0D80.c +++ b/src/overlay073/ov73_021D0D80.c @@ -726,7 +726,7 @@ static BOOL ov73_021D1510 (UnkStruct_ov73_021D1058 * param0, u32 param1, int par Strbuf_Free(v1); } - param0->unk_58 = PrintStringSimple(¶m0->unk_1C, 1, param0->unk_5C, 0, 0, (Options_GetTextFrameDelay(param0->unk_08)), NULL); + param0->unk_58 = PrintStringSimple(¶m0->unk_1C, 1, param0->unk_5C, 0, 0, (Options_TextFrameDelay(param0->unk_08)), NULL); param0->unk_50 = 1; break; case 1: diff --git a/src/overlay074/ov74_021D0D80.c b/src/overlay074/ov74_021D0D80.c index 57bfa97817..9531019d8d 100644 --- a/src/overlay074/ov74_021D0D80.c +++ b/src/overlay074/ov74_021D0D80.c @@ -674,7 +674,7 @@ static void ov74_021D1968 (UnkStruct_ov74_021D0D80 * param0, u16 param1, BOOL pa sub_0201D730(param0->unk_2AC); } - v2 = Options_GetTextFrameDelay(param0->unk_1C); + v2 = Options_TextFrameDelay(param0->unk_1C); BGL_FillWindow(&(param0->unk_2C[2]), 15); diff --git a/src/overlay075/ov75_021D0D80.c b/src/overlay075/ov75_021D0D80.c index 2ac127b9ad..81cf4ae265 100644 --- a/src/overlay075/ov75_021D0D80.c +++ b/src/overlay075/ov75_021D0D80.c @@ -145,7 +145,7 @@ int ov75_021D0D80 (OverlayManager * param0, int * param1) v1->unk_12 = v1->unk_1C->unk_03; v1->unk_17 = v1->unk_16 = v1->unk_11; v1->unk_1C->unk_00 = 0xFFFF; - v1->unk_10 = Options_GetTextFrameDelay(v1->unk_1C->unk_04); + v1->unk_10 = Options_TextFrameDelay(v1->unk_1C->unk_04); v1->unk_0A = Options_Frame(v1->unk_1C->unk_04); sub_02002AC8(1); diff --git a/src/overlay078/ov78_021D0D80.c b/src/overlay078/ov78_021D0D80.c index 98baad7e0f..5f95ce07f4 100644 --- a/src/overlay078/ov78_021D0D80.c +++ b/src/overlay078/ov78_021D0D80.c @@ -294,7 +294,7 @@ int ov78_021D0D80 (OverlayManager * param0, int * param1) v1 = OverlayManager_Args(param0); v0->unk_700 = Options_Frame(v1->unk_04); - v0->unk_704 = Options_GetTextFrameDelay(v1->unk_04); + v0->unk_704 = Options_TextFrameDelay(v1->unk_04); sub_0201DBEC(8, 47); SetMainCallback(ov78_021D1058, v0); diff --git a/src/overlay079/ov79_021D0D80.c b/src/overlay079/ov79_021D0D80.c index a5d032970f..fb9cb59048 100644 --- a/src/overlay079/ov79_021D0D80.c +++ b/src/overlay079/ov79_021D0D80.c @@ -710,7 +710,7 @@ static void ov79_021D1568 (UnkStruct_ov79_021D0E1C * param0) param0->unk_30.unk_38[v0] = MessageLoader_GetNewStrbuf(param0->unk_2C, 17 + v0); } - param0->unk_30.unk_4C = Options_GetTextFrameDelay(param0->unk_20->unk_18); + param0->unk_30.unk_4C = Options_TextFrameDelay(param0->unk_20->unk_18); } static void ov79_021D1618 (UnkStruct_ov79_021D0E1C * param0) diff --git a/src/overlay083/ov83_0223B5A0.c b/src/overlay083/ov83_0223B5A0.c index 648c70cb80..16b1e8a837 100644 --- a/src/overlay083/ov83_0223B5A0.c +++ b/src/overlay083/ov83_0223B5A0.c @@ -129,7 +129,7 @@ int ov83_0223B5B0 (OverlayManager * param0, int * param1) } v1->unk_24 = Options_Frame(v0->unk_10->unk_18); - v1->unk_28 = Options_GetTextFrameDelay(v0->unk_10->unk_18); + v1->unk_28 = Options_TextFrameDelay(v0->unk_10->unk_18); v1->unk_31C = 1; SetMainCallback(ov83_0223B5A0, v0); diff --git a/src/overlay084/ov84_0223F040.c b/src/overlay084/ov84_0223F040.c index fce8c53a20..3593bcb9b8 100644 --- a/src/overlay084/ov84_0223F040.c +++ b/src/overlay084/ov84_0223F040.c @@ -590,7 +590,7 @@ u8 ov84_022400A0 (UnkStruct_ov84_0223B5A0 * param0) sub_02002AC8(1); sub_02002AE4(0); - v0 = PrintStringSimple(¶m0->unk_04[6], 1, param0->unk_3F8, 0, 0, Options_GetTextFrameDelay(param0->unk_D0), ov84_022400E0); + v0 = PrintStringSimple(¶m0->unk_04[6], 1, param0->unk_3F8, 0, 0, Options_TextFrameDelay(param0->unk_D0), ov84_022400E0); return v0; } diff --git a/src/overlay091/ov91_021D0D80.c b/src/overlay091/ov91_021D0D80.c index 892c5847ff..d867b1762f 100644 --- a/src/overlay091/ov91_021D0D80.c +++ b/src/overlay091/ov91_021D0D80.c @@ -1166,7 +1166,7 @@ static void ov91_021D1DF8 (UnkStruct_ov91_021D0ED8 * param0, u32 param1) sub_02002AC8(1); sub_02002AE4(0); - param0->unk_185 = PrintStringSimple(¶m0->unk_08[12], 1, param0->unk_100, 0, 0, Options_GetTextFrameDelay(param0->unk_00->unk_08), ov91_021D1E50); + param0->unk_185 = PrintStringSimple(¶m0->unk_08[12], 1, param0->unk_100, 0, 0, Options_TextFrameDelay(param0->unk_00->unk_08), ov91_021D1E50); } static BOOL ov91_021D1E50 (UnkStruct_0201D738 * param0, u16 param1) diff --git a/src/overlay092/ov92_021D0D80.c b/src/overlay092/ov92_021D0D80.c index 239d71d916..8f54559f86 100644 --- a/src/overlay092/ov92_021D0D80.c +++ b/src/overlay092/ov92_021D0D80.c @@ -1020,7 +1020,7 @@ static BOOL ov92_021D1B70 (UnkStruct_ov92_021D1B24 * param0, u32 param1, int par BGL_WindowColor(¶m0->unk_B814, 15, 0, 0, 27 * 8, 4 * 8); param0->unk_B86C = Strbuf_Init(0x400, param0->unk_00); MessageLoader_GetStrbuf(param0->unk_B860, param1, param0->unk_B86C); - param0->unk_B868 = PrintStringSimple(¶m0->unk_B814, 1, param0->unk_B86C, 0, 0, Options_GetTextFrameDelay(param0->unk_08), NULL); + param0->unk_B868 = PrintStringSimple(¶m0->unk_B814, 1, param0->unk_B86C, 0, 0, Options_TextFrameDelay(param0->unk_08), NULL); param0->unk_B864 = 1; break; case 1: diff --git a/src/overlay094/ov94_0223BCB0.c b/src/overlay094/ov94_0223BCB0.c index 06b83006c0..6e5cbbebc3 100644 --- a/src/overlay094/ov94_0223BCB0.c +++ b/src/overlay094/ov94_0223BCB0.c @@ -492,7 +492,7 @@ void ov94_0223C4C8 (UnkStruct_ov94_0223FD4C * param0) int ov94_0223C4D4 (UnkStruct_ov94_0223FD4C * param0) { - return Options_GetTextFrameDelay(param0->unk_00->unk_24); + return Options_TextFrameDelay(param0->unk_00->unk_24); } static void ov94_0223C4E0 (UnkStruct_ov94_0223FD4C * param0) diff --git a/src/overlay100/ov100_021D46C8.c b/src/overlay100/ov100_021D46C8.c index b4d899e884..32b5b13965 100644 --- a/src/overlay100/ov100_021D46C8.c +++ b/src/overlay100/ov100_021D46C8.c @@ -52,7 +52,7 @@ int ov100_021D46C8 (UnkStruct_ov100_021D46C8 * param0, UnkStruct_020985E4 * para Strbuf_Copy(v3, v2); } - v4 = Options_GetTextFrameDelay(param1->unk_04); + v4 = Options_TextFrameDelay(param1->unk_04); BGL_FillWindow(¶m0->unk_30, 0xFF); v0 = PrintStringSimple(¶m0->unk_30, 1, v3, 0, 0, v4, NULL); diff --git a/src/overlay104/ov104_02231F74.c b/src/overlay104/ov104_02231F74.c index b2db1b5a21..6dbd1988f3 100644 --- a/src/overlay104/ov104_02231F74.c +++ b/src/overlay104/ov104_02231F74.c @@ -158,7 +158,7 @@ void ov104_02231F74 (UnkStruct_ov104_022320B4 * param0, const MessageLoader * pa v4 = sub_0209B970(v3->unk_08); - v0 = Options_GetTextFrameDelay(v4->unk_04); + v0 = Options_TextFrameDelay(v4->unk_04); v1 = 0; v2 = 1; } else { @@ -1095,7 +1095,7 @@ void ov104_0223310C (UnkStruct_ov104_0222E930 * param0, u16 * param1, u32 param2 ov104_02231F74(param0->unk_00, v1, param1[1], 1, NULL); MessageLoader_Free(v1); } else { - v0 = Options_GetTextFrameDelay(sub_02025E44(v2->unk_08)); + v0 = Options_TextFrameDelay(sub_02025E44(v2->unk_08)); ov104_022320B4(param0->unk_00, v0, param1[0], param1[1], param1[2], param1[3], 1); } diff --git a/src/overlay105/ov105_02241AE0.c b/src/overlay105/ov105_02241AE0.c index 798fb435e8..627abe4c0f 100644 --- a/src/overlay105/ov105_02241AE0.c +++ b/src/overlay105/ov105_02241AE0.c @@ -2107,7 +2107,7 @@ static BOOL ov105_02244424 (UnkStruct_ov105_02241FF4 * param0) ov105_02244F00(param0, 2, v2); ov105_0224628C(¶m0->unk_50[5], Options_Frame(param0->unk_138)); - param0->unk_10 = ov105_02244C60(param0, ¶m0->unk_50[5], 16, 1, 1, Options_GetTextFrameDelay(sub_02025E44(param0->unk_13C)), 1, 2, 15, 1); + param0->unk_10 = ov105_02244C60(param0, ¶m0->unk_50[5], 16, 1, 1, Options_TextFrameDelay(sub_02025E44(param0->unk_13C)), 1, 2, 15, 1); sub_0201A9A4(¶m0->unk_50[5]); diff --git a/src/overlay106/ov106_02241AE0.c b/src/overlay106/ov106_02241AE0.c index ce01449d3d..9fe1f6dc7d 100644 --- a/src/overlay106/ov106_02241AE0.c +++ b/src/overlay106/ov106_02241AE0.c @@ -505,7 +505,7 @@ static BOOL ov106_02241E5C (UnkStruct_ov106_02243118 * param0) break; case 4: ov106_02243758(¶m0->unk_4C[0], Options_Frame(param0->unk_B4)); - param0->unk_0A = ov106_02242918(param0, ¶m0->unk_4C[0], 32, 1, 1, Options_GetTextFrameDelay(sub_02025E44(param0->unk_B8)), 1, 2, 15, 1); + param0->unk_0A = ov106_02242918(param0, ¶m0->unk_4C[0], 32, 1, 1, Options_TextFrameDelay(sub_02025E44(param0->unk_B8)), 1, 2, 15, 1); sub_0201A954(¶m0->unk_4C[0]); param0->unk_08 = 5; break; diff --git a/src/overlay113/ov113_0225C700.c b/src/overlay113/ov113_0225C700.c index 48a628aa73..e6b9c3f6f8 100644 --- a/src/overlay113/ov113_0225C700.c +++ b/src/overlay113/ov113_0225C700.c @@ -520,7 +520,7 @@ int ov113_0225CA04 (OverlayManager * param0, int * param1) BGL_FillWindow(&v0->unk_B4, 0xf); sub_0200E060(&v0->unk_B4, 0, 1, 14); MessageLoader_GetStrbuf(v0->unk_30, 2, v0->unk_C4); - v0->unk_C8 = PrintStringSimple(&v0->unk_B4, 1, v0->unk_C4, 0, 0, Options_GetTextFrameDelay(sub_02025E44(v0->unk_04)), NULL); + v0->unk_C8 = PrintStringSimple(&v0->unk_B4, 1, v0->unk_C4, 0, 0, Options_TextFrameDelay(sub_02025E44(v0->unk_04)), NULL); (*param1)++; break; case 4: @@ -570,7 +570,7 @@ int ov113_0225CA04 (OverlayManager * param0, int * param1) BGL_FillWindow(&v0->unk_B4, 0xf); sub_0200E060(&v0->unk_B4, 0, 1, 14); MessageLoader_GetStrbuf(v0->unk_30, 3, v0->unk_C4); - v0->unk_C8 = PrintStringSimple(&v0->unk_B4, 1, v0->unk_C4, 0, 0, Options_GetTextFrameDelay(sub_02025E44(v0->unk_04)), NULL); + v0->unk_C8 = PrintStringSimple(&v0->unk_B4, 1, v0->unk_C4, 0, 0, Options_TextFrameDelay(sub_02025E44(v0->unk_04)), NULL); (*param1)++; break; case 7: diff --git a/src/unk_0205D8CC.c b/src/unk_0205D8CC.c index 8a4ec30ca7..c0bf102c0b 100644 --- a/src/unk_0205D8CC.c +++ b/src/unk_0205D8CC.c @@ -53,7 +53,7 @@ u8 sub_0205D994 (Window * param0, Strbuf *param1, const Options * param2, u8 par sub_02002AE4(0); sub_02002B20(0); - v0 = PrintStringSimple(param0, 1, param1, 0, 0, Options_GetTextFrameDelay(param2), NULL); + v0 = PrintStringSimple(param0, 1, param1, 0, 0, Options_TextFrameDelay(param2), NULL); return v0; } diff --git a/src/unk_0206F314.c b/src/unk_0206F314.c index 242eb2db0b..f7b0a4c9f9 100644 --- a/src/unk_0206F314.c +++ b/src/unk_0206F314.c @@ -213,7 +213,7 @@ static int sub_0206F314 (UnkStruct_0206F314 * param0, FieldSystem * param1, u16 v0->unk_CC = param1; v0->unk_D0 = param1->unk_08; v0->unk_304 = sub_0202E8C0(v1); - v0->unk_1A = Options_GetTextFrameDelay(sub_02025E44(v1)); + v0->unk_1A = Options_TextFrameDelay(sub_02025E44(v1)); v0->unk_1C = Options_Frame(sub_02025E44(v1)); param0->unk_08 = v0; diff --git a/src/unk_020722AC.c b/src/unk_020722AC.c index 9e3a82561e..90965933e2 100644 --- a/src/unk_020722AC.c +++ b/src/unk_020722AC.c @@ -223,7 +223,7 @@ void sub_020722AC (void * param0, int * param1) v0->unk_00 = 43; v0->unk_19 = 0; v0->unk_1A = 0xFF; - v0->unk_16 = Options_GetTextFrameDelay(sub_02025E44(v1)); + v0->unk_16 = Options_TextFrameDelay(sub_02025E44(v1)); v0->unk_14 = Options_Frame(sub_02025E44(v1)); sub_02072ED0(v0->unk_1C, 20, v0->unk_00); diff --git a/src/unk_0207AE68.c b/src/unk_0207AE68.c index 87631ffc14..316219ebcd 100644 --- a/src/unk_0207AE68.c +++ b/src/unk_0207AE68.c @@ -988,7 +988,7 @@ static u8 sub_0207C584 (UnkStruct_0207AE68 * param0, int param1) Heap_FreeToHeap(v0); BGL_FillWindow(param0->unk_04, 0xff); - return PrintStringSimple(param0->unk_04, 1, param0->unk_10, 0, 0, Options_GetTextFrameDelay(param0->unk_2C), sub_0207C5CC); + return PrintStringSimple(param0->unk_04, 1, param0->unk_10, 0, 0, Options_TextFrameDelay(param0->unk_2C), sub_0207C5CC); } static BOOL sub_0207C5CC (UnkStruct_0201D738 * param0, u16 param1) diff --git a/src/unk_020819DC.c b/src/unk_020819DC.c index 0dda48bda7..dfe75ada13 100644 --- a/src/unk_020819DC.c +++ b/src/unk_020819DC.c @@ -620,7 +620,7 @@ void sub_0208274C (GameWindowLayout * param0) sub_02002AC8(1); sub_02002AE4(0); param0->unk_B10 = PrintStringSimple( - ¶m0->unk_04[34], 1, param0->unk_6A4, 0, 0, Options_GetTextFrameDelay(param0->unk_5A4->unk_0C), sub_0208279C); + ¶m0->unk_04[34], 1, param0->unk_6A4, 0, 0, Options_TextFrameDelay(param0->unk_5A4->unk_0C), sub_0208279C); } static BOOL sub_0208279C (UnkStruct_0201D738 * param0, u16 param1) diff --git a/src/unk_02098218.c b/src/unk_02098218.c index 2a10b7702c..4da93f029d 100644 --- a/src/unk_02098218.c +++ b/src/unk_02098218.c @@ -72,7 +72,7 @@ static int sub_02098218 (OverlayManager * param0, int * param1) v0 = OverlayManager_Args(param0); v1->unk_00 = v0; - v1->unk_04.unk_0C = Options_GetTextFrameDelay(v1->unk_00->unk_0C.unk_04); + v1->unk_04.unk_0C = Options_TextFrameDelay(v1->unk_00->unk_0C.unk_04); v1->unk_04.unk_10 = Options_Frame(v1->unk_00->unk_0C.unk_04); v1->unk_04.unk_34 = ov119_021D0DD4(); v1->unk_04.unk_38 = sub_0200762C(71); diff --git a/src/unk_020989DC.c b/src/unk_020989DC.c index 6405c8d32a..282d977305 100644 --- a/src/unk_020989DC.c +++ b/src/unk_020989DC.c @@ -387,7 +387,7 @@ static int sub_02098D7C (UnkStruct_02098BE4 * param0) v1->unk_08 = param0->unk_0C->unk_1C[param0->unk_0C->unk_01].unk_02; v1->unk_04 = sub_0202AC70(param0->unk_0C->unk_08, param0->unk_0C->unk_1C[param0->unk_0C->unk_01].unk_00, param0->unk_00); v1->unk_00 = Party_GetPokemonBySlotIndex(param0->unk_0C->unk_10, param0->unk_08); - v1->unk_0A = Options_GetTextFrameDelay(param0->unk_0C->unk_18); + v1->unk_0A = Options_TextFrameDelay(param0->unk_0C->unk_18); v1->unk_0B = Options_Frame(param0->unk_0C->unk_18); param0->unk_14 = OverlayManager_New(&v0, v1, param0->unk_00); From d8319696c625c9d164b42b29941c5ce441e1832f Mon Sep 17 00:00:00 2001 From: RavePossum Date: Sun, 14 Apr 2024 16:04:15 -0400 Subject: [PATCH 17/23] PR feedback - sound method->mode, allocmemory->new --- include/constants/game_options.h | 6 +++--- include/game_options.h | 9 +++++---- src/game_options.c | 12 ++++++------ src/overlay074/ov74_021D0D80.c | 4 ++-- src/unk_02003B60.c | 2 +- src/unk_02051D8C.c | 2 +- 6 files changed, 18 insertions(+), 17 deletions(-) diff --git a/include/constants/game_options.h b/include/constants/game_options.h index 2b1ddf4b2c..dd320f2890 100644 --- a/include/constants/game_options.h +++ b/include/constants/game_options.h @@ -7,9 +7,9 @@ enum OptionsTextSpeed { OPTIONS_TEXT_SPEED_FAST }; -enum OptionsSoundMethod { - OPTIONS_SOUND_METHOD_STEREO = 0, - OPTIONS_SOUND_METHOD_MONO +enum OptionsSoundMode { + OPTIONS_SOUND_MODE_STEREO = 0, + OPTIONS_SOUND_MODE_MONO }; enum OptionsBattleStyle { diff --git a/include/game_options.h b/include/game_options.h index 318dd6ecc1..bcfd5db5ea 100644 --- a/include/game_options.h +++ b/include/game_options.h @@ -2,10 +2,11 @@ #define POKEPLATINUM_GAME_OPTIONS_H #include "savedata.h" +#include "constants/game_options.h" typedef struct Options { u16 textSpeed : 4; - u16 soundMethod : 2; + u16 soundMode : 2; u16 battleStyle : 1; u16 battleScene : 1; u16 buttonMode : 2; @@ -13,15 +14,15 @@ typedef struct Options { u16 : 1; } Options; -Options* Options_AllocMemory(u32 heapID); +Options* Options_New(u32 heapID); void Options_Copy(const Options *src, Options *dest); void Options_Init(Options *options); void Options_SetSystemButtonMode(SaveData *saveData, int buttonMode); int Options_TextSpeed(const Options *options); void Options_SetTextSpeed(Options *options, int textSpeed); u8 Options_TextFrameDelay(const Options *options); -int Options_SoundMethod(const Options *options); -void Options_SetSoundMethod(Options *options, int soundMethod); +int Options_SoundMode(const Options *options); +void Options_SetSoundMode(Options *options, int soundMode); int Options_BattleScene(const Options *options); void Options_SetBattleScene(Options *options, int battleScene); int Options_BattleStyle(const Options *options); diff --git a/src/game_options.c b/src/game_options.c index fe1755e1b2..e520165e62 100644 --- a/src/game_options.c +++ b/src/game_options.c @@ -11,7 +11,7 @@ #include "game_options.h" #include "core_sys.h" -Options* Options_AllocMemory (u32 heapID) +Options* Options_New (u32 heapID) { Options *options = Heap_AllocFromHeap(heapID, sizeof(Options)); Options_Init(options); @@ -29,7 +29,7 @@ void Options_Init (Options *options) MI_CpuFill8(options, 0, sizeof(Options)); options->textSpeed = OPTIONS_TEXT_SPEED_NORMAL; - options->soundMethod = OPTIONS_SOUND_METHOD_STEREO; + options->soundMode = OPTIONS_SOUND_MODE_STEREO; options->battleStyle = OPTIONS_BATTLE_STYLE_SHIFT; options->battleScene = OPTIONS_BATTLE_SCENE_ON; options->buttonMode = OPTIONS_BUTTON_MODE_NORMAL; @@ -79,14 +79,14 @@ u8 Options_TextFrameDelay (const Options *options) } } -int Options_SoundMethod (const Options *options) +int Options_SoundMode (const Options *options) { - return options->soundMethod; + return options->soundMode; } -void Options_SetSoundMethod (Options *options, int soundMethod) +void Options_SetSoundMode (Options *options, int soundMode) { - options->soundMethod = soundMethod; + options->soundMode = soundMode; } int Options_BattleScene (const Options *options) diff --git a/src/overlay074/ov74_021D0D80.c b/src/overlay074/ov74_021D0D80.c index 9531019d8d..904b449dc4 100644 --- a/src/overlay074/ov74_021D0D80.c +++ b/src/overlay074/ov74_021D0D80.c @@ -113,7 +113,7 @@ int ov74_021D0D80 (OverlayManager * param0, int * param1) v0->unk_18.unk_00_0 = Options_TextSpeed(v1); v0->unk_18.unk_00_6 = Options_BattleScene(v1); v0->unk_18.unk_00_7 = Options_BattleStyle(v1); - v0->unk_18.unk_00_4 = Options_SoundMethod(v1); + v0->unk_18.unk_00_4 = Options_SoundMode(v1); v0->unk_18.unk_00_8 = Options_ButtonMode(v1); v0->unk_18.unk_00_10 = Options_Frame(v1); v0->unk_00 = 38; @@ -140,7 +140,7 @@ int ov74_021D0E58 (OverlayManager * param0, int * param1) Options_SetTextSpeed(v0->unk_1C, v0->unk_18.unk_00_0); Options_SetBattleScene(v0->unk_1C, v0->unk_18.unk_00_6); Options_SetBattleStyle(v0->unk_1C, v0->unk_18.unk_00_7); - Options_SetSoundMethod(v0->unk_1C, v0->unk_18.unk_00_4); + Options_SetSoundMode(v0->unk_1C, v0->unk_18.unk_00_4); Options_SetButtonMode(v0->unk_1C, v0->unk_18.unk_00_8); Options_SetFrame(v0->unk_1C, v0->unk_18.unk_00_10); sub_02004FB8(v0->unk_18.unk_00_4); diff --git a/src/unk_02003B60.c b/src/unk_02003B60.c index 7efd5ebeab..ef791c955e 100644 --- a/src/unk_02003B60.c +++ b/src/unk_02003B60.c @@ -93,7 +93,7 @@ void sub_02003B60 (ChatotCry * param0, Options * param1) Unk_02101DF4 = NNS_SND_CAPTURE_OUTPUT_EFFECT_NORMAL; v0->unk_BCD98 = param0; - sub_02004FB8(param1->soundMethod); + sub_02004FB8(param1->soundMode); return; } diff --git a/src/unk_02051D8C.c b/src/unk_02051D8C.c index 461373de6c..5d7b77b3a8 100644 --- a/src/unk_02051D8C.c +++ b/src/unk_02051D8C.c @@ -104,7 +104,7 @@ BattleParams * sub_02051D8C (int param0, u32 param1) v1->unk_E0 = sub_0207D3C0(param0); v1->unk_E8 = sub_02026324(param0); - v1->unk_108 = Options_AllocMemory(param0); + v1->unk_108 = Options_New(param0); v1->unk_10C = sub_0206D140(param0); v1->unk_E4 = NULL; v1->unk_190 = NULL; From a404d5156fdf9a323b6a3216ccf1aeda5da70396 Mon Sep 17 00:00:00 2001 From: RavePossum Date: Sun, 14 Apr 2024 16:17:07 -0400 Subject: [PATCH 18/23] PR feedback - change setter methods to use enums, remove duplicate include --- include/game_options.h | 12 ++++++------ src/game_options.c | 25 +++++++++++-------------- 2 files changed, 17 insertions(+), 20 deletions(-) diff --git a/include/game_options.h b/include/game_options.h index bcfd5db5ea..d34766827f 100644 --- a/include/game_options.h +++ b/include/game_options.h @@ -19,17 +19,17 @@ void Options_Copy(const Options *src, Options *dest); void Options_Init(Options *options); void Options_SetSystemButtonMode(SaveData *saveData, int buttonMode); int Options_TextSpeed(const Options *options); -void Options_SetTextSpeed(Options *options, int textSpeed); +void Options_SetTextSpeed(Options *options, enum OptionsTextSpeed speed); u8 Options_TextFrameDelay(const Options *options); int Options_SoundMode(const Options *options); -void Options_SetSoundMode(Options *options, int soundMode); +void Options_SetSoundMode(Options *options, enum OptionsSoundMode mode); int Options_BattleScene(const Options *options); -void Options_SetBattleScene(Options *options, int battleScene); +void Options_SetBattleScene(Options *options, enum OptionsBattleScene scene); int Options_BattleStyle(const Options *options); -void Options_SetBattleStyle(Options *options, int battleStyle); +void Options_SetBattleStyle(Options *options, enum OptionsBattleStyle style); int Options_ButtonMode(const Options *options); -void Options_SetButtonMode(Options *options, int buttonMode); +void Options_SetButtonMode(Options *options, enum OptionsButtonMode mode); int Options_Frame(const Options *options); -void Options_SetFrame(Options *options, int frame); +void Options_SetFrame(Options *options, enum OptionsFrame frame); #endif // POKEPLATINUM_GAME_OPTIONS_H diff --git a/src/game_options.c b/src/game_options.c index e520165e62..2e0e2e07a3 100644 --- a/src/game_options.c +++ b/src/game_options.c @@ -1,9 +1,6 @@ #include #include - -#include "constants/game_options.h" - #include "core_sys.h" #include "savedata.h" #include "heap.h" @@ -61,9 +58,9 @@ int Options_TextSpeed (const Options *options) return options->textSpeed; } -void Options_SetTextSpeed (Options *options, int textSpeed) +void Options_SetTextSpeed (Options *options, enum OptionsTextSpeed speed) { - options->textSpeed = textSpeed; + options->textSpeed = speed; } u8 Options_TextFrameDelay (const Options *options) @@ -84,9 +81,9 @@ int Options_SoundMode (const Options *options) return options->soundMode; } -void Options_SetSoundMode (Options *options, int soundMode) +void Options_SetSoundMode (Options *options, enum OptionsSoundMode mode) { - options->soundMode = soundMode; + options->soundMode = mode; } int Options_BattleScene (const Options *options) @@ -94,9 +91,9 @@ int Options_BattleScene (const Options *options) return options->battleScene; } -void Options_SetBattleScene (Options *options, int battleScene) +void Options_SetBattleScene (Options *options, enum OptionsBattleScene scene) { - options->battleScene = battleScene; + options->battleScene = scene; } int Options_BattleStyle (const Options *options) @@ -104,9 +101,9 @@ int Options_BattleStyle (const Options *options) return options->battleStyle; } -void Options_SetBattleStyle (Options *options, int battleStyle) +void Options_SetBattleStyle (Options *options, enum OptionsBattleStyle style) { - options->battleStyle = battleStyle; + options->battleStyle = style; } int Options_ButtonMode (const Options *options) @@ -114,9 +111,9 @@ int Options_ButtonMode (const Options *options) return options->buttonMode; } -void Options_SetButtonMode (Options *options, int buttonMode) +void Options_SetButtonMode (Options *options, enum OptionsButtonMode mode) { - options->buttonMode = buttonMode; + options->buttonMode = mode; } int Options_Frame (const Options *options) @@ -124,7 +121,7 @@ int Options_Frame (const Options *options) return options->frame; } -void Options_SetFrame (Options *options, int frame) +void Options_SetFrame (Options *options, enum OptionsFrame frame) { options->frame = frame; } From 2e065a25ac2034d59f7fa5382887a89655a08e19 Mon Sep 17 00:00:00 2001 From: RavePossum Date: Sun, 14 Apr 2024 16:31:43 -0400 Subject: [PATCH 19/23] add enum type to SetSystemButtonMode signature --- include/game_options.h | 2 +- src/game_options.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/game_options.h b/include/game_options.h index d34766827f..54870379b0 100644 --- a/include/game_options.h +++ b/include/game_options.h @@ -17,7 +17,7 @@ typedef struct Options { Options* Options_New(u32 heapID); void Options_Copy(const Options *src, Options *dest); void Options_Init(Options *options); -void Options_SetSystemButtonMode(SaveData *saveData, int buttonMode); +void Options_SetSystemButtonMode(SaveData *saveData, enum OptionsButtonMode mode); int Options_TextSpeed(const Options *options); void Options_SetTextSpeed(Options *options, enum OptionsTextSpeed speed); u8 Options_TextFrameDelay(const Options *options); diff --git a/src/game_options.c b/src/game_options.c index 2e0e2e07a3..e752f813db 100644 --- a/src/game_options.c +++ b/src/game_options.c @@ -33,13 +33,13 @@ void Options_Init (Options *options) options->frame = OPTIONS_FRAME_1; } -void Options_SetSystemButtonMode (SaveData *saveData, int buttonMode) +void Options_SetSystemButtonMode (SaveData *saveData, enum OptionsButtonMode mode) { - if (saveData != NULL) { - buttonMode = Options_ButtonMode(sub_02025E44(saveData)); + if (saveData != NULL) { + mode = Options_ButtonMode(sub_02025E44(saveData)); } - switch (buttonMode) { + switch (mode) { case OPTIONS_BUTTON_MODE_START_IS_X: gCoreSys.buttonMode = BUTTON_MODE_START_IS_X; break; From ffaddb7c92b2cd50fcecc6683cd69e3675d1cb8e Mon Sep 17 00:00:00 2001 From: Trainer Riley Date: Sun, 14 Apr 2024 13:43:38 -0700 Subject: [PATCH 20/23] Address pull request comments --- include/overlay025/poketch_button.h | 8 ++--- include/struct_defs/union_02022594.h | 20 ------------- include/struct_defs/union_02022594_020225E0.h | 20 ------------- include/touch_screen.h | 6 ++++ src/overlay025/poketch_button.c | 30 +++++++++---------- src/overlay025/poketch_system.c | 6 ++-- src/overlay026/ov26_022561C0.c | 4 +-- src/overlay027/ov27_022561C0.c | 8 ++--- src/overlay028/ov28_022561C0.c | 4 +-- src/overlay029/ov29_022561C0.c | 4 +-- src/overlay030/ov30_022561C0.c | 4 +-- src/overlay035/ov35_022561C0.c | 4 +-- src/overlay036/ov36_022561C0.c | 4 +-- src/overlay037/ov37_022561C0.c | 4 +-- src/overlay039/ov39_022561C0.c | 4 +-- src/overlay041/ov41_022561C0.c | 4 +-- src/overlay043/ov43_022561C0.c | 4 +-- src/overlay044/ov44_022561C0.c | 4 +-- src/overlay045/ov45_022561C0.c | 12 ++++---- src/overlay046/ov46_022561C0.c | 20 ++++++------- src/overlay050/ov50_022561C0.c | 4 +-- src/overlay053/ov53_022561C0.c | 4 +-- src/overlay054/ov54_022561C0.c | 4 +-- 23 files changed, 75 insertions(+), 111 deletions(-) delete mode 100644 include/struct_defs/union_02022594.h delete mode 100644 include/struct_defs/union_02022594_020225E0.h diff --git a/include/overlay025/poketch_button.h b/include/overlay025/poketch_button.h index f579a81993..a63f11cc6b 100644 --- a/include/overlay025/poketch_button.h +++ b/include/overlay025/poketch_button.h @@ -55,11 +55,11 @@ typedef struct PoketchButtonManager { PoketchButton * buttons; } PoketchButtonManager; -PoketchButtonManager * PoketchButtonManager_Create(const TouchScreenHitTable *hitTable, u32 numButtons, PoketchButtonCallback callback, void *callbackData, u32 heapID); -void PoketchButtonManager_Destroy(PoketchButtonManager *buttonManager); +PoketchButtonManager * PoketchButtonManager_New(const TouchScreenHitTable *hitTable, u32 numButtons, PoketchButtonCallback callback, void *callbackData, u32 heapID); +void PoketchButtonManager_Free(PoketchButtonManager *buttonManager); void PoketchButtonManager_Update(PoketchButtonManager *buttonManager); -void PoketchButtonManager_ButtonTimer(PoketchButtonManager *buttonManager, u32 buttonIndex, u32 timerIndex, u16 time); -void PoketchButtonManager_RepeatTime(PoketchButtonManager *buttonManager, u32 index, u16 repeatTime); +void PoketchButtonManager_SetButtonTimer(PoketchButtonManager *buttonManager, u32 buttonIndex, u32 timerIndex, u16 time); +void PoketchButtonManager_SetRepeatTime(PoketchButtonManager *buttonManager, u32 index, u16 repeatTime); void PoketchButtonManager_ResetButtonState(PoketchButtonManager *buttonManager, u32 index); #endif // POKEPLATINUM_POKETCH_BUTTON_H diff --git a/include/struct_defs/union_02022594.h b/include/struct_defs/union_02022594.h deleted file mode 100644 index 5a9e5ad41b..0000000000 --- a/include/struct_defs/union_02022594.h +++ /dev/null @@ -1,20 +0,0 @@ -#ifndef POKEPLATINUM_UNION_02022594_H -#define POKEPLATINUM_UNION_02022594_H - -typedef union { - struct { - u8 unk_00; - u8 unk_01; - u8 unk_02; - u8 unk_03; - } val1; - - struct { - u8 unk_00; - u8 unk_01; - u8 unk_02; - u8 unk_03; - } val2; -} TouchScreenRect, TouchScreenHitTable; - -#endif // POKEPLATINUM_UNION_02022594_H diff --git a/include/struct_defs/union_02022594_020225E0.h b/include/struct_defs/union_02022594_020225E0.h deleted file mode 100644 index a377139918..0000000000 --- a/include/struct_defs/union_02022594_020225E0.h +++ /dev/null @@ -1,20 +0,0 @@ -#ifndef POKEPLATINUM_UNION_02022594_020225E0_H -#define POKEPLATINUM_UNION_02022594_020225E0_H - -typedef union { - struct { - u8 unk_00; - u8 unk_01; - u8 unk_02; - u8 unk_03; - } val1; - - struct { - u8 unk_00; - u8 unk_01; - u8 unk_02; - u8 unk_03; - } val2; -} TouchScreenRect, TouchScreenHitTable; - -#endif // POKEPLATINUM_UNION_02022594_020225E0_H diff --git a/include/touch_screen.h b/include/touch_screen.h index d1f70808e3..d13ca13864 100644 --- a/include/touch_screen.h +++ b/include/touch_screen.h @@ -3,6 +3,12 @@ #define TOUCHSCREEN_USE_CIRCLE 0xfe +/** + * These two structs represent regions that can be checked on the touch screen. + * The first struct, TouchScreenRect, is for strictly rectangular regions. + * The second struct, TouchScreenHitTable, is for rectangles OR circles. + * To enable circle mode, set the 'code' value to TOUCHSCREEN_USE_CIRCLE. +*/ typedef union { struct { u8 top; diff --git a/src/overlay025/poketch_button.c b/src/overlay025/poketch_button.c index b7a930c731..67ed54b3c6 100644 --- a/src/overlay025/poketch_button.c +++ b/src/overlay025/poketch_button.c @@ -8,7 +8,7 @@ #include "heap.h" static void PoketchButton_Init(PoketchButton *button); -static void PoketchButton_ChangeState(PoketchButton *button, u32 state); +static void PoketchButton_ChangeState(PoketchButton *button, enum ButtonEventState state); static void PoketchButton_IncrementTimer(PoketchButton *button); static u32 PoketchButton_CheckTimers(PoketchButton *button); static u32 Button_OnIdle(PoketchButton *button, BOOL touched, BOOL tapped); @@ -17,13 +17,11 @@ static u32 Button_OnCheckDoubleTap(PoketchButton *button, BOOL touched, BOOL tap static u32 Button_OnDoubleTap(PoketchButton *button, BOOL touched, BOOL tapped); static u32 Button_OnReset(PoketchButton *button, BOOL touched, BOOL tapped); -PoketchButtonManager* PoketchButtonManager_Create(const TouchScreenHitTable *hitTable, u32 numButtons, PoketchButtonCallback callback, void *callbackData, u32 heapID) +PoketchButtonManager* PoketchButtonManager_New(const TouchScreenHitTable *hitTable, u32 numButtons, PoketchButtonCallback callback, void *callbackData, u32 heapID) { - PoketchButtonManager *buttonManager; - GF_ASSERT(numButtons > 0); - buttonManager = Heap_AllocFromHeap(heapID, sizeof(PoketchButtonManager)); + PoketchButtonManager *buttonManager = Heap_AllocFromHeap(heapID, sizeof(PoketchButtonManager)); if (buttonManager) { buttonManager->heapID = heapID; @@ -46,7 +44,7 @@ PoketchButtonManager* PoketchButtonManager_Create(const TouchScreenHitTable *hit return buttonManager; } -void PoketchButtonManager_Destroy(PoketchButtonManager *buttonManager) +void PoketchButtonManager_Free(PoketchButtonManager *buttonManager) { GF_ASSERT(buttonManager); Heap_FreeToHeapExplicit(buttonManager->heapID, buttonManager->buttons); @@ -66,7 +64,7 @@ static ButtonEvent sButtonEvents = { void PoketchButtonManager_Update(PoketchButtonManager *buttonManager) { BOOL touched, tapped; - u32 i, button_state, touch_state; + u32 i, buttonState, touchState; touched = TouchScreen_Touched(); @@ -95,17 +93,17 @@ void PoketchButtonManager_Update(PoketchButtonManager *buttonManager) // Call Buttons's state machine function, and then optionally the button manager's currently set callback after that. for (i = 0; i < buttonManager->numButtons; i++) { - button_state = sButtonEvents[buttonManager->buttons[i].state](&buttonManager->buttons[i], touched, tapped); + buttonState = sButtonEvents[buttonManager->buttons[i].state](&buttonManager->buttons[i], touched, tapped); if (buttonManager->buttons[i].screenTouched != buttonManager->buttons[i].prevScreenTouched) { - touch_state = buttonManager->buttons[i].screenTouched; + touchState = buttonManager->buttons[i].screenTouched; } else { - touch_state = BUTTON_TOUCH_DOWN; + touchState = BUTTON_TOUCH_DOWN; } // We only call the button manager's callback once per update, and only if a button's state changed - if ((button_state != BUTTON_MANAGER_STATE_NULL) || (touch_state != BUTTON_TOUCH_DOWN)) { - buttonManager->callback(i, button_state, touch_state, buttonManager->buttonCallbackData); + if (buttonState != BUTTON_MANAGER_STATE_NULL || touchState != BUTTON_TOUCH_DOWN) { + buttonManager->callback(i, buttonState, touchState, buttonManager->buttonCallbackData); break; } } @@ -116,12 +114,12 @@ void PoketchButtonManager_Update(PoketchButtonManager *buttonManager) } } -void PoketchButtonManager_ButtonTimer(PoketchButtonManager *buttonManager, u32 buttonIndex, u32 timerIndex, u16 time) +void PoketchButtonManager_SetButtonTimer(PoketchButtonManager *buttonManager, u32 buttonIndex, u32 timerIndex, u16 time) { buttonManager->buttons[buttonIndex].timerDurations[timerIndex] = time; } -void PoketchButtonManager_RepeatTime(PoketchButtonManager *buttonManager, u32 index, u16 repeatTime) +void PoketchButtonManager_SetRepeatTime(PoketchButtonManager *buttonManager, u32 index, u16 repeatTime) { buttonManager->buttons[index].repeatTime = repeatTime; } @@ -148,14 +146,14 @@ static void PoketchButton_Init(PoketchButton *button) } /** Use enum ButtonEventState for state input. */ -static void PoketchButton_ChangeState(PoketchButton *button, u32 state) +static void PoketchButton_ChangeState(PoketchButton *button, enum ButtonEventState state) { button->state = state; button->timer = 0; } /** Use enum ButtonEventState for state input. */ -static void PoketchButton_ChangeState_NoReset(PoketchButton *button, u32 state) +static void PoketchButton_ChangeState_NoReset(PoketchButton *button, enum ButtonEventState state) { button->state = state; } diff --git a/src/overlay025/poketch_system.c b/src/overlay025/poketch_system.c index a21fb1180a..925043749e 100644 --- a/src/overlay025/poketch_system.c +++ b/src/overlay025/poketch_system.c @@ -560,10 +560,10 @@ static BOOL ov25_02254284 (PoketchSystem *poketchSys) {16, 175, 16, 207} }; - poketchSys->unk_28 = PoketchButtonManager_Create(v0, NELEMS(v0), ov25_022542E4, poketchSys, 7); + poketchSys->unk_28 = PoketchButtonManager_New(v0, NELEMS(v0), ov25_022542E4, poketchSys, 7); if (poketchSys->unk_28 != NULL) { - PoketchButtonManager_ButtonTimer(poketchSys->unk_28, 0, 0, 7); + PoketchButtonManager_SetButtonTimer(poketchSys->unk_28, 0, 0, 7); poketchSys->unk_2C = 0xffffffff; poketchSys->unk_30 = 0xffffffff; return 1; @@ -574,7 +574,7 @@ static BOOL ov25_02254284 (PoketchSystem *poketchSys) static void ov25_022542C8 (PoketchSystem *poketchSys) { - PoketchButtonManager_Destroy(poketchSys->unk_28); + PoketchButtonManager_Free(poketchSys->unk_28); } static void ov25_022542D4 (PoketchSystem *poketchSys) diff --git a/src/overlay026/ov26_022561C0.c b/src/overlay026/ov26_022561C0.c index 5a69aff6f0..7a537c57bb 100644 --- a/src/overlay026/ov26_022561C0.c +++ b/src/overlay026/ov26_022561C0.c @@ -96,7 +96,7 @@ static BOOL ov26_0225621C (UnkStruct_ov26_0225621C * param0, PoketchSystem * par param0->unk_06 = param0->unk_14.unk_00.minute; param0->unk_05 = param0->unk_14.unk_00.hour; - param0->unk_10 = PoketchButtonManager_Create(Unk_ov26_02256718, NELEMS(Unk_ov26_02256718), ov26_02256300, param0, 8); + param0->unk_10 = PoketchButtonManager_New(Unk_ov26_02256718, NELEMS(Unk_ov26_02256718), ov26_02256300, param0, 8); if (param0->unk_10 == NULL) { return 0; @@ -112,7 +112,7 @@ static BOOL ov26_0225621C (UnkStruct_ov26_0225621C * param0, PoketchSystem * par static void ov26_022562A4 (UnkStruct_ov26_0225621C * param0) { ov26_0225649C(param0->unk_24); - PoketchButtonManager_Destroy(param0->unk_10); + PoketchButtonManager_Free(param0->unk_10); Heap_FreeToHeap(param0); } diff --git a/src/overlay027/ov27_022561C0.c b/src/overlay027/ov27_022561C0.c index 8db898c8d2..ed7c0b036e 100644 --- a/src/overlay027/ov27_022561C0.c +++ b/src/overlay027/ov27_022561C0.c @@ -375,11 +375,11 @@ static BOOL ov27_02256608 (UnkStruct_ov27_0225621C * param0) {0xfe, 112, 112, 39}, }; - param0->unk_5C = PoketchButtonManager_Create(v0, NELEMS(v0), ov27_02256660, param0, 8); + param0->unk_5C = PoketchButtonManager_New(v0, NELEMS(v0), ov27_02256660, param0, 8); if (param0->unk_5C != NULL) { - PoketchButtonManager_ButtonTimer(param0->unk_5C, 0, 0, 15); - PoketchButtonManager_ButtonTimer(param0->unk_5C, 0, 1, 75); + PoketchButtonManager_SetButtonTimer(param0->unk_5C, 0, 0, 15); + PoketchButtonManager_SetButtonTimer(param0->unk_5C, 0, 1, 75); param0->unk_04 = 0; return 1; } @@ -389,7 +389,7 @@ static BOOL ov27_02256608 (UnkStruct_ov27_0225621C * param0) static void ov27_02256654 (UnkStruct_ov27_0225621C * param0) { - PoketchButtonManager_Destroy(param0->unk_5C); + PoketchButtonManager_Free(param0->unk_5C); } static void ov27_02256660 (u32 param0, u32 param1, u32 param2, void * param3) diff --git a/src/overlay028/ov28_022561C0.c b/src/overlay028/ov28_022561C0.c index 527d5ac1b5..676a628df3 100644 --- a/src/overlay028/ov28_022561C0.c +++ b/src/overlay028/ov28_022561C0.c @@ -117,7 +117,7 @@ static BOOL ov28_02256210 (UnkStruct_ov28_02256210 * param0, u32 param1, BGL * p return 0; } - param0->unk_0C = PoketchButtonManager_Create(Unk_ov28_02257658, NELEMS(Unk_ov28_02257658), ov28_02256344, param0, 8); + param0->unk_0C = PoketchButtonManager_New(Unk_ov28_02257658, NELEMS(Unk_ov28_02257658), ov28_02256344, param0, 8); if (param0->unk_0C == NULL) { return 0; @@ -142,7 +142,7 @@ static void ov28_02256298 (UnkStruct_ov28_02256210 * param0) } if (param0->unk_0C) { - PoketchButtonManager_Destroy(param0->unk_0C); + PoketchButtonManager_Free(param0->unk_0C); } ov28_022569AC(param0->unk_14); diff --git a/src/overlay029/ov29_022561C0.c b/src/overlay029/ov29_022561C0.c index 8de890cd17..d88cd20fcf 100644 --- a/src/overlay029/ov29_022561C0.c +++ b/src/overlay029/ov29_022561C0.c @@ -85,7 +85,7 @@ static BOOL ov29_0225621C (UnkStruct_ov29_0225621C * param0, PoketchSystem * par param0->unk_01 = 0; param0->unk_02 = 0; param0->unk_03 = 0; - param0->unk_16FC = PoketchButtonManager_Create(Unk_ov29_02256B3C, NELEMS(Unk_ov29_02256B3C), ov29_022562F4, param0, 8); + param0->unk_16FC = PoketchButtonManager_New(Unk_ov29_02256B3C, NELEMS(Unk_ov29_02256B3C), ov29_022562F4, param0, 8); param0->unk_16F8 = param1; return 1; @@ -96,7 +96,7 @@ static BOOL ov29_0225621C (UnkStruct_ov29_0225621C * param0, PoketchSystem * par static void ov29_02256288 (UnkStruct_ov29_0225621C * param0) { - PoketchButtonManager_Destroy(param0->unk_16FC); + PoketchButtonManager_Free(param0->unk_16FC); ov29_02256770(param0->unk_16F4); Heap_FreeToHeap(param0); } diff --git a/src/overlay030/ov30_022561C0.c b/src/overlay030/ov30_022561C0.c index bc60e75ff6..d414c8a1cc 100644 --- a/src/overlay030/ov30_022561C0.c +++ b/src/overlay030/ov30_022561C0.c @@ -93,7 +93,7 @@ static BOOL ov30_0225621C (UnkStruct_ov30_0225621C * param0, PoketchSystem * par } param0->unk_05 = param0->unk_14.unk_00.minute; - param0->unk_10 = PoketchButtonManager_Create(Unk_ov30_02256678, NELEMS(Unk_ov30_02256678), ov30_022562F4, param0, 8); + param0->unk_10 = PoketchButtonManager_New(Unk_ov30_02256678, NELEMS(Unk_ov30_02256678), ov30_022562F4, param0, 8); if (param0->unk_10 == NULL) { return 0; @@ -109,7 +109,7 @@ static BOOL ov30_0225621C (UnkStruct_ov30_0225621C * param0, PoketchSystem * par static void ov30_02256298 (UnkStruct_ov30_0225621C * param0) { ov30_02256444(param0->unk_24); - PoketchButtonManager_Destroy(param0->unk_10); + PoketchButtonManager_Free(param0->unk_10); Heap_FreeToHeap(param0); } diff --git a/src/overlay035/ov35_022561C0.c b/src/overlay035/ov35_022561C0.c index 4803d75a49..b3e599352f 100644 --- a/src/overlay035/ov35_022561C0.c +++ b/src/overlay035/ov35_022561C0.c @@ -87,7 +87,7 @@ static BOOL ov35_0225621C (UnkStruct_ov35_0225621C * param0, PoketchSystem * par param0->unk_00 = 0; param0->unk_01 = 0; param0->unk_02 = 0; - param0->unk_18 = PoketchButtonManager_Create(v0, NELEMS(v0), ov35_02256284, param0, 8); + param0->unk_18 = PoketchButtonManager_New(v0, NELEMS(v0), ov35_02256284, param0, 8); param0->unk_1C = 0; param0->unk_14 = param1; @@ -109,7 +109,7 @@ static void ov35_02256284 (u32 param0, u32 param1, u32 param2, void * param3) static void ov35_0225628C (UnkStruct_ov35_0225621C * param0) { sub_02099D54(param0->unk_04, (u8 *)(&(param0->unk_08.unk_00)), sizeof(u32)); - PoketchButtonManager_Destroy(param0->unk_18); + PoketchButtonManager_Free(param0->unk_18); ov35_0225644C(param0->unk_10); Heap_FreeToHeap(param0); } diff --git a/src/overlay036/ov36_022561C0.c b/src/overlay036/ov36_022561C0.c index 087f546e09..4f195982a2 100644 --- a/src/overlay036/ov36_022561C0.c +++ b/src/overlay036/ov36_022561C0.c @@ -82,7 +82,7 @@ static BOOL ov36_0225621C (UnkStruct_ov36_0225621C * param0, PoketchSystem * par param0->unk_00 = 0; param0->unk_01 = 0; param0->unk_02 = 0; - param0->unk_14 = PoketchButtonManager_Create(v0, NELEMS(v0), ov36_02256278, param0, 8); + param0->unk_14 = PoketchButtonManager_New(v0, NELEMS(v0), ov36_02256278, param0, 8); param0->unk_18 = 0; return 1; @@ -102,7 +102,7 @@ static void ov36_02256278 (u32 param0, u32 param1, u32 param2, void * param3) static void ov36_02256280 (UnkStruct_ov36_0225621C * param0) { - PoketchButtonManager_Destroy(param0->unk_14); + PoketchButtonManager_Free(param0->unk_14); ov36_02256440(param0->unk_0C); Heap_FreeToHeap(param0); diff --git a/src/overlay037/ov37_022561C0.c b/src/overlay037/ov37_022561C0.c index 8d0ae823c9..683c007704 100644 --- a/src/overlay037/ov37_022561C0.c +++ b/src/overlay037/ov37_022561C0.c @@ -78,7 +78,7 @@ static BOOL ov37_0225621C (UnkStruct_ov37_0225621C * param0, PoketchSystem * par param0->unk_00 = 0; param0->unk_01 = 0; param0->unk_02 = 0; - param0->unk_10 = PoketchButtonManager_Create(v0, NELEMS(v0), ov37_02256298, param0, 8); + param0->unk_10 = PoketchButtonManager_New(v0, NELEMS(v0), ov37_02256298, param0, 8); param0->unk_14 = 0; param0->unk_0C = param1; @@ -90,7 +90,7 @@ static BOOL ov37_0225621C (UnkStruct_ov37_0225621C * param0, PoketchSystem * par static void ov37_02256280 (UnkStruct_ov37_0225621C * param0) { - PoketchButtonManager_Destroy(param0->unk_10); + PoketchButtonManager_Free(param0->unk_10); ov37_02256410(param0->unk_08); Heap_FreeToHeap(param0); } diff --git a/src/overlay039/ov39_022561C0.c b/src/overlay039/ov39_022561C0.c index 6392ac56c4..57b191cf18 100644 --- a/src/overlay039/ov39_022561C0.c +++ b/src/overlay039/ov39_022561C0.c @@ -80,7 +80,7 @@ static BOOL ov39_0225621C (UnkStruct_ov39_0225621C * param0, PoketchSystem * par param0->unk_01 = 0; param0->unk_02 = 0; param0->unk_28 = param1; - param0->unk_2C = PoketchButtonManager_Create(v0, NELEMS(v0), ov39_02256284, param0, 8); + param0->unk_2C = PoketchButtonManager_New(v0, NELEMS(v0), ov39_02256284, param0, 8); param0->unk_30 = 0; for (v1 = 0; v1 < 6; v1++) { @@ -96,7 +96,7 @@ static BOOL ov39_0225621C (UnkStruct_ov39_0225621C * param0, PoketchSystem * par static void ov39_02256268 (UnkStruct_ov39_0225621C * param0) { if (param0->unk_2C) { - PoketchButtonManager_Destroy(param0->unk_2C); + PoketchButtonManager_Free(param0->unk_2C); } ov39_0225640C(param0->unk_24); diff --git a/src/overlay041/ov41_022561C0.c b/src/overlay041/ov41_022561C0.c index ee2d06095e..a71730d0fb 100644 --- a/src/overlay041/ov41_022561C0.c +++ b/src/overlay041/ov41_022561C0.c @@ -89,7 +89,7 @@ static BOOL ov41_02256220 (UnkStruct_ov41_02256220 * param0, PoketchSystem * par ov41_02256790(¶m0->unk_04); - param0->unk_5B84 = PoketchButtonManager_Create(v0, NELEMS(v0), ov41_02256300, param0, 8); + param0->unk_5B84 = PoketchButtonManager_New(v0, NELEMS(v0), ov41_02256300, param0, 8); param0->unk_5B88 = 0; param0->unk_5B80 = param1; @@ -101,7 +101,7 @@ static BOOL ov41_02256220 (UnkStruct_ov41_02256220 * param0, PoketchSystem * par static void ov41_02256294 (UnkStruct_ov41_02256220 * param0) { - PoketchButtonManager_Destroy(param0->unk_5B84); + PoketchButtonManager_Free(param0->unk_5B84); ov41_022567F8(param0->unk_5B7C); Heap_FreeToHeap(param0); } diff --git a/src/overlay043/ov43_022561C0.c b/src/overlay043/ov43_022561C0.c index ebd4324f77..3770a99b7a 100644 --- a/src/overlay043/ov43_022561C0.c +++ b/src/overlay043/ov43_022561C0.c @@ -88,7 +88,7 @@ static BOOL ov43_0225621C (UnkStruct_ov43_0225621C * param0, PoketchSystem * par param0->unk_00 = 0; param0->unk_01 = 0; param0->unk_02 = 0; - param0->unk_1C = PoketchButtonManager_Create(v0, NELEMS(v0), ov43_02256308, param0, 8); + param0->unk_1C = PoketchButtonManager_New(v0, NELEMS(v0), ov43_02256308, param0, 8); param0->unk_20 = 0; param0->unk_18 = param1; @@ -110,7 +110,7 @@ static void ov43_02256288 (UnkStruct_ov43_02256544_1 * param0) static void ov43_022562A8 (UnkStruct_ov43_0225621C * param0) { sub_02099D54(param0->unk_04, &(param0->unk_08), sizeof(param0->unk_08)); - PoketchButtonManager_Destroy(param0->unk_1C); + PoketchButtonManager_Free(param0->unk_1C); ov43_02256680(param0->unk_14); Heap_FreeToHeap(param0); } diff --git a/src/overlay044/ov44_022561C0.c b/src/overlay044/ov44_022561C0.c index f16205a100..8f87f455d9 100644 --- a/src/overlay044/ov44_022561C0.c +++ b/src/overlay044/ov44_022561C0.c @@ -110,7 +110,7 @@ static BOOL ov44_0225621C (UnkStruct_ov44_0225621C * param0, PoketchSystem * par param0->unk_00 = 0; param0->unk_01 = 0; param0->unk_02 = 0; - param0->unk_40 = PoketchButtonManager_Create(v4, NELEMS(v4), ov44_0225632C, param0, 8); + param0->unk_40 = PoketchButtonManager_New(v4, NELEMS(v4), ov44_0225632C, param0, 8); param0->unk_46 = 0; param0->unk_3C = param1; @@ -122,7 +122,7 @@ static BOOL ov44_0225621C (UnkStruct_ov44_0225621C * param0, PoketchSystem * par static void ov44_02256314 (UnkStruct_ov44_0225621C * param0) { - PoketchButtonManager_Destroy(param0->unk_40); + PoketchButtonManager_Free(param0->unk_40); ov44_022565F8(param0->unk_38); Heap_FreeToHeap(param0); } diff --git a/src/overlay045/ov45_022561C0.c b/src/overlay045/ov45_022561C0.c index 7d058b1dfc..ca5909cd93 100644 --- a/src/overlay045/ov45_022561C0.c +++ b/src/overlay045/ov45_022561C0.c @@ -102,13 +102,13 @@ static BOOL ov45_0225621C (UnkStruct_ov45_022561D4 * param0, PoketchSystem * par param0->unk_00 = 0; param0->unk_01 = 0; param0->unk_02 = 0; - param0->unk_14 = PoketchButtonManager_Create(v0, NELEMS(v0), ov45_02256310, param0, 8); + param0->unk_14 = PoketchButtonManager_New(v0, NELEMS(v0), ov45_02256310, param0, 8); param0->unk_1C = 0; - PoketchButtonManager_RepeatTime(param0->unk_14, 2, 4); - PoketchButtonManager_RepeatTime(param0->unk_14, 3, 4); - PoketchButtonManager_RepeatTime(param0->unk_14, 4, 4); - PoketchButtonManager_RepeatTime(param0->unk_14, 5, 4); + PoketchButtonManager_SetRepeatTime(param0->unk_14, 2, 4); + PoketchButtonManager_SetRepeatTime(param0->unk_14, 3, 4); + PoketchButtonManager_SetRepeatTime(param0->unk_14, 4, 4); + PoketchButtonManager_SetRepeatTime(param0->unk_14, 5, 4); param0->unk_2C = 0; param0->unk_30 = 0; @@ -140,7 +140,7 @@ static void ov45_022562C0 (UnkStruct_ov45_022566EC_1 * param0) static void ov45_022562F8 (UnkStruct_ov45_022561D4 * param0) { - PoketchButtonManager_Destroy(param0->unk_14); + PoketchButtonManager_Free(param0->unk_14); ov45_02256728(param0->unk_08); Heap_FreeToHeap(param0); diff --git a/src/overlay046/ov46_022561C0.c b/src/overlay046/ov46_022561C0.c index e2ece14c31..2b4dcb7a36 100644 --- a/src/overlay046/ov46_022561C0.c +++ b/src/overlay046/ov46_022561C0.c @@ -196,17 +196,17 @@ static BOOL ov46_02256310 (UnkStruct_ov46_0225621C * param0, PoketchSystem * par param0->unk_00 = 0; param0->unk_01 = 0; param0->unk_03 = 0; - param0->unk_10 = PoketchButtonManager_Create(v0, NELEMS(v0), ov46_022563D8, param0, 8); + param0->unk_10 = PoketchButtonManager_New(v0, NELEMS(v0), ov46_022563D8, param0, 8); param0->unk_18 = 0; - PoketchButtonManager_RepeatTime(param0->unk_10, 3, 4); - PoketchButtonManager_RepeatTime(param0->unk_10, 5, 4); - PoketchButtonManager_RepeatTime(param0->unk_10, 4, 4); - PoketchButtonManager_RepeatTime(param0->unk_10, 6, 4); - PoketchButtonManager_RepeatTime(param0->unk_10, 7, 4); - PoketchButtonManager_RepeatTime(param0->unk_10, 9, 4); - PoketchButtonManager_RepeatTime(param0->unk_10, 8, 4); - PoketchButtonManager_RepeatTime(param0->unk_10, 10, 4); + PoketchButtonManager_SetRepeatTime(param0->unk_10, 3, 4); + PoketchButtonManager_SetRepeatTime(param0->unk_10, 5, 4); + PoketchButtonManager_SetRepeatTime(param0->unk_10, 4, 4); + PoketchButtonManager_SetRepeatTime(param0->unk_10, 6, 4); + PoketchButtonManager_SetRepeatTime(param0->unk_10, 7, 4); + PoketchButtonManager_SetRepeatTime(param0->unk_10, 9, 4); + PoketchButtonManager_SetRepeatTime(param0->unk_10, 8, 4); + PoketchButtonManager_SetRepeatTime(param0->unk_10, 10, 4); param0->unk_0C = param1; return 1; @@ -218,7 +218,7 @@ static BOOL ov46_02256310 (UnkStruct_ov46_0225621C * param0, PoketchSystem * par static void ov46_022563B8 (UnkStruct_ov46_0225621C * param0) { ov46_02256270(param0, ¶m0->unk_48); - PoketchButtonManager_Destroy(param0->unk_10); + PoketchButtonManager_Free(param0->unk_10); ov46_02256C0C(param0->unk_08); Heap_FreeToHeap(param0); diff --git a/src/overlay050/ov50_022561C0.c b/src/overlay050/ov50_022561C0.c index 03d19c6047..9c2cde18cc 100644 --- a/src/overlay050/ov50_022561C0.c +++ b/src/overlay050/ov50_022561C0.c @@ -123,7 +123,7 @@ static BOOL ov50_0225621C (UnkStruct_ov50_022561D4 * param0, PoketchSystem * par param0->unk_00 = 0; param0->unk_01 = 0; param0->unk_02 = 0; - param0->unk_9C = PoketchButtonManager_Create(v0, NELEMS(v0), ov50_02256360, param0, 8); + param0->unk_9C = PoketchButtonManager_New(v0, NELEMS(v0), ov50_02256360, param0, 8); param0->unk_A0 = 0; param0->unk_94 = param1; @@ -165,7 +165,7 @@ static void ov50_022562AC (UnkStruct_ov50_02256510_1 * param0, UnkStruct_ov50_02 static void ov50_02256340 (UnkStruct_ov50_022561D4 * param0) { - PoketchButtonManager_Destroy(param0->unk_9C); + PoketchButtonManager_Free(param0->unk_9C); ov50_0225654C(param0->unk_90); Heap_FreeToHeap(param0); diff --git a/src/overlay053/ov53_022561C0.c b/src/overlay053/ov53_022561C0.c index c4d488a046..60b459ead6 100644 --- a/src/overlay053/ov53_022561C0.c +++ b/src/overlay053/ov53_022561C0.c @@ -110,7 +110,7 @@ static BOOL ov53_0225621C (UnkStruct_ov53_0225621C * param0, PoketchSystem * par param0->unk_00 = 0; param0->unk_01 = 0; param0->unk_02 = 0; - param0->unk_34 = PoketchButtonManager_Create(v0, NELEMS(v0), ov53_02256314, param0, 8); + param0->unk_34 = PoketchButtonManager_New(v0, NELEMS(v0), ov53_02256314, param0, 8); param0->unk_38 = 0; param0->unk_3C = 0; param0->unk_30 = param1; @@ -123,7 +123,7 @@ static BOOL ov53_0225621C (UnkStruct_ov53_0225621C * param0, PoketchSystem * par static void ov53_022562B8 (UnkStruct_ov53_0225621C * param0) { - PoketchButtonManager_Destroy(param0->unk_34); + PoketchButtonManager_Free(param0->unk_34); ov53_02256454(param0->unk_2C); Heap_FreeToHeap(param0); diff --git a/src/overlay054/ov54_022561C0.c b/src/overlay054/ov54_022561C0.c index e5a2de1196..6c8e7d9464 100644 --- a/src/overlay054/ov54_022561C0.c +++ b/src/overlay054/ov54_022561C0.c @@ -155,7 +155,7 @@ static BOOL ov54_0225621C (UnkStruct_ov54_0225621C * param0, PoketchSystem * par param0->unk_00 = 0; param0->unk_01 = 0; param0->unk_02 = 0; - param0->unk_A0 = PoketchButtonManager_Create(v0, NELEMS(v0), ov54_02256340, param0, 8); + param0->unk_A0 = PoketchButtonManager_New(v0, NELEMS(v0), ov54_02256340, param0, 8); param0->unk_A4 = 0; param0->unk_A8 = 0; param0->unk_9C = param1; @@ -168,7 +168,7 @@ static BOOL ov54_0225621C (UnkStruct_ov54_0225621C * param0, PoketchSystem * par static void ov54_022562D4 (UnkStruct_ov54_0225621C * param0) { - PoketchButtonManager_Destroy(param0->unk_A0); + PoketchButtonManager_Free(param0->unk_A0); ov54_02256460(param0->unk_98); Heap_FreeToHeap(param0); From 7ba592f6f4e2b3caa3fb46d99927fd520eb180b6 Mon Sep 17 00:00:00 2001 From: cbt6 <91667135+cbt6@users.noreply.github.com> Date: Thu, 18 Apr 2024 01:12:58 +0800 Subject: [PATCH 21/23] Move UnkStruct_0203E724 to unk_0203E724.h --- include/constdata/const_020EAC58.h | 2 +- include/functypes/funcptr_0203E724.h | 8 ------- include/inlines.h | 2 -- include/overlay005/ov5_021DD42C.h | 2 +- include/overlay005/ov5_021F6454.h | 2 +- include/overlay005/ov5_021F77A8.h | 2 +- include/struct_decls/struct_0203E724_decl.h | 6 ----- include/struct_defs/struct_0203E724_t.h | 25 --------------------- include/unk_0203E724.h | 25 +++++++++++++++++++-- include/unk_0203E880.h | 2 +- include/unk_0203F6C4.h | 2 +- include/unk_02046AD4.h | 2 +- include/unk_02046C7C.h | 2 +- include/unk_020474B8.h | 2 +- include/unk_020480A8.h | 2 +- include/unk_020482D4.h | 2 +- include/unk_02048614.h | 2 +- include/unk_02048BD0.h | 2 +- include/unk_02048DD8.h | 2 +- include/unk_020494DC.h | 2 +- include/unk_0204B64C.h | 2 +- include/unk_0204B830.h | 2 +- include/unk_0204C500.h | 2 +- include/unk_0204C6C8.h | 2 +- include/unk_0204C8F0.h | 2 +- include/unk_0204CA84.h | 2 +- include/unk_0204CDDC.h | 2 +- include/unk_0204CFFC.h | 2 +- include/unk_0204E240.h | 2 +- include/unk_0204E378.h | 2 +- include/unk_0204E3CC.h | 2 +- include/unk_0204E75C.h | 2 +- include/unk_0204E974.h | 2 +- include/unk_0204EDA4.h | 2 +- include/unk_0204F02C.h | 2 +- include/unk_0204F04C.h | 2 +- include/unk_0204F13C.h | 2 +- include/unk_0204FAB4.h | 2 +- include/unk_0205003C.h | 2 +- src/overlay005/ov5_021DD42C.c | 3 +-- src/overlay005/ov5_021F6454.c | 2 -- src/overlay005/ov5_021F77A8.c | 2 -- src/unk_0203E724.c | 5 ----- src/unk_0203E880.c | 2 -- src/unk_0203F6C4.c | 3 --- src/unk_02046AD4.c | 4 +--- src/unk_02046C7C.c | 2 -- src/unk_020474B8.c | 2 -- src/unk_020480A8.c | 3 +-- src/unk_020482D4.c | 3 --- src/unk_02048614.c | 2 -- src/unk_02048BD0.c | 3 --- src/unk_02048DD8.c | 2 -- src/unk_020494DC.c | 2 -- src/unk_0204B64C.c | 3 --- src/unk_0204B830.c | 2 -- src/unk_0204C500.c | 3 +-- src/unk_0204C6C8.c | 2 -- src/unk_0204C8F0.c | 2 -- src/unk_0204CA84.c | 2 -- src/unk_0204CDDC.c | 4 +--- src/unk_0204CFFC.c | 3 +-- src/unk_0204E240.c | 4 +--- src/unk_0204E378.c | 4 +--- src/unk_0204E3CC.c | 3 +-- src/unk_0204E75C.c | 4 +--- src/unk_0204E974.c | 3 +-- src/unk_0204EDA4.c | 2 -- src/unk_0204F02C.c | 4 +--- src/unk_0204F04C.c | 4 +--- src/unk_0204F13C.c | 2 -- src/unk_0204FAB4.c | 2 -- src/unk_0205003C.c | 2 -- 73 files changed, 70 insertions(+), 159 deletions(-) delete mode 100644 include/functypes/funcptr_0203E724.h delete mode 100644 include/struct_decls/struct_0203E724_decl.h delete mode 100644 include/struct_defs/struct_0203E724_t.h diff --git a/include/constdata/const_020EAC58.h b/include/constdata/const_020EAC58.h index 1268a74a91..38d34d21fb 100644 --- a/include/constdata/const_020EAC58.h +++ b/include/constdata/const_020EAC58.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_CONST_020EAC58_H #define POKEPLATINUM_CONST_020EAC58_H -#include "functypes/funcptr_0203E724.h" +#include "unk_0203E724.h" extern const UnkFuncPtr_0203E724 Unk_020EAC58[]; diff --git a/include/functypes/funcptr_0203E724.h b/include/functypes/funcptr_0203E724.h deleted file mode 100644 index fb4f142ba7..0000000000 --- a/include/functypes/funcptr_0203E724.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef POKEPLATINUM_FUNCPTR_0203E724_H -#define POKEPLATINUM_FUNCPTR_0203E724_H - -#include "struct_decls/struct_0203E724_decl.h" - -typedef BOOL (* UnkFuncPtr_0203E724)(UnkStruct_0203E724 *); - -#endif // POKEPLATINUM_FUNCPTR_0203E724_H diff --git a/include/inlines.h b/include/inlines.h index 889b05026f..ac4936f30d 100644 --- a/include/inlines.h +++ b/include/inlines.h @@ -7,10 +7,8 @@ #include "struct_decls/sys_task.h" #include "struct_decls/struct_0203A790_decl.h" #include "struct_decls/struct_020507E4_decl.h" -#include "struct_decls/struct_0203E724_decl.h" #include "field/field_system.h" -#include "struct_defs/struct_0203E724_t.h" #include "struct_defs/struct_02049FA8.h" #include "overlay061/struct_ov61_0222C3B0.h" diff --git a/include/overlay005/ov5_021DD42C.h b/include/overlay005/ov5_021DD42C.h index 72686a6a02..8d3f52476f 100644 --- a/include/overlay005/ov5_021DD42C.h +++ b/include/overlay005/ov5_021DD42C.h @@ -2,7 +2,7 @@ #define POKEPLATINUM_OV5_021DD42C_H #include "message.h" -#include "struct_decls/struct_0203E724_decl.h" +#include "unk_0203E724.h" #include "overlay005/struct_ov5_021DD42C.h" void ov5_021DD42C(UnkStruct_ov5_021DD42C * param0, UnkStruct_0203E724 * param1); diff --git a/include/overlay005/ov5_021F6454.h b/include/overlay005/ov5_021F6454.h index b637e950d6..e7ddcd4cf3 100644 --- a/include/overlay005/ov5_021F6454.h +++ b/include/overlay005/ov5_021F6454.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_OV5_021F6454_H #define POKEPLATINUM_OV5_021F6454_H -#include "struct_decls/struct_0203E724_decl.h" +#include "unk_0203E724.h" BOOL ov5_021F6454(UnkStruct_0203E724 * param0); BOOL ov5_021F6B3C(UnkStruct_0203E724 * param0); diff --git a/include/overlay005/ov5_021F77A8.h b/include/overlay005/ov5_021F77A8.h index d0e64b6218..8755b1bd4a 100644 --- a/include/overlay005/ov5_021F77A8.h +++ b/include/overlay005/ov5_021F77A8.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_OV5_021F77A8_H #define POKEPLATINUM_OV5_021F77A8_H -#include "struct_decls/struct_0203E724_decl.h" +#include "unk_0203E724.h" BOOL ov5_021F77A8(UnkStruct_0203E724 * param0); BOOL ov5_021F77E8(UnkStruct_0203E724 * param0); diff --git a/include/struct_decls/struct_0203E724_decl.h b/include/struct_decls/struct_0203E724_decl.h deleted file mode 100644 index 205de7b27d..0000000000 --- a/include/struct_decls/struct_0203E724_decl.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef POKEPLATINUM_STRUCT_0203E724_DECL_H -#define POKEPLATINUM_STRUCT_0203E724_DECL_H - -typedef struct UnkStruct_0203E724_t UnkStruct_0203E724; - -#endif // POKEPLATINUM_STRUCT_0203E724_DECL_H diff --git a/include/struct_defs/struct_0203E724_t.h b/include/struct_defs/struct_0203E724_t.h deleted file mode 100644 index 9706ad9414..0000000000 --- a/include/struct_defs/struct_0203E724_t.h +++ /dev/null @@ -1,25 +0,0 @@ -#ifndef POKEPLATINUM_STRUCT_0203E724_T_H -#define POKEPLATINUM_STRUCT_0203E724_T_H - -#include "message.h" -#include "field/field_system_decl.h" -#include "functypes/funcptr_0203E724.h" - -struct UnkStruct_0203E724_t { - u8 unk_00; - u8 unk_01; - u8 unk_02; - u8 padding_03; - UnkFuncPtr_0203E724 unk_04; - const u8 * unk_08; - const u8 * unk_0C[20]; - const UnkFuncPtr_0203E724 * unk_10; - u32 unk_14; - u32 unk_18[4]; - void * unk_28; - MessageLoader * unk_2C; - u8 * unk_30; - FieldSystem * unk_34; -}; - -#endif // POKEPLATINUM_STRUCT_0203E724_T_H diff --git a/include/unk_0203E724.h b/include/unk_0203E724.h index 46a17bdbb4..b7bd0dce3b 100644 --- a/include/unk_0203E724.h +++ b/include/unk_0203E724.h @@ -1,8 +1,29 @@ #ifndef POKEPLATINUM_UNK_0203E724_H #define POKEPLATINUM_UNK_0203E724_H -#include "functypes/funcptr_0203E724.h" -#include "struct_decls/struct_0203E724_decl.h" +#include "message.h" +#include "field/field_system_decl.h" + +typedef struct UnkStruct_0203E724 UnkStruct_0203E724; + +typedef BOOL (* UnkFuncPtr_0203E724)(UnkStruct_0203E724 *); + +struct UnkStruct_0203E724 { + u8 unk_00; + u8 unk_01; + u8 unk_02; + u8 padding_03; + UnkFuncPtr_0203E724 unk_04; + const u8 * unk_08; + const u8 * unk_0C[20]; + const UnkFuncPtr_0203E724 * unk_10; + u32 unk_14; + u32 unk_18[4]; + void * unk_28; + MessageLoader * unk_2C; + u8 * unk_30; + FieldSystem * unk_34; +}; void sub_0203E724(UnkStruct_0203E724 * param0, const UnkFuncPtr_0203E724 * param1, u32 param2); u8 sub_0203E758(UnkStruct_0203E724 * param0, const u8 * param1); diff --git a/include/unk_0203E880.h b/include/unk_0203E880.h index 2e0351669f..c3a536ab16 100644 --- a/include/unk_0203E880.h +++ b/include/unk_0203E880.h @@ -2,7 +2,7 @@ #define POKEPLATINUM_UNK_0203E880_H #include "field/field_system_decl.h" -#include "struct_decls/struct_0203E724_decl.h" +#include "unk_0203E724.h" #include "struct_decls/struct_0203EF60_decl.h" #include "struct_defs/struct_0203F478.h" #include "struct_decls/struct_020508D4_decl.h" diff --git a/include/unk_0203F6C4.h b/include/unk_0203F6C4.h index b80bb4459f..60c25c23b4 100644 --- a/include/unk_0203F6C4.h +++ b/include/unk_0203F6C4.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_UNK_0203F6C4_H #define POKEPLATINUM_UNK_0203F6C4_H -#include "struct_decls/struct_0203E724_decl.h" +#include "unk_0203E724.h" BOOL sub_02041CC8(UnkStruct_0203E724 * param0); BOOL sub_02041D60(UnkStruct_0203E724 * param0); diff --git a/include/unk_02046AD4.h b/include/unk_02046AD4.h index 0f82f712c8..30ea6c3b20 100644 --- a/include/unk_02046AD4.h +++ b/include/unk_02046AD4.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_UNK_02046AD4_H #define POKEPLATINUM_UNK_02046AD4_H -#include "struct_decls/struct_0203E724_decl.h" +#include "unk_0203E724.h" BOOL sub_02046AD4(UnkStruct_0203E724 * param0); BOOL sub_02046B9C(UnkStruct_0203E724 * param0); diff --git a/include/unk_02046C7C.h b/include/unk_02046C7C.h index 3296b655ef..e6a037dc83 100644 --- a/include/unk_02046C7C.h +++ b/include/unk_02046C7C.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_UNK_02046C7C_H #define POKEPLATINUM_UNK_02046C7C_H -#include "struct_decls/struct_0203E724_decl.h" +#include "unk_0203E724.h" BOOL sub_02046C7C(UnkStruct_0203E724 * param0); BOOL sub_02046CAC(UnkStruct_0203E724 * param0); diff --git a/include/unk_020474B8.h b/include/unk_020474B8.h index 71ceaba1b2..e0123ad24a 100644 --- a/include/unk_020474B8.h +++ b/include/unk_020474B8.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_UNK_020474B8_H #define POKEPLATINUM_UNK_020474B8_H -#include "struct_decls/struct_0203E724_decl.h" +#include "unk_0203E724.h" BOOL sub_020474B8(UnkStruct_0203E724 * param0); BOOL sub_020474F4(UnkStruct_0203E724 * param0); diff --git a/include/unk_020480A8.h b/include/unk_020480A8.h index 30e6c19e7f..3bfd9da0e7 100644 --- a/include/unk_020480A8.h +++ b/include/unk_020480A8.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_UNK_020480A8_H #define POKEPLATINUM_UNK_020480A8_H -#include "struct_decls/struct_0203E724_decl.h" +#include "unk_0203E724.h" BOOL sub_020480A8(UnkStruct_0203E724 * param0); BOOL sub_020480D8(UnkStruct_0203E724 * param0); diff --git a/include/unk_020482D4.h b/include/unk_020482D4.h index c2e23293fa..28cad6f749 100644 --- a/include/unk_020482D4.h +++ b/include/unk_020482D4.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_UNK_020482D4_H #define POKEPLATINUM_UNK_020482D4_H -#include "struct_decls/struct_0203E724_decl.h" +#include "unk_0203E724.h" BOOL sub_020482D4(UnkStruct_0203E724 * param0); BOOL sub_020482FC(UnkStruct_0203E724 * param0); diff --git a/include/unk_02048614.h b/include/unk_02048614.h index f757b94f38..9af7d3dab8 100644 --- a/include/unk_02048614.h +++ b/include/unk_02048614.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_UNK_02048614_H #define POKEPLATINUM_UNK_02048614_H -#include "struct_decls/struct_0203E724_decl.h" +#include "unk_0203E724.h" BOOL sub_02048614(UnkStruct_0203E724 * param0); BOOL sub_020486E0(UnkStruct_0203E724 * param0); diff --git a/include/unk_02048BD0.h b/include/unk_02048BD0.h index 309ab40835..deb6b72a71 100644 --- a/include/unk_02048BD0.h +++ b/include/unk_02048BD0.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_UNK_02048BD0_H #define POKEPLATINUM_UNK_02048BD0_H -#include "struct_decls/struct_0203E724_decl.h" +#include "unk_0203E724.h" BOOL sub_02048BD0(UnkStruct_0203E724 * param0); diff --git a/include/unk_02048DD8.h b/include/unk_02048DD8.h index 5c685b886f..45036e14cf 100644 --- a/include/unk_02048DD8.h +++ b/include/unk_02048DD8.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_UNK_02048DD8_H #define POKEPLATINUM_UNK_02048DD8_H -#include "struct_decls/struct_0203E724_decl.h" +#include "unk_0203E724.h" BOOL sub_02048DD8(UnkStruct_0203E724 * param0); BOOL sub_02048F74(UnkStruct_0203E724 * param0); diff --git a/include/unk_020494DC.h b/include/unk_020494DC.h index 6085199315..17b2d25934 100644 --- a/include/unk_020494DC.h +++ b/include/unk_020494DC.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_UNK_020494DC_H #define POKEPLATINUM_UNK_020494DC_H -#include "struct_decls/struct_0203E724_decl.h" +#include "unk_0203E724.h" BOOL sub_020494DC(UnkStruct_0203E724 * param0); BOOL sub_0204950C(UnkStruct_0203E724 * param0); diff --git a/include/unk_0204B64C.h b/include/unk_0204B64C.h index 36f9e0aa1a..d80a50c02b 100644 --- a/include/unk_0204B64C.h +++ b/include/unk_0204B64C.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_UNK_0204B64C_H #define POKEPLATINUM_UNK_0204B64C_H -#include "struct_decls/struct_0203E724_decl.h" +#include "unk_0203E724.h" BOOL sub_0204B64C(UnkStruct_0203E724 * param0); BOOL sub_0204B680(UnkStruct_0203E724 * param0); diff --git a/include/unk_0204B830.h b/include/unk_0204B830.h index 2a4b45d04a..6d89ab6536 100644 --- a/include/unk_0204B830.h +++ b/include/unk_0204B830.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_UNK_0204B830_H #define POKEPLATINUM_UNK_0204B830_H -#include "struct_decls/struct_0203E724_decl.h" +#include "unk_0203E724.h" BOOL sub_0204B85C(UnkStruct_0203E724 * param0); diff --git a/include/unk_0204C500.h b/include/unk_0204C500.h index eb88ea54cc..ba8c4b2757 100644 --- a/include/unk_0204C500.h +++ b/include/unk_0204C500.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_UNK_0204C500_H #define POKEPLATINUM_UNK_0204C500_H -#include "struct_decls/struct_0203E724_decl.h" +#include "unk_0203E724.h" BOOL sub_0204C500(UnkStruct_0203E724 * param0); BOOL sub_0204C554(UnkStruct_0203E724 * param0); diff --git a/include/unk_0204C6C8.h b/include/unk_0204C6C8.h index 84b398625f..abc5c9c627 100644 --- a/include/unk_0204C6C8.h +++ b/include/unk_0204C6C8.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_UNK_0204C6C8_H #define POKEPLATINUM_UNK_0204C6C8_H -#include "struct_decls/struct_0203E724_decl.h" +#include "unk_0203E724.h" BOOL sub_0204C6C8(UnkStruct_0203E724 * param0); BOOL sub_0204C718(UnkStruct_0203E724 * param0); diff --git a/include/unk_0204C8F0.h b/include/unk_0204C8F0.h index e9dfdc8957..f854558cfd 100644 --- a/include/unk_0204C8F0.h +++ b/include/unk_0204C8F0.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_UNK_0204C8F0_H #define POKEPLATINUM_UNK_0204C8F0_H -#include "struct_decls/struct_0203E724_decl.h" +#include "unk_0203E724.h" BOOL sub_0204C8F0(UnkStruct_0203E724 * param0); BOOL sub_0204C914(UnkStruct_0203E724 * param0); diff --git a/include/unk_0204CA84.h b/include/unk_0204CA84.h index c00774705e..96bb6feffb 100644 --- a/include/unk_0204CA84.h +++ b/include/unk_0204CA84.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_UNK_0204CA84_H #define POKEPLATINUM_UNK_0204CA84_H -#include "struct_decls/struct_0203E724_decl.h" +#include "unk_0203E724.h" BOOL sub_0204CA84(UnkStruct_0203E724 * param0); BOOL sub_0204CAA4(UnkStruct_0203E724 * param0); diff --git a/include/unk_0204CDDC.h b/include/unk_0204CDDC.h index b8d22fb384..78c6813269 100644 --- a/include/unk_0204CDDC.h +++ b/include/unk_0204CDDC.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_UNK_0204CDDC_H #define POKEPLATINUM_UNK_0204CDDC_H -#include "struct_decls/struct_0203E724_decl.h" +#include "unk_0203E724.h" BOOL sub_0204CDDC(UnkStruct_0203E724 * param0); BOOL sub_0204CDF0(UnkStruct_0203E724 * param0); diff --git a/include/unk_0204CFFC.h b/include/unk_0204CFFC.h index 0bba3b308e..4e0be7aa1f 100644 --- a/include/unk_0204CFFC.h +++ b/include/unk_0204CFFC.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_UNK_0204CFFC_H #define POKEPLATINUM_UNK_0204CFFC_H -#include "struct_decls/struct_0203E724_decl.h" +#include "unk_0203E724.h" BOOL sub_0204CFFC(UnkStruct_0203E724 * param0); BOOL sub_0204D08C(UnkStruct_0203E724 * param0); diff --git a/include/unk_0204E240.h b/include/unk_0204E240.h index 0b36853c79..d0757fa79d 100644 --- a/include/unk_0204E240.h +++ b/include/unk_0204E240.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_UNK_0204E240_H #define POKEPLATINUM_UNK_0204E240_H -#include "struct_decls/struct_0203E724_decl.h" +#include "unk_0203E724.h" BOOL sub_0204E240(UnkStruct_0203E724 * param0); BOOL sub_0204E28C(UnkStruct_0203E724 * param0); diff --git a/include/unk_0204E378.h b/include/unk_0204E378.h index 2af8c75f92..4c3c2b6a9e 100644 --- a/include/unk_0204E378.h +++ b/include/unk_0204E378.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_UNK_0204E378_H #define POKEPLATINUM_UNK_0204E378_H -#include "struct_decls/struct_0203E724_decl.h" +#include "unk_0203E724.h" BOOL sub_0204E378(UnkStruct_0203E724 * param0); diff --git a/include/unk_0204E3CC.h b/include/unk_0204E3CC.h index 5a2f8c3aac..c9c3fd08d7 100644 --- a/include/unk_0204E3CC.h +++ b/include/unk_0204E3CC.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_UNK_0204E3CC_H #define POKEPLATINUM_UNK_0204E3CC_H -#include "struct_decls/struct_0203E724_decl.h" +#include "unk_0203E724.h" BOOL sub_0204E3CC(UnkStruct_0203E724 * param0); BOOL sub_0204E3FC(UnkStruct_0203E724 * param0); diff --git a/include/unk_0204E75C.h b/include/unk_0204E75C.h index 97c9e1346a..38feab307a 100644 --- a/include/unk_0204E75C.h +++ b/include/unk_0204E75C.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_UNK_0204E75C_H #define POKEPLATINUM_UNK_0204E75C_H -#include "struct_decls/struct_0203E724_decl.h" +#include "unk_0203E724.h" BOOL sub_0204E75C(UnkStruct_0203E724 * param0); BOOL sub_0204E7B4(UnkStruct_0203E724 * param0); diff --git a/include/unk_0204E974.h b/include/unk_0204E974.h index 5ed40c8c36..35edadcc1b 100644 --- a/include/unk_0204E974.h +++ b/include/unk_0204E974.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_UNK_0204E974_H #define POKEPLATINUM_UNK_0204E974_H -#include "struct_decls/struct_0203E724_decl.h" +#include "unk_0203E724.h" BOOL sub_0204E974(UnkStruct_0203E724 * param0); BOOL sub_0204E9C8(UnkStruct_0203E724 * param0); diff --git a/include/unk_0204EDA4.h b/include/unk_0204EDA4.h index 8c828e8ac6..b31a40ca2c 100644 --- a/include/unk_0204EDA4.h +++ b/include/unk_0204EDA4.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_UNK_0204EDA4_H #define POKEPLATINUM_UNK_0204EDA4_H -#include "struct_decls/struct_0203E724_decl.h" +#include "unk_0203E724.h" BOOL sub_0204EDA4(UnkStruct_0203E724 * param0); BOOL sub_0204EDEC(UnkStruct_0203E724 * param0); diff --git a/include/unk_0204F02C.h b/include/unk_0204F02C.h index 50aed7ddcb..eed0ec04c9 100644 --- a/include/unk_0204F02C.h +++ b/include/unk_0204F02C.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_UNK_0204F02C_H #define POKEPLATINUM_UNK_0204F02C_H -#include "struct_decls/struct_0203E724_decl.h" +#include "unk_0203E724.h" BOOL sub_0204F02C(UnkStruct_0203E724 * param0); BOOL sub_0204F038(UnkStruct_0203E724 * param0); diff --git a/include/unk_0204F04C.h b/include/unk_0204F04C.h index aa90b03cb8..e111c499fb 100644 --- a/include/unk_0204F04C.h +++ b/include/unk_0204F04C.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_UNK_0204F04C_H #define POKEPLATINUM_UNK_0204F04C_H -#include "struct_decls/struct_0203E724_decl.h" +#include "unk_0203E724.h" BOOL sub_0204F04C(UnkStruct_0203E724 * param0); diff --git a/include/unk_0204F13C.h b/include/unk_0204F13C.h index 4bf35e0534..74d51d7be0 100644 --- a/include/unk_0204F13C.h +++ b/include/unk_0204F13C.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_UNK_0204F13C_H #define POKEPLATINUM_UNK_0204F13C_H -#include "struct_decls/struct_0203E724_decl.h" +#include "unk_0203E724.h" BOOL sub_0204F13C(UnkStruct_0203E724 * param0); BOOL sub_0204F360(UnkStruct_0203E724 * param0); diff --git a/include/unk_0204FAB4.h b/include/unk_0204FAB4.h index 3c21d1926c..5c819f29e4 100644 --- a/include/unk_0204FAB4.h +++ b/include/unk_0204FAB4.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_UNK_0204FAB4_H #define POKEPLATINUM_UNK_0204FAB4_H -#include "struct_decls/struct_0203E724_decl.h" +#include "unk_0203E724.h" BOOL sub_0204FAB4(UnkStruct_0203E724 * param0); BOOL sub_0204FBB4(UnkStruct_0203E724 * param0); diff --git a/include/unk_0205003C.h b/include/unk_0205003C.h index a1d8806932..fda4adbd67 100644 --- a/include/unk_0205003C.h +++ b/include/unk_0205003C.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_UNK_0205003C_H #define POKEPLATINUM_UNK_0205003C_H -#include "struct_decls/struct_0203E724_decl.h" +#include "unk_0203E724.h" BOOL sub_0205003C(UnkStruct_0203E724 * param0); BOOL sub_0205013C(UnkStruct_0203E724 * param0); diff --git a/src/overlay005/ov5_021DD42C.c b/src/overlay005/ov5_021DD42C.c index f24dd58b69..8433728f3c 100644 --- a/src/overlay005/ov5_021DD42C.c +++ b/src/overlay005/ov5_021DD42C.c @@ -3,11 +3,10 @@ #include "message.h" #include "strbuf.h" -#include "struct_decls/struct_0203E724_decl.h" #include "struct_defs/sentence.h" #include "field/field_system.h" -#include "struct_defs/struct_0203E724_t.h" +#include "unk_0203E724.h" #include "struct_defs/struct_0205AA50.h" #include "overlay005/struct_ov5_021DD42C.h" diff --git a/src/overlay005/ov5_021F6454.c b/src/overlay005/ov5_021F6454.c index 3d73389c3a..abf1c49bbd 100644 --- a/src/overlay005/ov5_021F6454.c +++ b/src/overlay005/ov5_021F6454.c @@ -12,7 +12,6 @@ #include "struct_decls/struct_0202C878_decl.h" #include "struct_decls/struct_0202CD88_decl.h" #include "struct_decls/struct_020308A0_decl.h" -#include "struct_decls/struct_0203E724_decl.h" #include "struct_decls/struct_020507E4_decl.h" #include "struct_decls/struct_02061830_decl.h" #include "struct_decls/struct_02061AB4_decl.h" @@ -22,7 +21,6 @@ #include "struct_defs/struct_02013A04_t.h" #include "field/field_system.h" -#include "struct_defs/struct_0203E724_t.h" #include "struct_defs/struct_0205AA50.h" #include "overlay084/struct_ov84_02240FA8.h" diff --git a/src/overlay005/ov5_021F77A8.c b/src/overlay005/ov5_021F77A8.c index 919385081e..c12256ac2d 100644 --- a/src/overlay005/ov5_021F77A8.c +++ b/src/overlay005/ov5_021F77A8.c @@ -8,7 +8,6 @@ #include "struct_decls/struct_02013A04_decl.h" #include "struct_decls/sys_task.h" #include "strbuf.h" -#include "struct_decls/struct_0203E724_decl.h" #include "pokemon.h" #include "struct_decls/struct_0207D3C0_decl.h" #include "overlay005/struct_ov5_021DC1A4_decl.h" @@ -16,7 +15,6 @@ #include "struct_defs/struct_02013A04_t.h" #include "field/field_system.h" -#include "struct_defs/struct_0203E724_t.h" #include "struct_defs/struct_0205AA50.h" #include "overlay084/struct_ov84_02240FA8.h" diff --git a/src/unk_0203E724.c b/src/unk_0203E724.c index 16f9b714fc..6e3277e787 100644 --- a/src/unk_0203E724.c +++ b/src/unk_0203E724.c @@ -1,11 +1,6 @@ #include #include -#include "struct_decls/struct_0203E724_decl.h" - -#include "functypes/funcptr_0203E724.h" -#include "struct_defs/struct_0203E724_t.h" - #include "unk_0203E724.h" void sub_0203E724 (UnkStruct_0203E724 * param0, const UnkFuncPtr_0203E724 * param1, u32 param2) diff --git a/src/unk_0203E880.c b/src/unk_0203E880.c index 2d10d63e8d..df0233a156 100644 --- a/src/unk_0203E880.c +++ b/src/unk_0203E880.c @@ -4,7 +4,6 @@ #include "struct_decls/struct_02001AF4_decl.h" #include "struct_decls/sys_task.h" #include "strbuf.h" -#include "struct_decls/struct_0203E724_decl.h" #include "struct_decls/struct_0203EF60_decl.h" #include "struct_decls/struct_020507E4_decl.h" #include "struct_decls/struct_020508D4_decl.h" @@ -18,7 +17,6 @@ #include "struct_defs/struct_0203A594.h" #include "field/field_system.h" -#include "struct_defs/struct_0203E724_t.h" #include "struct_defs/struct_0203F478.h" #include "struct_defs/struct_0205AA50.h" diff --git a/src/unk_0203F6C4.c b/src/unk_0203F6C4.c index ee71de3852..71cf65ae3a 100644 --- a/src/unk_0203F6C4.c +++ b/src/unk_0203F6C4.c @@ -25,7 +25,6 @@ #include "struct_decls/struct_0202AB28_decl.h" #include "struct_decls/struct_0202CA1C_decl.h" #include "struct_decls/struct_0203A790_decl.h" -#include "struct_decls/struct_0203E724_decl.h" #include "struct_decls/struct_020507E4_decl.h" #include "struct_decls/struct_0205C22C_decl.h" #include "struct_decls/struct_0205E884_decl.h" @@ -50,8 +49,6 @@ #include "field/field_system_sub2_t.h" #include "struct_defs/struct_0203D8AC.h" #include "struct_defs/struct_0203E608.h" -#include "functypes/funcptr_0203E724.h" -#include "struct_defs/struct_0203E724_t.h" #include "struct_defs/struct_02041DC8.h" #include "struct_defs/struct_02042434.h" #include "struct_defs/struct_020425E0.h" diff --git a/src/unk_02046AD4.c b/src/unk_02046AD4.c index b4d2c9e387..988668591b 100644 --- a/src/unk_02046AD4.c +++ b/src/unk_02046AD4.c @@ -3,9 +3,7 @@ #include "inlines.h" -#include "struct_decls/struct_0203E724_decl.h" - -#include "struct_defs/struct_0203E724_t.h" +#include "unk_0203E724.h" #include "unk_02025E08.h" #include "trainer_info.h" diff --git a/src/unk_02046C7C.c b/src/unk_02046C7C.c index bcc8a5b985..486b8a6322 100644 --- a/src/unk_02046C7C.c +++ b/src/unk_02046C7C.c @@ -5,11 +5,9 @@ #include "strbuf.h" #include "trainer_info.h" -#include "struct_decls/struct_0203E724_decl.h" #include "pokemon.h" #include "field/field_system_sub2_t.h" -#include "struct_defs/struct_0203E724_t.h" #include "struct_defs/struct_02093800.h" #include "string_template.h" diff --git a/src/unk_020474B8.c b/src/unk_020474B8.c index 465b402652..1a03823a43 100644 --- a/src/unk_020474B8.c +++ b/src/unk_020474B8.c @@ -6,12 +6,10 @@ #include "message.h" #include "strbuf.h" #include "trainer_info.h" -#include "struct_decls/struct_0203E724_decl.h" #include "pokemon.h" #include "struct_decls/struct_020797DC_decl.h" #include "field/field_system.h" -#include "struct_defs/struct_0203E724_t.h" #include "message.h" #include "string_template.h" diff --git a/src/unk_020480A8.c b/src/unk_020480A8.c index 15f251c913..effd5dad5c 100644 --- a/src/unk_020480A8.c +++ b/src/unk_020480A8.c @@ -3,13 +3,12 @@ #include "inlines.h" -#include "struct_decls/struct_0203E724_decl.h" #include "struct_decls/struct_020507E4_decl.h" #include "pokemon.h" #include "struct_decls/struct_020797DC_decl.h" #include "field/field_system.h" -#include "struct_defs/struct_0203E724_t.h" +#include "unk_0203E724.h" #include "savedata/save_table.h" #include "unk_020480A8.h" diff --git a/src/unk_020482D4.c b/src/unk_020482D4.c index d74cf31abb..7f32938b1d 100644 --- a/src/unk_020482D4.c +++ b/src/unk_020482D4.c @@ -4,10 +4,7 @@ #include "inlines.h" #include "core_sys.h" -#include "struct_decls/struct_0203E724_decl.h" - #include "field/field_system.h" -#include "struct_defs/struct_0203E724_t.h" #include "unk_020041CC.h" #include "unk_02005474.h" diff --git a/src/unk_02048614.c b/src/unk_02048614.c index e37a0300a6..47ca2c26db 100644 --- a/src/unk_02048614.c +++ b/src/unk_02048614.c @@ -4,12 +4,10 @@ #include "inlines.h" #include "struct_decls/sys_task.h" -#include "struct_decls/struct_0203E724_decl.h" #include "struct_decls/struct_0205E884_decl.h" #include "struct_decls/struct_02061AB4_decl.h" #include "field/field_system.h" -#include "struct_defs/struct_0203E724_t.h" #include "unk_020041CC.h" #include "unk_0203E724.h" diff --git a/src/unk_02048BD0.c b/src/unk_02048BD0.c index 0288bb835d..f65d8c3cd5 100644 --- a/src/unk_02048BD0.c +++ b/src/unk_02048BD0.c @@ -6,11 +6,8 @@ #include "strbuf.h" #include "trainer_info.h" #include "struct_decls/struct_0202B4A0_decl.h" -#include "struct_decls/struct_0203E724_decl.h" #include "savedata.h" -#include "struct_defs/struct_0203E724_t.h" - #include "string_template.h" #include "unk_0201D15C.h" #include "strbuf.h" diff --git a/src/unk_02048DD8.c b/src/unk_02048DD8.c index cf8df93af7..78176b9df9 100644 --- a/src/unk_02048DD8.c +++ b/src/unk_02048DD8.c @@ -7,7 +7,6 @@ #include "struct_decls/struct_0202440C_decl.h" #include "struct_decls/struct_0202A750_decl.h" #include "struct_decls/struct_0202CD88_decl.h" -#include "struct_decls/struct_0203E724_decl.h" #include "pokemon.h" #include "struct_decls/struct_party_decl.h" @@ -20,7 +19,6 @@ #include "struct_defs/struct_0202E81C.h" #include "field/field_system.h" #include "field/field_system_sub2_t.h" -#include "struct_defs/struct_0203E724_t.h" #include "message.h" #include "string_template.h" diff --git a/src/unk_020494DC.c b/src/unk_020494DC.c index 4750f9476e..59beb7e040 100644 --- a/src/unk_020494DC.c +++ b/src/unk_020494DC.c @@ -4,11 +4,9 @@ #include "inlines.h" #include "trainer_info.h" -#include "struct_decls/struct_0203E724_decl.h" #include "savedata.h" #include "field/field_system.h" -#include "struct_defs/struct_0203E724_t.h" #include "struct_defs/struct_02049A68.h" #include "struct_defs/struct_0204AFC4.h" #include "struct_defs/struct_0205AA50.h" diff --git a/src/unk_0204B64C.c b/src/unk_0204B64C.c index 272e4e3852..c1ce62a1fc 100644 --- a/src/unk_0204B64C.c +++ b/src/unk_0204B64C.c @@ -4,11 +4,8 @@ #include "inlines.h" #include "struct_decls/struct_0202CD88_decl.h" -#include "struct_decls/struct_0203E724_decl.h" #include "struct_decls/struct_02061AB4_decl.h" -#include "struct_defs/struct_0203E724_t.h" - #include "unk_0202CD50.h" #include "unk_0203E724.h" #include "unk_0203E880.h" diff --git a/src/unk_0204B830.c b/src/unk_0204B830.c index bcf5c4cb5e..b27a273f5a 100644 --- a/src/unk_0204B830.c +++ b/src/unk_0204B830.c @@ -6,7 +6,6 @@ #include "strbuf.h" #include "trainer_info.h" -#include "struct_decls/struct_0203E724_decl.h" #include "struct_decls/struct_020507E4_decl.h" #include "pokemon.h" #include "struct_decls/struct_party_decl.h" @@ -14,7 +13,6 @@ #include "struct_defs/struct_0202610C.h" #include "field/field_system.h" -#include "struct_defs/struct_0203E724_t.h" #include "struct_defs/union_0204C4D0.h" #include "string_template.h" diff --git a/src/unk_0204C500.c b/src/unk_0204C500.c index 1544c33464..c4c44607d1 100644 --- a/src/unk_0204C500.c +++ b/src/unk_0204C500.c @@ -5,11 +5,10 @@ #include "struct_decls/struct_02024440_decl.h" #include "struct_decls/pokedexdata_decl.h" -#include "struct_decls/struct_0203E724_decl.h" #include "struct_decls/struct_020507E4_decl.h" #include "struct_decls/struct_020797DC_decl.h" -#include "struct_defs/struct_0203E724_t.h" +#include "unk_0203E724.h" #include "heap.h" #include "savedata/save_table.h" diff --git a/src/unk_0204C6C8.c b/src/unk_0204C6C8.c index ad929c26a5..8942ee9ef8 100644 --- a/src/unk_0204C6C8.c +++ b/src/unk_0204C6C8.c @@ -4,11 +4,9 @@ #include "inlines.h" #include "trainer_info.h" -#include "struct_decls/struct_0203E724_decl.h" #include "savedata.h" #include "field/field_system.h" -#include "struct_defs/struct_0203E724_t.h" #include "struct_defs/struct_0205AA50.h" #include "unk_02025E08.h" diff --git a/src/unk_0204C8F0.c b/src/unk_0204C8F0.c index d854efc83c..5fba313d1b 100644 --- a/src/unk_0204C8F0.c +++ b/src/unk_0204C8F0.c @@ -4,10 +4,8 @@ #include "inlines.h" #include "trainer_info.h" -#include "struct_decls/struct_0203E724_decl.h" #include "field/field_system.h" -#include "struct_defs/struct_0203E724_t.h" #include "struct_defs/struct_0205AA50.h" #include "unk_02025E08.h" diff --git a/src/unk_0204CA84.c b/src/unk_0204CA84.c index 481475c860..787957c5b2 100644 --- a/src/unk_0204CA84.c +++ b/src/unk_0204CA84.c @@ -5,12 +5,10 @@ #include "trainer_info.h" #include "struct_decls/struct_02026310_decl.h" -#include "struct_decls/struct_0203E724_decl.h" #include "struct_decls/struct_party_decl.h" #include "savedata.h" #include "field/field_system.h" -#include "struct_defs/struct_0203E724_t.h" #include "savedata.h" #include "unk_02025E08.h" diff --git a/src/unk_0204CDDC.c b/src/unk_0204CDDC.c index e4b06ab049..daadf1d949 100644 --- a/src/unk_0204CDDC.c +++ b/src/unk_0204CDDC.c @@ -3,9 +3,7 @@ #include "inlines.h" -#include "struct_decls/struct_0203E724_decl.h" - -#include "struct_defs/struct_0203E724_t.h" +#include "unk_0203E724.h" #include "unk_0201D15C.h" #include "unk_0204CDDC.h" diff --git a/src/unk_0204CFFC.c b/src/unk_0204CFFC.c index c80cb44ec1..77460ff9f7 100644 --- a/src/unk_0204CFFC.c +++ b/src/unk_0204CFFC.c @@ -4,13 +4,12 @@ #include "inlines.h" #include "trainer_info.h" -#include "struct_decls/struct_0203E724_decl.h" #include "pokemon.h" #include "struct_decls/struct_020797DC_decl.h" #include "struct_decls/struct_party_decl.h" #include "field/field_system.h" -#include "struct_defs/struct_0203E724_t.h" +#include "unk_0203E724.h" #include "unk_02017038.h" #include "heap.h" diff --git a/src/unk_0204E240.c b/src/unk_0204E240.c index 38d149827d..077ae1a111 100644 --- a/src/unk_0204E240.c +++ b/src/unk_0204E240.c @@ -3,10 +3,8 @@ #include "inlines.h" -#include "struct_decls/struct_0203E724_decl.h" - #include "field/field_system.h" -#include "struct_defs/struct_0203E724_t.h" +#include "unk_0203E724.h" #include "unk_0204E240.h" #include "unk_0207D3B8.h" diff --git a/src/unk_0204E378.c b/src/unk_0204E378.c index 0105b9a48c..06bc2f2117 100644 --- a/src/unk_0204E378.c +++ b/src/unk_0204E378.c @@ -3,9 +3,7 @@ #include "inlines.h" -#include "struct_decls/struct_0203E724_decl.h" - -#include "struct_defs/struct_0203E724_t.h" +#include "unk_0203E724.h" #include "unk_0204E378.h" diff --git a/src/unk_0204E3CC.c b/src/unk_0204E3CC.c index 1de02b7e3c..1b2f9d96e0 100644 --- a/src/unk_0204E3CC.c +++ b/src/unk_0204E3CC.c @@ -5,10 +5,9 @@ #include "struct_decls/pokedexdata_decl.h" #include "struct_decls/struct_0203A790_decl.h" -#include "struct_decls/struct_0203E724_decl.h" #include "struct_decls/struct_020507E4_decl.h" -#include "struct_defs/struct_0203E724_t.h" +#include "unk_0203E724.h" #include "struct_defs/struct_0205EC34.h" #include "unk_02025E08.h" diff --git a/src/unk_0204E75C.c b/src/unk_0204E75C.c index 32609b09a6..13565fc07d 100644 --- a/src/unk_0204E75C.c +++ b/src/unk_0204E75C.c @@ -3,10 +3,8 @@ #include "inlines.h" -#include "struct_decls/struct_0203E724_decl.h" - #include "field/field_system.h" -#include "struct_defs/struct_0203E724_t.h" +#include "unk_0203E724.h" #include "unk_0204E75C.h" #include "unk_0205DFC4.h" diff --git a/src/unk_0204E974.c b/src/unk_0204E974.c index fe256a7bf4..0e257d3cbb 100644 --- a/src/unk_0204E974.c +++ b/src/unk_0204E974.c @@ -4,11 +4,10 @@ #include "inlines.h" #include "struct_decls/struct_020298B0_decl.h" -#include "struct_decls/struct_0203E724_decl.h" #include "savedata.h" #include "field/field_system.h" -#include "struct_defs/struct_0203E724_t.h" +#include "unk_0203E724.h" #include "unk_0202854C.h" #include "unk_0204E974.h" diff --git a/src/unk_0204EDA4.c b/src/unk_0204EDA4.c index 49ffdd8139..4a586b6fc7 100644 --- a/src/unk_0204EDA4.c +++ b/src/unk_0204EDA4.c @@ -3,10 +3,8 @@ #include "inlines.h" -#include "struct_decls/struct_0203E724_decl.h" #include "pokemon.h" -#include "struct_defs/struct_0203E724_t.h" #include "struct_defs/struct_020997B8.h" #include "heap.h" diff --git a/src/unk_0204F02C.c b/src/unk_0204F02C.c index 051f0fec54..44ddf9035d 100644 --- a/src/unk_0204F02C.c +++ b/src/unk_0204F02C.c @@ -1,9 +1,7 @@ #include #include -#include "struct_decls/struct_0203E724_decl.h" - -#include "struct_defs/struct_0203E724_t.h" +#include "unk_0203E724.h" #include "unk_0204F02C.h" diff --git a/src/unk_0204F04C.c b/src/unk_0204F04C.c index 4a03306db2..2686d70864 100644 --- a/src/unk_0204F04C.c +++ b/src/unk_0204F04C.c @@ -3,10 +3,8 @@ #include "inlines.h" -#include "struct_decls/struct_0203E724_decl.h" - #include "struct_defs/struct_020300F4.h" -#include "struct_defs/struct_0203E724_t.h" +#include "unk_0203E724.h" #include "unk_0202FF4C.h" #include "unk_0203061C.h" diff --git a/src/unk_0204F13C.c b/src/unk_0204F13C.c index 892f4b5561..168af0caa3 100644 --- a/src/unk_0204F13C.c +++ b/src/unk_0204F13C.c @@ -7,7 +7,6 @@ #include "struct_decls/struct_0203026C_decl.h" #include "struct_decls/struct_0203068C_decl.h" #include "struct_decls/struct_020308A0_decl.h" -#include "struct_decls/struct_0203E724_decl.h" #include "struct_decls/struct_020508D4_decl.h" #include "pokemon.h" #include "struct_decls/struct_party_decl.h" @@ -17,7 +16,6 @@ #include "constdata/const_020F410C.h" #include "field/field_system.h" -#include "struct_defs/struct_0203E724_t.h" #include "struct_defs/struct_0204AFC4.h" #include "struct_defs/struct_0204F3D0.h" #include "struct_defs/struct_02098C44.h" diff --git a/src/unk_0204FAB4.c b/src/unk_0204FAB4.c index e4746c95a1..ddfda8a994 100644 --- a/src/unk_0204FAB4.c +++ b/src/unk_0204FAB4.c @@ -5,7 +5,6 @@ #include "struct_decls/struct_020302DC_decl.h" #include "struct_decls/struct_0203041C_decl.h" -#include "struct_decls/struct_0203E724_decl.h" #include "struct_decls/struct_020508D4_decl.h" #include "savedata.h" @@ -13,7 +12,6 @@ #include "constdata/const_020F410C.h" #include "field/field_system.h" -#include "struct_defs/struct_0203E724_t.h" #include "struct_defs/struct_0204AFC4.h" #include "struct_defs/struct_0204FCF8.h" #include "struct_defs/struct_02098C44.h" diff --git a/src/unk_0205003C.c b/src/unk_0205003C.c index 791fff5e72..6f9688acc3 100644 --- a/src/unk_0205003C.c +++ b/src/unk_0205003C.c @@ -5,7 +5,6 @@ #include "struct_decls/struct_020304A0_decl.h" #include "struct_decls/struct_020305B8_decl.h" -#include "struct_decls/struct_0203E724_decl.h" #include "struct_decls/struct_020508D4_decl.h" #include "savedata.h" @@ -13,7 +12,6 @@ #include "constdata/const_020F410C.h" #include "field/field_system.h" -#include "struct_defs/struct_0203E724_t.h" #include "struct_defs/struct_0204AFC4.h" #include "struct_defs/struct_02050224.h" #include "struct_defs/struct_02098C44.h" From a90ee909002e1e4ab787941bf74e004ee29cd0ce Mon Sep 17 00:00:00 2001 From: cbt6 <91667135+cbt6@users.noreply.github.com> Date: Thu, 18 Apr 2024 01:29:07 +0800 Subject: [PATCH 22/23] Document unk_0203E724.c --- include/constdata/const_020EAC58.h | 2 +- include/inlines.h | 8 +- include/overlay005/ov5_021DD42C.h | 10 +- include/overlay005/ov5_021F6454.h | 44 +- include/overlay005/ov5_021F77A8.h | 16 +- include/unk_0203E724.h | 61 +- include/unk_0203E880.h | 2 +- include/unk_0203F6C4.h | 4 +- include/unk_02046AD4.h | 10 +- include/unk_02046C7C.h | 66 +- include/unk_020474B8.h | 92 +- include/unk_020480A8.h | 6 +- include/unk_020482D4.h | 52 +- include/unk_02048614.h | 40 +- include/unk_02048BD0.h | 2 +- include/unk_02048DD8.h | 22 +- include/unk_020494DC.h | 38 +- include/unk_0204B64C.h | 18 +- include/unk_0204B830.h | 2 +- include/unk_0204C500.h | 8 +- include/unk_0204C6C8.h | 20 +- include/unk_0204C8F0.h | 16 +- include/unk_0204CA84.h | 32 +- include/unk_0204CDDC.h | 12 +- include/unk_0204CFFC.h | 82 +- include/unk_0204E240.h | 10 +- include/unk_0204E378.h | 2 +- include/unk_0204E3CC.h | 40 +- include/unk_0204E75C.h | 18 +- include/unk_0204E974.h | 32 +- include/unk_0204EDA4.h | 20 +- include/unk_0204F02C.h | 8 +- include/unk_0204F04C.h | 2 +- include/unk_0204F13C.h | 14 +- include/unk_0204FAB4.h | 6 +- include/unk_0205003C.h | 6 +- src/overlay005/ov5_021DD42C.c | 34 +- src/overlay005/ov5_021F6454.c | 176 +- src/overlay005/ov5_021F77A8.c | 94 +- src/unk_0203E724.c | 187 +- src/unk_0203E880.c | 66 +- src/unk_0203F6C4.c | 4600 ++++++++++++++-------------- src/unk_02046AD4.c | 30 +- src/unk_02046C7C.c | 340 +- src/unk_020474B8.c | 380 +-- src/unk_020480A8.c | 22 +- src/unk_020482D4.c | 194 +- src/unk_02048614.c | 184 +- src/unk_02048BD0.c | 36 +- src/unk_02048DD8.c | 140 +- src/unk_020494DC.c | 226 +- src/unk_0204B64C.c | 74 +- src/unk_0204B830.c | 50 +- src/unk_0204C500.c | 42 +- src/unk_0204C6C8.c | 72 +- src/unk_0204C8F0.c | 54 +- src/unk_0204CA84.c | 110 +- src/unk_0204CDDC.c | 38 +- src/unk_0204CFFC.c | 332 +- src/unk_0204E240.c | 26 +- src/unk_0204E378.c | 8 +- src/unk_0204E3CC.c | 112 +- src/unk_0204E75C.c | 68 +- src/unk_0204E974.c | 160 +- src/unk_0204EDA4.c | 70 +- src/unk_0204F02C.c | 8 +- src/unk_0204F04C.c | 16 +- src/unk_0204F13C.c | 96 +- src/unk_0204FAB4.c | 48 +- src/unk_0205003C.c | 48 +- 70 files changed, 4480 insertions(+), 4484 deletions(-) diff --git a/include/constdata/const_020EAC58.h b/include/constdata/const_020EAC58.h index 38d34d21fb..1af2c1d69e 100644 --- a/include/constdata/const_020EAC58.h +++ b/include/constdata/const_020EAC58.h @@ -3,6 +3,6 @@ #include "unk_0203E724.h" -extern const UnkFuncPtr_0203E724 Unk_020EAC58[]; +extern const ScrCmdFunc Unk_020EAC58[]; #endif // POKEPLATINUM_CONST_020EAC58_H diff --git a/include/inlines.h b/include/inlines.h index ac4936f30d..559ecc5aa4 100644 --- a/include/inlines.h +++ b/include/inlines.h @@ -159,14 +159,14 @@ static inline void inline_02049FA8 (UnkStruct_02049FA8 * param0, int param1, int param0->unk_10 = param5; } -static inline u16 * inline_0204FCAC (UnkStruct_0203E724 * param0) +static inline u16 * ScriptContext_GetVarPointer (ScriptContext * ctx) { - return sub_0203F118(param0->unk_34, sub_0203E838(param0)); + return sub_0203F118(ctx->fieldSys, ScriptContext_ReadHalfWord(ctx)); } -static inline u16 inline_02049538 (UnkStruct_0203E724 * param0) +static inline u16 ScriptContext_GetVar (ScriptContext * ctx) { - return sub_0203F150(param0->unk_34, sub_0203E838(param0)); + return sub_0203F150(ctx->fieldSys, ScriptContext_ReadHalfWord(ctx)); } static inline void inline_0204E650 (UnkStruct_020507E4 * param0) diff --git a/include/overlay005/ov5_021DD42C.h b/include/overlay005/ov5_021DD42C.h index 8d3f52476f..7ff0954263 100644 --- a/include/overlay005/ov5_021DD42C.h +++ b/include/overlay005/ov5_021DD42C.h @@ -5,10 +5,10 @@ #include "unk_0203E724.h" #include "overlay005/struct_ov5_021DD42C.h" -void ov5_021DD42C(UnkStruct_ov5_021DD42C * param0, UnkStruct_0203E724 * param1); -void ov5_021DD444(UnkStruct_0203E724 * param0, const MessageLoader * param1, u16 param2, u8 param3, UnkStruct_ov5_021DD42C * param4); -void ov5_021DD498(UnkStruct_0203E724 * param0, const MessageLoader * param1, int param2); -void ov5_021DD4CC(UnkStruct_0203E724 * param0, u16 param1, u16 param2, u16 param3, s16 param4, u8 param5); -void ov5_021DD530(UnkStruct_0203E724 * param0, StringTemplate * param1, u8 param2, u8 param3); +void ov5_021DD42C(UnkStruct_ov5_021DD42C * param0, ScriptContext * param1); +void ov5_021DD444(ScriptContext * param0, const MessageLoader * param1, u16 param2, u8 param3, UnkStruct_ov5_021DD42C * param4); +void ov5_021DD498(ScriptContext * param0, const MessageLoader * param1, int param2); +void ov5_021DD4CC(ScriptContext * param0, u16 param1, u16 param2, u16 param3, s16 param4, u8 param5); +void ov5_021DD530(ScriptContext * param0, StringTemplate * param1, u8 param2, u8 param3); #endif // POKEPLATINUM_OV5_021DD42C_H diff --git a/include/overlay005/ov5_021F6454.h b/include/overlay005/ov5_021F6454.h index e7ddcd4cf3..8993e16f1a 100644 --- a/include/overlay005/ov5_021F6454.h +++ b/include/overlay005/ov5_021F6454.h @@ -3,27 +3,27 @@ #include "unk_0203E724.h" -BOOL ov5_021F6454(UnkStruct_0203E724 * param0); -BOOL ov5_021F6B3C(UnkStruct_0203E724 * param0); -BOOL ov5_021F6C60(UnkStruct_0203E724 * param0); -BOOL ov5_021F6D80(UnkStruct_0203E724 * param0); -BOOL ov5_021F6E50(UnkStruct_0203E724 * param0); -BOOL ov5_021F6E9C(UnkStruct_0203E724 * param0); -BOOL ov5_021F6F44(UnkStruct_0203E724 * param0); -BOOL ov5_021F6FC0(UnkStruct_0203E724 * param0); -BOOL ov5_021F71B8(UnkStruct_0203E724 * param0); -BOOL ov5_021F7208(UnkStruct_0203E724 * param0); -BOOL ov5_021F7270(UnkStruct_0203E724 * param0); -BOOL ov5_021F72B8(UnkStruct_0203E724 * param0); -BOOL ov5_021F7414(UnkStruct_0203E724 * param0); -BOOL ov5_021F7418(UnkStruct_0203E724 * param0); -BOOL ov5_021F7538(UnkStruct_0203E724 * param0); -BOOL ov5_021F7604(UnkStruct_0203E724 * param0); -BOOL ov5_021F76A0(UnkStruct_0203E724 * param0); -BOOL ov5_021F76D0(UnkStruct_0203E724 * param0); -BOOL ov5_021F7704(UnkStruct_0203E724 * param0); -BOOL ov5_021F7754(UnkStruct_0203E724 * param0); -BOOL ov5_021F7774(UnkStruct_0203E724 * param0); -BOOL ov5_021F7788(UnkStruct_0203E724 * param0); +BOOL ov5_021F6454(ScriptContext * param0); +BOOL ov5_021F6B3C(ScriptContext * param0); +BOOL ov5_021F6C60(ScriptContext * param0); +BOOL ov5_021F6D80(ScriptContext * param0); +BOOL ov5_021F6E50(ScriptContext * param0); +BOOL ov5_021F6E9C(ScriptContext * param0); +BOOL ov5_021F6F44(ScriptContext * param0); +BOOL ov5_021F6FC0(ScriptContext * param0); +BOOL ov5_021F71B8(ScriptContext * param0); +BOOL ov5_021F7208(ScriptContext * param0); +BOOL ov5_021F7270(ScriptContext * param0); +BOOL ov5_021F72B8(ScriptContext * param0); +BOOL ov5_021F7414(ScriptContext * param0); +BOOL ov5_021F7418(ScriptContext * param0); +BOOL ov5_021F7538(ScriptContext * param0); +BOOL ov5_021F7604(ScriptContext * param0); +BOOL ov5_021F76A0(ScriptContext * param0); +BOOL ov5_021F76D0(ScriptContext * param0); +BOOL ov5_021F7704(ScriptContext * param0); +BOOL ov5_021F7754(ScriptContext * param0); +BOOL ov5_021F7774(ScriptContext * param0); +BOOL ov5_021F7788(ScriptContext * param0); #endif // POKEPLATINUM_OV5_021F6454_H diff --git a/include/overlay005/ov5_021F77A8.h b/include/overlay005/ov5_021F77A8.h index 8755b1bd4a..0410be640c 100644 --- a/include/overlay005/ov5_021F77A8.h +++ b/include/overlay005/ov5_021F77A8.h @@ -3,13 +3,13 @@ #include "unk_0203E724.h" -BOOL ov5_021F77A8(UnkStruct_0203E724 * param0); -BOOL ov5_021F77E8(UnkStruct_0203E724 * param0); -BOOL ov5_021F7844(UnkStruct_0203E724 * param0); -BOOL ov5_021F789C(UnkStruct_0203E724 * param0); -BOOL ov5_021F7998(UnkStruct_0203E724 * param0); -BOOL ov5_021F7C04(UnkStruct_0203E724 * param0); -BOOL ov5_021F82B8(UnkStruct_0203E724 * param0); -BOOL ov5_021F8358(UnkStruct_0203E724 * param0); +BOOL ov5_021F77A8(ScriptContext * param0); +BOOL ov5_021F77E8(ScriptContext * param0); +BOOL ov5_021F7844(ScriptContext * param0); +BOOL ov5_021F789C(ScriptContext * param0); +BOOL ov5_021F7998(ScriptContext * param0); +BOOL ov5_021F7C04(ScriptContext * param0); +BOOL ov5_021F82B8(ScriptContext * param0); +BOOL ov5_021F8358(ScriptContext * param0); #endif // POKEPLATINUM_OV5_021F77A8_H diff --git a/include/unk_0203E724.h b/include/unk_0203E724.h index b7bd0dce3b..62e9fa4f59 100644 --- a/include/unk_0203E724.h +++ b/include/unk_0203E724.h @@ -3,40 +3,41 @@ #include "message.h" #include "field/field_system_decl.h" +#include "struct_decls/struct_020508D4_decl.h" -typedef struct UnkStruct_0203E724 UnkStruct_0203E724; +typedef struct ScriptContext ScriptContext; -typedef BOOL (* UnkFuncPtr_0203E724)(UnkStruct_0203E724 *); +typedef BOOL (* ShouldResumeScriptFunc)(ScriptContext *); +typedef BOOL (* ScrCmdFunc)(ScriptContext *); -struct UnkStruct_0203E724 { - u8 unk_00; - u8 unk_01; - u8 unk_02; - u8 padding_03; - UnkFuncPtr_0203E724 unk_04; - const u8 * unk_08; - const u8 * unk_0C[20]; - const UnkFuncPtr_0203E724 * unk_10; - u32 unk_14; - u32 unk_18[4]; - void * unk_28; - MessageLoader * unk_2C; - u8 * unk_30; - FieldSystem * unk_34; +struct ScriptContext { + u8 stackPointer; + u8 state; + u8 comparisonResult; + ShouldResumeScriptFunc shouldResume; + const u8 * scriptPtr; + const u8 * stack[20]; + const ScrCmdFunc * cmdTable; + u32 cmdTableSize; + u32 data[4]; + TaskManager * taskManager; + MessageLoader * loader; + const u8 * scripts; + FieldSystem * fieldSys; }; -void sub_0203E724(UnkStruct_0203E724 * param0, const UnkFuncPtr_0203E724 * param1, u32 param2); -u8 sub_0203E758(UnkStruct_0203E724 * param0, const u8 * param1); -void sub_0203E764(UnkStruct_0203E724 * param0, UnkFuncPtr_0203E724 param1); -void sub_0203E76C(UnkStruct_0203E724 * param0); -void sub_0203E774(UnkStruct_0203E724 * param0, void * param1); -u8 sub_0203E778(UnkStruct_0203E724 * param0); -u8 sub_0203E7E4(UnkStruct_0203E724 * param0, const u8 * param1); -const u8 * sub_0203E800(UnkStruct_0203E724 * param0); -void sub_0203E818(UnkStruct_0203E724 * param0, u8 * param1); -void sub_0203E81C(UnkStruct_0203E724 * param0, u8 * param1); -void sub_0203E82C(UnkStruct_0203E724 * param0); -u16 sub_0203E838(UnkStruct_0203E724 * param0); -u32 sub_0203E850(UnkStruct_0203E724 * param0); +#define ScriptContext_ReadByte(ctx) (*(ctx->scriptPtr++)) + +void ScriptContext_Init(ScriptContext * ctx, const ScrCmdFunc * cmdTable, u32 cmdTableSize); +BOOL ScriptContext_Start(ScriptContext * ctx, const u8 * ptr); +void ScriptContext_Pause(ScriptContext * ctx, ShouldResumeScriptFunc shouldResume); +void ScriptContext_Stop(ScriptContext * ctx); +void ScriptContext_SetTaskManager(ScriptContext * ctx, TaskManager * taskManager); +BOOL ScriptContext_Run(ScriptContext * ctx); +void ScriptContext_Jump(ScriptContext * ctx, const u8 * ptr); +void ScriptContext_Call(ScriptContext * ctx, const u8 * ptr); +void ScriptContext_Return(ScriptContext * ctx); +u16 ScriptContext_ReadHalfWord(ScriptContext * ctx); +u32 ScriptContext_ReadWord(ScriptContext * ctx); #endif // POKEPLATINUM_UNK_0203E724_H diff --git a/include/unk_0203E880.h b/include/unk_0203E880.h index c3a536ab16..f7d18d8e29 100644 --- a/include/unk_0203E880.h +++ b/include/unk_0203E880.h @@ -12,7 +12,7 @@ void sub_0203E880(FieldSystem * param0, u16 param1, LocalMapObject * param2); void sub_0203E8B0(FieldSystem * param0, LocalMapObject * param1, int param2, int param3, int param4, int param5, int param6, int param7); void sub_0203E8E0(TaskManager * param0, u16 param1, LocalMapObject * param2, void * param3); void sub_0203E918(TaskManager * param0, u16 param1, LocalMapObject * param2); -UnkStruct_0203E724 * sub_0203EAB8(FieldSystem * param0, u16 param1); +ScriptContext * sub_0203EAB8(FieldSystem * param0, u16 param1); void * sub_0203EF60(UnkStruct_0203EF60 * param0, u32 param1); void * sub_0203F098(FieldSystem * param0, u32 param1); void sub_0203F0C0(FieldSystem * param0); diff --git a/include/unk_0203F6C4.h b/include/unk_0203F6C4.h index 60c25c23b4..c81f65be03 100644 --- a/include/unk_0203F6C4.h +++ b/include/unk_0203F6C4.h @@ -3,7 +3,7 @@ #include "unk_0203E724.h" -BOOL sub_02041CC8(UnkStruct_0203E724 * param0); -BOOL sub_02041D60(UnkStruct_0203E724 * param0); +BOOL sub_02041CC8(ScriptContext * param0); +BOOL sub_02041D60(ScriptContext * param0); #endif // POKEPLATINUM_UNK_0203F6C4_H diff --git a/include/unk_02046AD4.h b/include/unk_02046AD4.h index 30ea6c3b20..4079387b0d 100644 --- a/include/unk_02046AD4.h +++ b/include/unk_02046AD4.h @@ -3,10 +3,10 @@ #include "unk_0203E724.h" -BOOL sub_02046AD4(UnkStruct_0203E724 * param0); -BOOL sub_02046B9C(UnkStruct_0203E724 * param0); -BOOL sub_02046BF4(UnkStruct_0203E724 * param0); -BOOL sub_02046C34(UnkStruct_0203E724 * param0); -BOOL sub_02046C6C(UnkStruct_0203E724 * param0); +BOOL sub_02046AD4(ScriptContext * param0); +BOOL sub_02046B9C(ScriptContext * param0); +BOOL sub_02046BF4(ScriptContext * param0); +BOOL sub_02046C34(ScriptContext * param0); +BOOL sub_02046C6C(ScriptContext * param0); #endif // POKEPLATINUM_UNK_02046AD4_H diff --git a/include/unk_02046C7C.h b/include/unk_02046C7C.h index e6a037dc83..f4dff8fb7b 100644 --- a/include/unk_02046C7C.h +++ b/include/unk_02046C7C.h @@ -3,38 +3,38 @@ #include "unk_0203E724.h" -BOOL sub_02046C7C(UnkStruct_0203E724 * param0); -BOOL sub_02046CAC(UnkStruct_0203E724 * param0); -BOOL sub_02046CFC(UnkStruct_0203E724 * param0); -BOOL sub_02046E14(UnkStruct_0203E724 * param0); -BOOL sub_02046E60(UnkStruct_0203E724 * param0); -BOOL sub_02046EB4(UnkStruct_0203E724 * param0); -BOOL sub_02046F08(UnkStruct_0203E724 * param0); -BOOL sub_02046F5C(UnkStruct_0203E724 * param0); -BOOL sub_02046FB8(UnkStruct_0203E724 * param0); -BOOL sub_02046FF0(UnkStruct_0203E724 * param0); -BOOL sub_0204700C(UnkStruct_0203E724 * param0); -BOOL sub_02047048(UnkStruct_0203E724 * param0); -BOOL sub_02047084(UnkStruct_0203E724 * param0); -BOOL sub_020470C0(UnkStruct_0203E724 * param0); -BOOL sub_020470F0(UnkStruct_0203E724 * param0); -BOOL sub_0204712C(UnkStruct_0203E724 * param0); -BOOL sub_0204715C(UnkStruct_0203E724 * param0); -BOOL sub_0204718C(UnkStruct_0203E724 * param0); -BOOL sub_020471BC(UnkStruct_0203E724 * param0); -BOOL sub_02047200(UnkStruct_0203E724 * param0); -BOOL sub_02047244(UnkStruct_0203E724 * param0); -BOOL sub_02047274(UnkStruct_0203E724 * param0); -BOOL sub_020472E8(UnkStruct_0203E724 * param0); -BOOL sub_02047318(UnkStruct_0203E724 * param0); -BOOL sub_02047358(UnkStruct_0203E724 * param0); -BOOL sub_02047388(UnkStruct_0203E724 * param0); -BOOL sub_020473A0(UnkStruct_0203E724 * param0); -BOOL sub_020473B8(UnkStruct_0203E724 * param0); -BOOL sub_020473E4(UnkStruct_0203E724 * param0); -BOOL sub_02047424(UnkStruct_0203E724 * param0); -BOOL sub_02047438(UnkStruct_0203E724 * param0); -BOOL sub_0204744C(UnkStruct_0203E724 * param0); -BOOL sub_020474AC(UnkStruct_0203E724 * param0); +BOOL sub_02046C7C(ScriptContext * param0); +BOOL sub_02046CAC(ScriptContext * param0); +BOOL sub_02046CFC(ScriptContext * param0); +BOOL sub_02046E14(ScriptContext * param0); +BOOL sub_02046E60(ScriptContext * param0); +BOOL sub_02046EB4(ScriptContext * param0); +BOOL sub_02046F08(ScriptContext * param0); +BOOL sub_02046F5C(ScriptContext * param0); +BOOL sub_02046FB8(ScriptContext * param0); +BOOL sub_02046FF0(ScriptContext * param0); +BOOL sub_0204700C(ScriptContext * param0); +BOOL sub_02047048(ScriptContext * param0); +BOOL sub_02047084(ScriptContext * param0); +BOOL sub_020470C0(ScriptContext * param0); +BOOL sub_020470F0(ScriptContext * param0); +BOOL sub_0204712C(ScriptContext * param0); +BOOL sub_0204715C(ScriptContext * param0); +BOOL sub_0204718C(ScriptContext * param0); +BOOL sub_020471BC(ScriptContext * param0); +BOOL sub_02047200(ScriptContext * param0); +BOOL sub_02047244(ScriptContext * param0); +BOOL sub_02047274(ScriptContext * param0); +BOOL sub_020472E8(ScriptContext * param0); +BOOL sub_02047318(ScriptContext * param0); +BOOL sub_02047358(ScriptContext * param0); +BOOL sub_02047388(ScriptContext * param0); +BOOL sub_020473A0(ScriptContext * param0); +BOOL sub_020473B8(ScriptContext * param0); +BOOL sub_020473E4(ScriptContext * param0); +BOOL sub_02047424(ScriptContext * param0); +BOOL sub_02047438(ScriptContext * param0); +BOOL sub_0204744C(ScriptContext * param0); +BOOL sub_020474AC(ScriptContext * param0); #endif // POKEPLATINUM_UNK_02046C7C_H diff --git a/include/unk_020474B8.h b/include/unk_020474B8.h index e0123ad24a..67c518a665 100644 --- a/include/unk_020474B8.h +++ b/include/unk_020474B8.h @@ -3,51 +3,51 @@ #include "unk_0203E724.h" -BOOL sub_020474B8(UnkStruct_0203E724 * param0); -BOOL sub_020474F4(UnkStruct_0203E724 * param0); -BOOL sub_02047528(UnkStruct_0203E724 * param0); -BOOL sub_0204754C(UnkStruct_0203E724 * param0); -BOOL sub_02047570(UnkStruct_0203E724 * param0); -BOOL sub_020475B8(UnkStruct_0203E724 * param0); -BOOL sub_020475F0(UnkStruct_0203E724 * param0); -BOOL sub_02047628(UnkStruct_0203E724 * param0); -BOOL sub_02047660(UnkStruct_0203E724 * param0); -BOOL sub_0204769C(UnkStruct_0203E724 * param0); -BOOL sub_020476D4(UnkStruct_0203E724 * param0); -BOOL sub_0204771C(UnkStruct_0203E724 * param0); -BOOL sub_0204777C(UnkStruct_0203E724 * param0); -BOOL sub_020477D0(UnkStruct_0203E724 * param0); -BOOL sub_02047818(UnkStruct_0203E724 * param0); -BOOL sub_02047874(UnkStruct_0203E724 * param0); -BOOL sub_020478AC(UnkStruct_0203E724 * param0); -BOOL sub_020478E4(UnkStruct_0203E724 * param0); -BOOL sub_02047930(UnkStruct_0203E724 * param0); -BOOL sub_020479C0(UnkStruct_0203E724 * param0); -BOOL sub_02047A10(UnkStruct_0203E724 * param0); -BOOL sub_02047A60(UnkStruct_0203E724 * param0); -BOOL sub_02047AB0(UnkStruct_0203E724 * param0); -BOOL sub_02047AE8(UnkStruct_0203E724 * param0); -BOOL sub_02047B20(UnkStruct_0203E724 * param0); -BOOL sub_02047B58(UnkStruct_0203E724 * param0); -BOOL sub_02047BB8(UnkStruct_0203E724 * param0); -BOOL sub_02047C30(UnkStruct_0203E724 * param0); -BOOL sub_02047C68(UnkStruct_0203E724 * param0); -BOOL sub_02047CA0(UnkStruct_0203E724 * param0); -BOOL sub_02047D00(UnkStruct_0203E724 * param0); -BOOL sub_02047D68(UnkStruct_0203E724 * param0); -BOOL sub_02047DAC(UnkStruct_0203E724 * param0); -BOOL sub_02047DE8(UnkStruct_0203E724 * param0); -BOOL sub_02047E20(UnkStruct_0203E724 * param0); -BOOL sub_02047E58(UnkStruct_0203E724 * param0); -BOOL sub_02047E90(UnkStruct_0203E724 * param0); -BOOL sub_02047EC8(UnkStruct_0203E724 * param0); -BOOL sub_02047F00(UnkStruct_0203E724 * param0); -BOOL sub_02047F38(UnkStruct_0203E724 * param0); -BOOL sub_02047F80(UnkStruct_0203E724 * param0); -BOOL sub_02047FB4(UnkStruct_0203E724 * param0); -BOOL sub_02047FEC(UnkStruct_0203E724 * param0); -BOOL sub_02048024(UnkStruct_0203E724 * param0); -BOOL sub_02048060(UnkStruct_0203E724 * param0); -BOOL sub_02048080(UnkStruct_0203E724 * param0); +BOOL sub_020474B8(ScriptContext * param0); +BOOL sub_020474F4(ScriptContext * param0); +BOOL sub_02047528(ScriptContext * param0); +BOOL sub_0204754C(ScriptContext * param0); +BOOL sub_02047570(ScriptContext * param0); +BOOL sub_020475B8(ScriptContext * param0); +BOOL sub_020475F0(ScriptContext * param0); +BOOL sub_02047628(ScriptContext * param0); +BOOL sub_02047660(ScriptContext * param0); +BOOL sub_0204769C(ScriptContext * param0); +BOOL sub_020476D4(ScriptContext * param0); +BOOL sub_0204771C(ScriptContext * param0); +BOOL sub_0204777C(ScriptContext * param0); +BOOL sub_020477D0(ScriptContext * param0); +BOOL sub_02047818(ScriptContext * param0); +BOOL sub_02047874(ScriptContext * param0); +BOOL sub_020478AC(ScriptContext * param0); +BOOL sub_020478E4(ScriptContext * param0); +BOOL sub_02047930(ScriptContext * param0); +BOOL sub_020479C0(ScriptContext * param0); +BOOL sub_02047A10(ScriptContext * param0); +BOOL sub_02047A60(ScriptContext * param0); +BOOL sub_02047AB0(ScriptContext * param0); +BOOL sub_02047AE8(ScriptContext * param0); +BOOL sub_02047B20(ScriptContext * param0); +BOOL sub_02047B58(ScriptContext * param0); +BOOL sub_02047BB8(ScriptContext * param0); +BOOL sub_02047C30(ScriptContext * param0); +BOOL sub_02047C68(ScriptContext * param0); +BOOL sub_02047CA0(ScriptContext * param0); +BOOL sub_02047D00(ScriptContext * param0); +BOOL sub_02047D68(ScriptContext * param0); +BOOL sub_02047DAC(ScriptContext * param0); +BOOL sub_02047DE8(ScriptContext * param0); +BOOL sub_02047E20(ScriptContext * param0); +BOOL sub_02047E58(ScriptContext * param0); +BOOL sub_02047E90(ScriptContext * param0); +BOOL sub_02047EC8(ScriptContext * param0); +BOOL sub_02047F00(ScriptContext * param0); +BOOL sub_02047F38(ScriptContext * param0); +BOOL sub_02047F80(ScriptContext * param0); +BOOL sub_02047FB4(ScriptContext * param0); +BOOL sub_02047FEC(ScriptContext * param0); +BOOL sub_02048024(ScriptContext * param0); +BOOL sub_02048060(ScriptContext * param0); +BOOL sub_02048080(ScriptContext * param0); #endif // POKEPLATINUM_UNK_020474B8_H diff --git a/include/unk_020480A8.h b/include/unk_020480A8.h index 3bfd9da0e7..c933dc992e 100644 --- a/include/unk_020480A8.h +++ b/include/unk_020480A8.h @@ -3,8 +3,8 @@ #include "unk_0203E724.h" -BOOL sub_020480A8(UnkStruct_0203E724 * param0); -BOOL sub_020480D8(UnkStruct_0203E724 * param0); -BOOL sub_02048254(UnkStruct_0203E724 * param0); +BOOL sub_020480A8(ScriptContext * param0); +BOOL sub_020480D8(ScriptContext * param0); +BOOL sub_02048254(ScriptContext * param0); #endif // POKEPLATINUM_UNK_020480A8_H diff --git a/include/unk_020482D4.h b/include/unk_020482D4.h index 28cad6f749..2fc495b246 100644 --- a/include/unk_020482D4.h +++ b/include/unk_020482D4.h @@ -3,31 +3,31 @@ #include "unk_0203E724.h" -BOOL sub_020482D4(UnkStruct_0203E724 * param0); -BOOL sub_020482FC(UnkStruct_0203E724 * param0); -BOOL sub_0204830C(UnkStruct_0203E724 * param0); -BOOL sub_02048320(UnkStruct_0203E724 * param0); -BOOL sub_02048338(UnkStruct_0203E724 * param0); -BOOL sub_02048350(UnkStruct_0203E724 * param0); -BOOL sub_0204838C(UnkStruct_0203E724 * param0); -BOOL sub_020483B0(UnkStruct_0203E724 * param0); -BOOL sub_020483CC(UnkStruct_0203E724 * param0); -BOOL sub_020483E0(UnkStruct_0203E724 * param0); -BOOL sub_020483F4(UnkStruct_0203E724 * param0); -BOOL sub_02048410(UnkStruct_0203E724 * param0); -BOOL sub_0204842C(UnkStruct_0203E724 * param0); -BOOL sub_0204846C(UnkStruct_0203E724 * param0); -BOOL sub_020484A0(UnkStruct_0203E724 * param0); -BOOL sub_020484C4(UnkStruct_0203E724 * param0); -BOOL sub_020484D4(UnkStruct_0203E724 * param0); -BOOL sub_020484F8(UnkStruct_0203E724 * param0); -BOOL sub_02048530(UnkStruct_0203E724 * param0); -BOOL sub_0204855C(UnkStruct_0203E724 * param0); -BOOL sub_02048568(UnkStruct_0203E724 * param0); -BOOL sub_0204857C(UnkStruct_0203E724 * param0); -BOOL sub_0204858C(UnkStruct_0203E724 * param0); -BOOL sub_020485C0(UnkStruct_0203E724 * param0); -BOOL sub_020485D4(UnkStruct_0203E724 * param0); -BOOL sub_020485F4(UnkStruct_0203E724 * param0); +BOOL sub_020482D4(ScriptContext * param0); +BOOL sub_020482FC(ScriptContext * param0); +BOOL sub_0204830C(ScriptContext * param0); +BOOL sub_02048320(ScriptContext * param0); +BOOL sub_02048338(ScriptContext * param0); +BOOL sub_02048350(ScriptContext * param0); +BOOL sub_0204838C(ScriptContext * param0); +BOOL sub_020483B0(ScriptContext * param0); +BOOL sub_020483CC(ScriptContext * param0); +BOOL sub_020483E0(ScriptContext * param0); +BOOL sub_020483F4(ScriptContext * param0); +BOOL sub_02048410(ScriptContext * param0); +BOOL sub_0204842C(ScriptContext * param0); +BOOL sub_0204846C(ScriptContext * param0); +BOOL sub_020484A0(ScriptContext * param0); +BOOL sub_020484C4(ScriptContext * param0); +BOOL sub_020484D4(ScriptContext * param0); +BOOL sub_020484F8(ScriptContext * param0); +BOOL sub_02048530(ScriptContext * param0); +BOOL sub_0204855C(ScriptContext * param0); +BOOL sub_02048568(ScriptContext * param0); +BOOL sub_0204857C(ScriptContext * param0); +BOOL sub_0204858C(ScriptContext * param0); +BOOL sub_020485C0(ScriptContext * param0); +BOOL sub_020485D4(ScriptContext * param0); +BOOL sub_020485F4(ScriptContext * param0); #endif // POKEPLATINUM_UNK_020482D4_H diff --git a/include/unk_02048614.h b/include/unk_02048614.h index 9af7d3dab8..801da8397b 100644 --- a/include/unk_02048614.h +++ b/include/unk_02048614.h @@ -3,25 +3,25 @@ #include "unk_0203E724.h" -BOOL sub_02048614(UnkStruct_0203E724 * param0); -BOOL sub_020486E0(UnkStruct_0203E724 * param0); -BOOL sub_02048750(UnkStruct_0203E724 * param0); -BOOL sub_02048778(UnkStruct_0203E724 * param0); -BOOL sub_020487CC(UnkStruct_0203E724 * param0); -BOOL sub_020487FC(UnkStruct_0203E724 * param0); -BOOL sub_0204887C(UnkStruct_0203E724 * param0); -BOOL sub_020488E0(UnkStruct_0203E724 * param0); -BOOL sub_02048968(UnkStruct_0203E724 * param0); -BOOL sub_020489F0(UnkStruct_0203E724 * param0); -BOOL sub_02048A24(UnkStruct_0203E724 * param0); -BOOL sub_02048A44(UnkStruct_0203E724 * param0); -BOOL sub_02048A50(UnkStruct_0203E724 * param0); -BOOL sub_02048A80(UnkStruct_0203E724 * param0); -BOOL sub_02048AB0(UnkStruct_0203E724 * param0); -BOOL sub_02048AE0(UnkStruct_0203E724 * param0); -BOOL sub_02048B0C(UnkStruct_0203E724 * param0); -BOOL sub_02048B34(UnkStruct_0203E724 * param0); -BOOL sub_02048B60(UnkStruct_0203E724 * param0); -BOOL sub_02048BA8(UnkStruct_0203E724 * param0); +BOOL sub_02048614(ScriptContext * param0); +BOOL sub_020486E0(ScriptContext * param0); +BOOL sub_02048750(ScriptContext * param0); +BOOL sub_02048778(ScriptContext * param0); +BOOL sub_020487CC(ScriptContext * param0); +BOOL sub_020487FC(ScriptContext * param0); +BOOL sub_0204887C(ScriptContext * param0); +BOOL sub_020488E0(ScriptContext * param0); +BOOL sub_02048968(ScriptContext * param0); +BOOL sub_020489F0(ScriptContext * param0); +BOOL sub_02048A24(ScriptContext * param0); +BOOL sub_02048A44(ScriptContext * param0); +BOOL sub_02048A50(ScriptContext * param0); +BOOL sub_02048A80(ScriptContext * param0); +BOOL sub_02048AB0(ScriptContext * param0); +BOOL sub_02048AE0(ScriptContext * param0); +BOOL sub_02048B0C(ScriptContext * param0); +BOOL sub_02048B34(ScriptContext * param0); +BOOL sub_02048B60(ScriptContext * param0); +BOOL sub_02048BA8(ScriptContext * param0); #endif // POKEPLATINUM_UNK_02048614_H diff --git a/include/unk_02048BD0.h b/include/unk_02048BD0.h index deb6b72a71..17f9a13430 100644 --- a/include/unk_02048BD0.h +++ b/include/unk_02048BD0.h @@ -3,6 +3,6 @@ #include "unk_0203E724.h" -BOOL sub_02048BD0(UnkStruct_0203E724 * param0); +BOOL sub_02048BD0(ScriptContext * param0); #endif // POKEPLATINUM_UNK_02048BD0_H diff --git a/include/unk_02048DD8.h b/include/unk_02048DD8.h index 45036e14cf..e8a4ab6349 100644 --- a/include/unk_02048DD8.h +++ b/include/unk_02048DD8.h @@ -3,16 +3,16 @@ #include "unk_0203E724.h" -BOOL sub_02048DD8(UnkStruct_0203E724 * param0); -BOOL sub_02048F74(UnkStruct_0203E724 * param0); -BOOL sub_02048F98(UnkStruct_0203E724 * param0); -BOOL sub_02048FD0(UnkStruct_0203E724 * param0); -BOOL sub_02048FE0(UnkStruct_0203E724 * param0); -BOOL sub_02048FF0(UnkStruct_0203E724 * param0); -BOOL sub_02049018(UnkStruct_0203E724 * param0); -BOOL sub_020490F0(UnkStruct_0203E724 * param0); -BOOL sub_0204912C(UnkStruct_0203E724 * param0); -BOOL sub_020493C8(UnkStruct_0203E724 * param0); -BOOL sub_020493F4(UnkStruct_0203E724 * param0); +BOOL sub_02048DD8(ScriptContext * param0); +BOOL sub_02048F74(ScriptContext * param0); +BOOL sub_02048F98(ScriptContext * param0); +BOOL sub_02048FD0(ScriptContext * param0); +BOOL sub_02048FE0(ScriptContext * param0); +BOOL sub_02048FF0(ScriptContext * param0); +BOOL sub_02049018(ScriptContext * param0); +BOOL sub_020490F0(ScriptContext * param0); +BOOL sub_0204912C(ScriptContext * param0); +BOOL sub_020493C8(ScriptContext * param0); +BOOL sub_020493F4(ScriptContext * param0); #endif // POKEPLATINUM_UNK_02048DD8_H diff --git a/include/unk_020494DC.h b/include/unk_020494DC.h index 17b2d25934..7665a7c3df 100644 --- a/include/unk_020494DC.h +++ b/include/unk_020494DC.h @@ -3,24 +3,24 @@ #include "unk_0203E724.h" -BOOL sub_020494DC(UnkStruct_0203E724 * param0); -BOOL sub_0204950C(UnkStruct_0203E724 * param0); -BOOL sub_0204951C(UnkStruct_0203E724 * param0); -BOOL sub_02049538(UnkStruct_0203E724 * param0); -BOOL sub_02049800(UnkStruct_0203E724 * param0); -BOOL sub_02049880(UnkStruct_0203E724 * param0); -BOOL sub_020498A8(UnkStruct_0203E724 * param0); -BOOL sub_020498D0(UnkStruct_0203E724 * param0); -BOOL sub_020499BC(UnkStruct_0203E724 * param0); -BOOL sub_02049A68(UnkStruct_0203E724 * param0); -BOOL sub_02049AB4(UnkStruct_0203E724 * param0); -BOOL sub_02049B24(UnkStruct_0203E724 * param0); -BOOL sub_02049B54(UnkStruct_0203E724 * param0); -BOOL sub_02049B6C(UnkStruct_0203E724 * param0); -BOOL sub_02049B8C(UnkStruct_0203E724 * param0); -BOOL sub_02049BBC(UnkStruct_0203E724 * param0); -BOOL sub_02049C00(UnkStruct_0203E724 * param0); -BOOL sub_02049C44(UnkStruct_0203E724 * param0); -BOOL sub_02049C94(UnkStruct_0203E724 * param0); +BOOL sub_020494DC(ScriptContext * param0); +BOOL sub_0204950C(ScriptContext * param0); +BOOL sub_0204951C(ScriptContext * param0); +BOOL sub_02049538(ScriptContext * param0); +BOOL sub_02049800(ScriptContext * param0); +BOOL sub_02049880(ScriptContext * param0); +BOOL sub_020498A8(ScriptContext * param0); +BOOL sub_020498D0(ScriptContext * param0); +BOOL sub_020499BC(ScriptContext * param0); +BOOL sub_02049A68(ScriptContext * param0); +BOOL sub_02049AB4(ScriptContext * param0); +BOOL sub_02049B24(ScriptContext * param0); +BOOL sub_02049B54(ScriptContext * param0); +BOOL sub_02049B6C(ScriptContext * param0); +BOOL sub_02049B8C(ScriptContext * param0); +BOOL sub_02049BBC(ScriptContext * param0); +BOOL sub_02049C00(ScriptContext * param0); +BOOL sub_02049C44(ScriptContext * param0); +BOOL sub_02049C94(ScriptContext * param0); #endif // POKEPLATINUM_UNK_020494DC_H diff --git a/include/unk_0204B64C.h b/include/unk_0204B64C.h index d80a50c02b..7fac1e9833 100644 --- a/include/unk_0204B64C.h +++ b/include/unk_0204B64C.h @@ -3,14 +3,14 @@ #include "unk_0203E724.h" -BOOL sub_0204B64C(UnkStruct_0203E724 * param0); -BOOL sub_0204B680(UnkStruct_0203E724 * param0); -BOOL sub_0204B6B4(UnkStruct_0203E724 * param0); -BOOL sub_0204B6E8(UnkStruct_0203E724 * param0); -BOOL sub_0204B71C(UnkStruct_0203E724 * param0); -BOOL sub_0204B750(UnkStruct_0203E724 * param0); -BOOL sub_0204B784(UnkStruct_0203E724 * param0); -BOOL sub_0204B7CC(UnkStruct_0203E724 * param0); -BOOL sub_0204B7FC(UnkStruct_0203E724 * param0); +BOOL sub_0204B64C(ScriptContext * param0); +BOOL sub_0204B680(ScriptContext * param0); +BOOL sub_0204B6B4(ScriptContext * param0); +BOOL sub_0204B6E8(ScriptContext * param0); +BOOL sub_0204B71C(ScriptContext * param0); +BOOL sub_0204B750(ScriptContext * param0); +BOOL sub_0204B784(ScriptContext * param0); +BOOL sub_0204B7CC(ScriptContext * param0); +BOOL sub_0204B7FC(ScriptContext * param0); #endif // POKEPLATINUM_UNK_0204B64C_H diff --git a/include/unk_0204B830.h b/include/unk_0204B830.h index 6d89ab6536..02560605d5 100644 --- a/include/unk_0204B830.h +++ b/include/unk_0204B830.h @@ -3,6 +3,6 @@ #include "unk_0203E724.h" -BOOL sub_0204B85C(UnkStruct_0203E724 * param0); +BOOL sub_0204B85C(ScriptContext * param0); #endif // POKEPLATINUM_UNK_0204B830_H diff --git a/include/unk_0204C500.h b/include/unk_0204C500.h index ba8c4b2757..9ee4a9b435 100644 --- a/include/unk_0204C500.h +++ b/include/unk_0204C500.h @@ -3,9 +3,9 @@ #include "unk_0203E724.h" -BOOL sub_0204C500(UnkStruct_0203E724 * param0); -BOOL sub_0204C554(UnkStruct_0203E724 * param0); -BOOL sub_0204C59C(UnkStruct_0203E724 * param0); -BOOL sub_0204C638(UnkStruct_0203E724 * param0); +BOOL sub_0204C500(ScriptContext * param0); +BOOL sub_0204C554(ScriptContext * param0); +BOOL sub_0204C59C(ScriptContext * param0); +BOOL sub_0204C638(ScriptContext * param0); #endif // POKEPLATINUM_UNK_0204C500_H diff --git a/include/unk_0204C6C8.h b/include/unk_0204C6C8.h index abc5c9c627..a5c8acea47 100644 --- a/include/unk_0204C6C8.h +++ b/include/unk_0204C6C8.h @@ -3,15 +3,15 @@ #include "unk_0203E724.h" -BOOL sub_0204C6C8(UnkStruct_0203E724 * param0); -BOOL sub_0204C718(UnkStruct_0203E724 * param0); -BOOL sub_0204C730(UnkStruct_0203E724 * param0); -BOOL sub_0204C750(UnkStruct_0203E724 * param0); -BOOL sub_0204C780(UnkStruct_0203E724 * param0); -BOOL sub_0204C7AC(UnkStruct_0203E724 * param0); -BOOL sub_0204C7D8(UnkStruct_0203E724 * param0); -BOOL sub_0204C808(UnkStruct_0203E724 * param0); -BOOL sub_0204C854(UnkStruct_0203E724 * param0); -BOOL sub_0204C8AC(UnkStruct_0203E724 * param0); +BOOL sub_0204C6C8(ScriptContext * param0); +BOOL sub_0204C718(ScriptContext * param0); +BOOL sub_0204C730(ScriptContext * param0); +BOOL sub_0204C750(ScriptContext * param0); +BOOL sub_0204C780(ScriptContext * param0); +BOOL sub_0204C7AC(ScriptContext * param0); +BOOL sub_0204C7D8(ScriptContext * param0); +BOOL sub_0204C808(ScriptContext * param0); +BOOL sub_0204C854(ScriptContext * param0); +BOOL sub_0204C8AC(ScriptContext * param0); #endif // POKEPLATINUM_UNK_0204C6C8_H diff --git a/include/unk_0204C8F0.h b/include/unk_0204C8F0.h index f854558cfd..9caba8f4b9 100644 --- a/include/unk_0204C8F0.h +++ b/include/unk_0204C8F0.h @@ -3,13 +3,13 @@ #include "unk_0203E724.h" -BOOL sub_0204C8F0(UnkStruct_0203E724 * param0); -BOOL sub_0204C914(UnkStruct_0203E724 * param0); -BOOL sub_0204C938(UnkStruct_0203E724 * param0); -BOOL sub_0204C968(UnkStruct_0203E724 * param0); -BOOL sub_0204C9AC(UnkStruct_0203E724 * param0); -BOOL sub_0204C9FC(UnkStruct_0203E724 * param0); -BOOL sub_0204CA4C(UnkStruct_0203E724 * param0); -BOOL sub_0204CA64(UnkStruct_0203E724 * param0); +BOOL sub_0204C8F0(ScriptContext * param0); +BOOL sub_0204C914(ScriptContext * param0); +BOOL sub_0204C938(ScriptContext * param0); +BOOL sub_0204C968(ScriptContext * param0); +BOOL sub_0204C9AC(ScriptContext * param0); +BOOL sub_0204C9FC(ScriptContext * param0); +BOOL sub_0204CA4C(ScriptContext * param0); +BOOL sub_0204CA64(ScriptContext * param0); #endif // POKEPLATINUM_UNK_0204C8F0_H diff --git a/include/unk_0204CA84.h b/include/unk_0204CA84.h index 96bb6feffb..cc9bd2bde7 100644 --- a/include/unk_0204CA84.h +++ b/include/unk_0204CA84.h @@ -3,21 +3,21 @@ #include "unk_0203E724.h" -BOOL sub_0204CA84(UnkStruct_0203E724 * param0); -BOOL sub_0204CAA4(UnkStruct_0203E724 * param0); -BOOL sub_0204CAD4(UnkStruct_0203E724 * param0); -BOOL sub_0204CAEC(UnkStruct_0203E724 * param0); -BOOL sub_0204CB20(UnkStruct_0203E724 * param0); -BOOL sub_0204CB80(UnkStruct_0203E724 * param0); -BOOL sub_0204CBD4(UnkStruct_0203E724 * param0); -BOOL sub_0204CC24(UnkStruct_0203E724 * param0); -BOOL sub_0204CC78(UnkStruct_0203E724 * param0); -BOOL sub_0204CCB8(UnkStruct_0203E724 * param0); -BOOL sub_0204CD44(UnkStruct_0203E724 * param0); -BOOL sub_0204CD74(UnkStruct_0203E724 * param0); -BOOL sub_0204CDA4(UnkStruct_0203E724 * param0); -BOOL sub_0204CDBC(UnkStruct_0203E724 * param0); -BOOL sub_0204CDC0(UnkStruct_0203E724 * param0); -BOOL sub_0204CDC4(UnkStruct_0203E724 * param0); +BOOL sub_0204CA84(ScriptContext * param0); +BOOL sub_0204CAA4(ScriptContext * param0); +BOOL sub_0204CAD4(ScriptContext * param0); +BOOL sub_0204CAEC(ScriptContext * param0); +BOOL sub_0204CB20(ScriptContext * param0); +BOOL sub_0204CB80(ScriptContext * param0); +BOOL sub_0204CBD4(ScriptContext * param0); +BOOL sub_0204CC24(ScriptContext * param0); +BOOL sub_0204CC78(ScriptContext * param0); +BOOL sub_0204CCB8(ScriptContext * param0); +BOOL sub_0204CD44(ScriptContext * param0); +BOOL sub_0204CD74(ScriptContext * param0); +BOOL sub_0204CDA4(ScriptContext * param0); +BOOL sub_0204CDBC(ScriptContext * param0); +BOOL sub_0204CDC0(ScriptContext * param0); +BOOL sub_0204CDC4(ScriptContext * param0); #endif // POKEPLATINUM_UNK_0204CA84_H diff --git a/include/unk_0204CDDC.h b/include/unk_0204CDDC.h index 78c6813269..7f5cf9ca49 100644 --- a/include/unk_0204CDDC.h +++ b/include/unk_0204CDDC.h @@ -3,11 +3,11 @@ #include "unk_0203E724.h" -BOOL sub_0204CDDC(UnkStruct_0203E724 * param0); -BOOL sub_0204CDF0(UnkStruct_0203E724 * param0); -BOOL sub_0204CE1C(UnkStruct_0203E724 * param0); -BOOL sub_0204CF68(UnkStruct_0203E724 * param0); -BOOL sub_0204CF8C(UnkStruct_0203E724 * param0); -BOOL sub_0204CFC4(UnkStruct_0203E724 * param0); +BOOL sub_0204CDDC(ScriptContext * param0); +BOOL sub_0204CDF0(ScriptContext * param0); +BOOL sub_0204CE1C(ScriptContext * param0); +BOOL sub_0204CF68(ScriptContext * param0); +BOOL sub_0204CF8C(ScriptContext * param0); +BOOL sub_0204CFC4(ScriptContext * param0); #endif // POKEPLATINUM_UNK_0204CDDC_H diff --git a/include/unk_0204CFFC.h b/include/unk_0204CFFC.h index 4e0be7aa1f..42af661976 100644 --- a/include/unk_0204CFFC.h +++ b/include/unk_0204CFFC.h @@ -3,46 +3,46 @@ #include "unk_0203E724.h" -BOOL sub_0204CFFC(UnkStruct_0203E724 * param0); -BOOL sub_0204D08C(UnkStruct_0203E724 * param0); -BOOL sub_0204D0E8(UnkStruct_0203E724 * param0); -BOOL sub_0204D154(UnkStruct_0203E724 * param0); -BOOL sub_0204D1DC(UnkStruct_0203E724 * param0); -BOOL sub_0204D234(UnkStruct_0203E724 * param0); -BOOL sub_0204D2D8(UnkStruct_0203E724 * param0); -BOOL sub_0204D398(UnkStruct_0203E724 * param0); -BOOL sub_0204D3DC(UnkStruct_0203E724 * param0); -BOOL sub_0204D470(UnkStruct_0203E724 * param0); -BOOL sub_0204D4CC(UnkStruct_0203E724 * param0); -BOOL sub_0204D540(UnkStruct_0203E724 * param0); -BOOL sub_0204D5CC(UnkStruct_0203E724 * param0); -BOOL sub_0204D614(UnkStruct_0203E724 * param0); -BOOL sub_0204D6E4(UnkStruct_0203E724 * param0); -BOOL sub_0204D74C(UnkStruct_0203E724 * param0); -BOOL sub_0204D7AC(UnkStruct_0203E724 * param0); -BOOL sub_0204D7D4(UnkStruct_0203E724 * param0); -BOOL sub_0204D840(UnkStruct_0203E724 * param0); -BOOL sub_0204D86C(UnkStruct_0203E724 * param0); -BOOL sub_0204D8C4(UnkStruct_0203E724 * param0); -BOOL sub_0204D94C(UnkStruct_0203E724 * param0); -BOOL sub_0204D9C8(UnkStruct_0203E724 * param0); -BOOL sub_0204DA20(UnkStruct_0203E724 * param0); -BOOL sub_0204DA84(UnkStruct_0203E724 * param0); -BOOL sub_0204DACC(UnkStruct_0203E724 * param0); -BOOL sub_0204DB74(UnkStruct_0203E724 * param0); -BOOL sub_0204DBB8(UnkStruct_0203E724 * param0); -BOOL sub_0204DC18(UnkStruct_0203E724 * param0); -BOOL sub_0204DC60(UnkStruct_0203E724 * param0); -BOOL sub_0204DC98(UnkStruct_0203E724 * param0); -BOOL sub_0204DD28(UnkStruct_0203E724 * param0); -BOOL sub_0204DE00(UnkStruct_0203E724 * param0); -BOOL sub_0204DE94(UnkStruct_0203E724 * param0); -BOOL sub_0204DF08(UnkStruct_0203E724 * param0); -BOOL sub_0204DFB0(UnkStruct_0203E724 * param0); -BOOL sub_0204E01C(UnkStruct_0203E724 * param0); -BOOL sub_0204E094(UnkStruct_0203E724 * param0); -int sub_0204E128(UnkStruct_0203E724 * param0); -BOOL sub_0204E12C(UnkStruct_0203E724 * param0); -BOOL sub_0204E1D0(UnkStruct_0203E724 * param0); +BOOL sub_0204CFFC(ScriptContext * param0); +BOOL sub_0204D08C(ScriptContext * param0); +BOOL sub_0204D0E8(ScriptContext * param0); +BOOL sub_0204D154(ScriptContext * param0); +BOOL sub_0204D1DC(ScriptContext * param0); +BOOL sub_0204D234(ScriptContext * param0); +BOOL sub_0204D2D8(ScriptContext * param0); +BOOL sub_0204D398(ScriptContext * param0); +BOOL sub_0204D3DC(ScriptContext * param0); +BOOL sub_0204D470(ScriptContext * param0); +BOOL sub_0204D4CC(ScriptContext * param0); +BOOL sub_0204D540(ScriptContext * param0); +BOOL sub_0204D5CC(ScriptContext * param0); +BOOL sub_0204D614(ScriptContext * param0); +BOOL sub_0204D6E4(ScriptContext * param0); +BOOL sub_0204D74C(ScriptContext * param0); +BOOL sub_0204D7AC(ScriptContext * param0); +BOOL sub_0204D7D4(ScriptContext * param0); +BOOL sub_0204D840(ScriptContext * param0); +BOOL sub_0204D86C(ScriptContext * param0); +BOOL sub_0204D8C4(ScriptContext * param0); +BOOL sub_0204D94C(ScriptContext * param0); +BOOL sub_0204D9C8(ScriptContext * param0); +BOOL sub_0204DA20(ScriptContext * param0); +BOOL sub_0204DA84(ScriptContext * param0); +BOOL sub_0204DACC(ScriptContext * param0); +BOOL sub_0204DB74(ScriptContext * param0); +BOOL sub_0204DBB8(ScriptContext * param0); +BOOL sub_0204DC18(ScriptContext * param0); +BOOL sub_0204DC60(ScriptContext * param0); +BOOL sub_0204DC98(ScriptContext * param0); +BOOL sub_0204DD28(ScriptContext * param0); +BOOL sub_0204DE00(ScriptContext * param0); +BOOL sub_0204DE94(ScriptContext * param0); +BOOL sub_0204DF08(ScriptContext * param0); +BOOL sub_0204DFB0(ScriptContext * param0); +BOOL sub_0204E01C(ScriptContext * param0); +BOOL sub_0204E094(ScriptContext * param0); +int sub_0204E128(ScriptContext * param0); +BOOL sub_0204E12C(ScriptContext * param0); +BOOL sub_0204E1D0(ScriptContext * param0); #endif // POKEPLATINUM_UNK_0204CFFC_H diff --git a/include/unk_0204E240.h b/include/unk_0204E240.h index d0757fa79d..9bf5bf3b2e 100644 --- a/include/unk_0204E240.h +++ b/include/unk_0204E240.h @@ -3,10 +3,10 @@ #include "unk_0203E724.h" -BOOL sub_0204E240(UnkStruct_0203E724 * param0); -BOOL sub_0204E28C(UnkStruct_0203E724 * param0); -BOOL sub_0204E2E0(UnkStruct_0203E724 * param0); -BOOL sub_0204E370(UnkStruct_0203E724 * param0); -BOOL sub_0204E374(UnkStruct_0203E724 * param0); +BOOL sub_0204E240(ScriptContext * param0); +BOOL sub_0204E28C(ScriptContext * param0); +BOOL sub_0204E2E0(ScriptContext * param0); +BOOL sub_0204E370(ScriptContext * param0); +BOOL sub_0204E374(ScriptContext * param0); #endif // POKEPLATINUM_UNK_0204E240_H diff --git a/include/unk_0204E378.h b/include/unk_0204E378.h index 4c3c2b6a9e..a7515fbedf 100644 --- a/include/unk_0204E378.h +++ b/include/unk_0204E378.h @@ -3,6 +3,6 @@ #include "unk_0203E724.h" -BOOL sub_0204E378(UnkStruct_0203E724 * param0); +BOOL sub_0204E378(ScriptContext * param0); #endif // POKEPLATINUM_UNK_0204E378_H diff --git a/include/unk_0204E3CC.h b/include/unk_0204E3CC.h index c9c3fd08d7..32995d7b97 100644 --- a/include/unk_0204E3CC.h +++ b/include/unk_0204E3CC.h @@ -3,25 +3,25 @@ #include "unk_0203E724.h" -BOOL sub_0204E3CC(UnkStruct_0203E724 * param0); -BOOL sub_0204E3FC(UnkStruct_0203E724 * param0); -BOOL sub_0204E410(UnkStruct_0203E724 * param0); -BOOL sub_0204E440(UnkStruct_0203E724 * param0); -BOOL sub_0204E45C(UnkStruct_0203E724 * param0); -BOOL sub_0204E4A4(UnkStruct_0203E724 * param0); -BOOL sub_0204E4D8(UnkStruct_0203E724 * param0); -BOOL sub_0204E504(UnkStruct_0203E724 * param0); -BOOL sub_0204E554(UnkStruct_0203E724 * param0); -BOOL sub_0204E568(UnkStruct_0203E724 * param0); -BOOL sub_0204E594(UnkStruct_0203E724 * param0); -BOOL sub_0204E5A8(UnkStruct_0203E724 * param0); -BOOL sub_0204E5BC(UnkStruct_0203E724 * param0); -BOOL sub_0204E5E8(UnkStruct_0203E724 * param0); -BOOL sub_0204E5FC(UnkStruct_0203E724 * param0); -BOOL sub_0204E610(UnkStruct_0203E724 * param0); -BOOL sub_0204E63C(UnkStruct_0203E724 * param0); -BOOL sub_0204E650(UnkStruct_0203E724 * param0); -BOOL sub_0204E6AC(UnkStruct_0203E724 * param0); -BOOL sub_0204E704(UnkStruct_0203E724 * param0); +BOOL sub_0204E3CC(ScriptContext * param0); +BOOL sub_0204E3FC(ScriptContext * param0); +BOOL sub_0204E410(ScriptContext * param0); +BOOL sub_0204E440(ScriptContext * param0); +BOOL sub_0204E45C(ScriptContext * param0); +BOOL sub_0204E4A4(ScriptContext * param0); +BOOL sub_0204E4D8(ScriptContext * param0); +BOOL sub_0204E504(ScriptContext * param0); +BOOL sub_0204E554(ScriptContext * param0); +BOOL sub_0204E568(ScriptContext * param0); +BOOL sub_0204E594(ScriptContext * param0); +BOOL sub_0204E5A8(ScriptContext * param0); +BOOL sub_0204E5BC(ScriptContext * param0); +BOOL sub_0204E5E8(ScriptContext * param0); +BOOL sub_0204E5FC(ScriptContext * param0); +BOOL sub_0204E610(ScriptContext * param0); +BOOL sub_0204E63C(ScriptContext * param0); +BOOL sub_0204E650(ScriptContext * param0); +BOOL sub_0204E6AC(ScriptContext * param0); +BOOL sub_0204E704(ScriptContext * param0); #endif // POKEPLATINUM_UNK_0204E3CC_H diff --git a/include/unk_0204E75C.h b/include/unk_0204E75C.h index 38feab307a..551c9582b2 100644 --- a/include/unk_0204E75C.h +++ b/include/unk_0204E75C.h @@ -3,14 +3,14 @@ #include "unk_0203E724.h" -BOOL sub_0204E75C(UnkStruct_0203E724 * param0); -BOOL sub_0204E7B4(UnkStruct_0203E724 * param0); -BOOL sub_0204E80C(UnkStruct_0203E724 * param0); -BOOL sub_0204E864(UnkStruct_0203E724 * param0); -BOOL sub_0204E8BC(UnkStruct_0203E724 * param0); -BOOL sub_0204E900(UnkStruct_0203E724 * param0); -BOOL sub_0204E934(UnkStruct_0203E724 * param0); -BOOL sub_0204E96C(UnkStruct_0203E724 * param0); -BOOL sub_0204E970(UnkStruct_0203E724 * param0); +BOOL sub_0204E75C(ScriptContext * param0); +BOOL sub_0204E7B4(ScriptContext * param0); +BOOL sub_0204E80C(ScriptContext * param0); +BOOL sub_0204E864(ScriptContext * param0); +BOOL sub_0204E8BC(ScriptContext * param0); +BOOL sub_0204E900(ScriptContext * param0); +BOOL sub_0204E934(ScriptContext * param0); +BOOL sub_0204E96C(ScriptContext * param0); +BOOL sub_0204E970(ScriptContext * param0); #endif // POKEPLATINUM_UNK_0204E75C_H diff --git a/include/unk_0204E974.h b/include/unk_0204E974.h index 35edadcc1b..c33003b375 100644 --- a/include/unk_0204E974.h +++ b/include/unk_0204E974.h @@ -3,21 +3,21 @@ #include "unk_0203E724.h" -BOOL sub_0204E974(UnkStruct_0203E724 * param0); -BOOL sub_0204E9C8(UnkStruct_0203E724 * param0); -BOOL sub_0204EA04(UnkStruct_0203E724 * param0); -BOOL sub_0204EA58(UnkStruct_0203E724 * param0); -BOOL sub_0204EA94(UnkStruct_0203E724 * param0); -BOOL sub_0204EAE8(UnkStruct_0203E724 * param0); -BOOL sub_0204EB24(UnkStruct_0203E724 * param0); -BOOL sub_0204EB60(UnkStruct_0203E724 * param0); -BOOL sub_0204EB9C(UnkStruct_0203E724 * param0); -BOOL sub_0204EBE4(UnkStruct_0203E724 * param0); -BOOL sub_0204EC20(UnkStruct_0203E724 * param0); -BOOL sub_0204EC5C(UnkStruct_0203E724 * param0); -BOOL sub_0204EC98(UnkStruct_0203E724 * param0); -BOOL sub_0204ECF0(UnkStruct_0203E724 * param0); -BOOL sub_0204ED2C(UnkStruct_0203E724 * param0); -BOOL sub_0204ED68(UnkStruct_0203E724 * param0); +BOOL sub_0204E974(ScriptContext * param0); +BOOL sub_0204E9C8(ScriptContext * param0); +BOOL sub_0204EA04(ScriptContext * param0); +BOOL sub_0204EA58(ScriptContext * param0); +BOOL sub_0204EA94(ScriptContext * param0); +BOOL sub_0204EAE8(ScriptContext * param0); +BOOL sub_0204EB24(ScriptContext * param0); +BOOL sub_0204EB60(ScriptContext * param0); +BOOL sub_0204EB9C(ScriptContext * param0); +BOOL sub_0204EBE4(ScriptContext * param0); +BOOL sub_0204EC20(ScriptContext * param0); +BOOL sub_0204EC5C(ScriptContext * param0); +BOOL sub_0204EC98(ScriptContext * param0); +BOOL sub_0204ECF0(ScriptContext * param0); +BOOL sub_0204ED2C(ScriptContext * param0); +BOOL sub_0204ED68(ScriptContext * param0); #endif // POKEPLATINUM_UNK_0204E974_H diff --git a/include/unk_0204EDA4.h b/include/unk_0204EDA4.h index b31a40ca2c..aa7b095653 100644 --- a/include/unk_0204EDA4.h +++ b/include/unk_0204EDA4.h @@ -3,15 +3,15 @@ #include "unk_0203E724.h" -BOOL sub_0204EDA4(UnkStruct_0203E724 * param0); -BOOL sub_0204EDEC(UnkStruct_0203E724 * param0); -BOOL sub_0204EE38(UnkStruct_0203E724 * param0); -BOOL sub_0204EE3C(UnkStruct_0203E724 * param0); -BOOL sub_0204EEFC(UnkStruct_0203E724 * param0); -BOOL sub_0204EF00(UnkStruct_0203E724 * param0); -BOOL sub_0204EF40(UnkStruct_0203E724 * param0); -BOOL sub_0204EFA0(UnkStruct_0203E724 * param0); -BOOL sub_0204EFA4(UnkStruct_0203E724 * param0); -BOOL sub_0204EFE8(UnkStruct_0203E724 * param0); +BOOL sub_0204EDA4(ScriptContext * param0); +BOOL sub_0204EDEC(ScriptContext * param0); +BOOL sub_0204EE38(ScriptContext * param0); +BOOL sub_0204EE3C(ScriptContext * param0); +BOOL sub_0204EEFC(ScriptContext * param0); +BOOL sub_0204EF00(ScriptContext * param0); +BOOL sub_0204EF40(ScriptContext * param0); +BOOL sub_0204EFA0(ScriptContext * param0); +BOOL sub_0204EFA4(ScriptContext * param0); +BOOL sub_0204EFE8(ScriptContext * param0); #endif // POKEPLATINUM_UNK_0204EDA4_H diff --git a/include/unk_0204F02C.h b/include/unk_0204F02C.h index eed0ec04c9..9569164bcd 100644 --- a/include/unk_0204F02C.h +++ b/include/unk_0204F02C.h @@ -3,9 +3,9 @@ #include "unk_0203E724.h" -BOOL sub_0204F02C(UnkStruct_0203E724 * param0); -BOOL sub_0204F038(UnkStruct_0203E724 * param0); -BOOL sub_0204F044(UnkStruct_0203E724 * param0); -BOOL sub_0204F048(UnkStruct_0203E724 * param0); +BOOL sub_0204F02C(ScriptContext * param0); +BOOL sub_0204F038(ScriptContext * param0); +BOOL sub_0204F044(ScriptContext * param0); +BOOL sub_0204F048(ScriptContext * param0); #endif // POKEPLATINUM_UNK_0204F02C_H diff --git a/include/unk_0204F04C.h b/include/unk_0204F04C.h index e111c499fb..8283e8240f 100644 --- a/include/unk_0204F04C.h +++ b/include/unk_0204F04C.h @@ -3,6 +3,6 @@ #include "unk_0203E724.h" -BOOL sub_0204F04C(UnkStruct_0203E724 * param0); +BOOL sub_0204F04C(ScriptContext * param0); #endif // POKEPLATINUM_UNK_0204F04C_H diff --git a/include/unk_0204F13C.h b/include/unk_0204F13C.h index 74d51d7be0..4a0fc47d9e 100644 --- a/include/unk_0204F13C.h +++ b/include/unk_0204F13C.h @@ -3,12 +3,12 @@ #include "unk_0203E724.h" -BOOL sub_0204F13C(UnkStruct_0203E724 * param0); -BOOL sub_0204F360(UnkStruct_0203E724 * param0); -BOOL sub_0204F398(UnkStruct_0203E724 * param0); -BOOL sub_0204F6D8(UnkStruct_0203E724 * param0); -BOOL sub_0204F8A8(UnkStruct_0203E724 * param0); -BOOL sub_0204F950(UnkStruct_0203E724 * param0); -BOOL sub_0204F9D4(UnkStruct_0203E724 * param0); +BOOL sub_0204F13C(ScriptContext * param0); +BOOL sub_0204F360(ScriptContext * param0); +BOOL sub_0204F398(ScriptContext * param0); +BOOL sub_0204F6D8(ScriptContext * param0); +BOOL sub_0204F8A8(ScriptContext * param0); +BOOL sub_0204F950(ScriptContext * param0); +BOOL sub_0204F9D4(ScriptContext * param0); #endif // POKEPLATINUM_UNK_0204F13C_H diff --git a/include/unk_0204FAB4.h b/include/unk_0204FAB4.h index 5c819f29e4..e308b14ea5 100644 --- a/include/unk_0204FAB4.h +++ b/include/unk_0204FAB4.h @@ -3,8 +3,8 @@ #include "unk_0203E724.h" -BOOL sub_0204FAB4(UnkStruct_0203E724 * param0); -BOOL sub_0204FBB4(UnkStruct_0203E724 * param0); -BOOL sub_0204FCAC(UnkStruct_0203E724 * param0); +BOOL sub_0204FAB4(ScriptContext * param0); +BOOL sub_0204FBB4(ScriptContext * param0); +BOOL sub_0204FCAC(ScriptContext * param0); #endif // POKEPLATINUM_UNK_0204FAB4_H diff --git a/include/unk_0205003C.h b/include/unk_0205003C.h index fda4adbd67..4478287d58 100644 --- a/include/unk_0205003C.h +++ b/include/unk_0205003C.h @@ -3,8 +3,8 @@ #include "unk_0203E724.h" -BOOL sub_0205003C(UnkStruct_0203E724 * param0); -BOOL sub_0205013C(UnkStruct_0203E724 * param0); -BOOL sub_020501D8(UnkStruct_0203E724 * param0); +BOOL sub_0205003C(ScriptContext * param0); +BOOL sub_0205013C(ScriptContext * param0); +BOOL sub_020501D8(ScriptContext * param0); #endif // POKEPLATINUM_UNK_0205003C_H diff --git a/src/overlay005/ov5_021DD42C.c b/src/overlay005/ov5_021DD42C.c index 8433728f3c..8826353f18 100644 --- a/src/overlay005/ov5_021DD42C.c +++ b/src/overlay005/ov5_021DD42C.c @@ -31,7 +31,7 @@ typedef struct { u8 * unk_14; } UnkStruct_ov5_021DD648; -static u8 ov5_021DD574(UnkStruct_0203E724 * param0); +static u8 ov5_021DD574(ScriptContext * param0); static void ov5_021DD588(FieldSystem * param0, UnkStruct_ov5_021DD648 * param1); static void ov5_021DD5D0(FieldSystem * param0, StringTemplate * param1, UnkStruct_ov5_021DD648 * param2); static void ov5_021DD610(FieldSystem * param0, UnkStruct_ov5_021DD648 * param1); @@ -40,22 +40,22 @@ static void ov5_021DD664(UnkStruct_ov5_021DD648 * param0, u16 param1, u16 param2 static void ov5_021DD6B4(UnkStruct_ov5_021DD648 * param0, int param1, int param2, int param3, int param4); static void ov5_021DD6DC(UnkStruct_ov5_021DD648 * param0, int param1); -void ov5_021DD42C (UnkStruct_ov5_021DD42C * param0, UnkStruct_0203E724 * param1) +void ov5_021DD42C (UnkStruct_ov5_021DD42C * param0, ScriptContext * param1) { param0->unk_00 = ov5_021DD574(param1); param0->unk_01 = 0; param0->unk_02 = 1; } -void ov5_021DD444 (UnkStruct_0203E724 * param0, const MessageLoader * param1, u16 param2, u8 param3, UnkStruct_ov5_021DD42C * param4) +void ov5_021DD444 (ScriptContext * param0, const MessageLoader * param1, u16 param2, u8 param3, UnkStruct_ov5_021DD42C * param4) { UnkStruct_ov5_021DD648 v0; u8 v1; u8 v2; u8 v3; - ov5_021DD588(param0->unk_34, &v0); - ov5_021DD610(param0->unk_34, &v0); + ov5_021DD588(param0->fieldSys, &v0); + ov5_021DD610(param0->fieldSys, &v0); ov5_021DD648(&v0, param1, param2); if (param4 == NULL) { @@ -71,23 +71,23 @@ void ov5_021DD444 (UnkStruct_0203E724 * param0, const MessageLoader * param1, u1 ov5_021DD6B4(&v0, v3, v1, param3, v2); } -void ov5_021DD498 (UnkStruct_0203E724 * param0, const MessageLoader * param1, int param2) +void ov5_021DD498 (ScriptContext * param0, const MessageLoader * param1, int param2) { UnkStruct_ov5_021DD648 v0; - ov5_021DD588(param0->unk_34, &v0); - ov5_021DD610(param0->unk_34, &v0); + ov5_021DD588(param0->fieldSys, &v0); + ov5_021DD610(param0->fieldSys, &v0); ov5_021DD648(&v0, param1, param2); ov5_021DD6DC(&v0, 1); } -void ov5_021DD4CC (UnkStruct_0203E724 * param0, u16 param1, u16 param2, u16 param3, s16 param4, u8 param5) +void ov5_021DD4CC (ScriptContext * param0, u16 param1, u16 param2, u16 param3, s16 param4, u8 param5) { UnkStruct_ov5_021DD648 v0; Sentence v1; - ov5_021DD588(param0->unk_34, &v0); - ov5_021DD610(param0->unk_34, &v0); + ov5_021DD588(param0->fieldSys, &v0); + ov5_021DD610(param0->fieldSys, &v0); ov5_021DD664(&v0, param1, param2, param3, param4); if (param5 != 0xFF) { @@ -97,19 +97,19 @@ void ov5_021DD4CC (UnkStruct_0203E724 * param0, u16 param1, u16 param2, u16 para } } -void ov5_021DD530 (UnkStruct_0203E724 * param0, StringTemplate * param1, u8 param2, u8 param3) +void ov5_021DD530 (ScriptContext * param0, StringTemplate * param1, u8 param2, u8 param3) { UnkStruct_ov5_021DD648 v0; - ov5_021DD5D0(param0->unk_34, param1, &v0); - ov5_021DD610(param0->unk_34, &v0); - ov5_021DD648(&v0, param0->unk_2C, param2); + ov5_021DD5D0(param0->fieldSys, param1, &v0); + ov5_021DD610(param0->fieldSys, &v0); + ov5_021DD648(&v0, param0->loader, param2); ov5_021DD6B4(&v0, 1, ov5_021DD574(param0), param3, 0); } -static u8 ov5_021DD574 (UnkStruct_0203E724 * param0) +static u8 ov5_021DD574 (ScriptContext * param0) { - return Options_TextFrameDelay(sub_02025E44(param0->unk_34->saveData)); + return Options_TextFrameDelay(sub_02025E44(param0->fieldSys->saveData)); } static void ov5_021DD588 (FieldSystem * param0, UnkStruct_ov5_021DD648 * param1) diff --git a/src/overlay005/ov5_021F6454.c b/src/overlay005/ov5_021F6454.c index abf1c49bbd..f8cf5e6b33 100644 --- a/src/overlay005/ov5_021F6454.c +++ b/src/overlay005/ov5_021F6454.c @@ -96,14 +96,14 @@ struct UnkStruct_ov5_021F6704_t { }; static u16 * ov5_021F65FC(int param0, int param1, int * param2); -BOOL ov5_021F6454(UnkStruct_0203E724 * param0); -static BOOL ov5_021F65D4(UnkStruct_0203E724 * param0); +BOOL ov5_021F6454(ScriptContext * param0); +static BOOL ov5_021F65D4(ScriptContext * param0); static void ov5_021F70CC(Pokemon * param0, int * param1, int * param2); -BOOL ov5_021F71B8(UnkStruct_0203E724 * param0); -BOOL ov5_021F7208(UnkStruct_0203E724 * param0); -BOOL ov5_021F72B8(UnkStruct_0203E724 * param0); -BOOL ov5_021F6B3C(UnkStruct_0203E724 * param0); -BOOL ov5_021F6E50(UnkStruct_0203E724 * param0); +BOOL ov5_021F71B8(ScriptContext * param0); +BOOL ov5_021F7208(ScriptContext * param0); +BOOL ov5_021F72B8(ScriptContext * param0); +BOOL ov5_021F6B3C(ScriptContext * param0); +BOOL ov5_021F6E50(ScriptContext * param0); static void ov5_021F661C(UnkStruct_ov5_021F6704 * param0, MessageLoader * param1); static void ov5_021F6624(FieldSystem * param0, UnkStruct_ov5_021F6704 * param1, u8 param2, u8 param3, u8 param4, u8 param5, u16 * param6, StringTemplate * param7, Window * param8, MessageLoader * param9, u16 * param10, u16 * param11); UnkStruct_ov5_021F6704 * ov5_021F6704(FieldSystem * param0, u8 param1, u8 param2, u8 param3, u8 param4, u16 * param5, StringTemplate * param6, Window * param7, MessageLoader * param8, u16 * param9, u16 * param10); @@ -128,7 +128,7 @@ static u16 Unk_ov5_0220210C[] = { 0x1A }; -BOOL ov5_021F6454 (UnkStruct_0203E724 * param0) +BOOL ov5_021F6454 (ScriptContext * param0) { int v0; BattleFrontierStage * v1; @@ -137,19 +137,19 @@ BOOL ov5_021F6454 (UnkStruct_0203E724 * param0) int v4, v5; MessageLoader * v6; MessageLoader * v7; - FieldSystem * v8 = param0->unk_34; + FieldSystem * v8 = param0->fieldSys; UnkStruct_ov5_021F6704 * v9; StringTemplate ** v10 = sub_0203F098(v8, 15); - u16 v11 = inline_02049538(param0); - u16 v12 = inline_02049538(param0); - u16 v13 = sub_0203E838(param0); - u16 v14 = sub_0203E838(param0); - u16 v15 = sub_0203E838(param0); + u16 v11 = ScriptContext_GetVar(param0); + u16 v12 = ScriptContext_GetVar(param0); + u16 v13 = ScriptContext_ReadHalfWord(param0); + u16 v14 = ScriptContext_ReadHalfWord(param0); + u16 v15 = ScriptContext_ReadHalfWord(param0); - param0->unk_18[0] = v13; + param0->data[0] = v13; v6 = MessageLoader_Init(0, 26, 412, 32); - v9 = ov5_021F6704(v8, 20, 1, 0, 1, sub_0203F118(v8, v13), *v10, sub_0203F098(param0->unk_34, 1), v6, sub_0203F118(v8, v14), sub_0203F118(v8, v15)); + v9 = ov5_021F6704(v8, 20, 1, 0, 1, sub_0203F118(v8, v13), *v10, sub_0203F098(param0->fieldSys, 1), v6, sub_0203F118(v8, v14), sub_0203F118(v8, v15)); v1 = sub_020308A0(v8->saveData, 11, &v0); if (v0 == 1) { @@ -180,16 +180,16 @@ BOOL ov5_021F6454 (UnkStruct_0203E724 * param0) ov5_021F661C(v9, v6); ov5_021F6768(v9); - sub_0203E764(param0, ov5_021F65D4); + ScriptContext_Pause(param0, ov5_021F65D4); MessageLoader_Free(v6); return 1; } -static BOOL ov5_021F65D4 (UnkStruct_0203E724 * param0) +static BOOL ov5_021F65D4 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; - u16 * v1 = sub_0203F118(v0, param0->unk_18[0]); + FieldSystem * v0 = param0->fieldSys; + u16 * v1 = sub_0203F118(v0, param0->data[0]); if (*v1 == 0xeeee) { return 0; @@ -448,16 +448,16 @@ static const u16 Unk_ov5_02200C84[] = { 0x7E }; -BOOL ov5_021F6B3C (UnkStruct_0203E724 * param0) +BOOL ov5_021F6B3C (ScriptContext * param0) { u8 v0; u32 v1[6]; Pokemon * v2; - FieldSystem * v3 = param0->unk_34; - u16 v4 = inline_02049538(param0); - u16 * v5 = inline_0204FCAC(param0); - u16 * v6 = inline_0204FCAC(param0); - u16 * v7 = inline_0204FCAC(param0); + FieldSystem * v3 = param0->fieldSys; + u16 v4 = ScriptContext_GetVar(param0); + u16 * v5 = ScriptContext_GetVarPointer(param0); + u16 * v6 = ScriptContext_GetVarPointer(param0); + u16 * v7 = ScriptContext_GetVarPointer(param0); v2 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(v3->saveData), v4); @@ -493,7 +493,7 @@ BOOL ov5_021F6B3C (UnkStruct_0203E724 * param0) return 0; } -BOOL ov5_021F6C60 (UnkStruct_0203E724 * param0) +BOOL ov5_021F6C60 (ScriptContext * param0) { Pokemon * v0; Party * v1; @@ -502,8 +502,8 @@ BOOL ov5_021F6C60 (UnkStruct_0203E724 * param0) u32 v7; int v8[6]; int v9 = 0; - FieldSystem * v10 = param0->unk_34; - u16 * v11 = inline_0204FCAC(param0); + FieldSystem * v10 = param0->fieldSys; + u16 * v11 = ScriptContext_GetVarPointer(param0); v1 = Party_GetFromSavedata(v10->saveData); v2 = Party_GetCurrentCount(v1); @@ -560,7 +560,7 @@ BOOL ov5_021F6C60 (UnkStruct_0203E724 * param0) return 0; } -BOOL ov5_021F6D80 (UnkStruct_0203E724 * param0) +BOOL ov5_021F6D80 (ScriptContext * param0) { Pokemon * v0; Party * v1; @@ -568,9 +568,9 @@ BOOL ov5_021F6D80 (UnkStruct_0203E724 * param0) u32 v4; int v5; int v6; - FieldSystem * v7 = param0->unk_34; - u16 v8 = inline_02049538(param0); - u16 * v9 = inline_0204FCAC(param0); + FieldSystem * v7 = param0->fieldSys; + u16 v8 = ScriptContext_GetVar(param0); + u16 * v9 = ScriptContext_GetVarPointer(param0); v1 = Party_GetFromSavedata(v7->saveData); v0 = Party_GetPokemonBySlotIndex(v1, v8); @@ -616,12 +616,12 @@ BOOL ov5_021F6D80 (UnkStruct_0203E724 * param0) return 0; } -BOOL ov5_021F6E50 (UnkStruct_0203E724 * param0) +BOOL ov5_021F6E50 (ScriptContext * param0) { Pokemon * v0; - FieldSystem * v1 = param0->unk_34; - u16 v2 = inline_02049538(param0); - u16 v3 = inline_02049538(param0); + FieldSystem * v1 = param0->fieldSys; + u16 v2 = ScriptContext_GetVar(param0); + u16 v3 = ScriptContext_GetVar(param0); v0 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(v1->saveData), v2); Pokemon_SetValue(v0, 112, &v3); @@ -629,15 +629,15 @@ BOOL ov5_021F6E50 (UnkStruct_0203E724 * param0) return 0; } -BOOL ov5_021F6E9C (UnkStruct_0203E724 * param0) +BOOL ov5_021F6E9C (ScriptContext * param0) { u32 v0, v1, v2; int v3, v4, v5; Pokemon * v6; Party * v7; - FieldSystem * v8 = param0->unk_34; - u16 * v9 = inline_0204FCAC(param0); - u16 * v10 = inline_0204FCAC(param0); + FieldSystem * v8 = param0->fieldSys; + u16 * v9 = ScriptContext_GetVarPointer(param0); + u16 * v10 = ScriptContext_GetVarPointer(param0); v5 = 0; *v10 = 0xff; @@ -663,17 +663,17 @@ BOOL ov5_021F6E9C (UnkStruct_0203E724 * param0) return 0; } -BOOL ov5_021F6F44 (UnkStruct_0203E724 * param0) +BOOL ov5_021F6F44 (ScriptContext * param0) { u32 v0, v1; u16 v2, v3; Pokemon * v4; Party * v5; - FieldSystem * v6 = param0->unk_34; - u16 v7 = inline_02049538(param0); - u16 v8 = inline_02049538(param0); - u16 v9 = inline_02049538(param0); - u16 v10 = inline_02049538(param0); + FieldSystem * v6 = param0->fieldSys; + u16 v7 = ScriptContext_GetVar(param0); + u16 v8 = ScriptContext_GetVar(param0); + u16 v9 = ScriptContext_GetVar(param0); + u16 v10 = ScriptContext_GetVar(param0); v5 = Party_GetFromSavedata(v6->saveData); v4 = Party_GetPokemonBySlotIndex(v5, v7); @@ -684,14 +684,14 @@ BOOL ov5_021F6F44 (UnkStruct_0203E724 * param0) return 0; } -BOOL ov5_021F6FC0 (UnkStruct_0203E724 * param0) +BOOL ov5_021F6FC0 (ScriptContext * param0) { u16 v0; int v1, v2; Pokemon * v3; - FieldSystem * v4 = param0->unk_34; - u16 v5 = inline_02049538(param0); - u16 * v6 = inline_0204FCAC(param0); + FieldSystem * v4 = param0->fieldSys; + u16 v5 = ScriptContext_GetVar(param0); + u16 * v6 = ScriptContext_GetVarPointer(param0); v3 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(v4->saveData), v5); v0 = Pokemon_GetValue(v3, MON_DATA_SPECIES, NULL); @@ -756,11 +756,11 @@ static void ov5_021F70CC (Pokemon * param0, int * param1, int * param2) } } -BOOL ov5_021F71B8 (UnkStruct_0203E724 * param0) +BOOL ov5_021F71B8 (ScriptContext * param0) { MiscSaveBlock * v0; Pokemon * v1; - FieldSystem * v2 = param0->unk_34; + FieldSystem * v2 = param0->fieldSys; v1 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(v2->saveData), 0); v0 = SaveData_MiscSaveBlock(v2->saveData); @@ -769,15 +769,15 @@ BOOL ov5_021F71B8 (UnkStruct_0203E724 * param0) return 0; } -BOOL ov5_021F7208 (UnkStruct_0203E724 * param0) +BOOL ov5_021F7208 (ScriptContext * param0) { int v0, v1, v2; MiscSaveBlock * v3; Pokemon * v4; - FieldSystem * v5 = param0->unk_34; - u16 * v6 = inline_0204FCAC(param0); - u16 * v7 = inline_0204FCAC(param0); - u16 * v8 = inline_0204FCAC(param0); + FieldSystem * v5 = param0->fieldSys; + u16 * v6 = ScriptContext_GetVarPointer(param0); + u16 * v7 = ScriptContext_GetVarPointer(param0); + u16 * v8 = ScriptContext_GetVarPointer(param0); v3 = SaveData_MiscSaveBlock(v5->saveData); MiscSaveBlock_FavoriteMon(v3, &v0, &v1, &v2); @@ -789,13 +789,13 @@ BOOL ov5_021F7208 (UnkStruct_0203E724 * param0) return 0; } -BOOL ov5_021F7270 (UnkStruct_0203E724 * param0) +BOOL ov5_021F7270 (ScriptContext * param0) { Pokemon * v0; Party * v1; - FieldSystem * v2 = param0->unk_34; - u16 v3 = inline_02049538(param0); - u16 * v4 = inline_0204FCAC(param0); + FieldSystem * v2 = param0->fieldSys; + u16 v3 = ScriptContext_GetVar(param0); + u16 * v4 = ScriptContext_GetVarPointer(param0); v1 = Party_GetFromSavedata(v2->saveData); v0 = Party_GetPokemonBySlotIndex(v1, v3); @@ -804,13 +804,13 @@ BOOL ov5_021F7270 (UnkStruct_0203E724 * param0) return 0; } -BOOL ov5_021F72B8 (UnkStruct_0203E724 * param0) +BOOL ov5_021F72B8 (ScriptContext * param0) { UnkStruct_020507E4 * v0; UnkStruct_0202CD88 * v1; - FieldSystem * v2 = param0->unk_34; - u16 v3 = inline_02049538(param0); - u16 * v4 = inline_0204FCAC(param0); + FieldSystem * v2 = param0->fieldSys; + u16 v3 = ScriptContext_GetVar(param0); + u16 * v4 = ScriptContext_GetVarPointer(param0); v0 = SaveData_Events(v2->saveData); v1 = sub_0202CD88(v2->saveData); @@ -891,7 +891,7 @@ BOOL ov5_021F72B8 (UnkStruct_0203E724 * param0) return 0; } -BOOL ov5_021F7414 (UnkStruct_0203E724 * param0) +BOOL ov5_021F7414 (ScriptContext * param0) { return 1; } @@ -926,13 +926,13 @@ static const UnkStruct_ov5_02200C90 Unk_ov5_02200CC8[] = { {0x9, 0x9} }; -BOOL ov5_021F7418 (UnkStruct_0203E724 * param0) +BOOL ov5_021F7418 (ScriptContext * param0) { int v0, v1; - u16 * v2 = inline_0204FCAC(param0); - u16 v3 = inline_02049538(param0); - u16 v4 = inline_02049538(param0); - u16 v5 = inline_02049538(param0); + u16 * v2 = ScriptContext_GetVarPointer(param0); + u16 v3 = ScriptContext_GetVar(param0); + u16 v4 = ScriptContext_GetVar(param0); + u16 v5 = ScriptContext_GetVar(param0); switch (v3) { case 588: @@ -977,13 +977,13 @@ BOOL ov5_021F7418 (UnkStruct_0203E724 * param0) return 0; } -BOOL ov5_021F7538 (UnkStruct_0203E724 * param0) +BOOL ov5_021F7538 (ScriptContext * param0) { fx32 v0; VecFx32 v1; UnkStruct_020216E0 * v2; int v3 = 0; - FieldSystem * v4 = param0->unk_34; + FieldSystem * v4 = param0->fieldSys; MapObjectManager * v5 = v4->unk_38; LocalMapObject * v6 = Player_LocalMapObject(v4->playerAvatar); LocalMapObject * v7; @@ -1021,10 +1021,10 @@ BOOL ov5_021F7538 (UnkStruct_0203E724 * param0) return 0; } -BOOL ov5_021F7604 (UnkStruct_0203E724 * param0) +BOOL ov5_021F7604 (ScriptContext * param0) { int v0 = 0; - FieldSystem * v1 = param0->unk_34; + FieldSystem * v1 = param0->fieldSys; MapObjectManager * v2 = v1->unk_38; LocalMapObject * v3 = Player_LocalMapObject(v1->playerAvatar); LocalMapObject * v4; @@ -1059,10 +1059,10 @@ static void ov5_021F7654 (LocalMapObject * param0, int param1) } } -BOOL ov5_021F76A0 (UnkStruct_0203E724 * param0) +BOOL ov5_021F76A0 (ScriptContext * param0) { LocalMapObject * v0; - FieldSystem * v1 = param0->unk_34; + FieldSystem * v1 = param0->fieldSys; MapObjectManager * v2 = v1->unk_38; v0 = sub_0206251C(v2, 32); @@ -1080,10 +1080,10 @@ BOOL ov5_021F76A0 (UnkStruct_0203E724 * param0) return 0; } -BOOL ov5_021F76D0 (UnkStruct_0203E724 * param0) +BOOL ov5_021F76D0 (ScriptContext * param0) { LocalMapObject * v0; - MapObjectManager * v1 = param0->unk_34->unk_38; + MapObjectManager * v1 = param0->fieldSys->unk_38; v0 = sub_0206251C(v1, 32); @@ -1100,10 +1100,10 @@ BOOL ov5_021F76D0 (UnkStruct_0203E724 * param0) return 0; } -BOOL ov5_021F7704 (UnkStruct_0203E724 * param0) +BOOL ov5_021F7704 (ScriptContext * param0) { int v0; - LocalMapObject * v1 = sub_0206251C(param0->unk_34->unk_38, 15); + LocalMapObject * v1 = sub_0206251C(param0->fieldSys->unk_38, 15); if (v1 != NULL) { switch (sub_02063020(v1)) @@ -1129,25 +1129,25 @@ BOOL ov5_021F7704 (UnkStruct_0203E724 * param0) return 0; } -BOOL ov5_021F7754 (UnkStruct_0203E724 * param0) +BOOL ov5_021F7754 (ScriptContext * param0) { - LocalMapObject * v0 = sub_0206251C(param0->unk_34->unk_38, 15); + LocalMapObject * v0 = sub_0206251C(param0->fieldSys->unk_38, 15); if (v0 != NULL) sub_020628C4(v0, 8192); return 0; } -BOOL ov5_021F7774 (UnkStruct_0203E724 * param0) +BOOL ov5_021F7774 (ScriptContext * param0) { - UnkStruct_0202C878 * v0 = sub_0202C878(param0->unk_34->saveData); + UnkStruct_0202C878 * v0 = sub_0202C878(param0->fieldSys->saveData); sub_02038F8C(v0); return 1; } -BOOL ov5_021F7788 (UnkStruct_0203E724 * param0) +BOOL ov5_021F7788 (ScriptContext * param0) { - u16 v0 = inline_02049538(param0); + u16 v0 = ScriptContext_GetVar(param0); sub_0200544C(1, v0); return 0; diff --git a/src/overlay005/ov5_021F77A8.c b/src/overlay005/ov5_021F77A8.c index c12256ac2d..93d725901b 100644 --- a/src/overlay005/ov5_021F77A8.c +++ b/src/overlay005/ov5_021F77A8.c @@ -636,12 +636,12 @@ struct UnkStruct_ov5_021F7ED8_t { u16 unk_27E; }; -BOOL ov5_021F77E8(UnkStruct_0203E724 * param0); -BOOL ov5_021F7844(UnkStruct_0203E724 * param0); -BOOL ov5_021F789C(UnkStruct_0203E724 * param0); -BOOL ov5_021F7998(UnkStruct_0203E724 * param0); -BOOL ov5_021F7C04(UnkStruct_0203E724 * param0); -static BOOL ov5_021F7DE8(UnkStruct_0203E724 * param0); +BOOL ov5_021F77E8(ScriptContext * param0); +BOOL ov5_021F7844(ScriptContext * param0); +BOOL ov5_021F789C(ScriptContext * param0); +BOOL ov5_021F7998(ScriptContext * param0); +BOOL ov5_021F7C04(ScriptContext * param0); +static BOOL ov5_021F7DE8(ScriptContext * param0); static u16 ov5_021F7A3C(u16 param0); static u16 ov5_021F7A4C(u16 param0); static u8 ReadMovesetMaskByte(Pokemon * param0, u8 param1); @@ -657,48 +657,48 @@ static void ov5_021F819C(UnkStruct_0200112C * param0, u32 param1, u8 param2); static void ov5_021F81A8(SysTask * param0, void * param1); static void ov5_021F8250(UnkStruct_ov5_021F7ED8 * param0); -BOOL ov5_021F77A8 (UnkStruct_0203E724 * param0) +BOOL ov5_021F77A8 (ScriptContext * param0) { - u16 v0 = sub_0203F150(param0->unk_34, sub_0203E838(param0)); - u16 * v1 = sub_0203F118(param0->unk_34, sub_0203E838(param0)); - PokedexData * v2 = SaveData_Pokedex(param0->unk_34->saveData); + u16 v0 = sub_0203F150(param0->fieldSys, ScriptContext_ReadHalfWord(param0)); + u16 * v1 = sub_0203F118(param0->fieldSys, ScriptContext_ReadHalfWord(param0)); + PokedexData * v2 = SaveData_Pokedex(param0->fieldSys->saveData); *v1 = sub_02026FE8(v2, v0); return 0; } -BOOL ov5_021F77E8 (UnkStruct_0203E724 * param0) +BOOL ov5_021F77E8 (ScriptContext * param0) { Pokemon * v0; - u16 v1 = inline_02049538(param0); - u16 v2 = inline_02049538(param0); - u16 * v3 = inline_0204FCAC(param0); + u16 v1 = ScriptContext_GetVar(param0); + u16 v2 = ScriptContext_GetVar(param0); + u16 * v3 = ScriptContext_GetVarPointer(param0); - v0 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(param0->unk_34->saveData), v1); + v0 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(param0->fieldSys->saveData), v1); *v3 = ov5_021F7B60(v0, v2); return 0; } -BOOL ov5_021F7844 (UnkStruct_0203E724 * param0) +BOOL ov5_021F7844 (ScriptContext * param0) { - u16 v0 = inline_02049538(param0); - u16 v1 = inline_02049538(param0); - u16 v2 = inline_02049538(param0); + u16 v0 = ScriptContext_GetVar(param0); + u16 v1 = ScriptContext_GetVar(param0); + u16 v2 = ScriptContext_GetVar(param0); - sub_02054988(Party_GetFromSavedata(param0->unk_34->saveData), v0, v1, v2); + sub_02054988(Party_GetFromSavedata(param0->fieldSys->saveData), v0, v1, v2); return 0; } -BOOL ov5_021F789C (UnkStruct_0203E724 * param0) +BOOL ov5_021F789C (ScriptContext * param0) { int v0; u8 v1, v2, v3, v4; UnkStruct_0207D3C0 * v5; - u16 v6 = inline_02049538(param0); - u16 * v7 = inline_0204FCAC(param0); + u16 v6 = ScriptContext_GetVar(param0); + u16 * v7 = ScriptContext_GetVarPointer(param0); - v5 = sub_0207D990(param0->unk_34->saveData); + v5 = sub_0207D990(param0->fieldSys->saveData); for (v0 = 0; v0 < (NELEMS(sTeachableMoves)); v0++) { if (v6 == sTeachableMoves[v0].moveID) { @@ -745,14 +745,14 @@ BOOL ov5_021F789C (UnkStruct_0203E724 * param0) return 0; } -BOOL ov5_021F7998 (UnkStruct_0203E724 * param0) +BOOL ov5_021F7998 (ScriptContext * param0) { int v0; u8 v1, v2, v3, v4; UnkStruct_0207D3C0 * v5; - u16 v6 = inline_02049538(param0); + u16 v6 = ScriptContext_GetVar(param0); - v5 = sub_0207D990(param0->unk_34->saveData); + v5 = sub_0207D990(param0->fieldSys->saveData); for (v0 = 0; v0 < (NELEMS(sTeachableMoves)); v0++) { if (v6 == sTeachableMoves[v0].moveID) { @@ -882,30 +882,30 @@ static u16 ov5_021F7B60 (Pokemon * param0, u16 param1) return 0; } -BOOL ov5_021F7C04 (UnkStruct_0203E724 * param0) +BOOL ov5_021F7C04 (ScriptContext * param0) { u8 v0, v1; int v2, v3, v4, v5; Pokemon * v6; MessageLoader * v7; MessageLoader * v8; - FieldSystem * v9 = param0->unk_34; + FieldSystem * v9 = param0->fieldSys; UnkStruct_ov5_021F7ED8 * v10; u16 v11[4]; u16 v12[(NELEMS(sTeachableMoves))]; StringTemplate ** v13 = sub_0203F098(v9, 15); - u16 v14 = inline_02049538(param0); - u16 v15 = inline_02049538(param0); - u16 v16 = sub_0203E838(param0); + u16 v14 = ScriptContext_GetVar(param0); + u16 v15 = ScriptContext_GetVar(param0); + u16 v16 = ScriptContext_ReadHalfWord(param0); - param0->unk_18[0] = v16; + param0->data[0] = v16; if (v14 != 0xff) { - v6 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(param0->unk_34->saveData), v14); + v6 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(param0->fieldSys->saveData), v14); } v7 = MessageLoader_Init(0, 26, 647, 32); - v10 = ov5_021F7ED8(v9, 20, 1, 0, 1, sub_0203F118(v9, v16), *v13, sub_0203F098(param0->unk_34, 1), v7); + v10 = ov5_021F7ED8(v9, 20, 1, 0, 1, sub_0203F118(v9, v16), *v13, sub_0203F098(param0->fieldSys, 1), v7); for (v2 = 0; v2 < (NELEMS(sTeachableMoves)); v2++) { v12[v2] = 0; @@ -959,16 +959,16 @@ BOOL ov5_021F7C04 (UnkStruct_0203E724 * param0) ov5_021F7E10(v10, v7); ov5_021F7F34(v10); - sub_0203E764(param0, ov5_021F7DE8); + ScriptContext_Pause(param0, ov5_021F7DE8); MessageLoader_Free(v7); return 1; } -static BOOL ov5_021F7DE8 (UnkStruct_0203E724 * param0) +static BOOL ov5_021F7DE8 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; - u16 * v1 = sub_0203F118(v0, param0->unk_18[0]); + FieldSystem * v0 = param0->fieldSys; + u16 * v1 = sub_0203F118(v0, param0->data[0]); if (*v1 == 0xeeee) { return 0; @@ -1188,15 +1188,15 @@ static void ov5_021F8250 (UnkStruct_ov5_021F7ED8 * param0) return; } -BOOL ov5_021F82B8 (UnkStruct_0203E724 * param0) +BOOL ov5_021F82B8 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; StringTemplate ** v1 = sub_0203F098(v0, 15); UnkStruct_ov5_021DC1A4 ** v2 = sub_0203F098(v0, 0); - u8 v3 = (*((param0)->unk_08++)); - u8 v4 = (*((param0)->unk_08++)); - u16 v5 = inline_02049538(param0); - u16 * v6 = inline_0204FCAC(param0); + u8 v3 = ScriptContext_ReadByte(param0); + u8 v4 = ScriptContext_ReadByte(param0); + u16 v5 = ScriptContext_GetVar(param0); + u16 * v6 = ScriptContext_GetVarPointer(param0); v5 = ov5_021F7A4C(v5); *v2 = ov5_021DD250(v0, v3, v4, v6, *v1, sTeachableMoves[v5].unk_02, sTeachableMoves[v5].unk_03, sTeachableMoves[v5].unk_04, sTeachableMoves[v5].unk_05); @@ -1204,9 +1204,9 @@ BOOL ov5_021F82B8 (UnkStruct_0203E724 * param0) return 0; } -BOOL ov5_021F8358 (UnkStruct_0203E724 * param0) +BOOL ov5_021F8358 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; UnkStruct_ov5_021DC1A4 ** v1 = sub_0203F098(v0, 0); ov5_021DD3A8(*v1); diff --git a/src/unk_0203E724.c b/src/unk_0203E724.c index 6e3277e787..a102d7ca38 100644 --- a/src/unk_0203E724.c +++ b/src/unk_0203E724.c @@ -3,165 +3,160 @@ #include "unk_0203E724.h" -void sub_0203E724 (UnkStruct_0203E724 * param0, const UnkFuncPtr_0203E724 * param1, u32 param2) +enum { + SCRIPT_STATE_STOPPED, + SCRIPT_STATE_RUNNING, + SCRIPT_STATE_WAITING, +}; + +void ScriptContext_Init (ScriptContext * ctx, const ScrCmdFunc * cmdTable, u32 cmdTableSize) { - u32 v0; + ctx->state = SCRIPT_STATE_STOPPED; + ctx->scriptPtr = NULL; + ctx->stackPointer = 0; + ctx->shouldResume = NULL; + ctx->cmdTable = cmdTable; + ctx->cmdTableSize = cmdTableSize; - param0->unk_01 = 0; - param0->unk_08 = NULL; - param0->unk_00 = 0; - param0->unk_04 = NULL; - param0->unk_10 = param1; - param0->unk_14 = param2; - - for (v0 = 0; v0 < 4; v0++) { - param0->unk_18[v0] = 0; + u32 i; + for (i = 0; i < NELEMS(ctx->data); i++) { + ctx->data[i] = 0; } - for (v0 = 0; v0 < 20; v0++) { - param0->unk_0C[v0] = NULL; + for (i = 0; i < NELEMS(ctx->stack); i++) { + ctx->stack[i] = NULL; } - param0->unk_28 = NULL; + ctx->taskManager = NULL; } -u8 sub_0203E758 (UnkStruct_0203E724 * param0, const u8 * param1) +BOOL ScriptContext_Start (ScriptContext * ctx, const u8 * ptr) { - param0->unk_08 = param1; - param0->unk_01 = 1; + ctx->scriptPtr = ptr; + ctx->state = SCRIPT_STATE_RUNNING; - return 1; + return TRUE; } -void sub_0203E764 (UnkStruct_0203E724 * param0, UnkFuncPtr_0203E724 param1) +void ScriptContext_Pause (ScriptContext * ctx, ShouldResumeScriptFunc shouldResume) { - param0->unk_01 = 2; - param0->unk_04 = param1; + ctx->state = SCRIPT_STATE_WAITING; + ctx->shouldResume = shouldResume; } -void sub_0203E76C (UnkStruct_0203E724 * param0) +void ScriptContext_Stop (ScriptContext * ctx) { - param0->unk_01 = 0; - param0->unk_08 = NULL; + ctx->state = SCRIPT_STATE_STOPPED; + ctx->scriptPtr = NULL; } -void sub_0203E774 (UnkStruct_0203E724 * param0, void * param1) +void ScriptContext_SetTaskManager (ScriptContext * ctx, TaskManager * taskManager) { - param0->unk_28 = param1; + ctx->taskManager = taskManager; } -u8 sub_0203E778 (UnkStruct_0203E724 * param0) +BOOL ScriptContext_Run (ScriptContext * ctx) { - u16 v0; - - if (param0->unk_01 == 0) { - return 0; + if (ctx->state == SCRIPT_STATE_STOPPED) { + return FALSE; } - switch (param0->unk_01) { - case 0: - return 0; - case 2: - if (param0->unk_04 != NULL) { - if (param0->unk_04(param0) == 1) { - param0->unk_01 = 1; + switch (ctx->state) { + case SCRIPT_STATE_STOPPED: + // this branch is never taken due to the above check + return FALSE; + + case SCRIPT_STATE_WAITING: + if (ctx->shouldResume != NULL) { + if (ctx->shouldResume(ctx) == TRUE) { + ctx->state = SCRIPT_STATE_RUNNING; } - - return 1; + return TRUE; } + ctx->state = SCRIPT_STATE_RUNNING; + // fallthrough - param0->unk_01 = 1; - case 1: + case SCRIPT_STATE_RUNNING: while (TRUE) { - if (param0->unk_08 == NULL) { - param0->unk_01 = 0; - return 0; + if (ctx->scriptPtr == NULL) { + ctx->state = SCRIPT_STATE_STOPPED; + return FALSE; } - - v0 = sub_0203E838(param0); - - if (v0 >= param0->unk_14) { - GF_ASSERT(0); - param0->unk_01 = 0; - return 0; + u16 cmdCode = ScriptContext_ReadHalfWord(ctx); + if (cmdCode >= ctx->cmdTableSize) { + GF_ASSERT(FALSE); + ctx->state = SCRIPT_STATE_STOPPED; + return FALSE; } - - if (param0->unk_10[v0](param0) == 1) { + if (ctx->cmdTable[cmdCode](ctx) == TRUE) { break; } } } - return 1; + return TRUE; } -u8 sub_0203E7E4 (UnkStruct_0203E724 * param0, const u8 * param1) +static BOOL ScriptContext_Push (ScriptContext * ctx, const u8 * ptr) { - if (param0->unk_00 + 1 >= 20) { - return 1; + if (ctx->stackPointer + 1 >= (int)NELEMS(ctx->stack)) { + return TRUE; } - param0->unk_0C[param0->unk_00] = param1; - param0->unk_00++; + ctx->stack[ctx->stackPointer] = ptr; + ctx->stackPointer++; - return 0; + return FALSE; } -const u8 * sub_0203E800 (UnkStruct_0203E724 * param0) +static const u8 * ScriptContext_Pop (ScriptContext * ctx) { - if (param0->unk_00 == 0) { + if (ctx->stackPointer == 0) { return NULL; } - param0->unk_00--; - - return param0->unk_0C[param0->unk_00]; + return ctx->stack[--ctx->stackPointer]; } -void sub_0203E818 (UnkStruct_0203E724 * param0, u8 * param1) +void ScriptContext_Jump (ScriptContext * ctx, const u8 * ptr) { - param0->unk_08 = param1; + ctx->scriptPtr = ptr; } -void sub_0203E81C (UnkStruct_0203E724 * param0, u8 * param1) +void ScriptContext_Call (ScriptContext * ctx, const u8 * ptr) { - sub_0203E7E4(param0, param0->unk_08); - param0->unk_08 = param1; + ScriptContext_Push(ctx, ctx->scriptPtr); + ctx->scriptPtr = ptr; } -void sub_0203E82C (UnkStruct_0203E724 * param0) +void ScriptContext_Return (ScriptContext * ctx) { - param0->unk_08 = sub_0203E800(param0); + ctx->scriptPtr = ScriptContext_Pop(ctx); } -u16 sub_0203E838 (UnkStruct_0203E724 * param0) +u16 ScriptContext_ReadHalfWord (ScriptContext * ctx) { - u16 v0; + u16 value = ScriptContext_ReadByte(ctx); + value += ScriptContext_ReadByte(ctx) << 8; - v0 = (u16)(*((param0)->unk_08++)); - v0 += (u16)(*((param0)->unk_08++)) << 8; - - return v0; + return value; } -u32 sub_0203E850 (UnkStruct_0203E724 * param0) +u32 ScriptContext_ReadWord (ScriptContext * ctx) { - u32 v0; - u8 v1, v2, v3, v4; + u8 byte0 = ScriptContext_ReadByte(ctx); + u8 byte1 = ScriptContext_ReadByte(ctx); + u8 byte2 = ScriptContext_ReadByte(ctx); + u8 byte3 = ScriptContext_ReadByte(ctx); + u32 value = 0; - v1 = (*((param0)->unk_08++)); - v2 = (*((param0)->unk_08++)); - v3 = (*((param0)->unk_08++)); - v4 = (*((param0)->unk_08++)); - v0 = 0; + value += byte3; + value <<= 8; + value += byte2; + value <<= 8; + value += byte1; + value <<= 8; + value += byte0; - v0 += (u32)v4; - v0 <<= 8; - v0 += (u32)v3; - v0 <<= 8; - v0 += (u32)v2; - v0 <<= 8; - v0 += (u32)v1; - - return v0; + return value; } diff --git a/src/unk_0203E880.c b/src/unk_0203E880.c index df0233a156..44cde92924 100644 --- a/src/unk_0203E880.c +++ b/src/unk_0203E880.c @@ -66,7 +66,7 @@ struct UnkStruct_0203EF60_t { LocalMapObject * unk_2C; LocalMapObject * unk_30; u16 * unk_34; - UnkStruct_0203E724 * unk_38[2]; + ScriptContext * unk_38[2]; StringTemplate * unk_40; Strbuf* unk_44; Strbuf* unk_48; @@ -89,17 +89,17 @@ void sub_0203E880(FieldSystem * param0, u16 param1, LocalMapObject * param2); void sub_0203E8E0(TaskManager * param0, u16 param1, LocalMapObject * param2, void * param3); static BOOL sub_0203E950(TaskManager * param0); static UnkStruct_0203EF60 * sub_0203EA28(); -static void sub_0203EA50(UnkStruct_0203E724 * param0); +static void sub_0203EA50(ScriptContext * param0); static void sub_0203EA68(FieldSystem * param0, UnkStruct_0203EF60 * param1, u16 param2, LocalMapObject * param3, void * param4); -UnkStruct_0203E724 * sub_0203EAB8(FieldSystem * param0, u16 param1); -static void sub_0203EAF4(FieldSystem * param0, UnkStruct_0203E724 * param1, u16 param2, u8 param3); -static u16 sub_0203EB20(FieldSystem * param0, UnkStruct_0203E724 * param1, u16 param2); -static void sub_0203EF14(FieldSystem * param0, UnkStruct_0203E724 * param1, int param2, u32 param3); -static void sub_0203EF38(FieldSystem * param0, UnkStruct_0203E724 * param1); +ScriptContext * sub_0203EAB8(FieldSystem * param0, u16 param1); +static void sub_0203EAF4(FieldSystem * param0, ScriptContext * param1, u16 param2, u8 param3); +static u16 sub_0203EB20(FieldSystem * param0, ScriptContext * param1, u16 param2); +static void sub_0203EF14(FieldSystem * param0, ScriptContext * param1, int param2, u32 param3); +static void sub_0203EF38(FieldSystem * param0, ScriptContext * param1); void * sub_0203EF60(UnkStruct_0203EF60 * param0, u32 param1); void * sub_0203F098(FieldSystem * param0, u32 param1); void sub_0203F0C0(FieldSystem * param0); -static void sub_0203F0E4(UnkStruct_0203E724 * param0, u16 param1); +static void sub_0203F0E4(ScriptContext * param0, u16 param1); static void * sub_0203F0FC(int param0); static u32 sub_0203F110(int param0); u16 * sub_0203F118(FieldSystem * param0, u16 param1); @@ -177,7 +177,7 @@ static BOOL sub_0203E950 (TaskManager * param0) { int v0; UnkFuncPtr_0203E950 v1; - UnkStruct_0203E724 * v2 = NULL; + ScriptContext * v2 = NULL; UnkStruct_0203EF60 * v3 = TaskManager_Environment(param0); FieldSystem * v4 = TaskManager_FieldSystem(param0); @@ -194,7 +194,7 @@ static BOOL sub_0203E950 (TaskManager * param0) v2 = v3->unk_38[v0]; if (v2 != NULL) { - if (sub_0203E778(v2) == 0) { + if (ScriptContext_Run(v2) == 0) { sub_0203EA50(v2); if (v3->unk_09 == 0) { @@ -245,10 +245,10 @@ static UnkStruct_0203EF60 * sub_0203EA28 () return v0; } -static void sub_0203EA50 (UnkStruct_0203E724 * param0) +static void sub_0203EA50 (ScriptContext * param0) { - MessageLoader_Free(param0->unk_2C); - Heap_FreeToHeap(param0->unk_30); + MessageLoader_Free(param0->loader); + Heap_FreeToHeap(param0->scripts); Heap_FreeToHeap(param0); return; @@ -274,37 +274,37 @@ static void sub_0203EA68 (FieldSystem * param0, UnkStruct_0203EF60 * param1, u16 return; } -UnkStruct_0203E724 * sub_0203EAB8 (FieldSystem * param0, u16 param1) +ScriptContext * sub_0203EAB8 (FieldSystem * param0, u16 param1) { - UnkStruct_0203E724 * v0 = NULL; + ScriptContext * v0 = NULL; - v0 = Heap_AllocFromHeap(11, sizeof(UnkStruct_0203E724)); + v0 = Heap_AllocFromHeap(11, sizeof(ScriptContext)); if (v0 == NULL) { GF_ASSERT(FALSE); } - sub_0203E724(v0, Unk_020EAC58, Unk_020EAB80); + ScriptContext_Init(v0, Unk_020EAC58, Unk_020EAB80); sub_0203EAF4(param0, v0, param1, 0); return v0; } -static void sub_0203EAF4 (FieldSystem * param0, UnkStruct_0203E724 * param1, u16 param2, u8 param3) +static void sub_0203EAF4 (FieldSystem * param0, ScriptContext * param1, u16 param2, u8 param3) { u16 v0; - param1->unk_34 = param0; + param1->fieldSys = param0; v0 = sub_0203EB20(param0, param1, param2); - sub_0203E758(param1, param1->unk_30); + ScriptContext_Start(param1, param1->scripts); sub_0203F0E4(param1, v0); - sub_0203E774(param1, (void *)param0->unk_10); + ScriptContext_SetTaskManager(param1, param0->unk_10); return; } -static u16 sub_0203EB20 (FieldSystem * param0, UnkStruct_0203E724 * param1, u16 param2) +static u16 sub_0203EB20 (FieldSystem * param0, ScriptContext * param1, u16 param2) { u16 v0 = param2; @@ -409,22 +409,22 @@ static u16 sub_0203EB20 (FieldSystem * param0, UnkStruct_0203E724 * param1, u16 return v0; } -static void sub_0203EF14 (FieldSystem * param0, UnkStruct_0203E724 * param1, int param2, u32 param3) +static void sub_0203EF14 (FieldSystem * param0, ScriptContext * param1, int param2, u32 param3) { u8 * v0 = NARC_AllocAndReadWholeMemberByIndexPair(NARC_INDEX_FIELDDATA__SCRIPT__SCR_SEQ, param2, 11); - param1->unk_30 = (u8 *)v0; - param1->unk_2C = MessageLoader_Init(1, 26, param3, 11); + param1->scripts = (u8 *)v0; + param1->loader = MessageLoader_Init(1, 26, param3, 11); return; } -static void sub_0203EF38 (FieldSystem * param0, UnkStruct_0203E724 * param1) +static void sub_0203EF38 (FieldSystem * param0, ScriptContext * param1) { u8 * v0 = sub_0203F0FC(param0->unk_1C->unk_00); - param1->unk_30 = (u8 *)v0; - param1->unk_2C = MessageLoader_Init(1, 26, sub_0203F110(param0->unk_1C->unk_00), 11); + param1->scripts = (u8 *)v0; + param1->loader = MessageLoader_Init(1, 26, sub_0203F110(param0->unk_1C->unk_00), 11); return; } @@ -574,10 +574,10 @@ void sub_0203F0C0 (FieldSystem * param0) return; } -static void sub_0203F0E4 (UnkStruct_0203E724 * param0, u16 param1) +static void sub_0203F0E4 (ScriptContext * param0, u16 param1) { - param0->unk_08 += (param1 * 4); - param0->unk_08 += sub_0203E850(param0); + param0->scriptPtr += (param1 * 4); + param0->scriptPtr += ScriptContext_ReadWord(param0); return; } @@ -895,9 +895,9 @@ void sub_0203F598 (FieldSystem * param0) void sub_0203F5A4 (FieldSystem * param0, u16 param1) { - UnkStruct_0203E724 * v0 = sub_0203EAB8(param0, param1); + ScriptContext * v0 = sub_0203EAB8(param0, param1); - while (sub_0203E778(v0) == 1) { + while (ScriptContext_Run(v0) == 1) { (void)0; } diff --git a/src/unk_0203F6C4.c b/src/unk_0203F6C4.c index 71cf65ae3a..ec7228b571 100644 --- a/src/unk_0203F6C4.c +++ b/src/unk_0203F6C4.c @@ -241,512 +241,512 @@ typedef struct { FieldSystem * fieldSystem; } UnkStruct_02040F28; -static BOOL sub_0203F6C4(UnkStruct_0203E724 * param0); -static BOOL sub_0203F6C8(UnkStruct_0203E724 * param0); -static BOOL sub_0203F6CC(UnkStruct_0203E724 * param0); -static BOOL sub_0203F6D8(UnkStruct_0203E724 * param0); -static BOOL sub_0203F70C(UnkStruct_0203E724 * param0); -static BOOL sub_0203F74C(UnkStruct_0203E724 * param0); -static BOOL sub_0203F764(UnkStruct_0203E724 * param0); -static BOOL sub_0203F780(UnkStruct_0203E724 * param0); -static BOOL sub_0203F79C(UnkStruct_0203E724 * param0); -static BOOL sub_0203F7B4(UnkStruct_0203E724 * param0); -static BOOL sub_0203F7D0(UnkStruct_0203E724 * param0); -static BOOL sub_0203F7F0(UnkStruct_0203E724 * param0); +static BOOL sub_0203F6C4(ScriptContext * param0); +static BOOL sub_0203F6C8(ScriptContext * param0); +static BOOL sub_0203F6CC(ScriptContext * param0); +static BOOL sub_0203F6D8(ScriptContext * param0); +static BOOL sub_0203F70C(ScriptContext * param0); +static BOOL sub_0203F74C(ScriptContext * param0); +static BOOL sub_0203F764(ScriptContext * param0); +static BOOL sub_0203F780(ScriptContext * param0); +static BOOL sub_0203F79C(ScriptContext * param0); +static BOOL sub_0203F7B4(ScriptContext * param0); +static BOOL sub_0203F7D0(ScriptContext * param0); +static BOOL sub_0203F7F0(ScriptContext * param0); static BOOL sub_0203F808(u16 param0, u16 param1); -static BOOL sub_0203F81C(UnkStruct_0203E724 * param0); -static BOOL sub_0203F84C(UnkStruct_0203E724 * param0); -static BOOL sub_0203F874(UnkStruct_0203E724 * param0); -static BOOL sub_0203F89C(UnkStruct_0203E724 * param0); -static BOOL sub_0203F8C4(UnkStruct_0203E724 * param0); -static BOOL sub_0203F8E0(UnkStruct_0203E724 * param0); -static BOOL sub_0203F900(UnkStruct_0203E724 * param0); -static BOOL sub_0203F92C(UnkStruct_0203E724 * param0); -static BOOL sub_0203F964(UnkStruct_0203E724 * param0); -static BOOL sub_0203F99C(UnkStruct_0203E724 * param0); -static BOOL sub_0203F9EC(UnkStruct_0203E724 * param0); -static BOOL sub_0203FA08(UnkStruct_0203E724 * param0); -static BOOL sub_0203FA1C(UnkStruct_0203E724 * param0); +static BOOL sub_0203F81C(ScriptContext * param0); +static BOOL sub_0203F84C(ScriptContext * param0); +static BOOL sub_0203F874(ScriptContext * param0); +static BOOL sub_0203F89C(ScriptContext * param0); +static BOOL sub_0203F8C4(ScriptContext * param0); +static BOOL sub_0203F8E0(ScriptContext * param0); +static BOOL sub_0203F900(ScriptContext * param0); +static BOOL sub_0203F92C(ScriptContext * param0); +static BOOL sub_0203F964(ScriptContext * param0); +static BOOL sub_0203F99C(ScriptContext * param0); +static BOOL sub_0203F9EC(ScriptContext * param0); +static BOOL sub_0203FA08(ScriptContext * param0); +static BOOL sub_0203FA1C(ScriptContext * param0); static LocalMapObject * sub_02040ED4(FieldSystem * param0, int param1); -static BOOL sub_0203FA34(UnkStruct_0203E724 * param0); -static BOOL sub_0203FA6C(UnkStruct_0203E724 * param0); -static BOOL sub_0203FA9C(UnkStruct_0203E724 * param0); -static BOOL sub_0203FAD0(UnkStruct_0203E724 * param0); -static BOOL sub_0203FAE8(UnkStruct_0203E724 * param0); -static BOOL sub_0203FAF4(UnkStruct_0203E724 * param0); -static BOOL sub_0203FB28(UnkStruct_0203E724 * param0); -static BOOL sub_0203FB5C(UnkStruct_0203E724 * param0); -static BOOL sub_0203FB74(UnkStruct_0203E724 * param0); -static BOOL sub_0203FB8C(UnkStruct_0203E724 * param0); -static BOOL sub_0203FBA8(UnkStruct_0203E724 * param0); -static BOOL sub_0203FBE4(UnkStruct_0203E724 * param0); -static BOOL sub_0203FC0C(UnkStruct_0203E724 * param0); -static BOOL sub_0203FC30(UnkStruct_0203E724 * param0); -static BOOL sub_0203FC54(UnkStruct_0203E724 * param0); -static BOOL sub_0203FC7C(UnkStruct_0203E724 * param0); -static BOOL sub_0203FCAC(UnkStruct_0203E724 * param0); -static BOOL sub_0203FCDC(UnkStruct_0203E724 * param0); -static BOOL sub_0203FD00(UnkStruct_0203E724 * param0); -static BOOL sub_0203FD30(UnkStruct_0203E724 * param0); -static BOOL sub_0203FD5C(UnkStruct_0203E724 * param0); -static BOOL sub_0203FD70(UnkStruct_0203E724 * param0); -static BOOL sub_0203FDBC(UnkStruct_0203E724 * param0); -static BOOL sub_0203FE20(UnkStruct_0203E724 * param0); -static BOOL sub_0203FE60(UnkStruct_0203E724 * param0); -static BOOL sub_0203FEAC(UnkStruct_0203E724 * param0); -static BOOL sub_0203FF34(UnkStruct_0203E724 * param0); -static BOOL sub_0203FFAC(UnkStruct_0203E724 * param0); -static BOOL sub_0203FFE8(UnkStruct_0203E724 * param0); -static BOOL sub_02040028(UnkStruct_0203E724 * param0); -static BOOL sub_02040064(UnkStruct_0203E724 * param0); -static BOOL sub_020400AC(UnkStruct_0203E724 * param0); -static BOOL sub_02040124(UnkStruct_0203E724 * param0); -static BOOL sub_02040014(UnkStruct_0203E724 * param0); -static BOOL sub_02040180(UnkStruct_0203E724 * param0); -static BOOL sub_02040190(UnkStruct_0203E724 * param0); -static BOOL sub_020401F4(UnkStruct_0203E724 * param0); -static BOOL sub_02040204(UnkStruct_0203E724 * param0); -static BOOL sub_02040284(UnkStruct_0203E724 * param0); -static BOOL sub_02040294(UnkStruct_0203E724 * param0); -static BOOL sub_020402B4(UnkStruct_0203E724 * param0); -static BOOL sub_020402FC(UnkStruct_0203E724 * param0); -static BOOL sub_0204032C(UnkStruct_0203E724 * param0); -static BOOL sub_020404A4(UnkStruct_0203E724 * param0); -static BOOL sub_02040554(UnkStruct_0203E724 * param0); -static BOOL sub_02040580(UnkStruct_0203E724 * param0); -static BOOL sub_0204059C(UnkStruct_0203E724 * param0); -static BOOL sub_020405C4(UnkStruct_0203E724 * param0); -static BOOL sub_020405DC(UnkStruct_0203E724 * param0); -static BOOL sub_02040670(UnkStruct_0203E724 * param0); -static BOOL sub_02040714(UnkStruct_0203E724 * param0); -static BOOL sub_02040730(UnkStruct_0203E724 * param0); -static BOOL sub_020407B4(UnkStruct_0203E724 * param0); -static BOOL sub_020403EC(UnkStruct_0203E724 * param0); -static BOOL sub_02040354(UnkStruct_0203E724 * param0); -static BOOL sub_020407C4(UnkStruct_0203E724 * param0); -static BOOL sub_02040824(UnkStruct_0203E724 * param0); -static BOOL sub_020408B0(UnkStruct_0203E724 * param0); -static BOOL sub_02040938(UnkStruct_0203E724 * param0); -static BOOL sub_020409C0(UnkStruct_0203E724 * param0); -static BOOL sub_020409E8(UnkStruct_0203E724 * param0); -static BOOL sub_02040A2C(UnkStruct_0203E724 * param0); -static BOOL sub_02040A50(UnkStruct_0203E724 * param0); -static BOOL sub_02040AE8(UnkStruct_0203E724 * param0); -static BOOL sub_02040B70(UnkStruct_0203E724 * param0); -static BOOL sub_02040BF8(UnkStruct_0203E724 * param0); -static BOOL sub_02040C58(UnkStruct_0203E724 * param0); -static BOOL sub_02040C7C(UnkStruct_0203E724 * param0); -static BOOL sub_02040CB8(UnkStruct_0203E724 * param0); -static BOOL sub_02040D08(UnkStruct_0203E724 * param0); -static BOOL sub_02040D74(UnkStruct_0203E724 * param0); -static BOOL sub_02040EFC(UnkStruct_0203E724 * param0); -static BOOL sub_02040FA4(UnkStruct_0203E724 * param0); -static BOOL sub_020410CC(UnkStruct_0203E724 * param0); -static BOOL sub_020411C4(UnkStruct_0203E724 * param0); -static BOOL sub_020411D4(UnkStruct_0203E724 * param0); -static BOOL sub_020411F0(UnkStruct_0203E724 * param0); -static BOOL sub_0204120C(UnkStruct_0203E724 * param0); -static BOOL sub_02041254(UnkStruct_0203E724 * param0); -static BOOL sub_02041288(UnkStruct_0203E724 * param0); -static BOOL sub_02041320(UnkStruct_0203E724 * param0); -static BOOL sub_02041364(UnkStruct_0203E724 * param0); -static BOOL sub_020413D8(UnkStruct_0203E724 * param0); -static BOOL sub_020413F0(UnkStruct_0203E724 * param0); -static BOOL sub_02041420(UnkStruct_0203E724 * param0); -static BOOL sub_02041464(UnkStruct_0203E724 * param0); -static BOOL sub_020414C4(UnkStruct_0203E724 * param0); -static BOOL sub_020414EC(UnkStruct_0203E724 * param0); -static BOOL sub_020415D0(UnkStruct_0203E724 * param0); -static BOOL sub_02041604(UnkStruct_0203E724 * param0); -static BOOL sub_0204163C(UnkStruct_0203E724 * param0); -static BOOL sub_02041684(UnkStruct_0203E724 * param0); -static BOOL sub_020416C8(UnkStruct_0203E724 * param0); -static BOOL sub_02041708(UnkStruct_0203E724 * param0); -static BOOL sub_0204174C(UnkStruct_0203E724 * param0); -static BOOL sub_02041C40(UnkStruct_0203E724 * param0); -static BOOL sub_02041C8C(UnkStruct_0203E724 * param0); -static BOOL sub_02041CB8(UnkStruct_0203E724 * param0); -static BOOL sub_02041CBC(UnkStruct_0203E724 * param0); -static BOOL sub_02041CC0(UnkStruct_0203E724 * param0); -static BOOL sub_02041CC4(UnkStruct_0203E724 * param0); -static BOOL sub_02041D78(UnkStruct_0203E724 * param0); -static BOOL sub_02041D88(UnkStruct_0203E724 * param0); -static BOOL sub_02041E18(UnkStruct_0203E724 * param0); -static BOOL sub_02041E28(UnkStruct_0203E724 * param0); -static BOOL sub_02041E34(UnkStruct_0203E724 * param0); -static BOOL sub_02041E64(UnkStruct_0203E724 * param0); -static BOOL sub_02041E84(UnkStruct_0203E724 * param0); +static BOOL sub_0203FA34(ScriptContext * param0); +static BOOL sub_0203FA6C(ScriptContext * param0); +static BOOL sub_0203FA9C(ScriptContext * param0); +static BOOL sub_0203FAD0(ScriptContext * param0); +static BOOL sub_0203FAE8(ScriptContext * param0); +static BOOL sub_0203FAF4(ScriptContext * param0); +static BOOL sub_0203FB28(ScriptContext * param0); +static BOOL sub_0203FB5C(ScriptContext * param0); +static BOOL sub_0203FB74(ScriptContext * param0); +static BOOL sub_0203FB8C(ScriptContext * param0); +static BOOL sub_0203FBA8(ScriptContext * param0); +static BOOL sub_0203FBE4(ScriptContext * param0); +static BOOL sub_0203FC0C(ScriptContext * param0); +static BOOL sub_0203FC30(ScriptContext * param0); +static BOOL sub_0203FC54(ScriptContext * param0); +static BOOL sub_0203FC7C(ScriptContext * param0); +static BOOL sub_0203FCAC(ScriptContext * param0); +static BOOL sub_0203FCDC(ScriptContext * param0); +static BOOL sub_0203FD00(ScriptContext * param0); +static BOOL sub_0203FD30(ScriptContext * param0); +static BOOL sub_0203FD5C(ScriptContext * param0); +static BOOL sub_0203FD70(ScriptContext * param0); +static BOOL sub_0203FDBC(ScriptContext * param0); +static BOOL sub_0203FE20(ScriptContext * param0); +static BOOL sub_0203FE60(ScriptContext * param0); +static BOOL sub_0203FEAC(ScriptContext * param0); +static BOOL sub_0203FF34(ScriptContext * param0); +static BOOL sub_0203FFAC(ScriptContext * param0); +static BOOL sub_0203FFE8(ScriptContext * param0); +static BOOL sub_02040028(ScriptContext * param0); +static BOOL sub_02040064(ScriptContext * param0); +static BOOL sub_020400AC(ScriptContext * param0); +static BOOL sub_02040124(ScriptContext * param0); +static BOOL sub_02040014(ScriptContext * param0); +static BOOL sub_02040180(ScriptContext * param0); +static BOOL sub_02040190(ScriptContext * param0); +static BOOL sub_020401F4(ScriptContext * param0); +static BOOL sub_02040204(ScriptContext * param0); +static BOOL sub_02040284(ScriptContext * param0); +static BOOL sub_02040294(ScriptContext * param0); +static BOOL sub_020402B4(ScriptContext * param0); +static BOOL sub_020402FC(ScriptContext * param0); +static BOOL sub_0204032C(ScriptContext * param0); +static BOOL sub_020404A4(ScriptContext * param0); +static BOOL sub_02040554(ScriptContext * param0); +static BOOL sub_02040580(ScriptContext * param0); +static BOOL sub_0204059C(ScriptContext * param0); +static BOOL sub_020405C4(ScriptContext * param0); +static BOOL sub_020405DC(ScriptContext * param0); +static BOOL sub_02040670(ScriptContext * param0); +static BOOL sub_02040714(ScriptContext * param0); +static BOOL sub_02040730(ScriptContext * param0); +static BOOL sub_020407B4(ScriptContext * param0); +static BOOL sub_020403EC(ScriptContext * param0); +static BOOL sub_02040354(ScriptContext * param0); +static BOOL sub_020407C4(ScriptContext * param0); +static BOOL sub_02040824(ScriptContext * param0); +static BOOL sub_020408B0(ScriptContext * param0); +static BOOL sub_02040938(ScriptContext * param0); +static BOOL sub_020409C0(ScriptContext * param0); +static BOOL sub_020409E8(ScriptContext * param0); +static BOOL sub_02040A2C(ScriptContext * param0); +static BOOL sub_02040A50(ScriptContext * param0); +static BOOL sub_02040AE8(ScriptContext * param0); +static BOOL sub_02040B70(ScriptContext * param0); +static BOOL sub_02040BF8(ScriptContext * param0); +static BOOL sub_02040C58(ScriptContext * param0); +static BOOL sub_02040C7C(ScriptContext * param0); +static BOOL sub_02040CB8(ScriptContext * param0); +static BOOL sub_02040D08(ScriptContext * param0); +static BOOL sub_02040D74(ScriptContext * param0); +static BOOL sub_02040EFC(ScriptContext * param0); +static BOOL sub_02040FA4(ScriptContext * param0); +static BOOL sub_020410CC(ScriptContext * param0); +static BOOL sub_020411C4(ScriptContext * param0); +static BOOL sub_020411D4(ScriptContext * param0); +static BOOL sub_020411F0(ScriptContext * param0); +static BOOL sub_0204120C(ScriptContext * param0); +static BOOL sub_02041254(ScriptContext * param0); +static BOOL sub_02041288(ScriptContext * param0); +static BOOL sub_02041320(ScriptContext * param0); +static BOOL sub_02041364(ScriptContext * param0); +static BOOL sub_020413D8(ScriptContext * param0); +static BOOL sub_020413F0(ScriptContext * param0); +static BOOL sub_02041420(ScriptContext * param0); +static BOOL sub_02041464(ScriptContext * param0); +static BOOL sub_020414C4(ScriptContext * param0); +static BOOL sub_020414EC(ScriptContext * param0); +static BOOL sub_020415D0(ScriptContext * param0); +static BOOL sub_02041604(ScriptContext * param0); +static BOOL sub_0204163C(ScriptContext * param0); +static BOOL sub_02041684(ScriptContext * param0); +static BOOL sub_020416C8(ScriptContext * param0); +static BOOL sub_02041708(ScriptContext * param0); +static BOOL sub_0204174C(ScriptContext * param0); +static BOOL sub_02041C40(ScriptContext * param0); +static BOOL sub_02041C8C(ScriptContext * param0); +static BOOL sub_02041CB8(ScriptContext * param0); +static BOOL sub_02041CBC(ScriptContext * param0); +static BOOL sub_02041CC0(ScriptContext * param0); +static BOOL sub_02041CC4(ScriptContext * param0); +static BOOL sub_02041D78(ScriptContext * param0); +static BOOL sub_02041D88(ScriptContext * param0); +static BOOL sub_02041E18(ScriptContext * param0); +static BOOL sub_02041E28(ScriptContext * param0); +static BOOL sub_02041E34(ScriptContext * param0); +static BOOL sub_02041E64(ScriptContext * param0); +static BOOL sub_02041E84(ScriptContext * param0); static void sub_020451B4(FieldSystem * param0, u16 param1); -static BOOL sub_02041FAC(UnkStruct_0203E724 * param0); -static BOOL sub_02042028(UnkStruct_0203E724 * param0); -static BOOL sub_0204205C(UnkStruct_0203E724 * param0); -static BOOL sub_020420A0(UnkStruct_0203E724 * param0); -static BOOL sub_020420AC(UnkStruct_0203E724 * param0); -static BOOL sub_020420CC(UnkStruct_0203E724 * param0); -static BOOL sub_02042124(UnkStruct_0203E724 * param0); -static BOOL sub_0204218C(UnkStruct_0203E724 * param0); -static BOOL sub_020421F4(UnkStruct_0203E724 * param0); -static BOOL sub_02042230(UnkStruct_0203E724 * param0); -static BOOL sub_0204226C(UnkStruct_0203E724 * param0); -static BOOL sub_020422D4(UnkStruct_0203E724 * param0); -static BOOL sub_020422E8(UnkStruct_0203E724 * param0); -static BOOL sub_02042330(UnkStruct_0203E724 * param0); -static BOOL sub_02042368(UnkStruct_0203E724 * param0); -static BOOL sub_020423BC(UnkStruct_0203E724 * param0); -static BOOL sub_02042434(UnkStruct_0203E724 * param0); -static BOOL sub_02042480(UnkStruct_0203E724 * param0); -static BOOL sub_0204249C(UnkStruct_0203E724 * param0); -static BOOL sub_020424AC(UnkStruct_0203E724 * param0); -static BOOL sub_020424BC(UnkStruct_0203E724 * param0); -static BOOL sub_020424E8(UnkStruct_0203E724 * param0); -static BOOL sub_020424F8(UnkStruct_0203E724 * param0); -static BOOL sub_02042524(UnkStruct_0203E724 * param0); -static BOOL sub_02042560(UnkStruct_0203E724 * param0); -static BOOL sub_020425C0(UnkStruct_0203E724 * param0); -static BOOL sub_020425E0(UnkStruct_0203E724 * param0); -static BOOL sub_02042628(UnkStruct_0203E724 * param0); -static BOOL sub_020426E8(UnkStruct_0203E724 * param0); -static BOOL sub_02042718(UnkStruct_0203E724 * param0); -static BOOL sub_02042784(UnkStruct_0203E724 * param0); -static BOOL sub_02042918(UnkStruct_0203E724 * param0); -static BOOL sub_02042960(UnkStruct_0203E724 * param0); -static BOOL sub_02042970(UnkStruct_0203E724 * param0); -static BOOL sub_02042984(UnkStruct_0203E724 * param0); -static BOOL sub_02042AB0(UnkStruct_0203E724 * param0); -static BOOL sub_02042AE0(UnkStruct_0203E724 * param0); -static BOOL sub_02042B3C(UnkStruct_0203E724 * param0); -static BOOL sub_02042B6C(UnkStruct_0203E724 * param0); -static BOOL sub_02042BB8(UnkStruct_0203E724 * param0); -static BOOL sub_02042BE8(UnkStruct_0203E724 * param0); -static BOOL sub_02042C18(UnkStruct_0203E724 * param0); -static BOOL sub_02042C80(UnkStruct_0203E724 * param0); -static BOOL sub_02042CA8(UnkStruct_0203E724 * param0); -static BOOL sub_02042CB4(UnkStruct_0203E724 * param0); -static BOOL sub_02042CE4(UnkStruct_0203E724 * param0); -static BOOL sub_02042D84(UnkStruct_0203E724 * param0); -static BOOL sub_02042D9C(UnkStruct_0203E724 * param0); -static BOOL sub_02042DC4(UnkStruct_0203E724 * param0); -static BOOL sub_02042DDC(UnkStruct_0203E724 * param0); -static BOOL sub_02042E38(UnkStruct_0203E724 * param0); -static BOOL sub_02042DEC(UnkStruct_0203E724 * param0); -static BOOL sub_02042E64(UnkStruct_0203E724 * param0); -static BOOL sub_02042F04(UnkStruct_0203E724 * param0); -static BOOL sub_02042F74(UnkStruct_0203E724 * param0); -static BOOL sub_02042F9C(UnkStruct_0203E724 * param0); -static BOOL sub_0204300C(UnkStruct_0203E724 * param0); -static BOOL sub_02043034(UnkStruct_0203E724 * param0); -static BOOL sub_02043040(UnkStruct_0203E724 * param0); -static BOOL sub_0204304C(UnkStruct_0203E724 * param0); -static BOOL sub_0204307C(UnkStruct_0203E724 * param0); -static BOOL sub_02043080(UnkStruct_0203E724 * param0); -static BOOL sub_02043100(UnkStruct_0203E724 * param0); -static BOOL sub_02043130(UnkStruct_0203E724 * param0); -static BOOL sub_02043190(UnkStruct_0203E724 * param0); -static BOOL sub_020431C0(UnkStruct_0203E724 * param0); -static BOOL sub_020431F0(UnkStruct_0203E724 * param0); -static BOOL sub_02043220(UnkStruct_0203E724 * param0); -static BOOL sub_02043250(UnkStruct_0203E724 * param0); -static BOOL sub_02043254(UnkStruct_0203E724 * param0); -static BOOL sub_020432DC(UnkStruct_0203E724 * param0); -static BOOL sub_02043330(UnkStruct_0203E724 * param0); -static BOOL sub_020433D8(UnkStruct_0203E724 * param0); -static BOOL sub_0204342C(UnkStruct_0203E724 * param0); -static BOOL sub_02043460(UnkStruct_0203E724 * param0); -static BOOL sub_0204346C(UnkStruct_0203E724 * param0); -static BOOL sub_0204347C(UnkStruct_0203E724 * param0); -static BOOL sub_020434A4(UnkStruct_0203E724 * param0); -static BOOL sub_020434C0(UnkStruct_0203E724 * param0); -static BOOL sub_020434D0(UnkStruct_0203E724 * param0); -static BOOL sub_020434EC(UnkStruct_0203E724 * param0); -static BOOL sub_02043540(UnkStruct_0203E724 * param0); -static BOOL sub_020435A0(UnkStruct_0203E724 * param0); -static BOOL sub_020435AC(UnkStruct_0203E724 * param0); -static BOOL sub_020435DC(UnkStruct_0203E724 * param0); -static BOOL sub_02043608(UnkStruct_0203E724 * param0); -static BOOL sub_02043648(UnkStruct_0203E724 * param0); -static BOOL sub_02043678(UnkStruct_0203E724 * param0); -static BOOL sub_02043694(UnkStruct_0203E724 * param0); -static BOOL sub_020436A0(UnkStruct_0203E724 * param0); -static BOOL sub_020436D0(UnkStruct_0203E724 * param0); -static BOOL sub_02043708(UnkStruct_0203E724 * param0); -static BOOL sub_02043988(UnkStruct_0203E724 * param0); -static BOOL sub_02043978(UnkStruct_0203E724 * param0); -static BOOL sub_02043748(UnkStruct_0203E724 * param0); -static BOOL sub_020437B4(UnkStruct_0203E724 * param0); -static BOOL sub_020437C4(UnkStruct_0203E724 * param0); -static BOOL sub_020437E8(UnkStruct_0203E724 * param0); -static BOOL sub_020437FC(UnkStruct_0203E724 * param0); -static BOOL sub_02043894(UnkStruct_0203E724 * param0); -static BOOL sub_020438CC(UnkStruct_0203E724 * param0); -static BOOL sub_0204391C(UnkStruct_0203E724 * param0); -static BOOL sub_02043938(UnkStruct_0203E724 * param0); -static BOOL sub_02043964(UnkStruct_0203E724 * param0); -static BOOL sub_0204399C(UnkStruct_0203E724 * param0); -static BOOL sub_020439D8(UnkStruct_0203E724 * param0); -static BOOL sub_020439F4(UnkStruct_0203E724 * param0); -static BOOL sub_02043A30(UnkStruct_0203E724 * param0); -static BOOL sub_02043A4C(UnkStruct_0203E724 * param0); -static BOOL sub_02043A94(UnkStruct_0203E724 * param0); -static BOOL sub_02043AA4(UnkStruct_0203E724 * param0); -static BOOL sub_02043AE0(UnkStruct_0203E724 * param0); -static BOOL sub_02043B48(UnkStruct_0203E724 * param0); -static BOOL sub_02043BA0(UnkStruct_0203E724 * param0); -static BOOL sub_02043854(UnkStruct_0203E724 * param0); -static BOOL sub_02043BD4(UnkStruct_0203E724 * param0); -static BOOL sub_02043BE0(UnkStruct_0203E724 * param0); -static BOOL sub_02043C0C(UnkStruct_0203E724 * param0); -static BOOL sub_02043C3C(UnkStruct_0203E724 * param0); -static BOOL sub_02043C54(UnkStruct_0203E724 * param0); -static BOOL sub_02043C58(UnkStruct_0203E724 * param0); -static BOOL sub_02043C70(UnkStruct_0203E724 * param0); -static BOOL sub_02043CA4(UnkStruct_0203E724 * param0); -static BOOL sub_02043CB4(UnkStruct_0203E724 * param0); -static BOOL sub_02043D04(UnkStruct_0203E724 * param0); -static BOOL sub_02043D54(UnkStruct_0203E724 * param0); -static BOOL sub_02043DE4(UnkStruct_0203E724 * param0); -static BOOL sub_02043E1C(UnkStruct_0203E724 * param0); -static BOOL sub_02043E54(UnkStruct_0203E724 * param0); -static BOOL sub_02043EA4(UnkStruct_0203E724 * param0); -static BOOL sub_02043EF4(UnkStruct_0203E724 * param0); -static BOOL sub_02043F40(UnkStruct_0203E724 * param0); -static BOOL sub_02043F6C(UnkStruct_0203E724 * param0); -static BOOL sub_02043FC4(UnkStruct_0203E724 * param0); -static BOOL sub_02043FDC(UnkStruct_0203E724 * param0); -static BOOL sub_02043FF4(UnkStruct_0203E724 * param0); -static BOOL sub_0204400C(UnkStruct_0203E724 * param0); -static BOOL sub_02044024(UnkStruct_0203E724 * param0); -static BOOL sub_02044034(UnkStruct_0203E724 * param0); -static BOOL sub_02044044(UnkStruct_0203E724 * param0); -static BOOL sub_02044054(UnkStruct_0203E724 * param0); -static BOOL sub_02044064(UnkStruct_0203E724 * param0); -static BOOL sub_02044074(UnkStruct_0203E724 * param0); -static BOOL sub_02044084(UnkStruct_0203E724 * param0); -static BOOL sub_020440A0(UnkStruct_0203E724 * param0); -static BOOL sub_020440BC(UnkStruct_0203E724 * param0); -static BOOL sub_020440CC(UnkStruct_0203E724 * param0); -static BOOL sub_020440DC(UnkStruct_0203E724 * param0); -static BOOL sub_020440EC(UnkStruct_0203E724 * param0); -static BOOL sub_02042658(UnkStruct_0203E724 * param0); -static BOOL sub_020426A8(UnkStruct_0203E724 * param0); -static BOOL sub_02043CC4(UnkStruct_0203E724 * param0); -static BOOL sub_02040868(UnkStruct_0203E724 * param0); -static BOOL sub_02040898(UnkStruct_0203E724 * param0); -static BOOL sub_020401A8(UnkStruct_0203E724 * param0); -static BOOL sub_020401D0(UnkStruct_0203E724 * param0); -static BOOL sub_02041790(UnkStruct_0203E724 * param0); -static BOOL sub_02041814(UnkStruct_0203E724 * param0); -static BOOL sub_02041860(UnkStruct_0203E724 * param0); -static BOOL sub_020418E0(UnkStruct_0203E724 * param0); -static BOOL sub_02041984(UnkStruct_0203E724 * param0); -static BOOL sub_020417C0(UnkStruct_0203E724 * param0); -static BOOL sub_02041B24(UnkStruct_0203E724 * param0); -static BOOL sub_02041B68(UnkStruct_0203E724 * param0); -static BOOL sub_02041BA8(UnkStruct_0203E724 * param0); -static BOOL sub_02041C00(UnkStruct_0203E724 * param0); -static BOOL sub_02044168(UnkStruct_0203E724 * param0); -static BOOL sub_020441C8(UnkStruct_0203E724 * param0); -static BOOL sub_02044208(UnkStruct_0203E724 * param0); -static BOOL sub_02044240(UnkStruct_0203E724 * param0); -static BOOL sub_02044254(UnkStruct_0203E724 * param0); -static BOOL sub_02044260(UnkStruct_0203E724 * param0); -static BOOL sub_02044288(UnkStruct_0203E724 * param0); -static BOOL sub_020442B0(UnkStruct_0203E724 * param0); -static BOOL sub_02044158(UnkStruct_0203E724 * param0); -static BOOL sub_020442B4(UnkStruct_0203E724 * param0); -static BOOL sub_020442E8(UnkStruct_0203E724 * param0); -static BOOL sub_0204431C(UnkStruct_0203E724 * param0); -static BOOL sub_02044328(UnkStruct_0203E724 * param0); -static BOOL sub_02044354(UnkStruct_0203E724 * param0); -static BOOL sub_02044374(UnkStruct_0203E724 * param0); -static BOOL sub_02044398(UnkStruct_0203E724 * param0); -static BOOL sub_020443D0(UnkStruct_0203E724 * param0); -static BOOL sub_02044408(UnkStruct_0203E724 * param0); -static BOOL sub_02044444(UnkStruct_0203E724 * param0); -static BOOL sub_02044468(UnkStruct_0203E724 * param0); -static BOOL sub_020444BC(UnkStruct_0203E724 * param0); -static BOOL sub_02044510(UnkStruct_0203E724 * param0); -static BOOL sub_02044528(UnkStruct_0203E724 * param0); -static BOOL sub_02044558(UnkStruct_0203E724 * param0); -static BOOL sub_0204466C(UnkStruct_0203E724 * param0); -static BOOL sub_02044670(UnkStruct_0203E724 * param0); -static BOOL sub_020446B4(UnkStruct_0203E724 * param0); -static BOOL sub_02044710(UnkStruct_0203E724 * param0); -static BOOL sub_02044774(UnkStruct_0203E724 * param0); -static BOOL sub_020447A4(UnkStruct_0203E724 * param0); -static BOOL sub_020417F0(UnkStruct_0203E724 * param0); -static BOOL sub_02041A28(UnkStruct_0203E724 * param0); -static BOOL sub_02041AB0(UnkStruct_0203E724 * param0); -static BOOL sub_020447E8(UnkStruct_0203E724 * param0); -static BOOL sub_02044820(UnkStruct_0203E724 * param0); -static BOOL sub_02044858(UnkStruct_0203E724 * param0); -static BOOL sub_02044888(UnkStruct_0203E724 * param0); -static BOOL sub_020448B8(UnkStruct_0203E724 * param0); -static BOOL sub_020448C8(UnkStruct_0203E724 * param0); -static BOOL sub_020448F0(UnkStruct_0203E724 * param0); -static BOOL sub_02044908(UnkStruct_0203E724 * param0); -static BOOL sub_02044928(UnkStruct_0203E724 * param0); -static BOOL sub_02044980(UnkStruct_0203E724 * param0); -static BOOL sub_020449F4(UnkStruct_0203E724 * param0); -static BOOL sub_02044A28(UnkStruct_0203E724 * param0); -static BOOL sub_0203F734(UnkStruct_0203E724 * param0); -static BOOL sub_02042A60(UnkStruct_0203E724 * param0); -static BOOL sub_02042A8C(UnkStruct_0203E724 * param0); -static BOOL sub_02044A50(UnkStruct_0203E724 * param0); -static BOOL sub_020429F4(UnkStruct_0203E724 * param0); -static BOOL sub_02042A50(UnkStruct_0203E724 * param0); -static BOOL sub_0204229C(UnkStruct_0203E724 * param0); -static BOOL sub_020422B8(UnkStruct_0203E724 * param0); -static BOOL sub_02044AE8(UnkStruct_0203E724 * param0); -static BOOL sub_020400E8(UnkStruct_0203E724 * param0); -static BOOL sub_02044AF8(UnkStruct_0203E724 * param0); -static BOOL sub_02044B28(UnkStruct_0203E724 * param0); -static BOOL sub_02044B38(UnkStruct_0203E724 * param0); -static BOOL sub_02044B70(UnkStruct_0203E724 * param0); -static BOOL sub_02044BA0(UnkStruct_0203E724 * param0); -static BOOL sub_02044BB8(UnkStruct_0203E724 * param0); -static BOOL sub_02045708(UnkStruct_0203E724 * param0); -static BOOL sub_02044BE8(UnkStruct_0203E724 * param0); -static BOOL sub_02044C64(UnkStruct_0203E724 * param0); -static BOOL sub_02044C90(UnkStruct_0203E724 * param0); -static BOOL sub_02044CBC(UnkStruct_0203E724 * param0); -static BOOL sub_02044CCC(UnkStruct_0203E724 * param0); -static BOOL sub_02044CE4(UnkStruct_0203E724 * param0); -static BOOL sub_02044D08(UnkStruct_0203E724 * param0); -static BOOL sub_02044D38(UnkStruct_0203E724 * param0); -static BOOL sub_02044D68(UnkStruct_0203E724 * param0); -static BOOL sub_02044D9C(UnkStruct_0203E724 * param0); -static BOOL sub_02044DB4(UnkStruct_0203E724 * param0); -static BOOL sub_02044DC8(UnkStruct_0203E724 * param0); -static BOOL sub_02044DDC(UnkStruct_0203E724 * param0); -static BOOL sub_02044E40(UnkStruct_0203E724 * param0); -static BOOL sub_02044EDC(UnkStruct_0203E724 * param0); -static BOOL sub_02044F04(UnkStruct_0203E724 * param0); -static BOOL sub_02044F24(UnkStruct_0203E724 * param0); -static BOOL sub_02044FA4(UnkStruct_0203E724 * param0); -static BOOL sub_02044FCC(UnkStruct_0203E724 * param0); -static BOOL sub_0204500C(UnkStruct_0203E724 * param0); -static BOOL sub_02042810(UnkStruct_0203E724 * param0); -static BOOL sub_02042868(UnkStruct_0203E724 * param0); -static BOOL sub_020428D4(UnkStruct_0203E724 * param0); -static BOOL sub_0204504C(UnkStruct_0203E724 * param0); -static BOOL sub_02045068(UnkStruct_0203E724 * param0); -static BOOL sub_02045134(UnkStruct_0203E724 * param0); -static BOOL sub_02045160(UnkStruct_0203E724 * param0); -static BOOL sub_0204517C(UnkStruct_0203E724 * param0); -static BOOL sub_02045198(UnkStruct_0203E724 * param0); -static BOOL sub_0204521C(UnkStruct_0203E724 * param0); -static BOOL sub_02045250(UnkStruct_0203E724 * param0); -static BOOL sub_02045274(UnkStruct_0203E724 * param0); -static BOOL sub_0204528C(UnkStruct_0203E724 * param0); -static BOOL sub_020452B4(UnkStruct_0203E724 * param0); -static BOOL sub_020452C4(UnkStruct_0203E724 * param0); -static BOOL sub_020452D4(UnkStruct_0203E724 * param0); -static BOOL sub_02045304(UnkStruct_0203E724 * param0); -static BOOL sub_02045314(UnkStruct_0203E724 * param0); -static BOOL sub_02045324(UnkStruct_0203E724 * param0); -static BOOL sub_02045344(UnkStruct_0203E724 * param0); -static BOOL sub_02045384(UnkStruct_0203E724 * param0); -static BOOL sub_02045404(UnkStruct_0203E724 * param0); -static BOOL sub_020454C0(UnkStruct_0203E724 * param0); -static BOOL sub_020454D4(UnkStruct_0203E724 * param0); -static BOOL sub_020454E8(UnkStruct_0203E724 * param0); -static BOOL sub_0204550C(UnkStruct_0203E724 * param0); -static BOOL sub_02045530(UnkStruct_0203E724 * param0); -static BOOL sub_020455C4(UnkStruct_0203E724 * param0); -static BOOL sub_02045628(UnkStruct_0203E724 * param0); -static BOOL sub_02045650(UnkStruct_0203E724 * param0); -static BOOL sub_020456E8(UnkStruct_0203E724 * param0); -static BOOL sub_02045720(UnkStruct_0203E724 * param0); -static BOOL sub_02045760(UnkStruct_0203E724 * param0); -static BOOL sub_02045798(UnkStruct_0203E724 * param0); -static BOOL sub_020457D0(UnkStruct_0203E724 * param0); -static BOOL sub_020457FC(UnkStruct_0203E724 * param0); -static BOOL sub_02045840(UnkStruct_0203E724 * param0); -static BOOL sub_02045850(UnkStruct_0203E724 * param0); -static BOOL sub_02045860(UnkStruct_0203E724 * param0); -static BOOL sub_02045900(UnkStruct_0203E724 * param0); -static BOOL sub_020458CC(UnkStruct_0203E724 * param0); -static BOOL sub_02045938(UnkStruct_0203E724 * param0); -static BOOL sub_0204598C(UnkStruct_0203E724 * param0); -static BOOL sub_020459BC(UnkStruct_0203E724 * param0); -static BOOL sub_02045A88(UnkStruct_0203E724 * param0); -static BOOL sub_02045AB8(UnkStruct_0203E724 * param0); -static BOOL sub_02045AE8(UnkStruct_0203E724 * param0); -static BOOL sub_02045B18(UnkStruct_0203E724 * param0); -static BOOL sub_02045BA8(UnkStruct_0203E724 * param0); -static BOOL sub_02045BE4(UnkStruct_0203E724 * param0); -static BOOL sub_02045C10(UnkStruct_0203E724 * param0); -static BOOL sub_02041F14(UnkStruct_0203E724 * param0); -static BOOL sub_02041FC4(UnkStruct_0203E724 * param0); -static BOOL sub_02041FDC(UnkStruct_0203E724 * param0); -static BOOL sub_02041FF8(UnkStruct_0203E724 * param0); -static BOOL sub_02045C50(UnkStruct_0203E724 * param0); -static BOOL sub_02045D70(UnkStruct_0203E724 * param0); -static BOOL sub_02045CB8(UnkStruct_0203E724 * param0); -static BOOL sub_02045CFC(UnkStruct_0203E724 * param0); -static BOOL sub_02045DB0(UnkStruct_0203E724 * param0); -static BOOL sub_02045E14(UnkStruct_0203E724 * param0); -static BOOL sub_02045E44(UnkStruct_0203E724 * param0); -static BOOL sub_02040DD8(UnkStruct_0203E724 * param0); -static BOOL sub_02045ECC(UnkStruct_0203E724 * param0); -static BOOL sub_02045E78(UnkStruct_0203E724 * param0); -static BOOL sub_02045EA0(UnkStruct_0203E724 * param0); -static BOOL sub_02045F04(UnkStruct_0203E724 * param0); -static BOOL sub_02045F48(UnkStruct_0203E724 * param0); -static BOOL sub_0204169C(UnkStruct_0203E724 * param0); -static BOOL sub_02046038(UnkStruct_0203E724 * param0); -static BOOL sub_02046050(UnkStruct_0203E724 * param0); -static BOOL sub_02046080(UnkStruct_0203E724 * param0); -static BOOL sub_0204608C(UnkStruct_0203E724 * param0); -static BOOL sub_02046098(UnkStruct_0203E724 * param0); -static BOOL sub_020410F4(UnkStruct_0203E724 * param0); -static BOOL sub_020460A8(UnkStruct_0203E724 * param0); -static BOOL sub_02046108(UnkStruct_0203E724 * param0); -static BOOL sub_02040A9C(UnkStruct_0203E724 * param0); -static BOOL sub_02040A78(UnkStruct_0203E724 * param0); -static BOOL sub_02043C8C(UnkStruct_0203E724 * param0); -static BOOL sub_02046144(UnkStruct_0203E724 * param0); -static BOOL sub_02042D70(UnkStruct_0203E724 * param0); -static BOOL sub_0204616C(UnkStruct_0203E724 * param0); -static BOOL sub_0204619C(UnkStruct_0203E724 * param0); -static BOOL sub_020461C8(UnkStruct_0203E724 * param0); -static BOOL sub_02040D34(UnkStruct_0203E724 * param0); -static BOOL sub_02040D54(UnkStruct_0203E724 * param0); -static BOOL sub_020461E0(UnkStruct_0203E724 * param0); -static BOOL sub_020427B4(UnkStruct_0203E724 * param0); -static BOOL sub_020427E0(UnkStruct_0203E724 * param0); -static BOOL sub_02046294(UnkStruct_0203E724 * param0); -static BOOL sub_020462DC(UnkStruct_0203E724 * param0); -static BOOL sub_020462F4(UnkStruct_0203E724 * param0); -static BOOL sub_02043568(UnkStruct_0203E724 * param0); -static BOOL sub_02043578(UnkStruct_0203E724 * param0); -static BOOL sub_02046314(UnkStruct_0203E724 * param0); -BOOL sub_02046340(UnkStruct_0203E724 * param0); -BOOL sub_020463B4(UnkStruct_0203E724 * param0); -BOOL sub_020463E4(UnkStruct_0203E724 * param0); -BOOL sub_02046400(UnkStruct_0203E724 * param0); -BOOL sub_0204645C(UnkStruct_0203E724 * param0); +static BOOL sub_02041FAC(ScriptContext * param0); +static BOOL sub_02042028(ScriptContext * param0); +static BOOL sub_0204205C(ScriptContext * param0); +static BOOL sub_020420A0(ScriptContext * param0); +static BOOL sub_020420AC(ScriptContext * param0); +static BOOL sub_020420CC(ScriptContext * param0); +static BOOL sub_02042124(ScriptContext * param0); +static BOOL sub_0204218C(ScriptContext * param0); +static BOOL sub_020421F4(ScriptContext * param0); +static BOOL sub_02042230(ScriptContext * param0); +static BOOL sub_0204226C(ScriptContext * param0); +static BOOL sub_020422D4(ScriptContext * param0); +static BOOL sub_020422E8(ScriptContext * param0); +static BOOL sub_02042330(ScriptContext * param0); +static BOOL sub_02042368(ScriptContext * param0); +static BOOL sub_020423BC(ScriptContext * param0); +static BOOL sub_02042434(ScriptContext * param0); +static BOOL sub_02042480(ScriptContext * param0); +static BOOL sub_0204249C(ScriptContext * param0); +static BOOL sub_020424AC(ScriptContext * param0); +static BOOL sub_020424BC(ScriptContext * param0); +static BOOL sub_020424E8(ScriptContext * param0); +static BOOL sub_020424F8(ScriptContext * param0); +static BOOL sub_02042524(ScriptContext * param0); +static BOOL sub_02042560(ScriptContext * param0); +static BOOL sub_020425C0(ScriptContext * param0); +static BOOL sub_020425E0(ScriptContext * param0); +static BOOL sub_02042628(ScriptContext * param0); +static BOOL sub_020426E8(ScriptContext * param0); +static BOOL sub_02042718(ScriptContext * param0); +static BOOL sub_02042784(ScriptContext * param0); +static BOOL sub_02042918(ScriptContext * param0); +static BOOL sub_02042960(ScriptContext * param0); +static BOOL sub_02042970(ScriptContext * param0); +static BOOL sub_02042984(ScriptContext * param0); +static BOOL sub_02042AB0(ScriptContext * param0); +static BOOL sub_02042AE0(ScriptContext * param0); +static BOOL sub_02042B3C(ScriptContext * param0); +static BOOL sub_02042B6C(ScriptContext * param0); +static BOOL sub_02042BB8(ScriptContext * param0); +static BOOL sub_02042BE8(ScriptContext * param0); +static BOOL sub_02042C18(ScriptContext * param0); +static BOOL sub_02042C80(ScriptContext * param0); +static BOOL sub_02042CA8(ScriptContext * param0); +static BOOL sub_02042CB4(ScriptContext * param0); +static BOOL sub_02042CE4(ScriptContext * param0); +static BOOL sub_02042D84(ScriptContext * param0); +static BOOL sub_02042D9C(ScriptContext * param0); +static BOOL sub_02042DC4(ScriptContext * param0); +static BOOL sub_02042DDC(ScriptContext * param0); +static BOOL sub_02042E38(ScriptContext * param0); +static BOOL sub_02042DEC(ScriptContext * param0); +static BOOL sub_02042E64(ScriptContext * param0); +static BOOL sub_02042F04(ScriptContext * param0); +static BOOL sub_02042F74(ScriptContext * param0); +static BOOL sub_02042F9C(ScriptContext * param0); +static BOOL sub_0204300C(ScriptContext * param0); +static BOOL sub_02043034(ScriptContext * param0); +static BOOL sub_02043040(ScriptContext * param0); +static BOOL sub_0204304C(ScriptContext * param0); +static BOOL sub_0204307C(ScriptContext * param0); +static BOOL sub_02043080(ScriptContext * param0); +static BOOL sub_02043100(ScriptContext * param0); +static BOOL sub_02043130(ScriptContext * param0); +static BOOL sub_02043190(ScriptContext * param0); +static BOOL sub_020431C0(ScriptContext * param0); +static BOOL sub_020431F0(ScriptContext * param0); +static BOOL sub_02043220(ScriptContext * param0); +static BOOL sub_02043250(ScriptContext * param0); +static BOOL sub_02043254(ScriptContext * param0); +static BOOL sub_020432DC(ScriptContext * param0); +static BOOL sub_02043330(ScriptContext * param0); +static BOOL sub_020433D8(ScriptContext * param0); +static BOOL sub_0204342C(ScriptContext * param0); +static BOOL sub_02043460(ScriptContext * param0); +static BOOL sub_0204346C(ScriptContext * param0); +static BOOL sub_0204347C(ScriptContext * param0); +static BOOL sub_020434A4(ScriptContext * param0); +static BOOL sub_020434C0(ScriptContext * param0); +static BOOL sub_020434D0(ScriptContext * param0); +static BOOL sub_020434EC(ScriptContext * param0); +static BOOL sub_02043540(ScriptContext * param0); +static BOOL sub_020435A0(ScriptContext * param0); +static BOOL sub_020435AC(ScriptContext * param0); +static BOOL sub_020435DC(ScriptContext * param0); +static BOOL sub_02043608(ScriptContext * param0); +static BOOL sub_02043648(ScriptContext * param0); +static BOOL sub_02043678(ScriptContext * param0); +static BOOL sub_02043694(ScriptContext * param0); +static BOOL sub_020436A0(ScriptContext * param0); +static BOOL sub_020436D0(ScriptContext * param0); +static BOOL sub_02043708(ScriptContext * param0); +static BOOL sub_02043988(ScriptContext * param0); +static BOOL sub_02043978(ScriptContext * param0); +static BOOL sub_02043748(ScriptContext * param0); +static BOOL sub_020437B4(ScriptContext * param0); +static BOOL sub_020437C4(ScriptContext * param0); +static BOOL sub_020437E8(ScriptContext * param0); +static BOOL sub_020437FC(ScriptContext * param0); +static BOOL sub_02043894(ScriptContext * param0); +static BOOL sub_020438CC(ScriptContext * param0); +static BOOL sub_0204391C(ScriptContext * param0); +static BOOL sub_02043938(ScriptContext * param0); +static BOOL sub_02043964(ScriptContext * param0); +static BOOL sub_0204399C(ScriptContext * param0); +static BOOL sub_020439D8(ScriptContext * param0); +static BOOL sub_020439F4(ScriptContext * param0); +static BOOL sub_02043A30(ScriptContext * param0); +static BOOL sub_02043A4C(ScriptContext * param0); +static BOOL sub_02043A94(ScriptContext * param0); +static BOOL sub_02043AA4(ScriptContext * param0); +static BOOL sub_02043AE0(ScriptContext * param0); +static BOOL sub_02043B48(ScriptContext * param0); +static BOOL sub_02043BA0(ScriptContext * param0); +static BOOL sub_02043854(ScriptContext * param0); +static BOOL sub_02043BD4(ScriptContext * param0); +static BOOL sub_02043BE0(ScriptContext * param0); +static BOOL sub_02043C0C(ScriptContext * param0); +static BOOL sub_02043C3C(ScriptContext * param0); +static BOOL sub_02043C54(ScriptContext * param0); +static BOOL sub_02043C58(ScriptContext * param0); +static BOOL sub_02043C70(ScriptContext * param0); +static BOOL sub_02043CA4(ScriptContext * param0); +static BOOL sub_02043CB4(ScriptContext * param0); +static BOOL sub_02043D04(ScriptContext * param0); +static BOOL sub_02043D54(ScriptContext * param0); +static BOOL sub_02043DE4(ScriptContext * param0); +static BOOL sub_02043E1C(ScriptContext * param0); +static BOOL sub_02043E54(ScriptContext * param0); +static BOOL sub_02043EA4(ScriptContext * param0); +static BOOL sub_02043EF4(ScriptContext * param0); +static BOOL sub_02043F40(ScriptContext * param0); +static BOOL sub_02043F6C(ScriptContext * param0); +static BOOL sub_02043FC4(ScriptContext * param0); +static BOOL sub_02043FDC(ScriptContext * param0); +static BOOL sub_02043FF4(ScriptContext * param0); +static BOOL sub_0204400C(ScriptContext * param0); +static BOOL sub_02044024(ScriptContext * param0); +static BOOL sub_02044034(ScriptContext * param0); +static BOOL sub_02044044(ScriptContext * param0); +static BOOL sub_02044054(ScriptContext * param0); +static BOOL sub_02044064(ScriptContext * param0); +static BOOL sub_02044074(ScriptContext * param0); +static BOOL sub_02044084(ScriptContext * param0); +static BOOL sub_020440A0(ScriptContext * param0); +static BOOL sub_020440BC(ScriptContext * param0); +static BOOL sub_020440CC(ScriptContext * param0); +static BOOL sub_020440DC(ScriptContext * param0); +static BOOL sub_020440EC(ScriptContext * param0); +static BOOL sub_02042658(ScriptContext * param0); +static BOOL sub_020426A8(ScriptContext * param0); +static BOOL sub_02043CC4(ScriptContext * param0); +static BOOL sub_02040868(ScriptContext * param0); +static BOOL sub_02040898(ScriptContext * param0); +static BOOL sub_020401A8(ScriptContext * param0); +static BOOL sub_020401D0(ScriptContext * param0); +static BOOL sub_02041790(ScriptContext * param0); +static BOOL sub_02041814(ScriptContext * param0); +static BOOL sub_02041860(ScriptContext * param0); +static BOOL sub_020418E0(ScriptContext * param0); +static BOOL sub_02041984(ScriptContext * param0); +static BOOL sub_020417C0(ScriptContext * param0); +static BOOL sub_02041B24(ScriptContext * param0); +static BOOL sub_02041B68(ScriptContext * param0); +static BOOL sub_02041BA8(ScriptContext * param0); +static BOOL sub_02041C00(ScriptContext * param0); +static BOOL sub_02044168(ScriptContext * param0); +static BOOL sub_020441C8(ScriptContext * param0); +static BOOL sub_02044208(ScriptContext * param0); +static BOOL sub_02044240(ScriptContext * param0); +static BOOL sub_02044254(ScriptContext * param0); +static BOOL sub_02044260(ScriptContext * param0); +static BOOL sub_02044288(ScriptContext * param0); +static BOOL sub_020442B0(ScriptContext * param0); +static BOOL sub_02044158(ScriptContext * param0); +static BOOL sub_020442B4(ScriptContext * param0); +static BOOL sub_020442E8(ScriptContext * param0); +static BOOL sub_0204431C(ScriptContext * param0); +static BOOL sub_02044328(ScriptContext * param0); +static BOOL sub_02044354(ScriptContext * param0); +static BOOL sub_02044374(ScriptContext * param0); +static BOOL sub_02044398(ScriptContext * param0); +static BOOL sub_020443D0(ScriptContext * param0); +static BOOL sub_02044408(ScriptContext * param0); +static BOOL sub_02044444(ScriptContext * param0); +static BOOL sub_02044468(ScriptContext * param0); +static BOOL sub_020444BC(ScriptContext * param0); +static BOOL sub_02044510(ScriptContext * param0); +static BOOL sub_02044528(ScriptContext * param0); +static BOOL sub_02044558(ScriptContext * param0); +static BOOL sub_0204466C(ScriptContext * param0); +static BOOL sub_02044670(ScriptContext * param0); +static BOOL sub_020446B4(ScriptContext * param0); +static BOOL sub_02044710(ScriptContext * param0); +static BOOL sub_02044774(ScriptContext * param0); +static BOOL sub_020447A4(ScriptContext * param0); +static BOOL sub_020417F0(ScriptContext * param0); +static BOOL sub_02041A28(ScriptContext * param0); +static BOOL sub_02041AB0(ScriptContext * param0); +static BOOL sub_020447E8(ScriptContext * param0); +static BOOL sub_02044820(ScriptContext * param0); +static BOOL sub_02044858(ScriptContext * param0); +static BOOL sub_02044888(ScriptContext * param0); +static BOOL sub_020448B8(ScriptContext * param0); +static BOOL sub_020448C8(ScriptContext * param0); +static BOOL sub_020448F0(ScriptContext * param0); +static BOOL sub_02044908(ScriptContext * param0); +static BOOL sub_02044928(ScriptContext * param0); +static BOOL sub_02044980(ScriptContext * param0); +static BOOL sub_020449F4(ScriptContext * param0); +static BOOL sub_02044A28(ScriptContext * param0); +static BOOL sub_0203F734(ScriptContext * param0); +static BOOL sub_02042A60(ScriptContext * param0); +static BOOL sub_02042A8C(ScriptContext * param0); +static BOOL sub_02044A50(ScriptContext * param0); +static BOOL sub_020429F4(ScriptContext * param0); +static BOOL sub_02042A50(ScriptContext * param0); +static BOOL sub_0204229C(ScriptContext * param0); +static BOOL sub_020422B8(ScriptContext * param0); +static BOOL sub_02044AE8(ScriptContext * param0); +static BOOL sub_020400E8(ScriptContext * param0); +static BOOL sub_02044AF8(ScriptContext * param0); +static BOOL sub_02044B28(ScriptContext * param0); +static BOOL sub_02044B38(ScriptContext * param0); +static BOOL sub_02044B70(ScriptContext * param0); +static BOOL sub_02044BA0(ScriptContext * param0); +static BOOL sub_02044BB8(ScriptContext * param0); +static BOOL sub_02045708(ScriptContext * param0); +static BOOL sub_02044BE8(ScriptContext * param0); +static BOOL sub_02044C64(ScriptContext * param0); +static BOOL sub_02044C90(ScriptContext * param0); +static BOOL sub_02044CBC(ScriptContext * param0); +static BOOL sub_02044CCC(ScriptContext * param0); +static BOOL sub_02044CE4(ScriptContext * param0); +static BOOL sub_02044D08(ScriptContext * param0); +static BOOL sub_02044D38(ScriptContext * param0); +static BOOL sub_02044D68(ScriptContext * param0); +static BOOL sub_02044D9C(ScriptContext * param0); +static BOOL sub_02044DB4(ScriptContext * param0); +static BOOL sub_02044DC8(ScriptContext * param0); +static BOOL sub_02044DDC(ScriptContext * param0); +static BOOL sub_02044E40(ScriptContext * param0); +static BOOL sub_02044EDC(ScriptContext * param0); +static BOOL sub_02044F04(ScriptContext * param0); +static BOOL sub_02044F24(ScriptContext * param0); +static BOOL sub_02044FA4(ScriptContext * param0); +static BOOL sub_02044FCC(ScriptContext * param0); +static BOOL sub_0204500C(ScriptContext * param0); +static BOOL sub_02042810(ScriptContext * param0); +static BOOL sub_02042868(ScriptContext * param0); +static BOOL sub_020428D4(ScriptContext * param0); +static BOOL sub_0204504C(ScriptContext * param0); +static BOOL sub_02045068(ScriptContext * param0); +static BOOL sub_02045134(ScriptContext * param0); +static BOOL sub_02045160(ScriptContext * param0); +static BOOL sub_0204517C(ScriptContext * param0); +static BOOL sub_02045198(ScriptContext * param0); +static BOOL sub_0204521C(ScriptContext * param0); +static BOOL sub_02045250(ScriptContext * param0); +static BOOL sub_02045274(ScriptContext * param0); +static BOOL sub_0204528C(ScriptContext * param0); +static BOOL sub_020452B4(ScriptContext * param0); +static BOOL sub_020452C4(ScriptContext * param0); +static BOOL sub_020452D4(ScriptContext * param0); +static BOOL sub_02045304(ScriptContext * param0); +static BOOL sub_02045314(ScriptContext * param0); +static BOOL sub_02045324(ScriptContext * param0); +static BOOL sub_02045344(ScriptContext * param0); +static BOOL sub_02045384(ScriptContext * param0); +static BOOL sub_02045404(ScriptContext * param0); +static BOOL sub_020454C0(ScriptContext * param0); +static BOOL sub_020454D4(ScriptContext * param0); +static BOOL sub_020454E8(ScriptContext * param0); +static BOOL sub_0204550C(ScriptContext * param0); +static BOOL sub_02045530(ScriptContext * param0); +static BOOL sub_020455C4(ScriptContext * param0); +static BOOL sub_02045628(ScriptContext * param0); +static BOOL sub_02045650(ScriptContext * param0); +static BOOL sub_020456E8(ScriptContext * param0); +static BOOL sub_02045720(ScriptContext * param0); +static BOOL sub_02045760(ScriptContext * param0); +static BOOL sub_02045798(ScriptContext * param0); +static BOOL sub_020457D0(ScriptContext * param0); +static BOOL sub_020457FC(ScriptContext * param0); +static BOOL sub_02045840(ScriptContext * param0); +static BOOL sub_02045850(ScriptContext * param0); +static BOOL sub_02045860(ScriptContext * param0); +static BOOL sub_02045900(ScriptContext * param0); +static BOOL sub_020458CC(ScriptContext * param0); +static BOOL sub_02045938(ScriptContext * param0); +static BOOL sub_0204598C(ScriptContext * param0); +static BOOL sub_020459BC(ScriptContext * param0); +static BOOL sub_02045A88(ScriptContext * param0); +static BOOL sub_02045AB8(ScriptContext * param0); +static BOOL sub_02045AE8(ScriptContext * param0); +static BOOL sub_02045B18(ScriptContext * param0); +static BOOL sub_02045BA8(ScriptContext * param0); +static BOOL sub_02045BE4(ScriptContext * param0); +static BOOL sub_02045C10(ScriptContext * param0); +static BOOL sub_02041F14(ScriptContext * param0); +static BOOL sub_02041FC4(ScriptContext * param0); +static BOOL sub_02041FDC(ScriptContext * param0); +static BOOL sub_02041FF8(ScriptContext * param0); +static BOOL sub_02045C50(ScriptContext * param0); +static BOOL sub_02045D70(ScriptContext * param0); +static BOOL sub_02045CB8(ScriptContext * param0); +static BOOL sub_02045CFC(ScriptContext * param0); +static BOOL sub_02045DB0(ScriptContext * param0); +static BOOL sub_02045E14(ScriptContext * param0); +static BOOL sub_02045E44(ScriptContext * param0); +static BOOL sub_02040DD8(ScriptContext * param0); +static BOOL sub_02045ECC(ScriptContext * param0); +static BOOL sub_02045E78(ScriptContext * param0); +static BOOL sub_02045EA0(ScriptContext * param0); +static BOOL sub_02045F04(ScriptContext * param0); +static BOOL sub_02045F48(ScriptContext * param0); +static BOOL sub_0204169C(ScriptContext * param0); +static BOOL sub_02046038(ScriptContext * param0); +static BOOL sub_02046050(ScriptContext * param0); +static BOOL sub_02046080(ScriptContext * param0); +static BOOL sub_0204608C(ScriptContext * param0); +static BOOL sub_02046098(ScriptContext * param0); +static BOOL sub_020410F4(ScriptContext * param0); +static BOOL sub_020460A8(ScriptContext * param0); +static BOOL sub_02046108(ScriptContext * param0); +static BOOL sub_02040A9C(ScriptContext * param0); +static BOOL sub_02040A78(ScriptContext * param0); +static BOOL sub_02043C8C(ScriptContext * param0); +static BOOL sub_02046144(ScriptContext * param0); +static BOOL sub_02042D70(ScriptContext * param0); +static BOOL sub_0204616C(ScriptContext * param0); +static BOOL sub_0204619C(ScriptContext * param0); +static BOOL sub_020461C8(ScriptContext * param0); +static BOOL sub_02040D34(ScriptContext * param0); +static BOOL sub_02040D54(ScriptContext * param0); +static BOOL sub_020461E0(ScriptContext * param0); +static BOOL sub_020427B4(ScriptContext * param0); +static BOOL sub_020427E0(ScriptContext * param0); +static BOOL sub_02046294(ScriptContext * param0); +static BOOL sub_020462DC(ScriptContext * param0); +static BOOL sub_020462F4(ScriptContext * param0); +static BOOL sub_02043568(ScriptContext * param0); +static BOOL sub_02043578(ScriptContext * param0); +static BOOL sub_02046314(ScriptContext * param0); +BOOL sub_02046340(ScriptContext * param0); +BOOL sub_020463B4(ScriptContext * param0); +BOOL sub_020463E4(ScriptContext * param0); +BOOL sub_02046400(ScriptContext * param0); +BOOL sub_0204645C(ScriptContext * param0); static u8 sub_02046524(u16 param0, u16 param1, u16 param2, u16 param3); static u8 sub_02046568(u16 param0, u16 param1, u16 param2, u16 param3); -static BOOL sub_020465AC(UnkStruct_0203E724 * param0); -static BOOL sub_02046624(UnkStruct_0203E724 * param0); -static BOOL sub_02046658(UnkStruct_0203E724 * param0); -static BOOL sub_0204666C(UnkStruct_0203E724 * param0); -static BOOL sub_020466A4(UnkStruct_0203E724 * param0); -static BOOL sub_02046868(UnkStruct_0203E724 * param0); -static BOOL sub_02046888(UnkStruct_0203E724 * param0); -static BOOL sub_020468AC(UnkStruct_0203E724 * param0); -static BOOL sub_020468D0(UnkStruct_0203E724 * param0); -static BOOL sub_020468E0(UnkStruct_0203E724 * param0); -static BOOL sub_02043384(UnkStruct_0203E724 * param0); -static BOOL sub_020451F8(UnkStruct_0203E724 * param0); -static BOOL sub_0204693C(UnkStruct_0203E724 * param0); -static BOOL sub_02046958(UnkStruct_0203E724 * param0); -static BOOL sub_0204697C(UnkStruct_0203E724 * param0); -static BOOL sub_0204698C(UnkStruct_0203E724 * param0); -static BOOL sub_020469D0(UnkStruct_0203E724 * param0); -static BOOL sub_02046A4C(UnkStruct_0203E724 * param0); -static BOOL sub_02040F0C(UnkStruct_0203E724 * param0); +static BOOL sub_020465AC(ScriptContext * param0); +static BOOL sub_02046624(ScriptContext * param0); +static BOOL sub_02046658(ScriptContext * param0); +static BOOL sub_0204666C(ScriptContext * param0); +static BOOL sub_020466A4(ScriptContext * param0); +static BOOL sub_02046868(ScriptContext * param0); +static BOOL sub_02046888(ScriptContext * param0); +static BOOL sub_020468AC(ScriptContext * param0); +static BOOL sub_020468D0(ScriptContext * param0); +static BOOL sub_020468E0(ScriptContext * param0); +static BOOL sub_02043384(ScriptContext * param0); +static BOOL sub_020451F8(ScriptContext * param0); +static BOOL sub_0204693C(ScriptContext * param0); +static BOOL sub_02046958(ScriptContext * param0); +static BOOL sub_0204697C(ScriptContext * param0); +static BOOL sub_0204698C(ScriptContext * param0); +static BOOL sub_020469D0(ScriptContext * param0); +static BOOL sub_02046A4C(ScriptContext * param0); +static BOOL sub_02040F0C(ScriptContext * param0); static void sub_02040F28(FieldSystem * param0, SysTask * param1, UnkStruct_ov5_021F8E3C * param2); static void sub_02040F5C(SysTask * param0, void * param1); static u32 sub_0204676C(SaveData * param0); @@ -770,7 +770,7 @@ static const UnkStruct_ov61_0222C884 Unk_020EAB84 = { 0x21F }; -const UnkFuncPtr_0203E724 Unk_020EAC58[] = { +const ScrCmdFunc Unk_020EAC58[] = { sub_0203F6C4, sub_0203F6C8, sub_0203F6CC, @@ -1615,41 +1615,41 @@ const UnkFuncPtr_0203E724 Unk_020EAC58[] = { const u32 Unk_020EAB80 = NELEMS(Unk_020EAC58); -static BOOL sub_0203F6C4 (UnkStruct_0203E724 * param0) +static BOOL sub_0203F6C4 (ScriptContext * param0) { return 0; } -static BOOL sub_0203F6C8 (UnkStruct_0203E724 * param0) +static BOOL sub_0203F6C8 (ScriptContext * param0) { return 0; } -static BOOL sub_0203F6CC (UnkStruct_0203E724 * param0) +static BOOL sub_0203F6CC (ScriptContext * param0) { - sub_0203E76C(param0); + ScriptContext_Stop(param0); return 0; } -static BOOL sub_0203F6D8 (UnkStruct_0203E724 * param0) +static BOOL sub_0203F6D8 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; - u16 v1 = sub_0203E838(param0); - u16 v2 = sub_0203E838(param0); + FieldSystem * v0 = param0->fieldSys; + u16 v1 = ScriptContext_ReadHalfWord(param0); + u16 v2 = ScriptContext_ReadHalfWord(param0); u16 * v3 = sub_0203F118(v0, v2); *v3 = v1; - param0->unk_18[0] = v2; + param0->data[0] = v2; - sub_0203E764(param0, sub_0203F70C); + ScriptContext_Pause(param0, sub_0203F70C); return 1; } -static BOOL sub_0203F70C (UnkStruct_0203E724 * param0) +static BOOL sub_0203F70C (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; - u16 * v1 = sub_0203F118(v0, param0->unk_18[0]); + FieldSystem * v0 = param0->fieldSys; + u16 * v1 = sub_0203F118(v0, param0->data[0]); (*v1)--; @@ -1660,86 +1660,86 @@ static BOOL sub_0203F70C (UnkStruct_0203E724 * param0) return 0; } -static BOOL sub_0203F734 (UnkStruct_0203E724 * param0) +static BOOL sub_0203F734 (ScriptContext * param0) { - u16 v0 = inline_02049538(param0); + u16 v0 = ScriptContext_GetVar(param0); return 0; } -static BOOL sub_0203F74C (UnkStruct_0203E724 * param0) +static BOOL sub_0203F74C (ScriptContext * param0) { - u8 v0 = (*((param0)->unk_08++)); + u8 v0 = ScriptContext_ReadByte(param0); - param0->unk_18[v0] = (*((param0)->unk_08++)); + param0->data[v0] = ScriptContext_ReadByte(param0); return 0; } -static BOOL sub_0203F764 (UnkStruct_0203E724 * param0) +static BOOL sub_0203F764 (ScriptContext * param0) { u8 v0; u32 v1; - v0 = (*((param0)->unk_08++)); - v1 = sub_0203E850(param0); - param0->unk_18[v0] = v1; + v0 = ScriptContext_ReadByte(param0); + v1 = ScriptContext_ReadWord(param0); + param0->data[v0] = v1; return 0; } -static BOOL sub_0203F780 (UnkStruct_0203E724 * param0) +static BOOL sub_0203F780 (ScriptContext * param0) { u8 v0; u8 * v1; - v0 = (*((param0)->unk_08++)); - v1 = (u8 *)sub_0203E850(param0); - param0->unk_18[v0] = *v1; + v0 = ScriptContext_ReadByte(param0); + v1 = (u8 *)ScriptContext_ReadWord(param0); + param0->data[v0] = *v1; return 0; } -static BOOL sub_0203F79C (UnkStruct_0203E724 * param0) +static BOOL sub_0203F79C (ScriptContext * param0) { u8 * v0; u8 v1; - v0 = (u8 *)sub_0203E850(param0); - v1 = (*((param0)->unk_08++)); + v0 = (u8 *)ScriptContext_ReadWord(param0); + v1 = ScriptContext_ReadByte(param0); *v0 = v1; return 0; } -static BOOL sub_0203F7B4 (UnkStruct_0203E724 * param0) +static BOOL sub_0203F7B4 (ScriptContext * param0) { u8 * v0; u8 v1; - v0 = (u8 *)sub_0203E850(param0); - v1 = (*((param0)->unk_08++)); - *v0 = param0->unk_18[v1]; + v0 = (u8 *)ScriptContext_ReadWord(param0); + v1 = ScriptContext_ReadByte(param0); + *v0 = param0->data[v1]; return 0; } -static BOOL sub_0203F7D0 (UnkStruct_0203E724 * param0) +static BOOL sub_0203F7D0 (ScriptContext * param0) { u8 v0, v1; - v0 = (*((param0)->unk_08++)); - v1 = (*((param0)->unk_08++)); - param0->unk_18[v0] = param0->unk_18[v1]; + v0 = ScriptContext_ReadByte(param0); + v1 = ScriptContext_ReadByte(param0); + param0->data[v0] = param0->data[v1]; return 0; } -static BOOL sub_0203F7F0 (UnkStruct_0203E724 * param0) +static BOOL sub_0203F7F0 (ScriptContext * param0) { u8 * v0; u8 * v1; - v0 = (u8 *)sub_0203E850(param0); - v1 = (u8 *)sub_0203E850(param0); + v0 = (u8 *)ScriptContext_ReadWord(param0); + v1 = (u8 *)ScriptContext_ReadWord(param0); *v0 = *v1; return 0; @@ -1756,131 +1756,131 @@ static BOOL sub_0203F808 (u16 param0, u16 param1) return 2; } -static BOOL sub_0203F81C (UnkStruct_0203E724 * param0) +static BOOL sub_0203F81C (ScriptContext * param0) { u8 v0, v1; - v0 = param0->unk_18[(*((param0)->unk_08++))]; - v1 = param0->unk_18[(*((param0)->unk_08++))]; - param0->unk_02 = sub_0203F808(v0, v1); + v0 = param0->data[ScriptContext_ReadByte(param0)]; + v1 = param0->data[ScriptContext_ReadByte(param0)]; + param0->comparisonResult = sub_0203F808(v0, v1); return 0; } -static BOOL sub_0203F84C (UnkStruct_0203E724 * param0) +static BOOL sub_0203F84C (ScriptContext * param0) { u8 v0, v1; - v0 = param0->unk_18[(*((param0)->unk_08++))]; - v1 = (*((param0)->unk_08++)); - param0->unk_02 = sub_0203F808(v0, v1); + v0 = param0->data[ScriptContext_ReadByte(param0)]; + v1 = ScriptContext_ReadByte(param0); + param0->comparisonResult = sub_0203F808(v0, v1); return 0; } -static BOOL sub_0203F874 (UnkStruct_0203E724 * param0) +static BOOL sub_0203F874 (ScriptContext * param0) { u8 v0, v1; - v0 = param0->unk_18[(*((param0)->unk_08++))]; - v1 = *(u8 *)sub_0203E850(param0); - param0->unk_02 = sub_0203F808(v0, v1); + v0 = param0->data[ScriptContext_ReadByte(param0)]; + v1 = *(u8 *)ScriptContext_ReadWord(param0); + param0->comparisonResult = sub_0203F808(v0, v1); return 0; } -static BOOL sub_0203F89C (UnkStruct_0203E724 * param0) +static BOOL sub_0203F89C (ScriptContext * param0) { u8 v0, v1; - v0 = *(u8 *)sub_0203E850(param0); - v1 = param0->unk_18[(*((param0)->unk_08++))]; - param0->unk_02 = sub_0203F808(v0, v1); + v0 = *(u8 *)ScriptContext_ReadWord(param0); + v1 = param0->data[ScriptContext_ReadByte(param0)]; + param0->comparisonResult = sub_0203F808(v0, v1); return 0; } -static BOOL sub_0203F8C4 (UnkStruct_0203E724 * param0) +static BOOL sub_0203F8C4 (ScriptContext * param0) { u8 v0, v1; - v0 = *(u8 *)sub_0203E850(param0); - v1 = (*((param0)->unk_08++)); - param0->unk_02 = sub_0203F808(v0, v1); + v0 = *(u8 *)ScriptContext_ReadWord(param0); + v1 = ScriptContext_ReadByte(param0); + param0->comparisonResult = sub_0203F808(v0, v1); return 0; } -static BOOL sub_0203F8E0 (UnkStruct_0203E724 * param0) +static BOOL sub_0203F8E0 (ScriptContext * param0) { u8 v0, v1; - v0 = *(u8 *)sub_0203E850(param0); - v1 = *(u8 *)sub_0203E850(param0); - param0->unk_02 = sub_0203F808(v0, v1); + v0 = *(u8 *)ScriptContext_ReadWord(param0); + v1 = *(u8 *)ScriptContext_ReadWord(param0); + param0->comparisonResult = sub_0203F808(v0, v1); return 0; } -static BOOL sub_0203F900 (UnkStruct_0203E724 * param0) +static BOOL sub_0203F900 (ScriptContext * param0) { u16 * v0; u16 v1, v2; - v0 = inline_0204FCAC(param0); + v0 = ScriptContext_GetVarPointer(param0); v1 = *v0; - v2 = sub_0203E838(param0); + v2 = ScriptContext_ReadHalfWord(param0); - param0->unk_02 = sub_0203F808(v1, v2); + param0->comparisonResult = sub_0203F808(v1, v2); return 0; } -static BOOL sub_0203F92C (UnkStruct_0203E724 * param0) +static BOOL sub_0203F92C (ScriptContext * param0) { u16 * v0; u16 * v1; - v0 = inline_0204FCAC(param0); - v1 = inline_0204FCAC(param0); - param0->unk_02 = sub_0203F808(*v0, *v1); + v0 = ScriptContext_GetVarPointer(param0); + v1 = ScriptContext_GetVarPointer(param0); + param0->comparisonResult = sub_0203F808(*v0, *v1); return 0; } -static BOOL sub_0203F964 (UnkStruct_0203E724 * param0) +static BOOL sub_0203F964 (ScriptContext * param0) { u16 v0; - FieldSystem * v1 = param0->unk_34; + FieldSystem * v1 = param0->fieldSys; u8 * v2 = sub_0203F098(v1, 7); - UnkStruct_0203E724 ** v3 = sub_0203F098(v1, 14); + ScriptContext ** v3 = sub_0203F098(v1, 14); - v0 = sub_0203E838(param0); + v0 = ScriptContext_ReadHalfWord(param0); *v3 = sub_0203EAB8(v1, v0); (*v2)++; return 1; } -static BOOL sub_0203F99C (UnkStruct_0203E724 * param0) +static BOOL sub_0203F99C (ScriptContext * param0) { u16 v0; - FieldSystem * v1 = param0->unk_34; + FieldSystem * v1 = param0->fieldSys; u8 * v2 = sub_0203F098(v1, 5); u8 * v3 = sub_0203F098(v1, 7); - UnkStruct_0203E724 ** v4 = sub_0203F098(v1, 14); + ScriptContext ** v4 = sub_0203F098(v1, 14); - v0 = sub_0203E838(param0); + v0 = ScriptContext_ReadHalfWord(param0); *v2 = 1; *v4 = sub_0203EAB8(v1, v0); (*v3)++; - sub_0203E764(param0, sub_0203F9EC); + ScriptContext_Pause(param0, sub_0203F9EC); return 1; } -static BOOL sub_0203F9EC (UnkStruct_0203E724 * param0) +static BOOL sub_0203F9EC (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; u8 * v1 = sub_0203F098(v0, 5); if (*v1 == 0) { @@ -1890,261 +1890,261 @@ static BOOL sub_0203F9EC (UnkStruct_0203E724 * param0) return 0; } -static BOOL sub_0203FA08 (UnkStruct_0203E724 * param0) +static BOOL sub_0203FA08 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; u8 * v1 = sub_0203F098(v0, 5); *v1 = 0; return 0; } -static BOOL sub_0203FA1C (UnkStruct_0203E724 * param0) +static BOOL sub_0203FA1C (ScriptContext * param0) { s32 v0; - v0 = (s32)sub_0203E850(param0); - sub_0203E818(param0, (u8 *)(param0->unk_08 + v0)); + v0 = (s32)ScriptContext_ReadWord(param0); + ScriptContext_Jump(param0, (u8 *)(param0->scriptPtr + v0)); return 0; } -static BOOL sub_0203FA34 (UnkStruct_0203E724 * param0) +static BOOL sub_0203FA34 (ScriptContext * param0) { u8 v0; s32 v1; LocalMapObject ** v2; - FieldSystem * v3 = param0->unk_34; + FieldSystem * v3 = param0->fieldSys; v2 = sub_0203F098(v3, 10); - v0 = (*((param0)->unk_08++)); - v1 = (s32)sub_0203E850(param0); + v0 = ScriptContext_ReadByte(param0); + v1 = (s32)ScriptContext_ReadWord(param0); if (sub_02062910(*v2) == v0) { - sub_0203E818(param0, (u8 *)(param0->unk_08 + v1)); + ScriptContext_Jump(param0, (u8 *)(param0->scriptPtr + v1)); } return 0; } -static BOOL sub_0203FA6C (UnkStruct_0203E724 * param0) +static BOOL sub_0203FA6C (ScriptContext * param0) { u8 v0; s32 v1; u32 v2; - v2 = sub_02050A6C(param0->unk_28); - v0 = (*((param0)->unk_08++)); - v1 = (s32)sub_0203E850(param0); + v2 = sub_02050A6C(param0->taskManager); + v0 = ScriptContext_ReadByte(param0); + v1 = (s32)ScriptContext_ReadWord(param0); if (v2 == v0) { - sub_0203E818(param0, (u8 *)(param0->unk_08 + v1)); + ScriptContext_Jump(param0, (u8 *)(param0->scriptPtr + v1)); } return 0; } -static BOOL sub_0203FA9C (UnkStruct_0203E724 * param0) +static BOOL sub_0203FA9C (ScriptContext * param0) { u8 v0; s32 v1; int * v2; - FieldSystem * v3 = param0->unk_34; + FieldSystem * v3 = param0->fieldSys; v2 = sub_0203F098(v3, 9); - v0 = (*((param0)->unk_08++)); - v1 = (s32)sub_0203E850(param0); + v0 = ScriptContext_ReadByte(param0); + v1 = (s32)ScriptContext_ReadWord(param0); if (*v2 == v0) { - sub_0203E818(param0, (u8 *)(param0->unk_08 + v1)); + ScriptContext_Jump(param0, (u8 *)(param0->scriptPtr + v1)); } return 0; } -static BOOL sub_0203FAD0 (UnkStruct_0203E724 * param0) +static BOOL sub_0203FAD0 (ScriptContext * param0) { - s32 v0 = (s32)sub_0203E850(param0); + s32 v0 = (s32)ScriptContext_ReadWord(param0); - sub_0203E81C(param0, (u8 *)(param0->unk_08 + v0)); + ScriptContext_Call(param0, (u8 *)(param0->scriptPtr + v0)); return 0; } -static BOOL sub_0203FAE8 (UnkStruct_0203E724 * param0) +static BOOL sub_0203FAE8 (ScriptContext * param0) { - sub_0203E82C(param0); + ScriptContext_Return(param0); return 0; } -static BOOL sub_0203FAF4 (UnkStruct_0203E724 * param0) +static BOOL sub_0203FAF4 (ScriptContext * param0) { u8 v0; s32 v1; - v0 = (*((param0)->unk_08++)); - v1 = (s32)sub_0203E850(param0); + v0 = ScriptContext_ReadByte(param0); + v1 = (s32)ScriptContext_ReadWord(param0); - if (Unk_020EABA6[v0][param0->unk_02] == 1) { - sub_0203E818(param0, (u8 *)(param0->unk_08 + v1)); + if (Unk_020EABA6[v0][param0->comparisonResult] == 1) { + ScriptContext_Jump(param0, (u8 *)(param0->scriptPtr + v1)); } return 0; } -static BOOL sub_0203FB28 (UnkStruct_0203E724 * param0) +static BOOL sub_0203FB28 (ScriptContext * param0) { u8 v0; s32 v1; - v0 = (*((param0)->unk_08++)); - v1 = (s32)sub_0203E850(param0); + v0 = ScriptContext_ReadByte(param0); + v1 = (s32)ScriptContext_ReadWord(param0); - if (Unk_020EABA6[v0][param0->unk_02] == 1) { - sub_0203E81C(param0, (u8 *)(param0->unk_08 + v1)); + if (Unk_020EABA6[v0][param0->comparisonResult] == 1) { + ScriptContext_Call(param0, (u8 *)(param0->scriptPtr + v1)); } return 0; } -static BOOL sub_0203FB5C (UnkStruct_0203E724 * param0) +static BOOL sub_0203FB5C (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; - u16 v1 = sub_0203E838(param0); + FieldSystem * v0 = param0->fieldSys; + u16 v1 = ScriptContext_ReadHalfWord(param0); sub_0203F19C(v0, v1); return 0; } -static BOOL sub_0203FB74 (UnkStruct_0203E724 * param0) +static BOOL sub_0203FB74 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; - u16 v1 = sub_0203E838(param0); + FieldSystem * v0 = param0->fieldSys; + u16 v1 = ScriptContext_ReadHalfWord(param0); sub_0203F1B0(v0, v1); return 0; } -static BOOL sub_0203FB8C (UnkStruct_0203E724 * param0) +static BOOL sub_0203FB8C (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; - u16 v1 = sub_0203E838(param0); + FieldSystem * v0 = param0->fieldSys; + u16 v1 = ScriptContext_ReadHalfWord(param0); - param0->unk_02 = sub_0203F188(v0, v1); + param0->comparisonResult = sub_0203F188(v0, v1); return 0; } -static BOOL sub_0203FBA8 (UnkStruct_0203E724 * param0) +static BOOL sub_0203FBA8 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; - u16 * v1 = inline_0204FCAC(param0); - u16 * v2 = inline_0204FCAC(param0); + FieldSystem * v0 = param0->fieldSys; + u16 * v1 = ScriptContext_GetVarPointer(param0); + u16 * v2 = ScriptContext_GetVarPointer(param0); *v2 = sub_0203F188(v0, (*v1)); return 0; } -static BOOL sub_0203FBE4 (UnkStruct_0203E724 * param0) +static BOOL sub_0203FBE4 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; - u16 * v1 = inline_0204FCAC(param0); + FieldSystem * v0 = param0->fieldSys; + u16 * v1 = ScriptContext_GetVarPointer(param0); sub_0203F19C(v0, (*v1)); return 0; } -static BOOL sub_0203FC0C (UnkStruct_0203E724 * param0) +static BOOL sub_0203FC0C (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; - u16 v1 = inline_02049538(param0); + FieldSystem * v0 = param0->fieldSys; + u16 v1 = ScriptContext_GetVar(param0); sub_0203F2BC(v0, v1); return 0; } -static BOOL sub_0203FC30 (UnkStruct_0203E724 * param0) +static BOOL sub_0203FC30 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; - u16 v1 = inline_02049538(param0); + FieldSystem * v0 = param0->fieldSys; + u16 v1 = ScriptContext_GetVar(param0); sub_0203F2D8(v0, v1); return 0; } -static BOOL sub_0203FC54 (UnkStruct_0203E724 * param0) +static BOOL sub_0203FC54 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; - u16 v1 = inline_02049538(param0); + FieldSystem * v0 = param0->fieldSys; + u16 v1 = ScriptContext_GetVar(param0); - param0->unk_02 = sub_0203F2A0(v0, v1); + param0->comparisonResult = sub_0203F2A0(v0, v1); return 0; } -static BOOL sub_0203FC7C (UnkStruct_0203E724 * param0) +static BOOL sub_0203FC7C (ScriptContext * param0) { u16 * v0; u16 v1; - v0 = inline_0204FCAC(param0); - *v0 += inline_02049538(param0); + v0 = ScriptContext_GetVarPointer(param0); + *v0 += ScriptContext_GetVar(param0); return 0; } -static BOOL sub_0203FCAC (UnkStruct_0203E724 * param0) +static BOOL sub_0203FCAC (ScriptContext * param0) { u16 * v0; - v0 = inline_0204FCAC(param0); - *v0 -= inline_02049538(param0); + v0 = ScriptContext_GetVarPointer(param0); + *v0 -= ScriptContext_GetVar(param0); return 0; } -static BOOL sub_0203FCDC (UnkStruct_0203E724 * param0) +static BOOL sub_0203FCDC (ScriptContext * param0) { u16 * v0; - v0 = inline_0204FCAC(param0); - *v0 = sub_0203E838(param0); + v0 = ScriptContext_GetVarPointer(param0); + *v0 = ScriptContext_ReadHalfWord(param0); return 0; } -static BOOL sub_0203FD00 (UnkStruct_0203E724 * param0) +static BOOL sub_0203FD00 (ScriptContext * param0) { u16 * v0; u16 * v1; - v0 = inline_0204FCAC(param0); - v1 = inline_0204FCAC(param0); + v0 = ScriptContext_GetVarPointer(param0); + v1 = ScriptContext_GetVarPointer(param0); *v0 = *v1; return 0; } -static BOOL sub_0203FD30 (UnkStruct_0203E724 * param0) +static BOOL sub_0203FD30 (ScriptContext * param0) { u16 * v0; - v0 = inline_0204FCAC(param0); - *v0 = inline_02049538(param0); + v0 = ScriptContext_GetVarPointer(param0); + *v0 = ScriptContext_GetVar(param0); return 0; } -static BOOL sub_0203FD5C (UnkStruct_0203E724 * param0) +static BOOL sub_0203FD5C (ScriptContext * param0) { - u8 v0 = (*((param0)->unk_08++)); + u8 v0 = ScriptContext_ReadByte(param0); - ov5_021DD498(param0, param0->unk_2C, v0); + ov5_021DD498(param0, param0->loader, v0); return 0; } -static BOOL sub_0203FD70 (UnkStruct_0203E724 * param0) +static BOOL sub_0203FD70 (ScriptContext * param0) { MessageLoader * v0; - u16 v1 = inline_02049538(param0); - u16 v2 = inline_02049538(param0); + u16 v1 = ScriptContext_GetVar(param0); + u16 v2 = ScriptContext_GetVar(param0); v0 = MessageLoader_Init(1, 26, v1, 32); @@ -2154,53 +2154,53 @@ static BOOL sub_0203FD70 (UnkStruct_0203E724 * param0) return 0; } -static BOOL sub_0203FDBC (UnkStruct_0203E724 * param0) +static BOOL sub_0203FDBC (ScriptContext * param0) { MessageLoader * v0; - u16 v1 = inline_02049538(param0); - u16 v2 = inline_02049538(param0); + u16 v1 = ScriptContext_GetVar(param0); + u16 v2 = ScriptContext_GetVar(param0); v0 = MessageLoader_Init(1, 26, v1, 32); ov5_021DD444(param0, v0, v2, 1, NULL); MessageLoader_Free(v0); - sub_0203E764(param0, sub_02040014); + ScriptContext_Pause(param0, sub_02040014); return 1; } -static BOOL sub_0203FE20 (UnkStruct_0203E724 * param0) +static BOOL sub_0203FE20 (ScriptContext * param0) { - u16 v0 = sub_0203E838(param0); - u16 v1 = sub_0203E838(param0); - u16 v2 = sub_0203E838(param0); - u16 v3 = sub_0203E838(param0); + u16 v0 = ScriptContext_ReadHalfWord(param0); + u16 v1 = ScriptContext_ReadHalfWord(param0); + u16 v2 = ScriptContext_ReadHalfWord(param0); + u16 v3 = ScriptContext_ReadHalfWord(param0); ov5_021DD4CC(param0, v0, v1, v2, v3, 0xFF); return 0; } -static BOOL sub_0203FE60 (UnkStruct_0203E724 * param0) +static BOOL sub_0203FE60 (ScriptContext * param0) { - u16 v0 = sub_0203E838(param0); - u16 v1 = sub_0203E838(param0); - u16 v2 = sub_0203E838(param0); - u16 v3 = sub_0203E838(param0); + u16 v0 = ScriptContext_ReadHalfWord(param0); + u16 v1 = ScriptContext_ReadHalfWord(param0); + u16 v2 = ScriptContext_ReadHalfWord(param0); + u16 v3 = ScriptContext_ReadHalfWord(param0); ov5_021DD4CC(param0, v0, v1, v2, v3, 1); - sub_0203E764(param0, sub_02040014); + ScriptContext_Pause(param0, sub_02040014); return 1; } -static BOOL sub_0203FEAC (UnkStruct_0203E724 * param0) +static BOOL sub_0203FEAC (ScriptContext * param0) { u16 * v0; UnkStruct_0204AFC4 * v1; MessageLoader * v2; - u16 v3 = (*((param0)->unk_08++)); + u16 v3 = ScriptContext_ReadByte(param0); - v1 = param0->unk_34->unk_AC; + v1 = param0->fieldSys->unk_AC; if (v1 == NULL) { return 0; @@ -2216,17 +2216,17 @@ static BOOL sub_0203FEAC (UnkStruct_0203E724 * param0) ov5_021DD4CC(param0, v0[0], v0[1], v0[2], v0[3], 1); } - sub_0203E764(param0, sub_02040014); + ScriptContext_Pause(param0, sub_02040014); return 1; } -static BOOL sub_0203FF34 (UnkStruct_0203E724 * param0) +static BOOL sub_0203FF34 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; - u8 v1 = (*((param0)->unk_08++)); - u16 v2 = inline_02049538(param0); - u16 v3 = sub_0203E838(param0); - u8 v4 = (*((param0)->unk_08++)); + FieldSystem * v0 = param0->fieldSys; + u8 v1 = ScriptContext_ReadByte(param0); + u16 v2 = ScriptContext_GetVar(param0); + u16 v3 = ScriptContext_ReadHalfWord(param0); + u8 v4 = ScriptContext_ReadByte(param0); u8 v5; StringTemplate * v6; @@ -2235,95 +2235,95 @@ static BOOL sub_0203FF34 (UnkStruct_0203E724 * param0) ov5_021DD530(param0, v6, v1 + v5, 1); StringTemplate_Free(v6); - sub_0203E764(param0, sub_02040014); + ScriptContext_Pause(param0, sub_02040014); return 1; } -static BOOL sub_0203FFAC (UnkStruct_0203E724 * param0) +static BOOL sub_0203FFAC (ScriptContext * param0) { UnkStruct_ov5_021DD42C v0; - u16 v1 = sub_0203E838(param0); + u16 v1 = ScriptContext_ReadHalfWord(param0); ov5_021DD42C(&v0, param0); v0.unk_02 = 3; - ov5_021DD444(param0, param0->unk_2C, v1, 0, &v0); - sub_0203E764(param0, sub_02040014); + ov5_021DD444(param0, param0->loader, v1, 0, &v0); + ScriptContext_Pause(param0, sub_02040014); return 1; } -static BOOL sub_0203FFE8 (UnkStruct_0203E724 * param0) +static BOOL sub_0203FFE8 (ScriptContext * param0) { - u8 v0 = (*((param0)->unk_08++)); + u8 v0 = ScriptContext_ReadByte(param0); - ov5_021DD444(param0, param0->unk_2C, (u8)v0, 1, NULL); - sub_0203E764(param0, sub_02040014); + ov5_021DD444(param0, param0->loader, (u8)v0, 1, NULL); + ScriptContext_Pause(param0, sub_02040014); return 1; } -static BOOL sub_02040014 (UnkStruct_0203E724 * param0) +static BOOL sub_02040014 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; u8 * v1 = sub_0203F098(v0, 3); return sub_0205DA04(*v1); } -static BOOL sub_02040028 (UnkStruct_0203E724 * param0) +static BOOL sub_02040028 (ScriptContext * param0) { - u16 v0 = inline_02049538(param0); + u16 v0 = ScriptContext_GetVar(param0); - ov5_021DD444(param0, param0->unk_2C, (u8)v0, 1, NULL); - sub_0203E764(param0, sub_02040014); + ov5_021DD444(param0, param0->loader, (u8)v0, 1, NULL); + ScriptContext_Pause(param0, sub_02040014); return 1; } -static BOOL sub_02040064 (UnkStruct_0203E724 * param0) +static BOOL sub_02040064 (ScriptContext * param0) { - u16 v0 = inline_02049538(param0); + u16 v0 = ScriptContext_GetVar(param0); UnkStruct_ov5_021DD42C v1; ov5_021DD42C(&v1, param0); v1.unk_01 = 1; - ov5_021DD444(param0, param0->unk_2C, (u8)v0, 1, &v1); - sub_0203E764(param0, sub_02040014); + ov5_021DD444(param0, param0->loader, (u8)v0, 1, &v1); + ScriptContext_Pause(param0, sub_02040014); return 1; } -static BOOL sub_020400AC (UnkStruct_0203E724 * param0) +static BOOL sub_020400AC (ScriptContext * param0) { - u16 v0 = inline_02049538(param0); + u16 v0 = ScriptContext_GetVar(param0); - ov5_021DD444(param0, param0->unk_2C, (u8)v0, 0, NULL); - sub_0203E764(param0, sub_02040014); + ov5_021DD444(param0, param0->loader, (u8)v0, 0, NULL); + ScriptContext_Pause(param0, sub_02040014); return 1; } -static BOOL sub_020400E8 (UnkStruct_0203E724 * param0) +static BOOL sub_020400E8 (ScriptContext * param0) { - LocalMapObject ** v0 = sub_0203F098(param0->unk_34, 10); + LocalMapObject ** v0 = sub_0203F098(param0->fieldSys, 10); u8 v1 = sub_02062950(*v0); - ov5_021DD444(param0, param0->unk_2C, (u8)v1, 1, NULL); - sub_0203E764(param0, sub_02040014); + ov5_021DD444(param0, param0->loader, (u8)v1, 1, NULL); + ScriptContext_Pause(param0, sub_02040014); return 1; } -static BOOL sub_02040124 (UnkStruct_0203E724 * param0) +static BOOL sub_02040124 (ScriptContext * param0) { - u8 v0 = (*((param0)->unk_08++)); + u8 v0 = ScriptContext_ReadByte(param0); if (CommSys_IsInitialized() == 0) { - ov5_021DD444(param0, param0->unk_2C, v0, 1, NULL); + ov5_021DD444(param0, param0->loader, v0, 1, NULL); } else { UnkStruct_ov5_021DD42C v1; @@ -2332,20 +2332,20 @@ static BOOL sub_02040124 (UnkStruct_0203E724 * param0) v1.unk_00 = 1; v1.unk_01 = 1; - ov5_021DD444(param0, param0->unk_2C, v0, 0, &v1); + ov5_021DD444(param0, param0->loader, v0, 0, &v1); } - sub_0203E764(param0, sub_02040014); + ScriptContext_Pause(param0, sub_02040014); return 1; } -static BOOL sub_02040180 (UnkStruct_0203E724 * param0) +static BOOL sub_02040180 (ScriptContext * param0) { - sub_0203E764(param0, sub_02040190); + ScriptContext_Pause(param0, sub_02040190); return 1; } -static BOOL sub_02040190 (UnkStruct_0203E724 * param0) +static BOOL sub_02040190 (ScriptContext * param0) { if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { return 1; @@ -2354,50 +2354,50 @@ static BOOL sub_02040190 (UnkStruct_0203E724 * param0) return 0; } -static BOOL sub_020401A8 (UnkStruct_0203E724 * param0) +static BOOL sub_020401A8 (ScriptContext * param0) { - param0->unk_18[0] = inline_02049538(param0); - sub_0203E764(param0, sub_020401D0); + param0->data[0] = ScriptContext_GetVar(param0); + ScriptContext_Pause(param0, sub_020401D0); return 1; } -static BOOL sub_020401D0 (UnkStruct_0203E724 * param0) +static BOOL sub_020401D0 (ScriptContext * param0) { if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { return 1; } - param0->unk_18[0]--; + param0->data[0]--; - if (param0->unk_18[0] == 0) { + if (param0->data[0] == 0) { return 1; } return 0; } -static BOOL sub_020401F4 (UnkStruct_0203E724 * param0) +static BOOL sub_020401F4 (ScriptContext * param0) { - sub_0203E764(param0, sub_02040204); + ScriptContext_Pause(param0, sub_02040204); return 1; } -static BOOL sub_02040204 (UnkStruct_0203E724 * param0) +static BOOL sub_02040204 (ScriptContext * param0) { if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { return 1; } if (gCoreSys.pressedKeys & PAD_KEY_UP) { - Player_SetDir(param0->unk_34->playerAvatar, 0); + Player_SetDir(param0->fieldSys->playerAvatar, 0); } else if (gCoreSys.pressedKeys & PAD_KEY_DOWN) { - Player_SetDir(param0->unk_34->playerAvatar, 1); + Player_SetDir(param0->fieldSys->playerAvatar, 1); } else if (gCoreSys.pressedKeys & PAD_KEY_LEFT) { - Player_SetDir(param0->unk_34->playerAvatar, 2); + Player_SetDir(param0->fieldSys->playerAvatar, 2); } else if (gCoreSys.pressedKeys & PAD_KEY_RIGHT) { - Player_SetDir(param0->unk_34->playerAvatar, 3); + Player_SetDir(param0->fieldSys->playerAvatar, 3); } else if (gCoreSys.pressedKeys & PAD_BUTTON_X) { - sub_0203F0C0(param0->unk_34); + sub_0203F0C0(param0->fieldSys); } else { return 0; } @@ -2405,13 +2405,13 @@ static BOOL sub_02040204 (UnkStruct_0203E724 * param0) return 1; } -static BOOL sub_02040284 (UnkStruct_0203E724 * param0) +static BOOL sub_02040284 (ScriptContext * param0) { - sub_0203E764(param0, sub_02040294); + ScriptContext_Pause(param0, sub_02040294); return 1; } -static BOOL sub_02040294 (UnkStruct_0203E724 * param0) +static BOOL sub_02040294 (ScriptContext * param0) { if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { return 1; @@ -2424,21 +2424,21 @@ static BOOL sub_02040294 (UnkStruct_0203E724 * param0) return 0; } -static BOOL sub_020402B4 (UnkStruct_0203E724 * param0) +static BOOL sub_020402B4 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; u8 * v1 = sub_0203F098(v0, 6); sub_0205D8F4(v0->unk_08, sub_0203F098(v0, 1), 3); - sub_0205D944(sub_0203F098(v0, 1), sub_02025E44(param0->unk_34->saveData)); + sub_0205D944(sub_0203F098(v0, 1), sub_02025E44(param0->fieldSys->saveData)); *v1 = 1; return 0; } -static BOOL sub_020402FC (UnkStruct_0203E724 * param0) +static BOOL sub_020402FC (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; Window * v1 = sub_0203F098(v0, 1); u8 * v2 = sub_0203F098(v0, 6); @@ -2449,9 +2449,9 @@ static BOOL sub_020402FC (UnkStruct_0203E724 * param0) return 0; } -static BOOL sub_0204032C (UnkStruct_0203E724 * param0) +static BOOL sub_0204032C (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; Window * v1 = sub_0203F098(v0, 1); u8 * v2 = sub_0203F098(v0, 6); @@ -2461,9 +2461,9 @@ static BOOL sub_0204032C (UnkStruct_0203E724 * param0) return 0; } -static BOOL sub_02040354 (UnkStruct_0203E724 * param0) +static BOOL sub_02040354 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; u16 * v1 = sub_0203F098(v0, 49); u16 * v2 = sub_0203F098(v0, 45); u16 * v3 = sub_0203F098(v0, 50); @@ -2471,21 +2471,21 @@ static BOOL sub_02040354 (UnkStruct_0203E724 * param0) u16 * v5 = sub_0203F098(v0, 46); u16 * v6 = sub_0203F098(v0, 52); - *v1 = (*((param0)->unk_08++)); - *v2 = (*((param0)->unk_08++)); - *v3 = (*((param0)->unk_08++)); - *v4 = (*((param0)->unk_08++)); - *v5 = (*((param0)->unk_08++)); - *v6 = (*((param0)->unk_08++)); + *v1 = ScriptContext_ReadByte(param0); + *v2 = ScriptContext_ReadByte(param0); + *v3 = ScriptContext_ReadByte(param0); + *v4 = ScriptContext_ReadByte(param0); + *v5 = ScriptContext_ReadByte(param0); + *v6 = ScriptContext_ReadByte(param0); - sub_0203E764(param0, sub_020403EC); + ScriptContext_Pause(param0, sub_020403EC); return 1; } -static BOOL sub_020403EC (UnkStruct_0203E724 * param0) +static BOOL sub_020403EC (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; u16 * v1 = sub_0203F098(v0, 49); u16 * v2 = sub_0203F098(v0, 50); u16 * v3 = sub_0203F098(v0, 51); @@ -2524,7 +2524,7 @@ static BOOL sub_020403EC (UnkStruct_0203E724 * param0) return 0; } -static BOOL sub_020404A4 (UnkStruct_0203E724 * param0) +static BOOL sub_020404A4 (ScriptContext * param0) { FieldSystem * v0; Strbuf ** v1; @@ -2535,14 +2535,14 @@ static BOOL sub_020404A4 (UnkStruct_0203E724 * param0) u8 v6; u8 v7; - v0 = param0->unk_34; + v0 = param0->fieldSys; v1 = sub_0203F098(v0, 17); v2 = sub_0203F098(v0, 16); v3 = sub_0203F098(v0, 15); - v7 = (*((param0)->unk_08++)); - v6 = (*((param0)->unk_08++)); - v4 = sub_0203E838(param0); - v5 = sub_0203E838(param0); + v7 = ScriptContext_ReadByte(param0); + v6 = ScriptContext_ReadByte(param0); + v4 = ScriptContext_ReadHalfWord(param0); + v5 = ScriptContext_ReadHalfWord(param0); if (v4 == 0) { LocalMapObject ** v8 = sub_0203F098(v0, 10); @@ -2554,22 +2554,22 @@ static BOOL sub_020404A4 (UnkStruct_0203E724 * param0) ov5_021E1B40(v0->unk_64, 1); ov5_021E1B68(v0); - MessageLoader_GetStrbuf(param0->unk_2C, v7, *v1); + MessageLoader_GetStrbuf(param0->loader, v7, *v1); StringTemplate_Format(*v3, *v2, *v1); PrintStringSimple(ov5_021E1B50(v0->unk_64), 1, *v2, 0, 0, 0, NULL); return 1; } -static BOOL sub_02040554 (UnkStruct_0203E724 * param0) +static BOOL sub_02040554 (ScriptContext * param0) { FieldSystem * v0; u16 v1; u8 v2; - v0 = param0->unk_34; - v2 = (*((param0)->unk_08++)); - v1 = sub_0203E838(param0); + v0 = param0->fieldSys; + v2 = ScriptContext_ReadByte(param0); + v1 = ScriptContext_ReadHalfWord(param0); ov5_021E1B38(v0->unk_64, v2, v1); ov5_021E1B40(v0->unk_64, 1); @@ -2577,34 +2577,34 @@ static BOOL sub_02040554 (UnkStruct_0203E724 * param0) return 1; } -static BOOL sub_02040580 (UnkStruct_0203E724 * param0) +static BOOL sub_02040580 (ScriptContext * param0) { FieldSystem * v0; u8 v1; - v0 = param0->unk_34; - v1 = (*((param0)->unk_08++)); + v0 = param0->fieldSys; + v1 = ScriptContext_ReadByte(param0); ov5_021E1B40(v0->unk_64, v1); return 1; } -static BOOL sub_0204059C (UnkStruct_0203E724 * param0) +static BOOL sub_0204059C (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; if (ov5_021E1B58(v0->unk_64) == 1) { return 0; } - sub_0203E764(param0, sub_020405C4); + ScriptContext_Pause(param0, sub_020405C4); return 1; } -static BOOL sub_020405C4 (UnkStruct_0203E724 * param0) +static BOOL sub_020405C4 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; if (ov5_021E1B58(v0->unk_64) == 1) { return 1; @@ -2613,32 +2613,32 @@ static BOOL sub_020405C4 (UnkStruct_0203E724 * param0) return 0; } -static BOOL sub_020405DC (UnkStruct_0203E724 * param0) +static BOOL sub_020405DC (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; u8 * v1 = sub_0203F098(v0, 3); Strbuf ** v2 = sub_0203F098(v0, 17); Strbuf ** v3 = sub_0203F098(v0, 16); StringTemplate ** v4 = sub_0203F098(v0, 15); - u8 v5 = (*((param0)->unk_08++)); - u16 v6 = sub_0203E838(param0); + u8 v5 = ScriptContext_ReadByte(param0); + u16 v6 = ScriptContext_ReadHalfWord(param0); - MessageLoader_GetStrbuf(param0->unk_2C, v5, *v2); + MessageLoader_GetStrbuf(param0->loader, v5, *v2); StringTemplate_Format(*v4, *v3, *v2); - *v1 = sub_0205D994(ov5_021E1B50(v0->unk_64), *v3, sub_02025E44(param0->unk_34->saveData), 1); + *v1 = sub_0205D994(ov5_021E1B50(v0->unk_64), *v3, sub_02025E44(param0->fieldSys->saveData), 1); - param0->unk_18[0] = v6; - sub_0203E764(param0, sub_02040670); + param0->data[0] = v6; + ScriptContext_Pause(param0, sub_02040670); return 1; } -static BOOL sub_02040670 (UnkStruct_0203E724 * param0) +static BOOL sub_02040670 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; u8 * v1 = sub_0203F098(v0, 3); - u16 * v2 = sub_0203F118(v0, param0->unk_18[0]); + u16 * v2 = sub_0203F118(v0, param0->data[0]); u8 v3 = ov5_021E1B54(v0->unk_64); int v4 = 0xffff; @@ -2659,7 +2659,7 @@ static BOOL sub_02040670 (UnkStruct_0203E724 * param0) if (v4 != 0xffff) { sub_0201D730(*v1); - Player_SetDir(param0->unk_34->playerAvatar, v4); + Player_SetDir(param0->fieldSys->playerAvatar, v4); *v2 = 0; return 1; } @@ -2673,20 +2673,20 @@ static BOOL sub_02040670 (UnkStruct_0203E724 * param0) return 0; } -static BOOL sub_02040714 (UnkStruct_0203E724 * param0) +static BOOL sub_02040714 (ScriptContext * param0) { - u16 v0 = sub_0203E838(param0); + u16 v0 = ScriptContext_ReadHalfWord(param0); - param0->unk_18[0] = v0; - sub_0203E764(param0, sub_02040730); + param0->data[0] = v0; + ScriptContext_Pause(param0, sub_02040730); return 1; } -static BOOL sub_02040730 (UnkStruct_0203E724 * param0) +static BOOL sub_02040730 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; - u16 * v1 = sub_0203F118(v0, param0->unk_18[0]); + FieldSystem * v0 = param0->fieldSys; + u16 * v1 = sub_0203F118(v0, param0->data[0]); int v2 = 0xffff; if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { @@ -2705,7 +2705,7 @@ static BOOL sub_02040730 (UnkStruct_0203E724 * param0) } if (v2 != 0xffff) { - Player_SetDir(param0->unk_34->playerAvatar, v2); + Player_SetDir(param0->fieldSys->playerAvatar, v2); *v1 = 0; return 1; } @@ -2718,36 +2718,36 @@ static BOOL sub_02040730 (UnkStruct_0203E724 * param0) return 0; } -static BOOL sub_020407B4 (UnkStruct_0203E724 * param0) +static BOOL sub_020407B4 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; sub_0203F0C0(v0); return 0; } -static BOOL sub_020407C4 (UnkStruct_0203E724 * param0) +static BOOL sub_020407C4 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; UIControlData ** v1 = sub_0203F098(v0, 2); - u16 v2 = sub_0203E838(param0); + u16 v2 = ScriptContext_ReadHalfWord(param0); sub_0200DAA4(v0->unk_08, 3, 1024 - (18 + 12) - 9, 11, 0, 4); *v1 = sub_02002100(v0->unk_08, &Unk_020EAB84, 1024 - (18 + 12) - 9, 11, 4); - param0->unk_18[0] = v2; + param0->data[0] = v2; - sub_0203E764(param0, sub_02040824); + ScriptContext_Pause(param0, sub_02040824); return 1; } -static BOOL sub_02040824 (UnkStruct_0203E724 * param0) +static BOOL sub_02040824 (ScriptContext * param0) { u32 v0; - FieldSystem * v1 = param0->unk_34; + FieldSystem * v1 = param0->fieldSys; UIControlData ** v2 = sub_0203F098(v1, 2); - u16 * v3 = sub_0203F118(v1, param0->unk_18[0]); + u16 * v3 = sub_0203F118(v1, param0->data[0]); v0 = sub_02002114(*v2, 4); @@ -2764,102 +2764,102 @@ static BOOL sub_02040824 (UnkStruct_0203E724 * param0) return 1; } -static BOOL sub_02040868 (UnkStruct_0203E724 * param0) +static BOOL sub_02040868 (ScriptContext * param0) { void ** v0; - Window * v1 = sub_0203F098(param0->unk_34, 1); + Window * v1 = sub_0203F098(param0->fieldSys, 1); - v0 = sub_0203F098(param0->unk_34, 18); + v0 = sub_0203F098(param0->fieldSys, 18); *v0 = sub_0200E7FC(v1, 1024 - (18 + 12)); return 0; } -static BOOL sub_02040898 (UnkStruct_0203E724 * param0) +static BOOL sub_02040898 (ScriptContext * param0) { void ** v0; - v0 = sub_0203F098(param0->unk_34, 18); + v0 = sub_0203F098(param0->fieldSys, 18); DeleteWaitDial(*v0); return 0; } -static BOOL sub_020408B0 (UnkStruct_0203E724 * param0) +static BOOL sub_020408B0 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; UnkStruct_ov5_021DC1A4 ** v1 = sub_0203F098(v0, 0); StringTemplate ** v2 = sub_0203F098(v0, 15); - u8 v3 = (*((param0)->unk_08++)); - u8 v4 = (*((param0)->unk_08++)); - u8 v5 = (*((param0)->unk_08++)); - u8 v6 = (*((param0)->unk_08++)); - u16 v7 = sub_0203E838(param0); + u8 v3 = ScriptContext_ReadByte(param0); + u8 v4 = ScriptContext_ReadByte(param0); + u8 v5 = ScriptContext_ReadByte(param0); + u8 v6 = ScriptContext_ReadByte(param0); + u16 v7 = ScriptContext_ReadHalfWord(param0); - *v1 = ov5_021DC150(v0, v3, v4, v5, v6, sub_0203F118(v0, v7), *v2, sub_0203F098(param0->unk_34, 1), NULL); - param0->unk_18[0] = v7; + *v1 = ov5_021DC150(v0, v3, v4, v5, v6, sub_0203F118(v0, v7), *v2, sub_0203F098(param0->fieldSys, 1), NULL); + param0->data[0] = v7; return 1; } -static BOOL sub_02040938 (UnkStruct_0203E724 * param0) +static BOOL sub_02040938 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; UnkStruct_ov5_021DC1A4 ** v1 = sub_0203F098(v0, 0); StringTemplate ** v2 = sub_0203F098(v0, 15); - u8 v3 = (*((param0)->unk_08++)); - u8 v4 = (*((param0)->unk_08++)); - u8 v5 = (*((param0)->unk_08++)); - u8 v6 = (*((param0)->unk_08++)); - u16 v7 = sub_0203E838(param0); + u8 v3 = ScriptContext_ReadByte(param0); + u8 v4 = ScriptContext_ReadByte(param0); + u8 v5 = ScriptContext_ReadByte(param0); + u8 v6 = ScriptContext_ReadByte(param0); + u16 v7 = ScriptContext_ReadHalfWord(param0); - *v1 = ov5_021DC150(v0, v3, v4, v5, v6, sub_0203F118(v0, v7), *v2, sub_0203F098(param0->unk_34, 1), param0->unk_2C); - param0->unk_18[0] = v7; + *v1 = ov5_021DC150(v0, v3, v4, v5, v6, sub_0203F118(v0, v7), *v2, sub_0203F098(param0->fieldSys, 1), param0->loader); + param0->data[0] = v7; return 1; } -static BOOL sub_020409C0 (UnkStruct_0203E724 * param0) +static BOOL sub_020409C0 (ScriptContext * param0) { u8 v0, v1; - FieldSystem * v2 = param0->unk_34; + FieldSystem * v2 = param0->fieldSys; UnkStruct_ov5_021DC1A4 ** v3 = sub_0203F098(v2, 0); - v0 = (*((param0)->unk_08++)); - v1 = (*((param0)->unk_08++)); + v0 = ScriptContext_ReadByte(param0); + v1 = ScriptContext_ReadByte(param0); ov5_021DC1A4(*v3, v0, v1); return 0; } -static BOOL sub_020409E8 (UnkStruct_0203E724 * param0) +static BOOL sub_020409E8 (ScriptContext * param0) { u16 v0, v1; - FieldSystem * v2 = param0->unk_34; + FieldSystem * v2 = param0->fieldSys; UnkStruct_ov5_021DC1A4 ** v3 = sub_0203F098(v2, 0); - v0 = inline_02049538(param0); - v1 = inline_02049538(param0); + v0 = ScriptContext_GetVar(param0); + v1 = ScriptContext_GetVar(param0); ov5_021DC1A4(*v3, v0, v1); return 0; } -static BOOL sub_02040A2C (UnkStruct_0203E724 * param0) +static BOOL sub_02040A2C (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; UnkStruct_ov5_021DC1A4 ** v1 = sub_0203F098(v0, 0); ov5_021DC1AC(*v1); - sub_0203E764(param0, sub_02040A50); + ScriptContext_Pause(param0, sub_02040A50); return 1; } -static BOOL sub_02040A50 (UnkStruct_0203E724 * param0) +static BOOL sub_02040A50 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; - u16 * v1 = sub_0203F118(v0, param0->unk_18[0]); + FieldSystem * v0 = param0->fieldSys; + u16 * v1 = sub_0203F118(v0, param0->data[0]); if (*v1 == 0xeeee) { return 0; @@ -2868,21 +2868,21 @@ static BOOL sub_02040A50 (UnkStruct_0203E724 * param0) return 1; } -static BOOL sub_02040A78 (UnkStruct_0203E724 * param0) +static BOOL sub_02040A78 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; UnkStruct_ov5_021DC1A4 ** v1 = sub_0203F098(v0, 0); ov5_021DC1AC(*v1); - sub_0203E764(param0, sub_02040A9C); + ScriptContext_Pause(param0, sub_02040A9C); return 1; } -static BOOL sub_02040A9C (UnkStruct_0203E724 * param0) +static BOOL sub_02040A9C (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; - u16 * v1 = sub_0203F118(v0, param0->unk_18[0]); + FieldSystem * v0 = param0->fieldSys; + u16 * v1 = sub_0203F118(v0, param0->data[0]); UnkStruct_ov5_021DC1A4 ** v2 = sub_0203F098(v0, 0); if (*v1 == 0xeeee) { @@ -2898,161 +2898,161 @@ static BOOL sub_02040A9C (UnkStruct_0203E724 * param0) return 1; } -static BOOL sub_02040AE8 (UnkStruct_0203E724 * param0) +static BOOL sub_02040AE8 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; UnkStruct_ov5_021DC1A4 ** v1 = sub_0203F098(v0, 0); StringTemplate ** v2 = sub_0203F098(v0, 15); - u8 v3 = (*((param0)->unk_08++)); - u8 v4 = (*((param0)->unk_08++)); - u8 v5 = (*((param0)->unk_08++)); - u8 v6 = (*((param0)->unk_08++)); - u16 v7 = sub_0203E838(param0); + u8 v3 = ScriptContext_ReadByte(param0); + u8 v4 = ScriptContext_ReadByte(param0); + u8 v5 = ScriptContext_ReadByte(param0); + u8 v6 = ScriptContext_ReadByte(param0); + u16 v7 = ScriptContext_ReadHalfWord(param0); - *v1 = ov5_021DC48C(v0, v3, v4, v5, v6, sub_0203F118(v0, v7), *v2, sub_0203F098(param0->unk_34, 1), NULL); - param0->unk_18[0] = v7; + *v1 = ov5_021DC48C(v0, v3, v4, v5, v6, sub_0203F118(v0, v7), *v2, sub_0203F098(param0->fieldSys, 1), NULL); + param0->data[0] = v7; return 1; } -static BOOL sub_02040B70 (UnkStruct_0203E724 * param0) +static BOOL sub_02040B70 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; UnkStruct_ov5_021DC1A4 ** v1 = sub_0203F098(v0, 0); StringTemplate ** v2 = sub_0203F098(v0, 15); - u8 v3 = (*((param0)->unk_08++)); - u8 v4 = (*((param0)->unk_08++)); - u8 v5 = (*((param0)->unk_08++)); - u8 v6 = (*((param0)->unk_08++)); - u16 v7 = sub_0203E838(param0); + u8 v3 = ScriptContext_ReadByte(param0); + u8 v4 = ScriptContext_ReadByte(param0); + u8 v5 = ScriptContext_ReadByte(param0); + u8 v6 = ScriptContext_ReadByte(param0); + u16 v7 = ScriptContext_ReadHalfWord(param0); - *v1 = ov5_021DC48C(v0, v3, v4, v5, v6, sub_0203F118(v0, v7), *v2, sub_0203F098(param0->unk_34, 1), param0->unk_2C); - param0->unk_18[0] = v7; + *v1 = ov5_021DC48C(v0, v3, v4, v5, v6, sub_0203F118(v0, v7), *v2, sub_0203F098(param0->fieldSys, 1), param0->loader); + param0->data[0] = v7; return 1; } -static BOOL sub_02040BF8 (UnkStruct_0203E724 * param0) +static BOOL sub_02040BF8 (ScriptContext * param0) { - UnkStruct_ov5_021DC1A4 ** v0 = sub_0203F098(param0->unk_34, 0); - u8 v1 = inline_02049538(param0); - u8 v2 = inline_02049538(param0); - u8 v3 = inline_02049538(param0); + UnkStruct_ov5_021DC1A4 ** v0 = sub_0203F098(param0->fieldSys, 0); + u8 v1 = ScriptContext_GetVar(param0); + u8 v2 = ScriptContext_GetVar(param0); + u8 v3 = ScriptContext_GetVar(param0); ov5_021DC4B0(*v0, v1, v2, v3); return 0; } -static BOOL sub_02040C58 (UnkStruct_0203E724 * param0) +static BOOL sub_02040C58 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; UnkStruct_ov5_021DC1A4 ** v1 = sub_0203F098(v0, 0); ov5_021DC4B8(*v1); - sub_0203E764(param0, sub_02040A50); + ScriptContext_Pause(param0, sub_02040A50); return 1; } -static BOOL sub_02040C7C (UnkStruct_0203E724 * param0) +static BOOL sub_02040C7C (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; UnkStruct_ov5_021DC1A4 ** v1 = sub_0203F098(v0, 0); - u16 v2 = inline_02049538(param0); + u16 v2 = ScriptContext_GetVar(param0); ov5_021DC528(*v1, v2); - sub_0203E764(param0, sub_02040A50); + ScriptContext_Pause(param0, sub_02040A50); return 1; } -static BOOL sub_02040CB8 (UnkStruct_0203E724 * param0) +static BOOL sub_02040CB8 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; UnkStruct_ov5_021DC1A4 ** v1 = sub_0203F098(v0, 0); - u16 * v2 = inline_0204FCAC(param0); - u16 * v3 = inline_0204FCAC(param0); + u16 * v2 = ScriptContext_GetVarPointer(param0); + u16 * v3 = ScriptContext_GetVarPointer(param0); ov5_021DC600(*v1, v2, v3); - sub_0203E764(param0, sub_02040A50); + ScriptContext_Pause(param0, sub_02040A50); return 1; } -static BOOL sub_02040D08 (UnkStruct_0203E724 * param0) +static BOOL sub_02040D08 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; UnkStruct_ov5_021DC1A4 ** v1 = sub_0203F098(v0, 0); - u8 v2 = (*((param0)->unk_08++)); + u8 v2 = ScriptContext_ReadByte(param0); ov5_021DCD94(*v1, v2); - sub_0203E764(param0, sub_02040A50); + ScriptContext_Pause(param0, sub_02040A50); return 1; } -static BOOL sub_02040D34 (UnkStruct_0203E724 * param0) +static BOOL sub_02040D34 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; UnkStruct_ov5_021DC1A4 ** v1 = sub_0203F098(v0, 0); - u8 v2 = (*((param0)->unk_08++)); + u8 v2 = ScriptContext_ReadByte(param0); ov5_021DD3F4(*v1, (BOOL)v2); return 1; } -static BOOL sub_02040D54 (UnkStruct_0203E724 * param0) +static BOOL sub_02040D54 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; UnkStruct_ov5_021DC1A4 ** v1 = sub_0203F098(v0, 0); - u8 v2 = (*((param0)->unk_08++)); + u8 v2 = ScriptContext_ReadByte(param0); ov5_021DD410(*v1, (BOOL)v2); return 1; } -static BOOL sub_02040D74 (UnkStruct_0203E724 * param0) +static BOOL sub_02040D74 (ScriptContext * param0) { u8 * v0; SysTask * v1; u8 * v2; LocalMapObject ** v3; LocalMapObject * v4; - u16 v5 = inline_02049538(param0); - u32 v6 = (s32)sub_0203E850(param0); + u16 v5 = ScriptContext_GetVar(param0); + u32 v6 = (s32)ScriptContext_ReadWord(param0); - v4 = sub_02040ED4(param0->unk_34, v5); + v4 = sub_02040ED4(param0->fieldSys, v5); if (v4 == NULL) { GF_ASSERT(FALSE); return 0; } - v0 = (u8 *)(param0->unk_08 + v6); + v0 = (u8 *)(param0->scriptPtr + v6); v1 = sub_02065700(v4, (UnkStruct_ov5_021F8E3C *)v0); - v2 = sub_0203F098(param0->unk_34, 4); + v2 = sub_0203F098(param0->fieldSys, 4); (*v2)++; - sub_02040F28(param0->unk_34, v1, NULL); + sub_02040F28(param0->fieldSys, v1, NULL); return 0; } -static BOOL sub_02040DD8 (UnkStruct_0203E724 * param0) +static BOOL sub_02040DD8 (ScriptContext * param0) { u8 * v0; SysTask * v1; u8 * v2; LocalMapObject ** v3; LocalMapObject * v4; - u16 v5 = inline_02049538(param0); - u16 v6 = inline_02049538(param0); - u16 v7 = inline_02049538(param0); + u16 v5 = ScriptContext_GetVar(param0); + u16 v6 = ScriptContext_GetVar(param0); + u16 v7 = ScriptContext_GetVar(param0); u16 v8, v9; UnkStruct_ov5_021F8E3C * v10; int v11; - v4 = sub_02040ED4(param0->unk_34, v5); + v4 = sub_02040ED4(param0->fieldSys, v5); if (v4 == NULL) { GF_ASSERT(FALSE); @@ -3087,10 +3087,10 @@ static BOOL sub_02040DD8 (UnkStruct_0203E724 * param0) v10[v11].unk_02 = 0; v1 = sub_02065700(v4, v10); - v2 = sub_0203F098(param0->unk_34, 4); + v2 = sub_0203F098(param0->fieldSys, 4); (*v2)++; - sub_02040F28(param0->unk_34, v1, v10); + sub_02040F28(param0->fieldSys, v1, v10); return 0; } @@ -3112,15 +3112,15 @@ static LocalMapObject * sub_02040ED4 (FieldSystem * param0, int param1) return v1; } -static BOOL sub_02040EFC (UnkStruct_0203E724 * param0) +static BOOL sub_02040EFC (ScriptContext * param0) { - sub_0203E764(param0, sub_02040F0C); + ScriptContext_Pause(param0, sub_02040F0C); return 1; } -static BOOL sub_02040F0C (UnkStruct_0203E724 * param0) +static BOOL sub_02040F0C (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; u8 * v1 = sub_0203F098(v0, 4); if (*v1 == 0) { @@ -3178,10 +3178,10 @@ static void sub_02040F5C (SysTask * param0, void * param1) return; } -static BOOL sub_02040FA4 (UnkStruct_0203E724 * param0) +static BOOL sub_02040FA4 (ScriptContext * param0) { MapObjectManager * v0; - FieldSystem * v1 = param0->unk_34; + FieldSystem * v1 = param0->fieldSys; LocalMapObject ** v2 = sub_0203F098(v1, 10); if (*v2 == NULL) { @@ -3194,7 +3194,7 @@ static BOOL sub_02040FA4 (UnkStruct_0203E724 * param0) if (v3) { if ((sub_0206A984(SaveData_Events(v1->saveData)) == 1) && (sub_02062D1C(v3) != 0)) { sub_02062DDC(v3); - sub_0203E764(param0, sub_020410CC); + ScriptContext_Pause(param0, sub_020410CC); return 1; } } @@ -3228,9 +3228,9 @@ static inline void inline_020410F4_3 (int mask) Unk_021C07E0 &= (0xff ^ mask); } -static BOOL sub_02041004 (UnkStruct_0203E724 * param0) +static BOOL sub_02041004 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; LocalMapObject ** v1 = sub_0203F098(v0, 10); LocalMapObject * v2 = Player_LocalMapObject(v0->playerAvatar); @@ -3269,9 +3269,9 @@ static BOOL sub_02041004 (UnkStruct_0203E724 * param0) return 0; } -static BOOL sub_020410CC (UnkStruct_0203E724 * param0) +static BOOL sub_020410CC (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; LocalMapObject * v1 = sub_02062570(v0->unk_38, 0x30); if (sub_02062D1C(v1) == 0) { @@ -3282,9 +3282,9 @@ static BOOL sub_020410CC (UnkStruct_0203E724 * param0) return 0; } -static BOOL sub_020410F4 (UnkStruct_0203E724 * param0) +static BOOL sub_020410F4 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; LocalMapObject ** v1 = sub_0203F098(v0, 10); LocalMapObject * v2 = Player_LocalMapObject(v0->playerAvatar); LocalMapObject * v3 = sub_02062570(v0->unk_38, 0x30); @@ -3320,14 +3320,14 @@ static BOOL sub_020410F4 (UnkStruct_0203E724 * param0) } } - sub_0203E764(param0, sub_02041004); + ScriptContext_Pause(param0, sub_02041004); return 1; } -static BOOL sub_020411C4 (UnkStruct_0203E724 * param0) +static BOOL sub_020411C4 (ScriptContext * param0) { MapObjectManager * v0; - FieldSystem * v1 = param0->unk_34; + FieldSystem * v1 = param0->fieldSys; v0 = v1->unk_38; MapObjectMan_UnpauseAllMovement(v0); @@ -3335,33 +3335,33 @@ static BOOL sub_020411C4 (UnkStruct_0203E724 * param0) return 1; } -static BOOL sub_020411D4 (UnkStruct_0203E724 * param0) +static BOOL sub_020411D4 (ScriptContext * param0) { LocalMapObject * v0; - FieldSystem * v1 = param0->unk_34; + FieldSystem * v1 = param0->fieldSys; - v0 = sub_0206251C(v1->unk_38, sub_0203E838(param0)); + v0 = sub_0206251C(v1->unk_38, ScriptContext_ReadHalfWord(param0)); sub_02062DD0(v0); return 0; } -static BOOL sub_020411F0 (UnkStruct_0203E724 * param0) +static BOOL sub_020411F0 (ScriptContext * param0) { LocalMapObject * v0; - FieldSystem * v1 = param0->unk_34; + FieldSystem * v1 = param0->fieldSys; - v0 = sub_0206251C(v1->unk_38, sub_0203E838(param0)); + v0 = sub_0206251C(v1->unk_38, ScriptContext_ReadHalfWord(param0)); sub_02062DDC(v0); return 0; } -static BOOL sub_0204120C (UnkStruct_0203E724 * param0) +static BOOL sub_0204120C (ScriptContext * param0) { LocalMapObject * v0; - FieldSystem * v1 = param0->unk_34; - u16 v2 = inline_02049538(param0); + FieldSystem * v1 = param0->fieldSys; + u16 v2 = ScriptContext_GetVar(param0); v0 = sub_02061A74(v1->unk_38, v2, sub_0203A4B4(v1), v1->unk_1C->unk_00, sub_0203A4BC(v1)); @@ -3372,12 +3372,12 @@ static BOOL sub_0204120C (UnkStruct_0203E724 * param0) return 0; } -static BOOL sub_02041254 (UnkStruct_0203E724 * param0) +static BOOL sub_02041254 (ScriptContext * param0) { LocalMapObject * v0; - FieldSystem * v1 = param0->unk_34; + FieldSystem * v1 = param0->fieldSys; - v0 = sub_0206251C(v1->unk_38, inline_02049538(param0)); + v0 = sub_0206251C(v1->unk_38, ScriptContext_GetVar(param0)); if (v0 == NULL) { GF_ASSERT(FALSE); @@ -3388,13 +3388,13 @@ static BOOL sub_02041254 (UnkStruct_0203E724 * param0) return 0; } -static BOOL sub_02041288 (UnkStruct_0203E724 * param0) +static BOOL sub_02041288 (ScriptContext * param0) { - u16 v0 = inline_02049538(param0); - u16 v1 = inline_02049538(param0); - LocalMapObject ** v2 = sub_0203F098(param0->unk_34, 11); + u16 v0 = ScriptContext_GetVar(param0); + u16 v1 = ScriptContext_GetVar(param0); + LocalMapObject ** v2 = sub_0203F098(param0->fieldSys, 11); - *v2 = sub_020619DC(param0->unk_34->unk_38, v0, v1, 0, 0x2000, 0x0, param0->unk_34->unk_1C->unk_00); + *v2 = sub_020619DC(param0->fieldSys->unk_38, v0, v1, 0, 0x2000, 0x0, param0->fieldSys->unk_1C->unk_00); sub_020642F8(*v2); sub_02062D64(*v2, 1); @@ -3404,16 +3404,16 @@ static BOOL sub_02041288 (UnkStruct_0203E724 * param0) const VecFx32 * v3; v3 = sub_02063070(*v2); - ov5_021E931C(v3, param0->unk_34->unk_28); - sub_02020690(v3, param0->unk_34->unk_24); + ov5_021E931C(v3, param0->fieldSys->unk_28); + sub_02020690(v3, param0->fieldSys->unk_24); } return 0; } -static BOOL sub_02041320 (UnkStruct_0203E724 * param0) +static BOOL sub_02041320 (ScriptContext * param0) { - LocalMapObject ** v0 = sub_0203F098(param0->unk_34, 11); + LocalMapObject ** v0 = sub_0203F098(param0->fieldSys, 11); sub_02061AF4(*v0); @@ -3421,23 +3421,23 @@ static BOOL sub_02041320 (UnkStruct_0203E724 * param0) LocalMapObject * v1; const VecFx32 * v2; - v1 = sub_0206251C(param0->unk_34->unk_38, 0xff); + v1 = sub_0206251C(param0->fieldSys->unk_38, 0xff); v2 = sub_02063070(v1); - ov5_021E931C(v2, param0->unk_34->unk_28); - sub_02020690(v2, param0->unk_34->unk_24); + ov5_021E931C(v2, param0->fieldSys->unk_28); + sub_02020690(v2, param0->fieldSys->unk_24); } return 0; } -static BOOL sub_02041364 (UnkStruct_0203E724 * param0) +static BOOL sub_02041364 (ScriptContext * param0) { - u16 v0 = inline_02049538(param0); - u16 v1 = inline_02049538(param0); - LocalMapObject ** v2 = sub_0203F098(param0->unk_34, 11); + u16 v0 = ScriptContext_GetVar(param0); + u16 v1 = ScriptContext_GetVar(param0); + LocalMapObject ** v2 = sub_0203F098(param0->fieldSys, 11); - *v2 = sub_020619DC(param0->unk_34->unk_38, v0, v1, 0, 0x2000, 0x0, param0->unk_34->unk_1C->unk_00); + *v2 = sub_020619DC(param0->fieldSys->unk_38, v0, v1, 0, 0x2000, 0x0, param0->fieldSys->unk_1C->unk_00); sub_020642F8(*v2); sub_02062D64(*v2, 1); @@ -3446,25 +3446,25 @@ static BOOL sub_02041364 (UnkStruct_0203E724 * param0) return 0; } -static BOOL sub_020413D8 (UnkStruct_0203E724 * param0) +static BOOL sub_020413D8 (ScriptContext * param0) { - LocalMapObject ** v0 = sub_0203F098(param0->unk_34, 11); + LocalMapObject ** v0 = sub_0203F098(param0->fieldSys, 11); sub_02061AF4(*v0); return 0; } -static BOOL sub_020413F0 (UnkStruct_0203E724 * param0) +static BOOL sub_020413F0 (ScriptContext * param0) { int v0; LocalMapObject ** v1; - FieldSystem * v2 = param0->unk_34; + FieldSystem * v2 = param0->fieldSys; { FieldSystem * v3; PlayerAvatar * v4; - v3 = param0->unk_34; + v3 = param0->fieldSys; v4 = v3->playerAvatar; v0 = Player_Dir(v4); } @@ -3481,95 +3481,95 @@ static BOOL sub_020413F0 (UnkStruct_0203E724 * param0) return 0; } -static BOOL sub_02041420 (UnkStruct_0203E724 * param0) +static BOOL sub_02041420 (ScriptContext * param0) { u16 * v0, * v1; - FieldSystem * v2 = param0->unk_34; + FieldSystem * v2 = param0->fieldSys; - v0 = inline_0204FCAC(param0); - v1 = inline_0204FCAC(param0); + v0 = ScriptContext_GetVarPointer(param0); + v1 = ScriptContext_GetVarPointer(param0); *v0 = Player_XPos(v2->playerAvatar); *v1 = Player_ZPos(v2->playerAvatar); return 0; } -static BOOL sub_02041464 (UnkStruct_0203E724 * param0) +static BOOL sub_02041464 (ScriptContext * param0) { LocalMapObject * v0; u16 * v1, * v2; - FieldSystem * v3 = param0->unk_34; + FieldSystem * v3 = param0->fieldSys; - v0 = sub_0206251C(v3->unk_38, inline_02049538(param0)); - v1 = inline_0204FCAC(param0); - v2 = inline_0204FCAC(param0); + v0 = sub_0206251C(v3->unk_38, ScriptContext_GetVar(param0)); + v1 = ScriptContext_GetVarPointer(param0); + v2 = ScriptContext_GetVarPointer(param0); *v1 = sub_02063020(v0); *v2 = sub_02063040(v0); return 0; } -static BOOL sub_020414C4 (UnkStruct_0203E724 * param0) +static BOOL sub_020414C4 (ScriptContext * param0) { u16 * v0; - v0 = inline_0204FCAC(param0); - *v0 = Player_Dir(param0->unk_34->playerAvatar); + v0 = ScriptContext_GetVarPointer(param0); + *v0 = Player_Dir(param0->fieldSys->playerAvatar); return 0; } -static BOOL sub_020414EC (UnkStruct_0203E724 * param0) +static BOOL sub_020414EC (ScriptContext * param0) { u16 v0, v1, v2; VecFx32 v3; - FieldSystem * v4 = param0->unk_34; + FieldSystem * v4 = param0->fieldSys; - v0 = inline_02049538(param0); - v1 = inline_02049538(param0); - v2 = inline_02049538(param0); + v0 = ScriptContext_GetVar(param0); + v1 = ScriptContext_GetVar(param0); + v2 = ScriptContext_GetVar(param0); v3.x = FX32_CONST(v0); v3.y = FX32_CONST(v1); v3.z = FX32_CONST(v2); - sub_020630AC(Player_LocalMapObject(param0->unk_34->playerAvatar), &v3); - sub_02020990(&v3, param0->unk_34->unk_24); + sub_020630AC(Player_LocalMapObject(param0->fieldSys->playerAvatar), &v3); + sub_02020990(&v3, param0->fieldSys->unk_24); return 0; } -static BOOL sub_020415D0 (UnkStruct_0203E724 * param0) +static BOOL sub_020415D0 (ScriptContext * param0) { LocalMapObject * v0; u8 v1; - v0 = sub_0206251C(param0->unk_34->unk_38, inline_02049538(param0)); - v1 = (*((param0)->unk_08++)); + v0 = sub_0206251C(param0->fieldSys->unk_38, ScriptContext_GetVar(param0)); + v1 = ScriptContext_ReadByte(param0); sub_02062E5C(v0, v1); return 0; } -static BOOL sub_02041604 (UnkStruct_0203E724 * param0) +static BOOL sub_02041604 (ScriptContext * param0) { LocalMapObject * v0; u16 v1; - v0 = sub_0206251C(param0->unk_34->unk_38, inline_02049538(param0)); - v1 = sub_0203E838(param0); + v0 = sub_0206251C(param0->fieldSys->unk_38, ScriptContext_GetVar(param0)); + v1 = ScriptContext_ReadHalfWord(param0); sub_020633A8(v0, v1); return 0; } -static BOOL sub_0204163C (UnkStruct_0203E724 * param0) +static BOOL sub_0204163C (ScriptContext * param0) { LocalMapObject * v0; - u16 * v1 = inline_0204FCAC(param0); + u16 * v1 = ScriptContext_GetVarPointer(param0); *v1 = 0; - v0 = sub_0206251C(param0->unk_34->unk_38, inline_02049538(param0)); + v0 = sub_0206251C(param0->fieldSys->unk_38, ScriptContext_GetVar(param0)); if (v0 != NULL) { *v1 = sub_02062948(v0); @@ -3578,99 +3578,99 @@ static BOOL sub_0204163C (UnkStruct_0203E724 * param0) return 0; } -static BOOL sub_02041684 (UnkStruct_0203E724 * param0) +static BOOL sub_02041684 (ScriptContext * param0) { LocalMapObject * v0; - v0 = sub_02062570(param0->unk_34->unk_38, 0x30); + v0 = sub_02062570(param0->fieldSys->unk_38, 0x30); sub_020633C8(v0, 0xfe); return 0; } -static BOOL sub_0204169C (UnkStruct_0203E724 * param0) +static BOOL sub_0204169C (ScriptContext * param0) { UnkStruct_0202CA1C * v0; - u16 * v1 = inline_0204FCAC(param0); + u16 * v1 = ScriptContext_GetVarPointer(param0); - v0 = sub_0202CA1C(param0->unk_34->saveData); + v0 = sub_0202CA1C(param0->fieldSys->saveData); *v1 = sub_0202CBA8(v0); return 0; } -static BOOL sub_020416C8 (UnkStruct_0203E724 * param0) +static BOOL sub_020416C8 (ScriptContext * param0) { UnkStruct_0202CA1C * v0; - u16 v1 = inline_02049538(param0); - u16 * v2 = inline_0204FCAC(param0); + u16 v1 = ScriptContext_GetVar(param0); + u16 * v2 = ScriptContext_GetVarPointer(param0); - v0 = sub_0202CA1C(param0->unk_34->saveData); + v0 = sub_0202CA1C(param0->fieldSys->saveData); *v2 = sub_0202CBC8(v0, v1); return 0; } -static BOOL sub_02041708 (UnkStruct_0203E724 * param0) +static BOOL sub_02041708 (ScriptContext * param0) { - u16 v0 = inline_02049538(param0); - u16 v1 = inline_02049538(param0); + u16 v0 = ScriptContext_GetVar(param0); + u16 v1 = ScriptContext_GetVar(param0); - sub_0202CAE0(sub_0202CA1C(param0->unk_34->saveData), v0, v1); + sub_0202CAE0(sub_0202CA1C(param0->fieldSys->saveData), v0, v1); return 0; } -static BOOL sub_0204174C (UnkStruct_0203E724 * param0) +static BOOL sub_0204174C (ScriptContext * param0) { Pokemon * v0; - u16 v1 = inline_02049538(param0); - u16 * v2 = inline_0204FCAC(param0); + u16 v1 = ScriptContext_GetVar(param0); + u16 * v2 = ScriptContext_GetVarPointer(param0); - v0 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(param0->unk_34->saveData), v1); + v0 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(param0->fieldSys->saveData), v1); *v2 = Pokemon_GetForm(v0); return 0; } -static BOOL sub_02041790 (UnkStruct_0203E724 * param0) +static BOOL sub_02041790 (ScriptContext * param0) { void ** v0; - v0 = sub_0203F098(param0->unk_34, 19); - *v0 = sub_0203D3C0(32, param0->unk_34); + v0 = sub_0203F098(param0->fieldSys, 19); + *v0 = sub_0203D3C0(32, param0->fieldSys); - sub_0203E764(param0, sub_02041D60); + ScriptContext_Pause(param0, sub_02041D60); return 1; } -static BOOL sub_020417C0 (UnkStruct_0203E724 * param0) +static BOOL sub_020417C0 (ScriptContext * param0) { void ** v0; - v0 = sub_0203F098(param0->unk_34, 19); - *v0 = sub_0203D3E4(32, param0->unk_34); + v0 = sub_0203F098(param0->fieldSys, 19); + *v0 = sub_0203D3E4(32, param0->fieldSys); - sub_0203E764(param0, sub_02041D60); + ScriptContext_Pause(param0, sub_02041D60); return 1; } -static BOOL sub_020417F0 (UnkStruct_0203E724 * param0) +static BOOL sub_020417F0 (ScriptContext * param0) { void ** v0; - v0 = sub_0203F098(param0->unk_34, 19); - *v0 = sub_0203D50C(param0->unk_34->unk_10, 32); + v0 = sub_0203F098(param0->fieldSys, 19); + *v0 = sub_0203D50C(param0->fieldSys->unk_10, 32); return 1; } -static BOOL sub_02041814 (UnkStruct_0203E724 * param0) +static BOOL sub_02041814 (ScriptContext * param0) { void ** v0; u16 * v1; - v1 = inline_0204FCAC(param0); - v0 = sub_0203F098(param0->unk_34, 19); + v1 = ScriptContext_GetVarPointer(param0); + v0 = sub_0203F098(param0->fieldSys, 19); GF_ASSERT(*v0 != 0); @@ -3686,7 +3686,7 @@ static BOOL sub_02041814 (UnkStruct_0203E724 * param0) return 0; } -static BOOL sub_02041860 (UnkStruct_0203E724 * param0) +static BOOL sub_02041860 (ScriptContext * param0) { u16 v0; int v1; @@ -3695,9 +3695,9 @@ static BOOL sub_02041860 (UnkStruct_0203E724 * param0) u16 * v4; PartyManagementData * v5; - v3 = inline_0204FCAC(param0); - v4 = inline_0204FCAC(param0); - v2 = sub_0203F098(param0->unk_34, 19); + v3 = ScriptContext_GetVarPointer(param0); + v4 = ScriptContext_GetVarPointer(param0); + v2 = sub_0203F098(param0->fieldSys, 19); v5 = *v2; GF_ASSERT(*v2 != 0); @@ -3724,7 +3724,7 @@ static BOOL sub_02041860 (UnkStruct_0203E724 * param0) return 0; } -static BOOL sub_020418E0 (UnkStruct_0203E724 * param0) +static BOOL sub_020418E0 (ScriptContext * param0) { u16 v0; int v1; @@ -3734,10 +3734,10 @@ static BOOL sub_020418E0 (UnkStruct_0203E724 * param0) u16 * v5; PartyManagementData * v6; - v3 = inline_0204FCAC(param0); - v4 = inline_0204FCAC(param0); - v5 = inline_0204FCAC(param0); - v2 = sub_0203F098(param0->unk_34, 19); + v3 = ScriptContext_GetVarPointer(param0); + v4 = ScriptContext_GetVarPointer(param0); + v5 = ScriptContext_GetVarPointer(param0); + v2 = sub_0203F098(param0->fieldSys, 19); v6 = *v2; GF_ASSERT(*v2 != 0); @@ -3766,7 +3766,7 @@ static BOOL sub_020418E0 (UnkStruct_0203E724 * param0) return 0; } -static BOOL sub_02041984 (UnkStruct_0203E724 * param0) +static BOOL sub_02041984 (ScriptContext * param0) { u16 v0; int v1; @@ -3776,10 +3776,10 @@ static BOOL sub_02041984 (UnkStruct_0203E724 * param0) u16 * v5; PartyManagementData * v6; - v3 = inline_0204FCAC(param0); - v4 = inline_0204FCAC(param0); - v5 = inline_0204FCAC(param0); - v2 = sub_0203F098(param0->unk_34, 19); + v3 = ScriptContext_GetVarPointer(param0); + v4 = ScriptContext_GetVarPointer(param0); + v5 = ScriptContext_GetVarPointer(param0); + v2 = sub_0203F098(param0->fieldSys, 19); v6 = *v2; GF_ASSERT(*v2 != 0); @@ -3808,28 +3808,28 @@ static BOOL sub_02041984 (UnkStruct_0203E724 * param0) return 0; } -static BOOL sub_02041A28 (UnkStruct_0203E724 * param0) +static BOOL sub_02041A28 (ScriptContext * param0) { - void ** v0 = sub_0203F098(param0->unk_34, 19); - u16 v1 = inline_02049538(param0); - u16 v2 = inline_02049538(param0); - u16 v3 = inline_02049538(param0); - u16 v4 = inline_02049538(param0); + void ** v0 = sub_0203F098(param0->fieldSys, 19); + u16 v1 = ScriptContext_GetVar(param0); + u16 v2 = ScriptContext_GetVar(param0); + u16 v3 = ScriptContext_GetVar(param0); + u16 v4 = ScriptContext_GetVar(param0); - *v0 = sub_0203D578(32, param0->unk_34, v3, v2, v4, v1); - sub_0203E764(param0, sub_02041D60); + *v0 = sub_0203D578(32, param0->fieldSys, v3, v2, v4, v1); + ScriptContext_Pause(param0, sub_02041D60); return 1; } -static BOOL sub_02041AB0 (UnkStruct_0203E724 * param0) +static BOOL sub_02041AB0 (ScriptContext * param0) { void ** v0; u16 * v1, * v2; - v1 = inline_0204FCAC(param0); - v2 = inline_0204FCAC(param0); - v0 = sub_0203F098(param0->unk_34, 19); + v1 = ScriptContext_GetVarPointer(param0); + v2 = ScriptContext_GetVarPointer(param0); + v0 = sub_0203F098(param0->fieldSys, 19); GF_ASSERT(*v0 != 0); @@ -3853,24 +3853,24 @@ static BOOL sub_02041AB0 (UnkStruct_0203E724 * param0) return 0; } -static BOOL sub_02041B24 (UnkStruct_0203E724 * param0) +static BOOL sub_02041B24 (ScriptContext * param0) { - void ** v0 = sub_0203F098(param0->unk_34, 19); - u16 v1 = inline_02049538(param0); + void ** v0 = sub_0203F098(param0->fieldSys, 19); + u16 v1 = ScriptContext_GetVar(param0); - *v0 = sub_0203D5C8(32, param0->unk_34, v1); - sub_0203E764(param0, sub_02041D60); + *v0 = sub_0203D5C8(32, param0->fieldSys, v1); + ScriptContext_Pause(param0, sub_02041D60); return 1; } -static BOOL sub_02041B68 (UnkStruct_0203E724 * param0) +static BOOL sub_02041B68 (ScriptContext * param0) { void ** v0; u16 * v1; - v1 = inline_0204FCAC(param0); - v0 = sub_0203F098(param0->unk_34, 19); + v1 = ScriptContext_GetVarPointer(param0); + v0 = sub_0203F098(param0->fieldSys, 19); GF_ASSERT(*v0 != 0); @@ -3882,26 +3882,26 @@ static BOOL sub_02041B68 (UnkStruct_0203E724 * param0) return 0; } -static BOOL sub_02041BA8 (UnkStruct_0203E724 * param0) +static BOOL sub_02041BA8 (ScriptContext * param0) { - void ** v0 = sub_0203F098(param0->unk_34, 19); - u16 v1 = inline_02049538(param0); - u16 v2 = inline_02049538(param0); + void ** v0 = sub_0203F098(param0->fieldSys, 19); + u16 v1 = ScriptContext_GetVar(param0); + u16 v2 = ScriptContext_GetVar(param0); - *v0 = sub_0203E63C(32, param0->unk_34, v1, v2); - sub_0203E764(param0, sub_02041D60); + *v0 = sub_0203E63C(32, param0->fieldSys, v1, v2); + ScriptContext_Pause(param0, sub_02041D60); return 1; } -static BOOL sub_02041C00 (UnkStruct_0203E724 * param0) +static BOOL sub_02041C00 (ScriptContext * param0) { void ** v0; u16 * v1; PokemonSummary * v2; - v1 = inline_0204FCAC(param0); - v0 = sub_0203F098(param0->unk_34, 19); + v1 = ScriptContext_GetVarPointer(param0); + v0 = sub_0203F098(param0->fieldSys, 19); GF_ASSERT(*v0 != 0); @@ -3914,51 +3914,51 @@ static BOOL sub_02041C00 (UnkStruct_0203E724 * param0) return 1; } -static BOOL sub_02041C40 (UnkStruct_0203E724 * param0) +static BOOL sub_02041C40 (ScriptContext * param0) { u8 v0, v1; - LocalMapObject ** v2 = sub_0203F098(param0->unk_34, 10); - u16 v3 = inline_02049538(param0); - u16 * v4 = inline_0204FCAC(param0); + LocalMapObject ** v2 = sub_0203F098(param0->fieldSys, 10); + u16 v3 = ScriptContext_GetVar(param0); + u16 * v4 = ScriptContext_GetVarPointer(param0); - *v4 = ov5_021DBD98(param0->unk_34, *v2, v3); + *v4 = ov5_021DBD98(param0->fieldSys, *v2, v3); return 0; } -static BOOL sub_02041C8C (UnkStruct_0203E724 * param0) +static BOOL sub_02041C8C (ScriptContext * param0) { - u16 * v0 = inline_0204FCAC(param0); + u16 * v0 = ScriptContext_GetVarPointer(param0); - *v0 = sub_0203A74C(sub_0203A790(param0->unk_34->saveData)); + *v0 = sub_0203A74C(sub_0203A790(param0->fieldSys->saveData)); return 0; } -static BOOL sub_02041CB8 (UnkStruct_0203E724 * param0) +static BOOL sub_02041CB8 (ScriptContext * param0) { return 0; } -static BOOL sub_02041CBC (UnkStruct_0203E724 * param0) +static BOOL sub_02041CBC (ScriptContext * param0) { return 0; } -static BOOL sub_02041CC0 (UnkStruct_0203E724 * param0) +static BOOL sub_02041CC0 (ScriptContext * param0) { return 1; } -static BOOL sub_02041CC4 (UnkStruct_0203E724 * param0) +static BOOL sub_02041CC4 (ScriptContext * param0) { return 0; } -BOOL sub_02041CC8 (UnkStruct_0203E724 * param0) +BOOL sub_02041CC8 (ScriptContext * param0) { void ** v0; - FieldSystem * v1 = param0->unk_34; + FieldSystem * v1 = param0->fieldSys; - v0 = sub_0203F098(param0->unk_34, 19); + v0 = sub_0203F098(param0->fieldSys, 19); if (sub_020509B4(v1)) { return 0; @@ -3970,13 +3970,13 @@ BOOL sub_02041CC8 (UnkStruct_0203E724 * param0) return 1; } -static BOOL sub_02041CF4 (UnkStruct_0203E724 * param0) +static BOOL sub_02041CF4 (ScriptContext * param0) { void ** v0; FieldSystem * v1; UnkStruct_02042434 * v2; - v1 = param0->unk_34; + v1 = param0->fieldSys; v0 = sub_0203F098(v1, 19); v2 = *v0; @@ -3997,12 +3997,12 @@ static BOOL sub_02041CF4 (UnkStruct_0203E724 * param0) return 1; } -static BOOL sub_02041D3C (UnkStruct_0203E724 * param0) +static BOOL sub_02041D3C (ScriptContext * param0) { void ** v0; - FieldSystem * v1 = param0->unk_34; + FieldSystem * v1 = param0->fieldSys; - v0 = sub_0203F098(param0->unk_34, 19); + v0 = sub_0203F098(param0->fieldSys, 19); if (sub_0209C238(*v0) == 0) { return 0; @@ -4013,9 +4013,9 @@ static BOOL sub_02041D3C (UnkStruct_0203E724 * param0) return 1; } -BOOL sub_02041D60 (UnkStruct_0203E724 * param0) +BOOL sub_02041D60 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; if (sub_020509B4(v0)) { return 0; @@ -4024,15 +4024,15 @@ BOOL sub_02041D60 (UnkStruct_0203E724 * param0) return 1; } -static BOOL sub_02041D78 (UnkStruct_0203E724 * param0) +static BOOL sub_02041D78 (ScriptContext * param0) { - sub_02055868(param0->unk_34->unk_10); + sub_02055868(param0->fieldSys->unk_10); return 1; } -static BOOL sub_02041D88 (UnkStruct_0203E724 * param0) +static BOOL sub_02041D88 (ScriptContext * param0) { - sub_02055820(param0->unk_34->unk_10); + sub_02055820(param0->fieldSys->unk_10); return 1; } @@ -4074,23 +4074,23 @@ static UnkStruct_02041DC8 * sub_02041DC8 (int param0, FieldSystem * param1, int return v0; } -static BOOL sub_02041E18 (UnkStruct_0203E724 * param0) +static BOOL sub_02041E18 (ScriptContext * param0) { - ov5_021EAF50(param0->unk_34); + ov5_021EAF50(param0->fieldSys); return 1; } -static BOOL sub_02041E28 (UnkStruct_0203E724 * param0) +static BOOL sub_02041E28 (ScriptContext * param0) { - sub_0207DDC0(param0->unk_28); + sub_0207DDC0(param0->taskManager); return 1; } -static BOOL sub_02041E34 (UnkStruct_0203E724 * param0) +static BOOL sub_02041E34 (ScriptContext * param0) { UnkStruct_ov98_02247168 * v0; - void ** v1 = sub_0203F098(param0->unk_34, 19); - u16 * v2 = inline_0204FCAC(param0); + void ** v1 = sub_0203F098(param0->fieldSys, 19); + u16 * v2 = ScriptContext_GetVarPointer(param0); v0 = (*v1); *v2 = v0->unk_04; @@ -4099,46 +4099,46 @@ static BOOL sub_02041E34 (UnkStruct_0203E724 * param0) return 0; } -static BOOL sub_02041E64 (UnkStruct_0203E724 * param0) +static BOOL sub_02041E64 (ScriptContext * param0) { - u16 * v0 = inline_0204FCAC(param0); + u16 * v0 = ScriptContext_GetVarPointer(param0); *v0 = CommSys_CurNetId(); return 1; } -static BOOL sub_02041E84 (UnkStruct_0203E724 * param0) +static BOOL sub_02041E84 (ScriptContext * param0) { - void ** v0 = sub_0203F098(param0->unk_34, 20); - u16 v1 = inline_02049538(param0); - u16 v2 = inline_02049538(param0); + void ** v0 = sub_0203F098(param0->fieldSys, 20); + u16 v1 = ScriptContext_GetVar(param0); + u16 v2 = ScriptContext_GetVar(param0); - sub_0200DAA4(param0->unk_34->unk_08, 3, 1024 - (18 + 12) - 9, 11, 0, 4); - *v0 = sub_0200EBF0(param0->unk_34->unk_08, 3, 10, 5, 11, 1024 - (18 + 12) - 9, v1, v2, 4); - sub_020451B4(param0->unk_34, v1); + sub_0200DAA4(param0->fieldSys->unk_08, 3, 1024 - (18 + 12) - 9, 11, 0, 4); + *v0 = sub_0200EBF0(param0->fieldSys->unk_08, 3, 10, 5, 11, 1024 - (18 + 12) - 9, v1, v2, 4); + sub_020451B4(param0->fieldSys, v1); return 0; } -static BOOL sub_02041F14 (UnkStruct_0203E724 * param0) +static BOOL sub_02041F14 (ScriptContext * param0) { Pokemon * v0; - void ** v1 = sub_0203F098(param0->unk_34, 20); - u16 v2 = inline_02049538(param0); + void ** v1 = sub_0203F098(param0->fieldSys, 20); + u16 v2 = ScriptContext_GetVar(param0); - v0 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(param0->unk_34->saveData), v2); - sub_0200DAA4(param0->unk_34->unk_08, 3, 1024 - (18 + 12) - 9, 11, 0, 4); + v0 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(param0->fieldSys->saveData), v2); + sub_0200DAA4(param0->fieldSys->unk_08, 3, 1024 - (18 + 12) - 9, 11, 0, 4); - *v1 = sub_0200EC48(param0->unk_34->unk_08, 3, 10, 5, 11, 1024 - (18 + 12) - 9, v0, 4); - sub_020451B4(param0->unk_34, Pokemon_GetValue(v0, MON_DATA_SPECIES, NULL)); + *v1 = sub_0200EC48(param0->fieldSys->unk_08, 3, 10, 5, 11, 1024 - (18 + 12) - 9, v0, 4); + sub_020451B4(param0->fieldSys, Pokemon_GetValue(v0, MON_DATA_SPECIES, NULL)); return 0; } -static BOOL sub_02041FAC (UnkStruct_0203E724 * param0) +static BOOL sub_02041FAC (ScriptContext * param0) { u8 * v0; - void ** v1 = sub_0203F098(param0->unk_34, 20); + void ** v1 = sub_0203F098(param0->fieldSys, 20); v0 = *v1; *v0 = 1; @@ -4146,10 +4146,10 @@ static BOOL sub_02041FAC (UnkStruct_0203E724 * param0) return 1; } -static BOOL sub_02041FC4 (UnkStruct_0203E724 * param0) +static BOOL sub_02041FC4 (ScriptContext * param0) { u8 * v0; - void ** v1 = sub_0203F098(param0->unk_34, 20); + void ** v1 = sub_0203F098(param0->fieldSys, 20); v0 = *v1; *v0 = 2; @@ -4157,22 +4157,22 @@ static BOOL sub_02041FC4 (UnkStruct_0203E724 * param0) return 1; } -static BOOL sub_02041FDC (UnkStruct_0203E724 * param0) +static BOOL sub_02041FDC (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; - u16 v1 = sub_0203E838(param0); + FieldSystem * v0 = param0->fieldSys; + u16 v1 = ScriptContext_ReadHalfWord(param0); - param0->unk_18[0] = v1; - sub_0203E764(param0, sub_02041FF8); + param0->data[0] = v1; + ScriptContext_Pause(param0, sub_02041FF8); return 1; } -static BOOL sub_02041FF8 (UnkStruct_0203E724 * param0) +static BOOL sub_02041FF8 (ScriptContext * param0) { u8 * v0; - void ** v1 = sub_0203F098(param0->unk_34, 20); - u16 * v2 = sub_0203F118(param0->unk_34, param0->unk_18[0]); + void ** v1 = sub_0203F098(param0->fieldSys, 20); + u16 * v2 = sub_0203F118(param0->fieldSys, param0->data[0]); v0 = *v1; @@ -4183,59 +4183,59 @@ static BOOL sub_02041FF8 (UnkStruct_0203E724 * param0) return 1; } -static BOOL sub_02042028 (UnkStruct_0203E724 * param0) +static BOOL sub_02042028 (ScriptContext * param0) { - u16 v0 = sub_0203E838(param0); - StringTemplate ** v1 = sub_0203F098(param0->unk_34, 15); + u16 v0 = ScriptContext_ReadHalfWord(param0); + StringTemplate ** v1 = sub_0203F098(param0->fieldSys, 15); - ov5_021DB888(param0->unk_28, *v1, sub_0203F118(param0->unk_34, v0)); + ov5_021DB888(param0->taskManager, *v1, sub_0203F118(param0->fieldSys, v0)); return 1; } -static BOOL sub_0204205C (UnkStruct_0203E724 * param0) +static BOOL sub_0204205C (ScriptContext * param0) { - LocalMapObject ** v0 = sub_0203F098(param0->unk_34, 10); + LocalMapObject ** v0 = sub_0203F098(param0->fieldSys, 10); if (*v0 != NULL) { - if ((sub_02071CB4(param0->unk_34, 2) == 0) || (ov8_0224C5DC(param0->unk_34, *v0) == 0)) { - ov5_021DBED4(param0->unk_34, *v0); + if ((sub_02071CB4(param0->fieldSys, 2) == 0) || (ov8_0224C5DC(param0->fieldSys, *v0) == 0)) { + ov5_021DBED4(param0->fieldSys, *v0); } } return 0; } -static BOOL sub_020420A0 (UnkStruct_0203E724 * param0) +static BOOL sub_020420A0 (ScriptContext * param0) { - sub_0209ACF4(param0->unk_28); + sub_0209ACF4(param0->taskManager); return 1; } -static BOOL sub_020420AC (UnkStruct_0203E724 * param0) +static BOOL sub_020420AC (ScriptContext * param0) { - u16 * v0 = inline_0204FCAC(param0); + u16 * v0 = ScriptContext_GetVarPointer(param0); - sub_0209B344(param0->unk_28, v0); + sub_0209B344(param0->taskManager, v0); return 1; } -static BOOL sub_020420CC (UnkStruct_0203E724 * param0) +static BOOL sub_020420CC (ScriptContext * param0) { - u16 v0 = inline_02049538(param0); - u16 * v1 = inline_0204FCAC(param0); - u16 v2 = inline_02049538(param0); + u16 v0 = ScriptContext_GetVar(param0); + u16 * v1 = ScriptContext_GetVarPointer(param0); + u16 v2 = ScriptContext_GetVar(param0); - sub_0203DAC0(param0->unk_34->unk_10, v1, param0->unk_34->saveData, v0, v2); + sub_0203DAC0(param0->fieldSys->unk_10, v1, param0->fieldSys->saveData, v0, v2); return 1; } -static BOOL sub_02042124 (UnkStruct_0203E724 * param0) +static BOOL sub_02042124 (ScriptContext * param0) { - void ** v0 = sub_0203F098(param0->unk_34, 19); - int v1 = sub_0203E838(param0); - u16 * v2 = inline_0204FCAC(param0); + void ** v0 = sub_0203F098(param0->fieldSys, 19); + int v1 = ScriptContext_ReadHalfWord(param0); + u16 * v2 = ScriptContext_GetVarPointer(param0); - *v0 = sub_02041DC8(11, param0->unk_34, 0, v1); + *v0 = sub_02041DC8(11, param0->fieldSys, 0, v1); if (*v0 == NULL) { *v2 = 1; @@ -4245,19 +4245,19 @@ static BOOL sub_02042124 (UnkStruct_0203E724 * param0) *v2 = 0; - sub_0203DB24(param0->unk_34, *v0); - sub_0203E764(param0, sub_02041CC8); + sub_0203DB24(param0->fieldSys, *v0); + ScriptContext_Pause(param0, sub_02041CC8); return 1; } -static BOOL sub_0204218C (UnkStruct_0203E724 * param0) +static BOOL sub_0204218C (ScriptContext * param0) { - void ** v0 = sub_0203F098(param0->unk_34, 19); - int v1 = sub_0203E838(param0); - u16 * v2 = inline_0204FCAC(param0); + void ** v0 = sub_0203F098(param0->fieldSys, 19); + int v1 = ScriptContext_ReadHalfWord(param0); + u16 * v2 = ScriptContext_GetVarPointer(param0); - *v0 = sub_02041DC8(11, param0->unk_34, 1, v1); + *v0 = sub_02041DC8(11, param0->fieldSys, 1, v1); if (*v0 == NULL) { *v2 = 1; @@ -4267,19 +4267,19 @@ static BOOL sub_0204218C (UnkStruct_0203E724 * param0) *v2 = 0; - sub_0203DB24(param0->unk_34, *v0); - sub_0203E764(param0, sub_02041CC8); + sub_0203DB24(param0->fieldSys, *v0); + ScriptContext_Pause(param0, sub_02041CC8); return 1; } -static BOOL sub_020421F4 (UnkStruct_0203E724 * param0) +static BOOL sub_020421F4 (ScriptContext * param0) { BOOL v0; - int v1 = sub_0203E838(param0); - u16 * v2 = inline_0204FCAC(param0); + int v1 = ScriptContext_ReadHalfWord(param0); + u16 * v2 = ScriptContext_GetVarPointer(param0); - v0 = sub_02041D98(param0->unk_34, 0, v1); + v0 = sub_02041D98(param0->fieldSys, 0, v1); if (v0 == 1) { *v2 = 1; @@ -4290,13 +4290,13 @@ static BOOL sub_020421F4 (UnkStruct_0203E724 * param0) return 1; } -static BOOL sub_02042230 (UnkStruct_0203E724 * param0) +static BOOL sub_02042230 (ScriptContext * param0) { BOOL v0; - int v1 = sub_0203E838(param0); - u16 * v2 = inline_0204FCAC(param0); + int v1 = ScriptContext_ReadHalfWord(param0); + u16 * v2 = ScriptContext_GetVarPointer(param0); - v0 = sub_02041D98(param0->unk_34, 1, v1); + v0 = sub_02041D98(param0->fieldSys, 1, v1); if (v0 == 1) { *v2 = 1; @@ -4307,10 +4307,10 @@ static BOOL sub_02042230 (UnkStruct_0203E724 * param0) return 1; } -static BOOL sub_0204226C (UnkStruct_0203E724 * param0) +static BOOL sub_0204226C (ScriptContext * param0) { - u16 v0 = inline_02049538(param0); - UnkStruct_0202A750 * v1 = sub_0202A750(param0->unk_34->saveData); + u16 v0 = ScriptContext_GetVar(param0); + UnkStruct_0202A750 * v1 = sub_0202A750(param0->fieldSys->saveData); UnkStruct_02029C68 * v2 = sub_02029CA8(v1, 0); sub_0202A0A0(v2, v0); @@ -4318,65 +4318,65 @@ static BOOL sub_0204226C (UnkStruct_0203E724 * param0) return 1; } -static BOOL sub_0204229C (UnkStruct_0203E724 * param0) +static BOOL sub_0204229C (ScriptContext * param0) { - sub_0203E224(param0->unk_34); - sub_0203E764(param0, sub_02041D60); + sub_0203E224(param0->fieldSys); + ScriptContext_Pause(param0, sub_02041D60); return 1; } -static BOOL sub_020422B8 (UnkStruct_0203E724 * param0) +static BOOL sub_020422B8 (ScriptContext * param0) { - sub_0203E704(param0->unk_34); - sub_0203E764(param0, sub_02041D60); + sub_0203E704(param0->fieldSys); + ScriptContext_Pause(param0, sub_02041D60); return 1; } -static BOOL sub_020422D4 (UnkStruct_0203E724 * param0) +static BOOL sub_020422D4 (ScriptContext * param0) { - sub_020980DC(param0->unk_28, param0->unk_34->saveData); + sub_020980DC(param0->taskManager, param0->fieldSys->saveData); return 1; } -static BOOL sub_020422E8 (UnkStruct_0203E724 * param0) +static BOOL sub_020422E8 (ScriptContext * param0) { UnkStruct_0203D8AC * v0; - void ** v1 = sub_0203F098(param0->unk_34, 19); + void ** v1 = sub_0203F098(param0->fieldSys, 19); *v1 = Heap_AllocFromHeap(11, sizeof(UnkStruct_0203D8AC)); - sub_0206B70C(param0->unk_34, *v1, 2); - sub_0203D884(param0->unk_34, *v1); - sub_0203E764(param0, sub_02041CC8); + sub_0206B70C(param0->fieldSys, *v1, 2); + sub_0203D884(param0->fieldSys, *v1); + ScriptContext_Pause(param0, sub_02041CC8); return 1; } -static BOOL sub_02042330 (UnkStruct_0203E724 * param0) +static BOOL sub_02042330 (ScriptContext * param0) { u8 v0; UnkStruct_0203D8AC * v1; - void ** v2 = sub_0203F098(param0->unk_34, 19); + void ** v2 = sub_0203F098(param0->fieldSys, 19); - v0 = sub_0203E838(param0); - *v2 = sub_02099674(param0->unk_34, v0, 11); + v0 = ScriptContext_ReadHalfWord(param0); + *v2 = sub_02099674(param0->fieldSys, v0, 11); - sub_0203E764(param0, sub_02041CC8); + ScriptContext_Pause(param0, sub_02041CC8); return 1; } -static BOOL sub_02042368 (UnkStruct_0203E724 * param0) +static BOOL sub_02042368 (ScriptContext * param0) { - u16 * v0 = sub_0203F118(param0->unk_34, sub_0203E838(param0)); + u16 * v0 = sub_0203F118(param0->fieldSys, ScriptContext_ReadHalfWord(param0)); - if (!sub_0207D69C(sub_0207D990(param0->unk_34->saveData), 4)) { + if (!sub_0207D69C(sub_0207D990(param0->fieldSys->saveData), 4)) { *v0 = 1; return 0; } - if (sub_0202AC98(Poffin_GetSavedataBlock(param0->unk_34->saveData)) >= 100) { + if (sub_0202AC98(Poffin_GetSavedataBlock(param0->fieldSys->saveData)) >= 100) { *v0 = 2; return 0; } @@ -4385,12 +4385,12 @@ static BOOL sub_02042368 (UnkStruct_0203E724 * param0) return 0; } -static BOOL sub_020423BC (UnkStruct_0203E724 * param0) +static BOOL sub_020423BC (ScriptContext * param0) { UnkStruct_ov90_021D0D80 * v0; - u16 v1 = inline_02049538(param0); - u16 v2 = inline_02049538(param0); - void ** v3 = sub_0203F098(param0->unk_34, 19); + u16 v1 = ScriptContext_GetVar(param0); + u16 v2 = ScriptContext_GetVar(param0); + void ** v3 = sub_0203F098(param0->fieldSys, 19); *v3 = Heap_AllocFromHeap(11, sizeof(UnkStruct_ov90_021D0D80)); @@ -4399,85 +4399,85 @@ static BOOL sub_020423BC (UnkStruct_0203E724 * param0) v0->unk_04 = v1; v0->unk_06 = v2; - v0->unk_00 = param0->unk_34->saveData; + v0->unk_00 = param0->fieldSys->saveData; - sub_0203D9D8(param0->unk_34, *v3); - sub_0203E764(param0, sub_02041CC8); + sub_0203D9D8(param0->fieldSys, *v3); + ScriptContext_Pause(param0, sub_02041CC8); return 1; } -static BOOL sub_02042434 (UnkStruct_0203E724 * param0) +static BOOL sub_02042434 (ScriptContext * param0) { - void ** v0 = sub_0203F098(param0->unk_34, 19); + void ** v0 = sub_0203F098(param0->fieldSys, 19); UnkStruct_02042434 * v1 = Heap_AllocFromHeap(11, sizeof(UnkStruct_02042434)); - v1->unk_00 = param0->unk_34->saveData; - v1->unk_04 = (*((param0)->unk_08++)); + v1->unk_00 = param0->fieldSys->saveData; + v1->unk_04 = ScriptContext_ReadByte(param0); *v0 = v1; - sub_0203D754(param0->unk_34, *v0); - sub_0203E764(param0, sub_02041CF4); + sub_0203D754(param0->fieldSys, *v0); + ScriptContext_Pause(param0, sub_02041CF4); return 1; } -static BOOL sub_02042480 (UnkStruct_0203E724 * param0) +static BOOL sub_02042480 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; sub_0203DDFC(v0); - sub_0203E764(param0, sub_02041D60); + ScriptContext_Pause(param0, sub_02041D60); return 1; } -static BOOL sub_0204249C (UnkStruct_0203E724 * param0) +static BOOL sub_0204249C (ScriptContext * param0) { - sub_02072204(param0->unk_34); + sub_02072204(param0->fieldSys); return 1; } -static BOOL sub_020424AC (UnkStruct_0203E724 * param0) +static BOOL sub_020424AC (ScriptContext * param0) { - sub_0203DDDC(param0->unk_34->unk_10); + sub_0203DDDC(param0->fieldSys->unk_10); return 1; } -static BOOL sub_020424BC (UnkStruct_0203E724 * param0) +static BOOL sub_020424BC (ScriptContext * param0) { - void ** v0 = sub_0203F098(param0->unk_34, 19); + void ** v0 = sub_0203F098(param0->fieldSys, 19); - *v0 = sub_0203DE34(param0->unk_34); - sub_0203E764(param0, sub_02041CC8); + *v0 = sub_0203DE34(param0->fieldSys); + ScriptContext_Pause(param0, sub_02041CC8); return 1; } -static BOOL sub_020424E8 (UnkStruct_0203E724 * param0) +static BOOL sub_020424E8 (ScriptContext * param0) { - sub_02052E58(param0->unk_34->unk_10); + sub_02052E58(param0->fieldSys->unk_10); return 1; } -static BOOL sub_020424F8 (UnkStruct_0203E724 * param0) +static BOOL sub_020424F8 (ScriptContext * param0) { - void ** v0 = sub_0203F098(param0->unk_34, 19); + void ** v0 = sub_0203F098(param0->fieldSys, 19); - *v0 = sub_0203E244(param0->unk_34); - sub_0203E764(param0, sub_02041CC8); + *v0 = sub_0203E244(param0->fieldSys); + ScriptContext_Pause(param0, sub_02041CC8); return 1; } -static BOOL sub_02042524 (UnkStruct_0203E724 * param0) +static BOOL sub_02042524 (ScriptContext * param0) { u16 * v0; int v1; HallOfFame * v2; - v2 = SaveData_HallOfFame(param0->unk_34->saveData, 4, &v1); - v0 = inline_0204FCAC(param0); + v2 = SaveData_HallOfFame(param0->fieldSys->saveData, 4, &v1); + v0 = ScriptContext_GetVarPointer(param0); *v0 = 0; if (v1 == 2) { @@ -4488,15 +4488,15 @@ static BOOL sub_02042524 (UnkStruct_0203E724 * param0) return 0; } -static BOOL sub_02042560 (UnkStruct_0203E724 * param0) +static BOOL sub_02042560 (ScriptContext * param0) { - u16 v0 = inline_02049538(param0); - u16 * v1 = inline_0204FCAC(param0); + u16 v0 = ScriptContext_GetVar(param0); + u16 * v1 = ScriptContext_GetVarPointer(param0); - if (sub_02039074(param0->unk_34->saveData)) { + if (sub_02039074(param0->fieldSys->saveData)) { *v1 = 1; - sub_0203E0FC(param0->unk_34, v0); - sub_0203E764(param0, sub_02041D60); + sub_0203E0FC(param0->fieldSys, v0); + ScriptContext_Pause(param0, sub_02041D60); } else { *v1 = 0; } @@ -4504,69 +4504,69 @@ static BOOL sub_02042560 (UnkStruct_0203E724 * param0) return 1; } -static BOOL sub_020425C0 (UnkStruct_0203E724 * param0) +static BOOL sub_020425C0 (ScriptContext * param0) { - u16 v0 = sub_0203E838(param0); + u16 v0 = ScriptContext_ReadHalfWord(param0); - sub_0207DDE0(param0->unk_28, sub_0203F118(param0->unk_34, v0)); + sub_0207DDE0(param0->taskManager, sub_0203F118(param0->fieldSys, v0)); return 1; } -static BOOL sub_020425E0 (UnkStruct_0203E724 * param0) +static BOOL sub_020425E0 (ScriptContext * param0) { UnkStruct_020425E0 * v0; - void ** v1 = sub_0203F098(param0->unk_34, 20); + void ** v1 = sub_0203F098(param0->fieldSys, 20); *v1 = Heap_AllocFromHeap(11, sizeof(UnkStruct_020425E0)); v0 = *v1; - v0->unk_04 = sub_02025E44(param0->unk_34->saveData); + v0->unk_04 = sub_02025E44(param0->fieldSys->saveData); - sub_0203E0C0(param0->unk_34, *v1); - sub_0203E764(param0, sub_02041D60); + sub_0203E0C0(param0->fieldSys, *v1); + ScriptContext_Pause(param0, sub_02041D60); return 1; } -static BOOL sub_02042628 (UnkStruct_0203E724 * param0) +static BOOL sub_02042628 (ScriptContext * param0) { UnkStruct_020425E0 * v0; - void ** v1 = sub_0203F098(param0->unk_34, 20); + void ** v1 = sub_0203F098(param0->fieldSys, 20); v0 = (*v1); - sub_0206B044(SaveData_Events(param0->unk_34->saveData), v0->unk_00); + sub_0206B044(SaveData_Events(param0->fieldSys->saveData), v0->unk_00); Heap_FreeToHeap(*v1); return 0; } -static BOOL sub_02042658 (UnkStruct_0203E724 * param0) +static BOOL sub_02042658 (ScriptContext * param0) { void ** v0; u8 v1; - if ((*((param0)->unk_08++)) == 0) { + if (ScriptContext_ReadByte(param0) == 0) { v1 = 0; } else { v1 = 1; } - v0 = sub_0203F098(param0->unk_34, 19); + v0 = sub_0203F098(param0->fieldSys, 19); GF_ASSERT(*v0 == 0); - *v0 = sub_0203D264(param0->unk_34, v1); - sub_0203E764(param0, sub_02041D60); + *v0 = sub_0203D264(param0->fieldSys, v1); + ScriptContext_Pause(param0, sub_02041D60); return 1; } -static BOOL sub_020426A8 (UnkStruct_0203E724 * param0) +static BOOL sub_020426A8 (ScriptContext * param0) { u16 * v0; void ** v1; - v0 = inline_0204FCAC(param0); - v1 = sub_0203F098(param0->unk_34, 19); + v0 = ScriptContext_GetVarPointer(param0); + v1 = sub_0203F098(param0->fieldSys, 19); GF_ASSERT(*v1 != 0); *v0 = sub_0203D2C4(*v1); @@ -4577,48 +4577,48 @@ static BOOL sub_020426A8 (UnkStruct_0203E724 * param0) return 0; } -static BOOL sub_020426E8 (UnkStruct_0203E724 * param0) +static BOOL sub_020426E8 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; - sub_0203DFE8(param0->unk_28, 0, 0, 7, 0, NULL, inline_0204FCAC(param0)); + sub_0203DFE8(param0->taskManager, 0, 0, 7, 0, NULL, ScriptContext_GetVarPointer(param0)); return 1; } -static BOOL sub_02042718 (UnkStruct_0203E724 * param0) +static BOOL sub_02042718 (ScriptContext * param0) { u16 v0[10 * 2]; Pokemon * v1; - FieldSystem * v2 = param0->unk_34; - u16 v3 = inline_02049538(param0); + FieldSystem * v2 = param0->fieldSys; + u16 v3 = ScriptContext_GetVar(param0); v1 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(v2->saveData), v3); Pokemon_GetValue(v1, MON_DATA_NICKNAME, v0); - sub_0203DFE8(param0->unk_28, 1, Pokemon_GetValue(v1, MON_DATA_SPECIES, NULL), 10, v3, v0, inline_0204FCAC(param0)); + sub_0203DFE8(param0->taskManager, 1, Pokemon_GetValue(v1, MON_DATA_SPECIES, NULL), 10, v3, v0, ScriptContext_GetVarPointer(param0)); return 1; } -static BOOL sub_02042784 (UnkStruct_0203E724 * param0) +static BOOL sub_02042784 (ScriptContext * param0) { - sub_0203DFE8(param0->unk_28, 6, 0, 10, 0, NULL, inline_0204FCAC(param0)); + sub_0203DFE8(param0->taskManager, 6, 0, 10, 0, NULL, ScriptContext_GetVarPointer(param0)); return 1; } -static BOOL sub_020427B4 (UnkStruct_0203E724 * param0) +static BOOL sub_020427B4 (ScriptContext * param0) { - void ** v0 = sub_0203F098(param0->unk_34, 19); + void ** v0 = sub_0203F098(param0->fieldSys, 19); - *v0 = sub_0209C1EC(param0->unk_34); - sub_0203E764(param0, sub_02041D3C); + *v0 = sub_0209C1EC(param0->fieldSys); + ScriptContext_Pause(param0, sub_02041D3C); return 1; } -static BOOL sub_020427E0 (UnkStruct_0203E724 * param0) +static BOOL sub_020427E0 (ScriptContext * param0) { - u16 * v0 = inline_0204FCAC(param0); + u16 * v0 = ScriptContext_GetVarPointer(param0); u8 v1; v1 = sub_0205BE38(); @@ -4632,49 +4632,49 @@ static BOOL sub_020427E0 (UnkStruct_0203E724 * param0) return 0; } -static BOOL sub_02042810 (UnkStruct_0203E724 * param0) +static BOOL sub_02042810 (ScriptContext * param0) { - u16 v0 = inline_02049538(param0); - u16 * v1 = inline_0204FCAC(param0); - u16 * v2 = inline_0204FCAC(param0); + u16 v0 = ScriptContext_GetVar(param0); + u16 * v1 = ScriptContext_GetVarPointer(param0); + u16 * v2 = ScriptContext_GetVarPointer(param0); *v2 = 0xffff; - sub_0203D80C(param0->unk_34->unk_10, v1, v2, NULL); + sub_0203D80C(param0->fieldSys->unk_10, v1, v2, NULL); return 1; } -static BOOL sub_02042868 (UnkStruct_0203E724 * param0) +static BOOL sub_02042868 (ScriptContext * param0) { - u16 v0 = inline_02049538(param0); - u16 * v1 = inline_0204FCAC(param0); - u16 * v2 = inline_0204FCAC(param0); - u16 * v3 = inline_0204FCAC(param0); + u16 v0 = ScriptContext_GetVar(param0); + u16 * v1 = ScriptContext_GetVarPointer(param0); + u16 * v2 = ScriptContext_GetVarPointer(param0); + u16 * v3 = ScriptContext_GetVarPointer(param0); *v2 = 0xffff; *v3 = 0xffff; - sub_0203D80C(param0->unk_34->unk_10, v1, v2, v3); + sub_0203D80C(param0->fieldSys->unk_10, v1, v2, v3); return 1; } -static BOOL sub_020428D4 (UnkStruct_0203E724 * param0) +static BOOL sub_020428D4 (ScriptContext * param0) { - StringTemplate ** v0 = sub_0203F098(param0->unk_34, 15); - u16 v1 = inline_02049538(param0); - u16 v2 = inline_02049538(param0); + StringTemplate ** v0 = sub_0203F098(param0->fieldSys, 15); + u16 v1 = ScriptContext_GetVar(param0); + u16 v2 = ScriptContext_GetVar(param0); StringTemplate_SetCustomMessageWord(*v0, v1, v2); return 0; } -static BOOL sub_02042918 (UnkStruct_0203E724 * param0) +static BOOL sub_02042918 (ScriptContext * param0) { - u16 v0 = sub_0203E838(param0); - u16 v1 = sub_0203E838(param0); - u16 v2 = sub_0203E838(param0); - u16 v3 = sub_0203E838(param0); + u16 v0 = ScriptContext_ReadHalfWord(param0); + u16 v1 = ScriptContext_ReadHalfWord(param0); + u16 v2 = ScriptContext_ReadHalfWord(param0); + u16 v3 = ScriptContext_ReadHalfWord(param0); sub_0200F174(0, v2, v2, v3, v0, v1, 4); sub_0200F32C(0); @@ -4683,13 +4683,13 @@ static BOOL sub_02042918 (UnkStruct_0203E724 * param0) return 0; } -static BOOL sub_02042960 (UnkStruct_0203E724 * param0) +static BOOL sub_02042960 (ScriptContext * param0) { - sub_0203E764(param0, sub_02042970); + ScriptContext_Pause(param0, sub_02042970); return 1; } -static BOOL sub_02042970 (UnkStruct_0203E724 * param0) +static BOOL sub_02042970 (ScriptContext * param0) { if (ScreenWipe_Done() == 1) { return 1; @@ -4698,144 +4698,144 @@ static BOOL sub_02042970 (UnkStruct_0203E724 * param0) return 0; } -static BOOL sub_02042984 (UnkStruct_0203E724 * param0) +static BOOL sub_02042984 (ScriptContext * param0) { u16 v0, v1, v2, v3; s16 v4; - FieldSystem * v5 = param0->unk_34; + FieldSystem * v5 = param0->fieldSys; - v0 = inline_02049538(param0); - v4 = sub_0203E838(param0); - v1 = inline_02049538(param0); - v2 = inline_02049538(param0); - v3 = inline_02049538(param0); + v0 = ScriptContext_GetVar(param0); + v4 = ScriptContext_ReadHalfWord(param0); + v1 = ScriptContext_GetVar(param0); + v2 = ScriptContext_GetVar(param0); + v3 = ScriptContext_GetVar(param0); v4 = -1; - sub_02053A80(param0->unk_28, v0, v4, v1, v2, v3); + sub_02053A80(param0->taskManager, v0, v4, v1, v2, v3); return 1; } -static BOOL sub_020429F4 (UnkStruct_0203E724 * param0) +static BOOL sub_020429F4 (ScriptContext * param0) { u16 v0, v1, v2, v3; s16 v4; - FieldSystem * v5 = param0->unk_34; + FieldSystem * v5 = param0->fieldSys; - v0 = sub_0203E838(param0); - v4 = sub_0203E838(param0); - v1 = inline_02049538(param0); - v2 = inline_02049538(param0); - v3 = sub_0203E838(param0); + v0 = ScriptContext_ReadHalfWord(param0); + v4 = ScriptContext_ReadHalfWord(param0); + v1 = ScriptContext_GetVar(param0); + v2 = ScriptContext_GetVar(param0); + v3 = ScriptContext_ReadHalfWord(param0); v4 = -1; - sub_02054800(param0->unk_34->unk_10, v0, v4, v1, v2, v3); + sub_02054800(param0->fieldSys->unk_10, v0, v4, v1, v2, v3); return 1; } -static BOOL sub_02042A50 (UnkStruct_0203E724 * param0) +static BOOL sub_02042A50 (ScriptContext * param0) { - sub_02054864(param0->unk_34->unk_10); + sub_02054864(param0->fieldSys->unk_10); return 1; } -static BOOL sub_02042A60 (UnkStruct_0203E724 * param0) +static BOOL sub_02042A60 (ScriptContext * param0) { - UnkStruct_0203A790 * v0 = sub_0203A790(param0->unk_34->saveData); + UnkStruct_0203A790 * v0 = sub_0203A790(param0->fieldSys->saveData); UnkStruct_02049FA8 * v1 = sub_0203A728(v0); - u16 * v2 = inline_0204FCAC(param0); + u16 * v2 = ScriptContext_GetVarPointer(param0); *v2 = v1->unk_00; return 0; } -static BOOL sub_02042A8C (UnkStruct_0203E724 * param0) +static BOOL sub_02042A8C (ScriptContext * param0) { - u16 * v0 = inline_0204FCAC(param0); + u16 * v0 = ScriptContext_GetVarPointer(param0); - *v0 = param0->unk_34->unk_1C->unk_00; + *v0 = param0->fieldSys->unk_1C->unk_00; return 0; } -static BOOL sub_02042AB0 (UnkStruct_0203E724 * param0) +static BOOL sub_02042AB0 (ScriptContext * param0) { - ov5_021E0734(param0->unk_28, Player_Dir(param0->unk_34->playerAvatar), inline_02049538(param0)); + ov5_021E0734(param0->taskManager, Player_Dir(param0->fieldSys->playerAvatar), ScriptContext_GetVar(param0)); return 1; } -static BOOL sub_02042AE0 (UnkStruct_0203E724 * param0) +static BOOL sub_02042AE0 (ScriptContext * param0) { - RadarChain_Clear(param0->unk_34->chain); + RadarChain_Clear(param0->fieldSys->chain); { int v0; - if (sub_0205F16C(param0->unk_34->playerAvatar) == 1) { - v0 = Player_Dir(param0->unk_34->playerAvatar); + if (sub_0205F16C(param0->fieldSys->playerAvatar) == 1) { + v0 = Player_Dir(param0->fieldSys->playerAvatar); } else { - v0 = sub_0205EA94(param0->unk_34->playerAvatar); + v0 = sub_0205EA94(param0->fieldSys->playerAvatar); } - ov5_021E00EC(param0->unk_28, v0, inline_02049538(param0)); + ov5_021E00EC(param0->taskManager, v0, ScriptContext_GetVar(param0)); } return 1; } -static BOOL sub_02042B3C (UnkStruct_0203E724 * param0) +static BOOL sub_02042B3C (ScriptContext * param0) { - ov5_021E0998(param0->unk_28, Player_Dir(param0->unk_34->playerAvatar), inline_02049538(param0)); + ov5_021E0998(param0->taskManager, Player_Dir(param0->fieldSys->playerAvatar), ScriptContext_GetVar(param0)); return 1; } -static BOOL sub_02042B6C (UnkStruct_0203E724 * param0) +static BOOL sub_02042B6C (ScriptContext * param0) { u16 v0, v1, v2; - v0 = sub_0203E838(param0); - v1 = inline_02049538(param0); - v2 = inline_02049538(param0); + v0 = ScriptContext_ReadHalfWord(param0); + v1 = ScriptContext_GetVar(param0); + v2 = ScriptContext_GetVar(param0); - sub_02053AB4(param0->unk_34, v0, -1, v1, v2, 1); + sub_02053AB4(param0->fieldSys, v0, -1, v1, v2, 1); return 1; } -static BOOL sub_02042BB8 (UnkStruct_0203E724 * param0) +static BOOL sub_02042BB8 (ScriptContext * param0) { - UnkStruct_0203A790 * v0 = sub_0203A790(param0->unk_34->saveData); + UnkStruct_0203A790 * v0 = sub_0203A790(param0->fieldSys->saveData); sub_0203A754(v0, 0); - ov5_021D5F7C(param0->unk_34->unk_04->unk_0C, sub_0203A74C(v0)); + ov5_021D5F7C(param0->fieldSys->unk_04->unk_0C, sub_0203A74C(v0)); return 1; } -static BOOL sub_02042BE8 (UnkStruct_0203E724 * param0) +static BOOL sub_02042BE8 (ScriptContext * param0) { - UnkStruct_0203A790 * v0 = sub_0203A790(param0->unk_34->saveData); + UnkStruct_0203A790 * v0 = sub_0203A790(param0->fieldSys->saveData); sub_0203A754(v0, 0); - ov5_021D5F7C(param0->unk_34->unk_04->unk_0C, sub_0203A74C(v0)); + ov5_021D5F7C(param0->fieldSys->unk_04->unk_0C, sub_0203A74C(v0)); return 1; } -static BOOL sub_02042C18 (UnkStruct_0203E724 * param0) +static BOOL sub_02042C18 (ScriptContext * param0) { Pokemon * v0; - void ** v1 = sub_0203F098(param0->unk_34, 20); - u16 v2 = inline_02049538(param0); + void ** v1 = sub_0203F098(param0->fieldSys, 20); + u16 v2 = ScriptContext_GetVar(param0); - v0 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(param0->unk_34->saveData), v2); - *v1 = ov6_02243F88(param0->unk_34, 0, v0, sub_0205EB98(param0->unk_34->playerAvatar)); + v0 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(param0->fieldSys->saveData), v2); + *v1 = ov6_02243F88(param0->fieldSys, 0, v0, sub_0205EB98(param0->fieldSys->playerAvatar)); - sub_0203E764(param0, sub_02042C80); + ScriptContext_Pause(param0, sub_02042C80); return 1; } -static BOOL sub_02042C80 (UnkStruct_0203E724 * param0) +static BOOL sub_02042C80 (ScriptContext * param0) { - void ** v0 = sub_0203F098(param0->unk_34, 20); + void ** v0 = sub_0203F098(param0->fieldSys, 20); if (ov6_02243FBC(*v0) == 1) { ov6_02243FC8(*v0); @@ -4845,17 +4845,17 @@ static BOOL sub_02042C80 (UnkStruct_0203E724 * param0) return 0; } -static BOOL sub_02042CA8 (UnkStruct_0203E724 * param0) +static BOOL sub_02042CA8 (ScriptContext * param0) { - ov5_021E0DD4(param0->unk_28); + ov5_021E0DD4(param0->taskManager); return 1; } -static BOOL sub_02042CB4 (UnkStruct_0203E724 * param0) +static BOOL sub_02042CB4 (ScriptContext * param0) { - u16 * v0 = inline_0204FCAC(param0); + u16 * v0 = ScriptContext_GetVarPointer(param0); - if (sub_0205EB74(param0->unk_34->playerAvatar) == 0x1) { + if (sub_0205EB74(param0->fieldSys->playerAvatar) == 0x1) { *v0 = 1; } else { *v0 = 0; @@ -4864,116 +4864,116 @@ static BOOL sub_02042CB4 (UnkStruct_0203E724 * param0) return 0; } -static BOOL sub_02042CE4 (UnkStruct_0203E724 * param0) +static BOOL sub_02042CE4 (ScriptContext * param0) { - u8 v0 = (*((param0)->unk_08++)); + u8 v0 = ScriptContext_ReadByte(param0); if (v0 == 1) { - sub_020553F0(param0->unk_34, 1152); - sub_02055554(param0->unk_34, 1152, 1); - ov5_021DFB54(param0->unk_34->playerAvatar, (1 << 1)); - ov5_021DFB5C(param0->unk_34->playerAvatar); + sub_020553F0(param0->fieldSys, 1152); + sub_02055554(param0->fieldSys, 1152, 1); + ov5_021DFB54(param0->fieldSys->playerAvatar, (1 << 1)); + ov5_021DFB5C(param0->fieldSys->playerAvatar); } else { - ov5_021DFB54(param0->unk_34->playerAvatar, (1 << 0)); - ov5_021DFB5C(param0->unk_34->playerAvatar); - sub_020553F0(param0->unk_34, 0); - sub_02055554(param0->unk_34, sub_02055428(param0->unk_34, param0->unk_34->unk_1C->unk_00), 1); + ov5_021DFB54(param0->fieldSys->playerAvatar, (1 << 0)); + ov5_021DFB5C(param0->fieldSys->playerAvatar); + sub_020553F0(param0->fieldSys, 0); + sub_02055554(param0->fieldSys, sub_02055428(param0->fieldSys, param0->fieldSys->unk_1C->unk_00), 1); } return 0; } -static BOOL sub_02042D70 (UnkStruct_0203E724 * param0) +static BOOL sub_02042D70 (ScriptContext * param0) { - sub_020553F0(param0->unk_34, 1189); + sub_020553F0(param0->fieldSys, 1189); return 0; } -static BOOL sub_02042D84 (UnkStruct_0203E724 * param0) +static BOOL sub_02042D84 (ScriptContext * param0) { - sub_0205EFC4(param0->unk_34->playerAvatar, (*((param0)->unk_08++))); + sub_0205EFC4(param0->fieldSys->playerAvatar, ScriptContext_ReadByte(param0)); return 0; } -static BOOL sub_02042D9C (UnkStruct_0203E724 * param0) +static BOOL sub_02042D9C (ScriptContext * param0) { - u16 * v0 = inline_0204FCAC(param0); + u16 * v0 = ScriptContext_GetVarPointer(param0); - *v0 = sub_0205EB74(param0->unk_34->playerAvatar); + *v0 = sub_0205EB74(param0->fieldSys->playerAvatar); return 0; } -static BOOL sub_02042DC4 (UnkStruct_0203E724 * param0) +static BOOL sub_02042DC4 (ScriptContext * param0) { - u16 v0 = sub_0203E838(param0); + u16 v0 = ScriptContext_ReadHalfWord(param0); - sub_0205EB84(param0->unk_34->playerAvatar, v0); + sub_0205EB84(param0->fieldSys->playerAvatar, v0); return 1; } -static BOOL sub_02042DDC (UnkStruct_0203E724 * param0) +static BOOL sub_02042DDC (ScriptContext * param0) { - ov5_021DFB5C(param0->unk_34->playerAvatar); + ov5_021DFB5C(param0->fieldSys->playerAvatar); return 0; } -static BOOL sub_02042DEC (UnkStruct_0203E724 * param0) +static BOOL sub_02042DEC (ScriptContext * param0) { - UnkStruct_0202D7B0 * v0 = sub_0202D834(param0->unk_34->saveData); - u16 * v1 = inline_0204FCAC(param0); - u16 * v2 = inline_0204FCAC(param0); + UnkStruct_0202D7B0 * v0 = sub_0202D834(param0->fieldSys->saveData); + u16 * v1 = ScriptContext_GetVarPointer(param0); + u16 * v2 = ScriptContext_GetVarPointer(param0); ov6_0224322C(sub_0202D814(v0, 2), v1, v2); return 0; } -static BOOL sub_02042E38 (UnkStruct_0203E724 * param0) +static BOOL sub_02042E38 (ScriptContext * param0) { - u16 * v0 = inline_0204FCAC(param0); + u16 * v0 = ScriptContext_GetVarPointer(param0); - *v0 = sub_0206B054(SaveData_Events(param0->unk_34->saveData)); + *v0 = sub_0206B054(SaveData_Events(param0->fieldSys->saveData)); return 0; } -static BOOL sub_02042E64 (UnkStruct_0203E724 * param0) +static BOOL sub_02042E64 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; u16 * v1 = sub_0203F098(v0, 8); Strbuf ** v2 = sub_0203F098(v0, 16); u8 * v3 = sub_0203F098(v0, 6); u8 * v4 = sub_0203F098(v0, 3); - u16 v5 = inline_02049538(param0); - u16 v6 = inline_02049538(param0); + u16 v5 = ScriptContext_GetVar(param0); + u16 v6 = ScriptContext_GetVar(param0); TrainerData_LoadMessage(v5, v6, *v2, 11); BGL_FillWindow(sub_0203F098(v0, 1), 15); - *v4 = sub_0205D994(sub_0203F098(v0, 1), *v2, sub_02025E44(param0->unk_34->saveData), 1); - sub_0203E764(param0, sub_02040014); + *v4 = sub_0205D994(sub_0203F098(v0, 1), *v2, sub_02025E44(param0->fieldSys->saveData), 1); + ScriptContext_Pause(param0, sub_02040014); return 1; } -static BOOL sub_02042F04 (UnkStruct_0203E724 * param0) +static BOOL sub_02042F04 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; - u16 commType = inline_02049538(param0); - u16 v2 = inline_02049538(param0); - u16 v3 = inline_02049538(param0); - u16 v4 = sub_0203E838(param0); + FieldSystem * v0 = param0->fieldSys; + u16 commType = ScriptContext_GetVar(param0); + u16 v2 = ScriptContext_GetVar(param0); + u16 v3 = ScriptContext_GetVar(param0); + u16 v4 = ScriptContext_ReadHalfWord(param0); ov7_0224B414(v0, commType, v2, v3); - param0->unk_18[0] = v4; - sub_0203E764(param0, sub_02042F74); + param0->data[0] = v4; + ScriptContext_Pause(param0, sub_02042F74); return 1; } -static BOOL sub_02042F74 (UnkStruct_0203E724 * param0) +static BOOL sub_02042F74 (ScriptContext * param0) { u32 v0; - FieldSystem * v1 = param0->unk_34; - u16 * v2 = sub_0203F118(v1, param0->unk_18[0]); + FieldSystem * v1 = param0->fieldSys; + u16 * v2 = sub_0203F118(v1, param0->data[0]); v0 = ov7_0224B460(); @@ -4985,26 +4985,26 @@ static BOOL sub_02042F74 (UnkStruct_0203E724 * param0) return 1; } -static BOOL sub_02042F9C (UnkStruct_0203E724 * param0) +static BOOL sub_02042F9C (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; - u16 commType = inline_02049538(param0); - u16 v2 = inline_02049538(param0); - u16 v3 = inline_02049538(param0); - u16 v4 = sub_0203E838(param0); + FieldSystem * v0 = param0->fieldSys; + u16 commType = ScriptContext_GetVar(param0); + u16 v2 = ScriptContext_GetVar(param0); + u16 v3 = ScriptContext_GetVar(param0); + u16 v4 = ScriptContext_ReadHalfWord(param0); ov7_0224B47C(v0, commType, v2, v3); - param0->unk_18[0] = v4; - sub_0203E764(param0, sub_0204300C); + param0->data[0] = v4; + ScriptContext_Pause(param0, sub_0204300C); return 1; } -static BOOL sub_0204300C (UnkStruct_0203E724 * param0) +static BOOL sub_0204300C (ScriptContext * param0) { u32 v0; - FieldSystem * v1 = param0->unk_34; - u16 * v2 = sub_0203F118(v1, param0->unk_18[0]); + FieldSystem * v1 = param0->fieldSys; + u16 * v2 = sub_0203F118(v1, param0->data[0]); v0 = CommClub_CheckWindowOpenClient(); @@ -5016,31 +5016,31 @@ static BOOL sub_0204300C (UnkStruct_0203E724 * param0) return 1; } -static BOOL sub_02043034 (UnkStruct_0203E724 * param0) +static BOOL sub_02043034 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; - u16 v1 = sub_0203E838(param0); + FieldSystem * v0 = param0->fieldSys; + u16 v1 = ScriptContext_ReadHalfWord(param0); return 1; } -static BOOL sub_02043040 (UnkStruct_0203E724 * param0) +static BOOL sub_02043040 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; - u16 v1 = sub_0203E838(param0); + FieldSystem * v0 = param0->fieldSys; + u16 v1 = ScriptContext_ReadHalfWord(param0); return 1; } -static BOOL sub_0204304C (UnkStruct_0203E724 * param0) +static BOOL sub_0204304C (ScriptContext * param0) { PartyManagementData * v0; void ** v1; - v1 = sub_0203F098(param0->unk_34, 19); + v1 = sub_0203F098(param0->fieldSys, 19); v0 = *v1; - sub_0205167C(param0->unk_34->unk_10, v0->unk_2C, (0x4 | 0x1)); + sub_0205167C(param0->fieldSys->unk_10, v0->unk_2C, (0x4 | 0x1)); Heap_FreeToHeap(v0); *v1 = NULL; @@ -5048,103 +5048,103 @@ static BOOL sub_0204304C (UnkStruct_0203E724 * param0) return 1; } -static BOOL sub_0204307C (UnkStruct_0203E724 * param0) +static BOOL sub_0204307C (ScriptContext * param0) { return 1; } -static BOOL sub_02043080 (UnkStruct_0203E724 * param0) +static BOOL sub_02043080 (ScriptContext * param0) { UnkStruct_02049FA8 v0; - v0.unk_00 = inline_02049538(param0); - v0.unk_04 = inline_02049538(param0); - v0.unk_08 = inline_02049538(param0); - v0.unk_0C = inline_02049538(param0); - v0.unk_10 = inline_02049538(param0); + v0.unk_00 = ScriptContext_GetVar(param0); + v0.unk_04 = ScriptContext_GetVar(param0); + v0.unk_08 = ScriptContext_GetVar(param0); + v0.unk_0C = ScriptContext_GetVar(param0); + v0.unk_10 = ScriptContext_GetVar(param0); - sub_0203A734(sub_0203A790(param0->unk_34->saveData), &v0); + sub_0203A734(sub_0203A790(param0->fieldSys->saveData), &v0); return 0; } -static BOOL sub_02043100 (UnkStruct_0203E724 * param0) +static BOOL sub_02043100 (ScriptContext * param0) { UnkStruct_02049FA8 * v0; - u16 * v1 = inline_0204FCAC(param0); + u16 * v1 = ScriptContext_GetVarPointer(param0); - v0 = sub_0203A730(sub_0203A790(param0->unk_34->saveData)); + v0 = sub_0203A730(sub_0203A790(param0->fieldSys->saveData)); *v1 = ov5_021DCCC8(v0->unk_00); return 0; } -static BOOL sub_02043130 (UnkStruct_0203E724 * param0) +static BOOL sub_02043130 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; StringTemplate ** v1 = sub_0203F098(v0, 15); - u8 v2 = (*((param0)->unk_08++)); - u8 v3 = (*((param0)->unk_08++)); - u16 * v4 = inline_0204FCAC(param0); - u16 v5 = inline_02049538(param0); + u8 v2 = ScriptContext_ReadByte(param0); + u8 v3 = ScriptContext_ReadByte(param0); + u16 * v4 = ScriptContext_GetVarPointer(param0); + u16 v5 = ScriptContext_GetVar(param0); ov5_021DCB24(v0, v2, v3, v4, *v1, v5); return 0; } -static BOOL sub_02043190 (UnkStruct_0203E724 * param0) +static BOOL sub_02043190 (ScriptContext * param0) { - const PokedexData * v0 = SaveData_Pokedex(param0->unk_34->saveData); - u16 * v1 = inline_0204FCAC(param0); + const PokedexData * v0 = SaveData_Pokedex(param0->fieldSys->saveData); + u16 * v1 = ScriptContext_GetVarPointer(param0); *v1 = sub_02026EAC(v0); return 0; } -static BOOL sub_020431C0 (UnkStruct_0203E724 * param0) +static BOOL sub_020431C0 (ScriptContext * param0) { - const PokedexData * v0 = SaveData_Pokedex(param0->unk_34->saveData); - u16 * v1 = inline_0204FCAC(param0); + const PokedexData * v0 = SaveData_Pokedex(param0->fieldSys->saveData); + u16 * v1 = ScriptContext_GetVarPointer(param0); *v1 = sub_02026E64(v0); return 0; } -static BOOL sub_020431F0 (UnkStruct_0203E724 * param0) +static BOOL sub_020431F0 (ScriptContext * param0) { - const PokedexData * v0 = SaveData_Pokedex(param0->unk_34->saveData); - u16 * v1 = inline_0204FCAC(param0); + const PokedexData * v0 = SaveData_Pokedex(param0->fieldSys->saveData); + u16 * v1 = ScriptContext_GetVarPointer(param0); *v1 = sub_02026E0C(v0); return 0; } -static BOOL sub_02043220 (UnkStruct_0203E724 * param0) +static BOOL sub_02043220 (ScriptContext * param0) { - const PokedexData * v0 = SaveData_Pokedex(param0->unk_34->saveData); - u16 * v1 = inline_0204FCAC(param0); + const PokedexData * v0 = SaveData_Pokedex(param0->fieldSys->saveData); + u16 * v1 = ScriptContext_GetVarPointer(param0); *v1 = sub_02026DD0(v0); return 0; } -static BOOL sub_02043250 (UnkStruct_0203E724 * param0) +static BOOL sub_02043250 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; return 0; } -static BOOL sub_02043254 (UnkStruct_0203E724 * param0) +static BOOL sub_02043254 (ScriptContext * param0) { - const PokedexData * v0 = SaveData_Pokedex(param0->unk_34->saveData); - const TrainerInfo * v1 = SaveData_GetTrainerInfo(param0->unk_34->saveData); - u8 v2 = (*((param0)->unk_08++)); - u16 * v3 = inline_0204FCAC(param0); + const PokedexData * v0 = SaveData_Pokedex(param0->fieldSys->saveData); + const TrainerInfo * v1 = SaveData_GetTrainerInfo(param0->fieldSys->saveData); + u8 v2 = ScriptContext_ReadByte(param0); + u16 * v3 = ScriptContext_GetVarPointer(param0); u16 v4; if (v2 == 0) { v4 = sub_02026F58(v0); - *v3 = sub_0205E078(v4, inline_0208BE68(SaveData_Events(param0->unk_34->saveData), 10)); + *v3 = sub_0205E078(v4, inline_0208BE68(SaveData_Events(param0->fieldSys->saveData), 10)); } else { v4 = sub_02026F20(v0); *v3 = sub_0205E0E4(v4, TrainerInfo_Gender(v1)); @@ -5153,109 +5153,109 @@ static BOOL sub_02043254 (UnkStruct_0203E724 * param0) return 0; } -static BOOL sub_020432DC (UnkStruct_0203E724 * param0) +static BOOL sub_020432DC (ScriptContext * param0) { - BOOL * v0 = sub_0203F098(param0->unk_34, 23); - u16 v1 = inline_02049538(param0); - u8 v2 = (u8)inline_02049538(param0); + BOOL * v0 = sub_0203F098(param0->fieldSys, 23); + u16 v1 = ScriptContext_GetVar(param0); + u8 v2 = (u8)ScriptContext_GetVar(param0); - sub_02051270(param0->unk_28, v1, v2, v0, 0); + sub_02051270(param0->taskManager, v1, v2, v0, 0); return 1; } -static BOOL sub_02043330 (UnkStruct_0203E724 * param0) +static BOOL sub_02043330 (ScriptContext * param0) { - BOOL * v0 = sub_0203F098(param0->unk_34, 23); - u16 v1 = inline_02049538(param0); - u8 v2 = (u8)inline_02049538(param0); + BOOL * v0 = sub_0203F098(param0->fieldSys, 23); + u16 v1 = ScriptContext_GetVar(param0); + u8 v2 = (u8)ScriptContext_GetVar(param0); - sub_02051270(param0->unk_28, v1, v2, v0, 1); + sub_02051270(param0->taskManager, v1, v2, v0, 1); return 1; } -static BOOL sub_02043384 (UnkStruct_0203E724 * param0) +static BOOL sub_02043384 (ScriptContext * param0) { - BOOL * v0 = sub_0203F098(param0->unk_34, 23); - u16 v1 = inline_02049538(param0); - u8 v2 = (u8)inline_02049538(param0); + BOOL * v0 = sub_0203F098(param0->fieldSys, 23); + u16 v1 = ScriptContext_GetVar(param0); + u8 v2 = (u8)ScriptContext_GetVar(param0); - sub_02051ABC(param0->unk_28, v1, v2, v0, 1); + sub_02051ABC(param0->taskManager, v1, v2, v0, 1); return 1; } -static BOOL sub_020433D8 (UnkStruct_0203E724 * param0) +static BOOL sub_020433D8 (ScriptContext * param0) { - BOOL * v0 = sub_0203F098(param0->unk_34, 23); - u16 v1 = inline_02049538(param0); - u8 v2 = (u8)inline_02049538(param0); + BOOL * v0 = sub_0203F098(param0->fieldSys, 23); + u16 v1 = ScriptContext_GetVar(param0); + u8 v2 = (u8)ScriptContext_GetVar(param0); - sub_020512E4(param0->unk_28, v1, v2, v0, 1); + sub_020512E4(param0->taskManager, v1, v2, v0, 1); return 1; } -static BOOL sub_0204342C (UnkStruct_0203E724 * param0) +static BOOL sub_0204342C (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; BOOL * v1 = sub_0203F098(v0, 23); - u16 v2 = inline_02049538(param0); + u16 v2 = ScriptContext_GetVar(param0); - sub_02051480(param0->unk_28, v2, 11, v1); + sub_02051480(param0->taskManager, v2, 11, v1); return 1; } -static BOOL sub_02043460 (UnkStruct_0203E724 * param0) +static BOOL sub_02043460 (ScriptContext * param0) { - sub_02051590(param0->unk_28); + sub_02051590(param0->taskManager); return 1; } -static BOOL sub_0204346C (UnkStruct_0203E724 * param0) +static BOOL sub_0204346C (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; ov5_021EFBDC(v0); return 0; } -static BOOL sub_0204347C (UnkStruct_0203E724 * param0) +static BOOL sub_0204347C (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; - u16 * v1 = inline_0204FCAC(param0); + FieldSystem * v0 = param0->fieldSys; + u16 * v1 = ScriptContext_GetVarPointer(param0); *v1 = ov5_021EFB94(v0); return 0; } -static BOOL sub_020434A4 (UnkStruct_0203E724 * param0) +static BOOL sub_020434A4 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; BOOL * v1 = sub_0203F098(v0, 23); - sub_0205120C(param0->unk_28, v1); + sub_0205120C(param0->taskManager, v1); return 1; } -static BOOL sub_020434C0 (UnkStruct_0203E724 * param0) +static BOOL sub_020434C0 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; ov5_021EFC90(v0); return 0; } -static BOOL sub_020434D0 (UnkStruct_0203E724 * param0) +static BOOL sub_020434D0 (ScriptContext * param0) { - sub_0203E0D0(param0->unk_34); - sub_0203E764(param0, sub_02041D60); + sub_0203E0D0(param0->fieldSys); + ScriptContext_Pause(param0, sub_02041D60); return 1; } -static BOOL sub_020434EC (UnkStruct_0203E724 * param0) +static BOOL sub_020434EC (ScriptContext * param0) { - SaveData * v0 = param0->unk_34->saveData; - u16 * v1 = inline_0204FCAC(param0); + SaveData * v0 = param0->fieldSys->saveData; + u16 * v1 = ScriptContext_GetVarPointer(param0); if (SaveData_OverwriteCheck(v0)) { *v1 = 0; @@ -5270,117 +5270,117 @@ static BOOL sub_020434EC (UnkStruct_0203E724 * param0) return 0; } -static BOOL sub_02043540 (UnkStruct_0203E724 * param0) +static BOOL sub_02043540 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; - u16 * v1 = inline_0204FCAC(param0); + FieldSystem * v0 = param0->fieldSys; + u16 * v1 = ScriptContext_GetVarPointer(param0); *v1 = ov5_021E200C(v0); return 0; } -static BOOL sub_02043568 (UnkStruct_0203E724 * param0) +static BOOL sub_02043568 (ScriptContext * param0) { - SaveDataExtra_Init(param0->unk_34->saveData); + SaveDataExtra_Init(param0->fieldSys->saveData); return 0; } -static BOOL sub_02043578 (UnkStruct_0203E724 * param0) +static BOOL sub_02043578 (ScriptContext * param0) { - u16 * v0 = inline_0204FCAC(param0); + u16 * v0 = ScriptContext_GetVarPointer(param0); - *v0 = SaveData_MiscSaveBlock_InitFlag(param0->unk_34->saveData); + *v0 = SaveData_MiscSaveBlock_InitFlag(param0->fieldSys->saveData); return 0; } -static BOOL sub_020435A0 (UnkStruct_0203E724 * param0) +static BOOL sub_020435A0 (ScriptContext * param0) { - ov5_021DDBC8(param0->unk_28); + ov5_021DDBC8(param0->taskManager); return 1; } -static BOOL sub_020435AC (UnkStruct_0203E724 * param0) +static BOOL sub_020435AC (ScriptContext * param0) { - PoketchData * v0 = SaveData_PoketchData(param0->unk_34->saveData); - u16 * v1 = inline_0204FCAC(param0); + PoketchData * v0 = SaveData_PoketchData(param0->fieldSys->saveData); + u16 * v1 = ScriptContext_GetVarPointer(param0); *v1 = PoketchData_IsEnabled(v0); return 0; } -static BOOL sub_020435DC (UnkStruct_0203E724 * param0) +static BOOL sub_020435DC (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; - u16 v1 = inline_02049538(param0); + FieldSystem * v0 = param0->fieldSys; + u16 v1 = ScriptContext_GetVar(param0); PoketchData_RegisterApp(SaveData_PoketchData(v0->saveData), v1); return 0; } -static BOOL sub_02043608 (UnkStruct_0203E724 * param0) +static BOOL sub_02043608 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; - u16 v1 = inline_02049538(param0); - u16 * v2 = inline_0204FCAC(param0); + FieldSystem * v0 = param0->fieldSys; + u16 v1 = ScriptContext_GetVar(param0); + u16 * v2 = ScriptContext_GetVarPointer(param0); *v2 = PoketchData_IsAppRegistered(SaveData_PoketchData(v0->saveData), v1); return 0; } -static BOOL sub_02043648 (UnkStruct_0203E724 * param0) +static BOOL sub_02043648 (ScriptContext * param0) { - u16 v0 = inline_02049538(param0); + u16 v0 = ScriptContext_GetVar(param0); - param0->unk_18[0] = v0; + param0->data[0] = v0; sub_020364F0(v0); - sub_0203E764(param0, sub_02043678); + ScriptContext_Pause(param0, sub_02043678); return 1; } -static BOOL sub_02043678 (UnkStruct_0203E724 * param0) +static BOOL sub_02043678 (ScriptContext * param0) { int v0; if (CommSys_ConnectedCount() < 2) { v0 = 1; } else { - v0 = sub_02036540(param0->unk_18[0]); + v0 = sub_02036540(param0->data[0]); } return v0; } -static BOOL sub_02043694 (UnkStruct_0203E724 * param0) +static BOOL sub_02043694 (ScriptContext * param0) { sub_020365F4(); return 0; } -static BOOL sub_020436A0 (UnkStruct_0203E724 * param0) +static BOOL sub_020436A0 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; StringTemplate ** v1 = sub_0203F098(v0, 15); - u16 * v2 = inline_0204FCAC(param0); + u16 * v2 = ScriptContext_GetVarPointer(param0); *v2 = sub_0205BC50(*v1); return 0; } -static BOOL sub_020436D0 (UnkStruct_0203E724 * param0) +static BOOL sub_020436D0 (ScriptContext * param0) { - u16 * v0 = inline_0204FCAC(param0); - FieldSystem * v1 = param0->unk_34; + u16 * v0 = ScriptContext_GetVarPointer(param0); + FieldSystem * v1 = param0->fieldSys; StringTemplate ** v2 = sub_0203F098(v1, 15); - *v0 = sub_0205BF44(param0->unk_34->unk_7C, *v2); + *v0 = sub_0205BF44(param0->fieldSys->unk_7C, *v2); return 0; } -static BOOL sub_02043708 (UnkStruct_0203E724 * param0) +static BOOL sub_02043708 (ScriptContext * param0) { - u16 v0 = sub_0203E838(param0); + u16 v0 = ScriptContext_ReadHalfWord(param0); if ((v0 == 5) || (v0 == 7) || (v0 == 9) || (v0 == 6) || (v0 == 12) || (v0 == 10)) { sub_02036BC8(); @@ -5395,13 +5395,13 @@ static BOOL sub_02043708 (UnkStruct_0203E724 * param0) return 0; } -static BOOL sub_02043748 (UnkStruct_0203E724 * param0) +static BOOL sub_02043748 (ScriptContext * param0) { - LocalMapObject ** v0 = sub_0203F098(param0->unk_34, 10); - StringTemplate ** v1 = sub_0203F098(param0->unk_34, 15); - u16 v2 = sub_0203E838(param0); - TrainerInfo * v3 = SaveData_GetTrainerInfo(FieldSystem_SaveData(param0->unk_34)); - UnkStruct_02014EC4 * v4 = sub_02014EC4(FieldSystem_SaveData(param0->unk_34)); + LocalMapObject ** v0 = sub_0203F098(param0->fieldSys, 10); + StringTemplate ** v1 = sub_0203F098(param0->fieldSys, 15); + u16 v2 = ScriptContext_ReadHalfWord(param0); + TrainerInfo * v3 = SaveData_GetTrainerInfo(FieldSystem_SaveData(param0->fieldSys)); + UnkStruct_02014EC4 * v4 = sub_02014EC4(FieldSystem_SaveData(param0->fieldSys)); u16 v5; if (v2 == 0) { @@ -5414,49 +5414,49 @@ static BOOL sub_02043748 (UnkStruct_0203E724 * param0) return 0; } -static BOOL sub_020437B4 (UnkStruct_0203E724 * param0) +static BOOL sub_020437B4 (ScriptContext * param0) { - sub_02099514(param0->unk_34); + sub_02099514(param0->fieldSys); return 0; } -static BOOL sub_020437C4 (UnkStruct_0203E724 * param0) +static BOOL sub_020437C4 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; sub_0205C2B0(v0->unk_80); sub_02036AC4(); - sub_0203E764(param0, sub_020437E8); + ScriptContext_Pause(param0, sub_020437E8); return 1; } -static BOOL sub_020437E8 (UnkStruct_0203E724 * param0) +static BOOL sub_020437E8 (ScriptContext * param0) { return CommSys_ConnectedCount() < 2; } -static BOOL sub_020437FC (UnkStruct_0203E724 * param0) +static BOOL sub_020437FC (ScriptContext * param0) { - LocalMapObject ** v0 = sub_0203F098(param0->unk_34, 10); - u16 v1 = sub_0203E838(param0); - u16 * v2 = inline_0204FCAC(param0); - StringTemplate ** v3 = sub_0203F098(param0->unk_34, 15); + LocalMapObject ** v0 = sub_0203F098(param0->fieldSys, 10); + u16 v1 = ScriptContext_ReadHalfWord(param0); + u16 * v2 = ScriptContext_GetVarPointer(param0); + StringTemplate ** v3 = sub_0203F098(param0->fieldSys, 15); - *v2 = sub_0205BCF4(param0->unk_34->unk_7C, sub_02062910(*v0), v1, *v3); + *v2 = sub_0205BCF4(param0->fieldSys->unk_7C, sub_02062910(*v0), v1, *v3); return 0; } -static BOOL sub_02043854 (UnkStruct_0203E724 * param0) +static BOOL sub_02043854 (ScriptContext * param0) { PartyManagementData * v0; void ** v1; - u16 * v2 = inline_0204FCAC(param0); + u16 * v2 = ScriptContext_GetVarPointer(param0); - *v2 = sub_0205BA7C(param0->unk_34->unk_7C); + *v2 = sub_0205BA7C(param0->fieldSys->unk_7C); if (*v2 != 0) { - v1 = sub_0203F098(param0->unk_34, 19); + v1 = sub_0203F098(param0->fieldSys, 19); v0 = *v1; Heap_FreeToHeap(v0); } @@ -5464,42 +5464,42 @@ static BOOL sub_02043854 (UnkStruct_0203E724 * param0) return 0; } -static BOOL sub_02043894 (UnkStruct_0203E724 * param0) +static BOOL sub_02043894 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; LocalMapObject ** v1 = sub_0203F098(v0, 10); - u16 * v2 = inline_0204FCAC(param0); + u16 * v2 = ScriptContext_GetVarPointer(param0); *v2 = sub_0205B780(v0->unk_7C, sub_02062910(*v1)); return 0; } -static BOOL sub_020438CC (UnkStruct_0203E724 * param0) +static BOOL sub_020438CC (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; LocalMapObject ** v1 = sub_0203F098(v0, 10); - u16 v2 = inline_02049538(param0); - u16 * v3 = inline_0204FCAC(param0); + u16 v2 = ScriptContext_GetVar(param0); + u16 * v3 = ScriptContext_GetVarPointer(param0); *v3 = sub_0205B804(v0->unk_7C, sub_02062910(*v1), v2); return 0; } -static BOOL sub_0204391C (UnkStruct_0203E724 * param0) +static BOOL sub_0204391C (ScriptContext * param0) { - u16 v0 = sub_0203E838(param0); + u16 v0 = ScriptContext_ReadHalfWord(param0); - param0->unk_18[0] = v0; - sub_0203E764(param0, sub_02043938); + param0->data[0] = v0; + ScriptContext_Pause(param0, sub_02043938); return 1; } -static BOOL sub_02043938 (UnkStruct_0203E724 * param0) +static BOOL sub_02043938 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; u32 v1 = sub_0205B8D8(v0->unk_7C); - u16 * v2 = sub_0203F118(v0, param0->unk_18[0]); + u16 * v2 = sub_0203F118(v0, param0->data[0]); if (v1 == 0) { return 0; @@ -5509,23 +5509,23 @@ static BOOL sub_02043938 (UnkStruct_0203E724 * param0) return 1; } -static BOOL sub_02043964 (UnkStruct_0203E724 * param0) +static BOOL sub_02043964 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; UnkStruct_0205C22C * v1 = v0->unk_80; sub_0205C820(v0->unk_38, v1); return 0; } -static BOOL sub_02043978 (UnkStruct_0203E724 * param0) +static BOOL sub_02043978 (ScriptContext * param0) { sub_0205BEA8(4); sub_02036BA0(); return 0; } -static BOOL sub_02043988 (UnkStruct_0203E724 * param0) +static BOOL sub_02043988 (ScriptContext * param0) { sub_02036BD8(); sub_02036AC4(); @@ -5533,35 +5533,35 @@ static BOOL sub_02043988 (UnkStruct_0203E724 * param0) return 0; } -static BOOL sub_0204399C (UnkStruct_0203E724 * param0) +static BOOL sub_0204399C (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; - u16 v1 = inline_02049538(param0); - u16 v2 = inline_02049538(param0); + FieldSystem * v0 = param0->fieldSys; + u16 v1 = ScriptContext_GetVar(param0); + u16 v2 = ScriptContext_GetVar(param0); sub_0205B930(v0->unk_7C, v1, v2); return 0; } -static BOOL sub_020439D8 (UnkStruct_0203E724 * param0) +static BOOL sub_020439D8 (ScriptContext * param0) { - u16 v0 = sub_0203E838(param0); + u16 v0 = ScriptContext_ReadHalfWord(param0); - param0->unk_18[0] = v0; - sub_0203E764(param0, sub_020439F4); + param0->data[0] = v0; + ScriptContext_Pause(param0, sub_020439F4); return 1; } -static BOOL sub_020439F4 (UnkStruct_0203E724 * param0) +static BOOL sub_020439F4 (ScriptContext * param0) { - u16 * v0 = sub_0203F118(param0->unk_34, param0->unk_18[0]); - u32 v1 = sub_0205B8DC(param0->unk_34->unk_7C); + u16 * v0 = sub_0203F118(param0->fieldSys, param0->data[0]); + u32 v1 = sub_0205B8DC(param0->fieldSys->unk_7C); if (v1 >= 1) { *v0 = v1; - sub_0205C154(param0->unk_34->unk_7C); + sub_0205C154(param0->fieldSys->unk_7C); return 1; } @@ -5569,23 +5569,23 @@ static BOOL sub_020439F4 (UnkStruct_0203E724 * param0) return 0; } -static BOOL sub_02043A30 (UnkStruct_0203E724 * param0) +static BOOL sub_02043A30 (ScriptContext * param0) { - u16 v0 = sub_0203E838(param0); + u16 v0 = ScriptContext_ReadHalfWord(param0); - param0->unk_18[0] = v0; - sub_0203E764(param0, sub_02043A4C); + param0->data[0] = v0; + ScriptContext_Pause(param0, sub_02043A4C); return 1; } -static BOOL sub_02043A4C (UnkStruct_0203E724 * param0) +static BOOL sub_02043A4C (ScriptContext * param0) { - u16 * v0 = sub_0203F118(param0->unk_34, param0->unk_18[0]); - u32 v1 = sub_0205B91C(param0->unk_34->unk_7C); + u16 * v0 = sub_0203F118(param0->fieldSys, param0->data[0]); + u32 v1 = sub_0205B91C(param0->fieldSys->unk_7C); if (gCoreSys.pressedKeys & PAD_BUTTON_B) { - v1 = sub_0205B9EC(param0->unk_34->unk_7C, 8); + v1 = sub_0205B9EC(param0->fieldSys->unk_7C, 8); if (v1) { (void)0; @@ -5602,26 +5602,26 @@ static BOOL sub_02043A4C (UnkStruct_0203E724 * param0) return 0; } -static BOOL sub_02043A94 (UnkStruct_0203E724 * param0) +static BOOL sub_02043A94 (ScriptContext * param0) { - sub_02054708(param0->unk_34->unk_10); + sub_02054708(param0->fieldSys->unk_10); return 1; } -static BOOL sub_02043AA4 (UnkStruct_0203E724 * param0) +static BOOL sub_02043AA4 (ScriptContext * param0) { - TrainerInfo * v0 = SaveData_GetTrainerInfo(FieldSystem_SaveData(param0->unk_34)); - StringTemplate ** v1 = sub_0203F098(param0->unk_34, 15); + TrainerInfo * v0 = SaveData_GetTrainerInfo(FieldSystem_SaveData(param0->fieldSys)); + StringTemplate ** v1 = sub_0203F098(param0->fieldSys, 15); sub_0205C980(TrainerInfo_ID(v0), TrainerInfo_Gender(v0), *v1); return 0; } -static BOOL sub_02043AE0 (UnkStruct_0203E724 * param0) +static BOOL sub_02043AE0 (ScriptContext * param0) { - TrainerInfo * v0 = SaveData_GetTrainerInfo(FieldSystem_SaveData(param0->unk_34)); - u16 v1 = inline_02049538(param0); - u16 * v2 = inline_0204FCAC(param0); + TrainerInfo * v0 = SaveData_GetTrainerInfo(FieldSystem_SaveData(param0->fieldSys)); + u16 v1 = ScriptContext_GetVar(param0); + u16 * v2 = ScriptContext_GetVarPointer(param0); *v2 = sub_0205C9BC(TrainerInfo_ID(v0), TrainerInfo_Gender(v0), v1); *v2 = sub_0205CA14(TrainerInfo_Gender(v0), *v2, 2); @@ -5629,71 +5629,71 @@ static BOOL sub_02043AE0 (UnkStruct_0203E724 * param0) return 0; } -static BOOL sub_02043B48 (UnkStruct_0203E724 * param0) +static BOOL sub_02043B48 (ScriptContext * param0) { - TrainerInfo * v0 = SaveData_GetTrainerInfo(FieldSystem_SaveData(param0->unk_34)); - u16 v1 = inline_02049538(param0); - u16 * v2 = inline_0204FCAC(param0); + TrainerInfo * v0 = SaveData_GetTrainerInfo(FieldSystem_SaveData(param0->fieldSys)); + u16 v1 = ScriptContext_GetVar(param0); + u16 * v2 = ScriptContext_GetVarPointer(param0); *v2 = sub_0205C9BC(TrainerInfo_ID(v0), TrainerInfo_Gender(v0), v1); return 0; } -static BOOL sub_02043BA0 (UnkStruct_0203E724 * param0) +static BOOL sub_02043BA0 (ScriptContext * param0) { - TrainerInfo * v0 = SaveData_GetTrainerInfo(FieldSystem_SaveData(param0->unk_34)); - u16 v1 = inline_02049538(param0); + TrainerInfo * v0 = SaveData_GetTrainerInfo(FieldSystem_SaveData(param0->fieldSys)); + u16 v1 = ScriptContext_GetVar(param0); TrainerInfo_SetAppearance(v0, v1); return 0; } -static BOOL sub_02043BD4 (UnkStruct_0203E724 * param0) +static BOOL sub_02043BD4 (ScriptContext * param0) { - sub_02052C5C(param0->unk_28); + sub_02052C5C(param0->taskManager); return 1; } -static BOOL sub_02043BE0 (UnkStruct_0203E724 * param0) +static BOOL sub_02043BE0 (ScriptContext * param0) { - u16 v0 = inline_02049538(param0); - FieldSystem * v1 = param0->unk_34; + u16 v0 = ScriptContext_GetVar(param0); + FieldSystem * v1 = param0->fieldSys; sub_0203A764(sub_0203A790(v1->saveData), v0); return 0; } -static BOOL sub_02043C0C (UnkStruct_0203E724 * param0) +static BOOL sub_02043C0C (ScriptContext * param0) { - TrainerInfo * v0 = SaveData_GetTrainerInfo(FieldSystem_SaveData(param0->unk_34)); - u16 * v1 = inline_0204FCAC(param0); + TrainerInfo * v0 = SaveData_GetTrainerInfo(FieldSystem_SaveData(param0->fieldSys)); + u16 * v1 = ScriptContext_GetVarPointer(param0); *v1 = TrainerInfo_Gender(v0); return 0; } -static BOOL sub_02043C3C (UnkStruct_0203E724 * param0) +static BOOL sub_02043C3C (ScriptContext * param0) { - FieldSystem * v0 = TaskManager_FieldSystem(param0->unk_28); + FieldSystem * v0 = TaskManager_FieldSystem(param0->taskManager); HealAllPokemonInParty(Party_GetFromSavedata(v0->saveData)); return 0; } -static BOOL sub_02043C54 (UnkStruct_0203E724 * param0) +static BOOL sub_02043C54 (ScriptContext * param0) { return 0; } -static BOOL sub_02043C58 (UnkStruct_0203E724 * param0) +static BOOL sub_02043C58 (ScriptContext * param0) { FieldCommMan_EndBattle(); - sub_0203E764(param0, sub_02043C70); + ScriptContext_Pause(param0, sub_02043C70); return 1; } -static BOOL sub_02043C70 (UnkStruct_0203E724 * param0) +static BOOL sub_02043C70 (ScriptContext * param0) { if (CommMan_IsInitialized() != 1) { if (sub_02033E1C() != 1) { @@ -5704,54 +5704,54 @@ static BOOL sub_02043C70 (UnkStruct_0203E724 * param0) return 0; } -static BOOL sub_02043C8C (UnkStruct_0203E724 * param0) +static BOOL sub_02043C8C (ScriptContext * param0) { sub_020598A0(); - sub_0203E764(param0, sub_02043C70); + ScriptContext_Pause(param0, sub_02043C70); return 1; } -static BOOL sub_02043CA4 (UnkStruct_0203E724 * param0) +static BOOL sub_02043CA4 (ScriptContext * param0) { - FieldCommMan_EnterBattleRoom(param0->unk_34); + FieldCommMan_EnterBattleRoom(param0->fieldSys); return 0; } -static BOOL sub_02043CB4 (UnkStruct_0203E724 * param0) +static BOOL sub_02043CB4 (ScriptContext * param0) { - CommPlayer_SetDir(sub_0203E838(param0)); + CommPlayer_SetDir(ScriptContext_ReadHalfWord(param0)); return 0; } -static BOOL sub_02043CC4 (UnkStruct_0203E724 * param0) +static BOOL sub_02043CC4 (ScriptContext * param0) { - u16 v0 = inline_02049538(param0); - u16 * v1 = inline_0204FCAC(param0); + u16 v0 = ScriptContext_GetVar(param0); + u16 * v1 = ScriptContext_GetVarPointer(param0); - *v1 = sub_0207D69C(sub_0207D990(param0->unk_34->saveData), v0); + *v1 = sub_0207D69C(sub_0207D990(param0->fieldSys->saveData), v0); return 0; } -static BOOL sub_02043D04 (UnkStruct_0203E724 * param0) +static BOOL sub_02043D04 (ScriptContext * param0) { - u16 v0 = inline_02049538(param0); - u16 v1 = inline_02049538(param0); - u16 v2 = inline_02049538(param0); + u16 v0 = ScriptContext_GetVar(param0); + u16 v1 = ScriptContext_GetVar(param0); + u16 v2 = ScriptContext_GetVar(param0); - sub_0203A4C4(param0->unk_34, v0, v1, v2); + sub_0203A4C4(param0->fieldSys, v0, v1, v2); return 0; } -static BOOL sub_02043D54 (UnkStruct_0203E724 * param0) +static BOOL sub_02043D54 (ScriptContext * param0) { LocalMapObject * v0; - u16 v1 = inline_02049538(param0); - u16 v2 = inline_02049538(param0); - u16 v3 = inline_02049538(param0); - u16 v4 = inline_02049538(param0); - u16 v5 = inline_02049538(param0); + u16 v1 = ScriptContext_GetVar(param0); + u16 v2 = ScriptContext_GetVar(param0); + u16 v3 = ScriptContext_GetVar(param0); + u16 v4 = ScriptContext_GetVar(param0); + u16 v5 = ScriptContext_GetVar(param0); - v0 = sub_0206251C(param0->unk_34->unk_38, v1); + v0 = sub_0206251C(param0->fieldSys->unk_38, v1); LocalMapObj_SetPosDir(v0, v2, v3, v4, v5); sub_020642F8(v0); @@ -5759,51 +5759,51 @@ static BOOL sub_02043D54 (UnkStruct_0203E724 * param0) return 0; } -static BOOL sub_02043DE4 (UnkStruct_0203E724 * param0) +static BOOL sub_02043DE4 (ScriptContext * param0) { - u16 v0 = inline_02049538(param0); - u16 v1 = inline_02049538(param0); + u16 v0 = ScriptContext_GetVar(param0); + u16 v1 = ScriptContext_GetVar(param0); - sub_0203A52C(param0->unk_34, v0, v1); + sub_0203A52C(param0->fieldSys, v0, v1); return 0; } -static BOOL sub_02043E1C (UnkStruct_0203E724 * param0) +static BOOL sub_02043E1C (ScriptContext * param0) { - u16 v0 = inline_02049538(param0); - u16 v1 = inline_02049538(param0); + u16 v0 = ScriptContext_GetVar(param0); + u16 v1 = ScriptContext_GetVar(param0); - sub_0203A4FC(param0->unk_34, v0, v1); + sub_0203A4FC(param0->fieldSys, v0, v1); return 0; } -static BOOL sub_02043E54 (UnkStruct_0203E724 * param0) +static BOOL sub_02043E54 (ScriptContext * param0) { - u16 v0 = inline_02049538(param0); - u16 v1 = inline_02049538(param0); - u16 v2 = inline_02049538(param0); + u16 v0 = ScriptContext_GetVar(param0); + u16 v1 = ScriptContext_GetVar(param0); + u16 v2 = ScriptContext_GetVar(param0); - sub_0203A55C(param0->unk_34, v0, v1, v2); + sub_0203A55C(param0->fieldSys, v0, v1, v2); return 0; } -static BOOL sub_02043EA4 (UnkStruct_0203E724 * param0) +static BOOL sub_02043EA4 (ScriptContext * param0) { - u16 v0 = inline_02049538(param0); - u16 v1 = inline_02049538(param0); - u16 v2 = inline_02049538(param0); + u16 v0 = ScriptContext_GetVar(param0); + u16 v1 = ScriptContext_GetVar(param0); + u16 v2 = ScriptContext_GetVar(param0); - sub_0203A594(param0->unk_34, v0, v1, v2); + sub_0203A594(param0->fieldSys, v0, v1, v2); return 0; } -static BOOL sub_02043EF4 (UnkStruct_0203E724 * param0) +static BOOL sub_02043EF4 (ScriptContext * param0) { LocalMapObject * v0; - u16 v1 = inline_02049538(param0); - u16 v2 = inline_02049538(param0); + u16 v1 = ScriptContext_GetVar(param0); + u16 v2 = ScriptContext_GetVar(param0); - v0 = sub_0206251C(param0->unk_34->unk_38, v1); + v0 = sub_0206251C(param0->fieldSys->unk_38, v1); if (v0 == NULL) { GF_ASSERT(FALSE); @@ -5813,10 +5813,10 @@ static BOOL sub_02043EF4 (UnkStruct_0203E724 * param0) return 0; } -static BOOL sub_02043F40 (UnkStruct_0203E724 * param0) +static BOOL sub_02043F40 (ScriptContext * param0) { - u16 ** v0 = sub_0203F098(param0->unk_34, 12); - u16 v1 = inline_02049538(param0); + u16 ** v0 = sub_0203F098(param0->fieldSys, 12); + u16 v1 = ScriptContext_GetVar(param0); if (*v0 != NULL) { **v0 = v1; @@ -5825,7 +5825,7 @@ static BOOL sub_02043F40 (UnkStruct_0203E724 * param0) return 0; } -static BOOL sub_02043F6C (UnkStruct_0203E724 * param0) +static BOOL sub_02043F6C (ScriptContext * param0) { u16 v0, v1; u16 v2, v3; @@ -5833,12 +5833,12 @@ static BOOL sub_02043F6C (UnkStruct_0203E724 * param0) u8 v6; FieldSystem * v7; - v0 = sub_0203E838(param0); - v1 = sub_0203E838(param0); - v2 = inline_02049538(param0); - v3 = inline_02049538(param0); - v6 = (*((param0)->unk_08++)); - v7 = param0->unk_34; + v0 = ScriptContext_ReadHalfWord(param0); + v1 = ScriptContext_ReadHalfWord(param0); + v2 = ScriptContext_GetVar(param0); + v3 = ScriptContext_GetVar(param0); + v6 = ScriptContext_ReadByte(param0); + v7 = param0->fieldSys; v4 = v0 * 32 + v2; v5 = v1 * 32 + v3; @@ -5847,152 +5847,152 @@ static BOOL sub_02043F6C (UnkStruct_0203E724 * param0) return 0; } -static BOOL sub_02043FC4 (UnkStruct_0203E724 * param0) +static BOOL sub_02043FC4 (ScriptContext * param0) { u8 v0; FieldSystem * v1; - v0 = (*((param0)->unk_08++)); - v1 = param0->unk_34; + v0 = ScriptContext_ReadByte(param0); + v1 = param0->fieldSys; ov5_021D4D48(v1, v0); return 1; } -static BOOL sub_02043FDC (UnkStruct_0203E724 * param0) +static BOOL sub_02043FDC (ScriptContext * param0) { u8 v0; FieldSystem * v1; - v0 = (*((param0)->unk_08++)); - v1 = param0->unk_34; + v0 = ScriptContext_ReadByte(param0); + v1 = param0->fieldSys; ov5_021D4D68(v1, v0); return 0; } -static BOOL sub_02043FF4 (UnkStruct_0203E724 * param0) +static BOOL sub_02043FF4 (ScriptContext * param0) { u8 v0; FieldSystem * v1; - v0 = (*((param0)->unk_08++)); - v1 = param0->unk_34; + v0 = ScriptContext_ReadByte(param0); + v1 = param0->fieldSys; ov5_021D4C88(v1, v0); return 0; } -static BOOL sub_0204400C (UnkStruct_0203E724 * param0) +static BOOL sub_0204400C (ScriptContext * param0) { u8 v0; FieldSystem * v1; - v0 = (*((param0)->unk_08++)); - v1 = param0->unk_34; + v0 = ScriptContext_ReadByte(param0); + v1 = param0->fieldSys; ov5_021D4CEC(v1, v0); return 0; } -static BOOL sub_02044024 (UnkStruct_0203E724 * param0) +static BOOL sub_02044024 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; sub_02071B10(v0); return 0; } -static BOOL sub_02044034 (UnkStruct_0203E724 * param0) +static BOOL sub_02044034 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; ov8_0224997C(v0); return 1; } -static BOOL sub_02044044 (UnkStruct_0203E724 * param0) +static BOOL sub_02044044 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; sub_02071C18(v0); return 0; } -static BOOL sub_02044054 (UnkStruct_0203E724 * param0) +static BOOL sub_02044054 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; ov8_02249FB8(v0); return 1; } -static BOOL sub_02044064 (UnkStruct_0203E724 * param0) +static BOOL sub_02044064 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; sub_02071B30(v0); return 0; } -static BOOL sub_02044074 (UnkStruct_0203E724 * param0) +static BOOL sub_02044074 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; sub_02071BF8(v0); return 0; } -static BOOL sub_02044084 (UnkStruct_0203E724 * param0) +static BOOL sub_02044084 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; - u8 v1 = (*((param0)->unk_08++)); + FieldSystem * v0 = param0->fieldSys; + u8 v1 = ScriptContext_ReadByte(param0); sub_02071B6C(v0, v1); return 0; } -static BOOL sub_020440A0 (UnkStruct_0203E724 * param0) +static BOOL sub_020440A0 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; - u8 v1 = (*((param0)->unk_08++)); + FieldSystem * v0 = param0->fieldSys; + u8 v1 = ScriptContext_ReadByte(param0); ov8_0224AD34(v0, v1); return 1; } -static BOOL sub_020440BC (UnkStruct_0203E724 * param0) +static BOOL sub_020440BC (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; sub_02071BD0(v0); return 0; } -static BOOL sub_020440CC (UnkStruct_0203E724 * param0) +static BOOL sub_020440CC (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; sub_02071C34(v0); return 0; } -static BOOL sub_020440DC (UnkStruct_0203E724 * param0) +static BOOL sub_020440DC (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; sub_02071C5C(v0); return 0; } -static BOOL sub_020440EC (UnkStruct_0203E724 * param0) +static BOOL sub_020440EC (ScriptContext * param0) { u16 * v0, * v1, * v2; - FieldSystem * v3 = param0->unk_34; + FieldSystem * v3 = param0->fieldSys; - v0 = inline_0204FCAC(param0); - v2 = inline_0204FCAC(param0); - v1 = inline_0204FCAC(param0); + v0 = ScriptContext_GetVarPointer(param0); + v2 = ScriptContext_GetVarPointer(param0); + v1 = ScriptContext_GetVarPointer(param0); { LocalMapObject * v4 = Player_LocalMapObject(v3->playerAvatar); @@ -6005,30 +6005,30 @@ static BOOL sub_020440EC (UnkStruct_0203E724 * param0) return 0; } -static BOOL sub_02044158 (UnkStruct_0203E724 * param0) +static BOOL sub_02044158 (ScriptContext * param0) { - sub_0203E2FC(param0->unk_34); + sub_0203E2FC(param0->fieldSys); return 1; } -static BOOL sub_02044168 (UnkStruct_0203E724 * param0) +static BOOL sub_02044168 (ScriptContext * param0) { - void ** v0 = sub_0203F098(param0->unk_34, 20); - LocalMapObject ** v1 = sub_0203F098(param0->unk_34, 10); - u16 v2 = inline_02049538(param0); - u16 v3 = sub_0203E838(param0); + void ** v0 = sub_0203F098(param0->fieldSys, 20); + LocalMapObject ** v1 = sub_0203F098(param0->fieldSys, 10); + u16 v2 = ScriptContext_GetVar(param0); + u16 v3 = ScriptContext_ReadHalfWord(param0); - param0->unk_18[0] = v3; - *v0 = ov23_02252C98(v2, param0->unk_34, sub_02062910(*v1)); + param0->data[0] = v3; + *v0 = ov23_02252C98(v2, param0->fieldSys, sub_02062910(*v1)); - sub_0203E764(param0, sub_020441C8); + ScriptContext_Pause(param0, sub_020441C8); return 1; } -static BOOL sub_020441C8 (UnkStruct_0203E724 * param0) +static BOOL sub_020441C8 (ScriptContext * param0) { - void ** v0 = sub_0203F098(param0->unk_34, 20); - u16 * v1 = sub_0203F118(param0->unk_34, param0->unk_18[0]); + void ** v0 = sub_0203F098(param0->fieldSys, 20); + u16 * v1 = sub_0203F118(param0->fieldSys, param0->data[0]); *v1 = ov23_02252C70((*v0)); @@ -6039,57 +6039,57 @@ static BOOL sub_020441C8 (UnkStruct_0203E724 * param0) return 1; } -static BOOL sub_02044208 (UnkStruct_0203E724 * param0) +static BOOL sub_02044208 (ScriptContext * param0) { - u8 * v0 = sub_0203F098(param0->unk_34, 3); + u8 * v0 = sub_0203F098(param0->fieldSys, 3); - *v0 = ov23_02252C9C(inline_02049538(param0)); - sub_0203E764(param0, sub_02044240); + *v0 = ov23_02252C9C(ScriptContext_GetVar(param0)); + ScriptContext_Pause(param0, sub_02044240); return 1; } -static BOOL sub_02044240 (UnkStruct_0203E724 * param0) +static BOOL sub_02044240 (ScriptContext * param0) { - u8 * v0 = sub_0203F098(param0->unk_34, 3); + u8 * v0 = sub_0203F098(param0->fieldSys, 3); return sub_0205DA04(*v0); } -static BOOL sub_02044254 (UnkStruct_0203E724 * param0) +static BOOL sub_02044254 (ScriptContext * param0) { ov23_02252CD4(); return 0; } -static BOOL sub_02044260 (UnkStruct_0203E724 * param0) +static BOOL sub_02044260 (ScriptContext * param0) { - u8 v0 = (*((param0)->unk_08++)); - u16 v1 = inline_02049538(param0); + u8 v0 = ScriptContext_ReadByte(param0); + u16 v1 = ScriptContext_GetVar(param0); ov23_02252CE0(v0, v1); return 0; } -static BOOL sub_02044288 (UnkStruct_0203E724 * param0) +static BOOL sub_02044288 (ScriptContext * param0) { - u8 v0 = (*((param0)->unk_08++)); - u16 v1 = inline_02049538(param0); + u8 v0 = ScriptContext_ReadByte(param0); + u16 v1 = ScriptContext_GetVar(param0); ov23_02252CF4(v0, v1); return 0; } -static BOOL sub_020442B0 (UnkStruct_0203E724 * param0) +static BOOL sub_020442B0 (ScriptContext * param0) { return 1; } -static BOOL sub_020442B4 (UnkStruct_0203E724 * param0) +static BOOL sub_020442B4 (ScriptContext * param0) { LocalMapObject * v0; - FieldSystem * v1 = param0->unk_34; + FieldSystem * v1 = param0->fieldSys; - v0 = sub_0206251C(v1->unk_38, inline_02049538(param0)); + v0 = sub_0206251C(v1->unk_38, ScriptContext_GetVar(param0)); if (v0 == NULL) { GF_ASSERT(FALSE); @@ -6099,12 +6099,12 @@ static BOOL sub_020442B4 (UnkStruct_0203E724 * param0) return 0; } -static BOOL sub_020442E8 (UnkStruct_0203E724 * param0) +static BOOL sub_020442E8 (ScriptContext * param0) { LocalMapObject * v0; - FieldSystem * v1 = param0->unk_34; + FieldSystem * v1 = param0->fieldSys; - v0 = sub_0206251C(v1->unk_38, inline_02049538(param0)); + v0 = sub_0206251C(v1->unk_38, ScriptContext_GetVar(param0)); if (v0 == NULL) { GF_ASSERT(FALSE); @@ -6114,115 +6114,115 @@ static BOOL sub_020442E8 (UnkStruct_0203E724 * param0) return 0; } -static BOOL sub_0204431C (UnkStruct_0203E724 * param0) +static BOOL sub_0204431C (ScriptContext * param0) { - sub_020736D8(param0->unk_28); + sub_020736D8(param0->taskManager); return 1; } -static BOOL sub_02044328 (UnkStruct_0203E724 * param0) +static BOOL sub_02044328 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; - u16 * v1 = inline_0204FCAC(param0); + FieldSystem * v0 = param0->fieldSys; + u16 * v1 = ScriptContext_GetVarPointer(param0); UnkStruct_02028430 * v2 = sub_02028430(v0->saveData); *v1 = (u16)sub_02028494(v2, 0); return 0; } -static BOOL sub_02044354 (UnkStruct_0203E724 * param0) +static BOOL sub_02044354 (ScriptContext * param0) { - u16 v0 = inline_02049538(param0); + u16 v0 = ScriptContext_GetVar(param0); - sub_020703FC(param0->unk_28, v0); + sub_020703FC(param0->taskManager, v0); return 1; } -static BOOL sub_02044374 (UnkStruct_0203E724 * param0) +static BOOL sub_02044374 (ScriptContext * param0) { - u16 * v0 = inline_0204FCAC(param0); + u16 * v0 = ScriptContext_GetVarPointer(param0); - *v0 = sub_02055BA8(param0->unk_34); + *v0 = sub_02055BA8(param0->fieldSys); return 0; } -static BOOL sub_02044398 (UnkStruct_0203E724 * param0) +static BOOL sub_02044398 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; - u16 * v1 = inline_0204FCAC(param0); - u16 v2 = inline_02049538(param0); + FieldSystem * v0 = param0->fieldSys; + u16 * v1 = ScriptContext_GetVarPointer(param0); + u16 v2 = ScriptContext_GetVar(param0); *v1 = (LCRNG_Next() % v2); return 1; } -static BOOL sub_020443D0 (UnkStruct_0203E724 * param0) +static BOOL sub_020443D0 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; - u16 * v1 = inline_0204FCAC(param0); - u16 v2 = inline_02049538(param0); + FieldSystem * v0 = param0->fieldSys; + u16 * v1 = ScriptContext_GetVarPointer(param0); + u16 v2 = ScriptContext_GetVar(param0); *v1 = (LCRNG_Next() % v2); return 1; } -static BOOL sub_02044408 (UnkStruct_0203E724 * param0) +static BOOL sub_02044408 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; - u16 * v1 = inline_0204FCAC(param0); - u16 v2 = inline_02049538(param0); + FieldSystem * v0 = param0->fieldSys; + u16 * v1 = ScriptContext_GetVarPointer(param0); + u16 v2 = ScriptContext_GetVar(param0); *v1 = ov5_021EE920(v0, v2); return 0; } -static BOOL sub_02044444 (UnkStruct_0203E724 * param0) +static BOOL sub_02044444 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; Pokemon * v1; - u16 v2 = inline_02049538(param0); + u16 v2 = ScriptContext_GetVar(param0); ov5_021EE9BC(v0, v2); return 0; } -static BOOL sub_02044468 (UnkStruct_0203E724 * param0) +static BOOL sub_02044468 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; - u16 v1 = inline_02049538(param0); - u16 v2 = inline_02049538(param0); - u16 v3 = inline_02049538(param0); + FieldSystem * v0 = param0->fieldSys; + u16 v1 = ScriptContext_GetVar(param0); + u16 v2 = ScriptContext_GetVar(param0); + u16 v3 = ScriptContext_GetVar(param0); ov5_021EEA84(v0, v1, v2, v3); return 0; } -static BOOL sub_020444BC (UnkStruct_0203E724 * param0) +static BOOL sub_020444BC (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; - u16 v1 = inline_02049538(param0); - u16 v2 = inline_02049538(param0); - u16 v3 = inline_02049538(param0); + FieldSystem * v0 = param0->fieldSys; + u16 v1 = ScriptContext_GetVar(param0); + u16 v2 = ScriptContext_GetVar(param0); + u16 v3 = ScriptContext_GetVar(param0); ov5_021EEA54(v0, v1, v2, v3); return 0; } -static BOOL sub_02044510 (UnkStruct_0203E724 * param0) +static BOOL sub_02044510 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; sub_0206B0C4(SaveData_Events(v0->saveData), 0x8200); return 0; } -static BOOL sub_02044528 (UnkStruct_0203E724 * param0) +static BOOL sub_02044528 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; inline_02044528(SaveData_Events(v0->saveData)); v0->unk_9C = sub_0202B634(sub_0202B628(v0->saveData), 1); @@ -6231,15 +6231,15 @@ static BOOL sub_02044528 (UnkStruct_0203E724 * param0) return 0; } -static BOOL sub_02044558 (UnkStruct_0203E724 * param0) +static BOOL sub_02044558 (ScriptContext * param0) { u8 v0; - u16 v1 = inline_02049538(param0); - u16 v2 = inline_02049538(param0); - u16 v3 = inline_02049538(param0); - u16 v4 = inline_02049538(param0); - u16 v5 = inline_02049538(param0); - void ** v6 = sub_0203F098(param0->unk_34, 20); + u16 v1 = ScriptContext_GetVar(param0); + u16 v2 = ScriptContext_GetVar(param0); + u16 v3 = ScriptContext_GetVar(param0); + u16 v4 = ScriptContext_GetVar(param0); + u16 v5 = ScriptContext_GetVar(param0); + void ** v6 = sub_0203F098(param0->fieldSys, 20); switch (v1) { case 16: @@ -6276,53 +6276,53 @@ static BOOL sub_02044558 (UnkStruct_0203E724 * param0) return 1; } - sub_0202B758(param0->unk_34->unk_9C, *v6, v0); + sub_0202B758(param0->fieldSys->unk_9C, *v6, v0); return 1; } -static BOOL sub_0204466C (UnkStruct_0203E724 * param0) +static BOOL sub_0204466C (ScriptContext * param0) { return 0; } -static BOOL sub_02044670 (UnkStruct_0203E724 * param0) +static BOOL sub_02044670 (ScriptContext * param0) { UnkStruct_0202A750 * v0; UnkStruct_02029D04 * v1; - u16 v2 = inline_02049538(param0); - u16 v3 = inline_02049538(param0); + u16 v2 = ScriptContext_GetVar(param0); + u16 v3 = ScriptContext_GetVar(param0); - v0 = sub_0202A750(param0->unk_34->saveData); + v0 = sub_0202A750(param0->fieldSys->saveData); v1 = sub_02029D04(v0); sub_02029E2C(v1, v2, v3); return 0; } -static BOOL sub_020446B4 (UnkStruct_0203E724 * param0) +static BOOL sub_020446B4 (ScriptContext * param0) { UnkStruct_0202A750 * v0; UnkStruct_02029D04 * v1; - u16 v2 = inline_02049538(param0); - u16 v3 = inline_02049538(param0); - u16 * v4 = inline_0204FCAC(param0); + u16 v2 = ScriptContext_GetVar(param0); + u16 v3 = ScriptContext_GetVar(param0); + u16 * v4 = ScriptContext_GetVarPointer(param0); - v0 = sub_0202A750(param0->unk_34->saveData); + v0 = sub_0202A750(param0->fieldSys->saveData); v1 = sub_02029D04(v0); *v4 = sub_02029D50(v1, v2, v3); return 0; } -static BOOL sub_02044710 (UnkStruct_0203E724 * param0) +static BOOL sub_02044710 (ScriptContext * param0) { UnkStruct_0202A750 * v0; UnkStruct_02029D04 * v1; - u16 v2 = inline_02049538(param0); - u16 v3 = inline_02049538(param0); - u16 * v4 = inline_0204FCAC(param0); + u16 v2 = ScriptContext_GetVar(param0); + u16 v3 = ScriptContext_GetVar(param0); + u16 * v4 = ScriptContext_GetVarPointer(param0); - v0 = sub_0202A750(param0->unk_34->saveData); + v0 = sub_0202A750(param0->fieldSys->saveData); v1 = sub_02029D04(v0); if (v3 <= sub_02029D94(v1, v2)) { @@ -6334,37 +6334,37 @@ static BOOL sub_02044710 (UnkStruct_0203E724 * param0) return 0; } -static BOOL sub_02044774 (UnkStruct_0203E724 * param0) +static BOOL sub_02044774 (ScriptContext * param0) { UnkStruct_0202A750 * v0; UnkStruct_02029D04 * v1; - u16 v2 = inline_02049538(param0); + u16 v2 = ScriptContext_GetVar(param0); - v0 = sub_0202A750(param0->unk_34->saveData); + v0 = sub_0202A750(param0->fieldSys->saveData); v1 = sub_02029D04(v0); sub_02029EFC(v1, v2); return 0; } -static BOOL sub_020447A4 (UnkStruct_0203E724 * param0) +static BOOL sub_020447A4 (ScriptContext * param0) { UnkStruct_0202A750 * v0; UnkStruct_02029D04 * v1; - u16 v2 = inline_02049538(param0); - u16 * v3 = inline_0204FCAC(param0); + u16 v2 = ScriptContext_GetVar(param0); + u16 * v3 = ScriptContext_GetVarPointer(param0); - v0 = sub_0202A750(param0->unk_34->saveData); + v0 = sub_0202A750(param0->fieldSys->saveData); v1 = sub_02029D04(v0); *v3 = sub_02029D80(v1, v2); return 0; } -static BOOL sub_020447E8 (UnkStruct_0203E724 * param0) +static BOOL sub_020447E8 (ScriptContext * param0) { - const PokedexData * v0 = SaveData_Pokedex(param0->unk_34->saveData); - u16 * v1 = inline_0204FCAC(param0); + const PokedexData * v0 = SaveData_Pokedex(param0->fieldSys->saveData); + u16 * v1 = ScriptContext_GetVarPointer(param0); *v1 = 0; @@ -6375,10 +6375,10 @@ static BOOL sub_020447E8 (UnkStruct_0203E724 * param0) return 0; } -static BOOL sub_02044820 (UnkStruct_0203E724 * param0) +static BOOL sub_02044820 (ScriptContext * param0) { - const PokedexData * v0 = SaveData_Pokedex(param0->unk_34->saveData); - u16 * v1 = inline_0204FCAC(param0); + const PokedexData * v0 = SaveData_Pokedex(param0->fieldSys->saveData); + u16 * v1 = ScriptContext_GetVarPointer(param0); *v1 = 0; @@ -6389,123 +6389,123 @@ static BOOL sub_02044820 (UnkStruct_0203E724 * param0) return 0; } -static BOOL sub_02044858 (UnkStruct_0203E724 * param0) +static BOOL sub_02044858 (ScriptContext * param0) { - void ** v0 = sub_0203F098(param0->unk_34, 19); + void ** v0 = sub_0203F098(param0->fieldSys, 19); - *v0 = sub_0203E53C(param0->unk_34, 32, 0); - sub_0203E764(param0, sub_02041CC8); + *v0 = sub_0203E53C(param0->fieldSys, 32, 0); + ScriptContext_Pause(param0, sub_02041CC8); return 1; } -static BOOL sub_02044888 (UnkStruct_0203E724 * param0) +static BOOL sub_02044888 (ScriptContext * param0) { - void ** v0 = sub_0203F098(param0->unk_34, 19); + void ** v0 = sub_0203F098(param0->fieldSys, 19); - *v0 = sub_0203E53C(param0->unk_34, 32, 1); - sub_0203E764(param0, sub_02041CC8); + *v0 = sub_0203E53C(param0->fieldSys, 32, 1); + ScriptContext_Pause(param0, sub_02041CC8); return 1; } -static BOOL sub_020448B8 (UnkStruct_0203E724 * param0) +static BOOL sub_020448B8 (ScriptContext * param0) { - ov6_022475B0(param0->unk_34->saveData); + ov6_022475B0(param0->fieldSys->saveData); return 0; } -static BOOL sub_020448C8 (UnkStruct_0203E724 * param0) +static BOOL sub_020448C8 (ScriptContext * param0) { - u16 * v0 = inline_0204FCAC(param0); + u16 * v0 = ScriptContext_GetVarPointer(param0); - (*v0) = ov6_02247624(param0->unk_34->saveData); + (*v0) = ov6_02247624(param0->fieldSys->saveData); return 0; } -static BOOL sub_020448F0 (UnkStruct_0203E724 * param0) +static BOOL sub_020448F0 (ScriptContext * param0) { - u16 * v0 = inline_0204FCAC(param0); + u16 * v0 = ScriptContext_GetVarPointer(param0); return 0; } -static BOOL sub_02044908 (UnkStruct_0203E724 * param0) +static BOOL sub_02044908 (ScriptContext * param0) { - u16 v0 = sub_0203E838(param0); + u16 v0 = ScriptContext_ReadHalfWord(param0); - sub_0202CF28(sub_0202CD88(param0->unk_34->saveData), v0); + sub_0202CF28(sub_0202CD88(param0->fieldSys->saveData), v0); return 0; } -static BOOL sub_02044928 (UnkStruct_0203E724 * param0) +static BOOL sub_02044928 (ScriptContext * param0) { u32 v0; u16 * v1, * v2; - u16 v3 = sub_0203E838(param0); - u16 v4 = sub_0203E838(param0); - u16 v5 = sub_0203E838(param0); + u16 v3 = ScriptContext_ReadHalfWord(param0); + u16 v4 = ScriptContext_ReadHalfWord(param0); + u16 v5 = ScriptContext_ReadHalfWord(param0); - v1 = sub_0203F118(param0->unk_34, v4); - v2 = sub_0203F118(param0->unk_34, v5); - v0 = sub_0202CFB8(sub_0202CD88(param0->unk_34->saveData), v3); + v1 = sub_0203F118(param0->fieldSys, v4); + v2 = sub_0203F118(param0->fieldSys, v5); + v0 = sub_0202CFB8(sub_0202CD88(param0->fieldSys->saveData), v3); *v1 = ((v0 & 0xFFFF0000) >> 16); *v2 = (v0 & 0xFFFF); return 0; } -static BOOL sub_02044980 (UnkStruct_0203E724 * param0) +static BOOL sub_02044980 (ScriptContext * param0) { u32 v0; - u16 v1 = sub_0203E838(param0); - u16 v2 = sub_0203E838(param0); - u16 v3 = sub_0203E838(param0); - u8 v4 = (*((param0)->unk_08++)); + u16 v1 = ScriptContext_ReadHalfWord(param0); + u16 v2 = ScriptContext_ReadHalfWord(param0); + u16 v3 = ScriptContext_ReadHalfWord(param0); + u8 v4 = ScriptContext_ReadByte(param0); v0 = (u32)(v2) << 16; v0 |= v3; switch (v4) { case 0: - sub_0202CF70(sub_0202CD88(param0->unk_34->saveData), v1, v0); + sub_0202CF70(sub_0202CD88(param0->fieldSys->saveData), v1, v0); break; case 1: - sub_0202CE90(sub_0202CD88(param0->unk_34->saveData), v1, v0); + sub_0202CE90(sub_0202CD88(param0->fieldSys->saveData), v1, v0); break; case 2: - sub_0202CED0(sub_0202CD88(param0->unk_34->saveData), v1, v0); + sub_0202CED0(sub_0202CD88(param0->fieldSys->saveData), v1, v0); break; } return 0; } -static BOOL sub_020449F4 (UnkStruct_0203E724 * param0) +static BOOL sub_020449F4 (ScriptContext * param0) { - u16 v0 = sub_0203E838(param0); - u16 v1 = inline_02049538(param0); + u16 v0 = ScriptContext_ReadHalfWord(param0); + u16 v1 = ScriptContext_GetVar(param0); - sub_0202CF70(sub_0202CD88(param0->unk_34->saveData), v0, v1); + sub_0202CF70(sub_0202CD88(param0->fieldSys->saveData), v0, v1); return 0; } -static BOOL sub_02044A28 (UnkStruct_0203E724 * param0) +static BOOL sub_02044A28 (ScriptContext * param0) { - u16 v0 = sub_0203E838(param0); - u32 v1 = sub_0203E850(param0); + u16 v0 = ScriptContext_ReadHalfWord(param0); + u32 v1 = ScriptContext_ReadWord(param0); - sub_0202CF70(sub_0202CD88(param0->unk_34->saveData), v0, v1); + sub_0202CF70(sub_0202CD88(param0->fieldSys->saveData), v0, v1); return 0; } -static BOOL sub_02044A50 (UnkStruct_0203E724 * param0) +static BOOL sub_02044A50 (ScriptContext * param0) { u16 * v0; u16 * v1; - UnkStruct_0203A790 * v2 = sub_0203A790(param0->unk_34->saveData); - UnkStruct_020507E4 * v3 = SaveData_Events(param0->unk_34->saveData); - TVBroadcast * v4 = SaveData_TVBroadcast(param0->unk_34->saveData); - int v5 = (*((param0)->unk_08++)); + UnkStruct_0203A790 * v2 = sub_0203A790(param0->fieldSys->saveData); + UnkStruct_020507E4 * v3 = SaveData_Events(param0->fieldSys->saveData); + TVBroadcast * v4 = SaveData_TVBroadcast(param0->fieldSys->saveData); + int v5 = ScriptContext_ReadByte(param0); v0 = sub_0203A784(v2); v1 = sub_0203A788(v2); @@ -6519,11 +6519,11 @@ static BOOL sub_02044A50 (UnkStruct_0203E724 * param0) break; case 1: sub_0206AE4C(v3); - sub_0206D720(param0->unk_34); + sub_0206D720(param0->fieldSys); { void * v6 = sub_0202BDE0(4); - sub_0202B758(param0->unk_34->unk_9C, v6, 1); + sub_0202B758(param0->fieldSys->unk_9C, v6, 1); } *v0 = 0; *v1 = 0; @@ -6533,68 +6533,68 @@ static BOOL sub_02044A50 (UnkStruct_0203E724 * param0) return 0; } -static BOOL sub_02044AE8 (UnkStruct_0203E724 * param0) +static BOOL sub_02044AE8 (ScriptContext * param0) { - sub_0206C0E8(param0->unk_34); + sub_0206C0E8(param0->fieldSys); return 1; } -static BOOL sub_02044AF8 (UnkStruct_0203E724 * param0) +static BOOL sub_02044AF8 (ScriptContext * param0) { - u8 v0 = (*((param0)->unk_08++)); - u16 * v1 = inline_0204FCAC(param0); + u8 v0 = ScriptContext_ReadByte(param0); + u16 * v1 = ScriptContext_GetVarPointer(param0); - *v1 = ov6_02243004(param0->unk_34, v0); + *v1 = ov6_02243004(param0->fieldSys, v0); return 1; } -static BOOL sub_02044B28 (UnkStruct_0203E724 * param0) +static BOOL sub_02044B28 (ScriptContext * param0) { - sub_02071CD0(param0->unk_34); + sub_02071CD0(param0->fieldSys); return 0; } -static BOOL sub_02044B38 (UnkStruct_0203E724 * param0) +static BOOL sub_02044B38 (ScriptContext * param0) { - u16 * v0 = inline_0204FCAC(param0); - u16 v1 = sub_0203E838(param0); + u16 * v0 = ScriptContext_GetVarPointer(param0); + u16 v1 = ScriptContext_ReadHalfWord(param0); sub_02004550(65, 0, 0); - ov6_02242B58(param0->unk_34, *v0, v1); + ov6_02242B58(param0->fieldSys, *v0, v1); return 1; } -static BOOL sub_02044B70 (UnkStruct_0203E724 * param0) +static BOOL sub_02044B70 (ScriptContext * param0) { - u16 v0 = sub_0203E838(param0); - u16 * v1 = inline_0204FCAC(param0); + u16 v0 = ScriptContext_ReadHalfWord(param0); + u16 * v1 = ScriptContext_GetVarPointer(param0); - *v1 = ov6_02242C3C(param0->unk_34, v0); + *v1 = ov6_02242C3C(param0->fieldSys, v0); return 0; } -static BOOL sub_02044BA0 (UnkStruct_0203E724 * param0) +static BOOL sub_02044BA0 (ScriptContext * param0) { - u8 v0 = (*((param0)->unk_08++)); + u8 v0 = ScriptContext_ReadByte(param0); - sub_0205ED2C(param0->unk_34->playerAvatar, v0); + sub_0205ED2C(param0->fieldSys->playerAvatar, v0); return 1; } -static BOOL sub_02044BB8 (UnkStruct_0203E724 * param0) +static BOOL sub_02044BB8 (ScriptContext * param0) { - UnkStruct_020507E4 * v0 = SaveData_Events(param0->unk_34->saveData); - u16 * v1 = inline_0204FCAC(param0); + UnkStruct_020507E4 * v0 = SaveData_Events(param0->fieldSys->saveData); + u16 * v1 = ScriptContext_GetVarPointer(param0); *v1 = sub_0206B354(v0); return 0; } -static BOOL sub_02044BE8 (UnkStruct_0203E724 * param0) +static BOOL sub_02044BE8 (ScriptContext * param0) { - const PokedexData * v0 = SaveData_Pokedex(param0->unk_34->saveData); - u16 * v1 = inline_0204FCAC(param0); + const PokedexData * v0 = SaveData_Pokedex(param0->fieldSys->saveData); + u16 * v1 = ScriptContext_GetVarPointer(param0); u16 v2, v3, v4, v5; v2 = sub_02026EAC(v0); @@ -6615,105 +6615,105 @@ static BOOL sub_02044BE8 (UnkStruct_0203E724 * param0) return 0; } -static BOOL sub_02044C64 (UnkStruct_0203E724 * param0) +static BOOL sub_02044C64 (ScriptContext * param0) { - u16 v0 = inline_02049538(param0); + u16 v0 = ScriptContext_GetVar(param0); - sub_0206B270(SaveData_Events(param0->unk_34->saveData), v0); + sub_0206B270(SaveData_Events(param0->fieldSys->saveData), v0); return 0; } -static BOOL sub_02044C90 (UnkStruct_0203E724 * param0) +static BOOL sub_02044C90 (ScriptContext * param0) { - u16 * v0 = inline_0204FCAC(param0); + u16 * v0 = ScriptContext_GetVarPointer(param0); - *v0 = sub_0206B260(SaveData_Events(param0->unk_34->saveData)); + *v0 = sub_0206B260(SaveData_Events(param0->fieldSys->saveData)); return 0; } -static BOOL sub_02044CBC (UnkStruct_0203E724 * param0) +static BOOL sub_02044CBC (ScriptContext * param0) { - sub_0202D884(param0->unk_34->saveData); + sub_0202D884(param0->fieldSys->saveData); return 0; } -static BOOL sub_02044CCC (UnkStruct_0203E724 * param0) +static BOOL sub_02044CCC (ScriptContext * param0) { - u8 v0 = (*((param0)->unk_08++)); + u8 v0 = ScriptContext_ReadByte(param0); - RoamingPokemon_ActivateSlot(param0->unk_34->saveData, v0); + RoamingPokemon_ActivateSlot(param0->fieldSys->saveData, v0); return 0; } -static BOOL sub_02044CE4 (UnkStruct_0203E724 * param0) +static BOOL sub_02044CE4 (ScriptContext * param0) { - void ** v0 = sub_0203F098(param0->unk_34, 20); - u8 v1 = (*((param0)->unk_08++)); + void ** v0 = sub_0203F098(param0->fieldSys, 20); + u8 v1 = ScriptContext_ReadByte(param0); *v0 = ov6_02246184(11, v1); return 0; } -static BOOL sub_02044D08 (UnkStruct_0203E724 * param0) +static BOOL sub_02044D08 (ScriptContext * param0) { - void ** v0 = sub_0203F098(param0->unk_34, 20); - u16 * v1 = inline_0204FCAC(param0); + void ** v0 = sub_0203F098(param0->fieldSys, 20); + u16 * v1 = ScriptContext_GetVarPointer(param0); *v1 = ov6_02246224((UnkStruct_ov6_02246204 *)*v0); return 0; } -static BOOL sub_02044D38 (UnkStruct_0203E724 * param0) +static BOOL sub_02044D38 (ScriptContext * param0) { - void ** v0 = sub_0203F098(param0->unk_34, 20); - u16 * v1 = inline_0204FCAC(param0); + void ** v0 = sub_0203F098(param0->fieldSys, 20); + u16 * v1 = ScriptContext_GetVarPointer(param0); *v1 = ov6_0224622C((UnkStruct_ov6_02246204 *)*v0); return 0; } -static BOOL sub_02044D68 (UnkStruct_0203E724 * param0) +static BOOL sub_02044D68 (ScriptContext * param0) { - void ** v0 = sub_0203F098(param0->unk_34, 20); - u16 v1 = inline_02049538(param0); + void ** v0 = sub_0203F098(param0->fieldSys, 20); + u16 v1 = ScriptContext_GetVar(param0); - sub_0206C740(param0->unk_28, (UnkStruct_ov6_02246204 *)*v0, v1, 11); + sub_0206C740(param0->taskManager, (UnkStruct_ov6_02246204 *)*v0, v1, 11); return 1; } -static BOOL sub_02044D9C (UnkStruct_0203E724 * param0) +static BOOL sub_02044D9C (ScriptContext * param0) { - void ** v0 = sub_0203F098(param0->unk_34, 20); + void ** v0 = sub_0203F098(param0->fieldSys, 20); ov6_02246204((UnkStruct_ov6_02246204 *)*v0); return 0; } -static BOOL sub_02044DB4 (UnkStruct_0203E724 * param0) +static BOOL sub_02044DB4 (ScriptContext * param0) { - sub_02027508(SaveData_Pokedex(param0->unk_34->saveData)); + sub_02027508(SaveData_Pokedex(param0->fieldSys->saveData)); return 0; } -static BOOL sub_02044DC8 (UnkStruct_0203E724 * param0) +static BOOL sub_02044DC8 (ScriptContext * param0) { - sub_020274B0(SaveData_Pokedex(param0->unk_34->saveData)); + sub_020274B0(SaveData_Pokedex(param0->fieldSys->saveData)); return 0; } -static BOOL sub_02044DDC (UnkStruct_0203E724 * param0) +static BOOL sub_02044DDC (ScriptContext * param0) { - u8 v0 = (*((param0)->unk_08++)); - u16 * v1 = inline_0204FCAC(param0); + u8 v0 = ScriptContext_ReadByte(param0); + u16 * v1 = ScriptContext_GetVarPointer(param0); *v1 = 0; if (v0 == 1) { - sub_02027454(SaveData_Pokedex(param0->unk_34->saveData)); - TrainerInfo_GiveNationalDex(SaveData_GetTrainerInfo(param0->unk_34->saveData)); + sub_02027454(SaveData_Pokedex(param0->fieldSys->saveData)); + TrainerInfo_GiveNationalDex(SaveData_GetTrainerInfo(param0->fieldSys->saveData)); } else if (v0 == 2) { - *v1 = sub_02027474(SaveData_Pokedex(param0->unk_34->saveData)); + *v1 = sub_02027474(SaveData_Pokedex(param0->fieldSys->saveData)); } else { GF_ASSERT(FALSE); } @@ -6721,14 +6721,14 @@ static BOOL sub_02044DDC (UnkStruct_0203E724 * param0) return 0; } -static BOOL sub_02044E40 (UnkStruct_0203E724 * param0) +static BOOL sub_02044E40 (ScriptContext * param0) { Pokemon * v0; - u16 * v1 = inline_0204FCAC(param0); - u16 v2 = inline_02049538(param0); + u16 * v1 = ScriptContext_GetVarPointer(param0); + u16 v2 = ScriptContext_GetVar(param0); u32 v3[7]; - v0 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(param0->unk_34->saveData), v2); + v0 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(param0->fieldSys->saveData), v2); v3[0] = Pokemon_GetValue(v0, MON_DATA_HP_EV, NULL); v3[1] = Pokemon_GetValue(v0, MON_DATA_ATK_EV, NULL); @@ -6741,10 +6741,10 @@ static BOOL sub_02044E40 (UnkStruct_0203E724 * param0) return 0; } -static BOOL sub_02044EDC (UnkStruct_0203E724 * param0) +static BOOL sub_02044EDC (ScriptContext * param0) { RTCDate v0; - u16 * v1 = inline_0204FCAC(param0); + u16 * v1 = ScriptContext_GetVarPointer(param0); GetCurrentDate(&v0); *v1 = v0.week; @@ -6752,23 +6752,23 @@ static BOOL sub_02044EDC (UnkStruct_0203E724 * param0) return 0; } -static BOOL sub_02044F04 (UnkStruct_0203E724 * param0) +static BOOL sub_02044F04 (ScriptContext * param0) { - u16 v0 = sub_0203E838(param0); + u16 v0 = ScriptContext_ReadHalfWord(param0); - ov7_0224BE7C(param0->unk_28, sub_0203F118(param0->unk_34, v0)); + ov7_0224BE7C(param0->taskManager, sub_0203F118(param0->fieldSys, v0)); return 1; } -static BOOL sub_02044F24 (UnkStruct_0203E724 * param0) +static BOOL sub_02044F24 (ScriptContext * param0) { Pokemon * v0; - u16 * v1 = inline_0204FCAC(param0); - u16 * v2 = inline_0204FCAC(param0); - u16 v3 = inline_02049538(param0); + u16 * v1 = ScriptContext_GetVarPointer(param0); + u16 * v2 = ScriptContext_GetVarPointer(param0); + u16 v3 = ScriptContext_GetVar(param0); u16 v4, v5; - v0 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(param0->unk_34->saveData), v3); + v0 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(param0->fieldSys->saveData), v3); v4 = Pokemon_GetValue(v0, MON_DATA_SPECIES, NULL); v5 = Pokemon_GetValue(v0, MON_DATA_FORM, NULL); *v1 = ov5_021F0E90(v4, v5); @@ -6777,53 +6777,53 @@ static BOOL sub_02044F24 (UnkStruct_0203E724 * param0) return 0; } -static BOOL sub_02044FA4 (UnkStruct_0203E724 * param0) +static BOOL sub_02044FA4 (ScriptContext * param0) { - u16 v0 = inline_02049538(param0); + u16 v0 = ScriptContext_GetVar(param0); - ov6_02246C24(param0->unk_34, v0); + ov6_02246C24(param0->fieldSys, v0); return 1; } -static BOOL sub_02044FCC (UnkStruct_0203E724 * param0) +static BOOL sub_02044FCC (ScriptContext * param0) { - u16 v0 = inline_02049538(param0); - u16 v1 = inline_02049538(param0); + u16 v0 = ScriptContext_GetVar(param0); + u16 v1 = ScriptContext_GetVar(param0); - ov6_02246F00(param0->unk_34, (u8)v0, (u8)v1); + ov6_02246F00(param0->fieldSys, (u8)v0, (u8)v1); return 1; } -static BOOL sub_0204500C (UnkStruct_0203E724 * param0) +static BOOL sub_0204500C (ScriptContext * param0) { - u8 v0 = (*((param0)->unk_08++)); - u8 v1 = (*((param0)->unk_08++)); - int v2 = sub_0203E838(param0); - int v3 = sub_0203E838(param0); - int v4 = sub_0203E838(param0); + u8 v0 = ScriptContext_ReadByte(param0); + u8 v1 = ScriptContext_ReadByte(param0); + int v2 = ScriptContext_ReadHalfWord(param0); + int v3 = ScriptContext_ReadHalfWord(param0); + int v4 = ScriptContext_ReadHalfWord(param0); - sub_0206C784(param0->unk_34, v0, v1, v2, v3, v4); + sub_0206C784(param0->fieldSys, v0, v1, v2, v3, v4); return 1; } -static BOOL sub_0204504C (UnkStruct_0203E724 * param0) +static BOOL sub_0204504C (ScriptContext * param0) { - u16 * v0 = inline_0204FCAC(param0); + u16 * v0 = ScriptContext_GetVarPointer(param0); *v0 = GAME_VERSION; return 0; } -static BOOL sub_02045068 (UnkStruct_0203E724 * param0) +static BOOL sub_02045068 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; - TrainerInfo * v1 = SaveData_GetTrainerInfo(FieldSystem_SaveData(param0->unk_34)); - u16 * v2 = inline_0204FCAC(param0); + FieldSystem * v0 = param0->fieldSys; + TrainerInfo * v1 = SaveData_GetTrainerInfo(FieldSystem_SaveData(param0->fieldSys)); + u16 * v2 = ScriptContext_GetVarPointer(param0); PCBoxes * v3 = SaveData_PCBoxes(v0->saveData); - u16 v4 = inline_02049538(param0); - u16 v5 = inline_02049538(param0); - u16 v6 = inline_02049538(param0); - u16 v7 = inline_02049538(param0); + u16 v4 = ScriptContext_GetVar(param0); + u16 v5 = ScriptContext_GetVar(param0); + u16 v6 = ScriptContext_GetVar(param0); + u16 v7 = ScriptContext_GetVar(param0); int v8; v8 = ov6_022479D0(v1, v4, v5, v6, v7, 4); @@ -6843,12 +6843,12 @@ static BOOL sub_02045068 (UnkStruct_0203E724 * param0) return 0; } -static BOOL sub_02045134 (UnkStruct_0203E724 * param0) +static BOOL sub_02045134 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; SaveData * v1 = v0->saveData; SecretBaseRecord * v2; - u16 * v3 = inline_0204FCAC(param0); + u16 * v3 = ScriptContext_GetVarPointer(param0); v2 = SaveData_SecretBaseRecord(v1); *v3 = sub_020295B8(v2); @@ -6856,38 +6856,38 @@ static BOOL sub_02045134 (UnkStruct_0203E724 * param0) return 0; } -static BOOL sub_02045160 (UnkStruct_0203E724 * param0) +static BOOL sub_02045160 (ScriptContext * param0) { FieldSystem * v0; u8 v1; - v0 = param0->unk_34; - v1 = (*((param0)->unk_08++)); + v0 = param0->fieldSys; + v1 = ScriptContext_ReadByte(param0); ov6_02247078(v0, v1); return 0; } -static BOOL sub_0204517C (UnkStruct_0203E724 * param0) +static BOOL sub_0204517C (ScriptContext * param0) { FieldSystem * v0; u8 v1; - v0 = param0->unk_34; - v1 = (*((param0)->unk_08++)); + v0 = param0->fieldSys; + v1 = ScriptContext_ReadByte(param0); ov6_022470E8(v0, v1); return 0; } -static BOOL sub_02045198 (UnkStruct_0203E724 * param0) +static BOOL sub_02045198 (ScriptContext * param0) { FieldSystem * v0; u8 v1; - v0 = param0->unk_34; - v1 = (*((param0)->unk_08++)); + v0 = param0->fieldSys; + v1 = ScriptContext_ReadByte(param0); ov6_022470F4(v0, v1); return 0; @@ -6906,68 +6906,68 @@ static void sub_020451B4 (FieldSystem * param0, u16 param1) return; } -static BOOL sub_020451F8 (UnkStruct_0203E724 * param0) +static BOOL sub_020451F8 (ScriptContext * param0) { - u16 v0 = inline_02049538(param0); + u16 v0 = ScriptContext_GetVar(param0); - sub_020451B4(param0->unk_34, v0); + sub_020451B4(param0->fieldSys, v0); return 0; } -static BOOL sub_0204521C (UnkStruct_0203E724 * param0) +static BOOL sub_0204521C (ScriptContext * param0) { - u16 * v0 = inline_0204FCAC(param0); + u16 * v0 = ScriptContext_GetVarPointer(param0); u16 v1; - v1 = sub_02079A50(SaveData_PCBoxes(param0->unk_34->saveData)); + v1 = sub_02079A50(SaveData_PCBoxes(param0->fieldSys->saveData)); *v0 = 18 * (5 * 6) - v1; return 0; } -static BOOL sub_02045250 (UnkStruct_0203E724 * param0) +static BOOL sub_02045250 (ScriptContext * param0) { - SysTask ** v0 = sub_0203F098(param0->unk_34, 22); + SysTask ** v0 = sub_0203F098(param0->fieldSys, 22); *v0 = NULL; - *v0 = ov5_021E1000(param0->unk_34); + *v0 = ov5_021E1000(param0->fieldSys); return 1; } -static BOOL sub_02045274 (UnkStruct_0203E724 * param0) +static BOOL sub_02045274 (ScriptContext * param0) { - SysTask ** v0 = sub_0203F098(param0->unk_34, 22); + SysTask ** v0 = sub_0203F098(param0->fieldSys, 22); ov5_021E100C(*v0); return 1; } -static BOOL sub_0204528C (UnkStruct_0203E724 * param0) +static BOOL sub_0204528C (ScriptContext * param0) { - u16 v0 = inline_02049538(param0); + u16 v0 = ScriptContext_GetVar(param0); - ov6_02247D30(param0->unk_34, v0); + ov6_02247D30(param0->fieldSys, v0); return 1; } -static BOOL sub_020452B4 (UnkStruct_0203E724 * param0) +static BOOL sub_020452B4 (ScriptContext * param0) { - sub_020716D4(param0->unk_34); + sub_020716D4(param0->fieldSys); return 0; } -static BOOL sub_020452C4 (UnkStruct_0203E724 * param0) +static BOOL sub_020452C4 (ScriptContext * param0) { - sub_0207183C(param0->unk_34); + sub_0207183C(param0->fieldSys); return 1; } -static BOOL sub_020452D4 (UnkStruct_0203E724 * param0) +static BOOL sub_020452D4 (ScriptContext * param0) { - u16 * v0 = inline_0204FCAC(param0); + u16 * v0 = ScriptContext_GetVarPointer(param0); - if (sub_02071818(param0->unk_34)) { + if (sub_02071818(param0->fieldSys)) { (*v0) = 1; } else { (*v0) = 0; @@ -6976,45 +6976,45 @@ static BOOL sub_020452D4 (UnkStruct_0203E724 * param0) return 0; } -static BOOL sub_02045304 (UnkStruct_0203E724 * param0) +static BOOL sub_02045304 (ScriptContext * param0) { - ov6_02247F5C(param0->unk_34); + ov6_02247F5C(param0->fieldSys); return 0; } -static BOOL sub_02045314 (UnkStruct_0203E724 * param0) +static BOOL sub_02045314 (ScriptContext * param0) { - ov6_02247FBC(param0->unk_34); + ov6_02247FBC(param0->fieldSys); return 1; } -static BOOL sub_02045324 (UnkStruct_0203E724 * param0) +static BOOL sub_02045324 (ScriptContext * param0) { - u16 v0 = sub_0203E838(param0); + u16 v0 = ScriptContext_ReadHalfWord(param0); - sub_0202CFEC(sub_0202CD88(param0->unk_34->saveData), v0); + sub_0202CFEC(sub_0202CD88(param0->fieldSys->saveData), v0); return 0; } -static BOOL sub_02045344 (UnkStruct_0203E724 * param0) +static BOOL sub_02045344 (ScriptContext * param0) { - u16 v0 = inline_02049538(param0); - u16 * v1 = inline_0204FCAC(param0); - Party * v2 = Party_GetFromSavedata(param0->unk_34->saveData); + u16 v0 = ScriptContext_GetVar(param0); + u16 * v1 = ScriptContext_GetVarPointer(param0); + Party * v2 = Party_GetFromSavedata(param0->fieldSys->saveData); *v1 = Party_HasSpecies(v2, v0); return 1; } -static BOOL sub_02045384 (UnkStruct_0203E724 * param0) +static BOOL sub_02045384 (ScriptContext * param0) { - u16 v0 = inline_02049538(param0); - Party * v1 = Party_GetFromSavedata(param0->unk_34->saveData); + u16 v0 = ScriptContext_GetVar(param0); + Party * v1 = Party_GetFromSavedata(param0->fieldSys->saveData); int v2; int v3; int v4 = Party_GetCurrentCount(v1); Pokemon * v5; - PokedexData * v6 = SaveData_Pokedex(param0->unk_34->saveData); + PokedexData * v6 = SaveData_Pokedex(param0->fieldSys->saveData); for (v2 = 0; v2 < v4; v2++) { v5 = Party_GetPokemonBySlotIndex(v1, v2); @@ -7030,12 +7030,12 @@ static BOOL sub_02045384 (UnkStruct_0203E724 * param0) return 1; } -static BOOL sub_02045404 (UnkStruct_0203E724 * param0) +static BOOL sub_02045404 (ScriptContext * param0) { Pokemon * v0; int v1, v2, v3, v4, v5, v6; - u16 * v7 = inline_0204FCAC(param0); - Party * v8 = Party_GetFromSavedata(param0->unk_34->saveData); + u16 * v7 = ScriptContext_GetVarPointer(param0); + Party * v8 = Party_GetFromSavedata(param0->fieldSys->saveData); int v9 = Party_GetCurrentCount(v8); v3 = 0; @@ -7069,91 +7069,91 @@ static BOOL sub_02045404 (UnkStruct_0203E724 * param0) return 1; } -static BOOL sub_020454C0 (UnkStruct_0203E724 * param0) +static BOOL sub_020454C0 (ScriptContext * param0) { - UnkStruct_020507E4 * v0 = SaveData_Events(param0->unk_34->saveData); + UnkStruct_020507E4 * v0 = SaveData_Events(param0->fieldSys->saveData); sub_0206AE0C(v0); return 0; } -static BOOL sub_020454D4 (UnkStruct_0203E724 * param0) +static BOOL sub_020454D4 (ScriptContext * param0) { - UnkStruct_020507E4 * v0 = SaveData_Events(param0->unk_34->saveData); + UnkStruct_020507E4 * v0 = SaveData_Events(param0->fieldSys->saveData); sub_0206AE1C(v0); return 0; } -static BOOL sub_020454E8 (UnkStruct_0203E724 * param0) +static BOOL sub_020454E8 (ScriptContext * param0) { - u16 v0 = inline_02049538(param0); + u16 v0 = ScriptContext_GetVar(param0); - sub_0203E414(param0->unk_34->unk_10, v0); + sub_0203E414(param0->fieldSys->unk_10, v0); return 1; } -static BOOL sub_0204550C (UnkStruct_0203E724 * param0) +static BOOL sub_0204550C (ScriptContext * param0) { - u16 * v0 = inline_0204FCAC(param0); + u16 * v0 = ScriptContext_GetVarPointer(param0); - *v0 = sub_02055BDC(param0->unk_34); + *v0 = sub_02055BDC(param0->fieldSys); return 0; } -static BOOL sub_02045530 (UnkStruct_0203E724 * param0) +static BOOL sub_02045530 (ScriptContext * param0) { LocalMapObject * v0; - u16 v1 = inline_02049538(param0); - u16 v2 = inline_02049538(param0); - u16 v3 = inline_02049538(param0); - u16 v4 = inline_02049538(param0); - u16 v5 = inline_02049538(param0); + u16 v1 = ScriptContext_GetVar(param0); + u16 v2 = ScriptContext_GetVar(param0); + u16 v3 = ScriptContext_GetVar(param0); + u16 v4 = ScriptContext_GetVar(param0); + u16 v5 = ScriptContext_GetVar(param0); - v0 = sub_0206251C(param0->unk_34->unk_38, v1); + v0 = sub_0206251C(param0->fieldSys->unk_38, v1); if (v0 == NULL) { GF_ASSERT(FALSE); } - sub_0205E318(param0->unk_28, v0, v2, v3, v4, v5); + sub_0205E318(param0->taskManager, v0, v2, v3, v4, v5); return 1; } -static BOOL sub_020455C4 (UnkStruct_0203E724 * param0) +static BOOL sub_020455C4 (ScriptContext * param0) { LocalMapObject * v0; - u16 v1 = inline_02049538(param0); - u16 v2 = inline_02049538(param0); - u16 v3 = inline_02049538(param0); + u16 v1 = ScriptContext_GetVar(param0); + u16 v2 = ScriptContext_GetVar(param0); + u16 v3 = ScriptContext_GetVar(param0); - v0 = sub_0206251C(param0->unk_34->unk_38, v1); + v0 = sub_0206251C(param0->fieldSys->unk_38, v1); if (v0 == NULL) { GF_ASSERT(FALSE); } - sub_0205E3F4(param0->unk_28, v0, v2, v3); + sub_0205E3F4(param0->taskManager, v0, v2, v3); return 1; } -static BOOL sub_02045628 (UnkStruct_0203E724 * param0) +static BOOL sub_02045628 (ScriptContext * param0) { - u16 * v0 = sub_0203F118(param0->unk_34, sub_0203E838(param0)); + u16 * v0 = sub_0203F118(param0->fieldSys, ScriptContext_ReadHalfWord(param0)); - *v0 = HasAllLegendaryTitansInParty(param0->unk_34->saveData); + *v0 = HasAllLegendaryTitansInParty(param0->fieldSys->saveData); return 0; } -static BOOL sub_02045650 (UnkStruct_0203E724 * param0) +static BOOL sub_02045650 (ScriptContext * param0) { UnkStruct_0202A750 * v0; UnkStruct_02029D04 * v1; u16 v2[16]; int v3, v4, v5, v6; - u16 * v7 = inline_0204FCAC(param0); + u16 * v7 = ScriptContext_GetVarPointer(param0); - v0 = sub_0202A750(param0->unk_34->saveData); + v0 = sub_0202A750(param0->fieldSys->saveData); v1 = sub_02029D04(v0); v4 = 0; @@ -7190,27 +7190,27 @@ static BOOL sub_02045650 (UnkStruct_0203E724 * param0) return 0; } -static BOOL sub_020456E8 (UnkStruct_0203E724 * param0) +static BOOL sub_020456E8 (ScriptContext * param0) { - u16 * v0 = inline_0204FCAC(param0); + u16 * v0 = ScriptContext_GetVarPointer(param0); *v0 = gCoreSys.unk_66; return 1; } -static BOOL sub_02045708 (UnkStruct_0203E724 * param0) +static BOOL sub_02045708 (ScriptContext * param0) { - UnkStruct_020507E4 * v0 = SaveData_Events(param0->unk_34->saveData); + UnkStruct_020507E4 * v0 = SaveData_Events(param0->fieldSys->saveData); sub_0206B364(v0, 0); return 0; } -static BOOL sub_02045720 (UnkStruct_0203E724 * param0) +static BOOL sub_02045720 (ScriptContext * param0) { - u16 v0 = inline_02049538(param0); - u8 v1 = (*((param0)->unk_08++)); - UnkStruct_020507E4 * v2 = SaveData_Events(param0->unk_34->saveData); + u16 v0 = ScriptContext_GetVar(param0); + u8 v1 = ScriptContext_ReadByte(param0); + UnkStruct_020507E4 * v2 = SaveData_Events(param0->fieldSys->saveData); if (v1) { sub_0206B1B0(v2, v0); @@ -7221,21 +7221,21 @@ static BOOL sub_02045720 (UnkStruct_0203E724 * param0) return 0; } -static BOOL sub_02045760 (UnkStruct_0203E724 * param0) +static BOOL sub_02045760 (ScriptContext * param0) { - StringTemplate ** v0 = sub_0203F098(param0->unk_34, 15); - u8 v1 = (*((param0)->unk_08++)); - u16 v2 = inline_02049538(param0); + StringTemplate ** v0 = sub_0203F098(param0->fieldSys, 15); + u8 v1 = ScriptContext_ReadByte(param0); + u16 v2 = ScriptContext_GetVar(param0); StringTemplate_SetContestBackdropName(*v0, v1, v2); return 1; } -static BOOL sub_02045798 (UnkStruct_0203E724 * param0) +static BOOL sub_02045798 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; - UnkStruct_020507E4 * v1 = SaveData_Events(param0->unk_34->saveData); - u16 * v2 = inline_0204FCAC(param0); + FieldSystem * v0 = param0->fieldSys; + UnkStruct_020507E4 * v1 = SaveData_Events(param0->fieldSys->saveData); + u16 * v2 = ScriptContext_GetVarPointer(param0); u32 v3; v3 = sub_0206B394(v1); @@ -7249,54 +7249,54 @@ static BOOL sub_02045798 (UnkStruct_0203E724 * param0) return 0; } -static BOOL sub_020457D0 (UnkStruct_0203E724 * param0) +static BOOL sub_020457D0 (ScriptContext * param0) { - u16 * v0 = inline_0204FCAC(param0); + u16 * v0 = ScriptContext_GetVarPointer(param0); - *v0 = sub_0206B314(SaveData_Events(param0->unk_34->saveData)); + *v0 = sub_0206B314(SaveData_Events(param0->fieldSys->saveData)); return 0; } -static BOOL sub_020457FC (UnkStruct_0203E724 * param0) +static BOOL sub_020457FC (ScriptContext * param0) { UnkStruct_0202A750 * v0; UnkStruct_02029D04 * v1; - u16 v2 = inline_02049538(param0); - u16 v3 = inline_02049538(param0); + u16 v2 = ScriptContext_GetVar(param0); + u16 v3 = ScriptContext_GetVar(param0); - v0 = sub_0202A750(param0->unk_34->saveData); + v0 = sub_0202A750(param0->fieldSys->saveData); v1 = sub_02029D04(v0); sub_02029EA0(v1, v2, v3); return 0; } -static BOOL sub_02045840 (UnkStruct_0203E724 * param0) +static BOOL sub_02045840 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; sub_02050568(v0); return 1; } -static BOOL sub_02045850 (UnkStruct_0203E724 * param0) +static BOOL sub_02045850 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; SaveData * v1 = v0->saveData; sub_0206B334(v1); return 0; } -static BOOL sub_02045860 (UnkStruct_0203E724 * param0) +static BOOL sub_02045860 (ScriptContext * param0) { UnkStruct_02014EC4 * v0; u32 v1; - u16 * v2 = inline_0204FCAC(param0); - u16 v3 = inline_02049538(param0); - StringTemplate ** v4 = sub_0203F098(param0->unk_34, 15); + u16 * v2 = ScriptContext_GetVarPointer(param0); + u16 v3 = ScriptContext_GetVar(param0); + StringTemplate ** v4 = sub_0203F098(param0->fieldSys, 15); - v0 = sub_02014EC4(param0->unk_34->saveData); + v0 = sub_02014EC4(param0->fieldSys->saveData); v1 = sub_02014EE4(v0); if (v1 == 32) { @@ -7316,12 +7316,12 @@ static BOOL sub_02045860 (UnkStruct_0203E724 * param0) return 0; } -static BOOL sub_020458CC (UnkStruct_0203E724 * param0) +static BOOL sub_020458CC (ScriptContext * param0) { UnkStruct_02014EC4 * v0; - u16 * v1 = inline_0204FCAC(param0); + u16 * v1 = ScriptContext_GetVarPointer(param0); - v0 = sub_02014EC4(param0->unk_34->saveData); + v0 = sub_02014EC4(param0->fieldSys->saveData); if (sub_02014F48(v0) == 1) { *v1 = 1; @@ -7332,11 +7332,11 @@ static BOOL sub_020458CC (UnkStruct_0203E724 * param0) return 0; } -static BOOL sub_02045900 (UnkStruct_0203E724 * param0) +static BOOL sub_02045900 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; - UnkStruct_020507E4 * v1 = SaveData_Events(param0->unk_34->saveData); - u16 * v2 = inline_0204FCAC(param0); + FieldSystem * v0 = param0->fieldSys; + UnkStruct_020507E4 * v1 = SaveData_Events(param0->fieldSys->saveData); + u16 * v2 = ScriptContext_GetVarPointer(param0); u16 v3; v3 = sub_0206B3DC(v1); @@ -7350,13 +7350,13 @@ static BOOL sub_02045900 (UnkStruct_0203E724 * param0) return 0; } -static BOOL sub_02045938 (UnkStruct_0203E724 * param0) +static BOOL sub_02045938 (ScriptContext * param0) { - u16 * v0 = inline_0204FCAC(param0); - FieldSystem * v1 = param0->unk_34; + u16 * v0 = ScriptContext_GetVarPointer(param0); + FieldSystem * v1 = param0->fieldSys; UnkStruct_02025CCC * v2; - v2 = sub_02025CCC(param0->unk_34->saveData); + v2 = sub_02025CCC(param0->fieldSys->saveData); if ((sub_02025D5C(v2) == sub_02055BB8(v1)) && (sub_02025D60(v2) == sub_02055BC4(v1))) { *v0 = 1; @@ -7367,22 +7367,22 @@ static BOOL sub_02045938 (UnkStruct_0203E724 * param0) return 0; } -static BOOL sub_0204598C (UnkStruct_0203E724 * param0) +static BOOL sub_0204598C (ScriptContext * param0) { - const PokedexData * v0 = SaveData_Pokedex(param0->unk_34->saveData); - u16 * v1 = inline_0204FCAC(param0); + const PokedexData * v0 = SaveData_Pokedex(param0->fieldSys->saveData); + u16 * v1 = ScriptContext_GetVarPointer(param0); *v1 = sub_020270DC(v0); return 0; } -static BOOL sub_020459BC (UnkStruct_0203E724 * param0) +static BOOL sub_020459BC (ScriptContext * param0) { u8 v0, v1; u16 v2, v3, v4; - u16 v5 = inline_02049538(param0); - u16 v6 = inline_02049538(param0); - FieldSystem * v7 = param0->unk_34; + u16 v5 = ScriptContext_GetVar(param0); + u16 v6 = ScriptContext_GetVar(param0); + FieldSystem * v7 = param0->fieldSys; static const u16 v8[] = { 0x10F, 0x110, @@ -7461,40 +7461,40 @@ static BOOL sub_020459BC (UnkStruct_0203E724 * param0) continue; } - sub_0203A574(param0->unk_34, v1, v2); + sub_0203A574(param0->fieldSys, v1, v2); } return 0; } -static BOOL sub_02045A88 (UnkStruct_0203E724 * param0) +static BOOL sub_02045A88 (ScriptContext * param0) { - UnkStruct_020507E4 * v0 = SaveData_Events(param0->unk_34->saveData); - u16 * v1 = inline_0204FCAC(param0); + UnkStruct_020507E4 * v0 = SaveData_Events(param0->fieldSys->saveData); + u16 * v1 = ScriptContext_GetVarPointer(param0); *v1 = sub_0206B3EC(v0); return 0; } -static BOOL sub_02045AB8 (UnkStruct_0203E724 * param0) +static BOOL sub_02045AB8 (ScriptContext * param0) { - UnkStruct_020507E4 * v0 = SaveData_Events(param0->unk_34->saveData); - u16 * v1 = inline_0204FCAC(param0); + UnkStruct_020507E4 * v0 = SaveData_Events(param0->fieldSys->saveData); + u16 * v1 = ScriptContext_GetVarPointer(param0); *v1 = sub_0206B40C(v0); return 0; } -static BOOL sub_02045AE8 (UnkStruct_0203E724 * param0) +static BOOL sub_02045AE8 (ScriptContext * param0) { - UnkStruct_020507E4 * v0 = SaveData_Events(param0->unk_34->saveData); - u16 * v1 = inline_0204FCAC(param0); + UnkStruct_020507E4 * v0 = SaveData_Events(param0->fieldSys->saveData); + u16 * v1 = ScriptContext_GetVarPointer(param0); *v1 = sub_0206B42C(v0); return 0; } -static BOOL sub_02045B18 (UnkStruct_0203E724 * param0) +static BOOL sub_02045B18 (ScriptContext * param0) { Poffin * v0; int v1; @@ -7505,16 +7505,16 @@ static BOOL sub_02045B18 (UnkStruct_0203E724 * param0) u16 * v6; int v7; - v6 = inline_0204FCAC(param0); + v6 = ScriptContext_GetVarPointer(param0); for (v7 = 0; v7 < 5; v7++) { - v3[v7] = inline_02049538(param0); + v3[v7] = ScriptContext_GetVar(param0); } - v4 = inline_02049538(param0); + v4 = ScriptContext_GetVar(param0); v0 = Poffin_malloc(4); v1 = sub_0202A9E4(v0, v3, v4, 0); - v2 = Poffin_GetSavedataBlock(param0->unk_34->saveData); + v2 = Poffin_GetSavedataBlock(param0->fieldSys->saveData); v5 = sub_0202AB74(v2, v0); Heap_FreeToHeap(v0); @@ -7528,13 +7528,13 @@ static BOOL sub_02045B18 (UnkStruct_0203E724 * param0) return 0; } -static BOOL sub_02045BA8 (UnkStruct_0203E724 * param0) +static BOOL sub_02045BA8 (ScriptContext * param0) { UnkStruct_0202AB28 * v0; u16 * v1; - v1 = inline_0204FCAC(param0); - v0 = Poffin_GetSavedataBlock(param0->unk_34->saveData); + v1 = ScriptContext_GetVarPointer(param0); + v0 = Poffin_GetSavedataBlock(param0->fieldSys->saveData); if (sub_0202AB54(v0) == 0xFFFF) { *v1 = 0; @@ -7545,23 +7545,23 @@ static BOOL sub_02045BA8 (UnkStruct_0203E724 * param0) return 0; } -static BOOL sub_02045BE4 (UnkStruct_0203E724 * param0) +static BOOL sub_02045BE4 (ScriptContext * param0) { UnkStruct_0202AB28 * v0; u16 * v1; - v1 = inline_0204FCAC(param0); - v0 = Poffin_GetSavedataBlock(param0->unk_34->saveData); + v1 = ScriptContext_GetVarPointer(param0); + v0 = Poffin_GetSavedataBlock(param0->fieldSys->saveData); *v1 = sub_0202ACC0(v0); return 0; } -static BOOL sub_02045C10 (UnkStruct_0203E724 * param0) +static BOOL sub_02045C10 (ScriptContext * param0) { - u8 v0 = (*((param0)->unk_08++)); - u16 * v1 = inline_0204FCAC(param0); - UnkStruct_020507E4 * v2 = SaveData_Events(param0->unk_34->saveData); + u8 v0 = ScriptContext_ReadByte(param0); + u16 * v1 = ScriptContext_GetVarPointer(param0); + UnkStruct_020507E4 * v2 = SaveData_Events(param0->fieldSys->saveData); GF_ASSERT((v0 <= 4)); @@ -7569,13 +7569,13 @@ static BOOL sub_02045C10 (UnkStruct_0203E724 * param0) return 0; } -static BOOL sub_02045C50 (UnkStruct_0203E724 * param0) +static BOOL sub_02045C50 (ScriptContext * param0) { int v0; const HallOfFame * v1; - u16 * v2 = inline_0204FCAC(param0); + u16 * v2 = ScriptContext_GetVarPointer(param0); - v1 = SaveData_HallOfFame(param0->unk_34->saveData, 32, &v0); + v1 = SaveData_HallOfFame(param0->fieldSys->saveData, 32, &v0); if (v0 == 0) { *v2 = 0; @@ -7595,26 +7595,26 @@ static BOOL sub_02045C50 (UnkStruct_0203E724 * param0) return 1; } -static BOOL sub_02045CB8 (UnkStruct_0203E724 * param0) +static BOOL sub_02045CB8 (ScriptContext * param0) { void ** v0; - u16 v1 = inline_02049538(param0); + u16 v1 = ScriptContext_GetVar(param0); - v0 = sub_0203F098(param0->unk_34, 19); - *v0 = sub_0203D410(32, param0->unk_34, v1); + v0 = sub_0203F098(param0->fieldSys, 19); + *v0 = sub_0203D410(32, param0->fieldSys, v1); - sub_0203E764(param0, sub_02041D60); + ScriptContext_Pause(param0, sub_02041D60); return 1; } -static BOOL sub_02045CFC (UnkStruct_0203E724 * param0) +static BOOL sub_02045CFC (ScriptContext * param0) { void ** v0; u16 * v1, * v2; - v1 = inline_0204FCAC(param0); - v2 = inline_0204FCAC(param0); - v0 = sub_0203F098(param0->unk_34, 19); + v1 = ScriptContext_GetVarPointer(param0); + v2 = ScriptContext_GetVarPointer(param0); + v0 = sub_0203F098(param0->fieldSys, 19); GF_ASSERT(*v0 != 0); @@ -7638,11 +7638,11 @@ static BOOL sub_02045CFC (UnkStruct_0203E724 * param0) return 0; } -static BOOL sub_02045D70 (UnkStruct_0203E724 * param0) +static BOOL sub_02045D70 (ScriptContext * param0) { u16 v0; - u8 v1 = (*((param0)->unk_08++)); - u16 * v2 = inline_0204FCAC(param0); + u8 v1 = ScriptContext_ReadByte(param0); + u16 * v2 = ScriptContext_GetVarPointer(param0); if (v1 > 100) { v1 = 100; @@ -7659,11 +7659,11 @@ static BOOL sub_02045D70 (UnkStruct_0203E724 * param0) return 0; } -static BOOL sub_02045DB0 (UnkStruct_0203E724 * param0) +static BOOL sub_02045DB0 (ScriptContext * param0) { - u16 v0 = inline_02049538(param0); - u16 * v1 = inline_0204FCAC(param0); - FieldSystem * v2 = param0->unk_34; + u16 v0 = ScriptContext_GetVar(param0); + u16 * v1 = ScriptContext_GetVarPointer(param0); + FieldSystem * v2 = param0->fieldSys; switch (v0) { case 0: @@ -7683,48 +7683,48 @@ static BOOL sub_02045DB0 (UnkStruct_0203E724 * param0) return 1; } -static BOOL sub_02045E14 (UnkStruct_0203E724 * param0) +static BOOL sub_02045E14 (ScriptContext * param0) { - UnkStruct_020507E4 * v0 = SaveData_Events(param0->unk_34->saveData); - u16 * v1 = inline_0204FCAC(param0); + UnkStruct_020507E4 * v0 = SaveData_Events(param0->fieldSys->saveData); + u16 * v1 = ScriptContext_GetVarPointer(param0); *v1 = sub_0206B374(v0); return 0; } -static BOOL sub_02045E44 (UnkStruct_0203E724 * param0) +static BOOL sub_02045E44 (ScriptContext * param0) { - u16 v0 = inline_02049538(param0); + u16 v0 = ScriptContext_GetVar(param0); if (v0 == 0) { - ov6_0223E384(param0->unk_34->unk_10); + ov6_0223E384(param0->fieldSys->unk_10); } else { - ov6_0223E4EC(param0->unk_34->unk_10); + ov6_0223E4EC(param0->fieldSys->unk_10); } return 1; } -static BOOL sub_02045E78 (UnkStruct_0203E724 * param0) +static BOOL sub_02045E78 (ScriptContext * param0) { - u16 * v0 = inline_0204FCAC(param0); + u16 * v0 = ScriptContext_GetVarPointer(param0); - *v0 = sub_02039074(param0->unk_34->saveData); + *v0 = sub_02039074(param0->fieldSys->saveData); return 0; } -static BOOL sub_02045EA0 (UnkStruct_0203E724 * param0) +static BOOL sub_02045EA0 (ScriptContext * param0) { - u16 * v0 = inline_0204FCAC(param0); + u16 * v0 = ScriptContext_GetVarPointer(param0); - *v0 = sub_0202AF94(sub_0202B370(param0->unk_34->saveData)); + *v0 = sub_0202AF94(sub_0202B370(param0->fieldSys->saveData)); return 0; } -static BOOL sub_02045ECC (UnkStruct_0203E724 * param0) +static BOOL sub_02045ECC (ScriptContext * param0) { - u16 v0 = inline_02049538(param0); - UndergroundData * v1 = sub_020298B0(param0->unk_34->saveData); + u16 v0 = ScriptContext_GetVar(param0); + UndergroundData * v1 = sub_020298B0(param0->fieldSys->saveData); if ((v0 == 135) || (v0 == 136)) { sub_02028828(v1); @@ -7733,10 +7733,10 @@ static BOOL sub_02045ECC (UnkStruct_0203E724 * param0) return 0; } -static BOOL sub_02045F04 (UnkStruct_0203E724 * param0) +static BOOL sub_02045F04 (ScriptContext * param0) { - u16 v0 = inline_02049538(param0); - u16 * v1 = inline_0204FCAC(param0); + u16 v0 = ScriptContext_GetVar(param0); + u16 * v1 = ScriptContext_GetVarPointer(param0); *v1 = 0; @@ -7747,14 +7747,14 @@ static BOOL sub_02045F04 (UnkStruct_0203E724 * param0) return 0; } -static BOOL sub_02045F48 (UnkStruct_0203E724 * param0) +static BOOL sub_02045F48 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; - u16 * v1 = inline_0204FCAC(param0); - u16 v2 = inline_02049538(param0); - u16 v3 = inline_02049538(param0); - u16 v4 = inline_02049538(param0); - u16 v5 = inline_02049538(param0); + FieldSystem * v0 = param0->fieldSys; + u16 * v1 = ScriptContext_GetVarPointer(param0); + u16 v2 = ScriptContext_GetVar(param0); + u16 v3 = ScriptContext_GetVar(param0); + u16 v4 = ScriptContext_GetVar(param0); + u16 v5 = ScriptContext_GetVar(param0); StringTemplate * v6 = StringTemplate_Default(32); MessageLoader * v7 = MessageLoader_Init(0, 26, 372, 32); Strbuf* v8; @@ -7777,51 +7777,51 @@ static BOOL sub_02045F48 (UnkStruct_0203E724 * param0) return 0; } -static BOOL sub_02046038 (UnkStruct_0203E724 * param0) +static BOOL sub_02046038 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; UnkStruct_02025CCC * v1; - v1 = sub_02025CCC(param0->unk_34->saveData); + v1 = sub_02025CCC(param0->fieldSys->saveData); sub_02025D6C(v1, 1); return 0; } -static BOOL sub_02046050 (UnkStruct_0203E724 * param0) +static BOOL sub_02046050 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; - u16 * v1 = inline_0204FCAC(param0); + FieldSystem * v0 = param0->fieldSys; + u16 * v1 = ScriptContext_GetVarPointer(param0); StringTemplate ** v2 = sub_0203F098(v0, 15); *v1 = sub_0205BC50(*v2); return 0; } -static BOOL sub_02046080 (UnkStruct_0203E724 * param0) +static BOOL sub_02046080 (ScriptContext * param0) { sub_02039734(); return 0; } -static BOOL sub_0204608C (UnkStruct_0203E724 * param0) +static BOOL sub_0204608C (ScriptContext * param0) { sub_02039794(); return 0; } -static BOOL sub_02046098 (UnkStruct_0203E724 * param0) +static BOOL sub_02046098 (ScriptContext * param0) { - sub_0203A7A8(param0->unk_34); + sub_0203A7A8(param0->fieldSys); return 0; } -static BOOL sub_020460A8 (UnkStruct_0203E724 * param0) +static BOOL sub_020460A8 (ScriptContext * param0) { - u16 v0 = inline_02049538(param0); - u16 v1 = inline_02049538(param0); - u16 v2 = inline_02049538(param0); - UnkStruct_0203A790 * v3 = sub_0203A790(param0->unk_34->saveData); + u16 v0 = ScriptContext_GetVar(param0); + u16 v1 = ScriptContext_GetVar(param0); + u16 v2 = ScriptContext_GetVar(param0); + UnkStruct_0203A790 * v3 = sub_0203A790(param0->fieldSys->saveData); UnkStruct_02049FA8 * v4 = sub_0203A72C(v3); v4->unk_00 = v0; @@ -7833,13 +7833,13 @@ static BOOL sub_020460A8 (UnkStruct_0203E724 * param0) return 0; } -static BOOL sub_02046108 (UnkStruct_0203E724 * param0) +static BOOL sub_02046108 (ScriptContext * param0) { LocalMapObject * v0; - u16 v1 = inline_02049538(param0); - u16 v2 = (*((param0)->unk_08++)); + u16 v1 = ScriptContext_GetVar(param0); + u16 v2 = ScriptContext_ReadByte(param0); - v0 = sub_0206251C(param0->unk_34->unk_38, v1); + v0 = sub_0206251C(param0->fieldSys->unk_38, v1); if (v0 == NULL) { GF_ASSERT(FALSE); @@ -7849,18 +7849,18 @@ static BOOL sub_02046108 (UnkStruct_0203E724 * param0) return 0; } -static BOOL sub_02046144 (UnkStruct_0203E724 * param0) +static BOOL sub_02046144 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; - u16 * v1 = inline_0204FCAC(param0); + FieldSystem * v0 = param0->fieldSys; + u16 * v1 = ScriptContext_GetVarPointer(param0); *v1 = sub_02071F28(v0); return 0; } -static BOOL sub_0204616C (UnkStruct_0203E724 * param0) +static BOOL sub_0204616C (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; UnkStruct_ov5_021E1FF4 ** v1 = sub_0203F098(v0, 40); if (!SaveData_OverwriteCheck(v0->saveData)) { @@ -7871,9 +7871,9 @@ static BOOL sub_0204616C (UnkStruct_0203E724 * param0) return 0; } -static BOOL sub_0204619C (UnkStruct_0203E724 * param0) +static BOOL sub_0204619C (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; UnkStruct_ov5_021E1FF4 ** v1 = sub_0203F098(v0, 40); if (!SaveData_OverwriteCheck(v0->saveData)) { @@ -7884,16 +7884,16 @@ static BOOL sub_0204619C (UnkStruct_0203E724 * param0) return 0; } -static BOOL sub_020461C8 (UnkStruct_0203E724 * param0) +static BOOL sub_020461C8 (ScriptContext * param0) { - sub_02070428(param0->unk_34, (*((param0)->unk_08++))); + sub_02070428(param0->fieldSys, ScriptContext_ReadByte(param0)); return 0; } -static BOOL sub_020461E0 (UnkStruct_0203E724 * param0) +static BOOL sub_020461E0 (ScriptContext * param0) { - void ** v0 = sub_0203F098(param0->unk_34, 19); - u8 v1 = (*((param0)->unk_08++)); + void ** v0 = sub_0203F098(param0->fieldSys, 19); + u8 v1 = ScriptContext_ReadByte(param0); UnkStruct_ov104_02230BE4 * v2 = Heap_AllocFromHeapAtEnd(11, sizeof(UnkStruct_ov104_02230BE4)); MI_CpuClear8(v2, sizeof(UnkStruct_ov104_02230BE4)); @@ -7901,32 +7901,32 @@ static BOOL sub_020461E0 (UnkStruct_0203E724 * param0) *v0 = v2; if ((v1 == ((((((0 + 1) + 1) + 1) + 1) + 1) + 0)) || (v1 == ((((((0 + 1) + 1) + 1) + 1) + 1) + 1))) { - v2->unk_00 = param0->unk_34->unk_AC; + v2->unk_00 = param0->fieldSys->unk_AC; } else { v2->unk_00 = NULL; } - v2->unk_04 = sub_02025E44(param0->unk_34->saveData); + v2->unk_04 = sub_02025E44(param0->fieldSys->saveData); v2->unk_24 = v1; - v2->unk_08 = param0->unk_34->saveData; - v2->unk_1C = param0->unk_34->unk_1C->unk_00; - v2->unk_0C = param0->unk_34->unk_9C; - v2->unk_10 = param0->unk_34->unk_98; - v2->unk_20 = param0->unk_34->unk_BC; + v2->unk_08 = param0->fieldSys->saveData; + v2->unk_1C = param0->fieldSys->unk_1C->unk_00; + v2->unk_0C = param0->fieldSys->unk_9C; + v2->unk_10 = param0->fieldSys->unk_98; + v2->unk_20 = param0->fieldSys->unk_BC; - sub_02050A38(param0->unk_28, &Unk_020F8BE0, v2); - sub_0203E764(param0, sub_02041CC8); + sub_02050A38(param0->taskManager, &Unk_020F8BE0, v2); + ScriptContext_Pause(param0, sub_02041CC8); return 1; } -static BOOL sub_02046294 (UnkStruct_0203E724 * param0) +static BOOL sub_02046294 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; Strbuf ** v1 = sub_0203F098(v0, 16); Window * v2 = sub_0203F098(v0, 1); - ov8_0224B67C(v0, v2, param0->unk_2C, *v1); + ov8_0224B67C(v0, v2, param0->loader, *v1); return 1; } @@ -7940,26 +7940,26 @@ static void sub_020462C0 (SysTask * param0, void * param1) } } -static BOOL sub_020462DC (UnkStruct_0203E724 * param0) +static BOOL sub_020462DC (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; SysTask_Start(sub_020462C0, v0, 128); return 1; } -static BOOL sub_020462F4 (UnkStruct_0203E724 * param0) +static BOOL sub_020462F4 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; u16 v1 = sub_0203A74C(sub_0203A790(v0->saveData)); ov5_021D5F24(v0->unk_04->unk_0C, v1); return 1; } -static BOOL sub_02046314 (UnkStruct_0203E724 * param0) +static BOOL sub_02046314 (ScriptContext * param0) { - u8 v0 = (*((param0)->unk_08++)); + u8 v0 = ScriptContext_ReadByte(param0); static const u16 v1[] = { 0x14D, 0x190, @@ -8011,55 +8011,55 @@ static BOOL sub_02046314 (UnkStruct_0203E724 * param0) v1, v2, }; - ov7_0224CDA4(param0->unk_28, param0->unk_34, (u16 *)v3[v0], 3, 0); + ov7_0224CDA4(param0->taskManager, param0->fieldSys, (u16 *)v3[v0], 3, 0); return 1; } -BOOL sub_02046340 (UnkStruct_0203E724 * param0) +BOOL sub_02046340 (ScriptContext * param0) { - void ** v0 = sub_0203F098(param0->unk_34, 19); - u16 v1 = inline_02049538(param0); - u16 v2 = inline_02049538(param0); - u16 v3 = inline_02049538(param0); + void ** v0 = sub_0203F098(param0->fieldSys, 19); + u16 v1 = ScriptContext_GetVar(param0); + u16 v2 = ScriptContext_GetVar(param0); + u16 v3 = ScriptContext_GetVar(param0); - *v0 = sub_0203E564(param0->unk_34, v1, v2, v3, 32); - sub_0203E764(param0, sub_02041CC8); + *v0 = sub_0203E564(param0->fieldSys, v1, v2, v3, 32); + ScriptContext_Pause(param0, sub_02041CC8); return 1; } -BOOL sub_020463B4 (UnkStruct_0203E724 * param0) +BOOL sub_020463B4 (ScriptContext * param0) { - void ** v0 = sub_0203F098(param0->unk_34, 19); + void ** v0 = sub_0203F098(param0->fieldSys, 19); - *v0 = sub_0203E608(param0->unk_34, 32); - sub_0203E764(param0, sub_02041D60); + *v0 = sub_0203E608(param0->fieldSys, 32); + ScriptContext_Pause(param0, sub_02041D60); return 1; } -BOOL sub_020463E4 (UnkStruct_0203E724 * param0) +BOOL sub_020463E4 (ScriptContext * param0) { void ** v0; - FieldSystem * v1 = param0->unk_34; + FieldSystem * v1 = param0->fieldSys; - v0 = sub_0203F098(param0->unk_34, 19); + v0 = sub_0203F098(param0->fieldSys, 19); Heap_FreeToHeap(*v0); *v0 = NULL; return 1; } -BOOL sub_02046400 (UnkStruct_0203E724 * param0) +BOOL sub_02046400 (ScriptContext * param0) { void ** v0; UnkStruct_0203E608 * v1; - FieldSystem * v2 = param0->unk_34; - u16 v3 = inline_02049538(param0); - u16 * v4 = inline_0204FCAC(param0); - u16 * v5 = inline_0204FCAC(param0); + FieldSystem * v2 = param0->fieldSys; + u16 v3 = ScriptContext_GetVar(param0); + u16 * v4 = ScriptContext_GetVarPointer(param0); + u16 * v5 = ScriptContext_GetVarPointer(param0); - v0 = sub_0203F098(param0->unk_34, 19); + v0 = sub_0203F098(param0->fieldSys, 19); v1 = (UnkStruct_0203E608 *)*v0; *v4 = v1->unk_08[v3]; *v5 = v1->unk_0E[v3]; @@ -8086,13 +8086,13 @@ static const u16 Unk_020EAB8C[] = { 0x91 }; -BOOL sub_0204645C (UnkStruct_0203E724 * param0) +BOOL sub_0204645C (ScriptContext * param0) { u16 v0, v1, v2, v3, v4; - u16 * v5 = inline_0204FCAC(param0); - u16 * v6 = inline_0204FCAC(param0); - u16 * v7 = inline_0204FCAC(param0); - u16 * v8 = inline_0204FCAC(param0); + u16 * v5 = ScriptContext_GetVarPointer(param0); + u16 * v6 = ScriptContext_GetVarPointer(param0); + u16 * v7 = ScriptContext_GetVarPointer(param0); + u16 * v8 = ScriptContext_GetVarPointer(param0); *v5 = 0xfff; *v6 = 0xfff; @@ -8180,16 +8180,16 @@ static u8 sub_02046568 (u16 param0, u16 param1, u16 param2, u16 param3) return v0; } -static BOOL sub_020465AC (UnkStruct_0203E724 * param0) +static BOOL sub_020465AC (ScriptContext * param0) { - u16 v0 = inline_02049538(param0); - u16 v1 = inline_02049538(param0); - u16 * v2 = inline_0204FCAC(param0); + u16 v0 = ScriptContext_GetVar(param0); + u16 v1 = ScriptContext_GetVar(param0); + u16 * v2 = ScriptContext_GetVarPointer(param0); - if (sub_02039074(param0->unk_34->saveData)) { + if (sub_02039074(param0->fieldSys->saveData)) { *v2 = 1; - sub_0203E6C0(param0->unk_34, v1, v0); - sub_0203E764(param0, sub_02041D60); + sub_0203E6C0(param0->fieldSys, v1, v0); + ScriptContext_Pause(param0, sub_02041D60); } else { *v2 = 0; } @@ -8197,27 +8197,27 @@ static BOOL sub_020465AC (UnkStruct_0203E724 * param0) return 1; } -static BOOL sub_02046624 (UnkStruct_0203E724 * param0) +static BOOL sub_02046624 (ScriptContext * param0) { - u16 v0 = sub_0203E838(param0); - u16 * v1 = sub_0203F118(param0->unk_34, v0); + u16 v0 = ScriptContext_ReadHalfWord(param0); + u16 * v1 = sub_0203F118(param0->fieldSys, v0); - if (sub_02039074(param0->unk_34->saveData)) { - sub_0205749C(param0->unk_28, *v1); + if (sub_02039074(param0->fieldSys->saveData)) { + sub_0205749C(param0->taskManager, *v1); } return 1; } -static BOOL sub_02046658 (UnkStruct_0203E724 * param0) +static BOOL sub_02046658 (ScriptContext * param0) { - sub_020985E4(param0->unk_28, param0->unk_34->saveData); + sub_020985E4(param0->taskManager, param0->fieldSys->saveData); return 1; } -static BOOL sub_0204666C (UnkStruct_0203E724 * param0) +static BOOL sub_0204666C (ScriptContext * param0) { - u16 * v0 = inline_0204FCAC(param0); + u16 * v0 = ScriptContext_GetVarPointer(param0); *v0 = 0; @@ -8232,15 +8232,15 @@ static BOOL sub_0204666C (UnkStruct_0203E724 * param0) return 0; } -static BOOL sub_020466A4 (UnkStruct_0203E724 * param0) +static BOOL sub_020466A4 (ScriptContext * param0) { u32 v0; - FieldSystem * v1 = param0->unk_34; - u16 * v2 = inline_0204FCAC(param0); - u16 * v3 = inline_0204FCAC(param0); - u16 * v4 = inline_0204FCAC(param0); - u16 * v5 = inline_0204FCAC(param0); - u16 * v6 = inline_0204FCAC(param0); + FieldSystem * v1 = param0->fieldSys; + u16 * v2 = ScriptContext_GetVarPointer(param0); + u16 * v3 = ScriptContext_GetVarPointer(param0); + u16 * v4 = ScriptContext_GetVarPointer(param0); + u16 * v5 = ScriptContext_GetVarPointer(param0); + u16 * v6 = ScriptContext_GetVarPointer(param0); *v2 = 0; *v3 = 0; @@ -8334,35 +8334,35 @@ static u32 sub_0204676C (SaveData * param0) return v3; } -static BOOL sub_02046868 (UnkStruct_0203E724 * param0) +static BOOL sub_02046868 (ScriptContext * param0) { - u16 v0 = sub_0203E838(param0); + u16 v0 = ScriptContext_ReadHalfWord(param0); - sub_0202CFEC(sub_0202CD88(param0->unk_34->saveData), v0); + sub_0202CFEC(sub_0202CD88(param0->fieldSys->saveData), v0); return 0; } -static BOOL sub_02046888 (UnkStruct_0203E724 * param0) +static BOOL sub_02046888 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; - u16 v1 = inline_02049538(param0); + FieldSystem * v0 = param0->fieldSys; + u16 v1 = ScriptContext_GetVar(param0); ov9_0224F158(v0, v1); return 0; } -static BOOL sub_020468AC (UnkStruct_0203E724 * param0) +static BOOL sub_020468AC (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; - u16 v1 = inline_02049538(param0); + FieldSystem * v0 = param0->fieldSys; + u16 v1 = ScriptContext_GetVar(param0); ov9_0224F16C(v0, v1); return 0; } -static BOOL sub_020468D0 (UnkStruct_0203E724 * param0) +static BOOL sub_020468D0 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; ov9_02249FD0(v0); return 0; @@ -8372,10 +8372,10 @@ u32 Unk_021C07E8; u32 Unk_021C07E4; u32 Unk_021C07EC; -static BOOL sub_020468E0 (UnkStruct_0203E724 * param0) +static BOOL sub_020468E0 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; - u16 v1 = inline_02049538(param0); + FieldSystem * v0 = param0->fieldSys; + u16 v1 = ScriptContext_GetVar(param0); u32 v2, v3, v4; v2 = Heap_FndGetTotalFreeSizeForExpHeap(11); @@ -8399,35 +8399,35 @@ static BOOL sub_020468E0 (UnkStruct_0203E724 * param0) return 0; } -static BOOL sub_0204693C (UnkStruct_0203E724 * param0) +static BOOL sub_0204693C (ScriptContext * param0) { - sub_0203E714(param0->unk_34); - sub_0203E764(param0, sub_02041D60); + sub_0203E714(param0->fieldSys); + ScriptContext_Pause(param0, sub_02041D60); return 1; } -static BOOL sub_02046958 (UnkStruct_0203E724 * param0) +static BOOL sub_02046958 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; - u16 v1 = inline_02049538(param0); + FieldSystem * v0 = param0->fieldSys; + u16 v1 = ScriptContext_GetVar(param0); ov9_0224E884(v0, v1); return 0; } -static BOOL sub_0204697C (UnkStruct_0203E724 * param0) +static BOOL sub_0204697C (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; ov9_0224E8A8(v0); return 0; } -static BOOL sub_0204698C (UnkStruct_0203E724 * param0) +static BOOL sub_0204698C (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; - u16 * v1 = inline_0204FCAC(param0); + FieldSystem * v0 = param0->fieldSys; + u16 * v1 = ScriptContext_GetVarPointer(param0); s64 v2; s64 v3; @@ -8443,13 +8443,13 @@ static BOOL sub_0204698C (UnkStruct_0203E724 * param0) return 0; } -static BOOL sub_020469D0 (UnkStruct_0203E724 * param0) +static BOOL sub_020469D0 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; Party * v1; - u16 v2 = inline_02049538(param0); + u16 v2 = ScriptContext_GetVar(param0); - v1 = Party_GetFromSavedata(param0->unk_34->saveData); + v1 = Party_GetFromSavedata(param0->fieldSys->saveData); Party_SetGiratinaForm(v1, v2); { int v3, v4; @@ -8468,18 +8468,18 @@ static BOOL sub_020469D0 (UnkStruct_0203E724 * param0) return 0; } -static BOOL sub_02046A4C (UnkStruct_0203E724 * param0) +static BOOL sub_02046A4C (ScriptContext * param0) { u32 v0, v1; int v2, v3; Pokemon * v4; - u16 * v5 = inline_0204FCAC(param0); + u16 * v5 = ScriptContext_GetVarPointer(param0); *v5 = 0; - v2 = Party_GetCurrentCount(Party_GetFromSavedata(param0->unk_34->saveData)); + v2 = Party_GetCurrentCount(Party_GetFromSavedata(param0->fieldSys->saveData)); for (v3 = 0; v3 < v2; v3++) { - v4 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(param0->unk_34->saveData), v3); + v4 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(param0->fieldSys->saveData), v3); if (Pokemon_GetValue(v4, MON_DATA_IS_EGG, NULL) == 0) { v0 = Pokemon_GetValue(v4, MON_DATA_SPECIES, NULL); diff --git a/src/unk_02046AD4.c b/src/unk_02046AD4.c index 988668591b..b332bc14e4 100644 --- a/src/unk_02046AD4.c +++ b/src/unk_02046AD4.c @@ -13,18 +13,18 @@ #include "data/mart_items.h" -BOOL sub_02046AD4 (UnkStruct_0203E724 * param0) +BOOL sub_02046AD4 (ScriptContext * param0) { u16 v0[64]; u8 v1, v2, v3, v4; - u16 v5 = inline_02049538(param0); + u16 v5 = ScriptContext_GetVar(param0); v3 = 0; v2 = 0; v1 = 0; for (v4 = 0; v4 < 8; v4++) { - if (TrainerInfo_HasBadge(SaveData_GetTrainerInfo(param0->unk_34->saveData), v4) == 1) { + if (TrainerInfo_HasBadge(SaveData_GetTrainerInfo(param0->fieldSys->saveData), v4) == 1) { v2++; } } @@ -65,13 +65,13 @@ BOOL sub_02046AD4 (UnkStruct_0203E724 * param0) v0[v3] = 0xffff; - ov7_0224CDA4(param0->unk_28, param0->unk_34, v0, 0, 0); + ov7_0224CDA4(param0->taskManager, param0->fieldSys, v0, 0, 0); return 1; } -BOOL sub_02046B9C (UnkStruct_0203E724 * param0) +BOOL sub_02046B9C (ScriptContext * param0) { - u16 v0 = inline_02049538(param0); + u16 v0 = ScriptContext_GetVar(param0); BOOL v1; if ((v0 == 8) || (v0 == 9) || (v0 == 10) || (v0 == 11) || (v0 == 12) || (v0 == 13) || (v0 == 19)) { @@ -80,13 +80,13 @@ BOOL sub_02046B9C (UnkStruct_0203E724 * param0) v1 = 0; } - ov7_0224CDA4(param0->unk_28, param0->unk_34, (u16 *)PokeMartSpecialties[v0], 0, v1); + ov7_0224CDA4(param0->taskManager, param0->fieldSys, (u16 *)PokeMartSpecialties[v0], 0, v1); return 1; } -BOOL sub_02046BF4 (UnkStruct_0203E724 * param0) +BOOL sub_02046BF4 (ScriptContext * param0) { - u16 v0 = inline_02049538(param0); + u16 v0 = ScriptContext_GetVar(param0); BOOL v1; if ((v0 == 0) || (v0 == 1)) { @@ -95,20 +95,20 @@ BOOL sub_02046BF4 (UnkStruct_0203E724 * param0) v1 = 0; } - ov7_0224CDA4(param0->unk_28, param0->unk_34, (u16 *)VeilstoneDeptStoreDecorationStocks[v0], 1, v1); + ov7_0224CDA4(param0->taskManager, param0->fieldSys, (u16 *)VeilstoneDeptStoreDecorationStocks[v0], 1, v1); return 1; } -BOOL sub_02046C34 (UnkStruct_0203E724 * param0) +BOOL sub_02046C34 (ScriptContext * param0) { - u16 v0 = inline_02049538(param0); + u16 v0 = ScriptContext_GetVar(param0); - ov7_0224CDA4(param0->unk_28, param0->unk_34, (u16 *)SunyshoreMarketDailyStocks[v0], 2, 0); + ov7_0224CDA4(param0->taskManager, param0->fieldSys, (u16 *)SunyshoreMarketDailyStocks[v0], 2, 0); return 1; } -BOOL sub_02046C6C (UnkStruct_0203E724 * param0) +BOOL sub_02046C6C (ScriptContext * param0) { - sub_0203E518(param0->unk_34->unk_10); + sub_0203E518(param0->fieldSys->unk_10); return 1; } diff --git a/src/unk_02046C7C.c b/src/unk_02046C7C.c index 486b8a6322..faea26aafe 100644 --- a/src/unk_02046C7C.c +++ b/src/unk_02046C7C.c @@ -28,97 +28,97 @@ #include "overlay005/ov5_021EF3A8.h" #include "overlay006/ov6_02247A0C.h" -static BOOL sub_02046CE0(UnkStruct_0203E724 * param0); -static BOOL sub_02046FDC(UnkStruct_0203E724 * param0); -static BOOL sub_02047404(UnkStruct_0203E724 * param0); -BOOL sub_02046C7C(UnkStruct_0203E724 * param0); -BOOL sub_02046CAC(UnkStruct_0203E724 * param0); -BOOL sub_02046CFC(UnkStruct_0203E724 * param0); -BOOL sub_02046E14(UnkStruct_0203E724 * param0); -BOOL sub_02046E60(UnkStruct_0203E724 * param0); -BOOL sub_02046EB4(UnkStruct_0203E724 * param0); -BOOL sub_02046F08(UnkStruct_0203E724 * param0); -BOOL sub_02046FB8(UnkStruct_0203E724 * param0); -BOOL sub_02046FF0(UnkStruct_0203E724 * param0); -BOOL sub_0204700C(UnkStruct_0203E724 * param0); -BOOL sub_02047048(UnkStruct_0203E724 * param0); -BOOL sub_02047084(UnkStruct_0203E724 * param0); -BOOL sub_020470C0(UnkStruct_0203E724 * param0); -BOOL sub_020470F0(UnkStruct_0203E724 * param0); -BOOL sub_0204712C(UnkStruct_0203E724 * param0); -BOOL sub_0204715C(UnkStruct_0203E724 * param0); -BOOL sub_0204718C(UnkStruct_0203E724 * param0); -BOOL sub_020471BC(UnkStruct_0203E724 * param0); -BOOL sub_02047200(UnkStruct_0203E724 * param0); -BOOL sub_020473B8(UnkStruct_0203E724 * param0); -BOOL sub_020473E4(UnkStruct_0203E724 * param0); -BOOL sub_02047424(UnkStruct_0203E724 * param0); -BOOL sub_02047438(UnkStruct_0203E724 * param0); -BOOL sub_0204744C(UnkStruct_0203E724 * param0); -BOOL sub_020474AC(UnkStruct_0203E724 * param0); -BOOL sub_02047388(UnkStruct_0203E724 * param0); -BOOL sub_020473A0(UnkStruct_0203E724 * param0); -BOOL sub_02046F5C(UnkStruct_0203E724 * param0); -BOOL sub_02047244(UnkStruct_0203E724 * param0); -BOOL sub_02047274(UnkStruct_0203E724 * param0); -BOOL sub_020472E8(UnkStruct_0203E724 * param0); -BOOL sub_02047318(UnkStruct_0203E724 * param0); -BOOL sub_02047358(UnkStruct_0203E724 * param0); +static BOOL sub_02046CE0(ScriptContext * param0); +static BOOL sub_02046FDC(ScriptContext * param0); +static BOOL sub_02047404(ScriptContext * param0); +BOOL sub_02046C7C(ScriptContext * param0); +BOOL sub_02046CAC(ScriptContext * param0); +BOOL sub_02046CFC(ScriptContext * param0); +BOOL sub_02046E14(ScriptContext * param0); +BOOL sub_02046E60(ScriptContext * param0); +BOOL sub_02046EB4(ScriptContext * param0); +BOOL sub_02046F08(ScriptContext * param0); +BOOL sub_02046FB8(ScriptContext * param0); +BOOL sub_02046FF0(ScriptContext * param0); +BOOL sub_0204700C(ScriptContext * param0); +BOOL sub_02047048(ScriptContext * param0); +BOOL sub_02047084(ScriptContext * param0); +BOOL sub_020470C0(ScriptContext * param0); +BOOL sub_020470F0(ScriptContext * param0); +BOOL sub_0204712C(ScriptContext * param0); +BOOL sub_0204715C(ScriptContext * param0); +BOOL sub_0204718C(ScriptContext * param0); +BOOL sub_020471BC(ScriptContext * param0); +BOOL sub_02047200(ScriptContext * param0); +BOOL sub_020473B8(ScriptContext * param0); +BOOL sub_020473E4(ScriptContext * param0); +BOOL sub_02047424(ScriptContext * param0); +BOOL sub_02047438(ScriptContext * param0); +BOOL sub_0204744C(ScriptContext * param0); +BOOL sub_020474AC(ScriptContext * param0); +BOOL sub_02047388(ScriptContext * param0); +BOOL sub_020473A0(ScriptContext * param0); +BOOL sub_02046F5C(ScriptContext * param0); +BOOL sub_02047244(ScriptContext * param0); +BOOL sub_02047274(ScriptContext * param0); +BOOL sub_020472E8(ScriptContext * param0); +BOOL sub_02047318(ScriptContext * param0); +BOOL sub_02047358(ScriptContext * param0); -BOOL sub_02046C7C (UnkStruct_0203E724 * param0) +BOOL sub_02046C7C (ScriptContext * param0) { - void ** v0 = sub_0203F098(param0->unk_34, 20); - u16 v1 = inline_02049538(param0); + void ** v0 = sub_0203F098(param0->fieldSys, 20); + u16 v1 = ScriptContext_GetVar(param0); sub_02094754(*v0, v1); return 0; } -BOOL sub_02046CAC (UnkStruct_0203E724 * param0) +BOOL sub_02046CAC (ScriptContext * param0) { - void ** v0 = sub_0203F098(param0->unk_34, 20); - u16 v1 = inline_02049538(param0); + void ** v0 = sub_0203F098(param0->fieldSys, 20); + u16 v1 = ScriptContext_GetVar(param0); - param0->unk_18[0] = v1; + param0->data[0] = v1; - sub_0203E764(param0, sub_02046CE0); + ScriptContext_Pause(param0, sub_02046CE0); return 1; } -static BOOL sub_02046CE0 (UnkStruct_0203E724 * param0) +static BOOL sub_02046CE0 (ScriptContext * param0) { - void ** v0 = sub_0203F098(param0->unk_34, 20); - return sub_0209476C(*v0, param0->unk_18[0]); + void ** v0 = sub_0203F098(param0->fieldSys, 20); + return sub_0209476C(*v0, param0->data[0]); } -BOOL sub_02046CFC (UnkStruct_0203E724 * param0) +BOOL sub_02046CFC (ScriptContext * param0) { Strbuf* v0; Pokemon * v1; - void ** v2 = sub_0203F098(param0->unk_34, 20); - TrainerInfo * v3 = SaveData_GetTrainerInfo(FieldSystem_SaveData(param0->unk_34)); - u16 v4 = inline_02049538(param0); - u16 v5 = inline_02049538(param0); - u16 v6 = inline_02049538(param0); - u16 v7 = inline_02049538(param0); + void ** v2 = sub_0203F098(param0->fieldSys, 20); + TrainerInfo * v3 = SaveData_GetTrainerInfo(FieldSystem_SaveData(param0->fieldSys)); + u16 v4 = ScriptContext_GetVar(param0); + u16 v5 = ScriptContext_GetVar(param0); + u16 v6 = ScriptContext_GetVar(param0); + u16 v7 = ScriptContext_GetVar(param0); UnkStruct_02093800 v8; - v1 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(param0->unk_34->saveData), v7); + v1 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(param0->fieldSys->saveData), v7); v0 = TrainerInfo_NameNewStrbuf(v3, 4); v8.unk_00 = v5; v8.unk_01 = v4; v8.unk_02 = v6; - v8.unk_03 = sub_0206A954(SaveData_Events(param0->unk_34->saveData)); - v8.unk_04 = sub_02027474(SaveData_Pokedex(param0->unk_34->saveData)); + v8.unk_03 = sub_0206A954(SaveData_Events(param0->fieldSys->saveData)); + v8.unk_04 = sub_02027474(SaveData_Pokedex(param0->fieldSys->saveData)); v8.unk_05 = v7; v8.unk_08 = v1; v8.unk_0C = v0; v8.unk_10 = v3; - v8.unk_14 = sub_0202A750(param0->unk_34->saveData); - v8.unk_18 = sub_02025E44(param0->unk_34->saveData); - v8.unk_1C = param0->unk_34->saveData; - v8.unk_20 = GetChatotCryDataFromSave(param0->unk_34->saveData); + v8.unk_14 = sub_0202A750(param0->fieldSys->saveData); + v8.unk_18 = sub_02025E44(param0->fieldSys->saveData); + v8.unk_1C = param0->fieldSys->saveData; + v8.unk_20 = GetChatotCryDataFromSave(param0->fieldSys->saveData); *v2 = sub_02093800(&v8); @@ -127,271 +127,271 @@ BOOL sub_02046CFC (UnkStruct_0203E724 * param0) return 0; } -BOOL sub_02046E14 (UnkStruct_0203E724 * param0) +BOOL sub_02046E14 (ScriptContext * param0) { Pokemon * v0; - void ** v1 = sub_0203F098(param0->unk_34, 20); - u16 v2 = inline_02049538(param0); - u32 v3 = MapHeader_GetMapLabelTextID(param0->unk_34->unk_1C->unk_00); + void ** v1 = sub_0203F098(param0->fieldSys, 20); + u16 v2 = ScriptContext_GetVar(param0); + u32 v3 = MapHeader_GetMapLabelTextID(param0->fieldSys->unk_1C->unk_00); - sub_02094C44(*v1, param0->unk_34->saveData, v3, param0->unk_34->unk_9C); + sub_02094C44(*v1, param0->fieldSys->saveData, v3, param0->fieldSys->unk_9C); sub_02093AD4(*v1); return 0; } -BOOL sub_02046E60 (UnkStruct_0203E724 * param0) +BOOL sub_02046E60 (ScriptContext * param0) { - void ** v0 = sub_0203F098(param0->unk_34, 20); - StringTemplate ** v1 = sub_0203F098(param0->unk_34, 15); - u16 v2 = inline_02049538(param0); - u16 v3 = inline_02049538(param0); + void ** v0 = sub_0203F098(param0->fieldSys, 20); + StringTemplate ** v1 = sub_0203F098(param0->fieldSys, 15); + u16 v2 = ScriptContext_GetVar(param0); + u16 v3 = ScriptContext_GetVar(param0); sub_02094630(*v0, v2, *v1, v3); return 0; } -BOOL sub_02046EB4 (UnkStruct_0203E724 * param0) +BOOL sub_02046EB4 (ScriptContext * param0) { - void ** v0 = sub_0203F098(param0->unk_34, 20); - StringTemplate ** v1 = sub_0203F098(param0->unk_34, 15); - u16 v2 = inline_02049538(param0); - u16 v3 = inline_02049538(param0); + void ** v0 = sub_0203F098(param0->fieldSys, 20); + StringTemplate ** v1 = sub_0203F098(param0->fieldSys, 15); + u16 v2 = ScriptContext_GetVar(param0); + u16 v3 = ScriptContext_GetVar(param0); sub_02094648(*v0, v2, *v1, v3); return 0; } -BOOL sub_02046F08 (UnkStruct_0203E724 * param0) +BOOL sub_02046F08 (ScriptContext * param0) { - void ** v0 = sub_0203F098(param0->unk_34, 20); - StringTemplate ** v1 = sub_0203F098(param0->unk_34, 15); - u16 v2 = inline_02049538(param0); - u16 v3 = inline_02049538(param0); + void ** v0 = sub_0203F098(param0->fieldSys, 20); + StringTemplate ** v1 = sub_0203F098(param0->fieldSys, 15); + u16 v2 = ScriptContext_GetVar(param0); + u16 v3 = ScriptContext_GetVar(param0); sub_02094680(*v0, v2, *v1, v3); return 0; } -BOOL sub_02046F5C (UnkStruct_0203E724 * param0) +BOOL sub_02046F5C (ScriptContext * param0) { - void ** v0 = sub_0203F098(param0->unk_34, 20); - StringTemplate ** v1 = sub_0203F098(param0->unk_34, 15); - u16 v2 = inline_02049538(param0); - u16 v3 = inline_02049538(param0); + void ** v0 = sub_0203F098(param0->fieldSys, 20); + StringTemplate ** v1 = sub_0203F098(param0->fieldSys, 15); + u16 v2 = ScriptContext_GetVar(param0); + u16 v3 = ScriptContext_GetVar(param0); StringTemplate_SetNumber(*v1, v3, v2, 1, 0, 1); return 0; } -BOOL sub_02046FB8 (UnkStruct_0203E724 * param0) +BOOL sub_02046FB8 (ScriptContext * param0) { - void ** v0 = sub_0203F098(param0->unk_34, 20); + void ** v0 = sub_0203F098(param0->fieldSys, 20); sub_020943B0(*v0); - sub_0203E764(param0, sub_02046FDC); + ScriptContext_Pause(param0, sub_02046FDC); return 1; } -static BOOL sub_02046FDC (UnkStruct_0203E724 * param0) +static BOOL sub_02046FDC (ScriptContext * param0) { - void ** v0 = sub_0203F098(param0->unk_34, 20); + void ** v0 = sub_0203F098(param0->fieldSys, 20); return sub_020944CC(*v0); } -BOOL sub_02046FF0 (UnkStruct_0203E724 * param0) +BOOL sub_02046FF0 (ScriptContext * param0) { - void ** v0 = sub_0203F098(param0->unk_34, 20); + void ** v0 = sub_0203F098(param0->fieldSys, 20); - sub_020933F8(param0->unk_28, *v0); + sub_020933F8(param0->taskManager, *v0); return 1; } -BOOL sub_0204700C (UnkStruct_0203E724 * param0) +BOOL sub_0204700C (ScriptContext * param0) { - void ** v0 = sub_0203F098(param0->unk_34, 20); - StringTemplate ** v1 = sub_0203F098(param0->unk_34, 15); - u16 v2 = inline_02049538(param0); + void ** v0 = sub_0203F098(param0->fieldSys, 20); + StringTemplate ** v1 = sub_0203F098(param0->fieldSys, 15); + u16 v2 = ScriptContext_GetVar(param0); sub_020946A4(*v0, *v1, v2); return 0; } -BOOL sub_02047048 (UnkStruct_0203E724 * param0) +BOOL sub_02047048 (ScriptContext * param0) { - void ** v0 = sub_0203F098(param0->unk_34, 20); - StringTemplate ** v1 = sub_0203F098(param0->unk_34, 15); - u16 v2 = inline_02049538(param0); + void ** v0 = sub_0203F098(param0->fieldSys, 20); + StringTemplate ** v1 = sub_0203F098(param0->fieldSys, 15); + u16 v2 = ScriptContext_GetVar(param0); sub_020946CC(*v0, *v1, v2); return 0; } -BOOL sub_02047084 (UnkStruct_0203E724 * param0) +BOOL sub_02047084 (ScriptContext * param0) { - void ** v0 = sub_0203F098(param0->unk_34, 20); - StringTemplate ** v1 = sub_0203F098(param0->unk_34, 15); - u16 v2 = inline_02049538(param0); + void ** v0 = sub_0203F098(param0->fieldSys, 20); + StringTemplate ** v1 = sub_0203F098(param0->fieldSys, 15); + u16 v2 = ScriptContext_GetVar(param0); sub_020946F0(*v0, *v1, v2); return 0; } -BOOL sub_020470C0 (UnkStruct_0203E724 * param0) +BOOL sub_020470C0 (ScriptContext * param0) { - void ** v0 = sub_0203F098(param0->unk_34, 20); - u16 * v1 = inline_0204FCAC(param0); + void ** v0 = sub_0203F098(param0->fieldSys, 20); + u16 * v1 = ScriptContext_GetVarPointer(param0); *v1 = sub_02094750(*v0); return 0; } -BOOL sub_020470F0 (UnkStruct_0203E724 * param0) +BOOL sub_020470F0 (ScriptContext * param0) { - void ** v0 = sub_0203F098(param0->unk_34, 20); - StringTemplate ** v1 = sub_0203F098(param0->unk_34, 15); - u16 v2 = inline_02049538(param0); + void ** v0 = sub_0203F098(param0->fieldSys, 20); + StringTemplate ** v1 = sub_0203F098(param0->fieldSys, 15); + u16 v2 = ScriptContext_GetVar(param0); sub_02094720(*v0, *v1, v2); return 0; } -BOOL sub_0204712C (UnkStruct_0203E724 * param0) +BOOL sub_0204712C (ScriptContext * param0) { - void ** v0 = sub_0203F098(param0->unk_34, 20); - u16 * v1 = inline_0204FCAC(param0); + void ** v0 = sub_0203F098(param0->fieldSys, 20); + u16 * v1 = ScriptContext_GetVarPointer(param0); *v1 = sub_02094790(*v0); return 0; } -BOOL sub_0204715C (UnkStruct_0203E724 * param0) +BOOL sub_0204715C (ScriptContext * param0) { - void ** v0 = sub_0203F098(param0->unk_34, 20); - u16 * v1 = inline_0204FCAC(param0); + void ** v0 = sub_0203F098(param0->fieldSys, 20); + u16 * v1 = ScriptContext_GetVarPointer(param0); *v1 = sub_020947A4(*v0); return 0; } -BOOL sub_0204718C (UnkStruct_0203E724 * param0) +BOOL sub_0204718C (ScriptContext * param0) { - void ** v0 = sub_0203F098(param0->unk_34, 20); - u16 * v1 = inline_0204FCAC(param0); + void ** v0 = sub_0203F098(param0->fieldSys, 20); + u16 * v1 = ScriptContext_GetVarPointer(param0); *v1 = sub_020947C8(*v0); return 0; } -BOOL sub_020471BC (UnkStruct_0203E724 * param0) +BOOL sub_020471BC (ScriptContext * param0) { - void ** v0 = sub_0203F098(param0->unk_34, 20); - u16 v1 = inline_02049538(param0); - u16 * v2 = inline_0204FCAC(param0); + void ** v0 = sub_0203F098(param0->fieldSys, 20); + u16 v1 = ScriptContext_GetVar(param0); + u16 * v2 = ScriptContext_GetVarPointer(param0); *v2 = sub_020947D8(*v0, v1); return 0; } -BOOL sub_02047200 (UnkStruct_0203E724 * param0) +BOOL sub_02047200 (ScriptContext * param0) { - void ** v0 = sub_0203F098(param0->unk_34, 20); - u16 v1 = inline_02049538(param0); - u16 * v2 = inline_0204FCAC(param0); + void ** v0 = sub_0203F098(param0->fieldSys, 20); + u16 v1 = ScriptContext_GetVar(param0); + u16 * v2 = ScriptContext_GetVarPointer(param0); *v2 = sub_020947F0(*v0, v1); return 0; } -BOOL sub_02047244 (UnkStruct_0203E724 * param0) +BOOL sub_02047244 (ScriptContext * param0) { - void ** v0 = sub_0203F098(param0->unk_34, 20); - u16 * v1 = inline_0204FCAC(param0); + void ** v0 = sub_0203F098(param0->fieldSys, 20); + u16 * v1 = ScriptContext_GetVarPointer(param0); *v1 = sub_02094804(*v0); return 0; } -BOOL sub_02047274 (UnkStruct_0203E724 * param0) +BOOL sub_02047274 (ScriptContext * param0) { - void ** v0 = sub_0203F098(param0->unk_34, 20); - u16 * v1 = inline_0204FCAC(param0); - u16 * v2 = inline_0204FCAC(param0); - u16 * v3 = inline_0204FCAC(param0); - u16 * v4 = inline_0204FCAC(param0); + void ** v0 = sub_0203F098(param0->fieldSys, 20); + u16 * v1 = ScriptContext_GetVarPointer(param0); + u16 * v2 = ScriptContext_GetVarPointer(param0); + u16 * v3 = ScriptContext_GetVarPointer(param0); + u16 * v4 = ScriptContext_GetVarPointer(param0); sub_02094828(*v0, v1, v2, v3, v4); return 0; } -BOOL sub_020472E8 (UnkStruct_0203E724 * param0) +BOOL sub_020472E8 (ScriptContext * param0) { - void ** v0 = sub_0203F098(param0->unk_34, 20); - u16 * v1 = inline_0204FCAC(param0); + void ** v0 = sub_0203F098(param0->fieldSys, 20); + u16 * v1 = ScriptContext_GetVarPointer(param0); *v1 = sub_02094868(*v0); return 0; } -BOOL sub_02047318 (UnkStruct_0203E724 * param0) +BOOL sub_02047318 (ScriptContext * param0) { - void ** v0 = sub_0203F098(param0->unk_34, 20); - StringTemplate ** v1 = sub_0203F098(param0->unk_34, 15); - u16 v2 = inline_02049538(param0); + void ** v0 = sub_0203F098(param0->fieldSys, 20); + StringTemplate ** v1 = sub_0203F098(param0->fieldSys, 15); + u16 v2 = ScriptContext_GetVar(param0); sub_02094898(*v0, *v1, v2, 11); return 0; } -BOOL sub_02047358 (UnkStruct_0203E724 * param0) +BOOL sub_02047358 (ScriptContext * param0) { - void ** v0 = sub_0203F098(param0->unk_34, 20); - u16 * v1 = inline_0204FCAC(param0); + void ** v0 = sub_0203F098(param0->fieldSys, 20); + u16 * v1 = ScriptContext_GetVarPointer(param0); *v1 = sub_02094904(*v0); return 0; } -BOOL sub_02047388 (UnkStruct_0203E724 * param0) +BOOL sub_02047388 (ScriptContext * param0) { - void ** v0 = sub_0203F098(param0->unk_34, 20); + void ** v0 = sub_0203F098(param0->fieldSys, 20); sub_02094850(*v0); return 0; } -BOOL sub_020473A0 (UnkStruct_0203E724 * param0) +BOOL sub_020473A0 (ScriptContext * param0) { - void ** v0 = sub_0203F098(param0->unk_34, 20); + void ** v0 = sub_0203F098(param0->fieldSys, 20); sub_02094860(*v0); return 0; } -BOOL sub_020473B8 (UnkStruct_0203E724 * param0) +BOOL sub_020473B8 (ScriptContext * param0) { - void ** v0 = sub_0203F098(param0->unk_34, 20); - u16 v1 = inline_02049538(param0); + void ** v0 = sub_0203F098(param0->fieldSys, 20); + u16 v1 = ScriptContext_GetVar(param0); sub_02094A58(*v0, v1); return 0; } -BOOL sub_020473E4 (UnkStruct_0203E724 * param0) +BOOL sub_020473E4 (ScriptContext * param0) { - void ** v0 = sub_0203F098(param0->unk_34, 20); + void ** v0 = sub_0203F098(param0->fieldSys, 20); - sub_0203E764(param0, sub_02047404); + ScriptContext_Pause(param0, sub_02047404); return 1; } -static BOOL sub_02047404 (UnkStruct_0203E724 * param0) +static BOOL sub_02047404 (ScriptContext * param0) { - void ** v0 = sub_0203F098(param0->unk_34, 20); + void ** v0 = sub_0203F098(param0->fieldSys, 20); if (sub_02094B1C(*v0) == 1) { return 1; @@ -400,22 +400,22 @@ static BOOL sub_02047404 (UnkStruct_0203E724 * param0) return 0; } -BOOL sub_02047424 (UnkStruct_0203E724 * param0) +BOOL sub_02047424 (ScriptContext * param0) { - ov5_021EF3FC(param0->unk_34->unk_04->unk_1C); + ov5_021EF3FC(param0->fieldSys->unk_04->unk_1C); return 0; } -BOOL sub_02047438 (UnkStruct_0203E724 * param0) +BOOL sub_02047438 (ScriptContext * param0) { - ov5_021EF3DC(param0->unk_34->unk_04->unk_1C); + ov5_021EF3DC(param0->fieldSys->unk_04->unk_1C); return 0; } -BOOL sub_0204744C (UnkStruct_0203E724 * param0) +BOOL sub_0204744C (ScriptContext * param0) { - void ** v0 = sub_0203F098(param0->unk_34, 20); - u16 * v1 = inline_0204FCAC(param0); + void ** v0 = sub_0203F098(param0->fieldSys, 20); + u16 * v1 = ScriptContext_GetVarPointer(param0); int v2, v3, v4, v5, v6; sub_02094BB4(*v0, &v2, &v3, &v4, &v5, &v6); @@ -429,8 +429,8 @@ BOOL sub_0204744C (UnkStruct_0203E724 * param0) return 0; } -BOOL sub_020474AC (UnkStruct_0203E724 * param0) +BOOL sub_020474AC (ScriptContext * param0) { - ov6_02247A0C(param0->unk_28); + ov6_02247A0C(param0->taskManager); return 1; } diff --git a/src/unk_020474B8.c b/src/unk_020474B8.c index 1a03823a43..09a70db087 100644 --- a/src/unk_020474B8.c +++ b/src/unk_020474B8.c @@ -38,54 +38,54 @@ static Strbuf* sub_02047998(u16 param0, u32 param1); -BOOL sub_020474B8 (UnkStruct_0203E724 * param0) +BOOL sub_020474B8 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; StringTemplate ** v1 = sub_0203F098(v0, 15); - u8 v2 = (*((param0)->unk_08++)); - u8 v3 = inline_02049538(param0); + u8 v2 = ScriptContext_ReadByte(param0); + u8 v3 = ScriptContext_GetVar(param0); StringTemplate_SetPokemonStatName(*v1, v2, v3); return 0; } -BOOL sub_020474F4 (UnkStruct_0203E724 * param0) +BOOL sub_020474F4 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; StringTemplate ** v1 = sub_0203F098(v0, 15); - u8 v2 = (*((param0)->unk_08++)); + u8 v2 = ScriptContext_ReadByte(param0); StringTemplate_SetPlayerName(*v1, v2, SaveData_GetTrainerInfo(FieldSystem_SaveData(v0))); return 0; } -BOOL sub_02047528 (UnkStruct_0203E724 * param0) +BOOL sub_02047528 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; StringTemplate ** v1 = sub_0203F098(v0, 15); - u8 v2 = (*((param0)->unk_08++)); + u8 v2 = ScriptContext_ReadByte(param0); StringTemplate_SetRivalName(*v1, v2, v0->saveData); return 0; } -BOOL sub_0204754C (UnkStruct_0203E724 * param0) +BOOL sub_0204754C (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; StringTemplate ** v1 = sub_0203F098(v0, 15); - u8 v2 = (*((param0)->unk_08++)); + u8 v2 = ScriptContext_ReadByte(param0); StringTemplate_SetCounterpartName(*v1, v2, v0->saveData); return 0; } -BOOL sub_02047570 (UnkStruct_0203E724 * param0) +BOOL sub_02047570 (ScriptContext * param0) { Pokemon * v0; - FieldSystem * v1 = param0->unk_34; + FieldSystem * v1 = param0->fieldSys; StringTemplate ** v2 = sub_0203F098(v1, 15); - u8 v3 = (*((param0)->unk_08++)); - u16 v4 = inline_02049538(param0); + u8 v3 = ScriptContext_ReadByte(param0); + u16 v4 = ScriptContext_GetVar(param0); v0 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(v1->saveData), v4); StringTemplate_SetSpeciesName(*v2, v3, (BoxPokemon *)v0); @@ -93,46 +93,46 @@ BOOL sub_02047570 (UnkStruct_0203E724 * param0) return 0; } -BOOL sub_020475B8 (UnkStruct_0203E724 * param0) +BOOL sub_020475B8 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; StringTemplate ** v1 = sub_0203F098(v0, 15); - u8 v2 = (*((param0)->unk_08++)); - u16 v3 = inline_02049538(param0); + u8 v2 = ScriptContext_ReadByte(param0); + u16 v3 = ScriptContext_GetVar(param0); StringTemplate_SetPokemonTypeName(*v1, v2, v3); return 0; } -BOOL sub_020475F0 (UnkStruct_0203E724 * param0) +BOOL sub_020475F0 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; StringTemplate ** v1 = sub_0203F098(v0, 15); - u8 v2 = (*((param0)->unk_08++)); - u16 v3 = inline_02049538(param0); + u8 v2 = ScriptContext_ReadByte(param0); + u16 v3 = ScriptContext_GetVar(param0); StringTemplate_SetItemName(*v1, v2, v3); return 0; } -BOOL sub_02047628 (UnkStruct_0203E724 * param0) +BOOL sub_02047628 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; StringTemplate ** v1 = sub_0203F098(v0, 15); - u8 v2 = (*((param0)->unk_08++)); - u16 v3 = inline_02049538(param0); + u8 v2 = ScriptContext_ReadByte(param0); + u16 v3 = ScriptContext_GetVar(param0); StringTemplate_SetBagPocketName(*v1, v2, v3); return 0; } -BOOL sub_02047660 (UnkStruct_0203E724 * param0) +BOOL sub_02047660 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; StringTemplate ** v1 = sub_0203F098(v0, 15); - u8 v2 = (*((param0)->unk_08++)); - u16 v3 = inline_02049538(param0); + u8 v2 = ScriptContext_ReadByte(param0); + u16 v3 = ScriptContext_GetVar(param0); u16 v4; v4 = Item_MoveForTMHM(v3); @@ -141,36 +141,36 @@ BOOL sub_02047660 (UnkStruct_0203E724 * param0) return 0; } -BOOL sub_0204769C (UnkStruct_0203E724 * param0) +BOOL sub_0204769C (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; StringTemplate ** v1 = sub_0203F098(v0, 15); - u8 v2 = (*((param0)->unk_08++)); - u16 v3 = inline_02049538(param0); + u8 v2 = ScriptContext_ReadByte(param0); + u16 v3 = ScriptContext_GetVar(param0); StringTemplate_SetMoveName(*v1, v2, v3); return 0; } -BOOL sub_020476D4 (UnkStruct_0203E724 * param0) +BOOL sub_020476D4 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; StringTemplate ** v1 = sub_0203F098(v0, 15); - u8 v2 = (*((param0)->unk_08++)); - u16 v3 = inline_02049538(param0); + u8 v2 = ScriptContext_ReadByte(param0); + u16 v3 = ScriptContext_GetVar(param0); StringTemplate_SetNumber(*v1, v2, v3, sub_0205DFC4(v3), 1, 1); return 0; } -BOOL sub_0204771C (UnkStruct_0203E724 * param0) +BOOL sub_0204771C (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; StringTemplate ** v1 = sub_0203F098(v0, 15); - u8 v2 = (*((param0)->unk_08++)); - u16 v3 = inline_02049538(param0); - u8 v4 = (*((param0)->unk_08++)); - u8 v5 = (*((param0)->unk_08++)); + u8 v2 = ScriptContext_ReadByte(param0); + u16 v3 = ScriptContext_GetVar(param0); + u8 v4 = ScriptContext_ReadByte(param0); + u8 v5 = ScriptContext_ReadByte(param0); if (v4 == 0) { v5 = sub_0205DFC4(v3); @@ -180,14 +180,14 @@ BOOL sub_0204771C (UnkStruct_0203E724 * param0) return 0; } -BOOL sub_0204777C (UnkStruct_0203E724 * param0) +BOOL sub_0204777C (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; StringTemplate ** v1 = sub_0203F098(v0, 15); - u8 v2 = (*((param0)->unk_08++)); - u32 v3 = sub_0203E850(param0); - u8 v4 = (*((param0)->unk_08++)); - u8 v5 = (*((param0)->unk_08++)); + u8 v2 = ScriptContext_ReadByte(param0); + u32 v3 = ScriptContext_ReadWord(param0); + u8 v4 = ScriptContext_ReadByte(param0); + u8 v5 = ScriptContext_ReadByte(param0); if (v4 == 0) { v5 = sub_0205DFC4(v3); @@ -197,13 +197,13 @@ BOOL sub_0204777C (UnkStruct_0203E724 * param0) return 0; } -BOOL sub_020477D0 (UnkStruct_0203E724 * param0) +BOOL sub_020477D0 (ScriptContext * param0) { Pokemon * v0; - FieldSystem * v1 = param0->unk_34; + FieldSystem * v1 = param0->fieldSys; StringTemplate ** v2 = sub_0203F098(v1, 15); - u8 v3 = (*((param0)->unk_08++)); - u16 v4 = inline_02049538(param0); + u8 v3 = ScriptContext_ReadByte(param0); + u16 v4 = ScriptContext_GetVar(param0); v0 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(v1->saveData), v4); StringTemplate_SetNickname(*v2, v3, (BoxPokemon *)v0); @@ -211,14 +211,14 @@ BOOL sub_020477D0 (UnkStruct_0203E724 * param0) return 0; } -BOOL sub_02047818 (UnkStruct_0203E724 * param0) +BOOL sub_02047818 (ScriptContext * param0) { BoxPokemon * v0; - FieldSystem * v1 = param0->unk_34; + FieldSystem * v1 = param0->fieldSys; PCBoxes * v2 = SaveData_PCBoxes(v1->saveData); StringTemplate ** v3 = sub_0203F098(v1, 15); - u8 v4 = (*((param0)->unk_08++)); - u16 v5 = inline_02049538(param0); + u8 v4 = ScriptContext_ReadByte(param0); + u16 v5 = ScriptContext_GetVar(param0); u32 v6, v7; v6 = v5 % (5 * 6); @@ -229,36 +229,36 @@ BOOL sub_02047818 (UnkStruct_0203E724 * param0) return 0; } -BOOL sub_02047874 (UnkStruct_0203E724 * param0) +BOOL sub_02047874 (ScriptContext * param0) { Pokemon * v0; - FieldSystem * v1 = param0->unk_34; + FieldSystem * v1 = param0->fieldSys; StringTemplate ** v2 = sub_0203F098(v1, 15); - u8 v3 = (*((param0)->unk_08++)); - u16 v4 = inline_02049538(param0); + u8 v3 = ScriptContext_ReadByte(param0); + u16 v4 = ScriptContext_GetVar(param0); StringTemplate_SetPoketchAppName(*v2, v3, v4); return 0; } -BOOL sub_020478AC (UnkStruct_0203E724 * param0) +BOOL sub_020478AC (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; StringTemplate ** v1 = sub_0203F098(v0, 15); - u8 v2 = (*((param0)->unk_08++)); - u16 v3 = inline_02049538(param0); + u8 v2 = ScriptContext_ReadByte(param0); + u16 v3 = ScriptContext_GetVar(param0); StringTemplate_SetTrainerClassName(*v1, v2, v3); return 0; } -BOOL sub_020478E4 (UnkStruct_0203E724 * param0) +BOOL sub_020478E4 (ScriptContext * param0) { int v0; - FieldSystem * v1 = param0->unk_34; - TrainerInfo * v2 = SaveData_GetTrainerInfo(FieldSystem_SaveData(param0->unk_34)); + FieldSystem * v1 = param0->fieldSys; + TrainerInfo * v2 = SaveData_GetTrainerInfo(FieldSystem_SaveData(param0->fieldSys)); StringTemplate ** v3 = sub_0203F098(v1, 15); - u8 v4 = (*((param0)->unk_08++)); + u8 v4 = ScriptContext_ReadByte(param0); v0 = sub_0205CA14(TrainerInfo_Gender(v2), TrainerInfo_Appearance(v2), 2); StringTemplate_SetTrainerClassNameWithArticle(*v3, v4, v0); @@ -266,14 +266,14 @@ BOOL sub_020478E4 (UnkStruct_0203E724 * param0) return 0; } -BOOL sub_02047930 (UnkStruct_0203E724 * param0) +BOOL sub_02047930 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; StringTemplate ** v1 = sub_0203F098(v0, 15); - u8 v2 = (*((param0)->unk_08++)); - u16 v3 = inline_02049538(param0); - u16 v4 = sub_0203E838(param0); - u8 v5 = (*((param0)->unk_08++)); + u8 v2 = ScriptContext_ReadByte(param0); + u16 v3 = ScriptContext_GetVar(param0); + u16 v4 = ScriptContext_ReadHalfWord(param0); + u8 v5 = ScriptContext_ReadByte(param0); Strbuf* v6 = sub_02047998(v3, 4); StringTemplate_SetStrbuf(*v1, v2, v6, v4, v5, GAME_LANGUAGE); @@ -294,11 +294,11 @@ static Strbuf* sub_02047998 (u16 param0, u32 param1) return v1; } -BOOL sub_020479C0 (UnkStruct_0203E724 * param0) +BOOL sub_020479C0 (ScriptContext * param0) { - StringTemplate ** v0 = sub_0203F098(param0->unk_34, 15); - u8 v1 = (*((param0)->unk_08++)); - u16 v2 = sub_0206B054(SaveData_Events(param0->unk_34->saveData)); + StringTemplate ** v0 = sub_0203F098(param0->fieldSys, 15); + u8 v1 = ScriptContext_ReadByte(param0); + u16 v2 = sub_0206B054(SaveData_Events(param0->fieldSys->saveData)); Strbuf* v3 = sub_02047998(v2, 4); StringTemplate_SetStrbuf(*v0, v1, v3, 0, 1, GAME_LANGUAGE); @@ -307,11 +307,11 @@ BOOL sub_020479C0 (UnkStruct_0203E724 * param0) return 0; } -BOOL sub_02047A10 (UnkStruct_0203E724 * param0) +BOOL sub_02047A10 (ScriptContext * param0) { - StringTemplate ** v0 = sub_0203F098(param0->unk_34, 15); - u8 v1 = (*((param0)->unk_08++)); - u16 v2 = sub_0206B064(SaveData_Events(param0->unk_34->saveData)); + StringTemplate ** v0 = sub_0203F098(param0->fieldSys, 15); + u8 v1 = ScriptContext_ReadByte(param0); + u16 v2 = sub_0206B064(SaveData_Events(param0->fieldSys->saveData)); Strbuf* v3 = sub_02047998(v2, 4); StringTemplate_SetStrbuf(*v0, v1, v3, 0, 1, GAME_LANGUAGE); @@ -320,11 +320,11 @@ BOOL sub_02047A10 (UnkStruct_0203E724 * param0) return 0; } -BOOL sub_02047A60 (UnkStruct_0203E724 * param0) +BOOL sub_02047A60 (ScriptContext * param0) { - StringTemplate ** v0 = sub_0203F098(param0->unk_34, 15); - u8 v1 = (*((param0)->unk_08++)); - u16 v2 = sub_0206B08C(SaveData_Events(param0->unk_34->saveData)); + StringTemplate ** v0 = sub_0203F098(param0->fieldSys, 15); + u8 v1 = ScriptContext_ReadByte(param0); + u16 v2 = sub_0206B08C(SaveData_Events(param0->fieldSys->saveData)); Strbuf* v3 = sub_02047998(v2, 4); StringTemplate_SetStrbuf(*v0, v1, v3, 0, 1, GAME_LANGUAGE); @@ -333,45 +333,45 @@ BOOL sub_02047A60 (UnkStruct_0203E724 * param0) return 0; } -BOOL sub_02047AB0 (UnkStruct_0203E724 * param0) +BOOL sub_02047AB0 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; StringTemplate ** v1 = sub_0203F098(v0, 15); - u8 v2 = (*((param0)->unk_08++)); - u16 v3 = inline_02049538(param0); + u8 v2 = ScriptContext_ReadByte(param0); + u16 v3 = ScriptContext_GetVar(param0); StringTemplate_SetUndergroundGoodsName(*v1, v2, v3); return 0; } -BOOL sub_02047AE8 (UnkStruct_0203E724 * param0) +BOOL sub_02047AE8 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; StringTemplate ** v1 = sub_0203F098(v0, 15); - u8 v2 = (*((param0)->unk_08++)); - u16 v3 = inline_02049538(param0); + u8 v2 = ScriptContext_ReadByte(param0); + u16 v3 = ScriptContext_GetVar(param0); StringTemplate_SetUndergroundTrapName(*v1, v2, v3); return 0; } -BOOL sub_02047B20 (UnkStruct_0203E724 * param0) +BOOL sub_02047B20 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; StringTemplate ** v1 = sub_0203F098(v0, 15); - u8 v2 = (*((param0)->unk_08++)); - u16 v3 = inline_02049538(param0); + u8 v2 = ScriptContext_ReadByte(param0); + u16 v3 = ScriptContext_GetVar(param0); StringTemplate_SetUndergroundItemName(*v1, v2, v3); return 0; } -BOOL sub_02047B58 (UnkStruct_0203E724 * param0) +BOOL sub_02047B58 (ScriptContext * param0) { Strbuf* v0 = Strbuf_Init(22, 4); - StringTemplate ** v1 = sub_0203F098(param0->unk_34, 15); - u8 v2 = (*((param0)->unk_08++)); - u16 v3 = inline_02049538(param0); + StringTemplate ** v1 = sub_0203F098(param0->fieldSys, 15); + u8 v2 = ScriptContext_ReadByte(param0); + u16 v3 = ScriptContext_GetVar(param0); sub_02071D10(v3, 4, v0); StringTemplate_SetStrbuf(*v1, v2, v0, 0, 1, GAME_LANGUAGE); @@ -380,12 +380,12 @@ BOOL sub_02047B58 (UnkStruct_0203E724 * param0) return 0; } -BOOL sub_02047BB8 (UnkStruct_0203E724 * param0) +BOOL sub_02047BB8 (ScriptContext * param0) { - StringTemplate ** v0 = sub_0203F098(param0->unk_34, 15); - u8 v1 = (*((param0)->unk_08++)); - u16 v2 = inline_02049538(param0); - u16 v3 = inline_02049538(param0); + StringTemplate ** v0 = sub_0203F098(param0->fieldSys, 15); + u8 v1 = ScriptContext_ReadByte(param0); + u16 v2 = ScriptContext_GetVar(param0); + u16 v3 = ScriptContext_GetVar(param0); Strbuf* v4 = BerryData_AllocAndGetName(v2 - 149, 32); StringTemplate_SetStrbuf(*v0, v1, v4, 0, (v3 < 2 ? 1 : 0), GAME_LANGUAGE); @@ -394,51 +394,51 @@ BOOL sub_02047BB8 (UnkStruct_0203E724 * param0) return 0; } -BOOL sub_02047C30 (UnkStruct_0203E724 * param0) +BOOL sub_02047C30 (ScriptContext * param0) { - StringTemplate ** v0 = sub_0203F098(param0->unk_34, 15); - u8 v1 = (*((param0)->unk_08++)); - u16 v2 = inline_02049538(param0); + StringTemplate ** v0 = sub_0203F098(param0->fieldSys, 15); + u8 v1 = ScriptContext_ReadByte(param0); + u16 v2 = ScriptContext_GetVar(param0); StringTemplate_SetNatureName(*v0, v1, v2); return 0; } -BOOL sub_02047C68 (UnkStruct_0203E724 * param0) +BOOL sub_02047C68 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; StringTemplate ** v1 = sub_0203F098(v0, 15); - u8 v2 = (*((param0)->unk_08++)); - u16 v3 = inline_02049538(param0); + u8 v2 = ScriptContext_ReadByte(param0); + u16 v3 = ScriptContext_GetVar(param0); StringTemplate_SetContestAccessoryName(*v1, v2, v3); return 0; } -BOOL sub_02047CA0 (UnkStruct_0203E724 * param0) +BOOL sub_02047CA0 (ScriptContext * param0) { Strbuf* v0; - FieldSystem * v1 = param0->unk_34; + FieldSystem * v1 = param0->fieldSys; StringTemplate ** v2 = sub_0203F098(v1, 15); - u8 v3 = (*((param0)->unk_08++)); + u8 v3 = ScriptContext_ReadByte(param0); v0 = Strbuf_Init(10 + 1, 11); - Strbuf_CopyChars(v0, MiscSaveBlock_TabletName(SaveData_MiscSaveBlock(param0->unk_34->saveData))); + Strbuf_CopyChars(v0, MiscSaveBlock_TabletName(SaveData_MiscSaveBlock(param0->fieldSys->saveData))); StringTemplate_SetStrbuf(*v2, v3, v0, 0, 0, Unk_020E4C44); Strbuf_Free(v0); return 0; } -BOOL sub_02047D00 (UnkStruct_0203E724 * param0) +BOOL sub_02047D00 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; Pokemon * v1; StringTemplate ** v2 = sub_0203F098(v0, 15); - u8 v3 = (*((param0)->unk_08++)); - u16 v4 = inline_02049538(param0); - u16 v5 = inline_02049538(param0); + u8 v3 = ScriptContext_ReadByte(param0); + u16 v4 = ScriptContext_GetVar(param0); + u16 v5 = ScriptContext_GetVar(param0); u16 v6; v1 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(v0->saveData), v4); @@ -448,12 +448,12 @@ BOOL sub_02047D00 (UnkStruct_0203E724 * param0) return 0; } -BOOL sub_02047D68 (UnkStruct_0203E724 * param0) +BOOL sub_02047D68 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; StringTemplate ** v1 = sub_0203F098(v0, 15); - u8 v2 = (*((param0)->unk_08++)); - u16 v3 = inline_02049538(param0); + u8 v2 = ScriptContext_ReadByte(param0); + u16 v3 = ScriptContext_GetVar(param0); u16 v4; v4 = sub_020923C0(v3, 3); @@ -462,12 +462,12 @@ BOOL sub_02047D68 (UnkStruct_0203E724 * param0) return 0; } -BOOL sub_02047DAC (UnkStruct_0203E724 * param0) +BOOL sub_02047DAC (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; StringTemplate ** v1 = sub_0203F098(v0, 15); - u8 v2 = (*((param0)->unk_08++)); - u16 v3 = inline_02049538(param0); + u8 v2 = ScriptContext_ReadByte(param0); + u16 v3 = ScriptContext_GetVar(param0); v3 -= 1; StringTemplate_SetBallSealName(*v1, v2, v3); @@ -475,123 +475,123 @@ BOOL sub_02047DAC (UnkStruct_0203E724 * param0) return 0; } -BOOL sub_02047DE8 (UnkStruct_0203E724 * param0) +BOOL sub_02047DE8 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; StringTemplate ** v1 = sub_0203F098(v0, 15); - u8 v2 = (*((param0)->unk_08++)); - u16 v3 = inline_02049538(param0); + u8 v2 = ScriptContext_ReadByte(param0); + u16 v3 = ScriptContext_GetVar(param0); StringTemplate_SetTrainerName(*v1, v2, v3); return 0; } -BOOL sub_02047E20 (UnkStruct_0203E724 * param0) +BOOL sub_02047E20 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; StringTemplate ** v1 = sub_0203F098(v0, 15); - u8 v2 = (*((param0)->unk_08++)); - u16 v3 = inline_02049538(param0); + u8 v2 = ScriptContext_ReadByte(param0); + u16 v3 = ScriptContext_GetVar(param0); StringTemplate_SetItemNameWithArticle(*v1, v2, v3); return 0; } -BOOL sub_02047E58 (UnkStruct_0203E724 * param0) +BOOL sub_02047E58 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; StringTemplate ** v1 = sub_0203F098(v0, 15); - u8 v2 = (*((param0)->unk_08++)); - u16 v3 = inline_02049538(param0); + u8 v2 = ScriptContext_ReadByte(param0); + u16 v3 = ScriptContext_GetVar(param0); StringTemplate_SetItemNamePlural(*v1, v2, v3); return 0; } -BOOL sub_02047E90 (UnkStruct_0203E724 * param0) +BOOL sub_02047E90 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; StringTemplate ** v1 = sub_0203F098(v0, 15); - u8 v2 = (*((param0)->unk_08++)); - u16 v3 = inline_02049538(param0); + u8 v2 = ScriptContext_ReadByte(param0); + u16 v3 = ScriptContext_GetVar(param0); StringTemplate_SetUndergroundGoodsNameWithArticle(*v1, v2, v3); return 0; } -BOOL sub_02047EC8 (UnkStruct_0203E724 * param0) +BOOL sub_02047EC8 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; StringTemplate ** v1 = sub_0203F098(v0, 15); - u8 v2 = (*((param0)->unk_08++)); - u16 v3 = inline_02049538(param0); + u8 v2 = ScriptContext_ReadByte(param0); + u16 v3 = ScriptContext_GetVar(param0); StringTemplate_SetUndergroundTrapNameWithArticle(*v1, v2, v3); return 0; } -BOOL sub_02047F00 (UnkStruct_0203E724 * param0) +BOOL sub_02047F00 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; StringTemplate ** v1 = sub_0203F098(v0, 15); - u8 v2 = (*((param0)->unk_08++)); - u16 v3 = inline_02049538(param0); + u8 v2 = ScriptContext_ReadByte(param0); + u16 v3 = ScriptContext_GetVar(param0); StringTemplate_SetUndergroundItemNameWithArticle(*v1, v2, v3); return 0; } -BOOL sub_02047F38 (UnkStruct_0203E724 * param0) +BOOL sub_02047F38 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; StringTemplate ** v1 = sub_0203F098(v0, 15); - u8 v2 = (*((param0)->unk_08++)); - u16 v3 = inline_02049538(param0); - u16 v4 = sub_0203E838(param0); - u8 v5 = (*((param0)->unk_08++)); + u8 v2 = ScriptContext_ReadByte(param0); + u16 v3 = ScriptContext_GetVar(param0); + u16 v4 = ScriptContext_ReadHalfWord(param0); + u8 v5 = ScriptContext_ReadByte(param0); StringTemplate_SetSpeciesNameWithArticleByID(*v1, v2, v3); return 0; } -BOOL sub_02047F80 (UnkStruct_0203E724 * param0) +BOOL sub_02047F80 (ScriptContext * param0) { - StringTemplate ** v0 = sub_0203F098(param0->unk_34, 15); - u8 v1 = (*((param0)->unk_08++)); - u16 v2 = sub_0206B08C(SaveData_Events(param0->unk_34->saveData)); + StringTemplate ** v0 = sub_0203F098(param0->fieldSys, 15); + u8 v1 = ScriptContext_ReadByte(param0); + u16 v2 = sub_0206B08C(SaveData_Events(param0->fieldSys->saveData)); StringTemplate_SetSpeciesNameWithArticleByID(*v0, v1, v2); return 0; } -BOOL sub_02047FB4 (UnkStruct_0203E724 * param0) +BOOL sub_02047FB4 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; StringTemplate ** v1 = sub_0203F098(v0, 15); - u8 v2 = (*((param0)->unk_08++)); - u16 v3 = inline_02049538(param0); + u8 v2 = ScriptContext_ReadByte(param0); + u16 v3 = ScriptContext_GetVar(param0); StringTemplate_SetContestAccessoryNameWithArticle(*v1, v2, v3); return 0; } -BOOL sub_02047FEC (UnkStruct_0203E724 * param0) +BOOL sub_02047FEC (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; StringTemplate ** v1 = sub_0203F098(v0, 15); - u8 v2 = (*((param0)->unk_08++)); - u16 v3 = inline_02049538(param0); + u8 v2 = ScriptContext_ReadByte(param0); + u16 v3 = ScriptContext_GetVar(param0); StringTemplate_SetTrainerClassNameWithArticle(*v1, v2, v3); return 0; } -BOOL sub_02048024 (UnkStruct_0203E724 * param0) +BOOL sub_02048024 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; StringTemplate ** v1 = sub_0203F098(v0, 15); - u8 v2 = (*((param0)->unk_08++)); - u16 v3 = inline_02049538(param0); + u8 v2 = ScriptContext_ReadByte(param0); + u16 v3 = ScriptContext_GetVar(param0); v3 -= 1; StringTemplate_SetBallSealNamePlural(*v1, v2, v3); @@ -599,22 +599,22 @@ BOOL sub_02048024 (UnkStruct_0203E724 * param0) return 0; } -BOOL sub_02048060 (UnkStruct_0203E724 * param0) +BOOL sub_02048060 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; StringTemplate ** v1 = sub_0203F098(v0, 15); - u8 v2 = (*((param0)->unk_08++)); + u8 v2 = ScriptContext_ReadByte(param0); StringTemplate_CapitalizeArgAtIndex(*v1, v2); return 0; } -BOOL sub_02048080 (UnkStruct_0203E724 * param0) +BOOL sub_02048080 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; StringTemplate ** v1 = sub_0203F098(v0, 15); - u8 v2 = (*((param0)->unk_08++)); - u8 v3 = (*((param0)->unk_08++)); + u8 v2 = ScriptContext_ReadByte(param0); + u8 v3 = ScriptContext_ReadByte(param0); StringTemplate_SetDepartmentStoreFloor(*v1, v2, v3); return 0; diff --git a/src/unk_020480A8.c b/src/unk_020480A8.c index effd5dad5c..4ae3e15ed9 100644 --- a/src/unk_020480A8.c +++ b/src/unk_020480A8.c @@ -20,10 +20,10 @@ static u8 sub_02048268(u16 param0, u16 param1); -BOOL sub_020480A8 (UnkStruct_0203E724 * param0) +BOOL sub_020480A8 (ScriptContext * param0) { - UnkStruct_020507E4 * v0 = SaveData_Events(param0->unk_34->saveData); - u16 * v1 = inline_0204FCAC(param0); + UnkStruct_020507E4 * v0 = SaveData_Events(param0->fieldSys->saveData); + u16 * v1 = ScriptContext_GetVarPointer(param0); u32 v2; v2 = sub_0206B2A4(v0); @@ -32,16 +32,16 @@ BOOL sub_020480A8 (UnkStruct_0203E724 * param0) return 0; } -BOOL sub_020480D8 (UnkStruct_0203E724 * param0) +BOOL sub_020480D8 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; Pokemon * v1; BoxPokemon * v2; PCBoxes * v3 = SaveData_PCBoxes(v0->saveData); - u16 * v4 = inline_0204FCAC(param0); - u16 * v5 = inline_0204FCAC(param0); - u16 * v6 = inline_0204FCAC(param0); - u16 v7 = inline_02049538(param0); + u16 * v4 = ScriptContext_GetVarPointer(param0); + u16 * v5 = ScriptContext_GetVarPointer(param0); + u16 * v6 = ScriptContext_GetVarPointer(param0); + u16 v7 = ScriptContext_GetVar(param0); u16 v8, v9, v10; u16 v11, v12; u16 v13, v14; @@ -105,9 +105,9 @@ BOOL sub_020480D8 (UnkStruct_0203E724 * param0) return 0; } -BOOL sub_02048254 (UnkStruct_0203E724 * param0) +BOOL sub_02048254 (ScriptContext * param0) { - UnkStruct_020507E4 * v0 = SaveData_Events(param0->unk_34->saveData); + UnkStruct_020507E4 * v0 = SaveData_Events(param0->fieldSys->saveData); sub_0206B2C8(v0); return 0; diff --git a/src/unk_020482D4.c b/src/unk_020482D4.c index 7f32938b1d..a3b3841364 100644 --- a/src/unk_020482D4.c +++ b/src/unk_020482D4.c @@ -13,89 +13,89 @@ #include "unk_0203E724.h" #include "unk_020553DC.h" -static BOOL sub_02048378(UnkStruct_0203E724 * param0); -static BOOL sub_02048454(UnkStruct_0203E724 * param0); -static BOOL sub_020484B0(UnkStruct_0203E724 * param0); -static BOOL sub_020484E4(UnkStruct_0203E724 * param0); -BOOL sub_020482FC(UnkStruct_0203E724 * param0); -BOOL sub_0204830C(UnkStruct_0203E724 * param0); -BOOL sub_02048320(UnkStruct_0203E724 * param0); -BOOL sub_02048338(UnkStruct_0203E724 * param0); -BOOL sub_02048350(UnkStruct_0203E724 * param0); -BOOL sub_02048378(UnkStruct_0203E724 * param0); -BOOL sub_0204838C(UnkStruct_0203E724 * param0); -BOOL sub_020483B0(UnkStruct_0203E724 * param0); -BOOL sub_020483CC(UnkStruct_0203E724 * param0); -BOOL sub_020483E0(UnkStruct_0203E724 * param0); -BOOL sub_020483F4(UnkStruct_0203E724 * param0); -BOOL sub_02048410(UnkStruct_0203E724 * param0); -BOOL sub_0204842C(UnkStruct_0203E724 * param0); -BOOL sub_0204846C(UnkStruct_0203E724 * param0); -BOOL sub_020484A0(UnkStruct_0203E724 * param0); -BOOL sub_020484C4(UnkStruct_0203E724 * param0); -BOOL sub_020484D4(UnkStruct_0203E724 * param0); -BOOL sub_020484F8(UnkStruct_0203E724 * param0); -BOOL sub_02048530(UnkStruct_0203E724 * param0); -BOOL sub_0204855C(UnkStruct_0203E724 * param0); -BOOL sub_02048568(UnkStruct_0203E724 * param0); -BOOL sub_0204857C(UnkStruct_0203E724 * param0); -BOOL sub_0204858C(UnkStruct_0203E724 * param0); -BOOL sub_020482D4(UnkStruct_0203E724 * param0); -BOOL sub_020485C0(UnkStruct_0203E724 * param0); -BOOL sub_020485D4(UnkStruct_0203E724 * param0); -BOOL sub_020485F4(UnkStruct_0203E724 * param0); +static BOOL sub_02048378(ScriptContext * param0); +static BOOL sub_02048454(ScriptContext * param0); +static BOOL sub_020484B0(ScriptContext * param0); +static BOOL sub_020484E4(ScriptContext * param0); +BOOL sub_020482FC(ScriptContext * param0); +BOOL sub_0204830C(ScriptContext * param0); +BOOL sub_02048320(ScriptContext * param0); +BOOL sub_02048338(ScriptContext * param0); +BOOL sub_02048350(ScriptContext * param0); +BOOL sub_02048378(ScriptContext * param0); +BOOL sub_0204838C(ScriptContext * param0); +BOOL sub_020483B0(ScriptContext * param0); +BOOL sub_020483CC(ScriptContext * param0); +BOOL sub_020483E0(ScriptContext * param0); +BOOL sub_020483F4(ScriptContext * param0); +BOOL sub_02048410(ScriptContext * param0); +BOOL sub_0204842C(ScriptContext * param0); +BOOL sub_0204846C(ScriptContext * param0); +BOOL sub_020484A0(ScriptContext * param0); +BOOL sub_020484C4(ScriptContext * param0); +BOOL sub_020484D4(ScriptContext * param0); +BOOL sub_020484F8(ScriptContext * param0); +BOOL sub_02048530(ScriptContext * param0); +BOOL sub_0204855C(ScriptContext * param0); +BOOL sub_02048568(ScriptContext * param0); +BOOL sub_0204857C(ScriptContext * param0); +BOOL sub_0204858C(ScriptContext * param0); +BOOL sub_020482D4(ScriptContext * param0); +BOOL sub_020485C0(ScriptContext * param0); +BOOL sub_020485D4(ScriptContext * param0); +BOOL sub_020485F4(ScriptContext * param0); -BOOL sub_020482D4 (UnkStruct_0203E724 * param0) +BOOL sub_020482D4 (ScriptContext * param0) { - u16 v0 = sub_0203E838(param0); - u16 * v1 = inline_0204FCAC(param0); + u16 v0 = ScriptContext_ReadHalfWord(param0); + u16 * v1 = ScriptContext_GetVarPointer(param0); *v1 = sub_02005690(v0); return 0; } -BOOL sub_020482FC (UnkStruct_0203E724 * param0) +BOOL sub_020482FC (ScriptContext * param0) { - u16 v0 = sub_0203E838(param0); + u16 v0 = ScriptContext_ReadHalfWord(param0); Sound_PlayBGM(v0); return 0; } -BOOL sub_0204830C (UnkStruct_0203E724 * param0) +BOOL sub_0204830C (ScriptContext * param0) { - u16 v0 = sub_0203E838(param0); + u16 v0 = ScriptContext_ReadHalfWord(param0); sub_020055D0(sub_020041FC(), 0); return 0; } -BOOL sub_02048320 (UnkStruct_0203E724 * param0) +BOOL sub_02048320 (ScriptContext * param0) { - int v0 = param0->unk_34->unk_1C->unk_00; - u16 v1 = sub_020554A4(param0->unk_34, v0); + int v0 = param0->fieldSys->unk_1C->unk_00; + u16 v1 = sub_020554A4(param0->fieldSys, v0); Sound_PlayBGM(v1); return 0; } -BOOL sub_02048338 (UnkStruct_0203E724 * param0) +BOOL sub_02048338 (ScriptContext * param0) { - sub_020553F0(param0->unk_34, sub_0203E838(param0)); + sub_020553F0(param0->fieldSys, ScriptContext_ReadHalfWord(param0)); return 0; } -BOOL sub_02048350 (UnkStruct_0203E724 * param0) +BOOL sub_02048350 (ScriptContext * param0) { - u16 v0 = sub_0203E838(param0); - u16 v1 = sub_0203E838(param0); + u16 v0 = ScriptContext_ReadHalfWord(param0); + u16 v1 = ScriptContext_ReadHalfWord(param0); sub_0200564C(v0, v1); - sub_0203E764(param0, sub_02048378); + ScriptContext_Pause(param0, sub_02048378); return 1; } -static BOOL sub_02048378 (UnkStruct_0203E724 * param0) +static BOOL sub_02048378 (ScriptContext * param0) { if (sub_02005684() == 0) { return 1; @@ -104,85 +104,85 @@ static BOOL sub_02048378 (UnkStruct_0203E724 * param0) return 0; } -BOOL sub_0204838C (UnkStruct_0203E724 * param0) +BOOL sub_0204838C (ScriptContext * param0) { - u16 v0 = sub_0203E838(param0); + u16 v0 = ScriptContext_ReadHalfWord(param0); sub_0200560C(127, v0, 0); - sub_0203E764(param0, sub_02048378); + ScriptContext_Pause(param0, sub_02048378); return 1; } -BOOL sub_020483B0 (UnkStruct_0203E724 * param0) +BOOL sub_020483B0 (ScriptContext * param0) { - u8 v0 = (*((param0)->unk_08++)); - BOOL v1 = (*((param0)->unk_08++)); + u8 v0 = ScriptContext_ReadByte(param0); + BOOL v1 = ScriptContext_ReadByte(param0); sub_020049F4(v0, v1); return 0; } -BOOL sub_020483CC (UnkStruct_0203E724 * param0) +BOOL sub_020483CC (ScriptContext * param0) { - sub_02005588(4, sub_0203E838(param0)); + sub_02005588(4, ScriptContext_ReadHalfWord(param0)); return 0; } -BOOL sub_020483E0 (UnkStruct_0203E724 * param0) +BOOL sub_020483E0 (ScriptContext * param0) { - sub_020041CC((*((param0)->unk_08++))); + sub_020041CC(ScriptContext_ReadByte(param0)); return 0; } -BOOL sub_020483F4 (UnkStruct_0203E724 * param0) +BOOL sub_020483F4 (ScriptContext * param0) { - Sound_PlayEffect(inline_02049538(param0)); + Sound_PlayEffect(ScriptContext_GetVar(param0)); return 0; } -BOOL sub_02048410 (UnkStruct_0203E724 * param0) +BOOL sub_02048410 (ScriptContext * param0) { - sub_020057A4(inline_02049538(param0), 0); + sub_020057A4(ScriptContext_GetVar(param0), 0); return 0; } -BOOL sub_0204842C (UnkStruct_0203E724 * param0) +BOOL sub_0204842C (ScriptContext * param0) { - param0->unk_18[0] = inline_02049538(param0); + param0->data[0] = ScriptContext_GetVar(param0); - sub_0203E764(param0, sub_02048454); + ScriptContext_Pause(param0, sub_02048454); return 1; } -static BOOL sub_02048454 (UnkStruct_0203E724 * param0) +static BOOL sub_02048454 (ScriptContext * param0) { - if (sub_020057D4(param0->unk_18[0]) == 0) { + if (sub_020057D4(param0->data[0]) == 0) { return 1; } return 0; } -BOOL sub_0204846C (UnkStruct_0203E724 * param0) +BOOL sub_0204846C (ScriptContext * param0) { u16 v0, v1; - v0 = inline_02049538(param0); - v1 = inline_02049538(param0); + v0 = ScriptContext_GetVar(param0); + v1 = ScriptContext_GetVar(param0); sub_02005844(v0, 0); return 0; } -BOOL sub_020484A0 (UnkStruct_0203E724 * param0) +BOOL sub_020484A0 (ScriptContext * param0) { - sub_0203E764(param0, sub_020484B0); + ScriptContext_Pause(param0, sub_020484B0); return 1; } -static BOOL sub_020484B0 (UnkStruct_0203E724 * param0) +static BOOL sub_020484B0 (ScriptContext * param0) { if (sub_0200598C() == 0) { return 1; @@ -191,23 +191,23 @@ static BOOL sub_020484B0 (UnkStruct_0203E724 * param0) return 0; } -BOOL sub_020484C4 (UnkStruct_0203E724 * param0) +BOOL sub_020484C4 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; - sub_02006150(sub_0203E838(param0)); + sub_02006150(ScriptContext_ReadHalfWord(param0)); return 0; } -BOOL sub_020484D4 (UnkStruct_0203E724 * param0) +BOOL sub_020484D4 (ScriptContext * param0) { - sub_0203E764(param0, sub_020484E4); + ScriptContext_Pause(param0, sub_020484E4); return 1; } -static BOOL sub_020484E4 (UnkStruct_0203E724 * param0) +static BOOL sub_020484E4 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; if (sub_020061E4() == 0) { return 1; @@ -216,11 +216,11 @@ static BOOL sub_020484E4 (UnkStruct_0203E724 * param0) return 0; } -BOOL sub_020484F8 (UnkStruct_0203E724 * param0) +BOOL sub_020484F8 (ScriptContext * param0) { - u16 * v0 = inline_0204FCAC(param0); + u16 * v0 = ScriptContext_GetVarPointer(param0); - if (IsChatotCryStructReadyForProcessing(GetChatotCryDataFromSave(param0->unk_34->saveData)) == 1) { + if (IsChatotCryStructReadyForProcessing(GetChatotCryDataFromSave(param0->fieldSys->saveData)) == 1) { *v0 = 1; return 0; } @@ -229,9 +229,9 @@ BOOL sub_020484F8 (UnkStruct_0203E724 * param0) return 0; } -BOOL sub_02048530 (UnkStruct_0203E724 * param0) +BOOL sub_02048530 (ScriptContext * param0) { - u16 * v0 = inline_0204FCAC(param0); + u16 * v0 = ScriptContext_GetVarPointer(param0); if (StartMicSampling() == MIC_RESULT_SUCCESS) { *v0 = 1; @@ -242,34 +242,34 @@ BOOL sub_02048530 (UnkStruct_0203E724 * param0) return 0; } -BOOL sub_0204855C (UnkStruct_0203E724 * param0) +BOOL sub_0204855C (ScriptContext * param0) { StopMicSampling(); return 1; } -BOOL sub_02048568 (UnkStruct_0203E724 * param0) +BOOL sub_02048568 (ScriptContext * param0) { - StoreMicDataInChatotCryStruct(GetChatotCryDataFromSave(param0->unk_34->saveData)); + StoreMicDataInChatotCryStruct(GetChatotCryDataFromSave(param0->fieldSys->saveData)); return 1; } -BOOL sub_0204857C (UnkStruct_0203E724 * param0) +BOOL sub_0204857C (ScriptContext * param0) { sub_02004550(63, 0, 0); return 1; } -BOOL sub_0204858C (UnkStruct_0203E724 * param0) +BOOL sub_0204858C (ScriptContext * param0) { - u16 v0 = inline_02049538(param0); - u16 v1 = inline_02049538(param0); + u16 v0 = ScriptContext_GetVar(param0); + u16 v1 = ScriptContext_GetVar(param0); sub_02004AD4(v0, v1); return 0; } -BOOL sub_020485C0 (UnkStruct_0203E724 * param0) +BOOL sub_020485C0 (ScriptContext * param0) { if (gCoreSys.heldKeys & PAD_KEY_UP) { sub_02004550(22, 1218, 1); @@ -280,17 +280,17 @@ BOOL sub_020485C0 (UnkStruct_0203E724 * param0) return 1; } -BOOL sub_020485D4 (UnkStruct_0203E724 * param0) +BOOL sub_020485D4 (ScriptContext * param0) { - u16 v0 = inline_02049538(param0); + u16 v0 = ScriptContext_GetVar(param0); sub_02004550(4, v0, 1); return 1; } -BOOL sub_020485F4 (UnkStruct_0203E724 * param0) +BOOL sub_020485F4 (ScriptContext * param0) { - u16 * v0 = inline_0204FCAC(param0); + u16 * v0 = ScriptContext_GetVarPointer(param0); *v0 = sub_020041FC(); return 0; diff --git a/src/unk_02048614.c b/src/unk_02048614.c index 47ca2c26db..fb8a2503f8 100644 --- a/src/unk_02048614.c +++ b/src/unk_02048614.c @@ -24,28 +24,28 @@ #include "unk_0206AFE0.h" #include "party.h" -BOOL sub_02048614(UnkStruct_0203E724 * param0); -BOOL sub_020486E0(UnkStruct_0203E724 * param0); -BOOL sub_02048750(UnkStruct_0203E724 * param0); -BOOL sub_02048778(UnkStruct_0203E724 * param0); -BOOL sub_020487CC(UnkStruct_0203E724 * param0); -BOOL sub_020487FC(UnkStruct_0203E724 * param0); -BOOL sub_0204887C(UnkStruct_0203E724 * param0); -BOOL sub_020488E0(UnkStruct_0203E724 * param0); -BOOL sub_02048968(UnkStruct_0203E724 * param0); -BOOL sub_020489F0(UnkStruct_0203E724 * param0); -BOOL sub_02048A24(UnkStruct_0203E724 * param0); -BOOL sub_02048A44(UnkStruct_0203E724 * param0); -BOOL sub_02048A50(UnkStruct_0203E724 * param0); -BOOL sub_02048A80(UnkStruct_0203E724 * param0); -BOOL sub_02048AB0(UnkStruct_0203E724 * param0); -BOOL sub_02048AE0(UnkStruct_0203E724 * param0); -BOOL sub_02048B0C(UnkStruct_0203E724 * param0); -BOOL sub_02048B34(UnkStruct_0203E724 * param0); -BOOL sub_02048B60(UnkStruct_0203E724 * param0); -BOOL sub_02048BA8(UnkStruct_0203E724 * param0); +BOOL sub_02048614(ScriptContext * param0); +BOOL sub_020486E0(ScriptContext * param0); +BOOL sub_02048750(ScriptContext * param0); +BOOL sub_02048778(ScriptContext * param0); +BOOL sub_020487CC(ScriptContext * param0); +BOOL sub_020487FC(ScriptContext * param0); +BOOL sub_0204887C(ScriptContext * param0); +BOOL sub_020488E0(ScriptContext * param0); +BOOL sub_02048968(ScriptContext * param0); +BOOL sub_020489F0(ScriptContext * param0); +BOOL sub_02048A24(ScriptContext * param0); +BOOL sub_02048A44(ScriptContext * param0); +BOOL sub_02048A50(ScriptContext * param0); +BOOL sub_02048A80(ScriptContext * param0); +BOOL sub_02048AB0(ScriptContext * param0); +BOOL sub_02048AE0(ScriptContext * param0); +BOOL sub_02048B0C(ScriptContext * param0); +BOOL sub_02048B34(ScriptContext * param0); +BOOL sub_02048B60(ScriptContext * param0); +BOOL sub_02048BA8(ScriptContext * param0); -BOOL sub_02048614 (UnkStruct_0203E724 * param0) +BOOL sub_02048614 (ScriptContext * param0) { int * v0; int * v1; @@ -55,8 +55,8 @@ BOOL sub_02048614 (UnkStruct_0203E724 * param0) SysTask ** v5; LocalMapObject ** v6; PlayerAvatar * v7; - FieldSystem * v8 = param0->unk_34; - u16 v9 = inline_02049538(param0); + FieldSystem * v8 = param0->fieldSys; + u16 v9 = ScriptContext_GetVar(param0); if (v9 == 0) { v0 = sub_0203F098(v8, 24); @@ -82,18 +82,18 @@ BOOL sub_02048614 (UnkStruct_0203E724 * param0) return 0; } -BOOL sub_020486E0 (UnkStruct_0203E724 * param0) +BOOL sub_020486E0 (ScriptContext * param0) { SysTask ** v0; - u16 v1 = inline_02049538(param0); - u16 * v2 = inline_0204FCAC(param0); + u16 v1 = ScriptContext_GetVar(param0); + u16 * v2 = ScriptContext_GetVarPointer(param0); *v2 = 0; if (v1 == 0) { - v0 = sub_0203F098(param0->unk_34, 30); + v0 = sub_0203F098(param0->fieldSys, 30); } else { - v0 = sub_0203F098(param0->unk_34, 37); + v0 = sub_0203F098(param0->fieldSys, 37); } if (*v0 == NULL) { @@ -110,75 +110,75 @@ BOOL sub_020486E0 (UnkStruct_0203E724 * param0) return 1; } -BOOL sub_02048750 (UnkStruct_0203E724 * param0) +BOOL sub_02048750 (ScriptContext * param0) { - u16 * v0 = sub_0203F098(param0->unk_34, 28); - u16 * v1 = inline_0204FCAC(param0); + u16 * v0 = sub_0203F098(param0->fieldSys, 28); + u16 * v1 = ScriptContext_GetVarPointer(param0); *v1 = *v0; return 0; } -BOOL sub_02048778 (UnkStruct_0203E724 * param0) +BOOL sub_02048778 (ScriptContext * param0) { - u16 * v0 = sub_0203F098(param0->unk_34, 27); - u16 * v1 = sub_0203F098(param0->unk_34, 34); - u16 v2 = inline_02049538(param0); - u16 * v3 = inline_0204FCAC(param0); + u16 * v0 = sub_0203F098(param0->fieldSys, 27); + u16 * v1 = sub_0203F098(param0->fieldSys, 34); + u16 v2 = ScriptContext_GetVar(param0); + u16 * v3 = ScriptContext_GetVarPointer(param0); *v3 = (v2 == 0) ? (*v0) : (*v1); return 0; } -BOOL sub_020487CC (UnkStruct_0203E724 * param0) +BOOL sub_020487CC (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; u16 * v1 = sub_0203F098(v0, 8); - u16 * v2 = inline_0204FCAC(param0); + u16 * v2 = ScriptContext_GetVarPointer(param0); *v2 = sub_0203F254(*v1); return 0; } -BOOL sub_020487FC (UnkStruct_0203E724 * param0) +BOOL sub_020487FC (ScriptContext * param0) { u32 v0; - FieldSystem * v1 = param0->unk_34; + FieldSystem * v1 = param0->fieldSys; u16 * v2 = sub_0203F098(v1, 8); BOOL * v3 = sub_0203F098(v1, 23); - u16 v4 = inline_02049538(param0); - u16 v5 = inline_02049538(param0); + u16 v4 = ScriptContext_GetVar(param0); + u16 v5 = ScriptContext_GetVar(param0); u16 v6; v6 = 0; - if (sub_0206A984(SaveData_Events(param0->unk_34->saveData)) == 1) { + if (sub_0206A984(SaveData_Events(param0->fieldSys->saveData)) == 1) { v6 = sub_0206B034(SaveData_Events(v1->saveData)); } - sub_020515CC(param0->unk_28, v4, v5, v6, 11, v3); + sub_020515CC(param0->taskManager, v4, v5, v6, 11, v3); return 1; } -BOOL sub_0204887C (UnkStruct_0203E724 * param0) +BOOL sub_0204887C (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; BOOL * v1 = sub_0203F098(v0, 23); - u16 v2 = inline_02049538(param0); - u16 v3 = inline_02049538(param0); - u16 v4 = inline_02049538(param0); + u16 v2 = ScriptContext_GetVar(param0); + u16 v3 = ScriptContext_GetVar(param0); + u16 v4 = ScriptContext_GetVar(param0); - sub_020515CC(param0->unk_28, v3, v4, v2, 11, v1); + sub_020515CC(param0->taskManager, v3, v4, v2, 11, v1); return 1; } -BOOL sub_020488E0 (UnkStruct_0203E724 * param0) +BOOL sub_020488E0 (ScriptContext * param0) { u16 v0, v1, v2, v3, v4; - u16 * v5 = sub_0203F098(param0->unk_34, 8); - u16 * v6 = inline_0204FCAC(param0); - u16 * v7 = inline_0204FCAC(param0); - u16 * v8 = inline_0204FCAC(param0); + u16 * v5 = sub_0203F098(param0->fieldSys, 8); + u16 * v6 = ScriptContext_GetVarPointer(param0); + u16 * v7 = ScriptContext_GetVarPointer(param0); + u16 * v8 = ScriptContext_GetVarPointer(param0); v0 = sub_0203F28C(sub_0203F254(*v5)); @@ -207,13 +207,13 @@ BOOL sub_020488E0 (UnkStruct_0203E724 * param0) return 0; } -BOOL sub_02048968 (UnkStruct_0203E724 * param0) +BOOL sub_02048968 (ScriptContext * param0) { u16 v0, v1, v2, v3, v4; - u16 * v5 = sub_0203F098(param0->unk_34, 8); - u16 * v6 = inline_0204FCAC(param0); - u16 * v7 = inline_0204FCAC(param0); - u16 * v8 = inline_0204FCAC(param0); + u16 * v5 = sub_0203F098(param0->fieldSys, 8); + u16 * v6 = ScriptContext_GetVarPointer(param0); + u16 * v7 = ScriptContext_GetVarPointer(param0); + u16 * v8 = ScriptContext_GetVarPointer(param0); v0 = sub_0203F28C(sub_0203F254(*v5)); @@ -242,78 +242,78 @@ BOOL sub_02048968 (UnkStruct_0203E724 * param0) return 0; } -BOOL sub_020489F0 (UnkStruct_0203E724 * param0) +BOOL sub_020489F0 (ScriptContext * param0) { - u16 * v0 = sub_0203F098(param0->unk_34, 8); - u16 * v1 = inline_0204FCAC(param0); + u16 * v0 = sub_0203F098(param0->fieldSys, 8); + u16 * v1 = ScriptContext_GetVarPointer(param0); *v1 = sub_0203F28C(sub_0203F254(*v0)); return 0; } -BOOL sub_02048A24 (UnkStruct_0203E724 * param0) +BOOL sub_02048A24 (ScriptContext * param0) { - u16 v0 = inline_02049538(param0); + u16 v0 = ScriptContext_GetVar(param0); sub_02004950(sub_0205560C(v0)); return 1; } -BOOL sub_02048A44 (UnkStruct_0203E724 * param0) +BOOL sub_02048A44 (ScriptContext * param0) { - sub_02052C5C(param0->unk_28); + sub_02052C5C(param0->taskManager); return 1; } -BOOL sub_02048A50 (UnkStruct_0203E724 * param0) +BOOL sub_02048A50 (ScriptContext * param0) { - BOOL * v0 = sub_0203F098(param0->unk_34, 23); - u16 * v1 = inline_0204FCAC(param0); + BOOL * v0 = sub_0203F098(param0->fieldSys, 23); + u16 * v1 = ScriptContext_GetVarPointer(param0); *v1 = sub_02052868(*v0); return 1; } -BOOL sub_02048A80 (UnkStruct_0203E724 * param0) +BOOL sub_02048A80 (ScriptContext * param0) { - BOOL * v0 = sub_0203F098(param0->unk_34, 23); - u16 * v1 = inline_0204FCAC(param0); + BOOL * v0 = sub_0203F098(param0->fieldSys, 23); + u16 * v1 = ScriptContext_GetVarPointer(param0); *v1 = sub_02052878(*v0); return 1; } -BOOL sub_02048AB0 (UnkStruct_0203E724 * param0) +BOOL sub_02048AB0 (ScriptContext * param0) { - BOOL * v0 = sub_0203F098(param0->unk_34, 23); - u16 * v1 = inline_0204FCAC(param0); + BOOL * v0 = sub_0203F098(param0->fieldSys, 23); + u16 * v1 = ScriptContext_GetVarPointer(param0); *v1 = sub_02052888(*v0); return 1; } -BOOL sub_02048AE0 (UnkStruct_0203E724 * param0) +BOOL sub_02048AE0 (ScriptContext * param0) { - u16 * v0 = inline_0204FCAC(param0); + u16 * v0 = ScriptContext_GetVarPointer(param0); - *v0 = sub_02054AB0(Party_GetFromSavedata(param0->unk_34->saveData)); + *v0 = sub_02054AB0(Party_GetFromSavedata(param0->fieldSys->saveData)); return 0; } -BOOL sub_02048B0C (UnkStruct_0203E724 * param0) +BOOL sub_02048B0C (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; BOOL * v1 = sub_0203F098(v0, 23); - sub_020515CC(param0->unk_28, 1, 0, 0, 11, v1); + sub_020515CC(param0->taskManager, 1, 0, 0, 11, v1); return 1; } -BOOL sub_02048B34 (UnkStruct_0203E724 * param0) +BOOL sub_02048B34 (ScriptContext * param0) { LocalMapObject ** v0; - FieldSystem * v1 = param0->unk_34; + FieldSystem * v1 = param0->fieldSys; v0 = sub_0203F098(v1, 10); sub_0203F2BC(sub_02062C00(*v0), sub_02062910(*v0)); @@ -321,29 +321,29 @@ BOOL sub_02048B34 (UnkStruct_0203E724 * param0) return 0; } -BOOL sub_02048B60 (UnkStruct_0203E724 * param0) +BOOL sub_02048B60 (ScriptContext * param0) { int v0; s32 v1; LocalMapObject ** v2; - FieldSystem * v3 = param0->unk_34; + FieldSystem * v3 = param0->fieldSys; v2 = sub_0203F098(v3, 10); - v1 = (s32)sub_0203E850(param0); + v1 = (s32)ScriptContext_ReadWord(param0); v0 = sub_0203F2A0(sub_02062C00(*v2), sub_02062910(*v2)); if (v0 == 1) { - sub_0203E818(param0, (u8 *)(param0->unk_08 + v1)); + ScriptContext_Jump(param0, (u8 *)(param0->scriptPtr + v1)); return 1; } return 0; } -BOOL sub_02048BA8 (UnkStruct_0203E724 * param0) +BOOL sub_02048BA8 (ScriptContext * param0) { - BOOL * v0 = sub_0203F098(param0->unk_34, 23); - u16 * v1 = inline_0204FCAC(param0); + BOOL * v0 = sub_0203F098(param0->fieldSys, 23); + u16 * v1 = ScriptContext_GetVarPointer(param0); *v1 = *v0; return 1; diff --git a/src/unk_02048BD0.c b/src/unk_02048BD0.c index f65d8c3cd5..092e3606cf 100644 --- a/src/unk_02048BD0.c +++ b/src/unk_02048BD0.c @@ -20,20 +20,20 @@ #include "unk_02048BD0.h" #include "unk_0206CCB0.h" -BOOL sub_02048BD0 (UnkStruct_0203E724 * param0) +BOOL sub_02048BD0 (ScriptContext * param0) { - StringTemplate ** v0 = sub_0203F098(param0->unk_34, 15); - UnkStruct_0202B4A0 * v1 = sub_0202B4A0(param0->unk_34->saveData); - SaveData * v2 = param0->unk_34->saveData; + StringTemplate ** v0 = sub_0203F098(param0->fieldSys, 15); + UnkStruct_0202B4A0 * v1 = sub_0202B4A0(param0->fieldSys->saveData); + SaveData * v2 = param0->fieldSys->saveData; - switch (sub_0203E838(param0)) { + switch (ScriptContext_ReadHalfWord(param0)) { case 0: { u16 v3; u16 * v4; - v3 = inline_02049538(param0); - v4 = inline_0204FCAC(param0); + v3 = ScriptContext_GetVar(param0); + v4 = ScriptContext_GetVarPointer(param0); *v4 = sub_0202B4AC(v1, v3); return 0; @@ -44,8 +44,8 @@ BOOL sub_02048BD0 (UnkStruct_0203E724 * param0) u16 v5; u16 * v6; - v5 = inline_02049538(param0); - v6 = inline_0204FCAC(param0); + v5 = ScriptContext_GetVar(param0); + v6 = ScriptContext_GetVarPointer(param0); *v6 = sub_0202B4C4(v1, v5); return 0; @@ -55,8 +55,8 @@ BOOL sub_02048BD0 (UnkStruct_0203E724 * param0) { u16 v7, v8; - v7 = inline_02049538(param0); - v8 = inline_02049538(param0); + v7 = ScriptContext_GetVar(param0); + v8 = ScriptContext_GetVar(param0); StringTemplate_SetUnionGroupName(*v0, v2, v7, v8, 0); } @@ -65,8 +65,8 @@ BOOL sub_02048BD0 (UnkStruct_0203E724 * param0) { u16 v9, v10; - v9 = inline_02049538(param0); - v10 = inline_02049538(param0); + v9 = ScriptContext_GetVar(param0); + v10 = ScriptContext_GetVar(param0); StringTemplate_SetUnionGroupName(*v0, v2, v9, v10, 1); } @@ -76,25 +76,25 @@ BOOL sub_02048BD0 (UnkStruct_0203E724 * param0) const u16 * v11; v11 = sub_0202B42C(v1, 0, 0); - sub_0203DFE8(param0->unk_28, 5, 0, 7, 0, v11, inline_0204FCAC(param0)); + sub_0203DFE8(param0->taskManager, 5, 0, 7, 0, v11, ScriptContext_GetVarPointer(param0)); } return 1; case 5: { - u16 v12 = inline_02049538(param0); + u16 v12 = ScriptContext_GetVar(param0); BOOL v13 = sub_0202B4AC(v1, 1); sub_0202B384(v1, v12, 1); if (v13) { - sub_0206D430(param0->unk_34); + sub_0206D430(param0->fieldSys); } } return 0; case 6: { Strbuf* v14 = Strbuf_Init(64, 32); - TrainerInfo * v15 = SaveData_GetTrainerInfo(param0->unk_34->saveData); + TrainerInfo * v15 = SaveData_GetTrainerInfo(param0->fieldSys->saveData); TrainerInfo_NameStrbuf(v15, v14); sub_0202B444(v1, 0, 1, v14); @@ -103,7 +103,7 @@ BOOL sub_02048BD0 (UnkStruct_0203E724 * param0) sub_0202B40C(v1, 0, MTRNG_Next()); Strbuf_Free(v14); sub_0202B384(v1, 0, 1); - sub_0206D424(param0->unk_34); + sub_0206D424(param0->fieldSys); } break; } diff --git a/src/unk_02048DD8.c b/src/unk_02048DD8.c index 78176b9df9..27e4e6a0a2 100644 --- a/src/unk_02048DD8.c +++ b/src/unk_02048DD8.c @@ -53,64 +53,64 @@ typedef struct { static int sub_020491D0(int param0, FieldSystem * param1, StringTemplate * param2); static void sub_020491B8(FieldSystem * param0, int param1, u16 param2, u16 param3); static BOOL sub_020491F4(FieldSystem * param0, int param1); -BOOL sub_020493C8(UnkStruct_0203E724 * param0); -BOOL sub_020493F4(UnkStruct_0203E724 * param0); +BOOL sub_020493C8(ScriptContext * param0); +BOOL sub_020493F4(ScriptContext * param0); -BOOL sub_02048DD8 (UnkStruct_0203E724 * param0) +BOOL sub_02048DD8 (ScriptContext * param0) { - switch (sub_0203E838(param0)) { + switch (ScriptContext_ReadHalfWord(param0)) { case 0: { - u16 * v0 = inline_0204FCAC(param0); + u16 * v0 = ScriptContext_GetVarPointer(param0); - *v0 = ov6_0224660C(param0->unk_34); + *v0 = ov6_0224660C(param0->fieldSys); } break; case 1: { - u16 v1 = sub_0203E838(param0); - u16 * v2 = inline_0204FCAC(param0); - u16 * v3 = inline_0204FCAC(param0); + u16 v1 = ScriptContext_ReadHalfWord(param0); + u16 * v2 = ScriptContext_GetVarPointer(param0); + u16 * v3 = ScriptContext_GetVarPointer(param0); *v2 = 622; - *v3 = ov6_02246978(param0->unk_34, v1); + *v3 = ov6_02246978(param0->fieldSys, v1); } break; case 3: { - StringTemplate ** v4 = sub_0203F098(param0->unk_34, 15); - u16 v5 = inline_02049538(param0); - u16 * v6 = inline_0204FCAC(param0); - u16 * v7 = inline_0204FCAC(param0); + StringTemplate ** v4 = sub_0203F098(param0->fieldSys, 15); + u16 v5 = ScriptContext_GetVar(param0); + u16 * v6 = ScriptContext_GetVarPointer(param0); + u16 * v7 = ScriptContext_GetVarPointer(param0); - ov6_022469E0(param0->unk_34, *v4, v5, v6, v7); + ov6_022469E0(param0->fieldSys, *v4, v5, v6, v7); } break; case 2: - ov6_022465FC(param0->unk_34); + ov6_022465FC(param0->fieldSys); break; case 4: { - u16 * v8 = inline_0204FCAC(param0); - u16 * v9 = inline_0204FCAC(param0); + u16 * v8 = ScriptContext_GetVarPointer(param0); + u16 * v9 = ScriptContext_GetVarPointer(param0); *v8 = 623; - *v9 = ov6_02246B40(param0->unk_34); + *v9 = ov6_02246B40(param0->fieldSys); } break; case 5: { - u16 v10 = inline_02049538(param0); - u16 v11 = inline_02049538(param0); - u16 * v12 = inline_0204FCAC(param0); + u16 v10 = ScriptContext_GetVar(param0); + u16 v11 = ScriptContext_GetVar(param0); + u16 * v12 = ScriptContext_GetVarPointer(param0); - *v12 = ov6_022468B0(param0->unk_34, v10, v11); + *v12 = ov6_022468B0(param0->fieldSys, v10, v11); } break; case 6: { - u16 * v13 = inline_0204FCAC(param0); - *v13 = ov6_02246920(param0->unk_34); + u16 * v13 = ScriptContext_GetVarPointer(param0); + *v13 = ov6_02246920(param0->fieldSys); } break; } @@ -118,74 +118,74 @@ BOOL sub_02048DD8 (UnkStruct_0203E724 * param0) return 0; } -BOOL sub_02048F74 (UnkStruct_0203E724 * param0) +BOOL sub_02048F74 (ScriptContext * param0) { - sub_0206D4AC(param0->unk_34, inline_02049538(param0)); + sub_0206D4AC(param0->fieldSys, ScriptContext_GetVar(param0)); return 0; } -BOOL sub_02048F98 (UnkStruct_0203E724 * param0) +BOOL sub_02048F98 (ScriptContext * param0) { - Party * v0 = Party_GetFromSavedata(param0->unk_34->saveData); - Pokemon * v1 = Party_GetPokemonBySlotIndex(v0, inline_02049538(param0)); + Party * v0 = Party_GetFromSavedata(param0->fieldSys->saveData); + Pokemon * v1 = Party_GetPokemonBySlotIndex(v0, ScriptContext_GetVar(param0)); - sub_0206D60C(param0->unk_34, v1); + sub_0206D60C(param0->fieldSys, v1); return 0; } -BOOL sub_02048FD0 (UnkStruct_0203E724 * param0) +BOOL sub_02048FD0 (ScriptContext * param0) { - sub_0206D7C4(param0->unk_34); + sub_0206D7C4(param0->fieldSys); return 0; } -BOOL sub_02048FE0 (UnkStruct_0203E724 * param0) +BOOL sub_02048FE0 (ScriptContext * param0) { - sub_0206DB20(param0->unk_34); + sub_0206DB20(param0->fieldSys); return 0; } -BOOL sub_02048FF0 (UnkStruct_0203E724 * param0) +BOOL sub_02048FF0 (ScriptContext * param0) { - u16 v0 = inline_02049538(param0); + u16 v0 = ScriptContext_GetVar(param0); - sub_0206DB5C(param0->unk_34, v0); + sub_0206DB5C(param0->fieldSys, v0); return 0; } static const UnkStruct_020EBB48 Unk_020EBB48[19]; -BOOL sub_02049018 (UnkStruct_0203E724 * param0) +BOOL sub_02049018 (ScriptContext * param0) { StringTemplate ** v0; - v0 = sub_0203F098(param0->unk_34, 15); + v0 = sub_0203F098(param0->fieldSys, 15); - switch (sub_0203E838(param0)) { + switch (ScriptContext_ReadHalfWord(param0)) { case 0: { int v1; u16 * v2; u16 * v3; - v1 = inline_02049538(param0); - v2 = inline_0204FCAC(param0); - v3 = inline_0204FCAC(param0); + v1 = ScriptContext_GetVar(param0); + v2 = ScriptContext_GetVarPointer(param0); + v3 = ScriptContext_GetVarPointer(param0); *v2 = 621; - *v3 = sub_020491D0(v1, param0->unk_34, *v0); + *v3 = sub_020491D0(v1, param0->fieldSys, *v0); } break; case 1: { u16 v4; u16 v5, v6; - UnkStruct_0202CD88 * v7 = sub_0202CD88(param0->unk_34->saveData); + UnkStruct_0202CD88 * v7 = sub_0202CD88(param0->fieldSys->saveData); - v4 = inline_02049538(param0); - v5 = inline_02049538(param0); - v6 = inline_02049538(param0); + v4 = ScriptContext_GetVar(param0); + v5 = ScriptContext_GetVar(param0); + v6 = ScriptContext_GetVar(param0); - sub_020491B8(param0->unk_34, v4, v5, v6); + sub_020491B8(param0->fieldSys, v4, v5, v6); sub_0202CFEC(v7, 3); } break; @@ -194,36 +194,36 @@ BOOL sub_02049018 (UnkStruct_0203E724 * param0) return 0; } -BOOL sub_020490F0 (UnkStruct_0203E724 * param0) +BOOL sub_020490F0 (ScriptContext * param0) { u16 v0; u16 * v1; - v0 = inline_02049538(param0); - v1 = inline_0204FCAC(param0); - *v1 = sub_020491F4(param0->unk_34, v0); + v0 = ScriptContext_GetVar(param0); + v1 = ScriptContext_GetVarPointer(param0); + *v1 = sub_020491F4(param0->fieldSys, v0); return 0; } -BOOL sub_0204912C (UnkStruct_0203E724 * param0) +BOOL sub_0204912C (ScriptContext * param0) { - TVBroadcast * v0 = SaveData_TVBroadcast(param0->unk_34->saveData); + TVBroadcast * v0 = SaveData_TVBroadcast(param0->fieldSys->saveData); - switch (sub_0203E838(param0)) { + switch (ScriptContext_ReadHalfWord(param0)) { case 0: { - Party * v1 = Party_GetFromSavedata(param0->unk_34->saveData); - Pokemon * v2 = Party_GetPokemonBySlotIndex(v1, inline_02049538(param0)); + Party * v1 = Party_GetFromSavedata(param0->fieldSys->saveData); + Pokemon * v2 = Party_GetPokemonBySlotIndex(v1, ScriptContext_GetVar(param0)); sub_0206CF48(v0, v2, 4); } break; case 1: - sub_0206CFB4(v0, inline_02049538(param0)); + sub_0206CFB4(v0, ScriptContext_GetVar(param0)); break; case 2: - sub_0206CF9C(v0, inline_02049538(param0)); + sub_0206CF9C(v0, ScriptContext_GetVar(param0)); break; } @@ -400,29 +400,29 @@ static const UnkStruct_020EBB48 Unk_020EBB48[19] = { {sub_0206E768, sub_02049308, sub_020493B8, 0x15} }; -BOOL sub_020493C8 (UnkStruct_0203E724 * param0) +BOOL sub_020493C8 (ScriptContext * param0) { TVBroadcast * v0; UnkStruct_0202E808 * v1; - u16 * v2 = inline_0204FCAC(param0); + u16 * v2 = ScriptContext_GetVarPointer(param0); - v0 = SaveData_TVBroadcast(param0->unk_34->saveData); + v0 = SaveData_TVBroadcast(param0->fieldSys->saveData); v1 = sub_0202E808(v0); *v2 = v1->unk_07; return 0; } -BOOL sub_020493F4 (UnkStruct_0203E724 * param0) +BOOL sub_020493F4 (ScriptContext * param0) { TVBroadcast * v0; UnkStruct_0202E81C * v1; - u16 * v2 = inline_0204FCAC(param0); - u16 * v3 = inline_0204FCAC(param0); - u16 * v4 = inline_0204FCAC(param0); - u16 * v5 = inline_0204FCAC(param0); + u16 * v2 = ScriptContext_GetVarPointer(param0); + u16 * v3 = ScriptContext_GetVarPointer(param0); + u16 * v4 = ScriptContext_GetVarPointer(param0); + u16 * v5 = ScriptContext_GetVarPointer(param0); - v0 = SaveData_TVBroadcast(param0->unk_34->saveData); + v0 = SaveData_TVBroadcast(param0->fieldSys->saveData); v1 = sub_0202E81C(v0); switch (v1->unk_01) { diff --git a/src/unk_020494DC.c b/src/unk_020494DC.c index 59beb7e040..edc58963f4 100644 --- a/src/unk_020494DC.c +++ b/src/unk_020494DC.c @@ -28,112 +28,112 @@ static u16 sub_02049AE0(UnkStruct_0204AFC4 * param0, u8 param1); -BOOL sub_020494DC (UnkStruct_0203E724 * param0) +BOOL sub_020494DC (ScriptContext * param0) { u16 v0, v1; - v0 = sub_0203E838(param0); - v1 = sub_0203E838(param0); + v0 = ScriptContext_ReadHalfWord(param0); + v1 = ScriptContext_ReadHalfWord(param0); - param0->unk_34->unk_AC = sub_0204A124(FieldSystem_SaveData(param0->unk_34), v0, v1); + param0->fieldSys->unk_AC = sub_0204A124(FieldSystem_SaveData(param0->fieldSys), v0, v1); return 0; } -BOOL sub_0204950C (UnkStruct_0203E724 * param0) +BOOL sub_0204950C (ScriptContext * param0) { - sub_0204A110(&(param0->unk_34->unk_AC)); + sub_0204A110(&(param0->fieldSys->unk_AC)); return 0; } -BOOL sub_0204951C (UnkStruct_0203E724 * param0) +BOOL sub_0204951C (ScriptContext * param0) { UnkStruct_0204AFC4 * v0; - sub_0204A32C(param0->unk_34->unk_AC); - param0->unk_34->unk_AC = NULL; + sub_0204A32C(param0->fieldSys->unk_AC); + param0->fieldSys->unk_AC = NULL; return 0; } -BOOL sub_02049538 (UnkStruct_0203E724 * param0) +BOOL sub_02049538 (ScriptContext * param0) { u16 v0, v1, v2; u16 * v3, * v4; void ** v5; UnkStruct_0204AFC4 * v6; - v0 = sub_0203E838(param0); - v1 = inline_02049538(param0); - v2 = sub_0203E838(param0); - v3 = sub_0203F118(param0->unk_34, v2); - v6 = param0->unk_34->unk_AC; + v0 = ScriptContext_ReadHalfWord(param0); + v1 = ScriptContext_GetVar(param0); + v2 = ScriptContext_ReadHalfWord(param0); + v3 = sub_0203F118(param0->fieldSys, v2); + v6 = param0->fieldSys->unk_AC; switch (v0) { case 1: if (v1 == 0) { - *v3 = sub_02049EC4(v6->unk_0E, param0->unk_34->saveData, 1); + *v3 = sub_02049EC4(v6->unk_0E, param0->fieldSys->saveData, 1); } else { - *v3 = sub_02049EC4(v1, param0->unk_34->saveData, 1); + *v3 = sub_02049EC4(v1, param0->fieldSys->saveData, 1); } break; case 2: sub_02049F8C(); break; case 3: - sub_02049F98(sub_0202D740(param0->unk_34->saveData)); + sub_02049F98(sub_0202D740(param0->fieldSys->saveData)); break; case 4: - *v3 = sub_02049FA0(sub_0202D740(param0->unk_34->saveData)); + *v3 = sub_02049FA0(sub_0202D740(param0->fieldSys->saveData)); break; case 5: - sub_02049FA8(param0->unk_34); + sub_02049FA8(param0->fieldSys); break; case 6: - sub_02049FE8(param0->unk_34); + sub_02049FE8(param0->fieldSys); break; case 8: - *v3 = sub_02049FF8(param0->unk_34->saveData, v1); + *v3 = sub_02049FF8(param0->fieldSys->saveData, v1); break; case 9: - *v3 = sub_0204AABC(NULL, param0->unk_34->saveData, 2); + *v3 = sub_0204AABC(NULL, param0->fieldSys->saveData, 2); break; case 10: - *v3 = sub_0204AABC(NULL, param0->unk_34->saveData, 0); + *v3 = sub_0204AABC(NULL, param0->fieldSys->saveData, 0); break; case 11: - sub_0204A030(param0->unk_34->saveData, v1); + sub_0204A030(param0->fieldSys->saveData, v1); break; case 12: - *v3 = sub_0204A050(param0->unk_34->saveData); + *v3 = sub_0204A050(param0->fieldSys->saveData); break; case 14: - *v3 = sub_0204A064(param0->unk_34->saveData); + *v3 = sub_0204A064(param0->fieldSys->saveData); break; case 15: - *v3 = sub_0204A100(param0->unk_34->saveData); + *v3 = sub_0204A100(param0->fieldSys->saveData); break; case 16: - sub_0206BCE4(param0->unk_28, v1, v2, *v3); + sub_0206BCE4(param0->taskManager, v1, v2, *v3); return 1; case (30 + 0): - v5 = sub_0203F098(param0->unk_34, 19); - sub_0204A358(v6, param0->unk_28, v5); + v5 = sub_0203F098(param0->fieldSys, 19); + sub_0204A358(v6, param0->taskManager, v5); return 1; case (30 + 1): - v5 = sub_0203F098(param0->unk_34, 19); - *v3 = sub_0204A378(v6, v5, param0->unk_34->saveData); + v5 = sub_0203F098(param0->fieldSys, 19); + *v3 = sub_0204A378(v6, v5, param0->fieldSys->saveData); break; case (30 + 2): - *v3 = sub_0204A410(v6, param0->unk_34->saveData); + *v3 = sub_0204A410(v6, param0->fieldSys->saveData); break; case (30 + 5): *v3 = sub_0204A57C(v6); break; case (30 + 7): - sub_0204A660(v6, param0->unk_34->saveData); + sub_0204A660(v6, param0->fieldSys->saveData); break; case (30 + 8): - sub_0204A7A4(v6, param0->unk_34->saveData, param0->unk_34->unk_9C); + sub_0204A7A4(v6, param0->fieldSys->saveData, param0->fieldSys->unk_9C); break; case (30 + 9): sub_0204A8C8(v6); @@ -151,13 +151,13 @@ BOOL sub_02049538 (UnkStruct_0203E724 * param0) *v3 = sub_0204A9FC(v6); break; case (30 + 17): - sub_0204AA7C(v6, param0->unk_34->saveData); + sub_0204AA7C(v6, param0->fieldSys->saveData); break; case (30 + 18): - *v3 = sub_0204AB68(v6, param0->unk_34->saveData); + *v3 = sub_0204AB68(v6, param0->fieldSys->saveData); break; case (30 + 19): - *v3 = sub_0204ABA0(v6, param0->unk_34->saveData); + *v3 = sub_0204ABA0(v6, param0->fieldSys->saveData); break; case (30 + 20): v6->unk_10_5 = v1; @@ -166,19 +166,19 @@ BOOL sub_02049538 (UnkStruct_0203E724 * param0) *v3 = v6->unk_10_5; break; case (30 + 22): - sub_0204A4C8(v6, param0->unk_34->saveData); + sub_0204A4C8(v6, param0->fieldSys->saveData); break; case (30 + 23): *v3 = v6->unk_2A[v1]; break; case (30 + 24): - *v3 = sub_0204AABC(v6, param0->unk_34->saveData, 1); + *v3 = sub_0204AABC(v6, param0->fieldSys->saveData, 1); break; case (30 + 25): *v3 = sub_02049AE0(v6, v1); break; case (30 + 27): - *v3 = sub_0204ABF4(v6, param0->unk_34->saveData); + *v3 = sub_0204ABF4(v6, param0->fieldSys->saveData); break; case 100: if (v6 == NULL) { @@ -199,16 +199,16 @@ BOOL sub_02049538 (UnkStruct_0203E724 * param0) return 0; } -BOOL sub_02049800 (UnkStruct_0203E724 * param0) +BOOL sub_02049800 (ScriptContext * param0) { u16 v0, v1; u16 * v2, * v3; - UnkStruct_0204AFC4 * v4 = param0->unk_34->unk_AC; + UnkStruct_0204AFC4 * v4 = param0->fieldSys->unk_AC; - v0 = inline_02049538(param0); - v1 = inline_02049538(param0); - v2 = sub_0203F118(param0->unk_34, sub_0203E838(param0)); - v3 = sub_0203F118(param0->unk_34, sub_0203E838(param0)); + v0 = ScriptContext_GetVar(param0); + v1 = ScriptContext_GetVar(param0); + v2 = sub_0203F118(param0->fieldSys, ScriptContext_ReadHalfWord(param0)); + v3 = sub_0203F118(param0->fieldSys, ScriptContext_ReadHalfWord(param0)); *v2 = v4->unk_298[v0].unk_30[v1].unk_00_val1_0; *v3 = v4->unk_298[v0].unk_30[v1].unk_04[0]; @@ -216,57 +216,57 @@ BOOL sub_02049800 (UnkStruct_0203E724 * param0) return 0; } -BOOL sub_02049880 (UnkStruct_0203E724 * param0) +BOOL sub_02049880 (ScriptContext * param0) { u16 v0, v1, v2; u16 * v3; - v0 = sub_0203E838(param0); - v3 = sub_0203F118(param0->unk_34, v0); - *v3 = sub_0206BDBC(param0->unk_34->saveData); + v0 = ScriptContext_ReadHalfWord(param0); + v3 = sub_0203F118(param0->fieldSys, v0); + *v3 = sub_0206BDBC(param0->fieldSys->saveData); return 0; } -BOOL sub_020498A8 (UnkStruct_0203E724 * param0) +BOOL sub_020498A8 (ScriptContext * param0) { u16 v0, v1, v2; u16 * v3; - v0 = sub_0203E838(param0); - v3 = sub_0203F118(param0->unk_34, v0); - *v3 = sub_0206BF04(param0->unk_34->saveData); + v0 = ScriptContext_ReadHalfWord(param0); + v3 = sub_0203F118(param0->fieldSys, v0); + *v3 = sub_0206BF04(param0->fieldSys->saveData); return 0; } -BOOL sub_020498D0 (UnkStruct_0203E724 * param0) +BOOL sub_020498D0 (ScriptContext * param0) { int v0, v1; const TrainerInfo * v2; - u16 v3 = inline_02049538(param0); - u16 v4 = inline_02049538(param0); - u16 * v5 = inline_0204FCAC(param0); - UnkStruct_0204AFC4 * v6 = param0->unk_34->unk_AC; + u16 v3 = ScriptContext_GetVar(param0); + u16 v4 = ScriptContext_GetVar(param0); + u16 * v5 = ScriptContext_GetVarPointer(param0); + UnkStruct_0204AFC4 * v6 = param0->fieldSys->unk_AC; *v5 = 0; switch (v3) { case 0: v0 = 62; - sub_0204B060(param0->unk_34->unk_AC, param0->unk_34->saveData); + sub_0204B060(param0->fieldSys->unk_AC, param0->fieldSys->saveData); break; case 1: v0 = 63; - sub_0204B0BC(param0->unk_34->unk_AC); + sub_0204B0BC(param0->fieldSys->unk_AC); break; case 2: v0 = 64; - sub_0204B0D4(param0->unk_34->unk_AC, v4); + sub_0204B0D4(param0->fieldSys->unk_AC, v4); break; } - if (sub_0205E6D8(param0->unk_34->saveData) == 1) { + if (sub_0205E6D8(param0->fieldSys->saveData) == 1) { if (sub_02036614(CommSys_CurNetId(), v6->unk_83E) == 1) { *v5 = 1; } else { @@ -285,34 +285,34 @@ BOOL sub_020498D0 (UnkStruct_0203E724 * param0) return 0; } -static BOOL sub_02049A20(UnkStruct_0203E724 * param0); +static BOOL sub_02049A20(ScriptContext * param0); -BOOL sub_020499BC (UnkStruct_0203E724 * param0) +BOOL sub_020499BC (ScriptContext * param0) { u16 v0; u16 v1; - UnkStruct_0204AFC4 * v2 = param0->unk_34->unk_AC; + UnkStruct_0204AFC4 * v2 = param0->fieldSys->unk_AC; - v1 = inline_02049538(param0); - v0 = sub_0203E838(param0); + v1 = ScriptContext_GetVar(param0); + v0 = ScriptContext_ReadHalfWord(param0); - if (sub_0205E6D8(param0->unk_34->saveData) == 1) { - sub_0206BD88(param0->unk_34->unk_10, v1, v0); + if (sub_0205E6D8(param0->fieldSys->saveData) == 1) { + sub_0206BD88(param0->fieldSys->unk_10, v1, v0); } else { v2->unk_8DA = v0; v2->unk_8D5 = v1; - sub_0203E764(param0, sub_02049A20); + ScriptContext_Pause(param0, sub_02049A20); } return 1; } -static BOOL sub_02049A20 (UnkStruct_0203E724 * param0) +static BOOL sub_02049A20 (ScriptContext * param0) { u8 v0; - UnkStruct_0204AFC4 * v1 = param0->unk_34->unk_AC; - u16 * v2 = sub_0203F118(param0->unk_34, v1->unk_8DA); + UnkStruct_0204AFC4 * v1 = param0->fieldSys->unk_AC; + u16 * v2 = sub_0203F118(param0->fieldSys, v1->unk_8DA); if (v1->unk_8D5 == 1) { v0 = 1; @@ -330,13 +330,13 @@ static BOOL sub_02049A20 (UnkStruct_0203E724 * param0) return 0; } -BOOL sub_02049A68 (UnkStruct_0203E724 * param0) +BOOL sub_02049A68 (ScriptContext * param0) { UnkStruct_02049A68 v0; - u16 * v1 = sub_0203F118(param0->unk_34, sub_0203E838(param0)); - u16 * v2 = sub_0203F118(param0->unk_34, sub_0203E838(param0)); + u16 * v1 = sub_0203F118(param0->fieldSys, ScriptContext_ReadHalfWord(param0)); + u16 * v2 = sub_0203F118(param0->fieldSys, ScriptContext_ReadHalfWord(param0)); - sub_0202D708(sub_0202D764(param0->unk_34->saveData), &v0); + sub_0202D708(sub_0202D764(param0->fieldSys->saveData), &v0); *v1 = v0.unk_00; *v2 = v0.unk_04; @@ -344,11 +344,11 @@ BOOL sub_02049A68 (UnkStruct_0203E724 * param0) return 0; } -BOOL sub_02049AB4 (UnkStruct_0203E724 * param0) +BOOL sub_02049AB4 (ScriptContext * param0) { - u16 * v0 = sub_0203F118(param0->unk_34, sub_0203E838(param0)); + u16 * v0 = sub_0203F118(param0->fieldSys, ScriptContext_ReadHalfWord(param0)); - *v0 = sub_0202D5F0(sub_0202D764(param0->unk_34->saveData)); + *v0 = sub_0202D5F0(sub_0202D764(param0->fieldSys->saveData)); return 0; } @@ -385,78 +385,78 @@ static u16 sub_02049AE0 (UnkStruct_0204AFC4 * param0, u8 param1) } } -BOOL sub_02049B24 (UnkStruct_0203E724 * param0) +BOOL sub_02049B24 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; - u8 v1 = (*((param0)->unk_08++)); - u8 v2 = (*((param0)->unk_08++)); + FieldSystem * v0 = param0->fieldSys; + u8 v1 = ScriptContext_ReadByte(param0); + u8 v2 = ScriptContext_ReadByte(param0); Window ** v3; v3 = sub_0203F098(v0, 38); - *v3 = ov5_021DD140(param0->unk_34, v1, v2); + *v3 = ov5_021DD140(param0->fieldSys, v1, v2); return 0; } -BOOL sub_02049B54 (UnkStruct_0203E724 * param0) +BOOL sub_02049B54 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; Window ** v1 = sub_0203F098(v0, 38); ov5_021DD084(*v1); return 0; } -BOOL sub_02049B6C (UnkStruct_0203E724 * param0) +BOOL sub_02049B6C (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; Window ** v1 = sub_0203F098(v0, 38); - ov5_021DD1A4(param0->unk_34, *v1); + ov5_021DD1A4(param0->fieldSys, *v1); return 0; } -BOOL sub_02049B8C (UnkStruct_0203E724 * param0) +BOOL sub_02049B8C (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; SaveData * v1 = v0->saveData; - u16 * v2 = inline_0204FCAC(param0); + u16 * v2 = ScriptContext_GetVarPointer(param0); *v2 = sub_0202D230(sub_0202D750(v1), 0, 0); return 0; } -BOOL sub_02049BBC (UnkStruct_0203E724 * param0) +BOOL sub_02049BBC (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; SaveData * v1 = v0->saveData; - u16 v2 = inline_02049538(param0); + u16 v2 = ScriptContext_GetVar(param0); - sub_0202CF70(sub_0202CD88(param0->unk_34->saveData), (1 + 67), v2); + sub_0202CF70(sub_0202CD88(param0->fieldSys->saveData), (1 + 67), v2); sub_0202D230(sub_0202D750(v1), v2, 5); return 0; } -BOOL sub_02049C00 (UnkStruct_0203E724 * param0) +BOOL sub_02049C00 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; SaveData * v1 = v0->saveData; - u16 v2 = inline_02049538(param0); + u16 v2 = ScriptContext_GetVar(param0); - sub_0202CF70(sub_0202CD88(param0->unk_34->saveData), (1 + 68), v2); + sub_0202CF70(sub_0202CD88(param0->fieldSys->saveData), (1 + 68), v2); sub_0202D230(sub_0202D750(v1), v2, 6); return 0; } -BOOL sub_02049C44 (UnkStruct_0203E724 * param0) +BOOL sub_02049C44 (ScriptContext * param0) { u16 v0; - FieldSystem * v1 = param0->unk_34; + FieldSystem * v1 = param0->fieldSys; SaveData * v2 = v1->saveData; - u16 v3 = inline_02049538(param0); - u16 * v4 = inline_0204FCAC(param0); + u16 v3 = ScriptContext_GetVar(param0); + u16 * v4 = ScriptContext_GetVarPointer(param0); v0 = sub_0202D230( sub_0202D750(v2), 0, 0); @@ -470,13 +470,13 @@ BOOL sub_02049C44 (UnkStruct_0203E724 * param0) return 0; } -BOOL sub_02049C94 (UnkStruct_0203E724 * param0) +BOOL sub_02049C94 (ScriptContext * param0) { u8 v0 = 0; - u16 v1 = inline_02049538(param0); - u16 v2 = inline_02049538(param0); - u16 * v3 = inline_0204FCAC(param0); - u16 * v4 = inline_0204FCAC(param0); + u16 v1 = ScriptContext_GetVar(param0); + u16 v2 = ScriptContext_GetVar(param0); + u16 * v3 = ScriptContext_GetVarPointer(param0); + u16 * v4 = ScriptContext_GetVarPointer(param0); static const u16 v5[][2] = { {0x2E, 0x1}, {0x31, 0x1}, diff --git a/src/unk_0204B64C.c b/src/unk_0204B64C.c index c1ce62a1fc..0e4de1e6c1 100644 --- a/src/unk_0204B64C.c +++ b/src/unk_0204B64C.c @@ -12,82 +12,82 @@ #include "unk_0204B64C.h" #include "unk_02055C50.h" -BOOL sub_0204B64C (UnkStruct_0203E724 * param0) +BOOL sub_0204B64C (ScriptContext * param0) { LocalMapObject ** v0; - u16 * v1 = inline_0204FCAC(param0); + u16 * v1 = ScriptContext_GetVarPointer(param0); - v0 = sub_0203F098(param0->unk_34, 10); - *v1 = sub_02055F00(param0->unk_34, *v0); + v0 = sub_0203F098(param0->fieldSys, 10); + *v1 = sub_02055F00(param0->fieldSys, *v0); return 0; } -BOOL sub_0204B680 (UnkStruct_0203E724 * param0) +BOOL sub_0204B680 (ScriptContext * param0) { - LocalMapObject ** v0 = sub_0203F098(param0->unk_34, 10); - u16 * v1 = inline_0204FCAC(param0); + LocalMapObject ** v0 = sub_0203F098(param0->fieldSys, 10); + u16 * v1 = ScriptContext_GetVarPointer(param0); - *v1 = sub_02055F40(param0->unk_34, *v0); + *v1 = sub_02055F40(param0->fieldSys, *v0); return 0; } -BOOL sub_0204B6B4 (UnkStruct_0203E724 * param0) +BOOL sub_0204B6B4 (ScriptContext * param0) { - LocalMapObject ** v0 = sub_0203F098(param0->unk_34, 10); - u16 * v1 = inline_0204FCAC(param0); + LocalMapObject ** v0 = sub_0203F098(param0->fieldSys, 10); + u16 * v1 = ScriptContext_GetVarPointer(param0); - *v1 = sub_02055F64(param0->unk_34, *v0); + *v1 = sub_02055F64(param0->fieldSys, *v0); return 0; } -BOOL sub_0204B6E8 (UnkStruct_0203E724 * param0) +BOOL sub_0204B6E8 (ScriptContext * param0) { - LocalMapObject ** v0 = sub_0203F098(param0->unk_34, 10); - u16 * v1 = inline_0204FCAC(param0); + LocalMapObject ** v0 = sub_0203F098(param0->fieldSys, 10); + u16 * v1 = ScriptContext_GetVarPointer(param0); - *v1 = sub_02055F88(param0->unk_34, *v0); + *v1 = sub_02055F88(param0->fieldSys, *v0); return 0; } -BOOL sub_0204B71C (UnkStruct_0203E724 * param0) +BOOL sub_0204B71C (ScriptContext * param0) { - LocalMapObject ** v0 = sub_0203F098(param0->unk_34, 10); - u16 * v1 = inline_0204FCAC(param0); + LocalMapObject ** v0 = sub_0203F098(param0->fieldSys, 10); + u16 * v1 = ScriptContext_GetVarPointer(param0); - *v1 = sub_02055FA8(param0->unk_34, *v0); + *v1 = sub_02055FA8(param0->fieldSys, *v0); return 0; } -BOOL sub_0204B750 (UnkStruct_0203E724 * param0) +BOOL sub_0204B750 (ScriptContext * param0) { - LocalMapObject ** v0 = sub_0203F098(param0->unk_34, 10); - u16 v1 = inline_02049538(param0); + LocalMapObject ** v0 = sub_0203F098(param0->fieldSys, 10); + u16 v1 = ScriptContext_GetVar(param0); - sub_02055E80(param0->unk_34, *v0, v1); + sub_02055E80(param0->fieldSys, *v0, v1); return 0; } -BOOL sub_0204B784 (UnkStruct_0203E724 * param0) +BOOL sub_0204B784 (ScriptContext * param0) { - LocalMapObject ** v0 = sub_0203F098(param0->unk_34, 10); - UnkStruct_0202CD88 * v1 = sub_0202CD88(param0->unk_34->saveData); - u16 v2 = inline_02049538(param0); + LocalMapObject ** v0 = sub_0203F098(param0->fieldSys, 10); + UnkStruct_0202CD88 * v1 = sub_0202CD88(param0->fieldSys->saveData); + u16 v2 = ScriptContext_GetVar(param0); - sub_02055EAC(param0->unk_34, *v0, v2); + sub_02055EAC(param0->fieldSys, *v0, v2); sub_0202CF28(v1, (1 + 3)); return 0; } -BOOL sub_0204B7CC (UnkStruct_0203E724 * param0) +BOOL sub_0204B7CC (ScriptContext * param0) { - switch (sub_0203E838(param0)) { + switch (ScriptContext_ReadHalfWord(param0)) { case 0: - sub_020562AC(param0->unk_34); + sub_020562AC(param0->fieldSys); break; case 1: - sub_020562D8(param0->unk_34); + sub_020562D8(param0->fieldSys); break; default: GF_ASSERT(0); @@ -96,13 +96,13 @@ BOOL sub_0204B7CC (UnkStruct_0203E724 * param0) return 1; } -BOOL sub_0204B7FC (UnkStruct_0203E724 * param0) +BOOL sub_0204B7FC (ScriptContext * param0) { u16 v0; - UnkStruct_0202CD88 * v1 = sub_0202CD88(param0->unk_34->saveData); - LocalMapObject ** v2 = sub_0203F098(param0->unk_34, 10); + UnkStruct_0202CD88 * v1 = sub_0202CD88(param0->fieldSys->saveData); + LocalMapObject ** v2 = sub_0203F098(param0->fieldSys, 10); - sub_02055E00(param0->unk_34, *v2); + sub_02055E00(param0->fieldSys, *v2); sub_0202CFEC(v1, 0); return 0; diff --git a/src/unk_0204B830.c b/src/unk_0204B830.c index b27a273f5a..10d583e716 100644 --- a/src/unk_0204B830.c +++ b/src/unk_0204B830.c @@ -84,23 +84,23 @@ static void sub_0204B850 (FieldSystem * param0) sub_0202DF78(sub_0202DF18()); } -BOOL sub_0204B85C (UnkStruct_0203E724 * param0) +BOOL sub_0204B85C (ScriptContext * param0) { - switch (sub_0203E838(param0)) { + switch (ScriptContext_ReadHalfWord(param0)) { case 0: - sub_0202DEE4(param0->unk_34->saveData, 32); + sub_0202DEE4(param0->fieldSys->saveData, 32); break; case 7: - sub_0202DF04(param0->unk_34->saveData, 0); + sub_0202DF04(param0->fieldSys->saveData, 0); break; case 8: - sub_0202DF04(param0->unk_34->saveData, 1); + sub_0202DF04(param0->fieldSys->saveData, 1); break; case 1: { - u16 * v0 = inline_0204FCAC(param0); + u16 * v0 = ScriptContext_GetVarPointer(param0); - if (sub_0204B838(param0->unk_34) != 0) { + if (sub_0204B838(param0->fieldSys) != 0) { *v0 = 1; } else { *v0 = 0; @@ -109,47 +109,47 @@ BOOL sub_0204B85C (UnkStruct_0203E724 * param0) break; case 2: { - u16 * v1 = inline_0204FCAC(param0); - *v1 = sub_0204B838(param0->unk_34); + u16 * v1 = ScriptContext_GetVarPointer(param0); + *v1 = sub_0204B838(param0->fieldSys); } break; case 3: { - u16 * v2 = inline_0204FCAC(param0); - const UnkStruct_020EBE94 * v3 = &Unk_020EBE94[sub_0204B838(param0->unk_34) - 1]; + u16 * v2 = ScriptContext_GetVarPointer(param0); + const UnkStruct_020EBE94 * v3 = &Unk_020EBE94[sub_0204B838(param0->fieldSys) - 1]; - *v2 = v3->unk_00(param0->unk_34, sub_0204B844(param0->unk_34)); + *v2 = v3->unk_00(param0->fieldSys, sub_0204B844(param0->fieldSys)); } break; case 4: { - const UnkStruct_020EBE94 * v4 = &Unk_020EBE94[sub_0204B838(param0->unk_34) - 1]; + const UnkStruct_020EBE94 * v4 = &Unk_020EBE94[sub_0204B838(param0->fieldSys) - 1]; - v4->unk_04(param0->unk_34, sub_0204B844(param0->unk_34)); - sub_0204B850(param0->unk_34); + v4->unk_04(param0->fieldSys, sub_0204B844(param0->fieldSys)); + sub_0204B850(param0->fieldSys); } break; case 5: { UnkStruct_0204B830 v5; - const UnkStruct_020EBE94 * v6 = &Unk_020EBE94[sub_0204B838(param0->unk_34) - 1]; - StringTemplate ** v7 = sub_0203F098(param0->unk_34, 15); - u16 * v8 = inline_0204FCAC(param0); - u16 * v9 = inline_0204FCAC(param0); + const UnkStruct_020EBE94 * v6 = &Unk_020EBE94[sub_0204B838(param0->fieldSys) - 1]; + StringTemplate ** v7 = sub_0203F098(param0->fieldSys, 15); + u16 * v8 = ScriptContext_GetVarPointer(param0); + u16 * v9 = ScriptContext_GetVarPointer(param0); - sub_0204B830(&v5, param0->unk_34, *v7, sub_0204B844(param0->unk_34)); + sub_0204B830(&v5, param0->fieldSys, *v7, sub_0204B844(param0->fieldSys)); v6->unk_08(&v5, v8, v9); } break; case 6: { UnkStruct_0204B830 v10; - const UnkStruct_020EBE94 * v11 = &Unk_020EBE94[sub_0204B838(param0->unk_34) - 1]; - StringTemplate ** v12 = sub_0203F098(param0->unk_34, 15); - u16 * v13 = inline_0204FCAC(param0); - u16 * v14 = inline_0204FCAC(param0); + const UnkStruct_020EBE94 * v11 = &Unk_020EBE94[sub_0204B838(param0->fieldSys) - 1]; + StringTemplate ** v12 = sub_0203F098(param0->fieldSys, 15); + u16 * v13 = ScriptContext_GetVarPointer(param0); + u16 * v14 = ScriptContext_GetVarPointer(param0); - sub_0204B830(&v10, param0->unk_34, *v12, sub_0204B844(param0->unk_34)); + sub_0204B830(&v10, param0->fieldSys, *v12, sub_0204B844(param0->fieldSys)); v11->unk_0C(&v10, v13, v14); } break; diff --git a/src/unk_0204C500.c b/src/unk_0204C500.c index c4c44607d1..23567226cf 100644 --- a/src/unk_0204C500.c +++ b/src/unk_0204C500.c @@ -25,17 +25,17 @@ #include "unk_020797C8.h" #include "unk_02092494.h" -BOOL sub_0204C500 (UnkStruct_0203E724 * param0) +BOOL sub_0204C500 (ScriptContext * param0) { - UnkStruct_020507E4 * v0 = SaveData_Events(param0->unk_34->saveData); - u16 v1 = inline_02049538(param0); + UnkStruct_020507E4 * v0 = SaveData_Events(param0->fieldSys->saveData); + u16 v1 = ScriptContext_GetVar(param0); if (v1 == 0) { sub_0206AE6C(v0); - sub_020562F8(param0->unk_34); + sub_020562F8(param0->fieldSys); } else if (v1 == 1) { sub_0206AE7C(v0); - sub_02056328(param0->unk_34); + sub_02056328(param0->fieldSys); } else { GF_ASSERT(0); } @@ -43,11 +43,11 @@ BOOL sub_0204C500 (UnkStruct_0203E724 * param0) return 0; } -BOOL sub_0204C554 (UnkStruct_0203E724 * param0) +BOOL sub_0204C554 (ScriptContext * param0) { - PalParkTransfer * v0 = SaveData_PalParkTransfer(param0->unk_34->saveData); + PalParkTransfer * v0 = SaveData_PalParkTransfer(param0->fieldSys->saveData); Pokemon * v1 = Pokemon_New(32); - u16 * v2 = inline_0204FCAC(param0); + u16 * v2 = ScriptContext_GetVarPointer(param0); if (sub_0202F028(v0) == 6) { *v2 = 1; @@ -59,13 +59,13 @@ BOOL sub_0204C554 (UnkStruct_0203E724 * param0) return 0; } -BOOL sub_0204C59C (UnkStruct_0203E724 * param0) +BOOL sub_0204C59C (ScriptContext * param0) { - PalParkTransfer * v0 = SaveData_PalParkTransfer(param0->unk_34->saveData); - PCBoxes * v1 = SaveData_PCBoxes(param0->unk_34->saveData); + PalParkTransfer * v0 = SaveData_PalParkTransfer(param0->fieldSys->saveData); + PCBoxes * v1 = SaveData_PCBoxes(param0->fieldSys->saveData); Pokemon * v2 = Pokemon_New(32); - TrainerInfo * v3 = SaveData_GetTrainerInfo(param0->unk_34->saveData); - PokedexData * v4 = SaveData_Pokedex(param0->unk_34->saveData); + TrainerInfo * v3 = SaveData_GetTrainerInfo(param0->fieldSys->saveData); + PokedexData * v4 = SaveData_Pokedex(param0->fieldSys->saveData); BOOL v5; int v6; @@ -74,7 +74,7 @@ BOOL sub_0204C59C (UnkStruct_0203E724 * param0) sub_0209304C(v2, v3, 2, 0, 32); v5 = sub_02079868(v1, Pokemon_GetBoxPokemon(v2)); GF_ASSERT(v5); - sub_0202F180(param0->unk_34->saveData, v2); + sub_0202F180(param0->fieldSys->saveData, v2); } Heap_FreeToHeap(v2); @@ -83,23 +83,23 @@ BOOL sub_0204C59C (UnkStruct_0203E724 * param0) return 0; } -BOOL sub_0204C638 (UnkStruct_0203E724 * param0) +BOOL sub_0204C638 (ScriptContext * param0) { - u16 v0 = inline_02049538(param0); - u16 * v1 = inline_0204FCAC(param0); + u16 v0 = ScriptContext_GetVar(param0); + u16 * v1 = ScriptContext_GetVarPointer(param0); switch (v0) { case 0: - *v1 = sub_020563D0(param0->unk_34); + *v1 = sub_020563D0(param0->fieldSys); break; case 1: - *v1 = sub_020563E0(param0->unk_34); + *v1 = sub_020563E0(param0->fieldSys); break; case 2: - *v1 = sub_020563F0(param0->unk_34); + *v1 = sub_020563F0(param0->fieldSys); break; case 3: - *v1 = sub_020563D0(param0->unk_34) + sub_020563F0(param0->unk_34) + sub_020563E0(param0->unk_34); + *v1 = sub_020563D0(param0->fieldSys) + sub_020563F0(param0->fieldSys) + sub_020563E0(param0->fieldSys); break; } diff --git a/src/unk_0204C6C8.c b/src/unk_0204C6C8.c index 8942ee9ef8..7728b63319 100644 --- a/src/unk_0204C6C8.c +++ b/src/unk_0204C6C8.c @@ -18,82 +18,82 @@ #include "overlay005/ov5_021DC018.h" -BOOL sub_0204C6C8 (UnkStruct_0203E724 * param0) +BOOL sub_0204C6C8 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; - u16 v1 = inline_02049538(param0); - u16 v2 = inline_02049538(param0); + FieldSystem * v0 = param0->fieldSys; + u16 v1 = ScriptContext_GetVar(param0); + u16 v2 = ScriptContext_GetVar(param0); Window ** v3; v3 = sub_0203F098(v0, 38); - *v3 = ov5_021DD020(param0->unk_34, v1, v2); + *v3 = ov5_021DD020(param0->fieldSys, v1, v2); return 0; } -BOOL sub_0204C718 (UnkStruct_0203E724 * param0) +BOOL sub_0204C718 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; Window ** v1 = sub_0203F098(v0, 38); ov5_021DD084(*v1); return 0; } -BOOL sub_0204C730 (UnkStruct_0203E724 * param0) +BOOL sub_0204C730 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; Window ** v1 = sub_0203F098(v0, 38); - ov5_021DD098(param0->unk_34, *v1); + ov5_021DD098(param0->fieldSys, *v1); return 0; } -BOOL sub_0204C750 (UnkStruct_0203E724 * param0) +BOOL sub_0204C750 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; SaveData * v1 = v0->saveData; u16 * v2 = sub_02025E50(v1); u16 * v3; - v3 = inline_0204FCAC(param0); + v3 = ScriptContext_GetVarPointer(param0); *v3 = (u16)Coins_GetValue(v2); return 0; } -BOOL sub_0204C780 (UnkStruct_0203E724 * param0) +BOOL sub_0204C780 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; SaveData * v1 = v0->saveData; u16 * v2 = sub_02025E50(v1); u16 v3; - v3 = inline_02049538(param0); + v3 = ScriptContext_GetVar(param0); Coins_Add(v2, v3); return 0; } -BOOL sub_0204C7AC (UnkStruct_0203E724 * param0) +BOOL sub_0204C7AC (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; SaveData * v1 = v0->saveData; u16 * v2 = sub_02025E50(v1); u16 v3; - v3 = inline_02049538(param0); + v3 = ScriptContext_GetVar(param0); Coins_Subtract(v2, v3); return 0; } -BOOL sub_0204C7D8 (UnkStruct_0203E724 * param0) +BOOL sub_0204C7D8 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; SaveData * v1 = v0->saveData; u16 * v2 = sub_02025E50(v1); - u16 * v3 = inline_0204FCAC(param0); + u16 * v3 = ScriptContext_GetVarPointer(param0); u16 v4; v4 = *v3; @@ -103,16 +103,16 @@ BOOL sub_0204C7D8 (UnkStruct_0203E724 * param0) return 0; } -BOOL sub_0204C808 (UnkStruct_0203E724 * param0) +BOOL sub_0204C808 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; - TrainerInfo * v1 = SaveData_GetTrainerInfo(FieldSystem_SaveData(param0->unk_34)); + FieldSystem * v0 = param0->fieldSys; + TrainerInfo * v1 = SaveData_GetTrainerInfo(FieldSystem_SaveData(param0->fieldSys)); SaveData * v2 = v0->saveData; u16 * v3 = sub_02025E50(v2); u32 v4, v5; - u16 * v6 = inline_0204FCAC(param0); + u16 * v6 = ScriptContext_GetVarPointer(param0); - v4 = sub_0203E850(param0); + v4 = ScriptContext_ReadWord(param0); v5 = Coins_GetValue(v3); if (v5 < v4) { @@ -124,14 +124,14 @@ BOOL sub_0204C808 (UnkStruct_0203E724 * param0) return 0; } -BOOL sub_0204C854 (UnkStruct_0203E724 * param0) +BOOL sub_0204C854 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; - TrainerInfo * v1 = SaveData_GetTrainerInfo(FieldSystem_SaveData(param0->unk_34)); + FieldSystem * v0 = param0->fieldSys; + TrainerInfo * v1 = SaveData_GetTrainerInfo(FieldSystem_SaveData(param0->fieldSys)); SaveData * v2 = v0->saveData; u16 * v3 = sub_02025E50(v2); - u16 * v4 = inline_0204FCAC(param0); - u16 * v5 = inline_0204FCAC(param0); + u16 * v4 = ScriptContext_GetVarPointer(param0); + u16 * v5 = ScriptContext_GetVarPointer(param0); u32 v6, v7; v6 = *v5; @@ -146,13 +146,13 @@ BOOL sub_0204C854 (UnkStruct_0203E724 * param0) return 0; } -BOOL sub_0204C8AC (UnkStruct_0203E724 * param0) +BOOL sub_0204C8AC (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; SaveData * v1 = v0->saveData; u16 * v2 = sub_02025E50(v1); - u16 * v3 = inline_0204FCAC(param0); - u16 v4 = inline_02049538(param0); + u16 * v3 = ScriptContext_GetVarPointer(param0); + u16 v4 = ScriptContext_GetVar(param0); *v3 = Coins_CanAddAmount(v2, v4); return 0; diff --git a/src/unk_0204C8F0.c b/src/unk_0204C8F0.c index 5fba313d1b..e73481eb6d 100644 --- a/src/unk_0204C8F0.c +++ b/src/unk_0204C8F0.c @@ -17,47 +17,47 @@ #include "overlay005/ov5_021DC018.h" -BOOL sub_0204C8F0 (UnkStruct_0203E724 * param0) +BOOL sub_0204C8F0 (ScriptContext * param0) { - TrainerInfo * v0 = SaveData_GetTrainerInfo(FieldSystem_SaveData(param0->unk_34)); + TrainerInfo * v0 = SaveData_GetTrainerInfo(FieldSystem_SaveData(param0->fieldSys)); u32 v1; - v1 = sub_0203E850(param0); + v1 = ScriptContext_ReadWord(param0); TrainerInfo_GiveMoney(v0, v1); return 0; } -BOOL sub_0204C914 (UnkStruct_0203E724 * param0) +BOOL sub_0204C914 (ScriptContext * param0) { - TrainerInfo * v0 = SaveData_GetTrainerInfo(FieldSystem_SaveData(param0->unk_34)); + TrainerInfo * v0 = SaveData_GetTrainerInfo(FieldSystem_SaveData(param0->fieldSys)); u32 v1; - v1 = sub_0203E850(param0); + v1 = ScriptContext_ReadWord(param0); TrainerInfo_TakeMoney(v0, v1); return 0; } -BOOL sub_0204C938 (UnkStruct_0203E724 * param0) +BOOL sub_0204C938 (ScriptContext * param0) { - TrainerInfo * v0 = SaveData_GetTrainerInfo(FieldSystem_SaveData(param0->unk_34)); + TrainerInfo * v0 = SaveData_GetTrainerInfo(FieldSystem_SaveData(param0->fieldSys)); u32 v1; - v1 = inline_02049538(param0); + v1 = ScriptContext_GetVar(param0); TrainerInfo_TakeMoney(v0, v1); return 0; } -BOOL sub_0204C968 (UnkStruct_0203E724 * param0) +BOOL sub_0204C968 (ScriptContext * param0) { - TrainerInfo * v0 = SaveData_GetTrainerInfo(FieldSystem_SaveData(param0->unk_34)); + TrainerInfo * v0 = SaveData_GetTrainerInfo(FieldSystem_SaveData(param0->fieldSys)); u16 * v1; u32 v2, v3; - v1 = inline_0204FCAC(param0); - v2 = sub_0203E850(param0); + v1 = ScriptContext_GetVarPointer(param0); + v2 = ScriptContext_ReadWord(param0); v3 = TrainerInfo_Money(v0); if (v3 < v2) { @@ -69,14 +69,14 @@ BOOL sub_0204C968 (UnkStruct_0203E724 * param0) return 0; } -BOOL sub_0204C9AC (UnkStruct_0203E724 * param0) +BOOL sub_0204C9AC (ScriptContext * param0) { - TrainerInfo * v0 = SaveData_GetTrainerInfo(FieldSystem_SaveData(param0->unk_34)); + TrainerInfo * v0 = SaveData_GetTrainerInfo(FieldSystem_SaveData(param0->fieldSys)); u16 * v1; u32 v2, v3; - v1 = inline_0204FCAC(param0); - v2 = inline_02049538(param0); + v1 = ScriptContext_GetVarPointer(param0); + v2 = ScriptContext_GetVar(param0); v3 = TrainerInfo_Money(v0); if (v3 < v2) { @@ -88,33 +88,33 @@ BOOL sub_0204C9AC (UnkStruct_0203E724 * param0) return 0; } -BOOL sub_0204C9FC (UnkStruct_0203E724 * param0) +BOOL sub_0204C9FC (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; - u16 v1 = inline_02049538(param0); - u16 v2 = inline_02049538(param0); + FieldSystem * v0 = param0->fieldSys; + u16 v1 = ScriptContext_GetVar(param0); + u16 v2 = ScriptContext_GetVar(param0); Window ** v3; v3 = sub_0203F098(v0, 39); - *v3 = ov5_021DCEB0(param0->unk_34, v1, v2); + *v3 = ov5_021DCEB0(param0->fieldSys, v1, v2); return 0; } -BOOL sub_0204CA4C (UnkStruct_0203E724 * param0) +BOOL sub_0204CA4C (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; Window ** v1 = sub_0203F098(v0, 39); ov5_021DCF58(*v1); return 0; } -BOOL sub_0204CA64 (UnkStruct_0203E724 * param0) +BOOL sub_0204CA64 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; Window ** v1 = sub_0203F098(v0, 39); - ov5_021DCF6C(param0->unk_34, *v1); + ov5_021DCF6C(param0->fieldSys, *v1); return 0; } diff --git a/src/unk_0204CA84.c b/src/unk_0204CA84.c index 787957c5b2..839575150f 100644 --- a/src/unk_0204CA84.c +++ b/src/unk_0204CA84.c @@ -20,9 +20,9 @@ #include "party.h" #include "overlay005/ov5_021E622C.h" -BOOL sub_0204CA84 (UnkStruct_0203E724 * param0) +BOOL sub_0204CA84 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; SaveData * v1 = v0->saveData; StringTemplate ** v2 = sub_0203F098(v0, 15); @@ -31,23 +31,23 @@ BOOL sub_0204CA84 (UnkStruct_0203E724 * param0) return 0; } -BOOL sub_0204CAA4 (UnkStruct_0203E724 * param0) +BOOL sub_0204CAA4 (ScriptContext * param0) { u16 * v0; - FieldSystem * v1 = param0->unk_34; + FieldSystem * v1 = param0->fieldSys; SaveData * v2 = v1->saveData; UnkStruct_02026310 * v3; - v0 = inline_0204FCAC(param0); + v0 = ScriptContext_GetVarPointer(param0); v3 = (UnkStruct_02026310 *)(SaveData_SaveTable(v2, 8)); *v0 = ov5_021E73C8(v3); return 0; } -BOOL sub_0204CAD4 (UnkStruct_0203E724 * param0) +BOOL sub_0204CAD4 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; SaveData * v1 = v0->saveData; UnkStruct_02026310 * v2; @@ -57,27 +57,27 @@ BOOL sub_0204CAD4 (UnkStruct_0203E724 * param0) return 0; } -BOOL sub_0204CAEC (UnkStruct_0203E724 * param0) +BOOL sub_0204CAEC (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; SaveData * v1 = v0->saveData; UnkStruct_02026310 * v2 = (UnkStruct_02026310 *)(SaveData_SaveTable(v1, 8)); Party * v3 = Party_GetFromSavedata(v0->saveData); - TrainerInfo * v4 = SaveData_GetTrainerInfo(FieldSystem_SaveData(param0->unk_34)); + TrainerInfo * v4 = SaveData_GetTrainerInfo(FieldSystem_SaveData(param0->fieldSys)); ov5_021E6EA8(v2, v3, v4); return 0; } -BOOL sub_0204CB20 (UnkStruct_0203E724 * param0) +BOOL sub_0204CB20 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; UnkStruct_02026310 * v1; Party * v2; StringTemplate ** v3 = sub_0203F098(v0, 15); SaveData * v4 = v0->saveData; - u16 * v5 = inline_0204FCAC(param0); - u8 v6 = inline_02049538(param0); + u16 * v5 = ScriptContext_GetVarPointer(param0); + u8 v6 = ScriptContext_GetVar(param0); v1 = (UnkStruct_02026310 *)(SaveData_SaveTable(v4, 8)); v2 = Party_GetFromSavedata(v0->saveData); @@ -86,14 +86,14 @@ BOOL sub_0204CB20 (UnkStruct_0203E724 * param0) return 0; } -BOOL sub_0204CB80 (UnkStruct_0203E724 * param0) +BOOL sub_0204CB80 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; UnkStruct_02026310 * v1; StringTemplate ** v2 = sub_0203F098(v0, 15); SaveData * v3 = v0->saveData; - u16 * v4 = inline_0204FCAC(param0); - u8 v5 = inline_02049538(param0); + u16 * v4 = ScriptContext_GetVarPointer(param0); + u8 v5 = ScriptContext_GetVar(param0); v1 = (UnkStruct_02026310 *)(SaveData_SaveTable(v3, 8)); *v4 = ov5_021E6630(v1, v5, *v2); @@ -101,14 +101,14 @@ BOOL sub_0204CB80 (UnkStruct_0203E724 * param0) return 0; } -BOOL sub_0204CBD4 (UnkStruct_0203E724 * param0) +BOOL sub_0204CBD4 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; SaveData * v1 = v0->saveData; UnkStruct_02026310 * v2; - StringTemplate ** v3 = sub_0203F098(param0->unk_34, 15); - u16 * v4 = inline_0204FCAC(param0); - u16 v5 = inline_02049538(param0); + StringTemplate ** v3 = sub_0203F098(param0->fieldSys, 15); + u16 * v4 = ScriptContext_GetVarPointer(param0); + u16 v5 = ScriptContext_GetVar(param0); v2 = (UnkStruct_02026310 *)(SaveData_SaveTable(v1, 8)); *v4 = ov5_021E6640(v2, v5, *v3); @@ -116,14 +116,14 @@ BOOL sub_0204CBD4 (UnkStruct_0203E724 * param0) return 0; } -BOOL sub_0204CC24 (UnkStruct_0203E724 * param0) +BOOL sub_0204CC24 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; Party * v1; - StringTemplate ** v2 = sub_0203F098(param0->unk_34, 15); - u16 v3 = sub_0203E838(param0); - u16 v4 = inline_02049538(param0); - u16 * v5 = inline_0204FCAC(param0); + StringTemplate ** v2 = sub_0203F098(param0->fieldSys, 15); + u16 v3 = ScriptContext_ReadHalfWord(param0); + u16 v4 = ScriptContext_GetVar(param0); + u16 * v5 = ScriptContext_GetVarPointer(param0); v1 = Party_GetFromSavedata(v0->saveData); *v5 = ov5_021E73A0(v1, v4, *v2); @@ -131,13 +131,13 @@ BOOL sub_0204CC24 (UnkStruct_0203E724 * param0) return 0; } -BOOL sub_0204CC78 (UnkStruct_0203E724 * param0) +BOOL sub_0204CC78 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; SaveData * v1 = v0->saveData; UnkStruct_02026310 * v2; Party * v3; - u8 v4 = inline_02049538(param0); + u8 v4 = ScriptContext_GetVar(param0); v3 = Party_GetFromSavedata(v0->saveData); v2 = (UnkStruct_02026310 *)(SaveData_SaveTable(v1, 8)); @@ -147,26 +147,26 @@ BOOL sub_0204CC78 (UnkStruct_0203E724 * param0) return 0; } -BOOL sub_0204CCB8 (UnkStruct_0203E724 * param0) +BOOL sub_0204CCB8 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; SaveData * v1 = v0->saveData; - StringTemplate ** v2 = sub_0203F098(param0->unk_34, 15); - u8 v3 = inline_02049538(param0); - u8 v4 = inline_02049538(param0); - u8 v5 = inline_02049538(param0); - u8 v6 = inline_02049538(param0); + StringTemplate ** v2 = sub_0203F098(param0->fieldSys, 15); + u8 v3 = ScriptContext_GetVar(param0); + u8 v4 = ScriptContext_GetVar(param0); + u8 v5 = ScriptContext_GetVar(param0); + u8 v6 = ScriptContext_GetVar(param0); ov5_021E7308(sub_02026310(v1), v3, v4, v5, v6, *v2); return 0; } -BOOL sub_0204CD44 (UnkStruct_0203E724 * param0) +BOOL sub_0204CD44 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; SaveData * v1 = v0->saveData; UnkStruct_02026310 * v2; - u16 * v3 = inline_0204FCAC(param0); + u16 * v3 = ScriptContext_GetVarPointer(param0); v2 = (UnkStruct_02026310 *)(SaveData_SaveTable(v1, 8)); *v3 = ov5_021E7420(v2); @@ -174,12 +174,12 @@ BOOL sub_0204CD44 (UnkStruct_0203E724 * param0) return 0; } -BOOL sub_0204CD74 (UnkStruct_0203E724 * param0) +BOOL sub_0204CD74 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; SaveData * v1 = v0->saveData; UnkStruct_02026310 * v2; - u16 * v3 = inline_0204FCAC(param0); + u16 * v3 = ScriptContext_GetVarPointer(param0); v2 = (UnkStruct_02026310 *)(SaveData_SaveTable(v1, 8)); *v3 = sub_02026234(v2); @@ -187,30 +187,30 @@ BOOL sub_0204CD74 (UnkStruct_0203E724 * param0) return 0; } -BOOL sub_0204CDA4 (UnkStruct_0203E724 * param0) +BOOL sub_0204CDA4 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; - u16 * v1 = inline_0204FCAC(param0); + FieldSystem * v0 = param0->fieldSys; + u16 * v1 = ScriptContext_GetVarPointer(param0); return 0; } -BOOL sub_0204CDBC (UnkStruct_0203E724 * param0) +BOOL sub_0204CDBC (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; return 0; } -BOOL sub_0204CDC0 (UnkStruct_0203E724 * param0) +BOOL sub_0204CDC0 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; return 0; } -BOOL sub_0204CDC4 (UnkStruct_0203E724 * param0) +BOOL sub_0204CDC4 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; - u16 * v1 = inline_0204FCAC(param0); + FieldSystem * v0 = param0->fieldSys; + u16 * v1 = ScriptContext_GetVarPointer(param0); return 0; } diff --git a/src/unk_0204CDDC.c b/src/unk_0204CDDC.c index daadf1d949..16a1aa0530 100644 --- a/src/unk_0204CDDC.c +++ b/src/unk_0204CDDC.c @@ -12,21 +12,21 @@ #include "constants/species.h" -BOOL sub_0204CF68(UnkStruct_0203E724 * param0); -BOOL sub_0204CF8C(UnkStruct_0203E724 * param0); -BOOL sub_0204CFC4(UnkStruct_0203E724 * param0); +BOOL sub_0204CF68(ScriptContext * param0); +BOOL sub_0204CF8C(ScriptContext * param0); +BOOL sub_0204CFC4(ScriptContext * param0); -BOOL sub_0204CDDC (UnkStruct_0203E724 * param0) +BOOL sub_0204CDDC (ScriptContext * param0) { - sub_0206B218(SaveData_Events(param0->unk_34->saveData)); + sub_0206B218(SaveData_Events(param0->fieldSys->saveData)); return 0; } -BOOL sub_0204CDF0 (UnkStruct_0203E724 * param0) +BOOL sub_0204CDF0 (ScriptContext * param0) { - u16 * v0 = inline_0204FCAC(param0); + u16 * v0 = ScriptContext_GetVarPointer(param0); - *v0 = sub_0206B228(SaveData_Events(param0->unk_34->saveData)); + *v0 = sub_0206B228(SaveData_Events(param0->fieldSys->saveData)); return 0; } @@ -39,12 +39,12 @@ static const u16 Unk_020EBF84[6][10] = { {0xC, 0x1E, 0x2, 0x14, 0x1D, 0x4, 0x9, 0x1B, 0xE, 0xA} // Jigglypuff, Torchic, Skitty, Shroomish }; -BOOL sub_0204CE1C (UnkStruct_0203E724 * ctx) +BOOL sub_0204CE1C (ScriptContext * ctx) { u8 i, j; u16 rand; - u16 *result = inline_0204FCAC(ctx); - u16 species = inline_02049538(ctx); + u16 *result = ScriptContext_GetVarPointer(ctx); + u16 species = ScriptContext_GetVar(ctx); rand = LCRNG_Next() % 100; @@ -132,18 +132,18 @@ static const u16 Unk_020EBF64[] = { 0x21 }; -BOOL sub_0204CF68 (UnkStruct_0203E724 * param0) +BOOL sub_0204CF68 (ScriptContext * param0) { - u16 * v0 = inline_0204FCAC(param0); + u16 * v0 = ScriptContext_GetVarPointer(param0); *v0 = (LCRNG_Next() % (NELEMS(Unk_020EBF64))); return 0; } -BOOL sub_0204CF8C (UnkStruct_0203E724 * param0) +BOOL sub_0204CF8C (ScriptContext * param0) { - u16 v0 = inline_02049538(param0); - u16 * v1 = inline_0204FCAC(param0); + u16 v0 = ScriptContext_GetVar(param0); + u16 * v1 = ScriptContext_GetVarPointer(param0); if (v0 < 9) { *v1 = 0; @@ -154,10 +154,10 @@ BOOL sub_0204CF8C (UnkStruct_0203E724 * param0) return 0; } -BOOL sub_0204CFC4 (UnkStruct_0203E724 * param0) +BOOL sub_0204CFC4 (ScriptContext * param0) { - u16 v0 = inline_02049538(param0); - u16 * v1 = inline_0204FCAC(param0); + u16 v0 = ScriptContext_GetVar(param0); + u16 * v1 = ScriptContext_GetVarPointer(param0); *v1 = Unk_020EBF64[v0]; return 0; diff --git a/src/unk_0204CFFC.c b/src/unk_0204CFFC.c index 77460ff9f7..3b04a711bc 100644 --- a/src/unk_0204CFFC.c +++ b/src/unk_0204CFFC.c @@ -29,16 +29,16 @@ #include "unk_020923C0.h" #include "overlay005/ov5_021E622C.h" -BOOL sub_0204CFFC (UnkStruct_0203E724 * param0) +BOOL sub_0204CFFC (ScriptContext * param0) { - int v0 = MapHeader_GetMapLabelTextID(param0->unk_34->unk_1C->unk_00); + int v0 = MapHeader_GetMapLabelTextID(param0->fieldSys->unk_1C->unk_00); int v1 = 24; Party * v2; - FieldSystem * v3 = param0->unk_34; - u16 v4 = inline_02049538(param0); - u16 v5 = inline_02049538(param0); - u16 v6 = inline_02049538(param0); - u16 * v7 = inline_0204FCAC(param0); + FieldSystem * v3 = param0->fieldSys; + u16 v4 = ScriptContext_GetVar(param0); + u16 v5 = ScriptContext_GetVar(param0); + u16 v6 = ScriptContext_GetVar(param0); + u16 * v7 = ScriptContext_GetVarPointer(param0); v2 = Party_GetFromSavedata(v3->saveData); *v7 = sub_020548B0(11, v3->saveData, v4, v5, v6, v0, v1); @@ -46,12 +46,12 @@ BOOL sub_0204CFFC (UnkStruct_0203E724 * param0) return 0; } -BOOL sub_0204D08C (UnkStruct_0203E724 * param0) +BOOL sub_0204D08C (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; Pokemon * v1; - u16 * v2 = inline_0204FCAC(param0); - u16 * v3 = inline_0204FCAC(param0); + u16 * v2 = ScriptContext_GetVarPointer(param0); + u16 * v3 = ScriptContext_GetVarPointer(param0); v1 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(v0->saveData), *v2); @@ -64,13 +64,13 @@ BOOL sub_0204D08C (UnkStruct_0203E724 * param0) return 0; } -BOOL sub_0204D0E8 (UnkStruct_0203E724 * param0) +BOOL sub_0204D0E8 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; Pokemon * v1; - TrainerInfo * v2 = SaveData_GetTrainerInfo(FieldSystem_SaveData(param0->unk_34)); - u16 * v3 = inline_0204FCAC(param0); - u16 * v4 = inline_0204FCAC(param0); + TrainerInfo * v2 = SaveData_GetTrainerInfo(FieldSystem_SaveData(param0->fieldSys)); + u16 * v3 = ScriptContext_GetVarPointer(param0); + u16 * v4 = ScriptContext_GetVarPointer(param0); u16 v5, v6; v1 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(v0->saveData), *v3); @@ -86,17 +86,17 @@ BOOL sub_0204D0E8 (UnkStruct_0203E724 * param0) return 0; } -BOOL sub_0204D154 (UnkStruct_0203E724 * param0) +BOOL sub_0204D154 (ScriptContext * param0) { int v0; u8 v1; BOOL v2; Party * v3; Pokemon * v4; - FieldSystem * v5 = param0->unk_34; + FieldSystem * v5 = param0->fieldSys; TrainerInfo * v6 = SaveData_GetTrainerInfo(v5->saveData); - u16 v7 = inline_02049538(param0); - u16 v8 = inline_02049538(param0); + u16 v7 = ScriptContext_GetVar(param0); + u16 v8 = ScriptContext_GetVar(param0); v3 = Party_GetFromSavedata(v5->saveData); v1 = Party_GetCurrentCount(v3); @@ -115,25 +115,25 @@ BOOL sub_0204D154 (UnkStruct_0203E724 * param0) return 0; } -BOOL sub_0204D1DC (UnkStruct_0203E724 * param0) +BOOL sub_0204D1DC (ScriptContext * param0) { u16 v0, v1, v2; - v0 = inline_02049538(param0); - v1 = inline_02049538(param0); - v2 = inline_02049538(param0); + v0 = ScriptContext_GetVar(param0); + v1 = ScriptContext_GetVar(param0); + v2 = ScriptContext_GetVar(param0); - sub_02054988(Party_GetFromSavedata(param0->unk_34->saveData), v0, v1, v2); + sub_02054988(Party_GetFromSavedata(param0->fieldSys->saveData), v0, v1, v2); return 0; } -BOOL sub_0204D234 (UnkStruct_0203E724 * param0) +BOOL sub_0204D234 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; Pokemon * v1; - u16 * v2 = inline_0204FCAC(param0); - u16 v3 = inline_02049538(param0); - u16 v4 = inline_02049538(param0); + u16 * v2 = ScriptContext_GetVarPointer(param0); + u16 v3 = ScriptContext_GetVar(param0); + u16 v4 = ScriptContext_GetVar(param0); u16 v5; v1 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(v0->saveData), v4); @@ -150,12 +150,12 @@ BOOL sub_0204D234 (UnkStruct_0203E724 * param0) return 0; } -BOOL sub_0204D2D8 (UnkStruct_0203E724 * param0) +BOOL sub_0204D2D8 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; Pokemon * v1; - u16 * v2 = inline_0204FCAC(param0); - u16 v3 = inline_02049538(param0); + u16 * v2 = ScriptContext_GetVarPointer(param0); + u16 v3 = ScriptContext_GetVar(param0); u16 v4; u8 v5, v6; @@ -177,26 +177,26 @@ BOOL sub_0204D2D8 (UnkStruct_0203E724 * param0) return 0; } -BOOL sub_0204D398 (UnkStruct_0203E724 * param0) +BOOL sub_0204D398 (ScriptContext * param0) { Pokemon * v0; u16 v1; u16 * v2; - v2 = inline_0204FCAC(param0); - v1 = inline_02049538(param0); - v0 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(param0->unk_34->saveData), v1); + v2 = ScriptContext_GetVarPointer(param0); + v1 = ScriptContext_GetVar(param0); + v0 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(param0->fieldSys->saveData), v1); *v2 = sub_02054B94(v0); return 0; } -BOOL sub_0204D3DC (UnkStruct_0203E724 * param0) +BOOL sub_0204D3DC (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; Pokemon * v1; - u16 * v2 = inline_0204FCAC(param0); - u16 v3 = inline_02049538(param0); + u16 * v2 = ScriptContext_GetVarPointer(param0); + u16 v3 = ScriptContext_GetVar(param0); u8 v4, v5, v6; v5 = Party_GetCurrentCount(Party_GetFromSavedata(v0->saveData)); @@ -217,12 +217,12 @@ BOOL sub_0204D3DC (UnkStruct_0203E724 * param0) return 0; } -BOOL sub_0204D470 (UnkStruct_0203E724 * param0) +BOOL sub_0204D470 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; Pokemon * v1; - u16 * v2 = inline_0204FCAC(param0); - u16 v3 = inline_02049538(param0); + u16 * v2 = ScriptContext_GetVarPointer(param0); + u16 v3 = ScriptContext_GetVar(param0); v1 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(v0->saveData), v3); *v2 = 0; @@ -234,12 +234,12 @@ BOOL sub_0204D470 (UnkStruct_0203E724 * param0) return 0; } -BOOL sub_0204D4CC (UnkStruct_0203E724 * param0) +BOOL sub_0204D4CC (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; Pokemon * v1; - u16 * v2 = inline_0204FCAC(param0); - u16 v3 = inline_02049538(param0); + u16 * v2 = ScriptContext_GetVarPointer(param0); + u16 v3 = ScriptContext_GetVar(param0); u8 v4; v4 = Party_GetCurrentCount(Party_GetFromSavedata(v0->saveData)); @@ -261,12 +261,12 @@ BOOL sub_0204D4CC (UnkStruct_0203E724 * param0) return 0; } -BOOL sub_0204D540 (UnkStruct_0203E724 * param0) +BOOL sub_0204D540 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; Pokemon * v1; - u16 * v2 = inline_0204FCAC(param0); - u16 v3 = inline_02049538(param0); + u16 * v2 = ScriptContext_GetVarPointer(param0); + u16 v3 = ScriptContext_GetVar(param0); u8 v4, v5; v4 = Party_GetCurrentCount(Party_GetFromSavedata(v0->saveData)); @@ -286,12 +286,12 @@ BOOL sub_0204D540 (UnkStruct_0203E724 * param0) return 0; } -BOOL sub_0204D5CC (UnkStruct_0203E724 * param0) +BOOL sub_0204D5CC (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; Pokemon * v1; - u16 * v2 = inline_0204FCAC(param0); - u16 v3 = inline_02049538(param0); + u16 * v2 = ScriptContext_GetVarPointer(param0); + u16 v3 = ScriptContext_GetVar(param0); v1 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(v0->saveData), v3); *v2 = Pokemon_GetValue(v1, MON_DATA_FRIENDSHIP, NULL); @@ -299,14 +299,14 @@ BOOL sub_0204D5CC (UnkStruct_0203E724 * param0) return 0; } -BOOL sub_0204D614 (UnkStruct_0203E724 * param0) +BOOL sub_0204D614 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; Pokemon * v1; - u16 v2 = inline_02049538(param0); - u16 v3 = inline_02049538(param0); + u16 v2 = ScriptContext_GetVar(param0); + u16 v3 = ScriptContext_GetVar(param0); u16 v4; - u32 v5 = MapHeader_GetMapLabelTextID(param0->unk_34->unk_1C->unk_00); + u32 v5 = MapHeader_GetMapLabelTextID(param0->fieldSys->unk_1C->unk_00); v1 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(v0->saveData), v3); v4 = Pokemon_GetValue(v1, MON_DATA_FRIENDSHIP, NULL); @@ -335,12 +335,12 @@ BOOL sub_0204D614 (UnkStruct_0203E724 * param0) return 0; } -BOOL sub_0204D6E4 (UnkStruct_0203E724 * param0) +BOOL sub_0204D6E4 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; Pokemon * v1; - u16 v2 = inline_02049538(param0); - u16 v3 = inline_02049538(param0); + u16 v2 = ScriptContext_GetVar(param0); + u16 v3 = ScriptContext_GetVar(param0); u16 v4; v1 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(v0->saveData), v3); @@ -356,34 +356,34 @@ BOOL sub_0204D6E4 (UnkStruct_0203E724 * param0) return 0; } -BOOL sub_0204D74C (UnkStruct_0203E724 * param0) +BOOL sub_0204D74C (ScriptContext * param0) { Pokemon * v0; - u16 v1 = inline_02049538(param0); - u16 v2 = inline_02049538(param0); - u16 * v3 = inline_0204FCAC(param0); + u16 v1 = ScriptContext_GetVar(param0); + u16 v2 = ScriptContext_GetVar(param0); + u16 * v3 = ScriptContext_GetVarPointer(param0); - v0 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(param0->unk_34->saveData), v1); + v0 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(param0->fieldSys->saveData), v1); *v3 = Pokemon_GetValue(v0, MON_DATA_COOL + v2, NULL); return 0; } -BOOL sub_0204D7AC (UnkStruct_0203E724 * param0) +BOOL sub_0204D7AC (ScriptContext * param0) { - u16 * v0 = inline_0204FCAC(param0); + u16 * v0 = ScriptContext_GetVarPointer(param0); - *v0 = sub_0205E1B4(param0->unk_34->saveData); + *v0 = sub_0205E1B4(param0->fieldSys->saveData); return 0; } -BOOL sub_0204D7D4 (UnkStruct_0203E724 * param0) +BOOL sub_0204D7D4 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; Pokemon * v1; - u16 * v2 = inline_0204FCAC(param0); - u16 * v3 = inline_0204FCAC(param0); - u16 v4 = inline_02049538(param0); + u16 * v2 = ScriptContext_GetVarPointer(param0); + u16 * v3 = ScriptContext_GetVarPointer(param0); + u16 v4 = ScriptContext_GetVar(param0); v1 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(v0->saveData), v4); *v2 = Pokemon_GetValue(v1, MON_DATA_TYPE_1, NULL); @@ -392,12 +392,12 @@ BOOL sub_0204D7D4 (UnkStruct_0203E724 * param0) return 0; } -BOOL sub_0204D840 (UnkStruct_0203E724 * param0) +BOOL sub_0204D840 (ScriptContext * param0) { int v0; Pokemon * v1; - FieldSystem * v2 = param0->unk_34; - u16 * v3 = inline_0204FCAC(param0); + FieldSystem * v2 = param0->fieldSys; + u16 * v3 = ScriptContext_GetVarPointer(param0); v0 = Party_GetCurrentCount(Party_GetFromSavedata(v2->saveData)); *v3 = v0; @@ -405,12 +405,12 @@ BOOL sub_0204D840 (UnkStruct_0203E724 * param0) return 0; } -BOOL sub_0204D86C (UnkStruct_0203E724 * param0) +BOOL sub_0204D86C (ScriptContext * param0) { int v0, v1, v2; Pokemon * v3; - FieldSystem * v4 = param0->unk_34; - u16 * v5 = inline_0204FCAC(param0); + FieldSystem * v4 = param0->fieldSys; + u16 * v5 = ScriptContext_GetVarPointer(param0); v0 = Party_GetCurrentCount(Party_GetFromSavedata(v4->saveData)); @@ -427,13 +427,13 @@ BOOL sub_0204D86C (UnkStruct_0203E724 * param0) return 0; } -BOOL sub_0204D8C4 (UnkStruct_0203E724 * param0) +BOOL sub_0204D8C4 (ScriptContext * param0) { int v0, v1, v2; Pokemon * v3; - FieldSystem * v4 = param0->unk_34; - u16 * v5 = inline_0204FCAC(param0); - u16 v6 = inline_02049538(param0); + FieldSystem * v4 = param0->fieldSys; + u16 * v5 = ScriptContext_GetVarPointer(param0); + u16 v6 = ScriptContext_GetVar(param0); v0 = Party_GetCurrentCount(Party_GetFromSavedata(v4->saveData)); @@ -456,12 +456,12 @@ BOOL sub_0204D8C4 (UnkStruct_0203E724 * param0) return 0; } -BOOL sub_0204D94C (UnkStruct_0203E724 * param0) +BOOL sub_0204D94C (ScriptContext * param0) { int v0, v1, v2; Pokemon * v3; - FieldSystem * v4 = param0->unk_34; - u16 * v5 = inline_0204FCAC(param0); + FieldSystem * v4 = param0->fieldSys; + u16 * v5 = ScriptContext_GetVarPointer(param0); PCBoxes * v6 = SaveData_PCBoxes(v4->saveData); v0 = Party_GetCurrentCount(Party_GetFromSavedata(v4->saveData)); @@ -482,12 +482,12 @@ BOOL sub_0204D94C (UnkStruct_0203E724 * param0) return 0; } -BOOL sub_0204D9C8 (UnkStruct_0203E724 * param0) +BOOL sub_0204D9C8 (ScriptContext * param0) { int v0, v1, v2; Pokemon * v3; - FieldSystem * v4 = param0->unk_34; - u16 * v5 = inline_0204FCAC(param0); + FieldSystem * v4 = param0->fieldSys; + u16 * v5 = ScriptContext_GetVarPointer(param0); v0 = Party_GetCurrentCount(Party_GetFromSavedata(v4->saveData)); @@ -504,15 +504,15 @@ BOOL sub_0204D9C8 (UnkStruct_0203E724 * param0) return 0; } -BOOL sub_0204DA20 (UnkStruct_0203E724 * param0) +BOOL sub_0204DA20 (ScriptContext * param0) { u16 v0, v1; u16 * v2; u32 v3; Pokemon * v4; - FieldSystem * v5 = param0->unk_34; + FieldSystem * v5 = param0->fieldSys; - v2 = inline_0204FCAC(param0); + v2 = ScriptContext_GetVarPointer(param0); v1 = Party_GetCurrentCount(Party_GetFromSavedata(v5->saveData)); *v2 = 0; @@ -530,24 +530,24 @@ BOOL sub_0204DA20 (UnkStruct_0203E724 * param0) return 0; } -BOOL sub_0204DA84 (UnkStruct_0203E724 * param0) +BOOL sub_0204DA84 (ScriptContext * param0) { Pokemon * v0; - u16 v1 = inline_02049538(param0); - u16 * v2 = inline_0204FCAC(param0); + u16 v1 = ScriptContext_GetVar(param0); + u16 * v2 = ScriptContext_GetVarPointer(param0); - v0 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(param0->unk_34->saveData), v1); + v0 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(param0->fieldSys->saveData), v1); *v2 = Pokemon_GetValue(v0, MON_DATA_GENDER, NULL); return 0; } -BOOL sub_0204DACC (UnkStruct_0203E724 * param0) +BOOL sub_0204DACC (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; Pokemon * v1; - u16 * v2 = inline_0204FCAC(param0); - u16 v3 = inline_02049538(param0); + u16 * v2 = ScriptContext_GetVarPointer(param0); + u16 v3 = ScriptContext_GetVar(param0); u8 v4; v1 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(v0->saveData), v3); @@ -579,14 +579,14 @@ BOOL sub_0204DACC (UnkStruct_0203E724 * param0) return 0; } -BOOL sub_0204DB74 (UnkStruct_0203E724 * param0) +BOOL sub_0204DB74 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; Pokemon * v1; u32 v2; u8 v3; - u16 v4 = inline_02049538(param0); - u16 v5 = inline_02049538(param0); + u16 v4 = ScriptContext_GetVar(param0); + u16 v5 = ScriptContext_GetVar(param0); v1 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(v0->saveData), v4); Pokemon_ClearMoveSlot(v1, v5); @@ -594,13 +594,13 @@ BOOL sub_0204DB74 (UnkStruct_0203E724 * param0) return 0; } -BOOL sub_0204DBB8 (UnkStruct_0203E724 * param0) +BOOL sub_0204DBB8 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; Pokemon * v1; - u16 * v2 = inline_0204FCAC(param0); - u16 v3 = inline_02049538(param0); - u16 v4 = inline_02049538(param0); + u16 * v2 = ScriptContext_GetVarPointer(param0); + u16 v3 = ScriptContext_GetVar(param0); + u16 v4 = ScriptContext_GetVar(param0); v1 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(v0->saveData), v3); *v2 = Pokemon_GetValue(v1, MON_DATA_MOVE1 + v4, NULL); @@ -608,12 +608,12 @@ BOOL sub_0204DBB8 (UnkStruct_0203E724 * param0) return 0; } -BOOL sub_0204DC18 (UnkStruct_0203E724 * param0) +BOOL sub_0204DC18 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; Pokemon * v1; - u16 * v2 = inline_0204FCAC(param0); - u16 v3 = inline_02049538(param0); + u16 * v2 = ScriptContext_GetVarPointer(param0); + u16 v3 = ScriptContext_GetVar(param0); v1 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(v0->saveData), v3); *v2 = Pokemon_GetValue(v1, MON_DATA_HELD_ITEM, NULL); @@ -621,11 +621,11 @@ BOOL sub_0204DC18 (UnkStruct_0203E724 * param0) return 0; } -BOOL sub_0204DC60 (UnkStruct_0203E724 * param0) +BOOL sub_0204DC60 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; Pokemon * v1; - u16 v2 = inline_02049538(param0); + u16 v2 = ScriptContext_GetVar(param0); u16 v3; v1 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(v0->saveData), v2); @@ -636,13 +636,13 @@ BOOL sub_0204DC60 (UnkStruct_0203E724 * param0) return 0; } -BOOL sub_0204DC98 (UnkStruct_0203E724 * param0) +BOOL sub_0204DC98 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; Pokemon * v1; Party * v2; - u16 * v3 = inline_0204FCAC(param0); - u16 v4 = inline_02049538(param0); + u16 * v3 = ScriptContext_GetVarPointer(param0); + u16 v4 = ScriptContext_GetVar(param0); u8 v5, v6; u16 v7; @@ -666,13 +666,13 @@ BOOL sub_0204DC98 (UnkStruct_0203E724 * param0) return 0; } -BOOL sub_0204DD28 (UnkStruct_0203E724 * param0) +BOOL sub_0204DD28 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; Pokemon * v1; Party * v2; - u16 * v3 = inline_0204FCAC(param0); - u16 v4 = inline_02049538(param0); + u16 * v3 = ScriptContext_GetVarPointer(param0); + u16 v4 = ScriptContext_GetVar(param0); u8 v5, v6, v7; u16 v8; u16 v9[6]; @@ -711,13 +711,13 @@ BOOL sub_0204DD28 (UnkStruct_0203E724 * param0) return 0; } -BOOL sub_0204DE00 (UnkStruct_0203E724 * param0) +BOOL sub_0204DE00 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; Pokemon * v1; Party * v2; - u16 * v3 = inline_0204FCAC(param0); - u16 v4 = inline_02049538(param0); + u16 * v3 = ScriptContext_GetVarPointer(param0); + u16 v4 = ScriptContext_GetVar(param0); u8 v5, v6; u16 v7; @@ -741,14 +741,14 @@ BOOL sub_0204DE00 (UnkStruct_0203E724 * param0) return 0; } -BOOL sub_0204DE94 (UnkStruct_0203E724 * param0) +BOOL sub_0204DE94 (ScriptContext * param0) { Pokemon * v0; - u16 * v1 = inline_0204FCAC(param0); - u16 v2 = inline_02049538(param0); + u16 * v1 = ScriptContext_GetVarPointer(param0); + u16 v2 = ScriptContext_GetVar(param0); u16 v3, v4; - v0 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(param0->unk_34->saveData), v2); + v0 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(param0->fieldSys->saveData), v2); for (v3 = 0, v4 = 0; v3 < 80; v3++) { if (Pokemon_GetValue(v0, sub_020923C0(v3, 0), NULL) != 0) { @@ -761,15 +761,15 @@ BOOL sub_0204DE94 (UnkStruct_0203E724 * param0) return 0; } -BOOL sub_0204DF08 (UnkStruct_0203E724 * param0) +BOOL sub_0204DF08 (ScriptContext * param0) { Pokemon * v0; Party * v1; - u16 * v2 = inline_0204FCAC(param0); + u16 * v2 = ScriptContext_GetVarPointer(param0); u16 v3, v4, v5, v6; - v6 = Party_GetCurrentCount(Party_GetFromSavedata(param0->unk_34->saveData)); - v1 = Party_GetFromSavedata(param0->unk_34->saveData); + v6 = Party_GetCurrentCount(Party_GetFromSavedata(param0->fieldSys->saveData)); + v1 = Party_GetFromSavedata(param0->fieldSys->saveData); for (v3 = 0, v5 = 0; v3 < 80; v3++) { for (v4 = 0; v4 < v6; v4++) { @@ -789,44 +789,44 @@ BOOL sub_0204DF08 (UnkStruct_0203E724 * param0) return 0; } -BOOL sub_0204DFB0 (UnkStruct_0203E724 * param0) +BOOL sub_0204DFB0 (ScriptContext * param0) { Pokemon * v0; - u16 * v1 = inline_0204FCAC(param0); - u16 v2 = inline_02049538(param0); - u16 v3 = inline_02049538(param0); + u16 * v1 = ScriptContext_GetVarPointer(param0); + u16 v2 = ScriptContext_GetVar(param0); + u16 v3 = ScriptContext_GetVar(param0); u8 v4 = 1; - v0 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(param0->unk_34->saveData), v2); + v0 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(param0->fieldSys->saveData), v2); *v1 = Pokemon_GetValue(v0, sub_020923C0(v3, 0), NULL); return 0; } -BOOL sub_0204E01C (UnkStruct_0203E724 * param0) +BOOL sub_0204E01C (ScriptContext * param0) { Pokemon * v0; - u16 v1 = inline_02049538(param0); - u16 v2 = inline_02049538(param0); + u16 v1 = ScriptContext_GetVar(param0); + u16 v2 = ScriptContext_GetVar(param0); u8 v3 = 1; - v0 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(param0->unk_34->saveData), v1); + v0 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(param0->fieldSys->saveData), v1); Pokemon_SetValue(v0, sub_020923C0(v2, 0), &v3); - sub_0206DDB8(param0->unk_34->saveData, v0, sub_020923C0(v2, 0)); + sub_0206DDB8(param0->fieldSys->saveData, v0, sub_020923C0(v2, 0)); return 0; } -BOOL sub_0204E094 (UnkStruct_0203E724 * param0) +BOOL sub_0204E094 (ScriptContext * param0) { Pokemon * v0; Party * v1; - u16 * v2 = inline_0204FCAC(param0); + u16 * v2 = ScriptContext_GetVarPointer(param0); u16 v3, v4, v5; - v5 = Party_GetCurrentCount(Party_GetFromSavedata(param0->unk_34->saveData)); - v1 = Party_GetFromSavedata(param0->unk_34->saveData); + v5 = Party_GetCurrentCount(Party_GetFromSavedata(param0->fieldSys->saveData)); + v1 = Party_GetFromSavedata(param0->fieldSys->saveData); for (v3 = 0; v3 < 80; v3++) { for (v4 = 0; v4 < v5; v4++) { @@ -846,20 +846,20 @@ BOOL sub_0204E094 (UnkStruct_0203E724 * param0) return 0; } -BOOL sub_0204E128 (UnkStruct_0203E724 * param0) +BOOL sub_0204E128 (ScriptContext * param0) { return 0; } -BOOL sub_0204E12C (UnkStruct_0203E724 * param0) +BOOL sub_0204E12C (ScriptContext * param0) { u8 v0, v1; u16 v2; Pokemon * v3; Party * v4; - FieldSystem * v5 = param0->unk_34; - u16 * v6 = inline_0204FCAC(param0); - u16 v7 = inline_02049538(param0); + FieldSystem * v5 = param0->fieldSys; + u16 * v6 = ScriptContext_GetVarPointer(param0); + u16 v7 = ScriptContext_GetVar(param0); v4 = Party_GetFromSavedata(v5->saveData); v1 = Party_GetCurrentCount(v4); @@ -883,14 +883,14 @@ BOOL sub_0204E12C (UnkStruct_0203E724 * param0) return 0; } -BOOL sub_0204E1D0 (UnkStruct_0203E724 * param0) +BOOL sub_0204E1D0 (ScriptContext * param0) { int v0, v1; Party * v2; Pokemon * v3; - FieldSystem * v4 = param0->unk_34; - u16 v5 = inline_02049538(param0); - u16 * v6 = inline_0204FCAC(param0); + FieldSystem * v4 = param0->fieldSys; + u16 v5 = ScriptContext_GetVar(param0); + u16 * v6 = ScriptContext_GetVarPointer(param0); v2 = Party_GetFromSavedata(v4->saveData); v1 = Party_GetCurrentCount(v2); diff --git a/src/unk_0204E240.c b/src/unk_0204E240.c index 077ae1a111..a93dc75427 100644 --- a/src/unk_0204E240.c +++ b/src/unk_0204E240.c @@ -19,12 +19,12 @@ const u16 Unk_020EBFFC[7][2] = { {0x69, 0x198} }; -BOOL sub_0204E240 (UnkStruct_0203E724 * param0) +BOOL sub_0204E240 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; u8 v1; u16 v2, v3; - u16 * v4 = inline_0204FCAC(param0); + u16 * v4 = ScriptContext_GetVarPointer(param0); for (v1 = 0, v3 = 0; v1 < 7; v1++) { v3 += sub_0207D730(sub_0207D990(v0->saveData), Unk_020EBFFC[v1][0], 4); @@ -35,11 +35,11 @@ BOOL sub_0204E240 (UnkStruct_0203E724 * param0) return 0; } -BOOL sub_0204E28C (UnkStruct_0203E724 * param0) +BOOL sub_0204E28C (ScriptContext * param0) { u16 v0; - u16 * v1 = inline_0204FCAC(param0); - u16 v2 = inline_02049538(param0); + u16 * v1 = ScriptContext_GetVarPointer(param0); + u16 v2 = ScriptContext_GetVar(param0); *v1 = 0; @@ -53,14 +53,14 @@ BOOL sub_0204E28C (UnkStruct_0203E724 * param0) return 0; } -BOOL sub_0204E2E0 (UnkStruct_0203E724 * param0) +BOOL sub_0204E2E0 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; u8 v1; u16 v2, v3; - u16 * v4 = inline_0204FCAC(param0); - u16 * v5 = inline_0204FCAC(param0); - u16 v6 = inline_02049538(param0); + u16 * v4 = ScriptContext_GetVarPointer(param0); + u16 * v5 = ScriptContext_GetVarPointer(param0); + u16 v6 = ScriptContext_GetVar(param0); *v4 = 0; *v5 = 0; @@ -78,12 +78,12 @@ BOOL sub_0204E2E0 (UnkStruct_0203E724 * param0) return 0; } -BOOL sub_0204E370 (UnkStruct_0203E724 * param0) +BOOL sub_0204E370 (ScriptContext * param0) { return 0; } -BOOL sub_0204E374 (UnkStruct_0203E724 * param0) +BOOL sub_0204E374 (ScriptContext * param0) { return 0; } diff --git a/src/unk_0204E378.c b/src/unk_0204E378.c index 06bc2f2117..59faf6c827 100644 --- a/src/unk_0204E378.c +++ b/src/unk_0204E378.c @@ -7,11 +7,11 @@ #include "unk_0204E378.h" -BOOL sub_0204E378 (UnkStruct_0203E724 * param0) +BOOL sub_0204E378 (ScriptContext * param0) { - u16 v0 = inline_02049538(param0); - u16 * v1 = inline_0204FCAC(param0); - u16 * v2 = inline_0204FCAC(param0); + u16 v0 = ScriptContext_GetVar(param0); + u16 * v1 = ScriptContext_GetVarPointer(param0); + u16 * v2 = ScriptContext_GetVarPointer(param0); static const u16 v3[][2] = { {0xFB, 0x3E8}, {0x109, 0x3E8}, diff --git a/src/unk_0204E3CC.c b/src/unk_0204E3CC.c index 1b2f9d96e0..3e189449c5 100644 --- a/src/unk_0204E3CC.c +++ b/src/unk_0204E3CC.c @@ -21,74 +21,74 @@ #include -BOOL sub_0204E3CC (UnkStruct_0203E724 * param0) +BOOL sub_0204E3CC (ScriptContext * param0) { - const PokedexData * v0 = SaveData_Pokedex(param0->unk_34->saveData); - u16 * v1 = inline_0204FCAC(param0); + const PokedexData * v0 = SaveData_Pokedex(param0->fieldSys->saveData); + u16 * v1 = ScriptContext_GetVarPointer(param0); *v1 = sub_02027520(v0); return 0; } -BOOL sub_0204E3FC (UnkStruct_0203E724 * param0) +BOOL sub_0204E3FC (ScriptContext * param0) { - PokedexData * v0 = SaveData_Pokedex(param0->unk_34->saveData); + PokedexData * v0 = SaveData_Pokedex(param0->fieldSys->saveData); sub_02027540(v0); return 0; } -BOOL sub_0204E410 (UnkStruct_0203E724 * param0) +BOOL sub_0204E410 (ScriptContext * param0) { UnkStruct_0203A790 * v0; UnkStruct_0205EC34 * v1; - u16 * v2 = inline_0204FCAC(param0); + u16 * v2 = ScriptContext_GetVarPointer(param0); - v0 = sub_0203A790(param0->unk_34->saveData); + v0 = sub_0203A790(param0->fieldSys->saveData); v1 = sub_0203A780(v0); *v2 = sub_0205EC40(v1); return 0; } -BOOL sub_0204E440 (UnkStruct_0203E724 * param0) +BOOL sub_0204E440 (ScriptContext * param0) { UnkStruct_0203A790 * v0; UnkStruct_0205EC34 * v1; - v0 = sub_0203A790(param0->unk_34->saveData); + v0 = sub_0203A790(param0->fieldSys->saveData); v1 = sub_0203A780(v0); sub_0205EC54(v1, 1); return 0; } -BOOL sub_0204E45C (UnkStruct_0203E724 * param0) +BOOL sub_0204E45C (ScriptContext * param0) { - u16 v0 = inline_02049538(param0); - u16 * v1 = inline_0204FCAC(param0); + u16 v0 = ScriptContext_GetVar(param0); + u16 * v1 = ScriptContext_GetVarPointer(param0); GF_ASSERT(v0 < 8); - * v1 = TrainerInfo_HasBadge(SaveData_GetTrainerInfo(param0->unk_34->saveData), v0); + * v1 = TrainerInfo_HasBadge(SaveData_GetTrainerInfo(param0->fieldSys->saveData), v0); return 0; } -BOOL sub_0204E4A4 (UnkStruct_0203E724 * param0) +BOOL sub_0204E4A4 (ScriptContext * param0) { - u16 v0 = inline_02049538(param0); + u16 v0 = ScriptContext_GetVar(param0); GF_ASSERT(v0 < 8); - TrainerInfo_SetBadge(SaveData_GetTrainerInfo(param0->unk_34->saveData), v0); + TrainerInfo_SetBadge(SaveData_GetTrainerInfo(param0->fieldSys->saveData), v0); return 0; } -BOOL sub_0204E4D8 (UnkStruct_0203E724 * param0) +BOOL sub_0204E4D8 (ScriptContext * param0) { - u16 * v0 = inline_0204FCAC(param0); + u16 * v0 = ScriptContext_GetVarPointer(param0); - *v0 = sub_0206A938(SaveData_Events(param0->unk_34->saveData)); + *v0 = sub_0206A938(SaveData_Events(param0->fieldSys->saveData)); return 0; } @@ -103,13 +103,13 @@ const u8 Unk_020EC064[8] = { 0x7 }; -BOOL sub_0204E504 (UnkStruct_0203E724 * param0) +BOOL sub_0204E504 (ScriptContext * param0) { u16 v0, v1; - u16 * v2 = inline_0204FCAC(param0); + u16 * v2 = ScriptContext_GetVarPointer(param0); for (v0 = 0, v1 = 0; v0 < 8; v0++) { - if (TrainerInfo_HasBadge(SaveData_GetTrainerInfo(param0->unk_34->saveData), Unk_020EC064[v0]) == 1) { + if (TrainerInfo_HasBadge(SaveData_GetTrainerInfo(param0->fieldSys->saveData), Unk_020EC064[v0]) == 1) { v1++; } } @@ -118,73 +118,73 @@ BOOL sub_0204E504 (UnkStruct_0203E724 * param0) return 0; } -BOOL sub_0204E554 (UnkStruct_0203E724 * param0) +BOOL sub_0204E554 (ScriptContext * param0) { - sub_0206A92C(SaveData_Events(param0->unk_34->saveData)); + sub_0206A92C(SaveData_Events(param0->fieldSys->saveData)); return 0; } -BOOL sub_0204E568 (UnkStruct_0203E724 * param0) +BOOL sub_0204E568 (ScriptContext * param0) { - u16 * v0 = inline_0204FCAC(param0); + u16 * v0 = ScriptContext_GetVarPointer(param0); - *v0 = sub_0206A984(SaveData_Events(param0->unk_34->saveData)); + *v0 = sub_0206A984(SaveData_Events(param0->fieldSys->saveData)); return 0; } -BOOL sub_0204E594 (UnkStruct_0203E724 * param0) +BOOL sub_0204E594 (ScriptContext * param0) { - sub_0206A964(SaveData_Events(param0->unk_34->saveData)); + sub_0206A964(SaveData_Events(param0->fieldSys->saveData)); return 0; } -BOOL sub_0204E5A8 (UnkStruct_0203E724 * param0) +BOOL sub_0204E5A8 (ScriptContext * param0) { - sub_0206A974(SaveData_Events(param0->unk_34->saveData)); + sub_0206A974(SaveData_Events(param0->fieldSys->saveData)); return 0; } -BOOL sub_0204E5BC (UnkStruct_0203E724 * param0) +BOOL sub_0204E5BC (ScriptContext * param0) { - u16 * v0 = inline_0204FCAC(param0); + u16 * v0 = ScriptContext_GetVarPointer(param0); - *v0 = sub_0206A9B4(SaveData_Events(param0->unk_34->saveData)); + *v0 = sub_0206A9B4(SaveData_Events(param0->fieldSys->saveData)); return 0; } -BOOL sub_0204E5E8 (UnkStruct_0203E724 * param0) +BOOL sub_0204E5E8 (ScriptContext * param0) { - sub_0206A994(SaveData_Events(param0->unk_34->saveData)); + sub_0206A994(SaveData_Events(param0->fieldSys->saveData)); return 0; } -BOOL sub_0204E5FC (UnkStruct_0203E724 * param0) +BOOL sub_0204E5FC (ScriptContext * param0) { - sub_0206A9A4(SaveData_Events(param0->unk_34->saveData)); + sub_0206A9A4(SaveData_Events(param0->fieldSys->saveData)); return 0; } -BOOL sub_0204E610 (UnkStruct_0203E724 * param0) +BOOL sub_0204E610 (ScriptContext * param0) { - u16 * v0 = inline_0204FCAC(param0); + u16 * v0 = ScriptContext_GetVarPointer(param0); - *v0 = sub_0206A954(SaveData_Events(param0->unk_34->saveData)); + *v0 = sub_0206A954(SaveData_Events(param0->fieldSys->saveData)); return 0; } -BOOL sub_0204E63C (UnkStruct_0203E724 * param0) +BOOL sub_0204E63C (ScriptContext * param0) { - sub_0206A944(SaveData_Events(param0->unk_34->saveData)); + sub_0206A944(SaveData_Events(param0->fieldSys->saveData)); return 0; } -BOOL sub_0204E650 (UnkStruct_0203E724 * param0) +BOOL sub_0204E650 (ScriptContext * param0) { u8 v0; u16 * v1; - UnkStruct_020507E4 * v2 = SaveData_Events(param0->unk_34->saveData); + UnkStruct_020507E4 * v2 = SaveData_Events(param0->fieldSys->saveData); - v0 = (*((param0)->unk_08++)); + v0 = ScriptContext_ReadByte(param0); switch (v0) { case 1: @@ -194,7 +194,7 @@ BOOL sub_0204E650 (UnkStruct_0203E724 * param0) inline_0204E650_1(v2); break; case 2: - v1 = inline_0204FCAC(param0); + v1 = ScriptContext_GetVarPointer(param0); *v1 = inline_0204E650_2(v2); break; default: @@ -204,13 +204,13 @@ BOOL sub_0204E650 (UnkStruct_0203E724 * param0) return 0; } -BOOL sub_0204E6AC (UnkStruct_0203E724 * param0) +BOOL sub_0204E6AC (ScriptContext * param0) { u8 v0; u16 * v1; - UnkStruct_020507E4 * v2 = SaveData_Events(param0->unk_34->saveData); + UnkStruct_020507E4 * v2 = SaveData_Events(param0->fieldSys->saveData); - v0 = (*((param0)->unk_08++)); + v0 = ScriptContext_ReadByte(param0); switch (v0) { case 1: @@ -220,7 +220,7 @@ BOOL sub_0204E6AC (UnkStruct_0203E724 * param0) sub_0206AECC(v2); break; case 2: - v1 = inline_0204FCAC(param0); + v1 = ScriptContext_GetVarPointer(param0); *v1 = sub_0206AEDC(v2); break; default: @@ -230,13 +230,13 @@ BOOL sub_0204E6AC (UnkStruct_0203E724 * param0) return 0; } -BOOL sub_0204E704 (UnkStruct_0203E724 * param0) +BOOL sub_0204E704 (ScriptContext * param0) { u8 v0; u16 * v1; - UnkStruct_020507E4 * v2 = SaveData_Events(param0->unk_34->saveData); + UnkStruct_020507E4 * v2 = SaveData_Events(param0->fieldSys->saveData); - v0 = (*((param0)->unk_08++)); + v0 = ScriptContext_ReadByte(param0); switch (v0) { case 1: @@ -246,7 +246,7 @@ BOOL sub_0204E704 (UnkStruct_0203E724 * param0) sub_0206AEFC(v2); break; case 2: - v1 = inline_0204FCAC(param0); + v1 = ScriptContext_GetVarPointer(param0); *v1 = sub_0206AF0C(v2); break; default: diff --git a/src/unk_0204E75C.c b/src/unk_0204E75C.c index 13565fc07d..c6b47854a9 100644 --- a/src/unk_0204E75C.c +++ b/src/unk_0204E75C.c @@ -11,86 +11,86 @@ #include "item.h" #include "unk_0207D3B8.h" -BOOL sub_0204E75C (UnkStruct_0203E724 * param0) +BOOL sub_0204E75C (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; - u16 v1 = inline_02049538(param0); - u16 v2 = inline_02049538(param0); - u16 * v3 = inline_0204FCAC(param0); + FieldSystem * v0 = param0->fieldSys; + u16 v1 = ScriptContext_GetVar(param0); + u16 v2 = ScriptContext_GetVar(param0); + u16 * v3 = ScriptContext_GetVarPointer(param0); *v3 = sub_0207D570(sub_0207D990(v0->saveData), v1, v2, 4); return 0; } -BOOL sub_0204E7B4 (UnkStruct_0203E724 * param0) +BOOL sub_0204E7B4 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; - u16 v1 = inline_02049538(param0); - u16 v2 = inline_02049538(param0); - u16 * v3 = inline_0204FCAC(param0); + FieldSystem * v0 = param0->fieldSys; + u16 v1 = ScriptContext_GetVar(param0); + u16 v2 = ScriptContext_GetVar(param0); + u16 * v3 = ScriptContext_GetVarPointer(param0); *v3 = Bag_SubtractItem(sub_0207D990(v0->saveData), v1, v2, 4); return 0; } -BOOL sub_0204E80C (UnkStruct_0203E724 * param0) +BOOL sub_0204E80C (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; - u16 v1 = inline_02049538(param0); - u16 v2 = inline_02049538(param0); - u16 * v3 = inline_0204FCAC(param0); + FieldSystem * v0 = param0->fieldSys; + u16 v1 = ScriptContext_GetVar(param0); + u16 v2 = ScriptContext_GetVar(param0); + u16 * v3 = ScriptContext_GetVarPointer(param0); *v3 = sub_0207D55C(sub_0207D990(v0->saveData), v1, v2, 4); return 0; } -BOOL sub_0204E864 (UnkStruct_0203E724 * param0) +BOOL sub_0204E864 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; - u16 v1 = inline_02049538(param0); - u16 v2 = inline_02049538(param0); - u16 * v3 = inline_0204FCAC(param0); + FieldSystem * v0 = param0->fieldSys; + u16 v1 = ScriptContext_GetVar(param0); + u16 v2 = ScriptContext_GetVar(param0); + u16 * v3 = ScriptContext_GetVarPointer(param0); *v3 = sub_0207D688(sub_0207D990(v0->saveData), v1, v2, 11); return 0; } -BOOL sub_0204E8BC (UnkStruct_0203E724 * param0) +BOOL sub_0204E8BC (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; - u16 v1 = inline_02049538(param0); - u16 * v2 = inline_0204FCAC(param0); + FieldSystem * v0 = param0->fieldSys; + u16 v1 = ScriptContext_GetVar(param0); + u16 * v2 = ScriptContext_GetVarPointer(param0); *v2 = sub_0207D730(sub_0207D990(v0->saveData), v1, 11); return 0; } -BOOL sub_0204E900 (UnkStruct_0203E724 * param0) +BOOL sub_0204E900 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; - u16 v1 = inline_02049538(param0); - u16 * v2 = inline_0204FCAC(param0); + FieldSystem * v0 = param0->fieldSys; + u16 v1 = ScriptContext_GetVar(param0); + u16 * v2 = ScriptContext_GetVarPointer(param0); *v2 = sub_0205E060(v1); return 0; } -BOOL sub_0204E934 (UnkStruct_0203E724 * param0) +BOOL sub_0204E934 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; - u16 v1 = inline_02049538(param0); - u16 * v2 = inline_0204FCAC(param0); + FieldSystem * v0 = param0->fieldSys; + u16 v1 = ScriptContext_GetVar(param0); + u16 * v2 = ScriptContext_GetVarPointer(param0); *v2 = (u16)Item_LoadParam(v1, 5, 11); return 0; } -BOOL sub_0204E96C (UnkStruct_0203E724 * param0) +BOOL sub_0204E96C (ScriptContext * param0) { return 0; } -BOOL sub_0204E970 (UnkStruct_0203E724 * param0) +BOOL sub_0204E970 (ScriptContext * param0) { return 0; } diff --git a/src/unk_0204E974.c b/src/unk_0204E974.c index 0e257d3cbb..7662b65abd 100644 --- a/src/unk_0204E974.c +++ b/src/unk_0204E974.c @@ -12,14 +12,14 @@ #include "unk_0202854C.h" #include "unk_0204E974.h" -BOOL sub_0204E974 (UnkStruct_0203E724 * param0) +BOOL sub_0204E974 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; SaveData * v1 = v0->saveData; UndergroundData * v2; - u16 v3 = inline_02049538(param0); - u16 v4 = inline_02049538(param0); - u16 * v5 = inline_0204FCAC(param0); + u16 v3 = ScriptContext_GetVar(param0); + u16 v4 = ScriptContext_GetVar(param0); + u16 * v5 = ScriptContext_GetVarPointer(param0); v2 = sub_020298B0(v1); *v5 = sub_0202895C(v2, v3); @@ -27,24 +27,24 @@ BOOL sub_0204E974 (UnkStruct_0203E724 * param0) return 0; } -BOOL sub_0204E9C8 (UnkStruct_0203E724 * param0) +BOOL sub_0204E9C8 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; - u16 v1 = inline_02049538(param0); - u16 v2 = inline_02049538(param0); - u16 * v3 = inline_0204FCAC(param0); + FieldSystem * v0 = param0->fieldSys; + u16 v1 = ScriptContext_GetVar(param0); + u16 v2 = ScriptContext_GetVar(param0); + u16 * v3 = ScriptContext_GetVarPointer(param0); return 0; } -BOOL sub_0204EA04 (UnkStruct_0203E724 * param0) +BOOL sub_0204EA04 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; SaveData * v1 = v0->saveData; UndergroundData * v2; - u16 v3 = inline_02049538(param0); - u16 v4 = inline_02049538(param0); - u16 * v5 = inline_0204FCAC(param0); + u16 v3 = ScriptContext_GetVar(param0); + u16 v4 = ScriptContext_GetVar(param0); + u16 * v5 = ScriptContext_GetVarPointer(param0); v2 = sub_020298B0(v1); *v5 = sub_02028984(v2, v3); @@ -52,24 +52,24 @@ BOOL sub_0204EA04 (UnkStruct_0203E724 * param0) return 0; } -BOOL sub_0204EA58 (UnkStruct_0203E724 * param0) +BOOL sub_0204EA58 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; - u16 v1 = inline_02049538(param0); - u16 v2 = inline_02049538(param0); - u16 * v3 = inline_0204FCAC(param0); + FieldSystem * v0 = param0->fieldSys; + u16 v1 = ScriptContext_GetVar(param0); + u16 v2 = ScriptContext_GetVar(param0); + u16 * v3 = ScriptContext_GetVarPointer(param0); return 0; } -BOOL sub_0204EA94 (UnkStruct_0203E724 * param0) +BOOL sub_0204EA94 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; SaveData * v1 = v0->saveData; UndergroundData * v2; - u16 v3 = inline_02049538(param0); - u16 v4 = inline_02049538(param0); - u16 * v5 = inline_0204FCAC(param0); + u16 v3 = ScriptContext_GetVar(param0); + u16 v4 = ScriptContext_GetVar(param0); + u16 * v5 = ScriptContext_GetVarPointer(param0); v2 = sub_020298B0(v1); *v5 = sub_02028E84(v2, v3); @@ -77,120 +77,120 @@ BOOL sub_0204EA94 (UnkStruct_0203E724 * param0) return 0; } -BOOL sub_0204EAE8 (UnkStruct_0203E724 * param0) +BOOL sub_0204EAE8 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; - u16 v1 = inline_02049538(param0); - u16 v2 = inline_02049538(param0); - u16 * v3 = inline_0204FCAC(param0); + FieldSystem * v0 = param0->fieldSys; + u16 v1 = ScriptContext_GetVar(param0); + u16 v2 = ScriptContext_GetVar(param0); + u16 * v3 = ScriptContext_GetVarPointer(param0); return 0; } -BOOL sub_0204EB24 (UnkStruct_0203E724 * param0) +BOOL sub_0204EB24 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; - u16 v1 = inline_02049538(param0); - u16 v2 = inline_02049538(param0); - u16 * v3 = inline_0204FCAC(param0); + FieldSystem * v0 = param0->fieldSys; + u16 v1 = ScriptContext_GetVar(param0); + u16 v2 = ScriptContext_GetVar(param0); + u16 * v3 = ScriptContext_GetVarPointer(param0); return 0; } -BOOL sub_0204EB60 (UnkStruct_0203E724 * param0) +BOOL sub_0204EB60 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; - u16 v1 = inline_02049538(param0); - u16 v2 = inline_02049538(param0); - u16 * v3 = inline_0204FCAC(param0); + FieldSystem * v0 = param0->fieldSys; + u16 v1 = ScriptContext_GetVar(param0); + u16 v2 = ScriptContext_GetVar(param0); + u16 * v3 = ScriptContext_GetVarPointer(param0); return 0; } -BOOL sub_0204EB9C (UnkStruct_0203E724 * param0) +BOOL sub_0204EB9C (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; SaveData * v1 = v0->saveData; UndergroundData * v2; - u16 v3 = inline_02049538(param0); - u16 v4 = inline_02049538(param0); - u16 * v5 = inline_0204FCAC(param0); + u16 v3 = ScriptContext_GetVar(param0); + u16 v4 = ScriptContext_GetVar(param0); + u16 * v5 = ScriptContext_GetVarPointer(param0); v2 = sub_020298B0(v1); return 0; } -BOOL sub_0204EBE4 (UnkStruct_0203E724 * param0) +BOOL sub_0204EBE4 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; - u16 v1 = inline_02049538(param0); - u16 v2 = inline_02049538(param0); - u16 * v3 = inline_0204FCAC(param0); + FieldSystem * v0 = param0->fieldSys; + u16 v1 = ScriptContext_GetVar(param0); + u16 v2 = ScriptContext_GetVar(param0); + u16 * v3 = ScriptContext_GetVarPointer(param0); return 0; } -BOOL sub_0204EC20 (UnkStruct_0203E724 * param0) +BOOL sub_0204EC20 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; - u16 v1 = inline_02049538(param0); - u16 v2 = inline_02049538(param0); - u16 * v3 = inline_0204FCAC(param0); + FieldSystem * v0 = param0->fieldSys; + u16 v1 = ScriptContext_GetVar(param0); + u16 v2 = ScriptContext_GetVar(param0); + u16 * v3 = ScriptContext_GetVarPointer(param0); return 0; } -BOOL sub_0204EC5C (UnkStruct_0203E724 * param0) +BOOL sub_0204EC5C (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; - u16 v1 = inline_02049538(param0); - u16 v2 = inline_02049538(param0); - u16 * v3 = inline_0204FCAC(param0); + FieldSystem * v0 = param0->fieldSys; + u16 v1 = ScriptContext_GetVar(param0); + u16 v2 = ScriptContext_GetVar(param0); + u16 * v3 = ScriptContext_GetVarPointer(param0); return 0; } -BOOL sub_0204EC98 (UnkStruct_0203E724 * param0) +BOOL sub_0204EC98 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; + FieldSystem * v0 = param0->fieldSys; SaveData * v1 = v0->saveData; UndergroundData * v2; - u16 v3 = inline_02049538(param0); - u16 v4 = inline_02049538(param0); - u16 * v5 = inline_0204FCAC(param0); + u16 v3 = ScriptContext_GetVar(param0); + u16 v4 = ScriptContext_GetVar(param0); + u16 * v5 = ScriptContext_GetVarPointer(param0); v2 = sub_020298B0(v1); *v5 = sub_02028CB0(v2, v3, v4); return 0; } -BOOL sub_0204ECF0 (UnkStruct_0203E724 * param0) +BOOL sub_0204ECF0 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; - u16 v1 = inline_02049538(param0); - u16 v2 = inline_02049538(param0); - u16 * v3 = inline_0204FCAC(param0); + FieldSystem * v0 = param0->fieldSys; + u16 v1 = ScriptContext_GetVar(param0); + u16 v2 = ScriptContext_GetVar(param0); + u16 * v3 = ScriptContext_GetVarPointer(param0); return 0; } -BOOL sub_0204ED2C (UnkStruct_0203E724 * param0) +BOOL sub_0204ED2C (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; - u16 v1 = inline_02049538(param0); - u16 v2 = inline_02049538(param0); - u16 * v3 = inline_0204FCAC(param0); + FieldSystem * v0 = param0->fieldSys; + u16 v1 = ScriptContext_GetVar(param0); + u16 v2 = ScriptContext_GetVar(param0); + u16 * v3 = ScriptContext_GetVarPointer(param0); return 0; } -BOOL sub_0204ED68 (UnkStruct_0203E724 * param0) +BOOL sub_0204ED68 (ScriptContext * param0) { - FieldSystem * v0 = param0->unk_34; - u16 v1 = inline_02049538(param0); - u16 v2 = inline_02049538(param0); - u16 * v3 = inline_0204FCAC(param0); + FieldSystem * v0 = param0->fieldSys; + u16 v1 = ScriptContext_GetVar(param0); + u16 v2 = ScriptContext_GetVar(param0); + u16 * v3 = ScriptContext_GetVarPointer(param0); return 0; } diff --git a/src/unk_0204EDA4.c b/src/unk_0204EDA4.c index 4a586b6fc7..1806586b10 100644 --- a/src/unk_0204EDA4.c +++ b/src/unk_0204EDA4.c @@ -18,27 +18,27 @@ #include "party.h" #include "unk_020997B8.h" -static void sub_0204EE90(UnkStruct_0203E724 * param0, u16 param1, Pokemon * param2, u16 * param3); +static void sub_0204EE90(ScriptContext * param0, u16 param1, Pokemon * param2, u16 * param3); -BOOL sub_0204EDA4 (UnkStruct_0203E724 * param0) +BOOL sub_0204EDA4 (ScriptContext * param0) { - u16 v0 = inline_02049538(param0); + u16 v0 = ScriptContext_GetVar(param0); void ** v1; - v1 = sub_0203F098(param0->unk_34, 19); - *v1 = sub_0203D6E4(32, param0->unk_34, v0); + v1 = sub_0203F098(param0->fieldSys, 19); + *v1 = sub_0203D6E4(32, param0->fieldSys, v0); - sub_0203E764(param0, sub_02041D60); + ScriptContext_Pause(param0, sub_02041D60); return 1; } -BOOL sub_0204EDEC (UnkStruct_0203E724 * param0) +BOOL sub_0204EDEC (ScriptContext * param0) { void ** v0; u16 * v1; - v1 = inline_0204FCAC(param0); - v0 = sub_0203F098(param0->unk_34, 19); + v1 = ScriptContext_GetVarPointer(param0); + v0 = sub_0203F098(param0->fieldSys, 19); GF_ASSERT(*v0 != 0); *v1 = sub_0203D750(*v0); @@ -52,19 +52,19 @@ BOOL sub_0204EDEC (UnkStruct_0203E724 * param0) return 0; } -BOOL sub_0204EE38 (UnkStruct_0203E724 * param0) +BOOL sub_0204EE38 (ScriptContext * param0) { return 0; } -BOOL sub_0204EE3C (UnkStruct_0203E724 * param0) +BOOL sub_0204EE3C (ScriptContext * param0) { Pokemon * v0; u16 * v1; - u16 * v2 = inline_0204FCAC(param0); - u16 v3 = inline_02049538(param0); + u16 * v2 = ScriptContext_GetVarPointer(param0); + u16 v3 = ScriptContext_GetVar(param0); - v0 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(param0->unk_34->saveData), v3); + v0 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(param0->fieldSys->saveData), v3); v1 = sub_020997D8(v0, 32); *v2 = sub_020998D8(v1); @@ -72,37 +72,37 @@ BOOL sub_0204EE3C (UnkStruct_0203E724 * param0) return 0; } -static void sub_0204EE90 (UnkStruct_0203E724 * param0, u16 param1, Pokemon * param2, u16 * param3) +static void sub_0204EE90 (ScriptContext * param0, u16 param1, Pokemon * param2, u16 * param3) { - void ** v0 = sub_0203F098(param0->unk_34, 19); + void ** v0 = sub_0203F098(param0->fieldSys, 19); UnkStruct_020997B8 * v1; v1 = sub_020997B8(32); *v0 = v1; v1->unk_00 = param2; - v1->unk_04 = SaveData_GetTrainerInfo(FieldSystem_SaveData(param0->unk_34)); - v1->unk_08 = sub_02025E44(param0->unk_34->saveData); + v1->unk_04 = SaveData_GetTrainerInfo(FieldSystem_SaveData(param0->fieldSys)); + v1->unk_08 = sub_02025E44(param0->fieldSys->saveData); v1->unk_0C = param3; v1->unk_15 = param1; - sub_0203E284(param0->unk_34, v1); - sub_0203E764(param0, sub_02041D60); + sub_0203E284(param0->fieldSys, v1); + ScriptContext_Pause(param0, sub_02041D60); Heap_FreeToHeap(param3); } -BOOL sub_0204EEFC (UnkStruct_0203E724 * param0) +BOOL sub_0204EEFC (ScriptContext * param0) { return 1; } -BOOL sub_0204EF00 (UnkStruct_0203E724 * param0) +BOOL sub_0204EF00 (ScriptContext * param0) { Pokemon * v0; - u16 v1 = inline_02049538(param0); + u16 v1 = ScriptContext_GetVar(param0); u16 * v2; - v0 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(param0->unk_34->saveData), v1); + v0 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(param0->fieldSys->saveData), v1); v2 = sub_020997D8(v0, 32); sub_0204EE90(param0, 1, v0, v2); @@ -110,14 +110,14 @@ BOOL sub_0204EF00 (UnkStruct_0203E724 * param0) return 1; } -BOOL sub_0204EF40 (UnkStruct_0203E724 * param0) +BOOL sub_0204EF40 (ScriptContext * param0) { Pokemon * v0; - u16 v1 = inline_02049538(param0); - u16 v2 = inline_02049538(param0); + u16 v1 = ScriptContext_GetVar(param0); + u16 v2 = ScriptContext_GetVar(param0); u16 * v3; - v0 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(param0->unk_34->saveData), v1); + v0 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(param0->fieldSys->saveData), v1); v3 = Heap_AllocFromHeap(32, (1 + 1) * 2); *(v3 + 0) = v2; @@ -128,16 +128,16 @@ BOOL sub_0204EF40 (UnkStruct_0203E724 * param0) return 1; } -BOOL sub_0204EFA0 (UnkStruct_0203E724 * param0) +BOOL sub_0204EFA0 (ScriptContext * param0) { return 0; } -BOOL sub_0204EFA4 (UnkStruct_0203E724 * param0) +BOOL sub_0204EFA4 (ScriptContext * param0) { UnkStruct_020997B8 * v0; - u16 * v1 = inline_0204FCAC(param0); - void ** v2 = sub_0203F098(param0->unk_34, 19); + u16 * v1 = ScriptContext_GetVarPointer(param0); + void ** v2 = sub_0203F098(param0->fieldSys, 19); v0 = *v2; @@ -154,11 +154,11 @@ BOOL sub_0204EFA4 (UnkStruct_0203E724 * param0) return 0; } -BOOL sub_0204EFE8 (UnkStruct_0203E724 * param0) +BOOL sub_0204EFE8 (ScriptContext * param0) { UnkStruct_020997B8 * v0; - u16 * v1 = inline_0204FCAC(param0); - void ** v2 = sub_0203F098(param0->unk_34, 19); + u16 * v1 = ScriptContext_GetVarPointer(param0); + void ** v2 = sub_0203F098(param0->fieldSys, 19); v0 = *v2; diff --git a/src/unk_0204F02C.c b/src/unk_0204F02C.c index 44ddf9035d..952cb2f390 100644 --- a/src/unk_0204F02C.c +++ b/src/unk_0204F02C.c @@ -5,24 +5,24 @@ #include "unk_0204F02C.h" -BOOL sub_0204F02C (UnkStruct_0203E724 * param0) +BOOL sub_0204F02C (ScriptContext * param0) { GF_ASSERT(0); return 0; } -BOOL sub_0204F038 (UnkStruct_0203E724 * param0) +BOOL sub_0204F038 (ScriptContext * param0) { GF_ASSERT(0); return 0; } -BOOL sub_0204F044 (UnkStruct_0203E724 * param0) +BOOL sub_0204F044 (ScriptContext * param0) { return 0; } -BOOL sub_0204F048 (UnkStruct_0203E724 * param0) +BOOL sub_0204F048 (ScriptContext * param0) { return 0; } diff --git a/src/unk_0204F04C.c b/src/unk_0204F04C.c index 2686d70864..684b65f2e8 100644 --- a/src/unk_0204F04C.c +++ b/src/unk_0204F04C.c @@ -11,17 +11,17 @@ #include "unk_0204F04C.h" #include "unk_0205DFC4.h" -BOOL sub_0204F04C(UnkStruct_0203E724 * param0); +BOOL sub_0204F04C(ScriptContext * param0); -BOOL sub_0204F04C (UnkStruct_0203E724 * param0) +BOOL sub_0204F04C (ScriptContext * param0) { u32 v0; u8 v1[4]; UnkStruct_020300F4 * v2; - u16 v3 = inline_02049538(param0); - u16 v4 = inline_02049538(param0); + u16 v3 = ScriptContext_GetVar(param0); + u16 v4 = ScriptContext_GetVar(param0); - v2 = sub_020300F4(param0->unk_34->saveData); + v2 = sub_020300F4(param0->fieldSys->saveData); v1[0] = 0; sub_020300B0(v2, 10, (v4 * 4) + v3, v1); @@ -33,11 +33,11 @@ BOOL sub_0204F04C (UnkStruct_0203E724 * param0) v0 = 104; } - sub_020306E4(sub_0203068C(param0->unk_34->saveData), v0, sub_0205E6A8(v0), 0); + sub_020306E4(sub_0203068C(param0->fieldSys->saveData), v0, sub_0205E6A8(v0), 0); } - sub_020306E4(sub_0203068C(param0->unk_34->saveData), sub_0205E430(v4, v3), sub_0205E6A8(sub_0205E430(v4, v3)), 0); - sub_020306E4(sub_0203068C(param0->unk_34->saveData), sub_0205E488(v4, v3), sub_0205E6A8(sub_0205E488(v4, v3)), 0); + sub_020306E4(sub_0203068C(param0->fieldSys->saveData), sub_0205E430(v4, v3), sub_0205E6A8(sub_0205E430(v4, v3)), 0); + sub_020306E4(sub_0203068C(param0->fieldSys->saveData), sub_0205E488(v4, v3), sub_0205E6A8(sub_0205E488(v4, v3)), 0); return 0; } diff --git a/src/unk_0204F13C.c b/src/unk_0204F13C.c index 168af0caa3..b017f48cd0 100644 --- a/src/unk_0204F13C.c +++ b/src/unk_0204F13C.c @@ -64,11 +64,11 @@ enum { UnkEnum_0204F13C_5, }; -BOOL sub_0204F13C(UnkStruct_0203E724 * param0); +BOOL sub_0204F13C(ScriptContext * param0); static BOOL sub_0204F268(u16 param0, SaveData * param1); -BOOL sub_0204F360(UnkStruct_0203E724 * param0); +BOOL sub_0204F360(ScriptContext * param0); -BOOL sub_0204F398(UnkStruct_0203E724 * param0); +BOOL sub_0204F398(ScriptContext * param0); void sub_0204F3D0(TaskManager * param0, u16 param1, u16 * param2); static BOOL sub_0204F414(TaskManager * param0); @@ -79,7 +79,7 @@ static int sub_0204F5D8(UnkStruct_0204F470 * param0, FieldSystem * param1); static int sub_0204F628(UnkStruct_0204F470 * param0, FieldSystem * param1, int param2); static int sub_0204F6B0(UnkStruct_0204F470 * param0, FieldSystem * param1); -BOOL sub_0204F13C (UnkStruct_0203E724 * param0) +BOOL sub_0204F13C (ScriptContext * param0) { u8 v0; u8 v1[4]; @@ -91,24 +91,24 @@ BOOL sub_0204F13C (UnkStruct_0203E724 * param0) UnkStruct_02030114 * v10; UnkStruct_0203026C * v11; - v3 = sub_0203E838(param0); - v4 = inline_02049538(param0); - v5 = sub_0203E838(param0); - v6 = sub_0203F118(param0->unk_34, v5); + v3 = ScriptContext_ReadHalfWord(param0); + v4 = ScriptContext_GetVar(param0); + v5 = ScriptContext_ReadHalfWord(param0); + v6 = sub_0203F118(param0->fieldSys, v5); - v10 = sub_02030114(param0->unk_34->saveData); - v11 = sub_0203026C(param0->unk_34->saveData); - v8 = sub_0203F098(param0->unk_34, 19); + v10 = sub_02030114(param0->fieldSys->saveData); + v11 = sub_0203026C(param0->fieldSys->saveData); + v8 = sub_0203F098(param0->fieldSys, 19); switch (v3) { case 0: - *v6 = sub_0204F268(v4, param0->unk_34->saveData); + *v6 = sub_0204F268(v4, param0->fieldSys->saveData); break; case 1: if (v4 == 3) { - *v6 = sub_02030698(sub_0203068C(param0->unk_34->saveData), + *v6 = sub_02030698(sub_0203068C(param0->fieldSys->saveData), 106, sub_0205E6A8(106)); } else { @@ -118,13 +118,13 @@ BOOL sub_0204F13C (UnkStruct_0203E724 * param0) break; case 2: - *v6 = sub_02030698(sub_0203068C(param0->unk_34->saveData), + *v6 = sub_02030698(sub_0203068C(param0->fieldSys->saveData), sub_0205E55C(v4), sub_0205E6A8(sub_0205E55C(v4))); break; case 3: - sub_0204FA50(param0->unk_34->saveData, v11, v4); + sub_0204FA50(param0->fieldSys->saveData, v11, v4); break; case 4: @@ -140,7 +140,7 @@ BOOL sub_0204F13C (UnkStruct_0203E724 * param0) } ; - sub_0204F470(param0->unk_28, v8, v0); + sub_0204F470(param0->taskManager, v8, v0); return 1; default: @@ -216,26 +216,26 @@ static BOOL sub_0204F268 (u16 param0, SaveData * param1) return 1; } -BOOL sub_0204F360 (UnkStruct_0203E724 * param0) +BOOL sub_0204F360 (ScriptContext * param0) { UnkStruct_0203026C * v0; - u16 v1 = inline_02049538(param0); + u16 v1 = ScriptContext_GetVar(param0); - v0 = sub_0203026C(param0->unk_34->saveData); + v0 = sub_0203026C(param0->fieldSys->saveData); - sub_0204FA50(param0->unk_34->saveData, v0, v1); + sub_0204FA50(param0->fieldSys->saveData, v0, v1); return 0; } -BOOL sub_0204F398 (UnkStruct_0203E724 * param0) +BOOL sub_0204F398 (ScriptContext * param0) { - u16 v0 = inline_02049538(param0); - u16 * v1 = inline_0204FCAC(param0); + u16 v0 = ScriptContext_GetVar(param0); + u16 * v1 = ScriptContext_GetVarPointer(param0); ; ; - sub_0204F3D0(param0->unk_28, v0, v1); + sub_0204F3D0(param0->taskManager, v0, v1); return 1; } @@ -464,7 +464,7 @@ static int sub_0204F6B0 (UnkStruct_0204F470 * param0, FieldSystem * param1) return UnkEnum_0204F13C_1; } -BOOL sub_0204F6D8(UnkStruct_0203E724 * param0); +BOOL sub_0204F6D8(ScriptContext * param0); typedef struct { u32 unk_00; @@ -521,7 +521,7 @@ static const UnkStruct_020EC078 Unk_020EC078[] = { {100000, 1000}, }; -BOOL sub_0204F6D8 (UnkStruct_0203E724 * param0) +BOOL sub_0204F6D8 (ScriptContext * param0) { int v0; int v1; @@ -529,14 +529,14 @@ BOOL sub_0204F6D8 (UnkStruct_0203E724 * param0) UnkStruct_0203068C * v3; u32 v4, v5, v6; u16 v7, v8; - FieldSystem * v9 = param0->unk_34; + FieldSystem * v9 = param0->fieldSys; StringTemplate ** v10 = sub_0203F098(v9, 15); - u8 v11 = (*((param0)->unk_08++)); - u8 v12 = (*((param0)->unk_08++)); - u8 v13 = (*((param0)->unk_08++)); - u8 v14 = (*((param0)->unk_08++)); - u16 * v15 = inline_0204FCAC(param0); - u16 * v16 = inline_0204FCAC(param0); + u8 v11 = ScriptContext_ReadByte(param0); + u8 v12 = ScriptContext_ReadByte(param0); + u8 v13 = ScriptContext_ReadByte(param0); + u8 v14 = ScriptContext_ReadByte(param0); + u16 * v15 = ScriptContext_GetVarPointer(param0); + u16 * v16 = ScriptContext_GetVarPointer(param0); v4 = 0; v0 = 1; @@ -580,11 +580,11 @@ BOOL sub_0204F6D8 (UnkStruct_0203E724 * param0) } } - sub_0202CF70(sub_0202CD88(param0->unk_34->saveData), (1 + 67), v7); + sub_0202CF70(sub_0202CD88(param0->fieldSys->saveData), (1 + 67), v7); if (v7 != 0) { sub_0202D230( - sub_0202D750(param0->unk_34->saveData), v7, 5); + sub_0202D750(param0->fieldSys->saveData), v7, 5); } if (v4 == 0) { @@ -616,14 +616,14 @@ BOOL sub_0204F6D8 (UnkStruct_0203E724 * param0) return 0; } -BOOL sub_0204F8A8(UnkStruct_0203E724 * param0); -BOOL sub_0204F8A8 (UnkStruct_0203E724 * param0) +BOOL sub_0204F8A8(ScriptContext * param0); +BOOL sub_0204F8A8 (ScriptContext * param0) { int v0; BattleFrontierStage * v1; u32 v2, v3, v4; - FieldSystem * v5 = param0->unk_34; - u16 * v6 = inline_0204FCAC(param0); + FieldSystem * v5 = param0->fieldSys; + u16 * v6 = ScriptContext_GetVarPointer(param0); v4 = 0; v0 = 1; @@ -665,16 +665,16 @@ BOOL sub_0204F8A8 (UnkStruct_0203E724 * param0) return 0; } -BOOL sub_0204F950(UnkStruct_0203E724 * param0); -BOOL sub_0204F950 (UnkStruct_0203E724 * param0) +BOOL sub_0204F950(ScriptContext * param0); +BOOL sub_0204F950 (ScriptContext * param0) { int v0; int v1; BattleFrontierStage * v2; UnkStruct_0203068C * v3; u32 v4, v5; - FieldSystem * v6 = param0->unk_34; - u16 * v7 = inline_0204FCAC(param0); + FieldSystem * v6 = param0->fieldSys; + u16 * v7 = ScriptContext_GetVarPointer(param0); v4 = 0; v0 = 1; @@ -710,18 +710,18 @@ BOOL sub_0204F950 (UnkStruct_0203E724 * param0) return 0; } -BOOL sub_0204F9D4(UnkStruct_0203E724 * param0); -BOOL sub_0204F9D4 (UnkStruct_0203E724 * param0) +BOOL sub_0204F9D4(ScriptContext * param0); +BOOL sub_0204F9D4 (ScriptContext * param0) { u16 v0, v1; - u16 * v2 = inline_0204FCAC(param0); + u16 * v2 = ScriptContext_GetVarPointer(param0); - v0 = sub_02030698(sub_0203068C(param0->unk_34->saveData), + v0 = sub_02030698(sub_0203068C(param0->fieldSys->saveData), sub_0205E55C(0), 0xff); - v1 = sub_02030698(sub_0203068C(param0->unk_34->saveData), + v1 = sub_02030698(sub_0203068C(param0->fieldSys->saveData), sub_0205E50C(0), 0xff); diff --git a/src/unk_0204FAB4.c b/src/unk_0204FAB4.c index ddfda8a994..3c920e2fbd 100644 --- a/src/unk_0204FAB4.c +++ b/src/unk_0204FAB4.c @@ -47,8 +47,8 @@ typedef struct { void ** unk_0C; } UnkStruct_0204FE50; -BOOL sub_0204FAB4(UnkStruct_0203E724 * param0); -BOOL sub_0204FBB4(UnkStruct_0203E724 * param0); +BOOL sub_0204FAB4(ScriptContext * param0); +BOOL sub_0204FBB4(ScriptContext * param0); static void sub_0204FBEC(SaveData * param0, UnkStruct_0203041C * param1, u8 param2); static void sub_0204FDB4(TaskManager * param0, void ** param1, u8 param2); static BOOL sub_0204FDE8(TaskManager * param0); @@ -56,11 +56,11 @@ static int sub_0204FE50(UnkStruct_0204FE50 * param0, FieldSystem * param1, int p static int sub_0204FF1C(UnkStruct_0204FE50 * param0, FieldSystem * param1); static int sub_0204FF6C(UnkStruct_0204FE50 * param0, FieldSystem * param1, int param2); static int sub_0204FFF4(UnkStruct_0204FE50 * param0, FieldSystem * param1); -BOOL sub_0204FCAC(UnkStruct_0203E724 * param0); +BOOL sub_0204FCAC(ScriptContext * param0); static void sub_0204FCF8(TaskManager * param0, u16 param1, u16 param2, u16 * param3); static BOOL sub_0204FD38(TaskManager * param0); -BOOL sub_0204FAB4 (UnkStruct_0203E724 * param0) +BOOL sub_0204FAB4 (ScriptContext * param0) { u8 v0; u8 v1[4]; @@ -72,27 +72,27 @@ BOOL sub_0204FAB4 (UnkStruct_0203E724 * param0) UnkStruct_020302DC * v10; UnkStruct_0203041C * v11; - v3 = sub_0203E838(param0); - v4 = inline_02049538(param0); - v5 = sub_0203E838(param0); - v6 = sub_0203F118(param0->unk_34, v5); - v10 = sub_020302DC(param0->unk_34->saveData); - v11 = sub_0203041C(param0->unk_34->saveData); - v8 = sub_0203F098(param0->unk_34, 19); + v3 = ScriptContext_ReadHalfWord(param0); + v4 = ScriptContext_GetVar(param0); + v5 = ScriptContext_ReadHalfWord(param0); + v6 = sub_0203F118(param0->fieldSys, v5); + v10 = sub_020302DC(param0->fieldSys->saveData); + v11 = sub_0203041C(param0->fieldSys->saveData); + v8 = sub_0203F098(param0->fieldSys, 19); switch (v3) { case 0: - *v6 = sub_02049EC4(v4, param0->unk_34->saveData, 0); + *v6 = sub_02049EC4(v4, param0->fieldSys->saveData, 0); break; case 1: if (v4 == 3) { - *v6 = sub_02030698(sub_0203068C(param0->unk_34->saveData), 108, sub_0205E6A8(108)); + *v6 = sub_02030698(sub_0203068C(param0->fieldSys->saveData), 108, sub_0205E6A8(108)); } else { *v6 = (u16)sub_02030470(v11, 9, v4, 0, NULL); } break; case 3: - sub_0204FBEC(param0->unk_34->saveData, v11, v4); + sub_0204FBEC(param0->fieldSys->saveData, v11, v4); break; case 4: if (v4 == 0) { @@ -105,7 +105,7 @@ BOOL sub_0204FAB4 (UnkStruct_0203E724 * param0) v0 = 2; } - sub_0204FDB4(param0->unk_28, v8, v0); + sub_0204FDB4(param0->taskManager, v8, v0); return 1; default: GF_ASSERT(FALSE); @@ -116,13 +116,13 @@ BOOL sub_0204FAB4 (UnkStruct_0203E724 * param0) return 0; } -BOOL sub_0204FBB4 (UnkStruct_0203E724 * param0) +BOOL sub_0204FBB4 (ScriptContext * param0) { UnkStruct_0203041C * v0; - u16 v1 = inline_02049538(param0); + u16 v1 = ScriptContext_GetVar(param0); - v0 = sub_0203041C(param0->unk_34->saveData); - sub_0204FBEC(param0->unk_34->saveData, v0, v1); + v0 = sub_0203041C(param0->fieldSys->saveData); + sub_0204FBEC(param0->fieldSys->saveData, v0, v1); return 0; } @@ -152,13 +152,13 @@ static void sub_0204FBEC (SaveData * param0, UnkStruct_0203041C * param1, u8 par return; } -BOOL sub_0204FCAC (UnkStruct_0203E724 * param0) +BOOL sub_0204FCAC (ScriptContext * param0) { - u16 v0 = inline_02049538(param0); - u16 v1 = inline_02049538(param0); - u16 * v2 = inline_0204FCAC(param0); + u16 v0 = ScriptContext_GetVar(param0); + u16 v1 = ScriptContext_GetVar(param0); + u16 * v2 = ScriptContext_GetVarPointer(param0); - sub_0204FCF8(param0->unk_28, v0, v1, v2); + sub_0204FCF8(param0->taskManager, v0, v1, v2); return 1; } diff --git a/src/unk_0205003C.c b/src/unk_0205003C.c index 6f9688acc3..ed7b508cc6 100644 --- a/src/unk_0205003C.c +++ b/src/unk_0205003C.c @@ -47,8 +47,8 @@ typedef struct { void ** unk_0C; } UnkStruct_0205037C; -BOOL sub_0205003C(UnkStruct_0203E724 * param0); -BOOL sub_0205013C(UnkStruct_0203E724 * param0); +BOOL sub_0205003C(ScriptContext * param0); +BOOL sub_0205013C(ScriptContext * param0); static void sub_02050174(SaveData * param0, UnkStruct_020305B8 * param1, u8 param2); void sub_020502E0(TaskManager * param0, void ** param1, u8 param2); static BOOL sub_02050314(TaskManager * param0); @@ -56,11 +56,11 @@ static int sub_0205037C(UnkStruct_0205037C * param0, FieldSystem * param1, int p static int sub_02050448(UnkStruct_0205037C * param0, FieldSystem * param1); static int sub_02050498(UnkStruct_0205037C * param0, FieldSystem * param1, int param2); static int sub_02050520(UnkStruct_0205037C * param0, FieldSystem * param1); -BOOL sub_020501D8(UnkStruct_0203E724 * param0); +BOOL sub_020501D8(ScriptContext * param0); void sub_02050224(TaskManager * param0, u16 param1, u16 param2, u16 * param3); static BOOL sub_02050264(TaskManager * param0); -BOOL sub_0205003C (UnkStruct_0203E724 * param0) +BOOL sub_0205003C (ScriptContext * param0) { u8 v0; u8 v1[4]; @@ -72,27 +72,27 @@ BOOL sub_0205003C (UnkStruct_0203E724 * param0) UnkStruct_020304A0 * v10; UnkStruct_020305B8 * v11; - v3 = sub_0203E838(param0); - v4 = inline_02049538(param0); - v5 = sub_0203E838(param0); - v6 = sub_0203F118(param0->unk_34, v5); - v10 = sub_020304A0(param0->unk_34->saveData); - v11 = sub_020305B8(param0->unk_34->saveData); - v8 = sub_0203F098(param0->unk_34, 19); + v3 = ScriptContext_ReadHalfWord(param0); + v4 = ScriptContext_GetVar(param0); + v5 = ScriptContext_ReadHalfWord(param0); + v6 = sub_0203F118(param0->fieldSys, v5); + v10 = sub_020304A0(param0->fieldSys->saveData); + v11 = sub_020305B8(param0->fieldSys->saveData); + v8 = sub_0203F098(param0->fieldSys, 19); switch (v3) { case 0: - *v6 = sub_02049EC4(v4, param0->unk_34->saveData, 0); + *v6 = sub_02049EC4(v4, param0->fieldSys->saveData, 0); break; case 1: if (v4 == 3) { - *v6 = sub_02030698(sub_0203068C(param0->unk_34->saveData), 110, sub_0205E6A8(110)); + *v6 = sub_02030698(sub_0203068C(param0->fieldSys->saveData), 110, sub_0205E6A8(110)); } else { *v6 = (u16)sub_02030600(v11, 8, v4, 0, NULL); } break; case 3: - sub_02050174(param0->unk_34->saveData, v11, v4); + sub_02050174(param0->fieldSys->saveData, v11, v4); break; case 4: if (v4 == 0) { @@ -105,7 +105,7 @@ BOOL sub_0205003C (UnkStruct_0203E724 * param0) v0 = 2; } - sub_020502E0(param0->unk_28, v8, v0); + sub_020502E0(param0->taskManager, v8, v0); return 1; default: GF_ASSERT(FALSE); @@ -116,13 +116,13 @@ BOOL sub_0205003C (UnkStruct_0203E724 * param0) return 0; } -BOOL sub_0205013C (UnkStruct_0203E724 * param0) +BOOL sub_0205013C (ScriptContext * param0) { UnkStruct_020305B8 * v0; - u16 v1 = inline_02049538(param0); + u16 v1 = ScriptContext_GetVar(param0); - v0 = sub_020305B8(param0->unk_34->saveData); - sub_02050174(param0->unk_34->saveData, v0, v1); + v0 = sub_020305B8(param0->fieldSys->saveData); + sub_02050174(param0->fieldSys->saveData, v0, v1); return 0; } @@ -144,13 +144,13 @@ static void sub_02050174 (SaveData * param0, UnkStruct_020305B8 * param1, u8 par return; } -BOOL sub_020501D8 (UnkStruct_0203E724 * param0) +BOOL sub_020501D8 (ScriptContext * param0) { - u16 v0 = inline_02049538(param0); - u16 v1 = inline_02049538(param0); - u16 * v2 = inline_0204FCAC(param0); + u16 v0 = ScriptContext_GetVar(param0); + u16 v1 = ScriptContext_GetVar(param0); + u16 * v2 = ScriptContext_GetVarPointer(param0); - sub_02050224(param0->unk_28, v0, v1, v2); + sub_02050224(param0->taskManager, v0, v1, v2); return 1; } From 80b6d912fd91c4bc4b9ecc05d9d1211874c91aaa Mon Sep 17 00:00:00 2001 From: cbt6 <91667135+cbt6@users.noreply.github.com> Date: Thu, 18 Apr 2024 10:19:09 +0800 Subject: [PATCH 23/23] Rename unk_0203E724.c to field_script_context.c --- include/constdata/const_020EAC58.h | 2 +- include/{unk_0203E724.h => field_script_context.h} | 6 +++--- include/inlines.h | 2 +- include/overlay005/ov5_021DD42C.h | 2 +- include/overlay005/ov5_021F6454.h | 2 +- include/overlay005/ov5_021F77A8.h | 2 +- include/unk_0203E880.h | 2 +- include/unk_0203F6C4.h | 2 +- include/unk_02046AD4.h | 2 +- include/unk_02046C7C.h | 2 +- include/unk_020474B8.h | 2 +- include/unk_020480A8.h | 2 +- include/unk_020482D4.h | 2 +- include/unk_02048614.h | 2 +- include/unk_02048BD0.h | 2 +- include/unk_02048DD8.h | 2 +- include/unk_020494DC.h | 2 +- include/unk_0204B64C.h | 2 +- include/unk_0204B830.h | 2 +- include/unk_0204C500.h | 2 +- include/unk_0204C6C8.h | 2 +- include/unk_0204C8F0.h | 2 +- include/unk_0204CA84.h | 2 +- include/unk_0204CDDC.h | 2 +- include/unk_0204CFFC.h | 2 +- include/unk_0204E240.h | 2 +- include/unk_0204E378.h | 2 +- include/unk_0204E3CC.h | 2 +- include/unk_0204E75C.h | 2 +- include/unk_0204E974.h | 2 +- include/unk_0204EDA4.h | 2 +- include/unk_0204F02C.h | 2 +- include/unk_0204F04C.h | 2 +- include/unk_0204F13C.h | 2 +- include/unk_0204FAB4.h | 2 +- include/unk_0205003C.h | 2 +- platinum.us/main.lsf | 2 +- src/{unk_0203E724.c => field_script_context.c} | 2 +- src/meson.build | 2 +- src/overlay005/ov5_021DD42C.c | 2 +- src/overlay005/ov5_021F6454.c | 2 +- src/overlay005/ov5_021F77A8.c | 2 +- src/unk_0203E880.c | 2 +- src/unk_0203F6C4.c | 2 +- src/unk_02046AD4.c | 2 +- src/unk_02046C7C.c | 2 +- src/unk_020474B8.c | 2 +- src/unk_020480A8.c | 2 +- src/unk_020482D4.c | 2 +- src/unk_02048614.c | 2 +- src/unk_02048BD0.c | 2 +- src/unk_02048DD8.c | 2 +- src/unk_020494DC.c | 2 +- src/unk_0204B64C.c | 2 +- src/unk_0204B830.c | 2 +- src/unk_0204C500.c | 2 +- src/unk_0204C6C8.c | 2 +- src/unk_0204C8F0.c | 2 +- src/unk_0204CA84.c | 2 +- src/unk_0204CDDC.c | 2 +- src/unk_0204CFFC.c | 2 +- src/unk_0204E240.c | 2 +- src/unk_0204E378.c | 2 +- src/unk_0204E3CC.c | 2 +- src/unk_0204E75C.c | 2 +- src/unk_0204E974.c | 2 +- src/unk_0204EDA4.c | 2 +- src/unk_0204F02C.c | 2 +- src/unk_0204F04C.c | 2 +- src/unk_0204F13C.c | 2 +- src/unk_0204FAB4.c | 2 +- src/unk_0205003C.c | 2 +- 72 files changed, 74 insertions(+), 74 deletions(-) rename include/{unk_0203E724.h => field_script_context.h} (91%) rename src/{unk_0203E724.c => field_script_context.c} (99%) diff --git a/include/constdata/const_020EAC58.h b/include/constdata/const_020EAC58.h index 1af2c1d69e..ad2de12dc0 100644 --- a/include/constdata/const_020EAC58.h +++ b/include/constdata/const_020EAC58.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_CONST_020EAC58_H #define POKEPLATINUM_CONST_020EAC58_H -#include "unk_0203E724.h" +#include "field_script_context.h" extern const ScrCmdFunc Unk_020EAC58[]; diff --git a/include/unk_0203E724.h b/include/field_script_context.h similarity index 91% rename from include/unk_0203E724.h rename to include/field_script_context.h index 62e9fa4f59..e9df3fddee 100644 --- a/include/unk_0203E724.h +++ b/include/field_script_context.h @@ -1,5 +1,5 @@ -#ifndef POKEPLATINUM_UNK_0203E724_H -#define POKEPLATINUM_UNK_0203E724_H +#ifndef POKEPLATINUM_FIELD_SCRIPT_CONTEXT_H +#define POKEPLATINUM_FIELD_SCRIPT_CONTEXT_H #include "message.h" #include "field/field_system_decl.h" @@ -40,4 +40,4 @@ void ScriptContext_Return(ScriptContext * ctx); u16 ScriptContext_ReadHalfWord(ScriptContext * ctx); u32 ScriptContext_ReadWord(ScriptContext * ctx); -#endif // POKEPLATINUM_UNK_0203E724_H +#endif // POKEPLATINUM_FIELD_SCRIPT_CONTEXT_H diff --git a/include/inlines.h b/include/inlines.h index 559ecc5aa4..3a26a71ade 100644 --- a/include/inlines.h +++ b/include/inlines.h @@ -20,7 +20,7 @@ #include "unk_0201D15C.h" #include "map_header.h" #include "unk_0203A6DC.h" -#include "unk_0203E724.h" +#include "field_script_context.h" #include "unk_0203E880.h" #include "unk_0206A8DC.h" diff --git a/include/overlay005/ov5_021DD42C.h b/include/overlay005/ov5_021DD42C.h index 7ff0954263..d0affa894c 100644 --- a/include/overlay005/ov5_021DD42C.h +++ b/include/overlay005/ov5_021DD42C.h @@ -2,7 +2,7 @@ #define POKEPLATINUM_OV5_021DD42C_H #include "message.h" -#include "unk_0203E724.h" +#include "field_script_context.h" #include "overlay005/struct_ov5_021DD42C.h" void ov5_021DD42C(UnkStruct_ov5_021DD42C * param0, ScriptContext * param1); diff --git a/include/overlay005/ov5_021F6454.h b/include/overlay005/ov5_021F6454.h index 8993e16f1a..53d33a86b4 100644 --- a/include/overlay005/ov5_021F6454.h +++ b/include/overlay005/ov5_021F6454.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_OV5_021F6454_H #define POKEPLATINUM_OV5_021F6454_H -#include "unk_0203E724.h" +#include "field_script_context.h" BOOL ov5_021F6454(ScriptContext * param0); BOOL ov5_021F6B3C(ScriptContext * param0); diff --git a/include/overlay005/ov5_021F77A8.h b/include/overlay005/ov5_021F77A8.h index 0410be640c..fc27faa18f 100644 --- a/include/overlay005/ov5_021F77A8.h +++ b/include/overlay005/ov5_021F77A8.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_OV5_021F77A8_H #define POKEPLATINUM_OV5_021F77A8_H -#include "unk_0203E724.h" +#include "field_script_context.h" BOOL ov5_021F77A8(ScriptContext * param0); BOOL ov5_021F77E8(ScriptContext * param0); diff --git a/include/unk_0203E880.h b/include/unk_0203E880.h index f7d18d8e29..df9007b959 100644 --- a/include/unk_0203E880.h +++ b/include/unk_0203E880.h @@ -2,7 +2,7 @@ #define POKEPLATINUM_UNK_0203E880_H #include "field/field_system_decl.h" -#include "unk_0203E724.h" +#include "field_script_context.h" #include "struct_decls/struct_0203EF60_decl.h" #include "struct_defs/struct_0203F478.h" #include "struct_decls/struct_020508D4_decl.h" diff --git a/include/unk_0203F6C4.h b/include/unk_0203F6C4.h index c81f65be03..0f87481bf0 100644 --- a/include/unk_0203F6C4.h +++ b/include/unk_0203F6C4.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_UNK_0203F6C4_H #define POKEPLATINUM_UNK_0203F6C4_H -#include "unk_0203E724.h" +#include "field_script_context.h" BOOL sub_02041CC8(ScriptContext * param0); BOOL sub_02041D60(ScriptContext * param0); diff --git a/include/unk_02046AD4.h b/include/unk_02046AD4.h index 4079387b0d..9219dc8d67 100644 --- a/include/unk_02046AD4.h +++ b/include/unk_02046AD4.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_UNK_02046AD4_H #define POKEPLATINUM_UNK_02046AD4_H -#include "unk_0203E724.h" +#include "field_script_context.h" BOOL sub_02046AD4(ScriptContext * param0); BOOL sub_02046B9C(ScriptContext * param0); diff --git a/include/unk_02046C7C.h b/include/unk_02046C7C.h index f4dff8fb7b..08817b518f 100644 --- a/include/unk_02046C7C.h +++ b/include/unk_02046C7C.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_UNK_02046C7C_H #define POKEPLATINUM_UNK_02046C7C_H -#include "unk_0203E724.h" +#include "field_script_context.h" BOOL sub_02046C7C(ScriptContext * param0); BOOL sub_02046CAC(ScriptContext * param0); diff --git a/include/unk_020474B8.h b/include/unk_020474B8.h index 67c518a665..50a7355cbb 100644 --- a/include/unk_020474B8.h +++ b/include/unk_020474B8.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_UNK_020474B8_H #define POKEPLATINUM_UNK_020474B8_H -#include "unk_0203E724.h" +#include "field_script_context.h" BOOL sub_020474B8(ScriptContext * param0); BOOL sub_020474F4(ScriptContext * param0); diff --git a/include/unk_020480A8.h b/include/unk_020480A8.h index c933dc992e..c1a872a90f 100644 --- a/include/unk_020480A8.h +++ b/include/unk_020480A8.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_UNK_020480A8_H #define POKEPLATINUM_UNK_020480A8_H -#include "unk_0203E724.h" +#include "field_script_context.h" BOOL sub_020480A8(ScriptContext * param0); BOOL sub_020480D8(ScriptContext * param0); diff --git a/include/unk_020482D4.h b/include/unk_020482D4.h index 2fc495b246..f4de944827 100644 --- a/include/unk_020482D4.h +++ b/include/unk_020482D4.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_UNK_020482D4_H #define POKEPLATINUM_UNK_020482D4_H -#include "unk_0203E724.h" +#include "field_script_context.h" BOOL sub_020482D4(ScriptContext * param0); BOOL sub_020482FC(ScriptContext * param0); diff --git a/include/unk_02048614.h b/include/unk_02048614.h index 801da8397b..74cb2d7c5f 100644 --- a/include/unk_02048614.h +++ b/include/unk_02048614.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_UNK_02048614_H #define POKEPLATINUM_UNK_02048614_H -#include "unk_0203E724.h" +#include "field_script_context.h" BOOL sub_02048614(ScriptContext * param0); BOOL sub_020486E0(ScriptContext * param0); diff --git a/include/unk_02048BD0.h b/include/unk_02048BD0.h index 17f9a13430..0567ff69c8 100644 --- a/include/unk_02048BD0.h +++ b/include/unk_02048BD0.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_UNK_02048BD0_H #define POKEPLATINUM_UNK_02048BD0_H -#include "unk_0203E724.h" +#include "field_script_context.h" BOOL sub_02048BD0(ScriptContext * param0); diff --git a/include/unk_02048DD8.h b/include/unk_02048DD8.h index e8a4ab6349..3612e45f9a 100644 --- a/include/unk_02048DD8.h +++ b/include/unk_02048DD8.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_UNK_02048DD8_H #define POKEPLATINUM_UNK_02048DD8_H -#include "unk_0203E724.h" +#include "field_script_context.h" BOOL sub_02048DD8(ScriptContext * param0); BOOL sub_02048F74(ScriptContext * param0); diff --git a/include/unk_020494DC.h b/include/unk_020494DC.h index 7665a7c3df..06c1340080 100644 --- a/include/unk_020494DC.h +++ b/include/unk_020494DC.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_UNK_020494DC_H #define POKEPLATINUM_UNK_020494DC_H -#include "unk_0203E724.h" +#include "field_script_context.h" BOOL sub_020494DC(ScriptContext * param0); BOOL sub_0204950C(ScriptContext * param0); diff --git a/include/unk_0204B64C.h b/include/unk_0204B64C.h index 7fac1e9833..5d72a7c6b3 100644 --- a/include/unk_0204B64C.h +++ b/include/unk_0204B64C.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_UNK_0204B64C_H #define POKEPLATINUM_UNK_0204B64C_H -#include "unk_0203E724.h" +#include "field_script_context.h" BOOL sub_0204B64C(ScriptContext * param0); BOOL sub_0204B680(ScriptContext * param0); diff --git a/include/unk_0204B830.h b/include/unk_0204B830.h index 02560605d5..b70fe8272d 100644 --- a/include/unk_0204B830.h +++ b/include/unk_0204B830.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_UNK_0204B830_H #define POKEPLATINUM_UNK_0204B830_H -#include "unk_0203E724.h" +#include "field_script_context.h" BOOL sub_0204B85C(ScriptContext * param0); diff --git a/include/unk_0204C500.h b/include/unk_0204C500.h index 9ee4a9b435..41e4e4d789 100644 --- a/include/unk_0204C500.h +++ b/include/unk_0204C500.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_UNK_0204C500_H #define POKEPLATINUM_UNK_0204C500_H -#include "unk_0203E724.h" +#include "field_script_context.h" BOOL sub_0204C500(ScriptContext * param0); BOOL sub_0204C554(ScriptContext * param0); diff --git a/include/unk_0204C6C8.h b/include/unk_0204C6C8.h index a5c8acea47..e68c0c3ac4 100644 --- a/include/unk_0204C6C8.h +++ b/include/unk_0204C6C8.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_UNK_0204C6C8_H #define POKEPLATINUM_UNK_0204C6C8_H -#include "unk_0203E724.h" +#include "field_script_context.h" BOOL sub_0204C6C8(ScriptContext * param0); BOOL sub_0204C718(ScriptContext * param0); diff --git a/include/unk_0204C8F0.h b/include/unk_0204C8F0.h index 9caba8f4b9..3f92f0b413 100644 --- a/include/unk_0204C8F0.h +++ b/include/unk_0204C8F0.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_UNK_0204C8F0_H #define POKEPLATINUM_UNK_0204C8F0_H -#include "unk_0203E724.h" +#include "field_script_context.h" BOOL sub_0204C8F0(ScriptContext * param0); BOOL sub_0204C914(ScriptContext * param0); diff --git a/include/unk_0204CA84.h b/include/unk_0204CA84.h index cc9bd2bde7..cfe42aeb67 100644 --- a/include/unk_0204CA84.h +++ b/include/unk_0204CA84.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_UNK_0204CA84_H #define POKEPLATINUM_UNK_0204CA84_H -#include "unk_0203E724.h" +#include "field_script_context.h" BOOL sub_0204CA84(ScriptContext * param0); BOOL sub_0204CAA4(ScriptContext * param0); diff --git a/include/unk_0204CDDC.h b/include/unk_0204CDDC.h index 7f5cf9ca49..c5f541086b 100644 --- a/include/unk_0204CDDC.h +++ b/include/unk_0204CDDC.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_UNK_0204CDDC_H #define POKEPLATINUM_UNK_0204CDDC_H -#include "unk_0203E724.h" +#include "field_script_context.h" BOOL sub_0204CDDC(ScriptContext * param0); BOOL sub_0204CDF0(ScriptContext * param0); diff --git a/include/unk_0204CFFC.h b/include/unk_0204CFFC.h index 42af661976..15e75f5986 100644 --- a/include/unk_0204CFFC.h +++ b/include/unk_0204CFFC.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_UNK_0204CFFC_H #define POKEPLATINUM_UNK_0204CFFC_H -#include "unk_0203E724.h" +#include "field_script_context.h" BOOL sub_0204CFFC(ScriptContext * param0); BOOL sub_0204D08C(ScriptContext * param0); diff --git a/include/unk_0204E240.h b/include/unk_0204E240.h index 9bf5bf3b2e..88563ea615 100644 --- a/include/unk_0204E240.h +++ b/include/unk_0204E240.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_UNK_0204E240_H #define POKEPLATINUM_UNK_0204E240_H -#include "unk_0203E724.h" +#include "field_script_context.h" BOOL sub_0204E240(ScriptContext * param0); BOOL sub_0204E28C(ScriptContext * param0); diff --git a/include/unk_0204E378.h b/include/unk_0204E378.h index a7515fbedf..edacd5b261 100644 --- a/include/unk_0204E378.h +++ b/include/unk_0204E378.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_UNK_0204E378_H #define POKEPLATINUM_UNK_0204E378_H -#include "unk_0203E724.h" +#include "field_script_context.h" BOOL sub_0204E378(ScriptContext * param0); diff --git a/include/unk_0204E3CC.h b/include/unk_0204E3CC.h index 32995d7b97..f12867123a 100644 --- a/include/unk_0204E3CC.h +++ b/include/unk_0204E3CC.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_UNK_0204E3CC_H #define POKEPLATINUM_UNK_0204E3CC_H -#include "unk_0203E724.h" +#include "field_script_context.h" BOOL sub_0204E3CC(ScriptContext * param0); BOOL sub_0204E3FC(ScriptContext * param0); diff --git a/include/unk_0204E75C.h b/include/unk_0204E75C.h index 551c9582b2..cfff562f39 100644 --- a/include/unk_0204E75C.h +++ b/include/unk_0204E75C.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_UNK_0204E75C_H #define POKEPLATINUM_UNK_0204E75C_H -#include "unk_0203E724.h" +#include "field_script_context.h" BOOL sub_0204E75C(ScriptContext * param0); BOOL sub_0204E7B4(ScriptContext * param0); diff --git a/include/unk_0204E974.h b/include/unk_0204E974.h index c33003b375..cf5942045b 100644 --- a/include/unk_0204E974.h +++ b/include/unk_0204E974.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_UNK_0204E974_H #define POKEPLATINUM_UNK_0204E974_H -#include "unk_0203E724.h" +#include "field_script_context.h" BOOL sub_0204E974(ScriptContext * param0); BOOL sub_0204E9C8(ScriptContext * param0); diff --git a/include/unk_0204EDA4.h b/include/unk_0204EDA4.h index aa7b095653..de8ba122f9 100644 --- a/include/unk_0204EDA4.h +++ b/include/unk_0204EDA4.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_UNK_0204EDA4_H #define POKEPLATINUM_UNK_0204EDA4_H -#include "unk_0203E724.h" +#include "field_script_context.h" BOOL sub_0204EDA4(ScriptContext * param0); BOOL sub_0204EDEC(ScriptContext * param0); diff --git a/include/unk_0204F02C.h b/include/unk_0204F02C.h index 9569164bcd..537b6db4ba 100644 --- a/include/unk_0204F02C.h +++ b/include/unk_0204F02C.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_UNK_0204F02C_H #define POKEPLATINUM_UNK_0204F02C_H -#include "unk_0203E724.h" +#include "field_script_context.h" BOOL sub_0204F02C(ScriptContext * param0); BOOL sub_0204F038(ScriptContext * param0); diff --git a/include/unk_0204F04C.h b/include/unk_0204F04C.h index 8283e8240f..73f8c6eca9 100644 --- a/include/unk_0204F04C.h +++ b/include/unk_0204F04C.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_UNK_0204F04C_H #define POKEPLATINUM_UNK_0204F04C_H -#include "unk_0203E724.h" +#include "field_script_context.h" BOOL sub_0204F04C(ScriptContext * param0); diff --git a/include/unk_0204F13C.h b/include/unk_0204F13C.h index 4a0fc47d9e..323212cb90 100644 --- a/include/unk_0204F13C.h +++ b/include/unk_0204F13C.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_UNK_0204F13C_H #define POKEPLATINUM_UNK_0204F13C_H -#include "unk_0203E724.h" +#include "field_script_context.h" BOOL sub_0204F13C(ScriptContext * param0); BOOL sub_0204F360(ScriptContext * param0); diff --git a/include/unk_0204FAB4.h b/include/unk_0204FAB4.h index e308b14ea5..c4fd2ac19d 100644 --- a/include/unk_0204FAB4.h +++ b/include/unk_0204FAB4.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_UNK_0204FAB4_H #define POKEPLATINUM_UNK_0204FAB4_H -#include "unk_0203E724.h" +#include "field_script_context.h" BOOL sub_0204FAB4(ScriptContext * param0); BOOL sub_0204FBB4(ScriptContext * param0); diff --git a/include/unk_0205003C.h b/include/unk_0205003C.h index 4478287d58..ed1ff2de5b 100644 --- a/include/unk_0205003C.h +++ b/include/unk_0205003C.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_UNK_0205003C_H #define POKEPLATINUM_UNK_0205003C_H -#include "unk_0203E724.h" +#include "field_script_context.h" BOOL sub_0205003C(ScriptContext * param0); BOOL sub_0205013C(ScriptContext * param0); diff --git a/platinum.us/main.lsf b/platinum.us/main.lsf index 31bb9e684d..d5add5d677 100644 --- a/platinum.us/main.lsf +++ b/platinum.us/main.lsf @@ -179,7 +179,7 @@ Static main Object main.nef.p/src_unk_0203CC84.c.o Object main.nef.p/src_unk_0203D178.c.o Object main.nef.p/src_unk_0203D1B8.c.o - Object main.nef.p/src_unk_0203E724.c.o + Object main.nef.p/src_field_script_context.c.o Object main.nef.p/src_unk_0203E880.c.o Object main.nef.p/src_unk_0203F6C4.c.o Object main.nef.p/src_unk_02046AD4.c.o diff --git a/src/unk_0203E724.c b/src/field_script_context.c similarity index 99% rename from src/unk_0203E724.c rename to src/field_script_context.c index a102d7ca38..241f8da422 100644 --- a/src/unk_0203E724.c +++ b/src/field_script_context.c @@ -1,7 +1,7 @@ #include #include -#include "unk_0203E724.h" +#include "field_script_context.h" enum { SCRIPT_STATE_STOPPED, diff --git a/src/meson.build b/src/meson.build index 3e6af16b27..eb51042eac 100644 --- a/src/meson.build +++ b/src/meson.build @@ -168,7 +168,7 @@ pokeplatinum_c = files( 'unk_0203CC84.c', 'unk_0203D178.c', 'unk_0203D1B8.c', - 'unk_0203E724.c', + 'field_script_context.c', 'unk_0203E880.c', 'unk_0203F6C4.c', 'unk_02046AD4.c', diff --git a/src/overlay005/ov5_021DD42C.c b/src/overlay005/ov5_021DD42C.c index 8826353f18..0d0c83072e 100644 --- a/src/overlay005/ov5_021DD42C.c +++ b/src/overlay005/ov5_021DD42C.c @@ -6,7 +6,7 @@ #include "struct_defs/sentence.h" #include "field/field_system.h" -#include "unk_0203E724.h" +#include "field_script_context.h" #include "struct_defs/struct_0205AA50.h" #include "overlay005/struct_ov5_021DD42C.h" diff --git a/src/overlay005/ov5_021F6454.c b/src/overlay005/ov5_021F6454.c index f8cf5e6b33..fe5ccbc69b 100644 --- a/src/overlay005/ov5_021F6454.c +++ b/src/overlay005/ov5_021F6454.c @@ -44,7 +44,7 @@ #include "unk_0202CD50.h" #include "unk_02030880.h" #include "unk_02038F8C.h" -#include "unk_0203E724.h" +#include "field_script_context.h" #include "unk_0203E880.h" #include "unk_020507CC.h" #include "unk_0205DFC4.h" diff --git a/src/overlay005/ov5_021F77A8.c b/src/overlay005/ov5_021F77A8.c index 93d725901b..a6343dbf12 100644 --- a/src/overlay005/ov5_021F77A8.c +++ b/src/overlay005/ov5_021F77A8.c @@ -29,7 +29,7 @@ #include "unk_02018340.h" #include "strbuf.h" #include "unk_0202631C.h" -#include "unk_0203E724.h" +#include "field_script_context.h" #include "unk_0203E880.h" #include "unk_02054884.h" #include "constants/species.h" diff --git a/src/unk_0203E880.c b/src/unk_0203E880.c index 44cde92924..904aa83417 100644 --- a/src/unk_0203E880.c +++ b/src/unk_0203E880.c @@ -29,7 +29,7 @@ #include "map_header.h" #include "unk_0203A378.h" #include "field_menu.h" -#include "unk_0203E724.h" +#include "field_script_context.h" #include "unk_0203E880.h" #include "unk_020507CC.h" #include "unk_020508D4.h" diff --git a/src/unk_0203F6C4.c b/src/unk_0203F6C4.c index ec7228b571..47348dd59b 100644 --- a/src/unk_0203F6C4.c +++ b/src/unk_0203F6C4.c @@ -107,7 +107,7 @@ #include "unk_0203A6DC.h" #include "unk_0203CC84.h" #include "unk_0203D1B8.h" -#include "unk_0203E724.h" +#include "field_script_context.h" #include "unk_0203E880.h" #include "unk_0203F6C4.h" #include "unk_02046AD4.h" diff --git a/src/unk_02046AD4.c b/src/unk_02046AD4.c index b332bc14e4..170099c517 100644 --- a/src/unk_02046AD4.c +++ b/src/unk_02046AD4.c @@ -3,7 +3,7 @@ #include "inlines.h" -#include "unk_0203E724.h" +#include "field_script_context.h" #include "unk_02025E08.h" #include "trainer_info.h" diff --git a/src/unk_02046C7C.c b/src/unk_02046C7C.c index faea26aafe..061cd8a434 100644 --- a/src/unk_02046C7C.c +++ b/src/unk_02046C7C.c @@ -19,7 +19,7 @@ #include "unk_0202CC64.h" #include "map_header.h" #include "unk_0203CC84.h" -#include "unk_0203E724.h" +#include "field_script_context.h" #include "unk_0203E880.h" #include "unk_020507CC.h" #include "unk_0206A8DC.h" diff --git a/src/unk_020474B8.c b/src/unk_020474B8.c index 09a70db087..182383edd6 100644 --- a/src/unk_020474B8.c +++ b/src/unk_020474B8.c @@ -19,7 +19,7 @@ #include "trainer_info.h" #include "savedata_misc.h" #include "unk_0203CC84.h" -#include "unk_0203E724.h" +#include "field_script_context.h" #include "unk_0203E880.h" #include "unk_020474B8.h" #include "unk_020507CC.h" diff --git a/src/unk_020480A8.c b/src/unk_020480A8.c index 4ae3e15ed9..963a2a2b73 100644 --- a/src/unk_020480A8.c +++ b/src/unk_020480A8.c @@ -8,7 +8,7 @@ #include "struct_decls/struct_020797DC_decl.h" #include "field/field_system.h" -#include "unk_0203E724.h" +#include "field_script_context.h" #include "savedata/save_table.h" #include "unk_020480A8.h" diff --git a/src/unk_020482D4.c b/src/unk_020482D4.c index a3b3841364..fe067e2be7 100644 --- a/src/unk_020482D4.c +++ b/src/unk_020482D4.c @@ -10,7 +10,7 @@ #include "unk_02005474.h" #include "unk_02006224.h" #include "unk_0202CC64.h" -#include "unk_0203E724.h" +#include "field_script_context.h" #include "unk_020553DC.h" static BOOL sub_02048378(ScriptContext * param0); diff --git a/src/unk_02048614.c b/src/unk_02048614.c index fb8a2503f8..aa6c093fb0 100644 --- a/src/unk_02048614.c +++ b/src/unk_02048614.c @@ -10,7 +10,7 @@ #include "field/field_system.h" #include "unk_020041CC.h" -#include "unk_0203E724.h" +#include "field_script_context.h" #include "unk_0203E880.h" #include "unk_020507CC.h" #include "unk_02050A74.h" diff --git a/src/unk_02048BD0.c b/src/unk_02048BD0.c index 092e3606cf..14648e079d 100644 --- a/src/unk_02048BD0.c +++ b/src/unk_02048BD0.c @@ -15,7 +15,7 @@ #include "trainer_info.h" #include "unk_0202B37C.h" #include "unk_0203D1B8.h" -#include "unk_0203E724.h" +#include "field_script_context.h" #include "unk_0203E880.h" #include "unk_02048BD0.h" #include "unk_0206CCB0.h" diff --git a/src/unk_02048DD8.c b/src/unk_02048DD8.c index 27e4e6a0a2..2af4d38d9d 100644 --- a/src/unk_02048DD8.c +++ b/src/unk_02048DD8.c @@ -27,7 +27,7 @@ #include "unk_020298BC.h" #include "unk_0202CD50.h" #include "unk_0202E2CC.h" -#include "unk_0203E724.h" +#include "field_script_context.h" #include "unk_0203E880.h" #include "unk_02048DD8.h" #include "unk_02054884.h" diff --git a/src/unk_020494DC.c b/src/unk_020494DC.c index edc58963f4..3f5431845b 100644 --- a/src/unk_020494DC.c +++ b/src/unk_020494DC.c @@ -16,7 +16,7 @@ #include "communication_system.h" #include "unk_020363E8.h" #include "unk_0203CC84.h" -#include "unk_0203E724.h" +#include "field_script_context.h" #include "unk_0203E880.h" #include "unk_020494DC.h" #include "unk_02049D08.h" diff --git a/src/unk_0204B64C.c b/src/unk_0204B64C.c index 0e4de1e6c1..a09e6e1015 100644 --- a/src/unk_0204B64C.c +++ b/src/unk_0204B64C.c @@ -7,7 +7,7 @@ #include "struct_decls/struct_02061AB4_decl.h" #include "unk_0202CD50.h" -#include "unk_0203E724.h" +#include "field_script_context.h" #include "unk_0203E880.h" #include "unk_0204B64C.h" #include "unk_02055C50.h" diff --git a/src/unk_0204B830.c b/src/unk_0204B830.c index 10d583e716..7f133adadc 100644 --- a/src/unk_0204B830.c +++ b/src/unk_0204B830.c @@ -29,7 +29,7 @@ #include "unk_0202D778.h" #include "unk_0202DAB4.h" #include "unk_0202F180.h" -#include "unk_0203E724.h" +#include "field_script_context.h" #include "unk_0203E880.h" #include "unk_0204B830.h" #include "unk_020507CC.h" diff --git a/src/unk_0204C500.c b/src/unk_0204C500.c index 23567226cf..57b00d1bf2 100644 --- a/src/unk_0204C500.c +++ b/src/unk_0204C500.c @@ -8,7 +8,7 @@ #include "struct_decls/struct_020507E4_decl.h" #include "struct_decls/struct_020797DC_decl.h" -#include "unk_0203E724.h" +#include "field_script_context.h" #include "heap.h" #include "savedata/save_table.h" diff --git a/src/unk_0204C6C8.c b/src/unk_0204C6C8.c index 7728b63319..1c0ba4c61d 100644 --- a/src/unk_0204C6C8.c +++ b/src/unk_0204C6C8.c @@ -12,7 +12,7 @@ #include "unk_02025E08.h" #include "coins.h" #include "unk_0203CC84.h" -#include "unk_0203E724.h" +#include "field_script_context.h" #include "unk_0203E880.h" #include "unk_0204C6C8.h" #include "overlay005/ov5_021DC018.h" diff --git a/src/unk_0204C8F0.c b/src/unk_0204C8F0.c index e73481eb6d..085042f93f 100644 --- a/src/unk_0204C8F0.c +++ b/src/unk_0204C8F0.c @@ -11,7 +11,7 @@ #include "unk_02025E08.h" #include "trainer_info.h" #include "unk_0203CC84.h" -#include "unk_0203E724.h" +#include "field_script_context.h" #include "unk_0203E880.h" #include "unk_0204C8F0.h" #include "overlay005/ov5_021DC018.h" diff --git a/src/unk_0204CA84.c b/src/unk_0204CA84.c index 839575150f..fbb6374e90 100644 --- a/src/unk_0204CA84.c +++ b/src/unk_0204CA84.c @@ -14,7 +14,7 @@ #include "unk_02025E08.h" #include "unk_020261E4.h" #include "unk_0203CC84.h" -#include "unk_0203E724.h" +#include "field_script_context.h" #include "unk_0203E880.h" #include "unk_0204CA84.h" #include "party.h" diff --git a/src/unk_0204CDDC.c b/src/unk_0204CDDC.c index 16a1aa0530..f9d709dee7 100644 --- a/src/unk_0204CDDC.c +++ b/src/unk_0204CDDC.c @@ -3,7 +3,7 @@ #include "inlines.h" -#include "unk_0203E724.h" +#include "field_script_context.h" #include "unk_0201D15C.h" #include "unk_0204CDDC.h" diff --git a/src/unk_0204CFFC.c b/src/unk_0204CFFC.c index 3b04a711bc..1e1411770c 100644 --- a/src/unk_0204CFFC.c +++ b/src/unk_0204CFFC.c @@ -9,7 +9,7 @@ #include "struct_decls/struct_party_decl.h" #include "field/field_system.h" -#include "unk_0203E724.h" +#include "field_script_context.h" #include "unk_02017038.h" #include "heap.h" diff --git a/src/unk_0204E240.c b/src/unk_0204E240.c index a93dc75427..0e71b3ca1e 100644 --- a/src/unk_0204E240.c +++ b/src/unk_0204E240.c @@ -4,7 +4,7 @@ #include "inlines.h" #include "field/field_system.h" -#include "unk_0203E724.h" +#include "field_script_context.h" #include "unk_0204E240.h" #include "unk_0207D3B8.h" diff --git a/src/unk_0204E378.c b/src/unk_0204E378.c index 59faf6c827..7e4539e0e0 100644 --- a/src/unk_0204E378.c +++ b/src/unk_0204E378.c @@ -3,7 +3,7 @@ #include "inlines.h" -#include "unk_0203E724.h" +#include "field_script_context.h" #include "unk_0204E378.h" diff --git a/src/unk_0204E3CC.c b/src/unk_0204E3CC.c index 3e189449c5..bb29a825e0 100644 --- a/src/unk_0204E3CC.c +++ b/src/unk_0204E3CC.c @@ -7,7 +7,7 @@ #include "struct_decls/struct_0203A790_decl.h" #include "struct_decls/struct_020507E4_decl.h" -#include "unk_0203E724.h" +#include "field_script_context.h" #include "struct_defs/struct_0205EC34.h" #include "unk_02025E08.h" diff --git a/src/unk_0204E75C.c b/src/unk_0204E75C.c index c6b47854a9..f08f3c592a 100644 --- a/src/unk_0204E75C.c +++ b/src/unk_0204E75C.c @@ -4,7 +4,7 @@ #include "inlines.h" #include "field/field_system.h" -#include "unk_0203E724.h" +#include "field_script_context.h" #include "unk_0204E75C.h" #include "unk_0205DFC4.h" diff --git a/src/unk_0204E974.c b/src/unk_0204E974.c index 7662b65abd..8c8bba998c 100644 --- a/src/unk_0204E974.c +++ b/src/unk_0204E974.c @@ -7,7 +7,7 @@ #include "savedata.h" #include "field/field_system.h" -#include "unk_0203E724.h" +#include "field_script_context.h" #include "unk_0202854C.h" #include "unk_0204E974.h" diff --git a/src/unk_0204EDA4.c b/src/unk_0204EDA4.c index 1806586b10..fe8ed01dec 100644 --- a/src/unk_0204EDA4.c +++ b/src/unk_0204EDA4.c @@ -11,7 +11,7 @@ #include "unk_02025E08.h" #include "unk_0203CC84.h" #include "unk_0203D1B8.h" -#include "unk_0203E724.h" +#include "field_script_context.h" #include "unk_0203E880.h" #include "unk_0203F6C4.h" #include "unk_0204EDA4.h" diff --git a/src/unk_0204F02C.c b/src/unk_0204F02C.c index 952cb2f390..605e6f47b4 100644 --- a/src/unk_0204F02C.c +++ b/src/unk_0204F02C.c @@ -1,7 +1,7 @@ #include #include -#include "unk_0203E724.h" +#include "field_script_context.h" #include "unk_0204F02C.h" diff --git a/src/unk_0204F04C.c b/src/unk_0204F04C.c index 684b65f2e8..0b08b6ae5e 100644 --- a/src/unk_0204F04C.c +++ b/src/unk_0204F04C.c @@ -4,7 +4,7 @@ #include "inlines.h" #include "struct_defs/struct_020300F4.h" -#include "unk_0203E724.h" +#include "field_script_context.h" #include "unk_0202FF4C.h" #include "unk_0203061C.h" diff --git a/src/unk_0204F13C.c b/src/unk_0204F13C.c index b017f48cd0..5e9e91e225 100644 --- a/src/unk_0204F13C.c +++ b/src/unk_0204F13C.c @@ -34,7 +34,7 @@ #include "unk_02030880.h" #include "communication_system.h" #include "unk_0203CC84.h" -#include "unk_0203E724.h" +#include "field_script_context.h" #include "unk_0203E880.h" #include "unk_0204F13C.h" #include "unk_0204FA34.h" diff --git a/src/unk_0204FAB4.c b/src/unk_0204FAB4.c index 3c920e2fbd..2f24e50f3a 100644 --- a/src/unk_0204FAB4.c +++ b/src/unk_0204FAB4.c @@ -25,7 +25,7 @@ #include "unk_0203061C.h" #include "communication_system.h" #include "unk_0203CC84.h" -#include "unk_0203E724.h" +#include "field_script_context.h" #include "unk_0203E880.h" #include "unk_02049D08.h" #include "unk_0204FAB4.h" diff --git a/src/unk_0205003C.c b/src/unk_0205003C.c index ed7b508cc6..cb853ac1c2 100644 --- a/src/unk_0205003C.c +++ b/src/unk_0205003C.c @@ -25,7 +25,7 @@ #include "unk_0203061C.h" #include "communication_system.h" #include "unk_0203CC84.h" -#include "unk_0203E724.h" +#include "field_script_context.h" #include "unk_0203E880.h" #include "unk_02049D08.h" #include "unk_0205003C.h"