From 4bd0a23bdb49def771a802e3fc7db0ab576e7662 Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Sat, 22 Nov 2025 09:37:47 -0500 Subject: [PATCH] Cutscene stuff + script directions --- include/constants/cutscenes.h | 123 + include/constants/direction.h | 16 + include/constants/dungeon.h | 67 +- include/constants/fixed_rooms.h | 10 +- include/constants/monster.h | 2 + include/constants/rescue_dungeon_id.h | 9 + include/constants/script_dungeon_id.h | 4 +- include/constants/tutorial_id.h | 28 + include/data_script.h | 31 +- include/direction_util.h | 6 +- include/dungeon_cutscene.h | 12 +- include/dungeon_cutscenes.h | 52 +- include/dungeon_items.h | 2 +- include/dungeon_message.h | 6 +- include/dungeon_strings.h | 37 +- include/dungeon_util.h | 3 +- include/dungeon_vram.h | 2 +- include/exclusive_pokemon.h | 54 +- include/ground_main.h | 4 +- include/other_random.h | 2 +- include/rescue_scenario.h | 10 +- include/save.h | 6 +- include/structs/str_dungeon.h | 2 +- include/structs/str_pokemon.h | 2 +- src/code_8023144.c | 8 +- src/code_8040094_1.c | 4 +- src/code_80A26CC.c | 4 +- src/data/ground/ground_data_a01p01_station.h | 8 +- src/data/ground/ground_data_a02p02_station.h | 4 +- src/data/ground/ground_data_a02p03_station.h | 20 +- src/data/ground/ground_data_a02p04_station.h | 16 +- src/data/ground/ground_data_a03p01_station.h | 30 +- src/data/ground/ground_data_a03p03_station.h | 18 +- src/data/ground/ground_data_a04p01_station.h | 278 +-- src/data/ground/ground_data_a04p04_station.h | 18 +- src/data/ground/ground_data_b01p01a_station.h | 1326 +++++----- src/data/ground/ground_data_b01p02a_station.h | 92 +- src/data/ground/ground_data_d01p01_station.h | 76 +- src/data/ground/ground_data_d01p02_station.h | 2 +- src/data/ground/ground_data_d02p01_station.h | 64 +- src/data/ground/ground_data_d02p02_station.h | 4 +- src/data/ground/ground_data_d03p01_station.h | 28 +- src/data/ground/ground_data_d03p02_station.h | 16 +- src/data/ground/ground_data_d04p01_station.h | 4 +- src/data/ground/ground_data_d04p02_station.h | 28 +- src/data/ground/ground_data_d05p01_station.h | 44 +- src/data/ground/ground_data_d05p02_station.h | 40 +- src/data/ground/ground_data_d06p01_station.h | 10 +- src/data/ground/ground_data_d06p03_station.h | 66 +- src/data/ground/ground_data_d07p01_station.h | 8 +- src/data/ground/ground_data_d07p02_station.h | 92 +- src/data/ground/ground_data_d08p01_station.h | 26 +- src/data/ground/ground_data_d08p02_station.h | 12 +- src/data/ground/ground_data_d09p01_station.h | 36 +- src/data/ground/ground_data_d09p02_station.h | 2 +- src/data/ground/ground_data_d09p03_station.h | 4 +- src/data/ground/ground_data_d10p01_station.h | 20 +- src/data/ground/ground_data_d10p02_station.h | 8 +- src/data/ground/ground_data_d10p03_station.h | 14 +- src/data/ground/ground_data_d11p01_station.h | 22 +- src/data/ground/ground_data_d11p02_station.h | 2 +- src/data/ground/ground_data_d11p03_station.h | 156 +- src/data/ground/ground_data_d12p01_station.h | 8 +- src/data/ground/ground_data_d12p04_station.h | 36 +- src/data/ground/ground_data_d13p01_station.h | 28 +- src/data/ground/ground_data_d13p03_station.h | 8 +- src/data/ground/ground_data_d20p01_station.h | 48 +- src/data/ground/ground_data_d22p01_station.h | 4 +- src/data/ground/ground_data_d23p01_station.h | 4 +- src/data/ground/ground_data_d24p01_station.h | 34 +- src/data/ground/ground_data_d24p02_station.h | 2 +- src/data/ground/ground_data_d25p01_station.h | 4 +- src/data/ground/ground_data_h29p01_station.h | 14 +- src/data/ground/ground_data_t01p01_station.h | 2204 ++++++++--------- src/data/ground/ground_data_t01p02a_station.h | 140 +- src/data/ground/ground_data_t01p03_station.h | 230 +- src/data/ground/ground_data_t01p04_station.h | 4 +- src/data/ground/ground_data_t01p05_station.h | 12 +- src/data/ground/ground_event_data.h | 278 +-- src/direction_util.c | 102 +- src/dungeon_8041AD0.c | 16 +- src/dungeon_action_execution.c | 4 +- src/dungeon_action_handler.c | 12 +- src/dungeon_cutscene.c | 272 +- src/dungeon_cutscene_articuno.c | 106 +- src/dungeon_cutscene_celebi.c | 142 +- src/dungeon_cutscene_deoxys.c | 18 +- src/dungeon_cutscene_empty_summit.c | 4 +- src/dungeon_cutscene_entei.c | 38 +- src/dungeon_cutscene_groudon.c | 134 +- src/dungeon_cutscene_hooh.c | 50 +- src/dungeon_cutscene_jirachi.c | 136 +- src/dungeon_cutscene_kyogre.c | 40 +- src/dungeon_cutscene_latios.c | 30 +- src/dungeon_cutscene_lugia.c | 30 +- src/dungeon_cutscene_magma_cavern.c | 92 +- src/dungeon_cutscene_mankey.c | 96 +- src/dungeon_cutscene_meanies.c | 75 +- src/dungeon_cutscene_medicham.c | 38 +- src/dungeon_cutscene_mewtwo.c | 40 +- src/dungeon_cutscene_moltres.c | 142 +- src/dungeon_cutscene_raikou.c | 42 +- src/dungeon_cutscene_rayquaza.c | 70 +- src/dungeon_cutscene_regis.c | 148 +- src/dungeon_cutscene_skarmory.c | 80 +- src/dungeon_cutscene_smeargle.c | 38 +- src/dungeon_cutscene_suicune.c | 50 +- src/dungeon_cutscene_zapdos.c | 96 +- src/dungeon_damage.c | 14 +- src/dungeon_entity_movement.c | 6 +- src/dungeon_generation_fixed.c | 2 +- src/dungeon_item_action.c | 6 +- src/dungeon_items.c | 34 +- src/dungeon_jobs.c | 16 +- src/dungeon_kecleon_shop.c | 4 +- src/dungeon_leveling.c | 2 +- src/dungeon_main.c | 10 +- src/dungeon_menu_items.c | 4 +- src/dungeon_menu_moves.c | 12 +- src/dungeon_menu_others.c | 8 +- src/dungeon_menu_team.c | 8 +- src/dungeon_message.c | 26 +- src/dungeon_misc.c | 10 +- src/dungeon_mon_recruit.c | 10 +- src/dungeon_move.c | 8 +- src/dungeon_move_util.c | 8 +- src/dungeon_recruit_release_menu.c | 2 +- src/dungeon_strings.c | 60 +- src/dungeon_turn_effects.c | 2 +- src/dungeon_util.c | 4 +- src/dungeon_vram.c | 2 +- src/event_flag.c | 56 +- src/exclusive_pokemon.c | 220 +- src/ground_lives.c | 10 +- src/ground_main.c | 10 +- src/ground_script.c | 75 +- src/hurl_orb.c | 2 +- src/main_loops.c | 4 +- src/one_room_orb.c | 4 +- src/other_menus2.c | 2 +- src/other_random.c | 4 +- src/pokemon.c | 4 +- src/pokemon_mail.c | 2 +- src/post_office_guide2.c | 6 +- src/rescue_scenario.c | 205 +- src/run_dungeon.c | 18 +- src/save.c | 36 +- src/trap.c | 6 +- src/wigglytuff_shop2.c | 2 +- src/wonder_mail_802D098.c | 8 +- 150 files changed, 4692 insertions(+), 4539 deletions(-) create mode 100644 include/constants/cutscenes.h create mode 100644 include/constants/tutorial_id.h diff --git a/include/constants/cutscenes.h b/include/constants/cutscenes.h new file mode 100644 index 000000000..b2c36aebb --- /dev/null +++ b/include/constants/cutscenes.h @@ -0,0 +1,123 @@ +#ifndef GUARD_CONSTANTS_CUTSCENES_H +#define GUARD_CONSTANTS_CUTSCENES_H + +enum CutsceneKind +{ + CUTSCENE_NONE, + CUTSCENE_MT_STEEL_ATTEMPT1, + CUTSCENE_MT_STEEL_ATTEMPT2, + CUTSCENE_MT_STEEL_POSTSTORY, + CUTSCENE_SINISTER_WOODS_ATTEMPT1, + CUTSCENE_SINISTER_WOODS_ATTEMPT2, + CUTSCENE_SINISTER_WOODS_POSTSTORY, + CUTSCENE_MT_THUNDER_PEAK_ATTEMPT1, + CUTSCENE_MT_THUNDER_PEAK_ATTEMPT2, + CUTSCENE_MT_THUNDER_PEAK_POSTSTORY, + CUTSCENE_MT_BLAZE_PEAK_ATTEMPT1, + CUTSCENE_MT_BLAZE_PEAK_ATTEMPT2, + CUTSCENE_MT_BLAZE_PEAK_POSTSTORY, + CUTSCENE_FROSTY_GROTTO_ATTEMPT1, + CUTSCENE_FROSTY_GROTTO_ATTEMPT2, + CUTSCENE_FROSTY_GROTTO_POSTSTORY, + CUTSCENE_MT_FREEZE_PEAK, + CUTSCENE_MT_FREEZE_PEAK_POSTSTORY, + CUTSCENE_MAGMA_CAVERN_PIT_ATTEMPT1, + CUTSCENE_MAGMA_CAVERN_PIT_ATTEMPT2, + CUTSCENE_MAGMA_CAVERN_PIT_POSTSTORY, + CUTSCENE_MAGMA_CAVERN_MID, + CUTSCENE_MAGMA_CAVERN_MID_POSTSTORY, + CUTSCENE_SKY_TOWER_SUMMIT_ATTEMPT1, + CUTSCENE_SKY_TOWER_SUMMIT_ATTEMPT2, + CUTSCENE_SKY_TOWER_SUMMIT_POSTSTORY, + CUTSCENE_UPROAR_FOREST_ATTEMPT1, + CUTSCENE_UPROAR_FOREST_ATTEMPT2, + CUTSCENE_UPROAR_FOREST_POSTSTORY, + CUTSCENE_WESTERN_CAVE_ATTEMPT1, + CUTSCENE_WESTERN_CAVE_ATTEMPT2, + CUTSCENE_WESTERN_CAVE_POSTSTORY, + CUTSCENE_FIERY_FIELD_ATTEMPT1, + CUTSCENE_FIERY_FIELD_ATTEMPT2, + CUTSCENE_FIERY_FIELD_POSTSTORY, + CUTSCENE_LIGHTNING_FIELD_ATTEMPT1, + CUTSCENE_LIGHTNING_FIELD_ATTEMPT2, + CUTSCENE_LIGHTNING_FIELD_POSTSTORY, + CUTSCENE_NORTHWIND_FIELD_ATTEMPT1, + CUTSCENE_NORTHWIND_FIELD_ATTEMPT2, + CUTSCENE_NORTHWIND_FIELD_POSTSTORY, + CUTSCENE_MT_FARAWAY, + CUTSCENE_MT_FARAWAY_POSTSTORY, + CUTSCENE_NORTHERN_RANGE_ATTEMPT1, + CUTSCENE_NORTHERN_RANGE_ATTEMPT2, + CUTSCENE_NORTHERN_RANGE_POSTSTORY, + CUTSCENE_REGIROCK, + CUTSCENE_REGICE, + CUTSCENE_REGISTEEL, + CUTSCENE_JIRACHI, + CUTSCENE_JIRACHI_POSTSTORY, + CUTSCENE_SILVER_TRENCH, + CUTSCENE_STORMY_SEA, + CUTSCENE_METEOR_CAVE, + CUTSCENE_PURITY_FOREST, + CUTSCENE_MAZE_BOSS, + CUTSCENE_MEDICHAM, + CUTSCENE_MEDICHAM_POSTSTORY, + CUTSCENE_HOWLING_FOREST, + CUTSCENE_HOWLING_FOREST_POSTSTORY, + + NUM_CUTSCENES +}; + +enum CutsceneFlagID +{ + CUTSCENE_FLAG_MT_STEEL_REACHED, + CUTSCENE_FLAG_MT_STEEL_COMPLETE, + CUTSCENE_FLAG_SINISTER_WOODS_REACHED, + CUTSCENE_FLAG_SINISTER_WOODS_COMPLETE, + CUTSCENE_FLAG_MT_THUNDER_PEAK_REACHED, + CUTSCENE_FLAG_MT_THUNDER_PEAK_COMPLETE, + CUTSCENE_FLAG_MT_BLAZE_PEAK_REACHED, + CUTSCENE_FLAG_MT_BLAZE_PEAK_COMPLETE, + CUTSCENE_FLAG_FROSTY_GROTTO_REACHED, + CUTSCENE_FLAG_FROSTY_GROTTO_COMPLETE, + CUTSCENE_FLAG_MT_FREEZE_PEAK_COMPLETE, + CUTSCENE_FLAG_MAGMA_CAVERN_PIT_REACHED, + CUTSCENE_FLAG_MAGMA_CAVERN_PIT_COMPLETE, + CUTSCENE_FLAG_MAGMA_CAVERN_MID_REACHED, + CUTSCENE_FLAG_SKY_TOWER_SUMMIT_REACHED, + CUTSCENE_FLAG_SKY_TOWER_SUMMIT_COMPLETE, + CUTSCENE_FLAG_UPROAR_FOREST_REACHED, + CUTSCENE_FLAG_UPROAR_FOREST_COMPLETE, + CUTSCENE_FLAG_WESTERN_CAVE_REACHED, + CUTSCENE_FLAG_WESTERN_CAVE_COMPLETE, + CUTSCENE_FLAG_FIERY_FIELD_REACHED, + CUTSCENE_FLAG_FIERY_FIELD_COMPLETE, + CUTSCENE_FLAG_LIGHTNING_FIELD_REACHED, + CUTSCENE_FLAG_LIGHTNING_FIELD_COMPLETE, + CUTSCENE_FLAG_NORTHWIND_FIELD_REACHED, + CUTSCENE_FLAG_NORTHWIND_FIELD_COMPLETE, + CUTSCENE_FLAG_MT_FARAWAY_COMPLETE, + CUTSCENE_FLAG_NORTHERN_RANGE_REACHED, + CUTSCENE_FLAG_NORTHERN_RANGE_COMPLETE, + // Written to when entering a Regi room: + // If the Regi was recruited before, this is set to TRUE. + // If the Regi "Part" or Music Box is in the inventory or held, this is set to TRUE. + // Otherwise, this is set to FALSE. + // If this is TRUE and the Regi is present, the Regi can be recruited. + CUTSCENE_FLAG_REGI_ITEM_OBTAINED, + CUTSCENE_FLAG_JIRACHI_COMPLETE, + CUTSCENE_FLAG_FROSTY_FOREST_INTRUDED, + CUTSCENE_FLAG_MEDICHAM_COMPLETE, + CUTSCENE_FLAG_HOWLING_FOREST_COMPLETE, + // Written to when entering a Regi room. + // If the Regi was recruited before, this is set to TRUE. + // Otherwise, this is set to FALSE. + CUTSCENE_FLAG_REGI_RECRUITED, + + NUM_CUTSCENE_FLAGS = 64, + + CUTSCENE_FLAG_INVALID = 0xFF, +}; + +#define CUTSCENE_FLAGS_U32STORAGE 3 // No idea why this is larger than necessary + +#endif // GUARD_CONSTANTS_CUTSCENES_H diff --git a/include/constants/direction.h b/include/constants/direction.h index 2e3d5abb1..bfa80d9c3 100644 --- a/include/constants/direction.h +++ b/include/constants/direction.h @@ -17,4 +17,20 @@ enum Direction NUM_DIRECTIONS }; +enum DirectionTransformation +{ + DIR_TRANS_NONE, + DIR_TRANS_SPINRIGHT1, // Spin right 1 (example: South -> SouthWest) + DIR_TRANS_SPINLEFT1, // Spin left 1 (example: South -> SouthEast) + DIR_TRANS_SPINRIGHT2, // Spin right 2 (example: South -> West) + DIR_TRANS_SPINLEFT2, // Spin left 2 (example: South -> East) + DIR_TRANS_FLIP, // Flip (example: South -> North) + DIR_TRANS_RAND_OFFSET_SOFT_CARDINAL, // Like DIR_TRANS_RAND_OFFSET_SOFT but only results in cardinal directions + DIR_TRANS_RAND_OFFSET_SOFT, // SpinLeft1 or Nothing or SpinRight1 + DIR_TRANS_RAND_CARDINAL, // Random non-diagonal + DIR_TRANS_RAND, // Fully random + DIR_TRANS_10, + DIR_TRANS_11, +}; + #endif diff --git a/include/constants/dungeon.h b/include/constants/dungeon.h index 9736dd0cf..ca57b7cc7 100644 --- a/include/constants/dungeon.h +++ b/include/constants/dungeon.h @@ -1,6 +1,8 @@ #ifndef GUARD_CONSTANTS_DUNGEON_H #define GUARD_CONSTANTS_DUNGEON_H +#include "constants/cutscenes.h" + enum DungeonID { DUNGEON_TINY_WOODS = 0, @@ -105,71 +107,6 @@ enum DungeonID DUNGEON_INVALID, // 99 }; -enum CutsceneKind -{ - CUTSCENE_NONE, - CUTSCENE_MT_STEEL_ATTEMPT1, - CUTSCENE_MT_STEEL_ATTEMPT2, - CUTSCENE_MT_STEEL_POSTSTORY, - CUTSCENE_SINISTER_WOODS_ATTEMPT1, - CUTSCENE_SINISTER_WOODS_ATTEMPT2, - CUTSCENE_SINISTER_WOODS_POSTSTORY, - CUTSCENE_MT_THUNDER_PEAK_ATTEMPT1, - CUTSCENE_MT_THUNDER_PEAK_ATTEMPT2, - CUTSCENE_MT_THUNDER_PEAK_POSTSTORY, - CUTSCENE_MT_BLAZE_PEAK_ATTEMPT1, - CUTSCENE_MT_BLAZE_PEAK_ATTEMPT2, - CUTSCENE_MT_BLAZE_PEAK_POSTSTORY, - CUTSCENE_FROSTY_GROTTO_ATTEMPT1, - CUTSCENE_FROSTY_GROTTO_ATTEMPT2, - CUTSCENE_FROSTY_GROTTO_POSTSTORY, - CUTSCENE_MT_FREEZE_PEAK, - CUTSCENE_MT_FREEZE_PEAK_POSTSTORY, - CUTSCENE_MAGMA_CAVERN_PIT_ATTEMPT1, - CUTSCENE_MAGMA_CAVERN_PIT_ATTEMPT2, - CUTSCENE_MAGMA_CAVERN_PIT_POSTSTORY, - CUTSCENE_MAGMA_CAVERN_MID, - CUTSCENE_MAGMA_CAVERN_MID_POSTSTORY, - CUTSCENE_SKY_TOWER_SUMMIT_ATTEMPT1, - CUTSCENE_SKY_TOWER_SUMMIT_ATTEMPT2, - CUTSCENE_SKY_TOWER_SUMMIT_POSTSTORY, - CUTSCENE_UPROAR_FOREST_ATTEMPT1, - CUTSCENE_UPROAR_FOREST_ATTEMPT2, - CUTSCENE_UPROAR_FOREST_POSTSTORY, - CUTSCENE_WESTERN_CAVE_ATTEMPT1, - CUTSCENE_WESTERN_CAVE_ATTEMPT2, - CUTSCENE_WESTERN_CAVE_POSTSTORY, - CUTSCENE_FIERY_FIELD_ATTEMPT1, - CUTSCENE_FIERY_FIELD_ATTEMPT2, - CUTSCENE_FIERY_FIELD_POSTSTORY, - CUTSCENE_LIGHTNING_FIELD_ATTEMPT1, - CUTSCENE_LIGHTNING_FIELD_ATTEMPT2, - CUTSCENE_LIGHTNING_FIELD_POSTSTORY, - CUTSCENE_NORTHWIND_FIELD_ATTEMPT1, - CUTSCENE_NORTHWIND_FIELD_ATTEMPT2, - CUTSCENE_NORTHWIND_FIELD_POSTSTORY, - CUTSCENE_MT_FARAWAY, - CUTSCENE_MT_FARAWAY_POSTSTORY, - CUTSCENE_NORTHERN_RANGE_ATTEMPT1, - CUTSCENE_NORTHERN_RANGE_ATTEMPT2, - CUTSCENE_NORTHERN_RANGE_POSTSTORY, - CUTSCENE_REGIROCK, - CUTSCENE_REGICE, - CUTSCENE_REGISTEEL, - CUTSCENE_JIRACHI, - CUTSCENE_JIRACHI_POSTSTORY, - CUTSCENE_SILVER_TRENCH, - CUTSCENE_STORMY_SEA, - CUTSCENE_METEOR_CAVE, - CUTSCENE_PURITY_FOREST, - CUTSCENE_MAZE_BOSS, - CUTSCENE_MEDICHAM, - CUTSCENE_MEDICHAM_POSTSTORY, - CUTSCENE_HOWLING_FOREST, - CUTSCENE_HOWLING_FOREST_POSTSTORY, - CUTSCENE_MAX -}; - #define DUNGEON_FIRST_MAZE DUNGEON_NORMAL_MAZE_2 #define DUNGEON_LAST_MAZE DUNGEON_RESCUE_TEAM_MAZE #define DUNGEON_LAST_BASIC_MAZE DUNGEON_STEEL_MAZE diff --git a/include/constants/fixed_rooms.h b/include/constants/fixed_rooms.h index 825dbed91..525f4b4b1 100644 --- a/include/constants/fixed_rooms.h +++ b/include/constants/fixed_rooms.h @@ -3,7 +3,8 @@ enum FixedRoomID { - // floorwide fixed rooms + // Floorwide fixed rooms + FIXED_ROOM_NONE, FIXED_ROOM_MT_STEEL_SKARMORY, FIXED_ROOM_SINISTER_WOODS_TEAM_MEANIES, @@ -31,7 +32,9 @@ enum FixedRoomID FIXED_ROOM_HOWLING_FOREST_SMEARGLE, FIXED_ROOM_PURITY_FOREST_CELEBI, FIXED_ROOM_WISH_CAVE_MEDICHAM, + // Mazes + FIXED_ROOM_NORMAL_MAZE_BOSS, FIXED_ROOM_FIRE_MAZE_BOSS, FIXED_ROOM_WATER_MAZE_BOSS, @@ -55,7 +58,9 @@ enum FixedRoomID FIXED_ROOM_TEAM_RUMBLEROCK_BOSS, FIXED_ROOM_RESCUE_TEAM_2_BOSS, FIXED_ROOM_RESCUE_TEAM_MAZE_BOSS, + // Non-floorwide fixed rooms + FIXED_ROOM_WYVERN_HILL_HM_FLY, FIXED_ROOM_SOLAR_CAVE_HM_DIVE, FIXED_ROOM_SOLAR_CAVE_HM_WATERFALL, @@ -77,8 +82,7 @@ enum FixedRoomID #define FIRST_DOJO_MAZE_BOSS_ROOM FIXED_ROOM_NORMAL_MAZE_BOSS #define LAST_DOJO_MAZE_BOSS_ROOM FIXED_ROOM_RESCUE_TEAM_MAZE_BOSS -#define NUM_MAZE_BOSS_ROOMS LAST_DOJO_MAZE_BOSS_ROOM - FIRST_DOJO_MAZE_BOSS_ROOM #define LAST_FLOORWIDE_FIXED_ROOM FIXED_ROOM_RESCUE_TEAM_MAZE_BOSS #define FIRST_NON_FLOORWIDE_FIXED_ROOM LAST_FLOORWIDE_FIXED_ROOM + 1 -#endif \ No newline at end of file +#endif // GUARD_CONSTANTS_FIXED_ROOMS_H diff --git a/include/constants/monster.h b/include/constants/monster.h index be843c196..4b37b07b1 100644 --- a/include/constants/monster.h +++ b/include/constants/monster.h @@ -430,6 +430,8 @@ #define NUM_MONSTERS MONSTER_JIRACHI #define MONSTER_MAX (MONSTER_RAYQUAZA_CUTSCENE + 1) +#define MONSTER_FLAGS_U32STORAGE 14 + #define IS_CASTFORM_FORM_MONSTER(id)((id == MONSTER_CASTFORM_SNOWY || id == MONSTER_CASTFORM_SUNNY || id == MONSTER_CASTFORM_RAINY)) #define IS_DEOXYS_FORM_MONSTER(id)((id == MONSTER_DEOXYS_ATTACK || id == MONSTER_DEOXYS_DEFENSE || id == MONSTER_DEOXYS_SPEED)) diff --git a/include/constants/rescue_dungeon_id.h b/include/constants/rescue_dungeon_id.h index b167089d3..fb603de26 100644 --- a/include/constants/rescue_dungeon_id.h +++ b/include/constants/rescue_dungeon_id.h @@ -3,6 +3,8 @@ enum RescueDungeonId { + RESCUE_DUNGEON_INVALID = -1, + RESCUE_DUNGEON_TINY_WOODS, RESCUE_DUNGEON_THUNDERWAVE_CAVE, RESCUE_DUNGEON_MT_STEEL, @@ -34,6 +36,9 @@ enum RescueDungeonId RESCUE_DUNGEON_WISH_CAVE, RESCUE_DUNGEON_MT_FREEZE_2, RESCUE_DUNGEON_MURKY_CAVE, + + // Non-story rescues: + RESCUE_DUNGEON_DESERT_REGION, RESCUE_DUNGEON_SOUTHERN_CAVERN, RESCUE_DUNGEON_WYVERN_HILL, @@ -49,7 +54,11 @@ enum RescueDungeonId RESCUE_DUNGEON_REMAINS_ISLAND, RESCUE_DUNGEON_MARVELOUS_SEA, RESCUE_DUNGEON_FANTASY_STRAIT, + RESCUE_DUNGEON_COUNT, }; +#define MAX_STORY_MISSION RESCUE_DUNGEON_MURKY_CAVE +#define NUM_STORY_MISSIONS (MAX_STORY_MISSION + 1) + #endif // GUARD_CONSTANTS_RESCUE_DUNGEON_ID_H diff --git a/include/constants/script_dungeon_id.h b/include/constants/script_dungeon_id.h index 1651eeb31..5b4825543 100644 --- a/include/constants/script_dungeon_id.h +++ b/include/constants/script_dungeon_id.h @@ -3,6 +3,8 @@ enum ScriptDungeonId { + SCRIPT_DUNGEON_INVALID = -1, + SCRIPT_DUNGEON_TINY_WOODS, SCRIPT_DUNGEON_THUNDERWAVE_CAVE, SCRIPT_DUNGEON_MT_STEEL, @@ -24,7 +26,7 @@ enum ScriptDungeonId SCRIPT_DUNGEON_MAGMA_CAVERN_PIT, SCRIPT_DUNGEON_SKY_TOWER, SCRIPT_DUNGEON_SKY_TOWER_SUMMIT, - SCRIPT_DUNGEON_21, + SCRIPT_DUNGEON_DUMMY, SCRIPT_DUNGEON_UPROAR_FOREST, SCRIPT_DUNGEON_HOWLING_FOREST, SCRIPT_DUNGEON_STORMY_SEA, diff --git a/include/constants/tutorial_id.h b/include/constants/tutorial_id.h new file mode 100644 index 000000000..960881216 --- /dev/null +++ b/include/constants/tutorial_id.h @@ -0,0 +1,28 @@ +#ifndef GUARD_CONSTANTS_TUTORIAL_ID_H +#define GUARD_CONSTANTS_TUTORIAL_ID_H + +enum TutorialFlagID +{ + TUTORIAL_FLAG_STAIRS_AND_SURVIVE, + TUTORIAL_FLAG_OPEN_MENU, + TUTORIAL_FLAG_REGAIN_HP, + TUTORIAL_FLAG_MANAGE_BELLY1, + TUTORIAL_FLAG_ORAN_BERRY, + TUTORIAL_FLAG_CHERI_BERRY, + TUTORIAL_FLAG_BLAST_SEED, + TUTORIAL_FLAG_GRAVELEROCK, + TUTORIAL_FLAG_UNK8, + TUTORIAL_FLAG_PECHA_BERRY, + TUTORIAL_FLAG_SLEEP_SEED, + TUTORIAL_FLAG_MONEY, + TUTORIAL_FLAG_MOVES, + TUTORIAL_FLAG_TEAM_MANAGEMENT, + TUTORIAL_FLAG_MOVEMENT, + TUTORIAL_FLAG_MANAGE_BELLY2, + + NUM_TUTORIAL_FLAGS = 31 +}; + +#define TUTORIAL_FLAGS_U32STORAGE 1 + +#endif // GUARD_CONSTANTS_TUTORIAL_ID_H diff --git a/include/data_script.h b/include/data_script.h index c39e495c8..5d75c7f08 100644 --- a/include/data_script.h +++ b/include/data_script.h @@ -1,7 +1,9 @@ +#include "constants/cutscenes.h" #include "constants/direction.h" #include "constants/event_flag.h" #include "constants/item.h" #include "constants/ground_map.h" +#include "constants/rescue_dungeon_id.h" #include "constants/script_dungeon_id.h" #include "portrait_placement.h" #include "structs/str_ground_script.h" @@ -82,12 +84,22 @@ #define SELECT_ANIMATION(id) { 0x54, 0, id, 0, 0, NULL } // 58..95: position and movement-related // For WARP/WALK, every map has a list of predefined locations. -#define WARP_WAYPOINT(u, w) { 0x5B, u, 0, w, 0, NULL } -#define WALK_RELATIVE(spd, h, v) { 0x6A, 0, spd, h, v, NULL } -#define WALK_GRID(spd, w) { 0x6B, 0, spd, w, 0, NULL } -#define WALK_DIRECT(spd, w) { 0x7A, 0, spd, w, 0, NULL } -#define CAMERA_PAN(u1, u2) { 0x86, 0, u1, u2, 0, NULL } -#define ROTATE(spd, d, o) { 0x91, spd, d, o, 0, NULL } // d=cw/ccw/shortest, o=final orientation +#define WARP_WAYPOINT(u,w) { 0x5B, u, 0, w, 0, NULL } +#define WALK_RELATIVE(spd,h,v) { 0x6A, 0, spd, h, v, NULL } +#define WALK_GRID(spd,w) { 0x6B, 0, spd, w, 0, NULL } +#define WALK_DIRECT(spd,w) { 0x7A, 0, spd, w, 0, NULL } +#define CAMERA_PAN(u1,u2) { 0x86, 0, u1, u2, 0, NULL } +#define CMD_UNK_8A(a,b,t) { 0x8A, a, b, t, 0, NULL } +#define CMD_UNK_8C(a,t,c) { 0x8C, a, t, c, 0, NULL } +#define CMD_UNK_8D(a,t) { 0x8D, a, t, 0, 0, NULL } +#define CMD_UNK_8E(a,t,c) { 0x8E, a, t, c, 0, NULL } +#define CMD_UNK_8F(a,t,c) { 0x8F, a, t, c, 0, NULL } +#define CMD_UNK_90(a,t,c) { 0x90, a, t, c, 0, NULL } +#define ROTATE_TO(spd,t,o) { 0x91, spd, t, o, 0, NULL } // o=final orientation +#define CMD_UNK_92(a,b,t) { 0x92, a, b, t, 0, NULL } +#define CMD_UNK_93(a,t,c) { 0x93, a, t, c, 0, NULL } +#define CMD_UNK_94(a,t,c) { 0x94, a, t, c, 0, NULL } +#define CMD_UNK_95(a,t,c) { 0x95, a, t, c, 0, NULL } // 96: unused? // 97: ??? (maybe more camera?) #define CAMERA_INIT_PAN { 0x98, 0, 0, 0, 0, NULL } @@ -104,7 +116,10 @@ #define SET_DUNGEON_RES(r,e) { 0xAB, 0, r, e, 0, NULL } #define SET_PLAYER_KIND(k) { 0xAC, 0, k, 0, 0, NULL } #define UNLOCK_FRIEND_AREA(a) { 0xAD, TRUE, a, 0, 0, NULL } -// ae..b2: opaque functions +#define CMD_UNK_AE(r) { 0xAE, TRUE, r, 0, 0, NULL } +#define CMD_UNK_AF(r, b) { 0xAF, b, r, 0, 0, NULL } +#define SET_RESCUE_CONQUERED(s) { 0xB0, TRUE, s, 0, 0, NULL } +// b1..b2: opaque functions #define JUMPIF_EQUAL(v,i,l) { 0xB3, l, v, i, 0, NULL } #define JUMPIF(o,v,i,l) { 0xB4, o, l, v, i, NULL } #define JUMPIF_2(o,a,b,l) { 0xB5, o, l, a, b, NULL } @@ -114,8 +129,8 @@ #define JUMPIF_SCENE_EQ(v,a,b,l) { 0xB9, l, v, a, b, NULL } #define JUMPIF_SCENE_GT(v,a,b,l) { 0xBA, l, v, a, b, NULL } #define JUMPIF_SCENARIOCHECK(i,l) { 0xBB, l, i, 0, 0, NULL } +#define JUMPIF_CUTSCENE_FLAG(f,l) { 0xBC, l, f, 0, 0, NULL } // functions need reversing -#define JUMPIF_UNK_BC(i,l) { 0xBC, l, i, 0, 0, NULL } #define JUMPIF_UNK_BD(i,l) { 0xBD, l, 0, i, 0, NULL } #define JUMPIF_UNK_BE(l) { 0xBE, l, 0, 0, 0, NULL } #define JUMPIF_HASITEM(i,l) { 0xBF, l, i, 0, 0, NULL } diff --git a/include/direction_util.h b/include/direction_util.h index a96f0f5a4..54b4f86c1 100644 --- a/include/direction_util.h +++ b/include/direction_util.h @@ -1,10 +1,12 @@ #ifndef GUARD_DIRECTION_UTIL_H #define GUARD_DIRECTION_UTIL_H +#include "constants/direction.h" #include "structs/str_position.h" -s32 sub_8002984(s32 _direction1, u32 caseID); -s32 sub_8002A70(s32 _direction1, s32 _direction2, s32 _caseId); +// See enum "DirectionTransformation" +s32 TransformDirection1(s32 _direction1, u32 caseID); +s32 TransformDirection2(s32 _direction1, s32 _direction2, s32 _caseId); s32 sub_8002B04(s32 _direction1, s32 _direction2); PixelPos SetVecFromDirectionSpeed(s32 _dir, u32 speed); s32 VecDirection8Radial(PixelPos *pixelPos); diff --git a/include/dungeon_cutscene.h b/include/dungeon_cutscene.h index 9bc0ccc89..a400be9ba 100644 --- a/include/dungeon_cutscene.h +++ b/include/dungeon_cutscene.h @@ -17,9 +17,9 @@ void sub_80847D4(void); bool8 ShouldShowDungeonBanner(void); void sub_80848F0(void); void DisplayPreFightDialogue(void); -void sub_8084E00_Async(Entity *entity, u8 param_2, bool8 param_3); -void sub_8085140(void); -bool8 sub_808529C(s32 speciesId_); +void HandleBossFaint_Async(Entity *entity, u8 monsterBehavior, bool8 transformedIntoFriend); +void sub_8085140_Async(void); +bool8 MonCutsceneCompleted(s32 speciesId_); void sub_8085374(void); Entity *CutsceneGetLeader(void); Entity *CutsceneGetPartner(void); @@ -43,7 +43,7 @@ u32 sub_8085EC8(s16 param_1,u32 param_2,u32 param_3,DungeonPos *param_4, bool32 void sub_8085F44(s32 param_1); void sub_8085F78(void); bool8 ItemInInventoryOrHeld(u8 id); -void sub_8086130(void); +void FrostyForestIntrusionCutscene_Async(void); void sub_80861A8(Entity *a0); void sub_80861B8(Entity *a0, u8 r1, s32 direction); void sub_80861D4(Entity *a0, u8 r1, s32 direction); @@ -69,8 +69,8 @@ void sub_8086854(void); void sub_80868F4(Entity *entity); void sub_8086910(Entity *entity); void sub_808692C(void); -void SpriteLookAroundEffect(Entity *entity); -void sub_80869E4(struct Entity *entity, s32 a1, u8 a2, s32 _someDirection); +void CutsceneLookAroundEffect_Async(Entity *entity); +void CutsceneLookDir_Async(struct Entity *entity, s32 numFrames, u8 dirTrans, s32 _someDirection); void sub_8086A3C(Entity *pokemon); void sub_8086A54(Entity *pokemon); void SetupBossFightHP(Entity *pokemon, s32 newHP, u16 songIndex); diff --git a/include/dungeon_cutscenes.h b/include/dungeon_cutscenes.h index 2150de7c5..cdc484278 100644 --- a/include/dungeon_cutscenes.h +++ b/include/dungeon_cutscenes.h @@ -52,25 +52,25 @@ void TeamMeaniesReFightDialogue(void); void ZapdosPostStoryPreFightDialogue(void); void ZapdosPreFightDialogue(void); void ZapdosReFightDialogue(void); -void nullsub_100(u8, u8, u8); +void HandleCelebiBossFaint(u8, u8, u8); void sub_8086B14(void); void sub_8086B94(void); -void sub_8086BDC(u8, u8); +void HandleSkarmoryBossFaint(u8, u8); void sub_8086E40(void); void sub_8086E9C(void); void sub_8086F00(void); -void sub_8086F54(u8, u8); +void HandleMeaniesBossFaint(u8, u8); void sub_8087130(void); void sub_8087230(void); void sub_808729C(void); -void sub_8087334(u8, u8); +void HandleZapdosBossFaint(u8, u8); void sub_80877E8(void); void sub_8087848(void); -void sub_80878F4(u8, u8); +void HandleMoltresBossFaint(u8, u8); void sub_8087F54(void); void sub_8087FB4(void); void sub_8087FF8(void); -void sub_8088088(u8, u8); +void HandleArticunoBossFaint(u8, u8); void sub_80885A0(void); void sub_80885C4(void); void sub_8088608(void); @@ -78,62 +78,62 @@ void sub_8088618(void); void sub_808862C(void); void sub_80886C4(void); void sub_808875C(void); -void sub_8088818(u8, u8); +void HandleGroudonBossFaint(u8, u8); void sub_8088DC0(void); void sub_8088E5C(void); void sub_8089168(void); void sub_80892C8(void); void sub_8089328(void); -void sub_80893B4(u8, u8); +void HandleRayquazaBossFaint(u8, u8); void sub_808970C(void); void sub_808974C(void); -void sub_8089788(Entity *entity, u8, u8); +void HandleMankeyBossFaint(Entity *entity, u8, u8); void sub_80897F0(void); void sub_8089878(void); void sub_80898E4(void); void sub_8089914(void); void sub_8089978(void); -void sub_8089A00(u8, u8); +void HandleMewtwoBossFaint(u8, u8); void sub_8089C44(void); void sub_8089C90(void); -void sub_8089CFC(u8, u8); +void HandleEnteiBossFaint(u8, u8); void sub_8089EFC(void); void sub_8089F44(void); void sub_8089F8C(void); -void sub_8089FF0(u8, u8); +void HandleRaikouBossFaint(u8, u8); void sub_808A264(void); void sub_808A2C0(void); void sub_808A308(void); -void sub_808A36C(u8, u8); +void HandleSuicuneBossFaint(u8, u8); void sub_808A608(void); void sub_808A668(void); -void sub_808A6E8(u8, u8); +void HandleHoOhBossFaint(u8, u8); void sub_808A9E4(void); void sub_808AA3C(void); void sub_808AA94(void); -void sub_808AAF0(u8, u8); +void HandleLatiosBossFaint(u8, u8); void sub_808AC3C(void); void sub_808ACC0(void); void sub_808AD48(void); void sub_808ADCC(void); -void sub_808AE54(u8, u8, DungeonPos *pos); -void sub_808AEC8(u8, u8, DungeonPos *pos); -void sub_808AF3C(u8, u8, DungeonPos *pos); -void sub_808AFB0(u8); -void sub_808B030(u8); -void sub_808B0B0(u8); +void HandleRegirockBossFaint_Async(u8, u8, DungeonPos *pos); +void HandleRegiceBossFaint_Async(u8, u8, DungeonPos *pos); +void HandleRegisteelBossFaint_Async(u8, u8, DungeonPos *pos); +void sub_808AFB0_Async(u8); +void sub_808B030_Async(u8); +void sub_808B0B0_Async(u8); void sub_808B2F4(void); void sub_808B35C(void); -void sub_808B3E4_Async(u8, u8, u8); +void HandleJirachiBossFaint_Async(u8 monsterBehavior, u8 cutscene, bool8 transformedIntoFriend); void sub_808BDEC(void); -void sub_808BE70(u8, u8, u8); +void HandleLugiaBossFaint(u8 monsterBehavior, u8 cutscene, bool8 transformedIntoFriend); void sub_808C10C(void); -void sub_808C1A4(u8, u8, u8); +void HandleKyogreBossFaint(u8, u8, u8); void sub_808C3A0(void); -void sub_808C414(u8, u8, u8); +void HandleDeoxysNormalBossFaint(u8, u8, u8); void sub_808C5C0(void); void sub_808C938(void); -void sub_808C948(Entity *entity, u8); +void HandleMazeBossFaint(Entity *entity, u8); void sub_808C998(void); void sub_808C9C4(void); void sub_808CB5C(void); diff --git a/include/dungeon_items.h b/include/dungeon_items.h index c4a1871d3..43c9bc08d 100644 --- a/include/dungeon_items.h +++ b/include/dungeon_items.h @@ -23,7 +23,7 @@ void SpawnDroppedItem(Entity *entity1, Entity *entity2, Item *item, bool8 a3, Du void sub_8046860(Entity *entity, DungeonPos *pos, Item *item, s32 a4); void sub_804687C(Entity *entity, DungeonPos *pos1, DungeonPos *pos2, Item *item, s32 count); bool8 HasHeldItem(Entity *pokemon, u8 id); -void sub_8046D20(void); +void PotentiallyCreateMusicBox_Async(void); bool8 sub_8046F00(Item *item); void ClearAllItemsWithFlag(s32 itemFlag); void AllItemsToPlainSeed(void); diff --git a/include/dungeon_message.h b/include/dungeon_message.h index 90b0bd1af..a6c39f33e 100644 --- a/include/dungeon_message.h +++ b/include/dungeon_message.h @@ -48,10 +48,10 @@ void xxx_draw_string_80524F0(void); void sub_80526D0(s32 r0); void sub_8052740(s32 a0); void DisplayDungeonMessage_Async(struct MonDialogueSpriteInfo *monSpriteInfo, const u8 *str, bool8 a2); -void DisplayDungeonDialogue(const struct DungeonDialogueStruct *dialogueInfo); -bool32 DisplayDungeonYesNoMessage(struct MonDialogueSpriteInfo *monSpriteInfo, const u8 *str, bool32 defaultYes); +void DisplayDungeonDialogue_Async(const struct DungeonDialogueStruct *dialogueInfo); +bool32 DisplayDungeonYesNoMessage_Async(struct MonDialogueSpriteInfo *monSpriteInfo, const u8 *str, bool32 defaultYes); s32 DisplayDungeonMenuMessage(struct MonDialogueSpriteInfo *monSpriteInfo, const u8 *str, const MenuItem *menuItems, u16 unkArg); -void sub_8052D44(s16 *ids, Entity *leader, Entity *partner); +void BufferCutsceneProtagonists(s16 destIDs[2], Entity *leader, Entity *partner); void TryDisplayGeneralTutorialMessage(void); void DisplayItemTip(u8 itemId); void DisplayYouReachedDestFloorStr(void); diff --git a/include/dungeon_strings.h b/include/dungeon_strings.h index 85ef200e1..985f7edf1 100644 --- a/include/dungeon_strings.h +++ b/include/dungeon_strings.h @@ -4,6 +4,7 @@ #include "structs/str_item_text.h" #include "constants/residual_damage.h" #include "constants/trap.h" +#include "constants/tutorial_id.h" #include "constants/weather.h" struct Struct_80F7C50 @@ -12,11 +13,11 @@ struct Struct_80F7C50 s32 val; }; -struct TutorialFlagMsg +typedef struct TutorialFlagMsg { - s32 flagId; + s32 flagId; // See enum "TutorialFlagID" const u8 *str; -}; +} TutorialFlagMsg; extern const ItemText gActions[]; extern const struct Struct_80F7C50 gUnknown_80F7C50[]; @@ -778,21 +779,21 @@ extern const u8 *const gUnknown_80FEF98; extern const u8 *const gUnknown_80FEFD0; extern const u8 *const gUnknown_80FEFF4; extern const u8 *const gUnknown_80FF01C; -extern const struct TutorialFlagMsg gUnknown_80FF020; -extern const struct TutorialFlagMsg gUnknown_80FF080; -extern const struct TutorialFlagMsg gUnknown_80FF0D8; -extern const struct TutorialFlagMsg gUnknown_80FF13C; -extern const struct TutorialFlagMsg gUnknown_80FF1B4; -extern const struct TutorialFlagMsg gMovementTutorial; -extern const struct TutorialFlagMsg gHungerTutorial; -extern const struct TutorialFlagMsg gFoodTutorial; -extern const struct TutorialFlagMsg gOranTutorial; -extern const struct TutorialFlagMsg gCheriTutorial; -extern const struct TutorialFlagMsg gBlastSeedTutorial; -extern const struct TutorialFlagMsg gUnknown_80FF4A0; -extern const struct TutorialFlagMsg gPechaTutorial; -extern const struct TutorialFlagMsg gSleepSeedTutorial; -extern const struct TutorialFlagMsg gMoneyTutorial; +extern const TutorialFlagMsg gUnknown_80FF020; +extern const TutorialFlagMsg gUnknown_80FF080; +extern const TutorialFlagMsg gUnknown_80FF0D8; +extern const TutorialFlagMsg gUnknown_80FF13C; +extern const TutorialFlagMsg gUnknown_80FF1B4; +extern const TutorialFlagMsg gMovementTutorial; +extern const TutorialFlagMsg gHungerTutorial; +extern const TutorialFlagMsg gFoodTutorial; +extern const TutorialFlagMsg gOranTutorial; +extern const TutorialFlagMsg gCheriTutorial; +extern const TutorialFlagMsg gBlastSeedTutorial; +extern const TutorialFlagMsg gUnknown_80FF4A0; +extern const TutorialFlagMsg gPechaTutorial; +extern const TutorialFlagMsg gSleepSeedTutorial; +extern const TutorialFlagMsg gMoneyTutorial; extern const u8 *const gUnknown_80FF674; extern const u8 *const gUnknown_80FF678; extern const u8 *const gUnknown_80FF6A4; diff --git a/include/dungeon_util.h b/include/dungeon_util.h index 1a31a9e94..649d7cf92 100644 --- a/include/dungeon_util.h +++ b/include/dungeon_util.h @@ -1,6 +1,7 @@ #ifndef GUARD_DUNGEON_UTIL_H #define GUARD_DUNGEON_UTIL_H +#include "constants/colors.h" #include "constants/direction.h" #include "structs/dungeon_entity.h" #include "structs/str_position.h" @@ -38,7 +39,7 @@ bool8 CanTargetEntity(Entity *entity, Entity *targetEntity); bool8 sub_8045A70(Entity *entity, Entity *targetEntity); bool8 sub_8045AAC(Entity *entity, DungeonPos *pos); bool8 CanTargetPosition(Entity *entity, DungeonPos *pos); -void SubstitutePlaceholderStringTags(u8 *buffer, Entity *entity, u32 param_3); +void SubstitutePlaceholderStringTags(u8 *buffer, Entity *entity, u32 monsterColorNum); void sub_8045ACC(void); s32 GetTeamMemberEntityIndex(Entity *pokemon); diff --git a/include/dungeon_vram.h b/include/dungeon_vram.h index f1d86d487..2eab902c5 100644 --- a/include/dungeon_vram.h +++ b/include/dungeon_vram.h @@ -9,7 +9,7 @@ void sub_803E250(void); void DungeonRunFrameActions(u32 a0); void sub_803E668(u32 unused); -void sub_803E708(s32 numFrames, u32 a1); +void DungeonWaitFrames_Async(s32 numFrames, u32 a1); void sub_803E724(s32 r0); void sub_803E748(void); void sub_803E7C8(void); diff --git a/include/exclusive_pokemon.h b/include/exclusive_pokemon.h index 7705b2b2a..49664880b 100644 --- a/include/exclusive_pokemon.h +++ b/include/exclusive_pokemon.h @@ -1,29 +1,29 @@ #ifndef GUARD_EXCLUSIVE_POKEMON_H #define GUARD_EXCLUSIVE_POKEMON_H +#include "constants/cutscenes.h" +#include "constants/tutorial_id.h" #include "data_serializer.h" - #define NUM_EXCLUSIVE_POKEMON 12 +// Size: 0x4 struct ExclusivePokemon { - s16 poke_id; - bool8 in_rrt; // red rescue team - bool8 in_brt; // blue rescue team + /* 0x0 */ s16 poke_id; + /* 0x2 */ bool8 in_rrt; // red rescue team + /* 0x3 */ bool8 in_brt; // blue rescue team }; -struct ExclusivePokemonData +typedef struct ExclusivePokemonData { - u8 unk0; - u32 unk4[1]; - u8 fill8[0x3C - 8]; - u32 unk3C[1]; - u8 fill40[8]; - u32 unk48[3]; - u32 unk54[1]; - /* 0x58 */ bool8 Exclusives[NUM_EXCLUSIVE_POKEMON]; -}; + /* 0x00 */ bool8 unk0; // Initialized? + /* 0x04 */ u32 monSeenFlags[MONSTER_FLAGS_U32STORAGE]; + /* 0x3C */ u32 cutsceneFlags[CUTSCENE_FLAGS_U32STORAGE]; + /* 0x48 */ u32 tempCutsceneFlags[CUTSCENE_FLAGS_U32STORAGE]; + /* 0x54 */ u32 tutorialFlags[TUTORIAL_FLAGS_U32STORAGE]; + /* 0x58 */ bool8 exclusives[NUM_EXCLUSIVE_POKEMON]; +} ExclusivePokemonData; #define RED_EXCLUSIVE(species) \ { \ @@ -39,22 +39,22 @@ struct ExclusivePokemonData .in_brt = TRUE, \ } -extern struct ExclusivePokemonData *gUnknown_203B498; +ExclusivePokemonData *gExclusiveMonPtr; void LoadExclusivePokemon(void); -struct ExclusivePokemonData *GetExclusivePokemon(void); +ExclusivePokemonData *GetExclusivePokemon(void); void InitializeExclusivePokemon(void); -void sub_8097FA8(u8 param_1); -void sub_8097FD0(u8 param_1); -void sub_8097FF8(void); -void sub_8098044(u8 param_1); -void sub_8098080(void); -u8 sub_80980A4(void); -void sub_80980B4(s16 pokeID); -bool8 sub_8098100(u8 param_1); -bool8 sub_8098134(s16 pokeID); -void SetTutorialFlag(s32 param_1); -bool32 GetTutorialFlag(s32 param_1); +void SetTempCutsceneFlag(u8 flag); +void SetCutsceneFlag(u8 flag); +void FlushTempCutsceneFlags(void); +void UnsetCutsceneFlag(u8 flag); +void ClearTempCutsceneFlags(void); +bool8 sub_80980A4(void); +void SetMonSeenFlag(s16 monID); +bool8 GetCutsceneFlag(u8 flag); +bool8 GetMonSeenFlag(s16 monID); +void SetTutorialFlag(s32 flag); +bool8 GetTutorialFlag(s32 flag); bool8 IsExclusivePokemonUnlocked(s32 pokeID); void UnlockExclusivePokemon(s16 pokeID); void WriteExclusivePokemon(DataSerializer *r0); diff --git a/include/ground_main.h b/include/ground_main.h index bac7c1713..3152f03b1 100644 --- a/include/ground_main.h +++ b/include/ground_main.h @@ -1,6 +1,7 @@ #ifndef GUARD_GROUND_MAIN_H #define GUARD_GROUND_MAIN_H +#include "constants/rescue_dungeon_id.h" #include "structs/str_dungeon_setup.h" u32 xxx_script_related_8098468(s32 param_1); @@ -19,7 +20,8 @@ u8 sub_80990EC(struct DungeonSetupInfo *param_1, s32 param_2); u8 sub_80991E0(struct DungeonSetupInfo *param_1, s16 *param_2); void sub_8099220(struct DungeonSetupInfo *param_1, s32 param_2); void sub_809927C(u8 param_1); -bool8 sub_80992E0(s16 *param_1, s16 *param_2); +// See enum "RescueDungeonId" +bool8 sub_80992E0(s16 *param_1, s16 *rescueDungeonId); bool8 sub_8099328(u8 *dungeonId); bool8 sub_8099360(u8 *dungeonId); bool8 sub_8099394(u8 *param); diff --git a/include/other_random.h b/include/other_random.h index 1b0b992f0..cceebaac9 100644 --- a/include/other_random.h +++ b/include/other_random.h @@ -1,7 +1,7 @@ #ifndef GUARD_OTHER_RANDOM_H #define GUARD_OTHER_RANDOM_H -s32 OtherRandInt(s32 cap); +s32 OtherRandInt(s32 exclusiveMax); s32 OtherRandRange(s32 a, s32 b); #endif // GUARD_OTHER_RANDOM_H diff --git a/include/rescue_scenario.h b/include/rescue_scenario.h index 5609f68b8..1949da429 100644 --- a/include/rescue_scenario.h +++ b/include/rescue_scenario.h @@ -7,12 +7,14 @@ void sub_80972F4(void); void nullsub_128(void); bool8 sub_8097318(s16 param_1); -void sub_809733C(s16 param_1, u32 param_2); +void sub_809733C(s32 _rescueDungId, bool32 param_2); bool8 sub_8097384(s32 param_1); -void sub_80973A8(s32 param_1, u32 param_2); +void sub_80973A8(s32 _rescueDungId, bool32 param_2); bool8 RescueScenarioConquered(s32 rescueDungeonID_); -void sub_8097418(s32 index, bool32); +// See enum "RescueDungeonId" +void SetRescueScenarioConquered(s32 rescueDungeonID_, bool32 conquered); const u8 *GetRescueDungeonName(s16 rescueDungeonId); -const u8 *GetCurrentMissionText(s16 index); +// See enum "RescueDungeonId" +const u8 *GetCurrentMissionText(s16 rescueDungeonId); #endif // GUARD_RESCUE_SCENARIO_H diff --git a/include/save.h b/include/save.h index bdae6ffc4..0a45a4287 100644 --- a/include/save.h +++ b/include/save.h @@ -50,7 +50,7 @@ struct UnkStruct_sub_8011DAC // size: 0x5C // This is most likely a debug savestate -struct UnkStruct_203B184 +typedef struct UnkStruct_203B184 { /* 0x0 */ TeamInventory *MoneyItems; /* 0x4 */ RecruitedMon *recruitedPokemon; @@ -61,7 +61,7 @@ struct UnkStruct_203B184 /* 0x18 */ unkStruct_203B490 *mailInfo; /* 0x1C */ struct RescueTeamData *RescueTeamInfo; /* 0x20 */ struct unkStruct_203B494 *unk20; - /* 0x24 */ struct ExclusivePokemonData *ExclusivePokemon; + /* 0x24 */ ExclusivePokemonData *exclusivePokemon; /* 0x28 */ bool8 *BoughtFriendAreas; /* 0x2C */ GameOptions *gameOptions; /* 0x30 */ struct PlayTimeStruct *playTime; @@ -75,7 +75,7 @@ struct UnkStruct_203B184 u32 unk050; u32 unk054; u32 RngState; -}; +} UnkStruct_203B184; void nullsub_33(void); u32 sub_8011C1C(void); diff --git a/include/structs/str_dungeon.h b/include/structs/str_dungeon.h index 9a73c7d94..24f58cc05 100644 --- a/include/structs/str_dungeon.h +++ b/include/structs/str_dungeon.h @@ -386,7 +386,7 @@ typedef struct Dungeon u8 unk5; u8 unk6; u8 unk7; - u8 unk8; + bool8 unk8; // Related to a yes/no prompt for the Music Box creation u8 unk9; u8 unkA; u8 unkB; diff --git a/include/structs/str_pokemon.h b/include/structs/str_pokemon.h index 39a9054db..51b868b46 100644 --- a/include/structs/str_pokemon.h +++ b/include/structs/str_pokemon.h @@ -113,7 +113,7 @@ typedef struct MonsterDataEntry /* 0x9 */ u8 bodySize; /* 0xC */ s32 movementSpeed; /* 0x10 */ u16 dialogueSprites; // Bitwise flags for whether a dialogue sprite/portrait is available for each emotion. - bool8 unk12; + bool8 unk12; // Appears to control whether the "has friend area" check is skipped /* 0x13 */ u8 types[2]; /* 0x15 */ u8 movementType; /* 0x16 */ u8 friendArea; diff --git a/src/code_8023144.c b/src/code_8023144.c index 7503d93b5..ff7117b00 100644 --- a/src/code_8023144.c +++ b/src/code_8023144.c @@ -201,7 +201,7 @@ static u32 sub_80236A4(void) gUnknown_3001B5C->unk8 = 0; for (index = 0; index < MONSTER_MAX; index++) { - if (sub_8098134(index) && (s16)index == GetBaseSpeciesNoUnown(index)) + if (GetMonSeenFlag(index) && (s16)index == GetBaseSpeciesNoUnown(index)) gUnknown_3001B5C->unkC[gUnknown_3001B5C->unk8++] = index; } @@ -211,10 +211,10 @@ static u32 sub_80236A4(void) static bool8 sub_8023704(u8 unused) { - s32 index; + s32 i; - for (index = 0; index < MONSTER_MAX; index++) { - if (sub_8098134(index)) + for (i = 0; i < MONSTER_MAX; i++) { + if (GetMonSeenFlag(i)) return FALSE; } diff --git a/src/code_8040094_1.c b/src/code_8040094_1.c index 572b63354..129634765 100644 --- a/src/code_8040094_1.c +++ b/src/code_8040094_1.c @@ -178,7 +178,7 @@ void sub_8040DA0(Entity *entity, Move *move) direction--; direction &= DIRECTION_MASK; sub_806CDD4(entity, 0, direction); - sub_803E708(2, 0x15); + DungeonWaitFrames_Async(2, 0x15); } } } @@ -189,7 +189,7 @@ void sub_8040DA0(Entity *entity, Move *move) for (i = 0; i < NUM_DIRECTIONS + 1; i++) { direction &= DIRECTION_MASK; sub_806CDD4(entity, 0, direction); - sub_803E708(2, 0x15); + DungeonWaitFrames_Async(2, 0x15); direction++; } } diff --git a/src/code_80A26CC.c b/src/code_80A26CC.c index aa7dd56df..5f72fd5da 100644 --- a/src/code_80A26CC.c +++ b/src/code_80A26CC.c @@ -280,7 +280,7 @@ static const DungeonInfo gUnknown_81168A8[SCRIPT_DUNGEON_COUNT] = { .unk10 = 1, .unk11 = 1, }, - [SCRIPT_DUNGEON_21] = { + [SCRIPT_DUNGEON_DUMMY] = { .unk0 = 9, .unk2 = 12, .unk4 = 12, @@ -1111,7 +1111,7 @@ static const s16 sRescueToScriptDungeonIdTable[RESCUE_DUNGEON_COUNT] = { [RESCUE_DUNGEON_MT_FREEZE] = SCRIPT_DUNGEON_MT_FREEZE, [RESCUE_DUNGEON_MAGMA_CAVERN] = SCRIPT_DUNGEON_MAGMA_CAVERN, [RESCUE_DUNGEON_SKY_TOWER] = SCRIPT_DUNGEON_SKY_TOWER, - [RESCUE_DUNGEON_DUMMY] = SCRIPT_DUNGEON_21, + [RESCUE_DUNGEON_DUMMY] = SCRIPT_DUNGEON_DUMMY, [RESCUE_DUNGEON_UPROAR_FOREST] = SCRIPT_DUNGEON_UPROAR_FOREST, [RESCUE_DUNGEON_HOWLING_FOREST] = SCRIPT_DUNGEON_HOWLING_FOREST, [RESCUE_DUNGEON_STORMY_SEA] = SCRIPT_DUNGEON_STORMY_SEA, diff --git a/src/data/ground/ground_data_a01p01_station.h b/src/data/ground/ground_data_a01p01_station.h index 038be0c54..7422f99f5 100644 --- a/src/data/ground/ground_data_a01p01_station.h +++ b/src/data/ground/ground_data_a01p01_station.h @@ -394,7 +394,7 @@ static const struct ScriptCommand s_gs162_g5_s0_lives0_dlg0[] = { /* 0x82116b8 * SELECT_ANIMATION(2), { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(60), - ROTATE(10, 1, DIRECTION_SOUTH), + ROTATE_TO(10, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTH), WAIT(30), MSG_NPC(-1, _(" I've been waiting for you.")), TEXTBOX_CLEAR, @@ -626,7 +626,7 @@ static const struct ScriptCommand s_gs162_g6_s1_lives0_dlg0[] = { /* 0x8212774 * SELECT_ANIMATION(23), STOP_ANIMATION_ON_CURRENT_FRAME, WAIT(6), - ROTATE(4, 11, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_SOUTHWEST), SELECT_ANIMATION(2), ALERT_CUE(5), AWAIT_CUE(7), @@ -885,7 +885,7 @@ static const struct ScriptCommand s_gs162_g8_s1_lives0_dlg0[] = { /* 0x8213b50 * SELECT_ANIMATION(23), STOP_ANIMATION_ON_CURRENT_FRAME, WAIT(6), - ROTATE(4, 11, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_SOUTHWEST), SELECT_ANIMATION(2), ALERT_CUE(5), AWAIT_CUE(6), @@ -1186,7 +1186,7 @@ static const struct ScriptCommand s_gs162_g9_s1_lives0_dlg0[] = { /* 0x82157b8 * SELECT_ANIMATION(23), STOP_ANIMATION_ON_CURRENT_FRAME, WAIT(6), - ROTATE(4, 11, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_SOUTHWEST), SELECT_ANIMATION(2), ALERT_CUE(5), AWAIT_CUE(7), diff --git a/src/data/ground/ground_data_a02p02_station.h b/src/data/ground/ground_data_a02p02_station.h index 4a665c7af..14f998131 100644 --- a/src/data/ground/ground_data_a02p02_station.h +++ b/src/data/ground/ground_data_a02p02_station.h @@ -54,7 +54,7 @@ static const struct ScriptCommand s_gs165_g1_s0_lives0_dlg0[] = { /* 0x8218834 * { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, ALERT_CUE(6), WALK_GRID(204, 0), - ROTATE(4, 11, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_NORTH), AWAIT_CUE(5), WAIT(30), PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000005), @@ -79,7 +79,7 @@ static const struct ScriptCommand s_gs165_g1_s0_lives1_dlg0[] = { /* 0x8218a34 * { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(6), WALK_GRID(204, 1), - ROTATE(8, 11, DIRECTION_NORTH), + ROTATE_TO(8, DIR_TRANS_11, DIRECTION_NORTH), ALERT_CUE(5), AWAIT_CUE(6), WAIT(10), diff --git a/src/data/ground/ground_data_a02p03_station.h b/src/data/ground/ground_data_a02p03_station.h index c2c1b5c0e..c93878e6b 100644 --- a/src/data/ground/ground_data_a02p03_station.h +++ b/src/data/ground/ground_data_a02p03_station.h @@ -36,7 +36,7 @@ static const struct ScriptCommand s_gs166_g1_s0_lives0_dlg0[] = { /* 0x8218cb0 * ALERT_CUE(6), WALK_GRID(512, 0), WAIT(15), - ROTATE(4, 11, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_WEST), BGM_FADEOUT(60), WAIT(20), PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000002), @@ -48,7 +48,7 @@ static const struct ScriptCommand s_gs166_g1_s0_lives0_dlg0[] = { /* 0x8218cb0 * MSG_NPC(1, _(" Oh, no! Look!")), TEXTBOX_CLEAR, BGM_SWITCH(38), - ROTATE(4, 11, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_EAST), WAIT(20), ALERT_CUE(3), HALT, @@ -61,9 +61,9 @@ static const struct ScriptCommand s_gs166_g1_s0_lives1_dlg0[] = { /* 0x8218e38 * { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(6), WALK_GRID(512, 1), - ROTATE(4, 2, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_WEST), AWAIT_CUE(6), - ROTATE(4, 1, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_EAST), WAIT(20), FANFARE_PLAY2(455), CALL_SCRIPT(JUMP_SURPRISE_FUNC), @@ -118,7 +118,7 @@ static const struct ScriptCommand s_gs166_g2_s0_lives0_dlg0[] = { /* 0x821915c * WAIT(20), ALERT_CUE(6), AWAIT_CUE(5), - ROTATE(4, 11, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_SOUTHEAST), PORTRAIT_REP(0x0001, 0x00000005), MSG_NPC(1, _(" What'll we do,\n{NAME_0}?")), TEXTBOX_CLEAR, @@ -128,7 +128,7 @@ static const struct ScriptCommand s_gs166_g2_s0_lives0_dlg0[] = { /* 0x821915c * FANFARE_PLAY2(465), ALERT_CUE(6), CALL_SCRIPT(NOTICE_FUNC), - ROTATE(4, 11, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_WEST), MSG_NPC(-1, _(" Get them!")), TEXTBOX_CLEAR, ALERT_CUE(6), @@ -152,16 +152,16 @@ static const struct ScriptCommand s_gs166_g2_s0_lives1_dlg0[] = { /* 0x821952c * SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(6), - ROTATE(4, 11, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_WEST), ALERT_CUE(5), AWAIT_CUE(6), - { 0x93, 0x04, 0x000b, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_11, 0), ALERT_CUE(5), AWAIT_CUE(6), CALL_SCRIPT(JUMP_SURPRISE_FUNC), - ROTATE(4, 11, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_WEST), AWAIT_CUE(6), - { 0x93, 0x04, 0x000b, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_11, 0), ALERT_CUE(5), AWAIT_CUE(6), { 0x89, 0x50, 0x0200, 0x00000002, 0x00000000, NULL }, diff --git a/src/data/ground/ground_data_a02p04_station.h b/src/data/ground/ground_data_a02p04_station.h index e2776a942..1e163c69a 100644 --- a/src/data/ground/ground_data_a02p04_station.h +++ b/src/data/ground/ground_data_a02p04_station.h @@ -88,7 +88,7 @@ static const struct ScriptCommand s_gs167_g2_s0_lives0_dlg0[] = { /* 0x8219c28 * WAIT(120), ALERT_CUE(6), WALK_GRID(256, 1), - { 0x93, 0x04, 0x000b, 0x00000022, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_11, 34), WAIT(80), ALERT_CUE(6), AWAIT_CUE(5), @@ -104,7 +104,7 @@ static const struct ScriptCommand s_gs167_g2_s0_lives0_dlg0[] = { /* 0x8219c28 * ALERT_CUE(6), AWAIT_CUE(5), WAIT(15), - ROTATE(4, 11, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_NORTH), PORTRAIT_REP(0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Haaah!\nThe view's great here.")), @@ -132,7 +132,7 @@ static const struct ScriptCommand s_gs167_g2_s0_lives0_dlg0[] = { /* 0x8219c28 * VARIANT(/* == */ 1, _(" ............{WAIT_PRESS}Hey, {NAME_0}.")), VARIANT(/* == */ 3, _(" ............{WAIT_PRESS}Um, {NAME_0}?")), VARIANT_DEFAULT(_(" ............{WAIT_PRESS}{NAME_0}.")), - ROTATE(4, 11, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_NORTHEAST), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" You remember how tough it\nwas getting over Mt. Blaze, right?")), VARIANT(/* == */ 1, _(" I don't think many Pokémon\ncan get through there.")), @@ -226,7 +226,7 @@ static const struct ScriptCommand s_gs167_g2_s0_lives0_dlg0[] = { /* 0x8219c28 * VARIANT(/* == */ 3, _(" Oh?{WAIT_PRESS} What's wrong?\nAren't we going, {NAME_0}?")), VARIANT_DEFAULT(_(" Huh?{WAIT_PRESS} What's the matter?\nAren't you coming, {NAME_0}?")), TEXTBOX_CLEAR, - ROTATE(10, 11, DIRECTION_SOUTHWEST), + ROTATE_TO(10, DIR_TRANS_11, DIRECTION_SOUTHWEST), WAIT(30), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" ...{WAIT_PRESS}What?{WAIT_PRESS}\nAren't I tired, you're asking?")), @@ -280,13 +280,13 @@ static const struct ScriptCommand s_gs167_g2_s0_lives1_dlg0[] = { /* 0x821b5d4 * AWAIT_CUE(6), CALL_SCRIPT(NOTICE_FUNC), WAIT(15), - ROTATE(4, 11, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_SOUTHWEST), ALERT_CUE(5), AWAIT_CUE(6), - ROTATE(4, 11, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_NORTH), ALERT_CUE(5), AWAIT_CUE(6), - ROTATE(4, 11, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_SOUTHWEST), ALERT_CUE(5), AWAIT_CUE(6), JUMPIF(JUDGE_EQ, EVENT_LOCAL, 1, /* to label */ 0), @@ -308,7 +308,7 @@ static const struct ScriptCommand s_gs167_g2_s0_lives1_dlg0[] = { /* 0x821b5d4 * AWAIT_CUE(6), WALK_GRID(153, 3), WAIT(30), - ROTATE(4, 11, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_NORTHEAST), ALERT_CUE(5), AWAIT_CUE(6), WALK_GRID(153, 4), diff --git a/src/data/ground/ground_data_a03p01_station.h b/src/data/ground/ground_data_a03p01_station.h index 935f6b1ae..199af8fb7 100644 --- a/src/data/ground/ground_data_a03p01_station.h +++ b/src/data/ground/ground_data_a03p01_station.h @@ -65,7 +65,7 @@ static const struct ScriptCommand s_gs168_g1_s0_lives0_dlg0[] = { /* 0x821bbf8 * MSG_NPC(1, _(" Hachoo!")), TEXTBOX_CLEAR, WAIT(8), - ROTATE(4, 1, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTHWEST), WAIT(24), ALERT_CUE(6), AWAIT_CUE(5), @@ -74,7 +74,7 @@ static const struct ScriptCommand s_gs168_g1_s0_lives0_dlg0[] = { /* 0x821bbf8 * MSG_NPC(1, _(" Yuck...{WAIT_PRESS}\nMy nose is running, and it's freezing.")), TEXTBOX_CLEAR, WAIT(30), - ROTATE(4, 2, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_EAST), { 0x3b, 0x36, 0x0004, 0x00000000, 0x00000000, NULL }, SELECT_ANIMATION(5), ALERT_CUE(6), @@ -167,32 +167,32 @@ static const struct ScriptCommand s_gs168_g1_s0_lives1_dlg0[] = { /* 0x821c620 * { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, SELECT_ANIMATION(2), AWAIT_CUE(6), - ROTATE(4, 2, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_NORTHEAST), ALERT_CUE(5), AWAIT_CUE(6), - ROTATE(4, 1, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_EAST), SELECT_ANIMATION(5), AWAIT_CUE(6), SELECT_ANIMATION(2), - ROTATE(4, 2, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_NORTHEAST), ALERT_CUE(5), AWAIT_CUE(6), - ROTATE(4, 1, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_EAST), { 0x56, 0x00, 0x0000, 0x00000058, 0x00000000, NULL }, { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x89, 0x0c, 0x0100, 0x00000002, 0x00000000, NULL }, ALERT_CUE(5), AWAIT_CUE(6), - ROTATE(4, 2, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_NORTHEAST), ALERT_CUE(5), AWAIT_CUE(6), - ROTATE(4, 1, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_EAST), ALERT_CUE(5), AWAIT_CUE(6), - ROTATE(4, 2, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_NORTHEAST), ALERT_CUE(5), AWAIT_CUE(6), - ROTATE(4, 1, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_EAST), ALERT_CUE(5), SELECT_ANIMATION(5), HALT, @@ -203,7 +203,7 @@ static const struct ScriptCommand s_gs168_g1_s0_lives2_dlg0[] = { /* 0x821c8e0 * SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(7), - ROTATE(4, 2, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_EAST), SELECT_ANIMATION(32), WAIT(9), FANFARE_PLAY2(478), @@ -244,13 +244,13 @@ static const struct ScriptCommand s_gs168_g2_s0_lives0_dlg0[] = { /* 0x821ca1c * VARIANT_DEFAULT(_(" Oh!")), TEXTBOX_CLEAR, WAIT(10), - ROTATE(4, 1, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTHEAST), ALERT_CUE(6), AWAIT_CUE(5), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" {NAME_0}!\nCheck that out!")), VARIANT_DEFAULT(_(" {NAME_0}! Look!")), - ROTATE(4, 2, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_EAST), ALERT_CUE(6), MSG_NPC(1, _(" See that?{WAIT_PRESS}\nThose trees are frozen!")), TEXTBOX_CLEAR, @@ -270,10 +270,10 @@ static const struct ScriptCommand s_gs168_g2_s0_lives1_dlg0[] = { /* 0x821cc58 * SELECT_ANIMATION(2), ALERT_CUE(5), AWAIT_CUE(6), - ROTATE(4, 2, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_NORTHWEST), ALERT_CUE(5), AWAIT_CUE(6), - ROTATE(4, 1, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_EAST), AWAIT_CUE(6), HALT, }; diff --git a/src/data/ground/ground_data_a03p03_station.h b/src/data/ground/ground_data_a03p03_station.h index c0d5b8f7a..89598b497 100644 --- a/src/data/ground/ground_data_a03p03_station.h +++ b/src/data/ground/ground_data_a03p03_station.h @@ -84,7 +84,7 @@ static const struct ScriptCommand s_gs170_g1_s0_lives0_dlg0[] = { /* 0x821d2f8 * { 0x3b, 0x36, 0x0000, 0x00000000, 0x00000000, NULL }, SELECT_ANIMATION(2), ALERT_CUE(6), - ROTATE(4, 1, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTHEAST), PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0001, 0x00000000), PORTRAIT_POS(1, 0, 2), MSG_VAR(2, PARTNER_TALK_KIND, 1), @@ -118,7 +118,7 @@ static const struct ScriptCommand s_gs170_g1_s0_lives0_dlg0[] = { /* 0x821d2f8 * { 0x3b, 0x36, 0x0000, 0x00000000, 0x00000000, NULL }, SELECT_ANIMATION(2), ALERT_CUE(6), - ROTATE(4, 1, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTHEAST), PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0001, 0x00000000), PORTRAIT_POS(1, 0, 2), MSG_VAR(2, PARTNER_TALK_KIND, 1), @@ -213,7 +213,7 @@ static const struct ScriptCommand s_gs170_g1_s0_lives0_dlg0[] = { /* 0x821d2f8 * FANFARE_PLAY2(477), SELECT_ENTITIES(-1, 1), { 0x27, 0x01, 0x0005, 0x00000030, 0x00000000, NULL }, - ROTATE(4, 2, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_EAST), WAIT(30), MSG_NPC(-1, _(" Finally...")), MSG_NPC(-1, _(" You have arrived...")), @@ -235,7 +235,7 @@ static const struct ScriptCommand s_gs170_g1_s0_lives1_dlg0[] = { /* 0x821ec08 * { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(6), SELECT_ANIMATION(2), - ROTATE(4, 2, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_NORTHWEST), AWAIT_CUE(6), { 0x56, 0x00, 0x0000, 0x0000005d, 0x00000000, NULL }, ALERT_CUE(5), @@ -253,7 +253,7 @@ static const struct ScriptCommand s_gs170_g1_s0_lives2_dlg0[] = { /* 0x821ed08 * SELECT_ANIMATION(5), AWAIT_CUE(6), SELECT_ANIMATION(2), - ROTATE(4, 2, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_NORTHEAST), AWAIT_CUE(6), HALT, }; @@ -308,9 +308,9 @@ static const struct ScriptCommand s_gs170_g2_s0_lives0_dlg0[] = { /* 0x821ee64 * WAIT(10), FANFARE_PLAY2(465), CALL_SCRIPT(NOTICE_FUNC), - ROTATE(4, 1, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTHEAST), WAIT(64), - ROTATE(4, 2, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_EAST), WAIT(16), MSG_NPC(2, _(" I cannot be seen by others.")), MSG_NPC(2, _(" I am visible only to you.")), @@ -377,10 +377,10 @@ static const struct ScriptCommand s_gs170_g2_s0_lives2_dlg0[] = { /* 0x821f5e4 * SELECT_ANIMATION(2), AWAIT_CUE(6), CALL_SCRIPT(LOOK_AROUND_RIGHT_FUNC), - ROTATE(4, 10, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHEAST), AWAIT_CUE(6), CALL_SCRIPT(LOOK_AROUND_LEFT_FUNC), - ROTATE(4, 10, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHEAST), AWAIT_CUE(6), HALT, }; diff --git a/src/data/ground/ground_data_a04p01_station.h b/src/data/ground/ground_data_a04p01_station.h index f463ff02e..186164382 100644 --- a/src/data/ground/ground_data_a04p01_station.h +++ b/src/data/ground/ground_data_a04p01_station.h @@ -160,7 +160,7 @@ static const struct ScriptCommand s_gs171_g3_s0_lives0_dlg0[] = { /* 0x82200b0 * WAIT(30), ALERT_CUE(6), AWAIT_CUE(5), - ROTATE(4, 10, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHWEST), PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x0000000c), MSG_NPC(1, _(" Wh-{WAIT_PRESS}what's going on?{WAIT_PRESS}\nWhat is {NAME_3} doing?")), TEXTBOX_CLEAR, @@ -199,7 +199,7 @@ static const struct ScriptCommand s_gs171_g3_s0_lives0_dlg0[] = { /* 0x82200b0 * TEXTBOX_CLEAR, WAIT(30), { 0x84, 0x00, 0x0100, -0x00000018, -0x00000018, NULL }, - ROTATE(4, 10, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), WAIT(30), ALERT_CUE(9), AWAIT_CUE(5), @@ -210,7 +210,7 @@ static const struct ScriptCommand s_gs171_g3_s0_lives0_dlg0[] = { /* 0x82200b0 * WAIT(30), ALERT_CUE(7), { 0x84, 0x00, 0x0100, 0x00000018, 0x00000018, NULL }, - ROTATE(4, 10, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHWEST), WAIT(30), MSG_NPC(3, _(" That was made using\nthe powers of psychics.")), MSG_NPC(3, _(" By me, {NAME_2},\nand...{WAIT_PRESS}\nOh?")), @@ -222,7 +222,7 @@ static const struct ScriptCommand s_gs171_g3_s0_lives0_dlg0[] = { /* 0x82200b0 * MSG_NPC(3, _(" ...Gone away, it seems...")), TEXTBOX_CLEAR, ALERT_CUE(6), - { 0x93, 0x04, 0x000a, 0x00000022, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 34), WAIT(30), MSG_NPC(1, _(" Who could it be?")), TEXTBOX_CLEAR, @@ -234,7 +234,7 @@ static const struct ScriptCommand s_gs171_g3_s0_lives0_dlg0[] = { /* 0x82200b0 * WAIT(30), ALERT_CUE(7), ALERT_CUE(6), - ROTATE(4, 10, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHWEST), PORTRAIT_REP(0x0002, 0x00000000), MSG_NPC(2, _(" Now...{WAIT_PRESS}\nI must ask you this one last time.")), MSG_NPC(2, _(" This journey will be fraught\nwith considerable danger.{WAIT_PRESS}\nWill you still go?")), @@ -285,18 +285,18 @@ static const struct ScriptCommand s_gs171_g3_s0_lives1_dlg0[] = { /* 0x8220df0 * AWAIT_CUE(6), CALL_SCRIPT(JUMP_SURPRISE_FUNC), AWAIT_CUE(6), - ROTATE(4, 10, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHEAST), ALERT_CUE(5), AWAIT_CUE(6), - ROTATE(4, 10, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), ALERT_CUE(5), AWAIT_CUE(6), CALL_SCRIPT(NOTICE_FUNC), - ROTATE(4, 10, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHEAST), AWAIT_CUE(6), - { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 0), AWAIT_CUE(6), - ROTATE(4, 10, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), AWAIT_CUE(6), HALT, }; @@ -308,12 +308,12 @@ static const struct ScriptCommand s_gs171_g3_s0_lives2_dlg0[] = { /* 0x8220f50 * SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(7), - ROTATE(4, 10, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTH), ALERT_CUE(5), AWAIT_CUE(7), - ROTATE(4, 10, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHEAST), AWAIT_CUE(7), - ROTATE(10, 10, DIRECTION_SOUTH), + ROTATE_TO(10, DIR_TRANS_10, DIRECTION_SOUTH), AWAIT_CUE(7), CALL_SCRIPT(SMILE_START_FUNC), AWAIT_CUE(7), @@ -333,7 +333,7 @@ static const struct ScriptCommand s_gs171_g3_s0_lives3_dlg0[] = { /* 0x8221070 * SELECT_ANIMATION(2), ALERT_CUE(5), AWAIT_CUE(8), - ROTATE(8, 10, DIRECTION_SOUTH), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_SOUTH), ALERT_CUE(5), AWAIT_CUE(8), CALL_SCRIPT(LOOK_AROUND_FUNC), @@ -405,7 +405,7 @@ static const struct ScriptCommand s_gs171_g4_s0_lives0_dlg0[] = { /* 0x82213fc * WAIT(10), ALERT_CUE(6), AWAIT_CUE(5), - ROTATE(4, 10, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_WEST), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" {NAME_0}!\nLet's do this right!")), VARIANT_DEFAULT(_(" {NAME_0}!\nLet's get this done!")), @@ -450,7 +450,7 @@ static const struct ScriptCommand s_gs171_g4_s0_lives1_dlg0[] = { /* 0x8221794 * SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(6), - { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 0), ALERT_CUE(5), AWAIT_CUE(6), WAIT(120), @@ -468,7 +468,7 @@ static const struct ScriptCommand s_gs171_g4_s0_lives2_dlg0[] = { /* 0x8221864 * SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(7), - ROTATE(4, 10, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHEAST), ALERT_CUE(5), AWAIT_CUE(7), HALT, @@ -489,7 +489,7 @@ static const struct ScriptCommand s_gs171_g4_s0_lives4_dlg0[] = { /* 0x8221944 * WAIT(120), { 0x89, 0x10, 0x0100, 0x00000004, 0x00000000, NULL }, { 0x89, 0x08, 0x0100, 0x00000002, 0x00000000, NULL }, - ROTATE(4, 10, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), AWAIT_CUE(12), { 0x59, 0x00, 0x0000, -0x000000c8, 0x00000000, NULL }, AWAIT_CUE(12), @@ -634,7 +634,7 @@ static const struct ScriptCommand s_gs171_g5_s0_lives0_dlg0[] = { /* 0x8221f00 * { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("(I'm sure... Back there...{WAIT_PRESS}\nGengar saved me...)") }, TEXTBOX_CLEAR, WAIT(30), - { 0x93, 0x04, 0x000a, 0x00000022, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 34), PORTRAIT_REP(0x0001, 0x00000000), MSG_NPC(1, _(" ...Maybe...{WAIT_PRESS}\nDid Gengar save {NAME_0} too?")), TEXTBOX_CLEAR, @@ -673,7 +673,7 @@ static const struct ScriptCommand s_gs171_g5_s0_lives0_dlg0[] = { /* 0x8221f00 * ALERT_CUE(4), ALERT_CUE(6), CALL_LABEL(3), - ROTATE(1, 10, DIRECTION_NORTH), + ROTATE_TO(1, DIR_TRANS_10, DIRECTION_NORTH), ALERT_CUE(8), AWAIT_CUE(5), WAIT(60), @@ -723,7 +723,7 @@ static const struct ScriptCommand s_gs171_g5_s0_lives0_dlg0[] = { /* 0x8221f00 * TEXTBOX_CLEAR, WAIT(10), ALERT_CUE(6), - { 0x93, 0x04, 0x000a, 0x00000022, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 34), CALL_LABEL(3), PORTRAIT_REP(0x0001, 0x00000001), MSG_VAR(2, PARTNER_TALK_KIND, 1), @@ -776,19 +776,19 @@ static const struct ScriptCommand s_gs171_g5_s0_lives1_dlg0[] = { /* 0x8222c44 * ALERT_CUE(5), AWAIT_CUE(6), WAIT(10), - { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 0), AWAIT_CUE(6), - ROTATE(6, 10, DIRECTION_NORTH), + ROTATE_TO(6, DIR_TRANS_10, DIRECTION_NORTH), WAIT(20), - ROTATE(6, 10, DIRECTION_SOUTH), + ROTATE_TO(6, DIR_TRANS_10, DIRECTION_SOUTH), WAIT(20), - ROTATE(6, 10, DIRECTION_WEST), + ROTATE_TO(6, DIR_TRANS_10, DIRECTION_WEST), ALERT_CUE(5), AWAIT_CUE(6), CALL_SCRIPT(JUMP_ANGRY_FUNC), ALERT_CUE(5), AWAIT_CUE(6), - ROTATE(1, 10, DIRECTION_NORTH), + ROTATE_TO(1, DIR_TRANS_10, DIRECTION_NORTH), AWAIT_CUE(6), CJUMP_UNK_C6(10), COND_EQUAL(0, /* to label */ 0), @@ -802,7 +802,7 @@ static const struct ScriptCommand s_gs171_g5_s0_lives1_dlg0[] = { /* 0x8222c44 * CALL_SCRIPT(JUMP_HAPPY_FUNC), ALERT_CUE(5), AWAIT_CUE(6), - { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 0), AWAIT_CUE(6), HALT, }; @@ -817,10 +817,10 @@ static const struct ScriptCommand s_gs171_g5_s0_lives2_dlg0[] = { /* 0x8222ec4 * CALL_SCRIPT(NOTICE_FUNC), AWAIT_CUE(7), AWAIT_CUE(7), - ROTATE(1, 10, DIRECTION_NORTH), + ROTATE_TO(1, DIR_TRANS_10, DIRECTION_NORTH), AWAIT_CUE(7), WAIT(5), - ROTATE(4, 10, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTH), AWAIT_CUE(7), HALT, }; @@ -835,7 +835,7 @@ static const struct ScriptCommand s_gs171_g5_s0_lives3_dlg0[] = { /* 0x8222fb4 * WAIT(30), SELECT_ANIMATION(2), WAIT(30), - ROTATE(10, 10, DIRECTION_SOUTH), + ROTATE_TO(10, DIR_TRANS_10, DIRECTION_SOUTH), ALERT_CUE(5), AWAIT_CUE(8), HALT, @@ -855,10 +855,10 @@ static const struct ScriptCommand s_gs171_g5_s0_lives4_dlg0[] = { /* 0x8223084 * ALERT_CUE(5), AWAIT_CUE(9), WAIT(7), - ROTATE(1, 10, DIRECTION_NORTH), + ROTATE_TO(1, DIR_TRANS_10, DIRECTION_NORTH), AWAIT_CUE(9), WAIT(2), - ROTATE(4, 10, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHEAST), AWAIT_CUE(9), HALT, }; @@ -877,10 +877,10 @@ static const struct ScriptCommand s_gs171_g5_s0_lives5_dlg0[] = { /* 0x82231b4 * ALERT_CUE(5), AWAIT_CUE(11), WAIT(7), - ROTATE(1, 10, DIRECTION_NORTH), + ROTATE_TO(1, DIR_TRANS_10, DIRECTION_NORTH), AWAIT_CUE(11), WAIT(3), - ROTATE(4, 10, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHEAST), AWAIT_CUE(11), HALT, }; @@ -897,10 +897,10 @@ static const struct ScriptCommand s_gs171_g5_s0_lives6_dlg0[] = { /* 0x82232e4 * { 0x89, 0x08, 0x0100, 0x00000007, 0x00000000, NULL }, AWAIT_CUE(12), WAIT(5), - ROTATE(1, 10, DIRECTION_NORTH), + ROTATE_TO(1, DIR_TRANS_10, DIRECTION_NORTH), AWAIT_CUE(12), WAIT(6), - ROTATE(4, 10, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHWEST), AWAIT_CUE(12), HALT, }; @@ -917,10 +917,10 @@ static const struct ScriptCommand s_gs171_g5_s0_lives7_dlg0[] = { /* 0x82233f4 * { 0x89, 0x08, 0x0100, 0x00000002, 0x00000000, NULL }, AWAIT_CUE(13), WAIT(6), - ROTATE(1, 10, DIRECTION_NORTH), + ROTATE_TO(1, DIR_TRANS_10, DIRECTION_NORTH), AWAIT_CUE(13), WAIT(10), - ROTATE(4, 10, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_EAST), AWAIT_CUE(13), HALT, }; @@ -936,10 +936,10 @@ static const struct ScriptCommand s_gs171_g5_s0_lives8_dlg0[] = { /* 0x8223504 * { 0x89, 0x08, 0x0100, 0x00000006, 0x00000000, NULL }, AWAIT_CUE(16), WAIT(3), - ROTATE(1, 10, DIRECTION_NORTH), + ROTATE_TO(1, DIR_TRANS_10, DIRECTION_NORTH), AWAIT_CUE(16), WAIT(8), - ROTATE(4, 10, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_WEST), AWAIT_CUE(16), HALT, }; @@ -953,10 +953,10 @@ static const struct ScriptCommand s_gs171_g5_s0_lives9_dlg0[] = { /* 0x8223604 * { 0x89, 0x08, 0x0100, 0x00000004, 0x00000000, NULL }, AWAIT_CUE(15), WAIT(5), - ROTATE(1, 10, DIRECTION_NORTH), + ROTATE_TO(1, DIR_TRANS_10, DIRECTION_NORTH), AWAIT_CUE(15), WAIT(11), - ROTATE(4, 10, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), AWAIT_CUE(15), HALT, }; @@ -972,10 +972,10 @@ static const struct ScriptCommand s_gs171_g5_s0_lives10_dlg0[] = { /* 0x82236e4 { 0x89, 0x08, 0x0100, 0x00000005, 0x00000000, NULL }, AWAIT_CUE(14), WAIT(4), - ROTATE(1, 10, DIRECTION_NORTH), + ROTATE_TO(1, DIR_TRANS_10, DIRECTION_NORTH), AWAIT_CUE(14), WAIT(7), - ROTATE(4, 10, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHWEST), AWAIT_CUE(14), HALT, }; @@ -991,10 +991,10 @@ static const struct ScriptCommand s_gs171_g5_s0_lives11_dlg0[] = { /* 0x82237e4 { 0x89, 0x08, 0x0100, 0x00000003, 0x00000000, NULL }, AWAIT_CUE(17), WAIT(4), - ROTATE(1, 10, DIRECTION_NORTH), + ROTATE_TO(1, DIR_TRANS_10, DIRECTION_NORTH), AWAIT_CUE(17), WAIT(12), - ROTATE(4, 10, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHEAST), AWAIT_CUE(17), HALT, }; @@ -1008,10 +1008,10 @@ static const struct ScriptCommand s_gs171_g5_s0_lives12_dlg0[] = { /* 0x82238e4 { 0x89, 0x08, 0x0100, 0x00000007, 0x00000000, NULL }, AWAIT_CUE(18), WAIT(4), - ROTATE(1, 10, DIRECTION_NORTH), + ROTATE_TO(1, DIR_TRANS_10, DIRECTION_NORTH), AWAIT_CUE(18), WAIT(9), - ROTATE(4, 10, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHWEST), AWAIT_CUE(18), HALT, }; @@ -1027,10 +1027,10 @@ static const struct ScriptCommand s_gs171_g5_s0_lives13_dlg0[] = { /* 0x82239c4 { 0x89, 0x08, 0x0100, 0x00000004, 0x00000000, NULL }, AWAIT_CUE(19), WAIT(5), - ROTATE(1, 10, DIRECTION_NORTH), + ROTATE_TO(1, DIR_TRANS_10, DIRECTION_NORTH), AWAIT_CUE(19), WAIT(9), - ROTATE(4, 10, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), AWAIT_CUE(19), HALT, }; @@ -1045,10 +1045,10 @@ static const struct ScriptCommand s_gs171_g5_s0_lives14_dlg0[] = { /* 0x8223ac4 { 0x89, 0x08, 0x0100, 0x00000004, 0x00000000, NULL }, AWAIT_CUE(20), WAIT(3), - ROTATE(1, 10, DIRECTION_NORTH), + ROTATE_TO(1, DIR_TRANS_10, DIRECTION_NORTH), AWAIT_CUE(20), WAIT(5), - ROTATE(4, 10, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), AWAIT_CUE(20), HALT, }; @@ -1137,7 +1137,7 @@ static const struct ScriptCommand s_gs171_g6_s0_lives0_dlg0[] = { /* 0x8223d40 * ALERT_CUE(13), CALL_LABEL(2), ALERT_CUE(6), - ROTATE(4, 10, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHWEST), WAIT(120), PORTRAIT(PLACEMENT_TOP_LEFT, 0x0008, 0x00000000), MSG_NPC(8, _(" I'll secure him so he can't\nget away.")), @@ -1231,15 +1231,15 @@ static const struct ScriptCommand s_gs171_g6_s0_lives0_dlg0[] = { /* 0x8223d40 * VARIANT(/* == */ 1, _(" ...!{WAIT_PRESS} {NAME_0}...!{WAIT_PRESS}\nYour body...{WAIT_PRESS} What's happening?")), VARIANT_DEFAULT(_(" ...!{WAIT_PRESS} {NAME_0}...!{WAIT_PRESS}\nYour body...{WAIT_PRESS} What's happening to you?")), TEXTBOX_CLEAR, - ROTATE(10, 10, DIRECTION_NORTH), + ROTATE_TO(10, DIR_TRANS_10, DIRECTION_NORTH), WAIT(30), { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("{NAME_1}...") }, TEXTBOX_CLEAR, - ROTATE(10, 10, DIRECTION_NORTHWEST), + ROTATE_TO(10, DIR_TRANS_10, DIRECTION_NORTHWEST), WAIT(30), - ROTATE(10, 10, DIRECTION_NORTHEAST), + ROTATE_TO(10, DIR_TRANS_10, DIRECTION_NORTHEAST), WAIT(30), - ROTATE(10, 10, DIRECTION_NORTH), + ROTATE_TO(10, DIR_TRANS_10, DIRECTION_NORTH), WAIT(30), { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("And, everyone...{WAIT_PRESS} I'm sorry.{WAIT_PRESS}\nBut I have to leave.") }, TEXTBOX_CLEAR, @@ -1389,13 +1389,13 @@ static const struct ScriptCommand s_gs171_g6_s0_lives1_dlg0[] = { /* 0x8225528 * { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, AWAIT_CUE(6), - ROTATE(4, 10, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHWEST), AWAIT_CUE(6), WAIT(15), WALK_GRID(179, 0), - ROTATE(4, 10, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHWEST), AWAIT_CUE(6), - ROTATE(4, 10, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTH), AWAIT_CUE(6), CALL_SCRIPT(JUMP_SURPRISE_FUNC), ALERT_CUE(5), @@ -1409,7 +1409,7 @@ static const struct ScriptCommand s_gs171_g6_s0_lives1_dlg0[] = { /* 0x8225528 * WALK_RELATIVE(51, 0, 10), AWAIT_CUE(6), WAIT(110), - ROTATE(12, 10, DIRECTION_NORTH), + ROTATE_TO(12, DIR_TRANS_10, DIRECTION_NORTH), WAIT(40), { 0x89, 0x50, 0x004c, 0x00000004, 0x00000000, NULL }, WAIT(10), @@ -1431,10 +1431,10 @@ static const struct ScriptCommand s_gs171_g6_s0_lives2_dlg0[] = { /* 0x8225728 * CALL_SCRIPT(SMILE_END_FUNC), AWAIT_CUE(7), WAIT(5), - ROTATE(4, 10, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHWEST), AWAIT_CUE(7), WALK_GRID(179, 1), - ROTATE(4, 10, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_WEST), AWAIT_CUE(7), AWAIT_CUE(7), WAIT(30), @@ -1453,7 +1453,7 @@ static const struct ScriptCommand s_gs171_g6_s0_lives2_dlg0[] = { /* 0x8225728 * CALL_SCRIPT(SMILE_END_FUNC), AWAIT_CUE(7), WAIT(2), - ROTATE(4, 10, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTH), AWAIT_CUE(7), CALL_SCRIPT(NOTICE_FUNC), AWAIT_CUE(7), @@ -1463,10 +1463,10 @@ static const struct ScriptCommand s_gs171_g6_s0_lives2_dlg0[] = { /* 0x8225728 * WALK_RELATIVE(256, 0, 8), AWAIT_CUE(7), WAIT(170), - ROTATE(12, 10, DIRECTION_NORTH), + ROTATE_TO(12, DIR_TRANS_10, DIRECTION_NORTH), WAIT(25), WALK_RELATIVE(128, 16, -16), - ROTATE(4, 10, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), AWAIT_CUE(7), AWAIT_CUE(7), HALT, @@ -1481,7 +1481,7 @@ static const struct ScriptCommand s_gs171_g6_s0_lives3_dlg0[] = { /* 0x8225a58 * WALK_RELATIVE(128, 0, 12), AWAIT_CUE(8), WAIT(260), - ROTATE(12, 1, DIRECTION_NORTH), + ROTATE_TO(12, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTH), AWAIT_CUE(8), HALT, }; @@ -1500,40 +1500,40 @@ static const struct ScriptCommand s_gs171_g6_s0_lives4_dlg0[] = { /* 0x8225b08 * AWAIT_CUE(9), { 0x7e, 0x00, 0x004c, 0x00000000, -0x00000028, NULL }, CALL_SCRIPT(JUMP_SURPRISE_FUNC), - ROTATE(4, 10, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHWEST), WAIT(15), - ROTATE(4, 2, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTHEAST), { 0x56, 0x00, 0x0000, 0x00000047, 0x00000000, NULL }, AWAIT_CUE(9), CALL_SCRIPT(JUMP_SURPRISE_FUNC), LABEL(0), /* = 0x00 */ - ROTATE(4, 10, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTH), WAIT(10), - ROTATE(4, 10, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHEAST), WAIT(10), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 1), JUMP_LABEL(0), LABEL(1), /* = 0x01 */ WAIT(30), - ROTATE(4, 10, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHEAST), CALL_SCRIPT(JUMP_SURPRISE_FUNC), ALERT_CUE(5), AWAIT_CUE(9), WAIT(10), CALL_SCRIPT(JUMP_SURPRISE_FUNC), - ROTATE(4, 10, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHWEST), WAIT(30), LABEL(2), /* = 0x02 */ - ROTATE(4, 10, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHEAST), WAIT(30), - ROTATE(4, 2, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_EAST), WAIT(60), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 3), - ROTATE(4, 10, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHWEST), WAIT(50), - ROTATE(4, 10, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHWEST), WAIT(50), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 3), @@ -1542,13 +1542,13 @@ static const struct ScriptCommand s_gs171_g6_s0_lives4_dlg0[] = { /* 0x8225b08 * WAIT(1), AWAIT_CUE(9), WAIT(4), - ROTATE(4, 10, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTH), AWAIT_CUE(9), WAIT(6), WALK_RELATIVE(256, 0, 10), AWAIT_CUE(9), WAIT(170), - ROTATE(12, 2, DIRECTION_NORTH), + ROTATE_TO(12, DIR_TRANS_SPINLEFT1, DIRECTION_NORTH), AWAIT_CUE(9), WAIT(30), WALK_RELATIVE(179, 0, -16), @@ -1567,14 +1567,14 @@ static const struct ScriptCommand s_gs171_g6_s0_lives5_dlg0[] = { /* 0x8225f38 * CALL_SCRIPT(SMILE_END_FUNC), AWAIT_CUE(11), WAIT(7), - ROTATE(4, 10, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), AWAIT_CUE(11), WALK_GRID(179, 2), - ROTATE(4, 10, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), AWAIT_CUE(11), AWAIT_CUE(11), AWAIT_CUE(11), - ROTATE(10, 10, DIRECTION_SOUTHEAST), + ROTATE_TO(10, DIR_TRANS_10, DIRECTION_SOUTHEAST), CALL_SCRIPT(NOTICE_FUNC), ALERT_CUE(5), AWAIT_CUE(11), @@ -1583,10 +1583,10 @@ static const struct ScriptCommand s_gs171_g6_s0_lives5_dlg0[] = { /* 0x8225f38 * AWAIT_CUE(11), WAIT(2), WALK_RELATIVE(204, 0, 10), - ROTATE(4, 10, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHEAST), AWAIT_CUE(11), WAIT(120), - ROTATE(12, 2, DIRECTION_NORTH), + ROTATE_TO(12, DIR_TRANS_SPINLEFT1, DIRECTION_NORTH), AWAIT_CUE(11), WAIT(60), WALK_RELATIVE(179, 0, -16), @@ -1608,18 +1608,18 @@ static const struct ScriptCommand s_gs171_g6_s0_lives6_dlg0[] = { /* 0x8226168 * CALL_SCRIPT(SMILE_END_FUNC), AWAIT_CUE(12), WAIT(4), - ROTATE(4, 10, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHWEST), AWAIT_CUE(12), WAIT(30), WALK_GRID(179, 4), - ROTATE(4, 10, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHWEST), AWAIT_CUE(12), CALL_SCRIPT(SMILE_START_FUNC), AWAIT_CUE(12), CALL_SCRIPT(SMILE_END_FUNC), AWAIT_CUE(12), WAIT(3), - ROTATE(4, 10, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTH), AWAIT_CUE(12), AWAIT_CUE(12), CALL_SCRIPT(JUMP_SURPRISE_FUNC), @@ -1628,7 +1628,7 @@ static const struct ScriptCommand s_gs171_g6_s0_lives6_dlg0[] = { /* 0x8226168 * WALK_RELATIVE(256, 0, 8), AWAIT_CUE(12), WAIT(190), - ROTATE(12, 1, DIRECTION_NORTH), + ROTATE_TO(12, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTH), WALK_RELATIVE(76, 0, -16), AWAIT_CUE(12), AWAIT_CUE(12), @@ -1648,7 +1648,7 @@ static const struct ScriptCommand s_gs171_g6_s0_lives7_dlg0[] = { /* 0x82263c8 * WAIT(35), WALK_RELATIVE(256, 0, -64), WALK_RELATIVE(256, 16, 0), - ROTATE(4, 10, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHEAST), AWAIT_CUE(13), CALL_SCRIPT(SMILE_START_FUNC), AWAIT_CUE(13), @@ -1672,7 +1672,7 @@ static const struct ScriptCommand s_gs171_g6_s0_lives7_dlg0[] = { /* 0x82263c8 * CALL_SCRIPT(SMILE_END_FUNC), AWAIT_CUE(13), WAIT(5), - ROTATE(4, 10, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTH), AWAIT_CUE(13), CALL_SCRIPT(NOTICE_FUNC), AWAIT_CUE(13), @@ -1680,7 +1680,7 @@ static const struct ScriptCommand s_gs171_g6_s0_lives7_dlg0[] = { /* 0x82263c8 * WALK_RELATIVE(179, 0, 6), AWAIT_CUE(13), WAIT(200), - ROTATE(12, 2, DIRECTION_NORTH), + ROTATE_TO(12, DIR_TRANS_SPINLEFT1, DIRECTION_NORTH), AWAIT_CUE(13), WAIT(10), WALK_RELATIVE(76, 0, -16), @@ -1698,14 +1698,14 @@ static const struct ScriptCommand s_gs171_g6_s0_lives8_dlg0[] = { /* 0x82266e8 * CALL_SCRIPT(SMILE_END_FUNC), AWAIT_CUE(16), WAIT(2), - ROTATE(4, 10, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHWEST), AWAIT_CUE(16), CALL_SCRIPT(NOTICE_FUNC), ALERT_CUE(5), AWAIT_CUE(16), WAIT(40), WALK_GRID(179, 6), - ROTATE(4, 10, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_WEST), AWAIT_CUE(16), AWAIT_CUE(16), WAIT(45), @@ -1724,16 +1724,16 @@ static const struct ScriptCommand s_gs171_g6_s0_lives8_dlg0[] = { /* 0x82266e8 * CALL_SCRIPT(SMILE_END_FUNC), AWAIT_CUE(16), WAIT(5), - ROTATE(4, 10, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHWEST), AWAIT_CUE(16), CALL_SCRIPT(NOTICE_FUNC), AWAIT_CUE(16), WAIT(6), WALK_RELATIVE(256, 0, 8), - ROTATE(4, 10, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHWEST), AWAIT_CUE(16), WAIT(170), - ROTATE(12, 1, DIRECTION_NORTHWEST), + ROTATE_TO(12, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTHWEST), AWAIT_CUE(16), WAIT(40), WALK_RELATIVE(179, 0, -16), @@ -1755,26 +1755,26 @@ static const struct ScriptCommand s_gs171_g6_s0_lives9_dlg0[] = { /* 0x8226a08 * CALL_SCRIPT(SMILE_END_FUNC), AWAIT_CUE(14), WAIT(6), - ROTATE(4, 10, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHWEST), AWAIT_CUE(14), WAIT(40), WALK_GRID(179, 7), - ROTATE(4, 10, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHWEST), AWAIT_CUE(14), CALL_SCRIPT(SMILE_START_FUNC), AWAIT_CUE(14), CALL_SCRIPT(SMILE_END_FUNC), AWAIT_CUE(14), WAIT(2), - ROTATE(4, 10, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHWEST), AWAIT_CUE(14), AWAIT_CUE(14), WAIT(3), WALK_RELATIVE(256, 0, 8), - ROTATE(4, 10, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHWEST), AWAIT_CUE(14), WAIT(120), - ROTATE(12, 1, DIRECTION_NORTH), + ROTATE_TO(12, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTH), AWAIT_CUE(14), WAIT(40), WALK_RELATIVE(179, 0, -16), @@ -1793,23 +1793,23 @@ static const struct ScriptCommand s_gs171_g6_s0_lives10_dlg0[] = { /* 0x8226c68 CALL_SCRIPT(SMILE_END_FUNC), AWAIT_CUE(15), WAIT(8), - ROTATE(4, 10, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHWEST), AWAIT_CUE(15), WAIT(40), WALK_GRID(179, 10), - ROTATE(4, 10, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHWEST), AWAIT_CUE(15), AWAIT_CUE(15), AWAIT_CUE(15), WAIT(7), - ROTATE(4, 10, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHWEST), AWAIT_CUE(15), AWAIT_CUE(15), WALK_RELATIVE(256, 0, 8), - ROTATE(4, 10, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHWEST), AWAIT_CUE(15), WAIT(90), - ROTATE(12, 1, DIRECTION_NORTH), + ROTATE_TO(12, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTH), AWAIT_CUE(15), WAIT(55), WALK_RELATIVE(102, 0, -16), @@ -1827,27 +1827,27 @@ static const struct ScriptCommand s_gs171_g6_s0_lives11_dlg0[] = { /* 0x8226e68 CALL_SCRIPT(SMILE_END_FUNC), AWAIT_CUE(17), WAIT(7), - ROTATE(4, 10, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), AWAIT_CUE(17), WAIT(10), WALK_GRID(179, 3), - ROTATE(4, 10, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_EAST), AWAIT_CUE(17), CALL_SCRIPT(SMILE_START_FUNC), AWAIT_CUE(17), CALL_SCRIPT(SMILE_END_FUNC), AWAIT_CUE(17), WAIT(7), - ROTATE(4, 10, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHEAST), AWAIT_CUE(17), CALL_SCRIPT(SHOCK_FUNC), AWAIT_CUE(17), WAIT(6), WALK_RELATIVE(256, 0, 8), - ROTATE(4, 10, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHEAST), AWAIT_CUE(17), WAIT(170), - ROTATE(12, 2, DIRECTION_NORTH), + ROTATE_TO(12, DIR_TRANS_SPINLEFT1, DIRECTION_NORTH), AWAIT_CUE(17), WAIT(40), WALK_RELATIVE(128, 0, -16), @@ -1865,16 +1865,16 @@ static const struct ScriptCommand s_gs171_g6_s0_lives12_dlg0[] = { /* 0x8227098 CALL_SCRIPT(SMILE_END_FUNC), AWAIT_CUE(18), WAIT(4), - ROTATE(4, 10, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHWEST), AWAIT_CUE(18), WAIT(35), WALK_GRID(179, 5), - ROTATE(4, 10, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHWEST), AWAIT_CUE(18), AWAIT_CUE(18), AWAIT_CUE(18), WAIT(5), - ROTATE(4, 10, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHWEST), AWAIT_CUE(18), CALL_SCRIPT(NOTICE_FUNC), AWAIT_CUE(18), @@ -1882,10 +1882,10 @@ static const struct ScriptCommand s_gs171_g6_s0_lives12_dlg0[] = { /* 0x8227098 AWAIT_CUE(18), WAIT(10), WALK_RELATIVE(179, 0, 6), - ROTATE(4, 10, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHWEST), AWAIT_CUE(18), WAIT(210), - ROTATE(12, 1, DIRECTION_NORTH), + ROTATE_TO(12, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTH), AWAIT_CUE(18), WAIT(25), WALK_RELATIVE(179, 0, -16), @@ -1903,11 +1903,11 @@ static const struct ScriptCommand s_gs171_g6_s0_lives13_dlg0[] = { /* 0x82272c8 CALL_SCRIPT(SMILE_END_FUNC), AWAIT_CUE(19), WAIT(7), - ROTATE(4, 10, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHWEST), AWAIT_CUE(19), WAIT(45), WALK_GRID(179, 8), - ROTATE(4, 10, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHEAST), AWAIT_CUE(19), CALL_SCRIPT(SMILE_START_FUNC), AWAIT_CUE(19), @@ -1928,15 +1928,15 @@ static const struct ScriptCommand s_gs171_g6_s0_lives13_dlg0[] = { /* 0x82272c8 CALL_SCRIPT(SMILE_END_FUNC), AWAIT_CUE(19), WAIT(5), - ROTATE(4, 10, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHEAST), AWAIT_CUE(19), CALL_SCRIPT(NOTICE_FUNC), AWAIT_CUE(19), WALK_RELATIVE(256, 0, 12), - ROTATE(4, 10, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHEAST), AWAIT_CUE(19), WAIT(120), - ROTATE(12, 2, DIRECTION_NORTH), + ROTATE_TO(12, DIR_TRANS_SPINLEFT1, DIRECTION_NORTH), AWAIT_CUE(19), WAIT(50), WALK_RELATIVE(102, 0, -16), @@ -1954,11 +1954,11 @@ static const struct ScriptCommand s_gs171_g6_s0_lives14_dlg0[] = { /* 0x82275c8 CALL_SCRIPT(SMILE_END_FUNC), AWAIT_CUE(19), WAIT(5), - ROTATE(4, 10, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), AWAIT_CUE(19), WAIT(40), WALK_GRID(179, 9), - ROTATE(4, 10, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHWEST), AWAIT_CUE(19), CALL_SCRIPT(SMILE_START_FUNC), AWAIT_CUE(19), @@ -1979,15 +1979,15 @@ static const struct ScriptCommand s_gs171_g6_s0_lives14_dlg0[] = { /* 0x82275c8 CALL_SCRIPT(SMILE_END_FUNC), AWAIT_CUE(19), WAIT(7), - ROTATE(4, 10, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHWEST), AWAIT_CUE(19), AWAIT_CUE(19), WAIT(2), WALK_RELATIVE(256, 0, 8), - ROTATE(4, 10, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHWEST), AWAIT_CUE(19), WAIT(130), - ROTATE(12, 1, DIRECTION_NORTH), + ROTATE_TO(12, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTH), AWAIT_CUE(19), WAIT(60), WALK_RELATIVE(179, 0, -16), @@ -2230,7 +2230,7 @@ static const struct ScriptCommand s_gs171_g7_s0_lives2_dlg0[] = { /* 0x8228a14 * { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(7), WAIT_RANDOM(0, 15), - ROTATE(4, 10, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHWEST), AWAIT_CUE(7), HALT, }; @@ -2244,7 +2244,7 @@ static const struct ScriptCommand s_gs171_g7_s0_lives3_dlg0[] = { /* 0x8228ab4 * ALERT_CUE(5), AWAIT_CUE(8), WAIT_RANDOM(0, 15), - ROTATE(4, 10, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTH), AWAIT_CUE(8), HALT, }; @@ -2255,7 +2255,7 @@ static const struct ScriptCommand s_gs171_g7_s0_lives4_dlg0[] = { /* 0x8228b64 * { 0x2d, 0x07, 0x0004, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(9), WAIT_RANDOM(0, 15), - ROTATE(4, 10, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHEAST), AWAIT_CUE(9), HALT, }; @@ -2266,7 +2266,7 @@ static const struct ScriptCommand s_gs171_g7_s0_lives5_dlg0[] = { /* 0x8228be4 * { 0x2d, 0x07, 0x0006, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(11), WAIT_RANDOM(0, 15), - ROTATE(4, 10, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHEAST), AWAIT_CUE(11), HALT, }; @@ -2277,7 +2277,7 @@ static const struct ScriptCommand s_gs171_g7_s0_lives6_dlg0[] = { /* 0x8228c64 * { 0x2d, 0x07, 0x0007, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(12), WAIT_RANDOM(0, 15), - ROTATE(4, 10, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHWEST), AWAIT_CUE(12), HALT, }; @@ -2288,7 +2288,7 @@ static const struct ScriptCommand s_gs171_g7_s0_lives7_dlg0[] = { /* 0x8228ce4 * { 0x2d, 0x07, 0x0008, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(13), WAIT_RANDOM(0, 15), - ROTATE(4, 10, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_EAST), AWAIT_CUE(13), HALT, }; @@ -2298,7 +2298,7 @@ static const struct ScriptCommand s_gs171_g7_s0_lives8_dlg0[] = { /* 0x8228d64 * SELECT_ANIMATION(2), AWAIT_CUE(16), WAIT_RANDOM(0, 15), - ROTATE(4, 10, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHWEST), AWAIT_CUE(16), HALT, }; @@ -2308,7 +2308,7 @@ static const struct ScriptCommand s_gs171_g7_s0_lives9_dlg0[] = { /* 0x8228dd4 * SELECT_ANIMATION(2), AWAIT_CUE(14), WAIT_RANDOM(0, 15), - ROTATE(4, 10, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHEAST), AWAIT_CUE(14), HALT, }; @@ -2318,7 +2318,7 @@ static const struct ScriptCommand s_gs171_g7_s0_lives10_dlg0[] = { /* 0x8228e44 SELECT_ANIMATION(2), AWAIT_CUE(15), WAIT_RANDOM(0, 15), - ROTATE(4, 10, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHEAST), AWAIT_CUE(15), HALT, }; @@ -2328,7 +2328,7 @@ static const struct ScriptCommand s_gs171_g7_s0_lives11_dlg0[] = { /* 0x8228eb4 SELECT_ANIMATION(2), AWAIT_CUE(17), WAIT_RANDOM(0, 15), - ROTATE(4, 10, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHWEST), AWAIT_CUE(17), HALT, }; @@ -2338,7 +2338,7 @@ static const struct ScriptCommand s_gs171_g7_s0_lives12_dlg0[] = { /* 0x8228f24 SELECT_ANIMATION(2), AWAIT_CUE(18), WAIT_RANDOM(0, 15), - ROTATE(4, 10, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_WEST), AWAIT_CUE(18), HALT, }; @@ -2348,7 +2348,7 @@ static const struct ScriptCommand s_gs171_g7_s0_lives13_dlg0[] = { /* 0x8228f94 SELECT_ANIMATION(2), AWAIT_CUE(19), WAIT_RANDOM(0, 15), - ROTATE(4, 10, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHEAST), AWAIT_CUE(19), HALT, }; @@ -2358,7 +2358,7 @@ static const struct ScriptCommand s_gs171_g7_s0_lives14_dlg0[] = { /* 0x8229004 SELECT_ANIMATION(2), AWAIT_CUE(19), WAIT_RANDOM(0, 15), - ROTATE(4, 10, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHEAST), AWAIT_CUE(19), HALT, }; diff --git a/src/data/ground/ground_data_a04p04_station.h b/src/data/ground/ground_data_a04p04_station.h index 7f7f137ec..cf7025057 100644 --- a/src/data/ground/ground_data_a04p04_station.h +++ b/src/data/ground/ground_data_a04p04_station.h @@ -144,9 +144,9 @@ static const struct ScriptCommand s_gs174_g1_s1_lives0_dlg0[] = { /* 0x822abd8 * ALERT_CUE(5), AWAIT_CUE(9), WALK_RELATIVE(128, 16, 32), - ROTATE(8, 10, DIRECTION_WEST), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_WEST), WAIT(60), - ROTATE(10, 10, DIRECTION_EAST), + ROTATE_TO(10, DIR_TRANS_10, DIRECTION_EAST), WAIT(45), { 0x54, 0x00, 0x001f, 0x00000000, 0x00000000, NULL }, ALERT_CUE(5), @@ -154,23 +154,23 @@ static const struct ScriptCommand s_gs174_g1_s1_lives0_dlg0[] = { /* 0x822abd8 * SELECT_ANIMATION(2), ALERT_CUE(5), AWAIT_CUE(9), - ROTATE(6, 10, DIRECTION_NORTH), + ROTATE_TO(6, DIR_TRANS_10, DIRECTION_NORTH), WAIT(20), - ROTATE(6, 10, DIRECTION_SOUTH), + ROTATE_TO(6, DIR_TRANS_10, DIRECTION_SOUTH), WAIT(20), - ROTATE(6, 10, DIRECTION_EAST), + ROTATE_TO(6, DIR_TRANS_10, DIRECTION_EAST), ALERT_CUE(5), AWAIT_CUE(9), - ROTATE(6, 10, DIRECTION_NORTH), + ROTATE_TO(6, DIR_TRANS_10, DIRECTION_NORTH), WAIT(20), - ROTATE(6, 10, DIRECTION_SOUTH), + ROTATE_TO(6, DIR_TRANS_10, DIRECTION_SOUTH), WAIT(20), - ROTATE(6, 10, DIRECTION_EAST), + ROTATE_TO(6, DIR_TRANS_10, DIRECTION_EAST), WAIT(60), { 0x89, 0x10, 0x0100, 0x00000002, 0x00000000, NULL }, ALERT_CUE(5), AWAIT_CUE(9), - ROTATE(4, 10, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_WEST), ALERT_CUE(5), AWAIT_CUE(9), { 0x89, 0x50, 0x0099, 0x00000002, 0x00000000, NULL }, diff --git a/src/data/ground/ground_data_b01p01a_station.h b/src/data/ground/ground_data_b01p01a_station.h index b0632d1d3..08743aa39 100644 --- a/src/data/ground/ground_data_b01p01a_station.h +++ b/src/data/ground/ground_data_b01p01a_station.h @@ -926,7 +926,7 @@ static const struct ScriptCommand s_gs9_g2_s1_lives0_dlg0[] = { /* 0x819e920 */ { 0x36, 0x00, -0x0001, 0x00000000, 0x00000000, _("Flap! Flap!") }, WALK_GRID(256, 3), TEXTBOX_CLEAR, - ROTATE(30, 2, DIRECTION_SOUTH), + ROTATE_TO(30, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTH), WAIT(15), { 0x68, 0x00, 0x0100, 0x00000008, 0x00000000, NULL }, FANFARE_STOP2(451), @@ -940,7 +940,7 @@ static const struct ScriptCommand s_gs9_g2_s1_lives0_dlg0[] = { /* 0x819e920 */ SELECT_ANIMATION(2), { 0x68, 0x00, 0x0100, 0x00000030, 0x00000000, NULL }, WAIT(15), - ROTATE(30, 1, DIRECTION_WEST), + ROTATE_TO(30, DIR_TRANS_SPINRIGHT1, DIRECTION_WEST), WALK_GRID(256, 4), FANFARE_STOP2(451), ALERT_CUE(3), @@ -1261,7 +1261,7 @@ static const struct ScriptCommand s_gs9_g9_s0_lives0_dlg2[] = { /* 0x819fac0 */ LABEL(1), /* = 0x01 */ TEXTBOX_CLEAR, SCENARIO_CALC(SCENARIO_SUB1, 31, 1), - { 0xae, 0x01, 0x000f, 0x00000000, 0x00000000, NULL }, + CMD_UNK_AE(RESCUE_DUNGEON_HOWLING_FOREST), CANCEL_ENTITIES(9, 0), JUMP_SCRIPT(END_TALK), }; @@ -1351,7 +1351,7 @@ static const struct ScriptCommand s_gs9_g14_s0_lives0_dlg2[] = { /* 0x81a002c */ JUMP_SCRIPT(END_TALK), LABEL(1), /* = 0x01 */ SCENARIO_CALC(SCENARIO_SUB7, 49, 1), - { 0xae, 0x01, 0x001b, 0x00000000, 0x00000000, NULL }, + CMD_UNK_AE(RESCUE_DUNGEON_BURIED_RELIC), CANCEL_ENTITIES(14, 0), JUMP_SCRIPT(END_TALK), }; @@ -1439,14 +1439,14 @@ static const struct ScriptCommand s_gs9_g17_s0_lives0_dlg0[] = { /* 0x81a05ac - { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, PORTRAIT(PLACEMENT_LEFT_, 0x0000, 0x00000000), WALK_GRID(256, 7), - ROTATE(4, 1, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_EAST), WAIT(30), MSG_NPC(1, _(" Well, this is the place...")), TEXTBOX_CLEAR, WAIT(30), ALERT_CUE(6), AWAIT_CUE(5), - ROTATE(4, 10, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), WAIT(30), FANFARE_PLAY2(465), CALL_SCRIPT(SHOCK_FUNC), @@ -1484,7 +1484,7 @@ static const struct ScriptCommand s_gs9_g17_s0_lives0_dlg0[] = { /* 0x81a05ac - WAIT(30), ALERT_CUE(6), AWAIT_CUE(5), - ROTATE(8, 10, DIRECTION_NORTH), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_NORTH), PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" This is your {COLOR CYAN}Mailbox{RESET}.{WAIT_PRESS}\nThis is where you'll get mail from\nother Pokémon.")), @@ -1572,7 +1572,7 @@ static const struct ScriptCommand s_gs9_g17_s0_lives0_dlg0[] = { /* 0x81a05ac - TEXTBOX_CLEAR, RENAME_TEAM, WAIT(30), - { 0xb0, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, + SET_RESCUE_CONQUERED(RESCUE_DUNGEON_TINY_WOODS), SCENARIO_CALC(SCENARIO_MAIN, 3, 0), { 0x3b, 0x39, 0x0001, 0x00000000, 0x00000000, NULL }, { 0x3b, 0x39, 0x0004, 0x00000000, 0x00000000, NULL }, @@ -1588,7 +1588,7 @@ static const struct ScriptCommand s_gs9_g17_s0_lives0_dlg0[] = { /* 0x81a05ac - VARIANT_DEFAULT(_(" Rescue Team\n{TEAM_NAME}{RESET}!{WAIT_PRESS}\nLet's do good starting tomorrow!")), TEXTBOX_CLEAR, WAIT(10), - ROTATE(6, 10, DIRECTION_SOUTH), + ROTATE_TO(6, DIR_TRANS_10, DIRECTION_SOUTH), WAIT(20), ALERT_CUE(6), WAIT(1), @@ -1614,21 +1614,21 @@ static const struct ScriptCommand s_gs9_g17_s0_lives1_dlg0[] = { /* 0x81a1e94 - { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000000), WALK_GRID(256, 8), - ROTATE(4, 2, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_WEST), AWAIT_CUE(6), - ROTATE(4, 1, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTH), WAIT(10), ALERT_CUE(5), AWAIT_CUE(6), - ROTATE(4, 2, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_WEST), WAIT(10), ALERT_CUE(5), AWAIT_CUE(6), WALK_GRID(153, 10), - ROTATE(4, 2, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_WEST), ALERT_CUE(5), AWAIT_CUE(6), - ROTATE(4, 2, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTH), WAIT(10), ALERT_CUE(5), { 0xda, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -1769,7 +1769,7 @@ static const struct ScriptCommand s_gs9_g18_s0_lives0_dlg0[] = { /* 0x81a23fc */ ALERT_CUE(4), WAIT(60), WALK_GRID(256, 14), - ROTATE(4, 10, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHWEST), AWAIT_CUE(5), WAIT(30), { 0x3b, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -1849,7 +1849,7 @@ static const struct ScriptCommand s_gs9_g18_s0_lives0_dlg0[] = { /* 0x81a23fc */ WAIT(30), ALERT_CUE(6), AWAIT_CUE(5), - ROTATE(4, 10, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTH), AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x00000000), MSG_NPC(1, _(" If there were any rescue\njobs, we would be getting mail, but...")), @@ -1866,12 +1866,12 @@ static const struct ScriptCommand s_gs9_g18_s0_lives0_dlg0[] = { /* 0x81a23fc */ { 0x36, 0x00, -0x0001, 0x00000000, 0x00000000, _("Flap! Flap!") }, FANFARE_PLAY2(451), ALERT_CUE(6), - ROTATE(4, 10, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_EAST), WAIT(60), TEXTBOX_CLEAR, WAIT(15), ALERT_CUE(6), - ROTATE(30, 10, DIRECTION_SOUTHWEST), + ROTATE_TO(30, DIR_TRANS_10, DIRECTION_SOUTHWEST), AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), @@ -1879,7 +1879,7 @@ static const struct ScriptCommand s_gs9_g18_s0_lives0_dlg0[] = { /* 0x81a23fc */ VARIANT_DEFAULT(_(" Oh?\nI wonder what it could be.")), TEXTBOX_CLEAR, ALERT_CUE(6), - { 0x95, 0x04, 0x000a, 0x0000000f, 0x00000000, NULL }, + CMD_UNK_95(4, DIR_TRANS_10, 15), AWAIT_CUE(5), ALERT_CUE(7), AWAIT_CUE(5), @@ -1912,7 +1912,7 @@ static const struct ScriptCommand s_gs9_g18_s0_lives1_dlg0[] = { /* 0x81a3a10 */ AWAIT_CUE(6), CALL_SCRIPT(LOOK_AROUND_FUNC), WAIT(20), - { 0x93, 0x08, 0x0002, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(8, DIR_TRANS_SPINLEFT1, 0), CALL_SCRIPT(SMILE_START_FUNC), ALERT_CUE(5), AWAIT_CUE(6), @@ -1925,41 +1925,41 @@ static const struct ScriptCommand s_gs9_g18_s0_lives1_dlg0[] = { /* 0x81a3a10 */ CALL_SCRIPT(NOTICE_FUNC), ALERT_CUE(5), AWAIT_CUE(6), - { 0x95, 0x04, 0x000a, 0x0000000c, 0x00000000, NULL }, + CMD_UNK_95(4, DIR_TRANS_10, 12), WALK_GRID(256, 12), - { 0x95, 0x04, 0x000a, 0x0000000d, 0x00000000, NULL }, + CMD_UNK_95(4, DIR_TRANS_10, 13), WALK_GRID(256, 13), - ROTATE(4, 10, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(6), CALL_SCRIPT(NOTICE_FUNC), - { 0x95, 0x04, 0x000a, 0x0000000f, 0x00000000, NULL }, + CMD_UNK_95(4, DIR_TRANS_10, 15), ALERT_CUE(5), AWAIT_CUE(6), - ROTATE(8, 10, DIRECTION_NORTHEAST), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_NORTHEAST), ALERT_CUE(5), AWAIT_CUE(6), - { 0x95, 0x04, 0x000a, 0x0000000f, 0x00000000, NULL }, + CMD_UNK_95(4, DIR_TRANS_10, 15), ALERT_CUE(5), AWAIT_CUE(6), - ROTATE(8, 10, DIRECTION_NORTHEAST), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_NORTHEAST), CALL_SCRIPT(JUMP_HAPPY_FUNC), ALERT_CUE(5), AWAIT_CUE(6), - { 0x95, 0x04, 0x000a, 0x0000000f, 0x00000000, NULL }, + CMD_UNK_95(4, DIR_TRANS_10, 15), ALERT_CUE(5), AWAIT_CUE(6), ALERT_CUE(5), AWAIT_CUE(6), - { 0x95, 0x04, 0x000a, 0x0000000c, 0x00000000, NULL }, + CMD_UNK_95(4, DIR_TRANS_10, 12), WALK_GRID(256, 12), ALERT_CUE(5), - { 0x95, 0x04, 0x000a, 0x0000000b, 0x00000000, NULL }, + CMD_UNK_95(4, DIR_TRANS_10, 11), WALK_GRID(256, 11), - { 0x95, 0x04, 0x000a, 0x0000000f, 0x00000000, NULL }, + CMD_UNK_95(4, DIR_TRANS_10, 15), ALERT_CUE(5), AWAIT_CUE(6), - { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 0), CALL_SCRIPT(SMILE_START_FUNC), ALERT_CUE(5), AWAIT_CUE(6), @@ -1967,13 +1967,13 @@ static const struct ScriptCommand s_gs9_g18_s0_lives1_dlg0[] = { /* 0x81a3a10 */ CALL_SCRIPT(SMILE_END_FUNC), ALERT_CUE(5), AWAIT_CUE(6), - ROTATE(4, 10, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_EAST), AWAIT_CUE(6), - ROTATE(30, 1, DIRECTION_WEST), + ROTATE_TO(30, DIR_TRANS_SPINRIGHT1, DIRECTION_WEST), CALL_SCRIPT(QUESTION_FUNC), AWAIT_CUE(6), ALERT_CUE(5), - { 0x95, 0x04, 0x000a, 0x0000000f, 0x00000000, NULL }, + CMD_UNK_95(4, DIR_TRANS_10, 15), ALERT_CUE(5), AWAIT_CUE(6), HALT, @@ -1987,7 +1987,7 @@ static const struct ScriptCommand s_gs9_g18_s0_lives2_dlg0[] = { /* 0x81a3ef0 */ { 0x60, 0x00, 0x0000, 0x00000030, 0x00000000, NULL }, AWAIT_CUE(7), WALK_GRID(256, 3), - ROTATE(30, 2, DIRECTION_SOUTH), + ROTATE_TO(30, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTH), WAIT(15), { 0x68, 0x00, 0x0100, 0x00000008, 0x00000000, NULL }, FANFARE_STOP2(451), @@ -2004,7 +2004,7 @@ static const struct ScriptCommand s_gs9_g18_s0_lives2_dlg0[] = { /* 0x81a3ef0 */ SELECT_ANIMATION(2), { 0x68, 0x00, 0x0100, 0x00000030, 0x00000000, NULL }, WAIT(15), - ROTATE(30, 1, DIRECTION_WEST), + ROTATE_TO(30, DIR_TRANS_SPINRIGHT1, DIRECTION_WEST), WALK_GRID(256, 4), ALERT_CUE(5), END_DELETE, @@ -2093,7 +2093,7 @@ static const struct ScriptCommand s_gs9_g19_s1_lives1_dlg0[] = { /* 0x81a4504 */ SELECT_ANIMATION(2), { 0x53, 0x00, 0x0000, 0x00000400, 0x00000000, NULL }, { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0x8e, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, + CMD_UNK_8E(1, DIR_TRANS_NONE, 0), AWAIT_CUE(3), RET, }; @@ -2125,7 +2125,7 @@ static const struct ScriptCommand s_gs9_g20_s0_station_sref_script[] = { /* 0x81 DEBUGINFO_O(2266), SELECT_ENTITIES(-1, 0), AWAIT_CUE(3), - { 0xaf, 0x01, 0x0001, 0x00000000, 0x00000000, NULL }, + CMD_UNK_AF(RESCUE_DUNGEON_THUNDERWAVE_CAVE, TRUE), SCENARIO_CALC(SCENARIO_MAIN, 3, 6), { 0x04, 0x00, 0x001e, 0x00000001, 0x00000000, NULL }, RET, @@ -2160,7 +2160,7 @@ static const struct ScriptCommand s_gs9_g20_s0_lives0_dlg0[] = { /* 0x81a48c8 */ VARIANT(/* == */ 1, _(" Maybe it's a rescue job\nrequest?!{WAIT_PRESS}\nCome on, what's it say?")), VARIANT_DEFAULT(_(" Maybe it's a rescue job\noffer!{WAIT_PRESS}\nWhat does it say?")), TEXTBOX_CLEAR, - { 0x8e, 0x1e, 0x0000, 0x00000022, 0x00000000, NULL }, + CMD_UNK_8E(30, DIR_TRANS_NONE, 34), MSG_INSTANT(_("{CENTER_ALIGN}{NAME_0} read the letter.")), TEXTBOX_CLEAR, WAIT(30), @@ -2209,7 +2209,7 @@ static const struct ScriptCommand s_gs9_g20_s0_lives0_dlg0[] = { /* 0x81a48c8 */ VARIANT_DEFAULT(_(" That's the spirit!\nLet's do our best!")), TEXTBOX_CLEAR, ALERT_CUE(6), - ROTATE(4, 10, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTH), WAIT(30), ALERT_CUE(6), { 0x54, 0x00, 0x002a, 0x00000000, 0x00000000, NULL }, @@ -2227,7 +2227,7 @@ static const struct ScriptCommand s_gs9_g20_s0_lives1_dlg0[] = { /* 0x81a50ac */ { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(6), WALK_GRID(256, 16), - { 0x8e, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, + CMD_UNK_8E(1, DIR_TRANS_NONE, 0), ALERT_CUE(5), HALT, }; @@ -2255,7 +2255,7 @@ static const struct ScriptCommand s_gs9_g20_s2_lives0_dlg0[] = { /* 0x81a51fc */ WAIT(20), ALERT_CUE(5), AWAIT_CUE(6), - ROTATE(4, 10, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTH), AWAIT_CUE(6), { 0x54, 0x00, 0x002a, 0x00000000, 0x00000000, NULL }, HALT, @@ -2344,7 +2344,7 @@ static const struct ScriptCommand s_gs9_g22_s1_lives0_dlg0[] = { /* 0x81a56b4 */ PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000000), MSG_NPC(1, _(" {NAME_0}!\nThe dungeon isn't that way.")), TEXTBOX_CLEAR, - { 0x93, 0x08, 0x000a, 0x00000004, 0x00000000, NULL }, + CMD_UNK_93(8, DIR_TRANS_10, 4), WAIT(10), ALERT_CUE(6), AWAIT_CUE(5), @@ -2368,15 +2368,15 @@ static const struct ScriptCommand s_gs9_g22_s1_lives1_dlg0[] = { /* 0x81a5930 */ DEBUGINFO_O(2509), SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0x93, 0x08, 0x000a, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(8, DIR_TRANS_10, 0), WAIT(10), ALERT_CUE(5), AWAIT_CUE(6), - { 0x95, 0x08, 0x000a, 0x00000011, 0x00000000, NULL }, + CMD_UNK_95(8, DIR_TRANS_10, 17), WAIT(10), ALERT_CUE(5), AWAIT_CUE(6), - { 0x93, 0x08, 0x000a, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(8, DIR_TRANS_10, 0), WAIT(10), ALERT_CUE(5), AWAIT_CUE(6), @@ -2401,7 +2401,7 @@ static const struct ScriptCommand s_gs9_g22_s2_lives0_dlg0[] = { /* 0x81a5a7c */ PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000000), MSG_NPC(1, _(" {NAME_0}!\nThe dungeon isn't that way.")), TEXTBOX_CLEAR, - { 0x93, 0x08, 0x000a, 0x00000004, 0x00000000, NULL }, + CMD_UNK_93(8, DIR_TRANS_10, 4), WAIT(10), ALERT_CUE(6), AWAIT_CUE(5), @@ -2425,15 +2425,15 @@ static const struct ScriptCommand s_gs9_g22_s2_lives1_dlg0[] = { /* 0x81a5c1c */ DEBUGINFO_O(2566), SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0x93, 0x08, 0x000a, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(8, DIR_TRANS_10, 0), WAIT(10), ALERT_CUE(5), AWAIT_CUE(6), - { 0x95, 0x08, 0x000a, 0x00000011, 0x00000000, NULL }, + CMD_UNK_95(8, DIR_TRANS_10, 17), WAIT(10), ALERT_CUE(5), AWAIT_CUE(6), - { 0x93, 0x08, 0x000a, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(8, DIR_TRANS_10, 0), WAIT(10), ALERT_CUE(5), AWAIT_CUE(6), @@ -2484,7 +2484,7 @@ static const struct ScriptCommand s_gs9_g23_s0_lives0_dlg0[] = { /* 0x81a5dd8 */ TEXTBOX_CLEAR, ALERT_CUE(6), WAIT(30), - ROTATE(10, 1, DIRECTION_WEST), + ROTATE_TO(10, DIR_TRANS_SPINRIGHT1, DIRECTION_WEST), WAIT(30), ALERT_CUE(3), HALT, @@ -2592,7 +2592,7 @@ static const struct ScriptCommand s_gs9_g25_s0_lives0_dlg0[] = { /* 0x81a6700 */ VARIANT(/* == */ 1, _(" Morning, {NAME_0}!\nYou're up early.")), VARIANT_DEFAULT(_(" Good morning, {NAME_0}!\nAren't you up early?")), TEXTBOX_CLEAR, - { 0x93, 0x04, 0x000a, 0x00000022, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 34), ALERT_CUE(4), AWAIT_CUE(5), ALERT_CUE(6), @@ -2658,7 +2658,7 @@ static const struct ScriptCommand s_gs9_g25_s0_lives1_dlg0[] = { /* 0x81a6f34 */ { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, AWAIT_CUE(6), WALK_GRID(256, 19), - { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 0), ALERT_CUE(5), AWAIT_CUE(6), CALL_SCRIPT(JUMP_HAPPY_FUNC), @@ -2878,7 +2878,7 @@ static const struct ScriptCommand s_gs9_g28_s0_lives0_dlg0[] = { /* 0x81a7c70 */ MSG_NPC(2, _(" Ohhh...\nI was very scared.")), ALERT_CUE(6), ALERT_CUE(8), - { 0x93, 0x04, 0x000a, 0x00000044, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 68), MSG_NPC(2, _(" Maybe because I was\nsomewhere up so high...")), MSG_NPC(2, _(" My feet feel like they're\nstill walking on air...")), TEXTBOX_CLEAR, @@ -2911,13 +2911,13 @@ static const struct ScriptCommand s_gs9_g28_s0_lives0_dlg0[] = { /* 0x81a7c70 */ TEXTBOX_CLEAR, ALERT_CUE(6), ALERT_CUE(8), - ROTATE(4, 2, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_WEST), WAIT_RANDOM(10, 20), - ROTATE(4, 1, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_EAST), WAIT_RANDOM(10, 20), - ROTATE(4, 1, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTH), WAIT_RANDOM(10, 20), - ROTATE(4, 1, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTH), WAIT(45), ALERT_CUE(6), ALERT_CUE(8), @@ -2936,7 +2936,7 @@ static const struct ScriptCommand s_gs9_g28_s0_lives0_dlg0[] = { /* 0x81a7c70 */ ALERT_CUE(8), FANFARE_PLAY2(465), CALL_SCRIPT(SHOCK_FUNC), - ROTATE(4, 10, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHEAST), WAIT(30), MSG_NPC(-1, _(" Hello. {NAME_4} here.")), TEXTBOX_CLEAR, @@ -2951,7 +2951,7 @@ static const struct ScriptCommand s_gs9_g28_s0_lives0_dlg0[] = { /* 0x81a7c70 */ TEXTBOX_CLEAR, WAIT(10), ALERT_CUE(8), - ROTATE(4, 10, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), MSG_NPC(2, _(" Nope!\nIt was scary, but I'm all right.{WAIT_PRESS}\nIt's all thanks to {NAME_0}'s team.")), TEXTBOX_CLEAR, WAIT(10), @@ -2959,7 +2959,7 @@ static const struct ScriptCommand s_gs9_g28_s0_lives0_dlg0[] = { /* 0x81a7c70 */ ALERT_CUE(8), ALERT_CUE(9), WAIT(10), - ROTATE(4, 10, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHEAST), PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0004, 0x00000000), MSG_NPC(4, _(" Thank you for everything.\nYou're heroes.")), TEXTBOX_CLEAR, @@ -3029,7 +3029,7 @@ static const struct ScriptCommand s_gs9_g28_s0_lives0_dlg0[] = { /* 0x81a7c70 */ WAIT(80), ALERT_CUE(8), ALERT_CUE(6), - ROTATE(4, 10, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), AWAIT_CUE(5), PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, 0x0003, 0x00000000), MSG_NPC(3, _(" WE'LL BE ON OUR WAY\nTOO...")), @@ -3044,7 +3044,7 @@ static const struct ScriptCommand s_gs9_g28_s0_lives0_dlg0[] = { /* 0x81a7c70 */ TEXTBOX_CLEAR, WAIT(10), ALERT_CUE(8), - { 0x93, 0x04, 0x000a, 0x00000022, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 34), PORTRAIT_REP(0x0003, 0x00000000), MSG_NPC(3, _(" WHAT IS IT?")), TEXTBOX_CLEAR, @@ -3056,7 +3056,7 @@ static const struct ScriptCommand s_gs9_g28_s0_lives0_dlg0[] = { /* 0x81a7c70 */ VARIANT_DEFAULT(_(" Uh...{WAIT_PRESS}\nWould you like to join our team?")), TEXTBOX_CLEAR, WAIT(10), - ROTATE(4, 10, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), MSG_NPC(3, _(" JOIN YOUR TEAM?")), TEXTBOX_CLEAR, WAIT(10), @@ -3066,7 +3066,7 @@ static const struct ScriptCommand s_gs9_g28_s0_lives0_dlg0[] = { /* 0x81a7c70 */ TEXTBOX_CLEAR, WAIT(10), ALERT_CUE(6), - { 0x93, 0x04, 0x000a, 0x00000022, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 34), AWAIT_CUE(5), PORTRAIT(PLACEMENT_TOP_RIGHT, 0x0001, 0x00000000), ASK3_VAR(FALSE, /*default*/ -1, /* speaker */ 1, PARTNER_TALK_KIND), @@ -3149,7 +3149,7 @@ static const struct ScriptCommand s_gs9_g28_s0_lives0_dlg0[] = { /* 0x81a7c70 */ LABEL(27), /* = 0x1b */ UPDATE_VARINT(CALC_SET, EVENT_LOCAL, 0), ALERT_CUE(6), - ROTATE(4, 10, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), AWAIT_CUE(5), PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000009), MSG_VAR(2, PARTNER_TALK_KIND, 1), @@ -3185,7 +3185,7 @@ static const struct ScriptCommand s_gs9_g28_s0_lives0_dlg0[] = { /* 0x81a7c70 */ WAIT(10), ALERT_CUE(8), AWAIT_CUE(5), - ROTATE(12, 1, DIRECTION_SOUTH), + ROTATE_TO(12, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTH), AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x00000005), MSG_NPC(1, _(" That is too bad.")), @@ -3193,7 +3193,7 @@ static const struct ScriptCommand s_gs9_g28_s0_lives0_dlg0[] = { /* 0x81a7c70 */ WAIT(10), ALERT_CUE(6), AWAIT_CUE(5), - { 0x93, 0x04, 0x000a, 0x00000022, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 34), PORTRAIT_REP(0x0001, 0x00000004), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" I guess we need somewhere\nPokémon can live if we want them to\njoin the rescue team...")), @@ -3263,35 +3263,35 @@ static const struct ScriptCommand s_gs9_g28_s0_lives1_dlg0[] = { /* 0x81aa778 */ SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(6), - ROTATE(4, 10, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHWEST), AWAIT_CUE(6), CALL_SCRIPT(SWEAT_FUNC), AWAIT_CUE(6), - ROTATE(4, 1, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTHEAST), WAIT_RANDOM(10, 20), - ROTATE(4, 2, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTHWEST), WAIT(15), - ROTATE(4, 1, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_EAST), WAIT(15), - ROTATE(4, 2, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_NORTH), AWAIT_CUE(6), FANFARE_PLAY2(469), CALL_SCRIPT(QUESTION_FUNC), AWAIT_CUE(6), CALL_SCRIPT(SHOCK_FUNC), - ROTATE(4, 10, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHWEST), AWAIT_CUE(6), - ROTATE(4, 10, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), AWAIT_CUE(6), - ROTATE(4, 10, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHWEST), AWAIT_CUE(6), - ROTATE(4, 10, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), AWAIT_CUE(6), FANFARE_PLAY2(465), CALL_SCRIPT(NOTICE_FUNC), ALERT_CUE(5), AWAIT_CUE(6), - { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 0), { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(6), CJUMP_VAR(EVENT_LOCAL), @@ -3318,15 +3318,15 @@ static const struct ScriptCommand s_gs9_g28_s0_lives1_dlg0[] = { /* 0x81aa778 */ ALERT_CUE(5), AWAIT_CUE(6), LABEL(0), /* = 0x00 */ - ROTATE(4, 10, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), ALERT_CUE(5), AWAIT_CUE(6), CALL_SCRIPT(SWEAT_FUNC), { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(6), - ROTATE(12, 2, DIRECTION_SOUTH), + ROTATE_TO(12, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTH), AWAIT_CUE(6), - { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 0), { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(6), FANFARE_PLAY2(465), @@ -3341,23 +3341,23 @@ static const struct ScriptCommand s_gs9_g28_s0_lives2_dlg0[] = { /* 0x81aac28 */ SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(7), - ROTATE(4, 10, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHEAST), AWAIT_CUE(7), - ROTATE(4, 10, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTH), AWAIT_CUE(7), - ROTATE(4, 10, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHEAST), { 0x56, 0x00, 0x0000, 0x0000005a, 0x00000000, NULL }, AWAIT_CUE(7), { 0x56, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - ROTATE(4, 10, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTH), AWAIT_CUE(7), - ROTATE(4, 10, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_EAST), AWAIT_CUE(7), - ROTATE(4, 10, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTH), AWAIT_CUE(7), - ROTATE(4, 10, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHEAST), AWAIT_CUE(7), - ROTATE(4, 10, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTH), AWAIT_CUE(7), FANFARE_PLAY2(486), SELECT_ANIMATION(23), @@ -3372,40 +3372,40 @@ static const struct ScriptCommand s_gs9_g28_s0_lives3_dlg0[] = { /* 0x81aade8 */ SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0003, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(8), - ROTATE(4, 10, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_WEST), AWAIT_CUE(8), CALL_SCRIPT(SWEAT_FUNC), AWAIT_CUE(8), - ROTATE(4, 10, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), WAIT_RANDOM(10, 20), - ROTATE(4, 10, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_EAST), WAIT_RANDOM(10, 20), - ROTATE(4, 10, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_WEST), WAIT_RANDOM(10, 20), - ROTATE(4, 10, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTH), AWAIT_CUE(8), CALL_SCRIPT(QUESTION_FUNC), AWAIT_CUE(8), CALL_SCRIPT(SHOCK_FUNC), - ROTATE(4, 10, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHWEST), AWAIT_CUE(8), - ROTATE(4, 10, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_WEST), AWAIT_CUE(8), - ROTATE(4, 10, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTH), { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(8), - ROTATE(4, 10, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHWEST), { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(8), - ROTATE(4, 10, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTH), { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(8), { 0x2d, 0x09, 0x0002, 0x0000003c, 0x00000000, NULL }, - { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 0), ALERT_CUE(5), AWAIT_CUE(8), CALL_SCRIPT(NOTICE_FUNC), - ROTATE(4, 10, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTH), AWAIT_CUE(8), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(0, /* to label */ 0), @@ -3433,35 +3433,35 @@ static const struct ScriptCommand s_gs9_g28_s0_lives4_dlg0[] = { /* 0x81ab198 */ DEBUGINFO_O(3574), SELECT_ANIMATION(2), AWAIT_CUE(8), - ROTATE(4, 10, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHWEST), AWAIT_CUE(8), CALL_SCRIPT(SWEAT_FUNC), AWAIT_CUE(8), - ROTATE(4, 10, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_EAST), WAIT_RANDOM(10, 20), - ROTATE(4, 10, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_WEST), WAIT_RANDOM(10, 20), - ROTATE(4, 10, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), WAIT_RANDOM(10, 20), - ROTATE(4, 10, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTH), AWAIT_CUE(8), CALL_SCRIPT(QUESTION_FUNC), AWAIT_CUE(8), CALL_SCRIPT(SHOCK_FUNC), AWAIT_CUE(8), - ROTATE(4, 10, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHWEST), AWAIT_CUE(8), - ROTATE(4, 10, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTH), AWAIT_CUE(8), - ROTATE(4, 10, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTH), AWAIT_CUE(8), - ROTATE(4, 10, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTH), AWAIT_CUE(8), { 0x2d, 0x09, 0x0002, 0x0000003c, 0x00000000, NULL }, - { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 0), AWAIT_CUE(8), CALL_SCRIPT(NOTICE_FUNC), - ROTATE(4, 10, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTH), AWAIT_CUE(8), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(0, /* to label */ 0), @@ -3489,18 +3489,18 @@ static const struct ScriptCommand s_gs9_g28_s1_lives0_dlg0[] = { /* 0x81ab488 */ SELECT_ANIMATION(2), ALERT_CUE(5), AWAIT_CUE(9), - ROTATE(4, 10, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHWEST), ALERT_CUE(5), AWAIT_CUE(9), - ROTATE(4, 10, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTH), AWAIT_CUE(9), - ROTATE(4, 10, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHEAST), AWAIT_CUE(9), - ROTATE(4, 10, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHWEST), AWAIT_CUE(9), - ROTATE(4, 10, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHEAST), AWAIT_CUE(9), - ROTATE(4, 10, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTH), AWAIT_CUE(9), FANFARE_PLAY2(486), SELECT_ANIMATION(23), @@ -3787,7 +3787,7 @@ static const struct ScriptCommand s_gs9_g30_s0_lives0_dlg0[] = { /* 0x81acd04 */ ALERT_CUE(9), AWAIT_CUE(5), ALERT_CUE(6), - { 0x8e, 0x04, 0x0000, 0x0000005b, 0x00000000, NULL }, + CMD_UNK_8E(4, DIR_TRANS_NONE, 91), WAIT(30), ALERT_CUE(7), AWAIT_CUE(5), @@ -3900,7 +3900,7 @@ static const struct ScriptCommand s_gs9_g30_s0_lives0_dlg0[] = { /* 0x81acd04 */ FANFARE_PLAY2(473), CALL_SCRIPT(SHOCK_FUNC), WALK_GRID(512, 31), - ROTATE(4, 1, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTHWEST), WAIT(16), ALERT_CUE(6), AWAIT_CUE(5), @@ -3913,18 +3913,18 @@ static const struct ScriptCommand s_gs9_g30_s0_lives0_dlg0[] = { /* 0x81acd04 */ ALERT_CUE(10), WAIT(10), ALERT_CUE(6), - ROTATE(4, 1, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTHEAST), AWAIT_CUE(5), - ROTATE(4, 10, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHWEST), AWAIT_CUE(5), - ROTATE(4, 10, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_WEST), AWAIT_CUE(5), ALERT_CUE(10), AWAIT_CUE(5), { 0x3b, 0x06, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(60), ALERT_CUE(6), - ROTATE(4, 2, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTHWEST), WAIT(30), PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000009), MSG_VAR(2, PARTNER_TALK_KIND, 1), @@ -3977,7 +3977,7 @@ static const struct ScriptCommand s_gs9_g30_s0_lives1_dlg0[] = { /* 0x81ae20c */ WALK_GRID(256, 26), ALERT_CUE(5), AWAIT_CUE(6), - ROTATE(4, 10, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTH), ALERT_CUE(5), AWAIT_CUE(6), { 0x62, 0x00, 0x0100, 0x00000000, -0x00000005, NULL }, @@ -4011,26 +4011,26 @@ static const struct ScriptCommand s_gs9_g30_s0_lives1_dlg0[] = { /* 0x81ae20c */ CALL_SCRIPT(NOTICE_FUNC), WAIT(10), WALK_GRID(256, 2), - { 0x90, 0x01, 0x0000, 0x0000001c, 0x00000000, NULL }, + CMD_UNK_90(1, DIR_TRANS_NONE, 28), ALERT_CUE(5), AWAIT_CUE(6), CALL_SCRIPT(JUMP_SURPRISE_FUNC), ALERT_CUE(5), WAIT(20), AWAIT_CUE(6), - ROTATE(4, 1, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTHEAST), ALERT_CUE(5), AWAIT_CUE(6), - ROTATE(4, 10, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHEAST), AWAIT_CUE(6), - ROTATE(8, 10, DIRECTION_NORTH), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_NORTH), AWAIT_CUE(6), - ROTATE(10, 2, DIRECTION_WEST), + ROTATE_TO(10, DIR_TRANS_SPINLEFT1, DIRECTION_WEST), AWAIT_CUE(6), - ROTATE(4, 1, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTHEAST), AWAIT_CUE(6), CALL_SCRIPT(ANGRY_START_FUNC), - ROTATE(4, 1, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTH), AWAIT_CUE(6), CALL_SCRIPT(ANGRY_END_FUNC), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, @@ -4044,17 +4044,17 @@ static const struct ScriptCommand s_gs9_g30_s0_lives2_dlg0[] = { /* 0x81ae61c */ { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, AWAIT_CUE(7), WALK_GRID(256, 30), - { 0x8e, 0x04, 0x0000, 0x00000000, 0x00000000, NULL }, + CMD_UNK_8E(4, DIR_TRANS_NONE, 0), ALERT_CUE(5), AWAIT_CUE(7), WALK_GRID(512, 31), - { 0x90, 0x01, 0x0000, 0x0000001c, 0x00000000, NULL }, + CMD_UNK_90(1, DIR_TRANS_NONE, 28), ALERT_CUE(5), AWAIT_CUE(7), CALL_SCRIPT(JUMP_ANGRY_FUNC), ALERT_CUE(5), AWAIT_CUE(7), - { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 0), AWAIT_CUE(7), CALL_SCRIPT(JUMP_ANGRY_FUNC), ALERT_CUE(5), @@ -4070,15 +4070,15 @@ static const struct ScriptCommand s_gs9_g30_s0_lives3_dlg0[] = { /* 0x81ae78c */ { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, AWAIT_CUE(8), WALK_GRID(256, 33), - { 0x8e, 0x04, 0x0000, 0x00000000, 0x00000000, NULL }, + CMD_UNK_8E(4, DIR_TRANS_NONE, 0), AWAIT_CUE(8), WALK_GRID(512, 34), - { 0x90, 0x01, 0x0000, 0x0000001c, 0x00000000, NULL }, + CMD_UNK_90(1, DIR_TRANS_NONE, 28), AWAIT_CUE(8), FANFARE_PLAY2(463), CALL_SCRIPT(SHOCK_FUNC), AWAIT_CUE(8), - ROTATE(4, 10, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHWEST), AWAIT_CUE(8), WALK_GRID(512, 35), END_DELETE, @@ -4091,19 +4091,19 @@ static const struct ScriptCommand s_gs9_g30_s0_lives4_dlg0[] = { /* 0x81ae8ac */ { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, AWAIT_CUE(9), WALK_GRID(256, 36), - { 0x8e, 0x04, 0x0000, 0x00000000, 0x00000000, NULL }, + CMD_UNK_8E(4, DIR_TRANS_NONE, 0), AWAIT_CUE(9), FANFARE_PLAY2(463), CALL_SCRIPT(NOTICE_FUNC), AWAIT_CUE(9), WALK_GRID(512, 37), - { 0x90, 0x01, 0x0000, 0x0000001c, 0x00000000, NULL }, + CMD_UNK_90(1, DIR_TRANS_NONE, 28), AWAIT_CUE(9), CALL_SCRIPT(SMILE_START_FUNC), WAIT(30), CALL_SCRIPT(SMILE_END_FUNC), AWAIT_CUE(9), - ROTATE(4, 10, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHEAST), AWAIT_CUE(9), WALK_GRID(512, 38), END_DELETE, @@ -4122,7 +4122,7 @@ static const struct ScriptCommand s_gs9_g30_s0_lives5_dlg0[] = { /* 0x81aea0c */ ALERT_CUE(6), ALERT_CUE(5), TEXTBOX_CLEAR, - ROTATE(30, 2, DIRECTION_SOUTH), + ROTATE_TO(30, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTH), WAIT(15), { 0x68, 0x00, 0x0100, 0x00000008, 0x00000000, NULL }, FANFARE_STOP2(451), @@ -4139,7 +4139,7 @@ static const struct ScriptCommand s_gs9_g30_s0_lives5_dlg0[] = { /* 0x81aea0c */ SELECT_ANIMATION(2), { 0x68, 0x00, 0x0100, 0x00000030, 0x00000000, NULL }, WAIT(15), - ROTATE(30, 1, DIRECTION_WEST), + ROTATE_TO(30, DIR_TRANS_SPINRIGHT1, DIRECTION_WEST), ALERT_CUE(6), WALK_GRID(256, 4), FANFARE_STOP2(451), @@ -4214,7 +4214,7 @@ static const struct ScriptCommand s_gs9_g31_s0_lives0_dlg0[] = { /* 0x81aee18 */ ALERT_CUE(6), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, { 0x84, 0x00, 0x0100, 0x00000010, 0x0000001e, NULL }, - { 0x93, 0x04, 0x000a, 0x00000036, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 54), AWAIT_CUE(5), WAIT(10), { 0x52, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, @@ -4343,7 +4343,7 @@ static const struct ScriptCommand s_gs9_g31_s0_lives0_dlg0[] = { /* 0x81aee18 */ ALERT_CUE(10), WAIT(30), ALERT_CUE(6), - ROTATE(4, 10, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHWEST), PORTRAIT_REP(0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Don't worry.\nWe'll save your friend first.")), @@ -4353,7 +4353,7 @@ static const struct ScriptCommand s_gs9_g31_s0_lives0_dlg0[] = { /* 0x81aee18 */ WAIT(15), ALERT_CUE(6), WAIT(5), - ROTATE(4, 10, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_WEST), PORTRAIT_REP(0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" {NAME_0}!{WAIT_PRESS}\nLet's roll, and quick!")), @@ -4395,12 +4395,12 @@ static const struct ScriptCommand s_gs9_g31_s0_lives1_dlg0[] = { /* 0x81b002c */ WALK_RELATIVE(256, 0, -3), ALERT_CUE(5), AWAIT_CUE(6), - { 0x93, 0x04, 0x000a, 0x00000036, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 54), AWAIT_CUE(6), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, WAIT(10), WALK_RELATIVE(256, -8, 0), - { 0x93, 0x04, 0x000a, 0x00000036, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 54), AWAIT_CUE(6), FANFARE_PLAY2(465), CALL_SCRIPT(NOTICE_FUNC), @@ -4422,9 +4422,9 @@ static const struct ScriptCommand s_gs9_g31_s0_lives1_dlg0[] = { /* 0x81b002c */ CALL_SCRIPT(ANGRY_END_FUNC), ALERT_CUE(5), AWAIT_CUE(6), - ROTATE(4, 10, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHEAST), AWAIT_CUE(6), - { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 0), AWAIT_CUE(6), { 0x53, 0x00, 0x0000, 0x00020000, 0x00000000, NULL }, { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, @@ -4449,10 +4449,10 @@ static const struct ScriptCommand s_gs9_g31_s0_lives2_dlg0[] = { /* 0x81b02dc */ CALL_SCRIPT(JUMP_ANGRY_FUNC), ALERT_CUE(5), AWAIT_CUE(7), - ROTATE(4, 10, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHEAST), ALERT_CUE(8), WAIT(16), - ROTATE(4, 10, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHWEST), ALERT_CUE(9), WAIT(16), ALERT_CUE(5), @@ -4472,7 +4472,7 @@ static const struct ScriptCommand s_gs9_g31_s0_lives3_dlg0[] = { /* 0x81b04bc */ AWAIT_CUE(8), { 0x89, 0x24, 0x0200, 0x00000004, 0x00000000, NULL }, AWAIT_CUE(8), - ROTATE(4, 10, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHWEST), AWAIT_CUE(8), WALK_GRID(256, 35), WAIT(60), @@ -4487,7 +4487,7 @@ static const struct ScriptCommand s_gs9_g31_s0_lives4_dlg0[] = { /* 0x81b057c */ AWAIT_CUE(9), { 0x89, 0x24, 0x0200, 0x00000004, 0x00000000, NULL }, AWAIT_CUE(9), - ROTATE(4, 10, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHEAST), AWAIT_CUE(9), WALK_GRID(256, 38), WAIT(60), @@ -4500,14 +4500,14 @@ static const struct ScriptCommand s_gs9_g31_s0_lives5_dlg0[] = { /* 0x81b063c */ { 0x2d, 0x07, 0x0005, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(10), WALK_GRID(256, 39), - { 0x93, 0x04, 0x000a, 0x00000002, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 2), ALERT_CUE(5), AWAIT_CUE(10), FANFARE_PLAY2(457), CALL_SCRIPT(JUMP_ANGRY_FUNC), ALERT_CUE(5), AWAIT_CUE(10), - { 0x93, 0x04, 0x000a, 0x0000005b, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 91), AWAIT_CUE(10), { 0x62, 0x00, 0x0100, 0x00000000, -0x00000004, NULL }, AWAIT_CUE(10), @@ -4515,7 +4515,7 @@ static const struct ScriptCommand s_gs9_g31_s0_lives5_dlg0[] = { /* 0x81b063c */ ALERT_CUE(5), AWAIT_CUE(10), WAIT(5), - ROTATE(4, 10, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), AWAIT_CUE(10), RET, }; @@ -4674,7 +4674,7 @@ static const struct ScriptCommand s_gs9_g34_s0_lives0_dlg0[] = { /* 0x81b0c98 */ TEXTBOX_CLEAR, WAIT(10), ALERT_CUE(6), - ROTATE(4, 1, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_EAST), PORTRAIT_REP(0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" {NAME_0}, how about we\ndo something right here?")), @@ -4691,7 +4691,7 @@ static const struct ScriptCommand s_gs9_g34_s0_lives0_dlg0[] = { /* 0x81b0c98 */ MSG_NPC(2, _(" That's cool!\nA rescue team base is cool!")), ALERT_CUE(6), ALERT_CUE(7), - ROTATE(4, 2, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_NORTH), WAIT(4), MSG_NPC(2, _(" I want to work here when\nI grow up!")), TEXTBOX_CLEAR, @@ -4703,7 +4703,7 @@ static const struct ScriptCommand s_gs9_g34_s0_lives0_dlg0[] = { /* 0x81b0c98 */ TEXTBOX_CLEAR, ALERT_CUE(6), ALERT_CUE(7), - ROTATE(4, 1, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTHEAST), WAIT(30), ALERT_CUE(6), PORTRAIT_REP(0x0001, 0x00000001), @@ -4714,7 +4714,7 @@ static const struct ScriptCommand s_gs9_g34_s0_lives0_dlg0[] = { /* 0x81b0c98 */ WAIT(30), ALERT_CUE(6), ALERT_CUE(7), - ROTATE(4, 1, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_EAST), WAIT(10), PORTRAIT_REP(0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), @@ -4733,7 +4733,7 @@ static const struct ScriptCommand s_gs9_g34_s0_lives0_dlg0[] = { /* 0x81b0c98 */ CALL_SCRIPT(SMILE_END_FUNC), WAIT(30), ALERT_CUE(6), - ROTATE(4, 2, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_NORTH), PORTRAIT_REP(0x0003, 0x00000000), MSG_NPC(3, _(" {NAME_0} and\n{NAME_1}, thank you again!")), TEXTBOX_CLEAR, @@ -4748,11 +4748,11 @@ static const struct ScriptCommand s_gs9_g34_s0_lives0_dlg0[] = { /* 0x81b0c98 */ ALERT_CUE(8), WAIT(30), ALERT_CUE(6), - ROTATE(10, 1, DIRECTION_EAST), + ROTATE_TO(10, DIR_TRANS_SPINRIGHT1, DIRECTION_EAST), AWAIT_CUE(5), WAIT(60), ALERT_CUE(6), - ROTATE(4, 1, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_EAST), WAIT(30), PORTRAIT_REP(0x0001, 0x00000005), MSG_VAR(2, PARTNER_TALK_KIND, 1), @@ -4792,7 +4792,7 @@ static const struct ScriptCommand s_gs9_g34_s0_lives1_dlg0[] = { /* 0x81b1da4 */ SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(6), - ROTATE(4, 2, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_NORTHWEST), CALL_SCRIPT(SMILE_START_FUNC), AWAIT_CUE(6), CALL_SCRIPT(SMILE_END_FUNC), @@ -4803,27 +4803,27 @@ static const struct ScriptCommand s_gs9_g34_s0_lives1_dlg0[] = { /* 0x81b1da4 */ ALERT_CUE(5), FANFARE_STOP2(465), AWAIT_CUE(6), - { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 0), AWAIT_CUE(6), - ROTATE(4, 1, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTHWEST), AWAIT_CUE(6), WAIT(5), - ROTATE(4, 1, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTH), AWAIT_CUE(6), CALL_SCRIPT(SMILE_START_FUNC), AWAIT_CUE(6), CALL_SCRIPT(SMILE_END_FUNC), - ROTATE(4, 2, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_WEST), AWAIT_CUE(6), CALL_SCRIPT(SMILE_START_FUNC), AWAIT_CUE(6), CALL_SCRIPT(SMILE_END_FUNC), AWAIT_CUE(6), - ROTATE(4, 1, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTH), AWAIT_CUE(6), - ROTATE(10, 1, DIRECTION_EAST), + ROTATE_TO(10, DIR_TRANS_SPINRIGHT1, DIRECTION_EAST), AWAIT_CUE(6), - ROTATE(4, 1, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_WEST), AWAIT_CUE(6), CALL_SCRIPT(SMILE_START_FUNC), WAIT(60), @@ -4838,13 +4838,13 @@ static const struct ScriptCommand s_gs9_g34_s0_lives2_dlg0[] = { /* 0x81b2054 */ SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(7), - { 0x93, 0x04, 0x000a, 0x0000005e, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 94), WAIT(10), FANFARE_PLAY2(455), CALL_SCRIPT(JUMP_HAPPY_FUNC), ALERT_CUE(5), AWAIT_CUE(7), - { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 0), CALL_SCRIPT(SMILE_START_FUNC), AWAIT_CUE(7), CALL_SCRIPT(SMILE_END_FUNC), @@ -4857,7 +4857,7 @@ static const struct ScriptCommand s_gs9_g34_s0_lives2_dlg0[] = { /* 0x81b2054 */ FANFARE_STOP2(470), AWAIT_CUE(7), WAIT(5), - ROTATE(4, 2, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTHEAST), AWAIT_CUE(7), FANFARE_PLAY2(457), CALL_SCRIPT(JUMP_ANGRY_FUNC), @@ -4869,18 +4869,18 @@ static const struct ScriptCommand s_gs9_g34_s0_lives2_dlg0[] = { /* 0x81b2054 */ WAIT(5), ALERT_CUE(5), AWAIT_CUE(7), - ROTATE(4, 1, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTH), AWAIT_CUE(7), WAIT(4), - ROTATE(4, 10, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_EAST), AWAIT_CUE(7), - ROTATE(4, 10, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTH), AWAIT_CUE(7), CALL_SCRIPT(SMILE_START_FUNC), AWAIT_CUE(7), CALL_SCRIPT(SMILE_END_FUNC), AWAIT_CUE(7), - { 0x8e, 0x04, 0x0000, 0x00000000, 0x00000000, NULL }, + CMD_UNK_8E(4, DIR_TRANS_NONE, 0), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, WALK_GRID(256, 40), ALERT_CUE(5), @@ -4892,12 +4892,12 @@ static const struct ScriptCommand s_gs9_g34_s0_lives3_dlg0[] = { /* 0x81b2384 */ SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0003, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(8), - { 0x93, 0x04, 0x000a, 0x00000036, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 54), ALERT_CUE(5), AWAIT_CUE(8), - ROTATE(4, 10, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTH), AWAIT_CUE(8), - ROTATE(4, 1, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTHWEST), ALERT_CUE(5), AWAIT_CUE(8), CALL_SCRIPT(SMILE_START_FUNC), @@ -4974,10 +4974,10 @@ static const struct ScriptCommand s_gs9_g35_s1_lives0_dlg0[] = { /* 0x81b2854 */ CALL_SCRIPT(QUESTION_FUNC), ALERT_CUE(5), AWAIT_CUE(6), - ROTATE(4, 11, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_SOUTH), WAIT(70), CAMERA_PAN(204, 44), - ROTATE(4, 11, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_SOUTHWEST), AWAIT_CUE(6), HALT, }; @@ -5073,7 +5073,7 @@ static const struct ScriptCommand s_gs9_g36_s0_lives0_dlg0[] = { /* 0x81b2ab0 */ ALERT_CUE(6), AWAIT_CUE(5), WAIT(15), - ROTATE(12, 10, DIRECTION_SOUTHEAST), + ROTATE_TO(12, DIR_TRANS_10, DIRECTION_SOUTHEAST), WAIT(40), PORTRAIT_REP(0x0001, 0x0000000b), MSG_VAR(2, PARTNER_TALK_KIND, 1), @@ -5082,7 +5082,7 @@ static const struct ScriptCommand s_gs9_g36_s0_lives0_dlg0[] = { /* 0x81b2ab0 */ TEXTBOX_CLEAR, ALERT_CUE(6), AWAIT_CUE(5), - ROTATE(4, 11, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_SOUTH), PORTRAIT_REP(0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" That's it, then!\nWe'll go look for them!")), @@ -5102,7 +5102,7 @@ static const struct ScriptCommand s_gs9_g36_s0_lives0_dlg0[] = { /* 0x81b2ab0 */ TEXTBOX_CLEAR, ALERT_CUE(6), AWAIT_CUE(5), - ROTATE(4, 11, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_SOUTHEAST), PORTRAIT_REP(0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Let's get to it,\n{NAME_0}!")), @@ -5137,13 +5137,13 @@ static const struct ScriptCommand s_gs9_g36_s0_lives1_dlg0[] = { /* 0x81b3680 */ CALL_SCRIPT(QUESTION_FUNC), ALERT_CUE(5), AWAIT_CUE(6), - ROTATE(8, 1, DIRECTION_NORTHWEST), + ROTATE_TO(8, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTHWEST), ALERT_CUE(5), AWAIT_CUE(6), - ROTATE(4, 2, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTHWEST), ALERT_CUE(5), AWAIT_CUE(6), - ROTATE(4, 1, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTHWEST), ALERT_CUE(5), AWAIT_CUE(6), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, @@ -5307,7 +5307,7 @@ static const struct ScriptCommand s_gs9_g39_s0_lives0_dlg0[] = { /* 0x81b3de0 */ ALERT_CUE(6), ALERT_CUE(7), ALERT_CUE(8), - ROTATE(4, 1, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_EAST), AWAIT_CUE(5), WAIT(30), FANFARE_PLAY2(466), @@ -5323,7 +5323,7 @@ static const struct ScriptCommand s_gs9_g39_s0_lives0_dlg0[] = { /* 0x81b3de0 */ AWAIT_CUE(5), WAIT(64), ALERT_CUE(6), - ROTATE(4, 11, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_NORTHEAST), BGM_SWITCH(114), PORTRAIT(PLACEMENT_TOP_FLIP, 0x0004, 0x00000000), MSG_NPC(4, _(" Zapdos...{WAIT_PRESS}\nIt's one of the legendary bird Pokémon.")), @@ -5380,7 +5380,7 @@ static const struct ScriptCommand s_gs9_g39_s0_lives0_dlg0[] = { /* 0x81b3de0 */ ALERT_CUE(7), ALERT_CUE(8), AWAIT_CUE(5), - ROTATE(4, 11, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_EAST), UPDATE_VARINT(CALC_SET, EVENT_LOCAL, 0), PORTRAIT_REP(0x0001, 0x00000000), ASK3_VAR(FALSE, /*default*/ -1, /* speaker */ 1, PARTNER_TALK_KIND), @@ -5414,7 +5414,7 @@ static const struct ScriptCommand s_gs9_g39_s0_lives0_dlg0[] = { /* 0x81b3de0 */ WAIT(20), ALERT_CUE(6), AWAIT_CUE(5), - ROTATE(4, 11, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_NORTHEAST), PORTRAIT_REP(0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" We're a rescue team too!")), @@ -5489,7 +5489,7 @@ static const struct ScriptCommand s_gs9_g39_s0_lives0_dlg0[] = { /* 0x81b3de0 */ ALERT_CUE(8), ALERT_CUE(6), AWAIT_CUE(5), - ROTATE(4, 11, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_EAST), PORTRAIT_REP(0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" {NAME_0}!\nLet's give it our best, partner!")), @@ -5529,12 +5529,12 @@ static const struct ScriptCommand s_gs9_g39_s0_lives1_dlg0[] = { /* 0x81b56f0 */ SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(6), - ROTATE(4, 11, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_EAST), AWAIT_CUE(6), CALL_SCRIPT(JUMP_SURPRISE_FUNC), ALERT_CUE(5), AWAIT_CUE(6), - ROTATE(4, 11, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_NORTHEAST), AWAIT_CUE(6), { 0x70, 0x00, 0x0200, 0x00000007, 0x00000000, NULL }, WAIT(1), @@ -5544,14 +5544,14 @@ static const struct ScriptCommand s_gs9_g39_s0_lives1_dlg0[] = { /* 0x81b56f0 */ CALL_SCRIPT(JUMP_ANGRY_FUNC), ALERT_CUE(5), AWAIT_CUE(6), - ROTATE(4, 11, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_WEST), ALERT_CUE(5), AWAIT_CUE(6), - ROTATE(4, 11, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_NORTHEAST), ALERT_CUE(5), AWAIT_CUE(6), JUMPIF(JUDGE_EQ, EVENT_LOCAL, 0, /* to label */ 0), - ROTATE(4, 11, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_EAST), WAIT(16), ALERT_CUE(5), AWAIT_CUE(6), @@ -5564,7 +5564,7 @@ static const struct ScriptCommand s_gs9_g39_s0_lives1_dlg0[] = { /* 0x81b56f0 */ { 0x70, 0x00, 0x0200, 0x00000000, 0x00000000, NULL }, ALERT_CUE(5), AWAIT_CUE(6), - ROTATE(4, 11, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_WEST), ALERT_CUE(5), AWAIT_CUE(6), { 0x54, 0x00, 0x002a, 0x00000000, 0x00000000, NULL }, @@ -5584,19 +5584,19 @@ static const struct ScriptCommand s_gs9_g39_s0_lives2_dlg0[] = { /* 0x81b59c0 */ ALERT_CUE(5), AWAIT_CUE(7), WAIT(20), - ROTATE(4, 2, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_EAST), AWAIT_CUE(7), WAIT(5), - ROTATE(4, 1, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTH), AWAIT_CUE(7), - ROTATE(4, 11, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_EAST), AWAIT_CUE(7), - ROTATE(4, 11, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_SOUTH), ALERT_CUE(5), AWAIT_CUE(7), - ROTATE(4, 11, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_EAST), AWAIT_CUE(7), - ROTATE(4, 11, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_SOUTH), AWAIT_CUE(7), HALT, }; @@ -5606,18 +5606,18 @@ static const struct ScriptCommand s_gs9_g39_s0_lives3_dlg0[] = { /* 0x81b5b60 */ SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0003, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(8), - ROTATE(4, 1, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_WEST), AWAIT_CUE(8), - ROTATE(4, 2, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTH), AWAIT_CUE(8), - ROTATE(4, 11, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_EAST), AWAIT_CUE(8), - ROTATE(4, 11, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_SOUTH), ALERT_CUE(5), AWAIT_CUE(8), - ROTATE(4, 11, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_EAST), AWAIT_CUE(8), - ROTATE(4, 11, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_SOUTH), AWAIT_CUE(8), HALT, }; @@ -5631,13 +5631,13 @@ static const struct ScriptCommand s_gs9_g39_s0_lives4_dlg0[] = { /* 0x81b5c80 */ AWAIT_CUE(9), { 0x89, 0x58, 0x0100, 0x00000006, 0x00000000, NULL }, AWAIT_CUE(9), - ROTATE(4, 2, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTHWEST), AWAIT_CUE(9), - ROTATE(4, 1, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTHEAST), ALERT_CUE(5), AWAIT_CUE(9), CALL_SCRIPT(NOTICE_FUNC), - ROTATE(4, 2, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTHWEST), ALERT_CUE(5), AWAIT_CUE(9), HALT, @@ -5650,13 +5650,13 @@ static const struct ScriptCommand s_gs9_g39_s0_lives5_dlg0[] = { /* 0x81b5da0 */ AWAIT_CUE(10), { 0x89, 0x58, 0x0100, 0x00000006, 0x00000000, NULL }, AWAIT_CUE(10), - ROTATE(8, 2, DIRECTION_SOUTHWEST), + ROTATE_TO(8, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTHWEST), ALERT_CUE(5), AWAIT_CUE(10), - ROTATE(4, 2, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTHWEST), AWAIT_CUE(10), WALK_RELATIVE(256, -5, 0), - ROTATE(4, 2, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTHWEST), ALERT_CUE(5), AWAIT_CUE(10), HALT, @@ -5669,7 +5669,7 @@ static const struct ScriptCommand s_gs9_g39_s0_lives6_dlg0[] = { /* 0x81b5ea0 */ AWAIT_CUE(11), { 0x89, 0x58, 0x0100, 0x00000006, 0x00000000, NULL }, AWAIT_CUE(11), - ROTATE(4, 2, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_WEST), AWAIT_CUE(11), WALK_RELATIVE(256, -5, 0), ALERT_CUE(5), @@ -5949,7 +5949,7 @@ static const struct ScriptCommand s_gs9_g43_s0_lives1_dlg0[] = { /* 0x81b7674 */ CALL_SCRIPT(NOTICE_FUNC), WAIT(30), FANFARE_STOP2(463), - ROTATE(4, 1, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTH), CALL_SCRIPT(QUESTION_FUNC), ALERT_CUE(5), AWAIT_CUE(6), @@ -6185,11 +6185,11 @@ static const struct ScriptCommand s_gs9_g45_s0_lives0_dlg0[] = { /* 0x81b7b50 */ SELECT_LIVES(-1, 1), WAIT(10), ALERT_CUE(6), - ROTATE(4, 10, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_EAST), AWAIT_CUE(5), - ROTATE(4, 10, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_WEST), AWAIT_CUE(5), - ROTATE(4, 10, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHWEST), AWAIT_CUE(5), ALERT_CUE(6), AWAIT_CUE(5), @@ -6212,7 +6212,7 @@ static const struct ScriptCommand s_gs9_g45_s0_lives0_dlg0[] = { /* 0x81b7b50 */ WAIT(90), ALERT_CUE(6), AWAIT_CUE(5), - ROTATE(4, 10, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTH), PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000003), ASK3(FALSE, /*default*/ -1, /* speaker */ 1, _(" ........................")), CHOICE(/* label */ 10, _("It appears to be impossible...")), @@ -6344,21 +6344,21 @@ static const struct ScriptCommand s_gs9_g45_s0_lives1_dlg0[] = { /* 0x81b9ee8 */ AWAIT_CUE(6), JUMPIF(JUDGE_EQ, EVENT_LOCAL, 0, /* to label */ 4), JUMPIF(JUDGE_EQ, EVENT_LOCAL, 0, /* to label */ 5), - ROTATE(4, 10, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_EAST), AWAIT_CUE(6), - ROTATE(4, 10, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHWEST), AWAIT_CUE(6), - ROTATE(4, 10, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHWEST), ALERT_CUE(5), AWAIT_CUE(6), CALL_SCRIPT(NOTICE_FUNC), ALERT_CUE(5), AWAIT_CUE(6), - ROTATE(4, 2, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTHWEST), AWAIT_CUE(6), - ROTATE(4, 10, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_WEST), AWAIT_CUE(6), - ROTATE(4, 1, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTH), WAIT(30), ALERT_CUE(5), AWAIT_CUE(6), @@ -6407,25 +6407,25 @@ static const struct ScriptCommand s_gs9_g45_s1_lives0_dlg0[] = { /* 0x81ba378 */ ALERT_CUE(6), ALERT_CUE(5), TEXTBOX_CLEAR, - ROTATE(30, 2, DIRECTION_SOUTH), + ROTATE_TO(30, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTH), WAIT(15), { 0x68, 0x00, 0x0100, 0x00000008, 0x00000000, NULL }, FANFARE_STOP2(451), ALERT_CUE(6), ALERT_CUE(5), AWAIT_CUE(7), - ROTATE(4, 10, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHEAST), WAIT(30), FANFARE_PLAY2(470), CALL_SCRIPT(SWEAT_FUNC), - ROTATE(4, 10, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTH), ALERT_CUE(5), AWAIT_CUE(7), FANFARE_PLAY2(451), SELECT_ANIMATION(2), { 0x68, 0x00, 0x0100, 0x00000030, 0x00000000, NULL }, WAIT(15), - ROTATE(30, 1, DIRECTION_WEST), + ROTATE_TO(30, DIR_TRANS_SPINRIGHT1, DIRECTION_WEST), ALERT_CUE(6), WALK_GRID(256, 4), FANFARE_STOP2(451), @@ -6471,9 +6471,9 @@ static const struct ScriptCommand s_gs9_g46_s0_lives0_dlg0[] = { /* 0x81ba664 */ BGM_FADEOUT(160), ALERT_CUE(6), WAIT(10), - ROTATE(12, 2, DIRECTION_NORTHEAST), + ROTATE_TO(12, DIR_TRANS_SPINLEFT1, DIRECTION_NORTHEAST), AWAIT_CUE(5), - ROTATE(30, 2, DIRECTION_WEST), + ROTATE_TO(30, DIR_TRANS_SPINLEFT1, DIRECTION_WEST), AWAIT_CUE(5), WAIT(45), ALERT_CUE(6), @@ -6516,7 +6516,7 @@ static const struct ScriptCommand s_gs9_g46_s0_lives0_dlg0[] = { /* 0x81ba664 */ TEXTBOX_CLEAR, WAIT(10), ALERT_CUE(6), - ROTATE(12, 10, DIRECTION_WEST), + ROTATE_TO(12, DIR_TRANS_10, DIRECTION_WEST), WAIT(150), ALERT_CUE(3), HALT, @@ -6532,7 +6532,7 @@ static const struct ScriptCommand s_gs9_g46_s0_lives1_dlg0[] = { /* 0x81baf28 */ ALERT_CUE(5), WALK_GRID(153, 49), WAIT(90), - ROTATE(4, 1, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_EAST), ALERT_CUE(5), AWAIT_CUE(6), SELECT_ANIMATION(3), @@ -6660,7 +6660,7 @@ static const struct ScriptCommand s_gs9_g48_s0_lives0_dlg0[] = { /* 0x81bb6cc */ PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT_FLIP, 0x0001, 0x0000000c), MSG_NPC(1, _(" Gasp, gasp...{WAIT_PRESS}\nWow, that was a real shock!")), SELECT_ANIMATION(2), - { 0x93, 0x05, 0x0002, 0x00000022, 0x00000000, NULL }, + CMD_UNK_93(5, DIR_TRANS_SPINLEFT1, 34), PORTRAIT_REP(0x0001, 0x00000005), MSG_NPC(1, _(" I never expected everyone\nto attack us like that.")), TEXTBOX_CLEAR, @@ -6872,7 +6872,7 @@ static const struct ScriptCommand s_gs9_g48_s0_lives0_dlg0[] = { /* 0x81bb6cc */ ALERT_CUE(6), ALERT_CUE(4), WAIT(60), - { 0x93, 0x0a, 0x000a, 0x00000022, 0x00000000, NULL }, + CMD_UNK_93(10, DIR_TRANS_10, 34), PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" {NAME_0}...")), @@ -6909,7 +6909,7 @@ static const struct ScriptCommand s_gs9_g48_s0_lives0_dlg0[] = { /* 0x81bb6cc */ ALERT_CUE(6), FANFARE_PLAY2(465), CALL_SCRIPT(NOTICE_FUNC), - { 0x93, 0x0a, 0x000a, 0x00000036, 0x00000000, NULL }, + CMD_UNK_93(10, DIR_TRANS_10, 54), WAIT(30), PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, 0x0001, 0x00000005), MSG_NPC(1, _(" {NAME_5}...")), @@ -6995,10 +6995,10 @@ static const struct ScriptCommand s_gs9_g48_s0_lives1_dlg0[] = { /* 0x81bddd8 */ WAIT(30), WALK_RELATIVE(768, -160, 0), SELECT_ANIMATION(2), - ROTATE(4, 2, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_EAST), ALERT_CUE(5), AWAIT_CUE(6), - { 0x93, 0x05, 0x000a, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(5, DIR_TRANS_10, 0), ALERT_CUE(5), AWAIT_CUE(6), { 0x56, 0x00, 0x0000, 0x0000005b, 0x00000000, NULL }, @@ -7014,7 +7014,7 @@ static const struct ScriptCommand s_gs9_g48_s0_lives1_dlg0[] = { /* 0x81bddd8 */ AWAIT_CUE(6), ALERT_CUE(5), AWAIT_CUE(6), - { 0x93, 0x04, 0x000a, 0x00000058, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 88), WAIT(30), FANFARE_PLAY2(464), { 0x56, 0x00, 0x0000, 0x00000058, 0x00000000, NULL }, @@ -7026,19 +7026,19 @@ static const struct ScriptCommand s_gs9_g48_s0_lives1_dlg0[] = { /* 0x81bddd8 */ { 0x56, 0x00, 0x0000, 0x0000005b, 0x00000000, NULL }, CALL_SCRIPT(JUMP_SURPRISE_FUNC), AWAIT_CUE(6), - ROTATE(4, 10, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_EAST), { 0x62, 0x00, 0x0080, -0x00000004, 0x00000000, NULL }, WAIT(15), ALERT_CUE(5), AWAIT_CUE(6), WAIT(30), - ROTATE(6, 1, DIRECTION_SOUTHWEST), + ROTATE_TO(6, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTHWEST), WAIT(15), - ROTATE(6, 2, DIRECTION_SOUTHEAST), + ROTATE_TO(6, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTHEAST), WAIT(15), - ROTATE(6, 1, DIRECTION_SOUTHWEST), + ROTATE_TO(6, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTHWEST), WAIT(15), - ROTATE(6, 2, DIRECTION_SOUTHEAST), + ROTATE_TO(6, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTHEAST), WAIT(10), ALERT_CUE(5), AWAIT_CUE(6), @@ -7047,20 +7047,20 @@ static const struct ScriptCommand s_gs9_g48_s0_lives1_dlg0[] = { /* 0x81bddd8 */ AWAIT_CUE(6), SELECT_ANIMATION(2), AWAIT_CUE(6), - ROTATE(8, 10, DIRECTION_EAST), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_EAST), AWAIT_CUE(6), - { 0x93, 0x08, 0x000a, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(8, DIR_TRANS_10, 0), AWAIT_CUE(6), CALL_SCRIPT(NOTICE_FUNC), - ROTATE(10, 10, DIRECTION_SOUTHEAST), + ROTATE_TO(10, DIR_TRANS_10, DIRECTION_SOUTHEAST), AWAIT_CUE(6), - { 0x93, 0x05, 0x000a, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(5, DIR_TRANS_10, 0), AWAIT_CUE(6), - ROTATE(4, 10, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHEAST), WAIT(60), ALERT_CUE(5), CALL_SCRIPT(SMILE_START_FUNC), - { 0x93, 0x05, 0x000a, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(5, DIR_TRANS_10, 0), ALERT_CUE(5), CALL_SCRIPT(JUMP_HAPPY_FUNC), CALL_SCRIPT(JUMP_HAPPY_FUNC), @@ -7096,9 +7096,9 @@ static const struct ScriptCommand s_gs9_g48_s1_lives0_dlg0[] = { /* 0x81be318 */ WAIT(60), ALERT_CUE(5), AWAIT_CUE(7), - { 0x93, 0x05, 0x000a, 0x00000022, 0x00000000, NULL }, + CMD_UNK_93(5, DIR_TRANS_10, 34), AWAIT_CUE(7), - { 0x93, 0x05, 0x000a, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(5, DIR_TRANS_10, 0), AWAIT_CUE(7), WALK_RELATIVE(153, 160, 0), { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, @@ -7164,10 +7164,10 @@ static const struct ScriptCommand s_gs9_g48_s2_lives0_dlg0[] = { /* 0x81be728 */ AWAIT_CUE(10), SELECT_ANIMATION(2), AWAIT_CUE(10), - ROTATE(4, 10, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHWEST), AWAIT_CUE(10), CALL_SCRIPT(SMILE_START_FUNC), - { 0x93, 0x05, 0x000a, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(5, DIR_TRANS_10, 0), AWAIT_CUE(10), CALL_SCRIPT(JUMP_HAPPY_FUNC), CALL_SCRIPT(JUMP_HAPPY_FUNC), @@ -7321,7 +7321,7 @@ static const struct ScriptCommand s_gs9_g50_s2_lives0_dlg0[] = { /* 0x81bf188 */ SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x2d, 0x09, 0x0001, 0x00000022, 0x00000000, NULL }, - { 0x93, 0x04, 0x000a, 0x00000022, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 34), PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Are you going to the\nsquare?")), @@ -7342,7 +7342,7 @@ static const struct ScriptCommand s_gs9_g50_s2_lives1_dlg0[] = { /* 0x81bf44c */ { 0x53, 0x00, 0x0000, 0x00000400, 0x00000000, NULL }, SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0x8e, 0x01, 0x000b, 0x00000000, 0x00000000, NULL }, + CMD_UNK_8E(1, DIR_TRANS_11, 0), AWAIT_CUE(3), RET, }; @@ -7397,7 +7397,7 @@ static const struct ScriptCommand s_gs9_g50_s3_lives1_dlg0[] = { /* 0x81bf708 */ DEBUGINFO_O(7538), SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0x93, 0x08, 0x000a, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(8, DIR_TRANS_10, 0), WAIT(10), ALERT_CUE(5), HALT, @@ -7587,7 +7587,7 @@ static const struct ScriptCommand s_gs9_g53_s0_lives0_dlg0[] = { /* 0x81c02fc */ FANFARE_PLAY2(465), ALERT_CUE(6), CALL_SCRIPT(NOTICE_FUNC), - ROTATE(4, 11, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_SOUTH), WAIT(15), ALERT_CUE(4), ALERT_CUE(7), @@ -7597,7 +7597,7 @@ static const struct ScriptCommand s_gs9_g53_s0_lives0_dlg0[] = { /* 0x81c02fc */ AWAIT_CUE(5), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, CAMERA_PAN(256, 52), - ROTATE(4, 11, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_SOUTH), WAIT(15), ALERT_CUE(6), AWAIT_CUE(5), @@ -7643,7 +7643,7 @@ static const struct ScriptCommand s_gs9_g53_s0_lives0_dlg0[] = { /* 0x81c02fc */ ALERT_CUE(8), ALERT_CUE(11), ALERT_CUE(12), - ROTATE(4, 11, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_SOUTHEAST), CALL_SCRIPT(JUMP_SURPRISE_FUNC), WAIT(30), PORTRAIT(PLACEMENT_TOP_RIGHT, 0x0004, 0x00000000), @@ -7664,11 +7664,11 @@ static const struct ScriptCommand s_gs9_g53_s0_lives0_dlg0[] = { /* 0x81c02fc */ ALERT_CUE(6), ALERT_CUE(7), ALERT_CUE(11), - ROTATE(4, 2, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_EAST), AWAIT_CUE(5), - ROTATE(4, 10, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_WEST), AWAIT_CUE(5), - ROTATE(4, 11, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_SOUTHWEST), AWAIT_CUE(5), ALERT_CUE(10), AWAIT_CUE(5), @@ -7687,7 +7687,7 @@ static const struct ScriptCommand s_gs9_g53_s0_lives0_dlg0[] = { /* 0x81c02fc */ ALERT_CUE(6), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, CAMERA_PAN(256, 57), - ROTATE(4, 11, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_NORTH), WAIT(30), MSG_INSTANT(_("{CENTER_ALIGN}{NAME_0} began reading the letter.")), TEXTBOX_CLEAR, @@ -7708,7 +7708,7 @@ static const struct ScriptCommand s_gs9_g53_s0_lives0_dlg0[] = { /* 0x81c02fc */ MSG_NPC(4, _(" The other Pokémon will\nbe waking up soon.")), MSG_NPC(4, _(" You have to go!\nHurry!")), TEXTBOX_CLEAR, - ROTATE(4, 11, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_NORTHEAST), ALERT_CUE(6), AWAIT_CUE(5), PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, 0x0001, 0x00000000), @@ -7730,7 +7730,7 @@ static const struct ScriptCommand s_gs9_g53_s0_lives0_dlg0[] = { /* 0x81c02fc */ ALERT_CUE(12), { 0x89, 0xe0, 0x0099, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(5), - ROTATE(4, 11, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_NORTH), ALERT_CUE(6), AWAIT_CUE(5), WAIT(30), @@ -7776,7 +7776,7 @@ static const struct ScriptCommand s_gs9_g53_s0_lives1_dlg0[] = { /* 0x81c1318 */ { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(6), CALL_SCRIPT(NOTICE_FUNC), - ROTATE(4, 1, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTH), AWAIT_CUE(6), CALL_SCRIPT(JUMP_SURPRISE_FUNC), ALERT_CUE(5), @@ -7784,42 +7784,42 @@ static const struct ScriptCommand s_gs9_g53_s0_lives1_dlg0[] = { /* 0x81c1318 */ WAIT(12), CALL_SCRIPT(LOOK_AROUND_FUNC), AWAIT_CUE(6), - { 0x93, 0x04, 0x000b, 0x00000044, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_11, 68), CALL_SCRIPT(JUMP_SURPRISE_FUNC), AWAIT_CUE(6), WAIT(30), - ROTATE(10, 11, DIRECTION_SOUTH), + ROTATE_TO(10, DIR_TRANS_11, DIRECTION_SOUTH), WAIT(30), - ROTATE(10, 11, DIRECTION_EAST), + ROTATE_TO(10, DIR_TRANS_11, DIRECTION_EAST), ALERT_CUE(5), AWAIT_CUE(6), WAIT(20), CALL_SCRIPT(NOTICE_FUNC), AWAIT_CUE(6), - ROTATE(4, 11, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_WEST), AWAIT_CUE(6), - ROTATE(4, 11, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_SOUTHWEST), AWAIT_CUE(6), WALK_RELATIVE(128, -4, 4), WAIT(30), - ROTATE(4, 11, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_NORTHEAST), ALERT_CUE(5), AWAIT_CUE(6), WAIT(25), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, CAMERA_PAN(256, 58), - ROTATE(4, 11, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_SOUTHWEST), AWAIT_CUE(6), - ROTATE(4, 11, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_EAST), ALERT_CUE(5), AWAIT_CUE(6), - { 0x93, 0x04, 0x000b, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_11, 0), WALK_RELATIVE(256, -8, 8), ALERT_CUE(5), AWAIT_CUE(6), { 0x89, 0xe0, 0x0099, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(6), - ROTATE(4, 11, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_NORTH), ALERT_CUE(5), AWAIT_CUE(6), { 0x89, 0x78, 0x0100, 0x00000000, 0x00000000, NULL }, @@ -7844,21 +7844,21 @@ static const struct ScriptCommand s_gs9_g53_s0_lives2_dlg0[] = { /* 0x81c1678 */ AWAIT_CUE(7), CALL_SCRIPT(LOOK_AROUND_FUNC), AWAIT_CUE(7), - ROTATE(4, 11, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_NORTHEAST), CALL_SCRIPT(NOTICE_FUNC), AWAIT_CUE(7), WAIT(22), CALL_SCRIPT(NOTICE_FUNC), AWAIT_CUE(7), - ROTATE(4, 11, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_NORTHWEST), AWAIT_CUE(7), - ROTATE(4, 11, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_WEST), AWAIT_CUE(7), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, CAMERA_PAN(256, 59), - ROTATE(4, 11, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_WEST), AWAIT_CUE(7), - ROTATE(4, 11, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_SOUTH), WAIT(20), TEXTBOX_AUTO_PRESS(60, 60), PORTRAIT(PLACEMENT_TOP, 0x0002, 0x00000000), @@ -7882,18 +7882,18 @@ static const struct ScriptCommand s_gs9_g53_s0_lives3_dlg0[] = { /* 0x81c1904 */ WAIT(4), CALL_SCRIPT(LOOK_AROUND_FUNC), AWAIT_CUE(8), - { 0x93, 0x04, 0x000b, 0x00000044, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_11, 68), CALL_SCRIPT(NOTICE_FUNC), AWAIT_CUE(8), - ROTATE(4, 11, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_NORTHWEST), AWAIT_CUE(8), - ROTATE(4, 11, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_WEST), AWAIT_CUE(8), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, CAMERA_PAN(256, 60), - ROTATE(4, 11, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_WEST), AWAIT_CUE(8), - ROTATE(4, 11, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_SOUTH), HALT, }; @@ -7916,7 +7916,7 @@ static const struct ScriptCommand s_gs9_g53_s0_lives4_dlg0[] = { /* 0x81c1a94 */ ALERT_CUE(12), ALERT_CUE(5), TEXTBOX_CLEAR, - ROTATE(30, 2, DIRECTION_SOUTH), + ROTATE_TO(30, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTH), WAIT(15), { 0x68, 0x00, 0x0100, 0x00000008, 0x00000000, NULL }, FANFARE_STOP2(451), @@ -7939,7 +7939,7 @@ static const struct ScriptCommand s_gs9_g53_s0_lives4_dlg0[] = { /* 0x81c1a94 */ SELECT_ANIMATION(2), { 0x68, 0x00, 0x0100, 0x00000030, 0x00000000, NULL }, WAIT(15), - ROTATE(30, 1, DIRECTION_WEST), + ROTATE_TO(30, DIR_TRANS_SPINRIGHT1, DIRECTION_WEST), WALK_GRID(256, 4), FANFARE_STOP2(451), ALERT_CUE(5), @@ -7961,21 +7961,21 @@ static const struct ScriptCommand s_gs9_g53_s0_lives5_dlg0[] = { /* 0x81c1d74 */ WAIT(12), CALL_SCRIPT(LOOK_AROUND_FUNC), AWAIT_CUE(11), - { 0x93, 0x04, 0x000b, 0x00000044, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_11, 68), CALL_SCRIPT(NOTICE_FUNC), AWAIT_CUE(11), WAIT(25), CALL_SCRIPT(NOTICE_FUNC), AWAIT_CUE(11), - ROTATE(4, 11, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_NORTHWEST), AWAIT_CUE(11), - ROTATE(4, 11, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_NORTHWEST), AWAIT_CUE(11), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, CAMERA_PAN(256, 61), - ROTATE(4, 11, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_NORTHWEST), AWAIT_CUE(11), - ROTATE(4, 11, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_SOUTH), WAIT(110), TEXTBOX_AUTO_PRESS(80, 80), PORTRAIT(PLACEMENT_TOP, 0x0006, 0x00000000), @@ -8000,16 +8000,16 @@ static const struct ScriptCommand s_gs9_g53_s0_lives6_dlg0[] = { /* 0x81c2004 */ WAIT(8), CALL_SCRIPT(LOOK_AROUND_FUNC), AWAIT_CUE(12), - { 0x93, 0x04, 0x000b, 0x00000044, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_11, 68), CALL_SCRIPT(JUMP_SURPRISE_FUNC), AWAIT_CUE(12), - ROTATE(4, 11, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_NORTHWEST), AWAIT_CUE(12), - ROTATE(4, 11, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_NORTHWEST), AWAIT_CUE(12), - ROTATE(4, 11, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_NORTHWEST), AWAIT_CUE(12), - ROTATE(4, 11, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_SOUTH), HALT, }; @@ -8021,19 +8021,19 @@ static const struct ScriptCommand s_gs9_g53_s2_lives0_dlg0[] = { /* 0x81c2174 */ SELECT_ANIMATION(2), ALERT_CUE(5), AWAIT_CUE(9), - ROTATE(4, 1, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTHWEST), ALERT_CUE(5), AWAIT_CUE(9), - ROTATE(4, 11, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_NORTHWEST), AWAIT_CUE(9), - ROTATE(4, 11, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_WEST), AWAIT_CUE(9), - ROTATE(4, 1, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_WEST), AWAIT_CUE(9), CALL_SCRIPT(LOOK_AROUND_FUNC), ALERT_CUE(5), AWAIT_CUE(9), - ROTATE(4, 11, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_SOUTH), HALT, }; @@ -8080,18 +8080,18 @@ static const struct ScriptCommand s_gs9_g55_s0_lives0_dlg0[] = { /* 0x81c23c0 */ WAIT(5), ALERT_CUE(6), CALL_SCRIPT(NOTICE_FUNC), - { 0x93, 0x04, 0x000b, 0x00000037, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_11, 55), WAIT(100), TEXTBOX_CLEAR, ALERT_CUE(6), - ROTATE(4, 11, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_SOUTHWEST), AWAIT_CUE(5), WAIT(30), ALERT_CUE(7), AWAIT_CUE(5), ALERT_CUE(6), WAIT(10), - { 0x93, 0x04, 0x000b, 0x00000007, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_11, 7), WAIT(10), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" {NAME_2}'s brought us\nmail already, too.")), @@ -8119,11 +8119,11 @@ static const struct ScriptCommand s_gs9_g55_s0_lives1_dlg0[] = { /* 0x81c2858 */ ALERT_CUE(5), AWAIT_CUE(6), CALL_SCRIPT(NOTICE_FUNC), - { 0x93, 0x04, 0x000b, 0x00000037, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_11, 55), AWAIT_CUE(6), - ROTATE(4, 11, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_SOUTHWEST), AWAIT_CUE(6), - { 0x93, 0x04, 0x000b, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_11, 0), AWAIT_CUE(6), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, RET, @@ -8138,7 +8138,7 @@ static const struct ScriptCommand s_gs9_g55_s1_lives0_dlg0[] = { /* 0x81c2958 */ { 0x60, 0x00, 0x0000, 0x00000030, 0x00000000, NULL }, FANFARE_PLAY2(451), WALK_GRID(256, 3), - ROTATE(30, 2, DIRECTION_SOUTH), + ROTATE_TO(30, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTH), WAIT(15), { 0x68, 0x00, 0x0100, 0x00000008, 0x00000000, NULL }, FANFARE_STOP2(451), @@ -8154,7 +8154,7 @@ static const struct ScriptCommand s_gs9_g55_s1_lives0_dlg0[] = { /* 0x81c2958 */ SELECT_ANIMATION(2), { 0x68, 0x00, 0x0100, 0x00000030, 0x00000000, NULL }, WAIT(15), - ROTATE(30, 1, DIRECTION_WEST), + ROTATE_TO(30, DIR_TRANS_SPINRIGHT1, DIRECTION_WEST), WALK_GRID(256, 4), FANFARE_STOP2(451), ALERT_CUE(5), @@ -8319,7 +8319,7 @@ static const struct ScriptCommand s_gs9_g58_s0_lives0_dlg0[] = { /* 0x81c37c8 */ ALERT_CUE(7), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, CAMERA_PAN(256, 63), - ROTATE(4, 11, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_SOUTH), AWAIT_CUE(5), WAIT(30), PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, 0x0001, 0x00000000), @@ -8341,7 +8341,7 @@ static const struct ScriptCommand s_gs9_g58_s0_lives0_dlg0[] = { /* 0x81c37c8 */ MSG_NPC(2, _(" He's getting the other rescue\nteams to come.")), TEXTBOX_CLEAR, ALERT_CUE(6), - ROTATE(4, 11, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_WEST), MSG_NPC(1, _(" {NAME_0}, let's go!")), TEXTBOX_CLEAR, ALERT_CUE(7), @@ -8368,12 +8368,12 @@ static const struct ScriptCommand s_gs9_g58_s0_lives1_dlg0[] = { /* 0x81c3df4 */ { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(6), CALL_SCRIPT(NOTICE_FUNC), - ROTATE(4, 11, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_SOUTH), AWAIT_CUE(6), CALL_SCRIPT(QUESTION_FUNC), ALERT_CUE(5), AWAIT_CUE(6), - ROTATE(4, 11, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_EAST), AWAIT_CUE(6), WAIT(5), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, @@ -8594,7 +8594,7 @@ static const struct ScriptCommand s_gs9_g61_s1_lives1_dlg0[] = { /* 0x81c4e54 */ DEBUGINFO_O(8735), SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0x93, 0x08, 0x000a, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(8, DIR_TRANS_10, 0), WAIT(10), ALERT_CUE(5), HALT, @@ -8996,7 +8996,7 @@ static const struct ScriptCommand s_gs9_g68_s0_lives1_dlg0[] = { /* 0x81c68e0 */ WAIT(50), SELECT_ANIMATION(2), WAIT(15), - ROTATE(10, 10, DIRECTION_SOUTH), + ROTATE_TO(10, DIR_TRANS_10, DIRECTION_SOUTH), WAIT(30), ALERT_CUE(18), WAIT(30), @@ -9024,7 +9024,7 @@ static const struct ScriptCommand s_gs9_g68_s0_lives2_dlg0[] = { /* 0x81c6a60 */ { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, AWAIT_CUE(7), WAIT(30), - ROTATE(8, 10, DIRECTION_SOUTH), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_SOUTH), AWAIT_CUE(7), WAIT(10), CALL_SCRIPT(JUMP_ANGRY_FUNC), @@ -9033,7 +9033,7 @@ static const struct ScriptCommand s_gs9_g68_s0_lives2_dlg0[] = { /* 0x81c6a60 */ AWAIT_CUE(7), WAIT(40), { 0x89, 0x08, 0x0100, 0x00000000, 0x00000000, NULL }, - ROTATE(4, 10, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHEAST), WAIT(30), CALL_SCRIPT(JUMP_ANGRY_FUNC), WAIT(60), @@ -9051,22 +9051,22 @@ static const struct ScriptCommand s_gs9_g68_s0_lives3_dlg0[] = { /* 0x81c6be0 */ { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, AWAIT_CUE(8), WAIT(5), - ROTATE(8, 10, DIRECTION_NORTH), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_NORTH), WAIT(20), - ROTATE(4, 10, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTH), AWAIT_CUE(8), WAIT(15), CALL_SCRIPT(NOTICE_FUNC), CALL_SCRIPT(JUMP_ANGRY_FUNC), AWAIT_CUE(8), WAIT(10), - ROTATE(4, 10, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_WEST), WAIT(40), - ROTATE(4, 10, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTH), AWAIT_CUE(8), WAIT(35), { 0x89, 0x08, 0x0100, 0x00000000, 0x00000000, NULL }, - ROTATE(4, 10, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHWEST), WAIT(30), CALL_SCRIPT(JUMP_HAPPY_FUNC), WAIT(45), @@ -9083,25 +9083,25 @@ static const struct ScriptCommand s_gs9_g68_s0_lives4_dlg0[] = { /* 0x81c6dc0 */ { 0x2d, 0x07, 0x0004, 0x00000000, 0x00000000, NULL }, { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, AWAIT_CUE(9), - ROTATE(4, 10, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), WAIT(15), - ROTATE(4, 10, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTH), AWAIT_CUE(9), WAIT(10), CALL_SCRIPT(JUMP_ANGRY_FUNC), AWAIT_CUE(9), WAIT(60), - ROTATE(12, 10, DIRECTION_SOUTHWEST), + ROTATE_TO(12, DIR_TRANS_10, DIRECTION_SOUTHWEST), AWAIT_CUE(9), WAIT(5), - ROTATE(4, 10, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHWEST), WAIT(40), - ROTATE(4, 10, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHWEST), WAIT(10), CALL_SCRIPT(JUMP_HAPPY_FUNC), AWAIT_CUE(9), WAIT(30), - ROTATE(4, 10, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_WEST), WAIT(20), CALL_SCRIPT(JUMP_HAPPY_FUNC), WAIT(20), @@ -9119,20 +9119,20 @@ static const struct ScriptCommand s_gs9_g68_s0_lives5_dlg0[] = { /* 0x81c6fc0 */ { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, AWAIT_CUE(9), WAIT(7), - ROTATE(4, 10, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), WAIT(20), - ROTATE(4, 10, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTH), AWAIT_CUE(9), WAIT(15), CALL_SCRIPT(JUMP_HAPPY_FUNC), AWAIT_CUE(9), WAIT(50), - ROTATE(12, 10, DIRECTION_SOUTHWEST), + ROTATE_TO(12, DIR_TRANS_10, DIRECTION_SOUTHWEST), AWAIT_CUE(9), WAIT(5), - ROTATE(4, 10, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHWEST), WAIT(40), - ROTATE(4, 10, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHWEST), WAIT(40), CALL_SCRIPT(JUMP_HAPPY_FUNC), AWAIT_CUE(9), @@ -9149,7 +9149,7 @@ static const struct ScriptCommand s_gs9_g68_s0_lives6_dlg0[] = { /* 0x81c7170 */ { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, AWAIT_CUE(10), WAIT(25), - ROTATE(4, 10, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHEAST), AWAIT_CUE(10), WAIT(20), CALL_SCRIPT(JUMP_HAPPY_FUNC), @@ -9159,7 +9159,7 @@ static const struct ScriptCommand s_gs9_g68_s0_lives6_dlg0[] = { /* 0x81c7170 */ AWAIT_CUE(10), WAIT(35), WALK_GRID(256, 71), - ROTATE(4, 10, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), AWAIT_CUE(10), HALT, }; @@ -9176,13 +9176,13 @@ static const struct ScriptCommand s_gs9_g68_s0_lives7_dlg0[] = { /* 0x81c72a0 */ WAIT(30), CALL_SCRIPT(JUMP_HAPPY_FUNC), AWAIT_CUE(11), - ROTATE(4, 10, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHEAST), WAIT(30), CALL_SCRIPT(JUMP_HAPPY_FUNC), AWAIT_CUE(11), WAIT(45), WALK_GRID(204, 72), - ROTATE(4, 10, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHEAST), AWAIT_CUE(11), HALT, }; @@ -9194,30 +9194,30 @@ static const struct ScriptCommand s_gs9_g68_s0_lives8_dlg0[] = { /* 0x81c73e0 */ { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, AWAIT_CUE(12), WAIT(15), - ROTATE(8, 10, DIRECTION_SOUTH), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_SOUTH), AWAIT_CUE(12), CALL_SCRIPT(JUMP_SURPRISE_FUNC), AWAIT_CUE(12), WAIT(15), - ROTATE(4, 10, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_WEST), WALK_RELATIVE(128, -8, 0), CALL_SCRIPT(JUMP_ANGRY_FUNC), - ROTATE(4, 10, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTH), WAIT(30), - ROTATE(4, 10, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_WEST), WAIT(30), - ROTATE(4, 10, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTH), CALL_SCRIPT(JUMP_HAPPY_FUNC), AWAIT_CUE(12), - ROTATE(4, 10, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHWEST), WAIT(30), - ROTATE(4, 10, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTH), WAIT(10), CALL_SCRIPT(JUMP_ANGRY_FUNC), AWAIT_CUE(12), WAIT(40), WALK_GRID(256, 73), - ROTATE(4, 10, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTH), CALL_SCRIPT(JUMP_ANGRY_FUNC), WAIT(45), CALL_SCRIPT(JUMP_ANGRY_FUNC), @@ -9234,18 +9234,18 @@ static const struct ScriptCommand s_gs9_g68_s0_lives9_dlg0[] = { /* 0x81c7630 */ { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, AWAIT_CUE(13), WAIT(30), - ROTATE(8, 10, DIRECTION_SOUTHWEST), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_SOUTHWEST), AWAIT_CUE(13), WAIT(10), CALL_SCRIPT(NOTICE_FUNC), AWAIT_CUE(13), - ROTATE(4, 10, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_WEST), WAIT(5), - ROTATE(4, 10, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTH), WAIT(5), - ROTATE(4, 10, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_WEST), WAIT(5), - ROTATE(4, 10, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHWEST), WAIT(20), CALL_SCRIPT(JUMP_HAPPY_FUNC), AWAIT_CUE(13), @@ -9263,21 +9263,21 @@ static const struct ScriptCommand s_gs9_g68_s0_lives10_dlg0[] = { /* 0x81c77c0 * { 0x2d, 0x07, 0x0009, 0x00000000, 0x00000000, NULL }, { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, AWAIT_CUE(14), - ROTATE(4, 10, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTH), WAIT(10), CALL_SCRIPT(NOTICE_FUNC), AWAIT_CUE(14), CALL_SCRIPT(NOTICE_FUNC), AWAIT_CUE(14), - ROTATE(6, 10, DIRECTION_NORTH), + ROTATE_TO(6, DIR_TRANS_10, DIRECTION_NORTH), WAIT(70), { 0x89, 0x28, 0x0080, 0x00000002, 0x00000000, NULL }, - ROTATE(8, 10, DIRECTION_SOUTH), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_SOUTH), AWAIT_CUE(14), { 0x89, 0x10, 0x0080, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(14), WAIT(30), - ROTATE(8, 10, DIRECTION_WEST), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_WEST), AWAIT_CUE(14), HALT, }; @@ -9293,15 +9293,15 @@ static const struct ScriptCommand s_gs9_g68_s0_lives11_dlg0[] = { /* 0x81c7940 * CALL_SCRIPT(NOTICE_FUNC), AWAIT_CUE(15), WAIT(60), - ROTATE(8, 10, DIRECTION_SOUTHEAST), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_SOUTHEAST), AWAIT_CUE(15), - ROTATE(12, 10, DIRECTION_NORTHEAST), + ROTATE_TO(12, DIR_TRANS_10, DIRECTION_NORTHEAST), WAIT(30), - ROTATE(12, 10, DIRECTION_SOUTHEAST), + ROTATE_TO(12, DIR_TRANS_10, DIRECTION_SOUTHEAST), AWAIT_CUE(15), WAIT(30), { 0x89, 0x08, 0x0100, 0x00000002, 0x00000000, NULL }, - ROTATE(12, 10, DIRECTION_NORTHEAST), + ROTATE_TO(12, DIR_TRANS_10, DIRECTION_NORTHEAST), WAIT(30), CALL_SCRIPT(SMILE_START_FUNC), WAIT(60), @@ -9320,18 +9320,18 @@ static const struct ScriptCommand s_gs9_g68_s0_lives12_dlg0[] = { /* 0x81c7b10 * { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, AWAIT_CUE(16), WAIT(10), - ROTATE(4, 10, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTH), WAIT(10), CALL_SCRIPT(NOTICE_FUNC), AWAIT_CUE(16), AWAIT_CUE(15), WAIT(60), - ROTATE(12, 10, DIRECTION_WEST), + ROTATE_TO(12, DIR_TRANS_10, DIRECTION_WEST), AWAIT_CUE(16), AWAIT_CUE(16), WAIT(35), { 0x89, 0x0c, 0x0100, 0x00000005, 0x00000000, NULL }, - ROTATE(4, 10, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHWEST), CALL_SCRIPT(SMILE_START_FUNC), WAIT(60), CALL_SCRIPT(SMILE_END_FUNC), @@ -9469,7 +9469,7 @@ static const struct ScriptCommand s_gs9_g69_s0_lives0_dlg0[] = { /* 0x81c817c */ WAIT(10), ALERT_CUE(6), AWAIT_CUE(5), - ROTATE(4, 10, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_EAST), PORTRAIT_REP(0x0001, 0x00000000), MSG_NPC(1, _(" {NAME_0}!\nLet's go to the square!")), TEXTBOX_CLEAR, @@ -9500,12 +9500,12 @@ static const struct ScriptCommand s_gs9_g69_s0_lives1_dlg0[] = { /* 0x81c8584 */ AWAIT_CUE(6), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, CAMERA_PAN(256, 74), - ROTATE(4, 10, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTH), { 0x52, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, AWAIT_CUE(6), - ROTATE(4, 10, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHWEST), AWAIT_CUE(6), - ROTATE(4, 10, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_WEST), ALERT_CUE(5), AWAIT_CUE(6), WAIT(15), @@ -9524,7 +9524,7 @@ static const struct ScriptCommand s_gs9_g69_s0_lives2_dlg0[] = { /* 0x81c86f4 */ { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, { 0x89, 0x40, 0x0100, 0x00000004, 0x00000000, NULL }, AWAIT_CUE(7), - ROTATE(4, 10, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHEAST), CALL_SCRIPT(JUMP_HAPPY_FUNC), ALERT_CUE(5), AWAIT_CUE(7), @@ -9581,7 +9581,7 @@ static const struct ScriptCommand s_gs9_g71_s0_lives0_dlg0[] = { /* 0x81c899c */ FANFARE_PLAY2(465), ALERT_CUE(6), AWAIT_CUE(5), - ROTATE(4, 10, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Oh, yeah, {NAME_0}!\nHang on a second!")), VARIANT(/* == */ 1, _(" There's something I wanted\nto bounce off you before we go to any\ndungeon.")), @@ -9805,23 +9805,23 @@ static const struct ScriptCommand s_gs9_g74_s0_lives0_dlg0[] = { /* 0x81ca698 */ FANFARE_PLAY2(465), CALL_SCRIPT(NOTICE_FUNC), ALERT_CUE(6), - ROTATE(4, 10, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_EAST), WAIT(45), ALERT_CUE(4), ALERT_CUE(6), ALERT_CUE(7), ALERT_CUE(8), WALK_GRID(256, 75), - ROTATE(8, 10, DIRECTION_EAST), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_EAST), AWAIT_CUE(5), ALERT_CUE(6), - ROTATE(4, 10, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_EAST), MSG_NPC(2, _(" Um...{WAIT_PRESS}\nI'm Wynaut, and this is...")), TEXTBOX_CLEAR, WAIT(10), ALERT_CUE(8), ALERT_CUE(6), - ROTATE(4, 10, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHEAST), AWAIT_CUE(5), { 0x2d, 0x03, 0x0003, 0x0000006e, 0x00000000, NULL }, PORTRAIT(PLACEMENT_TOP_RIGHT, 0x0003, 0x00000041), @@ -9833,14 +9833,14 @@ static const struct ScriptCommand s_gs9_g74_s0_lives0_dlg0[] = { /* 0x81ca698 */ ALERT_CUE(7), AWAIT_CUE(5), ALERT_CUE(6), - ROTATE(4, 10, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_EAST), PORTRAIT(PLACEMENT_RIGHT, 0x0002, 0x00000000), MSG_NPC(2, _(" We have a notice on the\nBulletin Board outside the Pelipper Post\nOffice.")), TEXTBOX_CLEAR, WAIT(10), ALERT_CUE(8), ALERT_CUE(6), - ROTATE(4, 10, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHEAST), AWAIT_CUE(5), PORTRAIT(PLACEMENT_TOP_RIGHT, 0x0003, 0x00000041), MSG_NPC(3, _(" Wobbuffet!")), @@ -9848,13 +9848,13 @@ static const struct ScriptCommand s_gs9_g74_s0_lives0_dlg0[] = { /* 0x81ca698 */ ALERT_CUE(8), WAIT(10), ALERT_CUE(6), - ROTATE(4, 10, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_EAST), MSG_NPC(2, _(" Please look at it for me.\nPlease, please.")), TEXTBOX_CLEAR, WAIT(10), ALERT_CUE(8), ALERT_CUE(6), - ROTATE(4, 10, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHEAST), AWAIT_CUE(5), PORTRAIT_REP(0x0003, 0x00000041), MSG_NPC(3, _(" Wobbuffet!!!{WAIT_PRESS}")), @@ -9863,23 +9863,23 @@ static const struct ScriptCommand s_gs9_g74_s0_lives0_dlg0[] = { /* 0x81ca698 */ WAIT(10), ALERT_CUE(6), ALERT_CUE(7), - ROTATE(4, 10, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_EAST), MSG_NPC(2, _(" Please help me.{WAIT_PRESS}\nI have to go now.")), TEXTBOX_CLEAR, WAIT(10), ALERT_CUE(8), ALERT_CUE(6), - ROTATE(4, 10, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHEAST), AWAIT_CUE(5), MSG_NPC(3, _(" Wobbuffet!")), TEXTBOX_CLEAR, ALERT_CUE(8), ALERT_CUE(7), - ROTATE(4, 10, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTH), AWAIT_CUE(5), ALERT_CUE(6), WAIT(1), - ROTATE(8, 10, DIRECTION_NORTH), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_NORTH), WAIT(10), PORTRAIT_REP(0x0001, 0x00000004), MSG_VAR(2, PARTNER_TALK_KIND, 1), @@ -9910,30 +9910,30 @@ static const struct ScriptCommand s_gs9_g74_s0_lives1_dlg0[] = { /* 0x81cb178 */ SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(6), - ROTATE(8, 10, DIRECTION_EAST), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_EAST), AWAIT_CUE(6), WALK_GRID(256, 76), - ROTATE(8, 10, DIRECTION_EAST), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_EAST), AWAIT_CUE(6), - ROTATE(4, 10, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHEAST), AWAIT_CUE(6), - ROTATE(8, 10, DIRECTION_EAST), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_EAST), AWAIT_CUE(6), - ROTATE(8, 10, DIRECTION_SOUTHEAST), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_SOUTHEAST), AWAIT_CUE(6), - ROTATE(8, 10, DIRECTION_EAST), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_EAST), AWAIT_CUE(6), - ROTATE(8, 10, DIRECTION_SOUTHEAST), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_SOUTHEAST), AWAIT_CUE(6), - ROTATE(8, 10, DIRECTION_EAST), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_EAST), AWAIT_CUE(6), - ROTATE(8, 10, DIRECTION_SOUTHEAST), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_SOUTHEAST), AWAIT_CUE(6), - ROTATE(8, 10, DIRECTION_EAST), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_EAST), AWAIT_CUE(6), - ROTATE(8, 10, DIRECTION_SOUTH), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_SOUTH), AWAIT_CUE(6), - ROTATE(8, 10, DIRECTION_SOUTH), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_SOUTH), FANFARE_PLAY2(470), CALL_SCRIPT(SWEAT_FUNC), ALERT_CUE(5), @@ -9951,7 +9951,7 @@ static const struct ScriptCommand s_gs9_g74_s0_lives2_dlg0[] = { /* 0x81cb3a8 */ AWAIT_CUE(7), WALK_GRID(256, 77), WALK_GRID(256, 78), - ROTATE(8, 10, DIRECTION_WEST), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_WEST), AWAIT_CUE(7), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, ALERT_CUE(5), @@ -9975,7 +9975,7 @@ static const struct ScriptCommand s_gs9_g74_s0_lives3_dlg0[] = { /* 0x81cb508 */ { 0x2d, 0x07, 0x0003, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(8), WALK_GRID(256, 80), - ROTATE(8, 10, DIRECTION_SOUTHWEST), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_SOUTHWEST), ALERT_CUE(5), AWAIT_CUE(8), SELECT_ANIMATION(19), @@ -10122,7 +10122,7 @@ static const struct ScriptCommand s_gs9_g75_s0_lives0_dlg0[] = { /* 0x81cb8b4 */ CALL_SCRIPT(SWEAT_FUNC), { 0xe2, 0x00, 0x01d6, 0x00000000, 0x00000000, NULL }, WAIT(30), - ROTATE(4, 1, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_EAST), WAIT(30), MSG_NPC(-1, _(" Hey, you!")), TEXTBOX_CLEAR, @@ -10132,7 +10132,7 @@ static const struct ScriptCommand s_gs9_g75_s0_lives0_dlg0[] = { /* 0x81cb8b4 */ FANFARE_PLAY2(465), CALL_SCRIPT(NOTICE_FUNC), WAIT(1), - ROTATE(8, 1, DIRECTION_SOUTH), + ROTATE_TO(8, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTH), { 0xe2, 0x00, 0x01d1, 0x00000000, 0x00000000, NULL }, ALERT_CUE(4), BGM_FADEOUT(90), @@ -10166,7 +10166,7 @@ static const struct ScriptCommand s_gs9_g75_s0_lives0_dlg0[] = { /* 0x81cb8b4 */ MSG_NPC(4, _(" That's right, you!")), ALERT_CUE(9), ALERT_CUE(6), - ROTATE(8, 2, DIRECTION_SOUTHEAST), + ROTATE_TO(8, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTHEAST), MSG_NPC(4, _(" You got lucky!\nYou don't mess with us!")), TEXTBOX_CLEAR, WAIT(10), @@ -10187,7 +10187,7 @@ static const struct ScriptCommand s_gs9_g75_s0_lives0_dlg0[] = { /* 0x81cb8b4 */ WAIT(10), ALERT_CUE(6), WAIT(1), - ROTATE(8, 1, DIRECTION_SOUTH), + ROTATE_TO(8, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTH), SELECT_ANIMATION(41), BGM_STOP, AWAIT_CUE(5), @@ -10249,7 +10249,7 @@ static const struct ScriptCommand s_gs9_g75_s0_lives0_dlg0[] = { /* 0x81cb8b4 */ ALERT_CUE(10), ALERT_CUE(11), ALERT_CUE(6), - ROTATE(4, 2, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTHEAST), AWAIT_CUE(5), WAIT(20), PORTRAIT(PLACEMENT_LEFT_, 0x0004, 0x00000000), @@ -10276,7 +10276,7 @@ static const struct ScriptCommand s_gs9_g75_s0_lives0_dlg0[] = { /* 0x81cb8b4 */ TEXTBOX_CLEAR, WAIT(10), ALERT_CUE(6), - ROTATE(4, 10, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_EAST), AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x00000004), MSG_NPC(1, _(" Hmmm...\n{NAME_0}, what do you think?")), @@ -10286,7 +10286,7 @@ static const struct ScriptCommand s_gs9_g75_s0_lives0_dlg0[] = { /* 0x81cb8b4 */ LABEL(16), /* = 0x10 */ TEXTBOX_CLEAR, UPDATE_VARINT(CALC_SET, EVENT_LOCAL, 0), - ROTATE(4, 1, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTH), SELECT_ENTITIES(-1, 1), WAIT(2), AWAIT_CUE(5), @@ -10376,7 +10376,7 @@ static const struct ScriptCommand s_gs9_g75_s0_lives0_dlg0[] = { /* 0x81cb8b4 */ TEXTBOX_CLEAR, WAIT(10), ALERT_CUE(6), - ROTATE(4, 10, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_EAST), AWAIT_CUE(5), PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000004), PORTRAIT_POS(1, -1, -4), @@ -10485,7 +10485,7 @@ static const struct ScriptCommand s_gs9_g75_s0_lives0_dlg0[] = { /* 0x81cb8b4 */ ALERT_CUE(7), ALERT_CUE(8), WAIT(1), - ROTATE(4, 10, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_EAST), WAIT(30), MSG_NPC(7, _(" I'll spit silk for gluing\nthings together!")), TEXTBOX_CLEAR, @@ -10494,7 +10494,7 @@ static const struct ScriptCommand s_gs9_g75_s0_lives0_dlg0[] = { /* 0x81cb8b4 */ { 0xe5, 0x00, 0x0008, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(5), ALERT_CUE(6), - ROTATE(4, 10, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), ALERT_CUE(7), AWAIT_CUE(5), MSG_NPC(2, _(" I'll help too!")), @@ -10546,7 +10546,7 @@ static const struct ScriptCommand s_gs9_g75_s0_lives0_dlg0[] = { /* 0x81cb8b4 */ ALERT_CUE(8), ALERT_CUE(7), ALERT_CUE(12), - ROTATE(4, 2, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTH), { 0x54, 0x00, 0x002a, 0x00000000, 0x00000000, NULL }, WAIT(80), ALERT_CUE(3), @@ -10588,18 +10588,18 @@ static const struct ScriptCommand s_gs9_g75_s0_lives1_dlg0[] = { /* 0x81ce8cc */ SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(6), - ROTATE(4, 2, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_NORTHWEST), CALL_SCRIPT(SMILE_START_FUNC), WAIT(30), CALL_SCRIPT(SMILE_END_FUNC), AWAIT_CUE(6), CALL_SCRIPT(NOTICE_FUNC), WAIT(1), - ROTATE(8, 2, DIRECTION_SOUTH), + ROTATE_TO(8, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTH), AWAIT_CUE(6), - ROTATE(8, 1, DIRECTION_SOUTHWEST), + ROTATE_TO(8, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTHWEST), AWAIT_CUE(6), - ROTATE(2, 2, DIRECTION_SOUTH), + ROTATE_TO(2, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTH), SELECT_ANIMATION(41), AWAIT_CUE(6), SELECT_ANIMATION(2), @@ -10607,9 +10607,9 @@ static const struct ScriptCommand s_gs9_g75_s0_lives1_dlg0[] = { /* 0x81ce8cc */ CALL_SCRIPT(QUESTION_FUNC), { 0xe2, 0x00, 0x01d4, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(6), - ROTATE(2, 1, DIRECTION_SOUTHWEST), + ROTATE_TO(2, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTHWEST), AWAIT_CUE(6), - { 0x93, 0x08, 0x000a, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(8, DIR_TRANS_10, 0), WAIT(1), ALERT_CUE(5), HALT, @@ -10628,7 +10628,7 @@ static const struct ScriptCommand s_gs9_g75_s0_lives2_dlg0[] = { /* 0x81cea9c */ ALERT_CUE(5), AWAIT_CUE(7), { 0x89, 0x10, 0x0100, 0x00000004, 0x00000000, NULL }, - ROTATE(4, 10, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTH), ALERT_CUE(5), AWAIT_CUE(7), SELECT_ANIMATION(19), @@ -10649,15 +10649,15 @@ static const struct ScriptCommand s_gs9_g75_s0_lives2_dlg0[] = { /* 0x81cea9c */ AWAIT_CUE(7), LABEL(0), /* = 0x00 */ JUMPIF(JUDGE_EQ, EVENT_LOCAL, 1, /* to label */ 1), - ROTATE(8, 1, DIRECTION_SOUTHWEST), + ROTATE_TO(8, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTHWEST), WAIT(20), - ROTATE(8, 2, DIRECTION_SOUTHEAST), + ROTATE_TO(8, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTHEAST), WAIT(20), - ROTATE(8, 1, DIRECTION_SOUTH), + ROTATE_TO(8, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTH), AWAIT_CUE(7), JUMP_LABEL(0), LABEL(1), /* = 0x01 */ - ROTATE(4, 10, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHEAST), AWAIT_CUE(7), WALK_GRID(256, 85), { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, @@ -10706,15 +10706,15 @@ static const struct ScriptCommand s_gs9_g75_s0_lives3_dlg0[] = { /* 0x81cee3c */ AWAIT_CUE(8), LABEL(0), /* = 0x00 */ JUMPIF(JUDGE_EQ, EVENT_LOCAL, 1, /* to label */ 1), - ROTATE(8, 1, DIRECTION_SOUTHWEST), + ROTATE_TO(8, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTHWEST), WAIT(20), - ROTATE(8, 2, DIRECTION_SOUTHEAST), + ROTATE_TO(8, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTHEAST), WAIT(20), - ROTATE(8, 1, DIRECTION_SOUTH), + ROTATE_TO(8, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTH), AWAIT_CUE(8), JUMP_LABEL(0), LABEL(1), /* = 0x01 */ - ROTATE(4, 10, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHEAST), AWAIT_CUE(8), WALK_GRID(256, 86), AWAIT_CUE(8), @@ -10741,9 +10741,9 @@ static const struct ScriptCommand s_gs9_g75_s0_lives4_dlg0[] = { /* 0x81cf1ac */ AWAIT_CUE(9), WALK_GRID(256, 87), AWAIT_CUE(9), - ROTATE(4, 1, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTHEAST), AWAIT_CUE(9), - ROTATE(4, 2, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_NORTH), WALK_GRID(256, 88), FANFARE_PLAY2(465), CALL_SCRIPT(NOTICE_FUNC), @@ -10751,14 +10751,14 @@ static const struct ScriptCommand s_gs9_g75_s0_lives4_dlg0[] = { /* 0x81cf1ac */ { 0x63, 0x00, 0x0040, 0x00000057, 0x00000000, NULL }, ALERT_CUE(5), AWAIT_CUE(9), - ROTATE(8, 2, DIRECTION_SOUTH), + ROTATE_TO(8, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTH), ALERT_CUE(5), AWAIT_CUE(9), - ROTATE(8, 1, DIRECTION_NORTH), + ROTATE_TO(8, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTH), ALERT_CUE(5), - ROTATE(8, 1, DIRECTION_NORTHEAST), + ROTATE_TO(8, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTHEAST), AWAIT_CUE(9), - ROTATE(8, 2, DIRECTION_NORTH), + ROTATE_TO(8, DIR_TRANS_SPINLEFT1, DIRECTION_NORTH), HALT, }; @@ -10781,9 +10781,9 @@ static const struct ScriptCommand s_gs9_g75_s0_lives5_dlg0[] = { /* 0x81cf33c */ CALL_SCRIPT(JUMP_ANGRY_FUNC), ALERT_CUE(5), AWAIT_CUE(10), - ROTATE(8, 10, DIRECTION_NORTHEAST), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_NORTHEAST), AWAIT_CUE(10), - ROTATE(8, 10, DIRECTION_NORTH), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_NORTH), HALT, }; @@ -10807,9 +10807,9 @@ static const struct ScriptCommand s_gs9_g75_s0_lives6_dlg0[] = { /* 0x81cf49c */ CALL_SCRIPT(JUMP_SURPRISE_FUNC), ALERT_CUE(5), AWAIT_CUE(11), - ROTATE(8, 10, DIRECTION_NORTHWEST), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_NORTHWEST), AWAIT_CUE(11), - ROTATE(8, 10, DIRECTION_NORTH), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_NORTH), HALT, }; @@ -10827,7 +10827,7 @@ static const struct ScriptCommand s_gs9_g75_s0_lives7_dlg0[] = { /* 0x81cf60c */ AWAIT_CUE(12), WALK_GRID(256, 95), WALK_GRID(256, 96), - ROTATE(4, 10, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTH), AWAIT_CUE(12), SELECT_ANIMATION(17), AWAIT_CUE(12), @@ -10841,7 +10841,7 @@ static const struct ScriptCommand s_gs9_g75_s1_lives0_dlg0[] = { /* 0x81cf72c */ { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, { 0x8b, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(6), - ROTATE(8, 10, DIRECTION_SOUTH), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_SOUTH), WAIT(1), AWAIT_CUE(6), SELECT_ANIMATION(41), @@ -10865,7 +10865,7 @@ static const struct ScriptCommand s_gs9_g75_s1_lives0_dlg0[] = { /* 0x81cf72c */ { 0x4f, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x8b, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(6), - { 0x93, 0x08, 0x000a, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(8, DIR_TRANS_10, 0), WAIT(10), ALERT_CUE(5), HALT, @@ -10953,25 +10953,25 @@ static const struct ScriptCommand s_gs9_g75_s2_lives0_dlg0[] = { /* 0x81cfd9c */ DEBUGINFO_O(11094), SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - ROTATE(8, 10, DIRECTION_SOUTH), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_SOUTH), AWAIT_CUE(6), FANFARE_PLAY2(465), CALL_SCRIPT(NOTICE_FUNC), - ROTATE(8, 10, DIRECTION_SOUTH), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_SOUTH), AWAIT_CUE(6), FANFARE_PLAY2(455), CALL_SCRIPT(JUMP_HAPPY_FUNC), ALERT_CUE(5), AWAIT_CUE(6), - ROTATE(4, 10, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_EAST), AWAIT_CUE(6), - ROTATE(4, 10, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), AWAIT_CUE(6), CALL_SCRIPT(JUMP_HAPPY_FUNC), CALL_SCRIPT(JUMP_HAPPY_FUNC), ALERT_CUE(5), AWAIT_CUE(6), - ROTATE(4, 1, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTH), { 0x54, 0x00, 0x002a, 0x00000000, 0x00000000, NULL }, HALT, }; @@ -10981,13 +10981,13 @@ static const struct ScriptCommand s_gs9_g75_s2_lives1_dlg0[] = { /* 0x81cff1c */ SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0004, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(9), - ROTATE(8, 2, DIRECTION_SOUTH), + ROTATE_TO(8, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTH), ALERT_CUE(5), AWAIT_CUE(9), - ROTATE(8, 1, DIRECTION_NORTH), + ROTATE_TO(8, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTH), ALERT_CUE(5), AWAIT_CUE(9), - ROTATE(8, 10, DIRECTION_SOUTH), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_SOUTH), HALT, }; @@ -10996,13 +10996,13 @@ static const struct ScriptCommand s_gs9_g75_s2_lives2_dlg0[] = { /* 0x81cffdc */ SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0005, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(10), - ROTATE(8, 10, DIRECTION_NORTHEAST), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_NORTHEAST), AWAIT_CUE(10), - ROTATE(8, 10, DIRECTION_NORTH), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_NORTH), AWAIT_CUE(10), WALK_GRID(256, 98), AWAIT_CUE(10), - ROTATE(8, 2, DIRECTION_SOUTH), + ROTATE_TO(8, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTH), HALT, }; @@ -11011,16 +11011,16 @@ static const struct ScriptCommand s_gs9_g75_s2_lives3_dlg0[] = { /* 0x81d009c */ SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0006, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(11), - ROTATE(8, 10, DIRECTION_NORTHWEST), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_NORTHWEST), AWAIT_CUE(11), - ROTATE(8, 10, DIRECTION_NORTH), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_NORTH), AWAIT_CUE(11), WALK_GRID(256, 99), WALK_GRID(256, 100), - ROTATE(1, 2, DIRECTION_NORTH), + ROTATE_TO(1, DIR_TRANS_SPINLEFT1, DIRECTION_NORTH), ALERT_CUE(5), AWAIT_CUE(11), - ROTATE(8, 1, DIRECTION_SOUTH), + ROTATE_TO(8, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTH), HALT, }; @@ -11080,7 +11080,7 @@ static const struct ScriptCommand s_gs9_g76_s0_lives0_dlg0[] = { /* 0x81d041c */ PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0007, 0x00000000), WAIT(10), ALERT_CUE(6), - ROTATE(4, 2, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_WEST), PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000001), MSG_NPC(1, _(" Whew...{WAIT_PRESS}\nOur base is coming along quickly.")), TEXTBOX_CLEAR, @@ -11105,13 +11105,13 @@ static const struct ScriptCommand s_gs9_g76_s0_lives0_dlg0[] = { /* 0x81d041c */ ALERT_CUE(6), ALERT_CUE(7), ALERT_CUE(12), - ROTATE(4, 1, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTHEAST), ALERT_CUE(8), WAIT(80), ALERT_CUE(12), MSG_NPC(7, _(" But there's still lots to do.")), ALERT_CUE(6), - ROTATE(4, 2, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_NORTH), ALERT_CUE(7), ALERT_CUE(8), MSG_NPC(7, _(" We still have difficult\nthings to do.")), @@ -11133,7 +11133,7 @@ static const struct ScriptCommand s_gs9_g76_s0_lives0_dlg0[] = { /* 0x81d041c */ AWAIT_CUE(5), MSG_NPC(1, _(" Look!\nOver there!")), TEXTBOX_CLEAR, - ROTATE(4, 2, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTHWEST), ALERT_CUE(7), ALERT_CUE(8), ALERT_CUE(4), @@ -11203,7 +11203,7 @@ static const struct ScriptCommand s_gs9_g76_s0_lives0_dlg0[] = { /* 0x81d041c */ TEXTBOX_CLEAR, WAIT(10), ALERT_CUE(6), - ROTATE(4, 1, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTHWEST), AWAIT_CUE(5), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Problem, {NAME_0}.")), @@ -11232,25 +11232,25 @@ static const struct ScriptCommand s_gs9_g76_s0_lives1_dlg0[] = { /* 0x81d11b8 */ SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(6), - ROTATE(4, 1, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_EAST), AWAIT_CUE(6), - ROTATE(4, 2, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_NORTHWEST), CALL_SCRIPT(SMILE_START_FUNC), WAIT(30), CALL_SCRIPT(SMILE_END_FUNC), AWAIT_CUE(6), - ROTATE(4, 1, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTHEAST), AWAIT_CUE(6), - ROTATE(4, 2, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_NORTH), AWAIT_CUE(6), CALL_SCRIPT(LOOK_AROUND_FUNC), WAIT(5), - ROTATE(4, 1, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTH), CALL_SCRIPT(LOOK_AROUND_FUNC), WAIT(1), FANFARE_PLAY2(465), CALL_SCRIPT(NOTICE_FUNC), - ROTATE(4, 1, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTHWEST), { 0xe2, 0x00, 0x01d1, 0x00000000, 0x00000000, NULL }, ALERT_CUE(5), AWAIT_CUE(6), @@ -11261,7 +11261,7 @@ static const struct ScriptCommand s_gs9_g76_s0_lives1_dlg0[] = { /* 0x81d11b8 */ AWAIT_CUE(6), CALL_SCRIPT(JUMP_SURPRISE_FUNC), AWAIT_CUE(6), - ROTATE(8, 10, DIRECTION_SOUTHEAST), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_SOUTHEAST), WAIT(1), ALERT_CUE(5), HALT, @@ -11272,14 +11272,14 @@ static const struct ScriptCommand s_gs9_g76_s0_lives2_dlg0[] = { /* 0x81d1408 */ SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(7), - ROTATE(4, 1, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTHEAST), SELECT_ANIMATION(5), WAIT(20), SELECT_ANIMATION(2), AWAIT_CUE(7), - ROTATE(4, 2, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_NORTHEAST), AWAIT_CUE(7), - ROTATE(4, 1, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTHWEST), AWAIT_CUE(7), WAIT(16), { 0x53, 0x00, 0x0000, 0x00000001, 0x00000000, NULL }, @@ -11287,7 +11287,7 @@ static const struct ScriptCommand s_gs9_g76_s0_lives2_dlg0[] = { /* 0x81d1408 */ WALK_GRID(256, 116), WALK_GRID(256, 117), { 0x52, 0x00, 0x0000, 0x00000001, 0x00000000, NULL }, - ROTATE(4, 2, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTHWEST), AWAIT_CUE(7), CALL_SCRIPT(JUMP_SURPRISE_FUNC), HALT, @@ -11298,7 +11298,7 @@ static const struct ScriptCommand s_gs9_g76_s0_lives3_dlg0[] = { /* 0x81d1578 */ SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0003, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(8), - ROTATE(4, 1, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTH), SELECT_ANIMATION(19), STOP_ANIMATION_ON_CURRENT_FRAME, ALERT_CUE(5), @@ -11311,11 +11311,11 @@ static const struct ScriptCommand s_gs9_g76_s0_lives3_dlg0[] = { /* 0x81d1578 */ AWAIT_CUE(8), SELECT_ANIMATION(2), AWAIT_CUE(8), - ROTATE(4, 2, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_EAST), WAIT(20), - ROTATE(4, 1, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTH), AWAIT_CUE(8), - ROTATE(4, 2, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_EAST), AWAIT_CUE(8), SELECT_ANIMATION(19), STOP_ANIMATION_ON_CURRENT_FRAME, @@ -11323,14 +11323,14 @@ static const struct ScriptCommand s_gs9_g76_s0_lives3_dlg0[] = { /* 0x81d1578 */ AWAIT_CUE(8), SELECT_ANIMATION(2), AWAIT_CUE(8), - ROTATE(4, 1, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTHWEST), AWAIT_CUE(8), { 0x53, 0x00, 0x0000, 0x00000001, 0x00000000, NULL }, WALK_GRID(256, 112), WALK_GRID(256, 113), WALK_GRID(256, 114), { 0x52, 0x00, 0x0000, 0x00000001, 0x00000000, NULL }, - ROTATE(4, 10, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHWEST), AWAIT_CUE(8), CALL_SCRIPT(JUMP_SURPRISE_FUNC), HALT, @@ -11342,7 +11342,7 @@ static const struct ScriptCommand s_gs9_g76_s0_lives4_dlg0[] = { /* 0x81d17f8 */ { 0x2d, 0x07, 0x0004, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(9), SELECT_ANIMATION(2), - ROTATE(8, 10, DIRECTION_EAST), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_EAST), ALERT_CUE(5), AWAIT_CUE(9), HALT, @@ -11355,7 +11355,7 @@ static const struct ScriptCommand s_gs9_g76_s0_lives5_dlg0[] = { /* 0x81d1888 */ { 0x59, 0x01, 0x0000, 0x00000004, 0x00000000, NULL }, AWAIT_CUE(10), SELECT_ANIMATION(2), - ROTATE(8, 10, DIRECTION_EAST), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_EAST), AWAIT_CUE(10), HALT, }; @@ -11366,7 +11366,7 @@ static const struct ScriptCommand s_gs9_g76_s0_lives6_dlg0[] = { /* 0x81d1918 */ { 0x2d, 0x07, 0x0006, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(11), SELECT_ANIMATION(2), - ROTATE(8, 10, DIRECTION_EAST), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_EAST), AWAIT_CUE(11), HALT, }; @@ -11376,21 +11376,21 @@ static const struct ScriptCommand s_gs9_g76_s0_lives7_dlg0[] = { /* 0x81d1998 */ SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0007, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(12), - ROTATE(8, 2, DIRECTION_SOUTHWEST), + ROTATE_TO(8, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTHWEST), CALL_SCRIPT(SMILE_START_FUNC), WAIT(30), CALL_SCRIPT(SMILE_END_FUNC), - ROTATE(4, 1, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_WEST), AWAIT_CUE(12), WALK_RELATIVE(256, -16, 0), - ROTATE(4, 2, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTHWEST), AWAIT_CUE(12), { 0x53, 0x00, 0x0000, 0x00000001, 0x00000000, NULL }, WAIT(20), WALK_GRID(204, 109), WALK_GRID(256, 110), WALK_GRID(256, 111), - ROTATE(4, 10, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_WEST), { 0x52, 0x00, 0x0000, 0x00000001, 0x00000000, NULL }, AWAIT_CUE(12), CALL_SCRIPT(JUMP_HAPPY_FUNC), @@ -11519,7 +11519,7 @@ static const struct ScriptCommand s_gs9_g77_s0_lives4_dlg3[] = { /* 0x81d21f0 */ SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(6), - ROTATE(4, 10, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTH), SELECT_ANIMATION(19), STOP_ANIMATION_ON_CURRENT_FRAME, ALERT_CUE(5), @@ -11716,7 +11716,7 @@ static const struct ScriptCommand s_gs9_g77_s1_lives1_dlg0[] = { /* 0x81d3084 */ DEBUGINFO_O(11857), SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0x93, 0x08, 0x000a, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(8, DIR_TRANS_10, 0), AWAIT_CUE(6), AWAIT_CUE(6), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, @@ -11727,7 +11727,7 @@ static const struct ScriptCommand s_gs9_g77_s1_lives2_dlg0[] = { /* 0x81d3104 */ DEBUGINFO_O(11868), SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x93, 0x08, 0x000a, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(8, DIR_TRANS_10, 0), AWAIT_CUE(7), HALT, }; @@ -11736,7 +11736,7 @@ static const struct ScriptCommand s_gs9_g77_s1_lives3_dlg0[] = { /* 0x81d3164 */ DEBUGINFO_O(11877), SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0003, 0x00000000, 0x00000000, NULL }, - { 0x93, 0x08, 0x000a, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(8, DIR_TRANS_10, 0), AWAIT_CUE(8), HALT, }; @@ -11745,7 +11745,7 @@ static const struct ScriptCommand s_gs9_g77_s1_lives4_dlg0[] = { /* 0x81d31c4 */ DEBUGINFO_O(11886), SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0004, 0x00000000, 0x00000000, NULL }, - { 0x93, 0x08, 0x000a, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(8, DIR_TRANS_10, 0), AWAIT_CUE(9), HALT, }; @@ -11757,13 +11757,13 @@ static const struct ScriptCommand s_gs9_g77_s2_lives0_dlg0[] = { /* 0x81d3224 */ CALL_SCRIPT(JUMP_ANGRY_FUNC), ALERT_CUE(5), AWAIT_CUE(7), - { 0x93, 0x08, 0x000a, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(8, DIR_TRANS_10, 0), { 0x6f, 0x08, 0x0100, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(7), SELECT_ANIMATION(8), WAIT(10), - ROTATE(4, 2, DIRECTION_WEST), - ROTATE(4, 2, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTH), ALERT_CUE(5), HALT, }; @@ -11774,13 +11774,13 @@ static const struct ScriptCommand s_gs9_g77_s2_lives1_dlg0[] = { /* 0x81d3314 */ { 0x2d, 0x07, 0x0003, 0x00000000, 0x00000000, NULL }, CALL_SCRIPT(JUMP_ANGRY_FUNC), AWAIT_CUE(8), - { 0x93, 0x08, 0x000a, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(8, DIR_TRANS_10, 0), { 0x6f, 0x08, 0x0100, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(8), SELECT_ANIMATION(8), WAIT(10), - ROTATE(4, 2, DIRECTION_WEST), - ROTATE(4, 2, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTH), HALT, }; @@ -11790,13 +11790,13 @@ static const struct ScriptCommand s_gs9_g77_s2_lives2_dlg0[] = { /* 0x81d33e4 */ { 0x2d, 0x07, 0x0004, 0x00000000, 0x00000000, NULL }, CALL_SCRIPT(JUMP_ANGRY_FUNC), AWAIT_CUE(9), - { 0x93, 0x08, 0x000a, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(8, DIR_TRANS_10, 0), { 0x6f, 0x08, 0x0100, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(9), SELECT_ANIMATION(8), WAIT(10), - ROTATE(4, 2, DIRECTION_WEST), - ROTATE(4, 2, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTH), HALT, }; @@ -11807,12 +11807,12 @@ static const struct ScriptCommand s_gs9_g77_s3_lives0_dlg0[] = { /* 0x81d34b4 */ CALL_SCRIPT(JUMP_HAPPY_FUNC), ALERT_CUE(5), AWAIT_CUE(7), - ROTATE(8, 10, DIRECTION_NORTHEAST), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_NORTHEAST), WAIT(1), AWAIT_CUE(7), WAIT(1), AWAIT_CUE(7), - { 0x93, 0x08, 0x000a, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(8, DIR_TRANS_10, 0), WAIT(1), AWAIT_CUE(7), HALT, @@ -11825,12 +11825,12 @@ static const struct ScriptCommand s_gs9_g77_s3_lives1_dlg0[] = { /* 0x81d35a4 */ CALL_SCRIPT(JUMP_HAPPY_FUNC), AWAIT_CUE(8), WAIT(1), - ROTATE(8, 10, DIRECTION_SOUTH), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_SOUTH), WAIT(1), AWAIT_CUE(8), WAIT(1), AWAIT_CUE(8), - { 0x93, 0x08, 0x000a, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(8, DIR_TRANS_10, 0), WAIT(1), AWAIT_CUE(8), HALT, @@ -11842,12 +11842,12 @@ static const struct ScriptCommand s_gs9_g77_s3_lives2_dlg0[] = { /* 0x81d3694 */ { 0x2d, 0x07, 0x0004, 0x00000000, 0x00000000, NULL }, CALL_SCRIPT(JUMP_HAPPY_FUNC), AWAIT_CUE(9), - ROTATE(8, 10, DIRECTION_WEST), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_WEST), WAIT(1), AWAIT_CUE(9), WAIT(1), AWAIT_CUE(9), - { 0x93, 0x08, 0x000a, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(8, DIR_TRANS_10, 0), WAIT(1), AWAIT_CUE(9), HALT, @@ -11939,7 +11939,7 @@ static const struct ScriptCommand s_gs9_g78_s0_lives0_dlg0[] = { /* 0x81d3cc4 */ TEXTBOX_CLEAR, WAIT(10), ALERT_CUE(6), - ROTATE(8, 1, DIRECTION_EAST), + ROTATE_TO(8, DIR_TRANS_SPINRIGHT1, DIRECTION_EAST), AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x00000001), MSG_VAR(2, PARTNER_TALK_KIND, 1), @@ -11950,7 +11950,7 @@ static const struct ScriptCommand s_gs9_g78_s0_lives0_dlg0[] = { /* 0x81d3cc4 */ VARIANT_DEFAULT(_(" {NAME_0}!\nIt's ready! Finally!")), VARIANT_DEFAULT(_(" Our... {COLOR CYAN}{TEAM_NAME}{RESET}'s\nrescue team base!")), TEXTBOX_CLEAR, - ROTATE(8, 2, DIRECTION_NORTH), + ROTATE_TO(8, DIR_TRANS_SPINLEFT1, DIRECTION_NORTH), ALERT_CUE(4), ALERT_CUE(6), AWAIT_CUE(5), @@ -11961,7 +11961,7 @@ static const struct ScriptCommand s_gs9_g78_s0_lives0_dlg0[] = { /* 0x81d3cc4 */ TEXTBOX_CLEAR, WAIT(10), ALERT_CUE(6), - ROTATE(8, 1, DIRECTION_EAST), + ROTATE_TO(8, DIR_TRANS_SPINRIGHT1, DIRECTION_EAST), AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x00000001), MSG_VAR(2, PARTNER_TALK_KIND, 1), @@ -11970,14 +11970,14 @@ static const struct ScriptCommand s_gs9_g78_s0_lives0_dlg0[] = { /* 0x81d3cc4 */ TEXTBOX_CLEAR, ALERT_CUE(12), ALERT_CUE(6), - ROTATE(4, 1, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTH), AWAIT_CUE(5), MSG_NPC(7, _(" We all worked very hard!")), TEXTBOX_CLEAR, WAIT(10), ALERT_CUE(7), ALERT_CUE(6), - ROTATE(8, 2, DIRECTION_SOUTHEAST), + ROTATE_TO(8, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTHEAST), AWAIT_CUE(5), MSG_NPC(2, _(" It was very hard, but it\nwas worth it!")), TEXTBOX_CLEAR, @@ -11990,13 +11990,13 @@ static const struct ScriptCommand s_gs9_g78_s0_lives0_dlg0[] = { /* 0x81d3cc4 */ ALERT_CUE(8), WAIT(10), ALERT_CUE(6), - ROTATE(10, 1, DIRECTION_SOUTH), + ROTATE_TO(10, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTH), WAIT(20), - ROTATE(10, 2, DIRECTION_SOUTHEAST), + ROTATE_TO(10, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTHEAST), WAIT(20), - ROTATE(10, 1, DIRECTION_SOUTH), + ROTATE_TO(10, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTH), WAIT(20), - ROTATE(10, 2, DIRECTION_SOUTHEAST), + ROTATE_TO(10, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTHEAST), WAIT(20), PORTRAIT_REP(0x0001, 0x0000000a), MSG_NPC(1, _(" Sniff... Everyone...{WAIT_PRESS}\nThank you!")), @@ -12012,7 +12012,7 @@ static const struct ScriptCommand s_gs9_g78_s0_lives0_dlg0[] = { /* 0x81d3cc4 */ TEXTBOX_CLEAR, WAIT(10), { 0xe5, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - ROTATE(8, 10, DIRECTION_WEST), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_WEST), ALERT_CUE(7), ALERT_CUE(8), ALERT_CUE(12), @@ -12066,7 +12066,7 @@ static const struct ScriptCommand s_gs9_g78_s0_lives0_dlg0[] = { /* 0x81d3cc4 */ ALERT_CUE(8), ALERT_CUE(12), CALL_SCRIPT(JUMP_SURPRISE_FUNC), - ROTATE(4, 10, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), AWAIT_CUE(5), WAIT(10), PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000004), @@ -12120,27 +12120,27 @@ static const struct ScriptCommand s_gs9_g78_s0_lives1_dlg0[] = { /* 0x81d4d24 */ CALL_SCRIPT(JUMP_HAPPY_FUNC), ALERT_CUE(5), AWAIT_CUE(6), - ROTATE(8, 2, DIRECTION_WEST), + ROTATE_TO(8, DIR_TRANS_SPINLEFT1, DIRECTION_WEST), ALERT_CUE(5), AWAIT_CUE(6), - ROTATE(8, 1, DIRECTION_NORTH), + ROTATE_TO(8, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTH), AWAIT_CUE(6), - ROTATE(8, 2, DIRECTION_WEST), + ROTATE_TO(8, DIR_TRANS_SPINLEFT1, DIRECTION_WEST), ALERT_CUE(5), AWAIT_CUE(6), - ROTATE(4, 2, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTHWEST), AWAIT_CUE(6), - ROTATE(4, 2, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTH), AWAIT_CUE(6), - ROTATE(10, 1, DIRECTION_WEST), + ROTATE_TO(10, DIR_TRANS_SPINRIGHT1, DIRECTION_WEST), WAIT(20), - ROTATE(10, 2, DIRECTION_SOUTHWEST), + ROTATE_TO(10, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTHWEST), WAIT(20), - ROTATE(10, 2, DIRECTION_SOUTH), + ROTATE_TO(10, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTH), WAIT(20), - ROTATE(10, 1, DIRECTION_SOUTHWEST), + ROTATE_TO(10, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTHWEST), AWAIT_CUE(6), - ROTATE(4, 1, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_WEST), AWAIT_CUE(6), CALL_SCRIPT(SMILE_START_FUNC), WAIT(10), @@ -12148,12 +12148,12 @@ static const struct ScriptCommand s_gs9_g78_s0_lives1_dlg0[] = { /* 0x81d4d24 */ AWAIT_CUE(6), CALL_SCRIPT(JUMP_SURPRISE_FUNC), WAIT(10), - ROTATE(6, 10, DIRECTION_NORTH), + ROTATE_TO(6, DIR_TRANS_10, DIRECTION_NORTH), AWAIT_CUE(6), WALK_RELATIVE(384, -16, -64), WALK_GRID(256, 122), WALK_GRID(256, 121), - ROTATE(4, 1, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTH), SELECT_ANIMATION(9), ALERT_CUE(9), WAIT(100), @@ -12176,11 +12176,11 @@ static const struct ScriptCommand s_gs9_g78_s0_lives2_dlg0[] = { /* 0x81d5054 */ SELECT_ANIMATION(2), { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(7), - ROTATE(4, 2, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_WEST), AWAIT_CUE(7), CALL_SCRIPT(JUMP_SURPRISE_FUNC), WAIT(5), - ROTATE(4, 10, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), AWAIT_CUE(7), WAIT(70), WALK_GRID(256, 126), @@ -12193,23 +12193,23 @@ static const struct ScriptCommand s_gs9_g78_s0_lives3_dlg0[] = { /* 0x81d5184 */ SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0003, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(8), - ROTATE(4, 2, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_NORTHWEST), SELECT_ANIMATION(19), STOP_ANIMATION_ON_CURRENT_FRAME, ALERT_CUE(5), AWAIT_CUE(8), SELECT_ANIMATION(2), AWAIT_CUE(8), - ROTATE(4, 2, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_WEST), AWAIT_CUE(8), CALL_SCRIPT(JUMP_SURPRISE_FUNC), WAIT(10), - ROTATE(8, 10, DIRECTION_NORTH), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_NORTH), AWAIT_CUE(8), WAIT(90), WALK_RELATIVE(512, -32, 0), WALK_RELATIVE(256, 0, -56), - ROTATE(4, 1, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTH), SELECT_ANIMATION(19), HALT, }; @@ -12220,10 +12220,10 @@ static const struct ScriptCommand s_gs9_g78_s0_lives4_dlg0[] = { /* 0x81d52f4 */ { 0x2d, 0x07, 0x0004, 0x00000000, 0x00000000, NULL }, { 0x57, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(9), - ROTATE(8, 10, DIRECTION_EAST), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_EAST), ALERT_CUE(5), AWAIT_CUE(9), - ROTATE(8, 10, DIRECTION_SOUTHWEST), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_SOUTHWEST), ALERT_CUE(5), AWAIT_CUE(9), FANFARE_PLAY2(472), @@ -12233,9 +12233,9 @@ static const struct ScriptCommand s_gs9_g78_s0_lives4_dlg0[] = { /* 0x81d52f4 */ AWAIT_CUE(9), SELECT_ANIMATION(2), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, - ROTATE(4, 10, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_EAST), WALK_GRID(512, 123), - ROTATE(4, 10, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), AWAIT_CUE(9), { 0x54, 0x00, 0x000c, 0x00000000, 0x00000000, NULL }, WAIT(10), @@ -12276,18 +12276,18 @@ static const struct ScriptCommand s_gs9_g78_s0_lives5_dlg0[] = { /* 0x81d5644 */ { 0x2d, 0x07, 0x0005, 0x00000000, 0x00000000, NULL }, { 0x57, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(10), - ROTATE(8, 10, DIRECTION_EAST), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_EAST), AWAIT_CUE(10), - ROTATE(8, 10, DIRECTION_SOUTHEAST), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_SOUTHEAST), AWAIT_CUE(10), CALL_SCRIPT(JUMP_ANGRY_FUNC), AWAIT_CUE(10), SELECT_ANIMATION(2), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, WAIT(20), - ROTATE(4, 10, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), WALK_GRID(512, 124), - ROTATE(4, 10, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_WEST), AWAIT_CUE(10), LABEL(0), /* = 0x00 */ JUMPIF(JUDGE_EQ, EVENT_LOCAL, 1, /* to label */ 1), @@ -12312,19 +12312,19 @@ static const struct ScriptCommand s_gs9_g78_s0_lives6_dlg0[] = { /* 0x81d5854 */ { 0x2d, 0x07, 0x0006, 0x00000000, 0x00000000, NULL }, { 0x57, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(11), - ROTATE(8, 10, DIRECTION_EAST), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_EAST), AWAIT_CUE(11), - ROTATE(8, 10, DIRECTION_NORTH), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_NORTH), AWAIT_CUE(11), CALL_SCRIPT(JUMP_ANGRY_FUNC), AWAIT_CUE(11), SELECT_ANIMATION(2), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, CALL_SCRIPT(JUMP_ANGRY_FUNC), - ROTATE(4, 10, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), WALK_GRID(512, 124), WALK_GRID(512, 125), - ROTATE(4, 10, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_WEST), ALERT_CUE(4), AWAIT_CUE(11), LABEL(0), /* = 0x00 */ @@ -12349,16 +12349,16 @@ static const struct ScriptCommand s_gs9_g78_s0_lives7_dlg0[] = { /* 0x81d5a84 */ SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0007, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(12), - ROTATE(4, 1, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTHEAST), { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(12), - ROTATE(8, 2, DIRECTION_WEST), + ROTATE_TO(8, DIR_TRANS_SPINLEFT1, DIRECTION_WEST), AWAIT_CUE(12), CALL_SCRIPT(JUMP_SURPRISE_FUNC), WAIT(5), - ROTATE(8, 10, DIRECTION_NORTH), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_NORTH), AWAIT_CUE(12), - { 0x93, 0x06, 0x000a, 0x00000072, 0x00000000, NULL }, + CMD_UNK_93(6, DIR_TRANS_10, 114), WAIT(80), WALK_GRID(204, 127), HALT, @@ -12407,7 +12407,7 @@ static const struct ScriptCommand s_gs9_g79_s0_lives0_dlg0[] = { /* 0x81d5d20 */ TEXTBOX_CLEAR, WAIT(10), ALERT_CUE(6), - ROTATE(4, 1, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTHEAST), PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" That's cool, {NAME_2}.{WAIT_PRESS}\nBut why'd you run away?")), @@ -12443,7 +12443,7 @@ static const struct ScriptCommand s_gs9_g79_s0_lives0_dlg0[] = { /* 0x81d5d20 */ ALERT_CUE(6), FANFARE_PLAY2(465), CALL_SCRIPT(NOTICE_FUNC), - ROTATE(4, 1, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTH), PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000004), PORTRAIT_POS(1, -1, -4), MSG_VAR(2, PARTNER_TALK_KIND, 1), @@ -12451,7 +12451,7 @@ static const struct ScriptCommand s_gs9_g79_s0_lives0_dlg0[] = { /* 0x81d5d20 */ VARIANT_DEFAULT(_(" More {NAME_2}?{WAIT_PRESS}\nTwo of them...")), WAIT(20), ALERT_CUE(6), - ROTATE(4, 2, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_NORTHEAST), PORTRAIT_REP(0x0001, 0x00000004), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Hey, {NAME_2}.{WAIT_PRESS}\nWho are those guys?")), @@ -12464,7 +12464,7 @@ static const struct ScriptCommand s_gs9_g79_s0_lives0_dlg0[] = { /* 0x81d5d20 */ ALERT_CUE(8), ALERT_CUE(9), ALERT_CUE(6), - ROTATE(4, 1, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTH), AWAIT_CUE(5), PORTRAIT(PLACEMENT_LEFT_, 0x0003, 0x00000000), MSG_NPC(3, _(" Now, come with us.{WAIT_PRESS}\nThe grown-up ritual is ready for you.")), @@ -12502,13 +12502,13 @@ static const struct ScriptCommand s_gs9_g79_s0_lives0_dlg0[] = { /* 0x81d5d20 */ WAIT(10), ALERT_CUE(6), ALERT_CUE(9), - ROTATE(4, 2, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTHEAST), PORTRAIT(PLACEMENT_RIGHT, 0x0003, 0x00000000), MSG_NPC(3, _(" When we reach a certain age, they\nmark our backs with paw prints to show\nwe are grown-ups.")), TEXTBOX_CLEAR, WAIT(10), ALERT_CUE(6), - ROTATE(4, 1, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTH), PORTRAIT(PLACEMENT_LEFT_, 0x0003, 0x00000000), MSG_NPC(3, _(" They do that by taking the\nfront paw...{WAIT_PRESS}\nand pushing doooooowwnn on the back...")), TEXTBOX_CLEAR, @@ -12519,7 +12519,7 @@ static const struct ScriptCommand s_gs9_g79_s0_lives0_dlg0[] = { /* 0x81d5d20 */ ALERT_CUE(8), ALERT_CUE(9), ALERT_CUE(6), - ROTATE(4, 2, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_NORTHEAST), WAIT(20), ALERT_CUE(7), MSG_NPC(2, _(" I have dreams of creating\ngreat art, so I have certain standards\nfor design that I swear by.")), @@ -12540,7 +12540,7 @@ static const struct ScriptCommand s_gs9_g79_s0_lives0_dlg0[] = { /* 0x81d5d20 */ WAIT(10), ALERT_CUE(7), ALERT_CUE(6), - ROTATE(4, 1, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTH), AWAIT_CUE(5), PORTRAIT_REP(0x0002, 0x00000000), MSG_NPC(2, _(" So...\nI won't return to the pack!{WAIT_PRESS}\nThis is where I will dedicate myself!")), @@ -12576,14 +12576,14 @@ static const struct ScriptCommand s_gs9_g79_s0_lives0_dlg0[] = { /* 0x81d5d20 */ TEXTBOX_CLEAR, WAIT(10), ALERT_CUE(6), - ROTATE(4, 2, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_EAST), PORTRAIT_REP(0x0001, 0x00000000), MSG_NPC(1, _(" But, that's OK.")), TEXTBOX_CLEAR, WAIT(30), ALERT_CUE(6), ALERT_CUE(7), - ROTATE(4, 1, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTHEAST), PORTRAIT_REP(0x0001, 0x00000009), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Welcome to the team!{WAIT_PRESS}\nWe expect your best, {NAME_2}!")), @@ -12606,13 +12606,13 @@ static const struct ScriptCommand s_gs9_g79_s0_lives0_dlg0[] = { /* 0x81d5d20 */ ALERT_CUE(7), WAIT(10), ALERT_CUE(6), - ROTATE(4, 2, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_NORTH), AWAIT_CUE(5), SELECT_LIVES(79, 1), ALERT_CUE(4), ALERT_CUE(6), WALK_GRID(256, 129), - ROTATE(4, 2, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_NORTHWEST), AWAIT_CUE(5), ALERT_CUE(7), MSG_NPC(2, _(" Observe, the design of that\nflag.")), @@ -12673,52 +12673,52 @@ static const struct ScriptCommand s_gs9_g79_s0_lives1_dlg0[] = { /* 0x81d764c */ SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(6), - ROTATE(4, 2, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_NORTHWEST), AWAIT_CUE(6), FANFARE_PLAY2(465), CALL_SCRIPT(NOTICE_FUNC), - ROTATE(4, 2, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTH), AWAIT_CUE(6), - ROTATE(4, 1, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTHWEST), AWAIT_CUE(6), - ROTATE(4, 2, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTH), AWAIT_CUE(6), - ROTATE(4, 1, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTHWEST), WAIT(20), - ROTATE(4, 2, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTH), WAIT(10), - ROTATE(4, 1, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTHWEST), WAIT(20), - ROTATE(4, 2, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTH), FANFARE_PLAY2(469), CALL_SCRIPT(QUESTION_FUNC), { 0xe2, 0x00, 0x01d5, 0x00000000, 0x00000000, NULL }, ALERT_CUE(5), AWAIT_CUE(6), - ROTATE(4, 1, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTHWEST), AWAIT_CUE(6), - ROTATE(4, 2, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTH), AWAIT_CUE(6), - ROTATE(4, 1, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTHWEST), ALERT_CUE(5), AWAIT_CUE(6), - ROTATE(4, 1, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTHWEST), AWAIT_CUE(6), FANFARE_PLAY2(465), CALL_SCRIPT(SHOCK_FUNC), ALERT_CUE(5), AWAIT_CUE(6), WAIT(5), - ROTATE(4, 2, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTH), AWAIT_CUE(6), - ROTATE(4, 1, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_WEST), AWAIT_CUE(6), - ROTATE(4, 2, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTHWEST), AWAIT_CUE(6), - ROTATE(4, 1, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTH), AWAIT_CUE(6), WALK_RELATIVE(256, 0, -112), - ROTATE(4, 2, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_NORTHWEST), HALT, }; @@ -12728,9 +12728,9 @@ static const struct ScriptCommand s_gs9_g79_s0_lives2_dlg0[] = { /* 0x81d797c */ { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x52, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(7), - ROTATE(4, 2, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTHEAST), AWAIT_CUE(7), - ROTATE(4, 1, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTH), FANFARE_PLAY2(465), CALL_SCRIPT(NOTICE_FUNC), { 0xe2, 0x00, 0x01d1, 0x00000000, 0x00000000, NULL }, @@ -12738,26 +12738,26 @@ static const struct ScriptCommand s_gs9_g79_s0_lives2_dlg0[] = { /* 0x81d797c */ WALK_RELATIVE(512, -16, 0), FANFARE_PLAY2(457), { 0x56, 0x00, 0x0000, 0x00000047, 0x00000000, NULL }, - ROTATE(4, 2, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTH), ALERT_CUE(5), AWAIT_CUE(7), { 0x62, 0x00, 0x0100, 0x00000010, 0x00000000, NULL }, ALERT_CUE(5), AWAIT_CUE(7), { 0x62, 0x00, 0x0200, -0x00000010, 0x00000000, NULL }, - ROTATE(4, 2, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_NORTH), AWAIT_CUE(7), - ROTATE(4, 1, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTH), { 0x62, 0x00, 0x0100, 0x00000010, 0x00000000, NULL }, AWAIT_CUE(7), - ROTATE(4, 2, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTHEAST), AWAIT_CUE(7), WAIT(10), - ROTATE(8, 1, DIRECTION_SOUTHWEST), + ROTATE_TO(8, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTHWEST), WAIT(30), - ROTATE(8, 2, DIRECTION_SOUTHEAST), + ROTATE_TO(8, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTHEAST), WAIT(30), - ROTATE(8, 1, DIRECTION_SOUTH), + ROTATE_TO(8, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTH), WAIT(30), FANFARE_PLAY2(465), CALL_SCRIPT(NOTICE_FUNC), @@ -12767,13 +12767,13 @@ static const struct ScriptCommand s_gs9_g79_s0_lives2_dlg0[] = { /* 0x81d797c */ WALK_RELATIVE(512, 0, 32), ALERT_CUE(5), AWAIT_CUE(7), - ROTATE(4, 1, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTHWEST), AWAIT_CUE(7), - ROTATE(4, 2, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTHEAST), AWAIT_CUE(7), - ROTATE(4, 1, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTH), AWAIT_CUE(7), - ROTATE(4, 2, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_NORTH), AWAIT_CUE(7), CALL_SCRIPT(SMILE_START_FUNC), WAIT(1), @@ -12783,7 +12783,7 @@ static const struct ScriptCommand s_gs9_g79_s0_lives2_dlg0[] = { /* 0x81d797c */ AWAIT_CUE(7), CALL_SCRIPT(LOOK_AROUND_FUNC), WAIT(20), - ROTATE(4, 2, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_NORTHWEST), FANFARE_PLAY2(465), CALL_SCRIPT(NOTICE_FUNC), { 0xe2, 0x00, 0x01d1, 0x00000000, 0x00000000, NULL }, @@ -12801,18 +12801,18 @@ static const struct ScriptCommand s_gs9_g79_s0_lives3_dlg0[] = { /* 0x81d7dcc */ AWAIT_CUE(8), WALK_RELATIVE(256, 0, -32), AWAIT_CUE(8), - ROTATE(4, 1, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTHEAST), AWAIT_CUE(8), WALK_RELATIVE(256, 0, -88), AWAIT_CUE(8), - ROTATE(4, 1, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTHEAST), AWAIT_CUE(8), - ROTATE(4, 2, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_NORTH), AWAIT_CUE(8), FANFARE_PLAY2(455), CALL_SCRIPT(JUMP_SURPRISE_FUNC), AWAIT_CUE(8), - ROTATE(4, 1, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_EAST), { 0x62, 0x00, 0x0100, 0x00000004, 0x00000000, NULL }, WAIT(5), SELECT_ANIMATION(5), @@ -12820,9 +12820,9 @@ static const struct ScriptCommand s_gs9_g79_s0_lives3_dlg0[] = { /* 0x81d7dcc */ SELECT_ANIMATION(2), { 0x62, 0x00, 0x0100, -0x00000004, 0x00000000, NULL }, WAIT(60), - ROTATE(4, 2, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_NORTH), AWAIT_CUE(8), - ROTATE(4, 1, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTHEAST), AWAIT_CUE(8), WALK_RELATIVE(256, 0, 80), END_DELETE, @@ -12836,18 +12836,18 @@ static const struct ScriptCommand s_gs9_g79_s0_lives4_dlg0[] = { /* 0x81d7fbc */ WAIT(10), WALK_RELATIVE(256, 0, -16), AWAIT_CUE(9), - ROTATE(4, 2, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_NORTHWEST), AWAIT_CUE(9), WALK_RELATIVE(256, 0, -104), ALERT_CUE(5), AWAIT_CUE(9), - ROTATE(4, 2, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_NORTHWEST), AWAIT_CUE(9), - ROTATE(4, 1, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTH), AWAIT_CUE(9), CALL_SCRIPT(JUMP_SURPRISE_FUNC), AWAIT_CUE(9), - ROTATE(4, 2, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_WEST), WAIT(30), { 0x62, 0x00, 0x0100, -0x00000004, 0x00000000, NULL }, SELECT_ANIMATION(5), @@ -12855,11 +12855,11 @@ static const struct ScriptCommand s_gs9_g79_s0_lives4_dlg0[] = { /* 0x81d7fbc */ SELECT_ANIMATION(2), { 0x62, 0x00, 0x0100, 0x00000004, 0x00000000, NULL }, WAIT(30), - ROTATE(4, 1, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTH), WAIT(10), ALERT_CUE(5), AWAIT_CUE(9), - ROTATE(4, 2, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_NORTHWEST), AWAIT_CUE(9), WALK_RELATIVE(256, 0, 80), ALERT_CUE(5), @@ -12926,7 +12926,7 @@ static const struct ScriptCommand s_gs9_g80_s0_lives0_dlg3[] = { /* 0x81d8594 */ CALL_SCRIPT(SMILE_END_FUNC), { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(6), - { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 0), ALERT_CUE(5), AWAIT_CUE(6), CALL_SCRIPT(SMILE_START_FUNC), @@ -12983,7 +12983,7 @@ static const struct ScriptCommand s_gs9_g81_s0_lives0_dlg0[] = { /* 0x81d87d8 */ WAIT(60), ALERT_CUE(7), ALERT_CUE(6), - { 0x93, 0x04, 0x000a, 0x00000061, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 97), CALL_SCRIPT(SHOCK_FUNC), PORTRAIT(PLACEMENT_TOP, 0x0002, 0x00000000), MSG_NPC(2, _(" Kwaaaaaah!")), @@ -13008,13 +13008,13 @@ static const struct ScriptCommand s_gs9_g81_s0_lives0_dlg0[] = { /* 0x81d87d8 */ ALERT_CUE(6), ALERT_CUE(7), CALL_SCRIPT(NOTICE_FUNC), - { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 104), WAIT(30), ALERT_CUE(8), AWAIT_CUE(5), ALERT_CUE(6), ALERT_CUE(7), - { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 104), WAIT(30), PORTRAIT(PLACEMENT_RIGHT, 0x0003, 0x00000000), MSG_NPC(3, _(" Oh, hey!\nThere you are!")), @@ -13036,7 +13036,7 @@ static const struct ScriptCommand s_gs9_g81_s0_lives0_dlg0[] = { /* 0x81d87d8 */ ALERT_CUE(7), ALERT_CUE(6), ALERT_CUE(8), - { 0x93, 0x04, 0x000a, 0x00000061, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 97), CALL_SCRIPT(SHOCK_FUNC), MSG_NPC(2, _(" Kwaaaah!")), TEXTBOX_CLEAR, @@ -13067,7 +13067,7 @@ static const struct ScriptCommand s_gs9_g81_s0_lives0_dlg0[] = { /* 0x81d87d8 */ TEXTBOX_CLEAR, WAIT(15), ALERT_CUE(8), - { 0x93, 0x04, 0x000a, 0x00000022, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 34), MSG_NPC(1, _(" Did you explore inside the\n{COLOR YELLOW_D}Meteor Cave{RESET}?")), TEXTBOX_CLEAR, WAIT(10), @@ -13100,7 +13100,7 @@ static const struct ScriptCommand s_gs9_g81_s0_lives0_dlg0[] = { /* 0x81d87d8 */ WAIT(15), ALERT_CUE(6), ALERT_CUE(7), - { 0x93, 0x04, 0x000a, 0x00000061, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 97), PORTRAIT(PLACEMENT_RIGHT, 0x0003, 0x00000000), MSG_NPC(3, _(" {NAME_2}, do you have\nany idea what are in that place?")), TEXTBOX_CLEAR, @@ -13122,7 +13122,7 @@ static const struct ScriptCommand s_gs9_g81_s0_lives0_dlg0[] = { /* 0x81d87d8 */ TEXTBOX_CLEAR, WAIT(30), ALERT_CUE(6), - { 0x93, 0x04, 0x000a, 0x00000022, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 34), AWAIT_CUE(5), PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), @@ -13171,21 +13171,21 @@ static const struct ScriptCommand s_gs9_g81_s0_lives1_dlg0[] = { /* 0x81d9bb4 */ { 0x56, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(6), - { 0x93, 0x04, 0x000a, 0x00000061, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 97), CALL_SCRIPT(SHOCK_FUNC), AWAIT_CUE(6), CALL_SCRIPT(SWEAT_FUNC), ALERT_CUE(5), AWAIT_CUE(6), CALL_SCRIPT(NOTICE_FUNC), - { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 104), AWAIT_CUE(7), - { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 104), AWAIT_CUE(7), - { 0x93, 0x04, 0x000a, 0x00000061, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 97), CALL_SCRIPT(SHOCK_FUNC), AWAIT_CUE(6), - { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 104), ALERT_CUE(5), AWAIT_CUE(6), { 0x56, 0x00, 0x0000, 0x0000005d, 0x00000000, NULL }, @@ -13193,9 +13193,9 @@ static const struct ScriptCommand s_gs9_g81_s0_lives1_dlg0[] = { /* 0x81d9bb4 */ { 0x56, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(6), - { 0x93, 0x04, 0x000a, 0x00000061, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 97), AWAIT_CUE(6), - { 0x93, 0x04, 0x000a, 0x00000001, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 1), ALERT_CUE(5), AWAIT_CUE(6), SELECT_ANIMATION(4), @@ -13214,9 +13214,9 @@ static const struct ScriptCommand s_gs9_g81_s0_lives2_dlg0[] = { /* 0x81d9e14 */ ALERT_CUE(5), AWAIT_CUE(7), CALL_SCRIPT(NOTICE_FUNC), - { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 104), AWAIT_CUE(7), - ROTATE(4, 10, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHEAST), AWAIT_CUE(7), FANFARE_PLAY2(474), SELECT_ANIMATION(9), @@ -13224,18 +13224,18 @@ static const struct ScriptCommand s_gs9_g81_s0_lives2_dlg0[] = { /* 0x81d9e14 */ SELECT_ANIMATION(2), ALERT_CUE(5), AWAIT_CUE(7), - { 0x93, 0x04, 0x000a, 0x00000022, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 34), ALERT_CUE(5), AWAIT_CUE(7), - ROTATE(4, 10, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHEAST), AWAIT_CUE(7), - ROTATE(4, 10, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTH), ALERT_CUE(5), AWAIT_CUE(7), - ROTATE(4, 10, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHEAST), ALERT_CUE(5), AWAIT_CUE(7), - ROTATE(4, 10, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTH), AWAIT_CUE(7), SELECT_ANIMATION(4), RET, @@ -13249,23 +13249,23 @@ static const struct ScriptCommand s_gs9_g81_s0_lives3_dlg0[] = { /* 0x81da054 */ WALK_GRID(256, 132), ALERT_CUE(5), AWAIT_CUE(8), - ROTATE(4, 10, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHWEST), ALERT_CUE(5), AWAIT_CUE(8), - ROTATE(4, 10, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHWEST), CALL_SCRIPT(SHOCK_FUNC), AWAIT_CUE(8), - ROTATE(4, 10, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHWEST), AWAIT_CUE(8), { 0x56, 0x00, 0x0000, 0x0000005e, 0x00000000, NULL }, WAIT(60), { 0x56, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(8), - ROTATE(4, 10, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHWEST), ALERT_CUE(5), AWAIT_CUE(8), - ROTATE(4, 10, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHWEST), AWAIT_CUE(8), SELECT_ANIMATION(4), RET, @@ -13325,7 +13325,7 @@ static const struct ScriptCommand s_gs9_g83_s0_lives0_dlg0[] = { /* 0x81da3bc */ { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("...This sound...") }, { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("...Something's coming closer?!") }, TEXTBOX_CLEAR, - ROTATE(4, 2, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTHEAST), { 0x36, 0x00, -0x0001, 0x00000000, 0x00000000, _("Whoooooooooooooooooooooooshhh!") }, WAIT(20), FANFARE_STOP2(508), @@ -13336,17 +13336,17 @@ static const struct ScriptCommand s_gs9_g83_s0_lives0_dlg0[] = { /* 0x81da3bc */ { 0x54, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, { 0x97, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, LABEL(1), /* = 0x01 */ - ROTATE(4, 1, DIRECTION_NORTHEAST), - ROTATE(4, 1, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTHEAST), JUMPIF(JUDGE_EQ, EVENT_LOCAL, 30, /* to label */ 2), JUMP_LABEL(1), LABEL(2), /* = 0x02 */ - ROTATE(4, 1, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTH), WAIT(30), SELECT_ANIMATION(2), WAIT(30), WALK_RELATIVE(512, 0, 40), - ROTATE(4, 1, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_WEST), FANFARE_PLAY2(469), CALL_SCRIPT(QUESTION_FUNC), PORTRAIT(PLACEMENT_LEFT_FLIP, 0x0000, 0x00000004), @@ -13355,7 +13355,7 @@ static const struct ScriptCommand s_gs9_g83_s0_lives0_dlg0[] = { /* 0x81da3bc */ { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("It seemed to be going...\nToward the mountain range in the north?") }, TEXTBOX_CLEAR, WAIT(30), - ROTATE(4, 2, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTH), PORTRAIT(PLACEMENT_LEFT_, 0x0000, 0x00000000), { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("............{WAIT_PRESS}\nYawwwwwn...\nStill sleepy...") }, { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("It's still early.\nI'll catch a little more sleep...") }, @@ -13450,14 +13450,14 @@ static const struct ScriptCommand s_gs9_g84_s0_lives0_dlg0[] = { /* 0x81da9c8 */ TEXTBOX_CLEAR, ALERT_CUE(7), AWAIT_CUE(5), - { 0x93, 0x04, 0x000a, 0x0000005d, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 93), WAIT(30), SPECIAL_TEXT(SPECIAL_TEXT_UNK_2C, 54, 0), WAIT(30), JUMP_LABEL(4), LABEL(4), /* = 0x04 */ ALERT_CUE(7), - ROTATE(8, 10, DIRECTION_NORTH), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_NORTH), AWAIT_CUE(5), MSG_NPC(2, _(" They say if you take that\nstone to the {COLOR YELLOW_D}Wish Cave{RESET}...\nTo its very depths...")), PORTRAIT_REP(0x0002, 0x00000003), @@ -13483,29 +13483,29 @@ static const struct ScriptCommand s_gs9_g84_s0_lives1_dlg0[] = { /* 0x81db1f8 */ SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(7), - { 0x93, 0x04, 0x0002, 0x0000005c, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_SPINLEFT1, 92), ALERT_CUE(5), AWAIT_CUE(7), - { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 0), ALERT_CUE(5), AWAIT_CUE(7), - { 0x93, 0x04, 0x0002, 0x0000005c, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_SPINLEFT1, 92), ALERT_CUE(5), AWAIT_CUE(7), CALL_SCRIPT(ANGRY_START_FUNC), WAIT(60), CALL_SCRIPT(ANGRY_END_FUNC), AWAIT_CUE(7), - { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 0), ALERT_CUE(5), AWAIT_CUE(7), WALK_RELATIVE(256, 0, 32), - { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 0), ALERT_CUE(5), AWAIT_CUE(7), - ROTATE(4, 10, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), WALK_RELATIVE(256, 0, -32), - { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 0), ALERT_CUE(5), AWAIT_CUE(7), END_DELETE, @@ -13529,19 +13529,19 @@ static const struct ScriptCommand s_gs9_g84_s0_lives2_dlg0[] = { /* 0x81db4b8 */ SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0003, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(8), - { 0x93, 0x04, 0x000a, 0x0000005d, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 93), WAIT(30), ALERT_CUE(5), CALL_SCRIPT(SMILE_START_FUNC), WAIT(60), CALL_SCRIPT(SMILE_END_FUNC), AWAIT_CUE(8), - { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 0), AWAIT_CUE(8), - { 0x93, 0x04, 0x000a, 0x0000005d, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 93), ALERT_CUE(5), AWAIT_CUE(8), - { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 0), AWAIT_CUE(8), END_DELETE, }; @@ -13738,7 +13738,7 @@ static const struct ScriptCommand s_gs9_g86_s3_lives0_dlg0[] = { /* 0x81dc4d8 */ { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x89, 0x30, 0x0080, 0x00000000, 0x00000000, NULL }, WAIT(90), - ROTATE(6, 10, DIRECTION_NORTH), + ROTATE_TO(6, DIR_TRANS_10, DIRECTION_NORTH), WAIT(30), { 0x89, 0x18, 0x0100, 0x00000004, 0x00000000, NULL }, ALERT_CUE(5), @@ -13911,10 +13911,10 @@ static const struct ScriptCommand s_gs9_g89_s1_lives0_dlg0[] = { /* 0x81dd154 */ CALL_SCRIPT(JUMP_ANGRY_FUNC), ALERT_CUE(5), AWAIT_CUE(7), - ROTATE(4, 10, DIRECTION_NORTHWEST), - ROTATE(4, 10, DIRECTION_NORTHEAST), - ROTATE(4, 10, DIRECTION_NORTHWEST), - ROTATE(4, 10, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), ALERT_CUE(5), AWAIT_CUE(7), HALT, @@ -13926,7 +13926,7 @@ static const struct ScriptCommand s_gs9_g89_s2_lives0_dlg0[] = { /* 0x81dd224 */ { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x89, 0x30, 0x0080, 0x00000000, 0x00000000, NULL }, WAIT(90), - ROTATE(6, 10, DIRECTION_NORTH), + ROTATE_TO(6, DIR_TRANS_10, DIRECTION_NORTH), WAIT(30), { 0x89, 0x18, 0x0100, 0x00000004, 0x00000000, NULL }, ALERT_CUE(5), @@ -13980,7 +13980,7 @@ static const struct ScriptCommand s_gs9_g91_s0_lives0_dlg0[] = { /* 0x81dd410 */ WAIT(45), ALERT_CUE(7), AWAIT_CUE(5), - ROTATE(4, 10, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_EAST), MSG_NPC(2, _(" Hey, {NAME_0}.\nThanks for getting me through this.")), MSG_NPC(2, _(" This is my thanks.")), TEXTBOX_CLEAR, @@ -13999,7 +13999,7 @@ static const struct ScriptCommand s_gs9_g91_s0_lives0_dlg0[] = { /* 0x81dd410 */ ALERT_CUE(8), MSG_NPC(3, _(" Oh, wait, please!")), TEXTBOX_CLEAR, - ROTATE(4, 10, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHEAST), WAIT(30), ALERT_CUE(7), AWAIT_CUE(5), @@ -14036,7 +14036,7 @@ static const struct ScriptCommand s_gs9_g91_s0_lives1_dlg0[] = { /* 0x81dd9c8 */ SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(7), - ROTATE(4, 10, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_WEST), ALERT_CUE(5), AWAIT_CUE(7), { 0x89, 0x18, 0x0100, 0x00000006, 0x00000000, NULL }, @@ -14045,7 +14045,7 @@ static const struct ScriptCommand s_gs9_g91_s0_lives1_dlg0[] = { /* 0x81dd9c8 */ { 0x89, 0x28, 0x0080, 0x00000002, 0x00000000, NULL }, ALERT_CUE(5), AWAIT_CUE(7), - ROTATE(4, 10, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHWEST), ALERT_CUE(5), AWAIT_CUE(7), END_DELETE, @@ -14056,7 +14056,7 @@ static const struct ScriptCommand s_gs9_g91_s0_lives2_dlg0[] = { /* 0x81ddad8 */ SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0003, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(8), - ROTATE(4, 10, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHEAST), ALERT_CUE(5), AWAIT_CUE(8), END_DELETE, diff --git a/src/data/ground/ground_data_b01p02a_station.h b/src/data/ground/ground_data_b01p02a_station.h index 87a878583..67558850b 100644 --- a/src/data/ground/ground_data_b01p02a_station.h +++ b/src/data/ground/ground_data_b01p02a_station.h @@ -466,7 +466,7 @@ static const struct ScriptCommand s_gs12_g9_s0_lives0_dlg0[] = { /* 0x81e2ec0 */ ALERT_CUE(7), AWAIT_CUE(5), ALERT_CUE(6), - ROTATE(4, 1, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTHEAST), PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" It's {NAME_0}'s house.")), @@ -484,7 +484,7 @@ static const struct ScriptCommand s_gs12_g9_s0_lives0_dlg0[] = { /* 0x81e2ec0 */ WAIT(10), ALERT_CUE(7), ALERT_CUE(6), - ROTATE(4, 2, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_NORTH), AWAIT_CUE(5), MSG_NPC(-1, _(" Th-thank you...")), TEXTBOX_CLEAR, @@ -564,7 +564,7 @@ static const struct ScriptCommand s_gs12_g9_s0_lives0_dlg0[] = { /* 0x81e2ec0 */ ALERT_CUE(7), AWAIT_CUE(5), WALK_RELATIVE(256, 0, -24), - ROTATE(4, 1, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTHEAST), WAIT(30), SELECT_EFFECTS(9, 1), WAIT(30), @@ -574,7 +574,7 @@ static const struct ScriptCommand s_gs12_g9_s0_lives0_dlg0[] = { /* 0x81e2ec0 */ TEXTBOX_CLEAR, WAIT(10), ALERT_CUE(7), - ROTATE(4, 1, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTHEAST), MSG_NPC(2, _(" It's a...{WAIT_PRESS}\n{COLOR GREEN_I}Clear Wing{RESET}...")), TEXTBOX_CLEAR, WAIT(10), @@ -588,7 +588,7 @@ static const struct ScriptCommand s_gs12_g9_s0_lives0_dlg0[] = { /* 0x81e2ec0 */ CANCEL_EFFECTS(9, 1), ALERT_CUE(7), ALERT_CUE(6), - ROTATE(4, 2, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_NORTH), AWAIT_CUE(5), MSG_NPC(2, _(" See? Depending on the light,\nit takes on many different colors.")), ALERT_CUE(7), @@ -603,13 +603,13 @@ static const struct ScriptCommand s_gs12_g9_s0_lives0_dlg0[] = { /* 0x81e2ec0 */ ALERT_CUE(6), AWAIT_CUE(5), ALERT_CUE(6), - ROTATE(4, 1, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTH), AWAIT_CUE(5), ALERT_CUE(6), - ROTATE(4, 1, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTHWEST), AWAIT_CUE(5), ALERT_CUE(6), - ROTATE(4, 2, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTHEAST), AWAIT_CUE(5), ALERT_CUE(6), AWAIT_CUE(5), @@ -628,7 +628,7 @@ static const struct ScriptCommand s_gs12_g9_s0_lives0_dlg0[] = { /* 0x81e2ec0 */ ALERT_CUE(7), AWAIT_CUE(5), ALERT_CUE(6), - ROTATE(4, 1, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTH), AWAIT_CUE(5), WAIT(30), PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000004), @@ -636,7 +636,7 @@ static const struct ScriptCommand s_gs12_g9_s0_lives0_dlg0[] = { /* 0x81e2ec0 */ TEXTBOX_CLEAR, WAIT(10), ALERT_CUE(6), - ROTATE(4, 2, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTHEAST), PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" But you are interested in\nthe mirage Pokémon, right?")), @@ -674,9 +674,9 @@ static const struct ScriptCommand s_gs12_g9_s0_lives1_dlg0[] = { /* 0x81e4480 */ SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(6), - ROTATE(4, 2, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_NORTHWEST), AWAIT_CUE(6), - ROTATE(4, 1, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTH), AWAIT_CUE(6), FANFARE_PLAY2(469), CALL_SCRIPT(QUESTION_FUNC), @@ -685,32 +685,32 @@ static const struct ScriptCommand s_gs12_g9_s0_lives1_dlg0[] = { /* 0x81e4480 */ CALL_SCRIPT(SHOCK_FUNC), AWAIT_CUE(6), WALK_RELATIVE(512, 0, -24), - ROTATE(4, 2, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_NORTHWEST), ALERT_CUE(5), AWAIT_CUE(6), FANFARE_PLAY2(469), CALL_SCRIPT(QUESTION_FUNC), { 0xe2, 0x00, 0x01d5, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(6), - ROTATE(4, 1, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTH), AWAIT_CUE(6), - ROTATE(4, 2, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_NORTHWEST), AWAIT_CUE(6), - ROTATE(4, 2, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTH), AWAIT_CUE(6), - ROTATE(4, 1, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTHWEST), AWAIT_CUE(6), - ROTATE(4, 2, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTHEAST), AWAIT_CUE(6), ALERT_CUE(4), WALK_RELATIVE(256, 0, 40), { 0x56, 0x00, 0x0000, 0x00000047, 0x00000000, NULL }, - ROTATE(4, 10, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHWEST), ALERT_CUE(5), AWAIT_CUE(6), - ROTATE(4, 2, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTH), AWAIT_CUE(6), - ROTATE(4, 10, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHWEST), HALT, }; @@ -743,7 +743,7 @@ static const struct ScriptCommand s_gs12_g9_s0_lives2_dlg0[] = { /* 0x81e4720 */ CALL_SCRIPT(JUMP_HAPPY_FUNC), ALERT_CUE(5), AWAIT_CUE(7), - ROTATE(4, 1, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTH), AWAIT_CUE(7), FANFARE_PLAY2(470), SELECT_ANIMATION(22), @@ -756,26 +756,26 @@ static const struct ScriptCommand s_gs12_g9_s0_lives2_dlg0[] = { /* 0x81e4720 */ ALERT_CUE(5), AWAIT_CUE(7), { 0x62, 0x00, 0x0100, 0x00000000, 0x00000010, NULL }, - ROTATE(4, 2, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTHEAST), SELECT_ANIMATION(5), WAIT(60), SELECT_ANIMATION(2), ALERT_CUE(5), AWAIT_CUE(7), { 0x62, 0x00, 0x0100, 0x00000000, -0x00000008, NULL }, - ROTATE(4, 10, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTH), ALERT_CUE(5), AWAIT_CUE(7), - ROTATE(4, 2, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTHEAST), AWAIT_CUE(7), - ROTATE(4, 1, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTH), SELECT_ANIMATION(7), SELECT_EFFECTS(9, 2), ALERT_CUE(5), AWAIT_CUE(7), SELECT_ANIMATION(2), AWAIT_CUE(7), - ROTATE(4, 2, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTHEAST), SELECT_ANIMATION(5), WAIT(60), WALK_RELATIVE(256, 0, 32), @@ -785,28 +785,28 @@ static const struct ScriptCommand s_gs12_g9_s0_lives2_dlg0[] = { /* 0x81e4720 */ FANFARE_PLAY2(468), WAIT(30), WALK_RELATIVE(256, -32, 16), - ROTATE(4, 2, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTH), FANFARE_PLAY2(468), { 0xe2, 0x00, 0x01d4, 0x00000000, 0x00000000, NULL }, FANFARE_PLAY2(468), ALERT_CUE(5), WAIT(30), WALK_RELATIVE(256, 64, 16), - ROTATE(4, 1, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTH), FANFARE_PLAY2(468), { 0xe2, 0x00, 0x01d4, 0x00000000, 0x00000000, NULL }, FANFARE_PLAY2(468), ALERT_CUE(5), WAIT(30), WALK_RELATIVE(256, -32, 24), - ROTATE(4, 2, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTH), FANFARE_PLAY2(468), { 0xe2, 0x00, 0x01d4, 0x00000000, 0x00000000, NULL }, FANFARE_PLAY2(468), WAIT(30), ALERT_CUE(5), AWAIT_CUE(7), - ROTATE(4, 10, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHEAST), ALERT_CUE(5), AWAIT_CUE(7), WALK_RELATIVE(256, 16, 16), @@ -818,7 +818,7 @@ static const struct ScriptCommand s_gs12_g9_s0_lives2_dlg0[] = { /* 0x81e4720 */ FANFARE_PLAY2(468), { 0xe2, 0x00, 0x01d4, 0x00000000, 0x00000000, NULL }, FANFARE_PLAY2(468), - ROTATE(4, 2, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTH), WAIT(30), ALERT_CUE(5), WALK_RELATIVE(256, 0, 16), @@ -889,7 +889,7 @@ static const struct ScriptCommand s_gs12_g10_s0_lives0_dlg0[] = { /* 0x81e507c * { 0x36, 0x00, -0x0001, 0x00000000, 0x00000000, _("Gggwwooooooooooooaahhhhh!") }, CALL_SCRIPT(JUMP_SURPRISE_FUNC), WAIT(20), - ROTATE(4, 1, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTH), CALL_SCRIPT(LOOK_AROUND_FUNC), TEXTBOX_CLEAR, WAIT(10), @@ -1559,12 +1559,12 @@ static const struct ScriptCommand s_gs12_g20_s0_lives0_dlg0[] = { /* 0x81e8394 * CALL_SCRIPT(WAKEUP_FUNC), WAIT(60), FANFARE_PLAY2(468), - { 0x92, 0x04, 0x0002, 0x00000004, 0x00000000, NULL }, + CMD_UNK_92(4, 2, DIR_TRANS_SPINLEFT2), WAIT(15), FANFARE_PLAY2(468), - { 0x92, 0x04, 0x0001, 0x00000005, 0x00000000, NULL }, + CMD_UNK_92(4, 1, DIR_TRANS_FLIP), WAIT(15), - { 0x92, 0x04, 0x0002, 0x00000004, 0x00000000, NULL }, + CMD_UNK_92(4, 2, DIR_TRANS_SPINLEFT2), WAIT(15), WAIT(30), FANFARE_PLAY2(469), @@ -1574,15 +1574,15 @@ static const struct ScriptCommand s_gs12_g20_s0_lives0_dlg0[] = { /* 0x81e8394 * TEXTBOX_CLEAR, WAIT(10), FANFARE_PLAY2(468), - { 0x92, 0x04, 0x0002, 0x00000005, 0x00000000, NULL }, + CMD_UNK_92(4, 2, DIR_TRANS_FLIP), WAIT(15), FANFARE_PLAY2(468), - { 0x92, 0x04, 0x0002, 0x00000004, 0x00000000, NULL }, + CMD_UNK_92(4, 2, DIR_TRANS_SPINLEFT2), WAIT(15), FANFARE_PLAY2(468), - { 0x92, 0x04, 0x0001, 0x00000005, 0x00000000, NULL }, + CMD_UNK_92(4, 1, DIR_TRANS_FLIP), WAIT(15), - { 0x92, 0x04, 0x0001, 0x00000003, 0x00000000, NULL }, + CMD_UNK_92(4, 1, DIR_TRANS_SPINRIGHT2), WAIT(30), MSG_NPC(-1, _(" ...Oh! You can't see us, of course!{WAIT_PRESS}\nHow very rude of us!")), TEXTBOX_CLEAR, @@ -1633,7 +1633,7 @@ static const struct ScriptCommand s_gs12_g20_s1_lives0_dlg0[] = { /* 0x81e8ac8 * STOP_ANIMATION_ON_CURRENT_FRAME, SELECT_ANIMATION(2), WAIT(45), - ROTATE(10, 2, DIRECTION_NORTH), + ROTATE_TO(10, DIR_TRANS_SPINLEFT1, DIRECTION_NORTH), ALERT_CUE(5), AWAIT_CUE(7), CALL_SCRIPT(ANGRY_START_FUNC), @@ -2513,17 +2513,17 @@ static const struct ScriptCommand s_gs12_g42_s0_lives1_dlg0[] = { /* 0x81ebd04 * { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(6), CALL_SCRIPT(NOTICE_FUNC), - ROTATE(6, 10, DIRECTION_NORTHWEST), + ROTATE_TO(6, DIR_TRANS_10, DIRECTION_NORTHWEST), WAIT(15), - ROTATE(6, 10, DIRECTION_NORTHEAST), + ROTATE_TO(6, DIR_TRANS_10, DIRECTION_NORTHEAST), WAIT(15), - ROTATE(6, 10, DIRECTION_NORTHWEST), + ROTATE_TO(6, DIR_TRANS_10, DIRECTION_NORTHWEST), ALERT_CUE(5), AWAIT_CUE(6), - ROTATE(4, 10, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHEAST), ALERT_CUE(5), AWAIT_CUE(6), - ROTATE(12, 10, DIRECTION_NORTH), + ROTATE_TO(12, DIR_TRANS_10, DIRECTION_NORTH), { 0x62, 0x00, 0x0080, 0x00000000, 0x0000000a, NULL }, WAIT(30), { 0x89, 0x40, 0x0200, 0x00000000, 0x00000000, NULL }, diff --git a/src/data/ground/ground_data_d01p01_station.h b/src/data/ground/ground_data_d01p01_station.h index 8dec37a53..dc20358e9 100644 --- a/src/data/ground/ground_data_d01p01_station.h +++ b/src/data/ground/ground_data_d01p01_station.h @@ -90,13 +90,13 @@ static const struct ScriptCommand s_gs178_g1_s0_lives0_dlg0[] = { /* 0x822c5e4 - { 0x33, 0x00, 0x0000, 0x00000000, 0x00000000, _("(Wh-where is this...?)") }, TEXTBOX_CLEAR, FANFARE_PLAY2(468), - ROTATE(4, 2, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_EAST), WAIT(20), FANFARE_PLAY2(468), - ROTATE(4, 1, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_WEST), WAIT(20), FANFARE_PLAY2(468), - ROTATE(4, 2, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_EAST), WAIT(50), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" You were passed out here.\nI'm glad you woke up!")), @@ -184,12 +184,12 @@ static const struct ScriptCommand s_gs178_g1_s0_lives0_dlg0[] = { /* 0x822c5e4 - ALERT_CUE(6), AWAIT_CUE(5), WAIT(30), - ROTATE(6, 10, DIRECTION_SOUTH), + ROTATE_TO(6, DIR_TRANS_10, DIRECTION_SOUTH), WAIT(15), FANFARE_PLAY2(470), CALL_SCRIPT(SWEAT_FUNC), WAIT(45), - ROTATE(6, 10, DIRECTION_EAST), + ROTATE_TO(6, DIR_TRANS_10, DIRECTION_EAST), BGM_FADEOUT(60), WAIT(60), MSG_NPC(-1, _(" Somebody!\nPlease! Help me!")), @@ -197,7 +197,7 @@ static const struct ScriptCommand s_gs178_g1_s0_lives0_dlg0[] = { /* 0x822c5e4 - ALERT_CUE(6), FANFARE_PLAY2(466), CALL_SCRIPT(NOTICE_FUNC), - ROTATE(4, 1, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_WEST), WAIT(30), PORTRAIT_REP(0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), @@ -206,7 +206,7 @@ static const struct ScriptCommand s_gs178_g1_s0_lives0_dlg0[] = { /* 0x822c5e4 - TEXTBOX_CLEAR, SELECT_LIVES(-1, 1), AWAIT_CUE(5), - ROTATE(10, 1, DIRECTION_NORTH), + ROTATE_TO(10, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTH), AWAIT_CUE(5), WAIT(20), MSG_VAR(2, PARTNER_TALK_KIND, 1), @@ -242,7 +242,7 @@ static const struct ScriptCommand s_gs178_g1_s0_lives0_dlg0[] = { /* 0x822c5e4 - ALERT_CUE(7), WAIT(60), ALERT_CUE(6), - ROTATE(4, 1, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_EAST), AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), @@ -304,18 +304,18 @@ static const struct ScriptCommand s_gs178_g1_s0_lives1_dlg0[] = { /* 0x822d950 - AWAIT_CUE(6), FANFARE_PLAY2(466), CALL_SCRIPT(NOTICE_FUNC), - ROTATE(4, 1, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_WEST), { 0xe2, 0x00, 0x01d2, 0x00000000, 0x00000000, NULL }, WAIT(30), AWAIT_CUE(6), - ROTATE(10, 1, DIRECTION_NORTH), + ROTATE_TO(10, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTH), AWAIT_CUE(6), FANFARE_PLAY2(463), CALL_SCRIPT(SHOCK_FUNC), { 0xe2, 0x00, 0x01cf, 0x00000000, 0x00000000, NULL }, ALERT_CUE(5), AWAIT_CUE(6), - ROTATE(4, 2, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_WEST), ALERT_CUE(5), AWAIT_CUE(6), WALK_GRID(384, 11), @@ -340,7 +340,7 @@ static const struct ScriptCommand s_gs178_g1_s1_lives0_dlg0[] = { /* 0x822dc90 - ALERT_CUE(6), WALK_GRID(256, 6), WALK_GRID(256, 7), - ROTATE(6, 1, DIRECTION_SOUTH), + ROTATE_TO(6, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTH), FANFARE_STOP2(450), { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(7), @@ -390,20 +390,20 @@ static const struct ScriptCommand s_gs178_g2_s0_lives0_dlg0[] = { /* 0x822df60 - CALL_SCRIPT(WAKEUP_FUNC), AWAIT_CUE(5), ALERT_CUE(6), - ROTATE(8, 2, DIRECTION_EAST), + ROTATE_TO(8, DIR_TRANS_SPINLEFT1, DIRECTION_EAST), FANFARE_PLAY2(468), WAIT(1), - ROTATE(8, 1, DIRECTION_WEST), + ROTATE_TO(8, DIR_TRANS_SPINRIGHT1, DIRECTION_WEST), FANFARE_PLAY2(468), WAIT(1), - ROTATE(8, 2, DIRECTION_EAST), + ROTATE_TO(8, DIR_TRANS_SPINLEFT1, DIRECTION_EAST), FANFARE_PLAY2(468), WAIT(50), FANFARE_STOP2(468), MSG_NPC(2, _(" Oh, my goodness!\nI'm so glad you came to!")), TEXTBOX_CLEAR, ALERT_CUE(6), - ROTATE(8, 2, DIRECTION_NORTH), + ROTATE_TO(8, DIR_TRANS_SPINLEFT1, DIRECTION_NORTH), AWAIT_CUE(5), ALERT_CUE(6), AWAIT_CUE(5), @@ -420,7 +420,7 @@ static const struct ScriptCommand s_gs178_g2_s0_lives0_dlg0[] = { /* 0x822df60 - VARIANT_DEFAULT(_(" ...We somehow ended up\nback here...")), TEXTBOX_CLEAR, ALERT_CUE(6), - ROTATE(8, 1, DIRECTION_EAST), + ROTATE_TO(8, DIR_TRANS_SPINRIGHT1, DIRECTION_EAST), AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x00000000), MSG_NPC(1, _(" I guess if we're defeated\nin there, we don't get to advance.")), @@ -432,14 +432,14 @@ static const struct ScriptCommand s_gs178_g2_s0_lives0_dlg0[] = { /* 0x822df60 - TEXTBOX_CLEAR, ALERT_CUE(7), ALERT_CUE(6), - ROTATE(4, 2, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_NORTH), WAIT(30), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" That's right!\nWe have to help that kid, and now!")), VARIANT_DEFAULT(_(" That's right!\nWe've got to hurry!")), ALERT_CUE(6), AWAIT_CUE(5), - ROTATE(4, 10, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_EAST), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Let's roll, {NAME_0}!")), VARIANT_DEFAULT(_(" {NAME_0}! Let's go!")), @@ -462,18 +462,18 @@ static const struct ScriptCommand s_gs178_g2_s0_lives1_dlg0[] = { /* 0x822e5fc - CALL_SCRIPT(WAKEUP_FUNC), { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(6), - ROTATE(8, 1, DIRECTION_WEST), + ROTATE_TO(8, DIR_TRANS_SPINRIGHT1, DIRECTION_WEST), FANFARE_PLAY2(468), WAIT(1), - ROTATE(8, 2, DIRECTION_EAST), + ROTATE_TO(8, DIR_TRANS_SPINLEFT1, DIRECTION_EAST), FANFARE_PLAY2(468), WAIT(1), - ROTATE(8, 1, DIRECTION_WEST), + ROTATE_TO(8, DIR_TRANS_SPINRIGHT1, DIRECTION_WEST), FANFARE_PLAY2(468), WAIT(50), FANFARE_STOP2(468), AWAIT_CUE(6), - ROTATE(8, 1, DIRECTION_NORTH), + ROTATE_TO(8, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTH), WAIT(60), ALERT_CUE(5), AWAIT_CUE(6), @@ -483,14 +483,14 @@ static const struct ScriptCommand s_gs178_g2_s0_lives1_dlg0[] = { /* 0x822e5fc - WAIT(5), { 0xe2, 0x00, 0x01d5, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(6), - ROTATE(8, 2, DIRECTION_WEST), + ROTATE_TO(8, DIR_TRANS_SPINLEFT1, DIRECTION_WEST), WAIT(20), ALERT_CUE(5), AWAIT_CUE(6), - ROTATE(4, 1, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTH), CALL_SCRIPT(NOTICE_FUNC), AWAIT_CUE(6), - ROTATE(4, 10, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_WEST), ALERT_CUE(5), AWAIT_CUE(6), WALK_GRID(384, 11), @@ -612,7 +612,7 @@ static const struct ScriptCommand s_gs178_g3_s0_lives0_dlg0[] = { /* 0x822ea18 - ALERT_CUE(8), WAIT(30), ALERT_CUE(6), - ROTATE(10, 1, DIRECTION_EAST), + ROTATE_TO(10, DIR_TRANS_SPINRIGHT1, DIRECTION_EAST), AWAIT_CUE(5), ALERT_CUE(6), AWAIT_CUE(5), @@ -620,7 +620,7 @@ static const struct ScriptCommand s_gs178_g3_s0_lives0_dlg0[] = { /* 0x822ea18 - MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Hey, thanks for helping me\nout.")), VARIANT_DEFAULT(_(" Thank you for helping!")), - ROTATE(8, 1, DIRECTION_EAST), + ROTATE_TO(8, DIR_TRANS_SPINRIGHT1, DIRECTION_EAST), WAIT(10), PORTRAIT_REP(0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), @@ -641,7 +641,7 @@ static const struct ScriptCommand s_gs178_g3_s0_lives0_dlg0[] = { /* 0x822ea18 - TEXTBOX_CLEAR, ALERT_CUE(6), AWAIT_CUE(5), - ROTATE(8, 10, DIRECTION_EAST), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_EAST), WAIT(10), ALERT_CUE(3), WALK_GRID(256, 16), @@ -664,26 +664,26 @@ static const struct ScriptCommand s_gs178_g3_s0_lives1_dlg0[] = { /* 0x822f68c - SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(6), - ROTATE(4, 2, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_WEST), ALERT_CUE(5), AWAIT_CUE(6), - ROTATE(4, 1, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTH), ALERT_CUE(5), AWAIT_CUE(6), - ROTATE(4, 10, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHWEST), ALERT_CUE(5), AWAIT_CUE(6), CALL_SCRIPT(SWEAT_FUNC), AWAIT_CUE(6), - ROTATE(4, 10, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), AWAIT_CUE(6), - ROTATE(10, 1, DIRECTION_EAST), + ROTATE_TO(10, DIR_TRANS_SPINRIGHT1, DIRECTION_EAST), AWAIT_CUE(6), - ROTATE(4, 2, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_WEST), WAIT(10), ALERT_CUE(5), AWAIT_CUE(6), - ROTATE(4, 1, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_EAST), ALERT_CUE(5), WAIT(1), WALK_GRID(256, 17), @@ -701,7 +701,7 @@ static const struct ScriptCommand s_gs178_g3_s0_lives2_dlg0[] = { /* 0x822f84c - { 0x62, 0x00, 0x0080, 0x00000000, -0x00000008, NULL }, ALERT_CUE(5), AWAIT_CUE(7), - { 0x95, 0x08, 0x000a, 0x0000000e, 0x00000000, NULL }, + CMD_UNK_95(8, DIR_TRANS_10, 14), FANFARE_PLAY2(450), WALK_GRID(256, 14), FANFARE_STOP2(450), @@ -719,7 +719,7 @@ static const struct ScriptCommand s_gs178_g3_s0_lives3_dlg0[] = { /* 0x822f94c - WAIT(20), ALERT_CUE(5), AWAIT_CUE(8), - { 0x95, 0x08, 0x000a, 0x0000000f, 0x00000000, NULL }, + CMD_UNK_95(8, DIR_TRANS_10, 15), WALK_GRID(256, 15), END_DELETE, }; diff --git a/src/data/ground/ground_data_d01p02_station.h b/src/data/ground/ground_data_d01p02_station.h index 9775d619a..d86f4159c 100644 --- a/src/data/ground/ground_data_d01p02_station.h +++ b/src/data/ground/ground_data_d01p02_station.h @@ -96,7 +96,7 @@ static const struct ScriptCommand s_gs179_g1_s0_lives2_dlg0[] = { /* 0x8230108 - { 0xe2, 0x00, 0x01c9, 0x00000000, 0x00000000, NULL }, ALERT_CUE(5), AWAIT_CUE(7), - ROTATE(4, 1, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTH), ALERT_CUE(5), AWAIT_CUE(7), CALL_SCRIPT(JUMP_HAPPY_FUNC), diff --git a/src/data/ground/ground_data_d02p01_station.h b/src/data/ground/ground_data_d02p01_station.h index ea561d5d9..b5e95cc13 100644 --- a/src/data/ground/ground_data_d02p01_station.h +++ b/src/data/ground/ground_data_d02p01_station.h @@ -63,13 +63,13 @@ static const struct ScriptCommand s_gs180_g1_s0_lives0_dlg0[] = { /* 0x823047c * MSG_NPC(2, _(" MY FRIENDS SHOULD BE\nON B{VALUE_0}F. PLEASE HELP THEM!\nBZBZBZZZT!")), TEXTBOX_CLEAR, ALERT_CUE(6), - { 0x93, 0x04, 0x000a, 0x00000022, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 34), WAIT(30), { 0x54, 0x00, 0x002f, 0x00000000, 0x00000000, NULL }, STOP_ANIMATION_ON_CURRENT_FRAME, SELECT_ANIMATION(2), WAIT(15), - ROTATE(8, 10, DIRECTION_NORTH), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_NORTH), WAIT(15), ALERT_CUE(7), ALERT_CUE(8), @@ -92,13 +92,13 @@ static const struct ScriptCommand s_gs180_g1_s0_lives1_dlg0[] = { /* 0x8230758 * AWAIT_CUE(6), WALK_RELATIVE(256, 0, -100), AWAIT_CUE(6), - { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 0), WAIT(30), { 0x54, 0x00, 0x002f, 0x00000000, 0x00000000, NULL }, STOP_ANIMATION_ON_CURRENT_FRAME, SELECT_ANIMATION(2), WAIT(15), - ROTATE(8, 10, DIRECTION_NORTH), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_NORTH), WAIT(15), AWAIT_CUE(6), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, @@ -113,11 +113,11 @@ static const struct ScriptCommand s_gs180_g1_s0_lives2_dlg0[] = { /* 0x82308a8 * SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(7), - ROTATE(4, 1, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTH), ALERT_CUE(5), AWAIT_CUE(7), { 0x62, 0x00, 0x0080, -0x00000010, 0x00000000, NULL }, - { 0x93, 0x04, 0x000a, 0x00000041, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 65), HALT, }; @@ -126,10 +126,10 @@ static const struct ScriptCommand s_gs180_g1_s0_lives3_dlg0[] = { /* 0x8230948 * SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0003, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(8), - ROTATE(4, 2, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTH), AWAIT_CUE(8), { 0x62, 0x00, 0x0080, 0x00000010, 0x00000000, NULL }, - { 0x93, 0x04, 0x000a, 0x00000040, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 64), HALT, }; @@ -176,7 +176,7 @@ static const struct ScriptCommand s_gs180_g2_s0_lives0_dlg0[] = { /* 0x8230ae4 * MSG_NPC(1, _(" The {NAME_2} are in\nthere somewhere.")), ALERT_CUE(6), AWAIT_CUE(5), - { 0x93, 0x04, 0x000a, 0x00000022, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 34), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Let's give it our best\nand rescue them {NAME_0}!")), VARIANT_DEFAULT(_(" Let's do our best to rescue\nthem, {NAME_0}!")), @@ -202,7 +202,7 @@ static const struct ScriptCommand s_gs180_g2_s0_lives1_dlg0[] = { /* 0x8230d64 * WALK_RELATIVE(256, 0, -100), ALERT_CUE(5), AWAIT_CUE(6), - { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 0), ALERT_CUE(5), AWAIT_CUE(6), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, @@ -217,10 +217,10 @@ static const struct ScriptCommand s_gs180_g2_s0_lives2_dlg0[] = { /* 0x8230e64 * SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(7), - ROTATE(4, 1, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTH), ALERT_CUE(5), AWAIT_CUE(7), - ROTATE(20, 2, DIRECTION_NORTHEAST), + ROTATE_TO(20, DIR_TRANS_SPINLEFT1, DIRECTION_NORTHEAST), HALT, }; @@ -229,9 +229,9 @@ static const struct ScriptCommand s_gs180_g2_s0_lives3_dlg0[] = { /* 0x8230ef4 * SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0003, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(8), - ROTATE(4, 2, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTH), AWAIT_CUE(8), - ROTATE(20, 1, DIRECTION_NORTHWEST), + ROTATE_TO(20, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTHWEST), HALT, }; @@ -308,7 +308,7 @@ static const struct ScriptCommand s_gs180_g3_s0_lives0_dlg0[] = { /* 0x8231020 * ALERT_CUE(10), WAIT(30), ALERT_CUE(6), - ROTATE(8, 2, DIRECTION_SOUTH), + ROTATE_TO(8, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTH), WAIT(90), ALERT_CUE(3), HALT, @@ -322,11 +322,11 @@ static const struct ScriptCommand s_gs180_g3_s0_lives1_dlg0[] = { /* 0x8231478 * SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(6), - ROTATE(4, 10, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHWEST), AWAIT_CUE(6), - ROTATE(4, 10, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), AWAIT_CUE(6), - ROTATE(8, 1, DIRECTION_SOUTH), + ROTATE_TO(8, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTH), HALT, }; @@ -336,9 +336,9 @@ static const struct ScriptCommand s_gs180_g3_s0_lives2_dlg0[] = { /* 0x8231518 * { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, AWAIT_CUE(7), - ROTATE(4, 10, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_WEST), AWAIT_CUE(7), - ROTATE(4, 10, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTH), ALERT_CUE(5), AWAIT_CUE(7), WALK_GRID(256, 3), @@ -352,7 +352,7 @@ static const struct ScriptCommand s_gs180_g3_s0_lives3_dlg0[] = { /* 0x82315e8 * { 0x2d, 0x07, 0x0003, 0x00000000, 0x00000000, NULL }, { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, AWAIT_CUE(8), - ROTATE(4, 10, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_WEST), AWAIT_CUE(8), CALL_SCRIPT(SMILE_START_FUNC), ALERT_CUE(5), @@ -360,7 +360,7 @@ static const struct ScriptCommand s_gs180_g3_s0_lives3_dlg0[] = { /* 0x82315e8 * CALL_SCRIPT(SMILE_END_FUNC), ALERT_CUE(5), AWAIT_CUE(8), - ROTATE(4, 10, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHWEST), ALERT_CUE(5), AWAIT_CUE(8), WALK_GRID(256, 3), @@ -375,24 +375,24 @@ static const struct ScriptCommand s_gs180_g3_s0_lives4_dlg0[] = { /* 0x8231718 * { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, AWAIT_CUE(9), CALL_SCRIPT(SMILE_START_FUNC), - ROTATE(4, 1, DIRECTION_NORTH), - ROTATE(4, 1, DIRECTION_SOUTH), - ROTATE(4, 1, DIRECTION_NORTH), - ROTATE(4, 1, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTH), ALERT_CUE(5), AWAIT_CUE(9), CALL_SCRIPT(SMILE_END_FUNC), ALERT_CUE(5), AWAIT_CUE(9), CALL_SCRIPT(SMILE_START_FUNC), - ROTATE(4, 1, DIRECTION_NORTH), - ROTATE(4, 1, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTH), ALERT_CUE(5), AWAIT_CUE(9), CALL_SCRIPT(SMILE_END_FUNC), ALERT_CUE(5), AWAIT_CUE(9), - ROTATE(4, 10, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTH), AWAIT_CUE(9), WALK_GRID(256, 2), { 0x52, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, @@ -406,14 +406,14 @@ static const struct ScriptCommand s_gs180_g3_s0_lives5_dlg0[] = { /* 0x82318d8 * { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, AWAIT_CUE(10), CALL_SCRIPT(SMILE_START_FUNC), - ROTATE(4, 1, DIRECTION_NORTH), - ROTATE(4, 1, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTH), ALERT_CUE(5), AWAIT_CUE(10), CALL_SCRIPT(SMILE_END_FUNC), ALERT_CUE(5), AWAIT_CUE(10), - ROTATE(4, 10, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHEAST), AWAIT_CUE(10), WALK_GRID(256, 2), { 0x52, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, diff --git a/src/data/ground/ground_data_d02p02_station.h b/src/data/ground/ground_data_d02p02_station.h index 12d24e42a..583d3ad90 100644 --- a/src/data/ground/ground_data_d02p02_station.h +++ b/src/data/ground/ground_data_d02p02_station.h @@ -50,7 +50,7 @@ static const struct ScriptCommand s_gs181_g1_s0_lives0_dlg0[] = { /* 0x8231d84 * ALERT_CUE(3), WAIT(1), WALK_GRID(204, 1), - ROTATE(4, 10, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHEAST), HALT, }; @@ -63,7 +63,7 @@ static const struct ScriptCommand s_gs181_g1_s0_lives1_dlg0[] = { /* 0x8231f0c * WALK_GRID(256, 2), AWAIT_CUE(6), WALK_GRID(204, 3), - ROTATE(4, 10, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHWEST), HALT, }; diff --git a/src/data/ground/ground_data_d03p01_station.h b/src/data/ground/ground_data_d03p01_station.h index cb0bcc737..caa3ac871 100644 --- a/src/data/ground/ground_data_d03p01_station.h +++ b/src/data/ground/ground_data_d03p01_station.h @@ -54,7 +54,7 @@ static const struct ScriptCommand s_gs182_g1_s0_lives0_dlg0[] = { /* 0x8232228 * SELECT_ENTITIES(-1, 1), WAIT(15), ALERT_CUE(6), - ROTATE(4, 10, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHEAST), CALL_SCRIPT(SHOCK_FUNC), WAIT(60), { 0x2d, 0x0a, 0x0000, 0x00000002, 0x00000000, NULL }, @@ -70,7 +70,7 @@ static const struct ScriptCommand s_gs182_g1_s0_lives0_dlg0[] = { /* 0x8232228 * AWAIT_CUE(5), WAIT(30), ALERT_CUE(6), - { 0x93, 0x04, 0x000a, 0x00000022, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 34), WAIT(30), PORTRAIT_REP(0x0001, 0x00000004), MSG_VAR(2, PARTNER_TALK_KIND, 1), @@ -78,7 +78,7 @@ static const struct ScriptCommand s_gs182_g1_s0_lives0_dlg0[] = { /* 0x8232228 * VARIANT_DEFAULT(_(" ......{WAIT_PRESS}\nUh... Let's go.")), TEXTBOX_CLEAR, ALERT_CUE(6), - ROTATE(4, 10, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), WAIT(45), { 0x23, 0x00, 0x0050, 0x00000000, 0x00000000, NULL }, ALERT_CUE(6), @@ -101,14 +101,14 @@ static const struct ScriptCommand s_gs182_g1_s0_lives1_dlg0[] = { /* 0x82326cc * WALK_RELATIVE(256, 0, -100), AWAIT_CUE(6), CALL_SCRIPT(JUMP_SURPRISE_FUNC), - ROTATE(4, 10, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHWEST), AWAIT_CUE(6), CALL_SCRIPT(SWEAT_FUNC), ALERT_CUE(5), AWAIT_CUE(6), - { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 0), AWAIT_CUE(6), - ROTATE(4, 10, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), AWAIT_CUE(6), WAIT(15), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, @@ -158,7 +158,7 @@ static const struct ScriptCommand s_gs182_g2_s0_lives0_dlg0[] = { /* 0x8232988 * WALK_RELATIVE(256, 0, -100), WAIT(15), ALERT_CUE(6), - { 0x93, 0x04, 0x000a, 0x00000022, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 34), AWAIT_CUE(5), PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), @@ -173,7 +173,7 @@ static const struct ScriptCommand s_gs182_g2_s0_lives0_dlg0[] = { /* 0x8232988 * SELECT_ENTITIES(-1, 1), WAIT(15), ALERT_CUE(6), - ROTATE(4, 10, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHEAST), CALL_SCRIPT(SHOCK_FUNC), WAIT(60), { 0x2d, 0x0a, 0x0000, 0x00000002, 0x00000000, NULL }, @@ -189,7 +189,7 @@ static const struct ScriptCommand s_gs182_g2_s0_lives0_dlg0[] = { /* 0x8232988 * AWAIT_CUE(5), WAIT(30), ALERT_CUE(6), - { 0x93, 0x04, 0x000a, 0x00000022, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 34), WAIT(30), PORTRAIT_REP(0x0001, 0x00000004), MSG_VAR(2, PARTNER_TALK_KIND, 1), @@ -197,7 +197,7 @@ static const struct ScriptCommand s_gs182_g2_s0_lives0_dlg0[] = { /* 0x8232988 * VARIANT_DEFAULT(_(" ......{WAIT_PRESS}\nUh... Let's go.")), TEXTBOX_CLEAR, ALERT_CUE(6), - ROTATE(4, 10, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), WAIT(45), { 0x23, 0x00, 0x0050, 0x00000000, 0x00000000, NULL }, ALERT_CUE(6), @@ -219,18 +219,18 @@ static const struct ScriptCommand s_gs182_g2_s0_lives1_dlg0[] = { /* 0x8232e30 * AWAIT_CUE(6), WALK_RELATIVE(256, 0, -100), AWAIT_CUE(6), - { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 0), ALERT_CUE(5), AWAIT_CUE(6), CALL_SCRIPT(JUMP_SURPRISE_FUNC), - ROTATE(4, 10, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHWEST), AWAIT_CUE(6), CALL_SCRIPT(SWEAT_FUNC), ALERT_CUE(5), AWAIT_CUE(6), - { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 0), AWAIT_CUE(6), - ROTATE(4, 10, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), AWAIT_CUE(6), WAIT(15), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, diff --git a/src/data/ground/ground_data_d03p02_station.h b/src/data/ground/ground_data_d03p02_station.h index ef3754a36..17aa96986 100644 --- a/src/data/ground/ground_data_d03p02_station.h +++ b/src/data/ground/ground_data_d03p02_station.h @@ -153,10 +153,10 @@ static const struct ScriptCommand s_gs183_g1_s0_lives1_dlg0[] = { /* 0x8233bec * ALERT_CUE(5), AWAIT_CUE(6), SELECT_ANIMATION(2), - { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 0), ALERT_CUE(5), AWAIT_CUE(6), - ROTATE(4, 10, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), CALL_SCRIPT(NOTICE_FUNC), AWAIT_CUE(6), HALT, @@ -202,16 +202,16 @@ static const struct ScriptCommand s_gs183_g1_s1_lives0_dlg0[] = { /* 0x8233eec * { 0x70, 0x00, 0x0200, 0x00000000, 0x00000000, NULL }, ALERT_CUE(5), AWAIT_CUE(8), - { 0x93, 0x04, 0x000a, 0x00000022, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 34), ALERT_CUE(5), AWAIT_CUE(8), WALK_GRID(128, 4), - { 0x93, 0x04, 0x000a, 0x00000044, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 68), ALERT_CUE(5), AWAIT_CUE(8), { 0x52, 0x00, 0x0000, 0x01000000, 0x00000000, NULL }, WALK_RELATIVE(76, 0, -16), - { 0x93, 0x04, 0x000a, 0x00000044, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 68), { 0x52, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, HALT, }; @@ -226,14 +226,14 @@ static const struct ScriptCommand s_gs183_g1_s1_lives1_dlg0[] = { /* 0x823405c * { 0x2d, 0x07, 0x0004, 0x00000000, 0x00000000, NULL }, { 0x70, 0x00, 0x0200, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(8), - { 0x93, 0x04, 0x000a, 0x00000022, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 34), AWAIT_CUE(8), WALK_GRID(128, 3), - { 0x93, 0x04, 0x000a, 0x00000044, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 68), AWAIT_CUE(8), { 0x52, 0x00, 0x0000, 0x01000000, 0x00000000, NULL }, WALK_RELATIVE(76, 0, -16), - { 0x93, 0x04, 0x000a, 0x00000044, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 68), { 0x52, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, HALT, }; diff --git a/src/data/ground/ground_data_d04p01_station.h b/src/data/ground/ground_data_d04p01_station.h index c443d261c..4540232d9 100644 --- a/src/data/ground/ground_data_d04p01_station.h +++ b/src/data/ground/ground_data_d04p01_station.h @@ -39,7 +39,7 @@ static const struct ScriptCommand s_gs184_g1_s0_lives0_dlg0[] = { /* 0x82343f8 * { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), ALERT_CUE(6), - { 0x93, 0x04, 0x000a, 0x00000022, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 34), WAIT(20), PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), @@ -67,7 +67,7 @@ static const struct ScriptCommand s_gs184_g1_s0_lives1_dlg0[] = { /* 0x8234714 * SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(6), - { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 0), AWAIT_CUE(6), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, WALK_GRID(384, 1), diff --git a/src/data/ground/ground_data_d04p02_station.h b/src/data/ground/ground_data_d04p02_station.h index d02b792d9..876adba9d 100644 --- a/src/data/ground/ground_data_d04p02_station.h +++ b/src/data/ground/ground_data_d04p02_station.h @@ -51,12 +51,12 @@ static const struct ScriptCommand s_gs185_g1_s0_lives0_dlg0[] = { /* 0x8234d94 * WAIT(10), ALERT_CUE(6), ALERT_CUE(11), - ROTATE(10, 2, DIRECTION_WEST), + ROTATE_TO(10, DIR_TRANS_SPINLEFT1, DIRECTION_WEST), AWAIT_CUE(5), WAIT(60), ALERT_CUE(6), ALERT_CUE(11), - ROTATE(4, 1, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_EAST), WAIT(30), PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000009), MSG_VAR(2, PARTNER_TALK_KIND, 1), @@ -72,7 +72,7 @@ static const struct ScriptCommand s_gs185_g1_s0_lives0_dlg0[] = { /* 0x8234d94 * ALERT_CUE(11), FANFARE_PLAY2(465), CALL_SCRIPT(NOTICE_FUNC), - { 0x93, 0x04, 0x0002, 0x0000005e, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_SPINLEFT1, 94), { 0xe2, 0x00, 0x01d1, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(5), PORTRAIT(PLACEMENT_MIDDLE_LEFT, 0x0002, 0x00000000), @@ -81,7 +81,7 @@ static const struct ScriptCommand s_gs185_g1_s0_lives0_dlg0[] = { /* 0x8234d94 * TEXTBOX_CLEAR, WAIT(16), ALERT_CUE(6), - ROTATE(4, 10, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHEAST), PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000000), MSG_NPC(1, _(" You must be {NAME_2}.")), MSG_NPC(1, _(" Let's get you home.\nCaterpie was worried about you.")), @@ -109,14 +109,14 @@ static const struct ScriptCommand s_gs185_g1_s0_lives1_dlg0[] = { /* 0x823531c * SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(6), - ROTATE(10, 2, DIRECTION_WEST), + ROTATE_TO(10, DIR_TRANS_SPINLEFT1, DIRECTION_WEST), AWAIT_CUE(6), - { 0x93, 0x04, 0x0002, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_SPINLEFT1, 0), AWAIT_CUE(6), CALL_SCRIPT(NOTICE_FUNC), - { 0x93, 0x04, 0x0001, 0x0000005e, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_SPINRIGHT1, 94), AWAIT_CUE(6), - ROTATE(4, 10, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHWEST), HALT, }; @@ -182,11 +182,11 @@ static const struct ScriptCommand s_gs185_g1_s0_lives6_dlg0[] = { /* 0x82356cc * DEBUGINFO_O(182), SELECT_ANIMATION(2), AWAIT_CUE(11), - ROTATE(10, 10, DIRECTION_WEST), + ROTATE_TO(10, DIR_TRANS_10, DIRECTION_WEST), AWAIT_CUE(11), - ROTATE(4, 10, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), AWAIT_CUE(11), - { 0x93, 0x04, 0x000a, 0x0000005e, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 94), AWAIT_CUE(11), HALT, }; @@ -195,11 +195,11 @@ static const struct ScriptCommand s_gs185_g1_s0_lives7_dlg0[] = { /* 0x823576c * DEBUGINFO_O(195), SELECT_ANIMATION(2), AWAIT_CUE(11), - ROTATE(8, 10, DIRECTION_WEST), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_WEST), AWAIT_CUE(11), - ROTATE(4, 10, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), AWAIT_CUE(11), - { 0x93, 0x04, 0x000a, 0x0000005e, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 94), AWAIT_CUE(11), HALT, }; diff --git a/src/data/ground/ground_data_d05p01_station.h b/src/data/ground/ground_data_d05p01_station.h index ad3405bfc..e41885a74 100644 --- a/src/data/ground/ground_data_d05p01_station.h +++ b/src/data/ground/ground_data_d05p01_station.h @@ -61,7 +61,7 @@ static const struct ScriptCommand s_gs186_g1_s0_lives0_dlg0[] = { /* 0x8235ba8 * WAIT(15), ALERT_CUE(6), AWAIT_CUE(5), - ROTATE(4, 11, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_NORTH), PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" So your friend {NAME_2}\nis somewhere deep in this canyon?")), @@ -89,7 +89,7 @@ static const struct ScriptCommand s_gs186_g1_s0_lives0_dlg0[] = { /* 0x8235ba8 * AWAIT_CUE(5), MSG_NPC(2, _(" ...Wait!")), TEXTBOX_CLEAR, - ROTATE(4, 11, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_NORTHEAST), FANFARE_PLAY2(463), ALERT_CUE(6), AWAIT_CUE(5), @@ -124,7 +124,7 @@ static const struct ScriptCommand s_gs186_g1_s0_lives0_dlg0[] = { /* 0x8235ba8 * TEXTBOX_CLEAR, ALERT_CUE(7), AWAIT_CUE(5), - ROTATE(4, 2, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_NORTHWEST), PORTRAIT_REP(0x0002, 0x00000041), MSG_NPC(2, _(" Oh!{WAIT_PRESS}\nWhat's wrong?!")), TEXTBOX_CLEAR, @@ -219,7 +219,7 @@ static const struct ScriptCommand s_gs186_g1_s0_lives0_dlg0[] = { /* 0x8235ba8 * TEXTBOX_CLEAR, ALERT_CUE(6), AWAIT_CUE(5), - ROTATE(4, 11, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_NORTHEAST), PORTRAIT_REP(0x0001, 0x00000004), MSG_NPC(1, _(" Huh?")), TEXTBOX_CLEAR, @@ -231,7 +231,7 @@ static const struct ScriptCommand s_gs186_g1_s0_lives0_dlg0[] = { /* 0x8235ba8 * VARIANT_DEFAULT(_(" Uh, yes...")), VARIANT_DEFAULT(_(" Owowow...{WAIT_PRESS}\nI guess the cramping settled down...")), TEXTBOX_CLEAR, - ROTATE(4, 11, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_NORTHWEST), ALERT_CUE(6), FANFARE_PLAY2(470), CALL_SCRIPT(SWEAT_FUNC), @@ -242,7 +242,7 @@ static const struct ScriptCommand s_gs186_g1_s0_lives0_dlg0[] = { /* 0x8235ba8 * LABEL(16), /* = 0x10 */ ALERT_CUE(6), WAIT(20), - ROTATE(4, 1, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTHEAST), WAIT(15), PORTRAIT_REP(0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), @@ -275,7 +275,7 @@ static const struct ScriptCommand s_gs186_g1_s0_lives0_dlg0[] = { /* 0x8235ba8 * VARIANT_DEFAULT(_(" OK! Gotcha!")), ALERT_CUE(6), AWAIT_CUE(5), - ROTATE(4, 11, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_NORTHWEST), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Let's roll, {NAME_0}!")), VARIANT_DEFAULT(_(" Let's get going,\n{NAME_0}!")), @@ -313,23 +313,23 @@ static const struct ScriptCommand s_gs186_g1_s0_lives1_dlg0[] = { /* 0x8237410 * WAIT(30), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, WAIT(16), - ROTATE(8, 1, DIRECTION_NORTHWEST), + ROTATE_TO(8, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTHWEST), WAIT(12), - ROTATE(8, 2, DIRECTION_SOUTHWEST), + ROTATE_TO(8, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTHWEST), WAIT(12), - ROTATE(8, 1, DIRECTION_NORTHWEST), + ROTATE_TO(8, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTHWEST), WAIT(12), AWAIT_CUE(6), - ROTATE(4, 11, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_NORTHEAST), WAIT(8), ALERT_CUE(5), AWAIT_CUE(6), - ROTATE(4, 11, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_SOUTHEAST), ALERT_CUE(5), AWAIT_CUE(6), { 0x89, 0x0a, 0x0100, 0x00000003, 0x00000000, NULL }, AWAIT_CUE(6), - ROTATE(4, 11, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_NORTHEAST), CALL_SCRIPT(QUESTION_FUNC), ALERT_CUE(5), AWAIT_CUE(6), @@ -342,15 +342,15 @@ static const struct ScriptCommand s_gs186_g1_s0_lives1_dlg0[] = { /* 0x8237410 * ALERT_CUE(5), AWAIT_CUE(6), SELECT_ANIMATION(2), - ROTATE(4, 11, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_SOUTHEAST), AWAIT_CUE(6), JUMPIF(JUDGE_EQ, EVENT_LOCAL, 1, /* to label */ 0), - ROTATE(4, 11, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_NORTHEAST), ALERT_CUE(5), AWAIT_CUE(6), CALL_SCRIPT(SWEAT_FUNC), WAIT(30), - ROTATE(4, 11, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_SOUTHEAST), ALERT_CUE(5), AWAIT_CUE(6), CALL_SCRIPT(SMILE_START_FUNC), @@ -369,22 +369,22 @@ static const struct ScriptCommand s_gs186_g1_s0_lives1_dlg0[] = { /* 0x8237410 * CALL_SCRIPT(ANGRY_END_FUNC), ALERT_CUE(5), AWAIT_CUE(6), - ROTATE(4, 11, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_NORTHEAST), ALERT_CUE(5), AWAIT_CUE(6), FANFARE_PLAY2(470), CALL_SCRIPT(SWEAT_FUNC), ALERT_CUE(5), AWAIT_CUE(6), - ROTATE(4, 11, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_SOUTHEAST), CALL_SCRIPT(SMILE_START_FUNC), WAIT(60), CALL_SCRIPT(SMILE_END_FUNC), AWAIT_CUE(6), LABEL(1), /* = 0x01 */ - ROTATE(4, 11, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_NORTHEAST), AWAIT_CUE(6), - ROTATE(4, 11, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_SOUTHEAST), ALERT_CUE(5), AWAIT_CUE(6), WALK_GRID(128, 1), @@ -407,11 +407,11 @@ static const struct ScriptCommand s_gs186_g1_s0_lives2_dlg0[] = { /* 0x8237920 * ALERT_CUE(5), AWAIT_CUE(7), JUMPIF(JUDGE_EQ, EVENT_LOCAL, 1, /* to label */ 0), - ROTATE(4, 2, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTHWEST), ALERT_CUE(5), AWAIT_CUE(7), LABEL(0), /* = 0x00 */ - ROTATE(4, 1, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTHWEST), ALERT_CUE(5), AWAIT_CUE(7), HALT, diff --git a/src/data/ground/ground_data_d05p02_station.h b/src/data/ground/ground_data_d05p02_station.h index afa1cc27a..6edc24419 100644 --- a/src/data/ground/ground_data_d05p02_station.h +++ b/src/data/ground/ground_data_d05p02_station.h @@ -64,7 +64,7 @@ static const struct ScriptCommand s_gs187_g1_s0_lives0_dlg0[] = { /* 0x8237d1c * ALERT_CUE(6), ALERT_CUE(12), { 0x89, 0x20, 0x0100, 0x00000004, 0x00000000, NULL }, - ROTATE(4, 1, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTHEAST), PORTRAIT_REP(0x0001, 0x00000000), MSG_NPC(1, _(" We came for you!\nAre you all right?")), TEXTBOX_CLEAR, @@ -83,12 +83,12 @@ static const struct ScriptCommand s_gs187_g1_s0_lives0_dlg0[] = { /* 0x8237d1c * PORTRAIT_REP(0x0001, 0x00000000), MSG_NPC(1, _(" Huh? {NAME_3}?")), TEXTBOX_CLEAR, - ROTATE(4, 2, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_NORTH), WAIT(5), ALERT_CUE(6), ALERT_CUE(12), WAIT(40), - ROTATE(2, 1, DIRECTION_EAST), + ROTATE_TO(2, DIR_TRANS_SPINRIGHT1, DIRECTION_EAST), ALERT_CUE(6), AWAIT_CUE(5), PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000000), @@ -99,7 +99,7 @@ static const struct ScriptCommand s_gs187_g1_s0_lives0_dlg0[] = { /* 0x8237d1c * ALERT_CUE(12), ALERT_CUE(4), { 0x89, 0x3c, 0x01cc, 0x00000004, 0x00000000, NULL }, - ROTATE(4, 1, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTHEAST), WAIT(30), PORTRAIT_REP(0x0001, 0x0000000c), MSG_VAR(2, PARTNER_TALK_KIND, 1), @@ -168,7 +168,7 @@ static const struct ScriptCommand s_gs187_g1_s0_lives0_dlg0[] = { /* 0x8237d1c * WAIT(30), MSG_NPC(1, _(" Shi-{NAME_3}'s gone!")), TEXTBOX_CLEAR, - ROTATE(4, 2, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_NORTH), ALERT_CUE(6), ALERT_CUE(12), WAIT(15), @@ -213,21 +213,21 @@ static const struct ScriptCommand s_gs187_g1_s0_lives1_dlg0[] = { /* 0x82389a8 * ALERT_CUE(5), AWAIT_CUE(6), { 0x89, 0x20, 0x0100, 0x00000004, 0x00000000, NULL }, - ROTATE(4, 2, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_NORTHWEST), AWAIT_CUE(6), - ROTATE(4, 1, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTH), AWAIT_CUE(6), - ROTATE(4, 2, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_WEST), ALERT_CUE(5), AWAIT_CUE(6), { 0x89, 0x3c, 0x01cc, 0x00000004, 0x00000000, NULL }, - ROTATE(4, 2, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_NORTHWEST), AWAIT_CUE(6), CALL_SCRIPT(LOOK_AROUND_FUNC), FANFARE_PLAY2(466), CALL_SCRIPT(NOTICE_FUNC), AWAIT_CUE(6), - ROTATE(8, 1, DIRECTION_NORTH), + ROTATE_TO(8, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTH), AWAIT_CUE(6), HALT, }; @@ -241,17 +241,17 @@ static const struct ScriptCommand s_gs187_g1_s0_lives2_dlg0[] = { /* 0x8238b68 * AWAIT_CUE(12), { 0x89, 0x20, 0x0100, 0x00000004, 0x00000000, NULL }, AWAIT_CUE(12), - ROTATE(4, 10, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), AWAIT_CUE(12), { 0x89, 0x3c, 0x01cc, 0x00000004, 0x00000000, NULL }, AWAIT_CUE(12), - ROTATE(4, 10, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_WEST), WAIT(15), - ROTATE(4, 10, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_EAST), WAIT(15), - ROTATE(4, 10, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHWEST), AWAIT_CUE(12), - ROTATE(4, 10, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), AWAIT_CUE(12), HALT, }; @@ -265,18 +265,18 @@ static const struct ScriptCommand s_gs187_g1_s0_lives3_dlg0[] = { /* 0x8238cb8 * AWAIT_CUE(12), { 0x89, 0x20, 0x0100, 0x00000004, 0x00000000, NULL }, AWAIT_CUE(12), - ROTATE(4, 10, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), AWAIT_CUE(12), { 0x89, 0x3c, 0x01cc, 0x00000004, 0x00000000, NULL }, AWAIT_CUE(12), WAIT(7), - ROTATE(4, 10, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_EAST), WAIT(15), - ROTATE(4, 10, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_WEST), WAIT(15), - ROTATE(4, 10, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHEAST), AWAIT_CUE(12), - ROTATE(4, 10, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), AWAIT_CUE(12), HALT, }; diff --git a/src/data/ground/ground_data_d06p01_station.h b/src/data/ground/ground_data_d06p01_station.h index cd994fcf0..6193fb1e5 100644 --- a/src/data/ground/ground_data_d06p01_station.h +++ b/src/data/ground/ground_data_d06p01_station.h @@ -67,7 +67,7 @@ static const struct ScriptCommand s_gs188_g1_s0_lives0_dlg0[] = { /* 0x82392cc * TEXTBOX_CLEAR, WAIT(30), ALERT_CUE(6), - ROTATE(4, 1, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_EAST), PORTRAIT_REP(0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" But I can't be spooked\nby this.")), @@ -96,7 +96,7 @@ static const struct ScriptCommand s_gs188_g1_s0_lives1_dlg0[] = { /* 0x8239824 * { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(6), WALK_GRID(256, 1), - ROTATE(4, 2, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_NORTH), WAIT(8), CALL_SCRIPT(LOOK_AROUND_FUNC), ALERT_CUE(5), @@ -105,7 +105,7 @@ static const struct ScriptCommand s_gs188_g1_s0_lives1_dlg0[] = { /* 0x8239824 * WAIT(30), SELECT_ANIMATION(2), AWAIT_CUE(6), - ROTATE(4, 2, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_WEST), AWAIT_CUE(6), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, WALK_GRID(256, 2), @@ -142,7 +142,7 @@ static const struct ScriptCommand s_gs188_g2_s0_lives0_dlg0[] = { /* 0x8239a30 * ALERT_CUE(6), WALK_GRID(256, 0), AWAIT_CUE(5), - ROTATE(4, 1, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_EAST), WAIT(20), PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), @@ -167,7 +167,7 @@ static const struct ScriptCommand s_gs188_g2_s0_lives1_dlg0[] = { /* 0x8239c48 * { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(6), WALK_GRID(256, 1), - ROTATE(4, 2, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_WEST), WAIT(8), ALERT_CUE(5), AWAIT_CUE(6), diff --git a/src/data/ground/ground_data_d06p03_station.h b/src/data/ground/ground_data_d06p03_station.h index 5dd186296..9016e9794 100644 --- a/src/data/ground/ground_data_d06p03_station.h +++ b/src/data/ground/ground_data_d06p03_station.h @@ -141,7 +141,7 @@ static const struct ScriptCommand s_gs190_g1_s0_lives0_dlg0[] = { /* 0x823ac18 * ALERT_CUE(10), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, WALK_DIRECT(32, 0), - { 0x93, 0x04, 0x000a, 0x00000055, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 85), WAIT(16), PORTRAIT(PLACEMENT_TOP_LEFT, 0x0004, 0x00000000), MSG_NPC(4, _(" Are you OK?")), @@ -171,7 +171,7 @@ static const struct ScriptCommand s_gs190_g1_s0_lives0_dlg0[] = { /* 0x823ac18 * MSG_NPC(4, _(" You're awfully strong for\na plain {POKEMON_0}.")), TEXTBOX_CLEAR, WAIT(32), - ROTATE(4, 2, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_NORTHWEST), WAIT(32), PORTRAIT(PLACEMENT_LEFT_, 0x0003, 0x00000000), MSG_NPC(3, _(" ......")), @@ -252,7 +252,7 @@ static const struct ScriptCommand s_gs190_g1_s0_lives0_dlg0[] = { /* 0x823ac18 * ALERT_CUE(6), ALERT_CUE(13), AWAIT_CUE(5), - ROTATE(4, 11, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_NORTHEAST), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" {NAME_0}, let's roll!\nWe're going to the {COLOR CYAN}Hill of the Ancients{RESET}!")), VARIANT(/* == */ 1, _(" There's no time to lose!\nWe'd better go back quick!")), @@ -285,7 +285,7 @@ static const struct ScriptCommand s_gs190_g1_s0_lives0_dlg0[] = { /* 0x823ac18 * ALERT_CUE(13), FANFARE_PLAY2(464), CALL_SCRIPT(NOTICE_FUNC), - ROTATE(4, 11, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_SOUTHEAST), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Don't just stand around.\nLet's go back.")), VARIANT_DEFAULT(_(" Don't just stand there.\nLet's go home.")), @@ -357,7 +357,7 @@ static const struct ScriptCommand s_gs190_g1_s0_lives1_dlg0[] = { /* 0x823c670 * AWAIT_CUE(6), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, WALK_DIRECT(32, 1), - { 0x93, 0x04, 0x000a, 0x00000055, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 85), AWAIT_CUE(6), CALL_SCRIPT(JUMP_HAPPY_FUNC), CALL_SCRIPT(SMILE_START_FUNC), @@ -365,7 +365,7 @@ static const struct ScriptCommand s_gs190_g1_s0_lives1_dlg0[] = { /* 0x823c670 * CALL_SCRIPT(SMILE_END_FUNC), ALERT_CUE(5), AWAIT_CUE(6), - ROTATE(4, 11, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_WEST), ALERT_CUE(5), AWAIT_CUE(6), CALL_SCRIPT(JUMP_SURPRISE_FUNC), @@ -374,16 +374,16 @@ static const struct ScriptCommand s_gs190_g1_s0_lives1_dlg0[] = { /* 0x823c670 * CALL_SCRIPT(NOTICE_FUNC), ALERT_CUE(5), AWAIT_CUE(6), - ROTATE(4, 2, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTHWEST), ALERT_CUE(5), AWAIT_CUE(6), - ROTATE(4, 1, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTHWEST), ALERT_CUE(5), AWAIT_CUE(6), WALK_GRID(128, 6), ALERT_CUE(5), AWAIT_CUE(6), - ROTATE(4, 1, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTHWEST), ALERT_CUE(5), AWAIT_CUE(6), { 0x89, 0x90, 0x0080, 0x00000000, 0x00000000, NULL }, @@ -399,19 +399,19 @@ static const struct ScriptCommand s_gs190_g1_s0_lives2_dlg0[] = { /* 0x823c940 * AWAIT_CUE(13), CALL_SCRIPT(JUMP_SURPRISE_FUNC), { 0x62, 0x00, 0x0100, 0x00000000, 0x00000010, NULL }, - ROTATE(4, 10, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHEAST), AWAIT_CUE(13), CALL_SCRIPT(NOTICE_FUNC), AWAIT_CUE(13), CALL_SCRIPT(NOTICE_FUNC), AWAIT_CUE(13), - ROTATE(4, 10, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_EAST), AWAIT_CUE(13), - ROTATE(4, 10, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHEAST), AWAIT_CUE(13), { 0x89, 0x60, 0x0080, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(13), - ROTATE(4, 10, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHEAST), AWAIT_CUE(13), { 0x89, 0x90, 0x0080, 0x00000000, 0x00000000, NULL }, END_DELETE, @@ -426,19 +426,19 @@ static const struct ScriptCommand s_gs190_g1_s0_lives3_dlg0[] = { /* 0x823cac0 * AWAIT_CUE(13), CALL_SCRIPT(JUMP_SURPRISE_FUNC), { 0x62, 0x00, 0x0100, 0x00000000, 0x00000010, NULL }, - ROTATE(4, 10, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHWEST), AWAIT_CUE(13), CALL_SCRIPT(NOTICE_FUNC), AWAIT_CUE(13), CALL_SCRIPT(NOTICE_FUNC), AWAIT_CUE(13), - ROTATE(4, 10, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_WEST), AWAIT_CUE(13), - ROTATE(4, 10, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHWEST), AWAIT_CUE(13), { 0x89, 0x60, 0x0080, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(13), - ROTATE(4, 10, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHWEST), AWAIT_CUE(13), { 0x89, 0x90, 0x0080, 0x00000000, 0x00000000, NULL }, END_DELETE, @@ -467,10 +467,10 @@ static const struct ScriptCommand s_gs190_g1_s0_lives4_dlg0[] = { /* 0x823cc40 * FANFARE_STOP2(491), ALERT_CUE(5), AWAIT_CUE(7), - ROTATE(4, 1, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTHWEST), ALERT_CUE(5), AWAIT_CUE(7), - ROTATE(4, 11, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_SOUTH), SELECT_ANIMATION(5), WAIT(32), SELECT_ANIMATION(5), @@ -499,17 +499,17 @@ static const struct ScriptCommand s_gs190_g1_s0_lives5_dlg0[] = { /* 0x823ce70 * AWAIT_CUE(8), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, WALK_DIRECT(32, 2), - { 0x93, 0x04, 0x000a, 0x00000055, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 85), AWAIT_CUE(8), - ROTATE(4, 1, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTHEAST), ALERT_CUE(5), AWAIT_CUE(8), - ROTATE(4, 11, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_EAST), ALERT_CUE(5), AWAIT_CUE(8), - ROTATE(4, 11, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_SOUTHEAST), AWAIT_CUE(8), - ROTATE(4, 1, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTH), ALERT_CUE(5), AWAIT_CUE(8), HALT, @@ -532,22 +532,22 @@ static const struct ScriptCommand s_gs190_g1_s0_lives6_dlg0[] = { /* 0x823d050 * AWAIT_CUE(9), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, { 0x84, 0x00, 0x0180, 0x00000022, -0x0000001a, NULL }, - ROTATE(4, 2, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_NORTH), ALERT_CUE(5), AWAIT_CUE(9), CALL_SCRIPT(SHOCK_FUNC), ALERT_CUE(5), AWAIT_CUE(9), WALK_DIRECT(32, 3), - ROTATE(4, 1, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTHEAST), AWAIT_CUE(9), - ROTATE(4, 1, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTHEAST), ALERT_CUE(5), AWAIT_CUE(9), CALL_SCRIPT(SHOCK_FUNC), ALERT_CUE(5), AWAIT_CUE(9), - ROTATE(4, 1, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTH), ALERT_CUE(5), AWAIT_CUE(9), HALT, @@ -573,14 +573,14 @@ static const struct ScriptCommand s_gs190_g1_s0_lives7_dlg0[] = { /* 0x823d280 * AWAIT_CUE(10), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, WALK_DIRECT(32, 4), - { 0x93, 0x04, 0x000a, 0x00000055, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 85), AWAIT_CUE(10), - ROTATE(4, 1, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTHEAST), ALERT_CUE(5), AWAIT_CUE(10), CALL_SCRIPT(NOTICE_FUNC), AWAIT_CUE(10), - ROTATE(4, 1, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTH), ALERT_CUE(5), AWAIT_CUE(10), HALT, @@ -604,12 +604,12 @@ static const struct ScriptCommand s_gs190_g1_s1_lives0_dlg0[] = { /* 0x823d4c0 * AWAIT_CUE(11), SELECT_ANIMATION(2), CALL_SCRIPT(LOOK_AROUND_FUNC), - ROTATE(4, 2, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTH), ALERT_CUE(5), AWAIT_CUE(11), CALL_SCRIPT(SHOCK_FUNC), AWAIT_CUE(11), - ROTATE(4, 10, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHEAST), ALERT_CUE(5), AWAIT_CUE(11), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, diff --git a/src/data/ground/ground_data_d07p01_station.h b/src/data/ground/ground_data_d07p01_station.h index d95a1cb48..55bf8c760 100644 --- a/src/data/ground/ground_data_d07p01_station.h +++ b/src/data/ground/ground_data_d07p01_station.h @@ -51,7 +51,7 @@ static const struct ScriptCommand s_gs191_g1_s0_lives0_dlg0[] = { /* 0x823d8e0 * MSG_NPC(1, _(" The peak is called the\n{COLOR CYAN}Hill of the Ancients{RESET}.")), ALERT_CUE(6), WAIT(10), - ROTATE(4, 1, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTHEAST), { 0x2d, 0x0a, 0x0000, 0x00000009, 0x00000000, NULL }, MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" {NAME_2} said that\nthe {COLOR CYAN}Hill of the Ancients{RESET} is on {VALUE_0}F.")), @@ -81,7 +81,7 @@ static const struct ScriptCommand s_gs191_g1_s0_lives1_dlg0[] = { /* 0x823dc10 * WAIT(20), ALERT_CUE(5), AWAIT_CUE(6), - ROTATE(4, 2, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTHWEST), AWAIT_CUE(6), WALK_GRID(128, 3), HALT, @@ -110,7 +110,7 @@ static const struct ScriptCommand s_gs191_g2_s0_lives0_dlg0[] = { /* 0x823ddac * WAIT(30), WALK_GRID(256, 1), WAIT(30), - ROTATE(4, 1, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_EAST), PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" {NAME_0}!\nThis time we'll make it to the peak,\nall right?")), @@ -135,7 +135,7 @@ static const struct ScriptCommand s_gs191_g2_s0_lives1_dlg0[] = { /* 0x823e038 * WAIT(30), WALK_GRID(256, 0), WAIT(30), - ROTATE(4, 2, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_WEST), AWAIT_CUE(6), WALK_GRID(204, 4), WALK_GRID(204, 3), diff --git a/src/data/ground/ground_data_d07p02_station.h b/src/data/ground/ground_data_d07p02_station.h index 0de659ba2..7a2cf2325 100644 --- a/src/data/ground/ground_data_d07p02_station.h +++ b/src/data/ground/ground_data_d07p02_station.h @@ -103,7 +103,7 @@ static const struct ScriptCommand s_gs192_g1_s0_lives0_dlg0[] = { /* 0x823e36c * MSG_NPC(2, _(" To the northwest, there lies\na large island.")), ALERT_CUE(7), WAIT(20), - ROTATE(4, 10, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHEAST), WAIT(30), MSG_NPC(2, _(" An island known as the\n“Three Fields.”")), MSG_NPC(2, _(" There is one such field.\nThe {COLOR YELLOW_D}Fiery Field{RESET}!")), @@ -111,7 +111,7 @@ static const struct ScriptCommand s_gs192_g1_s0_lives0_dlg0[] = { /* 0x823e36c * TEXTBOX_CLEAR, WAIT(20), ALERT_CUE(7), - ROTATE(4, 10, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), MSG_NPC(2, _(" Go.\nYou must go to the {COLOR YELLOW_D}Fiery Field{RESET}.")), MSG_NPC(2, _(" The answers you seek...\nPerhaps they await you there.")), TEXTBOX_CLEAR, @@ -132,7 +132,7 @@ static const struct ScriptCommand s_gs192_g1_s0_lives1_dlg0[] = { /* 0x823ec7c * SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(7), - ROTATE(4, 1, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTH), AWAIT_CUE(7), FANFARE_PLAY2(465), CALL_SCRIPT(NOTICE_FUNC), @@ -143,14 +143,14 @@ static const struct ScriptCommand s_gs192_g1_s0_lives1_dlg0[] = { /* 0x823ec7c * SELECT_ANIMATION(9), AWAIT_CUE(7), SELECT_ANIMATION(2), - ROTATE(8, 1, DIRECTION_NORTH), + ROTATE_TO(8, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTH), AWAIT_CUE(7), - ROTATE(4, 1, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTH), ALERT_CUE(5), AWAIT_CUE(7), - ROTATE(4, 10, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHEAST), AWAIT_CUE(7), - ROTATE(4, 10, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTH), HALT, }; @@ -191,7 +191,7 @@ static const struct ScriptCommand s_gs192_g2_s0_lives0_dlg0[] = { /* 0x823ef68 * { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), ALERT_CUE(6), - ROTATE(4, 1, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_EAST), PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Yes! We finally made it to\nthe top, {NAME_0}!")), @@ -199,7 +199,7 @@ static const struct ScriptCommand s_gs192_g2_s0_lives0_dlg0[] = { /* 0x823ef68 * TEXTBOX_CLEAR, ALERT_CUE(6), WAIT(10), - ROTATE(8, 2, DIRECTION_NORTH), + ROTATE_TO(8, DIR_TRANS_SPINLEFT1, DIRECTION_NORTH), AWAIT_CUE(5), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" So this is the {COLOR CYAN}Hill of\nthe Ancients{RESET}...")), @@ -214,7 +214,7 @@ static const struct ScriptCommand s_gs192_g2_s0_lives0_dlg0[] = { /* 0x823ef68 * ALERT_CUE(4), AWAIT_CUE(5), ALERT_CUE(6), - ROTATE(4, 1, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTHEAST), WAIT(10), PORTRAIT_REP(0x0001, 0x00000000), MSG_NPC(1, _(" {NAME_0}!{WAIT_PRESS}\nIs that {NAME_2} over there?")), @@ -224,7 +224,7 @@ static const struct ScriptCommand s_gs192_g2_s0_lives0_dlg0[] = { /* 0x823ef68 * ALERT_CUE(9), ALERT_CUE(4), WALK_DIRECT(60, 2), - ROTATE(4, 1, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTHEAST), WAIT(20), MSG_NPC(1, _(" Excuse me?{WAIT_PRESS}\nAre you maybe {NAME_2}?")), TEXTBOX_CLEAR, @@ -250,7 +250,7 @@ static const struct ScriptCommand s_gs192_g2_s0_lives0_dlg0[] = { /* 0x823ef68 * WAIT(40), ALERT_CUE(6), AWAIT_CUE(5), - ROTATE(4, 2, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_NORTH), MSG_NPC(1, _(" Hellooooooooooooooo?!")), TEXTBOX_CLEAR, WAIT(10), @@ -259,9 +259,9 @@ static const struct ScriptCommand s_gs192_g2_s0_lives0_dlg0[] = { /* 0x823ef68 * WAIT(60), ALERT_CUE(6), AWAIT_CUE(5), - ROTATE(4, 1, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTHEAST), AWAIT_CUE(5), - ROTATE(4, 1, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_EAST), MSG_NPC(1, _(" It's useless.\nHe's not responding at all.")), MSG_NPC(1, _(" Maybe he's sleeping while\non his feet?")), { 0x2e, 0x15, 0x0001, -0x00000002, 0x00000000, NULL }, @@ -279,7 +279,7 @@ static const struct ScriptCommand s_gs192_g2_s0_lives0_dlg0[] = { /* 0x823ef68 * VARIANT_DEFAULT(_(" Huh? Tickle him?{WAIT_PRESS}\n...OK. It's worth a try.")), TEXTBOX_CLEAR, ALERT_CUE(6), - ROTATE(4, 2, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_NORTHEAST), ALERT_CUE(6), AWAIT_CUE(5), WAIT(20), @@ -326,7 +326,7 @@ static const struct ScriptCommand s_gs192_g2_s0_lives0_dlg0[] = { /* 0x823ef68 * WAIT(30), ALERT_CUE(6), AWAIT_CUE(5), - ROTATE(4, 1, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_EAST), PORTRAIT_REP(0x0001, 0x00000005), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" It's useless, {NAME_0}.\nI'm not getting any response.")), @@ -338,7 +338,7 @@ static const struct ScriptCommand s_gs192_g2_s0_lives0_dlg0[] = { /* 0x823ef68 * TEXTBOX_CLEAR, WAIT(30), ALERT_CUE(6), - ROTATE(4, 2, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_NORTHEAST), PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000004), MSG_NPC(1, _(" Huh?")), TEXTBOX_CLEAR, @@ -414,7 +414,7 @@ static const struct ScriptCommand s_gs192_g2_s0_lives0_dlg0[] = { /* 0x823ef68 * BGM_FADEOUT(30), ALERT_CUE(6), AWAIT_CUE(5), - ROTATE(5, 2, DIRECTION_NORTHEAST), + ROTATE_TO(5, DIR_TRANS_SPINLEFT1, DIRECTION_NORTHEAST), AWAIT_CUE(5), WAIT(30), TEXTBOX_AUTO_PRESS(45, 60), @@ -499,7 +499,7 @@ static const struct ScriptCommand s_gs192_g2_s0_lives0_dlg0[] = { /* 0x823ef68 * TEXTBOX_CLEAR, WAIT(10), ALERT_CUE(6), - ROTATE(4, 1, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_EAST), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" This is my friend\n{NAME_0}...")), VARIANT(/* == */ 1, _(" My friend woke up one\nmorning as a Pokémon.")), @@ -509,7 +509,7 @@ static const struct ScriptCommand s_gs192_g2_s0_lives0_dlg0[] = { /* 0x823ef68 * VARIANT_DEFAULT(_(" And, without any memory as\na human.")), WAIT(30), ALERT_CUE(6), - ROTATE(4, 2, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_NORTHEAST), AWAIT_CUE(5), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" {NAME_2}, you can tell,\ncan't you?{WAIT_PRESS}\nCan't you tell us?")), @@ -520,7 +520,7 @@ static const struct ScriptCommand s_gs192_g2_s0_lives0_dlg0[] = { /* 0x823ef68 * MSG_NPC(2, _(" The calamities of nature.\nThere have been many in recent times.")), MSG_NPC(2, _(" They occur because the\nworld's balance is upset.")), ALERT_CUE(7), - ROTATE(4, 1, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTHEAST), MSG_NPC(2, _(" And your becoming a\nPokémon...")), MSG_NPC(2, _(" They are tied together.\nInseparably so.")), TEXTBOX_CLEAR, @@ -604,9 +604,9 @@ static const struct ScriptCommand s_gs192_g2_s0_lives1_dlg0[] = { /* 0x8241890 * SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(6), - ROTATE(4, 2, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_WEST), AWAIT_CUE(6), - ROTATE(4, 1, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTH), WALK_RELATIVE(128, 0, -16), CALL_SCRIPT(LOOK_AROUND_FUNC), ALERT_CUE(5), @@ -615,13 +615,13 @@ static const struct ScriptCommand s_gs192_g2_s0_lives1_dlg0[] = { /* 0x8241890 * CALL_SCRIPT(NOTICE_FUNC), ALERT_CUE(5), AWAIT_CUE(6), - ROTATE(4, 2, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTHWEST), AWAIT_CUE(6), WALK_DIRECT(60, 1), - ROTATE(4, 2, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_NORTHWEST), AWAIT_CUE(6), WALK_DIRECT(40, 5), - ROTATE(4, 1, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTH), ALERT_CUE(5), AWAIT_CUE(6), FANFARE_PLAY2(469), @@ -631,11 +631,11 @@ static const struct ScriptCommand s_gs192_g2_s0_lives1_dlg0[] = { /* 0x8241890 * WALK_DIRECT(40, 6), WAIT(15), FANFARE_PLAY2(468), - ROTATE(4, 2, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_WEST), WAIT(60), WALK_DIRECT(40, 7), WAIT(30), - ROTATE(4, 2, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTH), ALERT_CUE(5), FANFARE_PLAY2(457), CALL_SCRIPT(JUMP_ANGRY_FUNC), @@ -643,19 +643,19 @@ static const struct ScriptCommand s_gs192_g2_s0_lives1_dlg0[] = { /* 0x8241890 * WALK_DIRECT(40, 8), WAIT(30), FANFARE_PLAY2(468), - ROTATE(4, 2, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_EAST), WAIT(60), WALK_DIRECT(40, 9), ALERT_CUE(5), WALK_RELATIVE(256, 32, 3), WAIT(15), - ROTATE(4, 1, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_WEST), ALERT_CUE(5), AWAIT_CUE(6), JUMPIF(JUDGE_EQ, EVENT_LOCAL, 1, /* to label */ 0), AWAIT_CUE(6), WALK_DIRECT(40, 6), - ROTATE(4, 2, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_WEST), ALERT_CUE(5), AWAIT_CUE(6), FANFARE_PLAY2(469), @@ -700,9 +700,9 @@ static const struct ScriptCommand s_gs192_g2_s0_lives1_dlg0[] = { /* 0x8241890 * WAIT(60), WALK_RELATIVE(256, 0, 18), ALERT_CUE(5), - ROTATE(4, 1, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_WEST), AWAIT_CUE(6), - ROTATE(4, 1, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTHWEST), AWAIT_CUE(6), CALL_SCRIPT(SWEAT_FUNC), ALERT_CUE(5), @@ -714,9 +714,9 @@ static const struct ScriptCommand s_gs192_g2_s0_lives1_dlg0[] = { /* 0x8241890 * CALL_SCRIPT(SHOCK_FUNC), ALERT_CUE(5), AWAIT_CUE(6), - ROTATE(15, 1, DIRECTION_NORTHWEST), + ROTATE_TO(15, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTHWEST), WAIT(60), - ROTATE(4, 2, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_WEST), FANFARE_PLAY2(457), { 0x56, 0x00, 0x0000, 0x00000047, 0x00000000, NULL }, { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -744,12 +744,12 @@ static const struct ScriptCommand s_gs192_g2_s0_lives1_dlg0[] = { /* 0x8241890 * CALL_SCRIPT(NOTICE_FUNC), AWAIT_CUE(6), WALK_DIRECT(20, 5), - ROTATE(4, 1, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTH), ALERT_CUE(5), AWAIT_CUE(6), - ROTATE(4, 2, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_WEST), AWAIT_CUE(6), - ROTATE(4, 1, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTH), WAIT(10), ALERT_CUE(5), AWAIT_CUE(6), @@ -839,22 +839,22 @@ static const struct ScriptCommand s_gs192_g2_s0_lives4_dlg0[] = { /* 0x8242520 * AWAIT_CUE(7), SELECT_ANIMATION(2), AWAIT_CUE(7), - ROTATE(4, 2, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTH), ALERT_CUE(5), AWAIT_CUE(7), - ROTATE(10, 1, DIRECTION_SOUTHWEST), + ROTATE_TO(10, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTHWEST), AWAIT_CUE(7), - ROTATE(4, 1, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTH), ALERT_CUE(5), AWAIT_CUE(7), - ROTATE(4, 2, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTHEAST), ALERT_CUE(5), AWAIT_CUE(7), - ROTATE(4, 1, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTH), AWAIT_CUE(7), - ROTATE(4, 1, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTHWEST), AWAIT_CUE(7), - ROTATE(4, 2, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTH), AWAIT_CUE(7), SELECT_ANIMATION(24), WAIT(60), @@ -873,7 +873,7 @@ static const struct ScriptCommand s_gs192_g2_s1_lives0_dlg0[] = { /* 0x8242850 * CAMERA_END_PAN, ALERT_CUE(5), AWAIT_CUE(8), - ROTATE(4, 1, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTH), ALERT_CUE(5), AWAIT_CUE(8), CALL_SCRIPT(SMILE_START_FUNC), diff --git a/src/data/ground/ground_data_d08p01_station.h b/src/data/ground/ground_data_d08p01_station.h index 487012094..f7e540b8f 100644 --- a/src/data/ground/ground_data_d08p01_station.h +++ b/src/data/ground/ground_data_d08p01_station.h @@ -167,7 +167,7 @@ static const struct ScriptCommand s_gs193_g1_s0_lives0_dlg0[] = { /* 0x824313c * PORTRAIT_REP(0x0001, 0x00000000), MSG_NPC(1, _(" Huh? I hear voices...")), TEXTBOX_CLEAR, - ROTATE(4, 1, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_WEST), WAIT(20), MSG_NPC(-1, _(" I think they went this way.")), MSG_NPC(-1, _(" They can't get away.\nNot from all of us.")), @@ -201,13 +201,13 @@ static const struct ScriptCommand s_gs193_g1_s0_lives1_dlg0[] = { /* 0x824389c * AWAIT_CUE(6), WALK_GRID(256, 1), AWAIT_CUE(6), - { 0x93, 0x04, 0x000b, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_11, 0), ALERT_CUE(5), AWAIT_CUE(6), - ROTATE(2, 1, DIRECTION_NORTHWEST), - ROTATE(2, 2, DIRECTION_SOUTHWEST), - ROTATE(2, 1, DIRECTION_NORTHWEST), - ROTATE(2, 2, DIRECTION_WEST), + ROTATE_TO(2, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTHWEST), + ROTATE_TO(2, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTHWEST), + ROTATE_TO(2, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTHWEST), + ROTATE_TO(2, DIR_TRANS_SPINLEFT1, DIRECTION_WEST), ALERT_CUE(5), AWAIT_CUE(6), CALL_SCRIPT(NOTICE_FUNC), @@ -277,7 +277,7 @@ static const struct ScriptCommand s_gs193_g2_s0_lives1_dlg0[] = { /* 0x8243e64 * CALL_SCRIPT(LOOK_AROUND_FUNC), ALERT_CUE(5), AWAIT_CUE(6), - { 0x93, 0x04, 0x0001, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_SPINRIGHT1, 0), ALERT_CUE(5), AWAIT_CUE(6), HALT, @@ -327,7 +327,7 @@ static const struct ScriptCommand s_gs193_g3_s1_lives0_dlg0[] = { /* 0x8244078 * SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x8e, 0x01, 0x0000, 0x00000022, 0x00000000, NULL }, + CMD_UNK_8E(1, DIR_TRANS_NONE, 34), ASK3_VAR(FALSE, /*default*/ -1, /* speaker */ 1, PARTNER_TALK_KIND), VARIANT(/* == */ 1, _(" Hey, {NAME_0}.\nAre you all ready?")), VARIANT_DEFAULT(_(" Hi, {NAME_0}.\nAre you ready?")), @@ -406,18 +406,18 @@ static const struct ScriptCommand s_gs193_g3_s1_lives1_dlg0[] = { /* 0x8244648 * SELECT_ANIMATION(2), { 0x53, 0x00, 0x0000, 0x00000400, 0x00000000, NULL }, { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0x8e, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, + CMD_UNK_8E(1, DIR_TRANS_NONE, 0), AWAIT_CUE(6), CJUMP_UNK_C8(0), COND_EQUAL(0, /* to label */ 0), COND_EQUAL(1, /* to label */ 0), COND_EQUAL(7, /* to label */ 0), COND_EQUAL(6, /* to label */ 0), - ROTATE(4, 11, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_NORTHEAST), WALK_GRID(256, 2), HALT, LABEL(0), /* = 0x00 */ - ROTATE(4, 11, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_NORTHEAST), WALK_GRID(256, 2), HALT, }; @@ -483,7 +483,7 @@ static const struct ScriptCommand s_gs193_g4_s0_lives1_dlg0[] = { /* 0x8244bb4 * AWAIT_CUE(6), CALL_SCRIPT(LOOK_AROUND_FUNC), AWAIT_CUE(6), - { 0x93, 0x04, 0x0001, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_SPINRIGHT1, 0), ALERT_CUE(5), AWAIT_CUE(6), HALT, @@ -542,7 +542,7 @@ static const struct ScriptCommand s_gs193_g5_s0_lives1_dlg0[] = { /* 0x8244f58 * CALL_SCRIPT(LOOK_AROUND_FUNC), ALERT_CUE(5), AWAIT_CUE(6), - { 0x93, 0x04, 0x0001, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_SPINRIGHT1, 0), ALERT_CUE(5), AWAIT_CUE(6), HALT, diff --git a/src/data/ground/ground_data_d08p02_station.h b/src/data/ground/ground_data_d08p02_station.h index d35c2efa3..bb89d51de 100644 --- a/src/data/ground/ground_data_d08p02_station.h +++ b/src/data/ground/ground_data_d08p02_station.h @@ -48,12 +48,12 @@ static const struct ScriptCommand s_gs194_g1_s0_lives0_dlg0[] = { /* 0x8245734 * ALERT_CUE(6), WAIT(15), WALK_GRID(153, 0), - ROTATE(4, 11, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_NORTHWEST), { 0x52, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, WAIT(45), ALERT_CUE(6), AWAIT_CUE(5), - { 0x93, 0x04, 0x000b, 0x00000022, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_11, 34), PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Whew...\nWe finally got through that cave.")), @@ -71,7 +71,7 @@ static const struct ScriptCommand s_gs194_g1_s0_lives0_dlg0[] = { /* 0x8245734 * MSG_NPC(-1, _(" Catch {NAME_0}!")), TEXTBOX_CLEAR, ALERT_CUE(6), - ROTATE(4, 11, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_NORTHWEST), PORTRAIT_REP(0x0001, 0x0000000c), MSG_NPC(1, _(" Whoa! Here they come!\nRun!")), TEXTBOX_CLEAR, @@ -92,10 +92,10 @@ static const struct ScriptCommand s_gs194_g1_s0_lives1_dlg0[] = { /* 0x8245ab0 * AWAIT_CUE(6), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, WALK_GRID(153, 1), - ROTATE(4, 11, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_NORTHWEST), { 0x52, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, AWAIT_CUE(6), - { 0x93, 0x04, 0x000b, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_11, 0), ALERT_CUE(5), AWAIT_CUE(6), CALL_SCRIPT(LOOK_AROUND_FUNC), @@ -103,7 +103,7 @@ static const struct ScriptCommand s_gs194_g1_s0_lives1_dlg0[] = { /* 0x8245ab0 * AWAIT_CUE(6), CALL_SCRIPT(JUMP_SURPRISE_FUNC), AWAIT_CUE(6), - ROTATE(4, 11, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_NORTHWEST), AWAIT_CUE(6), { 0x89, 0x50, 0x0200, 0x00000002, 0x00000000, NULL }, HALT, diff --git a/src/data/ground/ground_data_d09p01_station.h b/src/data/ground/ground_data_d09p01_station.h index a6073fc37..aac7180b9 100644 --- a/src/data/ground/ground_data_d09p01_station.h +++ b/src/data/ground/ground_data_d09p01_station.h @@ -181,7 +181,7 @@ static const struct ScriptCommand s_gs195_g1_s0_lives0_dlg0[] = { /* 0x8246544 * WALK_GRID(256, 2), WAIT(10), CALL_SCRIPT(LOOK_AROUND_FUNC), - ROTATE(4, 11, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_SOUTH), WAIT(20), PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), @@ -190,19 +190,19 @@ static const struct ScriptCommand s_gs195_g1_s0_lives0_dlg0[] = { /* 0x8246544 * TEXTBOX_CLEAR, ALERT_CUE(6), AWAIT_CUE(5), - ROTATE(4, 11, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_EAST), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" But...{WAIT_PRESS}\nThere's no point hiding out here.")), VARIANT_DEFAULT(_(" But...{WAIT_PRESS}\nThere isn't any point hiding here.")), ALERT_CUE(6), AWAIT_CUE(5), - ROTATE(4, 11, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_NORTH), MSG_NPC(1, _(" We have to get over this\nmountain to get away.")), TEXTBOX_CLEAR, ALERT_CUE(6), AWAIT_CUE(5), WAIT(10), - ROTATE(4, 11, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_EAST), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" {NAME_0}, we need to\nroll as soon as we're ready.")), VARIANT_DEFAULT(_(" Let's go as soon as we're\nready, {NAME_0}.")), @@ -226,13 +226,13 @@ static const struct ScriptCommand s_gs195_g1_s0_lives1_dlg0[] = { /* 0x824696c * WALK_GRID(256, 5), CALL_SCRIPT(LOOK_AROUND_FUNC), AWAIT_CUE(6), - ROTATE(4, 11, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_WEST), ALERT_CUE(5), AWAIT_CUE(6), - ROTATE(4, 11, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_NORTH), ALERT_CUE(5), AWAIT_CUE(6), - ROTATE(4, 11, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_WEST), ALERT_CUE(5), AWAIT_CUE(6), HALT, @@ -275,7 +275,7 @@ static const struct ScriptCommand s_gs195_g2_s1_lives0_dlg0[] = { /* 0x8246bd0 * SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x8e, 0x01, 0x0000, 0x00000022, 0x00000000, NULL }, + CMD_UNK_8E(1, DIR_TRANS_NONE, 34), ASK3_VAR( TRUE, /*default*/ -1, /* speaker */ 1, PARTNER_TALK_KIND), VARIANT(/* == */ 1, _(" {NAME_0}, are you ready\nto roll?")), VARIANT_DEFAULT(_(" {NAME_0}, are you\nready?")), @@ -363,7 +363,7 @@ static const struct ScriptCommand s_gs195_g2_s1_lives1_dlg0[] = { /* 0x8247300 * SELECT_ANIMATION(2), { 0x53, 0x00, 0x0000, 0x00000400, 0x00000000, NULL }, { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0x8e, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, + CMD_UNK_8E(1, DIR_TRANS_NONE, 0), AWAIT_CUE(6), CJUMP_UNK_C8(0), COND_EQUAL(0, /* to label */ 0), @@ -375,7 +375,7 @@ static const struct ScriptCommand s_gs195_g2_s1_lives1_dlg0[] = { /* 0x8247300 * { 0x52, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, HALT, LABEL(0), /* = 0x00 */ - ROTATE(4, 11, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_NORTHWEST), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, WALK_GRID(153, 6), { 0x52, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, @@ -414,7 +414,7 @@ static const struct ScriptCommand s_gs195_g3_s0_lives0_dlg0[] = { /* 0x82474ec * FANFARE_PLAY2(463), ALERT_CUE(6), AWAIT_CUE(5), - ROTATE(4, 11, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_EAST), PORTRAIT(PLACEMENT_RIGHT_FLIP, 0x0001, 0x0000000c), MSG_NPC(1, _(" Ssh!{WAIT_PRESS}\nSomeone's coming.")), TEXTBOX_CLEAR, @@ -452,12 +452,12 @@ static const struct ScriptCommand s_gs195_g3_s0_lives0_dlg0[] = { /* 0x82474ec * WALK_GRID(256, 2), WAIT(10), CALL_SCRIPT(LOOK_AROUND_FUNC), - ROTATE(4, 11, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_SOUTHWEST), WAIT(20), PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000000), MSG_NPC(1, _(" ...Whew.")), ALERT_CUE(6), - ROTATE(4, 11, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_EAST), PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" We'll have to get over this\nmountain to get away from them.")), @@ -481,7 +481,7 @@ static const struct ScriptCommand s_gs195_g3_s0_lives1_dlg0[] = { /* 0x8247b14 * ALERT_CUE(5), AWAIT_CUE(6), CALL_SCRIPT(NOTICE_FUNC), - ROTATE(4, 11, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_EAST), ALERT_CUE(5), AWAIT_CUE(6), CAMERA_PAN(512, 9), @@ -490,9 +490,9 @@ static const struct ScriptCommand s_gs195_g3_s0_lives1_dlg0[] = { /* 0x8247b14 * WALK_GRID(512, 9), WALK_GRID(256, 5), CALL_SCRIPT(LOOK_AROUND_FUNC), - ROTATE(4, 11, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_EAST), AWAIT_CUE(6), - ROTATE(4, 11, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_WEST), AWAIT_CUE(6), HALT, }; @@ -556,7 +556,7 @@ static const struct ScriptCommand s_gs195_g4_s0_lives1_dlg0[] = { /* 0x82480b4 * AWAIT_CUE(6), CALL_SCRIPT(LOOK_AROUND_FUNC), AWAIT_CUE(6), - { 0x93, 0x04, 0x0001, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_SPINRIGHT1, 0), ALERT_CUE(5), AWAIT_CUE(6), HALT, @@ -615,7 +615,7 @@ static const struct ScriptCommand s_gs195_g5_s0_lives1_dlg0[] = { /* 0x8248458 * CALL_SCRIPT(LOOK_AROUND_FUNC), ALERT_CUE(5), AWAIT_CUE(6), - { 0x93, 0x04, 0x0001, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_SPINRIGHT1, 0), ALERT_CUE(5), AWAIT_CUE(6), HALT, diff --git a/src/data/ground/ground_data_d09p02_station.h b/src/data/ground/ground_data_d09p02_station.h index e39055347..17781570d 100644 --- a/src/data/ground/ground_data_d09p02_station.h +++ b/src/data/ground/ground_data_d09p02_station.h @@ -190,7 +190,7 @@ static const struct ScriptCommand s_gs196_g1_s0_lives1_dlg0[] = { /* 0x8249404 * WAIT(15), CALL_SCRIPT(WAKEUP_FUNC), CALL_SCRIPT(LOOK_AROUND_FUNC), - ROTATE(4, 10, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_EAST), ALERT_CUE(5), AWAIT_CUE(6), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, diff --git a/src/data/ground/ground_data_d09p03_station.h b/src/data/ground/ground_data_d09p03_station.h index 5e9334322..7475ae6f0 100644 --- a/src/data/ground/ground_data_d09p03_station.h +++ b/src/data/ground/ground_data_d09p03_station.h @@ -254,7 +254,7 @@ static const struct ScriptCommand s_gs197_g1_s0_lives0_dlg0[] = { /* 0x82498b0 * FANFARE_PLAY2(470), ALERT_CUE(6), AWAIT_CUE(5), - ROTATE(4, 11, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_WEST), PORTRAIT_REP(0x0001, 0x00000002), MSG_VAR(2, PARTNER_TALK_KIND, 1), MSG_NPC(1, _(" Whew...")), @@ -330,7 +330,7 @@ static const struct ScriptCommand s_gs197_g1_s0_lives1_dlg0[] = { /* 0x824b53c * AWAIT_CUE(6), CALL_SCRIPT(SWEAT_FUNC), WAIT(30), - { 0x93, 0x04, 0x000b, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_11, 0), ALERT_CUE(5), AWAIT_CUE(6), CALL_SCRIPT(JUMP_SURPRISE_FUNC), diff --git a/src/data/ground/ground_data_d10p01_station.h b/src/data/ground/ground_data_d10p01_station.h index 8345f9ef4..6f0306561 100644 --- a/src/data/ground/ground_data_d10p01_station.h +++ b/src/data/ground/ground_data_d10p01_station.h @@ -168,7 +168,7 @@ static const struct ScriptCommand s_gs198_g1_s0_lives0_dlg0[] = { /* 0x824c290 * VARIANT_DEFAULT(_(" But hiding out in this area\nisn't the answer either...")), VARIANT_DEFAULT(_(" We can only go forward.{WAIT_PRESS}\nWe'll just have to keep our spirits up\nand keep going, {NAME_0}!")), TEXTBOX_CLEAR, - ROTATE(4, 2, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_WEST), WAIT(10), { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, ALERT_CUE(3), @@ -181,7 +181,7 @@ static const struct ScriptCommand s_gs198_g1_s0_lives1_dlg0[] = { /* 0x824c670 * SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(6), - ROTATE(4, 1, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_EAST), HALT, }; @@ -222,7 +222,7 @@ static const struct ScriptCommand s_gs198_g2_s1_lives0_dlg0[] = { /* 0x824c7d4 * SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x8e, 0x01, 0x0000, 0x00000022, 0x00000000, NULL }, + CMD_UNK_8E(1, DIR_TRANS_NONE, 34), ASK3_VAR( TRUE, /*default*/ -1, /* speaker */ 1, PARTNER_TALK_KIND), VARIANT(/* == */ 1, _(" {NAME_0}, are you ready\nto roll?")), VARIANT_DEFAULT(_(" {NAME_0}, are you\nready?")), @@ -308,7 +308,7 @@ static const struct ScriptCommand s_gs198_g2_s1_lives1_dlg0[] = { /* 0x824cea4 * SELECT_ANIMATION(2), { 0x53, 0x00, 0x0000, 0x00000400, 0x00000000, NULL }, { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0x8e, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, + CMD_UNK_8E(1, DIR_TRANS_NONE, 0), AWAIT_CUE(6), CJUMP_UNK_C8(0), COND_EQUAL(0, /* to label */ 0), @@ -383,7 +383,7 @@ static const struct ScriptCommand s_gs198_g3_s0_lives1_dlg0[] = { /* 0x824d364 * CALL_SCRIPT(LOOK_AROUND_FUNC), ALERT_CUE(5), AWAIT_CUE(6), - ROTATE(4, 2, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_EAST), AWAIT_CUE(6), HALT, }; @@ -413,7 +413,7 @@ static const struct ScriptCommand s_gs198_g4_s0_lives0_dlg0[] = { /* 0x824d500 * { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, CALL_SCRIPT(WAKEUP_FUNC), SELECT_ANIMATION(2), - ROTATE(4, 1, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_WEST), WAIT(30), { 0x2d, 0x09, 0x0002, 0x00000066, 0x00000000, NULL }, PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000002), @@ -442,7 +442,7 @@ static const struct ScriptCommand s_gs198_g4_s0_lives1_dlg0[] = { /* 0x824d834 * { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, CALL_SCRIPT(WAKEUP_FUNC), SELECT_ANIMATION(2), - ROTATE(4, 2, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_EAST), HALT, }; @@ -509,7 +509,7 @@ static const struct ScriptCommand s_gs198_g5_s0_lives1_dlg0[] = { /* 0x824dd18 * AWAIT_CUE(6), CALL_SCRIPT(LOOK_AROUND_FUNC), AWAIT_CUE(6), - { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 0), ALERT_CUE(5), AWAIT_CUE(6), HALT, @@ -542,7 +542,7 @@ static const struct ScriptCommand s_gs198_g6_s0_lives0_dlg0[] = { /* 0x824ded4 * CALL_SCRIPT(WAKEUP_FUNC), CALL_SCRIPT(LOOK_AROUND_RIGHT_FUNC), AWAIT_CUE(5), - { 0x93, 0x04, 0x000a, 0x00000022, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 34), PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000002), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Urrggh...{WAIT_PRESS}\nWe couldn't get through...")), @@ -571,7 +571,7 @@ static const struct ScriptCommand s_gs198_g6_s0_lives1_dlg0[] = { /* 0x824e0f8 * CALL_SCRIPT(LOOK_AROUND_FUNC), ALERT_CUE(5), AWAIT_CUE(6), - { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 0), ALERT_CUE(5), AWAIT_CUE(6), HALT, diff --git a/src/data/ground/ground_data_d10p02_station.h b/src/data/ground/ground_data_d10p02_station.h index d07fd12ec..c3b514966 100644 --- a/src/data/ground/ground_data_d10p02_station.h +++ b/src/data/ground/ground_data_d10p02_station.h @@ -173,7 +173,7 @@ static const struct ScriptCommand s_gs199_g1_s0_lives0_dlg0[] = { /* 0x824eea4 * VARIANT_DEFAULT(_(" Hmm...{WAIT_PRESS}\nThat didn't work out...")), TEXTBOX_CLEAR, ALERT_CUE(6), - ROTATE(4, 10, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_WEST), PORTRAIT_REP(0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" This is a tough place...")), @@ -201,7 +201,7 @@ static const struct ScriptCommand s_gs199_g1_s0_lives1_dlg0[] = { /* 0x824f190 * CALL_SCRIPT(LOOK_AROUND_FUNC), ALERT_CUE(5), AWAIT_CUE(6), - ROTATE(4, 2, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_EAST), AWAIT_CUE(6), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, RET, @@ -241,7 +241,7 @@ static const struct ScriptCommand s_gs199_g2_s0_lives0_dlg0[] = { /* 0x824f33c * VARIANT_DEFAULT(_(" Hmm...{WAIT_PRESS}\nWe didn't do well at all...")), TEXTBOX_CLEAR, ALERT_CUE(6), - ROTATE(4, 10, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_WEST), PORTRAIT_REP(0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" That {NAME_2}...\nHe's one tough customer.")), @@ -269,7 +269,7 @@ static const struct ScriptCommand s_gs199_g2_s0_lives1_dlg0[] = { /* 0x824f6ac * CALL_SCRIPT(LOOK_AROUND_FUNC), ALERT_CUE(5), AWAIT_CUE(6), - ROTATE(4, 2, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_EAST), AWAIT_CUE(6), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, RET, diff --git a/src/data/ground/ground_data_d10p03_station.h b/src/data/ground/ground_data_d10p03_station.h index 8565f34e4..e8f1c2360 100644 --- a/src/data/ground/ground_data_d10p03_station.h +++ b/src/data/ground/ground_data_d10p03_station.h @@ -233,7 +233,7 @@ static const struct ScriptCommand s_gs200_g1_s0_lives0_dlg0[] = { /* 0x824fcb4 * MSG_NPC(1, _(" Thank you.{WAIT_PRESS}\nYou saved us.")), TEXTBOX_CLEAR, ALERT_CUE(8), - ROTATE(4, 1, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTHEAST), WAIT(30), PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, 0x0003, 0x00000000), MSG_NPC(3, _(" ..................")), @@ -347,7 +347,7 @@ static const struct ScriptCommand s_gs200_g1_s0_lives1_dlg0[] = { /* 0x825174c * ALERT_CUE(5), AWAIT_CUE(6), SELECT_ANIMATION(2), - ROTATE(4, 2, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_NORTHWEST), ALERT_CUE(5), AWAIT_CUE(6), CALL_SCRIPT(JUMP_SURPRISE_FUNC), @@ -431,18 +431,18 @@ static const struct ScriptCommand s_gs200_g1_s1_lives0_dlg0[] = { /* 0x8251cac * SELECT_ANIMATION(23), WAIT(32), SELECT_ANIMATION(2), - ROTATE(8, 2, DIRECTION_NORTH), + ROTATE_TO(8, DIR_TRANS_SPINLEFT1, DIRECTION_NORTH), ALERT_CUE(5), AWAIT_CUE(8), - ROTATE(4, 1, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTH), AWAIT_CUE(8), - ROTATE(8, 1, DIRECTION_NORTH), + ROTATE_TO(8, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTH), ALERT_CUE(5), AWAIT_CUE(8), - ROTATE(4, 1, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTH), ALERT_CUE(5), AWAIT_CUE(8), - ROTATE(4, 2, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTHEAST), ALERT_CUE(5), AWAIT_CUE(8), HALT, diff --git a/src/data/ground/ground_data_d11p01_station.h b/src/data/ground/ground_data_d11p01_station.h index 7cc92d404..83a558943 100644 --- a/src/data/ground/ground_data_d11p01_station.h +++ b/src/data/ground/ground_data_d11p01_station.h @@ -261,20 +261,20 @@ static const struct ScriptCommand s_gs201_g1_s0_lives1_dlg0[] = { /* 0x825366c * { 0x56, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, ALERT_CUE(5), AWAIT_CUE(6), - ROTATE(4, 2, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_NORTHEAST), ALERT_CUE(5), AWAIT_CUE(6), - ROTATE(4, 1, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_EAST), CALL_SCRIPT(JUMP_ANGRY_FUNC), ALERT_CUE(5), AWAIT_CUE(6), FANFARE_PLAY2(469), CALL_SCRIPT(QUESTION_FUNC), AWAIT_CUE(6), - ROTATE(4, 2, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_NORTHEAST), ALERT_CUE(5), AWAIT_CUE(6), - ROTATE(4, 1, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_EAST), ALERT_CUE(5), AWAIT_CUE(6), HALT, @@ -317,7 +317,7 @@ static const struct ScriptCommand s_gs201_g2_s1_lives0_dlg0[] = { /* 0x8253910 * SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x8e, 0x01, 0x0000, 0x00000022, 0x00000000, NULL }, + CMD_UNK_8E(1, DIR_TRANS_NONE, 34), ASK3_VAR( TRUE, /*default*/ -1, /* speaker */ 1, PARTNER_TALK_KIND), VARIANT(/* == */ 1, _(" Hey, {NAME_0}.\nAre you all ready?")), VARIANT_DEFAULT(_(" Hi, {NAME_0}.\nAre you ready?")), @@ -402,7 +402,7 @@ static const struct ScriptCommand s_gs201_g2_s1_lives1_dlg0[] = { /* 0x8253f50 * SELECT_ANIMATION(2), { 0x53, 0x00, 0x0000, 0x00000400, 0x00000000, NULL }, { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0x8e, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, + CMD_UNK_8E(1, DIR_TRANS_NONE, 0), AWAIT_CUE(6), CJUMP_UNK_C8(0), COND_EQUAL(0, /* to label */ 0), @@ -480,7 +480,7 @@ static const struct ScriptCommand s_gs201_g3_s0_lives1_dlg0[] = { /* 0x8254430 * CALL_SCRIPT(LOOK_AROUND_FUNC), ALERT_CUE(5), AWAIT_CUE(6), - ROTATE(4, 2, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_EAST), ALERT_CUE(5), AWAIT_CUE(6), HALT, @@ -550,7 +550,7 @@ static const struct ScriptCommand s_gs201_g4_s0_lives1_dlg0[] = { /* 0x825492c * AWAIT_CUE(6), CALL_SCRIPT(LOOK_AROUND_FUNC), AWAIT_CUE(6), - { 0x93, 0x04, 0x0002, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_SPINLEFT1, 0), ALERT_CUE(5), AWAIT_CUE(6), HALT, @@ -612,7 +612,7 @@ static const struct ScriptCommand s_gs201_g5_s0_lives1_dlg0[] = { /* 0x8254d64 * CALL_SCRIPT(LOOK_AROUND_FUNC), ALERT_CUE(5), AWAIT_CUE(6), - { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 0), ALERT_CUE(5), AWAIT_CUE(6), HALT, @@ -649,7 +649,7 @@ static const struct ScriptCommand s_gs201_g6_s0_lives0_dlg0[] = { /* 0x8254f30 * ALERT_CUE(7), { 0x89, 0x40, 0x0080, 0x00000003, 0x00000000, NULL }, AWAIT_CUE(5), - ROTATE(4, 10, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHWEST), MSG_NPC(2, _(" You're going to {COLOR YELLOW_D}Mt. Freeze{RESET}?")), MSG_NPC(2, _(" Don't forget to take me,\nkekeh!")), TEXTBOX_CLEAR, @@ -667,7 +667,7 @@ static const struct ScriptCommand s_gs201_g6_s0_lives1_dlg0[] = { /* 0x825508c * { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, SELECT_ANIMATION(2), CAMERA_PAN(256, 1), - ROTATE(4, 10, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHEAST), ALERT_CUE(5), AWAIT_CUE(7), WAIT(15), diff --git a/src/data/ground/ground_data_d11p02_station.h b/src/data/ground/ground_data_d11p02_station.h index dbc4e6158..c2b419945 100644 --- a/src/data/ground/ground_data_d11p02_station.h +++ b/src/data/ground/ground_data_d11p02_station.h @@ -211,7 +211,7 @@ static const struct ScriptCommand s_gs202_g1_s0_lives1_dlg0[] = { /* 0x82561ac * CALL_SCRIPT(LOOK_AROUND_FUNC), ALERT_CUE(5), AWAIT_CUE(6), - { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 0), ALERT_CUE(5), AWAIT_CUE(6), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, diff --git a/src/data/ground/ground_data_d11p03_station.h b/src/data/ground/ground_data_d11p03_station.h index b7593e129..0aeb016d5 100644 --- a/src/data/ground/ground_data_d11p03_station.h +++ b/src/data/ground/ground_data_d11p03_station.h @@ -86,7 +86,7 @@ static const struct ScriptCommand s_gs203_g1_s0_lives0_dlg0[] = { /* 0x82566f8 * WAIT(30), ALERT_CUE(7), AWAIT_CUE(5), - ROTATE(4, 10, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHWEST), MSG_NPC(2, _(" Kekeh!\nLong time, Ninetales!")), MSG_NPC(2, _(" Recognize me?")), TEXTBOX_CLEAR, @@ -198,7 +198,7 @@ static const struct ScriptCommand s_gs203_g1_s0_lives0_dlg0[] = { /* 0x82566f8 * WAIT(20), ALERT_CUE(4), ALERT_CUE(7), - ROTATE(12, 10, DIRECTION_SOUTHWEST), + ROTATE_TO(12, DIR_TRANS_10, DIRECTION_SOUTHWEST), AWAIT_CUE(5), PORTRAIT_REP(0x0002, 0x00000000), MSG_NPC(2, _(" Hey!\nI kept you waiting!\nLet's get home! Kekeh!")), @@ -248,16 +248,16 @@ static const struct ScriptCommand s_gs203_g1_s0_lives1_dlg0[] = { /* 0x8257a0c * WAIT(20), ALERT_CUE(5), AWAIT_CUE(7), - ROTATE(4, 10, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHEAST), ALERT_CUE(5), AWAIT_CUE(7), CALL_SCRIPT(JUMP_ANGRY_FUNC), ALERT_CUE(5), AWAIT_CUE(7), - ROTATE(8, 10, DIRECTION_SOUTHEAST), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_SOUTHEAST), ALERT_CUE(5), AWAIT_CUE(7), - ROTATE(4, 10, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHEAST), ALERT_CUE(5), AWAIT_CUE(7), CALL_SCRIPT(JUMP_SURPRISE_FUNC), @@ -268,7 +268,7 @@ static const struct ScriptCommand s_gs203_g1_s0_lives1_dlg0[] = { /* 0x8257a0c * AWAIT_CUE(7), { 0x89, 0x28, 0x0100, 0x00000000, 0x00000000, NULL }, WAIT(45), - ROTATE(4, 10, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHEAST), ALERT_CUE(5), AWAIT_CUE(7), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, @@ -283,25 +283,25 @@ static const struct ScriptCommand s_gs203_g1_s1_lives0_dlg0[] = { /* 0x8257c8c * SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0003, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(8), - ROTATE(4, 10, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHWEST), ALERT_CUE(5), AWAIT_CUE(8), CALL_SCRIPT(SHOCK_FUNC), ALERT_CUE(5), AWAIT_CUE(8), - ROTATE(8, 10, DIRECTION_SOUTHEAST), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_SOUTHEAST), AWAIT_CUE(8), - ROTATE(8, 10, DIRECTION_SOUTHWEST), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_SOUTHWEST), ALERT_CUE(5), AWAIT_CUE(8), { 0x84, 0x00, 0x0100, -0x00000011, 0x00000020, NULL }, ALERT_CUE(5), AWAIT_CUE(8), { 0x84, 0x00, 0x0100, 0x00000011, -0x00000020, NULL }, - ROTATE(4, 10, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTH), ALERT_CUE(5), AWAIT_CUE(8), - ROTATE(4, 10, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHWEST), ALERT_CUE(5), AWAIT_CUE(8), HALT, @@ -353,7 +353,7 @@ static const struct ScriptCommand s_gs203_g2_s0_lives0_dlg0[] = { /* 0x8257ee8 * TEXTBOX_CLEAR, SELECT_ENTITIES(-1, 1), ALERT_CUE(6), - ROTATE(4, 1, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTH), FANFARE_PLAY2(465), CALL_SCRIPT(NOTICE_FUNC), AWAIT_CUE(5), @@ -476,12 +476,12 @@ static const struct ScriptCommand s_gs203_g2_s0_lives1_dlg0[] = { /* 0x8258a00 * CALL_SCRIPT(LOOK_AROUND_FUNC), ALERT_CUE(5), AWAIT_CUE(6), - ROTATE(4, 1, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTH), CALL_SCRIPT(NOTICE_FUNC), AWAIT_CUE(6), - ROTATE(4, 10, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHWEST), AWAIT_CUE(6), - ROTATE(4, 10, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTH), AWAIT_CUE(6), WAIT(3), { 0x62, 0x00, 0x0100, 0x00000000, -0x00000005, NULL }, @@ -496,7 +496,7 @@ static const struct ScriptCommand s_gs203_g2_s0_lives1_dlg0[] = { /* 0x8258a00 * { 0x62, 0x00, 0x0100, 0x00000004, 0x00000010, NULL }, { 0x62, 0x00, 0x0080, 0x00000004, 0x00000008, NULL }, SELECT_ANIMATION(2), - ROTATE(4, 10, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), AWAIT_CUE(6), CAMERA_PAN(76, 6), AWAIT_CUE(6), @@ -511,7 +511,7 @@ static const struct ScriptCommand s_gs203_g2_s0_lives2_dlg0[] = { /* 0x8258c30 * { 0x89, 0x68, 0x0100, 0x00000004, 0x00000000, NULL }, AWAIT_CUE(6), AWAIT_CUE(6), - ROTATE(4, 1, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTH), CALL_SCRIPT(NOTICE_FUNC), { 0x62, 0x00, 0x0080, 0x00000000, -0x00000028, NULL }, AWAIT_CUE(6), @@ -530,7 +530,7 @@ static const struct ScriptCommand s_gs203_g2_s0_lives2_dlg0[] = { /* 0x8258c30 * { 0x62, 0x00, 0x0100, 0x00000000, 0x00000018, NULL }, { 0x62, 0x00, 0x0080, 0x00000000, 0x00000010, NULL }, SELECT_ANIMATION(2), - ROTATE(4, 10, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), AWAIT_CUE(6), CAMERA_PAN(76, 12), AWAIT_CUE(6), @@ -584,10 +584,10 @@ static const struct ScriptCommand s_gs203_g2_s1_lives1_dlg0[] = { /* 0x8259080 * { 0x2d, 0x07, 0x0003, 0x00000000, 0x00000000, NULL }, { 0x89, 0x50, 0x0100, 0x00000004, 0x00000000, NULL }, AWAIT_CUE(8), - ROTATE(4, 1, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTHEAST), ALERT_CUE(5), AWAIT_CUE(8), - ROTATE(4, 2, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_NORTH), ALERT_CUE(5), AWAIT_CUE(8), { 0x89, 0x08, 0x0100, 0x00000004, 0x00000000, NULL }, @@ -603,7 +603,7 @@ static const struct ScriptCommand s_gs203_g2_s1_lives1_dlg0[] = { /* 0x8259080 * { 0x62, 0x00, 0x0100, -0x00000008, -0x00000010, NULL }, { 0x62, 0x00, 0x0080, -0x00000004, -0x00000008, NULL }, SELECT_ANIMATION(2), - ROTATE(4, 10, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHEAST), AWAIT_CUE(8), CAMERA_PAN(76, 8), AWAIT_CUE(8), @@ -629,7 +629,7 @@ static const struct ScriptCommand s_gs203_g2_s1_lives2_dlg0[] = { /* 0x8259250 * { 0x62, 0x00, 0x0100, 0x00000008, -0x00000010, NULL }, { 0x62, 0x00, 0x0080, -0x00000004, -0x00000008, NULL }, SELECT_ANIMATION(2), - ROTATE(4, 10, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHWEST), AWAIT_CUE(8), CAMERA_PAN(76, 10), AWAIT_CUE(8), @@ -698,7 +698,7 @@ static const struct ScriptCommand s_gs203_g3_s0_lives0_dlg0[] = { /* 0x8259658 * ALERT_CUE(8), ALERT_CUE(9), ALERT_CUE(12), - ROTATE(4, 1, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTHEAST), FANFARE_PLAY2(455), CALL_SCRIPT(JUMP_SURPRISE_FUNC), PORTRAIT(PLACEMENT_TOP_LEFT, 0x0003, 0x00000041), @@ -776,7 +776,7 @@ static const struct ScriptCommand s_gs203_g3_s0_lives0_dlg0[] = { /* 0x8259658 * TEXTBOX_CLEAR, WAIT(10), ALERT_CUE(6), - ROTATE(4, 1, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_EAST), PORTRAIT_REP(0x0001, 0x00000008), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" ............{WAIT_PRESS}\nWhat's wrong with me?{WAIT_PRESS}\nI'm too tensed up to move...")), @@ -809,15 +809,15 @@ static const struct ScriptCommand s_gs203_g3_s0_lives0_dlg0[] = { /* 0x8259658 * TEXTBOX_CLEAR, ALERT_CUE(6), WAIT(15), - ROTATE(4, 2, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_NORTH), WAIT(20), - ROTATE(8, 2, DIRECTION_SOUTH), + ROTATE_TO(8, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTH), WAIT(20), - ROTATE(8, 1, DIRECTION_NORTH), + ROTATE_TO(8, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTH), WAIT(20), - ROTATE(8, 2, DIRECTION_WEST), + ROTATE_TO(8, DIR_TRANS_SPINLEFT1, DIRECTION_WEST), WAIT(20), - ROTATE(8, 2, DIRECTION_EAST), + ROTATE_TO(8, DIR_TRANS_SPINLEFT1, DIRECTION_EAST), AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x0000000a), MSG_VAR(2, PARTNER_TALK_KIND, 1), @@ -846,7 +846,7 @@ static const struct ScriptCommand s_gs203_g3_s0_lives0_dlg0[] = { /* 0x8259658 * VARIANT_DEFAULT(_(" You were wrong to hound\nand harass {NAME_0}!")), TEXTBOX_CLEAR, WAIT(10), - ROTATE(4, 2, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_NORTH), ALERT_CUE(7), ALERT_CUE(8), ALERT_CUE(9), @@ -878,7 +878,7 @@ static const struct ScriptCommand s_gs203_g3_s0_lives0_dlg0[] = { /* 0x8259658 * WAIT(10), ALERT_CUE(6), AWAIT_CUE(5), - ROTATE(4, 1, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_EAST), PORTRAIT_REP(0x0001, 0x00000001), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Hahaha! Isn't this great?\nI was convinced I was right!")), @@ -914,11 +914,11 @@ static const struct ScriptCommand s_gs203_g3_s0_lives0_dlg0[] = { /* 0x8259658 * ALERT_CUE(10), ALERT_CUE(12), WAIT(10), - ROTATE(4, 10, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_WEST), WAIT(15), - ROTATE(6, 1, DIRECTION_NORTHEAST), + ROTATE_TO(6, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTHEAST), WAIT(20), - ROTATE(4, 2, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_NORTHWEST), PORTRAIT_REP(0x0001, 0x0000000c), MSG_NPC(1, _(" Waah! The ground's heaving!")), TEXTBOX_CLEAR, @@ -940,7 +940,7 @@ static const struct ScriptCommand s_gs203_g3_s0_lives0_dlg0[] = { /* 0x8259658 * ALERT_CUE(8), ALERT_CUE(9), ALERT_CUE(12), - ROTATE(4, 10, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), WAIT(5), PORTRAIT_REP(0x0002, 0x00000000), MSG_NPC(2, _(" What?!\nGroudon is rising?!")), @@ -951,7 +951,7 @@ static const struct ScriptCommand s_gs203_g3_s0_lives0_dlg0[] = { /* 0x8259658 * TEXTBOX_CLEAR, WAIT(10), ALERT_CUE(6), - ROTATE(4, 2, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_NORTH), AWAIT_CUE(5), PORTRAIT_REP(0x0002, 0x00000004), MSG_NPC(1, _(" What is that?{WAIT_PRESS}\nWhat's a Groudon?")), @@ -1045,7 +1045,7 @@ static const struct ScriptCommand s_gs203_g3_s0_lives1_dlg0[] = { /* 0x825bcb4 * SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(6), - ROTATE(4, 2, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_NORTHWEST), CALL_SCRIPT(JUMP_SURPRISE_FUNC), AWAIT_CUE(6), CALL_SCRIPT(NOTICE_FUNC), @@ -1059,11 +1059,11 @@ static const struct ScriptCommand s_gs203_g3_s0_lives1_dlg0[] = { /* 0x825bcb4 * { 0x89, 0x10, 0x0080, 0x00000006, 0x00000000, NULL }, AWAIT_CUE(6), AWAIT_CUE(6), - ROTATE(4, 2, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTH), { 0x54, 0x00, 0x002e, 0x00000000, 0x00000000, NULL }, STOP_ANIMATION_ON_CURRENT_FRAME, SELECT_ANIMATION(2), - ROTATE(4, 1, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_WEST), AWAIT_CUE(6), AWAIT_CUE(6), CALL_SCRIPT(JUMP_HAPPY_FUNC), @@ -1116,28 +1116,28 @@ static const struct ScriptCommand s_gs203_g3_s0_lives1_dlg0[] = { /* 0x825bcb4 * SELECT_ANIMATION(2), ALERT_CUE(5), AWAIT_CUE(6), - ROTATE(4, 1, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTH), CALL_SCRIPT(ANGRY_START_FUNC), ALERT_CUE(5), AWAIT_CUE(6), CALL_SCRIPT(ANGRY_END_FUNC), ALERT_CUE(5), AWAIT_CUE(6), - ROTATE(4, 2, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_WEST), ALERT_CUE(5), AWAIT_CUE(6), CALL_SCRIPT(NOTICE_FUNC), ALERT_CUE(5), AWAIT_CUE(6), - ROTATE(4, 10, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTH), WAIT(20), - ROTATE(4, 1, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTH), WAIT(18), - ROTATE(4, 2, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_WEST), AWAIT_CUE(6), - ROTATE(4, 10, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), AWAIT_CUE(6), - ROTATE(4, 10, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), ALERT_CUE(5), AWAIT_CUE(6), HALT, @@ -1152,27 +1152,27 @@ static const struct ScriptCommand s_gs203_g3_s0_lives2_dlg0[] = { /* 0x825c2f4 * { 0x62, 0x00, 0x0200, 0x00000008, -0x00000008, NULL }, CALL_SCRIPT(SHOCK_FUNC), AWAIT_CUE(7), - ROTATE(4, 1, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTHWEST), CALL_SCRIPT(JUMP_SURPRISE_FUNC), ALERT_CUE(5), AWAIT_CUE(7), { 0x62, 0x00, 0x004c, -0x00000008, 0x00000008, NULL }, ALERT_CUE(5), AWAIT_CUE(7), - ROTATE(4, 2, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTH), AWAIT_CUE(7), WAIT(3), - ROTATE(6, 10, DIRECTION_WEST), + ROTATE_TO(6, DIR_TRANS_10, DIRECTION_WEST), WAIT(12), - ROTATE(4, 2, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTH), WAIT(15), - ROTATE(6, 1, DIRECTION_NORTHWEST), + ROTATE_TO(6, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTHWEST), WAIT(5), - ROTATE(6, 2, DIRECTION_WEST), + ROTATE_TO(6, DIR_TRANS_SPINLEFT1, DIRECTION_WEST), AWAIT_CUE(7), - ROTATE(4, 10, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTH), AWAIT_CUE(7), - ROTATE(4, 10, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTH), ALERT_CUE(5), AWAIT_CUE(7), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, @@ -1185,19 +1185,19 @@ static const struct ScriptCommand s_gs203_g3_s0_lives3_dlg0[] = { /* 0x825c514 * SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0003, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(8), - ROTATE(4, 2, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTHEAST), CALL_SCRIPT(JUMP_SURPRISE_FUNC), AWAIT_CUE(8), - ROTATE(4, 1, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTH), AWAIT_CUE(8), WAIT(6), - ROTATE(8, 10, DIRECTION_NORTHEAST), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_NORTHEAST), WAIT(12), - ROTATE(4, 1, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_WEST), WAIT(10), - ROTATE(7, 2, DIRECTION_SOUTHWEST), + ROTATE_TO(7, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTHWEST), AWAIT_CUE(8), - ROTATE(4, 10, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTH), AWAIT_CUE(8), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, { 0x89, 0x50, 0x0100, 0x00000000, 0x00000000, NULL }, @@ -1209,18 +1209,18 @@ static const struct ScriptCommand s_gs203_g3_s0_lives4_dlg0[] = { /* 0x825c664 * SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0004, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(9), - ROTATE(4, 1, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTHWEST), CALL_SCRIPT(JUMP_SURPRISE_FUNC), AWAIT_CUE(9), - ROTATE(4, 2, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTH), AWAIT_CUE(9), - ROTATE(8, 10, DIRECTION_EAST), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_EAST), WAIT(7), - ROTATE(6, 2, DIRECTION_NORTH), + ROTATE_TO(6, DIR_TRANS_SPINLEFT1, DIRECTION_NORTH), WAIT(10), - ROTATE(4, 1, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_EAST), AWAIT_CUE(9), - ROTATE(4, 10, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTH), AWAIT_CUE(9), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, { 0x89, 0x50, 0x0100, 0x00000000, 0x00000000, NULL }, @@ -1231,12 +1231,12 @@ static const struct ScriptCommand s_gs203_g3_s0_lives5_dlg0[] = { /* 0x825c7a4 * DEBUGINFO_O(1231), SELECT_ANIMATION(2), AWAIT_CUE(12), - ROTATE(4, 10, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), CALL_SCRIPT(JUMP_SURPRISE_FUNC), AWAIT_CUE(12), CALL_SCRIPT(LOOK_AROUND_FUNC), AWAIT_CUE(12), - ROTATE(4, 10, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), AWAIT_CUE(12), HALT, }; @@ -1254,31 +1254,31 @@ static const struct ScriptCommand s_gs203_g3_s1_lives0_dlg0[] = { /* 0x825c854 * SELECT_ANIMATION(23), AWAIT_CUE(10), SELECT_ANIMATION(2), - ROTATE(4, 1, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTHEAST), ALERT_CUE(5), AWAIT_CUE(10), - ROTATE(4, 1, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTHWEST), ALERT_CUE(5), AWAIT_CUE(10), - ROTATE(4, 1, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTHEAST), ALERT_CUE(5), AWAIT_CUE(10), - ROTATE(4, 1, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTHWEST), ALERT_CUE(5), AWAIT_CUE(10), - ROTATE(4, 2, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTHEAST), ALERT_CUE(5), AWAIT_CUE(10), - ROTATE(4, 2, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_NORTHEAST), ALERT_CUE(5), AWAIT_CUE(10), - ROTATE(4, 1, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTH), AWAIT_CUE(10), - ROTATE(4, 10, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_EAST), WAIT(10), - ROTATE(6, 1, DIRECTION_WEST), + ROTATE_TO(6, DIR_TRANS_SPINRIGHT1, DIRECTION_WEST), WAIT(10), - ROTATE(4, 2, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTH), AWAIT_CUE(10), HALT, }; diff --git a/src/data/ground/ground_data_d12p01_station.h b/src/data/ground/ground_data_d12p01_station.h index ac63f066b..d7ce91846 100644 --- a/src/data/ground/ground_data_d12p01_station.h +++ b/src/data/ground/ground_data_d12p01_station.h @@ -119,7 +119,7 @@ static const struct ScriptCommand s_gs204_g1_s0_lives0_dlg0[] = { /* 0x825d228 * TEXTBOX_CLEAR, ALERT_CUE(6), WAIT(5), - { 0x93, 0x04, 0x000b, 0x00000022, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_11, 34), WAIT(15), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Other rescue teams should\nalready be inside.")), @@ -146,7 +146,7 @@ static const struct ScriptCommand s_gs204_g1_s0_lives1_dlg0[] = { /* 0x825d6dc * WALK_GRID(256, 1), CALL_SCRIPT(LOOK_AROUND_FUNC), AWAIT_CUE(6), - { 0x93, 0x04, 0x000b, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_11, 0), AWAIT_CUE(6), WALK_GRID(256, 2), HALT, @@ -172,7 +172,7 @@ static const struct ScriptCommand s_gs204_g2_s0_lives0_dlg0[] = { /* 0x825d818 * { 0x2d, 0x09, 0x0002, 0x00000058, 0x00000000, NULL }, ALERT_CUE(6), WALK_GRID(256, 0), - { 0x93, 0x04, 0x000b, 0x00000022, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_11, 34), WAIT(15), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" This time, we'll rescue\n{NAME_2}'s team!\nLet's get it done!")), @@ -193,7 +193,7 @@ static const struct ScriptCommand s_gs204_g2_s0_lives1_dlg0[] = { /* 0x825d9bc * { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(6), WALK_GRID(256, 1), - { 0x93, 0x04, 0x000b, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_11, 0), AWAIT_CUE(6), WALK_GRID(256, 2), HALT, diff --git a/src/data/ground/ground_data_d12p04_station.h b/src/data/ground/ground_data_d12p04_station.h index 023039c0c..57150e146 100644 --- a/src/data/ground/ground_data_d12p04_station.h +++ b/src/data/ground/ground_data_d12p04_station.h @@ -83,7 +83,7 @@ static const struct ScriptCommand s_gs206_g1_s0_lives0_dlg0[] = { /* 0x825eb18 * FANFARE_PLAY2(465), ALERT_CUE(6), AWAIT_CUE(5), - ROTATE(4, 10, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHWEST), PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x0000000c), MSG_NPC(1, _(" Look! It's {NAME_3}!{WAIT_PRESS}\n{NAME_4} and {NAME_5} too!")), TEXTBOX_CLEAR, @@ -159,14 +159,14 @@ static const struct ScriptCommand s_gs206_g1_s0_lives1_dlg0[] = { /* 0x825f2ec * { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(6), CALL_SCRIPT(NOTICE_FUNC), - ROTATE(4, 10, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHEAST), ALERT_CUE(5), AWAIT_CUE(6), WALK_RELATIVE(128, 0, -8), - ROTATE(4, 10, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHEAST), ALERT_CUE(5), AWAIT_CUE(6), - ROTATE(10, 10, DIRECTION_NORTH), + ROTATE_TO(10, DIR_TRANS_10, DIRECTION_NORTH), ALERT_CUE(5), AWAIT_CUE(6), CALL_SCRIPT(JUMP_SURPRISE_FUNC), @@ -260,16 +260,16 @@ static const struct ScriptCommand s_gs206_g1_s1_lives0_dlg0[] = { /* 0x825f71c * WAIT(30), SELECT_ANIMATION(2), WAIT(30), - ROTATE(10, 2, DIRECTION_EAST), + ROTATE_TO(10, DIR_TRANS_SPINLEFT1, DIRECTION_EAST), WAIT(20), - ROTATE(10, 1, DIRECTION_SOUTHWEST), + ROTATE_TO(10, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTHWEST), WAIT(10), - ROTATE(10, 2, DIRECTION_SOUTHEAST), + ROTATE_TO(10, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTHEAST), AWAIT_CUE(8), WAIT(5), - ROTATE(4, 10, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), AWAIT_CUE(8), - ROTATE(4, 10, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHWEST), ALERT_CUE(5), AWAIT_CUE(8), { 0x89, 0x78, 0x0100, 0x00000000, 0x00000000, NULL }, @@ -296,14 +296,14 @@ static const struct ScriptCommand s_gs206_g1_s1_lives1_dlg0[] = { /* 0x825f91c * WAIT(25), SELECT_ANIMATION(2), WAIT(45), - ROTATE(10, 2, DIRECTION_SOUTHEAST), + ROTATE_TO(10, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTHEAST), WAIT(20), - ROTATE(10, 1, DIRECTION_SOUTHWEST), + ROTATE_TO(10, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTHWEST), AWAIT_CUE(9), - ROTATE(4, 10, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_EAST), AWAIT_CUE(9), WAIT(10), - ROTATE(4, 10, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHEAST), AWAIT_CUE(9), CALL_SCRIPT(NOTICE_FUNC), AWAIT_CUE(9), @@ -338,18 +338,18 @@ static const struct ScriptCommand s_gs206_g1_s1_lives2_dlg0[] = { /* 0x825fb1c * WAIT(40), SELECT_ANIMATION(2), WAIT(40), - ROTATE(10, 1, DIRECTION_WEST), + ROTATE_TO(10, DIR_TRANS_SPINRIGHT1, DIRECTION_WEST), WAIT(10), - ROTATE(10, 2, DIRECTION_SOUTHEAST), + ROTATE_TO(10, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTHEAST), WAIT(5), - ROTATE(10, 1, DIRECTION_WEST), + ROTATE_TO(10, DIR_TRANS_SPINRIGHT1, DIRECTION_WEST), ALERT_CUE(5), AWAIT_CUE(10), WAIT(10), - ROTATE(4, 10, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_WEST), AWAIT_CUE(10), WAIT(5), - ROTATE(4, 10, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHWEST), AWAIT_CUE(10), CALL_SCRIPT(SHOCK_FUNC), AWAIT_CUE(10), diff --git a/src/data/ground/ground_data_d13p01_station.h b/src/data/ground/ground_data_d13p01_station.h index 0237097a4..2a911ef68 100644 --- a/src/data/ground/ground_data_d13p01_station.h +++ b/src/data/ground/ground_data_d13p01_station.h @@ -66,20 +66,20 @@ static const struct ScriptCommand s_gs207_g1_s0_lives0_dlg0[] = { /* 0x826008c * PORTRAIT_REP(0x0001, 0x0000000c), MSG_NPC(1, _(" Wah!\n{NAME_0}, this is cool!{WAIT_PRESS}\nWe're on clouds!")), TEXTBOX_CLEAR, - ROTATE(4, 10, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_WEST), ALERT_CUE(7), ALERT_CUE(6), AWAIT_CUE(5), - ROTATE(4, 10, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHWEST), AWAIT_CUE(5), MSG_NPC(1, _(" Oh, wow!")), TEXTBOX_CLEAR, ALERT_CUE(6), - ROTATE(4, 10, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_WEST), AWAIT_CUE(5), MSG_NPC(1, _(" {NAME_0}, look up there!")), TEXTBOX_CLEAR, - ROTATE(4, 10, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), ALERT_CUE(7), WAIT(30), ALERT_CUE(3), @@ -124,7 +124,7 @@ static const struct ScriptCommand s_gs207_g1_s0_lives1_dlg0[] = { /* 0x8260458 * FANFARE_PLAY2(457), CALL_SCRIPT(JUMP_ANGRY_FUNC), WAIT(30), - ROTATE(4, 10, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), WAIT(15), FANFARE_PLAY2(458), CALL_SCRIPT(JUMP_SURPRISE_FUNC), @@ -152,12 +152,12 @@ static const struct ScriptCommand s_gs207_g1_s0_lives2_dlg0[] = { /* 0x8260738 * AWAIT_CUE(6), WAIT(10), SELECT_ANIMATION(2), - ROTATE(4, 10, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), CALL_SCRIPT(LOOK_AROUND_FUNC), AWAIT_CUE(7), - ROTATE(4, 10, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHWEST), AWAIT_CUE(7), - ROTATE(4, 10, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), AWAIT_CUE(7), HALT, }; @@ -189,7 +189,7 @@ static const struct ScriptCommand s_gs207_g2_s0_lives0_dlg0[] = { /* 0x8260934 * VARIANT_DEFAULT(_(" That's where {NAME_2}\nis...")), TEXTBOX_CLEAR, ALERT_CUE(6), - ROTATE(4, 10, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_WEST), WAIT(10), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" {NAME_0}!\nLet's give it our best!")), @@ -209,7 +209,7 @@ static const struct ScriptCommand s_gs207_g2_s0_lives1_dlg0[] = { /* 0x8260b8c * SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(6), - { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 0), AWAIT_CUE(6), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, WAIT(10), @@ -270,7 +270,7 @@ static const struct ScriptCommand s_gs207_g3_s0_lives0_dlg0[] = { /* 0x8260d38 * WAIT(10), ALERT_CUE(6), ALERT_CUE(7), - ROTATE(4, 10, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_WEST), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Let's storm our way to\nthe top floor!")), VARIANT_DEFAULT(_(" Let's head for the top!\nThis is it!")), @@ -301,9 +301,9 @@ static const struct ScriptCommand s_gs207_g3_s0_lives1_dlg0[] = { /* 0x826104c * { 0x70, 0x00, 0x0200, 0x00000000, 0x00000000, NULL }, SELECT_ANIMATION(2), AWAIT_CUE(6), - ROTATE(4, 10, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), AWAIT_CUE(6), - { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 0), AWAIT_CUE(6), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, WAIT(10), @@ -327,7 +327,7 @@ static const struct ScriptCommand s_gs207_g3_s0_lives2_dlg0[] = { /* 0x82611dc * { 0x70, 0x00, 0x0200, 0x00000000, 0x00000000, NULL }, SELECT_ANIMATION(2), AWAIT_CUE(7), - ROTATE(4, 10, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), AWAIT_CUE(7), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, WALK_GRID(179, 0), diff --git a/src/data/ground/ground_data_d13p03_station.h b/src/data/ground/ground_data_d13p03_station.h index 12ded32f4..90a173db4 100644 --- a/src/data/ground/ground_data_d13p03_station.h +++ b/src/data/ground/ground_data_d13p03_station.h @@ -109,7 +109,7 @@ static const struct ScriptCommand s_gs209_g1_s0_lives0_dlg0[] = { /* 0x826223c * ALERT_CUE(6), ALERT_CUE(7), ALERT_CUE(10), - ROTATE(4, 10, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), WAIT(20), ALERT_CUE(4), ALERT_CUE(3), @@ -132,7 +132,7 @@ static const struct ScriptCommand s_gs209_g1_s0_lives1_dlg0[] = { /* 0x826282c * CALL_SCRIPT(NOTICE_FUNC), ALERT_CUE(5), AWAIT_CUE(6), - ROTATE(4, 10, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), AWAIT_CUE(6), HALT, }; @@ -145,7 +145,7 @@ static const struct ScriptCommand s_gs209_g1_s0_lives2_dlg0[] = { /* 0x826290c * AWAIT_CUE(10), CALL_SCRIPT(JUMP_SURPRISE_FUNC), AWAIT_CUE(10), - ROTATE(4, 10, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), AWAIT_CUE(10), HALT, }; @@ -158,7 +158,7 @@ static const struct ScriptCommand s_gs209_g1_s0_lives3_dlg0[] = { /* 0x82629ac * AWAIT_CUE(10), CALL_SCRIPT(JUMP_SURPRISE_FUNC), AWAIT_CUE(10), - ROTATE(4, 10, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), AWAIT_CUE(10), HALT, }; diff --git a/src/data/ground/ground_data_d20p01_station.h b/src/data/ground/ground_data_d20p01_station.h index 84a0a6e0e..64985d734 100644 --- a/src/data/ground/ground_data_d20p01_station.h +++ b/src/data/ground/ground_data_d20p01_station.h @@ -51,7 +51,7 @@ static const struct ScriptCommand s_gs216_g1_s0_lives0_dlg0[] = { /* 0x8267cc8 * { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), WALK_GRID(256, 0), - { 0x93, 0x04, 0x0001, 0x00000068, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_SPINRIGHT1, 104), WAIT(30), { 0x56, 0x00, 0x0000, 0x0000005a, 0x00000000, NULL }, PORTRAIT(PLACEMENT_TOP_LEFT, 0x0000, 0x00000000), @@ -60,7 +60,7 @@ static const struct ScriptCommand s_gs216_g1_s0_lives0_dlg0[] = { /* 0x8267cc8 * { 0x56, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, ALERT_CUE(6), AWAIT_CUE(5), - { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 104), WAIT(30), PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000003), MSG_NPC(1, _(" Gasp, gasp...{WAIT_PRESS}\nThis is rough going...")), @@ -118,7 +118,7 @@ static const struct ScriptCommand s_gs216_g1_s0_lives0_dlg0[] = { /* 0x8267cc8 * FANFARE_PLAY2(465), CALL_SCRIPT(NOTICE_FUNC), WAIT(60), - { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 104), WAIT(30), MSG_NPC(0, _(" Hm?{WAIT_PRESS} What's wrong?{WAIT_PRESS}\nAre you still wiped out?")), TEXTBOX_CLEAR, @@ -129,13 +129,13 @@ static const struct ScriptCommand s_gs216_g1_s0_lives0_dlg0[] = { /* 0x8267cc8 * MSG_NPC(1, _(" I thought I heard a voice...")), TEXTBOX_CLEAR, WAIT(10), - { 0x92, 0x04, 0x0001, 0x00000003, 0x00000000, NULL }, + CMD_UNK_92(4, 1, DIR_TRANS_SPINRIGHT2), WAIT(15), - { 0x92, 0x04, 0x0002, 0x00000005, 0x00000000, NULL }, + CMD_UNK_92(4, 2, DIR_TRANS_FLIP), WAIT(15), - { 0x92, 0x04, 0x0001, 0x00000003, 0x00000000, NULL }, + CMD_UNK_92(4, 1, DIR_TRANS_SPINRIGHT2), WAIT(30), - { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 104), MSG_NPC(0, _(" ...No?{WAIT_PRESS}\nI don't hear anything.")), TEXTBOX_CLEAR, WAIT(10), @@ -146,13 +146,13 @@ static const struct ScriptCommand s_gs216_g1_s0_lives0_dlg0[] = { /* 0x8267cc8 * TEXTBOX_CLEAR, WAIT(10), ALERT_CUE(6), - { 0x92, 0x04, 0x0001, 0x00000003, 0x00000000, NULL }, + CMD_UNK_92(4, 1, DIR_TRANS_SPINRIGHT2), WAIT(15), - { 0x92, 0x04, 0x0002, 0x00000005, 0x00000000, NULL }, + CMD_UNK_92(4, 2, DIR_TRANS_FLIP), WAIT(15), - { 0x92, 0x04, 0x0002, 0x00000004, 0x00000000, NULL }, + CMD_UNK_92(4, 2, DIR_TRANS_SPINLEFT2), WAIT(15), - { 0x92, 0x04, 0x0002, 0x00000005, 0x00000000, NULL }, + CMD_UNK_92(4, 2, DIR_TRANS_FLIP), WAIT(30), TEXTBOX_AUTO_PRESS(-1, -1), MSG_NPC(0, _(" Wh-who's there?!")), @@ -237,14 +237,14 @@ static const struct ScriptCommand s_gs216_g1_s0_lives1_dlg0[] = { /* 0x8268c90 * { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(6), WALK_GRID(76, 1), - { 0x93, 0x04, 0x000a, 0x00000059, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 89), ALERT_CUE(5), AWAIT_CUE(6), - ROTATE(8, 10, DIRECTION_NORTHEAST), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_NORTHEAST), WAIT(30), - ROTATE(8, 10, DIRECTION_SOUTHEAST), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_SOUTHEAST), WAIT(30), - { 0x93, 0x08, 0x000a, 0x00000059, 0x00000000, NULL }, + CMD_UNK_93(8, DIR_TRANS_10, 89), ALERT_CUE(5), AWAIT_CUE(6), { 0x56, 0x00, 0x0000, 0x0000005e, 0x00000000, NULL }, @@ -255,7 +255,7 @@ static const struct ScriptCommand s_gs216_g1_s0_lives1_dlg0[] = { /* 0x8268c90 * SELECT_ANIMATION(9), WAIT(120), SELECT_ANIMATION(2), - ROTATE(4, 10, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), WAIT(15), SELECT_ANIMATION(18), { 0x56, 0x00, 0x0000, 0x00000054, 0x00000000, NULL }, @@ -266,7 +266,7 @@ static const struct ScriptCommand s_gs216_g1_s0_lives1_dlg0[] = { /* 0x8268c90 * ALERT_CUE(7), AWAIT_CUE(6), SELECT_ANIMATION(2), - ROTATE(4, 10, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHEAST), WAIT(15), SELECT_ANIMATION(18), { 0x56, 0x00, 0x0000, 0x00000054, 0x00000000, NULL }, @@ -277,7 +277,7 @@ static const struct ScriptCommand s_gs216_g1_s0_lives1_dlg0[] = { /* 0x8268c90 * ALERT_CUE(7), AWAIT_CUE(6), SELECT_ANIMATION(2), - ROTATE(4, 10, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHWEST), WAIT(15), SELECT_ANIMATION(18), { 0x56, 0x00, 0x0000, 0x00000054, 0x00000000, NULL }, @@ -288,18 +288,18 @@ static const struct ScriptCommand s_gs216_g1_s0_lives1_dlg0[] = { /* 0x8268c90 * ALERT_CUE(7), AWAIT_CUE(6), SELECT_ANIMATION(2), - { 0x93, 0x08, 0x000a, 0x00000059, 0x00000000, NULL }, + CMD_UNK_93(8, DIR_TRANS_10, 89), ALERT_CUE(5), AWAIT_CUE(6), - ROTATE(4, 10, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), AWAIT_CUE(6), - { 0x92, 0x04, 0x0002, 0x00000005, 0x00000000, NULL }, + CMD_UNK_92(4, 2, DIR_TRANS_FLIP), WAIT(15), - { 0x92, 0x04, 0x0002, 0x00000004, 0x00000000, NULL }, + CMD_UNK_92(4, 2, DIR_TRANS_SPINLEFT2), WAIT(15), - { 0x92, 0x04, 0x0002, 0x00000005, 0x00000000, NULL }, + CMD_UNK_92(4, 2, DIR_TRANS_FLIP), WAIT(15), - { 0x92, 0x04, 0x0001, 0x00000003, 0x00000000, NULL }, + CMD_UNK_92(4, 1, DIR_TRANS_SPINRIGHT2), AWAIT_CUE(6), FANFARE_PLAY2(786), { 0xe2, 0x00, 0x0312, 0x00000000, 0x00000000, NULL }, diff --git a/src/data/ground/ground_data_d22p01_station.h b/src/data/ground/ground_data_d22p01_station.h index c9a745f9b..8574fac0e 100644 --- a/src/data/ground/ground_data_d22p01_station.h +++ b/src/data/ground/ground_data_d22p01_station.h @@ -105,7 +105,7 @@ static const struct ScriptCommand s_gs218_g1_s0_lives0_dlg0[] = { /* 0x826a108 * WALK_RELATIVE(256, 8, 0), WALK_GRID(256, 0), ALERT_CUE(7), - ROTATE(4, 2, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_WEST), WAIT(30), BGM_FADEOUT(90), FANFARE_PLAY2(500), @@ -126,7 +126,7 @@ static const struct ScriptCommand s_gs218_g1_s0_lives1_dlg0[] = { /* 0x826a408 * SELECT_ANIMATION(4), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(7), - ROTATE(4, 2, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_EAST), WAIT(30), SELECT_ANIMATION(22), STOP_ANIMATION_ON_CURRENT_FRAME, diff --git a/src/data/ground/ground_data_d23p01_station.h b/src/data/ground/ground_data_d23p01_station.h index 7e48ccacd..dcb144a71 100644 --- a/src/data/ground/ground_data_d23p01_station.h +++ b/src/data/ground/ground_data_d23p01_station.h @@ -50,7 +50,7 @@ static const struct ScriptCommand s_gs219_g1_s0_lives0_dlg0[] = { /* 0x826a6b8 * ALERT_CUE(3), WAIT(1), WALK_GRID(204, 1), - ROTATE(4, 10, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHEAST), HALT, }; @@ -63,7 +63,7 @@ static const struct ScriptCommand s_gs219_g1_s0_lives1_dlg0[] = { /* 0x826a84c * WALK_GRID(256, 2), AWAIT_CUE(6), WALK_GRID(204, 3), - ROTATE(4, 10, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHWEST), HALT, }; diff --git a/src/data/ground/ground_data_d24p01_station.h b/src/data/ground/ground_data_d24p01_station.h index 6e45c299a..60fdbc406 100644 --- a/src/data/ground/ground_data_d24p01_station.h +++ b/src/data/ground/ground_data_d24p01_station.h @@ -117,14 +117,14 @@ static const struct ScriptCommand s_gs220_g1_s0_lives0_dlg0[] = { /* 0x826abb0 * TEXTBOX_CLEAR, WAIT(10), FANFARE_PLAY2(468), - ROTATE(4, 10, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHEAST), WAIT(5), - ROTATE(4, 10, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHWEST), WAIT(5), FANFARE_PLAY2(468), - ROTATE(4, 10, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHEAST), WAIT(5), - ROTATE(4, 10, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), WAIT(30), ALERT_CUE(7), AWAIT_CUE(5), @@ -142,12 +142,12 @@ static const struct ScriptCommand s_gs220_g1_s0_lives0_dlg0[] = { /* 0x826abb0 * TEXTBOX_CLEAR, FANFARE_PLAY2(469), ALERT_CUE(7), - ROTATE(8, 1, DIRECTION_EAST), + ROTATE_TO(8, DIR_TRANS_SPINRIGHT1, DIRECTION_EAST), WAIT(10), FANFARE_PLAY2(469), - ROTATE(8, 2, DIRECTION_WEST), + ROTATE_TO(8, DIR_TRANS_SPINLEFT1, DIRECTION_WEST), WAIT(10), - ROTATE(8, 1, DIRECTION_NORTH), + ROTATE_TO(8, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTH), MSG_NPC(2, _(" What? What?!\nWhere is that voice coming from?")), MSG_NPC(2, _(" Who are you?")), TEXTBOX_CLEAR, @@ -194,14 +194,14 @@ static const struct ScriptCommand s_gs220_g1_s0_lives0_dlg0[] = { /* 0x826abb0 * MSG_NPC(2, _(" Gegeh?! What the...?!{WAIT_PRESS}\nI can't move!")), TEXTBOX_CLEAR, WAIT(10), - ROTATE(4, 10, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHEAST), { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}{NAME_2}, you will not\n{CENTER_ALIGN}be doing the answering...") }, { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}{NAME_0}.") }, TEXTBOX_CLEAR, WAIT(10), FANFARE_PLAY2(465), CALL_SCRIPT(NOTICE_FUNC), - ROTATE(4, 10, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), WAIT(30), { 0x33, 0x00, -0x0001, 0x00000000, 0x00000000, _("{CENTER_ALIGN}{NAME_0}.\n{CENTER_ALIGN}You will answer.") }, TEXTBOX_CLEAR, @@ -274,10 +274,10 @@ static const struct ScriptCommand s_gs220_g1_s0_lives1_dlg0[] = { /* 0x826be2c * CALL_SCRIPT(LOOK_AROUND_FUNC), ALERT_CUE(5), AWAIT_CUE(7), - ROTATE(4, 10, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHWEST), ALERT_CUE(5), AWAIT_CUE(7), - ROTATE(4, 10, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), ALERT_CUE(5), AWAIT_CUE(7), CALL_SCRIPT(LOOK_AROUND_FUNC), @@ -346,7 +346,7 @@ static const struct ScriptCommand s_gs220_g2_s0_lives0_dlg0[] = { /* 0x826c278 * WAIT(10), ALERT_CUE(7), AWAIT_CUE(5), - ROTATE(4, 10, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTH), PORTRAIT(PLACEMENT_RIGHT, 0x0002, 0x00000043), MSG_NPC(2, _(" W-wait...")), TEXTBOX_CLEAR, @@ -363,7 +363,7 @@ static const struct ScriptCommand s_gs220_g2_s0_lives0_dlg0[] = { /* 0x826c278 * WAIT(120), ALERT_CUE(7), WALK_RELATIVE(256, -24, 0), - ROTATE(4, 10, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHEAST), WAIT(20), MSG_NPC(2, _(" Let me...{WAIT_PRESS}\nLet me say something!")), TEXTBOX_CLEAR, @@ -427,7 +427,7 @@ static const struct ScriptCommand s_gs220_g2_s0_lives0_dlg0[] = { /* 0x826c278 * FANFARE_PLAY2(465), ALERT_CUE(7), AWAIT_CUE(5), - ROTATE(4, 10, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHEAST), PORTRAIT_REP(0x0002, 0x00000046), MSG_NPC(2, _(" Ga-{NAME_3}!")), TEXTBOX_CLEAR, @@ -441,7 +441,7 @@ static const struct ScriptCommand s_gs220_g2_s0_lives0_dlg0[] = { /* 0x826c278 * TEXTBOX_CLEAR, WAIT(10), ALERT_CUE(7), - ROTATE(4, 10, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHEAST), AWAIT_CUE(5), PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0002, 0x00000044), MSG_NPC(2, _(" N-{NAME_5}!")), @@ -513,12 +513,12 @@ static const struct ScriptCommand s_gs220_g2_s0_lives1_dlg0[] = { /* 0x826d210 * AWAIT_CUE(7), { 0x89, 0x10, 0x0100, 0x00000004, 0x00000000, NULL }, AWAIT_CUE(7), - ROTATE(4, 10, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTH), FANFARE_PLAY2(465), CALL_SCRIPT(NOTICE_FUNC), ALERT_CUE(5), AWAIT_CUE(7), - ROTATE(4, 10, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), ALERT_CUE(5), AWAIT_CUE(7), HALT, diff --git a/src/data/ground/ground_data_d24p02_station.h b/src/data/ground/ground_data_d24p02_station.h index e080d2a56..ac3278e9b 100644 --- a/src/data/ground/ground_data_d24p02_station.h +++ b/src/data/ground/ground_data_d24p02_station.h @@ -44,7 +44,7 @@ static const struct ScriptCommand s_gs221_g1_s0_lives0_dlg0[] = { /* 0x826d898 * ALERT_CUE(7), { 0x89, 0x50, 0x0099, 0x00000004, 0x00000000, NULL }, AWAIT_CUE(5), - ROTATE(4, 10, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTH), MSG_NPC(2, _(" You're going to the\n{COLOR YELLOW_D}Murky Cave{RESET}?")), MSG_NPC(2, _(" Don't forget to take me,\nkekeh!")), TEXTBOX_CLEAR, diff --git a/src/data/ground/ground_data_d25p01_station.h b/src/data/ground/ground_data_d25p01_station.h index b8d9dc5b0..a53daf126 100644 --- a/src/data/ground/ground_data_d25p01_station.h +++ b/src/data/ground/ground_data_d25p01_station.h @@ -50,7 +50,7 @@ static const struct ScriptCommand s_gs222_g1_s0_lives0_dlg0[] = { /* 0x826dc2c * ALERT_CUE(3), WAIT(1), WALK_GRID(204, 1), - ROTATE(4, 10, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHEAST), HALT, }; @@ -63,7 +63,7 @@ static const struct ScriptCommand s_gs222_g1_s0_lives1_dlg0[] = { /* 0x826ddc0 * WALK_GRID(256, 2), AWAIT_CUE(6), WALK_GRID(204, 3), - ROTATE(4, 10, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHWEST), HALT, }; diff --git a/src/data/ground/ground_data_h29p01_station.h b/src/data/ground/ground_data_h29p01_station.h index 8a4103bb8..a53bcc8db 100644 --- a/src/data/ground/ground_data_h29p01_station.h +++ b/src/data/ground/ground_data_h29p01_station.h @@ -225,11 +225,11 @@ static const struct ScriptCommand s_gs158_g2_s0_lives0_dlg0[] = { /* 0x820d22c * { 0x89, 0x30, 0x0100, 0x00000004, 0x00000000, NULL }, { 0xdf, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(30), - ROTATE(8, 10, DIRECTION_WEST), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_WEST), WAIT(30), - ROTATE(8, 10, DIRECTION_EAST), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_EAST), WAIT(30), - ROTATE(8, 10, DIRECTION_NORTH), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_NORTH), WAIT(60), { 0x23, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, { 0x8b, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, @@ -376,7 +376,7 @@ static const struct ScriptCommand s_gs158_g2_s0_lives2_dlg0[] = { /* 0x820dccc * { 0x52, 0x00, 0x0000, 0x01000000, 0x00000000, NULL }, { 0x70, 0x00, 0x0080, 0x00000000, 0x00000000, NULL }, WAIT(30), - ROTATE(4, 10, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_WEST), AWAIT_CUE(7), { 0x54, 0x00, 0x0400, 0x00000000, 0x00000000, NULL }, WAIT(60), @@ -388,7 +388,7 @@ static const struct ScriptCommand s_gs158_g2_s0_lives2_dlg0[] = { /* 0x820dccc * AWAIT_CUE(7), SELECT_ANIMATION(2), AWAIT_CUE(7), - ROTATE(4, 10, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHWEST), AWAIT_CUE(7), HALT, }; @@ -414,7 +414,7 @@ static const struct ScriptCommand s_gs158_g2_s0_lives3_dlg0[] = { /* 0x820df0c * { 0x52, 0x00, 0x0000, 0x01000000, 0x00000000, NULL }, { 0x70, 0x00, 0x0080, 0x00000000, 0x00000000, NULL }, WAIT(30), - ROTATE(4, 10, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_EAST), ALERT_CUE(5), AWAIT_CUE(8), { 0x54, 0x00, 0x0400, 0x00000000, 0x00000000, NULL }, @@ -427,7 +427,7 @@ static const struct ScriptCommand s_gs158_g2_s0_lives3_dlg0[] = { /* 0x820df0c * AWAIT_CUE(8), SELECT_ANIMATION(2), AWAIT_CUE(8), - ROTATE(4, 10, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHEAST), AWAIT_CUE(8), HALT, }; diff --git a/src/data/ground/ground_data_t01p01_station.h b/src/data/ground/ground_data_t01p01_station.h index 436379922..7f3889371 100644 --- a/src/data/ground/ground_data_t01p01_station.h +++ b/src/data/ground/ground_data_t01p01_station.h @@ -843,7 +843,7 @@ static const struct ScriptCommand s_gs1_g4_s1_lives0_dlg0[] = { /* 0x813a9b4 */ ALERT_CUE(6), { 0x56, 0x00, -0x0001, 0x00000058, 0x00000000, NULL }, { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x93, 0x04, 0x000a, 0x0000007f, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 127), WAIT(60), MSG_NPC(2, _(" ....................................\n................................................\n................................................")), MSG_NPC(2, _(" ...Belly...rumbling...{WAIT_PRESS}\nHungry...")), @@ -862,7 +862,7 @@ static const struct ScriptCommand s_gs1_g4_s1_lives1_dlg0[] = { /* 0x813ac3c */ AWAIT_CUE(6), { 0x56, 0x00, -0x0001, 0x00000058, 0x00000000, NULL }, { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x93, 0x04, 0x000a, 0x0000007f, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 127), AWAIT_CUE(6), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, RET, @@ -885,7 +885,7 @@ static const struct ScriptCommand s_gs1_g4_s2_lives0_dlg0[] = { /* 0x813ad6c */ SELECT_ANIMATION(2), { 0x56, 0x00, -0x0001, 0x00000058, 0x00000000, NULL }, { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x93, 0x04, 0x000a, 0x0000007f, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 127), HALT, }; @@ -894,7 +894,7 @@ static const struct ScriptCommand s_gs1_g4_s2_lives1_dlg0[] = { /* 0x813adcc */ SELECT_ANIMATION(2), { 0x56, 0x00, -0x0001, 0x00000058, 0x00000000, NULL }, { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x93, 0x04, 0x000a, 0x0000007f, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 127), HALT, }; @@ -903,7 +903,7 @@ static const struct ScriptCommand s_gs1_g4_s2_lives2_dlg0[] = { /* 0x813ae2c */ SELECT_ANIMATION(2), { 0x56, 0x00, -0x0001, 0x00000058, 0x00000000, NULL }, { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x93, 0x04, 0x000a, 0x0000007f, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 127), HALT, }; @@ -912,7 +912,7 @@ static const struct ScriptCommand s_gs1_g4_s2_lives3_dlg0[] = { /* 0x813ae8c */ SELECT_ANIMATION(2), { 0x56, 0x00, -0x0001, 0x00000058, 0x00000000, NULL }, { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x93, 0x04, 0x000a, 0x0000007f, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 127), HALT, }; @@ -921,7 +921,7 @@ static const struct ScriptCommand s_gs1_g4_s2_lives4_dlg0[] = { /* 0x813aeec */ SELECT_ANIMATION(2), { 0x56, 0x00, -0x0001, 0x00000058, 0x00000000, NULL }, { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x93, 0x04, 0x000a, 0x0000007f, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 127), HALT, }; @@ -930,7 +930,7 @@ static const struct ScriptCommand s_gs1_g4_s2_lives5_dlg0[] = { /* 0x813af4c */ SELECT_ANIMATION(2), { 0x56, 0x00, -0x0001, 0x00000058, 0x00000000, NULL }, { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x93, 0x04, 0x000a, 0x0000007f, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 127), HALT, }; @@ -939,7 +939,7 @@ static const struct ScriptCommand s_gs1_g4_s2_lives6_dlg0[] = { /* 0x813afac */ SELECT_ANIMATION(2), { 0x56, 0x00, -0x0001, 0x00000058, 0x00000000, NULL }, { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x93, 0x04, 0x000a, 0x0000007f, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 127), HALT, }; @@ -948,7 +948,7 @@ static const struct ScriptCommand s_gs1_g4_s2_lives7_dlg0[] = { /* 0x813b00c */ SELECT_ANIMATION(2), { 0x56, 0x00, -0x0001, 0x00000058, 0x00000000, NULL }, { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x93, 0x04, 0x000a, 0x0000007f, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 127), HALT, }; @@ -957,7 +957,7 @@ static const struct ScriptCommand s_gs1_g4_s2_lives8_dlg0[] = { /* 0x813b06c */ SELECT_ANIMATION(2), { 0x56, 0x00, -0x0001, 0x00000058, 0x00000000, NULL }, { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x93, 0x04, 0x000a, 0x0000007f, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 127), HALT, }; @@ -966,7 +966,7 @@ static const struct ScriptCommand s_gs1_g4_s2_lives9_dlg0[] = { /* 0x813b0cc */ SELECT_ANIMATION(2), { 0x56, 0x00, -0x0001, 0x00000058, 0x00000000, NULL }, { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x93, 0x04, 0x000a, 0x0000007f, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 127), HALT, }; @@ -1058,7 +1058,7 @@ static const struct ScriptCommand s_gs1_g4_s3_lives0_dlg3[] = { /* 0x813b7d8 */ DEBUGINFO_O(1058), SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0x8d, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, + CMD_UNK_8D(1, DIR_TRANS_NONE), AWAIT_CUE(6), JUMPIF(JUDGE_EQ, EVENT_LOCAL, 1, /* to label */ 0), AWAIT_CUE(2), @@ -1074,7 +1074,7 @@ static const struct ScriptCommand s_gs1_g4_s3_lives0_dlg3[] = { /* 0x813b7d8 */ WAIT(10), ALERT_CUE(5), AWAIT_CUE(6), - { 0x93, 0x08, 0x000a, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(8, DIR_TRANS_10, 0), ALERT_CUE(5), AWAIT_CUE(6), HALT, @@ -1159,7 +1159,7 @@ static const struct ScriptCommand s_gs1_g5_s1_lives0_dlg0[] = { /* 0x813bbf0 */ ALERT_CUE(6), { 0x56, 0x00, -0x0001, 0x00000058, 0x00000000, NULL }, { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x93, 0x04, 0x000a, 0x0000007f, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 127), WAIT(60), PORTRAIT(PLACEMENT_LEFT_, 0x0002, 0x00000045), MSG_NPC(2, _(" ....................................")), @@ -1181,7 +1181,7 @@ static const struct ScriptCommand s_gs1_g5_s1_lives1_dlg0[] = { /* 0x813be18 */ AWAIT_CUE(6), { 0x56, 0x00, -0x0001, 0x00000058, 0x00000000, NULL }, { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x93, 0x04, 0x000a, 0x0000007f, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 127), AWAIT_CUE(6), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, RET, @@ -1290,7 +1290,7 @@ static const struct ScriptCommand s_gs1_g5_s2_lives0_dlg0[] = { /* 0x813c2f8 */ SELECT_ANIMATION(2), { 0x56, 0x00, -0x0001, 0x00000058, 0x00000000, NULL }, { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x93, 0x04, 0x000a, 0x0000007f, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 127), HALT, }; @@ -1299,7 +1299,7 @@ static const struct ScriptCommand s_gs1_g5_s2_lives1_dlg0[] = { /* 0x813c358 */ SELECT_ANIMATION(2), { 0x56, 0x00, -0x0001, 0x00000058, 0x00000000, NULL }, { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x93, 0x04, 0x000a, 0x0000007f, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 127), HALT, }; @@ -1308,7 +1308,7 @@ static const struct ScriptCommand s_gs1_g5_s2_lives2_dlg0[] = { /* 0x813c3b8 */ SELECT_ANIMATION(2), { 0x56, 0x00, -0x0001, 0x00000058, 0x00000000, NULL }, { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x93, 0x04, 0x000a, 0x0000007f, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 127), HALT, }; @@ -1317,7 +1317,7 @@ static const struct ScriptCommand s_gs1_g5_s2_lives3_dlg0[] = { /* 0x813c418 */ SELECT_ANIMATION(2), { 0x56, 0x00, -0x0001, 0x00000058, 0x00000000, NULL }, { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x93, 0x04, 0x000a, 0x0000007f, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 127), HALT, }; @@ -1326,7 +1326,7 @@ static const struct ScriptCommand s_gs1_g5_s2_lives4_dlg0[] = { /* 0x813c478 */ SELECT_ANIMATION(2), { 0x56, 0x00, -0x0001, 0x00000058, 0x00000000, NULL }, { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x93, 0x04, 0x000a, 0x0000007f, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 127), HALT, }; @@ -1335,7 +1335,7 @@ static const struct ScriptCommand s_gs1_g5_s2_lives5_dlg0[] = { /* 0x813c4d8 */ SELECT_ANIMATION(2), { 0x56, 0x00, -0x0001, 0x00000058, 0x00000000, NULL }, { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x93, 0x04, 0x000a, 0x0000007f, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 127), HALT, }; @@ -1344,7 +1344,7 @@ static const struct ScriptCommand s_gs1_g5_s2_lives6_dlg0[] = { /* 0x813c538 */ SELECT_ANIMATION(2), { 0x56, 0x00, -0x0001, 0x00000058, 0x00000000, NULL }, { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x93, 0x04, 0x000a, 0x0000007f, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 127), HALT, }; @@ -1353,7 +1353,7 @@ static const struct ScriptCommand s_gs1_g5_s2_lives7_dlg0[] = { /* 0x813c598 */ SELECT_ANIMATION(2), { 0x56, 0x00, -0x0001, 0x00000058, 0x00000000, NULL }, { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x93, 0x04, 0x000a, 0x0000007f, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 127), HALT, }; @@ -1362,7 +1362,7 @@ static const struct ScriptCommand s_gs1_g5_s2_lives8_dlg0[] = { /* 0x813c5f8 */ SELECT_ANIMATION(2), { 0x56, 0x00, -0x0001, 0x00000058, 0x00000000, NULL }, { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x93, 0x04, 0x000a, 0x0000007f, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 127), HALT, }; @@ -1371,7 +1371,7 @@ static const struct ScriptCommand s_gs1_g5_s2_lives9_dlg0[] = { /* 0x813c658 */ SELECT_ANIMATION(2), { 0x56, 0x00, -0x0001, 0x00000058, 0x00000000, NULL }, { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x93, 0x04, 0x000a, 0x0000007f, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 127), HALT, }; @@ -1409,7 +1409,7 @@ static const struct ScriptCommand s_gs1_g5_s4_lives0_dlg0[] = { /* 0x813c7e4 */ SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(5), - { 0x93, 0x08, 0x000a, 0x0000007f, 0x00000000, NULL }, + CMD_UNK_93(8, DIR_TRANS_10, 127), PORTRAIT_REP(0x0002, 0x00000000), ASK3(FALSE, /*default*/ -1, /* speaker */ 2, _(" ............{WAIT_PRESS}Hey.{WAIT_PRESS}\nThat belong to Munchlax.{WAIT_PRESS}\nMunchlax want back.")), CHOICE(/* label */ 1, _("Return it.")), @@ -1490,7 +1490,7 @@ static const struct ScriptCommand s_gs1_g5_s4_lives2_dlg0[] = { /* 0x813cdf0 */ { 0x53, 0x00, 0x0000, 0x00000400, 0x00000000, NULL }, SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 0), { 0x56, 0x00, -0x0001, 0x00000058, 0x00000000, NULL }, { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, ALERT_CUE(5), @@ -1512,7 +1512,7 @@ static const struct ScriptCommand s_gs1_g5_s4_lives2_dlg0[] = { /* 0x813cdf0 */ WAIT(30), ALERT_CUE(5), AWAIT_CUE(7), - { 0x95, 0x08, 0x000a, 0x00000003, 0x00000000, NULL }, + CMD_UNK_95(8, DIR_TRANS_10, 3), SELECT_ANIMATION(33), { 0x53, 0x00, 0x0000, 0x00000004, 0x00000000, NULL }, WALK_RELATIVE(128, 32, 0), @@ -1527,11 +1527,11 @@ static const struct ScriptCommand s_gs1_g5_s4_lives2_dlg0[] = { /* 0x813cdf0 */ { 0x54, 0x00, 0x0300, 0x00000000, 0x00000000, NULL }, SELECT_ANIMATION(2), WAIT(10), - { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 0), { 0x52, 0x00, 0x0000, 0x00000004, 0x00000000, NULL }, ALERT_CUE(5), AWAIT_CUE(7), - { 0x95, 0x04, 0x000a, 0x00000003, 0x00000000, NULL }, + CMD_UNK_95(4, DIR_TRANS_10, 3), WAIT(10), ALERT_CUE(5), HALT, @@ -1697,17 +1697,17 @@ static const struct ScriptCommand s_gs1_g6_s0_lives1_dlg0[] = { /* 0x813df88 */ WALK_GRID(128, 8), { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(6), - { 0x8e, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, + CMD_UNK_8E(4, DIR_TRANS_10, 0), SELECT_ANIMATION(4), ALERT_CUE(5), AWAIT_CUE(6), - ROTATE(4, 10, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_EAST), SELECT_ANIMATION(2), AWAIT_CUE(6), - { 0x8e, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, + CMD_UNK_8E(4, DIR_TRANS_10, 0), ALERT_CUE(5), AWAIT_CUE(6), - ROTATE(4, 10, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_EAST), ALERT_CUE(5), AWAIT_CUE(6), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, @@ -1826,10 +1826,10 @@ static const struct ScriptCommand s_gs1_g7_s0_lives7_dlg3[] = { /* 0x813e794 */ SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(6), - ROTATE(4, 11, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_EAST), ALERT_CUE(5), AWAIT_CUE(6), - { 0x93, 0x04, 0x000b, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_11, 0), ALERT_CUE(5), CALL_SCRIPT(WAIT_END_TALK_FUNC), RET, @@ -1852,7 +1852,7 @@ static const struct ScriptCommand s_gs1_g7_s1_lives0_dlg0[] = { /* 0x813e880 */ PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000000), MSG_NPC(1, _(" Huh?\nAre you going home already?")), TEXTBOX_CLEAR, - { 0x93, 0x08, 0x000a, 0x00000004, 0x00000000, NULL }, + CMD_UNK_93(8, DIR_TRANS_10, 4), WAIT(10), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" We haven't gone to the\n{COLOR CYAN}Pelipper Post Office{RESET} yet?")), @@ -1871,7 +1871,7 @@ static const struct ScriptCommand s_gs1_g7_s1_lives1_dlg0[] = { /* 0x813ead4 */ DEBUGINFO_O(1871), SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0x93, 0x08, 0x000a, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(8, DIR_TRANS_10, 0), ALERT_CUE(5), AWAIT_CUE(6), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, @@ -2001,7 +2001,7 @@ static const struct ScriptCommand s_gs1_g8_s1_lives0_dlg0[] = { /* 0x813f0dc */ PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000000), MSG_NPC(1, _(" Huh?\nYou want to go home already?")), TEXTBOX_CLEAR, - { 0x93, 0x08, 0x000a, 0x00000004, 0x00000000, NULL }, + CMD_UNK_93(8, DIR_TRANS_10, 4), WAIT(10), MSG_NPC(1, _(" We're already here.\nLet me show you around a bit more.")), TEXTBOX_CLEAR, @@ -2015,7 +2015,7 @@ static const struct ScriptCommand s_gs1_g8_s1_lives1_dlg0[] = { /* 0x813f23c */ DEBUGINFO_O(2015), SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0x93, 0x08, 0x000a, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(8, DIR_TRANS_10, 0), ALERT_CUE(5), AWAIT_CUE(6), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, @@ -2121,7 +2121,7 @@ static const struct ScriptCommand s_gs1_g9_s0_lives0_dlg0[] = { /* 0x813f614 */ WAIT(1), ALERT_CUE(6), WALK_GRID(256, 18), - ROTATE(4, 10, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), WAIT(30), PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000000), MSG_NPC(2, _(" Friends are my treasures!\nWelcome to {NAME_2} Club--a circle\nof friends! ")), @@ -2151,7 +2151,7 @@ static const struct ScriptCommand s_gs1_g9_s0_lives0_dlg0[] = { /* 0x813f614 */ WAIT(1), WAIT(15), ALERT_CUE(6), - ROTATE(4, 10, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_WEST), ALERT_CUE(7), PORTRAIT(PLACEMENT_TOP_LEFT, 0x0003, 0x00000000), MSG_NPC(3, _(" BZBZBZZT!{WAIT_PRESS}\nIF YOU'RE GIVING FRIEND AREAS AWAY...")), @@ -2165,7 +2165,7 @@ static const struct ScriptCommand s_gs1_g9_s0_lives0_dlg0[] = { /* 0x813f614 */ ALERT_CUE(7), AWAIT_CUE(5), ALERT_CUE(6), - ROTATE(4, 10, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), MSG_NPC(2, _(" I'm giving it away today!{WAIT_PRESS}\nWigglytuff〜♪ Wigglytuff〜♪{WAIT_PRESS}\nLet's be friends... Taaaaaaah!")), TEXTBOX_CLEAR, FANFARE_PLAY2(603), @@ -2192,7 +2192,7 @@ static const struct ScriptCommand s_gs1_g9_s0_lives0_dlg0[] = { /* 0x813f614 */ AWAIT_CUE(5), ALERT_CUE(6), ALERT_CUE(7), - ROTATE(4, 10, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_WEST), PORTRAIT_REP(0x0003, 0x00000000), MSG_NPC(3, _(" SORRY.{WAIT_PRESS}\nI KNOW MY FRIEND TURNED DOWN YOUR\nOFFER TO JOIN YOUR TEAM YESTERDAY...")), TEXTBOX_CLEAR, @@ -2258,7 +2258,7 @@ static const struct ScriptCommand s_gs1_g9_s0_lives0_dlg0[] = { /* 0x813f614 */ ALERT_CUE(7), WAIT(10), ALERT_CUE(6), - ROTATE(4, 10, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), MSG_NPC(2, _(" You can go to your Friend\nAreas by taking the left path from your\nrescue team base.")), MSG_NPC(2, _(" There's a sign on the path\nto the left of your rescue team base,\nso you shouldn't have any trouble.")), MSG_NPC(2, _(" That's all the giveaways\ntoday!{WAIT_PRESS} If you want more Friend Areas,\nyou'll have to buy them now.")), @@ -2276,17 +2276,17 @@ static const struct ScriptCommand s_gs1_g9_s0_lives1_dlg0[] = { /* 0x81408d0 */ AWAIT_CUE(6), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, WALK_GRID(256, 19), - ROTATE(4, 10, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), AWAIT_CUE(6), WAIT(7), - ROTATE(4, 10, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_WEST), AWAIT_CUE(6), - ROTATE(4, 10, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), AWAIT_CUE(6), - ROTATE(4, 10, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_WEST), AWAIT_CUE(6), WAIT(5), - ROTATE(4, 10, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), AWAIT_CUE(6), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, RET, @@ -2297,12 +2297,12 @@ static const struct ScriptCommand s_gs1_g9_s0_lives2_dlg0[] = { /* 0x8140a10 */ SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(7), - ROTATE(4, 10, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHWEST), AWAIT_CUE(7), - ROTATE(4, 10, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTH), ALERT_CUE(5), AWAIT_CUE(7), - ROTATE(4, 10, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTH), AWAIT_CUE(7), AWAIT_CUE(3), RET, @@ -2328,7 +2328,7 @@ static const struct ScriptCommand s_gs1_g9_s1_lives0_dlg0[] = { /* 0x8140ba0 */ SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0003, 0x00000000, 0x00000000, NULL }, WALK_GRID(384, 20), - ROTATE(4, 10, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHEAST), AWAIT_CUE(8), CALL_SCRIPT(SMILE_START_FUNC), CALL_SCRIPT(JUMP_HAPPY_FUNC), @@ -2338,20 +2338,20 @@ static const struct ScriptCommand s_gs1_g9_s1_lives0_dlg0[] = { /* 0x8140ba0 */ { 0x89, 0x10, 0x0080, 0x00000002, 0x00000000, NULL }, ALERT_CUE(5), AWAIT_CUE(8), - ROTATE(4, 10, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHWEST), ALERT_CUE(5), AWAIT_CUE(8), - ROTATE(4, 10, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_EAST), ALERT_CUE(5), AWAIT_CUE(8), - ROTATE(4, 10, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHWEST), CALL_SCRIPT(JUMP_HAPPY_FUNC), CALL_SCRIPT(SMILE_START_FUNC), ALERT_CUE(5), AWAIT_CUE(8), CALL_SCRIPT(SMILE_END_FUNC), AWAIT_CUE(8), - ROTATE(4, 10, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_EAST), AWAIT_CUE(8), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, { 0x89, 0x88, 0x0100, 0x00000006, 0x00000000, NULL }, @@ -2365,7 +2365,7 @@ static const struct ScriptCommand s_gs1_g9_s1_lives1_dlg0[] = { /* 0x8140dc0 */ SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0004, 0x00000000, 0x00000000, NULL }, WALK_GRID(384, 21), - ROTATE(4, 10, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHEAST), AWAIT_CUE(9), CALL_SCRIPT(SMILE_START_FUNC), WAIT(7), @@ -2373,15 +2373,15 @@ static const struct ScriptCommand s_gs1_g9_s1_lives1_dlg0[] = { /* 0x8140dc0 */ AWAIT_CUE(9), CALL_SCRIPT(SMILE_END_FUNC), AWAIT_CUE(9), - ROTATE(4, 10, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_EAST), AWAIT_CUE(9), - ROTATE(4, 10, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHEAST), CALL_SCRIPT(SMILE_START_FUNC), CALL_SCRIPT(JUMP_SURPRISE_FUNC), AWAIT_CUE(9), CALL_SCRIPT(SMILE_END_FUNC), AWAIT_CUE(9), - ROTATE(4, 10, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_EAST), AWAIT_CUE(9), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, { 0x89, 0x88, 0x0100, 0x00000006, 0x00000000, NULL }, @@ -2464,7 +2464,7 @@ static const struct ScriptCommand s_gs1_g10_s0_lives2_dlg0[] = { /* 0x81412bc */ ALERT_CUE(4), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, CAMERA_PAN(256, 22), - { 0x93, 0x04, 0x000b, 0x0000004e, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_11, 78), ALERT_CUE(6), WAIT(30), AWAIT_CUE(5), @@ -2490,7 +2490,7 @@ static const struct ScriptCommand s_gs1_g10_s0_lives2_dlg0[] = { /* 0x81412bc */ VARIANT_DEFAULT(_(" Hi, what's going on?")), TEXTBOX_CLEAR, WAIT(10), - { 0x93, 0x04, 0x000b, 0x0000004d, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_11, 77), ALERT_CUE(9), AWAIT_CUE(5), PORTRAIT(PLACEMENT_MIDDLE_RIGHT, 0x0004, 0x00000000), @@ -2504,7 +2504,7 @@ static const struct ScriptCommand s_gs1_g10_s0_lives2_dlg0[] = { /* 0x81412bc */ TEXTBOX_CLEAR, WAIT(4), ALERT_CUE(4), - { 0x93, 0x04, 0x000b, 0x00000055, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_11, 85), ALERT_CUE(6), AWAIT_CUE(5), { 0x2e, 0x00, 0x0004, -0x00000002, 0x00000000, NULL }, @@ -2514,7 +2514,7 @@ static const struct ScriptCommand s_gs1_g10_s0_lives2_dlg0[] = { /* 0x81412bc */ ALERT_CUE(4), AWAIT_CUE(5), ALERT_CUE(9), - ROTATE(4, 2, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTH), ALERT_CUE(6), PORTRAIT(PLACEMENT_MIDDLE_RIGHT, 0x0004, 0x00000000), MSG_NPC(4, _(" But his team's greedy.\nThey don't work unless they get paid\nroyally.")), @@ -2533,7 +2533,7 @@ static const struct ScriptCommand s_gs1_g10_s0_lives2_dlg0[] = { /* 0x81412bc */ ALERT_CUE(13), ALERT_CUE(14), WAIT(20), - { 0x93, 0x04, 0x000b, 0x00000058, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_11, 88), WAIT(1), ALERT_CUE(6), WAIT(1), @@ -2591,7 +2591,7 @@ static const struct ScriptCommand s_gs1_g10_s0_lives2_dlg0[] = { /* 0x81412bc */ VARIANT_DEFAULT(_(" Say, who are they?")), TEXTBOX_CLEAR, WAIT(10), - ROTATE(4, 10, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTH), ALERT_CUE(9), AWAIT_CUE(5), PORTRAIT(PLACEMENT_MIDDLE_RIGHT, 0x0004, 0x00000000), @@ -2601,7 +2601,7 @@ static const struct ScriptCommand s_gs1_g10_s0_lives2_dlg0[] = { /* 0x81412bc */ WAIT(4), ALERT_CUE(9), WAIT(5), - ROTATE(4, 10, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_WEST), ALERT_CUE(6), WAIT(20), ALERT_CUE(4), @@ -2648,7 +2648,7 @@ static const struct ScriptCommand s_gs1_g10_s0_lives2_dlg0[] = { /* 0x81412bc */ WAIT(60), { 0x36, 0x00, -0x0001, 0x00000000, 0x00000000, _("{COLOR YELLOW}{SPEECH_BUBBLE}{RESET}: I wouldn't expect less from a Gold\nRank rescue team.") }, WAIT(40), - ROTATE(10, 11, DIRECTION_EAST), + ROTATE_TO(10, DIR_TRANS_11, DIRECTION_EAST), ALERT_CUE(6), ALERT_CUE(9), WAIT(70), @@ -2760,39 +2760,39 @@ static const struct ScriptCommand s_gs1_g10_s0_lives3_dlg0[] = { /* 0x8142cf4 */ SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(6), - { 0x93, 0x04, 0x000b, 0x0000004e, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_11, 78), ALERT_CUE(5), AWAIT_CUE(6), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, CAMERA_PAN(256, 23), - { 0x8e, 0x01, 0x0000, 0x0000004e, 0x00000000, NULL }, + CMD_UNK_8E(1, DIR_TRANS_NONE, 78), AWAIT_CUE(6), - { 0x93, 0x04, 0x000b, 0x0000004d, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_11, 77), ALERT_CUE(5), AWAIT_CUE(6), - { 0x93, 0x04, 0x000b, 0x00000055, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_11, 85), AWAIT_CUE(6), - ROTATE(4, 2, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTH), AWAIT_CUE(6), WAIT(3), FANFARE_PLAY2(465), CALL_SCRIPT(NOTICE_FUNC), AWAIT_CUE(6), - { 0x93, 0x04, 0x000b, 0x00000058, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_11, 88), AWAIT_CUE(6), - { 0x93, 0x04, 0x000b, 0x0000004d, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_11, 77), ALERT_CUE(5), AWAIT_CUE(6), - { 0x93, 0x04, 0x000b, 0x00000058, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_11, 88), AWAIT_CUE(6), - ROTATE(10, 2, DIRECTION_EAST), + ROTATE_TO(10, DIR_TRANS_SPINLEFT1, DIRECTION_EAST), AWAIT_CUE(6), FANFARE_PLAY2(455), CALL_SCRIPT(JUMP_SURPRISE_FUNC), AWAIT_CUE(6), - { 0x90, 0x20, 0x0000, 0x0000001c, 0x00000000, NULL }, + CMD_UNK_90(32, DIR_TRANS_NONE, 28), AWAIT_CUE(6), - { 0x93, 0x04, 0x000b, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_11, 0), { 0x52, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, HALT, }; @@ -2803,26 +2803,26 @@ static const struct ScriptCommand s_gs1_g10_s0_lives4_dlg0[] = { /* 0x8142f64 */ { 0x2d, 0x07, 0x0009, 0x00000000, 0x00000000, NULL }, WAIT(1), AWAIT_CUE(14), - { 0x93, 0x04, 0x000b, 0x00000058, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_11, 88), AWAIT_CUE(14), - ROTATE(4, 11, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_SOUTHWEST), AWAIT_CUE(14), - ROTATE(4, 11, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_SOUTH), AWAIT_CUE(14), CALL_SCRIPT(SHOCK_FUNC), - ROTATE(1, 1, DIRECTION_WEST), + ROTATE_TO(1, DIR_TRANS_SPINRIGHT1, DIRECTION_WEST), { 0x61, 0x00, 0x0400, 0x00000230, 0x00000108, NULL }, WAIT(30), - ROTATE(4, 1, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTH), AWAIT_CUE(14), - ROTATE(4, 2, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTH), AWAIT_CUE(14), - ROTATE(4, 1, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTHWEST), AWAIT_CUE(14), WAIT(150), - ROTATE(8, 2, DIRECTION_SOUTHEAST), + ROTATE_TO(8, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTHEAST), WAIT(60), - ROTATE(4, 2, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_EAST), HALT, }; @@ -2831,22 +2831,22 @@ static const struct ScriptCommand s_gs1_g10_s0_lives5_dlg0[] = { /* 0x8143104 */ SELECT_ANIMATION(3), { 0x2d, 0x07, 0x0009, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(14), - ROTATE(4, 11, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_WEST), AWAIT_CUE(14), - ROTATE(4, 11, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_NORTHWEST), AWAIT_CUE(14), - ROTATE(4, 11, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_NORTH), AWAIT_CUE(14), WAIT(10), AWAIT_CUE(14), - ROTATE(4, 11, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_NORTH), AWAIT_CUE(14), - ROTATE(4, 2, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_NORTHWEST), AWAIT_CUE(14), WAIT(150), - ROTATE(8, 1, DIRECTION_NORTHEAST), + ROTATE_TO(8, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTHEAST), WAIT(60), - ROTATE(4, 1, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_EAST), HALT, }; @@ -2856,25 +2856,25 @@ static const struct ScriptCommand s_gs1_g10_s0_lives6_dlg0[] = { /* 0x8143254 */ { 0x2d, 0x07, 0x0008, 0x00000000, 0x00000000, NULL }, WAIT(1), AWAIT_CUE(13), - { 0x93, 0x04, 0x000b, 0x00000058, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_11, 88), AWAIT_CUE(13), - ROTATE(4, 11, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_SOUTHWEST), AWAIT_CUE(13), - ROTATE(4, 11, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_SOUTH), AWAIT_CUE(13), CALL_SCRIPT(SHOCK_FUNC), WAIT(65), - ROTATE(1, 2, DIRECTION_EAST), + ROTATE_TO(1, DIR_TRANS_SPINLEFT1, DIRECTION_EAST), { 0x61, 0x00, 0x0400, 0x000001d0, 0x00000108, NULL }, WAIT(30), - ROTATE(4, 2, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_NORTH), AWAIT_CUE(13), - ROTATE(4, 1, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTH), AWAIT_CUE(13), - ROTATE(4, 2, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTHEAST), AWAIT_CUE(13), WAIT(120), - ROTATE(4, 2, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_EAST), HALT, }; @@ -2897,9 +2897,9 @@ static const struct ScriptCommand s_gs1_g10_s0_lives7_dlg0[] = { /* 0x81433e4 */ ALERT_CUE(5), AWAIT_CUE(7), { 0x89, 0x08, 0x0100, 0x00000003, 0x00000000, NULL }, - ROTATE(4, 11, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_SOUTHWEST), WAIT(50), - ROTATE(4, 11, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_EAST), WAIT(70), { 0x89, 0x30, 0x0100, 0x00000002, 0x00000000, NULL }, AWAIT_CUE(7), @@ -2911,26 +2911,26 @@ static const struct ScriptCommand s_gs1_g10_s0_lives8_dlg0[] = { /* 0x8143574 */ SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0003, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(8), - { 0x8e, 0x01, 0x0000, 0x00000058, 0x00000000, NULL }, + CMD_UNK_8E(1, DIR_TRANS_NONE, 88), AWAIT_CUE(8), FANFARE_PLAY2(465), CALL_SCRIPT(NOTICE_FUNC), ALERT_CUE(5), FANFARE_STOP2(465), AWAIT_CUE(8), - ROTATE(4, 11, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_EAST), FANFARE_PLAY2(468), WAIT(48), - ROTATE(4, 11, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_WEST), WAIT(40), - ROTATE(4, 11, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_NORTHWEST), FANFARE_PLAY2(468), WAIT(40), - ROTATE(4, 11, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_SOUTHWEST), FANFARE_PLAY2(468), WAIT(40), FANFARE_STOP2(468), - ROTATE(4, 11, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_WEST), WAIT(16), FANFARE_PLAY2(470), CALL_SCRIPT(SWEAT_FUNC), @@ -2951,7 +2951,7 @@ static const struct ScriptCommand s_gs1_g10_s0_lives9_dlg0[] = { /* 0x81437d4 */ DEBUGINFO_O(2951), SELECT_ANIMATION(2), AWAIT_CUE(7), - { 0x8e, 0x01, 0x0000, 0x00000058, 0x00000000, NULL }, + CMD_UNK_8E(1, DIR_TRANS_NONE, 88), AWAIT_CUE(7), { 0x62, 0x00, 0x0100, 0x00000005, 0x00000000, NULL }, AWAIT_CUE(7), @@ -2965,7 +2965,7 @@ static const struct ScriptCommand s_gs1_g10_s0_lives10_dlg0[] = { /* 0x8143884 * DEBUGINFO_O(2965), SELECT_ANIMATION(2), AWAIT_CUE(7), - { 0x8e, 0x01, 0x0000, 0x00000058, 0x00000000, NULL }, + CMD_UNK_8E(1, DIR_TRANS_NONE, 88), AWAIT_CUE(7), { 0x62, 0x00, 0x0100, 0x00000005, 0x00000000, NULL }, AWAIT_CUE(7), @@ -2980,27 +2980,27 @@ static const struct ScriptCommand s_gs1_g10_s0_lives11_dlg0[] = { /* 0x8143934 * SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0004, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(9), - { 0x8e, 0x01, 0x0000, 0x00000004, 0x00000000, NULL }, + CMD_UNK_8E(1, DIR_TRANS_NONE, 4), ALERT_CUE(5), AWAIT_CUE(9), - { 0x93, 0x04, 0x0002, 0x00000055, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_SPINLEFT1, 85), ALERT_CUE(5), AWAIT_CUE(9), - ROTATE(4, 11, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_NORTH), AWAIT_CUE(9), WAIT(3), CALL_SCRIPT(NOTICE_FUNC), AWAIT_CUE(9), - { 0x8e, 0x01, 0x0000, 0x00000058, 0x00000000, NULL }, + CMD_UNK_8E(1, DIR_TRANS_NONE, 88), AWAIT_CUE(9), - { 0x8e, 0x01, 0x0000, 0x00000004, 0x00000000, NULL }, + CMD_UNK_8E(1, DIR_TRANS_NONE, 4), FANFARE_PLAY2(455), CALL_SCRIPT(JUMP_SURPRISE_FUNC), ALERT_CUE(5), AWAIT_CUE(9), - { 0x8e, 0x01, 0x0000, 0x00000058, 0x00000000, NULL }, + CMD_UNK_8E(1, DIR_TRANS_NONE, 88), AWAIT_CUE(9), - ROTATE(10, 1, DIRECTION_EAST), + ROTATE_TO(10, DIR_TRANS_SPINRIGHT1, DIRECTION_EAST), AWAIT_CUE(9), FANFARE_PLAY2(455), CALL_SCRIPT(JUMP_SURPRISE_FUNC), @@ -3029,11 +3029,11 @@ static const struct ScriptCommand s_gs1_g10_s1_lives0_dlg0[] = { /* 0x8143b44 */ ALERT_CUE(5), WAIT(10), AWAIT_CUE(10), - ROTATE(4, 2, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_WEST), AWAIT_CUE(10), - { 0x8e, 0x10, 0x0000, 0x00000059, 0x00000000, NULL }, + CMD_UNK_8E(16, DIR_TRANS_NONE, 89), WAIT(16), - { 0x8e, 0x10, 0x0000, 0x0000005a, 0x00000000, NULL }, + CMD_UNK_8E(16, DIR_TRANS_NONE, 90), WAIT(16), ALERT_CUE(5), AWAIT_CUE(10), @@ -3054,7 +3054,7 @@ static const struct ScriptCommand s_gs1_g10_s1_lives1_dlg0[] = { /* 0x8143d14 */ WALK_DIRECT(240, 30), AWAIT_CUE(11), WAIT(5), - { 0x8e, 0x10, 0x0000, 0x00000058, 0x00000000, NULL }, + CMD_UNK_8E(16, DIR_TRANS_NONE, 88), WAIT(16), FANFARE_PLAY2(469), CALL_SCRIPT(QUESTION_FUNC), @@ -3078,7 +3078,7 @@ static const struct ScriptCommand s_gs1_g10_s1_lives2_dlg0[] = { /* 0x8143e74 */ { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, WALK_DIRECT(240, 33), AWAIT_CUE(12), - { 0x8e, 0x10, 0x0000, 0x00000058, 0x00000000, NULL }, + CMD_UNK_8E(16, DIR_TRANS_NONE, 88), WAIT(16), AWAIT_CUE(12), WALK_DIRECT(136, 34), @@ -3091,9 +3091,9 @@ static const struct ScriptCommand s_gs1_g10_s2_lives0_dlg0[] = { /* 0x8143f74 */ DEBUGINFO_O(3091), SELECT_ANIMATION(2), { 0x2d, 0x01, 0x0005, 0x00000000, 0x00000000, NULL }, - { 0x8e, 0x04, 0x0000, 0x00000000, 0x00000000, NULL }, + CMD_UNK_8E(4, DIR_TRANS_NONE, 0), AWAIT_CUE(10), - ROTATE(10, 10, DIRECTION_SOUTH), + ROTATE_TO(10, DIR_TRANS_10, DIRECTION_SOUTH), WAIT(10), SELECT_ANIMATION(24), STOP_ANIMATION_ON_CURRENT_FRAME, @@ -3220,10 +3220,10 @@ static const struct ScriptCommand s_gs1_g11_s0_lives7_dlg3[] = { /* 0x8144888 */ SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(6), - ROTATE(4, 11, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_SOUTH), ALERT_CUE(5), AWAIT_CUE(6), - { 0x93, 0x04, 0x000b, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_11, 0), ALERT_CUE(5), CALL_SCRIPT(WAIT_END_TALK_FUNC), RET, @@ -3828,12 +3828,12 @@ static const struct ScriptCommand s_gs1_g17_s0_lives0_dlg0[] = { /* 0x8146704 */ { 0x2d, 0x09, 0x0005, 0x00000062, 0x00000000, NULL }, { 0x2d, 0x09, 0x0006, 0x00000063, 0x00000000, NULL }, WAIT(30), - { 0x93, 0x04, 0x0001, 0x00000004, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_SPINRIGHT1, 4), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Hah?{WAIT_PRESS}\nWhat are those guys talking about?")), VARIANT_DEFAULT(_(" Huh?{WAIT_PRESS}\nWhat are they chatting about?")), TEXTBOX_CLEAR, - ROTATE(4, 2, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_EAST), ALERT_CUE(4), ALERT_CUE(7), AWAIT_CUE(5), @@ -3868,7 +3868,7 @@ static const struct ScriptCommand s_gs1_g17_s0_lives0_dlg0[] = { /* 0x8146704 */ WAIT(10), ALERT_CUE(6), WALK_RELATIVE(256, 16, 0), - ROTATE(8, 1, DIRECTION_SOUTHEAST), + ROTATE_TO(8, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTHEAST), AWAIT_CUE(5), PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000004), MSG_NPC(1, _(" The {NAME_6} legend?{WAIT_PRESS}\nWhat's that?")), @@ -3889,14 +3889,14 @@ static const struct ScriptCommand s_gs1_g17_s0_lives0_dlg0[] = { /* 0x8146704 */ WAIT(10), MSG_NPC(3, _(" Well, it is still a mere\nrumor.")), ALERT_CUE(6), - ROTATE(4, 2, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_EAST), MSG_NPC(3, _(" I wouldn't put too much\nstock in that story if I were you.")), MSG_NPC(3, _(" Personally, I don't believe\nin rumors of that sort.")), TEXTBOX_CLEAR, WAIT(10), MSG_NPC(2, _(" If you want to know more\nabout the {NAME_6} legend...")), ALERT_CUE(6), - ROTATE(4, 1, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTHEAST), MSG_NPC(2, _(" You should go see a\nPokémon named {NAME_5}.\nHe knows the story well.")), TEXTBOX_CLEAR, WAIT(10), @@ -3907,12 +3907,12 @@ static const struct ScriptCommand s_gs1_g17_s0_lives0_dlg0[] = { /* 0x8146704 */ TEXTBOX_CLEAR, WAIT(10), ALERT_CUE(6), - ROTATE(4, 2, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_NORTH), WAIT(60), ALERT_CUE(7), AWAIT_CUE(5), ALERT_CUE(6), - ROTATE(4, 1, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTHEAST), PORTRAIT(PLACEMENT_TOP_FLIP, 0x0002, 0x00000000), MSG_NPC(2, _(" You should visit him if you\nwant to know more.")), TEXTBOX_CLEAR, @@ -3934,27 +3934,27 @@ static const struct ScriptCommand s_gs1_g17_s0_lives1_dlg0[] = { /* 0x8147160 */ { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, FANFARE_PLAY2(464), CALL_SCRIPT(NOTICE_FUNC), - { 0x8e, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, + CMD_UNK_8E(1, DIR_TRANS_NONE, 0), AWAIT_CUE(6), WALK_GRID(256, 44), ALERT_CUE(5), AWAIT_CUE(6), WALK_RELATIVE(256, 16, 0), - ROTATE(8, 2, DIRECTION_NORTHEAST), + ROTATE_TO(8, DIR_TRANS_SPINLEFT1, DIRECTION_NORTHEAST), WAIT(20), FANFARE_PLAY2(469), CALL_SCRIPT(QUESTION_FUNC), ALERT_CUE(5), AWAIT_CUE(6), - ROTATE(4, 1, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_EAST), AWAIT_CUE(6), - ROTATE(4, 2, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_NORTHEAST), AWAIT_CUE(6), - ROTATE(4, 2, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_NORTHEAST), AWAIT_CUE(6), - ROTATE(4, 2, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_NORTH), AWAIT_CUE(6), - ROTATE(4, 1, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTHEAST), AWAIT_CUE(6), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, RET, @@ -3972,18 +3972,18 @@ static const struct ScriptCommand s_gs1_g17_s0_lives2_dlg0[] = { /* 0x8147330 */ AWAIT_CUE(7), FANFARE_PLAY2(465), CALL_SCRIPT(NOTICE_FUNC), - ROTATE(4, 1, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_WEST), AWAIT_CUE(7), - ROTATE(4, 10, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHWEST), ALERT_CUE(5), AWAIT_CUE(7), - ROTATE(4, 1, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTH), ALERT_CUE(5), AWAIT_CUE(7), - ROTATE(4, 10, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHWEST), ALERT_CUE(5), AWAIT_CUE(7), - ROTATE(4, 10, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_EAST), ALERT_CUE(5), HALT, }; @@ -3995,12 +3995,12 @@ static const struct ScriptCommand s_gs1_g17_s0_lives3_dlg0[] = { /* 0x81474c0 */ { 0x2d, 0x07, 0x0003, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(8), CALL_SCRIPT(NOTICE_FUNC), - ROTATE(4, 1, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_WEST), ALERT_CUE(5), AWAIT_CUE(8), - ROTATE(4, 10, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHWEST), AWAIT_CUE(8), - ROTATE(4, 10, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHWEST), HALT, }; @@ -4010,9 +4010,9 @@ static const struct ScriptCommand s_gs1_g17_s0_lives4_dlg0[] = { /* 0x8147590 */ { 0x2d, 0x07, 0x0004, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(9), CALL_SCRIPT(NOTICE_FUNC), - ROTATE(4, 2, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_WEST), AWAIT_CUE(9), - ROTATE(4, 10, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHWEST), HALT, }; @@ -4132,7 +4132,7 @@ static const struct ScriptCommand s_gs1_g19_s0_lives0_dlg0[] = { /* 0x8147af4 */ VARIANT(/* == */ 1, _(" ...Listen, {NAME_0}.")), VARIANT_DEFAULT(_(" ...Say, {NAME_0}.")), TEXTBOX_CLEAR, - ROTATE(4, 2, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_EAST), WAIT(10), PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000005), MSG_VAR(2, PARTNER_TALK_KIND, 1), @@ -4148,7 +4148,7 @@ static const struct ScriptCommand s_gs1_g19_s0_lives1_dlg0[] = { /* 0x8147cf0 */ DEBUGINFO_O(4148), SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0x93, 0x08, 0x000a, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(8, DIR_TRANS_10, 0), ALERT_CUE(5), HALT, }; @@ -4208,17 +4208,17 @@ static const struct ScriptCommand s_gs1_g20_s0_lives0_dlg0[] = { /* 0x8147f8c */ PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000004), MSG_NPC(1, _(" Huh?")), TEXTBOX_CLEAR, - ROTATE(5, 10, DIRECTION_NORTHWEST), + ROTATE_TO(5, DIR_TRANS_10, DIRECTION_NORTHWEST), ALERT_CUE(6), WAIT(20), - ROTATE(10, 1, DIRECTION_EAST), + ROTATE_TO(10, DIR_TRANS_SPINRIGHT1, DIRECTION_EAST), AWAIT_CUE(5), MSG_NPC(1, _(" The town's atmosphere\nfeels different somehow...")), TEXTBOX_CLEAR, WAIT(30), ALERT_CUE(6), AWAIT_CUE(5), - ROTATE(4, 10, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHEAST), PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000000), MSG_NPC(1, _(" Maybe something's happened.")), MSG_NPC(1, _(" {NAME_0}, let's check\nit out!")), @@ -4242,15 +4242,15 @@ static const struct ScriptCommand s_gs1_g20_s0_lives1_dlg0[] = { /* 0x81481f8 */ ALERT_CUE(5), AWAIT_CUE(6), WALK_RELATIVE(256, 72, 0), - ROTATE(5, 10, DIRECTION_NORTH), + ROTATE_TO(5, DIR_TRANS_10, DIRECTION_NORTH), WAIT(15), - ROTATE(5, 1, DIRECTION_SOUTH), + ROTATE_TO(5, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTH), WAIT(15), - ROTATE(5, 10, DIRECTION_EAST), + ROTATE_TO(5, DIR_TRANS_10, DIRECTION_EAST), WAIT(15), ALERT_CUE(5), AWAIT_CUE(6), - ROTATE(4, 10, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHWEST), ALERT_CUE(5), AWAIT_CUE(6), WALK_RELATIVE(256, 120, 0), @@ -4335,14 +4335,14 @@ static const struct ScriptCommand s_gs1_g21_s0_lives0_dlg0[] = { /* 0x81484d4 */ ALERT_CUE(6), FANFARE_PLAY2(463), CALL_SCRIPT(NOTICE_FUNC), - { 0x93, 0x05, 0x000a, 0x00000036, 0x00000000, NULL }, + CMD_UNK_93(5, DIR_TRANS_10, 54), MSG_NPC(1, _(" Oh, hi, {NAME_3}!")), TEXTBOX_CLEAR, ALERT_CUE(8), AWAIT_CUE(5), ALERT_CUE(6), ALERT_CUE(10), - { 0x93, 0x0a, 0x000a, 0x00000036, 0x00000000, NULL }, + CMD_UNK_93(10, DIR_TRANS_10, 54), WAIT(30), PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000001), MSG_NPC(1, _(" Even you came out,\n{NAME_3}?")), @@ -4372,7 +4372,7 @@ static const struct ScriptCommand s_gs1_g21_s0_lives0_dlg0[] = { /* 0x81484d4 */ ALERT_CUE(6), ALERT_CUE(10), ALERT_CUE(11), - { 0x93, 0x05, 0x000a, 0x0000005b, 0x00000000, NULL }, + CMD_UNK_93(5, DIR_TRANS_10, 91), WAIT(15), ALERT_CUE(4), WAIT(30), @@ -4384,7 +4384,7 @@ static const struct ScriptCommand s_gs1_g21_s0_lives0_dlg0[] = { /* 0x81484d4 */ WAIT(10), ALERT_CUE(6), WALK_DIRECT(150, 55), - { 0x93, 0x05, 0x000a, 0x0000005b, 0x00000000, NULL }, + CMD_UNK_93(5, DIR_TRANS_10, 91), WAIT(30), FANFARE_PLAY2(473), ALERT_CUE(6), @@ -4418,7 +4418,7 @@ static const struct ScriptCommand s_gs1_g21_s0_lives0_dlg0[] = { /* 0x81484d4 */ CALL_LABEL(15), FANFARE_PLAY2(464), CALL_SCRIPT(NOTICE_FUNC), - { 0x93, 0x05, 0x000a, 0x00000022, 0x00000000, NULL }, + CMD_UNK_93(5, DIR_TRANS_10, 34), PORTRAIT(PLACEMENT_TOP_LEFT, 0x0005, 0x00000000), MSG_NPC(5, _(" What?!")), TEXTBOX_CLEAR, @@ -4456,7 +4456,7 @@ static const struct ScriptCommand s_gs1_g21_s0_lives0_dlg0[] = { /* 0x81484d4 */ ALERT_CUE(6), CALL_LABEL(15), FANFARE_PLAY2(473), - { 0x93, 0x05, 0x000a, 0x0000005b, 0x00000000, NULL }, + CMD_UNK_93(5, DIR_TRANS_10, 91), MSG_NPC(4, _(" Wh-what?")), TEXTBOX_CLEAR, WAIT(10), @@ -4592,7 +4592,7 @@ static const struct ScriptCommand s_gs1_g21_s0_lives0_dlg0[] = { /* 0x81484d4 */ ALERT_CUE(11), ALERT_CUE(6), CALL_LABEL(15), - { 0x93, 0x05, 0x000a, 0x0000005b, 0x00000000, NULL }, + CMD_UNK_93(5, DIR_TRANS_10, 91), WAIT(60), ALERT_CUE(7), AWAIT_CUE(5), @@ -4620,11 +4620,11 @@ static const struct ScriptCommand s_gs1_g21_s0_lives0_dlg0[] = { /* 0x81484d4 */ VARIANT_DEFAULT(_(" E-everyone, what's gotten\ninto you?{WAIT_PRESS}\nWhat are you going to do?")), TEXTBOX_CLEAR, ALERT_CUE(6), - ROTATE(5, 2, DIRECTION_NORTH), + ROTATE_TO(5, DIR_TRANS_SPINLEFT1, DIRECTION_NORTH), WAIT(15), - ROTATE(5, 1, DIRECTION_SOUTH), + ROTATE_TO(5, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTH), WAIT(15), - ROTATE(5, 2, DIRECTION_EAST), + ROTATE_TO(5, DIR_TRANS_SPINLEFT1, DIRECTION_EAST), { 0x62, 0x00, 0x004c, -0x00000008, 0x00000000, NULL }, AWAIT_CUE(5), PORTRAIT(PLACEMENT_RIGHT, 0x0004, 0x00000000), @@ -4655,7 +4655,7 @@ static const struct ScriptCommand s_gs1_g21_s0_lives0_dlg0[] = { /* 0x81484d4 */ MSG_NPC(1, _(" Waaaaah!{WAIT_PRESS}\n{NAME_0}, run!")), TEXTBOX_CLEAR, { 0xe5, 0x00, 0x0006, 0x00000000, 0x00000000, NULL }, - { 0x93, 0x02, 0x000a, 0x00000022, 0x00000000, NULL }, + CMD_UNK_93(2, DIR_TRANS_10, 34), ALERT_CUE(9), ALERT_CUE(10), ALERT_CUE(11), @@ -4737,29 +4737,29 @@ static const struct ScriptCommand s_gs1_g21_s0_lives1_dlg0[] = { /* 0x814a970 */ AWAIT_CUE(6), CALL_SCRIPT(NOTICE_FUNC), AWAIT_CUE(6), - ROTATE(5, 10, DIRECTION_SOUTHEAST), + ROTATE_TO(5, DIR_TRANS_10, DIRECTION_SOUTHEAST), AWAIT_CUE(6), - { 0x93, 0x0a, 0x000a, 0x0000005b, 0x00000000, NULL }, + CMD_UNK_93(10, DIR_TRANS_10, 91), AWAIT_CUE(6), WALK_DIRECT(150, 54), - { 0x93, 0x05, 0x000a, 0x0000005b, 0x00000000, NULL }, + CMD_UNK_93(5, DIR_TRANS_10, 91), AWAIT_CUE(6), CALL_SCRIPT(SHOCK_FUNC), WAIT(15), ALERT_CUE(5), AWAIT_CUE(6), CALL_SCRIPT(NOTICE_FUNC), - { 0x93, 0x05, 0x000a, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(5, DIR_TRANS_10, 0), AWAIT_CUE(6), - { 0x93, 0x05, 0x000a, 0x0000005b, 0x00000000, NULL }, + CMD_UNK_93(5, DIR_TRANS_10, 91), AWAIT_CUE(6), AWAIT_CUE(6), CALL_SCRIPT(SHOCK_FUNC), AWAIT_CUE(6), LABEL(0), /* = 0x00 */ - ROTATE(8, 10, DIRECTION_NORTHEAST), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_NORTHEAST), WAIT(15), - ROTATE(8, 10, DIRECTION_SOUTH), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_SOUTH), WAIT(15), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 1), @@ -4767,7 +4767,7 @@ static const struct ScriptCommand s_gs1_g21_s0_lives1_dlg0[] = { /* 0x814a970 */ LABEL(1), /* = 0x01 */ WAIT(15), WALK_RELATIVE(256, 16, 0), - { 0x93, 0x05, 0x000a, 0x00000050, 0x00000000, NULL }, + CMD_UNK_93(5, DIR_TRANS_10, 80), ALERT_CUE(5), AWAIT_CUE(6), { 0x54, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, @@ -4777,33 +4777,33 @@ static const struct ScriptCommand s_gs1_g21_s0_lives1_dlg0[] = { /* 0x814a970 */ WAIT(60), SELECT_ANIMATION(2), AWAIT_CUE(6), - ROTATE(4, 10, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHWEST), AWAIT_CUE(6), - { 0x93, 0x05, 0x000a, 0x0000005b, 0x00000000, NULL }, + CMD_UNK_93(5, DIR_TRANS_10, 91), AWAIT_CUE(6), { 0x56, 0x00, 0x0000, 0x0000005b, 0x00000000, NULL }, SELECT_ANIMATION(4), - ROTATE(4, 10, DIRECTION_NORTHEAST), - ROTATE(4, 10, DIRECTION_SOUTH), - ROTATE(4, 10, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHEAST), AWAIT_CUE(6), SELECT_ANIMATION(2), { 0x62, 0x00, 0x004c, -0x00000008, -0x00000008, NULL }, { 0x56, 0x00, 0x0000, 0x0000005b, 0x00000000, NULL }, - ROTATE(2, 2, DIRECTION_NORTH), + ROTATE_TO(2, DIR_TRANS_SPINLEFT1, DIRECTION_NORTH), WAIT(15), { 0x62, 0x00, 0x004c, -0x00000008, 0x00000008, NULL }, AWAIT_CUE(6), - { 0x93, 0x02, 0x000a, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(2, DIR_TRANS_10, 0), { 0x56, 0x00, 0x0000, 0x0000005b, 0x00000000, NULL }, AWAIT_CUE(6), CALL_SCRIPT(SHOCK_FUNC), CALL_SCRIPT(SHOCK_FUNC), WALK_GRID(512, 55), - ROTATE(2, 10, DIRECTION_EAST), + ROTATE_TO(2, DIR_TRANS_10, DIRECTION_EAST), { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(6), - ROTATE(2, 10, DIRECTION_NORTHWEST), + ROTATE_TO(2, DIR_TRANS_10, DIRECTION_NORTHWEST), WAIT(15), ALERT_CUE(5), AWAIT_CUE(6), @@ -4822,13 +4822,13 @@ static const struct ScriptCommand s_gs1_g21_s0_lives2_dlg0[] = { /* 0x814aee0 */ AWAIT_CUE(7), CALL_SCRIPT(SMILE_END_FUNC), AWAIT_CUE(7), - { 0x93, 0x05, 0x000a, 0x0000004d, 0x00000000, NULL }, + CMD_UNK_93(5, DIR_TRANS_10, 77), { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(7), - ROTATE(5, 10, DIRECTION_SOUTH), + ROTATE_TO(5, DIR_TRANS_10, DIRECTION_SOUTH), { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(7), - ROTATE(10, 10, DIRECTION_SOUTHWEST), + ROTATE_TO(10, DIR_TRANS_10, DIRECTION_SOUTHWEST), SELECT_ANIMATION(2), { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(7), @@ -4840,24 +4840,24 @@ static const struct ScriptCommand s_gs1_g21_s0_lives2_dlg0[] = { /* 0x814aee0 */ CALL_SCRIPT(SMILE_END_FUNC), { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(7), - ROTATE(6, 1, DIRECTION_WEST), + ROTATE_TO(6, DIR_TRANS_SPINRIGHT1, DIRECTION_WEST), WAIT(15), - ROTATE(6, 2, DIRECTION_EAST), + ROTATE_TO(6, DIR_TRANS_SPINLEFT1, DIRECTION_EAST), WAIT(15), - ROTATE(6, 10, DIRECTION_SOUTH), + ROTATE_TO(6, DIR_TRANS_10, DIRECTION_SOUTH), { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(7), - ROTATE(5, 10, DIRECTION_SOUTHWEST), + ROTATE_TO(5, DIR_TRANS_10, DIRECTION_SOUTHWEST), CALL_SCRIPT(SMILE_START_FUNC), { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(7), CALL_SCRIPT(SMILE_END_FUNC), { 0x8b, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x62, 0x00, 0x004c, 0x00000000, -0x00000010, NULL }, - { 0x93, 0x05, 0x000a, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(5, DIR_TRANS_10, 0), { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(7), - ROTATE(5, 10, DIRECTION_WEST), + ROTATE_TO(5, DIR_TRANS_10, DIRECTION_WEST), CALL_SCRIPT(SMILE_START_FUNC), AWAIT_CUE(7), HALT, @@ -4869,7 +4869,7 @@ static const struct ScriptCommand s_gs1_g21_s0_lives3_dlg0[] = { /* 0x814b1e0 */ { 0x2d, 0x07, 0x0003, 0x00000000, 0x00000000, NULL }, { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, AWAIT_CUE(8), - { 0x93, 0x05, 0x000a, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(5, DIR_TRANS_10, 0), FANFARE_PLAY2(465), CALL_SCRIPT(NOTICE_FUNC), { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -4878,13 +4878,13 @@ static const struct ScriptCommand s_gs1_g21_s0_lives3_dlg0[] = { /* 0x814b1e0 */ WALK_GRID(256, 61), ALERT_CUE(5), AWAIT_CUE(8), - { 0x93, 0x0a, 0x000a, 0x0000005b, 0x00000000, NULL }, + CMD_UNK_93(10, DIR_TRANS_10, 91), WAIT(30), ALERT_CUE(5), AWAIT_CUE(8), WALK_GRID(128, 62), WALK_GRID(128, 53), - { 0x93, 0x05, 0x000a, 0x0000005b, 0x00000000, NULL }, + CMD_UNK_93(5, DIR_TRANS_10, 91), AWAIT_CUE(8), CALL_SCRIPT(SHOCK_FUNC), AWAIT_CUE(8), @@ -4899,16 +4899,16 @@ static const struct ScriptCommand s_gs1_g21_s0_lives3_dlg0[] = { /* 0x814b1e0 */ COND_EQUAL(2, /* to label */ 4), COND_EQUAL(3, /* to label */ 5), LABEL(2), /* = 0x02 */ - ROTATE(5, 10, DIRECTION_NORTH), + ROTATE_TO(5, DIR_TRANS_10, DIRECTION_NORTH), JUMP_LABEL(6), LABEL(3), /* = 0x03 */ - ROTATE(5, 10, DIRECTION_NORTHEAST), + ROTATE_TO(5, DIR_TRANS_10, DIRECTION_NORTHEAST), JUMP_LABEL(6), LABEL(4), /* = 0x04 */ - ROTATE(5, 10, DIRECTION_NORTHWEST), + ROTATE_TO(5, DIR_TRANS_10, DIRECTION_NORTHWEST), JUMP_LABEL(6), LABEL(5), /* = 0x05 */ - ROTATE(5, 10, DIRECTION_EAST), + ROTATE_TO(5, DIR_TRANS_10, DIRECTION_EAST), JUMP_LABEL(6), LABEL(6), /* = 0x06 */ WAIT_RANDOM(15, 90), @@ -4916,28 +4916,28 @@ static const struct ScriptCommand s_gs1_g21_s0_lives3_dlg0[] = { /* 0x814b1e0 */ LABEL(1), /* = 0x01 */ CALL_SCRIPT(NOTICE_FUNC), { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x93, 0x05, 0x000a, 0x0000005b, 0x00000000, NULL }, + CMD_UNK_93(5, DIR_TRANS_10, 91), AWAIT_CUE(8), AWAIT_CUE(8), CALL_SCRIPT(SHOCK_FUNC), { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - ROTATE(5, 10, DIRECTION_NORTHWEST), + ROTATE_TO(5, DIR_TRANS_10, DIRECTION_NORTHWEST), AWAIT_CUE(8), - { 0x93, 0x05, 0x000a, 0x0000005b, 0x00000000, NULL }, + CMD_UNK_93(5, DIR_TRANS_10, 91), AWAIT_CUE(8), - ROTATE(8, 2, DIRECTION_NORTHWEST), - ROTATE(8, 1, DIRECTION_NORTHEAST), - ROTATE(8, 2, DIRECTION_NORTH), + ROTATE_TO(8, DIR_TRANS_SPINLEFT1, DIRECTION_NORTHWEST), + ROTATE_TO(8, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTHEAST), + ROTATE_TO(8, DIR_TRANS_SPINLEFT1, DIRECTION_NORTH), AWAIT_CUE(8), { 0x8b, 0x00, 0x0003, 0x00000000, 0x00000000, NULL }, { 0x62, 0x00, 0x0080, -0x00000010, 0x00000010, NULL }, WAIT(30), - { 0x93, 0x05, 0x000a, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(5, DIR_TRANS_10, 0), AWAIT_CUE(8), { 0x56, 0x00, 0x0000, 0x0000005b, 0x00000000, NULL }, AWAIT_CUE(8), WAIT(15), - ROTATE(4, 2, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_NORTHWEST), { 0x52, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, HALT, }; @@ -4960,16 +4960,16 @@ static const struct ScriptCommand s_gs1_g21_s0_lives4_dlg0[] = { /* 0x814b6a0 */ COND_EQUAL(2, /* to label */ 5), COND_EQUAL(3, /* to label */ 6), LABEL(3), /* = 0x03 */ - ROTATE(5, 10, DIRECTION_NORTH), + ROTATE_TO(5, DIR_TRANS_10, DIRECTION_NORTH), JUMP_LABEL(7), LABEL(4), /* = 0x04 */ - ROTATE(5, 10, DIRECTION_SOUTHWEST), + ROTATE_TO(5, DIR_TRANS_10, DIRECTION_SOUTHWEST), JUMP_LABEL(7), LABEL(5), /* = 0x05 */ - ROTATE(5, 10, DIRECTION_NORTHWEST), + ROTATE_TO(5, DIR_TRANS_10, DIRECTION_NORTHWEST), JUMP_LABEL(7), LABEL(6), /* = 0x06 */ - ROTATE(5, 10, DIRECTION_WEST), + ROTATE_TO(5, DIR_TRANS_10, DIRECTION_WEST), JUMP_LABEL(7), LABEL(7), /* = 0x07 */ WAIT_RANDOM(15, 90), @@ -4977,25 +4977,25 @@ static const struct ScriptCommand s_gs1_g21_s0_lives4_dlg0[] = { /* 0x814b6a0 */ LABEL(1), /* = 0x01 */ CALL_SCRIPT(NOTICE_FUNC), { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x93, 0x05, 0x000a, 0x0000005b, 0x00000000, NULL }, + CMD_UNK_93(5, DIR_TRANS_10, 91), AWAIT_CUE(9), CALL_SCRIPT(NOTICE_FUNC), AWAIT_CUE(9), - { 0x93, 0x05, 0x000a, 0x00000050, 0x00000000, NULL }, + CMD_UNK_93(5, DIR_TRANS_10, 80), ALERT_CUE(5), AWAIT_CUE(9), - { 0x93, 0x05, 0x000a, 0x0000005b, 0x00000000, NULL }, + CMD_UNK_93(5, DIR_TRANS_10, 91), AWAIT_CUE(9), CALL_SCRIPT(SHOCK_FUNC), { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x93, 0x05, 0x000a, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(5, DIR_TRANS_10, 0), AWAIT_CUE(9), - { 0x93, 0x05, 0x000a, 0x0000005b, 0x00000000, NULL }, + CMD_UNK_93(5, DIR_TRANS_10, 91), AWAIT_CUE(9), - { 0x93, 0x05, 0x000a, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(5, DIR_TRANS_10, 0), AWAIT_CUE(9), WALK_GRID(128, 57), - { 0x93, 0x05, 0x000a, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(5, DIR_TRANS_10, 0), AWAIT_CUE(9), WALK_DIRECT(30, 55), { 0x57, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, @@ -5022,7 +5022,7 @@ static const struct ScriptCommand s_gs1_g21_s0_lives5_dlg0[] = { /* 0x814bad0 */ FANFARE_PLAY2(465), CALL_SCRIPT(NOTICE_FUNC), { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x93, 0x04, 0x000a, 0x00000022, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 34), WAIT(15), WALK_GRID(204, 59), ALERT_CUE(5), @@ -5031,15 +5031,15 @@ static const struct ScriptCommand s_gs1_g21_s0_lives5_dlg0[] = { /* 0x814bad0 */ SELECT_ANIMATION(4), AWAIT_CUE(10), SELECT_ANIMATION(2), - { 0x93, 0x04, 0x0002, 0x00000036, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_SPINLEFT1, 54), AWAIT_CUE(10), - { 0x93, 0x04, 0x000a, 0x00000036, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 54), AWAIT_CUE(10), - { 0x93, 0x05, 0x000a, 0x0000005b, 0x00000000, NULL }, + CMD_UNK_93(5, DIR_TRANS_10, 91), AWAIT_CUE(10), WALK_GRID(128, 60), WALK_GRID(128, 56), - { 0x93, 0x05, 0x000a, 0x0000005b, 0x00000000, NULL }, + CMD_UNK_93(5, DIR_TRANS_10, 91), AWAIT_CUE(10), CALL_SCRIPT(SHOCK_FUNC), AWAIT_CUE(10), @@ -5054,16 +5054,16 @@ static const struct ScriptCommand s_gs1_g21_s0_lives5_dlg0[] = { /* 0x814bad0 */ COND_EQUAL(2, /* to label */ 5), COND_EQUAL(3, /* to label */ 6), LABEL(3), /* = 0x03 */ - ROTATE(5, 10, DIRECTION_EAST), + ROTATE_TO(5, DIR_TRANS_10, DIRECTION_EAST), JUMP_LABEL(7), LABEL(4), /* = 0x04 */ - ROTATE(5, 10, DIRECTION_SOUTHEAST), + ROTATE_TO(5, DIR_TRANS_10, DIRECTION_SOUTHEAST), JUMP_LABEL(7), LABEL(5), /* = 0x05 */ - ROTATE(5, 10, DIRECTION_SOUTH), + ROTATE_TO(5, DIR_TRANS_10, DIRECTION_SOUTH), JUMP_LABEL(7), LABEL(6), /* = 0x06 */ - ROTATE(5, 10, DIRECTION_SOUTHWEST), + ROTATE_TO(5, DIR_TRANS_10, DIRECTION_SOUTHWEST), JUMP_LABEL(7), LABEL(7), /* = 0x07 */ WAIT_RANDOM(15, 90), @@ -5071,23 +5071,23 @@ static const struct ScriptCommand s_gs1_g21_s0_lives5_dlg0[] = { /* 0x814bad0 */ LABEL(1), /* = 0x01 */ CALL_SCRIPT(NOTICE_FUNC), { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x93, 0x05, 0x000a, 0x0000005b, 0x00000000, NULL }, + CMD_UNK_93(5, DIR_TRANS_10, 91), AWAIT_CUE(10), AWAIT_CUE(10), CALL_SCRIPT(SHOCK_FUNC), { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x93, 0x05, 0x000a, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(5, DIR_TRANS_10, 0), AWAIT_CUE(10), - { 0x93, 0x05, 0x000a, 0x0000005b, 0x00000000, NULL }, + CMD_UNK_93(5, DIR_TRANS_10, 91), AWAIT_CUE(10), - { 0x93, 0x05, 0x000a, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(5, DIR_TRANS_10, 0), AWAIT_CUE(10), { 0x8b, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x62, 0x00, 0x004c, -0x00000008, 0x00000000, NULL }, AWAIT_CUE(10), { 0x62, 0x00, 0x004c, 0x00000000, 0x00000008, NULL }, AWAIT_CUE(10), - ROTATE(5, 1, DIRECTION_WEST), + ROTATE_TO(5, DIR_TRANS_SPINRIGHT1, DIRECTION_WEST), WAIT(15), { 0x62, 0x00, 0x0200, -0x00000008, 0x00000008, NULL }, { 0x52, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, @@ -5100,16 +5100,16 @@ static const struct ScriptCommand s_gs1_g21_s0_lives6_dlg0[] = { /* 0x814bfb0 */ SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0006, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(11), - { 0x93, 0x02, 0x000a, 0x00000022, 0x00000000, NULL }, + CMD_UNK_93(2, DIR_TRANS_10, 34), CALL_SCRIPT(ANGRY_START_FUNC), ALERT_CUE(5), AWAIT_CUE(11), CALL_SCRIPT(ANGRY_END_FUNC), AWAIT_CUE(11), - { 0x93, 0x05, 0x000a, 0x0000005b, 0x00000000, NULL }, + CMD_UNK_93(5, DIR_TRANS_10, 91), AWAIT_CUE(11), WALK_GRID(128, 52), - { 0x93, 0x05, 0x000a, 0x0000005b, 0x00000000, NULL }, + CMD_UNK_93(5, DIR_TRANS_10, 91), AWAIT_CUE(11), CALL_SCRIPT(SHOCK_FUNC), AWAIT_CUE(11), @@ -5124,16 +5124,16 @@ static const struct ScriptCommand s_gs1_g21_s0_lives6_dlg0[] = { /* 0x814bfb0 */ COND_EQUAL(2, /* to label */ 5), COND_EQUAL(3, /* to label */ 6), LABEL(3), /* = 0x03 */ - ROTATE(5, 10, DIRECTION_NORTH), + ROTATE_TO(5, DIR_TRANS_10, DIRECTION_NORTH), JUMP_LABEL(7), LABEL(4), /* = 0x04 */ - ROTATE(5, 10, DIRECTION_NORTHEAST), + ROTATE_TO(5, DIR_TRANS_10, DIRECTION_NORTHEAST), JUMP_LABEL(7), LABEL(5), /* = 0x05 */ - ROTATE(5, 10, DIRECTION_NORTHWEST), + ROTATE_TO(5, DIR_TRANS_10, DIRECTION_NORTHWEST), JUMP_LABEL(7), LABEL(6), /* = 0x06 */ - ROTATE(5, 10, DIRECTION_WEST), + ROTATE_TO(5, DIR_TRANS_10, DIRECTION_WEST), JUMP_LABEL(7), LABEL(7), /* = 0x07 */ WAIT_RANDOM(15, 90), @@ -5141,30 +5141,30 @@ static const struct ScriptCommand s_gs1_g21_s0_lives6_dlg0[] = { /* 0x814bfb0 */ LABEL(1), /* = 0x01 */ CALL_SCRIPT(NOTICE_FUNC), { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x93, 0x05, 0x000a, 0x0000005b, 0x00000000, NULL }, + CMD_UNK_93(5, DIR_TRANS_10, 91), AWAIT_CUE(11), CALL_SCRIPT(NOTICE_FUNC), AWAIT_CUE(11), - { 0x93, 0x05, 0x000a, 0x0000004d, 0x00000000, NULL }, + CMD_UNK_93(5, DIR_TRANS_10, 77), ALERT_CUE(5), AWAIT_CUE(11), - { 0x93, 0x05, 0x000a, 0x0000005b, 0x00000000, NULL }, + CMD_UNK_93(5, DIR_TRANS_10, 91), AWAIT_CUE(11), CALL_SCRIPT(SHOCK_FUNC), { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x93, 0x05, 0x000a, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(5, DIR_TRANS_10, 0), AWAIT_CUE(11), CALL_SCRIPT(ANGRY_START_FUNC), - { 0x93, 0x05, 0x000a, 0x00000022, 0x00000000, NULL }, + CMD_UNK_93(5, DIR_TRANS_10, 34), AWAIT_CUE(11), - { 0x93, 0x05, 0x000a, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(5, DIR_TRANS_10, 0), CALL_SCRIPT(ANGRY_END_FUNC), WAIT(30), ALERT_CUE(5), AWAIT_CUE(11), - { 0x93, 0x05, 0x000a, 0x0000005b, 0x00000000, NULL }, + CMD_UNK_93(5, DIR_TRANS_10, 91), AWAIT_CUE(11), - { 0x93, 0x05, 0x000a, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(5, DIR_TRANS_10, 0), AWAIT_CUE(11), WALK_RELATIVE(76, -24, 0), { 0x8b, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, @@ -5172,7 +5172,7 @@ static const struct ScriptCommand s_gs1_g21_s0_lives6_dlg0[] = { /* 0x814bfb0 */ AWAIT_CUE(11), { 0x62, 0x00, 0x004c, -0x00000008, 0x00000000, NULL }, AWAIT_CUE(11), - ROTATE(5, 2, DIRECTION_WEST), + ROTATE_TO(5, DIR_TRANS_SPINLEFT1, DIRECTION_WEST), WAIT(15), { 0x62, 0x00, 0x0200, -0x00000008, -0x00000008, NULL }, HALT, @@ -5190,32 +5190,32 @@ static const struct ScriptCommand s_gs1_g21_s0_lives7_dlg0[] = { /* 0x814c4b0 */ LABEL(0), /* = 0x00 */ CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 1), - ROTATE(6, 2, DIRECTION_SOUTHEAST), + ROTATE_TO(6, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTHEAST), WAIT_RANDOM(15, 90), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 1), - ROTATE(6, 1, DIRECTION_WEST), + ROTATE_TO(6, DIR_TRANS_SPINRIGHT1, DIRECTION_WEST), WAIT_RANDOM(15, 90), JUMP_LABEL(0), LABEL(1), /* = 0x01 */ CALL_SCRIPT(NOTICE_FUNC), { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x93, 0x04, 0x000a, 0x0000005b, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 91), AWAIT_CUE(12), CALL_LABEL(2), CALL_SCRIPT(SHOCK_FUNC), { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 0), AWAIT_CUE(12), CALL_LABEL(2), - { 0x93, 0x04, 0x000a, 0x0000005b, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 91), AWAIT_CUE(12), CALL_LABEL(2), - { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 0), AWAIT_CUE(12), CALL_LABEL(2), WALK_RELATIVE(128, -64, -8), - { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 0), AWAIT_CUE(12), CALL_LABEL(2), WALK_RELATIVE(768, -16, 8), @@ -5237,32 +5237,32 @@ static const struct ScriptCommand s_gs1_g21_s0_lives8_dlg0[] = { /* 0x814c770 */ LABEL(0), /* = 0x00 */ CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 1), - ROTATE(6, 1, DIRECTION_NORTHEAST), + ROTATE_TO(6, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTHEAST), WAIT_RANDOM(15, 90), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 1), - ROTATE(6, 2, DIRECTION_WEST), + ROTATE_TO(6, DIR_TRANS_SPINLEFT1, DIRECTION_WEST), WAIT_RANDOM(15, 90), JUMP_LABEL(0), LABEL(1), /* = 0x01 */ CALL_SCRIPT(NOTICE_FUNC), { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x93, 0x04, 0x000a, 0x0000005b, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 91), AWAIT_CUE(13), CALL_LABEL(2), CALL_SCRIPT(SHOCK_FUNC), { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 0), AWAIT_CUE(13), CALL_LABEL(2), - { 0x93, 0x04, 0x000a, 0x0000005b, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 91), AWAIT_CUE(13), CALL_LABEL(2), - { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 0), AWAIT_CUE(13), CALL_LABEL(2), WALK_RELATIVE(128, -24, -8), - { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 0), AWAIT_CUE(13), CALL_LABEL(2), { 0x62, 0x00, 0x0300, -0x00000008, 0x00000000, NULL }, @@ -5297,23 +5297,23 @@ static const struct ScriptCommand s_gs1_g21_s0_lives9_dlg0[] = { /* 0x814ca30 */ LABEL(1), /* = 0x01 */ CALL_SCRIPT(NOTICE_FUNC), { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x93, 0x04, 0x000a, 0x0000005b, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 91), AWAIT_CUE(14), CALL_LABEL(3), CALL_SCRIPT(SHOCK_FUNC), { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 0), AWAIT_CUE(14), CALL_LABEL(3), - { 0x93, 0x04, 0x000a, 0x0000005b, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 91), AWAIT_CUE(14), CALL_LABEL(3), - { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 0), AWAIT_CUE(14), CALL_LABEL(3), WALK_RELATIVE(128, -32, 0), WALK_RELATIVE(128, -32, 24), - { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 0), AWAIT_CUE(14), CALL_LABEL(3), { 0x62, 0x00, 0x0100, -0x00000020, 0x00000000, NULL }, @@ -5346,23 +5346,23 @@ static const struct ScriptCommand s_gs1_g21_s0_lives10_dlg0[] = { /* 0x814cd40 * LABEL(1), /* = 0x01 */ CALL_SCRIPT(NOTICE_FUNC), { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x93, 0x04, 0x000a, 0x0000005b, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 91), AWAIT_CUE(15), CALL_LABEL(2), CALL_SCRIPT(SHOCK_FUNC), { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 0), AWAIT_CUE(15), CALL_LABEL(2), - { 0x93, 0x04, 0x000a, 0x0000005b, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 91), AWAIT_CUE(15), CALL_LABEL(2), - { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 0), AWAIT_CUE(15), CALL_LABEL(2), - { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 0), AWAIT_CUE(15), - ROTATE(4, 10, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_WEST), AWAIT_CUE(15), LABEL(2), /* = 0x02 */ WAIT_RANDOM(0, 30), @@ -5380,32 +5380,32 @@ static const struct ScriptCommand s_gs1_g21_s0_lives11_dlg0[] = { /* 0x814cfe0 * { 0x56, 0x00, 0x0000, 0x0000005b, 0x00000000, NULL }, CALL_SCRIPT(JUMP_SURPRISE_FUNC), WAIT(15), - { 0x93, 0x04, 0x000a, 0x00000047, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 71), SELECT_ANIMATION(4), AWAIT_CUE(16), CALL_SCRIPT(NOTICE_FUNC), { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, SELECT_ANIMATION(2), - { 0x93, 0x04, 0x000a, 0x0000005b, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 91), AWAIT_CUE(16), CALL_LABEL(0), CALL_SCRIPT(SHOCK_FUNC), { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, SELECT_ANIMATION(2), - { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 0), AWAIT_CUE(16), CALL_LABEL(0), - { 0x93, 0x04, 0x000a, 0x0000005b, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 91), AWAIT_CUE(16), CALL_LABEL(0), - { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 0), AWAIT_CUE(16), WAIT(15), WALK_RELATIVE(76, -24, -16), - { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 0), AWAIT_CUE(16), CALL_LABEL(0), - { 0x93, 0x04, 0x000a, 0x00000047, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 71), { 0x52, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, AWAIT_CUE(16), LABEL(0), /* = 0x00 */ @@ -5424,31 +5424,31 @@ static const struct ScriptCommand s_gs1_g21_s0_lives12_dlg0[] = { /* 0x814d270 * { 0x56, 0x00, 0x0000, 0x0000005b, 0x00000000, NULL }, CALL_SCRIPT(JUMP_SURPRISE_FUNC), WAIT(15), - { 0x93, 0x04, 0x000a, 0x00000046, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 70), SELECT_ANIMATION(4), AWAIT_CUE(17), CALL_SCRIPT(NOTICE_FUNC), { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, SELECT_ANIMATION(2), - { 0x93, 0x04, 0x000a, 0x0000005b, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 91), AWAIT_CUE(17), CALL_LABEL(0), CALL_SCRIPT(SHOCK_FUNC), { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 0), AWAIT_CUE(17), CALL_LABEL(0), - { 0x93, 0x04, 0x000a, 0x0000005b, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 91), AWAIT_CUE(17), CALL_LABEL(0), - { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 0), AWAIT_CUE(17), WAIT(30), WALK_RELATIVE(76, -16, -8), - { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 0), AWAIT_CUE(17), CALL_LABEL(0), - { 0x93, 0x04, 0x000a, 0x00000046, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 70), { 0x52, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, AWAIT_CUE(17), LABEL(0), /* = 0x00 */ @@ -5810,7 +5810,7 @@ static const struct ScriptCommand s_gs1_g23_s0_lives0_dlg0[] = { /* 0x814dc14 */ ALERT_CUE(6), AWAIT_CUE(5), PORTRAIT_REP(0x0001, 0x00000003), - { 0x93, 0x01, 0x000b, 0x0000005b, 0x00000000, NULL }, + CMD_UNK_93(1, DIR_TRANS_11, 91), MSG_NPC(1, _(" Hm! Oh, it's you,\n{NAME_2}.\nIt's been a while.")), TEXTBOX_CLEAR, PORTRAIT_REP(0x0002, 0x00000044), @@ -5884,7 +5884,7 @@ static const struct ScriptCommand s_gs1_g23_s0_lives0_dlg0[] = { /* 0x814dc14 */ ALERT_CUE(12), ALERT_CUE(13), AWAIT_CUE(5), - { 0x93, 0x04, 0x000b, 0x00000022, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_11, 34), WAIT(45), PORTRAIT_REP(0x0002, 0x00000041), MSG_NPC(2, _(" That's right.\nSome hard evidence! Kekeh!")), @@ -5920,7 +5920,7 @@ static const struct ScriptCommand s_gs1_g23_s0_lives0_dlg0[] = { /* 0x814dc14 */ ALERT_CUE(11), ALERT_CUE(6), AWAIT_CUE(5), - ROTATE(4, 11, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_SOUTHEAST), PORTRAIT(PLACEMENT_LEFT_, 0x0006, 0x00000000), MSG_NPC(6, _(" I...{WAIT_PRESS}\nI always believed in {NAME_0}!")), ALERT_CUE(11), @@ -5939,7 +5939,7 @@ static const struct ScriptCommand s_gs1_g23_s0_lives0_dlg0[] = { /* 0x814dc14 */ ALERT_CUE(9), ALERT_CUE(10), AWAIT_CUE(5), - { 0x93, 0x04, 0x000b, 0x0000005b, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_11, 91), WAIT(30), ALERT_CUE(7), ALERT_CUE(12), @@ -5992,7 +5992,7 @@ static const struct ScriptCommand s_gs1_g23_s0_lives0_dlg0[] = { /* 0x814dc14 */ ALERT_CUE(11), ALERT_CUE(12), ALERT_CUE(13), - ROTATE(4, 10, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_EAST), ALERT_CUE(15), WAIT(15), TEXTBOX_AUTO_PRESS(210, 210), @@ -6000,10 +6000,10 @@ static const struct ScriptCommand s_gs1_g23_s0_lives0_dlg0[] = { /* 0x814dc14 */ MSG_NPC(9, _(" Extra! Extra!\nRead all about it!")), TEXTBOX_CLEAR2, TEXTBOX_AUTO_PRESS(-1, -1), - ROTATE(10, 10, DIRECTION_NORTHEAST), + ROTATE_TO(10, DIR_TRANS_10, DIRECTION_NORTHEAST), AWAIT_CUE(5), WAIT(20), - ROTATE(8, 10, DIRECTION_EAST), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_EAST), AWAIT_CUE(5), WAIT(90), FANFARE_PLAY2(468), @@ -6064,7 +6064,7 @@ static const struct ScriptCommand s_gs1_g23_s0_lives0_dlg0[] = { /* 0x814dc14 */ WAIT(10), ALERT_CUE(6), ALERT_CUE(16), - ROTATE(4, 11, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_NORTH), WAIT(80), FANFARE_PLAY2(471), ALERT_CUE(8), @@ -6082,7 +6082,7 @@ static const struct ScriptCommand s_gs1_g23_s0_lives0_dlg0[] = { /* 0x814dc14 */ WAIT(30), ALERT_CUE(6), ALERT_CUE(16), - { 0x93, 0x08, 0x000b, 0x00000036, 0x00000000, NULL }, + CMD_UNK_93(8, DIR_TRANS_11, 54), WAIT(30), PORTRAIT(PLACEMENT_RIGHT, 0x0006, 0x00000000), MSG_NPC(6, _(" Welcome back!")), @@ -6099,7 +6099,7 @@ static const struct ScriptCommand s_gs1_g23_s0_lives0_dlg0[] = { /* 0x814dc14 */ TEXTBOX_CLEAR, ALERT_CUE(6), AWAIT_CUE(5), - { 0x93, 0x04, 0x000b, 0x00000022, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_11, 34), PORTRAIT_REP(0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" All right, {NAME_0}.")), @@ -6169,10 +6169,10 @@ static const struct ScriptCommand s_gs1_g23_s0_lives1_dlg0[] = { /* 0x8150a08 */ WALK_GRID(256, 66), { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(6), - { 0x93, 0x04, 0x000b, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_11, 0), ALERT_CUE(5), AWAIT_CUE(6), - { 0x93, 0x04, 0x000b, 0x0000005b, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_11, 91), ALERT_CUE(5), AWAIT_CUE(6), CALL_SCRIPT(JUMP_ANGRY_FUNC), @@ -6182,23 +6182,23 @@ static const struct ScriptCommand s_gs1_g23_s0_lives1_dlg0[] = { /* 0x8150a08 */ ALERT_CUE(5), AWAIT_CUE(6), WAIT(5), - { 0x93, 0x04, 0x000b, 0x00000036, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_11, 54), AWAIT_CUE(6), - { 0x93, 0x04, 0x000b, 0x0000005b, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_11, 91), AWAIT_CUE(6), - ROTATE(4, 10, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_EAST), WAIT(210), - ROTATE(10, 10, DIRECTION_NORTHEAST), + ROTATE_TO(10, DIR_TRANS_10, DIRECTION_NORTHEAST), AWAIT_CUE(6), - ROTATE(12, 10, DIRECTION_NORTH), + ROTATE_TO(12, DIR_TRANS_10, DIRECTION_NORTH), WAIT(45), - ROTATE(12, 10, DIRECTION_EAST), + ROTATE_TO(12, DIR_TRANS_10, DIRECTION_EAST), AWAIT_CUE(6), - ROTATE(4, 11, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_NORTH), AWAIT_CUE(6), - { 0x93, 0x04, 0x000b, 0x00000036, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_11, 54), AWAIT_CUE(6), - { 0x93, 0x04, 0x000b, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_11, 0), ALERT_CUE(5), AWAIT_CUE(6), HALT, @@ -6213,15 +6213,15 @@ static const struct ScriptCommand s_gs1_g23_s0_lives2_dlg0[] = { /* 0x8150cb8 */ WALK_GRID(256, 68), AWAIT_CUE(16), WAIT(220), - ROTATE(12, 10, DIRECTION_NORTHEAST), + ROTATE_TO(12, DIR_TRANS_10, DIRECTION_NORTHEAST), AWAIT_CUE(16), WAIT(45), - ROTATE(12, 10, DIRECTION_EAST), + ROTATE_TO(12, DIR_TRANS_10, DIRECTION_EAST), AWAIT_CUE(16), - ROTATE(8, 10, DIRECTION_NORTHEAST), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_NORTHEAST), AWAIT_CUE(16), WAIT(5), - { 0x93, 0x08, 0x000a, 0x00000036, 0x00000000, NULL }, + CMD_UNK_93(8, DIR_TRANS_10, 54), AWAIT_CUE(16), HALT, }; @@ -6234,7 +6234,7 @@ static const struct ScriptCommand s_gs1_g23_s0_lives3_dlg0[] = { /* 0x8150de8 */ CALL_SCRIPT(JUMP_ANGRY_FUNC), AWAIT_CUE(7), WAIT(6), - { 0x93, 0x04, 0x000b, 0x00000055, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_11, 85), AWAIT_CUE(7), CALL_SCRIPT(ANGRY_START_FUNC), WAIT(60), @@ -6243,10 +6243,10 @@ static const struct ScriptCommand s_gs1_g23_s0_lives3_dlg0[] = { /* 0x8150de8 */ CALL_SCRIPT(JUMP_ANGRY_FUNC), ALERT_CUE(5), AWAIT_CUE(7), - { 0x93, 0x08, 0x000b, 0x0000004d, 0x00000000, NULL }, + CMD_UNK_93(8, DIR_TRANS_11, 77), ALERT_CUE(5), AWAIT_CUE(7), - { 0x93, 0x04, 0x000b, 0x0000005d, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_11, 93), AWAIT_CUE(7), CALL_SCRIPT(NOTICE_FUNC), ALERT_CUE(5), @@ -6254,11 +6254,11 @@ static const struct ScriptCommand s_gs1_g23_s0_lives3_dlg0[] = { /* 0x8150de8 */ CALL_SCRIPT(JUMP_SURPRISE_FUNC), ALERT_CUE(5), AWAIT_CUE(7), - { 0x93, 0x04, 0x000b, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_11, 0), AWAIT_CUE(7), WAIT(65), WALK_GRID(153, 72), - ROTATE(4, 11, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_SOUTHWEST), AWAIT_CUE(7), { 0x89, 0x08, 0x0100, 0x00000007, 0x00000000, NULL }, ALERT_CUE(5), @@ -6277,11 +6277,11 @@ static const struct ScriptCommand s_gs1_g23_s0_lives3_dlg0[] = { /* 0x8150de8 */ CALL_SCRIPT(JUMP_ANGRY_FUNC), ALERT_CUE(5), AWAIT_CUE(7), - ROTATE(4, 11, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_SOUTH), WAIT(15), - ROTATE(4, 11, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_SOUTHEAST), WAIT(30), - ROTATE(4, 11, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_SOUTH), ALERT_CUE(5), AWAIT_CUE(7), CALL_SCRIPT(QUESTION_FUNC), @@ -6291,26 +6291,26 @@ static const struct ScriptCommand s_gs1_g23_s0_lives3_dlg0[] = { /* 0x8150de8 */ CALL_SCRIPT(SHOCK_FUNC), ALERT_CUE(5), AWAIT_CUE(7), - { 0x93, 0x04, 0x000b, 0x00000055, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_11, 85), ALERT_CUE(5), AWAIT_CUE(7), CALL_SCRIPT(SHOCK_FUNC), ALERT_CUE(5), AWAIT_CUE(7), - { 0x93, 0x08, 0x000b, 0x0000004d, 0x00000000, NULL }, + CMD_UNK_93(8, DIR_TRANS_11, 77), ALERT_CUE(5), AWAIT_CUE(7), CALL_SCRIPT(LOOK_AROUND_FUNC), CALL_SCRIPT(SWEAT_FUNC), AWAIT_CUE(7), - ROTATE(4, 10, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_EAST), WAIT(180), - ROTATE(12, 10, DIRECTION_NORTH), + ROTATE_TO(12, DIR_TRANS_10, DIRECTION_NORTH), AWAIT_CUE(7), WAIT(10), CALL_SCRIPT(LOOK_AROUND_FUNC), WAIT(20), - ROTATE(4, 10, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTH), AWAIT_CUE(7), WAIT(20), { 0x62, 0x00, 0x0100, 0x00000000, -0x0000000c, NULL }, @@ -6329,45 +6329,45 @@ static const struct ScriptCommand s_gs1_g23_s0_lives4_dlg0[] = { /* 0x81513c8 */ { 0x2d, 0x07, 0x0003, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(8), WAIT(10), - { 0x93, 0x04, 0x000b, 0x0000004d, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_11, 77), AWAIT_CUE(8), - { 0x93, 0x08, 0x000b, 0x0000005b, 0x00000000, NULL }, + CMD_UNK_93(8, DIR_TRANS_11, 91), AWAIT_CUE(8), CALL_SCRIPT(SMILE_START_FUNC), WAIT(30), CALL_SCRIPT(SMILE_END_FUNC), AWAIT_CUE(8), WAIT(5), - { 0x93, 0x04, 0x000b, 0x0000005d, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_11, 93), AWAIT_CUE(8), WAIT(5), - { 0x93, 0x04, 0x000b, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_11, 0), AWAIT_CUE(8), CALL_SCRIPT(NOTICE_FUNC), ALERT_CUE(5), AWAIT_CUE(8), WAIT(5), - { 0x93, 0x04, 0x000b, 0x00000022, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_11, 34), AWAIT_CUE(8), WAIT(5), - { 0x93, 0x04, 0x000b, 0x0000005b, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_11, 91), AWAIT_CUE(8), - ROTATE(4, 10, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_EAST), WAIT(140), - ROTATE(10, 10, DIRECTION_NORTHWEST), + ROTATE_TO(10, DIR_TRANS_10, DIRECTION_NORTHWEST), AWAIT_CUE(8), WAIT(15), - ROTATE(10, 10, DIRECTION_NORTH), + ROTATE_TO(10, DIR_TRANS_10, DIRECTION_NORTH), WAIT(20), - ROTATE(10, 10, DIRECTION_WEST), + ROTATE_TO(10, DIR_TRANS_10, DIRECTION_WEST), WAIT(15), - ROTATE(8, 10, DIRECTION_SOUTHWEST), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_SOUTHWEST), AWAIT_CUE(8), { 0x89, 0x10, 0x0099, 0x00000000, 0x00000000, NULL }, - { 0x93, 0x04, 0x000b, 0x0000004d, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_11, 77), ALERT_CUE(5), AWAIT_CUE(8), - ROTATE(4, 11, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_NORTHWEST), AWAIT_CUE(8), CALL_SCRIPT(JUMP_ANGRY_FUNC), ALERT_CUE(5), @@ -6381,52 +6381,52 @@ static const struct ScriptCommand s_gs1_g23_s0_lives5_dlg0[] = { /* 0x81516e8 */ SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0004, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(9), - { 0x93, 0x04, 0x000b, 0x00000050, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_11, 80), AWAIT_CUE(9), - { 0x93, 0x08, 0x000b, 0x0000005b, 0x00000000, NULL }, + CMD_UNK_93(8, DIR_TRANS_11, 91), AWAIT_CUE(9), - { 0x93, 0x04, 0x000b, 0x00000055, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_11, 85), AWAIT_CUE(9), - { 0x93, 0x04, 0x000b, 0x0000005b, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_11, 91), CALL_SCRIPT(ANGRY_START_FUNC), WAIT(30), CALL_SCRIPT(ANGRY_END_FUNC), ALERT_CUE(5), AWAIT_CUE(9), WAIT(2), - { 0x93, 0x3c, 0x000b, 0x0000005d, 0x00000000, NULL }, + CMD_UNK_93(60, DIR_TRANS_11, 93), AWAIT_CUE(9), WAIT(2), - { 0x93, 0x04, 0x000b, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_11, 0), AWAIT_CUE(9), WAIT(62), WALK_GRID(153, 71), - { 0x93, 0x04, 0x000b, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_11, 0), AWAIT_CUE(9), WAIT(2), CALL_SCRIPT(JUMP_SURPRISE_FUNC), AWAIT_CUE(9), WAIT(5), - { 0x93, 0x08, 0x000b, 0x0000005b, 0x00000000, NULL }, + CMD_UNK_93(8, DIR_TRANS_11, 91), { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(9), WAIT(8), - { 0x93, 0x04, 0x000b, 0x00000022, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_11, 34), { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(9), - { 0x93, 0x04, 0x000b, 0x0000005b, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_11, 91), { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(9), - ROTATE(4, 10, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_EAST), WAIT(160), - ROTATE(4, 10, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), AWAIT_CUE(9), WAIT(12), - ROTATE(8, 10, DIRECTION_NORTHWEST), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_NORTHWEST), WAIT(15), - ROTATE(8, 10, DIRECTION_NORTHEAST), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_NORTHEAST), WAIT(15), - ROTATE(8, 10, DIRECTION_NORTH), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_NORTH), AWAIT_CUE(9), { 0x89, 0x30, 0x0099, 0x00000004, 0x00000000, NULL }, { 0x54, 0x00, 0x001f, 0x00000000, 0x00000000, NULL }, @@ -6437,7 +6437,7 @@ static const struct ScriptCommand s_gs1_g23_s0_lives5_dlg0[] = { /* 0x81516e8 */ { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(9), SELECT_ANIMATION(2), - ROTATE(4, 10, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), FANFARE_PLAY2(471), CALL_SCRIPT(ANGRY_START_FUNC), WAIT(45), @@ -6455,42 +6455,42 @@ static const struct ScriptCommand s_gs1_g23_s0_lives6_dlg0[] = { /* 0x8151b48 */ { 0x2d, 0x07, 0x0005, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(10), WAIT(5), - { 0x93, 0x04, 0x000b, 0x0000004d, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_11, 77), AWAIT_CUE(10), WAIT(5), - { 0x93, 0x08, 0x000b, 0x0000005b, 0x00000000, NULL }, + CMD_UNK_93(8, DIR_TRANS_11, 91), AWAIT_CUE(10), WAIT(2), - { 0x93, 0x04, 0x000b, 0x00000055, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_11, 85), AWAIT_CUE(10), WAIT(6), - ROTATE(4, 11, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_WEST), WAIT(60), - ROTATE(4, 11, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_NORTHWEST), AWAIT_CUE(10), WAIT(8), - { 0x93, 0x04, 0x000b, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_11, 0), ALERT_CUE(5), AWAIT_CUE(10), CALL_SCRIPT(NOTICE_FUNC), { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(10), - { 0x93, 0x08, 0x000b, 0x0000005b, 0x00000000, NULL }, + CMD_UNK_93(8, DIR_TRANS_11, 91), AWAIT_CUE(10), - { 0x93, 0x04, 0x000b, 0x00000022, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_11, 34), AWAIT_CUE(10), WAIT(8), - { 0x93, 0x04, 0x000b, 0x0000005b, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_11, 91), AWAIT_CUE(10), CALL_SCRIPT(JUMP_ANGRY_FUNC), AWAIT_CUE(10), - ROTATE(4, 10, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_EAST), WAIT(150), - ROTATE(12, 10, DIRECTION_NORTH), + ROTATE_TO(12, DIR_TRANS_10, DIRECTION_NORTH), AWAIT_CUE(10), { 0x89, 0x06, 0x0100, 0x00000005, 0x00000000, NULL }, AWAIT_CUE(10), - { 0x93, 0x04, 0x000b, 0x0000005b, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_11, 91), AWAIT_CUE(10), WAIT(20), { 0x89, 0x38, 0x0200, 0x00000004, 0x00000000, NULL }, @@ -6503,52 +6503,52 @@ static const struct ScriptCommand s_gs1_g23_s0_lives7_dlg0[] = { /* 0x8151e18 */ { 0x2d, 0x07, 0x0006, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(11), WAIT(8), - { 0x93, 0x04, 0x000b, 0x00000055, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_11, 85), ALERT_CUE(5), AWAIT_CUE(11), - ROTATE(4, 11, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_WEST), WAIT(45), - ROTATE(4, 11, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_NORTH), AWAIT_CUE(11), WAIT(8), - { 0x93, 0x04, 0x000b, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_11, 0), AWAIT_CUE(11), CALL_SCRIPT(JUMP_HAPPY_FUNC), ALERT_CUE(5), AWAIT_CUE(11), WAIT(60), WALK_GRID(153, 69), - ROTATE(4, 11, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_NORTHWEST), AWAIT_CUE(11), WAIT(5), CALL_SCRIPT(NOTICE_FUNC), AWAIT_CUE(11), WAIT(2), - { 0x93, 0x08, 0x000b, 0x0000005b, 0x00000000, NULL }, + CMD_UNK_93(8, DIR_TRANS_11, 91), AWAIT_CUE(11), WAIT(2), - { 0x93, 0x04, 0x000b, 0x00000022, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_11, 34), AWAIT_CUE(11), - { 0x93, 0x08, 0x000b, 0x0000005b, 0x00000000, NULL }, + CMD_UNK_93(8, DIR_TRANS_11, 91), { 0x89, 0x08, 0x0100, 0x00000004, 0x00000000, NULL }, ALERT_CUE(5), AWAIT_CUE(11), CALL_SCRIPT(JUMP_ANGRY_FUNC), AWAIT_CUE(11), - ROTATE(4, 10, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_EAST), WAIT(200), - ROTATE(4, 10, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), AWAIT_CUE(11), WAIT(13), - ROTATE(10, 10, DIRECTION_NORTHEAST), + ROTATE_TO(10, DIR_TRANS_10, DIRECTION_NORTHEAST), WAIT(10), - ROTATE(10, 10, DIRECTION_NORTH), + ROTATE_TO(10, DIR_TRANS_10, DIRECTION_NORTH), WAIT(15), - ROTATE(8, 10, DIRECTION_NORTHEAST), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_NORTHEAST), AWAIT_CUE(11), { 0x89, 0x08, 0x0080, 0x00000003, 0x00000000, NULL }, AWAIT_CUE(11), - { 0x93, 0x04, 0x000b, 0x0000005b, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_11, 91), AWAIT_CUE(11), { 0x89, 0x18, 0x0080, 0x00000004, 0x00000000, NULL }, { 0x89, 0x05, 0x0080, 0x00000006, 0x00000000, NULL }, @@ -6565,55 +6565,55 @@ static const struct ScriptCommand s_gs1_g23_s0_lives8_dlg0[] = { /* 0x81521a8 */ WALK_GRID(512, 73), ALERT_CUE(5), AWAIT_CUE(12), - { 0x93, 0x04, 0x000b, 0x0000005b, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_11, 91), CALL_SCRIPT(JUMP_SURPRISE_FUNC), ALERT_CUE(5), AWAIT_CUE(12), CALL_SCRIPT(JUMP_ANGRY_FUNC), ALERT_CUE(5), AWAIT_CUE(12), - { 0x93, 0x04, 0x000b, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_11, 0), ALERT_CUE(5), AWAIT_CUE(12), WAIT(55), WALK_GRID(153, 74), - { 0x93, 0x04, 0x000b, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_11, 0), AWAIT_CUE(12), WAIT(5), CALL_SCRIPT(NOTICE_FUNC), AWAIT_CUE(12), WAIT(2), - { 0x93, 0x08, 0x000b, 0x0000005b, 0x00000000, NULL }, + CMD_UNK_93(8, DIR_TRANS_11, 91), AWAIT_CUE(12), - { 0x93, 0x04, 0x000b, 0x00000022, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_11, 34), AWAIT_CUE(12), CALL_SCRIPT(SMILE_START_FUNC), WAIT(20), CALL_SCRIPT(SMILE_END_FUNC), AWAIT_CUE(12), - ROTATE(4, 11, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_EAST), WAIT(45), - ROTATE(4, 11, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_SOUTH), FANFARE_PLAY2(469), CALL_SCRIPT(QUESTION_FUNC), AWAIT_CUE(12), CALL_SCRIPT(JUMP_SURPRISE_FUNC), AWAIT_CUE(12), - { 0x93, 0x04, 0x000b, 0x00000055, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_11, 85), AWAIT_CUE(12), - ROTATE(4, 11, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_SOUTHEAST), CALL_SCRIPT(JUMP_SURPRISE_FUNC), AWAIT_CUE(12), - { 0x93, 0x04, 0x000b, 0x0000004d, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_11, 77), AWAIT_CUE(12), WAIT(30), CALL_SCRIPT(LOOK_AROUND_FUNC), AWAIT_CUE(12), - ROTATE(4, 10, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_EAST), WAIT(230), - ROTATE(8, 10, DIRECTION_NORTHEAST), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_NORTHEAST), WAIT(120), - ROTATE(12, 10, DIRECTION_SOUTHEAST), + ROTATE_TO(12, DIR_TRANS_10, DIRECTION_SOUTHEAST), AWAIT_CUE(12), CALL_SCRIPT(SWEAT_FUNC), AWAIT_CUE(12), @@ -6630,53 +6630,53 @@ static const struct ScriptCommand s_gs1_g23_s0_lives9_dlg0[] = { /* 0x81525b8 */ SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0008, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(13), - { 0x93, 0x04, 0x000b, 0x00000055, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_11, 85), AWAIT_CUE(13), - { 0x93, 0x04, 0x000b, 0x0000005d, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_11, 93), WAIT(45), - ROTATE(4, 11, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_SOUTHWEST), AWAIT_CUE(13), WAIT(5), - { 0x93, 0x04, 0x000b, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_11, 0), AWAIT_CUE(13), WAIT(45), - ROTATE(4, 11, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_SOUTHWEST), AWAIT_CUE(13), - { 0x93, 0x08, 0x000b, 0x0000005b, 0x00000000, NULL }, + CMD_UNK_93(8, DIR_TRANS_11, 91), AWAIT_CUE(13), - { 0x93, 0x04, 0x000b, 0x00000022, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_11, 34), AWAIT_CUE(13), CALL_SCRIPT(SMILE_START_FUNC), WAIT(20), CALL_SCRIPT(SMILE_END_FUNC), AWAIT_CUE(13), - ROTATE(4, 11, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_WEST), WAIT(45), - ROTATE(4, 11, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_SOUTH), WAIT(10), CALL_SCRIPT(QUESTION_FUNC), AWAIT_CUE(13), CALL_SCRIPT(SHOCK_FUNC), AWAIT_CUE(13), - { 0x93, 0x04, 0x000b, 0x00000055, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_11, 85), AWAIT_CUE(13), - ROTATE(4, 11, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_SOUTHEAST), CALL_SCRIPT(SHOCK_FUNC), AWAIT_CUE(13), - { 0x93, 0x04, 0x000b, 0x0000004d, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_11, 77), AWAIT_CUE(13), WAIT(15), CALL_SCRIPT(LOOK_AROUND_FUNC), AWAIT_CUE(13), - ROTATE(4, 10, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_EAST), WAIT(215), - ROTATE(4, 10, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHEAST), AWAIT_CUE(13), WAIT(10), CALL_SCRIPT(LOOK_AROUND_FUNC), - ROTATE(10, 10, DIRECTION_SOUTHEAST), + ROTATE_TO(10, DIR_TRANS_10, DIRECTION_SOUTHEAST), AWAIT_CUE(13), - ROTATE(4, 11, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_11, DIRECTION_SOUTHEAST), CALL_SCRIPT(QUESTION_FUNC), ALERT_CUE(5), AWAIT_CUE(13), @@ -6953,10 +6953,10 @@ static const struct ScriptCommand s_gs1_g24_s1_lives2_dlg0[] = { /* 0x8153c34 */ SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(7), - ROTATE(4, 2, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_EAST), ALERT_CUE(5), AWAIT_CUE(7), - ROTATE(4, 1, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTH), AWAIT_CUE(7), RET, }; @@ -6983,10 +6983,10 @@ static const struct ScriptCommand s_gs1_g24_s1_lives3_dlg0[] = { /* 0x8153db4 */ SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0003, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(8), - ROTATE(4, 1, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_WEST), ALERT_CUE(5), AWAIT_CUE(8), - ROTATE(4, 2, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTH), ALERT_CUE(5), AWAIT_CUE(8), RET, @@ -7185,7 +7185,7 @@ static const struct ScriptCommand s_gs1_g26_s0_lives0_dlg0[] = { /* 0x8154794 */ TEXTBOX_CLEAR, ALERT_CUE(6), ALERT_CUE(7), - { 0x93, 0x04, 0x000a, 0x0000004d, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 77), WAIT(30), PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0002, 0x00000000), MSG_NPC(2, _(" Looks like they sent out\nto a lot of rescue teams for help.")), @@ -7194,7 +7194,7 @@ static const struct ScriptCommand s_gs1_g26_s0_lives0_dlg0[] = { /* 0x8154794 */ TEXTBOX_CLEAR, ALERT_CUE(6), ALERT_CUE(7), - ROTATE(4, 10, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_EAST), WAIT(60), ALERT_CUE(4), AWAIT_CUE(5), @@ -7233,28 +7233,28 @@ static const struct ScriptCommand s_gs1_g26_s0_lives0_dlg0[] = { /* 0x8154794 */ TEXTBOX_CLEAR, ALERT_CUE(20), WAIT(90), - ROTATE(4, 10, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHEAST), MSG_NPC(-1, _(" No idea?{WAIT_PRESS}\nHow is that possible?!{WAIT_PRESS}\nThis is {NAME_8} you're talking about?")), TEXTBOX_CLEAR, WAIT(10), MSG_NPC(-1, _(" But they haven't come back.\nThat's for real!")), TEXTBOX_CLEAR, WAIT(10), - ROTATE(4, 10, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHEAST), MSG_NPC(-1, _(" That's right...\nAnd it sounds as if {NAME_9} is out of\nour league...")), TEXTBOX_CLEAR, WAIT(10), MSG_NPC(-1, _(" What? It's that tough?\nThis Pokémon named {NAME_9}?")), TEXTBOX_CLEAR, WAIT(10), - ROTATE(4, 10, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHEAST), MSG_NPC(-1, _(" Why don't you go underground and\nsee for yourself?")), TEXTBOX_CLEAR, WAIT(10), MSG_NPC(-1, _(" Hunh?!\nYou've gotta be kidding me!")), TEXTBOX_CLEAR, WAIT(10), - ROTATE(4, 10, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHEAST), MSG_NPC(-1, _(" There's magma flowing everywhere\nunderground.{WAIT_PRESS}\nI'd burn up if I went anywhere like that!")), TEXTBOX_CLEAR, WAIT(10), @@ -7262,7 +7262,7 @@ static const struct ScriptCommand s_gs1_g26_s0_lives0_dlg0[] = { /* 0x8154794 */ TEXTBOX_CLEAR, ALERT_CUE(20), UPDATE_VARINT(CALC_SET, EVENT_LOCAL, 1), - ROTATE(4, 10, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_EAST), WAIT(60), MSG_NPC(3, _(" There's no denying that\nit is dangerous underground.")), MSG_NPC(3, _(" It's not a place where just\nanyone can go.")), @@ -7280,7 +7280,7 @@ static const struct ScriptCommand s_gs1_g26_s0_lives0_dlg0[] = { /* 0x8154794 */ ALERT_CUE(4), AWAIT_CUE(5), ALERT_CUE(6), - { 0x93, 0x04, 0x000a, 0x00000022, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 34), AWAIT_CUE(5), ALERT_CUE(7), AWAIT_CUE(5), @@ -7290,7 +7290,7 @@ static const struct ScriptCommand s_gs1_g26_s0_lives0_dlg0[] = { /* 0x8154794 */ TEXTBOX_CLEAR, ALERT_CUE(7), ALERT_CUE(6), - ROTATE(4, 10, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHEAST), { 0x62, 0x00, 0x0100, -0x00000010, 0x00000000, NULL }, AWAIT_CUE(5), MSG_NPC(2, _(" Don't bother, you guys.")), @@ -7311,7 +7311,7 @@ static const struct ScriptCommand s_gs1_g26_s0_lives0_dlg0[] = { /* 0x8154794 */ ALERT_CUE(7), WAIT(30), ALERT_CUE(6), - ROTATE(4, 10, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_EAST), ALERT_CUE(4), AWAIT_CUE(5), WAIT(30), @@ -7330,7 +7330,7 @@ static const struct ScriptCommand s_gs1_g26_s0_lives0_dlg0[] = { /* 0x8154794 */ ALERT_CUE(10), ALERT_CUE(11), ALERT_CUE(20), - { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 104), WAIT(60), BGM_SWITCH(7), MSG_NPC(-1, _(" Whoa!")), @@ -7363,7 +7363,7 @@ static const struct ScriptCommand s_gs1_g26_s0_lives0_dlg0[] = { /* 0x8154794 */ ALERT_CUE(9), ALERT_CUE(11), ALERT_CUE(20), - { 0x93, 0x04, 0x000a, 0x00000069, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 105), WAIT(60), MSG_NPC(-1, _(" Woohoo! It's {NAME_5}!")), TEXTBOX_CLEAR, @@ -7392,7 +7392,7 @@ static const struct ScriptCommand s_gs1_g26_s0_lives0_dlg0[] = { /* 0x8154794 */ ALERT_CUE(9), ALERT_CUE(10), ALERT_CUE(20), - { 0x93, 0x04, 0x000a, 0x0000006a, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 106), WAIT(60), MSG_NPC(-1, _(" Wow! {NAME_6}!")), TEXTBOX_CLEAR, @@ -7456,8 +7456,8 @@ static const struct ScriptCommand s_gs1_g26_s0_lives0_dlg0[] = { /* 0x8154794 */ ALERT_CUE(7), WALK_GRID(256, 84), WALK_GRID(256, 85), - ROTATE(4, 10, DIRECTION_EAST), - ROTATE(30, 2, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_EAST), + ROTATE_TO(30, DIR_TRANS_SPINLEFT1, DIRECTION_WEST), AWAIT_CUE(5), MSG_NPC(-1, _(" Win it for us!")), TEXTBOX_CLEAR, @@ -7470,14 +7470,14 @@ static const struct ScriptCommand s_gs1_g26_s0_lives0_dlg0[] = { /* 0x8154794 */ ALERT_CUE(7), AWAIT_CUE(5), ALERT_CUE(6), - { 0x93, 0x04, 0x000a, 0x0000004d, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 77), MSG_NPC(2, _(" See?\nThey look pretty tough, eh?")), MSG_NPC(2, _(" Let them handle things.")), TEXTBOX_CLEAR, ALERT_CUE(6), ALERT_CUE(7), AWAIT_CUE(5), - { 0x93, 0x04, 0x000a, 0x00000022, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 34), PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000004), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" OK...\nI guess we can't say anything,\n{NAME_0}.")), @@ -7522,55 +7522,55 @@ static const struct ScriptCommand s_gs1_g26_s0_lives1_dlg0[] = { /* 0x8156884 */ AWAIT_CUE(6), WALK_GRID(256, 86), AWAIT_CUE(6), - ROTATE(4, 10, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHEAST), WAIT(10), - ROTATE(4, 10, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHEAST), WAIT(10), - ROTATE(4, 10, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_EAST), ALERT_CUE(5), AWAIT_CUE(6), - { 0x93, 0x04, 0x000a, 0x0000004d, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 77), AWAIT_CUE(6), - ROTATE(4, 10, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_EAST), AWAIT_CUE(20), { 0x56, 0x00, 0x0000, 0x0000005b, 0x00000000, NULL }, AWAIT_CUE(20), LABEL(0), /* = 0x00 */ CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 1), - ROTATE(4, 10, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHEAST), WAIT_RANDOM(15, 90), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 1), - ROTATE(4, 10, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHEAST), WAIT_RANDOM(15, 90), JUMP_LABEL(0), LABEL(1), /* = 0x01 */ - { 0x93, 0x04, 0x000a, 0x00000055, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 85), AWAIT_CUE(6), - { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 0), { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(6), { 0x8b, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x62, 0x00, 0x0100, 0x00000000, -0x00000010, NULL }, { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(6), - ROTATE(4, 10, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_EAST), WAIT(15), CALL_SCRIPT(JUMP_ANGRY_FUNC), { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(6), - ROTATE(4, 10, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_EAST), AWAIT_CUE(6), WAIT(30), WALK_GRID(256, 84), WALK_GRID(256, 87), - ROTATE(4, 10, DIRECTION_EAST), - ROTATE(20, 2, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_EAST), + ROTATE_TO(20, DIR_TRANS_SPINLEFT1, DIRECTION_WEST), AWAIT_CUE(6), - { 0x93, 0x04, 0x000a, 0x0000004d, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 77), AWAIT_CUE(6), - { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 0), ALERT_CUE(5), AWAIT_CUE(6), { 0x52, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, @@ -7585,35 +7585,35 @@ static const struct ScriptCommand s_gs1_g26_s0_lives2_dlg0[] = { /* 0x8156c44 */ AWAIT_CUE(7), WALK_GRID(256, 88), AWAIT_CUE(7), - { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 0), AWAIT_CUE(7), - ROTATE(4, 10, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_EAST), AWAIT_CUE(20), { 0x56, 0x00, 0x0000, 0x0000005b, 0x00000000, NULL }, AWAIT_CUE(7), - { 0x93, 0x04, 0x000a, 0x00000022, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 34), ALERT_CUE(5), AWAIT_CUE(7), WALK_RELATIVE(256, 0, 8), - ROTATE(4, 10, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_WEST), AWAIT_CUE(7), - ROTATE(4, 10, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHWEST), AWAIT_CUE(7), - ROTATE(4, 10, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_WEST), ALERT_CUE(5), AWAIT_CUE(7), - { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 104), AWAIT_CUE(7), WALK_GRID(256, 89), - ROTATE(4, 10, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_EAST), WAIT(30), - ROTATE(30, 10, DIRECTION_WEST), + ROTATE_TO(30, DIR_TRANS_10, DIRECTION_WEST), AWAIT_CUE(7), - { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 0), WALK_RELATIVE(256, 0, 16), ALERT_CUE(5), AWAIT_CUE(7), - { 0x93, 0x04, 0x000a, 0x00000022, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 34), ALERT_CUE(7), { 0x52, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, HALT, @@ -7624,31 +7624,31 @@ static const struct ScriptCommand s_gs1_g26_s0_lives3_dlg0[] = { /* 0x8156eb4 */ SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0003, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(8), - ROTATE(8, 10, DIRECTION_NORTHWEST), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_NORTHWEST), WAIT(5), - ROTATE(8, 10, DIRECTION_SOUTHWEST), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_SOUTHWEST), WAIT(5), - ROTATE(8, 10, DIRECTION_WEST), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_WEST), ALERT_CUE(5), AWAIT_CUE(8), - ROTATE(8, 10, DIRECTION_NORTHWEST), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_NORTHWEST), WAIT(5), - ROTATE(8, 10, DIRECTION_SOUTHWEST), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_SOUTHWEST), WAIT(5), - ROTATE(8, 10, DIRECTION_WEST), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_WEST), ALERT_CUE(5), AWAIT_CUE(8), - { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 104), AWAIT_CUE(20), - { 0x93, 0x04, 0x000a, 0x00000069, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 105), AWAIT_CUE(20), - { 0x93, 0x04, 0x000a, 0x0000006a, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 106), AWAIT_CUE(8), - ROTATE(8, 10, DIRECTION_NORTHWEST), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_NORTHWEST), WAIT(5), - ROTATE(8, 10, DIRECTION_SOUTHWEST), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_SOUTHWEST), WAIT(5), - ROTATE(8, 10, DIRECTION_WEST), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_WEST), ALERT_CUE(5), AWAIT_CUE(8), AWAIT_CUE(8), @@ -7674,66 +7674,66 @@ static const struct ScriptCommand s_gs1_g26_s0_lives4_dlg0[] = { /* 0x81570c4 */ COND_EQUAL(1, /* to label */ 4), COND_EQUAL(2, /* to label */ 5), LABEL(3), /* = 0x03 */ - ROTATE(4, 10, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHEAST), JUMP_LABEL(6), LABEL(4), /* = 0x04 */ - ROTATE(4, 10, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHEAST), JUMP_LABEL(6), LABEL(5), /* = 0x05 */ - ROTATE(4, 10, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHWEST), JUMP_LABEL(6), LABEL(6), /* = 0x06 */ WAIT_RANDOM(15, 90), JUMP_LABEL(0), LABEL(1), /* = 0x01 */ - { 0x93, 0x04, 0x000a, 0x00000055, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 85), AWAIT_CUE(20), LABEL(7), /* = 0x07 */ CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 8), - ROTATE(8, 10, DIRECTION_NORTHEAST), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_NORTHEAST), WAIT_RANDOM(15, 90), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 8), - ROTATE(8, 10, DIRECTION_NORTHWEST), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_NORTHWEST), WAIT_RANDOM(15, 90), JUMP_LABEL(7), LABEL(8), /* = 0x08 */ - { 0x93, 0x04, 0x000a, 0x00000055, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 85), ALERT_CUE(5), AWAIT_CUE(9), WALK_RELATIVE(76, 8, 0), AWAIT_CUE(9), WALK_GRID(76, 90), - { 0x93, 0x04, 0x000a, 0x00000055, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 85), { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(9), - ROTATE(4, 10, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_WEST), ALERT_CUE(5), AWAIT_CUE(9), LABEL(9), /* = 0x09 */ - { 0x93, 0x04, 0x000a, 0x00000069, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 105), WAIT(15), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 9), AWAIT_CUE(9), LABEL(10), /* = 0x0a */ - { 0x93, 0x04, 0x000a, 0x0000006a, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 106), WAIT(15), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 10), AWAIT_CUE(9), - { 0x93, 0x04, 0x000a, 0x00000055, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 85), ALERT_CUE(5), AWAIT_CUE(9), - ROTATE(4, 10, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_WEST), ALERT_CUE(5), AWAIT_CUE(9), - { 0x93, 0x04, 0x000a, 0x00000069, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 105), WAIT(30), - { 0x93, 0x04, 0x000a, 0x0000006a, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 106), WAIT(30), - ROTATE(4, 10, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_WEST), ALERT_CUE(5), AWAIT_CUE(9), WALK_GRID(256, 91), @@ -7760,58 +7760,58 @@ static const struct ScriptCommand s_gs1_g26_s0_lives5_dlg0[] = { /* 0x81575e4 */ COND_EQUAL(1, /* to label */ 3), COND_EQUAL(2, /* to label */ 4), LABEL(2), /* = 0x02 */ - ROTATE(4, 10, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHEAST), JUMP_LABEL(5), LABEL(3), /* = 0x03 */ - ROTATE(4, 10, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTH), JUMP_LABEL(5), LABEL(4), /* = 0x04 */ - ROTATE(4, 10, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_WEST), LABEL(5), /* = 0x05 */ WAIT_RANDOM(15, 90), JUMP_LABEL(0), LABEL(1), /* = 0x01 */ - { 0x93, 0x04, 0x000a, 0x00000055, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 85), AWAIT_CUE(20), LABEL(6), /* = 0x06 */ CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 7), - ROTATE(8, 2, DIRECTION_SOUTH), + ROTATE_TO(8, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTH), WAIT_RANDOM(15, 90), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 7), - ROTATE(8, 1, DIRECTION_NORTHWEST), + ROTATE_TO(8, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTHWEST), WAIT_RANDOM(15, 90), JUMP_LABEL(6), LABEL(7), /* = 0x07 */ - { 0x93, 0x04, 0x000a, 0x00000055, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 85), AWAIT_CUE(10), LABEL(8), /* = 0x08 */ - { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 104), WAIT(15), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 8), AWAIT_CUE(10), WALK_GRID(76, 92), - ROTATE(4, 10, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_EAST), { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(10), - ROTATE(4, 10, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_WEST), ALERT_CUE(5), AWAIT_CUE(10), LABEL(9), /* = 0x09 */ - { 0x93, 0x04, 0x000a, 0x0000006a, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 106), WAIT(15), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 9), AWAIT_CUE(10), - ROTATE(4, 10, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHEAST), AWAIT_CUE(10), - ROTATE(4, 10, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_WEST), AWAIT_CUE(10), - { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 104), AWAIT_CUE(10), - ROTATE(4, 10, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_WEST), WAIT(30), WALK_GRID(256, 91), AWAIT_CUE(10), @@ -7835,58 +7835,58 @@ static const struct ScriptCommand s_gs1_g26_s0_lives6_dlg0[] = { /* 0x8157a64 */ COND_EQUAL(1, /* to label */ 3), COND_EQUAL(2, /* to label */ 4), LABEL(2), /* = 0x02 */ - ROTATE(4, 10, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHEAST), JUMP_LABEL(5), LABEL(3), /* = 0x03 */ - ROTATE(4, 10, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHWEST), JUMP_LABEL(5), LABEL(4), /* = 0x04 */ - ROTATE(4, 10, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHWEST), LABEL(5), /* = 0x05 */ WAIT_RANDOM(15, 90), JUMP_LABEL(0), LABEL(1), /* = 0x01 */ - { 0x93, 0x04, 0x000a, 0x00000055, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 85), AWAIT_CUE(20), LABEL(6), /* = 0x06 */ CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 7), - ROTATE(8, 2, DIRECTION_WEST), + ROTATE_TO(8, DIR_TRANS_SPINLEFT1, DIRECTION_WEST), WAIT_RANDOM(15, 90), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 7), - ROTATE(8, 1, DIRECTION_NORTHEAST), + ROTATE_TO(8, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTHEAST), WAIT_RANDOM(15, 90), JUMP_LABEL(6), LABEL(7), /* = 0x07 */ - { 0x93, 0x04, 0x000a, 0x00000055, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 85), AWAIT_CUE(11), LABEL(8), /* = 0x08 */ - { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 104), WAIT(15), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 8), AWAIT_CUE(11), LABEL(9), /* = 0x09 */ - { 0x93, 0x04, 0x000a, 0x00000069, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 105), WAIT(15), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 9), AWAIT_CUE(11), WALK_GRID(76, 93), - ROTATE(4, 10, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_EAST), { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(11), - ROTATE(4, 10, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_WEST), ALERT_CUE(5), AWAIT_CUE(11), - ROTATE(4, 10, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHEAST), AWAIT_CUE(11), - ROTATE(4, 10, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_WEST), AWAIT_CUE(11), - { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 104), AWAIT_CUE(11), - ROTATE(4, 10, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_WEST), WAIT(60), WALK_GRID(256, 91), AWAIT_CUE(11), @@ -7914,40 +7914,40 @@ static const struct ScriptCommand s_gs1_g26_s0_lives7_dlg0[] = { /* 0x8157ee4 */ COND_EQUAL(1, /* to label */ 3), COND_EQUAL(2, /* to label */ 4), LABEL(2), /* = 0x02 */ - ROTATE(8, 1, DIRECTION_NORTHEAST), + ROTATE_TO(8, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTHEAST), JUMP_LABEL(5), LABEL(3), /* = 0x03 */ - ROTATE(8, 10, DIRECTION_NORTHWEST), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_NORTHWEST), JUMP_LABEL(5), LABEL(4), /* = 0x04 */ - ROTATE(8, 2, DIRECTION_SOUTHWEST), + ROTATE_TO(8, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTHWEST), LABEL(5), /* = 0x05 */ WAIT_RANDOM(15, 90), JUMP_LABEL(0), LABEL(1), /* = 0x01 */ - { 0x93, 0x04, 0x000a, 0x00000055, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 85), AWAIT_CUE(20), WAIT_RANDOM(0, 60), - ROTATE(4, 10, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_WEST), SELECT_ANIMATION(4), AWAIT_CUE(20), - { 0x93, 0x04, 0x000a, 0x00000055, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 85), SELECT_ANIMATION(2), AWAIT_CUE(20), LABEL(6), /* = 0x06 */ - { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 104), WAIT(15), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 6), AWAIT_CUE(20), LABEL(7), /* = 0x07 */ - { 0x93, 0x04, 0x000a, 0x00000069, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 105), WAIT(15), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 7), AWAIT_CUE(20), LABEL(8), /* = 0x08 */ - { 0x93, 0x04, 0x000a, 0x0000006a, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 106), WAIT(15), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 8), @@ -7957,7 +7957,7 @@ static const struct ScriptCommand s_gs1_g26_s0_lives7_dlg0[] = { /* 0x8157ee4 */ { 0x56, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(20), LABEL(9), /* = 0x09 */ - { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 104), WAIT(30), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 9), @@ -7978,33 +7978,33 @@ static const struct ScriptCommand s_gs1_g26_s0_lives8_dlg0[] = { /* 0x8158324 */ SELECT_ANIMATION(2), AWAIT_CUE(20), WAIT_RANDOM(0, 60), - ROTATE(4, 10, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHEAST), SELECT_ANIMATION(4), AWAIT_CUE(20), - { 0x93, 0x04, 0x000a, 0x00000055, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 85), SELECT_ANIMATION(2), AWAIT_CUE(20), WAIT_RANDOM(0, 60), - ROTATE(4, 10, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHEAST), SELECT_ANIMATION(4), AWAIT_CUE(20), - { 0x93, 0x04, 0x000a, 0x00000055, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 85), SELECT_ANIMATION(2), AWAIT_CUE(20), LABEL(0), /* = 0x00 */ - { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 104), WAIT(15), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 0), AWAIT_CUE(20), LABEL(1), /* = 0x01 */ - { 0x93, 0x04, 0x000a, 0x00000069, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 105), WAIT(15), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 1), AWAIT_CUE(20), LABEL(2), /* = 0x02 */ - { 0x93, 0x04, 0x000a, 0x0000006a, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 106), WAIT(15), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 2), @@ -8014,7 +8014,7 @@ static const struct ScriptCommand s_gs1_g26_s0_lives8_dlg0[] = { /* 0x8158324 */ { 0x56, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(20), LABEL(3), /* = 0x03 */ - { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 104), WAIT(30), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 3), @@ -8031,43 +8031,43 @@ static const struct ScriptCommand s_gs1_g26_s0_lives9_dlg0[] = { /* 0x8158684 */ LABEL(0), /* = 0x00 */ CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 1), - ROTATE(8, 10, DIRECTION_NORTHEAST), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_NORTHEAST), WAIT_RANDOM(15, 90), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 1), - ROTATE(8, 10, DIRECTION_SOUTHEAST), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_SOUTHEAST), WAIT_RANDOM(15, 90), JUMP_LABEL(0), LABEL(1), /* = 0x01 */ - { 0x93, 0x04, 0x000a, 0x00000055, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 85), AWAIT_CUE(20), LABEL(2), /* = 0x02 */ CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 3), - ROTATE(8, 10, DIRECTION_NORTHEAST), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_NORTHEAST), WAIT_RANDOM(15, 90), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 3), - ROTATE(8, 10, DIRECTION_SOUTHEAST), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_SOUTHEAST), WAIT_RANDOM(15, 90), JUMP_LABEL(2), LABEL(3), /* = 0x03 */ - { 0x93, 0x04, 0x000a, 0x00000055, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 85), AWAIT_CUE(20), LABEL(4), /* = 0x04 */ - { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 104), WAIT(15), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 4), AWAIT_CUE(20), LABEL(5), /* = 0x05 */ - { 0x93, 0x04, 0x000a, 0x00000069, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 105), WAIT(15), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 5), AWAIT_CUE(20), LABEL(6), /* = 0x06 */ - { 0x93, 0x04, 0x000a, 0x0000006a, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 106), WAIT(15), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 6), @@ -8077,7 +8077,7 @@ static const struct ScriptCommand s_gs1_g26_s0_lives9_dlg0[] = { /* 0x8158684 */ { 0x56, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(20), LABEL(7), /* = 0x07 */ - { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 104), WAIT(30), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 7), @@ -8098,33 +8098,33 @@ static const struct ScriptCommand s_gs1_g26_s0_lives10_dlg0[] = { /* 0x8158a44 * SELECT_ANIMATION(2), AWAIT_CUE(20), WAIT_RANDOM(0, 60), - ROTATE(4, 10, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHWEST), SELECT_ANIMATION(4), AWAIT_CUE(20), - { 0x93, 0x04, 0x000a, 0x00000055, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 85), SELECT_ANIMATION(2), AWAIT_CUE(20), WAIT_RANDOM(0, 60), - ROTATE(4, 10, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHWEST), SELECT_ANIMATION(4), AWAIT_CUE(20), - { 0x93, 0x04, 0x000a, 0x00000055, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 85), SELECT_ANIMATION(2), AWAIT_CUE(20), LABEL(0), /* = 0x00 */ - { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 104), WAIT(15), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 0), AWAIT_CUE(20), LABEL(1), /* = 0x01 */ - { 0x93, 0x04, 0x000a, 0x00000069, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 105), WAIT(15), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 1), AWAIT_CUE(20), LABEL(2), /* = 0x02 */ - { 0x93, 0x04, 0x000a, 0x0000006a, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 106), WAIT(15), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 2), @@ -8134,7 +8134,7 @@ static const struct ScriptCommand s_gs1_g26_s0_lives10_dlg0[] = { /* 0x8158a44 * { 0x56, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(20), LABEL(3), /* = 0x03 */ - { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 104), WAIT(30), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 3), @@ -8155,33 +8155,33 @@ static const struct ScriptCommand s_gs1_g26_s0_lives11_dlg0[] = { /* 0x8158da4 * SELECT_ANIMATION(2), AWAIT_CUE(20), WAIT_RANDOM(0, 60), - ROTATE(4, 10, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTH), SELECT_ANIMATION(4), AWAIT_CUE(20), - { 0x93, 0x04, 0x000a, 0x00000055, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 85), SELECT_ANIMATION(2), AWAIT_CUE(20), WAIT_RANDOM(0, 60), - ROTATE(4, 10, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTH), SELECT_ANIMATION(4), AWAIT_CUE(20), - { 0x93, 0x04, 0x000a, 0x00000055, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 85), SELECT_ANIMATION(2), AWAIT_CUE(20), LABEL(0), /* = 0x00 */ - { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 104), WAIT(15), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 0), AWAIT_CUE(20), LABEL(1), /* = 0x01 */ - { 0x93, 0x04, 0x000a, 0x00000069, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 105), WAIT(15), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 1), AWAIT_CUE(20), LABEL(2), /* = 0x02 */ - { 0x93, 0x04, 0x000a, 0x0000006a, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 106), WAIT(15), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 2), @@ -8191,7 +8191,7 @@ static const struct ScriptCommand s_gs1_g26_s0_lives11_dlg0[] = { /* 0x8158da4 * { 0x56, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(20), LABEL(3), /* = 0x03 */ - { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 104), WAIT(30), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 3), @@ -8212,33 +8212,33 @@ static const struct ScriptCommand s_gs1_g26_s0_lives12_dlg0[] = { /* 0x8159104 * SELECT_ANIMATION(2), AWAIT_CUE(20), WAIT_RANDOM(0, 60), - ROTATE(4, 10, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), SELECT_ANIMATION(4), AWAIT_CUE(20), - { 0x93, 0x04, 0x000a, 0x00000055, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 85), SELECT_ANIMATION(2), AWAIT_CUE(20), WAIT_RANDOM(0, 60), - ROTATE(4, 10, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), SELECT_ANIMATION(4), AWAIT_CUE(20), - { 0x93, 0x04, 0x000a, 0x00000055, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 85), SELECT_ANIMATION(2), AWAIT_CUE(20), LABEL(0), /* = 0x00 */ - { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 104), WAIT(15), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 0), AWAIT_CUE(20), LABEL(1), /* = 0x01 */ - { 0x93, 0x04, 0x000a, 0x00000069, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 105), WAIT(15), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 1), AWAIT_CUE(20), LABEL(2), /* = 0x02 */ - { 0x93, 0x04, 0x000a, 0x0000006a, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 106), WAIT(15), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 2), @@ -8248,7 +8248,7 @@ static const struct ScriptCommand s_gs1_g26_s0_lives12_dlg0[] = { /* 0x8159104 * { 0x56, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(20), LABEL(3), /* = 0x03 */ - { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 104), WAIT(30), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 3), @@ -8269,33 +8269,33 @@ static const struct ScriptCommand s_gs1_g26_s0_lives13_dlg0[] = { /* 0x8159464 * SELECT_ANIMATION(2), AWAIT_CUE(20), WAIT_RANDOM(0, 60), - ROTATE(4, 10, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHEAST), SELECT_ANIMATION(4), AWAIT_CUE(20), - { 0x93, 0x04, 0x000a, 0x00000055, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 85), SELECT_ANIMATION(2), AWAIT_CUE(20), WAIT_RANDOM(0, 60), - ROTATE(4, 10, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHEAST), SELECT_ANIMATION(4), AWAIT_CUE(20), - { 0x93, 0x04, 0x000a, 0x00000055, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 85), SELECT_ANIMATION(2), AWAIT_CUE(20), LABEL(0), /* = 0x00 */ - { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 104), WAIT(15), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 0), AWAIT_CUE(20), LABEL(1), /* = 0x01 */ - { 0x93, 0x04, 0x000a, 0x00000069, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 105), WAIT(15), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 1), AWAIT_CUE(20), LABEL(2), /* = 0x02 */ - { 0x93, 0x04, 0x000a, 0x0000006a, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 106), WAIT(15), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 2), @@ -8305,11 +8305,11 @@ static const struct ScriptCommand s_gs1_g26_s0_lives13_dlg0[] = { /* 0x8159464 * { 0x56, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(20), WAIT(10), - ROTATE(4, 10, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHWEST), WAIT(15), WALK_GRID(128, 95), LABEL(3), /* = 0x03 */ - { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 104), WAIT(30), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 3), @@ -8324,33 +8324,33 @@ static const struct ScriptCommand s_gs1_g26_s0_lives14_dlg0[] = { /* 0x8159804 * CALL_SCRIPT(SHOCK_FUNC), AWAIT_CUE(20), WAIT_RANDOM(0, 60), - ROTATE(4, 10, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTH), SELECT_ANIMATION(4), AWAIT_CUE(20), - { 0x93, 0x04, 0x000a, 0x00000055, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 85), SELECT_ANIMATION(2), AWAIT_CUE(20), WAIT_RANDOM(0, 60), - ROTATE(4, 10, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTH), SELECT_ANIMATION(4), AWAIT_CUE(20), - { 0x93, 0x04, 0x000a, 0x00000055, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 85), SELECT_ANIMATION(2), AWAIT_CUE(20), LABEL(0), /* = 0x00 */ - { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 104), WAIT(15), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 0), AWAIT_CUE(20), LABEL(1), /* = 0x01 */ - { 0x93, 0x04, 0x000a, 0x00000069, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 105), WAIT(15), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 1), AWAIT_CUE(20), LABEL(2), /* = 0x02 */ - { 0x93, 0x04, 0x000a, 0x0000006a, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 106), WAIT(15), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 2), @@ -8360,7 +8360,7 @@ static const struct ScriptCommand s_gs1_g26_s0_lives14_dlg0[] = { /* 0x8159804 * { 0x56, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(20), LABEL(3), /* = 0x03 */ - { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 104), WAIT(30), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 3), @@ -8381,46 +8381,46 @@ static const struct ScriptCommand s_gs1_g26_s0_lives15_dlg0[] = { /* 0x8159b04 * SELECT_ANIMATION(2), AWAIT_CUE(20), WAIT_RANDOM(0, 60), - ROTATE(4, 10, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), SELECT_ANIMATION(4), AWAIT_CUE(20), - { 0x93, 0x04, 0x000a, 0x00000055, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 85), SELECT_ANIMATION(2), AWAIT_CUE(20), WAIT_RANDOM(0, 60), - ROTATE(4, 10, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), SELECT_ANIMATION(4), AWAIT_CUE(20), - { 0x93, 0x04, 0x000a, 0x00000055, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 85), SELECT_ANIMATION(2), AWAIT_CUE(20), LABEL(0), /* = 0x00 */ - { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 104), WAIT(15), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 0), AWAIT_CUE(20), LABEL(1), /* = 0x01 */ - { 0x93, 0x04, 0x000a, 0x00000069, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 105), WAIT(15), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 1), AWAIT_CUE(20), LABEL(2), /* = 0x02 */ - { 0x93, 0x04, 0x000a, 0x0000006a, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 106), WAIT(15), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 2), AWAIT_CUE(15), CAMERA_PAN(256, 94), - ROTATE(4, 10, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHEAST), AWAIT_CUE(20), { 0x56, 0x00, 0x0000, 0x0000005a, 0x00000000, NULL }, WAIT_RANDOM(30, 120), { 0x56, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(20), LABEL(3), /* = 0x03 */ - { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 104), WAIT(30), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 3), @@ -8437,43 +8437,43 @@ static const struct ScriptCommand s_gs1_g26_s0_lives16_dlg0[] = { /* 0x8159e94 * LABEL(0), /* = 0x00 */ CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 1), - ROTATE(4, 10, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), WAIT_RANDOM(15, 90), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 1), - ROTATE(4, 10, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHWEST), WAIT_RANDOM(15, 90), JUMP_LABEL(0), LABEL(1), /* = 0x01 */ - { 0x93, 0x04, 0x000a, 0x00000055, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 85), AWAIT_CUE(20), LABEL(2), /* = 0x02 */ CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 3), - ROTATE(4, 10, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), WAIT_RANDOM(15, 90), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 3), - ROTATE(4, 10, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHWEST), WAIT_RANDOM(15, 90), JUMP_LABEL(2), LABEL(3), /* = 0x03 */ - { 0x93, 0x04, 0x000a, 0x00000055, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 85), AWAIT_CUE(20), LABEL(4), /* = 0x04 */ - { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 104), WAIT(15), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 4), AWAIT_CUE(20), LABEL(5), /* = 0x05 */ - { 0x93, 0x04, 0x000a, 0x00000069, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 105), WAIT(60), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 5), AWAIT_CUE(20), LABEL(6), /* = 0x06 */ - { 0x93, 0x04, 0x000a, 0x0000006a, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 106), WAIT(60), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 6), @@ -8483,7 +8483,7 @@ static const struct ScriptCommand s_gs1_g26_s0_lives16_dlg0[] = { /* 0x8159e94 * { 0x56, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(20), LABEL(7), /* = 0x07 */ - { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 104), WAIT(30), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 7), @@ -8662,7 +8662,7 @@ static const struct ScriptCommand s_gs1_g28_s0_lives0_dlg0[] = { /* 0x815aae0 */ WAIT(30), ALERT_CUE(6), AWAIT_CUE(5), - { 0x93, 0x04, 0x000a, 0x0000004d, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 77), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Hey, {NAME_2}!")), VARIANT(/* == */ 1, _(" What's up here?")), @@ -8681,7 +8681,7 @@ static const struct ScriptCommand s_gs1_g28_s0_lives0_dlg0[] = { /* 0x815aae0 */ ALERT_CUE(7), ALERT_CUE(6), WALK_GRID(256, 100), - ROTATE(4, 10, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHEAST), ALERT_CUE(4), AWAIT_CUE(5), ALERT_CUE(6), @@ -8693,7 +8693,7 @@ static const struct ScriptCommand s_gs1_g28_s0_lives0_dlg0[] = { /* 0x815aae0 */ TEXTBOX_CLEAR, WAIT(60), ALERT_CUE(6), - ROTATE(4, 10, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_EAST), AWAIT_CUE(5), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" {NAME_3}!{WAIT_PRESS}\nWhat's going on here?!")), @@ -8715,7 +8715,7 @@ static const struct ScriptCommand s_gs1_g28_s0_lives0_dlg0[] = { /* 0x815aae0 */ TEXTBOX_CLEAR, ALERT_CUE(6), ALERT_CUE(8), - ROTATE(4, 10, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHEAST), WAIT(10), PORTRAIT(PLACEMENT_TOP_RIGHT, 0x0006, 0x00000000), PORTRAIT_POS(6, 0, -1), @@ -8730,12 +8730,12 @@ static const struct ScriptCommand s_gs1_g28_s0_lives0_dlg0[] = { /* 0x815aae0 */ TEXTBOX_CLEAR, ALERT_CUE(6), ALERT_CUE(8), - ROTATE(4, 10, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHEAST), WAIT(60), ALERT_CUE(8), WAIT(30), ALERT_CUE(6), - { 0x93, 0x04, 0x000a, 0x00000055, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 85), MSG_NPC(3, _(" ...It appears the dungeon\nunderground...{WAIT_PRESS}\nis far worse than we'd imagined...")), TEXTBOX_CLEAR, BGM_FADEOUT(60), @@ -8749,7 +8749,7 @@ static const struct ScriptCommand s_gs1_g28_s0_lives0_dlg0[] = { /* 0x815aae0 */ ALERT_CUE(13), ALERT_CUE(8), ALERT_CUE(20), - { 0x93, 0x04, 0x000a, 0x0000005b, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 91), WAIT(5), CALL_SCRIPT(SHOCK_FUNC), WAIT(30), @@ -8769,7 +8769,7 @@ static const struct ScriptCommand s_gs1_g28_s0_lives0_dlg0[] = { /* 0x815aae0 */ AWAIT_CUE(5), ALERT_CUE(6), ALERT_CUE(8), - { 0x93, 0x04, 0x000a, 0x0000005b, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 91), WAIT(15), PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, 0x0004, 0x00000000), MSG_NPC(4, _(" Kekeh!\nYou really find thinking hard, don't you?")), @@ -8783,7 +8783,7 @@ static const struct ScriptCommand s_gs1_g28_s0_lives0_dlg0[] = { /* 0x815aae0 */ ALERT_CUE(20), ALERT_CUE(6), ALERT_CUE(7), - ROTATE(4, 10, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHWEST), WAIT(30), ALERT_CUE(4), AWAIT_CUE(5), @@ -8807,7 +8807,7 @@ static const struct ScriptCommand s_gs1_g28_s0_lives0_dlg0[] = { /* 0x815aae0 */ ALERT_CUE(9), AWAIT_CUE(5), ALERT_CUE(6), - { 0x93, 0x04, 0x000a, 0x0000005b, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 91), WAIT(15), PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, 0x0004, 0x00000000), MSG_NPC(4, _(" You see?\nEven they finally seem to understand\ntheir situation. Kekeh!")), @@ -8822,7 +8822,7 @@ static const struct ScriptCommand s_gs1_g28_s0_lives0_dlg0[] = { /* 0x815aae0 */ AWAIT_CUE(5), ALERT_CUE(6), ALERT_CUE(9), - { 0x93, 0x04, 0x000a, 0x00000055, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 85), WAIT(15), PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, 0x0001, 0x00000005), PORTRAIT_POS(1, -2, 0), @@ -8843,7 +8843,7 @@ static const struct ScriptCommand s_gs1_g28_s0_lives0_dlg0[] = { /* 0x815aae0 */ MSG_NPC(4, _(" ............Huh?{WAIT_PRESS}\nDid I say something profound?\nKekekekekekekeh!")), TEXTBOX_CLEAR, ALERT_CUE(6), - { 0x93, 0x04, 0x000a, 0x0000005b, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 91), WAIT(30), PORTRAIT(PLACEMENT_TOP_RIGHT, 0x0001, 0x00000005), MSG_NPC(1, _(" Urf...")), @@ -8851,7 +8851,7 @@ static const struct ScriptCommand s_gs1_g28_s0_lives0_dlg0[] = { /* 0x815aae0 */ WAIT(30), ALERT_CUE(6), AWAIT_CUE(5), - { 0x93, 0x04, 0x000a, 0x00000022, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 34), BGM_FADEOUT(150), WAIT(30), MSG_VAR(2, PARTNER_TALK_KIND, 1), @@ -8884,7 +8884,7 @@ static const struct ScriptCommand s_gs1_g28_s0_lives0_dlg0[] = { /* 0x815aae0 */ ALERT_CUE(6), AWAIT_CUE(5), WAIT(15), - ROTATE(4, 10, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHWEST), BGM_SWITCH(7), PORTRAIT_REP(0x0001, 0x00000000), MSG_NPC(1, _(" Everyone, listen!")), @@ -8961,7 +8961,7 @@ static const struct ScriptCommand s_gs1_g28_s0_lives0_dlg0[] = { /* 0x815aae0 */ ALERT_CUE(9), AWAIT_CUE(5), ALERT_CUE(6), - ROTATE(4, 10, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHWEST), PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT_FLIP, 0x0004, 0x00000000), MSG_NPC(4, _(" Why don't you do like\neveryone else and wise up?")), TEXTBOX_CLEAR, @@ -8974,7 +8974,7 @@ static const struct ScriptCommand s_gs1_g28_s0_lives0_dlg0[] = { /* 0x815aae0 */ ALERT_CUE(9), ALERT_CUE(20), ALERT_CUE(6), - { 0x93, 0x04, 0x0001, 0x00000055, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_SPINRIGHT1, 85), AWAIT_CUE(5), PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, 0x0004, 0x00000003), MSG_NPC(4, _(" ...Ugeh?")), @@ -8986,7 +8986,7 @@ static const struct ScriptCommand s_gs1_g28_s0_lives0_dlg0[] = { /* 0x815aae0 */ TEXTBOX_CLEAR, WAIT(10), ALERT_CUE(6), - ROTATE(4, 10, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHWEST), AWAIT_CUE(5), ALERT_CUE(9), AWAIT_CUE(5), @@ -9024,7 +9024,7 @@ static const struct ScriptCommand s_gs1_g28_s0_lives0_dlg0[] = { /* 0x815aae0 */ ALERT_CUE(6), ALERT_CUE(9), ALERT_CUE(20), - { 0x93, 0x04, 0x0001, 0x00000068, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_SPINRIGHT1, 104), WAIT(60), MSG_NPC(5, _(" ...We've only failed once.")), TEXTBOX_CLEAR, @@ -9048,7 +9048,7 @@ static const struct ScriptCommand s_gs1_g28_s0_lives0_dlg0[] = { /* 0x815aae0 */ ALERT_CUE(6), ALERT_CUE(8), ALERT_CUE(9), - ROTATE(4, 10, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHEAST), MSG_NPC(6, _(" Yes, no more wallowing in\nwoe-is-me self-pity.")), TEXTBOX_CLEAR, WAIT(60), @@ -9058,14 +9058,14 @@ static const struct ScriptCommand s_gs1_g28_s0_lives0_dlg0[] = { /* 0x815aae0 */ ALERT_CUE(6), ALERT_CUE(8), ALERT_CUE(9), - ROTATE(4, 10, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHEAST), MSG_NPC(7, _(" If we give up, that's how\nit ends. Not for me.")), TEXTBOX_CLEAR, WAIT(30), ALERT_CUE(6), ALERT_CUE(8), ALERT_CUE(9), - ROTATE(4, 10, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_EAST), WAIT(30), PORTRAIT(PLACEMENT_MIDDLE_TOP_LEFT, 0x0001, 0x0000000b), MSG_NPC(1, _(" {NAME_6}!\nAnd {NAME_7} too!")), @@ -9082,21 +9082,21 @@ static const struct ScriptCommand s_gs1_g28_s0_lives0_dlg0[] = { /* 0x815aae0 */ ALERT_CUE(9), AWAIT_CUE(5), ALERT_CUE(6), - ROTATE(4, 2, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_NORTHWEST), MSG_NPC(-1, _(" There've got to be ways we can\nget through!")), TEXTBOX_CLEAR, WAIT(10), ALERT_CUE(9), AWAIT_CUE(5), ALERT_CUE(6), - ROTATE(4, 10, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTH), MSG_NPC(-1, _(" If we all pull together, we'll be sure\nto find a way!")), TEXTBOX_CLEAR, WAIT(10), ALERT_CUE(9), AWAIT_CUE(5), ALERT_CUE(6), - ROTATE(4, 10, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHWEST), MSG_NPC(-1, _(" We'll conquer the dungeon by\nhaving all the rescue teams cooperate!")), WAIT(30), ALERT_CUE(20), @@ -9109,7 +9109,7 @@ static const struct ScriptCommand s_gs1_g28_s0_lives0_dlg0[] = { /* 0x815aae0 */ ALERT_CUE(20), ALERT_CUE(8), ALERT_CUE(6), - { 0x93, 0x04, 0x000a, 0x0000005b, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 91), ALERT_CUE(9), AWAIT_CUE(5), MSG_NPC(4, _(" Don't say I didn't warn you\nwhen you get into a world of pain!\nUgegegegeh!")), @@ -9118,7 +9118,7 @@ static const struct ScriptCommand s_gs1_g28_s0_lives0_dlg0[] = { /* 0x815aae0 */ ALERT_CUE(16), ALERT_CUE(9), ALERT_CUE(6), - ROTATE(10, 10, DIRECTION_NORTH), + ROTATE_TO(10, DIR_TRANS_10, DIRECTION_NORTH), AWAIT_CUE(5), UPDATE_VARINT(CALC_SET, EVENT_LOCAL, 1), WAIT(30), @@ -9126,7 +9126,7 @@ static const struct ScriptCommand s_gs1_g28_s0_lives0_dlg0[] = { /* 0x815aae0 */ AWAIT_CUE(5), ALERT_CUE(6), ALERT_CUE(8), - { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 104), AWAIT_CUE(5), ALERT_CUE(20), WAIT(60), @@ -9198,105 +9198,105 @@ static const struct ScriptCommand s_gs1_g28_s0_lives1_dlg0[] = { /* 0x815dbb8 */ WALK_GRID(256, 101), ALERT_CUE(5), AWAIT_CUE(6), - { 0x93, 0x04, 0x000a, 0x0000004d, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 77), ALERT_CUE(5), AWAIT_CUE(6), WAIT(30), WALK_GRID(256, 102), WALK_GRID(256, 103), - ROTATE(4, 10, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHEAST), AWAIT_CUE(6), FANFARE_PLAY2(464), CALL_SCRIPT(SHOCK_FUNC), ALERT_CUE(5), AWAIT_CUE(6), - { 0x93, 0x04, 0x000a, 0x00000055, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 85), ALERT_CUE(5), AWAIT_CUE(6), FANFARE_PLAY2(463), CALL_SCRIPT(SHOCK_FUNC), ALERT_CUE(5), AWAIT_CUE(6), - ROTATE(4, 10, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHEAST), AWAIT_CUE(6), - ROTATE(4, 10, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_EAST), AWAIT_CUE(6), - ROTATE(4, 10, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHEAST), AWAIT_CUE(6), - { 0x93, 0x04, 0x000a, 0x00000055, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 85), AWAIT_CUE(6), - { 0x93, 0x04, 0x000a, 0x0000005b, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 91), WAIT(5), CALL_SCRIPT(SHOCK_FUNC), AWAIT_CUE(6), - { 0x93, 0x04, 0x000a, 0x0000005b, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 91), AWAIT_CUE(6), - ROTATE(4, 10, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHWEST), AWAIT_CUE(6), - ROTATE(4, 10, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHWEST), WAIT(15), - ROTATE(4, 10, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTH), WAIT(15), - ROTATE(4, 10, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHWEST), ALERT_CUE(5), AWAIT_CUE(6), - { 0x93, 0x04, 0x000a, 0x0000005b, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 91), AWAIT_CUE(6), CALL_SCRIPT(NOTICE_FUNC), ALERT_CUE(5), AWAIT_CUE(6), - { 0x93, 0x04, 0x0002, 0x00000055, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_SPINLEFT1, 85), AWAIT_CUE(6), - { 0x93, 0x04, 0x000a, 0x0000005b, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 91), AWAIT_CUE(6), - { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 0), ALERT_CUE(5), AWAIT_CUE(6), - ROTATE(4, 10, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHWEST), ALERT_CUE(5), AWAIT_CUE(6), - ROTATE(8, 1, DIRECTION_NORTH), + ROTATE_TO(8, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTH), WAIT(30), - ROTATE(8, 2, DIRECTION_SOUTHEAST), + ROTATE_TO(8, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTHEAST), WAIT(30), - ROTATE(8, 1, DIRECTION_SOUTHWEST), + ROTATE_TO(8, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTHWEST), ALERT_CUE(5), AWAIT_CUE(6), - ROTATE(8, 10, DIRECTION_NORTHWEST), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_NORTHWEST), WAIT(15), - ROTATE(8, 10, DIRECTION_SOUTH), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_SOUTH), WAIT(15), - ROTATE(8, 10, DIRECTION_SOUTHWEST), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_SOUTHWEST), ALERT_CUE(5), AWAIT_CUE(6), - ROTATE(4, 10, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHWEST), AWAIT_CUE(6), - { 0x93, 0x04, 0x0002, 0x00000055, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_SPINLEFT1, 85), AWAIT_CUE(6), - ROTATE(4, 10, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHWEST), ALERT_CUE(5), AWAIT_CUE(6), - { 0x93, 0x04, 0x0002, 0x00000068, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_SPINLEFT1, 104), AWAIT_CUE(6), - { 0x93, 0x04, 0x000a, 0x00000069, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 105), AWAIT_CUE(6), - { 0x93, 0x04, 0x000a, 0x0000006a, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 106), AWAIT_CUE(6), - ROTATE(4, 10, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_EAST), AWAIT_CUE(6), - ROTATE(4, 1, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTHWEST), AWAIT_CUE(6), - ROTATE(4, 10, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTH), AWAIT_CUE(6), - ROTATE(4, 10, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHWEST), AWAIT_CUE(6), LABEL(0), /* = 0x00 */ - { 0x93, 0x04, 0x000a, 0x0000005b, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 91), WAIT(15), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(0, /* to label */ 0), AWAIT_CUE(6), - { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 104), ALERT_CUE(5), AWAIT_CUE(6), HALT, @@ -9307,31 +9307,31 @@ static const struct ScriptCommand s_gs1_g28_s0_lives2_dlg0[] = { /* 0x815e298 */ SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0003, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(8), - ROTATE(4, 10, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_WEST), AWAIT_CUE(8), - ROTATE(4, 10, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHWEST), AWAIT_CUE(8), - ROTATE(4, 10, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHWEST), AWAIT_CUE(8), - ROTATE(4, 10, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_WEST), AWAIT_CUE(8), - ROTATE(4, 10, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHWEST), AWAIT_CUE(8), - { 0x93, 0x04, 0x000a, 0x0000005b, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 91), AWAIT_CUE(8), - { 0x93, 0x04, 0x000a, 0x00000069, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 105), AWAIT_CUE(8), - { 0x93, 0x04, 0x000a, 0x0000006a, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 106), AWAIT_CUE(8), - ROTATE(4, 10, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_WEST), AWAIT_CUE(8), LABEL(0), /* = 0x00 */ - { 0x93, 0x04, 0x000a, 0x0000005b, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 91), WAIT(15), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(0, /* to label */ 0), AWAIT_CUE(8), - ROTATE(4, 10, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_WEST), AWAIT_CUE(8), HALT, }; @@ -9343,89 +9343,89 @@ static const struct ScriptCommand s_gs1_g28_s0_lives3_dlg0[] = { /* 0x815e488 */ { 0x2d, 0x07, 0x0004, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(9), WALK_GRID(256, 104), - { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 104), ALERT_CUE(5), AWAIT_CUE(9), WALK_GRID(256, 105), - { 0x93, 0x04, 0x000a, 0x00000022, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 34), ALERT_CUE(5), AWAIT_CUE(9), - ROTATE(4, 10, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHWEST), ALERT_CUE(5), AWAIT_CUE(9), - { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 0), ALERT_CUE(5), AWAIT_CUE(9), - { 0x93, 0x04, 0x000a, 0x00000055, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 85), AWAIT_CUE(9), - ROTATE(4, 10, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHWEST), ALERT_CUE(5), AWAIT_CUE(9), - ROTATE(4, 10, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHWEST), ALERT_CUE(5), AWAIT_CUE(9), - ROTATE(4, 10, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_EAST), ALERT_CUE(5), AWAIT_CUE(9), CALL_SCRIPT(SHOCK_FUNC), AWAIT_CUE(9), - ROTATE(4, 10, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHWEST), ALERT_CUE(5), AWAIT_CUE(9), CALL_SCRIPT(SHOCK_FUNC), WAIT(30), - { 0x93, 0x04, 0x000a, 0x00000055, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 85), ALERT_CUE(5), AWAIT_CUE(9), CALL_SCRIPT(SHOCK_FUNC), WAIT(15), - ROTATE(4, 10, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHWEST), ALERT_CUE(5), AWAIT_CUE(9), - ROTATE(4, 10, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_WEST), WAIT(15), - ROTATE(4, 2, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_EAST), WAIT(15), - ROTATE(4, 10, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHWEST), WAIT(15), CALL_SCRIPT(JUMP_SURPRISE_FUNC), CALL_SCRIPT(JUMP_SURPRISE_FUNC), ALERT_CUE(5), AWAIT_CUE(9), - { 0x93, 0x04, 0x000a, 0x00000022, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 34), WAIT(30), - ROTATE(4, 10, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHWEST), ALERT_CUE(5), AWAIT_CUE(6), - { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 104), CALL_SCRIPT(SHOCK_FUNC), AWAIT_CUE(9), CALL_SCRIPT(SHOCK_FUNC), ALERT_CUE(5), AWAIT_CUE(9), - { 0x93, 0x04, 0x000a, 0x00000069, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 105), AWAIT_CUE(9), - { 0x93, 0x04, 0x000a, 0x0000006a, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 106), AWAIT_CUE(9), - ROTATE(4, 10, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_EAST), AWAIT_CUE(9), CALL_SCRIPT(SHOCK_FUNC), ALERT_CUE(5), AWAIT_CUE(9), - ROTATE(4, 1, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTHWEST), ALERT_CUE(5), AWAIT_CUE(9), - ROTATE(4, 2, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTHEAST), ALERT_CUE(5), AWAIT_CUE(9), - ROTATE(4, 10, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHWEST), ALERT_CUE(5), AWAIT_CUE(9), - ROTATE(4, 10, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHWEST), WAIT(30), - ROTATE(4, 10, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_EAST), WAIT(30), - ROTATE(4, 10, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTH), ALERT_CUE(5), AWAIT_CUE(9), CALL_SCRIPT(JUMP_ANGRY_FUNC), @@ -9448,10 +9448,10 @@ static const struct ScriptCommand s_gs1_g28_s0_lives4_dlg0[] = { /* 0x815eaa8 */ SELECT_ANIMATION(2), ALERT_CUE(5), AWAIT_CUE(10), - ROTATE(4, 10, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHWEST), ALERT_CUE(5), AWAIT_CUE(10), - ROTATE(4, 10, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_WEST), ALERT_CUE(5), AWAIT_CUE(10), HALT, @@ -9466,7 +9466,7 @@ static const struct ScriptCommand s_gs1_g28_s0_lives5_dlg0[] = { /* 0x815ebb8 */ SELECT_ANIMATION(23), STOP_ANIMATION_ON_CURRENT_FRAME, SELECT_ANIMATION(2), - ROTATE(4, 10, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_WEST), ALERT_CUE(5), AWAIT_CUE(11), HALT, @@ -9481,7 +9481,7 @@ static const struct ScriptCommand s_gs1_g28_s0_lives6_dlg0[] = { /* 0x815ec78 */ SELECT_ANIMATION(23), STOP_ANIMATION_ON_CURRENT_FRAME, SELECT_ANIMATION(2), - ROTATE(4, 10, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_WEST), ALERT_CUE(5), AWAIT_CUE(12), HALT, @@ -9492,56 +9492,56 @@ static const struct ScriptCommand s_gs1_g28_s0_lives7_dlg0[] = { /* 0x815ed38 */ SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(7), - { 0x93, 0x04, 0x0001, 0x00000022, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_SPINRIGHT1, 34), ALERT_CUE(5), AWAIT_CUE(7), - ROTATE(4, 2, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_EAST), WAIT(60), - { 0x93, 0x04, 0x0001, 0x00000022, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_SPINRIGHT1, 34), ALERT_CUE(5), AWAIT_CUE(7), - ROTATE(4, 2, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_EAST), AWAIT_CUE(20), - { 0x93, 0x04, 0x000a, 0x0000005b, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 91), AWAIT_CUE(20), - ROTATE(4, 10, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_EAST), SELECT_ANIMATION(4), AWAIT_CUE(20), SELECT_ANIMATION(2), - { 0x93, 0x04, 0x000a, 0x00000022, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 34), AWAIT_CUE(20), CALL_SCRIPT(SHOCK_FUNC), AWAIT_CUE(20), - ROTATE(4, 10, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_EAST), SELECT_ANIMATION(4), AWAIT_CUE(20), SELECT_ANIMATION(2), - { 0x93, 0x04, 0x000a, 0x00000022, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 34), AWAIT_CUE(20), - { 0x93, 0x04, 0x000a, 0x00000055, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 85), AWAIT_CUE(20), - ROTATE(4, 10, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_EAST), SELECT_ANIMATION(4), AWAIT_CUE(20), WAIT(30), SELECT_ANIMATION(2), - { 0x93, 0x04, 0x000a, 0x0000005b, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 91), AWAIT_CUE(20), - { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 104), AWAIT_CUE(20), { 0x56, 0x00, 0x0000, 0x0000005a, 0x00000000, NULL }, WAIT_RANDOM(30, 90), { 0x56, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(20), LABEL(0), /* = 0x00 */ - { 0x93, 0x04, 0x000a, 0x0000005b, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 91), WAIT(15), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(0, /* to label */ 0), AWAIT_CUE(20), - { 0x93, 0x04, 0x000a, 0x00000022, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 34), AWAIT_CUE(20), - { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 104), AWAIT_CUE(20), { 0x56, 0x00, 0x0000, 0x0000005a, 0x00000000, NULL }, WAIT_RANDOM(30, 90), @@ -9556,46 +9556,46 @@ static const struct ScriptCommand s_gs1_g28_s0_lives8_dlg0[] = { /* 0x815f118 */ DEBUGINFO_O(9556), SELECT_ANIMATION(2), AWAIT_CUE(20), - { 0x93, 0x04, 0x000a, 0x0000005b, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 91), AWAIT_CUE(20), - ROTATE(4, 10, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHWEST), SELECT_ANIMATION(4), AWAIT_CUE(20), SELECT_ANIMATION(2), - { 0x93, 0x04, 0x000a, 0x00000022, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 34), AWAIT_CUE(20), CALL_SCRIPT(SHOCK_FUNC), AWAIT_CUE(20), - ROTATE(4, 10, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHWEST), SELECT_ANIMATION(4), AWAIT_CUE(20), SELECT_ANIMATION(2), - { 0x93, 0x04, 0x000a, 0x00000022, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 34), AWAIT_CUE(20), - { 0x93, 0x04, 0x000a, 0x00000055, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 85), AWAIT_CUE(20), - ROTATE(4, 10, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHWEST), SELECT_ANIMATION(4), AWAIT_CUE(20), WAIT(30), SELECT_ANIMATION(2), - { 0x93, 0x04, 0x000a, 0x0000005b, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 91), AWAIT_CUE(20), - { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 104), AWAIT_CUE(20), { 0x56, 0x00, 0x0000, 0x0000005a, 0x00000000, NULL }, WAIT_RANDOM(30, 90), { 0x56, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(20), LABEL(0), /* = 0x00 */ - { 0x93, 0x04, 0x000a, 0x0000005b, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 91), WAIT(15), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(0, /* to label */ 0), AWAIT_CUE(20), - { 0x93, 0x04, 0x000a, 0x00000022, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 34), AWAIT_CUE(20), - { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 104), AWAIT_CUE(20), { 0x56, 0x00, 0x0000, 0x0000005a, 0x00000000, NULL }, WAIT_RANDOM(30, 90), @@ -9609,14 +9609,14 @@ static const struct ScriptCommand s_gs1_g28_s0_lives9_dlg0[] = { /* 0x815f428 */ SELECT_ANIMATION(2), { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, AWAIT_CUE(20), - { 0x93, 0x04, 0x000a, 0x0000005b, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 91), AWAIT_CUE(20), - ROTATE(8, 10, DIRECTION_SOUTH), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_SOUTH), LABEL(0), /* = 0x00 */ CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 1), WALK_GRID(128, 107), - ROTATE(4, 10, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTH), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 1), SELECT_ANIMATION(4), @@ -9625,7 +9625,7 @@ static const struct ScriptCommand s_gs1_g28_s0_lives9_dlg0[] = { /* 0x815f428 */ CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 1), WALK_GRID(128, 108), - ROTATE(4, 10, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTH), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 1), SELECT_ANIMATION(4), @@ -9634,50 +9634,50 @@ static const struct ScriptCommand s_gs1_g28_s0_lives9_dlg0[] = { /* 0x815f428 */ JUMP_LABEL(0), LABEL(1), /* = 0x01 */ WALK_GRID(128, 109), - ROTATE(4, 10, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHEAST), { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(20), CALL_SCRIPT(SHOCK_FUNC), AWAIT_CUE(20), WAIT(30), - ROTATE(4, 10, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_EAST), WAIT(30), WALK_GRID(76, 110), - { 0x93, 0x04, 0x000a, 0x0000008e, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 142), SELECT_ANIMATION(4), AWAIT_CUE(20), SELECT_ANIMATION(2), - { 0x93, 0x04, 0x000a, 0x00000022, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 34), AWAIT_CUE(20), - { 0x93, 0x04, 0x000a, 0x00000055, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 85), AWAIT_CUE(20), - { 0x93, 0x04, 0x000a, 0x0000008e, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 142), SELECT_ANIMATION(4), AWAIT_CUE(20), WAIT(30), SELECT_ANIMATION(2), - { 0x93, 0x04, 0x000a, 0x0000005b, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 91), AWAIT_CUE(20), - { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 104), AWAIT_CUE(20), { 0x56, 0x00, 0x0000, 0x0000005a, 0x00000000, NULL }, WAIT_RANDOM(30, 90), { 0x56, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(20), - { 0x93, 0x04, 0x000a, 0x0000005b, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 91), AWAIT_CUE(16), { 0x62, 0x00, 0x0100, -0x00000010, 0x00000000, NULL }, LABEL(2), /* = 0x02 */ - { 0x93, 0x04, 0x000a, 0x0000005b, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 91), WAIT(15), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(0, /* to label */ 2), AWAIT_CUE(20), WALK_RELATIVE(128, 16, 0), - ROTATE(4, 10, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHEAST), ALERT_CUE(5), AWAIT_CUE(20), - { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 104), AWAIT_CUE(20), { 0x56, 0x00, 0x0000, 0x0000005a, 0x00000000, NULL }, WAIT_RANDOM(30, 90), @@ -9691,46 +9691,46 @@ static const struct ScriptCommand s_gs1_g28_s0_lives10_dlg0[] = { /* 0x815f928 * DEBUGINFO_O(9691), SELECT_ANIMATION(2), AWAIT_CUE(20), - { 0x93, 0x04, 0x000a, 0x0000005b, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 91), AWAIT_CUE(20), - ROTATE(4, 10, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTH), SELECT_ANIMATION(4), AWAIT_CUE(20), SELECT_ANIMATION(2), - { 0x93, 0x04, 0x000a, 0x00000022, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 34), AWAIT_CUE(20), CALL_SCRIPT(SHOCK_FUNC), AWAIT_CUE(20), - ROTATE(4, 10, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTH), SELECT_ANIMATION(4), AWAIT_CUE(20), SELECT_ANIMATION(2), - { 0x93, 0x04, 0x000a, 0x00000022, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 34), AWAIT_CUE(20), - { 0x93, 0x04, 0x000a, 0x00000055, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 85), AWAIT_CUE(20), - ROTATE(4, 10, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTH), SELECT_ANIMATION(4), AWAIT_CUE(20), WAIT(30), SELECT_ANIMATION(2), - { 0x93, 0x04, 0x000a, 0x0000005b, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 91), AWAIT_CUE(20), - { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 104), AWAIT_CUE(20), { 0x56, 0x00, 0x0000, 0x0000005a, 0x00000000, NULL }, WAIT_RANDOM(30, 90), { 0x56, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(20), LABEL(0), /* = 0x00 */ - { 0x93, 0x04, 0x000a, 0x0000005b, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 91), WAIT(15), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(0, /* to label */ 0), AWAIT_CUE(20), - { 0x93, 0x04, 0x000a, 0x00000022, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 34), AWAIT_CUE(20), - { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 104), AWAIT_CUE(20), { 0x56, 0x00, 0x0000, 0x0000005a, 0x00000000, NULL }, WAIT_RANDOM(30, 90), @@ -9745,13 +9745,13 @@ static const struct ScriptCommand s_gs1_g28_s0_lives11_dlg0[] = { /* 0x815fc58 * DEBUGINFO_O(9745), SELECT_ANIMATION(2), AWAIT_CUE(20), - { 0x93, 0x04, 0x000a, 0x0000005b, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 91), AWAIT_CUE(20), - ROTATE(8, 10, DIRECTION_SOUTH), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_SOUTH), LABEL(0), /* = 0x00 */ CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 1), - ROTATE(8, 10, DIRECTION_SOUTHWEST), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_SOUTHWEST), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 1), SELECT_ANIMATION(4), @@ -9759,7 +9759,7 @@ static const struct ScriptCommand s_gs1_g28_s0_lives11_dlg0[] = { /* 0x815fc58 * SELECT_ANIMATION(2), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 1), - ROTATE(8, 10, DIRECTION_SOUTHEAST), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_SOUTHEAST), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 1), SELECT_ANIMATION(4), @@ -9767,14 +9767,14 @@ static const struct ScriptCommand s_gs1_g28_s0_lives11_dlg0[] = { /* 0x815fc58 * SELECT_ANIMATION(2), JUMP_LABEL(0), LABEL(1), /* = 0x01 */ - { 0x93, 0x04, 0x000a, 0x00000022, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 34), AWAIT_CUE(20), CALL_SCRIPT(SHOCK_FUNC), AWAIT_CUE(20), LABEL(2), /* = 0x02 */ CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 3), - ROTATE(8, 10, DIRECTION_SOUTHWEST), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_SOUTHWEST), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 3), SELECT_ANIMATION(4), @@ -9782,7 +9782,7 @@ static const struct ScriptCommand s_gs1_g28_s0_lives11_dlg0[] = { /* 0x815fc58 * SELECT_ANIMATION(2), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 3), - ROTATE(8, 10, DIRECTION_SOUTHEAST), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_SOUTHEAST), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 3), SELECT_ANIMATION(4), @@ -9790,32 +9790,32 @@ static const struct ScriptCommand s_gs1_g28_s0_lives11_dlg0[] = { /* 0x815fc58 * SELECT_ANIMATION(2), JUMP_LABEL(2), LABEL(3), /* = 0x03 */ - { 0x93, 0x04, 0x000a, 0x00000022, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 34), AWAIT_CUE(20), - { 0x93, 0x04, 0x000a, 0x00000055, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 85), AWAIT_CUE(20), - ROTATE(4, 10, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTH), SELECT_ANIMATION(4), AWAIT_CUE(20), WAIT(30), SELECT_ANIMATION(2), - { 0x93, 0x04, 0x000a, 0x0000005b, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 91), AWAIT_CUE(20), - { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 104), AWAIT_CUE(20), { 0x56, 0x00, 0x0000, 0x0000005a, 0x00000000, NULL }, WAIT_RANDOM(30, 90), { 0x56, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(20), LABEL(4), /* = 0x04 */ - { 0x93, 0x04, 0x000a, 0x0000005b, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 91), WAIT(15), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(0, /* to label */ 4), AWAIT_CUE(20), - { 0x93, 0x04, 0x000a, 0x00000022, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 34), AWAIT_CUE(20), - { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 104), AWAIT_CUE(20), { 0x56, 0x00, 0x0000, 0x0000005a, 0x00000000, NULL }, WAIT_RANDOM(30, 90), @@ -9828,64 +9828,64 @@ static const struct ScriptCommand s_gs1_g28_s0_lives12_dlg0[] = { /* 0x8160158 * DEBUGINFO_O(9828), SELECT_ANIMATION(2), AWAIT_CUE(20), - { 0x93, 0x04, 0x000a, 0x0000005b, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 91), AWAIT_CUE(20), LABEL(0), /* = 0x00 */ CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 1), - ROTATE(4, 10, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_EAST), WAIT_RANDOM(15, 90), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 1), - ROTATE(4, 10, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHWEST), WAIT_RANDOM(15, 90), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 1), - ROTATE(4, 10, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), WAIT_RANDOM(15, 90), JUMP_LABEL(0), LABEL(1), /* = 0x01 */ - { 0x93, 0x04, 0x000a, 0x00000022, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 34), AWAIT_CUE(20), CALL_SCRIPT(SHOCK_FUNC), AWAIT_CUE(20), LABEL(2), /* = 0x02 */ CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 3), - ROTATE(4, 10, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHEAST), WAIT_RANDOM(15, 90), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 3), - ROTATE(4, 10, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHWEST), WAIT_RANDOM(15, 90), JUMP_LABEL(2), LABEL(3), /* = 0x03 */ - { 0x93, 0x04, 0x000a, 0x00000022, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 34), AWAIT_CUE(20), - { 0x93, 0x04, 0x000a, 0x00000055, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 85), AWAIT_CUE(20), - ROTATE(4, 10, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), SELECT_ANIMATION(4), AWAIT_CUE(20), WAIT(30), SELECT_ANIMATION(2), - { 0x93, 0x04, 0x000a, 0x0000005b, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 91), AWAIT_CUE(20), - { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 104), AWAIT_CUE(20), { 0x56, 0x00, 0x0000, 0x0000005a, 0x00000000, NULL }, WAIT_RANDOM(30, 90), { 0x56, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(20), LABEL(4), /* = 0x04 */ - { 0x93, 0x04, 0x000a, 0x0000005b, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 91), WAIT(15), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(0, /* to label */ 4), AWAIT_CUE(20), - { 0x93, 0x04, 0x000a, 0x00000022, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 34), AWAIT_CUE(20), - { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 104), AWAIT_CUE(20), { 0x56, 0x00, 0x0000, 0x0000005a, 0x00000000, NULL }, WAIT_RANDOM(30, 90), @@ -9898,46 +9898,46 @@ static const struct ScriptCommand s_gs1_g28_s0_lives13_dlg0[] = { /* 0x8160588 * DEBUGINFO_O(9898), SELECT_ANIMATION(2), AWAIT_CUE(20), - { 0x93, 0x04, 0x000a, 0x0000005b, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 91), AWAIT_CUE(20), - ROTATE(4, 10, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_EAST), SELECT_ANIMATION(4), AWAIT_CUE(20), SELECT_ANIMATION(2), - { 0x93, 0x04, 0x000a, 0x00000022, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 34), AWAIT_CUE(20), CALL_SCRIPT(SHOCK_FUNC), AWAIT_CUE(20), - ROTATE(4, 10, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_EAST), SELECT_ANIMATION(4), AWAIT_CUE(20), SELECT_ANIMATION(2), - { 0x93, 0x04, 0x000a, 0x00000022, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 34), AWAIT_CUE(20), - { 0x93, 0x04, 0x000a, 0x00000055, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 85), AWAIT_CUE(20), - ROTATE(4, 10, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_EAST), SELECT_ANIMATION(4), AWAIT_CUE(20), WAIT(30), SELECT_ANIMATION(2), - { 0x93, 0x04, 0x000a, 0x0000005b, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 91), AWAIT_CUE(20), - { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 104), AWAIT_CUE(20), { 0x56, 0x00, 0x0000, 0x0000005a, 0x00000000, NULL }, WAIT_RANDOM(30, 90), { 0x56, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(20), LABEL(0), /* = 0x00 */ - { 0x93, 0x04, 0x000a, 0x0000005b, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 91), WAIT(15), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(0, /* to label */ 0), AWAIT_CUE(20), - { 0x93, 0x04, 0x000a, 0x00000022, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 34), AWAIT_CUE(20), - { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 104), AWAIT_CUE(20), { 0x56, 0x00, 0x0000, 0x0000005a, 0x00000000, NULL }, WAIT_RANDOM(30, 90), @@ -9950,59 +9950,59 @@ static const struct ScriptCommand s_gs1_g28_s0_lives14_dlg0[] = { /* 0x8160898 * DEBUGINFO_O(9950), SELECT_ANIMATION(2), AWAIT_CUE(20), - { 0x93, 0x04, 0x000a, 0x0000005b, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 91), AWAIT_CUE(20), SELECT_ANIMATION(2), - ROTATE(4, 10, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_WEST), WAIT(30), - ROTATE(4, 10, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTH), WAIT(30), - ROTATE(4, 10, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_WEST), WAIT(30), - ROTATE(4, 10, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHEAST), SELECT_ANIMATION(4), AWAIT_CUE(20), SELECT_ANIMATION(2), - { 0x93, 0x04, 0x000a, 0x00000022, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 34), AWAIT_CUE(20), CALL_SCRIPT(SHOCK_FUNC), AWAIT_CUE(20), - { 0x93, 0x08, 0x000a, 0x00000088, 0x00000000, NULL }, + CMD_UNK_93(8, DIR_TRANS_10, 136), WAIT(30), WALK_GRID(128, 111), SELECT_ANIMATION(4), ALERT_CUE(5), AWAIT_CUE(20), SELECT_ANIMATION(2), - { 0x93, 0x04, 0x000a, 0x00000022, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 34), AWAIT_CUE(20), - { 0x93, 0x04, 0x000a, 0x00000055, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 85), AWAIT_CUE(20), - { 0x93, 0x04, 0x000a, 0x00000088, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 136), SELECT_ANIMATION(4), AWAIT_CUE(20), WAIT(30), SELECT_ANIMATION(2), - { 0x93, 0x04, 0x000a, 0x0000005b, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 91), AWAIT_CUE(20), - { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 104), AWAIT_CUE(20), { 0x56, 0x00, 0x0000, 0x0000005a, 0x00000000, NULL }, WAIT_RANDOM(30, 90), { 0x56, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(20), - { 0x93, 0x04, 0x000a, 0x0000005b, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 91), AWAIT_CUE(16), { 0x62, 0x00, 0x0100, 0x00000010, 0x00000000, NULL }, LABEL(0), /* = 0x00 */ - { 0x93, 0x04, 0x000a, 0x0000005b, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 91), WAIT(15), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(0, /* to label */ 0), AWAIT_CUE(20), - { 0x93, 0x04, 0x000a, 0x00000022, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 34), AWAIT_CUE(20), - { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 104), AWAIT_CUE(20), { 0x56, 0x00, 0x0000, 0x0000005a, 0x00000000, NULL }, WAIT_RANDOM(30, 90), @@ -10015,52 +10015,52 @@ static const struct ScriptCommand s_gs1_g28_s0_lives15_dlg0[] = { /* 0x8160c78 * DEBUGINFO_O(10015), SELECT_ANIMATION(2), AWAIT_CUE(13), - { 0x93, 0x04, 0x000a, 0x0000005b, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 91), WAIT(15), { 0x62, 0x00, 0x0100, 0x00000000, 0x00000010, NULL }, - ROTATE(4, 10, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHWEST), WALK_RELATIVE(256, -16, 16), WALK_RELATIVE(256, -8, 0), - ROTATE(4, 10, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHEAST), AWAIT_CUE(20), - ROTATE(4, 10, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHWEST), SELECT_ANIMATION(4), AWAIT_CUE(20), SELECT_ANIMATION(2), - { 0x93, 0x04, 0x000a, 0x00000022, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 34), AWAIT_CUE(20), CALL_SCRIPT(SHOCK_FUNC), AWAIT_CUE(20), - ROTATE(4, 10, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHWEST), SELECT_ANIMATION(4), AWAIT_CUE(20), SELECT_ANIMATION(2), - { 0x93, 0x04, 0x000a, 0x00000022, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 34), AWAIT_CUE(20), - { 0x93, 0x04, 0x000a, 0x00000055, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 85), AWAIT_CUE(20), - ROTATE(4, 10, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHWEST), SELECT_ANIMATION(4), AWAIT_CUE(20), WAIT(30), SELECT_ANIMATION(2), - { 0x93, 0x04, 0x000a, 0x0000005b, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 91), AWAIT_CUE(20), - { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 104), AWAIT_CUE(20), { 0x56, 0x00, 0x0000, 0x0000005a, 0x00000000, NULL }, WAIT_RANDOM(30, 90), { 0x56, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(20), LABEL(0), /* = 0x00 */ - { 0x93, 0x04, 0x000a, 0x0000005b, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 91), WAIT(15), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(0, /* to label */ 0), AWAIT_CUE(20), - { 0x93, 0x04, 0x000a, 0x00000022, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 34), AWAIT_CUE(20), - { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 104), AWAIT_CUE(20), { 0x56, 0x00, 0x0000, 0x0000005a, 0x00000000, NULL }, WAIT_RANDOM(30, 90), @@ -10375,10 +10375,10 @@ static const struct ScriptCommand s_gs1_g29_s1_lives2_dlg0[] = { /* 0x81624e0 */ SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(7), - ROTATE(4, 2, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_EAST), ALERT_CUE(5), AWAIT_CUE(7), - ROTATE(4, 1, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTH), AWAIT_CUE(7), RET, }; @@ -10405,10 +10405,10 @@ static const struct ScriptCommand s_gs1_g29_s1_lives3_dlg0[] = { /* 0x8162660 */ SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0003, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(8), - ROTATE(4, 1, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_WEST), ALERT_CUE(5), AWAIT_CUE(8), - ROTATE(4, 2, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTH), ALERT_CUE(5), AWAIT_CUE(8), RET, @@ -10657,13 +10657,13 @@ static const struct ScriptCommand s_gs1_g30_s0_lives9_dlg1[] = { /* 0x81634b0 */ SELECT_ANIMATION(5), WALK_RELATIVE(256, -16, 0), WAIT(10), - ROTATE(4, 10, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTH), WAIT(90), WALK_RELATIVE(256, 16, 0), WAIT(90), WALK_RELATIVE(256, 16, 0), WAIT(10), - ROTATE(4, 10, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTH), WAIT(90), WALK_RELATIVE(256, -16, 0), WAIT(90), @@ -10769,10 +10769,10 @@ static const struct ScriptCommand s_gs1_g30_s1_lives2_dlg0[] = { /* 0x8163d34 */ SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(7), - ROTATE(4, 2, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_EAST), ALERT_CUE(5), AWAIT_CUE(7), - ROTATE(4, 1, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTH), AWAIT_CUE(7), RET, }; @@ -10799,10 +10799,10 @@ static const struct ScriptCommand s_gs1_g30_s1_lives3_dlg0[] = { /* 0x8163eb4 */ SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0003, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(8), - ROTATE(4, 1, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_WEST), ALERT_CUE(5), AWAIT_CUE(8), - ROTATE(4, 2, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTH), ALERT_CUE(5), AWAIT_CUE(8), RET, @@ -10946,14 +10946,14 @@ static const struct ScriptCommand s_gs1_g31_s0_lives0_dlg0[] = { /* 0x81641b8 */ TEXTBOX_CLEAR, WAIT(10), ALERT_CUE(6), - ROTATE(4, 10, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_WEST), MSG_NPC(8, _(" You've earned everyone's\nrespect now.")), MSG_NPC(8, _(" Your {COLOR CYAN}Team {TEAM_NAME}{RESET}\nis a first-class rescue team.")), MSG_NPC(8, _(" Take pride in that.{WAIT_PRESS}\n{NAME_1}, {NAME_0}.")), TEXTBOX_CLEAR, WAIT(10), ALERT_CUE(6), - ROTATE(4, 10, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), WAIT(5), PORTRAIT_REP(0x0001, 0x00000008), MSG_VAR(2, PARTNER_TALK_KIND, 1), @@ -11001,7 +11001,7 @@ static const struct ScriptCommand s_gs1_g31_s0_lives0_dlg0[] = { /* 0x81641b8 */ { 0x27, 0x01, 0x0001, 0x0000000f, 0x00ffffff, NULL }, WAIT(60), ALERT_CUE(6), - ROTATE(4, 10, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_EAST), MSG_NPC(3, _(" No. I heard it too.")), TEXTBOX_CLEAR, WAIT(10), @@ -11028,7 +11028,7 @@ static const struct ScriptCommand s_gs1_g31_s0_lives0_dlg0[] = { /* 0x81641b8 */ { 0x2d, 0x09, 0x0009, 0x00000061, 0x00000000, NULL }, ALERT_CUE(6), AWAIT_CUE(5), - ROTATE(4, 10, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), PORTRAIT_REP(0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Th-this voice...{WAIT_PRESS}\nI remember this voice.")), @@ -11038,7 +11038,7 @@ static const struct ScriptCommand s_gs1_g31_s0_lives0_dlg0[] = { /* 0x81641b8 */ TEXTBOX_CLEAR, WAIT(10), ALERT_CUE(6), - ROTATE(4, 10, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_WEST), MSG_NPC(8, _(" {NAME_9}?{WAIT_PRESS}\nAh, that's it! Telepathy!")), MSG_NPC(8, _(" {NAME_9} is calling out\nto us using telepathy!")), TEXTBOX_CLEAR, @@ -11083,23 +11083,23 @@ static const struct ScriptCommand s_gs1_g31_s0_lives1_dlg0[] = { /* 0x8165464 */ ALERT_CUE(5), AWAIT_CUE(6), WAIT(3), - ROTATE(4, 10, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_WEST), AWAIT_CUE(6), - ROTATE(4, 10, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTH), AWAIT_CUE(6), WAIT(5), CALL_SCRIPT(LOOK_AROUND_FUNC), AWAIT_CUE(6), - ROTATE(4, 10, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_EAST), AWAIT_CUE(6), WAIT(5), CALL_SCRIPT(LOOK_AROUND_FUNC), - ROTATE(4, 10, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTH), AWAIT_CUE(6), CALL_SCRIPT(NOTICE_FUNC), ALERT_CUE(5), AWAIT_CUE(6), - ROTATE(4, 10, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_WEST), AWAIT_CUE(6), { 0x52, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, HALT, @@ -11110,13 +11110,13 @@ static const struct ScriptCommand s_gs1_g31_s0_lives2_dlg0[] = { /* 0x8165654 */ SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(7), - ROTATE(4, 10, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHWEST), AWAIT_CUE(7), - ROTATE(4, 10, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_WEST), AWAIT_CUE(7), WALK_GRID(256, 123), AWAIT_CUE(7), - ROTATE(4, 10, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHWEST), AWAIT_CUE(7), CALL_SCRIPT(SMILE_START_FUNC), AWAIT_CUE(7), @@ -11139,22 +11139,22 @@ static const struct ScriptCommand s_gs1_g31_s0_lives3_dlg0[] = { /* 0x8165794 */ AWAIT_CUE(8), WALK_GRID(256, 121), AWAIT_CUE(8), - ROTATE(4, 10, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHWEST), AWAIT_CUE(8), WALK_RELATIVE(128, -8, 8), ALERT_CUE(5), AWAIT_CUE(8), - ROTATE(12, 10, DIRECTION_NORTHWEST), + ROTATE_TO(12, DIR_TRANS_10, DIRECTION_NORTHWEST), WAIT(15), - ROTATE(12, 10, DIRECTION_SOUTHEAST), + ROTATE_TO(12, DIR_TRANS_10, DIRECTION_SOUTHEAST), WAIT(10), - ROTATE(4, 10, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHWEST), AWAIT_CUE(8), - ROTATE(12, 10, DIRECTION_NORTHWEST), + ROTATE_TO(12, DIR_TRANS_10, DIRECTION_NORTHWEST), WAIT(15), - ROTATE(12, 10, DIRECTION_SOUTHEAST), + ROTATE_TO(12, DIR_TRANS_10, DIRECTION_SOUTHEAST), WAIT(15), - ROTATE(12, 10, DIRECTION_SOUTHWEST), + ROTATE_TO(12, DIR_TRANS_10, DIRECTION_SOUTHWEST), AWAIT_CUE(8), { 0x52, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, HALT, @@ -11165,12 +11165,12 @@ static const struct ScriptCommand s_gs1_g31_s0_lives4_dlg0[] = { /* 0x8165964 */ SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0004, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(9), - ROTATE(4, 10, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHWEST), AWAIT_CUE(9), - ROTATE(4, 10, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_WEST), AWAIT_CUE(9), WALK_GRID(256, 122), - ROTATE(4, 10, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_WEST), AWAIT_CUE(9), CALL_SCRIPT(JUMP_HAPPY_FUNC), ALERT_CUE(5), @@ -11189,24 +11189,24 @@ static const struct ScriptCommand s_gs1_g31_s0_lives5_dlg0[] = { /* 0x8165ab4 */ SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0005, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(10), - ROTATE(4, 10, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_WEST), AWAIT_CUE(10), - ROTATE(4, 10, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_WEST), AWAIT_CUE(10), WALK_GRID(256, 124), - ROTATE(4, 10, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_WEST), AWAIT_CUE(10), CALL_SCRIPT(SMILE_START_FUNC), AWAIT_CUE(10), CALL_SCRIPT(SMILE_END_FUNC), AWAIT_CUE(10), - ROTATE(8, 10, DIRECTION_SOUTH), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_SOUTH), WAIT(45), - ROTATE(8, 10, DIRECTION_WEST), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_WEST), AWAIT_CUE(10), - ROTATE(8, 10, DIRECTION_SOUTH), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_SOUTH), WAIT(45), - ROTATE(8, 10, DIRECTION_WEST), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_WEST), AWAIT_CUE(10), HALT, }; @@ -11216,22 +11216,22 @@ static const struct ScriptCommand s_gs1_g31_s0_lives6_dlg0[] = { /* 0x8165c34 */ SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0006, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(11), - ROTATE(4, 10, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_WEST), AWAIT_CUE(11), - ROTATE(4, 10, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_WEST), AWAIT_CUE(11), CALL_SCRIPT(JUMP_ANGRY_FUNC), ALERT_CUE(5), AWAIT_CUE(11), WALK_GRID(256, 125), AWAIT_CUE(11), - ROTATE(8, 10, DIRECTION_NORTH), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_NORTH), WAIT(50), - ROTATE(4, 10, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_WEST), AWAIT_CUE(11), - ROTATE(8, 10, DIRECTION_NORTH), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_NORTH), WAIT(50), - ROTATE(4, 10, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_WEST), AWAIT_CUE(11), HALT, }; @@ -11241,13 +11241,13 @@ static const struct ScriptCommand s_gs1_g31_s0_lives7_dlg0[] = { /* 0x8165d94 */ SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0007, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(12), - ROTATE(4, 10, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHWEST), AWAIT_CUE(12), - ROTATE(4, 10, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_WEST), AWAIT_CUE(12), WALK_GRID(256, 126), AWAIT_CUE(12), - ROTATE(4, 10, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHWEST), AWAIT_CUE(12), CALL_SCRIPT(LOOK_AROUND_FUNC), AWAIT_CUE(12), @@ -11275,13 +11275,13 @@ static const struct ScriptCommand s_gs1_g31_s0_lives9_dlg0[] = { /* 0x8165f34 */ AWAIT_CUE(15), WALK_GRID(204, 119), AWAIT_CUE(15), - ROTATE(12, 10, DIRECTION_NORTHWEST), + ROTATE_TO(12, DIR_TRANS_10, DIRECTION_NORTHWEST), WAIT(45), - ROTATE(12, 10, DIRECTION_EAST), + ROTATE_TO(12, DIR_TRANS_10, DIRECTION_EAST), AWAIT_CUE(15), - ROTATE(12, 10, DIRECTION_NORTHWEST), + ROTATE_TO(12, DIR_TRANS_10, DIRECTION_NORTHWEST), WAIT(45), - ROTATE(12, 10, DIRECTION_EAST), + ROTATE_TO(12, DIR_TRANS_10, DIRECTION_EAST), AWAIT_CUE(15), { 0x52, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, HALT, @@ -11294,13 +11294,13 @@ static const struct ScriptCommand s_gs1_g31_s0_lives10_dlg0[] = { /* 0x8166034 * AWAIT_CUE(16), WALK_GRID(204, 120), AWAIT_CUE(16), - ROTATE(12, 10, DIRECTION_SOUTHWEST), + ROTATE_TO(12, DIR_TRANS_10, DIRECTION_SOUTHWEST), WAIT(30), - ROTATE(12, 10, DIRECTION_EAST), + ROTATE_TO(12, DIR_TRANS_10, DIRECTION_EAST), AWAIT_CUE(16), - ROTATE(12, 10, DIRECTION_SOUTHWEST), + ROTATE_TO(12, DIR_TRANS_10, DIRECTION_SOUTHWEST), WAIT(30), - ROTATE(12, 10, DIRECTION_EAST), + ROTATE_TO(12, DIR_TRANS_10, DIRECTION_EAST), AWAIT_CUE(16), { 0x52, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, HALT, @@ -11319,14 +11319,14 @@ static const struct ScriptCommand s_gs1_g31_s0_lives11_dlg0[] = { /* 0x8166134 * CALL_SCRIPT(SMILE_END_FUNC), AWAIT_CUE(20), WAIT(10), - ROTATE(12, 10, DIRECTION_SOUTHEAST), + ROTATE_TO(12, DIR_TRANS_10, DIRECTION_SOUTHEAST), WAIT(30), - ROTATE(12, 10, DIRECTION_NORTHEAST), + ROTATE_TO(12, DIR_TRANS_10, DIRECTION_NORTHEAST), AWAIT_CUE(20), WAIT(10), - ROTATE(12, 10, DIRECTION_SOUTHEAST), + ROTATE_TO(12, DIR_TRANS_10, DIRECTION_SOUTHEAST), WAIT(30), - ROTATE(12, 10, DIRECTION_NORTH), + ROTATE_TO(12, DIR_TRANS_10, DIRECTION_NORTH), AWAIT_CUE(20), { 0x52, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, HALT, @@ -11339,7 +11339,7 @@ static const struct ScriptCommand s_gs1_g31_s0_lives12_dlg0[] = { /* 0x81662a4 * AWAIT_CUE(20), WAIT(45), WALK_GRID(256, 134), - ROTATE(4, 10, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHWEST), AWAIT_CUE(20), WAIT(3), CALL_SCRIPT(SMILE_START_FUNC), @@ -11347,18 +11347,18 @@ static const struct ScriptCommand s_gs1_g31_s0_lives12_dlg0[] = { /* 0x81662a4 * CALL_SCRIPT(SMILE_END_FUNC), AWAIT_CUE(20), WAIT(5), - ROTATE(12, 10, DIRECTION_SOUTHEAST), + ROTATE_TO(12, DIR_TRANS_10, DIRECTION_SOUTHEAST), WAIT(15), - ROTATE(12, 10, DIRECTION_WEST), + ROTATE_TO(12, DIR_TRANS_10, DIRECTION_WEST), WAIT(15), - ROTATE(12, 10, DIRECTION_NORTH), + ROTATE_TO(12, DIR_TRANS_10, DIRECTION_NORTH), AWAIT_CUE(20), WAIT(5), - ROTATE(12, 10, DIRECTION_SOUTHEAST), + ROTATE_TO(12, DIR_TRANS_10, DIRECTION_SOUTHEAST), WAIT(15), - ROTATE(12, 10, DIRECTION_WEST), + ROTATE_TO(12, DIR_TRANS_10, DIRECTION_WEST), WAIT(15), - ROTATE(12, 10, DIRECTION_NORTHWEST), + ROTATE_TO(12, DIR_TRANS_10, DIRECTION_NORTHWEST), AWAIT_CUE(20), { 0x52, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, HALT, @@ -11377,13 +11377,13 @@ static const struct ScriptCommand s_gs1_g31_s0_lives13_dlg0[] = { /* 0x8166474 * AWAIT_CUE(20), CALL_SCRIPT(SMILE_END_FUNC), AWAIT_CUE(20), - ROTATE(8, 10, DIRECTION_SOUTHEAST), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_SOUTHEAST), WAIT(45), - ROTATE(4, 10, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), AWAIT_CUE(20), - ROTATE(8, 10, DIRECTION_SOUTHEAST), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_SOUTHEAST), WAIT(45), - ROTATE(4, 10, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), AWAIT_CUE(20), { 0x52, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, HALT, @@ -11400,14 +11400,14 @@ static const struct ScriptCommand s_gs1_g31_s0_lives14_dlg0[] = { /* 0x81665d4 * WAIT(5), AWAIT_CUE(20), WAIT(7), - ROTATE(12, 10, DIRECTION_WEST), + ROTATE_TO(12, DIR_TRANS_10, DIRECTION_WEST), WAIT(30), - ROTATE(12, 10, DIRECTION_SOUTHEAST), + ROTATE_TO(12, DIR_TRANS_10, DIRECTION_SOUTHEAST), AWAIT_CUE(20), WAIT(7), - ROTATE(12, 10, DIRECTION_WEST), + ROTATE_TO(12, DIR_TRANS_10, DIRECTION_WEST), WAIT(30), - ROTATE(12, 10, DIRECTION_SOUTH), + ROTATE_TO(12, DIR_TRANS_10, DIRECTION_SOUTH), AWAIT_CUE(20), { 0x52, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, HALT, @@ -11451,7 +11451,7 @@ static const struct ScriptCommand s_gs1_g31_s0_lives17_dlg0[] = { /* 0x81668b4 * AWAIT_CUE(20), WAIT(45), WALK_GRID(256, 130), - ROTATE(4, 10, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHEAST), AWAIT_CUE(20), WAIT(2), CALL_SCRIPT(SMILE_START_FUNC), @@ -11472,21 +11472,21 @@ static const struct ScriptCommand s_gs1_g31_s0_lives18_dlg0[] = { /* 0x81669d4 * AWAIT_CUE(20), WAIT(60), WALK_GRID(256, 131), - ROTATE(4, 10, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHWEST), AWAIT_CUE(20), CALL_SCRIPT(SMILE_START_FUNC), AWAIT_CUE(20), CALL_SCRIPT(SMILE_END_FUNC), AWAIT_CUE(20), WAIT(12), - ROTATE(12, 10, DIRECTION_EAST), + ROTATE_TO(12, DIR_TRANS_10, DIRECTION_EAST), WAIT(20), - ROTATE(8, 10, DIRECTION_SOUTHWEST), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_SOUTHWEST), AWAIT_CUE(20), WAIT(12), - ROTATE(12, 10, DIRECTION_EAST), + ROTATE_TO(12, DIR_TRANS_10, DIRECTION_EAST), WAIT(20), - ROTATE(8, 10, DIRECTION_SOUTHWEST), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_SOUTHWEST), AWAIT_CUE(20), { 0x52, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, HALT, @@ -11611,7 +11611,7 @@ static const struct ScriptCommand s_gs1_g32_s0_lives0_dlg0[] = { /* 0x8166c80 */ TEXTBOX_CLEAR, WAIT(10), ALERT_CUE(6), - ROTATE(4, 10, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Hey, {NAME_0}!\nLet's get it done!")), VARIANT_DEFAULT(_(" Right, {NAME_0}?\nLet's get it done!")), @@ -11643,7 +11643,7 @@ static const struct ScriptCommand s_gs1_g32_s0_lives1_dlg0[] = { /* 0x8167744 */ CALL_SCRIPT(JUMP_HAPPY_FUNC), ALERT_CUE(5), AWAIT_CUE(6), - ROTATE(4, 10, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTH), AWAIT_CUE(6), HALT, }; @@ -12607,10 +12607,10 @@ static const struct ScriptCommand s_gs1_g38_s1_lives1_dlg0[] = { /* 0x816b424 */ SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(7), - ROTATE(4, 2, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_EAST), ALERT_CUE(5), AWAIT_CUE(7), - ROTATE(4, 1, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTH), AWAIT_CUE(7), SELECT_ANIMATION(4), RET, @@ -12637,10 +12637,10 @@ static const struct ScriptCommand s_gs1_g38_s1_lives2_dlg0[] = { /* 0x816b620 */ SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0003, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(8), - ROTATE(4, 1, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_WEST), ALERT_CUE(5), AWAIT_CUE(8), - ROTATE(4, 2, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTH), ALERT_CUE(5), AWAIT_CUE(8), WAIT(30), @@ -12796,12 +12796,12 @@ static const struct ScriptCommand s_gs1_g40_s0_lives0_dlg3[] = { /* 0x816c390 */ CALL_SCRIPT(QUESTION_FUNC), ALERT_CUE(5), AWAIT_CUE(6), - { 0x92, 0x04, 0x000b, 0x00000005, 0x00000000, NULL }, + CMD_UNK_92(4, 11, DIR_TRANS_FLIP), AWAIT_CUE(6), - { 0x92, 0x04, 0x000b, 0x00000005, 0x00000000, NULL }, + CMD_UNK_92(4, 11, DIR_TRANS_FLIP), CALL_SCRIPT(NOTICE_FUNC), LABEL(0), /* = 0x00 */ - { 0x8d, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, + CMD_UNK_8D(1, DIR_TRANS_NONE), AWAIT_CUE(2), WAIT(12), RET, @@ -12854,14 +12854,14 @@ static const struct ScriptCommand s_gs1_g41_s0_lives0_dlg3[] = { /* 0x816c958 */ DEBUGINFO_O(12854), { 0x52, 0x00, 0x0000, 0x00000200, 0x00000000, NULL }, { 0x52, 0x00, 0x0000, 0x00000400, 0x00000000, NULL }, - { 0x8d, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, + CMD_UNK_8D(0, DIR_TRANS_NONE), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(6), - ROTATE(4, 10, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHWEST), ALERT_CUE(5), AWAIT_CUE(6), - { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, - { 0x8d, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 0), + CMD_UNK_8D(1, DIR_TRANS_NONE), AWAIT_CUE(2), WAIT(12), RET, @@ -12982,7 +12982,7 @@ static const struct ScriptCommand s_gs1_g43_s0_lives0_dlg0[] = { /* 0x816cf4c */ MSG_NPC(3, _(" Who is that? Over there.")), TEXTBOX_CLEAR, WAIT(10), - ROTATE(4, 10, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_WEST), ALERT_CUE(7), AWAIT_CUE(5), PORTRAIT(PLACEMENT_LEFT_FLIP, 0x0002, 0x00000000), @@ -12991,7 +12991,7 @@ static const struct ScriptCommand s_gs1_g43_s0_lives0_dlg0[] = { /* 0x816cf4c */ BGM_FADEOUT(120), WAIT(10), ALERT_CUE(6), - ROTATE(4, 10, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_WEST), WAIT(20), ALERT_CUE(4), ALERT_CUE(9), @@ -13025,9 +13025,9 @@ static const struct ScriptCommand s_gs1_g43_s0_lives1_dlg0[] = { /* 0x816d2cc */ DEBUGINFO_O(13025), SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0x8e, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, + CMD_UNK_8E(1, DIR_TRANS_NONE, 0), AWAIT_CUE(6), - ROTATE(4, 10, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_WEST), AWAIT_CUE(6), { 0x58, 0x01, 0x0000, 0x000001d0, 0x00000150, NULL }, AWAIT_CUE(6), @@ -13042,7 +13042,7 @@ static const struct ScriptCommand s_gs1_g43_s0_lives2_dlg0[] = { /* 0x816d39c */ SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(7), - ROTATE(4, 10, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_WEST), WAIT(10), FANFARE_PLAY2(469), CALL_SCRIPT(QUESTION_FUNC), @@ -13063,7 +13063,7 @@ static const struct ScriptCommand s_gs1_g43_s0_lives3_dlg0[] = { /* 0x816d48c */ FANFARE_PLAY2(465), CALL_SCRIPT(NOTICE_FUNC), { 0xe2, 0x00, 0x01d1, 0x00000000, 0x00000000, NULL }, - ROTATE(4, 10, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_WEST), ALERT_CUE(5), AWAIT_CUE(8), { 0x58, 0x01, 0x0000, 0x000001f0, 0x00000150, NULL }, @@ -13097,7 +13097,7 @@ static const struct ScriptCommand s_gs1_g43_s0_lives4_dlg0[] = { /* 0x816d56c */ AWAIT_CUE(9), FANFARE_PLAY2(809), { 0x54, 0x00, 0x000f, 0x00000000, 0x00000000, NULL }, - ROTATE(1, 10, DIRECTION_SOUTH), + ROTATE_TO(1, DIR_TRANS_10, DIRECTION_SOUTH), WAIT(10), { 0xe2, 0x00, 0x0329, 0x00000000, 0x00000000, NULL }, STOP_ANIMATION_ON_CURRENT_FRAME, @@ -13212,11 +13212,11 @@ static const struct ScriptCommand s_gs1_g45_s1_lives0_dlg0[] = { /* 0x816d940 */ ALERT_CUE(7), { 0x52, 0x00, 0x0000, 0x00000004, 0x00000000, NULL }, WALK_RELATIVE(256, -32, 0), - { 0x8e, 0x0f, 0x000a, 0x00000073, 0x00000000, NULL }, + CMD_UNK_8E(15, DIR_TRANS_10, 115), AWAIT_CUE(5), - ROTATE(4, 10, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHEAST), AWAIT_CUE(5), - ROTATE(4, 10, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTH), AWAIT_CUE(5), { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, ALERT_CUE(3), @@ -13290,7 +13290,7 @@ static const struct ScriptCommand s_gs1_g45_s1_lives1_dlg0[] = { /* 0x816e32c */ { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, WAIT(20), SELECT_ANIMATION(5), - ROTATE(4, 10, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTH), WAIT(30), WALK_RELATIVE(256, 8, 16), ALERT_CUE(5), @@ -13302,13 +13302,13 @@ static const struct ScriptCommand s_gs1_g45_s1_lives1_dlg0[] = { /* 0x816e32c */ WALK_RELATIVE(256, -8, 16), WAIT(60), WALK_RELATIVE(256, 8, 16), - ROTATE(4, 10, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTH), ALERT_CUE(5), WAIT(30), WALK_RELATIVE(256, -8, 16), WAIT(60), WALK_RELATIVE(256, 8, 16), - ROTATE(4, 10, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTH), WAIT(30), WALK_RELATIVE(256, -8, 16), WAIT(30), @@ -13522,7 +13522,7 @@ static const struct ScriptCommand s_gs1_g46_s0_lives0_dlg0[] = { /* 0x816e9f8 */ ALERT_CUE(7), ALERT_CUE(8), ALERT_CUE(10), - { 0x93, 0x04, 0x000a, 0x0000006d, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 109), WAIT(60), MSG_NPC(4, _(" I heard this story...")), MSG_NPC(4, _(" Somewhere in the world is\na Pokémon that was made for fighting.")), @@ -13557,7 +13557,7 @@ static const struct ScriptCommand s_gs1_g46_s0_lives0_dlg0[] = { /* 0x816e9f8 */ ALERT_CUE(8), ALERT_CUE(9), ALERT_CUE(10), - { 0x93, 0x04, 0x000a, 0x00000059, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 89), WAIT(30), ALERT_CUE(4), AWAIT_CUE(5), @@ -13618,7 +13618,7 @@ static const struct ScriptCommand s_gs1_g46_s0_lives0_dlg0[] = { /* 0x816e9f8 */ ALERT_CUE(8), ALERT_CUE(9), ALERT_CUE(10), - { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 104), MSG_NPC(7, _(" I never want...{WAIT_PRESS}\nto go back again...{WAIT_PRESS} Gfwoh!")), TEXTBOX_CLEAR, ALERT_CUE(12), @@ -13642,7 +13642,7 @@ static const struct ScriptCommand s_gs1_g46_s0_lives0_dlg0[] = { /* 0x816e9f8 */ MSG_NPC(2, _(" ...Wow, it really exists...{WAIT_PRESS}\nA Pokémon that tough...")), ALERT_CUE(9), ALERT_CUE(10), - { 0x93, 0x04, 0x000a, 0x0000004d, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 77), MSG_NPC(2, _(" ...But, you know?{WAIT_PRESS}\nSo we now know that Pokémon is in the\n{COLOR YELLOW_D}Western Cave{RESET}...")), MSG_NPC(2, _(" I still don't feel like going\nout there...")), MSG_NPC(2, _(" Going anywhere like that'd\nbe too scary by half!")), @@ -13652,7 +13652,7 @@ static const struct ScriptCommand s_gs1_g46_s0_lives0_dlg0[] = { /* 0x816e9f8 */ TEXTBOX_CLEAR, WAIT(10), ALERT_CUE(10), - { 0x93, 0x04, 0x000a, 0x0000006d, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 109), AWAIT_CUE(5), ALERT_CUE(10), PORTRAIT_REP(0x0005, 0x00000001), @@ -13711,17 +13711,17 @@ static const struct ScriptCommand s_gs1_g46_s0_lives2_dlg0[] = { /* 0x81709ac */ SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(7), - { 0x93, 0x04, 0x000a, 0x0000004f, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 79), ALERT_CUE(5), AWAIT_CUE(7), - ROTATE(4, 10, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHWEST), ALERT_CUE(5), AWAIT_CUE(7), - { 0x93, 0x04, 0x000a, 0x0000004f, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 79), ALERT_CUE(5), AWAIT_CUE(7), CALL_SCRIPT(NOTICE_FUNC), - { 0x93, 0x04, 0x000a, 0x00000001, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 1), ALERT_CUE(5), AWAIT_CUE(7), CJUMP_VAR(EVENT_LOCAL), @@ -13739,19 +13739,19 @@ static const struct ScriptCommand s_gs1_g46_s0_lives2_dlg0[] = { /* 0x81709ac */ JUMP_LABEL(3), LABEL(1), /* = 0x01 */ { 0x56, 0x00, 0x0000, 0x0000005b, 0x00000000, NULL }, - { 0x93, 0x04, 0x000a, 0x0000004f, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 79), JUMP_LABEL(3), LABEL(2), /* = 0x02 */ CALL_SCRIPT(SWEAT_FUNC), ALERT_CUE(5), LABEL(3), /* = 0x03 */ AWAIT_CUE(7), - { 0x93, 0x04, 0x000a, 0x0000006d, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 109), AWAIT_CUE(7), - { 0x93, 0x04, 0x000a, 0x00000059, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 89), AWAIT_CUE(7), WALK_GRID(256, 138), - { 0x93, 0x04, 0x000a, 0x00000059, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 89), ALERT_CUE(5), AWAIT_CUE(7), { 0x56, 0x00, 0x0000, 0x0000005b, 0x00000000, NULL }, @@ -13759,11 +13759,11 @@ static const struct ScriptCommand s_gs1_g46_s0_lives2_dlg0[] = { /* 0x81709ac */ AWAIT_CUE(7), { 0x56, 0x00, 0x0000, 0x0000005b, 0x00000000, NULL }, AWAIT_CUE(7), - { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 104), AWAIT_CUE(7), { 0x56, 0x00, 0x0000, 0x0000005b, 0x00000000, NULL }, AWAIT_CUE(7), - ROTATE(4, 10, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHEAST), ALERT_CUE(5), AWAIT_CUE(7), RET, @@ -13774,17 +13774,17 @@ static const struct ScriptCommand s_gs1_g46_s0_lives3_dlg0[] = { /* 0x8170d6c */ SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0003, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(8), - ROTATE(4, 10, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHWEST), ALERT_CUE(5), AWAIT_CUE(8), - { 0x93, 0x04, 0x000a, 0x0000004d, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 77), ALERT_CUE(5), AWAIT_CUE(8), - ROTATE(4, 10, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHWEST), ALERT_CUE(5), AWAIT_CUE(8), CALL_SCRIPT(NOTICE_FUNC), - { 0x93, 0x04, 0x000a, 0x00000001, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 1), AWAIT_CUE(8), CJUMP_VAR(EVENT_LOCAL), COND_EQUAL(1, /* to label */ 0), @@ -13792,7 +13792,7 @@ static const struct ScriptCommand s_gs1_g46_s0_lives3_dlg0[] = { /* 0x8170d6c */ COND_EQUAL(3, /* to label */ 2), LABEL(0), /* = 0x00 */ { 0x56, 0x00, 0x0000, 0x0000005b, 0x00000000, NULL }, - { 0x93, 0x04, 0x000a, 0x0000004d, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 77), JUMP_LABEL(3), LABEL(1), /* = 0x01 */ CALL_SCRIPT(NOTICE_FUNC), @@ -13807,24 +13807,24 @@ static const struct ScriptCommand s_gs1_g46_s0_lives3_dlg0[] = { /* 0x8170d6c */ CALL_SCRIPT(SWEAT_FUNC), LABEL(3), /* = 0x03 */ AWAIT_CUE(8), - { 0x93, 0x04, 0x000a, 0x0000006d, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 109), AWAIT_CUE(8), SELECT_ANIMATION(9), WAIT(60), SELECT_ANIMATION(2), { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(8), - { 0x93, 0x04, 0x000a, 0x00000059, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 89), AWAIT_CUE(8), WALK_GRID(256, 139), - { 0x93, 0x04, 0x000a, 0x00000059, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 89), AWAIT_CUE(8), { 0x56, 0x00, 0x0000, 0x0000005b, 0x00000000, NULL }, CALL_SCRIPT(JUMP_SURPRISE_FUNC), AWAIT_CUE(8), { 0x56, 0x00, 0x0000, 0x0000005b, 0x00000000, NULL }, AWAIT_CUE(8), - { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 104), AWAIT_CUE(8), { 0x56, 0x00, 0x0000, 0x0000005b, 0x00000000, NULL }, AWAIT_CUE(8), @@ -13838,13 +13838,13 @@ static const struct ScriptCommand s_gs1_g46_s0_lives4_dlg0[] = { /* 0x817113c */ SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0004, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(9), - { 0x93, 0x04, 0x000a, 0x0000004f, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 79), AWAIT_CUE(9), - { 0x93, 0x04, 0x000a, 0x0000004d, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 77), AWAIT_CUE(9), - { 0x93, 0x04, 0x000a, 0x0000004f, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 79), AWAIT_CUE(9), - { 0x93, 0x04, 0x000a, 0x00000001, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 1), WAIT(30), FANFARE_PLAY2(465), CALL_SCRIPT(NOTICE_FUNC), @@ -13862,26 +13862,26 @@ static const struct ScriptCommand s_gs1_g46_s0_lives4_dlg0[] = { /* 0x817113c */ CALL_SCRIPT(SWEAT_FUNC), LABEL(3), /* = 0x03 */ AWAIT_CUE(9), - ROTATE(4, 10, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), ALERT_CUE(5), AWAIT_CUE(9), - { 0x93, 0x04, 0x000a, 0x0000004f, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 79), ALERT_CUE(5), AWAIT_CUE(9), - { 0x93, 0x04, 0x000a, 0x00000059, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 89), AWAIT_CUE(9), - ROTATE(4, 10, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_WEST), AWAIT_CUE(9), { 0x56, 0x00, 0x0000, 0x0000005b, 0x00000000, NULL }, CALL_SCRIPT(JUMP_SURPRISE_FUNC), AWAIT_CUE(9), { 0x56, 0x00, 0x0000, 0x0000005b, 0x00000000, NULL }, AWAIT_CUE(9), - { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 104), AWAIT_CUE(9), { 0x56, 0x00, 0x0000, 0x0000005b, 0x00000000, NULL }, AWAIT_CUE(9), - { 0x93, 0x04, 0x000a, 0x0000004d, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 77), AWAIT_CUE(9), RET, }; @@ -13891,9 +13891,9 @@ static const struct ScriptCommand s_gs1_g46_s0_lives5_dlg0[] = { /* 0x817145c */ SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0005, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(10), - { 0x93, 0x04, 0x000a, 0x0000004f, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 79), AWAIT_CUE(10), - { 0x93, 0x04, 0x000a, 0x0000004d, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 77), AWAIT_CUE(10), SELECT_ANIMATION(19), STOP_ANIMATION_ON_CURRENT_FRAME, @@ -13909,7 +13909,7 @@ static const struct ScriptCommand s_gs1_g46_s0_lives5_dlg0[] = { /* 0x817145c */ SELECT_ANIMATION(2), ALERT_CUE(5), AWAIT_CUE(10), - { 0x93, 0x04, 0x000a, 0x0000004f, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 79), AWAIT_CUE(10), SELECT_ANIMATION(19), STOP_ANIMATION_ON_CURRENT_FRAME, @@ -13925,7 +13925,7 @@ static const struct ScriptCommand s_gs1_g46_s0_lives5_dlg0[] = { /* 0x817145c */ SELECT_ANIMATION(2), ALERT_CUE(5), AWAIT_CUE(10), - { 0x93, 0x04, 0x000a, 0x00000001, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 1), WAIT(30), CALL_SCRIPT(NOTICE_FUNC), AWAIT_CUE(10), @@ -13941,24 +13941,24 @@ static const struct ScriptCommand s_gs1_g46_s0_lives5_dlg0[] = { /* 0x817145c */ CALL_SCRIPT(SWEAT_FUNC), LABEL(3), /* = 0x03 */ AWAIT_CUE(10), - { 0x93, 0x04, 0x000a, 0x0000006d, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 109), AWAIT_CUE(10), - { 0x93, 0x04, 0x000a, 0x00000059, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 89), AWAIT_CUE(10), - ROTATE(4, 10, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_WEST), AWAIT_CUE(10), { 0x56, 0x00, 0x0000, 0x0000005b, 0x00000000, NULL }, CALL_SCRIPT(JUMP_SURPRISE_FUNC), AWAIT_CUE(10), { 0x56, 0x00, 0x0000, 0x0000005b, 0x00000000, NULL }, AWAIT_CUE(10), - { 0x93, 0x04, 0x000a, 0x00000068, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 104), AWAIT_CUE(10), { 0x56, 0x00, 0x0000, 0x0000005b, 0x00000000, NULL }, AWAIT_CUE(10), - { 0x93, 0x04, 0x000a, 0x0000004d, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 77), AWAIT_CUE(10), - { 0x93, 0x04, 0x000a, 0x0000006d, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 109), { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(10), SELECT_ANIMATION(19), @@ -14079,7 +14079,7 @@ static const struct ScriptCommand s_gs1_g47_s0_lives0_dlg0[] = { /* 0x8171d48 */ ALERT_CUE(10), AWAIT_CUE(5), ALERT_CUE(6), - ROTATE(4, 1, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTHEAST), PORTRAIT(PLACEMENT_RIGHT, 0x0002, 0x00000000), MSG_NPC(2, _(" Up? Up? Up?!\nHow could it be up, I ask you!")), MSG_NPC(2, _(" My beautiful shop...\nMy fine wares were stolen from me!")), @@ -14092,7 +14092,7 @@ static const struct ScriptCommand s_gs1_g47_s0_lives0_dlg0[] = { /* 0x8171d48 */ WAIT(10), ALERT_CUE(9), ALERT_CUE(6), - ROTATE(4, 1, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTHEAST), PORTRAIT(PLACEMENT_RIGHT, 0x0004, 0x00000000), MSG_NPC(4, _(" My bank wasn't hit, but...{WAIT_PRESS}\nThese are frightening times.")), TEXTBOX_CLEAR, @@ -14101,7 +14101,7 @@ static const struct ScriptCommand s_gs1_g47_s0_lives0_dlg0[] = { /* 0x8171d48 */ MSG_NPC(1, _(" Is the storage OK?")), TEXTBOX_CLEAR, WAIT(10), - ROTATE(4, 2, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_NORTHEAST), ALERT_CUE(10), PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0005, 0x00000000), MSG_NPC(5, _(" No problem.{WAIT_PRESS}\nNothing gets stolen from under my eye.")), @@ -14123,7 +14123,7 @@ static const struct ScriptCommand s_gs1_g47_s0_lives0_dlg0[] = { /* 0x8171d48 */ ALERT_CUE(8), ALERT_CUE(9), ALERT_CUE(10), - ROTATE(4, 1, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_EAST), PORTRAIT(PLACEMENT_MIDDLE_TOP_RIGHT, 0x0006, 0x00000000), MSG_NPC(6, _(" Now wait.")), WAIT(10), @@ -14168,7 +14168,7 @@ static const struct ScriptCommand s_gs1_g47_s0_lives0_dlg0[] = { /* 0x8171d48 */ TEXTBOX_CLEAR, WAIT(10), ALERT_CUE(6), - ROTATE(4, 1, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTH), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" {NAME_0}.\nWant to go check it out?")), VARIANT_DEFAULT(_(" {NAME_0}.\nWant to look into this?")), @@ -14209,10 +14209,10 @@ static const struct ScriptCommand s_gs1_g47_s0_lives1_dlg0[] = { /* 0x8172b68 */ CALL_SCRIPT(NOTICE_FUNC), { 0xe2, 0x00, 0x01d1, 0x00000000, 0x00000000, NULL }, WAIT(20), - { 0x8e, 0x01, 0x0000, 0x00000001, 0x00000000, NULL }, + CMD_UNK_8E(1, DIR_TRANS_NONE, 1), ALERT_CUE(5), AWAIT_CUE(6), - ROTATE(4, 2, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_EAST), AWAIT_CUE(6), WALK_GRID(256, 144), FANFARE_PLAY2(468), @@ -14220,18 +14220,18 @@ static const struct ScriptCommand s_gs1_g47_s0_lives1_dlg0[] = { /* 0x8172b68 */ { 0xe2, 0x00, 0x01d4, 0x00000000, 0x00000000, NULL }, ALERT_CUE(5), AWAIT_CUE(6), - ROTATE(4, 2, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_NORTHEAST), AWAIT_CUE(6), { 0x56, 0x00, 0x0000, 0x00000146, 0x00000000, NULL }, { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(6), - ROTATE(4, 1, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTHEAST), AWAIT_CUE(6), - ROTATE(4, 2, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_NORTHEAST), AWAIT_CUE(6), - ROTATE(4, 1, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_EAST), AWAIT_CUE(6), - ROTATE(1, 10, DIRECTION_NORTH), + ROTATE_TO(1, DIR_TRANS_10, DIRECTION_NORTH), HALT, }; @@ -14240,9 +14240,9 @@ static const struct ScriptCommand s_gs1_g47_s0_lives2_dlg0[] = { /* 0x8172d68 */ SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0003, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(8), - ROTATE(4, 2, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_NORTHWEST), AWAIT_CUE(8), - ROTATE(4, 1, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTH), HALT, }; @@ -14254,7 +14254,7 @@ static const struct ScriptCommand s_gs1_g47_s0_lives3_dlg0[] = { /* 0x8172de8 */ AWAIT_CUE(7), CALL_SCRIPT(ANGRY_START_FUNC), WAIT(60), - ROTATE(4, 1, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTH), WAIT(60), CALL_SCRIPT(ANGRY_END_FUNC), AWAIT_CUE(7), @@ -14262,24 +14262,24 @@ static const struct ScriptCommand s_gs1_g47_s0_lives3_dlg0[] = { /* 0x8172de8 */ WALK_RELATIVE(512, -16, 0), ALERT_CUE(5), AWAIT_CUE(7), - ROTATE(4, 1, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTH), FANFARE_PLAY2(457), CALL_SCRIPT(JUMP_ANGRY_FUNC), ALERT_CUE(5), AWAIT_CUE(7), - ROTATE(4, 1, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_EAST), FANFARE_PLAY2(469), CALL_SCRIPT(QUESTION_FUNC), { 0xe2, 0x00, 0x01d5, 0x00000000, 0x00000000, NULL }, ALERT_CUE(5), AWAIT_CUE(7), - ROTATE(4, 2, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_NORTHWEST), WAIT(10), ALERT_CUE(5), AWAIT_CUE(7), - ROTATE(4, 1, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_EAST), AWAIT_CUE(7), - ROTATE(4, 1, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_WEST), HALT, }; @@ -14288,11 +14288,11 @@ static const struct ScriptCommand s_gs1_g47_s0_lives4_dlg0[] = { /* 0x8173008 */ SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0004, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(9), - ROTATE(4, 2, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_NORTH), AWAIT_CUE(9), - ROTATE(4, 2, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_NORTHWEST), AWAIT_CUE(9), - ROTATE(4, 1, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTH), HALT, }; @@ -14301,15 +14301,15 @@ static const struct ScriptCommand s_gs1_g47_s0_lives5_dlg0[] = { /* 0x81730a8 */ SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0005, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(10), - ROTATE(3, 1, DIRECTION_SOUTH), + ROTATE_TO(3, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTH), AWAIT_CUE(10), - ROTATE(4, 1, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTHWEST), AWAIT_CUE(10), CALL_SCRIPT(SMILE_START_FUNC), WAIT(30), CALL_SCRIPT(SMILE_END_FUNC), AWAIT_CUE(10), - ROTATE(4, 2, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTH), HALT, }; @@ -14321,17 +14321,17 @@ static const struct ScriptCommand s_gs1_g47_s0_lives6_dlg0[] = { /* 0x8173188 */ AWAIT_CUE(11), WALK_RELATIVE(256, -8, 24), ALERT_CUE(5), - ROTATE(4, 1, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_WEST), AWAIT_CUE(11), FANFARE_PLAY2(465), CALL_SCRIPT(NOTICE_FUNC), { 0xe2, 0x00, 0x01d1, 0x00000000, 0x00000000, NULL }, ALERT_CUE(5), AWAIT_CUE(11), - ROTATE(4, 1, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTHWEST), ALERT_CUE(5), AWAIT_CUE(11), - ROTATE(4, 2, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_WEST), HALT, }; @@ -14459,12 +14459,12 @@ static const struct ScriptCommand s_gs1_g48_s0_lives0_dlg0[] = { /* 0x8173394 */ PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x0000000c), MSG_NPC(1, _(" A meteorite?!")), ALERT_CUE(6), - ROTATE(4, 1, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTHEAST), MSG_NPC(1, _(" {NAME_0}!{WAIT_PRESS}\nDo you think maybe that it's a chunk of\nthe blown-up meteor?")), TEXTBOX_CLEAR, WAIT(10), ALERT_CUE(6), - ROTATE(4, 2, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_NORTHEAST), MSG_NPC(5, _(" I went to the {COLOR YELLOW_D}Pitfall Valley{RESET}\nin hopes of rescuing my sister, but...")), MSG_NPC(5, _(" I made little headway...\nI wasn't up to the task...")), TEXTBOX_CLEAR, @@ -14484,7 +14484,7 @@ static const struct ScriptCommand s_gs1_g48_s0_lives0_dlg0[] = { /* 0x8173394 */ WAIT(60), ALERT_CUE(6), ALERT_CUE(8), - ROTATE(4, 1, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTHEAST), ALERT_CUE(7), AWAIT_CUE(5), MSG_NPC(2, _(" Oh... Oh, my!{WAIT_PRESS}\nIt is not a problem! Not a problem at all!")), @@ -14494,7 +14494,7 @@ static const struct ScriptCommand s_gs1_g48_s0_lives0_dlg0[] = { /* 0x8173394 */ ALERT_CUE(9), ALERT_CUE(6), ALERT_CUE(8), - ROTATE(4, 2, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_NORTHEAST), AWAIT_CUE(5), MSG_NPC(4, _(" However...{WAIT_PRESS}\nEven if you were to plumb the depths of\n{COLOR YELLOW_D}Pitfall Valley{RESET}...")), MSG_NPC(4, _(" What would you do then?")), @@ -14530,7 +14530,7 @@ static const struct ScriptCommand s_gs1_g48_s0_lives0_dlg0[] = { /* 0x8173394 */ ALERT_CUE(8), FANFARE_PLAY2(465), CALL_SCRIPT(SHOCK_FUNC), - ROTATE(4, 1, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_EAST), PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x0000000c), MSG_NPC(1, _(" You can?!{WAIT_PRESS}\nHow?!")), TEXTBOX_CLEAR, @@ -14554,7 +14554,7 @@ static const struct ScriptCommand s_gs1_g48_s0_lives0_dlg0[] = { /* 0x8173394 */ TEXTBOX_CLEAR, WAIT(10), ALERT_CUE(6), - ROTATE(4, 1, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTHEAST), PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" {NAME_0}!{WAIT_PRESS}\nThis is a rescue that only we can do!")), @@ -14609,30 +14609,30 @@ static const struct ScriptCommand s_gs1_g48_s0_lives1_dlg0[] = { /* 0x8174e1c */ AWAIT_CUE(6), CALL_SCRIPT(SHOCK_FUNC), AWAIT_CUE(6), - ROTATE(4, 1, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTHEAST), FANFARE_PLAY2(469), CALL_SCRIPT(QUESTION_FUNC), { 0xe2, 0x00, 0x01d5, 0x00000000, 0x00000000, NULL }, ALERT_CUE(5), AWAIT_CUE(6), - ROTATE(4, 2, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_NORTHEAST), AWAIT_CUE(6), FANFARE_PLAY2(465), CALL_SCRIPT(NOTICE_FUNC), { 0xe2, 0x00, 0x01d1, 0x00000000, 0x00000000, NULL }, ALERT_CUE(5), AWAIT_CUE(6), - ROTATE(4, 2, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_NORTHWEST), AWAIT_CUE(6), - ROTATE(4, 1, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTHEAST), AWAIT_CUE(6), - ROTATE(4, 1, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTHEAST), AWAIT_CUE(6), - ROTATE(4, 2, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_NORTHEAST), AWAIT_CUE(6), CALL_SCRIPT(SHOCK_FUNC), AWAIT_CUE(6), - ROTATE(4, 2, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_NORTHWEST), HALT, }; @@ -14643,9 +14643,9 @@ static const struct ScriptCommand s_gs1_g48_s0_lives2_dlg0[] = { /* 0x817500c */ AWAIT_CUE(8), CALL_SCRIPT(SHOCK_FUNC), AWAIT_CUE(8), - ROTATE(4, 2, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTHWEST), AWAIT_CUE(8), - ROTATE(4, 1, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTHWEST), AWAIT_CUE(8), CALL_SCRIPT(SHOCK_FUNC), HALT, @@ -14673,18 +14673,18 @@ static const struct ScriptCommand s_gs1_g48_s0_lives3_dlg0[] = { /* 0x81750cc */ CALL_SCRIPT(SHOCK_FUNC), { 0xe2, 0x00, 0x01d1, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(7), - ROTATE(4, 2, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_NORTHWEST), AWAIT_CUE(7), - ROTATE(4, 1, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTH), AWAIT_CUE(7), WAIT(30), FANFARE_PLAY2(468), - ROTATE(4, 2, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_NORTHWEST), WAIT(20), FANFARE_PLAY2(468), - ROTATE(4, 1, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTHEAST), WAIT(30), - ROTATE(4, 2, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_NORTH), FANFARE_PLAY2(457), { 0x56, 0x00, 0x0000, 0x00000047, 0x00000000, NULL }, { 0xde, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -14701,21 +14701,21 @@ static const struct ScriptCommand s_gs1_g48_s0_lives4_dlg0[] = { /* 0x817534c */ { 0x2d, 0x07, 0x0004, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(9), WALK_RELATIVE(512, -40, 0), - ROTATE(4, 2, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTH), AWAIT_CUE(9), - ROTATE(4, 1, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTH), AWAIT_CUE(9), CALL_SCRIPT(SHOCK_FUNC), ALERT_CUE(5), AWAIT_CUE(9), WALK_RELATIVE(256, 24, 0), - ROTATE(4, 2, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTHWEST), AWAIT_CUE(9), WALK_RELATIVE(256, -24, 0), - ROTATE(4, 1, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTH), ALERT_CUE(5), AWAIT_CUE(9), - ROTATE(4, 2, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTHWEST), HALT, }; @@ -14821,7 +14821,7 @@ static const struct ScriptCommand s_gs1_g49_s0_lives0_dlg0[] = { /* 0x81757f8 */ ALERT_CUE(8), ALERT_CUE(7), AWAIT_CUE(5), - ROTATE(4, 1, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTHEAST), PORTRAIT(PLACEMENT_RIGHT, 0x0005, 0x00000000), MSG_NPC(5, _(" My sister is safe, all\nthanks to you.")), MSG_NPC(5, _(" To be honest, I came close\nto giving up...")), @@ -14850,20 +14850,20 @@ static const struct ScriptCommand s_gs1_g49_s0_lives0_dlg0[] = { /* 0x81757f8 */ TEXTBOX_CLEAR, WAIT(10), ALERT_CUE(6), - ROTATE(4, 2, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_EAST), AWAIT_CUE(5), PORTRAIT(PLACEMENT_RIGHT, 0x0006, 0x00000000), MSG_NPC(6, _(" We would like to join {COLOR CYAN}Team\n{TEAM_NAME}{RESET} and help with your rescue\nwork.")), TEXTBOX_CLEAR, WAIT(10), ALERT_CUE(6), - ROTATE(4, 1, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTHEAST), AWAIT_CUE(5), MSG_NPC(5, _(" Would that work?{WAIT_PRESS}\nWould you be willing to accept us on\nyour rescue team?")), TEXTBOX_CLEAR, WAIT(10), ALERT_CUE(6), - ROTATE(4, 1, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTH), AWAIT_CUE(5), PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000004), ASK3_VAR( TRUE, /*default*/ -1, /* speaker */ 1, PARTNER_TALK_KIND), @@ -14911,7 +14911,7 @@ static const struct ScriptCommand s_gs1_g49_s0_lives0_dlg0[] = { /* 0x81757f8 */ ALERT_CUE(6), ALERT_CUE(7), ALERT_CUE(8), - ROTATE(4, 2, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_NORTHEAST), MSG_NPC(4, _(" Latios and Latias are\nPokémon so rarely seen that they are\nconsidered mythical.")), MSG_NPC(4, _(" If you part ways with them\nnow, you may never see them again.")), MSG_NPC(4, _(" Strike that.\nYou will never again see them.")), @@ -14923,7 +14923,7 @@ static const struct ScriptCommand s_gs1_g49_s0_lives0_dlg0[] = { /* 0x81757f8 */ ALERT_CUE(6), ALERT_CUE(7), ALERT_CUE(8), - ROTATE(4, 1, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTH), AWAIT_CUE(5), PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000004), MSG_VAR(2, PARTNER_TALK_KIND, 1), @@ -14942,7 +14942,7 @@ static const struct ScriptCommand s_gs1_g49_s0_lives0_dlg0[] = { /* 0x81757f8 */ WAIT(10), UPDATE_VARINT(CALC_SET, EVENT_LOCAL, 1), ALERT_CUE(6), - ROTATE(4, 2, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_EAST), ALERT_CUE(10), ALERT_CUE(11), ALERT_CUE(7), @@ -14964,13 +14964,13 @@ static const struct ScriptCommand s_gs1_g49_s0_lives0_dlg0[] = { /* 0x81757f8 */ WAIT(10), ALERT_CUE(10), ALERT_CUE(11), - ROTATE(4, 1, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTHEAST), PORTRAIT_REP(0x0005, 0x00000001), MSG_NPC(5, _(" Thanks for having us!")), TEXTBOX_CLEAR, WAIT(10), ALERT_CUE(6), - ROTATE(4, 2, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_EAST), AWAIT_CUE(5), PORTRAIT_REP(0x0006, 0x00000001), MSG_NPC(6, _(" Delighted to join!")), @@ -15034,13 +15034,13 @@ static const struct ScriptCommand s_gs1_g49_s0_lives1_dlg0[] = { /* 0x8176dcc */ { 0xe2, 0x00, 0x01d1, 0x00000000, 0x00000000, NULL }, ALERT_CUE(5), AWAIT_CUE(6), - ROTATE(4, 2, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_NORTHEAST), ALERT_CUE(5), AWAIT_CUE(6), - ROTATE(4, 1, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_EAST), ALERT_CUE(5), AWAIT_CUE(6), - ROTATE(4, 2, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_NORTH), ALERT_CUE(5), AWAIT_CUE(6), LABEL(0), /* = 0x00 */ @@ -15052,17 +15052,17 @@ static const struct ScriptCommand s_gs1_g49_s0_lives1_dlg0[] = { /* 0x8176dcc */ CALL_SCRIPT(JUMP_SURPRISE_FUNC), ALERT_CUE(5), AWAIT_CUE(6), - ROTATE(4, 1, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTHEAST), AWAIT_CUE(6), - ROTATE(4, 2, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_NORTH), CALL_SCRIPT(JUMP_ANGRY_FUNC), ALERT_CUE(5), AWAIT_CUE(6), JUMP_LABEL(0), LABEL(1), /* = 0x01 */ - ROTATE(4, 1, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_EAST), AWAIT_CUE(6), - ROTATE(4, 2, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_NORTHEAST), ALERT_CUE(5), HALT, }; @@ -15076,7 +15076,7 @@ static const struct ScriptCommand s_gs1_g49_s0_lives2_dlg0[] = { /* 0x817708c */ SELECT_ANIMATION(9), AWAIT_CUE(7), SELECT_ANIMATION(2), - ROTATE(4, 1, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTHWEST), AWAIT_CUE(7), LABEL(0), /* = 0x00 */ JUMPIF(JUDGE_EQ, EVENT_LOCAL, 1, /* to label */ 1), @@ -15085,18 +15085,18 @@ static const struct ScriptCommand s_gs1_g49_s0_lives2_dlg0[] = { /* 0x817708c */ JUMPIF(JUDGE_EQ, EVENT_LOCAL, 1, /* to label */ 1), CALL_SCRIPT(JUMP_SURPRISE_FUNC), AWAIT_CUE(7), - ROTATE(4, 2, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTHEAST), AWAIT_CUE(7), - ROTATE(4, 1, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTHWEST), AWAIT_CUE(7), JUMP_LABEL(0), LABEL(1), /* = 0x01 */ - ROTATE(4, 2, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTH), SELECT_ANIMATION(22), STOP_ANIMATION_ON_CURRENT_FRAME, AWAIT_CUE(7), SELECT_ANIMATION(2), - ROTATE(4, 1, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTHWEST), HALT, }; @@ -15106,10 +15106,10 @@ static const struct ScriptCommand s_gs1_g49_s0_lives3_dlg0[] = { /* 0x817725c */ SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0003, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(8), - ROTATE(4, 1, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_WEST), ALERT_CUE(5), AWAIT_CUE(8), - ROTATE(4, 2, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTHWEST), AWAIT_CUE(8), LABEL(0), /* = 0x00 */ JUMPIF(JUDGE_EQ, EVENT_LOCAL, 1, /* to label */ 1), @@ -15118,18 +15118,18 @@ static const struct ScriptCommand s_gs1_g49_s0_lives3_dlg0[] = { /* 0x817725c */ JUMPIF(JUDGE_EQ, EVENT_LOCAL, 1, /* to label */ 1), CALL_SCRIPT(JUMP_SURPRISE_FUNC), AWAIT_CUE(8), - ROTATE(4, 2, DIRECTION_SOUTHEAST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTHEAST), AWAIT_CUE(8), - ROTATE(4, 1, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTHWEST), AWAIT_CUE(8), JUMP_LABEL(0), LABEL(1), /* = 0x01 */ - ROTATE(4, 2, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTH), SELECT_ANIMATION(22), STOP_ANIMATION_ON_CURRENT_FRAME, AWAIT_CUE(8), SELECT_ANIMATION(2), - ROTATE(4, 1, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTHWEST), HALT, }; @@ -15152,7 +15152,7 @@ static const struct ScriptCommand s_gs1_g49_s0_lives4_dlg0[] = { /* 0x817742c */ AWAIT_CUE(9), JUMP_LABEL(0), LABEL(1), /* = 0x01 */ - ROTATE(4, 2, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTHWEST), HALT, }; @@ -15174,11 +15174,11 @@ static const struct ScriptCommand s_gs1_g49_s0_lives5_dlg0[] = { /* 0x817755c */ AWAIT_CUE(10), SELECT_ANIMATION(2), WALK_RELATIVE(256, -8, 8), - ROTATE(4, 1, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_WEST), ALERT_CUE(5), AWAIT_CUE(10), { 0x62, 0x00, 0x0200, -0x00000008, 0x00000000, NULL }, - ROTATE(4, 1, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTH), SELECT_ANIMATION(17), STOP_ANIMATION_ON_CURRENT_FRAME, SELECT_ANIMATION(2), @@ -15186,25 +15186,25 @@ static const struct ScriptCommand s_gs1_g49_s0_lives5_dlg0[] = { /* 0x817755c */ ALERT_CUE(5), AWAIT_CUE(10), { 0x62, 0x00, 0x0100, -0x00000008, -0x00000008, NULL }, - ROTATE(1, 1, DIRECTION_NORTHEAST), + ROTATE_TO(1, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTHEAST), { 0x62, 0x00, 0x0100, -0x00000008, -0x00000008, NULL }, - ROTATE(1, 1, DIRECTION_EAST), + ROTATE_TO(1, DIR_TRANS_SPINRIGHT1, DIRECTION_EAST), { 0x62, 0x00, 0x0100, 0x00000008, -0x00000008, NULL }, - ROTATE(1, 1, DIRECTION_SOUTHEAST), + ROTATE_TO(1, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTHEAST), { 0x62, 0x00, 0x0100, 0x00000008, -0x00000008, NULL }, - ROTATE(1, 1, DIRECTION_SOUTH), + ROTATE_TO(1, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTH), { 0x62, 0x00, 0x0100, 0x00000008, 0x00000008, NULL }, - ROTATE(1, 1, DIRECTION_SOUTHWEST), + ROTATE_TO(1, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTHWEST), { 0x62, 0x00, 0x0100, 0x00000008, 0x00000008, NULL }, - ROTATE(1, 1, DIRECTION_WEST), + ROTATE_TO(1, DIR_TRANS_SPINRIGHT1, DIRECTION_WEST), { 0x62, 0x00, 0x0100, -0x00000008, 0x00000008, NULL }, - ROTATE(1, 1, DIRECTION_NORTHWEST), + ROTATE_TO(1, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTHWEST), { 0x62, 0x00, 0x0100, -0x00000008, 0x00000008, NULL }, - ROTATE(1, 1, DIRECTION_NORTH), + ROTATE_TO(1, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTH), ALERT_CUE(5), AWAIT_CUE(10), { 0x62, 0x00, 0x0200, 0x00000008, 0x00000000, NULL }, - ROTATE(4, 2, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_WEST), HALT, }; @@ -15225,34 +15225,34 @@ static const struct ScriptCommand s_gs1_g49_s0_lives6_dlg0[] = { /* 0x817785c */ AWAIT_CUE(11), SELECT_ANIMATION(2), WALK_RELATIVE(256, 0, -16), - ROTATE(4, 2, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_WEST), AWAIT_CUE(11), - ROTATE(4, 2, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTH), FANFARE_PLAY2(455), SELECT_ANIMATION(17), STOP_ANIMATION_ON_CURRENT_FRAME, SELECT_ANIMATION(2), AWAIT_CUE(11), { 0x62, 0x00, 0x0100, 0x00000008, 0x00000008, NULL }, - ROTATE(1, 1, DIRECTION_SOUTHWEST), + ROTATE_TO(1, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTHWEST), { 0x62, 0x00, 0x0100, 0x00000008, 0x00000008, NULL }, - ROTATE(1, 1, DIRECTION_WEST), + ROTATE_TO(1, DIR_TRANS_SPINRIGHT1, DIRECTION_WEST), FANFARE_PLAY2(457), { 0x62, 0x00, 0x0100, -0x00000008, 0x00000008, NULL }, - ROTATE(1, 1, DIRECTION_NORTHWEST), + ROTATE_TO(1, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTHWEST), { 0x62, 0x00, 0x0100, -0x00000008, 0x00000008, NULL }, - ROTATE(1, 1, DIRECTION_NORTH), + ROTATE_TO(1, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTH), { 0x62, 0x00, 0x0100, -0x00000008, -0x00000008, NULL }, - ROTATE(1, 1, DIRECTION_NORTHEAST), + ROTATE_TO(1, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTHEAST), { 0x62, 0x00, 0x0100, -0x00000008, -0x00000008, NULL }, - ROTATE(1, 1, DIRECTION_EAST), + ROTATE_TO(1, DIR_TRANS_SPINRIGHT1, DIRECTION_EAST), FANFARE_PLAY2(457), { 0x62, 0x00, 0x0100, 0x00000008, -0x00000008, NULL }, - ROTATE(1, 1, DIRECTION_SOUTHEAST), + ROTATE_TO(1, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTHEAST), { 0x62, 0x00, 0x0100, 0x00000008, -0x00000008, NULL }, - ROTATE(1, 1, DIRECTION_SOUTH), + ROTATE_TO(1, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTH), AWAIT_CUE(11), - ROTATE(4, 1, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_WEST), HALT, }; @@ -15330,7 +15330,7 @@ static const struct ScriptCommand s_gs1_g50_s0_lives3_dlg2[] = { /* 0x817803c */ { 0xe1, 0x00, 0x00cd, 0x00000000, 0x00000000, NULL }, TEXTBOX_CLEAR, JUMPIF_SCENE_GT(SCENARIO_SUB7, 49, 2, /* to label */ 1), - { 0xaf, 0x01, 0x001b, 0x00000000, 0x00000000, NULL }, + CMD_UNK_AF(RESCUE_DUNGEON_BURIED_RELIC, TRUE), SCENARIO_CALC(SCENARIO_SUB7, 49, 3), LABEL(1), /* = 0x01 */ JUMP_SCRIPT(END_TALK), @@ -15342,7 +15342,7 @@ static const struct ScriptCommand s_gs1_g50_s0_lives3_dlg3[] = { /* 0x8178340 */ DEBUGINFO_O(15342), SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0x8d, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, + CMD_UNK_8D(1, DIR_TRANS_NONE), AWAIT_CUE(6), CALL_SCRIPT(NOTICE_FUNC), ALERT_CUE(5), diff --git a/src/data/ground/ground_data_t01p02a_station.h b/src/data/ground/ground_data_t01p02a_station.h index a56ae706b..4cdc17c10 100644 --- a/src/data/ground/ground_data_t01p02a_station.h +++ b/src/data/ground/ground_data_t01p02a_station.h @@ -398,7 +398,7 @@ static const struct ScriptCommand s_gs2_g3_s0_lives0_dlg2[] = { /* 0x817e834 */ MSG_INSTANT(_("{CENTER_ALIGN}Beware--you must take the HM {COLOR GREEN_I}Dive{RESET},\n{CENTER_ALIGN}or a team member must learn {COLOR GREEN_I}Dive{RESET}\n{CENTER_ALIGN}as a move for the team to enter!")), TEXTBOX_CLEAR, BGM_SWITCH(8), - { 0xaf, 0x01, 0x0010, 0x00000000, 0x00000000, NULL }, + CMD_UNK_AF(RESCUE_DUNGEON_STORMY_SEA, TRUE), SCENARIO_CALC(SCENARIO_SUB2, 33, 4), JUMP_SCRIPT(END_TALK), LABEL(0), /* = 0x00 */ @@ -439,7 +439,7 @@ static const struct ScriptCommand s_gs2_g3_s0_lives0_dlg3[] = { /* 0x817f2d4 */ { 0x56, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, ALERT_CUE(5), AWAIT_CUE(6), - { 0x8d, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, + CMD_UNK_8D(1, DIR_TRANS_NONE), AWAIT_CUE(2), WAIT(12), RET, @@ -486,7 +486,7 @@ static const struct ScriptCommand s_gs2_g4_s0_lives0_dlg3[] = { /* 0x817f6b8 */ DEBUGINFO_O(486), SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0x8d, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, + CMD_UNK_8D(1, DIR_TRANS_NONE), AWAIT_CUE(6), { 0x56, 0x00, 0x0000, 0x0000005d, 0x00000000, NULL }, WAIT(60), @@ -548,7 +548,7 @@ static const struct ScriptCommand s_gs2_g6_s0_lives0_dlg0[] = { /* 0x817f910 */ SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x95, 0x04, 0x000a, 0x00000005, 0x00000000, NULL }, + CMD_UNK_95(4, DIR_TRANS_10, 5), ALERT_CUE(4), AWAIT_CUE(5), PORTRAIT(PLACEMENT_LEFT_, 0x0002, 0x00000000), @@ -621,8 +621,8 @@ static const struct ScriptCommand s_gs2_g6_s0_lives0_dlg0[] = { /* 0x817f910 */ ALERT_CUE(7), ALERT_CUE(8), WAIT(60), - { 0x93, 0x08, 0x000a, 0x0000005d, 0x00000000, NULL }, - ROTATE(8, 10, DIRECTION_SOUTHEAST), + CMD_UNK_93(8, DIR_TRANS_10, 93), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_SOUTHEAST), AWAIT_CUE(5), CANCEL_EVENTS(5, 0), { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, @@ -655,11 +655,11 @@ static const struct ScriptCommand s_gs2_g6_s0_lives2_dlg0[] = { /* 0x81800fc */ { 0x56, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(7), - { 0x93, 0x04, 0x000a, 0x0000005d, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 93), ALERT_CUE(5), AWAIT_CUE(7), CALL_SCRIPT(NOTICE_FUNC), - { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 0), ALERT_CUE(5), AWAIT_CUE(7), { 0x56, 0x00, 0x0000, 0x0000005b, 0x00000000, NULL }, @@ -690,10 +690,10 @@ static const struct ScriptCommand s_gs2_g6_s0_lives3_dlg0[] = { /* 0x818034c */ { 0x53, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, { 0x2d, 0x07, 0x0003, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(8), - { 0x93, 0x04, 0x000a, 0x0000005d, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 93), AWAIT_CUE(8), CALL_SCRIPT(NOTICE_FUNC), - { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 0), AWAIT_CUE(8), { 0x56, 0x00, 0x0000, 0x0000005b, 0x00000000, NULL }, { 0x54, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, @@ -760,7 +760,7 @@ static const struct ScriptCommand s_gs2_g8_s0_lives0_dlg0[] = { /* 0x8180674 */ SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0x95, 0x04, 0x000a, 0x00000005, 0x00000000, NULL }, + CMD_UNK_95(4, DIR_TRANS_10, 5), ALERT_CUE(4), AWAIT_CUE(5), PORTRAIT(PLACEMENT_LEFT_, 0x0002, 0x00000000), @@ -823,8 +823,8 @@ static const struct ScriptCommand s_gs2_g8_s0_lives0_dlg0[] = { /* 0x8180674 */ ALERT_CUE(7), ALERT_CUE(8), WAIT(60), - { 0x93, 0x08, 0x000a, 0x0000005d, 0x00000000, NULL }, - ROTATE(8, 10, DIRECTION_SOUTHEAST), + CMD_UNK_93(8, DIR_TRANS_10, 93), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_SOUTHEAST), AWAIT_CUE(5), CANCEL_EVENTS(7, 0), { 0x9b, 0x00, 0x0100, 0x00000000, 0x00000000, NULL }, @@ -852,11 +852,11 @@ static const struct ScriptCommand s_gs2_g8_s0_lives2_dlg0[] = { /* 0x8180e20 */ SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(7), - ROTATE(4, 10, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), ALERT_CUE(5), AWAIT_CUE(7), CALL_SCRIPT(NOTICE_FUNC), - { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 0), ALERT_CUE(5), AWAIT_CUE(7), { 0x56, 0x00, 0x0000, 0x0000005b, 0x00000000, NULL }, @@ -886,11 +886,11 @@ static const struct ScriptCommand s_gs2_g8_s0_lives3_dlg0[] = { /* 0x8181010 */ SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0003, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(8), - ROTATE(4, 10, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), ALERT_CUE(5), AWAIT_CUE(8), CALL_SCRIPT(NOTICE_FUNC), - { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 0), AWAIT_CUE(8), { 0x56, 0x00, 0x0000, 0x0000005b, 0x00000000, NULL }, { 0x54, 0x00, 0x000b, 0x00000000, 0x00000000, NULL }, @@ -999,7 +999,7 @@ static const struct ScriptCommand s_gs2_g9_s1_lives2_dlg0[] = { /* 0x8181730 */ { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(7), CALL_SCRIPT(NOTICE_FUNC), - { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 0), ALERT_CUE(5), AWAIT_CUE(7), { 0x56, 0x00, 0x0000, 0x0000005b, 0x00000000, NULL }, @@ -1010,7 +1010,7 @@ static const struct ScriptCommand s_gs2_g9_s1_lives2_dlg0[] = { /* 0x8181730 */ SELECT_ANIMATION(2), { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(7), - { 0x92, 0x04, 0x000b, 0x00000005, 0x00000000, NULL }, + CMD_UNK_92(4, 11, DIR_TRANS_FLIP), ALERT_CUE(5), AWAIT_CUE(7), RET, @@ -1443,11 +1443,11 @@ static const struct ScriptCommand s_gs2_g16_s1_lives0_dlg0[] = { /* 0x8182f18 */ TEXTBOX_CLEAR, WAIT(20), ALERT_CUE(8), - ROTATE(4, 1, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_EAST), FANFARE_PLAY2(470), CALL_SCRIPT(SWEAT_FUNC), WAIT(60), - ROTATE(4, 2, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_NORTH), MSG_NPC(1, _(" “And when the human \nbecomes a Pokémon...”")), MSG_NPC(1, _(" “The world's balance will\nbe upset...”")), MSG_NPC(1, _(" ...And that is how the legend\nends.")), @@ -1488,11 +1488,11 @@ static const struct ScriptCommand s_gs2_g16_s1_lives1_dlg0[] = { /* 0x8183b64 */ FANFARE_PLAY2(466), CALL_SCRIPT(SHOCK_FUNC), AWAIT_CUE(8), - ROTATE(4, 2, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_WEST), FANFARE_PLAY2(470), CALL_SCRIPT(SWEAT_FUNC), WAIT(60), - ROTATE(4, 1, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTH), AWAIT_CUE(8), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, RET, @@ -2183,7 +2183,7 @@ static const struct ScriptCommand s_gs2_g29_s0_lives0_dlg0[] = { /* 0x81863ec */ ALERT_CUE(7), ALERT_CUE(8), AWAIT_CUE(5), - ROTATE(4, 10, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHEAST), PORTRAIT(PLACEMENT_LEFT_, 0x0001, 0x00000000), MSG_NPC(1, _(" Hi, {NAME_4}!")), TEXTBOX_CLEAR, @@ -2194,7 +2194,7 @@ static const struct ScriptCommand s_gs2_g29_s0_lives0_dlg0[] = { /* 0x81863ec */ ALERT_CUE(9), ALERT_CUE(10), WALK_GRID(256, 16), - ROTATE(4, 10, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), WAIT(30), FANFARE_PLAY2(468), ALERT_CUE(6), @@ -2244,7 +2244,7 @@ static const struct ScriptCommand s_gs2_g29_s0_lives0_dlg0[] = { /* 0x81863ec */ ALERT_CUE(9), ALERT_CUE(10), WAIT(5), - ROTATE(4, 10, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHWEST), WAIT(15), ALERT_CUE(4), AWAIT_CUE(5), @@ -2259,7 +2259,7 @@ static const struct ScriptCommand s_gs2_g29_s0_lives0_dlg0[] = { /* 0x81863ec */ ALERT_CUE(9), ALERT_CUE(11), WAIT(5), - ROTATE(4, 10, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), WAIT(15), ALERT_CUE(10), AWAIT_CUE(5), @@ -2276,7 +2276,7 @@ static const struct ScriptCommand s_gs2_g29_s0_lives0_dlg0[] = { /* 0x81863ec */ ALERT_CUE(8), ALERT_CUE(10), WAIT(5), - ROTATE(4, 10, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHWEST), WAIT(30), FANFARE_PLAY2(468), ALERT_CUE(6), @@ -2370,7 +2370,7 @@ static const struct ScriptCommand s_gs2_g29_s0_lives0_dlg0[] = { /* 0x81863ec */ WAIT(10), ALERT_CUE(6), AWAIT_CUE(5), - ROTATE(4, 10, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_WEST), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" {NAME_0}.{WAIT_PRESS}\nWe should go to the cave if we want to\nevolve.")), VARIANT(/* == */ 3, _(" {NAME_0}.{WAIT_PRESS}\nLet's go to the cave if we're ready to\nevolve.")), @@ -2412,30 +2412,30 @@ static const struct ScriptCommand s_gs2_g29_s0_lives1_dlg0[] = { /* 0x8187888 */ { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, WALK_GRID(256, 17), AWAIT_CUE(6), - ROTATE(4, 10, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHEAST), FANFARE_PLAY2(465), CALL_SCRIPT(NOTICE_FUNC), ALERT_CUE(5), AWAIT_CUE(6), WALK_GRID(256, 18), - ROTATE(4, 10, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), AWAIT_CUE(6), - ROTATE(4, 10, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_WEST), WAIT(15), - ROTATE(4, 10, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_EAST), WAIT(15), - ROTATE(4, 10, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), ALERT_CUE(5), AWAIT_CUE(6), - ROTATE(4, 10, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHEAST), CALL_SCRIPT(JUMP_SURPRISE_FUNC), AWAIT_CUE(6), - ROTATE(4, 10, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHWEST), AWAIT_CUE(6), - ROTATE(8, 10, DIRECTION_NORTHEAST), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_NORTHEAST), ALERT_CUE(5), AWAIT_CUE(6), - ROTATE(4, 10, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), AWAIT_CUE(6), CALL_SCRIPT(QUESTION_FUNC), ALERT_CUE(5), @@ -2444,12 +2444,12 @@ static const struct ScriptCommand s_gs2_g29_s0_lives1_dlg0[] = { /* 0x8187888 */ AWAIT_CUE(6), CALL_SCRIPT(JUMP_SURPRISE_FUNC), AWAIT_CUE(6), - ROTATE(4, 10, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHEAST), WAIT(90), - ROTATE(4, 10, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), ALERT_CUE(5), AWAIT_CUE(6), - ROTATE(4, 10, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_EAST), ALERT_CUE(5), AWAIT_CUE(6), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, @@ -2463,22 +2463,22 @@ static const struct ScriptCommand s_gs2_g29_s0_lives2_dlg0[] = { /* 0x8187b78 */ WALK_GRID(256, 19), AWAIT_CUE(7), WAIT(10), - ROTATE(4, 10, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHEAST), AWAIT_CUE(7), WAIT(5), WALK_GRID(256, 20), - ROTATE(4, 10, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), AWAIT_CUE(7), - ROTATE(4, 10, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHEAST), AWAIT_CUE(7), WAIT(4), - ROTATE(4, 10, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), AWAIT_CUE(7), WAIT(4), - ROTATE(4, 10, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHEAST), AWAIT_CUE(7), WAIT(3), - ROTATE(4, 10, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), AWAIT_CUE(7), CALL_SCRIPT(NOTICE_FUNC), AWAIT_CUE(7), @@ -2501,20 +2501,20 @@ static const struct ScriptCommand s_gs2_g29_s0_lives3_dlg0[] = { /* 0x8187d98 */ ALERT_CUE(5), AWAIT_CUE(8), WAIT(20), - ROTATE(4, 10, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHEAST), AWAIT_CUE(8), WAIT(10), WALK_GRID(256, 22), - ROTATE(4, 10, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), AWAIT_CUE(8), WAIT(10), - ROTATE(4, 10, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHWEST), AWAIT_CUE(8), WAIT(10), - ROTATE(4, 10, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), AWAIT_CUE(8), WAIT(10), - ROTATE(4, 10, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHWEST), AWAIT_CUE(8), WAIT(4), CALL_SCRIPT(JUMP_SURPRISE_FUNC), @@ -2529,21 +2529,21 @@ static const struct ScriptCommand s_gs2_g29_s0_lives4_dlg0[] = { /* 0x8187f58 */ SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0004, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(9), - ROTATE(8, 10, DIRECTION_SOUTHWEST), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_SOUTHWEST), WAIT(30), - ROTATE(4, 10, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTH), AWAIT_CUE(9), - ROTATE(4, 10, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), AWAIT_CUE(9), - ROTATE(4, 10, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_EAST), AWAIT_CUE(9), - ROTATE(8, 10, DIRECTION_SOUTH), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_SOUTH), ALERT_CUE(5), AWAIT_CUE(9), - ROTATE(8, 10, DIRECTION_EAST), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_EAST), ALERT_CUE(5), AWAIT_CUE(9), - ROTATE(8, 10, DIRECTION_SOUTH), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_SOUTH), ALERT_CUE(5), AWAIT_CUE(9), HALT, @@ -2555,30 +2555,30 @@ static const struct ScriptCommand s_gs2_g29_s0_lives5_dlg0[] = { /* 0x81880b8 */ { 0x2d, 0x07, 0x0005, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(10), WAIT(10), - ROTATE(8, 10, DIRECTION_SOUTHWEST), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_SOUTHWEST), WAIT(30), - ROTATE(4, 10, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTH), AWAIT_CUE(10), - ROTATE(10, 10, DIRECTION_SOUTHWEST), + ROTATE_TO(10, DIR_TRANS_10, DIRECTION_SOUTHWEST), ALERT_CUE(5), AWAIT_CUE(10), - ROTATE(8, 10, DIRECTION_NORTHWEST), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_NORTHWEST), AWAIT_CUE(10), - ROTATE(10, 10, DIRECTION_SOUTHWEST), + ROTATE_TO(10, DIR_TRANS_10, DIRECTION_SOUTHWEST), ALERT_CUE(5), AWAIT_CUE(10), - ROTATE(10, 10, DIRECTION_WEST), + ROTATE_TO(10, DIR_TRANS_10, DIRECTION_WEST), AWAIT_CUE(10), CALL_SCRIPT(NOTICE_FUNC), AWAIT_CUE(10), - ROTATE(10, 10, DIRECTION_SOUTH), + ROTATE_TO(10, DIR_TRANS_10, DIRECTION_SOUTH), { 0x56, 0x00, 0x0000, 0x00000047, 0x00000000, NULL }, ALERT_CUE(5), AWAIT_CUE(10), - ROTATE(4, 10, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_WEST), CALL_SCRIPT(NOTICE_FUNC), AWAIT_CUE(10), - ROTATE(4, 10, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTH), AWAIT_CUE(10), HALT, }; @@ -2589,11 +2589,11 @@ static const struct ScriptCommand s_gs2_g29_s0_lives6_dlg0[] = { /* 0x81882a8 */ SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0006, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(11), - ROTATE(12, 10, DIRECTION_NORTHWEST), + ROTATE_TO(12, DIR_TRANS_10, DIRECTION_NORTHWEST), ALERT_CUE(5), AWAIT_CUE(11), WAIT(4), - ROTATE(12, 10, DIRECTION_SOUTH), + ROTATE_TO(12, DIR_TRANS_10, DIRECTION_SOUTH), AWAIT_CUE(11), HALT, }; diff --git a/src/data/ground/ground_data_t01p03_station.h b/src/data/ground/ground_data_t01p03_station.h index 3ed231921..e62e75289 100644 --- a/src/data/ground/ground_data_t01p03_station.h +++ b/src/data/ground/ground_data_t01p03_station.h @@ -179,7 +179,7 @@ static const struct ScriptCommand s_gs4_g0_s0_obj0_dlg2[] = { /* 0x818a1f8 */ SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0000, 0x00000000, 0x00000000, NULL }, WAIT(1), - { 0xaf, 0x01, 0x000d, 0x00000000, 0x00000000, NULL }, + CMD_UNK_AF(RESCUE_DUNGEON_DUMMY, TRUE), SPECIAL_TEXT(SPECIAL_TEXT_BULLETIN_BOARD_JOBS, 0, 0), COND_EQUAL(1, /* to label */ 0), COND_EQUAL(2, /* to label */ 1), @@ -212,10 +212,10 @@ static const struct ScriptCommand s_gs4_g0_s0_lives0_dlg0[] = { /* 0x818a358 */ WAIT(15), { 0x68, 0x00, 0x0100, 0x00000018, 0x00000000, NULL }, WAIT(15), - ROTATE(30, 10, DIRECTION_WEST), + ROTATE_TO(30, DIR_TRANS_10, DIRECTION_WEST), WALK_DIRECT(300, 1), WALK_DIRECT(300, 0), - ROTATE(30, 10, DIRECTION_SOUTH), + ROTATE_TO(30, DIR_TRANS_10, DIRECTION_SOUTH), WAIT(15), { 0x68, 0x00, 0x0100, 0x00000008, 0x00000000, NULL }, WAIT(15), @@ -239,7 +239,7 @@ static const struct ScriptCommand s_gs4_g0_s0_lives1_dlg0[] = { /* 0x818a4f8 */ LABEL(1), /* = 0x01 */ WAIT(90), WALK_DIRECT(300, 2), - ROTATE(30, 10, DIRECTION_SOUTH), + ROTATE_TO(30, DIR_TRANS_10, DIRECTION_SOUTH), WAIT(15), { 0x68, 0x00, 0x0100, 0x00000008, 0x00000000, NULL }, WAIT(15), @@ -249,7 +249,7 @@ static const struct ScriptCommand s_gs4_g0_s0_lives1_dlg0[] = { /* 0x818a4f8 */ WAIT(15), { 0x68, 0x00, 0x0100, 0x00000018, 0x00000000, NULL }, WAIT(15), - ROTATE(30, 10, DIRECTION_EAST), + ROTATE_TO(30, DIR_TRANS_10, DIRECTION_EAST), WALK_DIRECT(300, 3), JUMP_LABEL(1), { 0x52, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, @@ -434,12 +434,12 @@ static const struct ScriptCommand s_gs4_g1_s0_lives4_dlg3[] = { /* 0x818b4d4 */ COND_EQUAL(1, /* to label */ 1), COND_EQUAL(2, /* to label */ 2), LABEL(1), /* = 0x01 */ - { 0x8d, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, + CMD_UNK_8D(1, DIR_TRANS_NONE), AWAIT_CUE(2), WAIT(12), RET, LABEL(2), /* = 0x02 */ - { 0x8d, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, + CMD_UNK_8D(1, DIR_TRANS_NONE), AWAIT_CUE(6), FANFARE_PLAY2(465), CALL_SCRIPT(JUMP_SURPRISE_FUNC), @@ -505,35 +505,35 @@ static const struct ScriptCommand s_gs4_g1_s1_lives0_dlg0[] = { /* 0x818b710 */ AWAIT_CUE(5), MSG_NPC(2, _(" Ha!")), ALERT_CUE(8), - ROTATE(4, 10, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHWEST), AWAIT_CUE(5), TEXTBOX_CLEAR, ALERT_CUE(7), AWAIT_CUE(5), MSG_NPC(2, _(" Ha!")), ALERT_CUE(8), - ROTATE(4, 10, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_WEST), AWAIT_CUE(5), TEXTBOX_CLEAR, ALERT_CUE(7), AWAIT_CUE(5), MSG_NPC(2, _(" Ha!")), ALERT_CUE(8), - ROTATE(4, 10, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTH), AWAIT_CUE(5), TEXTBOX_CLEAR, ALERT_CUE(7), AWAIT_CUE(5), MSG_NPC(2, _(" Ha!")), ALERT_CUE(8), - { 0x93, 0x04, 0x000a, 0x00000042, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 66), AWAIT_CUE(5), TEXTBOX_CLEAR, ALERT_CUE(7), AWAIT_CUE(5), MSG_NPC(2, _(" Ha!")), ALERT_CUE(8), - { 0x93, 0x04, 0x000a, 0x00000042, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 66), AWAIT_CUE(5), TEXTBOX_CLEAR, WAIT(30), @@ -586,7 +586,7 @@ static const struct ScriptCommand s_gs4_g1_s1_lives1_dlg0[] = { /* 0x818bfec */ DEBUGINFO_O(586), SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0x8e, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, + CMD_UNK_8E(1, DIR_TRANS_NONE, 0), AWAIT_CUE(6), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, RET, @@ -655,10 +655,10 @@ static const struct ScriptCommand s_gs4_g1_s1_lives2_dlg0[] = { /* 0x818c05c */ SELECT_ANIMATION(2), ALERT_CUE(5), AWAIT_CUE(7), - ROTATE(8, 1, DIRECTION_SOUTH), + ROTATE_TO(8, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTH), ALERT_CUE(5), AWAIT_CUE(7), - ROTATE(4, 10, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_EAST), { 0x52, 0x00, 0x0000, 0x0000001f, 0x00000000, NULL }, ALERT_CUE(5), AWAIT_CUE(7), @@ -675,24 +675,24 @@ static const struct ScriptCommand s_gs4_g1_s1_lives3_dlg0[] = { /* 0x818c4dc */ CALL_SCRIPT(NOTICE_FUNC), { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(8), - ROTATE(4, 10, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_WEST), WAIT(15), CALL_SCRIPT(LOOK_AROUND_FUNC), { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(8), - ROTATE(4, 10, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTHWEST), { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(8), - ROTATE(4, 10, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_WEST), { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(8), - ROTATE(4, 10, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTH), { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(8), - ROTATE(4, 10, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_WEST), { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(8), - ROTATE(4, 10, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(8), CALL_SCRIPT(SMILE_START_FUNC), @@ -700,7 +700,7 @@ static const struct ScriptCommand s_gs4_g1_s1_lives3_dlg0[] = { /* 0x818c4dc */ CALL_SCRIPT(SMILE_END_FUNC), { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(8), - ROTATE(4, 10, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_EAST), { 0x53, 0x00, 0x0000, 0x00000400, 0x00000000, NULL }, SELECT_ANIMATION(4), ALERT_CUE(5), @@ -791,12 +791,12 @@ static const struct ScriptCommand s_gs4_g3_s0_lives0_dlg0[] = { /* 0x818ca80 */ MSG_NPC(1, _(" Did you two put up that job?")), TEXTBOX_CLEAR, WAIT(10), - ROTATE(4, 1, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTHEAST), ALERT_CUE(7), MSG_NPC(2, _(" Yup, yup!")), TEXTBOX_CLEAR, WAIT(10), - ROTATE(4, 2, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_NORTH), ALERT_CUE(6), ALERT_CUE(8), AWAIT_CUE(5), @@ -805,12 +805,12 @@ static const struct ScriptCommand s_gs4_g3_s0_lives0_dlg0[] = { /* 0x818ca80 */ TEXTBOX_CLEAR, ALERT_CUE(8), WAIT(10), - ROTATE(4, 1, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTHEAST), ALERT_CUE(6), MSG_NPC(2, _(" A bad Mankey gang is going\nwild in our forest.\nEveryone is upset.")), TEXTBOX_CLEAR, WAIT(10), - ROTATE(4, 2, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_NORTH), ALERT_CUE(6), ALERT_CUE(8), AWAIT_CUE(5), @@ -818,13 +818,13 @@ static const struct ScriptCommand s_gs4_g3_s0_lives0_dlg0[] = { /* 0x818ca80 */ TEXTBOX_CLEAR, ALERT_CUE(8), WAIT(10), - ROTATE(4, 1, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTHEAST), ALERT_CUE(7), MSG_NPC(2, _(" We don't know why they\nrampage around...")), MSG_NPC(2, _(" But they are always angry\nand attack anyone they see!")), TEXTBOX_CLEAR, WAIT(10), - ROTATE(4, 2, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_NORTH), ALERT_CUE(6), ALERT_CUE(8), AWAIT_CUE(5), @@ -836,7 +836,7 @@ static const struct ScriptCommand s_gs4_g3_s0_lives0_dlg0[] = { /* 0x818ca80 */ MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Hmm... That is a problem.")), VARIANT_DEFAULT(_(" Oh, no... That is a problem.")), - ROTATE(4, 1, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_EAST), ALERT_CUE(6), PORTRAIT_REP(0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), @@ -848,7 +848,7 @@ static const struct ScriptCommand s_gs4_g3_s0_lives0_dlg0[] = { /* 0x818ca80 */ TEXTBOX_CLEAR, WAIT(20), ALERT_CUE(6), - ROTATE(4, 2, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_NORTH), ALERT_CUE(8), AWAIT_CUE(5), MSG_NPC(3, _(" Wobbuffet!")), @@ -876,17 +876,17 @@ static const struct ScriptCommand s_gs4_g3_s0_lives1_dlg0[] = { /* 0x818d208 */ SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(6), - ROTATE(4, 2, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_NORTHWEST), AWAIT_CUE(6), - ROTATE(4, 1, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTH), AWAIT_CUE(6), - ROTATE(4, 2, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_NORTHWEST), AWAIT_CUE(6), - ROTATE(4, 2, DIRECTION_NORTHWEST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_NORTHWEST), AWAIT_CUE(6), - ROTATE(4, 2, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_WEST), AWAIT_CUE(6), - ROTATE(4, 1, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_NORTH), AWAIT_CUE(6), WALK_RELATIVE(256, -80, 0), HALT, @@ -901,7 +901,7 @@ static const struct ScriptCommand s_gs4_g3_s0_lives2_dlg0[] = { /* 0x818d328 */ WAIT(15), SELECT_ANIMATION(2), AWAIT_CUE(7), - ROTATE(4, 1, DIRECTION_SOUTHWEST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTHWEST), HALT, }; @@ -979,7 +979,7 @@ static const struct ScriptCommand s_gs4_g5_s0_lives0_dlg0[] = { /* 0x818d758 */ PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000000), ALERT_CUE(6), AWAIT_CUE(5), - { 0x93, 0x04, 0x000a, 0x00000022, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 34), PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" “Smeargle's desperate plea,“\nhuh...?{WAIT_PRESS}\nThat's some title.")), @@ -988,7 +988,7 @@ static const struct ScriptCommand s_gs4_g5_s0_lives0_dlg0[] = { /* 0x818d758 */ VARIANT_DEFAULT(_(" What does it say?{WAIT_PRESS}\nCan you read it?")), TEXTBOX_CLEAR, WAIT(20), - ROTATE(4, 10, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), ALERT_CUE(6), AWAIT_CUE(5), MSG_INSTANT(_("{CENTER_ALIGN}{NAME_0} read the letter.")), @@ -1004,7 +1004,7 @@ static const struct ScriptCommand s_gs4_g5_s0_lives0_dlg0[] = { /* 0x818d758 */ WAIT(20), ALERT_CUE(6), AWAIT_CUE(5), - { 0x93, 0x04, 0x000a, 0x00000022, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 34), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" .............{WAIT_PRESS}\nIt says he ran away because he didn't want\nto be an adult...{WAIT_PRESS} What's up with that?")), VARIANT(/* == */ 1, _(" I don't really get it, but...{WAIT_PRESS}\nWell, let's go rescue this Smeargle!")), @@ -1031,13 +1031,13 @@ static const struct ScriptCommand s_gs4_g5_s0_lives1_dlg0[] = { /* 0x818def4 */ SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(6), - { 0x93, 0x04, 0x000a, 0x00000001, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 1), ALERT_CUE(5), AWAIT_CUE(6), - ROTATE(4, 10, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), ALERT_CUE(5), AWAIT_CUE(6), - { 0x93, 0x04, 0x000a, 0x00000001, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 1), ALERT_CUE(5), AWAIT_CUE(6), HALT, @@ -1089,21 +1089,21 @@ static const struct ScriptCommand s_gs4_g6_s0_lives0_dlg3[] = { /* 0x818e248 */ { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(6), WAIT(30), - { 0x92, 0x04, 0x0001, 0x00000001, 0x00000000, NULL }, + CMD_UNK_92(4, 1, DIR_TRANS_SPINRIGHT1), WAIT(5), - { 0x92, 0x04, 0x0002, 0x00000004, 0x00000000, NULL }, + CMD_UNK_92(4, 2, DIR_TRANS_SPINLEFT2), WAIT(5), - { 0x92, 0x04, 0x0001, 0x00000001, 0x00000000, NULL }, + CMD_UNK_92(4, 1, DIR_TRANS_SPINRIGHT1), ALERT_CUE(5), AWAIT_CUE(6), - { 0x92, 0x04, 0x0001, 0x00000001, 0x00000000, NULL }, + CMD_UNK_92(4, 1, DIR_TRANS_SPINRIGHT1), WAIT(5), - { 0x92, 0x04, 0x0002, 0x00000004, 0x00000000, NULL }, + CMD_UNK_92(4, 2, DIR_TRANS_SPINLEFT2), WAIT(5), - { 0x92, 0x04, 0x0001, 0x00000001, 0x00000000, NULL }, + CMD_UNK_92(4, 1, DIR_TRANS_SPINRIGHT1), ALERT_CUE(5), AWAIT_CUE(6), - ROTATE(4, 10, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), ALERT_CUE(5), RET, }; @@ -1235,7 +1235,7 @@ static const struct ScriptCommand s_gs4_g9_s0_lives0_dlg0[] = { /* 0x818eafc */ ALERT_CUE(7), ALERT_CUE(8), AWAIT_CUE(5), - { 0x93, 0x04, 0x000a, 0x0000005d, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 93), PORTRAIT(PLACEMENT_LEFT_, 0x0002, 0x00000000), ASK3(FALSE, /*default*/ -1, /* speaker */ 2, _(" Say, sweetie.{WAIT_PRESS}\nHave you seen Gengar around?")), CHOICE(/* label */ 2, _("Yes.")), @@ -1258,7 +1258,7 @@ static const struct ScriptCommand s_gs4_g9_s0_lives0_dlg0[] = { /* 0x818eafc */ MSG_NPC(2, _(" ...Oh, OK.")), TEXTBOX_CLEAR, WAIT(10), - { 0x93, 0x04, 0x000a, 0x0000005c, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 92), PORTRAIT(PLACEMENT_RIGHT, 0x0003, 0x00000000), MSG_NPC(3, _(" Something seems to be\nwrong with Gengar lately.")), TEXTBOX_CLEAR, @@ -1273,7 +1273,7 @@ static const struct ScriptCommand s_gs4_g9_s0_lives0_dlg0[] = { /* 0x818eafc */ WAIT(10), ALERT_CUE(7), AWAIT_CUE(5), - { 0x93, 0x04, 0x000a, 0x0000005d, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 93), PORTRAIT_REP(0x0002, 0x00000000), MSG_NPC(2, _(" You think so?{WAIT_PRESS}\nHis expression...\nIt looks the same as usual, no?")), MSG_NPC(2, _(" All I have seen is him\nlaughing in his usual mean way?")), @@ -1281,7 +1281,7 @@ static const struct ScriptCommand s_gs4_g9_s0_lives0_dlg0[] = { /* 0x818eafc */ WAIT(10), ALERT_CUE(8), AWAIT_CUE(5), - { 0x93, 0x04, 0x000a, 0x0000005c, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 92), MSG_NPC(3, _(" No, it's different.{WAIT_PRESS}\nI can tell.")), MSG_NPC(3, _(" The way he sets his mouth.\nIt's different just a little at the corners.")), TEXTBOX_CLEAR, @@ -1291,7 +1291,7 @@ static const struct ScriptCommand s_gs4_g9_s0_lives0_dlg0[] = { /* 0x818eafc */ WAIT(10), ALERT_CUE(7), AWAIT_CUE(5), - { 0x93, 0x04, 0x000a, 0x0000005d, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 93), MSG_NPC(2, _(" Anyway, without Gengar\naround, {COLOR CYAN}Team Meanies{RESET} can't operate.")), MSG_NPC(2, _(" Such a vexing problem!")), TEXTBOX_CLEAR, @@ -1328,7 +1328,7 @@ static const struct ScriptCommand s_gs4_g9_s0_lives2_dlg0[] = { /* 0x818f2e4 */ SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(7), - { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 0), AWAIT_CUE(7), JUMPIF(JUDGE_EQ, EVENT_LOCAL, 1, /* to label */ 0), CALL_SCRIPT(JUMP_SURPRISE_FUNC), @@ -1336,13 +1336,13 @@ static const struct ScriptCommand s_gs4_g9_s0_lives2_dlg0[] = { /* 0x818f2e4 */ AWAIT_CUE(7), JUMPIF(JUDGE_EQ, EVENT_LOCAL, 0, /* to label */ 0), LABEL(0), /* = 0x00 */ - { 0x93, 0x04, 0x000a, 0x0000005c, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 92), ALERT_CUE(5), AWAIT_CUE(7), - { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 0), ALERT_CUE(5), AWAIT_CUE(7), - ROTATE(4, 10, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_EAST), ALERT_CUE(5), HALT, }; @@ -1354,10 +1354,10 @@ static const struct ScriptCommand s_gs4_g9_s0_lives3_dlg0[] = { /* 0x818f434 */ { 0x2d, 0x07, 0x0003, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(8), WAIT(5), - { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 0), ALERT_CUE(5), AWAIT_CUE(8), - { 0x93, 0x04, 0x000a, 0x0000005d, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 93), ALERT_CUE(5), AWAIT_CUE(8), HALT, @@ -1505,7 +1505,7 @@ static const struct ScriptCommand s_gs4_g12_s0_station_sref_script[] = { /* 0x81 AWAIT_CUE(3), SELECT_EVENTS(0, 0), SELECT_LIVES(0, 0), - { 0xaf, 0x01, 0x000d, 0x00000000, 0x00000000, NULL }, + CMD_UNK_AF(RESCUE_DUNGEON_DUMMY, TRUE), RET, }; @@ -1544,7 +1544,7 @@ static const struct ScriptCommand s_gs4_g12_s0_lives0_dlg0[] = { /* 0x818fcdc */ AWAIT_CUE(5), ALERT_CUE(6), WALK_GRID(256, 12), - ROTATE(4, 10, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHEAST), AWAIT_CUE(5), PORTRAIT(PLACEMENT_RIGHT, 0x0001, 0x00000000), MSG_VAR(2, PARTNER_TALK_KIND, 1), @@ -1553,7 +1553,7 @@ static const struct ScriptCommand s_gs4_g12_s0_lives0_dlg0[] = { /* 0x818fcdc */ TEXTBOX_CLEAR, ALERT_CUE(6), AWAIT_CUE(5), - ROTATE(4, 10, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" Take a look at this!\nSee this Bulletin Board?")), VARIANT_DEFAULT(_(" See?\nHave a look at this Bulletin Board.")), @@ -1564,7 +1564,7 @@ static const struct ScriptCommand s_gs4_g12_s0_lives0_dlg0[] = { /* 0x818fcdc */ TEXTBOX_CLEAR, SPECIAL_TEXT(SPECIAL_TEXT_BULLETIN_BOARD_JOBS, 0, 0), ALERT_CUE(6), - ROTATE(4, 10, DIRECTION_NORTHEAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTHEAST), AWAIT_CUE(5), MSG_VAR(2, PARTNER_TALK_KIND, 1), VARIANT(/* == */ 1, _(" See?\nThere were jobs listed, right?")), @@ -1613,14 +1613,14 @@ static const struct ScriptCommand s_gs4_g12_s0_lives1_dlg0[] = { /* 0x81909bc */ AWAIT_CUE(6), WALK_GRID(256, 13), WAIT(20), - { 0x8e, 0x14, 0x0000, 0x00000000, 0x00000000, NULL }, + CMD_UNK_8E(20, DIR_TRANS_NONE, 0), ALERT_CUE(5), AWAIT_CUE(6), WAIT(20), { 0x8b, 0x14, 0x0004, 0x00000000, 0x00000000, NULL }, ALERT_CUE(5), AWAIT_CUE(6), - { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 0), { 0xe5, 0x00, 0x0005, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(6), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, @@ -1638,7 +1638,7 @@ static const struct ScriptCommand s_gs4_g12_s0_lives2_dlg0[] = { /* 0x8190aec */ WAIT(60), { 0x68, 0x00, 0x0100, 0x00000018, 0x00000000, NULL }, WAIT(15), - ROTATE(30, 10, DIRECTION_WEST), + ROTATE_TO(30, DIR_TRANS_10, DIRECTION_WEST), WAIT(15), WALK_DIRECT(120, 14), WAIT(15), @@ -1657,7 +1657,7 @@ static const struct ScriptCommand s_gs4_g12_s0_lives3_dlg0[] = { /* 0x8190bec */ WAIT(160), WALK_DIRECT(120, 15), WAIT(15), - ROTATE(30, 10, DIRECTION_SOUTH), + ROTATE_TO(30, DIR_TRANS_10, DIRECTION_SOUTH), WAIT(15), { 0x68, 0x00, 0x0100, 0x00000008, 0x00000000, NULL }, WAIT(15), @@ -1776,7 +1776,7 @@ static const struct ScriptCommand s_gs4_g16_s1_lives1_dlg0[] = { /* 0x8191244 */ SELECT_ANIMATION(2), { 0x53, 0x00, 0x0000, 0x00000200, 0x00000000, NULL }, AWAIT_CUE(7), - ROTATE(4, 1, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTH), ALERT_CUE(5), AWAIT_CUE(7), { 0x8b, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, @@ -1796,7 +1796,7 @@ static const struct ScriptCommand s_gs4_g16_s1_lives2_dlg0[] = { /* 0x8191324 */ SELECT_ANIMATION(2), { 0x53, 0x00, 0x0000, 0x00000200, 0x00000000, NULL }, AWAIT_CUE(8), - ROTATE(4, 2, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_NORTH), ALERT_CUE(5), AWAIT_CUE(8), { 0x8b, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, @@ -1889,7 +1889,7 @@ static const struct ScriptCommand s_gs4_g17_s1_lives1_dlg0[] = { /* 0x819171c */ SELECT_ANIMATION(2), { 0x53, 0x00, 0x0000, 0x00000200, 0x00000000, NULL }, AWAIT_CUE(7), - ROTATE(4, 1, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTH), ALERT_CUE(5), AWAIT_CUE(7), { 0x8b, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, @@ -1909,7 +1909,7 @@ static const struct ScriptCommand s_gs4_g17_s1_lives2_dlg0[] = { /* 0x81917fc */ SELECT_ANIMATION(2), { 0x53, 0x00, 0x0000, 0x00000200, 0x00000000, NULL }, AWAIT_CUE(8), - ROTATE(4, 2, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_NORTH), ALERT_CUE(5), AWAIT_CUE(8), { 0x8b, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, @@ -1971,10 +1971,10 @@ static const struct ScriptCommand s_gs4_g18_s0_lives0_dlg3[] = { /* 0x8191c7c */ { 0x2d, 0x09, 0x0003, 0x00000000, 0x00000000, NULL }, { 0x53, 0x00, 0x0000, 0x00000200, 0x00000000, NULL }, AWAIT_CUE(6), - { 0x8e, 0x0a, 0x000a, 0x00000000, 0x00000000, NULL }, + CMD_UNK_8E(10, DIR_TRANS_10, 0), ALERT_CUE(5), AWAIT_CUE(6), - ROTATE(4, 10, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_EAST), ALERT_CUE(5), HALT, }; @@ -2081,7 +2081,7 @@ static const struct ScriptCommand s_gs4_g19_s1_lives1_dlg0[] = { /* 0x8192548 */ SELECT_ANIMATION(2), { 0x53, 0x00, 0x0000, 0x00000200, 0x00000000, NULL }, AWAIT_CUE(7), - ROTATE(4, 1, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_SOUTH), ALERT_CUE(5), AWAIT_CUE(7), { 0x8b, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, @@ -2101,7 +2101,7 @@ static const struct ScriptCommand s_gs4_g19_s1_lives2_dlg0[] = { /* 0x8192628 */ SELECT_ANIMATION(2), { 0x53, 0x00, 0x0000, 0x00000200, 0x00000000, NULL }, AWAIT_CUE(8), - ROTATE(4, 2, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_NORTH), ALERT_CUE(5), AWAIT_CUE(8), { 0x8b, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, @@ -2142,7 +2142,7 @@ static const struct ScriptCommand s_gs4_g20_s0_lives1_dlg0[] = { /* 0x81927b4 */ SELECT_ANIMATION(2), { 0x53, 0x00, 0x0000, 0x00000200, 0x00000000, NULL }, AWAIT_CUE(8), - ROTATE(4, 2, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_NORTH), ALERT_CUE(5), AWAIT_CUE(8), { 0x8b, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, @@ -2214,7 +2214,7 @@ static const struct ScriptCommand s_gs4_g20_s1_lives1_dlg0[] = { /* 0x81929a0 */ MSG_NPC(2, _(" Hah!")), ALERT_CUE(6), ALERT_CUE(8), - { 0x93, 0x04, 0x000a, 0x00000042, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 66), TEXTBOX_CLEAR, ALERT_CUE(7), AWAIT_CUE(5), @@ -2222,7 +2222,7 @@ static const struct ScriptCommand s_gs4_g20_s1_lives1_dlg0[] = { /* 0x81929a0 */ MSG_NPC(2, _(" Hah!")), ALERT_CUE(6), ALERT_CUE(8), - { 0x93, 0x04, 0x000a, 0x00000042, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 66), TEXTBOX_CLEAR, ALERT_CUE(7), AWAIT_CUE(5), @@ -2230,14 +2230,14 @@ static const struct ScriptCommand s_gs4_g20_s1_lives1_dlg0[] = { /* 0x81929a0 */ MSG_NPC(2, _(" Hah!")), ALERT_CUE(6), ALERT_CUE(8), - { 0x93, 0x04, 0x000a, 0x00000042, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 66), TEXTBOX_CLEAR, PORTRAIT(PLACEMENT_RIGHT, 0x0002, 0x00000000), ALERT_CUE(7), AWAIT_CUE(5), ALERT_CUE(6), ALERT_CUE(8), - { 0x93, 0x04, 0x000a, 0x00000042, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 66), TEXTBOX_AUTO_PRESS(30, 30), PORTRAIT(PLACEMENT_LEFT_FLIP, 0x0002, 0x00000000), MSG_NPC(2, _(" Hah!")), @@ -2266,15 +2266,15 @@ static const struct ScriptCommand s_gs4_g20_s1_lives2_dlg0[] = { /* 0x8192fa8 */ DEBUGINFO_O(2266), SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0x8e, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, + CMD_UNK_8E(1, DIR_TRANS_NONE, 0), AWAIT_CUE(6), - { 0x93, 0x04, 0x000a, 0x00000042, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 66), AWAIT_CUE(6), - { 0x93, 0x04, 0x000a, 0x00000042, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 66), AWAIT_CUE(6), - { 0x93, 0x04, 0x000a, 0x00000042, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 66), AWAIT_CUE(6), - { 0x93, 0x04, 0x000a, 0x00000042, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 66), AWAIT_CUE(6), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, RET, @@ -2287,7 +2287,7 @@ static const struct ScriptCommand s_gs4_g20_s1_lives3_dlg0[] = { /* 0x8193098 */ SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(7), - ROTATE(4, 10, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTH), ALERT_CUE(5), AWAIT_CUE(7), { 0x54, 0x00, 0x0400, 0x00000000, 0x00000000, NULL }, @@ -2345,7 +2345,7 @@ static const struct ScriptCommand s_gs4_g20_s1_lives3_dlg0[] = { /* 0x8193098 */ ALERT_CUE(5), AWAIT_CUE(7), SELECT_ANIMATION(2), - ROTATE(8, 10, DIRECTION_SOUTH), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_SOUTH), ALERT_CUE(5), AWAIT_CUE(7), { 0x8b, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, @@ -2365,16 +2365,16 @@ static const struct ScriptCommand s_gs4_g20_s1_lives4_dlg0[] = { /* 0x8193528 */ SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0003, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(8), - ROTATE(4, 10, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), ALERT_CUE(5), AWAIT_CUE(8), - { 0x93, 0x04, 0x000a, 0x00000042, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 66), AWAIT_CUE(8), - { 0x93, 0x04, 0x000a, 0x00000042, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 66), AWAIT_CUE(8), - { 0x93, 0x04, 0x000a, 0x00000042, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 66), AWAIT_CUE(8), - { 0x93, 0x04, 0x000a, 0x00000042, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 66), AWAIT_CUE(8), { 0x8b, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, ALERT_CUE(5), @@ -2473,7 +2473,7 @@ static const struct ScriptCommand s_gs4_g21_s1_lives0_dlg0[] = { /* 0x8193870 */ MSG_NPC(2, _(" Hah!")), ALERT_CUE(6), ALERT_CUE(8), - { 0x93, 0x04, 0x000a, 0x00000042, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 66), TEXTBOX_CLEAR, ALERT_CUE(7), AWAIT_CUE(5), @@ -2482,7 +2482,7 @@ static const struct ScriptCommand s_gs4_g21_s1_lives0_dlg0[] = { /* 0x8193870 */ MSG_NPC(2, _(" Hah!")), ALERT_CUE(6), ALERT_CUE(8), - { 0x93, 0x04, 0x000a, 0x00000042, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 66), TEXTBOX_CLEAR, ALERT_CUE(7), AWAIT_CUE(5), @@ -2490,13 +2490,13 @@ static const struct ScriptCommand s_gs4_g21_s1_lives0_dlg0[] = { /* 0x8193870 */ MSG_NPC(2, _(" Hah!")), ALERT_CUE(6), ALERT_CUE(8), - { 0x93, 0x04, 0x000a, 0x00000042, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 66), TEXTBOX_CLEAR, ALERT_CUE(7), AWAIT_CUE(5), ALERT_CUE(6), ALERT_CUE(8), - { 0x93, 0x04, 0x000a, 0x00000042, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 66), TEXTBOX_AUTO_PRESS(30, 30), PORTRAIT(PLACEMENT_RIGHT_FLIP, 0x0002, 0x00000000), MSG_NPC(2, _(" Hah!")), @@ -2524,15 +2524,15 @@ static const struct ScriptCommand s_gs4_g21_s1_lives1_dlg0[] = { /* 0x8193edc */ DEBUGINFO_O(2524), SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0x8e, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, + CMD_UNK_8E(1, DIR_TRANS_NONE, 0), AWAIT_CUE(6), - { 0x93, 0x04, 0x000a, 0x00000042, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 66), AWAIT_CUE(6), - { 0x93, 0x04, 0x000a, 0x00000042, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 66), AWAIT_CUE(6), - { 0x93, 0x04, 0x000a, 0x00000042, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 66), AWAIT_CUE(6), - { 0x93, 0x04, 0x000a, 0x00000042, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 66), AWAIT_CUE(6), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, RET, @@ -2545,7 +2545,7 @@ static const struct ScriptCommand s_gs4_g21_s1_lives2_dlg0[] = { /* 0x8193fcc */ SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(7), - ROTATE(4, 10, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTH), ALERT_CUE(5), AWAIT_CUE(7), { 0x54, 0x00, 0x0400, 0x00000000, 0x00000000, NULL }, @@ -2603,7 +2603,7 @@ static const struct ScriptCommand s_gs4_g21_s1_lives2_dlg0[] = { /* 0x8193fcc */ ALERT_CUE(5), AWAIT_CUE(7), SELECT_ANIMATION(2), - ROTATE(8, 10, DIRECTION_SOUTH), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_SOUTH), ALERT_CUE(5), AWAIT_CUE(7), { 0x8b, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, @@ -2623,16 +2623,16 @@ static const struct ScriptCommand s_gs4_g21_s1_lives3_dlg0[] = { /* 0x819445c */ { 0x53, 0x00, 0x0000, 0x00000200, 0x00000000, NULL }, { 0x2d, 0x07, 0x0003, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(8), - ROTATE(4, 10, DIRECTION_NORTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_NORTH), ALERT_CUE(5), AWAIT_CUE(8), - { 0x93, 0x04, 0x000a, 0x00000042, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 66), AWAIT_CUE(8), - { 0x93, 0x04, 0x000a, 0x00000042, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 66), AWAIT_CUE(8), - { 0x93, 0x04, 0x000a, 0x00000042, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 66), AWAIT_CUE(8), - { 0x93, 0x04, 0x000a, 0x00000042, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 66), AWAIT_CUE(8), { 0x8b, 0x00, 0x0002, 0x00000000, 0x00000000, NULL }, ALERT_CUE(5), @@ -2748,7 +2748,7 @@ static const struct ScriptCommand s_gs4_g22_s1_lives1_dlg0[] = { /* 0x8194c3c */ DEBUGINFO_O(2748), SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0x8e, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, + CMD_UNK_8E(1, DIR_TRANS_NONE, 0), AWAIT_CUE(6), { 0x52, 0x00, 0x0000, 0x00001000, 0x00000000, NULL }, RET, @@ -2760,7 +2760,7 @@ static const struct ScriptCommand s_gs4_g22_s1_lives2_dlg0[] = { /* 0x8194cac */ SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(7), - ROTATE(4, 10, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_SOUTH), ALERT_CUE(5), AWAIT_CUE(7), SELECT_ANIMATION(23), @@ -2776,7 +2776,7 @@ static const struct ScriptCommand s_gs4_g22_s1_lives3_dlg0[] = { /* 0x8194d7c */ SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0003, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(8), - { 0x8e, 0x04, 0x000a, 0x00000042, 0x00000000, NULL }, + CMD_UNK_8E(4, DIR_TRANS_10, 66), ALERT_CUE(5), AWAIT_CUE(8), CALL_SCRIPT(LOOK_AROUND_FUNC), @@ -2784,7 +2784,7 @@ static const struct ScriptCommand s_gs4_g22_s1_lives3_dlg0[] = { /* 0x8194d7c */ FANFARE_PLAY2(469), CALL_SCRIPT(QUESTION_FUNC), WAIT(10), - ROTATE(4, 10, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_10, DIRECTION_EAST), ALERT_CUE(5), HALT, }; @@ -3098,7 +3098,7 @@ static const struct ScriptCommand s_gs4_g28_s0_lives0_dlg3[] = { /* 0x819609c */ SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(6), - { 0x93, 0x04, 0x000a, 0x00000000, 0x00000000, NULL }, + CMD_UNK_93(4, DIR_TRANS_10, 0), ALERT_CUE(5), AWAIT_CUE(6), CALL_SCRIPT(NOTICE_FUNC), diff --git a/src/data/ground/ground_data_t01p04_station.h b/src/data/ground/ground_data_t01p04_station.h index 139324016..10bb80dda 100644 --- a/src/data/ground/ground_data_t01p04_station.h +++ b/src/data/ground/ground_data_t01p04_station.h @@ -317,7 +317,7 @@ static const struct ScriptCommand s_gs5_g5_s0_lives0_dlg0[] = { /* 0x81988f4 */ ALERT_CUE(4), { 0x53, 0x00, 0x0000, 0x01000000, 0x00000000, NULL }, { 0x80, 0x00, 0x0080, 0x00000002, 0x00000000, NULL }, - ROTATE(8, 10, DIRECTION_EAST), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_EAST), { 0x80, 0x00, 0x0100, 0x00000003, 0x00000000, NULL }, ALERT_CUE(3), { 0x80, 0x00, 0x0100, 0x00000004, 0x00000000, NULL }, @@ -329,7 +329,7 @@ static const struct ScriptCommand s_gs5_g5_s0_lives1_dlg0[] = { /* 0x8198a24 */ SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, AWAIT_CUE(6), - ROTATE(8, 10, DIRECTION_WEST), + ROTATE_TO(8, DIR_TRANS_10, DIRECTION_WEST), HALT, }; diff --git a/src/data/ground/ground_data_t01p05_station.h b/src/data/ground/ground_data_t01p05_station.h index b78760c45..2f424b113 100644 --- a/src/data/ground/ground_data_t01p05_station.h +++ b/src/data/ground/ground_data_t01p05_station.h @@ -145,9 +145,9 @@ static const struct ScriptCommand s_gs6_g1_s0_lives0_dlg3[] = { /* 0x819947c */ DEBUGINFO_O(145), CALL_SCRIPT(INIT_PLAZA_SLEEP_TALK_FUNC), JUMPIF_SCENARIOCHECK(QUEST_SQUARE_ASLEEP, /* to label */ 0), - { 0x8e, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, + CMD_UNK_8E(0, DIR_TRANS_NONE, 0), LABEL(0), /* = 0x00 */ - { 0x8d, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, + CMD_UNK_8D(1, DIR_TRANS_NONE), JUMP_SCRIPT(LIVES_REPLY), }; @@ -231,7 +231,7 @@ static const struct ScriptCommand s_gs6_g2_s0_lives2_dlg0[] = { /* 0x81998c8 */ { 0x4f, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, CALL_SCRIPT(INIT_PLAZA_SLEEP_TALK_FUNC), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x8e, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, + CMD_UNK_8E(0, DIR_TRANS_NONE, 0), AWAIT_CUE(3), RET, }; @@ -281,7 +281,7 @@ static const struct ScriptCommand s_gs6_g3_s0_lives2_dlg0[] = { /* 0x8199b14 */ { 0x4f, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, CALL_SCRIPT(INIT_PLAZA_SLEEP_TALK_FUNC), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x8e, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, + CMD_UNK_8E(0, DIR_TRANS_NONE, 0), AWAIT_CUE(3), RET, }; @@ -331,7 +331,7 @@ static const struct ScriptCommand s_gs6_g4_s0_lives2_dlg0[] = { /* 0x8199d60 */ { 0x4f, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, CALL_SCRIPT(INIT_PLAZA_SLEEP_TALK_FUNC), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x8e, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, + CMD_UNK_8E(0, DIR_TRANS_NONE, 0), AWAIT_CUE(3), RET, }; @@ -381,7 +381,7 @@ static const struct ScriptCommand s_gs6_g5_s0_lives2_dlg0[] = { /* 0x8199fac */ { 0x4f, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, CALL_SCRIPT(INIT_PLAZA_SLEEP_TALK_FUNC), { 0x2d, 0x07, 0x0002, 0x00000000, 0x00000000, NULL }, - { 0x8e, 0x00, 0x0000, 0x00000000, 0x00000000, NULL }, + CMD_UNK_8E(0, DIR_TRANS_NONE, 0), AWAIT_CUE(3), RET, }; diff --git a/src/data/ground/ground_event_data.h b/src/data/ground/ground_event_data.h index a07dcb575..2b0b5a639 100644 --- a/src/data/ground/ground_event_data.h +++ b/src/data/ground/ground_event_data.h @@ -51,7 +51,7 @@ static const struct ScriptCommand s_script_LIVES_REPLY_NORMAL[] = { /* 0x811efd8 DEBUGINFO_O(51), SELECT_ANIMATION(2), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0x8d, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, + CMD_UNK_8D(1, DIR_TRANS_NONE), AWAIT_CUE(2), WAIT(12), RET, @@ -60,7 +60,7 @@ static const struct ScriptCommand s_script_LIVES_REPLY_NORMAL[] = { /* 0x811efd8 static const struct ScriptCommand s_script_LIVES_REPLY[] = { /* 0x811f048 */ DEBUGINFO_O(61), { 0x2d, 0x07, 0x0001, 0x00000000, 0x00000000, NULL }, - { 0x8d, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, + CMD_UNK_8D(1, DIR_TRANS_NONE), AWAIT_CUE(2), WAIT(12), RET, @@ -162,7 +162,7 @@ static const struct ScriptCommand s_script_HABITAT_MOVE1[] = { /* 0x811f7c0 */ LABEL(0), /* = 0x00 */ SELECT_ANIMATION(1), LABEL(1), /* = 0x01 */ - { 0x8a, 0x18, 0x0100, 0x00000009, 0x00000000, NULL }, + CMD_UNK_8A(24, 256, DIR_TRANS_RAND), WAIT_RANDOM(24, 48), JUMP_LABEL(1), }; @@ -177,7 +177,7 @@ static const struct ScriptCommand s_script_HABITAT_MOVE2[] = { /* 0x811f860 */ { 0x52, 0x00, 0x0000, 0x00000002, 0x00000000, NULL }, { 0x53, 0x00, 0x0000, 0x00000001, 0x00000000, NULL }, LABEL(1), /* = 0x01 */ - { 0x8a, 0x18, 0x0100, 0x00000009, 0x00000000, NULL }, + CMD_UNK_8A(24, 256, DIR_TRANS_RAND), WAIT_RANDOM(24, 48), JUMP_LABEL(1), }; @@ -186,7 +186,7 @@ static const struct ScriptCommand s_script_HABITAT_MOVE_PAUSE[] = { /* 0x811f920 DEBUGINFO_O(186), { 0x54, 0x00, 0x0300, 0x00000000, 0x00000000, NULL }, SELECT_ANIMATION(3), - { 0x8d, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, + CMD_UNK_8D(1, DIR_TRANS_NONE), LABEL(0), /* = 0x00 */ WAIT(240), JUMP_LABEL(0), @@ -196,7 +196,7 @@ static const struct ScriptCommand s_script_HABITAT_MOVE_STAY_FIX[] = { /* 0x811f DEBUGINFO_O(196), { 0x54, 0x00, 0x0300, 0x00000000, 0x00000000, NULL }, SELECT_ANIMATION(4), - { 0x8d, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, + CMD_UNK_8D(1, DIR_TRANS_NONE), LABEL(0), /* = 0x00 */ WAIT(240), JUMP_LABEL(0), @@ -207,7 +207,7 @@ static const struct ScriptCommand s_script_HABITAT_MOVE_STAY_TURN[] = { /* 0x811 { 0x54, 0x00, 0x0300, 0x00000000, 0x00000000, NULL }, SELECT_ANIMATION(4), LABEL(0), /* = 0x00 */ - { 0x8d, 0x01, 0x0009, 0x00000000, 0x00000000, NULL }, + CMD_UNK_8D(1, DIR_TRANS_RAND), WAIT_RANDOM(24, 48), JUMP_LABEL(0), }; @@ -272,7 +272,7 @@ static const struct ScriptCommand s_script_MOVE_PAUSE[] = { /* 0x811fca0 */ DEBUGINFO_O(272), { 0x54, 0x00, 0x0300, 0x00000000, 0x00000000, NULL }, SELECT_ANIMATION(3), - { 0x8d, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, + CMD_UNK_8D(1, DIR_TRANS_NONE), LABEL(0), /* = 0x00 */ WAIT(240), JUMP_LABEL(0), @@ -282,7 +282,7 @@ static const struct ScriptCommand s_script_MOVE_STAY[] = { /* 0x811fd10 */ DEBUGINFO_O(282), { 0x54, 0x00, 0x0300, 0x00000000, 0x00000000, NULL }, SELECT_ANIMATION(4), - { 0x8d, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, + CMD_UNK_8D(1, DIR_TRANS_NONE), LABEL(0), /* = 0x00 */ WAIT(240), JUMP_LABEL(0), @@ -301,7 +301,7 @@ static const struct ScriptCommand s_script_MOVE_RANDOM[] = { /* 0x811fde0 */ DEBUGINFO_O(301), SELECT_ANIMATION(1), LABEL(0), /* = 0x00 */ - { 0x8a, 0x18, 0x0100, 0x00000008, 0x00000000, NULL }, + CMD_UNK_8A(24, 256, DIR_TRANS_RAND_CARDINAL), WAIT(48), JUMP_LABEL(0), }; @@ -310,7 +310,7 @@ static const struct ScriptCommand s_script_MOVE_BOY[] = { /* 0x811fe40 */ DEBUGINFO_O(310), SELECT_ANIMATION(1), LABEL(0), /* = 0x00 */ - { 0x8a, 0x18, 0x0100, 0x00000008, 0x00000000, NULL }, + CMD_UNK_8A(24, 256, DIR_TRANS_RAND_CARDINAL), WAIT_RANDOM(24, 48), JUMP_LABEL(0), }; @@ -319,7 +319,7 @@ static const struct ScriptCommand s_script_MOVE_GIRL[] = { /* 0x811fea0 */ DEBUGINFO_O(319), SELECT_ANIMATION(1), LABEL(0), /* = 0x00 */ - { 0x8a, 0x10, 0x0100, 0x00000008, 0x00000000, NULL }, + CMD_UNK_8A(16, 256, DIR_TRANS_RAND_CARDINAL), WAIT_RANDOM(16, 24), JUMP_LABEL(0), }; @@ -345,42 +345,42 @@ static const struct ScriptCommand s_script_WAKEUP_FUNC[] = { /* 0x811ff00 */ static const struct ScriptCommand s_script_LOOK_AROUND_FUNC[] = { /* 0x8120000 */ DEBUGINFO_O(347), - { 0x92, 0x04, 0x0002, 0x00000004, 0x00000000, NULL }, + CMD_UNK_92(4, 2, DIR_TRANS_SPINLEFT2), WAIT(15), - { 0x92, 0x04, 0x0001, 0x00000005, 0x00000000, NULL }, + CMD_UNK_92(4, 1, DIR_TRANS_FLIP), WAIT(15), - { 0x92, 0x04, 0x0002, 0x00000004, 0x00000000, NULL }, + CMD_UNK_92(4, 2, DIR_TRANS_SPINLEFT2), WAIT(15), RET_DIRECT, }; static const struct ScriptCommand s_script_LOOK_AROUND_DOWN_FUNC[] = { /* 0x8120080 */ DEBUGINFO_O(358), - ROTATE(4, 2, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_EAST), WAIT(15), - ROTATE(4, 1, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_WEST), WAIT(15), - ROTATE(4, 2, DIRECTION_SOUTH), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTH), RET_DIRECT, }; static const struct ScriptCommand s_script_LOOK_AROUND_RIGHT_FUNC[] = { /* 0x81200f0 */ DEBUGINFO_O(368), - ROTATE(4, 2, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_EAST), WAIT(15), - ROTATE(4, 1, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_WEST), WAIT(15), - ROTATE(4, 2, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_EAST), RET_DIRECT, }; static const struct ScriptCommand s_script_LOOK_AROUND_LEFT_FUNC[] = { /* 0x8120160 */ DEBUGINFO_O(378), - ROTATE(4, 1, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_WEST), WAIT(15), - ROTATE(4, 2, DIRECTION_EAST), + ROTATE_TO(4, DIR_TRANS_SPINLEFT1, DIRECTION_EAST), WAIT(15), - ROTATE(4, 1, DIRECTION_WEST), + ROTATE_TO(4, DIR_TRANS_SPINRIGHT1, DIRECTION_WEST), RET_DIRECT, }; @@ -486,7 +486,7 @@ static const struct ScriptCommand s_script_ANGRY_END_FUNC[] = { /* 0x8120560 */ static const struct ScriptCommand s_script_MOVE_PLAZA_SLEEP[] = { /* 0x8120590 */ DEBUGINFO_O(487), CALL_SCRIPT(INIT_PLAZA_SLEEP_STAY_FUNC), - { 0x8d, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, + CMD_UNK_8D(1, DIR_TRANS_NONE), LABEL(0), /* = 0x00 */ WAIT(240), JUMP_LABEL(0), @@ -1197,7 +1197,7 @@ static const struct ScriptCommand s_script_EVENT_DIVIDE_NEXT_DAY_FUNC[] = { /* 0 JUMP_LABEL(8), LABEL(7), /* = 0x07 */ SCENARIO_CALC(SCENARIO_SUB8, 51, 7), - { 0xae, 0x01, 0x001c, 0x00000000, 0x00000000, NULL }, + CMD_UNK_AE(RESCUE_DUNGEON_WISH_CAVE), JUMP_LABEL(8), LABEL(8), /* = 0x08 */ JUMPIF_SCENE_EQ(SCENARIO_SUB9, 53, 2, /* to label */ 9), @@ -1260,7 +1260,7 @@ static const struct ScriptCommand s_script_EVENT_DIVIDE_NEXT_DAY2_FUNC[] = { /* JUMP_LABEL(8), LABEL(7), /* = 0x07 */ SCENARIO_CALC(SCENARIO_SUB8, 51, 7), - { 0xae, 0x01, 0x001c, 0x00000000, 0x00000000, NULL }, + CMD_UNK_AE(RESCUE_DUNGEON_WISH_CAVE), JUMP_LABEL(8), LABEL(8), /* = 0x08 */ JUMPIF_SCENE_EQ(SCENARIO_SUB9, 53, 2, /* to label */ 9), @@ -1737,16 +1737,16 @@ static const struct ScriptCommand s_script_EVENT_DIVIDE_AFTER[] = { /* 0x8124268 CALL_SCRIPT(EVENT_S08E01A_END), CALL_SCRIPT(EVENT_S03E01A_END), CALL_SCRIPT(EVENT_S09E01A_END), - { 0xb0, 0x01, 0x001f, 0x00000000, 0x00000000, NULL }, - { 0xb0, 0x01, 0x0020, 0x00000000, 0x00000000, NULL }, - { 0xb0, 0x01, 0x0021, 0x00000000, 0x00000000, NULL }, - { 0xb0, 0x01, 0x0022, 0x00000000, 0x00000000, NULL }, - { 0xb0, 0x01, 0x0023, 0x00000000, 0x00000000, NULL }, - { 0xb0, 0x01, 0x0024, 0x00000000, 0x00000000, NULL }, - { 0xb0, 0x01, 0x0025, 0x00000000, 0x00000000, NULL }, - { 0xb0, 0x01, 0x0027, 0x00000000, 0x00000000, NULL }, - { 0xb0, 0x01, 0x0028, 0x00000000, 0x00000000, NULL }, - { 0xb0, 0x01, 0x0029, 0x00000000, 0x00000000, NULL }, + SET_RESCUE_CONQUERED(RESCUE_DUNGEON_DESERT_REGION), + SET_RESCUE_CONQUERED(RESCUE_DUNGEON_SOUTHERN_CAVERN), + SET_RESCUE_CONQUERED(RESCUE_DUNGEON_WYVERN_HILL), + SET_RESCUE_CONQUERED(RESCUE_DUNGEON_SOLAR_CAVE), + SET_RESCUE_CONQUERED(RESCUE_DUNGEON_DARKNIGHT_RELIC), + SET_RESCUE_CONQUERED(RESCUE_DUNGEON_GRAND_SEA), + SET_RESCUE_CONQUERED(RESCUE_DUNGEON_WATERFALL_POND), + SET_RESCUE_CONQUERED(RESCUE_DUNGEON_JOYOUS_TOWER), + SET_RESCUE_CONQUERED(RESCUE_DUNGEON_FAR_OFF_SEA), + SET_RESCUE_CONQUERED(RESCUE_DUNGEON_PURITY_FOREST), JUMP_SCRIPT(EVENT_M02END_L001), }; @@ -1867,7 +1867,7 @@ static const struct ScriptCommand s_script_EVENT_M00E01A_L001[] = { /* 0x81251c0 static const struct ScriptCommand s_script_EVENT_M01E01A_L001[] = { /* 0x8125230 */ DEBUGINFO_O(1868), EXECUTE_SUBSTATION(178, 1, 0), - { 0xaf, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, + CMD_UNK_AF(RESCUE_DUNGEON_TINY_WOODS, TRUE), RET, }; @@ -1886,7 +1886,7 @@ static const struct ScriptCommand s_script_EVENT_M01E01A_L003[] = { /* 0x81252a0 { 0x3b, 0x39, 0x0001, 0x00000000, 0x00000000, NULL }, EXECUTE_SUBSTATION(224, 2, 0), { 0x3b, 0x39, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xb0, 0x01, 0x0000, 0x00000000, 0x00000000, NULL }, + SET_RESCUE_CONQUERED(RESCUE_DUNGEON_TINY_WOODS), SCENARIO_CALC(SCENARIO_MAIN, 3, 0), JUMP_SCRIPT(EVENT_DIVIDE), }; @@ -1921,7 +1921,7 @@ static const struct ScriptCommand s_script_EVENT_M01E02A_L002[] = { /* 0x8125400 static const struct ScriptCommand s_script_EVENT_M01E02A_L003[] = { /* 0x8125440 */ DEBUGINFO_O(1922), EXECUTE_SUBSTATION(180, 1, 0), - { 0xaf, 0x01, 0x0001, 0x00000000, 0x00000000, NULL }, + CMD_UNK_AF(RESCUE_DUNGEON_THUNDERWAVE_CAVE, TRUE), SCENARIO_CALC(SCENARIO_MAIN, 3, 6), RET, }; @@ -1943,7 +1943,7 @@ static const struct ScriptCommand s_script_EVENT_M01E02A_L006[] = { /* 0x81254f0 EXECUTE_SUBSTATION(181, 1, 0), EXECUTE_SUBSTATION(180, 3, 0), EXECUTE_SUBSTATION(9, 23, 0), - { 0xb0, 0x01, 0x0001, 0x00000000, 0x00000000, NULL }, + SET_RESCUE_CONQUERED(RESCUE_DUNGEON_THUNDERWAVE_CAVE), SCENARIO_CALC(SCENARIO_MAIN, 4, 0), UPDATE_VARINT(CALC_SET, GROUND_PLACE, 11), CALL_SCRIPT(NEXT_SAVE_FUNC), @@ -1980,7 +1980,7 @@ static const struct ScriptCommand s_script_EVENT_M01E02B_L004[] = { /* 0x8125680 EXECUTE_SUBSTATION(12, 2, 0), EXECUTE_SUBSTATION(162, 2, 0), EXECUTE_SUBSTATION(12, 20, 0), - { 0xaf, 0x01, 0x0002, 0x00000000, 0x00000000, NULL }, + CMD_UNK_AF(RESCUE_DUNGEON_MT_STEEL, TRUE), SCENARIO_CALC(SCENARIO_MAIN, 4, 5), RET, }; @@ -2016,7 +2016,7 @@ static const struct ScriptCommand s_script_EVENT_M01E02B_L008[] = { /* 0x81257e0 DEBUGINFO_O(2016), EXECUTE_SUBSTATION(183, 1, 0), EXECUTE_SUBSTATION(9, 28, 0), - { 0xb0, 0x01, 0x0002, 0x00000000, 0x00000000, NULL }, + SET_RESCUE_CONQUERED(RESCUE_DUNGEON_MT_STEEL), SCENARIO_CALC(SCENARIO_MAIN, 5, 0), UPDATE_VARINT(CALC_SET, GROUND_PLACE, 11), CALL_SCRIPT(NEXT_SAVE_FUNC), @@ -2092,7 +2092,7 @@ static const struct ScriptCommand s_script_EVENT_M01E03A_L006[] = { /* 0x8125af0 static const struct ScriptCommand s_script_EVENT_M01E03A_L007[] = { /* 0x8125b30 */ DEBUGINFO_O(2093), EXECUTE_SUBSTATION(9, 31, 0), - { 0xaf, 0x01, 0x0003, 0x00000000, 0x00000000, NULL }, + CMD_UNK_AF(RESCUE_DUNGEON_SINISTER_WOODS, TRUE), SCENARIO_CALC(SCENARIO_MAIN, 5, 9), RET, }; @@ -2120,7 +2120,7 @@ static const struct ScriptCommand s_script_EVENT_M01E03A_L011[] = { /* 0x8125c20 DEBUGINFO_O(2120), EXECUTE_SUBSTATION(185, 1, 0), EXECUTE_SUBSTATION(9, 34, 0), - { 0xb0, 0x01, 0x0003, 0x00000000, 0x00000000, NULL }, + SET_RESCUE_CONQUERED(RESCUE_DUNGEON_SINISTER_WOODS), SCENARIO_CALC(SCENARIO_MAIN, 6, 0), CALL_SCRIPT(DISMISSAL_SALLY_MEMBER_FUNC), UPDATE_VARINT(CALC_SET, GROUND_PLACE, 11), @@ -2148,7 +2148,7 @@ static const struct ScriptCommand s_script_EVENT_M01E04A_L002[] = { /* 0x8125d30 { 0x3b, 0x3b, 0x0000, 0x00000000, 0x00000000, NULL }, EXECUTE_SUBSTATION(1, 12, 0), EXECUTE_SUBSTATION(9, 36, 0), - { 0xaf, 0x01, 0x0004, 0x00000000, 0x00000000, NULL }, + CMD_UNK_AF(RESCUE_DUNGEON_SILENT_CHASM, TRUE), SCENARIO_CALC(SCENARIO_MAIN, 6, 3), RET, }; @@ -2176,7 +2176,7 @@ static const struct ScriptCommand s_script_EVENT_M01E04A_L006[] = { /* 0x8125e50 DEBUGINFO_O(2176), EXECUTE_SUBSTATION(187, 1, 0), EXECUTE_SUBSTATION(9, 39, 0), - { 0xb0, 0x01, 0x0004, 0x00000000, 0x00000000, NULL }, + SET_RESCUE_CONQUERED(RESCUE_DUNGEON_SILENT_CHASM), SCENARIO_CALC(SCENARIO_MAIN, 7, 0), CALL_SCRIPT(DISMISSAL_SALLY_MEMBER_FUNC), UPDATE_VARINT(CALC_SET, GROUND_PLACE, 11), @@ -2201,7 +2201,7 @@ static const struct ScriptCommand s_script_EVENT_M01E04B_L001[] = { /* 0x8125f20 static const struct ScriptCommand s_script_EVENT_M01E04B_L002[] = { /* 0x8125f60 */ DEBUGINFO_O(2202), EXECUTE_SUBSTATION(9, 40, 0), - { 0xaf, 0x01, 0x0005, 0x00000000, 0x00000000, NULL }, + CMD_UNK_AF(RESCUE_DUNGEON_MT_THUNDER, TRUE), SCENARIO_CALC(SCENARIO_MAIN, 7, 3), RET, }; @@ -2234,7 +2234,7 @@ static const struct ScriptCommand s_script_EVENT_M01E04B_L006[] = { /* 0x8126050 static const struct ScriptCommand s_script_EVENT_M01E04B_L007[] = { /* 0x8126080 */ DEBUGINFO_O(2235), EXECUTE_SUBSTATION(190, 1, 0), - { 0xb0, 0x01, 0x0005, 0x00000000, 0x00000000, NULL }, + SET_RESCUE_CONQUERED(RESCUE_DUNGEON_MT_THUNDER), SCENARIO_CALC(SCENARIO_MAIN, 8, 0), CALL_SCRIPT(DISMISSAL_SALLY_MEMBER_FUNC), UPDATE_VARINT(CALC_SET, GROUND_PLACE, 11), @@ -2259,7 +2259,7 @@ static const struct ScriptCommand s_script_EVENT_M01E05A_L001[] = { /* 0x8126140 static const struct ScriptCommand s_script_EVENT_M01E05A_L002[] = { /* 0x8126180 */ DEBUGINFO_O(2260), EXECUTE_SUBSTATION(9, 43, 0), - { 0xaf, 0x01, 0x0006, 0x00000000, 0x00000000, NULL }, + CMD_UNK_AF(RESCUE_DUNGEON_GREAT_CANYON, TRUE), SCENARIO_CALC(SCENARIO_MAIN, 8, 3), RET, }; @@ -2286,7 +2286,7 @@ static const struct ScriptCommand s_script_EVENT_M01E05A_L005[] = { /* 0x8126240 static const struct ScriptCommand s_script_EVENT_M01E05A_L006[] = { /* 0x8126270 */ DEBUGINFO_O(2287), EXECUTE_SUBSTATION(192, 2, 0), - { 0xb0, 0x01, 0x0006, 0x00000000, 0x00000000, NULL }, + SET_RESCUE_CONQUERED(RESCUE_DUNGEON_GREAT_CANYON), SCENARIO_CALC(SCENARIO_MAIN, 9, 0), CALL_SCRIPT(DISMISSAL_SALLY_MEMBER_FUNC), UPDATE_VARINT(CALC_SET, GROUND_PLACE, 11), @@ -2389,7 +2389,7 @@ static const struct ScriptCommand s_script_EVENT_M01E07A_L002[] = { /* 0x81265e0 static const struct ScriptCommand s_script_EVENT_M01E07A_L003[] = { /* 0x81266a0 */ DEBUGINFO_O(2390), EXECUTE_SUBSTATION(193, 1, 0), - { 0xaf, 0x01, 0x0007, 0x00000000, 0x00000000, NULL }, + CMD_UNK_AF(RESCUE_DUNGEON_LAPIS_CAVE, TRUE), RET, }; @@ -2407,7 +2407,7 @@ static const struct ScriptCommand s_script_EVENT_M01E07A_L005[] = { /* 0x8126710 EXECUTE_SUBSTATION(167, 1, 0), { 0x3b, 0x39, 0x0000, 0x00000000, 0x00000000, NULL }, EXECUTE_SUBSTATION(166, 2, 0), - { 0xb0, 0x01, 0x0007, 0x00000000, 0x00000000, NULL }, + SET_RESCUE_CONQUERED(RESCUE_DUNGEON_LAPIS_CAVE), SCENARIO_CALC(SCENARIO_MAIN, 12, 0), UPDATE_VARINT(CALC_SET, GROUND_PLACE, 24), CALL_SCRIPT(NEXT_SAVE_FUNC), @@ -2435,7 +2435,7 @@ static const struct ScriptCommand s_script_EVENT_M01E07B_L001[] = { /* 0x8126830 static const struct ScriptCommand s_script_EVENT_M01E07B_L002[] = { /* 0x8126870 */ DEBUGINFO_O(2437), - { 0xaf, 0x01, 0x0008, 0x00000000, 0x00000000, NULL }, + CMD_UNK_AF(RESCUE_DUNGEON_MT_BLAZE, TRUE), RET, }; @@ -2457,7 +2457,7 @@ static const struct ScriptCommand s_script_EVENT_M01E07B_L005[] = { /* 0x8126900 { 0x3b, 0x39, 0x0001, 0x00000000, 0x00000000, NULL }, EXECUTE_SUBSTATION(167, 2, 0), { 0x3b, 0x39, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xb0, 0x01, 0x0008, 0x00000000, 0x00000000, NULL }, + SET_RESCUE_CONQUERED(RESCUE_DUNGEON_MT_BLAZE), SCENARIO_CALC(SCENARIO_MAIN, 13, 0), UPDATE_VARINT(CALC_SET, GROUND_PLACE, 26), CALL_SCRIPT(NEXT_SAVE_FUNC), @@ -2490,7 +2490,7 @@ static const struct ScriptCommand s_script_EVENT_M01E08A_L001[] = { /* 0x8126a00 static const struct ScriptCommand s_script_EVENT_M01E08A_L002[] = { /* 0x8126a80 */ DEBUGINFO_O(2491), EXECUTE_SUBSTATION(198, 1, 0), - { 0xaf, 0x01, 0x0009, 0x00000000, 0x00000000, NULL }, + CMD_UNK_AF(RESCUE_DUNGEON_FROSTY_FOREST, TRUE), RET, }; @@ -2502,7 +2502,7 @@ static const struct ScriptCommand s_script_EVENT_M01E08A_L003[] = { /* 0x8126ac0 static const struct ScriptCommand s_script_EVENT_M01E08A_L004[] = { /* 0x8126af0 */ DEBUGINFO_O(2504), - JUMPIF_UNK_BC(8, /* to label */ 0), + JUMPIF_CUTSCENE_FLAG(CUTSCENE_FLAG_FROSTY_GROTTO_REACHED, /* to label */ 0), EXECUTE_SUBSTATION(199, 1, 0), JUMP_LABEL(1), LABEL(0), /* = 0x00 */ @@ -2514,7 +2514,7 @@ static const struct ScriptCommand s_script_EVENT_M01E08A_L004[] = { /* 0x8126af0 static const struct ScriptCommand s_script_EVENT_M01E08A_L005[] = { /* 0x8126b70 */ DEBUGINFO_O(2515), EXECUTE_SUBSTATION(200, 1, 0), - { 0xb0, 0x01, 0x0009, 0x00000000, 0x00000000, NULL }, + SET_RESCUE_CONQUERED(RESCUE_DUNGEON_FROSTY_FOREST), SCENARIO_CALC(SCENARIO_MAIN, 14, 0), UPDATE_VARINT(CALC_SET, GROUND_PLACE, 28), CALL_SCRIPT(NEXT_SAVE_FUNC), @@ -2547,7 +2547,7 @@ static const struct ScriptCommand s_script_EVENT_M01E08B_L001[] = { /* 0x8126c40 static const struct ScriptCommand s_script_EVENT_M01E08B_L002[] = { /* 0x8126cc0 */ DEBUGINFO_O(2548), EXECUTE_SUBSTATION(201, 1, 0), - { 0xaf, 0x01, 0x000a, 0x00000000, 0x00000000, NULL }, + CMD_UNK_AF(RESCUE_DUNGEON_MT_FREEZE, TRUE), RET, }; @@ -2573,7 +2573,7 @@ static const struct ScriptCommand s_script_EVENT_M01E08B_L006[] = { /* 0x8126d90 DEBUGINFO_O(2573), EXECUTE_SUBSTATION(203, 2, 0), EXECUTE_SUBSTATION(203, 3, 0), - { 0xb0, 0x01, 0x000a, 0x00000000, 0x00000000, NULL }, + SET_RESCUE_CONQUERED(RESCUE_DUNGEON_MT_FREEZE), SCENARIO_CALC(SCENARIO_MAIN, 15, 0), UPDATE_VARINT(CALC_SET, GROUND_PLACE, 2), CALL_SCRIPT(NEXT_SAVE_FUNC), @@ -2664,7 +2664,7 @@ static const struct ScriptCommand s_script_EVENT_M01E09A_L009[] = { /* 0x8127110 EXECUTE_SUBSTATION(162, 8, 0), { 0x3b, 0x03, 0x0000, 0x00000000, 0x00000000, NULL }, EXECUTE_SUBSTATION(12, 40, 0), - { 0xaf, 0x01, 0x000b, 0x00000000, 0x00000000, NULL }, + CMD_UNK_AF(RESCUE_DUNGEON_MAGMA_CAVERN, TRUE), SCENARIO_CALC(SCENARIO_MAIN, 15, 10), UPDATE_VARINT(CALC_SET, WARP_LOCK, 0), RET, @@ -2673,7 +2673,7 @@ static const struct ScriptCommand s_script_EVENT_M01E09A_L009[] = { /* 0x8127110 static const struct ScriptCommand s_script_EVENT_M01E09A_L010[] = { /* 0x81271a0 */ DEBUGINFO_O(2674), EXECUTE_SUBSTATION(9, 62, 0), - { 0xaf, 0x01, 0x000b, 0x00000000, 0x00000000, NULL }, + CMD_UNK_AF(RESCUE_DUNGEON_MAGMA_CAVERN, TRUE), SCENARIO_CALC(SCENARIO_MAIN, 15, 11), RET, }; @@ -2706,7 +2706,7 @@ static const struct ScriptCommand s_script_EVENT_M01E09A_L014[] = { /* 0x8127290 static const struct ScriptCommand s_script_EVENT_M01E09A_L015[] = { /* 0x81272c0 */ DEBUGINFO_O(2707), EXECUTE_SUBSTATION(206, 1, 0), - { 0xb0, 0x01, 0x000b, 0x00000000, 0x00000000, NULL }, + SET_RESCUE_CONQUERED(RESCUE_DUNGEON_MAGMA_CAVERN), SCENARIO_CALC(SCENARIO_MAIN, 16, 0), CALL_SCRIPT(DISMISSAL_SALLY_MEMBER_FUNC), UPDATE_VARINT(CALC_SET, GROUND_PLACE, 2), @@ -2738,7 +2738,7 @@ static const struct ScriptCommand s_script_EVENT_M01E10A_L002[] = { /* 0x81273f0 EXECUTE_SUBSTATION(162, 9, 0), { 0x3b, 0x03, 0x0000, 0x00000000, 0x00000000, NULL }, EXECUTE_SUBSTATION(12, 43, 0), - { 0xaf, 0x01, 0x000c, 0x00000000, 0x00000000, NULL }, + CMD_UNK_AF(RESCUE_DUNGEON_SKY_TOWER, TRUE), UPDATE_VARINT(CALC_SET, WARP_LOCK, 0), RET, }; @@ -2746,7 +2746,7 @@ static const struct ScriptCommand s_script_EVENT_M01E10A_L002[] = { /* 0x81273f0 static const struct ScriptCommand s_script_EVENT_M01E10A_L003[] = { /* 0x81274b0 */ DEBUGINFO_O(2747), EXECUTE_SUBSTATION(9, 65, 0), - { 0xaf, 0x01, 0x000c, 0x00000000, 0x00000000, NULL }, + CMD_UNK_AF(RESCUE_DUNGEON_SKY_TOWER, TRUE), SCENARIO_CALC(SCENARIO_MAIN, 16, 4), UPDATE_VARINT(CALC_SET, WARP_LOCK, 0), RET, @@ -2789,7 +2789,7 @@ static const struct ScriptCommand s_script_EVENT_M01E10A_L008[] = { /* 0x8127630 EXECUTE_SUBSTATION(209, 2, 0), EXECUTE_SUBSTATION(173, 3, 0), EXECUTE_SUBSTATION(209, 3, 0), - { 0xb0, 0x01, 0x000c, 0x00000000, 0x00000000, NULL }, + SET_RESCUE_CONQUERED(RESCUE_DUNGEON_SKY_TOWER), SCENARIO_CALC(SCENARIO_MAIN, 17, 0), JUMP_SCRIPT(EVENT_DIVIDE), }; @@ -2968,7 +2968,7 @@ static const struct ScriptCommand s_script_EVENT_S01E01A_CONTINUE[] = { /* 0x812 RET_DIRECT, LABEL(0), /* = 0x00 */ SCENARIO_CALC(SCENARIO_SUB1, 29, 2), - { 0xae, 0x01, 0x000e, 0x00000000, 0x00000000, NULL }, + CMD_UNK_AE(RESCUE_DUNGEON_UPROAR_FOREST), RET_DIRECT, }; @@ -2978,14 +2978,14 @@ static const struct ScriptCommand s_script_EVENT_S01E01A_END[] = { /* 0x8127e20 RET_DIRECT, LABEL(0), /* = 0x00 */ SCENARIO_CALC(SCENARIO_SUB1, 31, 0), - { 0xb0, 0x01, 0x000e, 0x00000000, 0x00000000, NULL }, + SET_RESCUE_CONQUERED(RESCUE_DUNGEON_UPROAR_FOREST), UPDATE_VARINT(CALC_SET, BASE_LEVEL, 2), RET_DIRECT, }; static const struct ScriptCommand s_script_EVENT_S01E01A_L001[] = { /* 0x8127ea0 */ DEBUGINFO_O(2987), - { 0xae, 0x01, 0x000e, 0x00000000, 0x00000000, NULL }, + CMD_UNK_AE(RESCUE_DUNGEON_UPROAR_FOREST), SCENARIO_CALC(SCENARIO_SUB1, 29, 2), RET, SCENARIO_CALC(SCENARIO_MAIN, 15, 5), @@ -3002,7 +3002,7 @@ static const struct ScriptCommand s_script_EVENT_S01E01A_L001[] = { /* 0x8127ea0 static const struct ScriptCommand s_script_EVENT_S01E01A_L002[] = { /* 0x8127f60 */ DEBUGINFO_O(3003), EXECUTE_SUBSTATION(4, 3, 0), - { 0xaf, 0x01, 0x000e, 0x00000000, 0x00000000, NULL }, + CMD_UNK_AF(RESCUE_DUNGEON_UPROAR_FOREST, TRUE), SCENARIO_CALC(SCENARIO_SUB1, 29, 3), SET_DUNGEON_RES(/* result */ 0, /* enter */ -1), UPDATE_VARINT(CALC_SET, GROUND_ENTER, 4), @@ -3014,7 +3014,7 @@ static const struct ScriptCommand s_script_EVENT_S01E01A_L002[] = { /* 0x8127f60 static const struct ScriptCommand s_script_EVENT_S01E01A_L003[] = { /* 0x8127ff0 */ DEBUGINFO_O(3015), EXECUTE_SUBSTATION(9, 75, 0), - { 0xb0, 0x01, 0x000e, 0x00000000, 0x00000000, NULL }, + SET_RESCUE_CONQUERED(RESCUE_DUNGEON_UPROAR_FOREST), JUMP_SCRIPT(EVENT_S01E01B_L001), }; @@ -3052,8 +3052,8 @@ static const struct ScriptCommand s_script_EVENT_S01E02A_START[] = { /* 0x812816 RET_DIRECT, LABEL(0), /* = 0x00 */ SCENARIO_CALC(SCENARIO_SUB1, 31, 1), - { 0xae, 0x01, 0x000f, 0x00000000, 0x00000000, NULL }, - { 0xb0, 0x01, 0x000e, 0x00000000, 0x00000000, NULL }, + CMD_UNK_AE(RESCUE_DUNGEON_HOWLING_FOREST), + SET_RESCUE_CONQUERED(RESCUE_DUNGEON_UPROAR_FOREST), UNLOCK_FRIEND_AREA(MAP_FRIEND_AREA_SKY_BLUE_PLAINS), UPDATE_VARINT(CALC_SET, BASE_LEVEL, 2), RET_DIRECT, @@ -3065,8 +3065,8 @@ static const struct ScriptCommand s_script_EVENT_S01E02A_END[] = { /* 0x8128200 RET_DIRECT, LABEL(0), /* = 0x00 */ SCENARIO_CALC(SCENARIO_SUB1, 32, 2), - { 0xb0, 0x01, 0x000e, 0x00000000, 0x00000000, NULL }, - { 0xb0, 0x01, 0x000f, 0x00000000, 0x00000000, NULL }, + SET_RESCUE_CONQUERED(RESCUE_DUNGEON_UPROAR_FOREST), + SET_RESCUE_CONQUERED(RESCUE_DUNGEON_HOWLING_FOREST), UPDATE_VARINT(CALC_SET, BASE_LEVEL, 2), RET_DIRECT, }; @@ -3074,7 +3074,7 @@ static const struct ScriptCommand s_script_EVENT_S01E02A_END[] = { /* 0x8128200 static const struct ScriptCommand s_script_EVENT_S01E02A_L001[] = { /* 0x8128290 */ DEBUGINFO_O(3075), EXECUTE_SUBSTATION(4, 5, 0), - { 0xaf, 0x01, 0x000f, 0x00000000, 0x00000000, NULL }, + CMD_UNK_AF(RESCUE_DUNGEON_HOWLING_FOREST, TRUE), SCENARIO_CALC(SCENARIO_SUB1, 31, 2), SET_DUNGEON_RES(/* result */ 0, /* enter */ -1), UPDATE_VARINT(CALC_SET, GROUND_ENTER, 4), @@ -3087,7 +3087,7 @@ static const struct ScriptCommand s_script_EVENT_S01E02A_L002[] = { /* 0x8128320 DEBUGINFO_O(3087), SCENARIO_CALC(SCENARIO_SUB1, 32, 0), EXECUTE_SUBSTATION(9, 79, 0), - { 0xb0, 0x01, 0x000f, 0x00000000, 0x00000000, NULL }, + SET_RESCUE_CONQUERED(RESCUE_DUNGEON_HOWLING_FOREST), CALL_SCRIPT(DISMISSAL_SALLY_MEMBER_FUNC), UPDATE_VARINT(CALC_SET, GROUND_PLACE, 11), SCENARIO_CALC(SCENARIO_SELECT, 31, 0), @@ -3120,7 +3120,7 @@ static const struct ScriptCommand s_script_EVENT_S02E01A_START[] = { /* 0x812845 RET_DIRECT, LABEL(0), /* = 0x00 */ SCENARIO_CALC(SCENARIO_SUB2, 33, 1), - { 0xb0, 0x01, 0x0010, 0x00000000, 0x00000000, NULL }, + SET_RESCUE_CONQUERED(RESCUE_DUNGEON_STORMY_SEA), RET_DIRECT, }; @@ -3130,7 +3130,7 @@ static const struct ScriptCommand s_script_EVENT_S02E01A_END[] = { /* 0x81284c0 RET_DIRECT, LABEL(0), /* = 0x00 */ SCENARIO_CALC(SCENARIO_SUB2, 34, 0), - { 0xb0, 0x01, 0x0010, 0x00000000, 0x00000000, NULL }, + SET_RESCUE_CONQUERED(RESCUE_DUNGEON_STORMY_SEA), RET_DIRECT, }; @@ -3148,14 +3148,14 @@ static const struct ScriptCommand s_script_EVENT_S02E01A_L002[] = { /* 0x8128560 static const struct ScriptCommand s_script_EVENT_S02E01A_L003[] = { /* 0x8128590 */ DEBUGINFO_O(3150), - { 0xaf, 0x01, 0x0010, 0x00000000, 0x00000000, NULL }, + CMD_UNK_AF(RESCUE_DUNGEON_STORMY_SEA, TRUE), SCENARIO_CALC(SCENARIO_SUB2, 33, 4), RET, }; static const struct ScriptCommand s_script_EVENT_S02E01A_L004[] = { /* 0x81285d0 */ DEBUGINFO_O(3157), - { 0xb0, 0x01, 0x0010, 0x00000000, 0x00000000, NULL }, + SET_RESCUE_CONQUERED(RESCUE_DUNGEON_STORMY_SEA), SCENARIO_CALC(SCENARIO_SUB2, 34, 0), CALL_SCRIPT(DISMISSAL_SALLY_MEMBER_FUNC), UPDATE_VARINT(CALC_SET, GROUND_PLACE, 11), @@ -3178,7 +3178,7 @@ static const struct ScriptCommand s_script_EVENT_S02E02A_START[] = { /* 0x812869 LABEL(0), /* = 0x00 */ SCENARIO_CALC(SCENARIO_SUB2, 34, 1), { 0x3b, 0x20, 0x0000, 0x00000000, 0x00000000, NULL }, - { 0xb0, 0x01, 0x0010, 0x00000000, 0x00000000, NULL }, + SET_RESCUE_CONQUERED(RESCUE_DUNGEON_STORMY_SEA), RET_DIRECT, }; @@ -3188,8 +3188,8 @@ static const struct ScriptCommand s_script_EVENT_S02E02A_END[] = { /* 0x8128710 RET_DIRECT, LABEL(0), /* = 0x00 */ SCENARIO_CALC(SCENARIO_SUB2, 35, 0), - { 0xb0, 0x01, 0x0010, 0x00000000, 0x00000000, NULL }, - { 0xb0, 0x01, 0x0011, 0x00000000, 0x00000000, NULL }, + SET_RESCUE_CONQUERED(RESCUE_DUNGEON_STORMY_SEA), + SET_RESCUE_CONQUERED(RESCUE_DUNGEON_SILVER_TRENCH), RET_DIRECT, }; @@ -3202,7 +3202,7 @@ static const struct ScriptCommand s_script_EVENT_S02E02A_L001[] = { /* 0x8128790 static const struct ScriptCommand s_script_EVENT_S02E02A_L002[] = { /* 0x81287c0 */ DEBUGINFO_O(3203), EXECUTE_SUBSTATION(158, 2, 0), - { 0xaf, 0x01, 0x0011, 0x00000000, 0x00000000, NULL }, + CMD_UNK_AF(RESCUE_DUNGEON_SILVER_TRENCH, TRUE), SCENARIO_CALC(SCENARIO_SUB2, 34, 3), EXECUTE_SUBSTATION(12, 4, 0), RET, @@ -3210,7 +3210,7 @@ static const struct ScriptCommand s_script_EVENT_S02E02A_L002[] = { /* 0x81287c0 static const struct ScriptCommand s_script_EVENT_S02E02A_L003[] = { /* 0x8128820 */ DEBUGINFO_O(3212), - { 0xb0, 0x01, 0x0011, 0x00000000, 0x00000000, NULL }, + SET_RESCUE_CONQUERED(RESCUE_DUNGEON_SILVER_TRENCH), SCENARIO_CALC(SCENARIO_SUB2, 35, 0), CALL_SCRIPT(DISMISSAL_SALLY_MEMBER_FUNC), UPDATE_VARINT(CALC_SET, GROUND_PLACE, 11), @@ -3241,7 +3241,7 @@ static const struct ScriptCommand s_script_EVENT_S03E01A_CONTINUE[] = { /* 0x812 RET_DIRECT, LABEL(0), /* = 0x00 */ SCENARIO_CALC(SCENARIO_SUB3, 36, 2), - { 0xaf, 0x01, 0x0012, 0x00000000, 0x00000000, NULL }, + CMD_UNK_AF(RESCUE_DUNGEON_METEOR_CAVE, TRUE), RET_DIRECT, }; @@ -3251,13 +3251,13 @@ static const struct ScriptCommand s_script_EVENT_S03E01A_END[] = { /* 0x81289b0 RET_DIRECT, LABEL(0), /* = 0x00 */ SCENARIO_CALC(SCENARIO_SUB3, 37, 0), - { 0xb0, 0x01, 0x0012, 0x00000000, 0x00000000, NULL }, + SET_RESCUE_CONQUERED(RESCUE_DUNGEON_METEOR_CAVE), RET_DIRECT, }; static const struct ScriptCommand s_script_EVENT_S03E01A_L001[] = { /* 0x8128a20 */ DEBUGINFO_O(3259), - { 0xaf, 0x01, 0x0012, 0x00000000, 0x00000000, NULL }, + CMD_UNK_AF(RESCUE_DUNGEON_METEOR_CAVE, TRUE), SCENARIO_CALC(SCENARIO_SUB3, 36, 2), EXECUTE_SUBSTATION(9, 81, 0), EXECUTE_SUBSTATION(12, 4, 0), @@ -3266,7 +3266,7 @@ static const struct ScriptCommand s_script_EVENT_S03E01A_L001[] = { /* 0x8128a20 static const struct ScriptCommand s_script_EVENT_S03E01A_L002[] = { /* 0x8128a80 */ DEBUGINFO_O(3268), - { 0xb0, 0x01, 0x0012, 0x00000000, 0x00000000, NULL }, + SET_RESCUE_CONQUERED(RESCUE_DUNGEON_METEOR_CAVE), SCENARIO_CALC(SCENARIO_SUB3, 37, 0), CALL_SCRIPT(DISMISSAL_SALLY_MEMBER_FUNC), UPDATE_VARINT(CALC_SET, GROUND_PLACE, 11), @@ -3297,11 +3297,11 @@ static const struct ScriptCommand s_script_EVENT_S04E01A_LAST[] = { /* 0x8128ba0 RET_DIRECT, LABEL(0), /* = 0x00 */ SCENARIO_CALC(SCENARIO_SUB4, 43, 0), - { 0xaf, 0x00, 0x0013, 0x00000000, 0x00000000, NULL }, - { 0xb0, 0x01, 0x0014, 0x00000000, 0x00000000, NULL }, - { 0xb0, 0x01, 0x0015, 0x00000000, 0x00000000, NULL }, - { 0xb0, 0x01, 0x0016, 0x00000000, 0x00000000, NULL }, - { 0xb0, 0x01, 0x0017, 0x00000000, 0x00000000, NULL }, + CMD_UNK_AF(RESCUE_DUNGEON_GREAT_CANYON_2, FALSE), + SET_RESCUE_CONQUERED(RESCUE_DUNGEON_FIERY_FIELD), + SET_RESCUE_CONQUERED(RESCUE_DUNGEON_LIGHTNING_FIELD), + SET_RESCUE_CONQUERED(RESCUE_DUNGEON_NORTHWIND_FIELD), + SET_RESCUE_CONQUERED(RESCUE_DUNGEON_MT_FARAWAY), RET_DIRECT, }; @@ -3311,11 +3311,11 @@ static const struct ScriptCommand s_script_EVENT_S04E01A_END[] = { /* 0x8128c50 RET_DIRECT, LABEL(0), /* = 0x00 */ SCENARIO_CALC(SCENARIO_SUB4, 43, 2), - { 0xaf, 0x00, 0x0013, 0x00000000, 0x00000000, NULL }, - { 0xb0, 0x01, 0x0014, 0x00000000, 0x00000000, NULL }, - { 0xb0, 0x01, 0x0015, 0x00000000, 0x00000000, NULL }, - { 0xb0, 0x01, 0x0016, 0x00000000, 0x00000000, NULL }, - { 0xb0, 0x01, 0x0017, 0x00000000, 0x00000000, NULL }, + CMD_UNK_AF(RESCUE_DUNGEON_GREAT_CANYON_2, FALSE), + SET_RESCUE_CONQUERED(RESCUE_DUNGEON_FIERY_FIELD), + SET_RESCUE_CONQUERED(RESCUE_DUNGEON_LIGHTNING_FIELD), + SET_RESCUE_CONQUERED(RESCUE_DUNGEON_NORTHWIND_FIELD), + SET_RESCUE_CONQUERED(RESCUE_DUNGEON_MT_FARAWAY), RET_DIRECT, }; @@ -3323,7 +3323,7 @@ static const struct ScriptCommand s_script_EVENT_S04E01A_L001[] = { /* 0x8128d00 DEBUGINFO_O(3323), EXECUTE_SUBSTATION(9, 82, 0), EXECUTE_SUBSTATION(12, 9, 0), - { 0xaf, 0x01, 0x0013, 0x00000000, 0x00000000, NULL }, + CMD_UNK_AF(RESCUE_DUNGEON_GREAT_CANYON_2, TRUE), SCENARIO_CALC(SCENARIO_SUB4, 38, 2), RET, }; @@ -3331,8 +3331,8 @@ static const struct ScriptCommand s_script_EVENT_S04E01A_L001[] = { /* 0x8128d00 static const struct ScriptCommand s_script_EVENT_S04E01A_L002[] = { /* 0x8128d60 */ DEBUGINFO_O(3332), EXECUTE_SUBSTATION(192, 1, 0), - { 0xaf, 0x00, 0x0013, 0x00000000, 0x00000000, NULL }, - { 0xaf, 0x01, 0x0014, 0x00000000, 0x00000000, NULL }, + CMD_UNK_AF(RESCUE_DUNGEON_GREAT_CANYON_2, FALSE), + CMD_UNK_AF(RESCUE_DUNGEON_FIERY_FIELD, TRUE), SCENARIO_CALC(SCENARIO_SUB4, 39, 0), CALL_SCRIPT(DISMISSAL_SALLY_MEMBER_FUNC), UPDATE_VARINT(CALC_SET, GROUND_PLACE, 11), @@ -3350,8 +3350,8 @@ static const struct ScriptCommand s_script_EVENT_S04E01A_L002L[] = { /* 0x8128e0 static const struct ScriptCommand s_script_EVENT_S04E01B_L001[] = { /* 0x8128e30 */ DEBUGINFO_O(3351), EXECUTE_SUBSTATION(212, 1, 0), - { 0xb0, 0x01, 0x0014, 0x00000000, 0x00000000, NULL }, - { 0xaf, 0x01, 0x0015, 0x00000000, 0x00000000, NULL }, + SET_RESCUE_CONQUERED(RESCUE_DUNGEON_FIERY_FIELD), + CMD_UNK_AF(RESCUE_DUNGEON_LIGHTNING_FIELD, TRUE), SCENARIO_CALC(SCENARIO_SUB4, 40, 0), CALL_SCRIPT(DISMISSAL_SALLY_MEMBER_FUNC), UPDATE_VARINT(CALC_SET, GROUND_PLACE, 11), @@ -3369,8 +3369,8 @@ static const struct ScriptCommand s_script_EVENT_S04E01B_L001L[] = { /* 0x8128ed static const struct ScriptCommand s_script_EVENT_S04E01C_L001[] = { /* 0x8128f00 */ DEBUGINFO_O(3370), EXECUTE_SUBSTATION(213, 1, 0), - { 0xb0, 0x01, 0x0015, 0x00000000, 0x00000000, NULL }, - { 0xaf, 0x01, 0x0016, 0x00000000, 0x00000000, NULL }, + SET_RESCUE_CONQUERED(RESCUE_DUNGEON_LIGHTNING_FIELD), + CMD_UNK_AF(RESCUE_DUNGEON_NORTHWIND_FIELD, TRUE), SCENARIO_CALC(SCENARIO_SUB4, 41, 0), CALL_SCRIPT(DISMISSAL_SALLY_MEMBER_FUNC), UPDATE_VARINT(CALC_SET, GROUND_PLACE, 11), @@ -3388,8 +3388,8 @@ static const struct ScriptCommand s_script_EVENT_S04E01C_L001L[] = { /* 0x8128fa static const struct ScriptCommand s_script_EVENT_S04E01D_L001[] = { /* 0x8128fd0 */ DEBUGINFO_O(3389), EXECUTE_SUBSTATION(214, 1, 0), - { 0xb0, 0x01, 0x0016, 0x00000000, 0x00000000, NULL }, - { 0xaf, 0x01, 0x0017, 0x00000000, 0x00000000, NULL }, + SET_RESCUE_CONQUERED(RESCUE_DUNGEON_NORTHWIND_FIELD), + CMD_UNK_AF(RESCUE_DUNGEON_MT_FARAWAY, TRUE), SCENARIO_CALC(SCENARIO_SUB4, 42, 0), CALL_SCRIPT(DISMISSAL_SALLY_MEMBER_FUNC), UPDATE_VARINT(CALC_SET, GROUND_PLACE, 11), @@ -3406,7 +3406,7 @@ static const struct ScriptCommand s_script_EVENT_S04E01D_L001L[] = { /* 0x812907 static const struct ScriptCommand s_script_EVENT_S04E01E_L001[] = { /* 0x81290a0 */ DEBUGINFO_O(3408), - { 0xb0, 0x01, 0x0017, 0x00000000, 0x00000000, NULL }, + SET_RESCUE_CONQUERED(RESCUE_DUNGEON_MT_FARAWAY), SCENARIO_CALC(SCENARIO_SUB4, 43, 0), CALL_SCRIPT(DISMISSAL_SALLY_MEMBER_FUNC), UPDATE_VARINT(CALC_SET, GROUND_PLACE, 11), @@ -3442,7 +3442,7 @@ static const struct ScriptCommand s_script_EVENT_S05E01A_CONTINUE[] = { /* 0x812 RET_DIRECT, LABEL(0), /* = 0x00 */ SCENARIO_CALC(SCENARIO_SUB5, 44, 2), - { 0xaf, 0x01, 0x0018, 0x00000000, 0x00000000, NULL }, + CMD_UNK_AF(RESCUE_DUNGEON_WESTERN_CAVE, TRUE), RET_DIRECT, }; @@ -3452,13 +3452,13 @@ static const struct ScriptCommand s_script_EVENT_S05E01A_END[] = { /* 0x8129250 RET_DIRECT, LABEL(0), /* = 0x00 */ SCENARIO_CALC(SCENARIO_SUB5, 45, 0), - { 0xb0, 0x01, 0x0018, 0x00000000, 0x00000000, NULL }, + SET_RESCUE_CONQUERED(RESCUE_DUNGEON_WESTERN_CAVE), RET_DIRECT, }; static const struct ScriptCommand s_script_EVENT_S05E01A_L001[] = { /* 0x81292c0 */ DEBUGINFO_O(3460), - { 0xaf, 0x01, 0x0018, 0x00000000, 0x00000000, NULL }, + CMD_UNK_AF(RESCUE_DUNGEON_WESTERN_CAVE, TRUE), SCENARIO_CALC(SCENARIO_SUB5, 44, 2), EXECUTE_SUBSTATION(216, 1, 0), EXECUTE_SUBSTATION(1, 46, 0), @@ -3468,7 +3468,7 @@ static const struct ScriptCommand s_script_EVENT_S05E01A_L001[] = { /* 0x81292c0 static const struct ScriptCommand s_script_EVENT_S05E01A_L002[] = { /* 0x8129330 */ DEBUGINFO_O(3470), - { 0xb0, 0x01, 0x0018, 0x00000000, 0x00000000, NULL }, + SET_RESCUE_CONQUERED(RESCUE_DUNGEON_WESTERN_CAVE), SCENARIO_CALC(SCENARIO_SUB5, 45, 0), CALL_SCRIPT(DISMISSAL_SALLY_MEMBER_FUNC), UPDATE_VARINT(CALC_SET, GROUND_PLACE, 11), @@ -3498,7 +3498,7 @@ static const struct ScriptCommand s_script_EVENT_S06E01A_CONTINUE[] = { /* 0x812 RET_DIRECT, LABEL(0), /* = 0x00 */ SCENARIO_CALC(SCENARIO_SUB6, 46, 2), - { 0xaf, 0x01, 0x0019, 0x00000000, 0x00000000, NULL }, + CMD_UNK_AF(RESCUE_DUNGEON_NORTHERN_RANGE, TRUE), RET_DIRECT, }; @@ -3508,8 +3508,8 @@ static const struct ScriptCommand s_script_EVENT_S06E01A_END[] = { /* 0x81294b0 RET_DIRECT, LABEL(0), /* = 0x00 */ SCENARIO_CALC(SCENARIO_SUB6, 48, 0), - { 0xb0, 0x01, 0x0019, 0x00000000, 0x00000000, NULL }, - { 0xb0, 0x01, 0x001a, 0x00000000, 0x00000000, NULL }, + SET_RESCUE_CONQUERED(RESCUE_DUNGEON_NORTHERN_RANGE), + SET_RESCUE_CONQUERED(RESCUE_DUNGEON_PITFALL_VALLEY), { 0x3b, 0x24, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x3b, 0x25, 0x0000, 0x00000000, 0x00000000, NULL }, { 0x3b, 0x26, 0x0000, 0x00000000, 0x00000000, NULL }, @@ -3519,7 +3519,7 @@ static const struct ScriptCommand s_script_EVENT_S06E01A_END[] = { /* 0x81294b0 static const struct ScriptCommand s_script_EVENT_S06E01A_L001[] = { /* 0x8129570 */ DEBUGINFO_O(3521), - { 0xaf, 0x01, 0x0019, 0x00000000, 0x00000000, NULL }, + CMD_UNK_AF(RESCUE_DUNGEON_NORTHERN_RANGE, TRUE), SCENARIO_CALC(SCENARIO_SUB6, 46, 2), EXECUTE_SUBSTATION(12, 10, 0), EXECUTE_SUBSTATION(9, 83, 0), @@ -3532,7 +3532,7 @@ static const struct ScriptCommand s_script_EVENT_S06E01A_L001[] = { /* 0x8129570 static const struct ScriptCommand s_script_EVENT_S06E01A_L002[] = { /* 0x8129600 */ DEBUGINFO_O(3533), EXECUTE_SUBSTATION(217, 1, 0), - { 0xb0, 0x01, 0x0019, 0x00000000, 0x00000000, NULL }, + SET_RESCUE_CONQUERED(RESCUE_DUNGEON_NORTHERN_RANGE), SCENARIO_CALC(SCENARIO_SUB6, 47, 2), UPDATE_VARINT(CALC_SET, GROUND_PLACE, 2), SCENARIO_CALC(SCENARIO_SELECT, 46, 0), @@ -3548,7 +3548,7 @@ static const struct ScriptCommand s_script_EVENT_S06E01A_L002L[] = { /* 0x812968 static const struct ScriptCommand s_script_EVENT_S06E01B_L001[] = { /* 0x81296a0 */ DEBUGINFO_O(3549), EXECUTE_SUBSTATION(1, 48, 0), - { 0xaf, 0x01, 0x001a, 0x00000000, 0x00000000, NULL }, + CMD_UNK_AF(RESCUE_DUNGEON_PITFALL_VALLEY, TRUE), SCENARIO_CALC(SCENARIO_SUB6, 47, 2), CALL_SCRIPT(DISMISSAL_SALLY_MEMBER_FUNC), EXECUTE_SUBSTATION(12, 5, 0), @@ -3559,7 +3559,7 @@ static const struct ScriptCommand s_script_EVENT_S06E01B_L002[] = { /* 0x8129710 DEBUGINFO_O(3559), EXECUTE_SUBSTATION(218, 1, 0), EXECUTE_SUBSTATION(1, 49, 0), - { 0xb0, 0x01, 0x001a, 0x00000000, 0x00000000, NULL }, + SET_RESCUE_CONQUERED(RESCUE_DUNGEON_PITFALL_VALLEY), SCENARIO_CALC(SCENARIO_SUB6, 48, 0), CALL_SCRIPT(DISMISSAL_SALLY_MEMBER_FUNC), UPDATE_VARINT(CALC_SET, GROUND_PLACE, 11), @@ -3590,7 +3590,7 @@ static const struct ScriptCommand s_script_EVENT_S07E01A_END[] = { /* 0x8129850 RET_DIRECT, LABEL(0), /* = 0x00 */ SCENARIO_CALC(SCENARIO_SUB7, 50, 0), - { 0xb0, 0x01, 0x001b, 0x00000000, 0x00000000, NULL }, + SET_RESCUE_CONQUERED(RESCUE_DUNGEON_BURIED_RELIC), RET_DIRECT, }; @@ -3602,14 +3602,14 @@ static const struct ScriptCommand s_script_EVENT_S07E01A_L001[] = { /* 0x81298c0 static const struct ScriptCommand s_script_EVENT_S07E01A_L002[] = { /* 0x81298f0 */ DEBUGINFO_O(3604), - { 0xaf, 0x01, 0x001b, 0x00000000, 0x00000000, NULL }, + CMD_UNK_AF(RESCUE_DUNGEON_BURIED_RELIC, TRUE), SCENARIO_CALC(SCENARIO_SUB7, 49, 3), RET, }; static const struct ScriptCommand s_script_EVENT_S07E01A_L003[] = { /* 0x8129930 */ DEBUGINFO_O(3611), - { 0xb0, 0x01, 0x001b, 0x00000000, 0x00000000, NULL }, + SET_RESCUE_CONQUERED(RESCUE_DUNGEON_BURIED_RELIC), SCENARIO_CALC(SCENARIO_SUB7, 50, 0), CALL_SCRIPT(DISMISSAL_SALLY_MEMBER_FUNC), UPDATE_VARINT(CALC_SET, GROUND_PLACE, 11), @@ -3640,7 +3640,7 @@ static const struct ScriptCommand s_script_EVENT_S08E01A_END[] = { /* 0x8129a50 RET_DIRECT, LABEL(0), /* = 0x00 */ SCENARIO_CALC(SCENARIO_SUB8, 52, 0), - { 0xb0, 0x01, 0x001c, 0x00000000, 0x00000000, NULL }, + SET_RESCUE_CONQUERED(RESCUE_DUNGEON_WISH_CAVE), RET_DIRECT, }; @@ -3670,7 +3670,7 @@ static const struct ScriptCommand s_script_EVENT_S08E01A_L004[] = { /* 0x8129b50 static const struct ScriptCommand s_script_EVENT_S08E01A_L005[] = { /* 0x8129b80 */ DEBUGINFO_O(3672), - { 0xae, 0x01, 0x001c, 0x00000000, 0x00000000, NULL }, + CMD_UNK_AE(RESCUE_DUNGEON_WISH_CAVE), SCENARIO_CALC(SCENARIO_SUB8, 51, 7), RET, }; @@ -3678,7 +3678,7 @@ static const struct ScriptCommand s_script_EVENT_S08E01A_L005[] = { /* 0x8129b80 static const struct ScriptCommand s_script_EVENT_S08E01A_L005B[] = { /* 0x8129bc0 */ DEBUGINFO_O(3679), EXECUTE_SUBSTATION(4, 7, 0), - { 0xaf, 0x01, 0x001c, 0x00000000, 0x00000000, NULL }, + CMD_UNK_AF(RESCUE_DUNGEON_WISH_CAVE, TRUE), SCENARIO_CALC(SCENARIO_SUB8, 51, 8), SET_DUNGEON_RES(/* result */ 0, /* enter */ -1), UPDATE_VARINT(CALC_SET, GROUND_ENTER, 4), @@ -3690,7 +3690,7 @@ static const struct ScriptCommand s_script_EVENT_S08E01A_L005B[] = { /* 0x8129bc static const struct ScriptCommand s_script_EVENT_S08E01A_L006[] = { /* 0x8129c50 */ DEBUGINFO_O(3691), EXECUTE_SUBSTATION(9, 84, 0), - { 0xb0, 0x01, 0x001c, 0x00000000, 0x00000000, NULL }, + SET_RESCUE_CONQUERED(RESCUE_DUNGEON_WISH_CAVE), SCENARIO_CALC(SCENARIO_SUB8, 52, 0), CALL_SCRIPT(DISMISSAL_SALLY_MEMBER_FUNC), UPDATE_VARINT(CALC_SET, GROUND_PLACE, 11), @@ -3808,8 +3808,8 @@ static const struct ScriptCommand s_script_EVENT_S09E01A_END[] = { /* 0x812a1e4 RET_DIRECT, LABEL(0), /* = 0x00 */ SCENARIO_CALC(SCENARIO_SUB9, 55, 2), - { 0xaf, 0x00, 0x001d, 0x00000000, 0x00000000, NULL }, - { 0xb0, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, + CMD_UNK_AF(RESCUE_DUNGEON_MT_FREEZE_2, FALSE), + SET_RESCUE_CONQUERED(RESCUE_DUNGEON_MURKY_CAVE), RET_DIRECT, }; @@ -3834,7 +3834,7 @@ static const struct ScriptCommand s_script_EVENT_S09E01A_L003[] = { /* 0x812a2c4 static const struct ScriptCommand s_script_EVENT_S09E01A_L004[] = { /* 0x812a2f4 */ DEBUGINFO_O(3835), EXECUTE_SUBSTATION(9, 86, 0), - { 0xaf, 0x01, 0x001d, 0x00000000, 0x00000000, NULL }, + CMD_UNK_AF(RESCUE_DUNGEON_MT_FREEZE_2, TRUE), SCENARIO_CALC(SCENARIO_SUB9, 53, 6), RET, }; @@ -3850,7 +3850,7 @@ static const struct ScriptCommand s_script_EVENT_S09E01A_L005[] = { /* 0x812a384 DEBUGINFO_O(3850), EXECUTE_SUBSTATION(203, 1, 0), EXECUTE_SUBSTATION(9, 88, 0), - { 0xaf, 0x00, 0x001d, 0x00000000, 0x00000000, NULL }, + CMD_UNK_AF(RESCUE_DUNGEON_MT_FREEZE_2, FALSE), SCENARIO_CALC(SCENARIO_SUB9, 54, 0), CALL_SCRIPT(DISMISSAL_SALLY_MEMBER_FUNC), UPDATE_VARINT(CALC_SET, GROUND_PLACE, 11), @@ -3868,7 +3868,7 @@ static const struct ScriptCommand s_script_EVENT_S09E01A_L005L[] = { /* 0x812a42 static const struct ScriptCommand s_script_EVENT_S09E01B_L001[] = { /* 0x812a454 */ DEBUGINFO_O(3869), EXECUTE_SUBSTATION(9, 89, 0), - { 0xaf, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, + CMD_UNK_AF(RESCUE_DUNGEON_MURKY_CAVE, TRUE), SCENARIO_CALC(SCENARIO_SUB9, 54, 2), RET, }; @@ -3886,7 +3886,7 @@ static const struct ScriptCommand s_script_EVENT_S09E01B_L002[] = { /* 0x812a4e4 EXECUTE_SUBSTATION(163, 3, 0), EXECUTE_SUBSTATION(220, 2, 0), EXECUTE_SUBSTATION(9, 91, 0), - { 0xb0, 0x01, 0x001e, 0x00000000, 0x00000000, NULL }, + SET_RESCUE_CONQUERED(RESCUE_DUNGEON_MURKY_CAVE), SCENARIO_CALC(SCENARIO_SUB9, 55, 2), CALL_SCRIPT(DISMISSAL_SALLY_MEMBER_FUNC), UPDATE_VARINT(CALC_SET, GROUND_PLACE, 11), @@ -4952,7 +4952,7 @@ static const struct ScriptCommand s_script_GETOUT_D62E01A[] = { /* 0x812dff4 */ JUMPIF_EQUAL(START_MODE, 10, /* to label */ 3), JUMP_SCRIPT(EVENT_S00E01A_L001), LABEL(2), /* = 0x02 */ - { 0xb0, 0x01, 0x0029, 0x00000000, 0x00000000, NULL }, + SET_RESCUE_CONQUERED(RESCUE_DUNGEON_PURITY_FOREST), LABEL(3), /* = 0x03 */ JUMP_SCRIPT(GETOUT_R00E01A), LABEL(1), /* = 0x01 */ @@ -4970,7 +4970,7 @@ static const struct ScriptCommand s_script_GETOUT_D43E01A[] = { /* 0x812e0e4 */ JUMPIF_EQUAL(START_MODE, 10, /* to label */ 3), JUMP_SCRIPT(EVENT_S00E01A_L001), LABEL(2), /* = 0x02 */ - { 0xb0, 0x01, 0x002a, 0x00000000, 0x00000000, NULL }, + SET_RESCUE_CONQUERED(RESCUE_DUNGEON_ODDITY_CAVE), LABEL(3), /* = 0x03 */ JUMP_SCRIPT(GETOUT_R00E01A), LABEL(1), /* = 0x01 */ @@ -4988,7 +4988,7 @@ static const struct ScriptCommand s_script_GETOUT_D44E01A[] = { /* 0x812e1d4 */ JUMPIF_EQUAL(START_MODE, 10, /* to label */ 3), JUMP_SCRIPT(EVENT_S00E01A_L001), LABEL(2), /* = 0x02 */ - { 0xb0, 0x01, 0x002b, 0x00000000, 0x00000000, NULL }, + SET_RESCUE_CONQUERED(RESCUE_DUNGEON_REMAINS_ISLAND), LABEL(3), /* = 0x03 */ JUMP_SCRIPT(GETOUT_R00E01A), LABEL(1), /* = 0x01 */ @@ -5006,7 +5006,7 @@ static const struct ScriptCommand s_script_GETOUT_D45E01A[] = { /* 0x812e2c4 */ JUMPIF_EQUAL(START_MODE, 10, /* to label */ 3), JUMP_SCRIPT(EVENT_S00E01A_L001), LABEL(2), /* = 0x02 */ - { 0xb0, 0x01, 0x002c, 0x00000000, 0x00000000, NULL }, + SET_RESCUE_CONQUERED(RESCUE_DUNGEON_MARVELOUS_SEA), LABEL(3), /* = 0x03 */ JUMP_SCRIPT(GETOUT_R00E01A), LABEL(1), /* = 0x01 */ @@ -5024,7 +5024,7 @@ static const struct ScriptCommand s_script_GETOUT_D46E01A[] = { /* 0x812e3b4 */ JUMPIF_EQUAL(START_MODE, 10, /* to label */ 3), JUMP_SCRIPT(EVENT_S00E01A_L001), LABEL(2), /* = 0x02 */ - { 0xb0, 0x01, 0x002d, 0x00000000, 0x00000000, NULL }, + SET_RESCUE_CONQUERED(RESCUE_DUNGEON_FANTASY_STRAIT), LABEL(3), /* = 0x03 */ JUMP_SCRIPT(GETOUT_R00E01A), LABEL(1), /* = 0x01 */ diff --git a/src/direction_util.c b/src/direction_util.c index 304ced132..ba6d16950 100644 --- a/src/direction_util.c +++ b/src/direction_util.c @@ -21,71 +21,73 @@ static const PixelPos sVectorDirections[NUM_DIRECTIONS] = { static s8 VecDirection4Radial(PixelPos *pixelPos); -static inline s8 GetRandomizedDirection(s32 direction1, s32 rand, s32 add, s32 multi) +static inline s8 GetRandomizedDirection(s32 dir, s32 randExclusiveMax, s32 add, s32 multi) { - return (s8)(((direction1 + add) + OtherRandInt(rand) * multi) % NUM_DIRECTIONS); + return (s8)(((dir + add) + (OtherRandInt(randExclusiveMax) * multi)) % NUM_DIRECTIONS); } // arm9.bin::020109F4 -s32 sub_8002984(s32 _direction1, u32 caseID) +s32 TransformDirection1(s32 _direction1, u32 caseID) { - s32 direction1 = (s8) _direction1; + s32 dir = (s8) _direction1; switch((u8)caseID) { - case 1: - if (direction1 >= 0) { - direction1 += 7; - direction1 &= DIRECTION_MASK; + case DIR_TRANS_SPINRIGHT1: + if (dir >= 0) { + dir += 7; + dir &= DIRECTION_MASK; } break; - case 2: - if (direction1 >= 0) { - direction1 += 1; - direction1 &= DIRECTION_MASK; + case DIR_TRANS_SPINLEFT1: + if (dir >= 0) { + dir += 1; + dir &= DIRECTION_MASK; } break; - case 3: - if (direction1 >= 0) { - direction1 += 6; - direction1 &= DIRECTION_MASK; + case DIR_TRANS_SPINRIGHT2: + if (dir >= 0) { + dir += 6; + dir &= DIRECTION_MASK; } break; - case 4: - if (direction1 >= 0) { - direction1 += 2; - direction1 &= DIRECTION_MASK; + case DIR_TRANS_SPINLEFT2: + if (dir >= 0) { + dir += 2; + dir &= DIRECTION_MASK; } break; - case 5: - if (direction1 >= 0) { - direction1 += 4; - direction1 &= DIRECTION_MASK; + case DIR_TRANS_FLIP: + if (dir >= 0) { + dir += 4; + dir &= DIRECTION_MASK; } break; - case 6: - if ((direction1 & 1) != 0) { - direction1 = GetRandomizedDirection(direction1, 2, 7, 2); + case DIR_TRANS_RAND_OFFSET_SOFT_CARDINAL: + if ((dir & 1) != 0) { + // Diagonal + dir = GetRandomizedDirection(dir, 2, 7, 2); // spinRight1 + (0 or spinLeft2) } else { - direction1 = GetRandomizedDirection(direction1, 3, 6, 2); + // Cardinal + dir = GetRandomizedDirection(dir, 3, 6, 2); // spinRight2 + (0 or spinLeft2 or flip) } break; - case 7: - direction1 = GetRandomizedDirection(direction1, 3, 7, 1); + case DIR_TRANS_RAND_OFFSET_SOFT: + dir = GetRandomizedDirection(dir, 3, 7, 1); // spinRight1 + (0 or spinLeft1 or spinLeft2) break; - case 8: - direction1 = (s8)(OtherRandInt(NUM_DIRECTIONS) & 0xfe); + case DIR_TRANS_RAND_CARDINAL: + dir = (s8)(OtherRandInt(NUM_DIRECTIONS) & (u8)~1); break; - case 9: - direction1 = (s8) OtherRandInt(NUM_DIRECTIONS); + case DIR_TRANS_RAND: + dir = (s8) OtherRandInt(NUM_DIRECTIONS); break; default: break; } - return direction1; + return dir; } // arm9.bin::020108EC -s32 sub_8002A70(s32 _direction1, s32 _direction2, s32 _caseId) +s32 TransformDirection2(s32 _direction1, s32 _direction2, s32 _caseId) { s32 direction1 = (s8)(_direction1); s32 direction2 = (s8)(_direction2); @@ -95,34 +97,34 @@ s32 sub_8002A70(s32 _direction1, s32 _direction2, s32 _caseId) return direction1; switch (caseId) { - case 1: + case DIR_TRANS_SPINRIGHT1: if (direction1 >= 0) { direction1 += 7; direction1 &= DIRECTION_MASK; } break; - case 2: + case DIR_TRANS_SPINLEFT1: if (direction1 >= 0) { direction1 += 1; direction1 &= DIRECTION_MASK; } break; - case 3: + case DIR_TRANS_SPINRIGHT2: if (direction1 >= 0) { direction1 += 6; direction1 &= DIRECTION_MASK; } break; - case 4: + case DIR_TRANS_SPINLEFT2: if (direction1 >= 0) { direction1 += 2; direction1 &= DIRECTION_MASK; } break; - case 11: + case DIR_TRANS_11: direction1 = sub_8002B04(direction1, direction2); // Fallthrough - case 10: + case DIR_TRANS_10: direction1 = sub_8002B04(direction1, direction2); break; } @@ -139,11 +141,11 @@ s32 sub_8002B04(s32 _direction1, s32 _direction2) { s32 newDirection = ((direction2 + NUM_DIRECTIONS) - direction1) % NUM_DIRECTIONS; - if (newDirection != 0) { - if (newDirection < 4) - newDirection = (direction1 + 1) % NUM_DIRECTIONS; + if (newDirection != DIRECTION_SOUTH) { + if (newDirection <= DIRECTION_NORTHEAST) + newDirection = (direction1 + 1) % NUM_DIRECTIONS; // Spin Left 1 else - newDirection = (direction1 + 7) % NUM_DIRECTIONS; + newDirection = (direction1 + 7) % NUM_DIRECTIONS; // Spin Right 1 direction1 = (s8)newDirection; } @@ -164,12 +166,12 @@ UNUSED static s32 sub_8002B5C(s32 _direction1, s32 _direction2) if (direction2 != -1) { newDirection = ((direction2 + NUM_DIRECTIONS) - direction1) % NUM_DIRECTIONS; - if (newDirection != 0) { - if (newDirection < 4) { - newDirection = (direction1 + 2) % NUM_DIRECTIONS; + if (newDirection != DIRECTION_SOUTH) { + if (newDirection <= DIRECTION_NORTHEAST) { + newDirection = (direction1 + 2) % NUM_DIRECTIONS; // Spin Left 2 } else { - newDirection = (direction1 + 6) % NUM_DIRECTIONS; + newDirection = (direction1 + 6) % NUM_DIRECTIONS; // Spin Right 2 } direction1 = (s8)(newDirection); } diff --git a/src/dungeon_8041AD0.c b/src/dungeon_8041AD0.c index 255a99586..393a24be8 100644 --- a/src/dungeon_8041AD0.c +++ b/src/dungeon_8041AD0.c @@ -1099,7 +1099,7 @@ void sub_804225C(Entity *entity, DungeonPos *pos, u8 trapId) sub_800EF28(trapId); sub_800EF64(); - sub_803E708(4,0x42); + DungeonWaitFrames_Async(4,0x42); x = X_POS_TO_PIXELPOS(pos->x); newPos.x = x / 256; @@ -1110,7 +1110,7 @@ void sub_804225C(Entity *entity, DungeonPos *pos, u8 trapId) uVar6 = sub_800E448(trapId,&newPos); if (trapId == TRAP_SUMMON_TRAP) { sub_80421C0(0,0x193); - sub_803E708(0x28,0x33); + DungeonWaitFrames_Async(0x28,0x33); } else if (trapId == TRAP_SPIN_TRAP) { EntityInfo *info = GetEntInfo(entity); @@ -1119,14 +1119,14 @@ void sub_804225C(Entity *entity, DungeonPos *pos, u8 trapId) direction--; direction &= DIRECTION_MASK; sub_806CDD4(entity,0,direction); - sub_803E708(2,0x33); + DungeonWaitFrames_Async(2,0x33); if (!sub_800E9A8(uVar6)) break; } info->action.direction = direction & DIRECTION_MASK; } else { - sub_803E708(0x28,0x33); + DungeonWaitFrames_Async(0x28,0x33); } for (i = 0; i < 1000; i++) { @@ -1149,7 +1149,7 @@ void sub_8042390(Entity *entity, Item *item) id = !ItemSticky(item) ? item->id : ITEM_NOTHING; sub_800EF40(id, 0); sub_800EF64(); - sub_803E708(4,0x42); + DungeonWaitFrames_Async(4,0x42); local_14.x = (entity->pixelPos).x / 256; local_14.y = (entity->pixelPos).y / 256; @@ -1177,7 +1177,7 @@ void sub_804245C(Entity *entity, Item *item) if (sub_8042768(entity)) { id = !ItemSticky(item) ? item->id : ITEM_NOTHING; sub_800EF64(); - sub_803E708(4,0x42); + DungeonWaitFrames_Async(4,0x42); local_14.x = (entity->pixelPos).x / 256; local_14.y = (entity->pixelPos).y / 256; @@ -1418,7 +1418,7 @@ void sub_8042940(Entity *r0) void sub_8042950(Entity *r0) { sub_804151C(r0, 0xD8 << 1, 1); - sub_803E708(0xA, 0x42); + DungeonWaitFrames_Async(0xA, 0x42); } void sub_8042968(Entity *r0) @@ -1513,7 +1513,7 @@ static void sub_8042A84(s16 param_1, Entity *entity, u32 param_3) r6 = IntToF248(2); if (sub_8042768(entity)) { sub_804151C(entity,param_1_s16,0); - sub_803E708(param_3,0x42); + DungeonWaitFrames_Async(param_3,0x42); do { if (entity->unk1C > IntToF248(199.999)) break; DungeonRunFrameActions(0x42); diff --git a/src/dungeon_action_execution.c b/src/dungeon_action_execution.c index 320b07cf4..4e2908f64 100644 --- a/src/dungeon_action_execution.c +++ b/src/dungeon_action_execution.c @@ -270,7 +270,7 @@ bool8 ExecuteEntityDungeonAction_Async(Entity *entity) } sub_8041888(0); if (EntityIsValid(entity)) { - sub_8085140(); + sub_8085140_Async(); if (info->unk14B != 0) { bVar4 = FALSE; info->unk14B = 0; @@ -302,7 +302,7 @@ bool8 ExecuteEntityDungeonAction_Async(Entity *entity) } if (EntityIsValid(entity)) { if (!sub_8044B84()) { - sub_8046D20(); + PotentiallyCreateMusicBox_Async(); } sub_8041888(0); if (((EntityIsValid(entity)) && (!info->aiAllySkip)) && (!bVar14)) { diff --git a/src/dungeon_action_handler.c b/src/dungeon_action_handler.c index bbc33ebcb..fa8766b9d 100644 --- a/src/dungeon_action_handler.c +++ b/src/dungeon_action_handler.c @@ -451,7 +451,7 @@ void sub_8067110(Entity *entity) LogMessageByIdWithPopupCheckUser_Async(entity,sub_80464AC(item)); item2 = *item; sub_8044DF0(entity,0,0x66); - sub_803E708(0x1e,0x11); + DungeonWaitFrames_Async(0x1e,0x11); sub_80479B8(0,0,0,entity,entity,&item2); TriggerMonsterHouse_Async(entity,gDungeon->forceMonsterHouse); } @@ -465,16 +465,16 @@ void sub_80671A0(Entity *entity) if (info->action.actionParameters[0].actionUseIndex == 0x81 && ItemSticky(item)) { sub_8045BF8(gFormatBuffer_Items[0], item); LogMessageByIdWithPopupCheckUser_Async(entity, gUnknown_80F8BE0); - sub_803E708(0x14, 0x4C); + DungeonWaitFrames_Async(0x14, 0x4C); } else if ((GetItemCategory(item->id) == CATEGORY_THROWN_LINE || GetItemCategory(item->id) == CATEGORY_THROWN_ARC) && ItemSticky(item)) { sub_8045BF8(gFormatBuffer_Items[0], item); LogMessageByIdWithPopupCheckUser_Async(entity, gUnknown_80F8BE0); - sub_803E708(0x14, 0x4C); + DungeonWaitFrames_Async(0x14, 0x4C); } else if (ShouldMonsterRunAwayAndShowEffect(entity, TRUE)) { LogMessageByIdWithPopupCheckUser_Async(entity, gUnknown_80FF76C); - sub_803E708(0x14, 0x4C); + DungeonWaitFrames_Async(0x14, 0x4C); } else { bool8 r7; @@ -524,7 +524,7 @@ void sub_80671A0(Entity *entity) dir--; dir &= DIRECTION_MASK; sub_806CDD4(entity, 0, dir); - sub_803E708(2, 21); + DungeonWaitFrames_Async(2, 21); } info->unk166 = 4; } @@ -728,7 +728,7 @@ static void sub_8067794(Entity *entity, Entity *targetEntity, s32 a2) } } - if (DisplayDungeonYesNoMessage(NULL, stringPtr1, FALSE) == 1) { + if (DisplayDungeonYesNoMessage_Async(NULL, stringPtr1, FALSE) == 1) { u8 tempText[64]; strncpy(tempText, gFormatBuffer_Monsters[0], sizeof(tempText)); diff --git a/src/dungeon_cutscene.c b/src/dungeon_cutscene.c index 12912c191..ef783e323 100644 --- a/src/dungeon_cutscene.c +++ b/src/dungeon_cutscene.c @@ -60,9 +60,9 @@ typedef struct FixedRoomCutsceneData { /* 0x0 */ u8 fixedRoomNum; // See enum "FixedRoomID" /* 0x1 */ u8 cutscene1; // See enum "CutsceneKind" - /* 0x2 */ u8 unk2; // 64 is a special value... + /* 0x2 */ u8 cutscene2Flag; // See enum "CutsceneFlagID" /* 0x3 */ u8 cutscene2; // See enum "CutsceneKind" - /* 0x4 */ u8 unk4; // 64 is a special value... + /* 0x4 */ u8 cutscene3Flag; // See enum "CutsceneFlagID" /* 0x5 */ u8 cutscene3; // See enum "CutsceneKind" } FixedRoomCutsceneData; @@ -83,43 +83,43 @@ static void sub_80857B8(void); static void sub_80861EC(Entity *); static const FixedRoomCutsceneData sFixedRoomCutsceneLookup[] = { - { FIXED_ROOM_MT_STEEL_SKARMORY, CUTSCENE_MT_STEEL_ATTEMPT1, 0, CUTSCENE_MT_STEEL_ATTEMPT2, 1, CUTSCENE_MT_STEEL_POSTSTORY }, - { FIXED_ROOM_SINISTER_WOODS_TEAM_MEANIES, CUTSCENE_SINISTER_WOODS_ATTEMPT1, 2, CUTSCENE_SINISTER_WOODS_ATTEMPT2, 3, CUTSCENE_SINISTER_WOODS_POSTSTORY }, - { FIXED_ROOM_MT_THUNDER_PEAK_ZAPDOS, CUTSCENE_MT_THUNDER_PEAK_ATTEMPT1, 4, CUTSCENE_MT_THUNDER_PEAK_ATTEMPT2, 5, CUTSCENE_MT_THUNDER_PEAK_POSTSTORY }, - { FIXED_ROOM_MT_BLAZE_PEAK_MOLTRES, CUTSCENE_MT_BLAZE_PEAK_ATTEMPT1, 6, CUTSCENE_MT_BLAZE_PEAK_ATTEMPT2, 7, CUTSCENE_MT_BLAZE_PEAK_POSTSTORY }, - { FIXED_ROOM_FROSTY_GROTTO_ARTICUNO, CUTSCENE_FROSTY_GROTTO_ATTEMPT1, 8, CUTSCENE_FROSTY_GROTTO_ATTEMPT2, 9, CUTSCENE_FROSTY_GROTTO_POSTSTORY }, - { FIXED_ROOM_MT_FREEZE_PEAK_NINETALES, CUTSCENE_MT_FREEZE_PEAK, 10, CUTSCENE_MT_FREEZE_PEAK_POSTSTORY, 10, CUTSCENE_MT_FREEZE_PEAK_POSTSTORY }, - { FIXED_ROOM_MAGMA_CAVERN_PIT_GROUDON, CUTSCENE_MAGMA_CAVERN_PIT_ATTEMPT1, 11, CUTSCENE_MAGMA_CAVERN_PIT_ATTEMPT2, 12, CUTSCENE_MAGMA_CAVERN_PIT_POSTSTORY }, - { FIXED_ROOM_MAGMA_CAVERN_PIT_TYRANITAR_ALAKAZAM, CUTSCENE_MAGMA_CAVERN_MID, 13, CUTSCENE_MAGMA_CAVERN_MID_POSTSTORY, 13, CUTSCENE_MAGMA_CAVERN_MID_POSTSTORY }, - { FIXED_ROOM_SKY_TOWER_SUMMIT_RAYQUAZA, CUTSCENE_SKY_TOWER_SUMMIT_ATTEMPT1, 14, CUTSCENE_SKY_TOWER_SUMMIT_ATTEMPT2, 15, CUTSCENE_SKY_TOWER_SUMMIT_POSTSTORY }, - { FIXED_ROOM_UPROAR_FOREST_MANKEY, CUTSCENE_UPROAR_FOREST_ATTEMPT1, 16, CUTSCENE_UPROAR_FOREST_ATTEMPT2, 17, CUTSCENE_UPROAR_FOREST_POSTSTORY }, - { FIXED_ROOM_WESTERN_CAVE_MEWTWO, CUTSCENE_WESTERN_CAVE_ATTEMPT1, 18, CUTSCENE_WESTERN_CAVE_ATTEMPT2, 19, CUTSCENE_WESTERN_CAVE_POSTSTORY }, - { FIXED_ROOM_FIERY_FIELD_ENTEI, CUTSCENE_FIERY_FIELD_ATTEMPT1, 20, CUTSCENE_FIERY_FIELD_ATTEMPT2, 21, CUTSCENE_FIERY_FIELD_POSTSTORY }, - { FIXED_ROOM_LIGHTNING_FIELD_RAIKOU, CUTSCENE_LIGHTNING_FIELD_ATTEMPT1, 22, CUTSCENE_LIGHTNING_FIELD_ATTEMPT2, 23, CUTSCENE_LIGHTNING_FIELD_POSTSTORY }, - { FIXED_ROOM_NORTHWIND_FIELD_SUICUNE, CUTSCENE_NORTHWIND_FIELD_ATTEMPT1, 24, CUTSCENE_NORTHWIND_FIELD_ATTEMPT2, 25, CUTSCENE_NORTHWIND_FIELD_POSTSTORY }, - { FIXED_ROOM_MT_FARAWAY_HO_OH, CUTSCENE_MT_FARAWAY, 64, CUTSCENE_MT_FARAWAY, 26, CUTSCENE_MT_FARAWAY_POSTSTORY }, - { FIXED_ROOM_NORTHERN_RANGE_LATIOS, CUTSCENE_NORTHERN_RANGE_ATTEMPT1, 27, CUTSCENE_NORTHERN_RANGE_ATTEMPT2, 28, CUTSCENE_NORTHERN_RANGE_POSTSTORY }, - { FIXED_ROOM_BURIED_RELIC_REGIROCK, CUTSCENE_REGIROCK, 64, CUTSCENE_REGIROCK, 64, CUTSCENE_REGIROCK }, - { FIXED_ROOM_BURIED_RELIC_REGICE, CUTSCENE_REGICE, 64, CUTSCENE_REGICE, 64, CUTSCENE_REGICE }, - { FIXED_ROOM_BURIED_RELIC_REGISTEEL, CUTSCENE_REGISTEEL, 64, CUTSCENE_REGISTEEL, 64, CUTSCENE_REGISTEEL }, - { FIXED_ROOM_WISH_CAVE_JIRACHI, CUTSCENE_JIRACHI, 64, CUTSCENE_JIRACHI, 30, CUTSCENE_JIRACHI_POSTSTORY }, - { FIXED_ROOM_SILVER_TRENCH_LUGIA, CUTSCENE_SILVER_TRENCH, 64, CUTSCENE_SILVER_TRENCH, 64, CUTSCENE_SILVER_TRENCH }, - { FIXED_ROOM_STORMY_SEA_KYOGRE, CUTSCENE_STORMY_SEA, 64, CUTSCENE_STORMY_SEA, 64, CUTSCENE_STORMY_SEA }, - { FIXED_ROOM_METEOR_CAVE_DEOXYS, CUTSCENE_METEOR_CAVE, 64, CUTSCENE_METEOR_CAVE, 64, CUTSCENE_METEOR_CAVE }, - { FIXED_ROOM_PURITY_FOREST_CELEBI, CUTSCENE_PURITY_FOREST, 64, CUTSCENE_PURITY_FOREST, 64, CUTSCENE_PURITY_FOREST }, - { FIRST_DOJO_MAZE_BOSS_ROOM, CUTSCENE_MAZE_BOSS, 64, CUTSCENE_MAZE_BOSS, 64, CUTSCENE_MAZE_BOSS }, - { FIXED_ROOM_WISH_CAVE_MEDICHAM, CUTSCENE_MEDICHAM, 32, CUTSCENE_MEDICHAM_POSTSTORY, 32, CUTSCENE_MEDICHAM_POSTSTORY }, - { FIXED_ROOM_HOWLING_FOREST_SMEARGLE, CUTSCENE_HOWLING_FOREST, 33, CUTSCENE_HOWLING_FOREST_POSTSTORY, 33, CUTSCENE_HOWLING_FOREST_POSTSTORY }, + { FIXED_ROOM_MT_STEEL_SKARMORY, CUTSCENE_MT_STEEL_ATTEMPT1, CUTSCENE_FLAG_MT_STEEL_REACHED, CUTSCENE_MT_STEEL_ATTEMPT2, CUTSCENE_FLAG_MT_STEEL_COMPLETE, CUTSCENE_MT_STEEL_POSTSTORY }, + { FIXED_ROOM_SINISTER_WOODS_TEAM_MEANIES, CUTSCENE_SINISTER_WOODS_ATTEMPT1, CUTSCENE_FLAG_SINISTER_WOODS_REACHED, CUTSCENE_SINISTER_WOODS_ATTEMPT2, CUTSCENE_FLAG_SINISTER_WOODS_COMPLETE, CUTSCENE_SINISTER_WOODS_POSTSTORY }, + { FIXED_ROOM_MT_THUNDER_PEAK_ZAPDOS, CUTSCENE_MT_THUNDER_PEAK_ATTEMPT1, CUTSCENE_FLAG_MT_THUNDER_PEAK_REACHED, CUTSCENE_MT_THUNDER_PEAK_ATTEMPT2, CUTSCENE_FLAG_MT_THUNDER_PEAK_COMPLETE, CUTSCENE_MT_THUNDER_PEAK_POSTSTORY }, + { FIXED_ROOM_MT_BLAZE_PEAK_MOLTRES, CUTSCENE_MT_BLAZE_PEAK_ATTEMPT1, CUTSCENE_FLAG_MT_BLAZE_PEAK_REACHED, CUTSCENE_MT_BLAZE_PEAK_ATTEMPT2, CUTSCENE_FLAG_MT_BLAZE_PEAK_COMPLETE, CUTSCENE_MT_BLAZE_PEAK_POSTSTORY }, + { FIXED_ROOM_FROSTY_GROTTO_ARTICUNO, CUTSCENE_FROSTY_GROTTO_ATTEMPT1, CUTSCENE_FLAG_FROSTY_GROTTO_REACHED, CUTSCENE_FROSTY_GROTTO_ATTEMPT2, CUTSCENE_FLAG_FROSTY_GROTTO_COMPLETE, CUTSCENE_FROSTY_GROTTO_POSTSTORY }, + { FIXED_ROOM_MT_FREEZE_PEAK_NINETALES, CUTSCENE_MT_FREEZE_PEAK, CUTSCENE_FLAG_MT_FREEZE_PEAK_COMPLETE, CUTSCENE_MT_FREEZE_PEAK_POSTSTORY, CUTSCENE_FLAG_MT_FREEZE_PEAK_COMPLETE, CUTSCENE_MT_FREEZE_PEAK_POSTSTORY }, + { FIXED_ROOM_MAGMA_CAVERN_PIT_GROUDON, CUTSCENE_MAGMA_CAVERN_PIT_ATTEMPT1, CUTSCENE_FLAG_MAGMA_CAVERN_PIT_REACHED, CUTSCENE_MAGMA_CAVERN_PIT_ATTEMPT2, CUTSCENE_FLAG_MAGMA_CAVERN_PIT_COMPLETE, CUTSCENE_MAGMA_CAVERN_PIT_POSTSTORY }, + { FIXED_ROOM_MAGMA_CAVERN_PIT_TYRANITAR_ALAKAZAM, CUTSCENE_MAGMA_CAVERN_MID, CUTSCENE_FLAG_MAGMA_CAVERN_MID_REACHED, CUTSCENE_MAGMA_CAVERN_MID_POSTSTORY, CUTSCENE_FLAG_MAGMA_CAVERN_MID_REACHED, CUTSCENE_MAGMA_CAVERN_MID_POSTSTORY }, + { FIXED_ROOM_SKY_TOWER_SUMMIT_RAYQUAZA, CUTSCENE_SKY_TOWER_SUMMIT_ATTEMPT1, CUTSCENE_FLAG_SKY_TOWER_SUMMIT_REACHED, CUTSCENE_SKY_TOWER_SUMMIT_ATTEMPT2, CUTSCENE_FLAG_SKY_TOWER_SUMMIT_COMPLETE, CUTSCENE_SKY_TOWER_SUMMIT_POSTSTORY }, + { FIXED_ROOM_UPROAR_FOREST_MANKEY, CUTSCENE_UPROAR_FOREST_ATTEMPT1, CUTSCENE_FLAG_UPROAR_FOREST_REACHED, CUTSCENE_UPROAR_FOREST_ATTEMPT2, CUTSCENE_FLAG_UPROAR_FOREST_COMPLETE, CUTSCENE_UPROAR_FOREST_POSTSTORY }, + { FIXED_ROOM_WESTERN_CAVE_MEWTWO, CUTSCENE_WESTERN_CAVE_ATTEMPT1, CUTSCENE_FLAG_WESTERN_CAVE_REACHED, CUTSCENE_WESTERN_CAVE_ATTEMPT2, CUTSCENE_FLAG_WESTERN_CAVE_COMPLETE, CUTSCENE_WESTERN_CAVE_POSTSTORY }, + { FIXED_ROOM_FIERY_FIELD_ENTEI, CUTSCENE_FIERY_FIELD_ATTEMPT1, CUTSCENE_FLAG_FIERY_FIELD_REACHED, CUTSCENE_FIERY_FIELD_ATTEMPT2, CUTSCENE_FLAG_FIERY_FIELD_COMPLETE, CUTSCENE_FIERY_FIELD_POSTSTORY }, + { FIXED_ROOM_LIGHTNING_FIELD_RAIKOU, CUTSCENE_LIGHTNING_FIELD_ATTEMPT1, CUTSCENE_FLAG_LIGHTNING_FIELD_REACHED, CUTSCENE_LIGHTNING_FIELD_ATTEMPT2, CUTSCENE_FLAG_LIGHTNING_FIELD_COMPLETE, CUTSCENE_LIGHTNING_FIELD_POSTSTORY }, + { FIXED_ROOM_NORTHWIND_FIELD_SUICUNE, CUTSCENE_NORTHWIND_FIELD_ATTEMPT1, CUTSCENE_FLAG_NORTHWIND_FIELD_REACHED, CUTSCENE_NORTHWIND_FIELD_ATTEMPT2, CUTSCENE_FLAG_NORTHWIND_FIELD_COMPLETE, CUTSCENE_NORTHWIND_FIELD_POSTSTORY }, + { FIXED_ROOM_MT_FARAWAY_HO_OH, CUTSCENE_MT_FARAWAY, NUM_CUTSCENE_FLAGS, CUTSCENE_MT_FARAWAY, CUTSCENE_FLAG_MT_FARAWAY_COMPLETE, CUTSCENE_MT_FARAWAY_POSTSTORY }, + { FIXED_ROOM_NORTHERN_RANGE_LATIOS, CUTSCENE_NORTHERN_RANGE_ATTEMPT1, CUTSCENE_FLAG_NORTHERN_RANGE_REACHED, CUTSCENE_NORTHERN_RANGE_ATTEMPT2, CUTSCENE_FLAG_NORTHERN_RANGE_COMPLETE, CUTSCENE_NORTHERN_RANGE_POSTSTORY }, + { FIXED_ROOM_BURIED_RELIC_REGIROCK, CUTSCENE_REGIROCK, NUM_CUTSCENE_FLAGS, CUTSCENE_REGIROCK, NUM_CUTSCENE_FLAGS, CUTSCENE_REGIROCK }, + { FIXED_ROOM_BURIED_RELIC_REGICE, CUTSCENE_REGICE, NUM_CUTSCENE_FLAGS, CUTSCENE_REGICE, NUM_CUTSCENE_FLAGS, CUTSCENE_REGICE }, + { FIXED_ROOM_BURIED_RELIC_REGISTEEL, CUTSCENE_REGISTEEL, NUM_CUTSCENE_FLAGS, CUTSCENE_REGISTEEL, NUM_CUTSCENE_FLAGS, CUTSCENE_REGISTEEL }, + { FIXED_ROOM_WISH_CAVE_JIRACHI, CUTSCENE_JIRACHI, NUM_CUTSCENE_FLAGS, CUTSCENE_JIRACHI, CUTSCENE_FLAG_JIRACHI_COMPLETE, CUTSCENE_JIRACHI_POSTSTORY }, + { FIXED_ROOM_SILVER_TRENCH_LUGIA, CUTSCENE_SILVER_TRENCH, NUM_CUTSCENE_FLAGS, CUTSCENE_SILVER_TRENCH, NUM_CUTSCENE_FLAGS, CUTSCENE_SILVER_TRENCH }, + { FIXED_ROOM_STORMY_SEA_KYOGRE, CUTSCENE_STORMY_SEA, NUM_CUTSCENE_FLAGS, CUTSCENE_STORMY_SEA, NUM_CUTSCENE_FLAGS, CUTSCENE_STORMY_SEA }, + { FIXED_ROOM_METEOR_CAVE_DEOXYS, CUTSCENE_METEOR_CAVE, NUM_CUTSCENE_FLAGS, CUTSCENE_METEOR_CAVE, NUM_CUTSCENE_FLAGS, CUTSCENE_METEOR_CAVE }, + { FIXED_ROOM_PURITY_FOREST_CELEBI, CUTSCENE_PURITY_FOREST, NUM_CUTSCENE_FLAGS, CUTSCENE_PURITY_FOREST, NUM_CUTSCENE_FLAGS, CUTSCENE_PURITY_FOREST }, + { FIRST_DOJO_MAZE_BOSS_ROOM, CUTSCENE_MAZE_BOSS, NUM_CUTSCENE_FLAGS, CUTSCENE_MAZE_BOSS, NUM_CUTSCENE_FLAGS, CUTSCENE_MAZE_BOSS }, + { FIXED_ROOM_WISH_CAVE_MEDICHAM, CUTSCENE_MEDICHAM, CUTSCENE_FLAG_MEDICHAM_COMPLETE, CUTSCENE_MEDICHAM_POSTSTORY, CUTSCENE_FLAG_MEDICHAM_COMPLETE, CUTSCENE_MEDICHAM_POSTSTORY }, + { FIXED_ROOM_HOWLING_FOREST_SMEARGLE, CUTSCENE_HOWLING_FOREST, CUTSCENE_FLAG_HOWLING_FOREST_COMPLETE, CUTSCENE_HOWLING_FOREST_POSTSTORY, CUTSCENE_FLAG_HOWLING_FOREST_COMPLETE, CUTSCENE_HOWLING_FOREST_POSTSTORY }, { FIXED_ROOM_NONE, 0, 0, 0, 0, 0 }, }; -static const s32 gUnknown_8107314[] = { +static const s32 gUnknown_8107314[17] = { 0, -1, 1, -2, 2, -3, 3, -4, 4, -4, 4, -4, 4, -4, 4, -4, 4 }; -EWRAM_DATA static unkStruct_202F3D0 gUnknown_202F3D0 = {0}; +EWRAM_DATA static unkStruct_202F3D0 gUnknown_202F3D0 = { 0 }; void sub_80847D4(void) { @@ -129,19 +129,21 @@ void sub_80847D4(void) gDungeon->cutscene = CUTSCENE_NONE; gDungeon->unk1356C = FALSE; UpdateMinimap(); + for (i = 0; i < 999 && sFixedRoomCutsceneLookup[i].fixedRoomNum != FIXED_ROOM_NONE; i++) { fixedRoomNumber = gDungeon->fixedRoomNumber; + // Dojo maze bosses all use the same cutscene data - if (fixedRoomNumber - (FIRST_DOJO_MAZE_BOSS_ROOM + 1) < NUM_MAZE_BOSS_ROOMS) { + if (fixedRoomNumber >= (FIRST_DOJO_MAZE_BOSS_ROOM + 1) && fixedRoomNumber <= LAST_DOJO_MAZE_BOSS_ROOM) fixedRoomNumber = FIRST_DOJO_MAZE_BOSS_ROOM; - } - if (fixedRoomNumber == sFixedRoomCutsceneLookup[i].fixedRoomNum) - { + + if (fixedRoomNumber == sFixedRoomCutsceneLookup[i].fixedRoomNum) { sub_8084854(&sFixedRoomCutsceneLookup[i]); break; } } - sub_8097FF8(); + + FlushTempCutsceneFlags(); } static void sub_8084854(const FixedRoomCutsceneData *data) @@ -149,17 +151,17 @@ static void sub_8084854(const FixedRoomCutsceneData *data) if (gDungeon->unk644.missionKind != DUNGEON_MISSION_UNK0) { gDungeon->cutscene = data->cutscene3; } - else if (sub_8098100(data->unk4)) { + else if (GetCutsceneFlag(data->cutscene3Flag)) { gDungeon->cutscene = data->cutscene3; } - else if (sub_8098100(data->unk2)) { + else if (GetCutsceneFlag(data->cutscene2Flag)) { gDungeon->cutscene = data->cutscene2; } else { gDungeon->cutscene = data->cutscene1; - if (data->unk2 != 64) { - sub_8097FA8(data->unk2); - } + + if (data->cutscene2Flag != NUM_CUTSCENE_FLAGS) + SetTempCutsceneFlag(data->cutscene2Flag); } gDungeon->unk644.unk31 = 1; @@ -177,7 +179,7 @@ void sub_80848F0(void) switch (gDungeon->cutscene) { case CUTSCENE_NONE: - case CUTSCENE_MAX: + case NUM_CUTSCENES: gDungeon->unk1356C = FALSE; break; case CUTSCENE_MT_STEEL_ATTEMPT1: @@ -342,7 +344,7 @@ void sub_80848F0(void) sub_808CD44(); break; } - sub_8097FF8(); + FlushTempCutsceneFlags(); } void DisplayPreFightDialogue(void) @@ -525,16 +527,16 @@ void DisplayPreFightDialogue(void) case CUTSCENE_HOWLING_FOREST_POSTSTORY: sub_808CD9C(); break; - case CUTSCENE_MAX: + case NUM_CUTSCENES: break; } sub_8085764(); sub_80857B8(); gDungeon->unk1356C = FALSE; - sub_8097FF8(); + FlushTempCutsceneFlags(); } -void sub_8084E00_Async(Entity *entity, u8 monsterBehavior, bool8 param_3) +void HandleBossFaint_Async(Entity *entity, u8 monsterBehavior, bool8 transformedIntoFriend) { if (monsterBehavior == BEHAVIOR_FIXED_ENEMY) return; @@ -544,200 +546,200 @@ void sub_8084E00_Async(Entity *entity, u8 monsterBehavior, bool8 param_3) break; case CUTSCENE_MT_STEEL_ATTEMPT1: case CUTSCENE_MT_STEEL_ATTEMPT2: - sub_8086BDC(monsterBehavior, gDungeon->cutscene); + HandleSkarmoryBossFaint(monsterBehavior, gDungeon->cutscene); break; case CUTSCENE_SINISTER_WOODS_ATTEMPT1: case CUTSCENE_SINISTER_WOODS_ATTEMPT2: - sub_8086F54(monsterBehavior, gDungeon->cutscene); + HandleMeaniesBossFaint(monsterBehavior, gDungeon->cutscene); break; case CUTSCENE_MT_THUNDER_PEAK_ATTEMPT1: case CUTSCENE_MT_THUNDER_PEAK_ATTEMPT2: case CUTSCENE_MT_THUNDER_PEAK_POSTSTORY: - sub_8087334(monsterBehavior, gDungeon->cutscene); + HandleZapdosBossFaint(monsterBehavior, gDungeon->cutscene); break; case CUTSCENE_MT_BLAZE_PEAK_ATTEMPT1: case CUTSCENE_MT_BLAZE_PEAK_ATTEMPT2: case CUTSCENE_MT_BLAZE_PEAK_POSTSTORY: - sub_80878F4(monsterBehavior, gDungeon->cutscene); + HandleMoltresBossFaint(monsterBehavior, gDungeon->cutscene); break; case CUTSCENE_FROSTY_GROTTO_ATTEMPT1: case CUTSCENE_FROSTY_GROTTO_ATTEMPT2: case CUTSCENE_FROSTY_GROTTO_POSTSTORY: - sub_8088088(monsterBehavior, gDungeon->cutscene); + HandleArticunoBossFaint(monsterBehavior, gDungeon->cutscene); break; case CUTSCENE_MAGMA_CAVERN_PIT_ATTEMPT1: case CUTSCENE_MAGMA_CAVERN_PIT_ATTEMPT2: case CUTSCENE_MAGMA_CAVERN_PIT_POSTSTORY: - sub_8088818(monsterBehavior, gDungeon->cutscene); + HandleGroudonBossFaint(monsterBehavior, gDungeon->cutscene); break; case CUTSCENE_SKY_TOWER_SUMMIT_ATTEMPT1: case CUTSCENE_SKY_TOWER_SUMMIT_ATTEMPT2: case CUTSCENE_SKY_TOWER_SUMMIT_POSTSTORY: - sub_80893B4(monsterBehavior, gDungeon->cutscene); + HandleRayquazaBossFaint(monsterBehavior, gDungeon->cutscene); break; case CUTSCENE_UPROAR_FOREST_ATTEMPT1: case CUTSCENE_UPROAR_FOREST_ATTEMPT2: - sub_8089788(entity, monsterBehavior, gDungeon->cutscene); + HandleMankeyBossFaint(entity, monsterBehavior, gDungeon->cutscene); break; case CUTSCENE_WESTERN_CAVE_ATTEMPT1: case CUTSCENE_WESTERN_CAVE_ATTEMPT2: case CUTSCENE_WESTERN_CAVE_POSTSTORY: - sub_8089A00(monsterBehavior, gDungeon->cutscene); + HandleMewtwoBossFaint(monsterBehavior, gDungeon->cutscene); break; case CUTSCENE_FIERY_FIELD_ATTEMPT1: case CUTSCENE_FIERY_FIELD_ATTEMPT2: case CUTSCENE_FIERY_FIELD_POSTSTORY: - sub_8089CFC(monsterBehavior, gDungeon->cutscene); + HandleEnteiBossFaint(monsterBehavior, gDungeon->cutscene); break; case CUTSCENE_LIGHTNING_FIELD_ATTEMPT1: case CUTSCENE_LIGHTNING_FIELD_ATTEMPT2: case CUTSCENE_LIGHTNING_FIELD_POSTSTORY: - sub_8089FF0(monsterBehavior, gDungeon->cutscene); + HandleRaikouBossFaint(monsterBehavior, gDungeon->cutscene); break; case CUTSCENE_NORTHWIND_FIELD_ATTEMPT1: case CUTSCENE_NORTHWIND_FIELD_ATTEMPT2: case CUTSCENE_NORTHWIND_FIELD_POSTSTORY: - sub_808A36C(monsterBehavior, gDungeon->cutscene); + HandleSuicuneBossFaint(monsterBehavior, gDungeon->cutscene); break; case CUTSCENE_MT_FARAWAY: case CUTSCENE_MT_FARAWAY_POSTSTORY: - sub_808A6E8(monsterBehavior, gDungeon->cutscene); + HandleHoOhBossFaint(monsterBehavior, gDungeon->cutscene); break; case CUTSCENE_NORTHERN_RANGE_ATTEMPT1: case CUTSCENE_NORTHERN_RANGE_ATTEMPT2: case CUTSCENE_NORTHERN_RANGE_POSTSTORY: - sub_808AAF0(monsterBehavior, gDungeon->cutscene); + HandleLatiosBossFaint(monsterBehavior, gDungeon->cutscene); break; case CUTSCENE_REGIROCK: - sub_808AE54(monsterBehavior, gDungeon->cutscene, &entity->pos); + HandleRegirockBossFaint_Async(monsterBehavior, gDungeon->cutscene, &entity->pos); break; case CUTSCENE_REGICE: - sub_808AEC8(monsterBehavior, gDungeon->cutscene, &entity->pos); + HandleRegiceBossFaint_Async(monsterBehavior, gDungeon->cutscene, &entity->pos); break; case CUTSCENE_REGISTEEL: - sub_808AF3C(monsterBehavior, gDungeon->cutscene, &entity->pos); + HandleRegisteelBossFaint_Async(monsterBehavior, gDungeon->cutscene, &entity->pos); break; case CUTSCENE_JIRACHI: case CUTSCENE_JIRACHI_POSTSTORY: - sub_808B3E4_Async(monsterBehavior, gDungeon->cutscene, param_3); + HandleJirachiBossFaint_Async(monsterBehavior, gDungeon->cutscene, transformedIntoFriend); break; case CUTSCENE_SILVER_TRENCH: - sub_808BE70(monsterBehavior, gDungeon->cutscene, param_3); + HandleLugiaBossFaint(monsterBehavior, gDungeon->cutscene, transformedIntoFriend); break; case CUTSCENE_STORMY_SEA: - sub_808C1A4(monsterBehavior, gDungeon->cutscene, param_3); + HandleKyogreBossFaint(monsterBehavior, gDungeon->cutscene, transformedIntoFriend); break; case CUTSCENE_METEOR_CAVE: - sub_808C414(monsterBehavior, gDungeon->cutscene, param_3); + HandleDeoxysNormalBossFaint(monsterBehavior, gDungeon->cutscene, transformedIntoFriend); break; case CUTSCENE_PURITY_FOREST: - nullsub_100(monsterBehavior, gDungeon->cutscene, param_3); + HandleCelebiBossFaint(monsterBehavior, gDungeon->cutscene, transformedIntoFriend); break; case CUTSCENE_MAZE_BOSS: - sub_808C948(entity, gDungeon->cutscene); + HandleMazeBossFaint(entity, gDungeon->cutscene); break; case CUTSCENE_MEDICHAM: case CUTSCENE_MEDICHAM_POSTSTORY: case CUTSCENE_HOWLING_FOREST: case CUTSCENE_HOWLING_FOREST_POSTSTORY: - case CUTSCENE_MAX: + case NUM_CUTSCENES: break; } - if (param_3 == 0 && gDungeon->unk2 != DUNGEON_UNK2_0) + if (!transformedIntoFriend && gDungeon->unk2 != DUNGEON_UNK2_0) DungeonStartNewBGM(999); } -void sub_8085140(void) +void sub_8085140_Async(void) { switch (gDungeon->cutscene) { - // NOTE: shortcut way to generate all cases from 0 - 0x3C properly + // NOTE: shortcut way to generate all cases from [CUTSCENE_NONE, NUM_CUTSCENES] properly default: case CUTSCENE_NONE: case CUTSCENE_MT_STEEL_ATTEMPT1: - case CUTSCENE_MAX: + case NUM_CUTSCENES: break; case CUTSCENE_REGIROCK: - sub_808AFB0(gDungeon->cutscene); + sub_808AFB0_Async(gDungeon->cutscene); break; case CUTSCENE_REGICE: - sub_808B030(gDungeon->cutscene); + sub_808B030_Async(gDungeon->cutscene); break; case CUTSCENE_REGISTEEL: - sub_808B0B0(gDungeon->cutscene); + sub_808B0B0_Async(gDungeon->cutscene); break; } } -bool8 sub_808529C(s32 speciesId_) +bool8 MonCutsceneCompleted(s32 speciesId_) { - s32 r3; + s32 flag; s32 speciesId = 0; // This line serves no purpose other than generating the right asm. Feel free to remove it. speciesId += (s16) speciesId_; speciesId = (s16) speciesId_; - r3 = 0x40; + flag = NUM_CUTSCENE_FLAGS; switch (speciesId) { case MONSTER_SKARMORY: - r3 = 1; + flag = CUTSCENE_FLAG_MT_STEEL_COMPLETE; break; case MONSTER_EKANS: - r3 = 3; + flag = CUTSCENE_FLAG_SINISTER_WOODS_COMPLETE; break; case MONSTER_GENGAR: - r3 = 3; + flag = CUTSCENE_FLAG_SINISTER_WOODS_COMPLETE; break; case MONSTER_MEDICHAM: - r3 = 3; + flag = CUTSCENE_FLAG_SINISTER_WOODS_COMPLETE; break; case MONSTER_ZAPDOS: - r3 = 5; + flag = CUTSCENE_FLAG_MT_THUNDER_PEAK_COMPLETE; break; case MONSTER_MOLTRES: - r3 = 7; + flag = CUTSCENE_FLAG_MT_BLAZE_PEAK_COMPLETE; break; case MONSTER_ARTICUNO: - r3 = 9; + flag = CUTSCENE_FLAG_FROSTY_GROTTO_COMPLETE; break; case MONSTER_GROUDON: - r3 = 0xC; + flag = CUTSCENE_FLAG_MAGMA_CAVERN_PIT_COMPLETE; break; case MONSTER_RAYQUAZA: - r3 = 0xF; + flag = CUTSCENE_FLAG_SKY_TOWER_SUMMIT_COMPLETE; break; case MONSTER_MEWTWO: - r3 = 0x13; + flag = CUTSCENE_FLAG_WESTERN_CAVE_COMPLETE; break; case MONSTER_ENTEI: - r3 = 0x15; + flag = CUTSCENE_FLAG_FIERY_FIELD_COMPLETE; break; case MONSTER_RAIKOU: - r3 = 0x17; + flag = CUTSCENE_FLAG_LIGHTNING_FIELD_COMPLETE; break; case MONSTER_SUICUNE: - r3 = 0x19; + flag = CUTSCENE_FLAG_NORTHWIND_FIELD_COMPLETE; break; case MONSTER_HO_OH: - r3 = 0x1A; + flag = CUTSCENE_FLAG_MT_FARAWAY_COMPLETE; break; case MONSTER_MANKEY: - r3 = 0x11; + flag = CUTSCENE_FLAG_UPROAR_FOREST_COMPLETE; break; case MONSTER_REGIROCK: - r3 = 0x1D; + flag = CUTSCENE_FLAG_REGI_ITEM_OBTAINED; break; case MONSTER_REGICE: - r3 = 0x1D; + flag = CUTSCENE_FLAG_REGI_ITEM_OBTAINED; break; case MONSTER_REGISTEEL: - r3 = 0x1D; + flag = CUTSCENE_FLAG_REGI_ITEM_OBTAINED; break; } - if (r3 != 0x40 && !sub_8098100(r3)) + if (flag != NUM_CUTSCENE_FLAGS && !GetCutsceneFlag(flag)) return FALSE; return TRUE; } @@ -1155,7 +1157,7 @@ UNUSED static void sub_8085B0C(Entity *pokemon) while (local_28[index] != 0) { SetFacingDirection(pokemon, local_28[index]); - sub_803E708(6,0x46); + DungeonWaitFrames_Async(6,0x46); index++; } } @@ -1381,7 +1383,7 @@ void sub_8085F78(void) sub_808A718(); break; case CUTSCENE_NONE: - case CUTSCENE_MAX: + case NUM_CUTSCENES: default: break; } @@ -1417,20 +1419,20 @@ UNUSED static void sub_8086124(Entity *entity, u8 param_2) GetEntInfo(entity)->unk160 = param_2; } -void sub_8086130(void) +void FrostyForestIntrusionCutscene_Async(void) { - DungeonFadeOutBGM(0x3c); - sub_803E708(0x3c,0x46); + DungeonFadeOutBGM(60); + DungeonWaitFrames_Async(60, 70); sub_8052FB8(gUnknown_810665C); - sub_803E708(0x1e,0x46); + DungeonWaitFrames_Async(30, 70); sub_8052FB8(gUnknown_810668C); - sub_803E708(0x1e,0x46); + DungeonWaitFrames_Async(30, 70); sub_8052FB8(gUnknown_81066D4); - sub_803E708(0x1e,0x46); + DungeonWaitFrames_Async(30, 70); sub_8052FB8(gUnknown_81066F0); - sub_803E708(0x1e,0x46); + DungeonWaitFrames_Async(30, 70); sub_8052FB8(gUnknown_810671C); - sub_803E708(0x1e,0x46); + DungeonWaitFrames_Async(30, 70); } void sub_80861A8(Entity *a0) @@ -1623,16 +1625,16 @@ static void sub_8086494(void) s32 i; sub_8085930(DIRECTION_NORTHEAST); - sub_803E708(4, 70); + DungeonWaitFrames_Async(4, 70); sub_8085930(DIRECTION_EAST); - sub_803E708(4, 70); + DungeonWaitFrames_Async(4, 70); sub_8085930(DIRECTION_SOUTHEAST); - sub_803E708(4, 70); + DungeonWaitFrames_Async(4, 70); sub_8085930(DIRECTION_SOUTH); - sub_803E708(4, 70); + DungeonWaitFrames_Async(4, 70); sub_80855E4(sub_80863C8); @@ -1759,10 +1761,10 @@ void sub_8086690(void) void sub_80866C4(const struct DungeonDialogueStruct *dialogue) { - SpriteLookAroundEffect(CutsceneGetLeader()); - sub_803E708(10, 70); - DisplayDungeonDialogue(dialogue); - sub_803E708(10, 70); + CutsceneLookAroundEffect_Async(CutsceneGetLeader()); + DungeonWaitFrames_Async(10, 70); + DisplayDungeonDialogue_Async(dialogue); + DungeonWaitFrames_Async(10, 70); sub_8086494(); gDungeon->unk2 = DUNGEON_UNK2_1; } @@ -1904,43 +1906,45 @@ void sub_8086910(Entity *entity) void sub_808692C(void) { sub_80859F0(DIRECTION_NORTHWEST); - sub_803E708(4, 70); + DungeonWaitFrames_Async(4, 70); sub_80859F0(DIRECTION_WEST); - sub_803E708(4, 70); + DungeonWaitFrames_Async(4, 70); sub_80859F0(DIRECTION_SOUTHWEST); - sub_803E708(4, 70); + DungeonWaitFrames_Async(4, 70); sub_80859F0(DIRECTION_SOUTH); - sub_803E708(4, 70); + DungeonWaitFrames_Async(4, 70); } -void SpriteLookAroundEffect(Entity *entity) +void CutsceneLookAroundEffect_Async(Entity *entity) { - s8 dir = sub_8002984((s8) GetEntInfo(entity)->action.direction, 4); + s8 dir = (s8)GetEntInfo(entity)->action.direction; - sub_80869E4(entity, 4, 2, dir); - sub_803E708(15, 70); - dir = sub_8002984(dir, 5); - sub_80869E4(entity, 4, 1, dir); - sub_803E708(15, 70); - sub_80869E4(entity, 4, 2, (s8) sub_8002984(dir, 4)); - sub_803E708(15, 70); + dir = TransformDirection1(dir, DIR_TRANS_SPINLEFT2); + CutsceneLookDir_Async(entity, 4, DIR_TRANS_SPINLEFT1, dir); + DungeonWaitFrames_Async(15, 70); + dir = TransformDirection1(dir, DIR_TRANS_FLIP); + CutsceneLookDir_Async(entity, 4, DIR_TRANS_SPINRIGHT1, dir); + DungeonWaitFrames_Async(15, 70); + dir = TransformDirection1(dir, DIR_TRANS_SPINLEFT2); + CutsceneLookDir_Async(entity, 4, DIR_TRANS_SPINLEFT1, dir); + DungeonWaitFrames_Async(15, 70); } -void sub_80869E4(struct Entity *entity, s32 a1, u8 a2, s32 _someDirection) +void CutsceneLookDir_Async(struct Entity *entity, s32 numFrames, u8 dirTrans, s32 _someDirection) { s32 someDirection = (s8) _someDirection; struct EntityInfo *info = GetEntInfo(entity); s32 direction = (s8) info->action.direction; while (direction != someDirection) { - direction = (s8) sub_8002A70(direction, someDirection, a2); + direction = (s8) TransformDirection2(direction, someDirection, dirTrans); info->action.direction = direction; info->action.direction &= DIRECTION_MASK; sub_806CE68(entity, info->action.direction); - sub_803E708(a1, 70); + DungeonWaitFrames_Async(numFrames, 70); } } @@ -1980,7 +1984,7 @@ void SetupBossFightHP(Entity *pokemon, s32 newHP, u16 songIndex) void sub_8086AC0(void) { if (!IsFloorOver() && gDungeon->unk2 == DUNGEON_UNK2_0) - sub_8097FF8(); + FlushTempCutsceneFlags(); } bool8 sub_8086AE4(s16 _index) diff --git a/src/dungeon_cutscene_articuno.c b/src/dungeon_cutscene_articuno.c index dbe44373a..bacdb23b5 100644 --- a/src/dungeon_cutscene_articuno.c +++ b/src/dungeon_cutscene_articuno.c @@ -92,10 +92,10 @@ void sub_8087FF8(void) CopyMonsterNameToBuffer(gFormatBuffer_Monsters[2], MONSTER_ARTICUNO); } -void sub_8088088(u8 monsterBehavior, u8 cutscene) +void HandleArticunoBossFaint(u8 monsterBehavior, u8 cutscene) { if ((cutscene == CUTSCENE_FROSTY_GROTTO_ATTEMPT1 || cutscene == CUTSCENE_FROSTY_GROTTO_ATTEMPT2 || cutscene == CUTSCENE_FROSTY_GROTTO_POSTSTORY) && monsterBehavior == BEHAVIOR_ARTICUNO) { - sub_8097FA8(9); + SetTempCutsceneFlag(CUTSCENE_FLAG_FROSTY_GROTTO_COMPLETE); gDungeon->unk2 = DUNGEON_UNK2_1; } } @@ -110,70 +110,70 @@ void ArticunoPreFightDialogue(void) partnerEntity = CutsceneGetPartner(); articunoEntity = GetEntityFromMonsterBehavior(BEHAVIOR_ARTICUNO); sub_8086448(); - SpriteLookAroundEffect(partnerEntity); - DisplayDungeonDialogue(gArticunoPreFightDialogue_1); - sub_803E708(10,0x46); + CutsceneLookAroundEffect_Async(partnerEntity); + DisplayDungeonDialogue_Async(gArticunoPreFightDialogue_1); + DungeonWaitFrames_Async(10,0x46); sub_8086598(); DungeonStopBGM(); - DisplayDungeonDialogue(&gArticunoPreFightDialogue_2); - sub_803E708(10,0x46); - sub_80869E4(partnerEntity,4,1,DIRECTION_EAST); - sub_80869E4(leaderEntity,4,2,DIRECTION_WEST); - DisplayDungeonDialogue(&gArticunoPreFightDialogue_3); - sub_803E708(10,0x46); + DisplayDungeonDialogue_Async(&gArticunoPreFightDialogue_2); + DungeonWaitFrames_Async(10,0x46); + CutsceneLookDir_Async(partnerEntity,4,DIR_TRANS_SPINRIGHT1,DIRECTION_EAST); + CutsceneLookDir_Async(leaderEntity,4,DIR_TRANS_SPINLEFT1,DIRECTION_WEST); + DisplayDungeonDialogue_Async(&gArticunoPreFightDialogue_3); + DungeonWaitFrames_Async(10,0x46); SetFacingDirection(leaderEntity, DIRECTION_WEST); - sub_803E708(4,0x46); + DungeonWaitFrames_Async(4,0x46); SetFacingDirection(leaderEntity, DIRECTION_NORTHWEST); - sub_803E708(4,0x46); + DungeonWaitFrames_Async(4,0x46); SetFacingDirection(leaderEntity, DIRECTION_WEST); - sub_803E708(4,0x46); + DungeonWaitFrames_Async(4,0x46); SetFacingDirection(leaderEntity, DIRECTION_SOUTHWEST); - sub_803E708(4,0x46); + DungeonWaitFrames_Async(4,0x46); SetFacingDirection(leaderEntity, DIRECTION_WEST); - sub_803E708(4,0x46); + DungeonWaitFrames_Async(4,0x46); SetFacingDirection(leaderEntity, DIRECTION_NORTHWEST); - sub_803E708(4,0x46); + DungeonWaitFrames_Async(4,0x46); SetFacingDirection(leaderEntity, DIRECTION_WEST); - sub_803E708(10,0x46); - DisplayDungeonDialogue(gArticunoPreFightDialogue_4); - sub_803E708(10,0x46); - DisplayDungeonDialogue(&gArticunoPreFightDialogue_5); - sub_803E708(10,0x46); - sub_80869E4(leaderEntity,4,1,DIRECTION_NORTH); - sub_80869E4(partnerEntity,4,2,DIRECTION_NORTH); + DungeonWaitFrames_Async(10,0x46); + DisplayDungeonDialogue_Async(gArticunoPreFightDialogue_4); + DungeonWaitFrames_Async(10,0x46); + DisplayDungeonDialogue_Async(&gArticunoPreFightDialogue_5); + DungeonWaitFrames_Async(10,0x46); + CutsceneLookDir_Async(leaderEntity,4,DIR_TRANS_SPINRIGHT1,DIRECTION_NORTH); + CutsceneLookDir_Async(partnerEntity,4,DIR_TRANS_SPINLEFT1,DIRECTION_NORTH); PlaySoundEffect(0x1d5); - SpriteLookAroundEffect(partnerEntity); + CutsceneLookAroundEffect_Async(partnerEntity); PlaySoundEffect(0x1d5); - SpriteLookAroundEffect(leaderEntity); - DisplayDungeonDialogue(&gArticunoPreFightDialogue_6); - sub_803E708(10,0x46); - DisplayDungeonDialogue(&gArticunoPreFightDialogue_7); - sub_803E708(10,0x46); + CutsceneLookAroundEffect_Async(leaderEntity); + DisplayDungeonDialogue_Async(&gArticunoPreFightDialogue_6); + DungeonWaitFrames_Async(10,0x46); + DisplayDungeonDialogue_Async(&gArticunoPreFightDialogue_7); + DungeonWaitFrames_Async(10,0x46); PlaySoundEffect(0); // snow flurry gDungeon->weather.unkE265 = WEATHER_SNOW; sub_807EAA0(0,1); PlaySoundEffect(0x1ee); // flash effect? sub_8088574(); - DisplayDungeonDialogue(&gArticunoPreFightDialogue_8); - sub_803E708(10,0x46); + DisplayDungeonDialogue_Async(&gArticunoPreFightDialogue_8); + DungeonWaitFrames_Async(10,0x46); ArticunoScreenFlash(); sub_8086738(); PlaySoundEffect(0x1da); - DisplayDungeonDialogue(&gArticunoPreFightDialogue_9); - sub_803E708(10,0x46); + DisplayDungeonDialogue_Async(&gArticunoPreFightDialogue_9); + DungeonWaitFrames_Async(10,0x46); PlaySoundEffect(0x1ea); sub_8088484(articunoEntity); sub_80865E8(); ArticunoScreenFlash(); - DisplayDungeonDialogue(&gArticunoPreFightDialogue_10); + DisplayDungeonDialogue_Async(&gArticunoPreFightDialogue_10); sub_806CDD4(articunoEntity,0xf,DIRECTION_SOUTH); ArticunoScreenFlash(); - DisplayDungeonDialogue(&gArticunoPreFightDialogue_11); + DisplayDungeonDialogue_Async(&gArticunoPreFightDialogue_11); sub_806CDD4(articunoEntity,0x10,DIRECTION_SOUTH); ArticunoScreenFlash(); - DisplayDungeonDialogue(&gArticunoPreFightDialogue_12); + DisplayDungeonDialogue_Async(&gArticunoPreFightDialogue_12); sub_806CDD4(articunoEntity,0xf,DIRECTION_SOUTH); - sub_803E708(0x10,0x46); + DungeonWaitFrames_Async(0x10,0x46); SetupBossFightHP(articunoEntity,0x1c2,MUS_BOSS_BATTLE); ShiftCameraToPosition(&leaderEntity->pixelPos,0x10); } @@ -187,15 +187,15 @@ void ArticunoReFightDialogue(void) articunoEntity = GetEntityFromMonsterBehavior(BEHAVIOR_ARTICUNO); gDungeon->weather.unkE265 = WEATHER_SNOW; sub_807EAA0(0,1); - sub_803E708(10,0x46); - DisplayDungeonDialogue(&gArticunoReFightDialogue_1); + DungeonWaitFrames_Async(10,0x46); + DisplayDungeonDialogue_Async(&gArticunoReFightDialogue_1); sub_806CDD4(articunoEntity,0x10,DIRECTION_SOUTH); ArticunoScreenFlash(); - DisplayDungeonDialogue(&gArticunoReFightDialogue_2); + DisplayDungeonDialogue_Async(&gArticunoReFightDialogue_2); ArticunoScreenFlash(); - DisplayDungeonDialogue(&gArticunoReFightDialogue_3); + DisplayDungeonDialogue_Async(&gArticunoReFightDialogue_3); sub_806CDD4(articunoEntity,0xf,DIRECTION_SOUTH); - sub_803E708(0x28,0x46); + DungeonWaitFrames_Async(0x28,0x46); SetupBossFightHP(articunoEntity,0x1c2,MUS_BOSS_BATTLE); ShiftCameraToPosition(&leaderEntity->pixelPos,0x10); } @@ -217,21 +217,21 @@ void ArticunoPostStoryPreFightDialogue(void) ArticunoScreenFlash(); sub_8086738(); PlaySoundEffect(0x1da); - DisplayDungeonDialogue(&gArticunoPostStoryPreFightDialogue_1); - sub_803E708(10,0x46); + DisplayDungeonDialogue_Async(&gArticunoPostStoryPreFightDialogue_1); + DungeonWaitFrames_Async(10,0x46); sub_8088484(articunoEntity); ArticunoScreenFlash(); - DisplayDungeonDialogue(&gArticunoPostStoryPreFightDialogue_2); + DisplayDungeonDialogue_Async(&gArticunoPostStoryPreFightDialogue_2); sub_806CDD4(articunoEntity,0xf,DIRECTION_SOUTH); ArticunoScreenFlash(); - DisplayDungeonDialogue(&gArticunoPostStoryPreFightDialogue_3); + DisplayDungeonDialogue_Async(&gArticunoPostStoryPreFightDialogue_3); sub_806CDD4(articunoEntity,0x10,DIRECTION_SOUTH); ArticunoScreenFlash(); - DisplayDungeonDialogue(&gArticunoPostStoryPreFightDialogue_4); + DisplayDungeonDialogue_Async(&gArticunoPostStoryPreFightDialogue_4); ArticunoScreenFlash(); - DisplayDungeonDialogue(&gArticunoPostStoryPreFightDialogue_5); + DisplayDungeonDialogue_Async(&gArticunoPostStoryPreFightDialogue_5); sub_806CDD4(articunoEntity,0xf,DIRECTION_SOUTH); - sub_803E708(0x28,0x46); + DungeonWaitFrames_Async(0x28,0x46); SetupBossFightHP(articunoEntity,0x1c2,MUS_BOSS_BATTLE); ShiftCameraToPosition(&leaderEntity->pixelPos,0x10); } @@ -262,19 +262,19 @@ static void ArticunoScreenFlash(void) SetDungeonBGColorRGB(iVar1 / 2,iVar1,iVar1,1,1); DungeonRunFrameActions(0x46); } - sub_803E708(4,0x46); + DungeonWaitFrames_Async(4,0x46); for(iVar1 = 250; iVar1 > 199; iVar1 -= 10) { SetDungeonBGColorRGB(0,iVar1,iVar1,1,1); DungeonRunFrameActions(0x46); } - sub_803E708(4,0x46); + DungeonWaitFrames_Async(4,0x46); for(iVar1 = 250; iVar1 >= 0; iVar1 -= 10) { SetDungeonBGColorRGB(iVar1 / 2,iVar1,iVar1,1,1); DungeonRunFrameActions(0x46); } - sub_803E708(4,0x46); + DungeonWaitFrames_Async(4,0x46); sub_8085EB0(); } diff --git a/src/dungeon_cutscene_celebi.c b/src/dungeon_cutscene_celebi.c index 1930cc1f5..2383a7134 100644 --- a/src/dungeon_cutscene_celebi.c +++ b/src/dungeon_cutscene_celebi.c @@ -39,26 +39,26 @@ static void sub_808C9B0(Entity *param_1); void sub_808C5C0(void) { - Entity * leaderEntity; - Entity * celebiEntity; + Entity * leaderEntity; + Entity * celebiEntity; - u32 XPos; - s32 YPos; + u32 XPos; + s32 YPos; - leaderEntity = CutsceneGetLeader(); - celebiEntity = GetEntityFromMonsterBehavior(BEHAVIOR_CELEBI); - DungeonStartNewBGM(MUS_FRIEND_AREA_HEALING_FOREST); - sub_80854D4(); - sub_8085930(DIRECTION_NORTH); - SetFacingDirection(celebiEntity, DIRECTION_SOUTH); - sub_8085860(leaderEntity->pos.x,leaderEntity->pos.y); - XPos = GetCameraXPos(); - YPos = GetCameraYPos(); - sub_803F878(XPos,YPos - 0x1000); - CopyMonsterNameToBuffer(gFormatBuffer_Monsters[2], MONSTER_CELEBI); + leaderEntity = CutsceneGetLeader(); + celebiEntity = GetEntityFromMonsterBehavior(BEHAVIOR_CELEBI); + DungeonStartNewBGM(MUS_FRIEND_AREA_HEALING_FOREST); + sub_80854D4(); + sub_8085930(DIRECTION_NORTH); + SetFacingDirection(celebiEntity, DIRECTION_SOUTH); + sub_8085860(leaderEntity->pos.x,leaderEntity->pos.y); + XPos = GetCameraXPos(); + YPos = GetCameraYPos(); + sub_803F878(XPos,YPos - 0x1000); + CopyMonsterNameToBuffer(gFormatBuffer_Monsters[2], MONSTER_CELEBI); } -void nullsub_100(u8 monsterBehavior, u8 cutscene, u8 r3) +void HandleCelebiBossFaint(u8 monsterBehavior, u8 cutscene, bool8 transformedIntoFriend) { } @@ -74,35 +74,35 @@ void CelebiJoinDialogue(void) if ((HasRecruitedMon(MONSTER_CELEBI)) || (!CanEntityBeRecruited(celebiEntity))) { HandleFaint_Async(celebiEntity,DUNGEON_EXIT_DELETED_FOR_EVENT,0); - SpriteLookAroundEffect(leaderEntity); - sub_803E708(10,0x46); + CutsceneLookAroundEffect_Async(leaderEntity); + DungeonWaitFrames_Async(10,0x46); // ......... - DisplayDungeonDialogue(&gCelebiJoinDialogue_10); + DisplayDungeonDialogue_Async(&gCelebiJoinDialogue_10); } else { - SpriteLookAroundEffect(leaderEntity); - sub_803E708(10,0x46); + CutsceneLookAroundEffect_Async(leaderEntity); + DungeonWaitFrames_Async(10,0x46); SpriteShockEffect(leaderEntity); - sub_803E708(10,0x46); + DungeonWaitFrames_Async(10,0x46); // Oh? There's someone there. - DisplayDungeonDialogue(&gCelebiJoinDialogue_1); - sub_803E708(10,0x46); + DisplayDungeonDialogue_Async(&gCelebiJoinDialogue_1); + DungeonWaitFrames_Async(10,0x46); sub_8086598(); sub_8086598(); sub_8086598(); sub_8086598(); // The Time-Traveling Pokemon {POKEMON_2} (Celebi)! - DisplayDungeonDialogue(&gCelebiJoinDialogue_2); + DisplayDungeonDialogue_Async(&gCelebiJoinDialogue_2); PlaySoundEffect(0x1c7); sub_806CDD4(celebiEntity,10,DIRECTION_SOUTH); - sub_803E708(0x14,0x46); + DungeonWaitFrames_Async(0x14,0x46); sub_806CE68(celebiEntity, DIRECTION_SOUTH); - sub_803E708(4,0x46); + DungeonWaitFrames_Async(4,0x46); PlaySoundEffect(0x1c7); sub_806CDD4(celebiEntity,10,DIRECTION_SOUTH); - DisplayDungeonDialogue(&gCelebiJoinDialogue_3); - sub_803E708(10,0x46); + DisplayDungeonDialogue_Async(&gCelebiJoinDialogue_3); + DungeonWaitFrames_Async(10,0x46); state = 0; do @@ -115,7 +115,7 @@ void CelebiJoinDialogue(void) menuChoice = DisplayDungeonMenuMessage(0,gPtrPurityForestAllowCelebiToJoinText, gPurityForestAllowCelebiToJoinPrompt,0x701); } while (menuChoice < 1); - sub_803E708(10,0x46); + DungeonWaitFrames_Async(10,0x46); if (menuChoice == 1) { @@ -127,26 +127,26 @@ void CelebiJoinDialogue(void) DungeonStartNewBGM(MUS_FRIEND_AREA_HEALING_FOREST); PlaySoundEffect(0x1c7); sub_80861D4(celebiEntity,0xd,DIRECTION_SOUTH); - sub_803E708(0x37,0x46); + DungeonWaitFrames_Async(0x37,0x46); PlaySoundEffect(0x1d5); - sub_803E708(0x1a,0x46); + DungeonWaitFrames_Async(0x1a,0x46); PlaySoundEffect(0x1d5); - sub_803E708(0x1c,0x46); - DisplayDungeonDialogue(&gCelebiJoinDialogue_4); - sub_803E708(10,0x46); + DungeonWaitFrames_Async(0x1c,0x46); + DisplayDungeonDialogue_Async(&gCelebiJoinDialogue_4); + DungeonWaitFrames_Async(10,0x46); HandleSpecialEntityJoinSequence(leaderEntity,celebiEntity,&celebiEntity); DungeonStartNewBGM(MUS_FRIEND_AREA_HEALING_FOREST); - DisplayDungeonDialogue(&gCelebiJoinDialogue_5); - sub_803E708(10,0x46); + DisplayDungeonDialogue_Async(&gCelebiJoinDialogue_5); + DungeonWaitFrames_Async(10,0x46); PlaySoundEffect(0x1c7); sub_80861D4(celebiEntity,0xd,DIRECTION_SOUTH); - sub_803E708(0x37,0x46); + DungeonWaitFrames_Async(0x37,0x46); PlaySoundEffect(0x1d5); - sub_803E708(0x1a,0x46); + DungeonWaitFrames_Async(0x1a,0x46); PlaySoundEffect(0x1d5); - sub_803E708(0x1b,0x46); - DisplayDungeonDialogue(&gCelebiJoinDialogue_6); - sub_803E708(10,0x46); + DungeonWaitFrames_Async(0x1b,0x46); + DisplayDungeonDialogue_Async(&gCelebiJoinDialogue_6); + DungeonWaitFrames_Async(10,0x46); state = 2; } else @@ -165,17 +165,17 @@ void CelebiJoinDialogue(void) } else { - sub_803E708(10,0x46); - DisplayDungeonDialogue(&gCelebiJoinDialogue_7); + DungeonWaitFrames_Async(10,0x46); + DisplayDungeonDialogue_Async(&gCelebiJoinDialogue_7); sub_80861F8(0x3e,celebiEntity,1); - sub_803E708(0x18,0x46); + DungeonWaitFrames_Async(0x18,0x46); sub_80861F8(0x3e,celebiEntity,1); - sub_803E708(0xe,0x46); - DisplayDungeonDialogue(&gCelebiJoinDialogue_8); - sub_803E708(10,0x46); + DungeonWaitFrames_Async(0xe,0x46); + DisplayDungeonDialogue_Async(&gCelebiJoinDialogue_8); + DungeonWaitFrames_Async(10,0x46); sub_808C8E0(celebiEntity); - DisplayDungeonDialogue(&gCelebiJoinDialogue_9); - sub_803E708(10,0x46); + DisplayDungeonDialogue_Async(&gCelebiJoinDialogue_9); + DungeonWaitFrames_Async(10,0x46); state = 2; } break; @@ -183,7 +183,7 @@ void CelebiJoinDialogue(void) } while (state != 2); } DungeonFadeOutBGM(30); - sub_803E708(30, 70); + DungeonWaitFrames_Async(30, 70); gDungeon->unk2 = DUNGEON_UNK2_1; } @@ -204,38 +204,42 @@ static void sub_808C8E0(Entity *entity) sub_8086A3C(entity); } +// TODO: Yeah that doesn't look like Celebi stuff. +// Check if it's a file split in blue... + void sub_808C938(void) { sub_80855E4(sub_808C9B0); } -void sub_808C948(Entity *entity, u8 cutscene) +void HandleMazeBossFaint(Entity *entity, u8 cutscene) { - bool8 flag; - s32 index; - Entity *pokeEntity; + s32 i; + Entity *pokeEntity; - if (cutscene == CUTSCENE_MAZE_BOSS) { - flag = FALSE; - for(index = 0; index < DUNGEON_MAX_WILD_POKEMON; index++){ - pokeEntity = gDungeon->wildPokemon[index]; - if ((pokeEntity != entity) && (EntityIsValid(pokeEntity))) { - flag = TRUE; - break; - } + if (cutscene == CUTSCENE_MAZE_BOSS) { + bool8 stillAlive = FALSE; + + for (i = 0; i < DUNGEON_MAX_WILD_POKEMON; i++){ + pokeEntity = gDungeon->wildPokemon[i]; + if (pokeEntity != entity && EntityIsValid(pokeEntity)) { + stillAlive = TRUE; + break; + } + } + + if (!stillAlive) { + gDungeon->unk2 = DUNGEON_UNK2_1; + } } - if (!flag) { - gDungeon->unk2 = DUNGEON_UNK2_1; - } - } } void sub_808C998(void) { // Defeat the opposing team to win // Be careful, your opponents are tough - DisplayDungeonDialogue(&gUnknown_8106720); - sub_803E708(0xA, 0x46); + DisplayDungeonDialogue_Async(&gUnknown_8106720); + DungeonWaitFrames_Async(0xA, 0x46); } static void sub_808C9B0(Entity *param_1) diff --git a/src/dungeon_cutscene_deoxys.c b/src/dungeon_cutscene_deoxys.c index ad07fd1fe..b4c6f576c 100644 --- a/src/dungeon_cutscene_deoxys.c +++ b/src/dungeon_cutscene_deoxys.c @@ -58,7 +58,7 @@ void sub_808C3A0(void) CopyMonsterNameToBuffer(gFormatBuffer_Monsters[2], MONSTER_DEOXYS_NORMAL); } -void sub_808C414(u8 monsterBehavior, u8 cutscene, u8 param_3) +void HandleDeoxysNormalBossFaint(u8 monsterBehavior, u8 cutscene, bool8 transformedIntoFriend) { if (cutscene == CUTSCENE_METEOR_CAVE && monsterBehavior == BEHAVIOR_DEOXYS_NORMAL) { gDungeon->unk2 = DUNGEON_UNK2_1; @@ -78,15 +78,15 @@ void DeoxysPreFightDialogue(void) sub_80866C4(&gDeoxysPreFightDialogue_5); } else { - DisplayDungeonDialogue(&gDeoxysPreFightDialogue_1); + DisplayDungeonDialogue_Async(&gDeoxysPreFightDialogue_1); DungeonFadeInNewBGM(MUS_RAYQUAZAS_DOMAIN, 0x3c); sub_808C550(); - DisplayDungeonDialogue(&gDeoxysPreFightDialogue_2); + DisplayDungeonDialogue_Async(&gDeoxysPreFightDialogue_2); DeoxysScreenFlash(); - DisplayDungeonDialogue(&gDeoxysPreFightDialogue_3); + DisplayDungeonDialogue_Async(&gDeoxysPreFightDialogue_3); DeoxysScreenFlash(); - DisplayDungeonDialogue(&gDeoxysPreFightDialogue_4); - sub_803E708(10,0x46); + DisplayDungeonDialogue_Async(&gDeoxysPreFightDialogue_4); + DungeonWaitFrames_Async(10,0x46); sub_808563C(SetupDeoxysFightHP); ShiftCameraToPosition(&leaderEntity->pixelPos,0x10); } @@ -101,17 +101,17 @@ static void DeoxysScreenFlash(void) SetDungeonBGColorRGB(iVar1,0,0,1,1); DungeonRunFrameActions(0x46); } - sub_803E708(10,0x46); + DungeonWaitFrames_Async(10,0x46); for(iVar1 = 250; iVar1 > 199; iVar1 -= 10){ SetDungeonBGColorRGB(iVar1,iVar1,0,1,1); DungeonRunFrameActions(0x46); } - sub_803E708(10,0x46); + DungeonWaitFrames_Async(10,0x46); for(iVar1 = 250; iVar1 >= 0; iVar1 -= 10){ SetDungeonBGColorRGB(iVar1,0,0,1,1); DungeonRunFrameActions(0x46); } - sub_803E708(10,0x46); + DungeonWaitFrames_Async(10,0x46); sub_8085EB0(); } diff --git a/src/dungeon_cutscene_empty_summit.c b/src/dungeon_cutscene_empty_summit.c index a8ca8b669..991f3999f 100644 --- a/src/dungeon_cutscene_empty_summit.c +++ b/src/dungeon_cutscene_empty_summit.c @@ -33,7 +33,7 @@ void sub_80885A0(void) { DungeonFadeOutBGM(0x3c); - sub_803E708(0x3c,0x46); + DungeonWaitFrames_Async(0x3c,0x46); DungeonStopBGM(); gDungeon->unk7 = 1; } @@ -44,7 +44,7 @@ void sub_80885C4(void) leaderEntity = CutsceneGetLeader(); DungeonFadeOutBGM(0x3c); - sub_803E708(0x3c,0x46); + DungeonWaitFrames_Async(0x3c,0x46); DungeonStopBGM(); sub_80854D4(); sub_8085930(DIRECTION_NORTH); diff --git a/src/dungeon_cutscene_entei.c b/src/dungeon_cutscene_entei.c index 32001169f..61cbbb01f 100644 --- a/src/dungeon_cutscene_entei.c +++ b/src/dungeon_cutscene_entei.c @@ -68,10 +68,10 @@ void sub_8089C90(void) CopyMonsterNameToBuffer(gFormatBuffer_Monsters[2], MONSTER_ENTEI); } -void sub_8089CFC(u8 monsterBehavior, u8 cutscene) +void HandleEnteiBossFaint(u8 monsterBehavior, u8 cutscene) { if ((cutscene == CUTSCENE_FIERY_FIELD_ATTEMPT1 || cutscene == CUTSCENE_FIERY_FIELD_ATTEMPT2 || cutscene == CUTSCENE_FIERY_FIELD_POSTSTORY) && monsterBehavior == BEHAVIOR_ENTEI) { - sub_8097FA8(21); + SetTempCutsceneFlag(CUTSCENE_FLAG_FIERY_FIELD_COMPLETE); gDungeon->unk2 = DUNGEON_UNK2_1; } } @@ -84,12 +84,12 @@ void EnteiPreFightDialogue(void) leaderEntity = CutsceneGetLeader(); EnteiEntity = GetEntityFromMonsterBehavior(BEHAVIOR_ENTEI); EnteiScreenFlash(); - DisplayDungeonDialogue(&gEnteiPreFightDialogue_1); + DisplayDungeonDialogue_Async(&gEnteiPreFightDialogue_1); EnteiScreenFlash(); - DisplayDungeonDialogue(&gEnteiPreFightDialogue_2); + DisplayDungeonDialogue_Async(&gEnteiPreFightDialogue_2); EnteiScreenFlash(); - DisplayDungeonDialogue(&gEnteiPreFightDialogue_3); - sub_803E708(10,70); + DisplayDungeonDialogue_Async(&gEnteiPreFightDialogue_3); + DungeonWaitFrames_Async(10,70); SetupBossFightHP(EnteiEntity,600,MUS_BOSS_BATTLE); ShiftCameraToPosition(&leaderEntity->pixelPos,0x10); } @@ -102,12 +102,12 @@ void EnteiReFightDialogue(void) leaderEntity = CutsceneGetLeader(); EnteiEntity = GetEntityFromMonsterBehavior(BEHAVIOR_ENTEI); EnteiScreenFlash(); - DisplayDungeonDialogue(&gEnteiReFightDialogue_1); + DisplayDungeonDialogue_Async(&gEnteiReFightDialogue_1); EnteiScreenFlash(); - DisplayDungeonDialogue(&gEnteiReFightDialogue_2); + DisplayDungeonDialogue_Async(&gEnteiReFightDialogue_2); EnteiScreenFlash(); - DisplayDungeonDialogue(&gEnteiReFightDialogue_3); - sub_803E708(10,70); + DisplayDungeonDialogue_Async(&gEnteiReFightDialogue_3); + DungeonWaitFrames_Async(10,70); SetupBossFightHP(EnteiEntity,600,MUS_BOSS_BATTLE); ShiftCameraToPosition(&leaderEntity->pixelPos,0x10); } @@ -124,12 +124,12 @@ void EnteiPostStoryPreFightDialogue(void) } else { EnteiScreenFlash(); - DisplayDungeonDialogue(&gEnteiPostStoryPreFightDialogue_1); + DisplayDungeonDialogue_Async(&gEnteiPostStoryPreFightDialogue_1); EnteiScreenFlash(); - DisplayDungeonDialogue(&gEnteiPostStoryPreFightDialogue_2); + DisplayDungeonDialogue_Async(&gEnteiPostStoryPreFightDialogue_2); EnteiScreenFlash(); - DisplayDungeonDialogue(&gEnteiPostStoryPreFightDialogue_3); - sub_803E708(10,70); + DisplayDungeonDialogue_Async(&gEnteiPostStoryPreFightDialogue_3); + DungeonWaitFrames_Async(10,70); SetupBossFightHP(EnteiEntity,600,MUS_BOSS_BATTLE); ShiftCameraToPosition(&leaderEntity->pixelPos,0x10); } @@ -140,24 +140,24 @@ static void EnteiScreenFlash(void) s32 iVar1; PlaySoundEffect(0x1ed); - for(iVar1 = 250; iVar1 > 149; iVar1 -= 10) + for(iVar1 = 250; iVar1 >= 150; iVar1 -= 10) { SetDungeonBGColorRGB(iVar1, iVar1 / 2, iVar1 / 2, 1, 1); DungeonRunFrameActions(70); } - sub_803E708(10,70); - for(iVar1 = 250; iVar1 > 199; iVar1 -= 10) + DungeonWaitFrames_Async(10,70); + for(iVar1 = 250; iVar1 >= 200; iVar1 -= 10) { SetDungeonBGColorRGB(iVar1, 0, 0, 1, 1); DungeonRunFrameActions(70); } - sub_803E708(10,70); + DungeonWaitFrames_Async(10,70); for(iVar1 = 250; iVar1 >= 0; iVar1 -= 10) { SetDungeonBGColorRGB(iVar1, iVar1 / 2, iVar1 / 2, 1, 1); DungeonRunFrameActions(70); } - sub_803E708(10,70); + DungeonWaitFrames_Async(10,70); sub_8085EB0(); } diff --git a/src/dungeon_cutscene_groudon.c b/src/dungeon_cutscene_groudon.c index 06aef10b1..5f9a2ebc4 100644 --- a/src/dungeon_cutscene_groudon.c +++ b/src/dungeon_cutscene_groudon.c @@ -116,10 +116,10 @@ void sub_808875C(void) CopyMonsterNameToBuffer(gFormatBuffer_Monsters[3], MONSTER_ALAKAZAM); } -void sub_8088818(u8 monsterBehavior, u8 cutscene) +void HandleGroudonBossFaint(u8 monsterBehavior, u8 cutscene) { if ((cutscene == CUTSCENE_MAGMA_CAVERN_PIT_ATTEMPT1 || cutscene == CUTSCENE_MAGMA_CAVERN_PIT_ATTEMPT2 || cutscene == CUTSCENE_MAGMA_CAVERN_PIT_POSTSTORY) && monsterBehavior == BEHAVIOR_GROUDON_2) { - sub_8097FA8(12); + SetTempCutsceneFlag(CUTSCENE_FLAG_MAGMA_CAVERN_PIT_COMPLETE); gDungeon->unk2 = DUNGEON_UNK2_1; } } @@ -141,69 +141,69 @@ void GroudonPreFightDialogue(void) alakazamEntity = GetEntityFromMonsterBehavior(BEHAVIOR_ALAKAZAM_1); groudonEntity = GetEntityFromMonsterBehavior(BEHAVIOR_GROUDON_2); sub_8086448(); - DisplayDungeonDialogue(GroudonPreFightDialogue_1); - sub_803E708(10,0x46); - sub_803E708(0x3c,0x46); - DisplayDungeonDialogue(&GroudonPreFightDialogue_2); - sub_803E708(10,0x46); + DisplayDungeonDialogue_Async(GroudonPreFightDialogue_1); + DungeonWaitFrames_Async(10,0x46); + DungeonWaitFrames_Async(0x3c,0x46); + DisplayDungeonDialogue_Async(&GroudonPreFightDialogue_2); + DungeonWaitFrames_Async(10,0x46); sub_8086838(1,1,1); sub_808680C(); - sub_803E708(0x3c,0x46); + DungeonWaitFrames_Async(0x3c,0x46); sub_808682C(); - sub_803E708(0x1e,0x46); - DisplayDungeonDialogue(&GroudonPreFightDialogue_3); - sub_803E708(10,0x46); + DungeonWaitFrames_Async(0x1e,0x46); + DisplayDungeonDialogue_Async(&GroudonPreFightDialogue_3); + DungeonWaitFrames_Async(10,0x46); sub_8086838(1,1,1); sub_808680C(); - sub_803E708(0x3c,0x46); - DisplayDungeonDialogue(&GroudonPreFightDialogue_4); - sub_803E708(10,0x46); + DungeonWaitFrames_Async(0x3c,0x46); + DisplayDungeonDialogue_Async(&GroudonPreFightDialogue_4); + DungeonWaitFrames_Async(10,0x46); GroudonScreenFlash(); - DisplayDungeonDialogue(&GroudonPreFightDialogue_5); - sub_803E708(10,0x46); - DisplayDungeonDialogue(&GroudonPreFightDialogue_6); - sub_803E708(10,0x46); + DisplayDungeonDialogue_Async(&GroudonPreFightDialogue_5); + DungeonWaitFrames_Async(10,0x46); + DisplayDungeonDialogue_Async(&GroudonPreFightDialogue_6); + DungeonWaitFrames_Async(10,0x46); PlaySoundEffect(0x1d5); - SpriteLookAroundEffect(partnerEntity); - DisplayDungeonDialogue(&GroudonPreFightDialogue_7); - sub_803E708(10,0x46); + CutsceneLookAroundEffect_Async(partnerEntity); + DisplayDungeonDialogue_Async(&GroudonPreFightDialogue_7); + DungeonWaitFrames_Async(10,0x46); sub_808682C(); - sub_803E708(0x3c,0x46); + DungeonWaitFrames_Async(0x3c,0x46); sub_80861B8(alakazamEntity,6,DIRECTION_NORTH); PlaySoundEffect(0x205); sub_8086738(); HandleFaint_Async(alakazamEntity,DUNGEON_EXIT_DELETED_FOR_EVENT,0); - DisplayDungeonDialogue(&GroudonPreFightDialogue_8); - sub_803E708(10,0x46); - DisplayDungeonDialogue(&GroudonPreFightDialogue_9); - sub_803E708(10,0x46); + DisplayDungeonDialogue_Async(&GroudonPreFightDialogue_8); + DungeonWaitFrames_Async(10,0x46); + DisplayDungeonDialogue_Async(&GroudonPreFightDialogue_9); + DungeonWaitFrames_Async(10,0x46); sub_8085930(DIRECTION_NORTH); sub_8086764(); - sub_803E708(0x28,0x46); + DungeonWaitFrames_Async(0x28,0x46); PlaySoundEffect(0x1d5); - SpriteLookAroundEffect(partnerEntity); - DisplayDungeonDialogue(GroudonPreFightDialogue_10); - sub_803E708(10,0x46); + CutsceneLookAroundEffect_Async(partnerEntity); + DisplayDungeonDialogue_Async(GroudonPreFightDialogue_10); + DungeonWaitFrames_Async(10,0x46); sub_8086838(1,1,1); sub_808680C(); - sub_803E708(0x3c,0x46); - DisplayDungeonDialogue(GroudonPreFightDialogue_11); - sub_803E708(10,0x46); + DungeonWaitFrames_Async(0x3c,0x46); + DisplayDungeonDialogue_Async(GroudonPreFightDialogue_11); + DungeonWaitFrames_Async(10,0x46); DungeonStopBGM(); GroudonScreenFlash2(); - sub_803E708(0x1e,0x46); - DisplayDungeonDialogue(&GroudonPreFightDialogue_12); - sub_803E708(10,0x46); - DisplayDungeonDialogue(&GroudonPreFightDialogue_13); - sub_803E708(10,0x46); - sub_803E708(0x1e,0x46); + DungeonWaitFrames_Async(0x1e,0x46); + DisplayDungeonDialogue_Async(&GroudonPreFightDialogue_12); + DungeonWaitFrames_Async(10,0x46); + DisplayDungeonDialogue_Async(&GroudonPreFightDialogue_13); + DungeonWaitFrames_Async(10,0x46); + DungeonWaitFrames_Async(0x1e,0x46); sub_808682C(); - sub_803E708(0x3c,0x46); + DungeonWaitFrames_Async(0x3c,0x46); PlaySoundEffect(0x1fa); sub_8086738(); sub_8085930(DIRECTION_NORTH); - DisplayDungeonDialogue(GroudonPreFightDialogue_14); - sub_803E708(10,0x46); + DisplayDungeonDialogue_Async(GroudonPreFightDialogue_14); + DungeonWaitFrames_Async(10,0x46); sub_8086A54(groudonEntity); sub_8085930(DIRECTION_NORTH); sub_8086764(); @@ -220,22 +220,22 @@ void GroudonReFightDialogue(void) groudonEntity = GetEntityFromMonsterBehavior(BEHAVIOR_GROUDON_2); sub_8086838(1,1,1); sub_808680C(); - sub_803E708(0x3c,0x46); - DisplayDungeonDialogue(gGroudonReFightDialogue_1); - sub_803E708(10,0x46); + DungeonWaitFrames_Async(0x3c,0x46); + DisplayDungeonDialogue_Async(gGroudonReFightDialogue_1); + DungeonWaitFrames_Async(10,0x46); GroudonScreenFlash(); - sub_803E708(0x1e,0x46); - DisplayDungeonDialogue(gGroudonReFightDialogue_2); - sub_803E708(10,0x46); - DisplayDungeonDialogue(&gGroudonReFightDialogue_3); - sub_803E708(10,0x46); + DungeonWaitFrames_Async(0x1e,0x46); + DisplayDungeonDialogue_Async(gGroudonReFightDialogue_2); + DungeonWaitFrames_Async(10,0x46); + DisplayDungeonDialogue_Async(&gGroudonReFightDialogue_3); + DungeonWaitFrames_Async(10,0x46); sub_808682C(); - sub_803E708(0x3c,0x46); + DungeonWaitFrames_Async(0x3c,0x46); DungeonStopBGM(); PlaySoundEffect(0x1fa); sub_8086738(); - DisplayDungeonDialogue(gGroudonReFightDialogue_4); - sub_803E708(10,0x46); + DisplayDungeonDialogue_Async(gGroudonReFightDialogue_4); + DungeonWaitFrames_Async(10,0x46); sub_8086A54(groudonEntity); sub_8085930(DIRECTION_NORTH); sub_8086764(); @@ -255,18 +255,18 @@ void GroudonPostStoryPreFightDialogue(void) sub_80866C4(&gUnknown_8103488); } else{ - DisplayDungeonDialogue(&gGroudonPostStoryPreFightDialogue_1); - sub_803E708(10,0x46); + DisplayDungeonDialogue_Async(&gGroudonPostStoryPreFightDialogue_1); + DungeonWaitFrames_Async(10,0x46); SceneGroudonMovement(groudonEntity); SceneGroudonMovement(groudonEntity); - DisplayDungeonDialogue(&gGroudonPostStoryPreFightDialogue_2); + DisplayDungeonDialogue_Async(&gGroudonPostStoryPreFightDialogue_2); PlaySoundEffect(0x1f6); GroudonScreenFlash(); - DisplayDungeonDialogue(&gGroudonPostStoryPreFightDialogue_3); + DisplayDungeonDialogue_Async(&gGroudonPostStoryPreFightDialogue_3); PlaySoundEffect(0x1f6); GroudonScreenFlash(); - DisplayDungeonDialogue(&gGroudonPostStoryPreFightDialogue_4); - sub_803E708(10,0x46); + DisplayDungeonDialogue_Async(&gGroudonPostStoryPreFightDialogue_4); + DungeonWaitFrames_Async(10,0x46); SetupBossFightHP(groudonEntity,500,MUS_BOSS_BATTLE); ShiftCameraToPosition(&leaderEntity->pixelPos,0x10); } @@ -293,10 +293,10 @@ static void SceneGroudonMovement(Entity * groudonEntity) } sub_80856C8(groudonEntity,groudonEntity->pos.x,groudonEntity->pos.y + 1); sub_80861D4(groudonEntity,0xf,DIRECTION_SOUTH); - sub_803E708(10,0x46); + DungeonWaitFrames_Async(10,0x46); sub_808682C(); sub_8085930(DIRECTION_NORTH); - sub_803E708(0x22,0x46); + DungeonWaitFrames_Async(0x22,0x46); } static void GroudonScreenFlash(void) @@ -308,21 +308,21 @@ static void GroudonScreenFlash(void) SetDungeonBGColorRGB(iVar1,iVar1 / 2,iVar1 / 2,1,1); DungeonRunFrameActions(0x46); } - sub_803E708(10,0x46); + DungeonWaitFrames_Async(10,0x46); for(iVar1 = 250; iVar1 > 199; iVar1 -= 10) { SetDungeonBGColorRGB(iVar1,iVar1 / 2,0,1,1); DungeonRunFrameActions(0x46); } - sub_803E708(10,0x46); + DungeonWaitFrames_Async(10,0x46); for(iVar1 = 250; iVar1 >= 0; iVar1 -= 10) { SetDungeonBGColorRGB(iVar1,iVar1 / 2,iVar1 / 2,1,1); DungeonRunFrameActions(0x46); } - sub_803E708(10,0x46); + DungeonWaitFrames_Async(10,0x46); sub_8085EB0(); } @@ -335,21 +335,21 @@ static void GroudonScreenFlash2(void) SetDungeonBGColorRGB(iVar1,iVar1 / 2,iVar1 / 2,1,1); DungeonRunFrameActions(0x46); } - sub_803E708(10,0x46); + DungeonWaitFrames_Async(10,0x46); for(iVar1 = 250; iVar1 > 199; iVar1 -= 10) { SetDungeonBGColorRGB(iVar1,iVar1 / 2,0,1,1); DungeonRunFrameActions(0x46); } - sub_803E708(10,0x46); + DungeonWaitFrames_Async(10,0x46); for(iVar1 = 250; iVar1 >= 0; iVar1 -= 10) { SetDungeonBGColorRGB(iVar1,iVar1 / 2,iVar1 / 2,1,1); DungeonRunFrameActions(0x46); } - sub_803E708(10,0x46); + DungeonWaitFrames_Async(10,0x46); sub_8085EB0(); } diff --git a/src/dungeon_cutscene_hooh.c b/src/dungeon_cutscene_hooh.c index ec4487cf6..9bb085d60 100644 --- a/src/dungeon_cutscene_hooh.c +++ b/src/dungeon_cutscene_hooh.c @@ -75,10 +75,10 @@ void sub_808A668(void) CopyMonsterNameToBuffer(gFormatBuffer_Monsters[2], MONSTER_HO_OH); } -void sub_808A6E8(u8 monsterBehavior, u8 cutscene) +void HandleHoOhBossFaint(u8 monsterBehavior, u8 cutscene) { if ((cutscene == CUTSCENE_MT_FARAWAY || cutscene == CUTSCENE_MT_FARAWAY_POSTSTORY) && monsterBehavior == BEHAVIOR_HO_OH) { - sub_8097FA8(26); + SetTempCutsceneFlag(CUTSCENE_FLAG_MT_FARAWAY_COMPLETE); gDungeon->unk2 = DUNGEON_UNK2_1; } } @@ -99,30 +99,30 @@ void HoOhPreFightDialogue(void) local_14.x = leaderEntity->pixelPos.x; local_14.y = leaderEntity->pixelPos.y + -0x1000; ShiftCameraToPosition(&local_14,0x88); - sub_803E708(0x40,70); - DisplayDungeonDialogue(&gHoOhPreFightDialogue_1); - sub_803E708(10,70); + DungeonWaitFrames_Async(0x40,70); + DisplayDungeonDialogue_Async(&gHoOhPreFightDialogue_1); + DungeonWaitFrames_Async(10,70); HoOhScreenFlash(); - DisplayDungeonDialogue(&gHoOhPreFightDialogue_2); - sub_803E708(10,70); + DisplayDungeonDialogue_Async(&gHoOhPreFightDialogue_2); + DungeonWaitFrames_Async(10,70); sub_80855E4(sub_80868F4); sub_808680C(); PlaySoundEffect(0x1c5); - sub_803E708(0xfa,70); + DungeonWaitFrames_Async(0xfa,70); HoOhDropInEffect(HoOhEntity); StopSoundEffect(0x1c5); sub_808682C(); sub_80855E4(sub_8086910); sub_8085930(DIRECTION_NORTH); - DisplayDungeonDialogue(&gHoOhPreFightDialogue_3); - DisplayDungeonDialogue(&gHoOhPreFightDialogue_4); - sub_803E708(0x1e,70); - sub_803E708(0x1e,70); + DisplayDungeonDialogue_Async(&gHoOhPreFightDialogue_3); + DisplayDungeonDialogue_Async(&gHoOhPreFightDialogue_4); + DungeonWaitFrames_Async(0x1e,70); + DungeonWaitFrames_Async(0x1e,70); HoOhScreenFlash(); - DisplayDungeonDialogue(&gHoOhPreFightDialogue_5); + DisplayDungeonDialogue_Async(&gHoOhPreFightDialogue_5); HoOhScreenFlash(); - DisplayDungeonDialogue(&gHoOhPreFightDialogue_6); - sub_803E708(10,70); + DisplayDungeonDialogue_Async(&gHoOhPreFightDialogue_6); + DungeonWaitFrames_Async(10,70); SetupBossFightHP(HoOhEntity,800,MUS_BATTLE_WITH_RAYQUAZA); ShiftCameraToPosition(&leaderEntity->pixelPos,0x10); } @@ -139,26 +139,26 @@ void HoOhReFightDialogue(void) local_14.x = leaderEntity->pixelPos.x; local_14.y = leaderEntity->pixelPos.y + -0x1000; ShiftCameraToPosition(&local_14,0x88); - sub_803E708(0x40,70); + DungeonWaitFrames_Async(0x40,70); if (HasRecruitedMon(MONSTER_HO_OH)) { sub_80866C4(&HoOhReFightDialogue_5); } else { - DisplayDungeonDialogue(&HoOhReFightDialogue_1); + DisplayDungeonDialogue_Async(&HoOhReFightDialogue_1); HoOhScreenFlash(); sub_80855E4(sub_80868F4); sub_808680C(); - sub_803E708(10,70); + DungeonWaitFrames_Async(10,70); HoOhDropInEffect(HoOhEntity); sub_808682C(); sub_80855E4(sub_8086910); sub_8085930(DIRECTION_NORTH); - DisplayDungeonDialogue(&HoOhReFightDialogue_2); + DisplayDungeonDialogue_Async(&HoOhReFightDialogue_2); HoOhScreenFlash(); - DisplayDungeonDialogue(&HoOhReFightDialogue_3); + DisplayDungeonDialogue_Async(&HoOhReFightDialogue_3); HoOhScreenFlash(); - DisplayDungeonDialogue(&HoOhReFightDialogue_4); - sub_803E708(10,70); + DisplayDungeonDialogue_Async(&HoOhReFightDialogue_4); + DungeonWaitFrames_Async(10,70); SetupBossFightHP(HoOhEntity,800,MUS_BATTLE_WITH_RAYQUAZA); ShiftCameraToPosition(&leaderEntity->pixelPos,0x10); } @@ -196,18 +196,18 @@ static void HoOhScreenFlash(void) SetDungeonBGColorRGB(iVar1,iVar1,iVar1,1,1); DungeonRunFrameActions(70); } - sub_803E708(10,70); + DungeonWaitFrames_Async(10,70); for(iVar1 = 250; iVar1 > 199; iVar1 -= 10) { SetDungeonBGColorRGB(iVar1,iVar1,iVar1,1,1); DungeonRunFrameActions(70); } - sub_803E708(10,70); + DungeonWaitFrames_Async(10,70); for(iVar1 = 250; iVar1 >= 0; iVar1 -= 10) { SetDungeonBGColorRGB(iVar1,iVar1,iVar1,1,1); DungeonRunFrameActions(70); } - sub_803E708(10,70); + DungeonWaitFrames_Async(10,70); sub_8085EB0(); } diff --git a/src/dungeon_cutscene_jirachi.c b/src/dungeon_cutscene_jirachi.c index e0cca0cfb..008106fd5 100644 --- a/src/dungeon_cutscene_jirachi.c +++ b/src/dungeon_cutscene_jirachi.c @@ -35,7 +35,7 @@ #include "dungeon_8041AD0.h" -static void sub_808B50C(void); +static void sub_808B50C_Async(void); static void JirachiWish_Async(void); static void JirachiWishGrantFlash(void); static void sub_808BB3C(DungeonPos *pos1); @@ -91,11 +91,11 @@ void sub_808B35C(void) CopyMonsterNameToBuffer(gFormatBuffer_Monsters[2], MONSTER_JIRACHI); } -void sub_808B3E4_Async(u8 monsterBehavior, u8 cutscene, u8 param_3) +void HandleJirachiBossFaint_Async(u8 monsterBehavior, u8 cutscene, bool8 transformedIntoFriend) { if ((cutscene == CUTSCENE_JIRACHI || cutscene == CUTSCENE_JIRACHI_POSTSTORY) && monsterBehavior == BEHAVIOR_JIRACHI) { - sub_8097FA8(30); - if (param_3 != 0) + SetTempCutsceneFlag(CUTSCENE_FLAG_JIRACHI_COMPLETE); + if (transformedIntoFriend) gDungeon->unk2 = DUNGEON_UNK2_1; else { bool8 b = gDungeon->unk1356C; @@ -103,7 +103,7 @@ void sub_808B3E4_Async(u8 monsterBehavior, u8 cutscene, u8 param_3) if (ItemInInventoryOrHeld(ITEM_WISH_STONE)) JirachiWish_Async(); else - sub_808B50C(); + sub_808B50C_Async(); gDungeon->unk1356C = b; UpdateMinimap(); @@ -119,26 +119,26 @@ void JirachiPreFightDialogue(void) leaderEntity = CutsceneGetLeader(); jirachiEntity = GetEntityFromMonsterBehavior(BEHAVIOR_JIRACHI); sub_8086448(); - sub_803E708(0x40,70); - DisplayDungeonDialogue(&gJirachiPreFightDialogue_1); - sub_803E708(10,70); - SpriteLookAroundEffect(leaderEntity); - sub_803E708(10,70); - DisplayDungeonDialogue(&gJirachiPreFightDialogue_2); + DungeonWaitFrames_Async(0x40,70); + DisplayDungeonDialogue_Async(&gJirachiPreFightDialogue_1); + DungeonWaitFrames_Async(10,70); + CutsceneLookAroundEffect_Async(leaderEntity); + DungeonWaitFrames_Async(10,70); + DisplayDungeonDialogue_Async(&gJirachiPreFightDialogue_2); sub_80861F8(0x37,jirachiEntity,1); sub_80855E4(SpriteShockEffect); - sub_803E708(0x3c,70); + DungeonWaitFrames_Async(0x3c,70); JirachiDropInEffect(jirachiEntity); - sub_803E708(0x5a,70); - DisplayDungeonDialogue(&gJirachiPreFightDialogue_3); - sub_803E708(10,70); - DisplayDungeonDialogue(&gJirachiPreFightDialogue_4); - sub_803E708(10,70); + DungeonWaitFrames_Async(0x5a,70); + DisplayDungeonDialogue_Async(&gJirachiPreFightDialogue_3); + DungeonWaitFrames_Async(10,70); + DisplayDungeonDialogue_Async(&gJirachiPreFightDialogue_4); + DungeonWaitFrames_Async(10,70); SetupBossFightHP(jirachiEntity,0x15e,MUS_BATTLE_WITH_RAYQUAZA); ShiftCameraToPosition(&leaderEntity->pixelPos,0x10); } -static void sub_808B50C(void) +static void sub_808B50C_Async(void) { Entity * jirachiEntity; @@ -151,18 +151,18 @@ static void sub_808B50C(void) GetEntInfo(jirachiEntity)->unk15E = 0; sub_80861B8(jirachiEntity,0xe,DIRECTION_SOUTH); DungeonFadeOutBGM(0x1e); - sub_803E708(0x1e,70); + DungeonWaitFrames_Async(0x1e,70); // Fwaaaahhhh - DisplayDungeonDialogue(&gUnknown_810554C); + DisplayDungeonDialogue_Async(&gUnknown_810554C); DungeonStartNewBGM(MUS_FRIEND_AREA_FOREST); // I think I had a dream, and I was fighting in it // Did I imagine it? // I'm sleepy so I'm going back to sleep. - DisplayDungeonDialogue(&gUnknown_8105558); - sub_803E708(10,70); + DisplayDungeonDialogue_Async(&gUnknown_8105558); + DungeonWaitFrames_Async(10,70); JirachiSpinEffect(jirachiEntity); - DisplayDungeonDialogue(&gUnknown_81055F4); - sub_803E708(10,70); + DisplayDungeonDialogue_Async(&gUnknown_81055F4); + DungeonWaitFrames_Async(10,70); gDungeon->unk2 = DUNGEON_UNK2_1; } @@ -186,35 +186,35 @@ static void JirachiWish_Async(void) sub_80855E4(sub_80861A8); gDungeon->unk1356C = TRUE; DungeonFadeOutBGM(0x1e); - sub_803E708(0x1e,0x46); - DisplayDungeonDialogue(&gUnknown_8105668); - sub_803E708(10,0x46); + DungeonWaitFrames_Async(0x1e,0x46); + DisplayDungeonDialogue_Async(&gUnknown_8105668); + DungeonWaitFrames_Async(10,0x46); PlaySoundEffect(0x1a7); - sub_803E708(0x96,0x46); + DungeonWaitFrames_Async(0x96,0x46); SpriteShockEffect(jirachiEntity); - DisplayDungeonDialogue(&gUnknown_8105674); + DisplayDungeonDialogue_Async(&gUnknown_8105674); DungeonStartNewBGM(MUS_FRIEND_AREA_FOREST); - sub_803E708(10,0x46); + DungeonWaitFrames_Async(10,0x46); sub_80856E0(jirachiEntity, DIRECTION_SOUTH); PlaySoundEffect(0x16a); - DisplayDungeonDialogue(&gUnknown_81056B8); - sub_803E708(10,0x46); - SpriteLookAroundEffect(jirachiEntity); - DisplayDungeonDialogue(&gUnknown_81056DC); - sub_803E708(10,0x46); + DisplayDungeonDialogue_Async(&gUnknown_81056B8); + DungeonWaitFrames_Async(10,0x46); + CutsceneLookAroundEffect_Async(jirachiEntity); + DisplayDungeonDialogue_Async(&gUnknown_81056DC); + DungeonWaitFrames_Async(10,0x46); while( 1 ) { while (1) { wishChoice = DisplayDungeonMenuMessage(NULL,gUnknown_8105798,gUnknown_810579C,0x705); if (wishChoice >= 1) break; } - sub_803E708(10,0x46); + DungeonWaitFrames_Async(10,0x46); if (wishChoice == 1) { s32 counter, index; DungeonPos pos; Item moneyItems [9]; // Lots of Money - DisplayDungeonDialogue(&gUnknown_810581C); - sub_803E708(10,0x46); + DisplayDungeonDialogue_Async(&gUnknown_810581C); + DungeonWaitFrames_Async(10,0x46); JirachiWishGrantDialogue(jirachiEntity); for(counter = 0; counter < 6; counter++) @@ -238,8 +238,8 @@ static void JirachiWish_Async(void) DungeonPos pos; Item items [9]; // Lots of Items - DisplayDungeonDialogue(&gUnknown_8105974); - sub_803E708(10,0x46); + DisplayDungeonDialogue_Async(&gUnknown_8105974); + DungeonWaitFrames_Async(10,0x46); JirachiWishGrantDialogue(jirachiEntity); for(counter = 0; counter < 6; counter++) @@ -267,25 +267,25 @@ static void JirachiWish_Async(void) if (friendArea == NUM_FRIEND_AREAS) { // You want a friend area? But you already have many friend areas... - DisplayDungeonDialogue(&gUnknown_8105A08); - sub_803E708(10,0x46); + DisplayDungeonDialogue_Async(&gUnknown_8105A08); + DungeonWaitFrames_Async(10,0x46); continue; } else { // You want a friend area? As you wish.. - DisplayDungeonDialogue(&gUnknown_8105AD4); - sub_803E708(10,0x46); + DisplayDungeonDialogue_Async(&gUnknown_8105AD4); + DungeonWaitFrames_Async(10,0x46); JirachiWishGrantDialogue(jirachiEntity); GetEntInfo(jirachiEntity)->unk15D = 0; - DisplayDungeonDialogue(&gUnknown_8105B20); + DisplayDungeonDialogue_Async(&gUnknown_8105B20); UnlockFriendArea(friendArea); PlaySoundEffect(0xd4); leaderEntity = GetLeader(); SubstitutePlaceholderStringTags(gFormatBuffer_Monsters[0],leaderEntity,0); WriteFriendAreaName(gFormatBuffer_Items[0],friendArea,FALSE); // Obtained the friend area! - DisplayDungeonDialogue(&gUnknown_8105B68); + DisplayDungeonDialogue_Async(&gUnknown_8105B68); } } if (wishChoice == 4) { @@ -293,8 +293,8 @@ static void JirachiWish_Async(void) DungeonPos pos; Item strengthItems [9]; // More Strength.. - DisplayDungeonDialogue(&gUnknown_8105BA8); - sub_803E708(10,0x46); + DisplayDungeonDialogue_Async(&gUnknown_8105BA8); + DungeonWaitFrames_Async(10,0x46); JirachiWishGrantDialogue(jirachiEntity); for(counter = 0; counter < 5; counter++) @@ -315,34 +315,34 @@ static void JirachiWish_Async(void) } } GetEntInfo(jirachiEntity)->unk15D = 0; - DisplayDungeonDialogue(&gUnknown_8105BF4); - sub_803E708(10,0x46); + DisplayDungeonDialogue_Async(&gUnknown_8105BF4); + DungeonWaitFrames_Async(10,0x46); } if (wishChoice == 5) { s32 direction; // Something Good... - DisplayDungeonDialogue(&gUnknown_8105D2C); - sub_803E708(10,0x46); + DisplayDungeonDialogue_Async(&gUnknown_8105D2C); + DungeonWaitFrames_Async(10,0x46); JirachiWishGrantDialogue(jirachiEntity); GetEntInfo(jirachiEntity)->unk15D = 0; - DisplayDungeonDialogue(&gUnknown_8105D80); - sub_803E708(10,0x46); + DisplayDungeonDialogue_Async(&gUnknown_8105D80); + DungeonWaitFrames_Async(10,0x46); LeaderPos = &GetLeader()->pos; direction = GetDirectionTowardsPosition(&jirachiEntity->pos,LeaderPos); SetFacingDirection(jirachiEntity,direction); - sub_803E708(10,0x46); - DisplayDungeonDialogue(&gUnknown_8105D9C); - sub_803E708(10,0x46); + DungeonWaitFrames_Async(10,0x46); + DisplayDungeonDialogue_Async(&gUnknown_8105D9C); + DungeonWaitFrames_Async(10,0x46); gDungeon->unk644.unk30 = 1; } break; } - DisplayDungeonDialogue(&gUnknown_81058E0); + DisplayDungeonDialogue_Async(&gUnknown_81058E0); JirachiSpinEffect(jirachiEntity); - sub_803E708(10,0x46); - DisplayDungeonDialogue(&gUnknown_810593C); - sub_803E708(10,0x46); + DungeonWaitFrames_Async(10,0x46); + DisplayDungeonDialogue_Async(&gUnknown_810593C); + DungeonWaitFrames_Async(10,0x46); EnableJirachiWishWarpTile(); } @@ -371,21 +371,21 @@ static void JirachiWishGrantFlash(void) SetDungeonBGColorRGB(iVar1,iVar1,iVar1,1,1); DungeonRunFrameActions(0x46); } - sub_803E708(10,0x46); + DungeonWaitFrames_Async(10,0x46); for(iVar1 = 0xFA; iVar1 > 0xC7; iVar1 -= 10) { SetDungeonBGColorRGB(iVar1,iVar1,iVar1,1,1); DungeonRunFrameActions(0x46); } - sub_803E708(10,0x46); + DungeonWaitFrames_Async(10,0x46); for(iVar1 = 0xFA; iVar1 >= 0; iVar1 -= 10) { SetDungeonBGColorRGB(iVar1,iVar1,iVar1,1,1); DungeonRunFrameActions(0x46); } - sub_803E708(10,0x46); + DungeonWaitFrames_Async(10,0x46); sub_8085EB0(); } @@ -438,7 +438,7 @@ static void JirachiSpinEffect(Entity * jirachiEntity) PlaySoundEffect(0x298); for(uVar1 = 0; uVar1 < 25; uVar1++){ SetFacingDirection(jirachiEntity, uVar1 & DIRECTION_MASK); - sub_803E708(3,0x46); + DungeonWaitFrames_Async(3,0x46); } GetEntInfo(jirachiEntity)->unk15E = 1; PlaySoundEffect(0x27f); @@ -451,17 +451,17 @@ static void JirachiWishGrantDialogue(Entity *jirachiEntity) GetEntInfo(jirachiEntity)->unk15D = 1; // Nnnnnnnnnn! - DisplayDungeonDialogue(&gUnknown_81058A8); + DisplayDungeonDialogue_Async(&gUnknown_81058A8); PlaySoundEffect(0x375); sub_80861F8(0x67,jirachiEntity,1); PlaySoundEffect(0x2a8); uVar2 = sub_80861F8(0x68,jirachiEntity,0); // Taaaaaaaah! - DisplayDungeonDialogue(&gUnknown_81058C4); + DisplayDungeonDialogue_Async(&gUnknown_81058C4); if (sub_800E9A8(uVar2)) { sub_800DC14(uVar2); } - sub_803E708(10,0x46); + DungeonWaitFrames_Async(10,0x46); JirachiWishGrantFlash(); } diff --git a/src/dungeon_cutscene_kyogre.c b/src/dungeon_cutscene_kyogre.c index 162650a41..25b37825d 100644 --- a/src/dungeon_cutscene_kyogre.c +++ b/src/dungeon_cutscene_kyogre.c @@ -65,7 +65,7 @@ void sub_808C10C(void) CopyMonsterNameToBuffer(gFormatBuffer_Monsters[3], MONSTER_GROUDON); } -void sub_808C1A4(u8 monsterBehavior, u8 cutscene, u8 param_3) +void HandleKyogreBossFaint(u8 monsterBehavior, u8 cutscene, bool8 transformedIntoFriend) { if (cutscene == CUTSCENE_STORMY_SEA && monsterBehavior == BEHAVIOR_KYOGRE) { gDungeon->unk2 = DUNGEON_UNK2_1; @@ -83,38 +83,38 @@ void KyogrePreFightDialogue(void) DungeonStopBGM(); if (HasRecruitedMon(MONSTER_KYOGRE)) { DungeonFadeInNewBGM(MUS_FRIEND_AREA_CRYPTIC_CAVE,0x3c); - SpriteLookAroundEffect(leaderEntity); - sub_803E708(10,0x46); - DisplayDungeonDialogue(&gKyogrePreFightDialogue_8); - sub_803E708(10,0x46); + CutsceneLookAroundEffect_Async(leaderEntity); + DungeonWaitFrames_Async(10,0x46); + DisplayDungeonDialogue_Async(&gKyogrePreFightDialogue_8); + DungeonWaitFrames_Async(10,0x46); gDungeon->unk2 = DUNGEON_UNK2_1; } else { - DisplayDungeonDialogue(&gKyogrePreFightDialogue_1); - sub_803E708(10,0x46); - DisplayDungeonDialogue(&gKyogrePreFightDialogue_2); - sub_803E708(10,0x46); + DisplayDungeonDialogue_Async(&gKyogrePreFightDialogue_1); + DungeonWaitFrames_Async(10,0x46); + DisplayDungeonDialogue_Async(&gKyogrePreFightDialogue_2); + DungeonWaitFrames_Async(10,0x46); nullsub_99(); - sub_803E708(10,0x46); + DungeonWaitFrames_Async(10,0x46); // Gwwwwwooooooooh - DisplayDungeonDialogue(&gKyogrePreFightDialogue_3); - sub_803E708(10,0x46); + DisplayDungeonDialogue_Async(&gKyogrePreFightDialogue_3); + DungeonWaitFrames_Async(10,0x46); DungeonFadeInNewBGM(MUS_FRIEND_AREA_CRYPTIC_CAVE,0x3c); sub_808C360(); // My duels against {POKEMON_3} (Groudon) left us both exhausted - DisplayDungeonDialogue(&gKyogrePreFightDialogue_4); + DisplayDungeonDialogue_Async(&gKyogrePreFightDialogue_4); KyogreScreenFlash(); // I am {POKEMON_2} (Kyogre)! // The lord of the sea! - DisplayDungeonDialogue(&gKyogrePreFightDialogue_5); + DisplayDungeonDialogue_Async(&gKyogrePreFightDialogue_5); KyogreScreenFlash(); // Witness the destructive force of my waves! - DisplayDungeonDialogue(&gKyogrePreFightDialogue_6); + DisplayDungeonDialogue_Async(&gKyogrePreFightDialogue_6); KyogreScreenFlash(); // Marvel at my awesome // power! - DisplayDungeonDialogue(&gKyogrePreFightDialogue_7); - sub_803E708(10,0x46); + DisplayDungeonDialogue_Async(&gKyogrePreFightDialogue_7); + DungeonWaitFrames_Async(10,0x46); SetupBossFightHP(KyogreEntity,600,MUS_BOSS_BATTLE); DungeonStartNewBGM(MUS_FRIEND_AREA_CRYPTIC_CAVE); ShiftCameraToPosition(&leaderEntity->pixelPos,0x10); @@ -134,17 +134,17 @@ static void KyogreScreenFlash(void) SetDungeonBGColorRGB(0,0,iVar1,1,1); DungeonRunFrameActions(0x46); } - sub_803E708(10,0x46); + DungeonWaitFrames_Async(10,0x46); for(iVar1 = 250; iVar1 > 199; iVar1 -= 10){ SetDungeonBGColorRGB(0,iVar1,iVar1,1,1); DungeonRunFrameActions(0x46); } - sub_803E708(10,0x46); + DungeonWaitFrames_Async(10,0x46); for(iVar1 = 250; iVar1 >= 0; iVar1 -= 10){ SetDungeonBGColorRGB(0,0,iVar1,1,1); DungeonRunFrameActions(0x46); } - sub_803E708(10,0x46); + DungeonWaitFrames_Async(10,0x46); sub_8085EB0(); } diff --git a/src/dungeon_cutscene_latios.c b/src/dungeon_cutscene_latios.c index e2e415508..df783866f 100644 --- a/src/dungeon_cutscene_latios.c +++ b/src/dungeon_cutscene_latios.c @@ -82,10 +82,10 @@ void sub_808AA94(void) CopyMonsterNameToBuffer(gFormatBuffer_Monsters[2], MONSTER_LATIOS); } -void sub_808AAF0(u8 monsterBehavior, u8 cutscene) +void HandleLatiosBossFaint(u8 monsterBehavior, u8 cutscene) { if ((cutscene == CUTSCENE_NORTHERN_RANGE_ATTEMPT1 || cutscene == CUTSCENE_NORTHERN_RANGE_ATTEMPT2 || cutscene == CUTSCENE_NORTHERN_RANGE_POSTSTORY) && monsterBehavior == BEHAVIOR_LATIOS) { - sub_8097FA8(28); + SetTempCutsceneFlag(CUTSCENE_FLAG_NORTHERN_RANGE_COMPLETE); gDungeon->unk2 = DUNGEON_UNK2_1; } } @@ -106,19 +106,19 @@ void LatiosPreFightDialogue(void) local_19.x = 0xFC; sub_8085EC8(0x1bd,0,0,&local_19,1); - sub_803E708(0x1e,70); + DungeonWaitFrames_Async(0x1e,70); sub_8086448(); ShiftCameraToPosition(&local_18,0x18); - sub_803E708(2,70); + DungeonWaitFrames_Async(2,70); SpriteShockEffect(LatiosEntity); - sub_803E708(0x20,70); + DungeonWaitFrames_Async(0x20,70); sub_808692C(); - DisplayDungeonDialogue(&gLatiosPreFightDialogue_1); + DisplayDungeonDialogue_Async(&gLatiosPreFightDialogue_1); LatiosScreenFlash(); - DisplayDungeonDialogue(&gLatiosPreFightDialogue_2); + DisplayDungeonDialogue_Async(&gLatiosPreFightDialogue_2); LatiosScreenFlash(); - DisplayDungeonDialogue(&gLatiosPreFightDialogue_3); - sub_803E708(10,70); + DisplayDungeonDialogue_Async(&gLatiosPreFightDialogue_3); + DungeonWaitFrames_Async(10,70); SetupBossFightHP(LatiosEntity,600,MUS_BOSS_BATTLE); ShiftCameraToPosition(&leaderEntity->pixelPos,0x10); } @@ -132,12 +132,12 @@ void LatiosReFightDialogue(void) LatiosEntity = GetEntityFromMonsterBehavior(BEHAVIOR_LATIOS); sub_8086448(); sub_808692C(); - DisplayDungeonDialogue(&gLatiosReFightDialogue_1); + DisplayDungeonDialogue_Async(&gLatiosReFightDialogue_1); LatiosScreenFlash(); - DisplayDungeonDialogue(&gLatiosPreFightDialogue_2); + DisplayDungeonDialogue_Async(&gLatiosPreFightDialogue_2); LatiosScreenFlash(); - DisplayDungeonDialogue(&gLatiosPreFightDialogue_3); - sub_803E708(10,70); + DisplayDungeonDialogue_Async(&gLatiosPreFightDialogue_3); + DungeonWaitFrames_Async(10,70); SetupBossFightHP(LatiosEntity,600,MUS_BOSS_BATTLE); ShiftCameraToPosition(&leaderEntity->pixelPos,0x10); } @@ -160,12 +160,12 @@ static void LatiosScreenFlash(void) SetDungeonBGColorRGB(iVar1,iVar1,iVar1,1,1); DungeonRunFrameActions(70); } - sub_803E708(10,70); + DungeonWaitFrames_Async(10,70); for(iVar1 = 250; iVar1 >= 0; iVar1 -= 10) { SetDungeonBGColorRGB(iVar1,iVar1,iVar1,1,1); DungeonRunFrameActions(70); } - sub_803E708(10,70); + DungeonWaitFrames_Async(10,70); sub_8085EB0(); } diff --git a/src/dungeon_cutscene_lugia.c b/src/dungeon_cutscene_lugia.c index a1c8e0db2..a8c4f17d5 100644 --- a/src/dungeon_cutscene_lugia.c +++ b/src/dungeon_cutscene_lugia.c @@ -59,7 +59,7 @@ void sub_808BDEC(void) CopyMonsterNameToBuffer(gFormatBuffer_Monsters[2], MONSTER_LUGIA); } -void sub_808BE70(u8 monsterBehavior, u8 cutscene, u8 param_3) +void HandleLugiaBossFaint(u8 monsterBehavior, u8 cutscene, bool8 transformedIntoFriend) { if (cutscene == CUTSCENE_SILVER_TRENCH && monsterBehavior == BEHAVIOR_LUGIA) { gDungeon->unk2 = DUNGEON_UNK2_1; @@ -80,26 +80,26 @@ void LugiaPreFightDialogue(void) else { DungeonStopBGM(); sub_8086448(); - DisplayDungeonDialogue(&gLugiaPreFightDialogue_1); + DisplayDungeonDialogue_Async(&gLugiaPreFightDialogue_1); DungeonFadeInNewBGM(MUS_FRIEND_AREA_CRYPTIC_CAVE,0x3c); sub_808C0CC(); - DisplayDungeonDialogue(&gLugiaPreFightDialogue_2); + DisplayDungeonDialogue_Async(&gLugiaPreFightDialogue_2); LugiaScreenFlash(); - DisplayDungeonDialogue(&gLugiaPreFightDialogue_3); - sub_803E708(10,0x46); - DisplayDungeonDialogue(&gLugiaPreFightDialogue_4); + DisplayDungeonDialogue_Async(&gLugiaPreFightDialogue_3); + DungeonWaitFrames_Async(10,0x46); + DisplayDungeonDialogue_Async(&gLugiaPreFightDialogue_4); PlaySoundEffect(0x1f8); sub_80861D4(lugiaEntity,0xd,DIRECTION_SOUTH); - sub_803E708(0x2b,0x46); + DungeonWaitFrames_Async(0x2b,0x46); sub_80861B8(lugiaEntity,0,DIRECTION_SOUTH); - DisplayDungeonDialogue(&gLugiaPreFightDialogue_5); + DisplayDungeonDialogue_Async(&gLugiaPreFightDialogue_5); LugiaScreenFlash(); - DisplayDungeonDialogue(&gLugiaPreFightDialogue_6); + DisplayDungeonDialogue_Async(&gLugiaPreFightDialogue_6); LugiaScreenFlash2(); SetDungeonBGColorRGB(-250,-250,-250,1,0); DungeonStopBGM(); sub_80861D4(lugiaEntity,7,DIRECTION_SOUTH); - DisplayDungeonDialogue(&gLugiaPreFightDialogue_7); + DisplayDungeonDialogue_Async(&gLugiaPreFightDialogue_7); LugiaScreenFlash(); SetupBossFightHP(lugiaEntity,800,MUS_BATTLE_WITH_RAYQUAZA); DungeonStartNewBGM(MUS_FRIEND_AREA_CRYPTIC_CAVE); @@ -116,17 +116,17 @@ static void LugiaScreenFlash(void) SetDungeonBGColorRGB(0,0,iVar1,1,1); DungeonRunFrameActions(0x46); } - sub_803E708(10,0x46); + DungeonWaitFrames_Async(10,0x46); for(iVar1 = 250; iVar1 > 199; iVar1 -= 10){ SetDungeonBGColorRGB(0,iVar1,iVar1,1,1); DungeonRunFrameActions(0x46); } - sub_803E708(10,0x46); + DungeonWaitFrames_Async(10,0x46); for(iVar1 = 250; iVar1 >= 0; iVar1 -= 10){ SetDungeonBGColorRGB(0,0,iVar1,1,1); DungeonRunFrameActions(0x46); } - sub_803E708(10,0x46); + DungeonWaitFrames_Async(10,0x46); sub_8085EB0(); } @@ -146,7 +146,7 @@ static void LugiaScreenFlash2(void) DungeonRunFrameActions(0x46); } - sub_803E708(4,0x46); + DungeonWaitFrames_Async(4,0x46); for(iVar1 = 0; iVar1 < 200; iVar1 += 100){ SetDungeonBGColorRGB(iVar1,iVar1,iVar1,1,0); @@ -158,7 +158,7 @@ static void LugiaScreenFlash2(void) DungeonRunFrameActions(0x46); } - sub_803E708(10,0x46); + DungeonWaitFrames_Async(10,0x46); sub_8085EB0(); } diff --git a/src/dungeon_cutscene_magma_cavern.c b/src/dungeon_cutscene_magma_cavern.c index 76a9fd7ba..f341dac2f 100644 --- a/src/dungeon_cutscene_magma_cavern.c +++ b/src/dungeon_cutscene_magma_cavern.c @@ -97,89 +97,89 @@ void MagmaCavernMidDialogue(void) partnerEntity = CutsceneGetPartner(); groudonEntity = GetEntityFromMonsterBehavior(BEHAVIOR_GROUDON_1); alakazamEntity = GetEntityFromMonsterBehavior(BEHAVIOR_ALAKAZAM_2); - sub_8052D44(IDStack,leaderEntity,partnerEntity); + BufferCutsceneProtagonists(IDStack,leaderEntity,partnerEntity); sub_8086448(); - SpriteLookAroundEffect(partnerEntity); + CutsceneLookAroundEffect_Async(partnerEntity); // Let's see.. // I wonder where we are? - DisplayDungeonDialogue(&MagmaCavernMidDialogue_1); - sub_803E708(10,0x46); - sub_80869E4(partnerEntity,4,1,DIRECTION_EAST); - sub_80869E4(leaderEntity,4,2,DIRECTION_WEST); + DisplayDungeonDialogue_Async(&MagmaCavernMidDialogue_1); + DungeonWaitFrames_Async(10,0x46); + CutsceneLookDir_Async(partnerEntity,4,DIR_TRANS_SPINRIGHT1,DIRECTION_EAST); + CutsceneLookDir_Async(leaderEntity,4,DIR_TRANS_SPINLEFT1,DIRECTION_WEST); // I know we've come pretty // far... // // I'm certain we've come quite // far already.. - DisplayDungeonDialogue(MagmaCavernMidDialogue_2); - sub_803E708(10,0x46); + DisplayDungeonDialogue_Async(MagmaCavernMidDialogue_2); + DungeonWaitFrames_Async(10,0x46); DungeonStopBGM(); sub_80855E4(sub_80868F4); sub_808680C(); PlaySoundEffect(0x1c5); - sub_803E708(0x28,0x46); + DungeonWaitFrames_Async(0x28,0x46); // Waaah! // Qu-quake! - DisplayDungeonDialogue(&MagmaCavernMidDialogue_3); - sub_803E708(0x78,0x46); + DisplayDungeonDialogue_Async(&MagmaCavernMidDialogue_3); + DungeonWaitFrames_Async(0x78,0x46); StopSoundEffect(0x1c5); sub_808682C(); sub_80855E4(sub_8086910); - sub_803E708(0x14,0x46); + DungeonWaitFrames_Async(0x14,0x46); sub_8085930(DIRECTION_NORTH); - sub_803E708(10,0x46); + DungeonWaitFrames_Async(10,0x46); // Whew! // It settled down. // // Whew // It's over. - DisplayDungeonDialogue(MagmaCavernMidDialogue_4); - sub_803E708(10,0x46); + DisplayDungeonDialogue_Async(MagmaCavernMidDialogue_4); + DungeonWaitFrames_Async(10,0x46); PlaySoundEffect(0x1d5); - SpriteLookAroundEffect(partnerEntity); + CutsceneLookAroundEffect_Async(partnerEntity); PlaySoundEffect(0x1c7); sub_80856E0(partnerEntity, DIRECTION_NORTH); // Hey! {POKEMON_0}! // Over there! - DisplayDungeonDialogue(&MagmaCavernMidDialogue_5); + DisplayDungeonDialogue_Async(&MagmaCavernMidDialogue_5); GetEntInfo(groudonEntity)->unk15E = 0; GetEntInfo(alakazamEntity)->unk15E =0; pos.x = (groudonEntity->pixelPos.x + alakazamEntity->pixelPos.x) / 2; pos.y = (groudonEntity->pixelPos.y + alakazamEntity->pixelPos.y) / 2 + 0x800; ShiftCameraToPosition(&pos,0x20); - sub_803E708(0x3c,0x46); + DungeonWaitFrames_Async(0x3c,0x46); sub_80891F0(); // Hey! // Are you OK?! // // Hey! // Snap out of it! - DisplayDungeonDialogue(MagmaCavernMidDialogue_6); - sub_803E708(10,0x46); + DisplayDungeonDialogue_Async(MagmaCavernMidDialogue_6); + DungeonWaitFrames_Async(10,0x46); // Urrrrgh... - DisplayDungeonDialogue(&MagmaCavernMidDialogue_7); - sub_803E708(10,0x46); - sub_80869E4(leaderEntity,4,2,DIRECTION_NORTHWEST); + DisplayDungeonDialogue_Async(&MagmaCavernMidDialogue_7); + DungeonWaitFrames_Async(10,0x46); + CutsceneLookDir_Async(leaderEntity,4,DIR_TRANS_SPINLEFT1,DIRECTION_NORTHWEST); // What happened to you? // // What happened here? - DisplayDungeonDialogue(MagmaCavernMidDialogue_8); - sub_803E708(10,0x46); + DisplayDungeonDialogue_Async(MagmaCavernMidDialogue_8); + DungeonWaitFrames_Async(10,0x46); // We challenged.. // {POKEMON_2}... // And wiped out.. - DisplayDungeonDialogue(&MagmaCavernMidDialogue_9); - sub_803E708(10,0x46); - DisplayDungeonDialogue(&MagmaCavernMidDialogue_10); - sub_803E708(10,0x46); - sub_80869E4(leaderEntity,4,1,DIRECTION_NORTHEAST); - sub_80869E4(partnerEntity,4,1,DIRECTION_NORTHEAST); + DisplayDungeonDialogue_Async(&MagmaCavernMidDialogue_9); + DungeonWaitFrames_Async(10,0x46); + DisplayDungeonDialogue_Async(&MagmaCavernMidDialogue_10); + DungeonWaitFrames_Async(10,0x46); + CutsceneLookDir_Async(leaderEntity,4,DIR_TRANS_SPINRIGHT1,DIRECTION_NORTHEAST); + CutsceneLookDir_Async(partnerEntity,4,DIR_TRANS_SPINRIGHT1,DIRECTION_NORTHEAST); // Grrgh.. // We... It crushed us - DisplayDungeonDialogue(&MagmaCavernMidDialogue_11); - sub_803E708(10,0x46); + DisplayDungeonDialogue_Async(&MagmaCavernMidDialogue_11); + DungeonWaitFrames_Async(10,0x46); PlaySoundEffect(0x1d5); - SpriteLookAroundEffect(partnerEntity); + CutsceneLookAroundEffect_Async(partnerEntity); // That's right... // What happened to {POKEMON_3}? // Where is {POKEMON_3}? @@ -187,22 +187,22 @@ void MagmaCavernMidDialogue(void) // Wait... // What about {POKEMON_3}? // Where did {POKEMON_3} go? - DisplayDungeonDialogue(MagmaCavernMidDialogue_12); - sub_803E708(0x1e,0x46); + DisplayDungeonDialogue_Async(MagmaCavernMidDialogue_12); + DungeonWaitFrames_Async(0x1e,0x46); // {POKEMON_3} is... // Still battling {POKEMON_2}... - DisplayDungeonDialogue(&MagmaCavernMidDialogue_13); - sub_803E708(10,0x46); - sub_80869E4(partnerEntity,4,1,DIRECTION_EAST); - sub_80869E4(leaderEntity,4,2,DIRECTION_WEST); + DisplayDungeonDialogue_Async(&MagmaCavernMidDialogue_13); + DungeonWaitFrames_Async(10,0x46); + CutsceneLookDir_Async(partnerEntity,4,DIR_TRANS_SPINRIGHT1,DIRECTION_EAST); + CutsceneLookDir_Async(leaderEntity,4,DIR_TRANS_SPINLEFT1,DIRECTION_WEST); // {POKEMON_0}! // We've got to hurry! - DisplayDungeonDialogue(&MagmaCavernMidDialogue_14); + DisplayDungeonDialogue_Async(&MagmaCavernMidDialogue_14); sub_8089294(); // Be careful! - DisplayDungeonDialogue(&MagmaCavernMidDialogue_15); - sub_803E708(10,0x46); + DisplayDungeonDialogue_Async(&MagmaCavernMidDialogue_15); + DungeonWaitFrames_Async(10,0x46); gDungeon->unk2 = DUNGEON_UNK2_1; } @@ -212,9 +212,9 @@ void sub_8089168(void) leaderEntity = CutsceneGetLeader(); sub_8086448(); - sub_803E708(10,0x46); - SpriteLookAroundEffect(leaderEntity); - sub_803E708(10,0x46); + DungeonWaitFrames_Async(10,0x46); + CutsceneLookAroundEffect_Async(leaderEntity); + DungeonWaitFrames_Async(10,0x46); ShiftCameraToPosition(&leaderEntity->pixelPos,0x10); } diff --git a/src/dungeon_cutscene_mankey.c b/src/dungeon_cutscene_mankey.c index 367a289ba..6e9fb073c 100644 --- a/src/dungeon_cutscene_mankey.c +++ b/src/dungeon_cutscene_mankey.c @@ -36,50 +36,44 @@ static void sub_8089908(Entity *r0); void sub_808970C(void) { - Entity *leaderEntity; - - leaderEntity = CutsceneGetLeader(); - DungeonStartNewBGM(MUS_TINY_WOODS); - sub_80854D4(); - sub_8085930(DIRECTION_NORTH); - sub_80855E4(sub_8086A3C); - sub_808563C(sub_8089908); - sub_8085860(leaderEntity->pos.x,leaderEntity->pos.y -3); + Entity *leaderEntity = CutsceneGetLeader(); + DungeonStartNewBGM(MUS_TINY_WOODS); + sub_80854D4(); + sub_8085930(DIRECTION_NORTH); + sub_80855E4(sub_8086A3C); + sub_808563C(sub_8089908); + sub_8085860(leaderEntity->pos.x,leaderEntity->pos.y -3); } void sub_808974C(void) { - Entity *leaderEntity; - - leaderEntity = CutsceneGetLeader(); - sub_80854D4(); - sub_8085930(DIRECTION_NORTH); - sub_80855E4(sub_8086A3C); - sub_808563C(sub_80898F8); - sub_8085860(leaderEntity->pos.x,leaderEntity->pos.y + -3); + Entity *leaderEntity = CutsceneGetLeader(); + sub_80854D4(); + sub_8085930(DIRECTION_NORTH); + sub_80855E4(sub_8086A3C); + sub_808563C(sub_80898F8); + sub_8085860(leaderEntity->pos.x,leaderEntity->pos.y + -3); } -void sub_8089788(Entity *entity, u8 monsterBehavior, u8 cutscene) +void HandleMankeyBossFaint(Entity *entity, u8 monsterBehavior, u8 cutscene) { - Entity *monEntity; - s32 index; - bool8 found = FALSE; + s32 i; + bool8 stillAlive = FALSE; - if (cutscene == CUTSCENE_UPROAR_FOREST_ATTEMPT1 || cutscene == CUTSCENE_UPROAR_FOREST_ATTEMPT2) { - for(index = 0; index < DUNGEON_MAX_WILD_POKEMON; index++) - { - monEntity = gDungeon->wildPokemon[index]; - if ((EntityIsValid(monEntity)) && (monEntity != entity) && (GetEntInfo(monEntity)->monsterBehavior == monsterBehavior)) { - found = TRUE; - break; - } - } + if (cutscene == CUTSCENE_UPROAR_FOREST_ATTEMPT1 || cutscene == CUTSCENE_UPROAR_FOREST_ATTEMPT2) { + for (i = 0; i < DUNGEON_MAX_WILD_POKEMON; i++) { + Entity *monEntity = gDungeon->wildPokemon[i]; + if (EntityIsValid(monEntity) && monEntity != entity && GetEntInfo(monEntity)->monsterBehavior == monsterBehavior) { + stillAlive = TRUE; + break; + } + } - if(!found){ - sub_8097FA8(17); - gDungeon->unk2 = DUNGEON_UNK2_1; + if (!stillAlive){ + SetTempCutsceneFlag(CUTSCENE_FLAG_UPROAR_FOREST_COMPLETE); + gDungeon->unk2 = DUNGEON_UNK2_1; + } } - } } void sub_80897F0(void) @@ -88,32 +82,32 @@ void sub_80897F0(void) leaderEntity = CutsceneGetLeader(); sub_8086448(); - sub_803E708(10,0x46); + DungeonWaitFrames_Async(10,0x46); sub_808563C(SpriteShockEffect); - sub_803E708(0x20,0x46); + DungeonWaitFrames_Async(0x20,0x46); sub_808692C(); - DisplayDungeonDialogue(&gUnknown_8103BD8); + DisplayDungeonDialogue_Async(&gUnknown_8103BD8); // We don't like to brag or // nothing, but - DisplayDungeonDialogue(&gUnknown_8103C00); + DisplayDungeonDialogue_Async(&gUnknown_8103C00); // We get furious real easy // You know that?! - DisplayDungeonDialogue(&gUnknown_8103C3C); + DisplayDungeonDialogue_Async(&gUnknown_8103C3C); // What really irritates us is // when we see some dim witted face - DisplayDungeonDialogue(&gUnknown_8103C74); + DisplayDungeonDialogue_Async(&gUnknown_8103C74); // ......... // Wrooooooar! // That vacant expression - DisplayDungeonDialogue(&gUnknown_8103CC4); + DisplayDungeonDialogue_Async(&gUnknown_8103CC4); // Gwoooh // It's ticking me off! // I'm seeing red! - DisplayDungeonDialogue(&gUnknown_8103D0C); + DisplayDungeonDialogue_Async(&gUnknown_8103D0C); // Mukkkeeeeeh // Get 'em! It's frenzy time! - DisplayDungeonDialogue(&gUnknown_8103D50); - sub_803E708(10,0x46); + DisplayDungeonDialogue_Async(&gUnknown_8103D50); + DungeonWaitFrames_Async(10,0x46); ShiftCameraToPosition(&leaderEntity->pixelPos,0x10); } @@ -123,15 +117,15 @@ void sub_8089878(void) leaderEntity = CutsceneGetLeader(); sub_8086448(); - sub_803E708(10,0x46); + DungeonWaitFrames_Async(10,0x46); sub_808563C(SpriteShockEffect); - sub_803E708(0x20,0x46); + DungeonWaitFrames_Async(0x20,0x46); sub_808692C(); - DisplayDungeonDialogue(&gUnknown_8103D8C); - DisplayDungeonDialogue(&gUnknown_8103D98); - DisplayDungeonDialogue(&gUnknown_8103DD8); - DisplayDungeonDialogue(&gUnknown_8103E28); - sub_803E708(10,0x46); + DisplayDungeonDialogue_Async(&gUnknown_8103D8C); + DisplayDungeonDialogue_Async(&gUnknown_8103D98); + DisplayDungeonDialogue_Async(&gUnknown_8103DD8); + DisplayDungeonDialogue_Async(&gUnknown_8103E28); + DungeonWaitFrames_Async(10,0x46); ShiftCameraToPosition(&leaderEntity->pixelPos,0x10); } diff --git a/src/dungeon_cutscene_meanies.c b/src/dungeon_cutscene_meanies.c index 6bb7a2655..01f9a5fd7 100644 --- a/src/dungeon_cutscene_meanies.c +++ b/src/dungeon_cutscene_meanies.c @@ -63,25 +63,26 @@ void sub_8086F00(void) CopyMonsterNameToBuffer(gFormatBuffer_Monsters[4], MONSTER_CATERPIE); } -void sub_8086F54(u8 monsterBehavior, u8 cutscene) +void HandleMeaniesBossFaint(u8 monsterBehavior, u8 cutscene) { - s32 index; + s32 i; if (cutscene == CUTSCENE_SINISTER_WOODS_ATTEMPT1 || cutscene == CUTSCENE_SINISTER_WOODS_ATTEMPT2) { - bool8 found = FALSE; - for (index = 0; index < 16; index++) { - struct Entity *entity = gDungeon->wildPokemon[index]; + bool8 stillAlive = FALSE; + + for (i = 0; i < DUNGEON_MAX_WILD_POKEMON; i++) { + struct Entity *entity = gDungeon->wildPokemon[i]; if ((EntityIsValid(entity))) { struct EntityInfo *entInfo = GetEntInfo(entity); if (entInfo->monsterBehavior != monsterBehavior) { - found = TRUE; + stillAlive = TRUE; return; } } } - if (!found) { - sub_8097FA8(3); + if (!stillAlive) { + SetTempCutsceneFlag(CUTSCENE_FLAG_SINISTER_WOODS_COMPLETE); gDungeon->unk2 = DUNGEON_UNK2_1; } } @@ -93,23 +94,23 @@ void TeamMeaniesPreFightDialogue(void) leaderEntity = CutsceneGetLeader(); sub_8086448(); - sub_803E708(10, 0x46); - DisplayDungeonDialogue(gTeamMeaniesPreFightDialogue_1); - sub_803E708(10, 0x46); - DisplayDungeonDialogue(&gTeamMeaniesPreFightDialogue_2); - sub_803E708(10, 0x46); + DungeonWaitFrames_Async(10, 0x46); + DisplayDungeonDialogue_Async(gTeamMeaniesPreFightDialogue_1); + DungeonWaitFrames_Async(10, 0x46); + DisplayDungeonDialogue_Async(&gTeamMeaniesPreFightDialogue_2); + DungeonWaitFrames_Async(10, 0x46); sub_8087144(); DungeonStartNewBGM(MUS_THERES_TROUBLE); - DisplayDungeonDialogue(&gTeamMeaniesPreFightDialogue_3); - sub_803E708(10, 0x46); - DisplayDungeonDialogue(gTeamMeaniesPreFightDialogue_4); - sub_803E708(10, 0x46); - DisplayDungeonDialogue(&gTeamMeaniesPreFightDialogue_5); - sub_803E708(10, 0x46); - DisplayDungeonDialogue(&gTeamMeaniesPreFightDialogue_6); - sub_803E708(10, 0x46); - DisplayDungeonDialogue(&gTeamMeaniesPreFightDialogue_7); - sub_803E708(10, 0x46); + DisplayDungeonDialogue_Async(&gTeamMeaniesPreFightDialogue_3); + DungeonWaitFrames_Async(10, 0x46); + DisplayDungeonDialogue_Async(gTeamMeaniesPreFightDialogue_4); + DungeonWaitFrames_Async(10, 0x46); + DisplayDungeonDialogue_Async(&gTeamMeaniesPreFightDialogue_5); + DungeonWaitFrames_Async(10, 0x46); + DisplayDungeonDialogue_Async(&gTeamMeaniesPreFightDialogue_6); + DungeonWaitFrames_Async(10, 0x46); + DisplayDungeonDialogue_Async(&gTeamMeaniesPreFightDialogue_7); + DungeonWaitFrames_Async(10, 0x46); ShiftCameraToPosition(&leaderEntity->pixelPos, 0x10); } @@ -121,25 +122,25 @@ void TeamMeaniesReFightDialogue(void) leaderEntity = CutsceneGetLeader(); partnerEntity = CutsceneGetPartner(); sub_8086448(); - DisplayDungeonDialogue(gTeamMeaniesReFightDialogue_1); - sub_803E708(10, 0x46); - DisplayDungeonDialogue(&gTeamMeaniesPreFightDialogue_2); - sub_803E708(10, 0x46); + DisplayDungeonDialogue_Async(gTeamMeaniesReFightDialogue_1); + DungeonWaitFrames_Async(10, 0x46); + DisplayDungeonDialogue_Async(&gTeamMeaniesPreFightDialogue_2); + DungeonWaitFrames_Async(10, 0x46); sub_8087144(); - sub_803E708(10, 0x46); - DisplayDungeonDialogue(gTeamMeaniesReFightDialogue_2); - sub_803E708(10, 0x46); - DisplayDungeonDialogue(&gTeamMeaniesReFightDialogue_3); - sub_803E708(10, 0x46); + DungeonWaitFrames_Async(10, 0x46); + DisplayDungeonDialogue_Async(gTeamMeaniesReFightDialogue_2); + DungeonWaitFrames_Async(10, 0x46); + DisplayDungeonDialogue_Async(&gTeamMeaniesReFightDialogue_3); + DungeonWaitFrames_Async(10, 0x46); sub_806CDD4(leaderEntity, 6, DIRECTION_NORTH); sub_806CDD4(partnerEntity, 6, DIRECTION_NORTH); - sub_803E708(10, 0x46); + DungeonWaitFrames_Async(10, 0x46); sub_806CDD4(leaderEntity, 7, DIRECTION_NORTH); sub_806CDD4(partnerEntity, 7, DIRECTION_NORTH); - sub_803E708(10, 0x46); - DisplayDungeonDialogue(&gTeamMeaniesReFightDialogue_4); - DisplayDungeonDialogue(&gTeamMeaniesReFightDialogue_5); - sub_803E708(10, 0x46); + DungeonWaitFrames_Async(10, 0x46); + DisplayDungeonDialogue_Async(&gTeamMeaniesReFightDialogue_4); + DisplayDungeonDialogue_Async(&gTeamMeaniesReFightDialogue_5); + DungeonWaitFrames_Async(10, 0x46); ShiftCameraToPosition(&leaderEntity->pixelPos, 0x10); } diff --git a/src/dungeon_cutscene_medicham.c b/src/dungeon_cutscene_medicham.c index 087ad1002..0a87cfa47 100644 --- a/src/dungeon_cutscene_medicham.c +++ b/src/dungeon_cutscene_medicham.c @@ -53,38 +53,38 @@ void MedichamRescueDialogue(void) s32 counter; medichamEntity = GetEntityFromMonsterBehavior(BEHAVIOR_MEDICHAM); - SpriteLookAroundEffect(medichamEntity); - sub_803E708(0xA, 0x46); + CutsceneLookAroundEffect_Async(medichamEntity); + DungeonWaitFrames_Async(0xA, 0x46); // Oh my I can't seem to find a way out... - DisplayDungeonDialogue(&gMedichamRescueDialogue_1); - sub_803E708(0xA, 0x46); - sub_80869E4(medichamEntity, 4, 2, DIRECTION_NORTH); - sub_803E708(0xA, 0x46); + DisplayDungeonDialogue_Async(&gMedichamRescueDialogue_1); + DungeonWaitFrames_Async(0xA, 0x46); + CutsceneLookDir_Async(medichamEntity, 4, DIR_TRANS_SPINLEFT1, DIRECTION_NORTH); + DungeonWaitFrames_Async(0xA, 0x46); // What am I to do...? - DisplayDungeonDialogue(&gMedichamRescueDialogue_2); - sub_803E708(0xA, 0x46); + DisplayDungeonDialogue_Async(&gMedichamRescueDialogue_2); + DungeonWaitFrames_Async(0xA, 0x46); sub_8086448(); sub_8086598(); - sub_803E708(0x20, 0x46); + DungeonWaitFrames_Async(0x20, 0x46); SpriteShockEffect(medichamEntity); - sub_803E708(0x20, 0x46); - sub_80869E4(medichamEntity, 4, 2, DIRECTION_SOUTH); - DisplayDungeonDialogue(&gMedichamRescueDialogue_3); - sub_803E708(0xA, 0x46); + DungeonWaitFrames_Async(0x20, 0x46); + CutsceneLookDir_Async(medichamEntity, 4, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTH); + DisplayDungeonDialogue_Async(&gMedichamRescueDialogue_3); + DungeonWaitFrames_Async(0xA, 0x46); PlaySoundEffect(0x1c7); sub_806CDD4(medichamEntity, 0xA, DIRECTION_SOUTH); - sub_803E708(0x14, 0x46); + DungeonWaitFrames_Async(0x14, 0x46); sub_806CE68(medichamEntity, DIRECTION_SOUTH); - sub_803E708(0x4, 0x46); + DungeonWaitFrames_Async(0x4, 0x46); PlaySoundEffect(0x1c7); sub_806CDD4(medichamEntity, 0xA, DIRECTION_SOUTH); - sub_803E708(0x14, 0x46); + DungeonWaitFrames_Async(0x14, 0x46); // Yes Yes // I am so lucky // // There appears to be no one here - DisplayDungeonDialogue(&gMedichamRescueDialogue_4); - sub_803E708(0xA, 0x46); + DisplayDungeonDialogue_Async(&gMedichamRescueDialogue_4); + DungeonWaitFrames_Async(0xA, 0x46); sub_806CDD4(medichamEntity, 0, DIRECTION_SOUTH); for(counter = 0x17; counter >= 0; counter--) { @@ -92,7 +92,7 @@ void MedichamRescueDialogue(void) DungeonRunFrameActions(0x46); } sub_806CE68(medichamEntity, DIRECTION_SOUTH); - sub_803E708(0x20, 0x46); + DungeonWaitFrames_Async(0x20, 0x46); sub_8042B0C(medichamEntity); HandleFaint_Async(medichamEntity, DUNGEON_EXIT_DELETED_FOR_EVENT, 0); gDungeon->unk4 = 1; diff --git a/src/dungeon_cutscene_mewtwo.c b/src/dungeon_cutscene_mewtwo.c index 9e421101e..8ea6d23d0 100644 --- a/src/dungeon_cutscene_mewtwo.c +++ b/src/dungeon_cutscene_mewtwo.c @@ -76,10 +76,10 @@ void sub_8089978(void) CopyMonsterNameToBuffer(gFormatBuffer_Monsters[2],MONSTER_MEWTWO); } -void sub_8089A00(u8 monsterBehavior, u8 cutscene) +void HandleMewtwoBossFaint(u8 monsterBehavior, u8 cutscene) { if ((cutscene == CUTSCENE_WESTERN_CAVE_ATTEMPT1 || cutscene == CUTSCENE_WESTERN_CAVE_ATTEMPT2 || cutscene == CUTSCENE_WESTERN_CAVE_POSTSTORY) && monsterBehavior == BEHAVIOR_MEWTWO) { - sub_8097FA8(19); + SetTempCutsceneFlag(CUTSCENE_FLAG_WESTERN_CAVE_COMPLETE); gDungeon->unk2 = DUNGEON_UNK2_1; } } @@ -92,21 +92,21 @@ void MewtwoPreFightDialogue(void) leaderEntity = CutsceneGetLeader(); MewtwoEntity = GetEntityFromMonsterBehavior(BEHAVIOR_MEWTWO); sub_8086448(); - DisplayDungeonDialogue(&gMewtwoPreFightDialogue_1); - sub_803E708(10,0x46); + DisplayDungeonDialogue_Async(&gMewtwoPreFightDialogue_1); + DungeonWaitFrames_Async(10,0x46); DungeonStartNewBGM(MUS_FRIEND_AREA_CRYPTIC_CAVE); sub_8086794(); - sub_803E708(0x1e,0x46); + DungeonWaitFrames_Async(0x1e,0x46); MewtwoDropInEffect(MewtwoEntity); - sub_803E708(0x3c,0x46); - DisplayDungeonDialogue(&gMewtwoPreFightDialogue_2); - DisplayDungeonDialogue(&gMewtwoPreFightDialogue_3); - sub_803E708(10,0x46); + DungeonWaitFrames_Async(0x3c,0x46); + DisplayDungeonDialogue_Async(&gMewtwoPreFightDialogue_2); + DisplayDungeonDialogue_Async(&gMewtwoPreFightDialogue_3); + DungeonWaitFrames_Async(10,0x46); MewtwoScreenFlash(); - DisplayDungeonDialogue(&gMewtwoPreFightDialogue_4); + DisplayDungeonDialogue_Async(&gMewtwoPreFightDialogue_4); MewtwoScreenFlash(); - DisplayDungeonDialogue(&gMewtwoPreFightDialogue_5); - sub_803E708(10,0x46); + DisplayDungeonDialogue_Async(&gMewtwoPreFightDialogue_5); + DungeonWaitFrames_Async(10,0x46); SetupBossFightHP(MewtwoEntity,900,MUS_BATTLE_WITH_RAYQUAZA); ShiftCameraToPosition(&leaderEntity->pixelPos,0x10); } @@ -123,16 +123,16 @@ void MewtwoReFightDialogue(void) sub_80866C4(&gMewtwoReFightDialogue_5); } else { - DisplayDungeonDialogue(&gMewtwoReFightDialogue_1); + DisplayDungeonDialogue_Async(&gMewtwoReFightDialogue_1); DungeonStartNewBGM(MUS_FRIEND_AREA_CRYPTIC_CAVE); sub_8086794(); MewtwoDropInEffect(MewtwoEntity); - sub_803E708(0x3c,0x46); - DisplayDungeonDialogue(&gMewtwoReFightDialogue_2); + DungeonWaitFrames_Async(0x3c,0x46); + DisplayDungeonDialogue_Async(&gMewtwoReFightDialogue_2); MewtwoScreenFlash(); - DisplayDungeonDialogue(&gMewtwoReFightDialogue_3); + DisplayDungeonDialogue_Async(&gMewtwoReFightDialogue_3); MewtwoScreenFlash(); - DisplayDungeonDialogue(&gMewtwoReFightDialogue_4); + DisplayDungeonDialogue_Async(&gMewtwoReFightDialogue_4); SetupBossFightHP(MewtwoEntity,900,MUS_BATTLE_WITH_RAYQUAZA); ShiftCameraToPosition(&leaderEntity->pixelPos,0x10); } @@ -170,19 +170,19 @@ static void MewtwoScreenFlash(void) SetDungeonBGColorRGB(iVar1,iVar1,iVar1,1,1); DungeonRunFrameActions(0x46); } - sub_803E708(10,0x46); + DungeonWaitFrames_Async(10,0x46); for(iVar1 = 250; iVar1 > 199; iVar1 -= 10) { SetDungeonBGColorRGB(iVar1,iVar1,0,1,1); DungeonRunFrameActions(0x46); } - sub_803E708(10,0x46); + DungeonWaitFrames_Async(10,0x46); for(iVar1 = 250; iVar1 >= 0; iVar1 -= 10) { SetDungeonBGColorRGB(iVar1,iVar1,iVar1,1,1); DungeonRunFrameActions(0x46); } - sub_803E708(10,0x46); + DungeonWaitFrames_Async(10,0x46); sub_8085EB0(); } diff --git a/src/dungeon_cutscene_moltres.c b/src/dungeon_cutscene_moltres.c index 219705883..02fa8b0dc 100644 --- a/src/dungeon_cutscene_moltres.c +++ b/src/dungeon_cutscene_moltres.c @@ -86,10 +86,10 @@ void sub_8087848(void) CopyMonsterNameToBuffer(gFormatBuffer_Monsters[2],MONSTER_MOLTRES); } -void sub_80878F4(u8 monsterBehavior, u8 cutscene) +void HandleMoltresBossFaint(u8 monsterBehavior, u8 cutscene) { if ((cutscene == CUTSCENE_MT_BLAZE_PEAK_ATTEMPT1 || cutscene == CUTSCENE_MT_BLAZE_PEAK_ATTEMPT2 || cutscene == CUTSCENE_MT_BLAZE_PEAK_POSTSTORY) && monsterBehavior == BEHAVIOR_MOLTRES) { - sub_8097FA8(7); + SetTempCutsceneFlag(CUTSCENE_FLAG_MT_BLAZE_PEAK_COMPLETE); gDungeon->unk2 = DUNGEON_UNK2_1; } } @@ -105,60 +105,60 @@ void MoltresPreFightDialogue(void) moltresEntity = GetEntityFromMonsterBehavior(BEHAVIOR_MOLTRES); MoltresScreenFlash1(0xc,5); sub_8086500(); - sub_803E708(10,0x46); - DisplayDungeonDialogue(&gMoltresPreFightDialogue_1); - sub_803E708(10,0x46); - sub_80869E4(partnerEntity,4,1,DIRECTION_NORTHWEST); - sub_803E708(4,0x46); - SpriteLookAroundEffect(partnerEntity); - sub_803E708(10,0x46); - DisplayDungeonDialogue(gMoltresPreFightDialogue_2); - sub_803E708(10,0x46); + DungeonWaitFrames_Async(10,0x46); + DisplayDungeonDialogue_Async(&gMoltresPreFightDialogue_1); + DungeonWaitFrames_Async(10,0x46); + CutsceneLookDir_Async(partnerEntity,4,DIR_TRANS_SPINRIGHT1,DIRECTION_NORTHWEST); + DungeonWaitFrames_Async(4,0x46); + CutsceneLookAroundEffect_Async(partnerEntity); + DungeonWaitFrames_Async(10,0x46); + DisplayDungeonDialogue_Async(gMoltresPreFightDialogue_2); + DungeonWaitFrames_Async(10,0x46); MoltresScreenFlash1(0xc,5); MoltresScreenFlash2(9,5); - DisplayDungeonDialogue(gMoltresPreFightDialogue_3); - sub_803E708(10,0x46); - sub_80869E4(partnerEntity,4,1,DIRECTION_EAST); - sub_80869E4(leaderEntity,4,2,DIRECTION_WEST); - DisplayDungeonDialogue(gMoltresPreFightDialogue_4); - sub_803E708(10,0x46); - sub_80869E4(partnerEntity,4,2,DIRECTION_WEST); + DisplayDungeonDialogue_Async(gMoltresPreFightDialogue_3); + DungeonWaitFrames_Async(10,0x46); + CutsceneLookDir_Async(partnerEntity,4,DIR_TRANS_SPINRIGHT1,DIRECTION_EAST); + CutsceneLookDir_Async(leaderEntity,4,DIR_TRANS_SPINLEFT1,DIRECTION_WEST); + DisplayDungeonDialogue_Async(gMoltresPreFightDialogue_4); + DungeonWaitFrames_Async(10,0x46); + CutsceneLookDir_Async(partnerEntity,4,DIR_TRANS_SPINLEFT1,DIRECTION_WEST); sub_8086690(); - DisplayDungeonDialogue(&gMoltresPreFightDialogue_5); - sub_803E708(10,0x46); + DisplayDungeonDialogue_Async(&gMoltresPreFightDialogue_5); + DungeonWaitFrames_Async(10,0x46); sub_8085930(DIRECTION_NORTHWEST); - sub_803E708(4,0x46); + DungeonWaitFrames_Async(4,0x46); sub_8085930(DIRECTION_NORTH); PlaySoundEffect(0x2f2); DungeonStopBGM(); MoltresScreenDarken(); - DisplayDungeonDialogue(gMoltresPreFightDialogue_6); - sub_803E708(10,0x46); - DisplayDungeonDialogue(&gMoltresPreFightDialogue_7); - sub_803E708(10,0x46); + DisplayDungeonDialogue_Async(gMoltresPreFightDialogue_6); + DungeonWaitFrames_Async(10,0x46); + DisplayDungeonDialogue_Async(&gMoltresPreFightDialogue_7); + DungeonWaitFrames_Async(10,0x46); PlaySoundEffect(0x1cf); sub_80856E0(partnerEntity, DIRECTION_NORTH); - sub_803E708(10,0x46); - DisplayDungeonDialogue(gMoltresPreFightDialogue_8); - sub_803E708(10,0x46); + DungeonWaitFrames_Async(10,0x46); + DisplayDungeonDialogue_Async(gMoltresPreFightDialogue_8); + DungeonWaitFrames_Async(10,0x46); MoltresScreenFlash3(); PlaySoundEffect(0x1da); - DisplayDungeonDialogue(&gMoltresPreFightDialogue_9); - sub_803E708(10,0x46); + DisplayDungeonDialogue_Async(&gMoltresPreFightDialogue_9); + DungeonWaitFrames_Async(10,0x46); MoltresScreenFlash1(9,5); MoltresScreenFlash2(0xb,5); - DisplayDungeonDialogue(&gMoltresPreFightDialogue_10); - sub_803E708(10,0x46); + DisplayDungeonDialogue_Async(&gMoltresPreFightDialogue_10); + DungeonWaitFrames_Async(10,0x46); MoltresScreenFlash1(0xc,5); MoltresScreenFlash2(9,5); MoltresDropInEffect(moltresEntity); sub_808663C(); MoltresScreenFlash3(); - DisplayDungeonDialogue(&gMoltresPreFightDialogue_11); - sub_803E708(10,0x46); + DisplayDungeonDialogue_Async(&gMoltresPreFightDialogue_11); + DungeonWaitFrames_Async(10,0x46); MoltresScreenFlash2(0xb,6); - DisplayDungeonDialogue(&gMoltresPreFightDialogue_12); - sub_803E708(10,0x46); + DisplayDungeonDialogue_Async(&gMoltresPreFightDialogue_12); + DungeonWaitFrames_Async(10,0x46); SetupBossFightHP(moltresEntity,400,MUS_BOSS_BATTLE); ShiftCameraToPosition(&leaderEntity->pixelPos,0x10); } @@ -174,33 +174,33 @@ void MoltresReFightDialogue(void) moltresEntity = GetEntityFromMonsterBehavior(BEHAVIOR_MOLTRES); MoltresScreenFlash1(10,5); sub_8086500(); - sub_803E708(10,0x46); - SpriteLookAroundEffect(partnerEntity); - sub_803E708(10,0x46); - DisplayDungeonDialogue(&gMoltresReFightDialogue_1); - sub_803E708(10,0x46); - sub_80869E4(partnerEntity,4,1,DIRECTION_EAST); - sub_80869E4(leaderEntity,4,2,DIRECTION_WEST); - DisplayDungeonDialogue(gMoltresReFightDialogue_2); - sub_803E708(10,0x46); - sub_80869E4(partnerEntity,4,2,DIRECTION_WEST); - sub_80869E4(leaderEntity,4,2,DIRECTION_WEST); + DungeonWaitFrames_Async(10,0x46); + CutsceneLookAroundEffect_Async(partnerEntity); + DungeonWaitFrames_Async(10,0x46); + DisplayDungeonDialogue_Async(&gMoltresReFightDialogue_1); + DungeonWaitFrames_Async(10,0x46); + CutsceneLookDir_Async(partnerEntity,4,DIR_TRANS_SPINRIGHT1,DIRECTION_EAST); + CutsceneLookDir_Async(leaderEntity,4,DIR_TRANS_SPINLEFT1,DIRECTION_WEST); + DisplayDungeonDialogue_Async(gMoltresReFightDialogue_2); + DungeonWaitFrames_Async(10,0x46); + CutsceneLookDir_Async(partnerEntity,4,DIR_TRANS_SPINLEFT1,DIRECTION_WEST); + CutsceneLookDir_Async(leaderEntity,4,DIR_TRANS_SPINLEFT1,DIRECTION_WEST); sub_8086690(); MoltresScreenDarken(); - sub_803E708(10,0x46); + DungeonWaitFrames_Async(10,0x46); sub_8085930(DIRECTION_NORTHWEST); - sub_803E708(4,0x46); + DungeonWaitFrames_Async(4,0x46); sub_8085930(DIRECTION_NORTH); MoltresDropInEffect(moltresEntity); sub_808663C(); MoltresScreenFlash3(); - DisplayDungeonDialogue(&gMoltresReFightDialogue_3); - sub_803E708(10,0x46); + DisplayDungeonDialogue_Async(&gMoltresReFightDialogue_3); + DungeonWaitFrames_Async(10,0x46); MoltresScreenFlash2(0xb,6); - DisplayDungeonDialogue(gMoltresReFightDialogue_4); - sub_803E708(10,0x46); - DisplayDungeonDialogue(&gMoltresReFightDialogue_5); - sub_803E708(10,0x46); + DisplayDungeonDialogue_Async(gMoltresReFightDialogue_4); + DungeonWaitFrames_Async(10,0x46); + DisplayDungeonDialogue_Async(&gMoltresReFightDialogue_5); + DungeonWaitFrames_Async(10,0x46); SetupBossFightHP(moltresEntity,400,MUS_BOSS_BATTLE); ShiftCameraToPosition(&leaderEntity->pixelPos,0x10); } @@ -216,29 +216,29 @@ void MoltresPostStoryPreFightDialogue(void) sub_808654C(); if (sub_8086AE4(MONSTER_MOLTRES)) { sub_8085930(DIRECTION_NORTHWEST); - sub_803E708(4,0x46); + DungeonWaitFrames_Async(4,0x46); sub_8085930(DIRECTION_NORTH); - sub_803E708(4,0x46); - sub_803E708(10,0x46); - DisplayDungeonDialogue(&gUnknown_8100D3C); - sub_803E708(10,0x46); + DungeonWaitFrames_Async(4,0x46); + DungeonWaitFrames_Async(10,0x46); + DisplayDungeonDialogue_Async(&gUnknown_8100D3C); + DungeonWaitFrames_Async(10,0x46); gDungeon->unk2 = DUNGEON_UNK2_1; } else { - DisplayDungeonDialogue(&gMoltresPostStoryPreFightDialogue_1); + DisplayDungeonDialogue_Async(&gMoltresPostStoryPreFightDialogue_1); sub_8085930(DIRECTION_NORTHWEST); - sub_803E708(4,0x46); + DungeonWaitFrames_Async(4,0x46); sub_8085930(DIRECTION_NORTH); MoltresDropInEffect(moltresEntity); - DisplayDungeonDialogue(&gMoltresPostStoryPreFightDialogue_2); + DisplayDungeonDialogue_Async(&gMoltresPostStoryPreFightDialogue_2); MoltresScreenFlash1(0xc,5); MoltresScreenFlash2(9,5); - DisplayDungeonDialogue(&gMoltresPostStoryPreFightDialogue_3); + DisplayDungeonDialogue_Async(&gMoltresPostStoryPreFightDialogue_3); MoltresScreenFlash3(); - DisplayDungeonDialogue(&gMoltresPostStoryPreFightDialogue_4); + DisplayDungeonDialogue_Async(&gMoltresPostStoryPreFightDialogue_4); MoltresScreenFlash2(0xb,6); - DisplayDungeonDialogue(&gMoltresPostStoryPreFightDialogue_5); - sub_803E708(10,0x46); + DisplayDungeonDialogue_Async(&gMoltresPostStoryPreFightDialogue_5); + DungeonWaitFrames_Async(10,0x46); SetupBossFightHP(moltresEntity,400,MUS_BOSS_BATTLE); ShiftCameraToPosition(&leaderEntity->pixelPos,0x10); } @@ -292,13 +292,13 @@ static void MoltresScreenFlash2(s32 xArg, s32 yArg) SetDungeonBGColorRGB(i, 0, 0, 1, 1); DungeonRunFrameActions(0x46); } - sub_803E708(0xA, 0x46); + DungeonWaitFrames_Async(0xA, 0x46); for (i = 250; i >= 0; i -= 10) { SetDungeonBGColorRGB(i, 0, 0, 1, 1); DungeonRunFrameActions(0x46); } - sub_803E708(0xA, 0x46); + DungeonWaitFrames_Async(0xA, 0x46); sub_8085EB0(); sub_8085F44(r6); @@ -315,14 +315,14 @@ static void MoltresScreenFlash3(void) SetDungeonBGColorRGB(iVar1,iVar1,iVar1 / 2,1,1); DungeonRunFrameActions(0x46); } - sub_803E708(0x1e,0x46); + DungeonWaitFrames_Async(0x1e,0x46); PlaySoundEffect(0x1ed); for(iVar1 = 250; iVar1 >= 0; iVar1 -= 10) { SetDungeonBGColorRGB(iVar1,iVar1,iVar1 / 2,1,1); DungeonRunFrameActions(0x46); } - sub_803E708(0x1e,0x46); + DungeonWaitFrames_Async(0x1e,0x46); sub_8085EB0(); } diff --git a/src/dungeon_cutscene_raikou.c b/src/dungeon_cutscene_raikou.c index 5dd2772f5..af8cba5d1 100644 --- a/src/dungeon_cutscene_raikou.c +++ b/src/dungeon_cutscene_raikou.c @@ -84,10 +84,10 @@ void sub_8089F8C(void) CopyMonsterNameToBuffer(gFormatBuffer_Monsters[2], MONSTER_RAIKOU); } -void sub_8089FF0(u8 monsterBehavior, u8 cutscene) +void HandleRaikouBossFaint(u8 monsterBehavior, u8 cutscene) { if ((cutscene == CUTSCENE_LIGHTNING_FIELD_ATTEMPT1 || cutscene == CUTSCENE_LIGHTNING_FIELD_ATTEMPT2 || cutscene == CUTSCENE_LIGHTNING_FIELD_POSTSTORY) && monsterBehavior == BEHAVIOR_RAIKOU) { - sub_8097FA8(23); + SetTempCutsceneFlag(CUTSCENE_FLAG_LIGHTNING_FIELD_COMPLETE); gDungeon->unk2 = DUNGEON_UNK2_1; } } @@ -99,20 +99,20 @@ void RaikouPreFightDialogue(void) leaderEntity = CutsceneGetLeader(); RaikouEntity = GetEntityFromMonsterBehavior(BEHAVIOR_RAIKOU); - DisplayDungeonDialogue(&gRaikouPreFightDialogue_1); + DisplayDungeonDialogue_Async(&gRaikouPreFightDialogue_1); RaikouScreenFlash(); - DisplayDungeonDialogue(&gRaikouPreFightDialogue_2); + DisplayDungeonDialogue_Async(&gRaikouPreFightDialogue_2); gDungeon->weather.unkE265 = WEATHER_RAIN; sub_807EAA0(0,1); - sub_803E708(10,70); - DisplayDungeonDialogue(&gRaikouPreFightDialogue_3); + DungeonWaitFrames_Async(10,70); + DisplayDungeonDialogue_Async(&gRaikouPreFightDialogue_3); RaikouScreenFlash(); - DisplayDungeonDialogue(&gRaikouPreFightDialogue_4); + DisplayDungeonDialogue_Async(&gRaikouPreFightDialogue_4); RaikouScreenFlash(); - DisplayDungeonDialogue(&gRaikouPreFightDialogue_5); + DisplayDungeonDialogue_Async(&gRaikouPreFightDialogue_5); RaikouScreenFlash(); - DisplayDungeonDialogue(&gRaikouPreFightDialogue_6); - sub_803E708(10,70); + DisplayDungeonDialogue_Async(&gRaikouPreFightDialogue_6); + DungeonWaitFrames_Async(10,70); SetupBossFightHP(RaikouEntity,0x28a,MUS_BOSS_BATTLE); ShiftCameraToPosition(&leaderEntity->pixelPos,0x10); } @@ -127,12 +127,12 @@ void RaikouReFightDialogue(void) gDungeon->weather.unkE265 = WEATHER_RAIN; sub_807EAA0(0,1); RaikouScreenFlash(); - DisplayDungeonDialogue(&gRaikouReFightDialogue_1); + DisplayDungeonDialogue_Async(&gRaikouReFightDialogue_1); RaikouScreenFlash(); - DisplayDungeonDialogue(&gRaikouReFightDialogue_2); + DisplayDungeonDialogue_Async(&gRaikouReFightDialogue_2); RaikouScreenFlash(); - DisplayDungeonDialogue(&gRaikouReFightDialogue_3); - sub_803E708(10,70); + DisplayDungeonDialogue_Async(&gRaikouReFightDialogue_3); + DungeonWaitFrames_Async(10,70); SetupBossFightHP(RaikouEntity,0x28a,MUS_BOSS_BATTLE); ShiftCameraToPosition(&leaderEntity->pixelPos,0x10); } @@ -150,12 +150,12 @@ void RaikouPostStoryPreFightDialogue(void) else { gDungeon->weather.unkE265 = WEATHER_RAIN; sub_807EAA0(0,1); - DisplayDungeonDialogue(&gRaikouPostStoryPreFightDialogue_1); + DisplayDungeonDialogue_Async(&gRaikouPostStoryPreFightDialogue_1); RaikouScreenFlash(); - DisplayDungeonDialogue(&gRaikouPostStoryPreFightDialogue_2); + DisplayDungeonDialogue_Async(&gRaikouPostStoryPreFightDialogue_2); RaikouScreenFlash(); - DisplayDungeonDialogue(&gRaikouPostStoryPreFightDialogue_3); - sub_803E708(10,70); + DisplayDungeonDialogue_Async(&gRaikouPostStoryPreFightDialogue_3); + DungeonWaitFrames_Async(10,70); SetupBossFightHP(RaikouEntity,650,MUS_BOSS_BATTLE); ShiftCameraToPosition(&leaderEntity->pixelPos,0x10); } @@ -171,19 +171,19 @@ static void RaikouScreenFlash(void) SetDungeonBGColorRGB(iVar1,iVar1,iVar1,1,1); DungeonRunFrameActions(70); } - sub_803E708(10,70); + DungeonWaitFrames_Async(10,70); for(iVar1 = 250; iVar1 > 199; iVar1 -= 10) { SetDungeonBGColorRGB(iVar1,iVar1,iVar1,1,1); DungeonRunFrameActions(70); } - sub_803E708(10,70); + DungeonWaitFrames_Async(10,70); for(iVar1 = 250; iVar1 >= 0; iVar1 -= 10) { SetDungeonBGColorRGB(iVar1,iVar1,iVar1,1,1); DungeonRunFrameActions(70); } - sub_803E708(10,70); + DungeonWaitFrames_Async(10,70); sub_8085EB0(); } diff --git a/src/dungeon_cutscene_rayquaza.c b/src/dungeon_cutscene_rayquaza.c index 7c2f9e7b3..4243bb6e5 100644 --- a/src/dungeon_cutscene_rayquaza.c +++ b/src/dungeon_cutscene_rayquaza.c @@ -75,10 +75,10 @@ void sub_8089328(void) CopyMonsterNameToBuffer(gFormatBuffer_Monsters[2],MONSTER_RAYQUAZA); } -void sub_80893B4(u8 monsterBehavior, u8 cutscene) +void HandleRayquazaBossFaint(u8 monsterBehavior, u8 cutscene) { if ((cutscene == CUTSCENE_SKY_TOWER_SUMMIT_ATTEMPT1 || cutscene == CUTSCENE_SKY_TOWER_SUMMIT_ATTEMPT2 || cutscene == CUTSCENE_SKY_TOWER_SUMMIT_POSTSTORY) && monsterBehavior == BEHAVIOR_RAYQUAZA) { - sub_8097FA8(15); + SetTempCutsceneFlag(CUTSCENE_FLAG_SKY_TOWER_SUMMIT_COMPLETE); gDungeon->unk2 = DUNGEON_UNK2_1; } } @@ -93,33 +93,33 @@ void RayquazaPreFightDialogue(void) partnerEntity = CutsceneGetPartner(); rayquazaEntity = GetEntityFromMonsterBehavior(BEHAVIOR_RAYQUAZA); sub_8086448(); - DisplayDungeonDialogue(&gRayquazaPreFightDialogue_1); + DisplayDungeonDialogue_Async(&gRayquazaPreFightDialogue_1); RayquazaScreenFlash(); - DisplayDungeonDialogue(&gRayquazaPreFightDialogue_2); + DisplayDungeonDialogue_Async(&gRayquazaPreFightDialogue_2); sub_80856E0(partnerEntity, DIRECTION_NORTH); - SpriteLookAroundEffect(partnerEntity); - sub_803E708(10,0x46); - sub_80869E4(partnerEntity,4,1,DIRECTION_EAST); - sub_80869E4(leaderEntity,4,2,DIRECTION_WEST); - DisplayDungeonDialogue(gRayquazaPreFightDialogue_3); - sub_80869E4(partnerEntity,4,2,DIRECTION_NORTH); - sub_80869E4(leaderEntity,4,1,DIRECTION_NORTH); - DisplayDungeonDialogue(&gRayquazaPreFightDialogue_4); - sub_803E708(10,0x46); - DisplayDungeonDialogue(&gRayquazaPreFightDialogue_5); - sub_803E708(10,0x46); - DisplayDungeonDialogue(&gRayquazaPreFightDialogue_6); + CutsceneLookAroundEffect_Async(partnerEntity); + DungeonWaitFrames_Async(10,0x46); + CutsceneLookDir_Async(partnerEntity,4,DIR_TRANS_SPINRIGHT1,DIRECTION_EAST); + CutsceneLookDir_Async(leaderEntity,4,DIR_TRANS_SPINLEFT1,DIRECTION_WEST); + DisplayDungeonDialogue_Async(gRayquazaPreFightDialogue_3); + CutsceneLookDir_Async(partnerEntity,4,DIR_TRANS_SPINLEFT1,DIRECTION_NORTH); + CutsceneLookDir_Async(leaderEntity,4,DIR_TRANS_SPINRIGHT1,DIRECTION_NORTH); + DisplayDungeonDialogue_Async(&gRayquazaPreFightDialogue_4); + DungeonWaitFrames_Async(10,0x46); + DisplayDungeonDialogue_Async(&gRayquazaPreFightDialogue_5); + DungeonWaitFrames_Async(10,0x46); + DisplayDungeonDialogue_Async(&gRayquazaPreFightDialogue_6); RayquazaScreenFlash(); PlaySoundEffect(0x1da); // Rayquaza Cry - DisplayDungeonDialogue(&gRayquazaPreFightDialogue_7); + DisplayDungeonDialogue_Async(&gRayquazaPreFightDialogue_7); RayquazaDropInEffect(rayquazaEntity); - DisplayDungeonDialogue(&gRayquazaPreFightDialogue_8); + DisplayDungeonDialogue_Async(&gRayquazaPreFightDialogue_8); RayquazaScreenFlash(); - DisplayDungeonDialogue(&gRayquazaPreFightDialogue_9); + DisplayDungeonDialogue_Async(&gRayquazaPreFightDialogue_9); RayquazaScreenFlash(); - DisplayDungeonDialogue(&gRayquazaPreFightDialogue_10); + DisplayDungeonDialogue_Async(&gRayquazaPreFightDialogue_10); RayquazaScreenFlash(); - DisplayDungeonDialogue(&gRayquazaPreFightDialogue_11); + DisplayDungeonDialogue_Async(&gRayquazaPreFightDialogue_11); SetupBossFightHP(rayquazaEntity,600,MUS_BATTLE_WITH_RAYQUAZA); ShiftCameraToPosition(&leaderEntity->pixelPos,0x10); } @@ -134,16 +134,16 @@ void RayquazaReFightDialogue(void) sub_8086448(); RayquazaScreenFlash(); PlaySoundEffect(0x1da); // Rayquaza Cry - DisplayDungeonDialogue(&gRayquazaPreFightDialogue_7); - sub_803E708(10,0x46); + DisplayDungeonDialogue_Async(&gRayquazaPreFightDialogue_7); + DungeonWaitFrames_Async(10,0x46); RayquazaDropInEffect(rayquazaEntity); - DisplayDungeonDialogue(&gRayquazaReFightDialogue_1); + DisplayDungeonDialogue_Async(&gRayquazaReFightDialogue_1); RayquazaScreenFlash(); - DisplayDungeonDialogue(&gRayquazaReFightDialogue_2); + DisplayDungeonDialogue_Async(&gRayquazaReFightDialogue_2); RayquazaScreenFlash(); - DisplayDungeonDialogue(&gRayquazaReFightDialogue_3); + DisplayDungeonDialogue_Async(&gRayquazaReFightDialogue_3); RayquazaScreenFlash(); - DisplayDungeonDialogue(&gRayquazaReFightDialogue_4); + DisplayDungeonDialogue_Async(&gRayquazaReFightDialogue_4); SetupBossFightHP(rayquazaEntity,600,MUS_BATTLE_WITH_RAYQUAZA); ShiftCameraToPosition(&leaderEntity->pixelPos,0x10); } @@ -161,15 +161,15 @@ void RayquazaPostStoryPreFightDialogue(void) } else { PlaySoundEffect(0x1da); // Rayquaza Cry - DisplayDungeonDialogue(&gRayquazaPostStoryPreFightDialogue_1); + DisplayDungeonDialogue_Async(&gRayquazaPostStoryPreFightDialogue_1); RayquazaDropInEffect(rayquazaEntity); - DisplayDungeonDialogue(&gRayquazaPostStoryPreFightDialogue_2); + DisplayDungeonDialogue_Async(&gRayquazaPostStoryPreFightDialogue_2); RayquazaScreenFlash(); - DisplayDungeonDialogue(&gRayquazaPostStoryPreFightDialogue_3); + DisplayDungeonDialogue_Async(&gRayquazaPostStoryPreFightDialogue_3); RayquazaScreenFlash(); - DisplayDungeonDialogue(&gRayquazaPostStoryPreFightDialogue_4); + DisplayDungeonDialogue_Async(&gRayquazaPostStoryPreFightDialogue_4); RayquazaScreenFlash(); - DisplayDungeonDialogue(&gRayquazaPostStoryPreFightDialogue_5); + DisplayDungeonDialogue_Async(&gRayquazaPostStoryPreFightDialogue_5); SetupBossFightHP(rayquazaEntity,600,MUS_BOSS_BATTLE); ShiftCameraToPosition(&leaderEntity->pixelPos,0x10); } @@ -207,18 +207,18 @@ static void RayquazaScreenFlash(void) SetDungeonBGColorRGB(iVar1 / 2, iVar1, iVar1 / 2, 1, 1); DungeonRunFrameActions(70); } - sub_803E708(10,70); + DungeonWaitFrames_Async(10,70); for(iVar1 = 250; iVar1 > 199; iVar1 -= 10) { SetDungeonBGColorRGB(iVar1 / 2, iVar1, 0, 1, 1); DungeonRunFrameActions(70); } - sub_803E708(10,70); + DungeonWaitFrames_Async(10,70); for(iVar1 = 250; iVar1 >= 0; iVar1 -= 10) { SetDungeonBGColorRGB(iVar1 / 2, iVar1, iVar1 / 2, 1, 1); DungeonRunFrameActions(70); } - sub_803E708(10,70); + DungeonWaitFrames_Async(10,70); sub_8085EB0(); } diff --git a/src/dungeon_cutscene_regis.c b/src/dungeon_cutscene_regis.c index 2d5a9b3f8..f948a2b3c 100644 --- a/src/dungeon_cutscene_regis.c +++ b/src/dungeon_cutscene_regis.c @@ -43,21 +43,21 @@ void sub_808ACC0(void) if (HasRecruitedMon(MONSTER_REGIROCK)) { Entity *entity = GetEntityFromMonsterBehavior(BEHAVIOR_REGIROCK); HandleFaint_Async(entity, DUNGEON_EXIT_DELETED_FOR_EVENT, NULL); - sub_8097FA8(34); - sub_8097FA8(29); + SetTempCutsceneFlag(CUTSCENE_FLAG_REGI_RECRUITED); + SetTempCutsceneFlag(CUTSCENE_FLAG_REGI_ITEM_OBTAINED); sub_808B1CC(ITEM_ROCK_PART); } else if (ItemInInventoryOrHeld(ITEM_ROCK_PART)) { - sub_8098044(34); - sub_8097FA8(29); + UnsetCutsceneFlag(CUTSCENE_FLAG_REGI_RECRUITED); + SetTempCutsceneFlag(CUTSCENE_FLAG_REGI_ITEM_OBTAINED); } else if (ItemInInventoryOrHeld(ITEM_MUSIC_BOX)) { - sub_8098044(34); - sub_8097FA8(29); + UnsetCutsceneFlag(CUTSCENE_FLAG_REGI_RECRUITED); + SetTempCutsceneFlag(CUTSCENE_FLAG_REGI_ITEM_OBTAINED); } else { - sub_8098044(34); - sub_8098044(29); + UnsetCutsceneFlag(CUTSCENE_FLAG_REGI_RECRUITED); + UnsetCutsceneFlag(CUTSCENE_FLAG_REGI_ITEM_OBTAINED); sub_80855E4(SetupRegiFacingDirection); CopyMonsterNameToBuffer(gFormatBuffer_Monsters[2], MONSTER_REGIROCK); } @@ -68,21 +68,21 @@ void sub_808AD48(void) if (HasRecruitedMon(MONSTER_REGICE)) { Entity *entity = GetEntityFromMonsterBehavior(BEHAVIOR_REGICE); HandleFaint_Async(entity, DUNGEON_EXIT_DELETED_FOR_EVENT, NULL); - sub_8097FA8(34); - sub_8097FA8(29); + SetTempCutsceneFlag(CUTSCENE_FLAG_REGI_RECRUITED); + SetTempCutsceneFlag(CUTSCENE_FLAG_REGI_ITEM_OBTAINED); sub_808B1CC(ITEM_ICE_PART); } else if (ItemInInventoryOrHeld(ITEM_ICE_PART)) { - sub_8098044(34); - sub_8097FA8(29); + UnsetCutsceneFlag(CUTSCENE_FLAG_REGI_RECRUITED); + SetTempCutsceneFlag(CUTSCENE_FLAG_REGI_ITEM_OBTAINED); } else if (ItemInInventoryOrHeld(ITEM_MUSIC_BOX)) { - sub_8098044(34); - sub_8097FA8(29); + UnsetCutsceneFlag(CUTSCENE_FLAG_REGI_RECRUITED); + SetTempCutsceneFlag(CUTSCENE_FLAG_REGI_ITEM_OBTAINED); } else { - sub_8098044(34); - sub_8098044(29); + UnsetCutsceneFlag(CUTSCENE_FLAG_REGI_RECRUITED); + UnsetCutsceneFlag(CUTSCENE_FLAG_REGI_ITEM_OBTAINED); sub_80855E4(SetupRegiFacingDirection); CopyMonsterNameToBuffer(gFormatBuffer_Monsters[2], MONSTER_REGICE); } @@ -93,37 +93,37 @@ void sub_808ADCC(void) if (HasRecruitedMon(MONSTER_REGISTEEL)) { Entity *entity = GetEntityFromMonsterBehavior(BEHAVIOR_REGISTEEL); HandleFaint_Async(entity, DUNGEON_EXIT_DELETED_FOR_EVENT, NULL); - sub_8097FA8(34); - sub_8097FA8(29); + SetTempCutsceneFlag(CUTSCENE_FLAG_REGI_RECRUITED); + SetTempCutsceneFlag(CUTSCENE_FLAG_REGI_ITEM_OBTAINED); sub_808B1CC(ITEM_STEEL_PART); } else if (ItemInInventoryOrHeld(ITEM_STEEL_PART)) { - sub_8098044(34); - sub_8097FA8(29); + UnsetCutsceneFlag(CUTSCENE_FLAG_REGI_RECRUITED); + SetTempCutsceneFlag(CUTSCENE_FLAG_REGI_ITEM_OBTAINED); } else if (ItemInInventoryOrHeld(ITEM_MUSIC_BOX)) { - sub_8098044(34); - sub_8097FA8(29); + UnsetCutsceneFlag(CUTSCENE_FLAG_REGI_RECRUITED); + SetTempCutsceneFlag(CUTSCENE_FLAG_REGI_ITEM_OBTAINED); } else { - sub_8098044(34); - sub_8098044(29); + UnsetCutsceneFlag(CUTSCENE_FLAG_REGI_RECRUITED); + UnsetCutsceneFlag(CUTSCENE_FLAG_REGI_ITEM_OBTAINED); sub_80855E4(SetupRegiFacingDirection); CopyMonsterNameToBuffer(gFormatBuffer_Monsters[2], MONSTER_REGISTEEL); } } -void sub_808AE54(u8 monsterBehavior, u8 cutscene, DungeonPos *pos) +void HandleRegirockBossFaint_Async(u8 monsterBehavior, u8 cutscene, DungeonPos *pos) { Entity *leaderEntity; s16 IDStack[2]; leaderEntity = CutsceneGetLeader(); - sub_8052D44(IDStack, leaderEntity, NULL); + BufferCutsceneProtagonists(IDStack, leaderEntity, NULL); - if (!sub_8098100(34) && cutscene == CUTSCENE_REGIROCK && monsterBehavior == BEHAVIOR_REGIROCK) { + if (!GetCutsceneFlag(CUTSCENE_FLAG_REGI_RECRUITED) && cutscene == CUTSCENE_REGIROCK && monsterBehavior == BEHAVIOR_REGIROCK) { sub_808B1CC(ITEM_NOTHING); - if (!sub_8098100(29)) { + if (!GetCutsceneFlag(CUTSCENE_FLAG_REGI_ITEM_OBTAINED)) { Item item; ItemIdToItem(&item, ITEM_ROCK_PART, FALSE); @@ -131,22 +131,22 @@ void sub_808AE54(u8 monsterBehavior, u8 cutscene, DungeonPos *pos) DungeonStartNewBGM(MUS_IN_THE_DEPTHS_OF_THE_PIT); // Something fell from Regirock's body // Regirock was apparently guarding this item - DisplayDungeonDialogue(&gRegirockPostFightDialogue_1); + DisplayDungeonDialogue_Async(&gRegirockPostFightDialogue_1); } } } -void sub_808AEC8(u8 monsterBehavior, u8 cutscene, DungeonPos *pos) +void HandleRegiceBossFaint_Async(u8 monsterBehavior, u8 cutscene, DungeonPos *pos) { Entity *leaderEntity; s16 IDStack[2]; leaderEntity = CutsceneGetLeader(); - sub_8052D44(IDStack, leaderEntity, NULL); + BufferCutsceneProtagonists(IDStack, leaderEntity, NULL); - if (!sub_8098100(34) && cutscene == CUTSCENE_REGICE && monsterBehavior == BEHAVIOR_REGICE) { + if (!GetCutsceneFlag(CUTSCENE_FLAG_REGI_RECRUITED) && cutscene == CUTSCENE_REGICE && monsterBehavior == BEHAVIOR_REGICE) { sub_808B1CC(ITEM_NOTHING); - if (!sub_8098100(29)) { + if (!GetCutsceneFlag(CUTSCENE_FLAG_REGI_ITEM_OBTAINED)) { Item item; ItemIdToItem(&item, ITEM_ICE_PART, FALSE); @@ -154,22 +154,22 @@ void sub_808AEC8(u8 monsterBehavior, u8 cutscene, DungeonPos *pos) DungeonStartNewBGM(MUS_IN_THE_DEPTHS_OF_THE_PIT); // Something fell from Regice's body // Regice was apparently guarding this item - DisplayDungeonDialogue(&gRegicePostFightDialogue_1); + DisplayDungeonDialogue_Async(&gRegicePostFightDialogue_1); } } } -void sub_808AF3C(u8 monsterBehavior, u8 cutscene, DungeonPos *pos) +void HandleRegisteelBossFaint_Async(u8 monsterBehavior, u8 cutscene, DungeonPos *pos) { Entity *leaderEntity; s16 IDStack[2]; leaderEntity = CutsceneGetLeader(); - sub_8052D44(IDStack, leaderEntity, NULL); + BufferCutsceneProtagonists(IDStack, leaderEntity, NULL); - if (!sub_8098100(34) && cutscene == CUTSCENE_REGISTEEL && monsterBehavior == BEHAVIOR_REGISTEEL) { + if (!GetCutsceneFlag(CUTSCENE_FLAG_REGI_RECRUITED) && cutscene == CUTSCENE_REGISTEEL && monsterBehavior == BEHAVIOR_REGISTEEL) { sub_808B1CC(ITEM_NOTHING); - if (!sub_8098100(29)) { + if (!GetCutsceneFlag(CUTSCENE_FLAG_REGI_ITEM_OBTAINED)) { Item item; ItemIdToItem(&item, ITEM_STEEL_PART, FALSE); @@ -177,100 +177,100 @@ void sub_808AF3C(u8 monsterBehavior, u8 cutscene, DungeonPos *pos) DungeonStartNewBGM(MUS_IN_THE_DEPTHS_OF_THE_PIT); // Something fell from Registeel's body // Registeel was apparently guarding this item - DisplayDungeonDialogue(&gRegisteelPostFightDialogue_1); + DisplayDungeonDialogue_Async(&gRegisteelPostFightDialogue_1); } } } -void sub_808AFB0(u8 cutscene) +void sub_808AFB0_Async(u8 cutscene) { Entity *leaderEntity; s16 IDStack[2]; leaderEntity = CutsceneGetLeader(); - sub_8052D44(IDStack, leaderEntity, NULL); + BufferCutsceneProtagonists(IDStack, leaderEntity, NULL); - if (!sub_8098100(34) && cutscene == CUTSCENE_REGIROCK && !sub_8098100(29) && ItemInInventoryOrHeld(ITEM_ROCK_PART)) { - sub_8097FD0(29); - SubstitutePlaceholderStringTags(gFormatBuffer_Monsters[0],GetLeader(),0); + if (!GetCutsceneFlag(CUTSCENE_FLAG_REGI_RECRUITED) && cutscene == CUTSCENE_REGIROCK && !GetCutsceneFlag(CUTSCENE_FLAG_REGI_ITEM_OBTAINED) && ItemInInventoryOrHeld(ITEM_ROCK_PART)) { + SetCutsceneFlag(CUTSCENE_FLAG_REGI_ITEM_OBTAINED); + SubstitutePlaceholderStringTags(gFormatBuffer_Monsters[0], GetLeader(), 0); // {POKEMON_0} obtained the Rock Part that Regirock was guarding - DisplayDungeonDialogue(&gRegirockPostFightDialogue_2); - sub_80421C0(0,212); - sub_803E708(10,70); - sub_8046D20(); + DisplayDungeonDialogue_Async(&gRegirockPostFightDialogue_2); + sub_80421C0(0, 212); + DungeonWaitFrames_Async(10, 70); + PotentiallyCreateMusicBox_Async(); } } -void sub_808B030(u8 cutscene) +void sub_808B030_Async(u8 cutscene) { Entity *leaderEntity; s16 IDStack[2]; leaderEntity = CutsceneGetLeader(); - sub_8052D44(IDStack, leaderEntity, NULL); + BufferCutsceneProtagonists(IDStack, leaderEntity, NULL); - if (!sub_8098100(34) && cutscene == CUTSCENE_REGICE && !sub_8098100(29) && ItemInInventoryOrHeld(ITEM_ICE_PART)) { - sub_8097FD0(29); - SubstitutePlaceholderStringTags(gFormatBuffer_Monsters[0],GetLeader(),0); + if (!GetCutsceneFlag(CUTSCENE_FLAG_REGI_RECRUITED) && cutscene == CUTSCENE_REGICE && !GetCutsceneFlag(CUTSCENE_FLAG_REGI_ITEM_OBTAINED) && ItemInInventoryOrHeld(ITEM_ICE_PART)) { + SetCutsceneFlag(CUTSCENE_FLAG_REGI_ITEM_OBTAINED); + SubstitutePlaceholderStringTags(gFormatBuffer_Monsters[0], GetLeader(), 0); // {POKEMON_0} obtained the Ice Part that Regice was guarding - DisplayDungeonDialogue(&gRegicePostFightDialogue_2); - sub_80421C0(0,212); - sub_803E708(10,70); - sub_8046D20(); + DisplayDungeonDialogue_Async(&gRegicePostFightDialogue_2); + sub_80421C0(0, 212); + DungeonWaitFrames_Async(10, 70); + PotentiallyCreateMusicBox_Async(); } } -void sub_808B0B0(u8 cutscene) +void sub_808B0B0_Async(u8 cutscene) { Entity *leaderEntity; s16 IDStack[2]; leaderEntity = CutsceneGetLeader(); - sub_8052D44(IDStack,leaderEntity, NULL); + BufferCutsceneProtagonists(IDStack, leaderEntity, NULL); - if (!sub_8098100(34) && cutscene == CUTSCENE_REGISTEEL && !sub_8098100(29) && ItemInInventoryOrHeld(ITEM_STEEL_PART)) { - sub_8097FD0(29); + if (!GetCutsceneFlag(CUTSCENE_FLAG_REGI_RECRUITED) && cutscene == CUTSCENE_REGISTEEL && !GetCutsceneFlag(CUTSCENE_FLAG_REGI_ITEM_OBTAINED) && ItemInInventoryOrHeld(ITEM_STEEL_PART)) { + SetCutsceneFlag(CUTSCENE_FLAG_REGI_ITEM_OBTAINED); SubstitutePlaceholderStringTags(gFormatBuffer_Monsters[0], GetLeader(), 0); // {POKEMON_0} obtained the Steel Part that Registeel was guarding - DisplayDungeonDialogue(&gRegisteelPostFightDialogue_2); - sub_80421C0(0,212); - sub_803E708(10,70); - sub_8046D20(); + DisplayDungeonDialogue_Async(&gRegisteelPostFightDialogue_2); + sub_80421C0(0, 212); + DungeonWaitFrames_Async(10, 70); + PotentiallyCreateMusicBox_Async(); } } void RegirockPreFightDialogue(void) { - if (!sub_8098100(34)) { + if (!GetCutsceneFlag(CUTSCENE_FLAG_REGI_RECRUITED)) { sub_8085930(DIRECTION_NORTH); // INTRUDER ALERT // EXTERMINATE - DisplayDungeonDialogue(&gRegirockPreFightDialogue_1); - sub_803E708(10,70); + DisplayDungeonDialogue_Async(&gRegirockPreFightDialogue_1); + DungeonWaitFrames_Async(10, 70); sub_808563C(SetupRegirockFightHP); } } void RegicePreFightDialogue(void) { - if (!sub_8098100(34)) { + if (!GetCutsceneFlag(CUTSCENE_FLAG_REGI_RECRUITED)) { sub_8085930(DIRECTION_NORTH); // INTRUDER ALERT // EXTERMINATE - DisplayDungeonDialogue(&gRegicePreFightDialogue_1); - sub_803E708(10,70); + DisplayDungeonDialogue_Async(&gRegicePreFightDialogue_1); + DungeonWaitFrames_Async(10,70); sub_808563C(SetupRegiceFightHP); } } void RegisteelPreFightDialogue(void) { - if (!sub_8098100(34)) { + if (!GetCutsceneFlag(CUTSCENE_FLAG_REGI_RECRUITED)) { sub_8085930(DIRECTION_NORTH); // INTRUDER ALERT // EXTERMINATE - DisplayDungeonDialogue(&gRegisteelPreFightDialogue_1); - sub_803E708(10,70); + DisplayDungeonDialogue_Async(&gRegisteelPreFightDialogue_1); + DungeonWaitFrames_Async(10,70); sub_808563C(SetupRegisteelFightHP); } } diff --git a/src/dungeon_cutscene_skarmory.c b/src/dungeon_cutscene_skarmory.c index 516aecff4..27f896d17 100644 --- a/src/dungeon_cutscene_skarmory.c +++ b/src/dungeon_cutscene_skarmory.c @@ -71,10 +71,10 @@ void sub_8086B94(void) sub_8085860(leaderEntity->pos.x,leaderEntity->pos.y); } -void sub_8086BDC(u8 monsterBehavior, u8 cutscene) +void HandleSkarmoryBossFaint(u8 monsterBehavior, u8 cutscene) { if ((cutscene == CUTSCENE_MT_STEEL_ATTEMPT1 || cutscene == CUTSCENE_MT_STEEL_ATTEMPT2) && monsterBehavior == BEHAVIOR_SKARMORY) { - sub_8097FA8(1); + SetTempCutsceneFlag(CUTSCENE_FLAG_MT_STEEL_COMPLETE); gDungeon->unk2 = DUNGEON_UNK2_1; } } @@ -101,40 +101,40 @@ void SkarmoryPreFightDialogue(void) pos2.y = skarmoryEntity->pixelPos.y + 0x2000; sub_8086448(); - sub_803E708(10,0x46); + DungeonWaitFrames_Async(10,0x46); SpriteShockEffect(partnerEntity); - sub_803E708(0x20,0x46); - sub_803E708(10,0x46); - DisplayDungeonDialogue(&gSkarmoryPreFightDialogue_1); + DungeonWaitFrames_Async(0x20,0x46); + DungeonWaitFrames_Async(10,0x46); + DisplayDungeonDialogue_Async(&gSkarmoryPreFightDialogue_1); ShiftCameraToPosition(&pos1,0x40); - sub_803E708(0x40,0x46); + DungeonWaitFrames_Async(0x40,0x46); ShiftCameraToPosition(&pos2,0x30); - DisplayDungeonDialogue(gSkarmoryPreFightDialogue_2); - sub_803E708(10,0x46); + DisplayDungeonDialogue_Async(gSkarmoryPreFightDialogue_2); + DungeonWaitFrames_Async(10,0x46); GetEntInfo(diglettEntity)->unk15D = 1; ShiftCameraToPosition(&pos1,0x30); - DisplayDungeonDialogue(&gSkarmoryPreFightDialogue_3); // Diglett: ...I...\nI'm scared. - sub_803E708(10,0x46); + DisplayDungeonDialogue_Async(&gSkarmoryPreFightDialogue_3); // Diglett: ...I...\nI'm scared. + DungeonWaitFrames_Async(10,0x46); ShiftCameraToPosition(&pos2,0x20); - sub_803E708(0x20,0x46); + DungeonWaitFrames_Async(0x20,0x46); SkarmoryEntry(skarmoryEntity); - DisplayDungeonDialogue(&gSkarmoryPreFightDialogue_4); // Skarmory: You!\nWhat do you think you're doing here?! - sub_803E708(10,0x46); - DisplayDungeonDialogue(gSkarmoryPreFightDialogue_5); - sub_803E708(10,0x46); - DisplayDungeonDialogue(&gSkarmoryPreFightDialogue_6); - sub_803E708(10,0x46); - DisplayDungeonDialogue(gSkarmoryPreFightDialogue_7); - sub_803E708(10,0x46); + DisplayDungeonDialogue_Async(&gSkarmoryPreFightDialogue_4); // Skarmory: You!\nWhat do you think you're doing here?! + DungeonWaitFrames_Async(10,0x46); + DisplayDungeonDialogue_Async(gSkarmoryPreFightDialogue_5); + DungeonWaitFrames_Async(10,0x46); + DisplayDungeonDialogue_Async(&gSkarmoryPreFightDialogue_6); + DungeonWaitFrames_Async(10,0x46); + DisplayDungeonDialogue_Async(gSkarmoryPreFightDialogue_7); + DungeonWaitFrames_Async(10,0x46); sub_806CDD4(skarmoryEntity,0xd,DIRECTION_SOUTH); - DisplayDungeonDialogue(&gSkarmoryPreFightDialogue_8); - sub_803E708(10,0x46); - sub_80869E4(partnerEntity,4,1,DIRECTION_EAST); - sub_80869E4(leaderEntity,4,2,DIRECTION_WEST); - DisplayDungeonDialogue(gSkarmoryPreFightDialogue_9); - sub_80869E4(partnerEntity,4,2,DIRECTION_NORTH); - sub_80869E4(leaderEntity,4,1,DIRECTION_NORTH); - sub_803E708(10,0x46); + DisplayDungeonDialogue_Async(&gSkarmoryPreFightDialogue_8); + DungeonWaitFrames_Async(10,0x46); + CutsceneLookDir_Async(partnerEntity,4,DIR_TRANS_SPINRIGHT1,DIRECTION_EAST); + CutsceneLookDir_Async(leaderEntity,4,DIR_TRANS_SPINLEFT1,DIRECTION_WEST); + DisplayDungeonDialogue_Async(gSkarmoryPreFightDialogue_9); + CutsceneLookDir_Async(partnerEntity,4,DIR_TRANS_SPINLEFT1,DIRECTION_NORTH); + CutsceneLookDir_Async(leaderEntity,4,DIR_TRANS_SPINRIGHT1,DIRECTION_NORTH); + DungeonWaitFrames_Async(10,0x46); DungeonStartNewBGM(MUS_BOSS_BATTLE); ShiftCameraToPosition(&leaderEntity->pixelPos,0x10); } @@ -150,26 +150,26 @@ void SkarmoryReFightDialogue(void) pos.x = skarmoryEntity->pixelPos.x; pos.y = skarmoryEntity->pixelPos.y + 0x2000; sub_8086448(); - sub_803E708(10,0x46); + DungeonWaitFrames_Async(10,0x46); SkarmoryEntry(skarmoryEntity); ShiftCameraToPosition(&pos,0x10); - DisplayDungeonDialogue(&gSkarmoryReFightDialogue_1); - sub_803E708(10,0x46); - DisplayDungeonDialogue(&gSkarmoryReFightDialogue_2); - sub_803E708(10,0x46); + DisplayDungeonDialogue_Async(&gSkarmoryReFightDialogue_1); + DungeonWaitFrames_Async(10,0x46); + DisplayDungeonDialogue_Async(&gSkarmoryReFightDialogue_2); + DungeonWaitFrames_Async(10,0x46); sub_806CDD4(skarmoryEntity,0xd,DIRECTION_SOUTH); - DisplayDungeonDialogue(&gSkarmoryReFightDialogue_3); - sub_803E708(10,0x46); + DisplayDungeonDialogue_Async(&gSkarmoryReFightDialogue_3); + DungeonWaitFrames_Async(10,0x46); ShiftCameraToPosition(&leaderEntity->pixelPos,0x10); DungeonStartNewBGM(MUS_BOSS_BATTLE); } void sub_8086E40(void) { - SpriteLookAroundEffect(CutsceneGetLeader()); - sub_803E708(10, 70); - DisplayDungeonDialogue(&gUnknown_8100D3C); - sub_803E708(10, 70); + CutsceneLookAroundEffect_Async(CutsceneGetLeader()); + DungeonWaitFrames_Async(10, 70); + DisplayDungeonDialogue_Async(&gUnknown_8100D3C); + DungeonWaitFrames_Async(10, 70); gDungeon->unk2 = DUNGEON_UNK2_1; } @@ -178,6 +178,6 @@ static void SkarmoryEntry(Entity * skarmoryEntity) sub_806CDD4(skarmoryEntity,0xf,DIRECTION_SOUTH); sub_8086A54(skarmoryEntity); PlaySoundEffect(0x1f8); - sub_803E708(0x44,0x46); + DungeonWaitFrames_Async(0x44,0x46); } diff --git a/src/dungeon_cutscene_smeargle.c b/src/dungeon_cutscene_smeargle.c index d66cc6589..3aa54e10c 100644 --- a/src/dungeon_cutscene_smeargle.c +++ b/src/dungeon_cutscene_smeargle.c @@ -57,40 +57,40 @@ void SmeargleRescueDialogue(void) s32 counter; smeargleEntity = GetEntityFromMonsterBehavior(BEHAVIOR_SMEARGLE); - SpriteLookAroundEffect(smeargleEntity); - sub_803E708(0xA, 0x46); + CutsceneLookAroundEffect_Async(smeargleEntity); + DungeonWaitFrames_Async(0xA, 0x46); // Ohhh... // I've lost my bearings - DisplayDungeonDialogue(&gSmeargleRescueDialogue_1); - sub_803E708(0xA, 0x46); - sub_80869E4(smeargleEntity, 4, 2, DIRECTION_NORTH); - sub_803E708(0xA, 0x46); + DisplayDungeonDialogue_Async(&gSmeargleRescueDialogue_1); + DungeonWaitFrames_Async(0xA, 0x46); + CutsceneLookDir_Async(smeargleEntity, 4, DIR_TRANS_SPINLEFT1, DIRECTION_NORTH); + DungeonWaitFrames_Async(0xA, 0x46); // I can't get out... // I'm hungry... // I'm in trouble - DisplayDungeonDialogue(&gSmeargleRescueDialogue_2); - sub_803E708(0xA, 0x46); + DisplayDungeonDialogue_Async(&gSmeargleRescueDialogue_2); + DungeonWaitFrames_Async(0xA, 0x46); sub_8086448(); sub_8086598(); - sub_803E708(0x20, 0x46); + DungeonWaitFrames_Async(0x20, 0x46); SpriteShockEffect(smeargleEntity); - sub_803E708(0x20, 0x46); - sub_80869E4(smeargleEntity, 4, 2, DIRECTION_SOUTH); + DungeonWaitFrames_Async(0x20, 0x46); + CutsceneLookDir_Async(smeargleEntity, 4, DIR_TRANS_SPINLEFT1, DIRECTION_SOUTH); // Oh! You are? - DisplayDungeonDialogue(&gSmeargleRescueDialogue_3); - sub_803E708(0xA, 0x46); + DisplayDungeonDialogue_Async(&gSmeargleRescueDialogue_3); + DungeonWaitFrames_Async(0xA, 0x46); PlaySoundEffect(0x1c7); sub_806CDD4(smeargleEntity, 0xA, DIRECTION_SOUTH); - sub_803E708(0x14, 0x46); + DungeonWaitFrames_Async(0x14, 0x46); sub_806CE68(smeargleEntity, DIRECTION_SOUTH); - sub_803E708(0x4, 0x46); + DungeonWaitFrames_Async(0x4, 0x46); PlaySoundEffect(0x1c7); sub_806CDD4(smeargleEntity, 0xA, DIRECTION_SOUTH); - sub_803E708(0x14, 0x46); + DungeonWaitFrames_Async(0x14, 0x46); // Did you maybe come to rescue me? // Am I glad to see you - DisplayDungeonDialogue(&gSmeargleRescueDialogue_4); - sub_803E708(0xA, 0x46); + DisplayDungeonDialogue_Async(&gSmeargleRescueDialogue_4); + DungeonWaitFrames_Async(0xA, 0x46); sub_806CDD4(smeargleEntity, 0, DIRECTION_SOUTH); for(counter = 0x17; counter >= 0; counter--) { @@ -98,7 +98,7 @@ void SmeargleRescueDialogue(void) DungeonRunFrameActions(0x46); } sub_806CE68(smeargleEntity, DIRECTION_SOUTH); - sub_803E708(0x20, 0x46); + DungeonWaitFrames_Async(0x20, 0x46); sub_8042B0C(smeargleEntity); HandleFaint_Async(smeargleEntity, DUNGEON_EXIT_DELETED_FOR_EVENT, 0); gDungeon->unk4 = 1; diff --git a/src/dungeon_cutscene_suicune.c b/src/dungeon_cutscene_suicune.c index 3d5f824ec..4bb40d8a5 100644 --- a/src/dungeon_cutscene_suicune.c +++ b/src/dungeon_cutscene_suicune.c @@ -86,10 +86,10 @@ void sub_808A308(void) CopyMonsterNameToBuffer(gFormatBuffer_Monsters[2], MONSTER_SUICUNE); } -void sub_808A36C(u8 monsterBehavior, u8 cutscene) +void HandleSuicuneBossFaint(u8 monsterBehavior, u8 cutscene) { if ((cutscene == CUTSCENE_NORTHWIND_FIELD_ATTEMPT1 || cutscene == CUTSCENE_NORTHWIND_FIELD_ATTEMPT2 || cutscene == CUTSCENE_NORTHWIND_FIELD_POSTSTORY) && monsterBehavior == BEHAVIOR_SUICUNE) { - sub_8097FA8(25); + SetTempCutsceneFlag(CUTSCENE_FLAG_NORTHWIND_FIELD_COMPLETE); gDungeon->unk2 = DUNGEON_UNK2_1; } } @@ -102,22 +102,22 @@ void SuicunePreFightDialogue(void) leaderEntity = CutsceneGetLeader(); SuicuneEntity = GetEntityFromMonsterBehavior(BEHAVIOR_SUICUNE); sub_8086448(); - DisplayDungeonDialogue(&gSuicunePreFightDialogue_1); - sub_803E708(10,70); - DisplayDungeonDialogue(&gSuicunePreFightDialogue_2); - sub_803E708(10,70); + DisplayDungeonDialogue_Async(&gSuicunePreFightDialogue_1); + DungeonWaitFrames_Async(10,70); + DisplayDungeonDialogue_Async(&gSuicunePreFightDialogue_2); + DungeonWaitFrames_Async(10,70); sub_80426C8(1,2); - sub_803E708(0x3c,70); - DisplayDungeonDialogue(&gSuicunePreFightDialogue_3); - sub_803E708(10,70); + DungeonWaitFrames_Async(0x3c,70); + DisplayDungeonDialogue_Async(&gSuicunePreFightDialogue_3); + DungeonWaitFrames_Async(10,70); sub_808A528(SuicuneEntity); - DisplayDungeonDialogue(&gSuicunePreFightDialogue_4); - DisplayDungeonDialogue(&gSuicunePreFightDialogue_5); + DisplayDungeonDialogue_Async(&gSuicunePreFightDialogue_4); + DisplayDungeonDialogue_Async(&gSuicunePreFightDialogue_5); SuicuneScreenFlash(); - DisplayDungeonDialogue(&gSuicunePreFightDialogue_6); + DisplayDungeonDialogue_Async(&gSuicunePreFightDialogue_6); SuicuneScreenFlash(); - DisplayDungeonDialogue(&gSuicunePreFightDialogue_7); - sub_803E708(10,70); + DisplayDungeonDialogue_Async(&gSuicunePreFightDialogue_7); + DungeonWaitFrames_Async(10,70); SetupBossFightHP(SuicuneEntity,0x28a,MUS_BOSS_BATTLE); ShiftCameraToPosition(&leaderEntity->pixelPos,0x10); } @@ -129,12 +129,12 @@ void SuicuneReFightDialogue(void) leaderEntity = CutsceneGetLeader(); SuicuneEntity = GetEntityFromMonsterBehavior(BEHAVIOR_SUICUNE); - DisplayDungeonDialogue(&gSuicuneReFightDialogue_1); + DisplayDungeonDialogue_Async(&gSuicuneReFightDialogue_1); SuicuneScreenFlash(); - DisplayDungeonDialogue(&gSuicuneReFightDialogue_2); + DisplayDungeonDialogue_Async(&gSuicuneReFightDialogue_2); SuicuneScreenFlash(); - DisplayDungeonDialogue(&gSuicuneReFightDialogue_3); - sub_803E708(10,70); + DisplayDungeonDialogue_Async(&gSuicuneReFightDialogue_3); + DungeonWaitFrames_Async(10,70); SetupBossFightHP(SuicuneEntity,0x28a,MUS_BOSS_BATTLE); ShiftCameraToPosition(&leaderEntity->pixelPos,0x10); } @@ -150,12 +150,12 @@ void SuicunePostStoryPreFightDialogue(void) sub_80866C4(&gSuicunePostStoryPreFightDialogue_4); } else { - DisplayDungeonDialogue(&gSuicunePostStoryPreFightDialogue_1); + DisplayDungeonDialogue_Async(&gSuicunePostStoryPreFightDialogue_1); SuicuneScreenFlash(); - DisplayDungeonDialogue(&gSuicunePostStoryPreFightDialogue_2); + DisplayDungeonDialogue_Async(&gSuicunePostStoryPreFightDialogue_2); SuicuneScreenFlash(); - DisplayDungeonDialogue(&gSuicunePostStoryPreFightDialogue_3); - sub_803E708(10,70); + DisplayDungeonDialogue_Async(&gSuicunePostStoryPreFightDialogue_3); + DungeonWaitFrames_Async(10,70); SetupBossFightHP(SuicuneEntity,0x28a,MUS_BOSS_BATTLE); ShiftCameraToPosition(&leaderEntity->pixelPos,0x10); } @@ -193,19 +193,19 @@ static void SuicuneScreenFlash(void) SetDungeonBGColorRGB(iVar1,iVar1,iVar1,1,1); DungeonRunFrameActions(70); } - sub_803E708(10,70); + DungeonWaitFrames_Async(10,70); for(iVar1 = 250; iVar1 > 199; iVar1 -= 10) { SetDungeonBGColorRGB(iVar1,iVar1,iVar1,1,1); DungeonRunFrameActions(70); } - sub_803E708(10,70); + DungeonWaitFrames_Async(10,70); for(iVar1 = 250; iVar1 >= 0; iVar1 -= 10) { SetDungeonBGColorRGB(iVar1,iVar1,iVar1,1,1); DungeonRunFrameActions(70); } - sub_803E708(10,70); + DungeonWaitFrames_Async(10,70); sub_8085EB0(); } diff --git a/src/dungeon_cutscene_zapdos.c b/src/dungeon_cutscene_zapdos.c index 2417272db..ab48a5136 100644 --- a/src/dungeon_cutscene_zapdos.c +++ b/src/dungeon_cutscene_zapdos.c @@ -87,10 +87,10 @@ void sub_808729C(void) CopyMonsterNameToBuffer(gFormatBuffer_Monsters[3], MONSTER_ZAPDOS); } -void sub_8087334(u8 monsterBehavior, u8 cutscene) +void HandleZapdosBossFaint(u8 monsterBehavior, u8 cutscene) { if ((cutscene == CUTSCENE_MT_THUNDER_PEAK_ATTEMPT1 || cutscene == CUTSCENE_MT_THUNDER_PEAK_ATTEMPT2 || cutscene == CUTSCENE_MT_THUNDER_PEAK_POSTSTORY) && monsterBehavior == BEHAVIOR_ZAPDOS) { - sub_8097FA8(5); + SetTempCutsceneFlag(CUTSCENE_FLAG_MT_THUNDER_PEAK_COMPLETE); gDungeon->unk2 = DUNGEON_UNK2_1; } } @@ -113,27 +113,27 @@ void ZapdosPreFightDialogue(void) partnerEntity = CutsceneGetPartner(); zapdosEntity = GetEntityFromMonsterBehavior(BEHAVIOR_ZAPDOS); sub_8086448(); - sub_803E708(10,0x46); - SpriteLookAroundEffect(partnerEntity); - sub_803E708(10,0x46); - sub_80869E4(partnerEntity,4,1,DIRECTION_EAST); - sub_80869E4(leaderEntity,4,2,DIRECTION_WEST); - DisplayDungeonDialogue(gUnknown_81014B0); - sub_803E708(10,0x46); - sub_80869E4(partnerEntity,4,2,DIRECTION_NORTH); - sub_80869E4(leaderEntity,4,1,DIRECTION_NORTH); - DisplayDungeonDialogue(gUnknown_8101504); - sub_803E708(10,0x46); + DungeonWaitFrames_Async(10,0x46); + CutsceneLookAroundEffect_Async(partnerEntity); + DungeonWaitFrames_Async(10,0x46); + CutsceneLookDir_Async(partnerEntity,4,DIR_TRANS_SPINRIGHT1,DIRECTION_EAST); + CutsceneLookDir_Async(leaderEntity,4,DIR_TRANS_SPINLEFT1,DIRECTION_WEST); + DisplayDungeonDialogue_Async(gUnknown_81014B0); + DungeonWaitFrames_Async(10,0x46); + CutsceneLookDir_Async(partnerEntity,4,DIR_TRANS_SPINLEFT1,DIRECTION_NORTH); + CutsceneLookDir_Async(leaderEntity,4,DIR_TRANS_SPINRIGHT1,DIRECTION_NORTH); + DisplayDungeonDialogue_Async(gUnknown_8101504); + DungeonWaitFrames_Async(10,0x46); ZapdosScreenFlash(3); DungeonStopBGM(); PlaySoundEffect(0x1da); - DisplayDungeonDialogue(&gUnknown_81015A0); + DisplayDungeonDialogue_Async(&gUnknown_81015A0); ZapdosDropInEffect(zapdosEntity); DungeonStartNewBGM(MUS_RISING_FEAR); sub_806CDD4(partnerEntity,6,DIRECTION_NORTH); - DisplayDungeonDialogue(&gUnknown_81015D4); // Waah! - sub_803E708(10,0x46); - sub_80869E4(partnerEntity,2,1,DIRECTION_SOUTHEAST); + DisplayDungeonDialogue_Async(&gUnknown_81015D4); // Waah! + DungeonWaitFrames_Async(10,0x46); + CutsceneLookDir_Async(partnerEntity,2,DIR_TRANS_SPINRIGHT1,DIRECTION_SOUTHEAST); puStack_38 = (struct Zapdos1) {1, 2, 12, 0, 1, 0, 0, 0, 0, 9, 9, 0}; puStack_34[0] = puStack_38.unk0; @@ -146,13 +146,13 @@ void ZapdosPreFightDialogue(void) GetEntInfo(partnerEntity)->unk15F = 0; GetEntInfo(partnerEntity)->unk15D = 1; - sub_80869E4(partnerEntity,2,2,DIRECTION_NORTH); - DisplayDungeonDialogue(&gUnknown_81015E8); // I warned you! I have no mercy for meddlers - sub_803E708(0x3c,0x46); - DisplayDungeonDialogue(&gUnknown_8101624); - sub_803E708(10,0x46); + CutsceneLookDir_Async(partnerEntity,2,DIR_TRANS_SPINLEFT1,DIRECTION_NORTH); + DisplayDungeonDialogue_Async(&gUnknown_81015E8); // I warned you! I have no mercy for meddlers + DungeonWaitFrames_Async(0x3c,0x46); + DisplayDungeonDialogue_Async(&gUnknown_8101624); + DungeonWaitFrames_Async(10,0x46); GetEntInfo(partnerEntity)->unk15D = 0; - sub_80869E4(partnerEntity,2,2,DIRECTION_NORTHWEST); + CutsceneLookDir_Async(partnerEntity,2,DIR_TRANS_SPINLEFT1,DIRECTION_NORTHWEST); puStack_30 = (struct Zapdos2) {5, 2, 12, 0, 4, 2, 12, 0, 4, 0, 0, 0, 0, 8, 7, 0}; puStack_4c[0] = puStack_30.unk0; @@ -162,18 +162,18 @@ void ZapdosPreFightDialogue(void) DungeonRunFrameActions(0x46); } - sub_80869E4(partnerEntity,2,1,DIRECTION_NORTHEAST); - DisplayDungeonDialogue(gUnknown_810165C); - sub_803E708(10,0x46); + CutsceneLookDir_Async(partnerEntity,2,DIR_TRANS_SPINRIGHT1,DIRECTION_NORTHEAST); + DisplayDungeonDialogue_Async(gUnknown_810165C); + DungeonWaitFrames_Async(10,0x46); ZapdosScreenFlash(3); - DisplayDungeonDialogue(&gUnknown_8101750); - sub_803E708(10,0x46); + DisplayDungeonDialogue_Async(&gUnknown_8101750); + DungeonWaitFrames_Async(10,0x46); ZapdosScreenFlash(1); - DisplayDungeonDialogue(&gUnknown_810178C); - sub_803E708(10,0x46); + DisplayDungeonDialogue_Async(&gUnknown_810178C); + DungeonWaitFrames_Async(10,0x46); ZapdosScreenFlash(2); - DisplayDungeonDialogue(&gUnknown_81017B4); - sub_803E708(10,0x46); + DisplayDungeonDialogue_Async(&gUnknown_81017B4); + DungeonWaitFrames_Async(10,0x46); SetupBossFightHP(zapdosEntity,300, MUS_BOSS_BATTLE); ShiftCameraToPosition(&leaderEntity->pixelPos,0x10); } @@ -186,19 +186,19 @@ void ZapdosReFightDialogue(void) leaderEntity = CutsceneGetLeader(); zapdosEntity = GetEntityFromMonsterBehavior(BEHAVIOR_ZAPDOS); sub_8086448(); - sub_803E708(10,0x46); - DisplayDungeonDialogue(gZapdosReFightDialogue_1); - sub_803E708(10,0x46); + DungeonWaitFrames_Async(10,0x46); + DisplayDungeonDialogue_Async(gZapdosReFightDialogue_1); + DungeonWaitFrames_Async(10,0x46); PlaySoundEffect(0x1da); - DisplayDungeonDialogue(&gUnknown_81015A0); - sub_803E708(10,0x46); + DisplayDungeonDialogue_Async(&gUnknown_81015A0); + DungeonWaitFrames_Async(10,0x46); ZapdosDropInEffect(zapdosEntity); - sub_803E708(10,0x46); - DisplayDungeonDialogue(&gZapdosReFightDialogue_2); + DungeonWaitFrames_Async(10,0x46); + DisplayDungeonDialogue_Async(&gZapdosReFightDialogue_2); ZapdosScreenFlash(1); - DisplayDungeonDialogue(&gZapdosReFightDialogue_3); + DisplayDungeonDialogue_Async(&gZapdosReFightDialogue_3); ZapdosScreenFlash(2); - DisplayDungeonDialogue(&gZapdosReFightDialogue_4); + DisplayDungeonDialogue_Async(&gZapdosReFightDialogue_4); SetupBossFightHP(zapdosEntity,300,MUS_BOSS_BATTLE); ShiftCameraToPosition(&leaderEntity->pixelPos,0x10); } @@ -217,16 +217,16 @@ void ZapdosPostStoryPreFightDialogue(void) else { ZapdosScreenFlash(1); PlaySoundEffect(0x1da); - DisplayDungeonDialogue(&gZapdosPostStoryPreFightDialogue_1); + DisplayDungeonDialogue_Async(&gZapdosPostStoryPreFightDialogue_1); ZapdosDropInEffect(zapdosEntity); - DisplayDungeonDialogue(&gZapdosPostStoryPreFightDialogue_2); + DisplayDungeonDialogue_Async(&gZapdosPostStoryPreFightDialogue_2); ZapdosScreenFlash(1); - DisplayDungeonDialogue(&gZapdosPostStoryPreFightDialogue_3); + DisplayDungeonDialogue_Async(&gZapdosPostStoryPreFightDialogue_3); ZapdosScreenFlash(2); - DisplayDungeonDialogue(&gZapdosPostStoryPreFightDialogue_4); + DisplayDungeonDialogue_Async(&gZapdosPostStoryPreFightDialogue_4); ZapdosScreenFlash(2); - DisplayDungeonDialogue(&gZapdosPostStoryPreFightDialogue_5); - sub_803E708(10,0x46); + DisplayDungeonDialogue_Async(&gZapdosPostStoryPreFightDialogue_5); + DungeonWaitFrames_Async(10,0x46); SetupBossFightHP(zapdosEntity,300,MUS_BOSS_BATTLE); ShiftCameraToPosition(&leaderEntity->pixelPos,0x10); } @@ -245,7 +245,7 @@ static void ZapdosDropInEffect(Entity *zapdosEntity) GetEntInfo(zapdosEntity)->unk174 = IntToF248(iVar1); DungeonRunFrameActions(0x46); } - sub_803E708(0x1e,0x46); + DungeonWaitFrames_Async(0x1e,0x46); } static void ZapdosScreenFlash(s32 numFlashes) diff --git a/src/dungeon_damage.c b/src/dungeon_damage.c index 73e183462..ee92e4ad3 100644 --- a/src/dungeon_damage.c +++ b/src/dungeon_damage.c @@ -323,7 +323,7 @@ static bool8 HandleDealingDamageInternal_Async(Entity *attacker, Entity *target, if (targetData->unk152 == 0) { TryDisplayDungeonLoggableMessage3_Async(attacker, target, gUnknown_80F9688); } - sub_803E708(0x1E, 0x18); + DungeonWaitFrames_Async(0x1E, 0x18); } dmgStruct->tookNoDamage = TRUE; return FALSE; @@ -331,7 +331,7 @@ static bool8 HandleDealingDamageInternal_Async(Entity *attacker, Entity *target, else if (dmgStruct->dmg == 9999) { if (arg8 != 0 && ShouldDisplayEntity(target)) { unkTile = GetTileAtEntitySafe(target); - sub_803E708(0x14, 0x18); + DungeonWaitFrames_Async(0x14, 0x18); unkTile->spawnOrVisibilityFlags.spawn |= SPAWN_FLAG_TRAP; UpdateTrapsVisibility(); } @@ -417,7 +417,7 @@ static bool8 HandleDealingDamageInternal_Async(Entity *attacker, Entity *target, hpChange = 0; if (var_24 || unkTile != NULL) - sub_803E708(0xA, 0x18); + DungeonWaitFrames_Async(0xA, 0x18); if (targetData->HP != 0) { if (var_24) { @@ -441,15 +441,15 @@ static bool8 HandleDealingDamageInternal_Async(Entity *attacker, Entity *target, } if (unkTile != NULL) { - sub_803E708(0x14, 0x18); + DungeonWaitFrames_Async(0x14, 0x18); target->unk22 = 2; - sub_803E708(0xA, 0x18); + DungeonWaitFrames_Async(0xA, 0x18); unkTile->spawnOrVisibilityFlags.spawn &= ~(SPAWN_FLAG_TRAP); UpdateTrapsVisibility(); } else if (var_24) { target->unk22 = 1; - sub_803E708(0x1E, 0x18); + DungeonWaitFrames_Async(0x1E, 0x18); } r8 = 1; @@ -676,7 +676,7 @@ static bool8 HandleDealingDamageInternal_Async(Entity *attacker, Entity *target, if (exp == 0) exp = 1; if (attackerData->isTeamLeader) { - sub_80980B4(targetData->id); + SetMonSeenFlag(targetData->id); } if (targetData->grudge) { attackerData->unk14B = 1; diff --git a/src/dungeon_entity_movement.c b/src/dungeon_entity_movement.c index 946e2ab93..46a2b1929 100644 --- a/src/dungeon_entity_movement.c +++ b/src/dungeon_entity_movement.c @@ -282,7 +282,7 @@ bool8 DisplayActions_Async(Entity *a0) break; EnemyEvolution(mon); - sub_8046D20(); + PotentiallyCreateMusicBox_Async(); TryTriggerMonsterHouseWithMsg_Async(mon, gDungeon->forceMonsterHouse); } if (!EntityIsValid(mon)) @@ -302,7 +302,7 @@ bool8 DisplayActions_Async(Entity *a0) sub_8086AC0(); if (!IsFloorOver()) { - sub_8085140(); + sub_8085140_Async(); gDungeon->unkB8 = savedEntityPtr; } else { @@ -480,6 +480,6 @@ void TryTriggerMonsterHouseWithMsg_Async(Entity *pokemon, bool8 forcedMonsterHou TriggerMonsterHouse_Async(pokemon, forcedMonsterHouse); sub_8041888(0); if (sub_803F428(&pokemon->pos)) - sub_803E708(0x78, 0x39); + DungeonWaitFrames_Async(0x78, 0x39); } } diff --git a/src/dungeon_generation_fixed.c b/src/dungeon_generation_fixed.c index 047a15b01..5108f4552 100644 --- a/src/dungeon_generation_fixed.c +++ b/src/dungeon_generation_fixed.c @@ -1049,7 +1049,7 @@ void sub_8051E7C(Entity *pokemon) UpdateTrapsVisibility(); sub_80429FC(&pos); LogMessageByIdWithPopupCheckUser_Async(pokemon, gUnknown_80FDDD0); // The closed corridor was opened! - sub_803E708(0x14, 0x3C); + DungeonWaitFrames_Async(0x14, 0x3C); } else { LogMessageByIdWithPopupCheckUser_Async(pokemon, gUnknown_80FDDF0); // It can't be used here! diff --git a/src/dungeon_item_action.c b/src/dungeon_item_action.c index a96727cd4..7361c270d 100644 --- a/src/dungeon_item_action.c +++ b/src/dungeon_item_action.c @@ -549,7 +549,7 @@ static void GinsengItemAction(Entity *pokemon, Entity * target) if (isMoveBoosted) { TryDisplayDungeonLoggableMessage3_Async(pokemon,target,gUnknown_80FE454); if (moveBoost != 1) { - sub_803E708(10,0x40); + DungeonWaitFrames_Async(10,0x40); TryDisplayDungeonLoggableMessage3_Async(pokemon,target,gUnknown_80FE434); } } @@ -847,7 +847,7 @@ bool8 HandleLinkBoxAction(Entity *entity, Item *item) if (ShowDungeonMovesMenu(entity2,1,0,0,1)) { if (!ret) break; - if (DisplayDungeonYesNoMessage(0,gUnknown_80FECA0,1) == 1) + if (DisplayDungeonYesNoMessage_Async(0,gUnknown_80FECA0,1) == 1) break; } @@ -964,5 +964,5 @@ static void MusicBoxItemAction(Entity *pokemon, Entity *target, u8 r2) { sub_80421C0(pokemon, 0xD6); LogMessageByIdWithPopupCheckUser_Async(pokemon, gPtrMusicBoxPlayedCrumbledMessage); - sub_803E708(0x3C, 0x46); + DungeonWaitFrames_Async(0x3C, 0x46); } diff --git a/src/dungeon_items.c b/src/dungeon_items.c index a3d7b62f2..684a47c3a 100644 --- a/src/dungeon_items.c +++ b/src/dungeon_items.c @@ -28,8 +28,8 @@ #include "dungeon_vram.h" #include "sprite.h" -static void MusicBoxCreation(void); -static u8 sub_8046D70(void); +static void MusicBoxCreation_Async(void); +static bool8 sub_8046D70(void); static EWRAM_INIT u8 sUnkItemTileNums[8] = {0x15, 0x00, 0x16, 0x00, 0x15, 0x00, 0x16, 0x00}; static EWRAM_INIT u8 sUnkItemMatrixNums[8] = {0x02, 0x03, 0x01, 0x01, 0x00, 0x00, 0x00, 0x02}; @@ -719,31 +719,31 @@ static void sub_8046CE4(Item *item,s32 param_2) item->quantity = 1; } -void sub_8046D20(void) +void PotentiallyCreateMusicBox_Async(void) { - u8 cVar1; + bool8 b = gDungeon->unk8; - cVar1 = gDungeon->unk8; gDungeon->unk8 = sub_8046D70(); - if (((gDungeon->unk8 == 1) && (cVar1 == 0)) && - (DisplayDungeonYesNoMessage(0, gUnknown_80FA408, 1) == 1)) { + + if (gDungeon->unk8 == TRUE && !b && DisplayDungeonYesNoMessage_Async(NULL, gUnknown_80FA408, TRUE) == TRUE) { gDungeon->unk4 = 1; gDungeon->unk11 = 2; } else { - MusicBoxCreation(); + MusicBoxCreation_Async(); } } -static u8 sub_8046D70(void) +static bool8 sub_8046D70(void) { + // Insane if (gDungeon->unk644.unk46) - return 0; + return FALSE; else - return 0; + return FALSE; } -static void MusicBoxCreation(void) +static void MusicBoxCreation_Async(void) { bool8 musicBoxOnce; bool8 createMusicBox; @@ -794,18 +794,18 @@ static void MusicBoxCreation(void) sub_80855E4(sub_80861A8); gDungeon->unk1356C = TRUE; DisplayDungeonMessage_Async(0,gUnknown_810531C,1); - sub_803E708(0x3c,0x41); + DungeonWaitFrames_Async(0x3c,0x41); DisplayDungeonMessage_Async(0,gUnknown_8105360,1); - sub_80869E4(leader,4,10,0); + CutsceneLookDir_Async(leader,4,DIR_TRANS_10,0); sub_80416E0(&leader->pixelPos,0x10c,FALSE); sub_80421C0(leader,0xd7); - sub_803E708(0x3c,0x41); + DungeonWaitFrames_Async(0x3c,0x41); SubstitutePlaceholderStringTags(gFormatBuffer_Monsters[0],leader,0); DisplayDungeonMessage_Async(0,gUnknown_81053A8,1); - sub_803E708(10,0x41); + DungeonWaitFrames_Async(10,0x41); PlaySoundEffect(0xd4); DisplayDungeonMessage_Async(0,gUnknown_8105434,1); - sub_803E708(10,0x41); + DungeonWaitFrames_Async(10,0x41); sub_804178C_Async(1); gDungeon->unk1356C = FALSE; UpdateMinimap(); diff --git a/src/dungeon_jobs.c b/src/dungeon_jobs.c index 53fb94fb3..4a5830482 100644 --- a/src/dungeon_jobs.c +++ b/src/dungeon_jobs.c @@ -94,7 +94,7 @@ void sub_8084448(Entity *pokemon) } if (gDungeon->unk644.unk46 != 0) { - if (DisplayDungeonYesNoMessage(0, gUnknown_80FA32C, 1) != 1) + if (DisplayDungeonYesNoMessage_Async(0, gUnknown_80FA32C, 1) != 1) return; BufferItemName(gFormatBuffer_Items[0], gDungeon->unk644.unk46, 0); for (i = 0; i < INVENTORY_SIZE; i++) { @@ -118,7 +118,7 @@ void sub_8084448(Entity *pokemon) str = gUnknown_80FA370; } else { - if (DisplayDungeonYesNoMessage(0, gUnknown_80FA2F0, 1) != 1) + if (DisplayDungeonYesNoMessage_Async(0, gUnknown_80FA2F0, 1) != 1) return; DisplayDungeonMessage_Async(0, gUnknown_80FA260, 1); str = gUnknown_80FA36C; @@ -129,14 +129,14 @@ void sub_8084448(Entity *pokemon) HandleFaint_Async(pokemon,DUNGEON_EXIT_DELETED_FOR_EVENT,0); sub_804178C_Async(1); while(1) { - if (DisplayDungeonYesNoMessage(0,str,1) == 1) { - if (DisplayDungeonYesNoMessage(0,gUnknown_80FA394,0) == 1) { + if (DisplayDungeonYesNoMessage_Async(0,str,1) == 1) { + if (DisplayDungeonYesNoMessage_Async(0,gUnknown_80FA394,0) == 1) { gDungeon->unk4 = 1; gDungeon->unk11 = 2; return; } } - else if (DisplayDungeonYesNoMessage(0,gUnknown_80FA3B8,0) == 1) { + else if (DisplayDungeonYesNoMessage_Async(0,gUnknown_80FA3B8,0) == 1) { return; } } @@ -189,14 +189,14 @@ void sub_80845E0(Entity *pokemon) HandleFaint_Async(entity,DUNGEON_EXIT_DELETED_FOR_EVENT,0); sub_804178C_Async(1); while(1) { - if (DisplayDungeonYesNoMessage(0,gUnknown_80FA4D8,1) == 1) { - if (DisplayDungeonYesNoMessage(0,gUnknown_80FA394,0) == 1) { + if (DisplayDungeonYesNoMessage_Async(0,gUnknown_80FA4D8,1) == 1) { + if (DisplayDungeonYesNoMessage_Async(0,gUnknown_80FA394,0) == 1) { gDungeon->unk4 = 1; gDungeon->unk11 = 2; return; } } - else if (DisplayDungeonYesNoMessage(0,gUnknown_80FA3B8,0) == 1) { + else if (DisplayDungeonYesNoMessage_Async(0,gUnknown_80FA3B8,0) == 1) { return; } } diff --git a/src/dungeon_kecleon_shop.c b/src/dungeon_kecleon_shop.c index 6783ded61..ace52c058 100644 --- a/src/dungeon_kecleon_shop.c +++ b/src/dungeon_kecleon_shop.c @@ -213,7 +213,7 @@ static void sub_807EFFC(bool8 arg0) return; gFormatArgs[0] = gDungeon->unk644.unk4C; - if (DisplayDungeonYesNoMessage(&dialogueInfo, gUnknown_80FE5C0, TRUE) == 1) { // For the merch you have left, I shall pay X. Is that acceptable? + if (DisplayDungeonYesNoMessage_Async(&dialogueInfo, gUnknown_80FE5C0, TRUE) == 1) { // For the merch you have left, I shall pay X. Is that acceptable? s32 x, y; DungeonPos pos; s32 local_24; @@ -262,7 +262,7 @@ static s32 sub_807F19C(bool8 arg0) } gFormatArgs[0] = diff; - if (DisplayDungeonYesNoMessage(&dialogueInfo, gUnknown_80FE568, TRUE) != 1) { // The merchandise you have chosen costs X + if (DisplayDungeonYesNoMessage_Async(&dialogueInfo, gUnknown_80FE568, TRUE) != 1) { // The merchandise you have chosen costs X return 1; } if (gTeamInventoryRef->teamMoney < diff) { diff --git a/src/dungeon_leveling.c b/src/dungeon_leveling.c index f20a4d7f2..5297a8945 100644 --- a/src/dungeon_leveling.c +++ b/src/dungeon_leveling.c @@ -618,7 +618,7 @@ static void sub_8072778(Entity *pokemon, Entity *target, u8 param_2, u8 param_3) if (!info->isNotTeamMember && param_3) { if (!sp_0xCC && param_2) { - sub_803E708(0xA, 0x6); + DungeonWaitFrames_Async(0xA, 0x6); DisplayDungeonMessage_Async(0, gUnknown_80F9FA4, 1); } sp_0xCC = 1; diff --git a/src/dungeon_main.c b/src/dungeon_main.c index 6eaf47b7c..06e382c62 100644 --- a/src/dungeon_main.c +++ b/src/dungeon_main.c @@ -94,7 +94,7 @@ void DungeonHandlePlayerInput(void) gDungeon->unk12 = 0; TryPointCameraToMonster(GetLeader(), 1); if (sub_80701A4(GetLeader())) { - sub_803E708(60, 16); + DungeonWaitFrames_Async(60, 16); return; } @@ -365,7 +365,7 @@ void DungeonHandlePlayerInput(void) sub_8052210(1); UpdateMinimap(); SetBGOBJEnableFlags(0x1E); - sub_803E708(0xA, 0x2F); + DungeonWaitFrames_Async(0xA, 0x2F); while (1) { DungeonRunFrameActions(0x2F); if (gRealInputs.pressed & SELECT_BUTTON) @@ -904,7 +904,7 @@ static bool8 sub_805EC4C(Entity *a0, u8 a1) if (IsChargingAnyTwoTurnMove(tileMonster, FALSE)) return FALSE; if (!sub_8070F80(a0, entityInfo->action.direction)) return FALSE; - if (a1 != 0 && sub_807049C(tileMonster, &a0->pos) && !DisplayDungeonYesNoMessage(0, gUnknown_8100208, 0)) return FALSE; + if (a1 != 0 && sub_807049C(tileMonster, &a0->pos) && !DisplayDungeonYesNoMessage_Async(0, gUnknown_8100208, 0)) return FALSE; SetMonsterActionFields(&entityInfo->action, ACTION_WALK); if (gRealInputs.held & B_BUTTON) { @@ -1210,14 +1210,14 @@ static void ShowMainMenu(bool8 fromBPress, bool8 a1) else if (action == ACTION_SET_ITEM) { HandleSetItemAction_Async(GetLeader(), TRUE); SetLeaderActionToNothing(TRUE); - sub_803E708(0x50, 0x4D); + DungeonWaitFrames_Async(0x50, 0x4D); sub_8052210(0); break; } else if (action == ACTION_UNSET_ITEM) { HandleUnsetItemAction_Async(GetLeader(), TRUE); SetLeaderActionToNothing(TRUE); - sub_803E708(0x50, 0x4D); + DungeonWaitFrames_Async(0x50, 0x4D); sub_8052210(0); break; } diff --git a/src/dungeon_menu_items.c b/src/dungeon_menu_items.c index a63679ab9..7a66ee6d8 100644 --- a/src/dungeon_menu_items.c +++ b/src/dungeon_menu_items.c @@ -333,9 +333,9 @@ bool8 ShowDungeonItemsMenu(Entity * a0, struct UnkMenuBitsStruct *a1) } gDungeon->unk181e8.unk18212 = 0; - sub_803E708(2, 0x61); + DungeonWaitFrames_Async(2, 0x61); sub_804AA60(); - sub_803E708(2, 0x61); + DungeonWaitFrames_Async(2, 0x61); return inputAction; } diff --git a/src/dungeon_menu_moves.c b/src/dungeon_menu_moves.c index 870e714ea..1fc46e066 100644 --- a/src/dungeon_menu_moves.c +++ b/src/dungeon_menu_moves.c @@ -304,7 +304,7 @@ bool8 ShowDungeonMovesMenu(Entity * entity, bool8 addLinkOptions, bool8 addUseMo leaderInfo->action.actionParameters[0].actionUseIndex = entity->unk24; leaderInfo->action.actionParameters[1].actionUseIndex = sChosenMoveSlotId; sub_803EAF0(0, NULL); - sub_803E708(8, 0x1B); + DungeonWaitFrames_Async(8, 0x1B); ret = FALSE; break; } @@ -390,7 +390,7 @@ bool8 ShowDungeonMovesMenu(Entity * entity, bool8 addLinkOptions, bool8 addUseMo if (unkBool) { sub_803EAF0(0, NULL); - sub_803E708(8, 0x1E); + DungeonWaitFrames_Async(8, 0x1E); } return ret; @@ -740,7 +740,7 @@ void ActionSetOrUnsetMove(ActionContainer *a0, bool8 flagToSet) else { LogMessageByIdWithPopupCheckUser_Async(entity, gUnknown_80F8B64); } - sub_803E708(0x78, 0x1F); + DungeonWaitFrames_Async(0x78, 0x1F); } } @@ -849,7 +849,7 @@ void ActionDelinkMoves(ActionContainer *a0, bool8 showMsg) else { LogMessageByIdWithPopupCheckUser_Async(entity, gUnknown_80F8BB4); } - sub_803E708(0x78, 0x1F); + DungeonWaitFrames_Async(0x78, 0x1F); } } @@ -968,7 +968,7 @@ bool8 sub_8063E70(Entity *entity, Move *moves, bool8 showYesNoBox, bool8 allowBP if (inputAction == 2) { sub_803EAF0(0, NULL); - sub_803E708(8, 0x1B); + DungeonWaitFrames_Async(8, 0x1B); ASM_MATCH_TRICK(sChosenMoveSlotId); ShowMovesInfoWindow(moves, sChosenMoveSlotId, MAX_MON_MOVES); continue; @@ -1037,7 +1037,7 @@ bool8 sub_8063E70(Entity *entity, Move *moves, bool8 showYesNoBox, bool8 allowBP linked = TRUE; } BufferMoveName(gFormatBuffer_Items[0], move, NULL); - yesNoAnswer = DisplayDungeonYesNoMessage(NULL, (!linked) ? gUnknown_80FDF70 : gUnknown_80FDF00, FALSE); + yesNoAnswer = DisplayDungeonYesNoMessage_Async(NULL, (!linked) ? gUnknown_80FDF70 : gUnknown_80FDF00, FALSE); } else { yesNoAnswer = 1; diff --git a/src/dungeon_menu_others.c b/src/dungeon_menu_others.c index c7be13387..59c26df16 100644 --- a/src/dungeon_menu_others.c +++ b/src/dungeon_menu_others.c @@ -349,7 +349,7 @@ static void TrySetNewGameOptions(bool8 bPressed) } if (optionsChanged) { - if (DisplayDungeonYesNoMessage(0, gUnknown_80FEBF8, TRUE) == 1) { + if (DisplayDungeonYesNoMessage_Async(0, gUnknown_80FEBF8, TRUE) == 1) { *gGameOptionsRef = sChangedGameOptions; sub_803E13C(); LoadDungeonMapPalette(); @@ -359,7 +359,7 @@ static void TrySetNewGameOptions(bool8 bPressed) static void AskToResetToDefault(void) { - if (DisplayDungeonYesNoMessage(0, gUnknown_80FEC28, FALSE) == 1) { + if (DisplayDungeonYesNoMessage_Async(0, gUnknown_80FEC28, FALSE) == 1) { InitializeGameOptions(FALSE); sub_803E13C(); } @@ -426,7 +426,7 @@ static void ShowMissionObjectivesMenu(void) static bool8 AskToQuickSave(void) { - if (DisplayDungeonYesNoMessage(NULL, gUnknown_80FDE6C, FALSE) != 1) { + if (DisplayDungeonYesNoMessage_Async(NULL, gUnknown_80FDE6C, FALSE) != 1) { return TRUE; } SetMonsterActionFields(GetLeaderActionContainer(), ACTION_QUICK_SAVE); @@ -435,7 +435,7 @@ static bool8 AskToQuickSave(void) static bool8 AskToGiveUp(void) { - if (DisplayDungeonYesNoMessage(NULL, gUnknown_80FDEB8, FALSE) != 1) { + if (DisplayDungeonYesNoMessage_Async(NULL, gUnknown_80FDEB8, FALSE) != 1) { return TRUE; } SetMonsterActionFields(GetLeaderActionContainer(), ACTION_GIVE_UP); diff --git a/src/dungeon_menu_team.c b/src/dungeon_menu_team.c index f921a5db6..016c3f590 100644 --- a/src/dungeon_menu_team.c +++ b/src/dungeon_menu_team.c @@ -1230,7 +1230,7 @@ static void ShowIqDescriptionWindow(u8 iqSkillId) ShowStatusesDescriptionMenu(count, result); } - sub_803E708(4, 0x3E); + DungeonWaitFrames_Async(4, 0x3E); } static void ShowTacticDescriptionWindow(u8 tacticId) @@ -1283,7 +1283,7 @@ static void ShowTacticDescriptionWindow(u8 tacticId) ShowStatusesDescriptionMenu(count, result); } - sub_803E708(4, 0x3E); + DungeonWaitFrames_Async(4, 0x3E); } static void ShowStatusInfoWindow(s32 statusId) @@ -1334,7 +1334,7 @@ static void ShowStatusInfoWindow(s32 statusId) } } - sub_803E708(4, 0x3E); + DungeonWaitFrames_Async(4, 0x3E); } static const WindowHeader sBottomWindowHeader = {1, 0, 15, 0}; @@ -1453,7 +1453,7 @@ Entity *ShowDungeonToWhichMonMenu(s32 *teamId, s32 caseId) sub_804AA60(); TryPointCameraToMonster(GetLeader(), 0); sub_803EAF0(0, NULL); - sub_803E708(4, 0x3E); + DungeonWaitFrames_Async(4, 0x3E); if (bPress) { return NULL; } diff --git a/src/dungeon_message.c b/src/dungeon_message.c index f6aee31b0..d9e8f6558 100644 --- a/src/dungeon_message.c +++ b/src/dungeon_message.c @@ -359,7 +359,7 @@ void DisplayDungeonMessage_Async(struct MonDialogueSpriteInfo *monSpriteInfo, co } } - sub_803E708(8, 9); + DungeonWaitFrames_Async(8, 9); } void DisplayDungeonLoggableMessage(Entity *pokemon, const u8 *str) @@ -370,7 +370,7 @@ void DisplayDungeonLoggableMessage(Entity *pokemon, const u8 *str) static const u16 sUnknownDialogueFlags[] = {0x30D, 0x10D, 0x30D, 0x10D, 0x301, 1, 0x11}; -void DisplayDungeonDialogue(const struct DungeonDialogueStruct *dialogueInfo) +void DisplayDungeonDialogue_Async(const struct DungeonDialogueStruct *dialogueInfo) { MonPortraitMsg monPortrait; s32 leaderId, partnerId, dialogueMonId; @@ -478,10 +478,10 @@ void DisplayDungeonDialogue(const struct DungeonDialogueStruct *dialogueInfo) LoadDungeonMapPalette(); sub_803EAF0(0, NULL); } - sub_803E708(8, 9); + DungeonWaitFrames_Async(8, 9); } -bool32 DisplayDungeonYesNoMessage(struct MonDialogueSpriteInfo *monSpriteInfo, const u8 *str, bool32 defaultYes) +bool32 DisplayDungeonYesNoMessage_Async(struct MonDialogueSpriteInfo *monSpriteInfo, const u8 *str, bool32 defaultYes) { MonPortraitMsg monPortrait, *monPortraitPtr; s32 chosenMenuIndex; @@ -569,24 +569,24 @@ s32 DisplayDungeonMenuMessage(struct MonDialogueSpriteInfo *monSpriteInfo, const return chosenMenuIndex; } -void sub_8052D44(s16 *ids, Entity *leader, Entity *partner) +void BufferCutsceneProtagonists(s16 destIDs[2], Entity *leader, Entity *partner) { if (EntityIsValid(leader)) { - SubstitutePlaceholderStringTags(gFormatBuffer_Monsters[0], leader, 0); - ids[0] = GetEntInfo(leader)->apparentID; + SubstitutePlaceholderStringTags(gFormatBuffer_Monsters[0], leader, COLOR_WHITE); + destIDs[0] = GetEntInfo(leader)->apparentID; } else { InlineStrcpy(gFormatBuffer_Monsters[0], "??"); - ids[0] = 0; + destIDs[0] = 0; } if (EntityIsValid(partner)) { - SubstitutePlaceholderStringTags(gFormatBuffer_Monsters[1], partner, 0); - ids[1] = GetEntInfo(partner)->apparentID; + SubstitutePlaceholderStringTags(gFormatBuffer_Monsters[1], partner, COLOR_WHITE); + destIDs[1] = GetEntInfo(partner)->apparentID; } else { InlineStrcpy(gFormatBuffer_Monsters[1], "??"); - ids[1] = 0; + destIDs[1] = 0; } } @@ -595,7 +595,7 @@ static bool8 sub_8052DC0(Entity *entity) return ShouldDisplayEntity(entity); } -static inline bool32 DislayTutorialMsg(Entity *leader, const struct TutorialFlagMsg *tutorial, bool32 unkFunctionCall) +static inline bool32 DislayTutorialMsg(Entity *leader, const TutorialFlagMsg *tutorial, bool32 unkFunctionCall) { const u8 *str; s32 flag = tutorial->flagId; @@ -730,7 +730,7 @@ void sub_8052FB8(const u8 *str) for (j = 0; j < 8; j++) { SetBGPaletteBufferColorArray(240 + j, &gFontPalette[j]); } - sub_803E708(8, 9); + DungeonWaitFrames_Async(8, 9); } const u8 *GetCurrentDungeonName(void) diff --git a/src/dungeon_misc.c b/src/dungeon_misc.c index f2505194f..727e706df 100644 --- a/src/dungeon_misc.c +++ b/src/dungeon_misc.c @@ -384,7 +384,7 @@ void sub_8068BDC(bool8 a0) if (id == j) break; - if (DisplayDungeonYesNoMessage(NULL, gUnknown_80FE20C, TRUE) == TRUE) // If you dismiss this mon, it may never join you again. Bid farewell to it? + if (DisplayDungeonYesNoMessage_Async(NULL, gUnknown_80FE20C, TRUE) == TRUE) // If you dismiss this mon, it may never join you again. Bid farewell to it? break; } @@ -498,7 +498,7 @@ void HandleFaint_Async(Entity *entity, s32 dungeonExitReason_, Entity *param_3) joinId = entity->isVisible; joinId = entity->unk22;joinId = entity->isVisible; joinId = entity->unk22;joinId = entity->isVisible; joinId = entity->unk22; #endif if (entInfo->isTeamLeader) { - sub_803E708(0x3c,0x49); + DungeonWaitFrames_Async(0x3c,0x49); DisplayMessageLog(); if (gDungeon->unk6 == 0) { if (gDungeon->unk644.stoleFromKecleon == 0 @@ -510,7 +510,7 @@ void HandleFaint_Async(Entity *entity, s32 dungeonExitReason_, Entity *param_3) && gDungeon->unk644.missionKind != DUNGEON_MISSION_OUTONRESCUE) { if (gDungeon->unk644.unk37 > 0) { - if (DisplayDungeonYesNoMessage(NULL,gUnknown_80FE268,1) == 1) { + if (DisplayDungeonYesNoMessage_Async(NULL,gUnknown_80FE268,1) == 1) { DisplayDungeonMessage_Async(NULL,gUnknown_80FE28C,1); gDungeon->unk4 = 1; gDungeon->unk6 = 1; @@ -579,7 +579,7 @@ void HandleFaint_Async(Entity *entity, s32 dungeonExitReason_, Entity *param_3) } if (GetLeader() != NULL && dungeonExitReason != DUNGEON_EXIT_DELETED_FOR_EVENT && !entInfo->isTeamLeader && !gDungeon->unk10) { - sub_8084E00_Async(entity, entInfo->monsterBehavior, dungeonExitReason == DUNGEON_EXIT_TRANSFORMED_INTO_FRIEND); + HandleBossFaint_Async(entity, entInfo->monsterBehavior, dungeonExitReason == DUNGEON_EXIT_TRANSFORMED_INTO_FRIEND); if (IS_DEOXYS_FORM_MONSTER(entInfo->apparentID) && !IsFloorwideFixedRoom() && entInfo->isNotTeamMember) { gDungeon->deoxysDefeat = 1; DisplayDungeonLoggableMessageTrue_Async(entity,gUnknown_80FA580); @@ -1261,7 +1261,7 @@ void TryPointCameraToMonster(Entity *pokemon, u8 param_2) DungeonRunFrameActions(0x34); } } - sub_803E708(4,0x44); + DungeonWaitFrames_Async(4,0x44); PointCameraToMonster(pokemon); DiscoverMinimap(&pokemon->pos); gDungeon->unk12 = 0; diff --git a/src/dungeon_mon_recruit.c b/src/dungeon_mon_recruit.c index 4e254e425..3b9820641 100644 --- a/src/dungeon_mon_recruit.c +++ b/src/dungeon_mon_recruit.c @@ -188,7 +188,7 @@ bool8 IsMonsterRecruitable(s32 species) if (!gDungeon->unk644.canRecruit) { return FALSE; } - else if (!sub_808529C(id)) { + else if (!MonCutsceneCompleted(id)) { return FALSE; } else if (id == MONSTER_MEW && gDungeon->unk644.missionKind == DUNGEON_MISSION_OUTONRESCUE) { @@ -238,7 +238,7 @@ bool8 MonsterJoinSequence_Async(Entity *entity1, Entity *entity2, struct unkStru sub_806CE68(entity2, direction); CopyCyanMonsterNametoBuffer(gFormatBuffer_Monsters[0],param_3->id); - if (DisplayDungeonYesNoMessage(0,gUnknown_80F9FE8,1) == 0) { + if (DisplayDungeonYesNoMessage_Async(0,gUnknown_80F9FE8,1) == 0) { if (param_3->id != MONSTER_JIRACHI) { LogMessageByIdWithPopupCheckUser_Async(entity1,gText_Pokemon0WentAway); } @@ -296,8 +296,8 @@ bool8 MonsterJoinSequence_Async(Entity *entity1, Entity *entity2, struct unkStru } else { sub_8083D88(); - sub_803E708(0xa0,0x46); - if (DisplayDungeonYesNoMessage(0,gText_NewMemberJoinedGiveItNickname,TRUE) == 1) { + DungeonWaitFrames_Async(0xa0,0x46); + if (DisplayDungeonYesNoMessage_Async(0,gText_NewMemberJoinedGiveItNickname,TRUE) == 1) { while (DungeonGiveNameToRecruitedMon(dungeonMon->name) == 0) { DisplayDungeonMessage_Async(0,gText_PleaseGiveNicknameNewMember,TRUE); } @@ -421,7 +421,7 @@ bool8 HandleSpecialEntityJoinSequence(Entity *entity1,Entity *entity2,Entity **e dungeonMon->flags = 0; } else { - if (DisplayDungeonYesNoMessage(0,gText_NewMemberJoinedGiveItNickname,TRUE) == 1) { + if (DisplayDungeonYesNoMessage_Async(0,gText_NewMemberJoinedGiveItNickname,TRUE) == 1) { while (!DungeonGiveNameToRecruitedMon(dungeonMon->name)) { DisplayDungeonMessage_Async(0,gText_PleaseGiveNicknameNewMember,TRUE); } diff --git a/src/dungeon_move.c b/src/dungeon_move.c index 691fa6e0b..1e84be40f 100644 --- a/src/dungeon_move.c +++ b/src/dungeon_move.c @@ -142,18 +142,18 @@ void UseMoveAgainstTargets(Entity **targetsArray, Entity *attacker, Move *move, s32 k; for (k = 0; k < 24; k++) { sub_806CE68(currTarget, direction1); - sub_803E708(2, 0x43); + DungeonWaitFrames_Async(2, 0x43); direction1++; direction1 &= DIRECTION_MASK; } while (direction1 != direction2) { sub_806CE68(currTarget, direction1); - sub_803E708(2, 0x43); + DungeonWaitFrames_Async(2, 0x43); direction1++; direction1 &= DIRECTION_MASK; } sub_806CE68(currTarget, direction1); - sub_803E708(2, 0x43); + DungeonWaitFrames_Async(2, 0x43); } targetInfo->belly = FixedPoint_Subtract(targetInfo->belly, IntToFixedPoint(gPassScarfBellyDownValue)); if (move->id == MOVE_REGULAR_ATTACK) { @@ -258,7 +258,7 @@ void UseMoveAgainstTargets(Entity **targetsArray, Entity *attacker, Move *move, } if (ShouldDisplayEntity(currTarget)) { - sub_803E708(4, 0x4A); + DungeonWaitFrames_Async(4, 0x4A); sub_8041168(attacker, currTarget, move, NULL); } diff --git a/src/dungeon_move_util.c b/src/dungeon_move_util.c index f19e5980d..87dcc92dc 100644 --- a/src/dungeon_move_util.c +++ b/src/dungeon_move_util.c @@ -360,7 +360,7 @@ bool8 TryUseChosenMove(struct Entity *attacker, u32 r6, s32 itemId, u32 var_30, if (GetEntInfo(attacker)->muzzled.muzzled == TRUE && FailsWhileMuzzled(move->id)) { SubstitutePlaceholderStringTags(gFormatBuffer_Monsters[0], attacker, 0); LogMessageByIdWithPopupCheckUser_Async(attacker, msg); - sub_803E708(0xA, 0x3F); + DungeonWaitFrames_Async(0xA, 0x3F); LogMessageByIdWithPopupCheckUser_Async(attacker, gUnknown_80FC710); // is muzzled! return FALSE; } @@ -369,13 +369,13 @@ bool8 TryUseChosenMove(struct Entity *attacker, u32 r6, s32 itemId, u32 var_30, if (itemId == 0) { BufferMoveName(gFormatBuffer_Items[0], move, NULL); LogMessageByIdWithPopupCheckUser_Async(attacker, msg); - sub_803E708(0xA, 0x3F); + DungeonWaitFrames_Async(0xA, 0x3F); LogMessageByIdWithPopupCheckUser_Async(attacker, gUnknown_80FC6D0); // But the move couldn't be used! } else { BufferItemName(gFormatBuffer_Items[0], itemId, NULL); LogMessageByIdWithPopupCheckUser_Async(attacker, msg); - sub_803E708(0xA, 0x3F); + DungeonWaitFrames_Async(0xA, 0x3F); LogMessageByIdWithPopupCheckUser_Async(attacker, gUnknown_80FC6FC); // But Orbs are prevented from being used! } return FALSE; @@ -734,7 +734,7 @@ void sub_80566F8(Entity *attacker, Move *move, s32 a2, bool8 a3, s32 itemId, s32 UseMoveAgainstTargets(targetsArray, attacker, move, itemId, isLinkedMove); } else if (a2 == 1 && sub_803F428(&var_68)) { - sub_803E708(1, 0x4A); + DungeonWaitFrames_Async(1, 0x4A); sub_8041168(attacker, NULL, move, &var_68); } } diff --git a/src/dungeon_recruit_release_menu.c b/src/dungeon_recruit_release_menu.c index 55018b45f..2e8005d0a 100644 --- a/src/dungeon_recruit_release_menu.c +++ b/src/dungeon_recruit_release_menu.c @@ -232,7 +232,7 @@ void ShowRecruitReleaseMenu(u8 a0, s32 a1, s32 a2, Pokemon **a3) continue; } - if (DisplayDungeonYesNoMessage(NULL, gUnknown_80FDFB8, TRUE) == 1) { + if (DisplayDungeonYesNoMessage_Async(NULL, gUnknown_80FDFB8, TRUE) == 1) { break; } else { diff --git a/src/dungeon_strings.c b/src/dungeon_strings.c index 61572e186..e5de5d565 100644 --- a/src/dungeon_strings.c +++ b/src/dungeon_strings.c @@ -1025,64 +1025,64 @@ const u8 *const gUnknown_80FEF98 = _("Cute Charm caused infatuation!"); const u8 *const gUnknown_80FEFD0 = _("A horrid stench billowed out!\n{POKEMON_0} became terrified!"); const u8 *const gUnknown_80FEFF4 = _("Transform can't be used here!"); const u8 *const gUnknown_80FF01C = _("{POKEMON_0}'s Synchronize took effect!"); -const struct TutorialFlagMsg gUnknown_80FF020 = { - 0x00, _("Head for the destination while attacking\nfoes with {A_BUTTON}.\nTry not to let a partner faint!") +const TutorialFlagMsg gUnknown_80FF020 = { + TUTORIAL_FLAG_STAIRS_AND_SURVIVE, _("Head for the destination while attacking\nfoes with {A_BUTTON}.\nTry not to let a partner faint!") }; -const struct TutorialFlagMsg gUnknown_80FF080 = { - 0x01, _("Foes won't move until you do.\nOpen the menu with {B_BUTTON} and\nthink before you act!") +const TutorialFlagMsg gUnknown_80FF080 = { + TUTORIAL_FLAG_OPEN_MENU, _("Foes won't move until you do.\nOpen the menu with {B_BUTTON} and\nthink before you act!") }; -const struct TutorialFlagMsg gUnknown_80FF0D8 = { - 0x02, _("Your team regains HP as it moves.\nHold {B_BUTTON} then press {A_BUTTON} to recover\nHP quickly on the spot.") +const TutorialFlagMsg gUnknown_80FF0D8 = { + TUTORIAL_FLAG_REGAIN_HP, _("Your team regains HP as it moves.\nHold {B_BUTTON} then press {A_BUTTON} to recover\nHP quickly on the spot.") }; -const struct TutorialFlagMsg gUnknown_80FF13C = { - 0x0c, _("Defeat foes using moves instead of\n{A_BUTTON} attacks for more Exp. Points.\nChoose and set the move you want to use.") +const TutorialFlagMsg gUnknown_80FF13C = { + TUTORIAL_FLAG_MOVES, _("Defeat foes using moves instead of\n{A_BUTTON} attacks for more Exp. Points.\nChoose and set the move you want to use.") }; -const struct TutorialFlagMsg gUnknown_80FF1B4 = { - 0x0d, _("Choose a partner with the Team command\nand set its tactics and IQ skills.\nCooperation with partners is the key!") +const TutorialFlagMsg gUnknown_80FF1B4 = { + TUTORIAL_FLAG_TEAM_MANAGEMENT, _("Choose a partner with the Team command\nand set its tactics and IQ skills.\nCooperation with partners is the key!") }; -const struct TutorialFlagMsg gMovementTutorial = { - 0x0e, _("Hold {B_BUTTON} then press {DPAD} to speed up\nmovement. Hold {R_BUTTON} then press {DPAD}\nto move only diagonally.") +const TutorialFlagMsg gMovementTutorial = { + TUTORIAL_FLAG_MOVEMENT, _("Hold {B_BUTTON} then press {DPAD} to speed up\nmovement. Hold {R_BUTTON} then press {DPAD}\nto move only diagonally.") }; -const struct TutorialFlagMsg gHungerTutorial = { - 0x0f, _("Eat an Apple or Gummi when your Belly\ngoes down. Being famished can cause\nfainting, so check your Belly in the menu.") +const TutorialFlagMsg gHungerTutorial = { + TUTORIAL_FLAG_MANAGE_BELLY2, _("Eat an Apple or Gummi when your Belly\ngoes down. Being famished can cause\nfainting, so check your Belly in the menu.") }; -const struct TutorialFlagMsg gFoodTutorial = { - 0x03, _("Eating an Apple or Gummi fills your Belly.\nChoose them under Items in the menu\nand eat one before your Belly gets empty.") +const TutorialFlagMsg gFoodTutorial = { + TUTORIAL_FLAG_MANAGE_BELLY1, _("Eating an Apple or Gummi fills your Belly.\nChoose them under Items in the menu\nand eat one before your Belly gets empty.") }; -const struct TutorialFlagMsg gOranTutorial = { - 0x04, _("An Oran Berry restores HP.\nOpen the menu with {B_BUTTON} and\nselect it under Items.") +const TutorialFlagMsg gOranTutorial = { + TUTORIAL_FLAG_ORAN_BERRY, _("An Oran Berry restores HP.\nOpen the menu with {B_BUTTON} and\nselect it under Items.") }; -const struct TutorialFlagMsg gCheriTutorial = { - 0x05, _("A Cheri Berry heals paralysis.\nOpen the menu with {B_BUTTON} and\nselect it under Items.") +const TutorialFlagMsg gCheriTutorial = { + TUTORIAL_FLAG_CHERI_BERRY, _("A Cheri Berry heals paralysis.\nOpen the menu with {B_BUTTON} and\nselect it under Items.") }; -const struct TutorialFlagMsg gBlastSeedTutorial = { - 0x06, _("A Blast Seed flames the foe you\nare facing.\nTurn to face the foe, then use the item.") +const TutorialFlagMsg gBlastSeedTutorial = { + TUTORIAL_FLAG_BLAST_SEED, _("A Blast Seed flames the foe you\nare facing.\nTurn to face the foe, then use the item.") }; -const struct TutorialFlagMsg gUnknown_80FF4A0 = { - 0x07, _("Gravelerocks can be lobbed at distant foes.\nSet them for use under Items.\nHold {L_BUTTON} then press {R_BUTTON} to throw them.") +const TutorialFlagMsg gUnknown_80FF4A0 = { + TUTORIAL_FLAG_GRAVELEROCK, _("Gravelerocks can be lobbed at distant foes.\nSet them for use under Items.\nHold {L_BUTTON} then press {R_BUTTON} to throw them.") }; -const struct TutorialFlagMsg gPechaTutorial = { - 0x09, _("A Pecha Berry heals any kind of poisoning.\nOpen the menu with {B_BUTTON} and\nselect it under Items.") +const TutorialFlagMsg gPechaTutorial = { + TUTORIAL_FLAG_PECHA_BERRY, _("A Pecha Berry heals any kind of poisoning.\nOpen the menu with {B_BUTTON} and\nselect it under Items.") }; -const struct TutorialFlagMsg gSleepSeedTutorial = { - 0x0a, _("Throw a Sleep Seed at a foe to put it\nto sleep for a little while.\nEating it will put you to sleep!") +const TutorialFlagMsg gSleepSeedTutorial = { + TUTORIAL_FLAG_SLEEP_SEED, _("Throw a Sleep Seed at a foe to put it\nto sleep for a little while.\nEating it will put you to sleep!") }; -const struct TutorialFlagMsg gMoneyTutorial = { - 0x0b, _("{POKE} is the money in this world.\nCollect and save it to buy useful\nitems.") +const TutorialFlagMsg gMoneyTutorial = { + TUTORIAL_FLAG_MONEY, _("{POKE} is the money in this world.\nCollect and save it to buy useful\nitems.") }; const u8 *const gUnknown_80FF674 = _("You're a thief!\nYou're not recognized as a rescuer!"); diff --git a/src/dungeon_turn_effects.c b/src/dungeon_turn_effects.c index 2314ff696..1a210520c 100644 --- a/src/dungeon_turn_effects.c +++ b/src/dungeon_turn_effects.c @@ -157,7 +157,7 @@ void DoEndOfTurnEffects_Async(Entity *entity) if (sound) PlaySoundEffect(0x153); LogMessageByIdWithPopupCheckUser_Async(entity, str); - sub_803E708(30, 0x32); + DungeonWaitFrames_Async(30, 0x32); } } diff --git a/src/dungeon_util.c b/src/dungeon_util.c index b58b6bb3d..fcbe9497c 100644 --- a/src/dungeon_util.c +++ b/src/dungeon_util.c @@ -601,12 +601,12 @@ s32 GetTeamMemberEntityIndex(Entity *pokemon) return -1; } -void SubstitutePlaceholderStringTags(u8 *buffer, Entity *entity, u32 param_3) +void SubstitutePlaceholderStringTags(u8 *buffer, Entity *entity, u32 monsterColorNum) { switch(GetEntityType(entity)) { case ENTITY_MONSTER: - SetMessageArgument_2(buffer, GetEntInfo(entity), param_3); + SetMessageArgument_2(buffer, GetEntInfo(entity), monsterColorNum); break; case ENTITY_ITEM: sub_8045BF8(buffer, GetItemData_1(entity)); diff --git a/src/dungeon_vram.c b/src/dungeon_vram.c index 901de9857..dc3d96722 100644 --- a/src/dungeon_vram.c +++ b/src/dungeon_vram.c @@ -260,7 +260,7 @@ void sub_803E668(u32 unused) sUnknown_202EDD4--; } -void sub_803E708(s32 numFrames, u32 a1) +void DungeonWaitFrames_Async(s32 numFrames, u32 a1) { while (numFrames != 0) { DungeonRunFrameActions(a1); diff --git a/src/event_flag.c b/src/event_flag.c index 415d958f3..c6ad91487 100644 --- a/src/event_flag.c +++ b/src/event_flag.c @@ -440,10 +440,10 @@ UNUSED static void ScriptVarStringPopFirstChar(s16 varId,u32 param_2,s32 maxLen) #endif // arm9.bin::0200F508 -void GetScriptVarScenario(s32 param_1,u32 *param_2,u32 *param_3) +void GetScriptVarScenario(s32 varID, u32 *outMain, u32 *outSub) { - *param_2 = GetScriptVarArrayValue(NULL, (s16)param_1, 0); - *param_3 = GetScriptVarArrayValue(NULL, (s16)param_1, 1); + *outMain = GetScriptVarArrayValue(NULL, (s16)varID, 0); + *outSub = GetScriptVarArrayValue(NULL, (s16)varID, 1); } // arm9.bin::0200F36C @@ -478,15 +478,15 @@ void ScenarioCalc(s16 param_1,s32 param_2,s32 param_3) } break; case 4: - if (ScriptVarScenarioBefore(SCENARIO_SUB1,31,0) == 0) { + if (!ScriptVarScenarioBefore(SCENARIO_SUB1,31,0)) { SetAdventureAchievement(AA_TEAM_BASE_DONE); } - if (ScriptVarScenarioBefore(SCENARIO_SUB1,32,0) == 0) { + if (!ScriptVarScenarioBefore(SCENARIO_SUB1,32,0)) { SetAdventureAchievement(AA_SMEARGLE); } break; case 0xC: - if(ScriptVarScenarioBefore(SCENARIO_SUB9,55,2) == 0) { + if(!ScriptVarScenarioBefore(SCENARIO_SUB9,55,2)) { SetAdventureAchievement(AA_BROKE_CURSE); } break; @@ -551,17 +551,17 @@ bool8 ScriptVarScenarioAfter(s16 varId, u32 pMain, s32 pSub) // arm9.bin::0200ECE0 void sub_8001D88(void) { - u32 local_c; - u32 auStack8; + u32 sMain_sub; + u32 sMain_main; - GetScriptVarScenario(3, &auStack8, &local_c); - if (auStack8 < 1 || auStack8 > 0x1b) + GetScriptVarScenario(SCENARIO_MAIN, &sMain_main, &sMain_sub); + if (sMain_main < 1 || sMain_main > 0x1b) return; - if (ScriptVarScenarioBefore(SCENARIO_SUB1,0x1f,0) != 0) { + if (ScriptVarScenarioBefore(SCENARIO_SUB1,31,0) != 0) { if (ScriptVarScenarioAfter(SCENARIO_MAIN,0xf,7) != 0) { - ScenarioCalc(SCENARIO_SUB1,0x1f,0); - sub_8097418(0xe,1); + ScenarioCalc(SCENARIO_SUB1,31,0); + SetRescueScenarioConquered(RESCUE_DUNGEON_UPROAR_FOREST, TRUE); SetScriptVarValue(NULL,BASE_LEVEL,2); } else { @@ -572,32 +572,32 @@ void sub_8001D88(void) } if ((ScriptVarScenarioEqual(SCENARIO_SUB1,0x1f,0)) && (GetFriendAreaStatus(SKY_BLUE_PLAINS))) { ScenarioCalc(SCENARIO_SUB1,0x1f,1); - sub_809733C(0xf,1); + sub_809733C(RESCUE_DUNGEON_HOWLING_FOREST, TRUE); } - if (auStack8 > 0x11) { - sub_80973A8(0x25,1); + if (sMain_main > 0x11) { + sub_80973A8(RESCUE_DUNGEON_WATERFALL_POND, TRUE); if (((FindItemInInventory(ITEM_HM_DIVE) != -1) || (gTeamInventoryRef->teamStorage[ITEM_HM_DIVE] != 0)) || (ScriptVarScenarioAfter(SCENARIO_SUB2,0x21,3) != 0)) { - sub_80973A8(0x22,1); + sub_80973A8(RESCUE_DUNGEON_SOLAR_CAVE, TRUE); } if (GetFriendAreaStatus(FURNACE_DESERT) != 0) { - sub_80973A8(0x1f,1); + sub_80973A8(RESCUE_DUNGEON_DESERT_REGION, TRUE); } if (GetFriendAreaStatus(BOULDER_CAVE)) { - sub_80973A8(0x20,1); + sub_80973A8(RESCUE_DUNGEON_SOUTHERN_CAVERN, TRUE); } if (GetFriendAreaStatus(DRAGON_CAVE)) { - sub_80973A8(0x21,1); + sub_80973A8(RESCUE_DUNGEON_WYVERN_HILL, TRUE); } if (GetFriendAreaStatus(SECRETIVE_FOREST)) { - sub_80973A8(0x23,1); + sub_80973A8(RESCUE_DUNGEON_DARKNIGHT_RELIC, TRUE); } if (GetFriendAreaStatus(SERENE_SEA)) { - sub_80973A8(0x24,1); - sub_80973A8(0x28,1); + sub_80973A8(RESCUE_DUNGEON_GRAND_SEA, TRUE); + sub_80973A8(RESCUE_DUNGEON_FAR_OFF_SEA, TRUE); } - if ((GetFriendAreaStatus(AGED_CHAMBER_AN)) && (GetFriendAreaStatus(AGED_CHAMBER_O_EXCLAIM))) { - sub_80973A8(0x26,1); + if (GetFriendAreaStatus(AGED_CHAMBER_AN) && GetFriendAreaStatus(AGED_CHAMBER_O_EXCLAIM)) { + sub_80973A8(RESCUE_DUNGEON_UNOWN_RELIC, TRUE); } if (ScriptVarScenarioEqual(SCENARIO_SUB2,0,0)) { ScenarioCalc(SCENARIO_SUB2,0x21,1); @@ -619,16 +619,16 @@ void sub_8001D88(void) ScenarioCalc(SCENARIO_SUB8,0x33,1); } if (GetFriendAreaStatus(SKY_BLUE_PLAINS)) { - sub_80973A8(0x27,1); + sub_80973A8(RESCUE_DUNGEON_JOYOUS_TOWER, TRUE); } if (GetFriendAreaStatus(SKY_BLUE_PLAINS)) { - sub_80973A8(0x29,1); + sub_80973A8(RESCUE_DUNGEON_PURITY_FOREST, TRUE); } } if (!ScriptVarScenarioBefore(SCENARIO_SUB2,0x22,0)) { if (ScriptVarScenarioEqual(SCENARIO_SUB7,0,0)) { ScenarioCalc(SCENARIO_SUB7,0x31,1); - sub_809733C(0x1b,1); + sub_809733C(RESCUE_DUNGEON_BURIED_RELIC, TRUE); } if ((ScriptVarScenarioEqual(SCENARIO_SUB9,0,0)) && (!ScriptVarScenarioBefore(SCENARIO_SUB8,0x34,0))) { ScenarioCalc(SCENARIO_SUB9,0x35,1); diff --git a/src/exclusive_pokemon.c b/src/exclusive_pokemon.c index 8cc86c727..f0d5144c5 100644 --- a/src/exclusive_pokemon.c +++ b/src/exclusive_pokemon.c @@ -3,77 +3,80 @@ #include "exclusive_pokemon.h" #include "dungeon_data.h" -EWRAM_INIT struct ExclusivePokemonData *gUnknown_203B498 = {0}; -EWRAM_DATA struct ExclusivePokemonData gExclusivePokemonInfo = {0}; +EWRAM_INIT ExclusivePokemonData *gExclusiveMonPtr = { NULL }; + +EWRAM_DATA ExclusivePokemonData gExclusivePokemonInfo = { 0 }; + +// This file is more of a pokedex rather than just exclusive mon stuff void LoadExclusivePokemon(void) { - gUnknown_203B498 = &gExclusivePokemonInfo; + gExclusiveMonPtr = &gExclusivePokemonInfo; } -struct ExclusivePokemonData *GetExclusivePokemon(void) +ExclusivePokemonData *GetExclusivePokemon(void) { return &gExclusivePokemonInfo; } void InitializeExclusivePokemon(void) { - s32 counter; - memset(gUnknown_203B498, 0, sizeof(struct ExclusivePokemonData)); - for(counter = 0; counter < NUM_EXCLUSIVE_POKEMON; counter++) - { - gUnknown_203B498->Exclusives[counter] = gExclusivePokemon[counter].in_rrt; + s32 i; + + memset(gExclusiveMonPtr, 0, sizeof(ExclusivePokemonData)); + + for (i = 0; i < NUM_EXCLUSIVE_POKEMON; i++) { + gExclusiveMonPtr->exclusives[i] = gExclusivePokemon[i].in_rrt; } } -void sub_8097FA8(u8 param_1) +void SetTempCutsceneFlag(u8 flag) { - gUnknown_203B498->unk48[param_1 / 32] |= 1 << ((param_1 % 32)); + gExclusiveMonPtr->tempCutsceneFlags[flag / 32] |= 1 << (flag % 32); } -void sub_8097FD0(u8 param_1) +void SetCutsceneFlag(u8 flag) { - gUnknown_203B498->unk3C[param_1 / 32] |= 1 << ((param_1 % 32)); + gExclusiveMonPtr->cutsceneFlags[flag / 32] |= 1 << (flag % 32); } -void sub_8097FF8(void) +void FlushTempCutsceneFlags(void) { - s32 index; + s32 i; - for (index = 0; index < 0x40; index++) { - if ((gUnknown_203B498->unk48[index / 32] & (1 << (index % 32))) != 0) { - gUnknown_203B498->unk3C[index / 32] |= (1 << (index % 32)); + for (i = 0; i < NUM_CUTSCENE_FLAGS; i++) { + if ((gExclusiveMonPtr->tempCutsceneFlags[i / 32] & (1 << (i % 32))) != 0) { + gExclusiveMonPtr->cutsceneFlags[i / 32] |= 1 << (i % 32); } } - sub_8098080(); + + ClearTempCutsceneFlags(); } -void sub_8098044(u8 param_1) +void UnsetCutsceneFlag(u8 flag) { - gUnknown_203B498->unk3C[param_1 / 32] &= ~(1 << (((param_1 % 32)))); - gUnknown_203B498->unk48[param_1 / 32] &= ~(1 << (((param_1 % 32)))); + gExclusiveMonPtr->cutsceneFlags[flag / 32] &= ~(1 << (flag % 32)); + gExclusiveMonPtr->tempCutsceneFlags[flag / 32] &= ~(1 << (flag % 32)); } -void sub_8098080(void) +void ClearTempCutsceneFlags(void) { - s32 index; + s32 i; - for(index = 0; index < 0x3; index++) - { - gUnknown_203B498->unk48[index] = 0; - } + for (i = 0; i < CUTSCENE_FLAGS_U32STORAGE; i++) + gExclusiveMonPtr->tempCutsceneFlags[i] = 0; } -u8 sub_80980A4(void) +bool8 sub_80980A4(void) { - u32 temp = gUnknown_203B498->unk0; - gUnknown_203B498->unk0 = 1; + bool8 temp = gExclusiveMonPtr->unk0; + gExclusiveMonPtr->unk0 = TRUE; return temp; } -void sub_80980B4(s16 pokeID) +void SetMonSeenFlag(s16 monID) { - s32 pokeID_s32 = pokeID; + s32 pokeID_s32 = monID; s32 pokeID_s32_1 = pokeID_s32; if (pokeID_s32 == MONSTER_DECOY) @@ -83,136 +86,135 @@ void sub_80980B4(s16 pokeID) if (pokeID_s32 == MONSTER_RAYQUAZA_CUTSCENE) return; - gUnknown_203B498->unk4[pokeID_s32 / 32] |= 1 << (s16)(pokeID_s32_1 % 32); + gExclusiveMonPtr->monSeenFlags[pokeID_s32 / 32] |= 1 << (s16)(pokeID_s32_1 % 32); } -bool8 sub_8098100(u8 param_1) +bool8 GetCutsceneFlag(u8 flag) { - if (param_1 >= 64) + if (flag >= NUM_CUTSCENE_FLAGS) return FALSE; - return (gUnknown_203B498->unk3C[param_1 / 32] & (1 << (param_1 % 32))) != 0; + return (gExclusiveMonPtr->cutsceneFlags[flag / 32] & (1 << (flag % 32))) != 0; } -bool8 sub_8098134(s16 pokeID) +bool8 GetMonSeenFlag(s16 monID) { s32 pokeID_s32; s32 pokeID_s32_1; - pokeID_s32 = pokeID; + pokeID_s32 = monID; pokeID_s32_1 = pokeID_s32; - return (gUnknown_203B498->unk4[pokeID_s32 / 32] & (1 << (s16)(pokeID_s32_1 % 32))) != 0; + return (gExclusiveMonPtr->monSeenFlags[pokeID_s32 / 32] & (1 << (s16)(pokeID_s32_1 % 32))) != 0; } -void SetTutorialFlag(s32 index) +void SetTutorialFlag(s32 flag) { - gUnknown_203B498->unk54[index / 32] |= (1 << (index % 32)); + gExclusiveMonPtr->tutorialFlags[flag / 32] |= (1 << (flag % 32)); } -bool32 GetTutorialFlag(s32 index) +bool8 GetTutorialFlag(s32 flag) { - if (index >= 31) + if (flag >= NUM_TUTORIAL_FLAGS) return FALSE; - return ((gUnknown_203B498->unk54[index / 32]) & (1 << (index % 32))) != 0; + return ((gExclusiveMonPtr->tutorialFlags[flag / 32]) & (1 << (flag % 32))) != 0; } bool8 IsExclusivePokemonUnlocked(s32 pokeID) { - s32 index; + s32 i; s32 pokeID_s32 = (s16) pokeID; - for(index = 0; index < NUM_EXCLUSIVE_POKEMON; index++) - { - if(gExclusivePokemon[index].poke_id == pokeID_s32) - return gUnknown_203B498->Exclusives[index]; + for (i = 0; i < NUM_EXCLUSIVE_POKEMON; i++) { + if (gExclusivePokemon[i].poke_id == pokeID_s32) + return gExclusiveMonPtr->exclusives[i]; } + return TRUE; } void UnlockExclusivePokemon(s16 pokeID) { - s32 index; - s32 pokeID_s32; + s32 i; + s32 pokeID_s32 = pokeID; - pokeID_s32 = pokeID; - - for(index = 0; index < NUM_EXCLUSIVE_POKEMON; index++) - { - if(gExclusivePokemon[index].poke_id == pokeID_s32) - gUnknown_203B498->Exclusives[index] = TRUE; + for (i = 0; i < NUM_EXCLUSIVE_POKEMON; i++) { + if (gExclusivePokemon[i].poke_id == pokeID_s32) + gExclusiveMonPtr->exclusives[i] = TRUE; } } void WriteExclusivePokemon(DataSerializer *r0) { - s32 index; - u8 *puVar2; + s32 i; - u8 stack_0; - u8 stack_1; - u8 stack_2; - u8 neg_1; - u8 zero; + u8 neg_1 = -1; + u8 zero = 0; - neg_1 = -1; - zero = 0; + WriteBits(r0, &gExclusiveMonPtr->unk0, 1); - WriteBits(r0, gUnknown_203B498, 1); - for(index = 0; index < MONSTER_MAX; index++) - { - stack_0 = sub_8098134(index); - WriteBits(r0, &stack_0, 1); + for (i = 0; i < MONSTER_MAX; i++) { + bool8 b = GetMonSeenFlag(i); + WriteBits(r0, &b, 1); } - for(index = 0; index < 64; index++) - { - stack_1 = sub_8098100(index); - WriteBits(r0, &stack_1, 1); + + for (i = 0; i < NUM_CUTSCENE_FLAGS; i++) { + bool8 b = GetCutsceneFlag(i); + WriteBits(r0, &b, 1); } - for(index = 0; index < 31; index++) - { - stack_2 = GetTutorialFlag(index); - WriteBits(r0, &stack_2, 1); + + for (i = 0; i < NUM_TUTORIAL_FLAGS; i++) { + bool8 b = GetTutorialFlag(i); + WriteBits(r0, &b, 1); } - for(index = 0; index < NUM_EXCLUSIVE_POKEMON; index++) - { - if(gUnknown_203B498->Exclusives[index]) - puVar2 = &neg_1; + + for (i = 0; i < NUM_EXCLUSIVE_POKEMON; i++) { + u8 *p; + + if (gExclusiveMonPtr->exclusives[i]) + p = &neg_1; else - puVar2 = &zero; - WriteBits(r0, puVar2, 1); + p = &zero; + + WriteBits(r0, p, 1); } } void ReadExclusivePokemon(DataSerializer *r0) { - s32 index; + s32 i; - memset(gUnknown_203B498, 0, sizeof(struct ExclusivePokemonData)); - ReadBits(r0, gUnknown_203B498, 1); - for (index = 0; index < MONSTER_MAX; index++) { - u8 stack_0; - ReadBits(r0, &stack_0, 1); - if(stack_0) - sub_80980B4(index); + memset(gExclusiveMonPtr, 0, sizeof(ExclusivePokemonData)); + + ReadBits(r0, &gExclusiveMonPtr->unk0, 1); + + for (i = 0; i < MONSTER_MAX; i++) { + bool8 b; + ReadBits(r0, &b, 1); + if (b) + SetMonSeenFlag(i); } - for (index = 0; index < 64; index++) { - u8 stack_1; - ReadBits(r0, &stack_1, 1); - if(stack_1) - sub_8097FA8(index); + + for (i = 0; i < NUM_CUTSCENE_FLAGS; i++) { + bool8 b; + ReadBits(r0, &b, 1); + if (b) + SetTempCutsceneFlag(i); } - for (index = 0; index < 31; index++) { - u8 stack_2; - ReadBits(r0, &stack_2, 1); - if(stack_2) - SetTutorialFlag(index); + + for (i = 0; i < NUM_TUTORIAL_FLAGS; i++) { + bool8 b; + ReadBits(r0, &b, 1); + if (b) + SetTutorialFlag(i); } - for (index = 0; index < NUM_EXCLUSIVE_POKEMON; index++) { - u8 stack_3; - ReadBits(r0, &stack_3, 1); + + for (i = 0; i < NUM_EXCLUSIVE_POKEMON; i++) { + bool8 b; + ReadBits(r0, &b, 1); do; while(0); // do/while needed for matching - jiang - gUnknown_203B498->Exclusives[index] = (stack_3 & 1) != 0; + gExclusiveMonPtr->exclusives[i] = (b & 1) != 0; } - sub_8097FF8(); + + FlushTempCutsceneFlags(); } diff --git a/src/ground_lives.c b/src/ground_lives.c index 6ebaf460e..f3ae27c4c 100644 --- a/src/ground_lives.c +++ b/src/ground_lives.c @@ -1527,10 +1527,10 @@ UNUSED static bool8 sub_80A91A0(s32 id1_, s32 id2_) } if (livesPtr2->unk2 <= 37) { - livesPtr2->direction1 = sub_8002984(dir1, 5); + livesPtr2->direction1 = TransformDirection1(dir1, DIR_TRANS_FLIP); } else { - livesPtr2->direction1 = sub_8002984(dir2, 5); + livesPtr2->direction1 = TransformDirection1(dir2, DIR_TRANS_FLIP); } return TRUE; @@ -1650,7 +1650,7 @@ static s32 sub_80A95AC(struct GroundLive *livesPtr, PixelPos *posArg1, PixelPos if (ptr2->flags & 0x40) { if (ptr2->flags & 0x200) { - ptr2->direction1 = sub_8002984(livesPtr->direction1, 5); + ptr2->direction1 = TransformDirection1(livesPtr->direction1, DIR_TRANS_FLIP); } if (GroundLives_ExecutePlayerScriptActionLives(livesPtr->id, id2_)) return 2; @@ -1993,7 +1993,7 @@ static s32 sub_80AA2BC(struct GroundLive *livesPtr, u32 flags, PixelPos *pixelPo if (id2 >= 0) { struct GroundLive *ptr2 = &gGroundLives->array[id2]; if (ptr2->flags & 0x200) { - ptr2->direction1 = sub_8002984(livesPtr->direction1, 5); + ptr2->direction1 = TransformDirection1(livesPtr->direction1, DIR_TRANS_FLIP); } if (GroundLives_ExecutePlayerScriptActionLives(livesPtr->id, id2)) return 3; @@ -2168,7 +2168,7 @@ static s32 sub_80AA7B0(struct GroundLive *livesPtr, s16 *a1, u32 flags, PixelPos s16 var = (s16) sub_80A8BBC(id2); if (var >= 14 && var < 30 && sub_80A8E9C(id2) != NULL) { *a1 = id2; - sub_80A9090(id2, (s8) sub_8002984(livesPtr->direction1, 5)); + sub_80A9090(id2, (s8)TransformDirection1(livesPtr->direction1, DIR_TRANS_FLIP)); return 5; } } diff --git a/src/ground_main.c b/src/ground_main.c index 4a5c87922..3e43adc8b 100644 --- a/src/ground_main.c +++ b/src/ground_main.c @@ -797,19 +797,19 @@ void sub_809927C(u8 param_1) gUnknown_20398C8.sub0.unkD = 0; } -bool8 sub_80992E0(s16 *param_1, s16 *param_2) +bool8 sub_80992E0(s16 *param_1, s16 *rescueDungeonId) { s32 sVar2; - sVar2 = (s16)GetScriptVarValue(NULL,DUNGEON_ENTER); - if ((((sVar2 != -1) && (sVar2 != 0x50)) && (sVar2 != 0x51)) && (sVar2 != 0x52)) { + sVar2 = (s16)GetScriptVarValue(NULL, DUNGEON_ENTER); + if (sVar2 != -1 && sVar2 != 0x50 && sVar2 != 0x51 && sVar2 != 0x52) { *param_1 = sVar2; - *param_2 = GetScriptVarValue(NULL,DUNGEON_ENTER_INDEX); + *rescueDungeonId = GetScriptVarValue(NULL, DUNGEON_ENTER_INDEX); return TRUE; } else { *param_1 = -1; - *param_2 = -1; + *rescueDungeonId = RESCUE_DUNGEON_INVALID; return FALSE; } } diff --git a/src/ground_script.c b/src/ground_script.c index 32a32ab7c..b72653eec 100644 --- a/src/ground_script.c +++ b/src/ground_script.c @@ -729,7 +729,11 @@ s16 HandleAction(Action *action, const DebugLocation *debug) } break; } - case 0x91 ... 0x95: { + case 0x91: // ROTATE_TO + case 0x92: // CMD_UNK_92 + case 0x93: // CMD_UNK_93 + case 0x94: // CMD_UNK_94 + case 0x95: { // CMD_UNK_95 if (action->scriptData.unk2A > 0) { action->scriptData.unk2A--; loopContinue = FALSE; @@ -747,11 +751,12 @@ s16 HandleAction(Action *action, const DebugLocation *debug) action->callbacks->getDirection(action->parentObject, &dir); // arg1h synthetic switch (cmd.op) { - case 0x91: case 0x92: { + case 0x91: // ROTATE_TO + case 0x92: { // CMD_UNK_92 tmp2 = (s8) action->scriptData.unk4D; break; } - case 0x93: { + case 0x93: { // CMD_UNK_93 s16 res; res = sub_80A7AE8((s16)cmd.arg1); if (res >= 0) { @@ -761,7 +766,7 @@ s16 HandleAction(Action *action, const DebugLocation *debug) } break; } - case 0x94: { + case 0x94: { // CMD_UNK_94 s32 res; res = (s16)sub_80A7AE8((s16)cmd.arg1); if (res >= 0) { @@ -771,7 +776,7 @@ s16 HandleAction(Action *action, const DebugLocation *debug) } break; } - case 0x95: { + case 0x95: { // CMD_UNK_95 flag = TRUE; action->callbacks->getHitboxCenter(action->parentObject, &pos1); action->callbacks->getSize(action->parentObject, &pos2); @@ -793,7 +798,7 @@ s16 HandleAction(Action *action, const DebugLocation *debug) } ASM_MATCH_TRICK(dir); - action->scriptData.unk26 = sub_8002A70(dir, tmp2, (u8)cmd.argShort); + action->scriptData.unk26 = TransformDirection2(dir, tmp2, (u8)cmd.argShort); action->callbacks->setDirection(action->parentObject, action->scriptData.unk26); action->scriptData.unk2A = cmd.argByte; } @@ -1884,7 +1889,7 @@ static s32 ExecuteScriptCommand(Action *action) return 2; } case 0x3d: { - int i; + s32 i; if ((s16)curCmd.arg1 != -1) { Pokemon *mon = sub_80A8D54((s16) curCmd.arg1); if (mon != NULL) { @@ -1911,7 +1916,7 @@ static s32 ExecuteScriptCommand(Action *action) return 2; } case 0x3f: { - int i; + s32 i; for (i = 0; i < ARRAY_COUNT_INT(sPokeNameBuffer); i++) { sPokeNameBuffer[i] = '\0'; } @@ -2275,10 +2280,10 @@ static s32 ExecuteScriptCommand(Action *action) scriptData->unk2A = (u8)curCmd.argByte; return 2; } - case 0x8a: { + case 0x8A: { // CMD_UNK_8A s8 dir; action->callbacks->getDirection(action->parentObject, &dir); - action->scriptData.unk26 = sub_8002984(dir, (u8)curCmd.arg1); + action->scriptData.unk26 = TransformDirection1(dir, (u8)curCmd.arg1); action->callbacks->setDirection(action->parentObject, action->scriptData.unk26); scriptData->unk30 = curCmd.argShort; scriptData->unk2A = (u8)curCmd.argByte; @@ -2290,31 +2295,33 @@ static s32 ExecuteScriptCommand(Action *action) scriptData->unk2A = (u8)curCmd.argByte; return 2; } - case 0x8c: { - int ret = (s16)sub_80A7AE8((s16)curCmd.arg1); + case 0x8C: { // CMD_UNK_8C + s32 ret = (s16)sub_80A7AE8((s16)curCmd.arg1); s8 dir; if (ret >= 0) { sub_80A9050(ret, &dir); - action->scriptData.unk26 = sub_8002984(dir, (u8)curCmd.argShort); + action->scriptData.unk26 = TransformDirection1(dir, (u8)curCmd.argShort); action->callbacks->setDirection(action->parentObject, action->scriptData.unk26); } scriptData->unk2A = (u8)curCmd.argByte; return 2; } - case 0x8d: { + case 0x8D: { // CMD_UNK_8D s8 dir; action->callbacks->getDirection(action->parentObject, &dir); - action->scriptData.unk26 = sub_8002984(dir, (u8)curCmd.argShort); + action->scriptData.unk26 = TransformDirection1(dir, (u8)curCmd.argShort); action->callbacks->setDirection(action->parentObject, action->scriptData.unk26); scriptData->unk2A = (u8)curCmd.argByte; return 2; } - case 0x8e: case 0x8f: case 0x90: { + case 0x8E: // CMD_UNK_8E + case 0x8F: // CMD_UNK_8F + case 0x90: { // CMD_UNK_90 bool8 flag = FALSE; s8 dir; PixelPos pos1, pos2, pos3, pos4; switch (curCmd.op) { - case 0x8e: { + case 0x8e: { // CMD_UNK_8E s32 val = (s16)sub_80A7AE8((s16)curCmd.arg1); if (val >= 0) { flag = TRUE; @@ -2323,7 +2330,7 @@ static s32 ExecuteScriptCommand(Action *action) } break; } - case 0x8f: { + case 0x8F: { // CMD_UNK_8F s32 val = (s16)sub_80A7AE8((s16)curCmd.arg1); if (val >= 0) { flag = TRUE; @@ -2332,7 +2339,7 @@ static s32 ExecuteScriptCommand(Action *action) } break; } - case 0x90: { + case 0x90: { // CMD_UNK_90 flag = TRUE; action->callbacks->getHitboxCenter(action->parentObject, &pos1); action->callbacks->getSize(action->parentObject, &pos2); @@ -2355,25 +2362,27 @@ static s32 ExecuteScriptCommand(Action *action) if (dir == tmp) { action->callbacks->getDirection(action->parentObject, &dir); } - action->scriptData.unk26 = sub_8002984(dir, (u8)curCmd.argShort); + action->scriptData.unk26 = TransformDirection1(dir, (u8)curCmd.argShort); action->callbacks->setDirection(action->parentObject, action->scriptData.unk26); } scriptData->unk2A = (u8)curCmd.argByte; return 2; } - case 0x93: case 0x94: case 0x95: { + case 0x93: // CMD_UNK_93 + case 0x94: // CMD_UNK_94 + case 0x95: { // CMD_UNK_95 scriptData->unk2A = 0; return 2; } - case 0x91: { + case 0x91: { // ROTATE_TO action->scriptData.unk4D = (s8)curCmd.arg1; scriptData->unk2A = 0; return 2; } - case 0x92: { + case 0x92: { // CMD_UNK_92 s8 unk; action->callbacks->getDirection(action->parentObject, &unk); - action->scriptData.unk4D = sub_8002984(unk, (u8)curCmd.arg1); + action->scriptData.unk4D = TransformDirection1(unk, (u8)curCmd.arg1); scriptData->unk2A = 0; return 2; } @@ -2579,16 +2588,16 @@ static s32 ExecuteScriptCommand(Action *action) ScriptUnlockFriendArea(curCmd.argShort, (u8)curCmd.argByte > 0); break; } - case 0xae: { + case 0xAE: { // CMD_UNK_AE sub_809733C(curCmd.argShort, (u8)curCmd.argByte > 0); break; } - case 0xaf: { + case 0xAF: { // CMD_UNK_AF sub_80973A8(curCmd.argShort, (u8)curCmd.argByte > 0); break; } - case 0xb0: { - sub_8097418(curCmd.argShort, (u8)curCmd.argByte > 0); + case 0xB0: { // SET_RESCUE_CONQUERED + SetRescueScenarioConquered(curCmd.argShort, (u8)curCmd.argByte > 0); break; } case 0xb1: { @@ -2653,8 +2662,8 @@ static s32 ExecuteScriptCommand(Action *action) } break; } - case 0xbc: { - if (sub_8098100(curCmd.argShort)) { + case 0xBC: { // JUMPIF_CUTSCENE_FLAG + if (GetCutsceneFlag(curCmd.argShort)) { scriptData->script.ptr = FindLabel(action, (u8)curCmd.argByte); } break; @@ -2719,7 +2728,7 @@ static s32 ExecuteScriptCommand(Action *action) val = GetScriptVarArrayValue(NULL, curCmd.argShort, 1); break; } - case 0xc6: { + case 0xC6: { // CJUMP_UNK_C6 val = (s16)sub_80A8C2C((s16)curCmd.arg1); break; } @@ -3302,7 +3311,7 @@ static s32 sub_80A14E8(Action *action, u8 idx, u32 r2, s32 r3) pokemon = GetPlayerPokemonStruct(); if (pokemon != NULL && pokemon->speciesNum == MONSTER_HO_OH) return 2; - else if (sub_8098134(MONSTER_HO_OH) != 0) + else if (GetMonSeenFlag(MONSTER_HO_OH)) return 1; } return 0; @@ -3608,7 +3617,7 @@ static s32 sub_80A14E8(Action *action, u8 idx, u32 r2, s32 r3) if(pokemon != NULL && pokemon->speciesNum == MONSTER_CHANSEY) return 2; else - if(sub_8098134(MONSTER_CHANSEY) != 0) + if(GetMonSeenFlag(MONSTER_CHANSEY)) return 1; else return 0; diff --git a/src/hurl_orb.c b/src/hurl_orb.c index 61abcfe83..3b51bca90 100644 --- a/src/hurl_orb.c +++ b/src/hurl_orb.c @@ -226,7 +226,7 @@ void HandleHurlOrb(Entity *target, Entity *attacker) if (EntityIsValid(attacker)) { sub_806CE68(attacker, GetEntInfo(attacker)->action.direction); } - sub_803E708(0x1E, 0x3B); + DungeonWaitFrames_Async(0x1E, 0x3B); sub_807F9BC(attacker); } } diff --git a/src/main_loops.c b/src/main_loops.c index 1521cd5f8..b737fd15f 100644 --- a/src/main_loops.c +++ b/src/main_loops.c @@ -1016,11 +1016,11 @@ void sub_8001064(void) static u8 sub_8001170(void) { s16 local_10; - s16 auStack_e; + s16 rescueDungeonId; u8 auStack_b; u8 dungeonID = NUM_DUNGEONS + 1; - if (sub_80992E0(&local_10, &auStack_e)) + if (sub_80992E0(&local_10, &rescueDungeonId)) dungeonID = ScriptDungeonIdToDungeonId(local_10); else if (!sub_8099328(&dungeonID) && !sub_8099360(&dungeonID) && sub_8099394(&auStack_b)) dungeonID = DUNGEON_OUT_ON_RESCUE; diff --git a/src/one_room_orb.c b/src/one_room_orb.c index a2933a5ae..372b620d5 100644 --- a/src/one_room_orb.c +++ b/src/one_room_orb.c @@ -131,7 +131,7 @@ void HandleOneRoomOrb(Entity *pokemon, Entity *target) UpdateMinimap(); UpdateTrapsVisibility(); LogMessageByIdWithPopupCheckUser_Async(pokemon,gUnknown_80FD3A0); - sub_803E708(0x28,0x2b); + DungeonWaitFrames_Async(0x28,0x2b); TryTriggerMonsterHouseWithMsg_Async(pokemon,1); for(index = 0; index < DUNGEON_MAX_POKEMON; index++) { @@ -144,5 +144,5 @@ void HandleOneRoomOrb(Entity *pokemon, Entity *target) } } gDungeon->forceMonsterHouse = TRUE; - sub_803E708(0x14,0x2b); + DungeonWaitFrames_Async(0x14,0x2b); } diff --git a/src/other_menus2.c b/src/other_menus2.c index 503b64e87..6bf512e41 100644 --- a/src/other_menus2.c +++ b/src/other_menus2.c @@ -26,7 +26,7 @@ UNUSED EWRAM_DATA static u8 sUnused = 0; EWRAM_DATA static s32 gUnknown_202EC40[2] = {0}; EWRAM_DATA static s32 gUnknown_202EC48 = 0; -extern struct UnkStruct_203B184 *gUnknown_203B184; +extern UnkStruct_203B184 *gUnknown_203B184; #include "data/other_menus2.h" diff --git a/src/other_random.c b/src/other_random.c index 922de5d17..f2faabb9d 100644 --- a/src/other_random.c +++ b/src/other_random.c @@ -12,9 +12,9 @@ static s32 OtherRandom16(void) } // arm9.bin::020127DC -s32 OtherRandInt(s32 cap) +s32 OtherRandInt(s32 exclusiveMax) { - return (OtherRandom16() * cap) >> 16; + return (OtherRandom16() * exclusiveMax) >> 16; } // arm9.bin::020127C4 diff --git a/src/pokemon.c b/src/pokemon.c index 7f9ea1eef..528a2aea1 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -121,7 +121,7 @@ void sub_808CE74(s16 _species, bool32 _isLeader, u8* name) if (speciesFriendArea == friendArea) { gRecruitedPokemonRef->pokemon[i] = pokemon; gFriendAreas[speciesFriendArea] = TRUE; - sub_80980B4(species); + SetMonSeenFlag(species); break; } } @@ -245,7 +245,7 @@ Pokemon *TryAddPokemonToRecruited(Pokemon *pokemon) if (speciesFriendArea == friendArea) { gRecruitedPokemonRef->pokemon[i] = *pokemon; gRecruitedPokemonRef->pokemon[i].flags &= ~(POKEMON_FLAG_x4000); - sub_80980B4(pokemon->speciesNum); + SetMonSeenFlag(pokemon->speciesNum); return &gRecruitedPokemonRef->pokemon[i]; } } diff --git a/src/pokemon_mail.c b/src/pokemon_mail.c index 6576353c4..44c12599d 100644 --- a/src/pokemon_mail.c +++ b/src/pokemon_mail.c @@ -413,7 +413,7 @@ bool8 sub_803C110(s16 index) species_s32 = (s32)index; - if (!sub_8098134(index) || index != GetBaseSpecies(index) || !sub_803C0DC(index)) + if (!GetMonSeenFlag(index) || index != GetBaseSpecies(index) || !sub_803C0DC(index)) return FALSE; if (!CheckQuest(QUEST_REACHED_POSTGAME)) { diff --git a/src/post_office_guide2.c b/src/post_office_guide2.c index f7e5fcca7..d0ec1d39e 100644 --- a/src/post_office_guide2.c +++ b/src/post_office_guide2.c @@ -169,11 +169,11 @@ static void DisplayMissionObjectives(void) case DUNGEON_MISSION_UNK0: default: { s16 auStack44; - s16 missionIndex; + s16 rescueDungeonId; u8 local_test; - if (sub_80992E0(&auStack44, &missionIndex)) - PrintStringOnWindow(10, 16, GetCurrentMissionText(missionIndex), sUnknown_203B330->unk10, 0); + if (sub_80992E0(&auStack44, &rescueDungeonId)) + PrintStringOnWindow(10, 16, GetCurrentMissionText(rescueDungeonId), sUnknown_203B330->unk10, 0); else if (sub_8099360(&local_test) != 0) PrintStringOnWindow(10, 16, sub_80975DC(sub_80A2688(local_test)), sUnknown_203B330->unk10, 0); else diff --git a/src/rescue_scenario.c b/src/rescue_scenario.c index 6ff9d5d12..7d53ad3c0 100644 --- a/src/rescue_scenario.c +++ b/src/rescue_scenario.c @@ -7,49 +7,47 @@ #include "code_80958E8.h" #include "code_80A26CC.h" -// size: 0x8 +// Size: R=0x8 | B=0x6 typedef struct MissionText { /* 0x0 */ const u8 *text; - u8 unk4; - u8 unk5; - u8 unk6; - u8 unk7; + /* 0x4 */ u8 cutsceneFlag1; // See enum "CutsceneFlagID" + /* 0x5 */ u8 cutsceneFlag2; // See enum "CutsceneFlagID" } MissionText; -static const MissionText sStoryMissionText[] = { - { _("Rescue Caterpie."), -1, -1, 0, 0 }, - { _("Rescue Magnemite."), -1, -1, 0, 0 }, - { _("Rescue Diglett."), 0, 1, 0, 0 }, - { _("Rescue Metapod."), 2, 3, 0, 0 }, - { _("Rescue Jumpluff."), -1, -1, 0, 0 }, - { _("Rescue Shiftry."), 4, 5, 0, 0 }, - { _("Meet Xatu."), -1, -1, 0, 0 }, - { _("Fugitive"), -1, -1, 0, 0 }, - { _("Fugitive"), 6, 7, 0, 0 }, - { _("Fugitive"), 8, 9, 0, 0 }, - { _("Meet Ninetales."), -1, 10, 0, 0 }, - { _("Rescue Alakazam."), 11, 12, 0, 0 }, - { _("Seek Rayquaza's help."), 14, 15, 0, 0 }, - { _("{COLOR YELLOW_C}Scenario Progress Dummy{RESET}"), -1, -1, 0, 0 }, - { _("Punish bad Mankey."), 16, 17, 0, 0 }, - { _("Rescue Smeargle."), -1, 33, 0, 0 }, - { _("Explore seafloor."), -1, -1, 0, 0 }, - { _("Meet sea guardian."), -1, -1, 0, 0 }, - { _("Check mystery Pokémon."), -1, -1, 0, 0 }, - { _("Meet Xatu."), -1, -1, 0, 0 }, - { _("Mirage Pokémon 1"), 20, 21, 0, 0 }, - { _("Mirage Pokémon 2"), 22, 23, 0, 0 }, - { _("Mirage Pokémon 3"), 24, 25, 0, 0 }, - { _("Mirage Pokémon 4"), -1, 26, 0, 0 }, - { _("Meet toughest Pokémon."), 18, 19, 0, 0 }, - { _("Catch thief."), 27, 28, 0, 0 }, - { _("Rescue Latias."), -1, -1, 0, 0 }, - { _("Investigate Relic."), -1, -1, 0, 0 }, - { _("Rescue Medicham."), -1, 32, 0, 0 }, - { _("Meet Ninetales."), -1, -1, 0, 0 }, - { _("Break Gardevoir's curse."), -1, -1, 0, 0 }, - { NULL, -1, -1, 0, 0 }, +static const MissionText sStoryMissionText[NUM_STORY_MISSIONS + 1] = { + [RESCUE_DUNGEON_TINY_WOODS] = { _("Rescue Caterpie."), CUTSCENE_FLAG_INVALID, CUTSCENE_FLAG_INVALID }, + [RESCUE_DUNGEON_THUNDERWAVE_CAVE] = { _("Rescue Magnemite."), CUTSCENE_FLAG_INVALID, CUTSCENE_FLAG_INVALID }, + [RESCUE_DUNGEON_MT_STEEL] = { _("Rescue Diglett."), CUTSCENE_FLAG_MT_STEEL_REACHED, CUTSCENE_FLAG_MT_STEEL_COMPLETE }, + [RESCUE_DUNGEON_SINISTER_WOODS] = { _("Rescue Metapod."), CUTSCENE_FLAG_SINISTER_WOODS_REACHED, CUTSCENE_FLAG_SINISTER_WOODS_COMPLETE }, + [RESCUE_DUNGEON_SILENT_CHASM] = { _("Rescue Jumpluff."), CUTSCENE_FLAG_INVALID, CUTSCENE_FLAG_INVALID }, + [RESCUE_DUNGEON_MT_THUNDER] = { _("Rescue Shiftry."), CUTSCENE_FLAG_MT_THUNDER_PEAK_REACHED, CUTSCENE_FLAG_MT_THUNDER_PEAK_COMPLETE }, + [RESCUE_DUNGEON_GREAT_CANYON] = { _("Meet Xatu."), CUTSCENE_FLAG_INVALID, CUTSCENE_FLAG_INVALID }, + [RESCUE_DUNGEON_LAPIS_CAVE] = { _("Fugitive"), CUTSCENE_FLAG_INVALID, CUTSCENE_FLAG_INVALID }, + [RESCUE_DUNGEON_MT_BLAZE] = { _("Fugitive"), CUTSCENE_FLAG_MT_BLAZE_PEAK_REACHED, CUTSCENE_FLAG_MT_BLAZE_PEAK_COMPLETE }, + [RESCUE_DUNGEON_FROSTY_FOREST] = { _("Fugitive"), CUTSCENE_FLAG_FROSTY_GROTTO_REACHED, CUTSCENE_FLAG_FROSTY_GROTTO_COMPLETE }, + [RESCUE_DUNGEON_MT_FREEZE] = { _("Meet Ninetales."), CUTSCENE_FLAG_INVALID, CUTSCENE_FLAG_MT_FREEZE_PEAK_COMPLETE }, + [RESCUE_DUNGEON_MAGMA_CAVERN] = { _("Rescue Alakazam."), CUTSCENE_FLAG_MAGMA_CAVERN_PIT_REACHED, CUTSCENE_FLAG_MAGMA_CAVERN_PIT_COMPLETE }, + [RESCUE_DUNGEON_SKY_TOWER] = { _("Seek Rayquaza's help."), CUTSCENE_FLAG_SKY_TOWER_SUMMIT_REACHED, CUTSCENE_FLAG_SKY_TOWER_SUMMIT_COMPLETE }, + [RESCUE_DUNGEON_DUMMY] = { _("{COLOR YELLOW_C}Scenario Progress Dummy{RESET}"), CUTSCENE_FLAG_INVALID, CUTSCENE_FLAG_INVALID }, + [RESCUE_DUNGEON_UPROAR_FOREST] = { _("Punish bad Mankey."), CUTSCENE_FLAG_UPROAR_FOREST_REACHED, CUTSCENE_FLAG_UPROAR_FOREST_COMPLETE }, + [RESCUE_DUNGEON_HOWLING_FOREST] = { _("Rescue Smeargle."), CUTSCENE_FLAG_INVALID, CUTSCENE_FLAG_HOWLING_FOREST_COMPLETE }, + [RESCUE_DUNGEON_STORMY_SEA] = { _("Explore seafloor."), CUTSCENE_FLAG_INVALID, CUTSCENE_FLAG_INVALID }, + [RESCUE_DUNGEON_SILVER_TRENCH] = { _("Meet sea guardian."), CUTSCENE_FLAG_INVALID, CUTSCENE_FLAG_INVALID }, + [RESCUE_DUNGEON_METEOR_CAVE] = { _("Check mystery Pokémon."), CUTSCENE_FLAG_INVALID, CUTSCENE_FLAG_INVALID }, + [RESCUE_DUNGEON_GREAT_CANYON_2] = { _("Meet Xatu."), CUTSCENE_FLAG_INVALID, CUTSCENE_FLAG_INVALID }, + [RESCUE_DUNGEON_FIERY_FIELD] = { _("Mirage Pokémon 1"), CUTSCENE_FLAG_FIERY_FIELD_REACHED, CUTSCENE_FLAG_FIERY_FIELD_COMPLETE }, + [RESCUE_DUNGEON_LIGHTNING_FIELD] = { _("Mirage Pokémon 2"), CUTSCENE_FLAG_LIGHTNING_FIELD_REACHED, CUTSCENE_FLAG_LIGHTNING_FIELD_COMPLETE }, + [RESCUE_DUNGEON_NORTHWIND_FIELD] = { _("Mirage Pokémon 3"), CUTSCENE_FLAG_NORTHWIND_FIELD_REACHED, CUTSCENE_FLAG_NORTHWIND_FIELD_COMPLETE }, + [RESCUE_DUNGEON_MT_FARAWAY] = { _("Mirage Pokémon 4"), CUTSCENE_FLAG_INVALID, CUTSCENE_FLAG_MT_FARAWAY_COMPLETE }, + [RESCUE_DUNGEON_WESTERN_CAVE] = { _("Meet toughest Pokémon."), CUTSCENE_FLAG_WESTERN_CAVE_REACHED, CUTSCENE_FLAG_WESTERN_CAVE_COMPLETE }, + [RESCUE_DUNGEON_NORTHERN_RANGE] = { _("Catch thief."), CUTSCENE_FLAG_NORTHERN_RANGE_REACHED, CUTSCENE_FLAG_NORTHERN_RANGE_COMPLETE }, + [RESCUE_DUNGEON_PITFALL_VALLEY] = { _("Rescue Latias."), CUTSCENE_FLAG_INVALID, CUTSCENE_FLAG_INVALID }, + [RESCUE_DUNGEON_BURIED_RELIC] = { _("Investigate Relic."), CUTSCENE_FLAG_INVALID, CUTSCENE_FLAG_INVALID }, + [RESCUE_DUNGEON_WISH_CAVE] = { _("Rescue Medicham."), CUTSCENE_FLAG_INVALID, CUTSCENE_FLAG_MEDICHAM_COMPLETE }, + [RESCUE_DUNGEON_MT_FREEZE_2] = { _("Meet Ninetales."), CUTSCENE_FLAG_INVALID, CUTSCENE_FLAG_INVALID }, + [RESCUE_DUNGEON_MURKY_CAVE] = { _("Break Gardevoir's curse."), CUTSCENE_FLAG_INVALID, CUTSCENE_FLAG_INVALID }, + [NUM_STORY_MISSIONS] = { NULL, CUTSCENE_FLAG_INVALID, CUTSCENE_FLAG_INVALID }, }; ALIGNED(4) const u8 gDummyScenarioText[] = _("{COLOR YELLOW_C}Scenario try dummy{RESET}"); @@ -70,67 +68,60 @@ bool8 sub_8097318(s16 param_1) { s32 param_1_s32 = param_1; - if (param_1_s32 == 0xd) + if (param_1_s32 == 13) return FALSE; - return GetScriptVarArrayValue(NULL,RESCUE_SCENARIO_ORDER_LIST, (u16) param_1_s32) != 0; + return GetScriptVarArrayValue(NULL, RESCUE_SCENARIO_ORDER_LIST, (u16)param_1_s32) != 0; } -void sub_809733C(s16 param_1, u32 param_2) +void sub_809733C(s32 _rescueDungId, bool32 param_2) { - s32 uVar2; - u8 param_2_u8; - u16 uVar2_u16; + s32 param_1_s32 = (s16)_rescueDungId; + bool8 param_2_u8 = (bool8)param_2; - uVar2 = param_1; - param_2_u8 = param_2; + if (param_1_s32 != RESCUE_DUNGEON_DUMMY) { - if (uVar2 != 0xd) { - uVar2_u16 = uVar2; - if (GetScriptVarArrayValue(NULL,RESCUE_SCENARIO_JOB_LIST, (u16) uVar2_u16) == 0) { - SetScriptVarArrayValue(NULL,RESCUE_SCENARIO_ORDER_LIST,uVar2_u16,param_2_u8); - if (param_2_u8) { - switch(uVar2) - { - case 0xE: - case 0xF: - case 0x1C: - GeneratePelipperJobs(); - break; + if (GetScriptVarArrayValue(NULL, RESCUE_SCENARIO_JOB_LIST, (u16)param_1_s32) == 0) { + SetScriptVarArrayValue(NULL, RESCUE_SCENARIO_ORDER_LIST, (u16)param_1_s32, param_2_u8); + + if (param_2_u8) { + switch (param_1_s32) { + case RESCUE_DUNGEON_UPROAR_FOREST: + case RESCUE_DUNGEON_HOWLING_FOREST: + case RESCUE_DUNGEON_WISH_CAVE: + GeneratePelipperJobs(); + break; + } + } } - } } - } } bool8 sub_8097384(s32 param_1) { - s32 param1 = (s16) param_1; + s32 param1 = (s16)param_1; - if (param1 == RESCUE_DUNGEON_DUMMY) { + if (param1 == RESCUE_DUNGEON_DUMMY) return FALSE; - } - else { - return (GetScriptVarArrayValue(NULL, RESCUE_SCENARIO_JOB_LIST, (u16) param1) != FALSE); - } + + return GetScriptVarArrayValue(NULL, RESCUE_SCENARIO_JOB_LIST, (u16)param1) != FALSE; } -void sub_80973A8(s32 param_1, u32 param_2) +void sub_80973A8(s32 _rescueDungId, bool32 param_2) { - s32 sVar1; - s32 param_1_s32 = (s16)param_1; - u8 param_2_u32 = param_2; + s32 rescueDungId = (s16)_rescueDungId; + bool8 param_2_u8 = (bool8)param_2; - if (param_1_s32 != 0xd) { - if (param_2_u32 != 0) { - sVar1 = RescueDungeonToScriptDungeonId(param_1); - SetScriptVarArrayValue(NULL,RESCUE_SCENARIO_ORDER_LIST,(u16)param_1_s32,0); - if (sVar1 != -1) { - SetScriptVarValue(NULL,DUNGEON_SELECT,sVar1); - } + if (rescueDungId != RESCUE_DUNGEON_DUMMY) { + if (param_2_u8) { + s32 scriptDungeon = RescueDungeonToScriptDungeonId(_rescueDungId); + SetScriptVarArrayValue(NULL, RESCUE_SCENARIO_ORDER_LIST, (u16)rescueDungId, 0); + if (scriptDungeon != SCRIPT_DUNGEON_INVALID) + SetScriptVarValue(NULL, DUNGEON_SELECT, scriptDungeon); + } + + SetScriptVarArrayValue(NULL, RESCUE_SCENARIO_JOB_LIST, (u16)rescueDungId, param_2_u8); } - SetScriptVarArrayValue(NULL,RESCUE_SCENARIO_JOB_LIST,(u16)param_1_s32,param_2_u32); - } } bool8 RescueScenarioConquered(s32 rescueDungeonID_) @@ -143,26 +134,33 @@ bool8 RescueScenarioConquered(s32 rescueDungeonID_) return (GetScriptVarArrayValue(NULL, RESCUE_SCENARIO_CONQUEST_LIST, (u16)rescueDungeonID) != FALSE); } -void sub_8097418(s32 index, bool32 param_2) +void SetRescueScenarioConquered(s32 rescueDungeonID_, bool32 conquered) { - int index_s32 = (s16)index; - bool8 param_2_u8 = param_2; - if (index_s32 != 0xd) { - if ((param_2_u8) && (SetScriptVarArrayValue(NULL,RESCUE_SCENARIO_JOB_LIST,(u16)index_s32,0), index_s32 < 0x1f)) { - const MissionText *mt = &sStoryMissionText[index_s32]; - if (mt->unk4 != 0xFF) { - sub_8097FA8(mt->unk4); - } - if (mt->unk5 != 0xFF) { - sub_8097FA8(mt->unk5); - } - if (index_s32 == 9) { - sub_8097FA8(0x1f); - } - sub_8097FF8(); + s32 rescueDungeonID_s32 = (s16)rescueDungeonID_; + bool8 param_2_u8 = (bool8)conquered; + + if (rescueDungeonID_s32 != RESCUE_DUNGEON_DUMMY) { + if (param_2_u8) { + SetScriptVarArrayValue(NULL, RESCUE_SCENARIO_JOB_LIST, (u16)rescueDungeonID_s32, 0); + + if (rescueDungeonID_s32 < NUM_STORY_MISSIONS) { + const MissionText *mt = &sStoryMissionText[rescueDungeonID_s32]; + + if (mt->cutsceneFlag1 != CUTSCENE_FLAG_INVALID) + SetTempCutsceneFlag(mt->cutsceneFlag1); + + if (mt->cutsceneFlag2 != CUTSCENE_FLAG_INVALID) + SetTempCutsceneFlag(mt->cutsceneFlag2); + + if (rescueDungeonID_s32 == RESCUE_DUNGEON_FROSTY_FOREST) + SetTempCutsceneFlag(CUTSCENE_FLAG_FROSTY_FOREST_INTRUDED); + + FlushTempCutsceneFlags(); + } + } + + SetScriptVarArrayValue(NULL, RESCUE_SCENARIO_CONQUEST_LIST, (u16)rescueDungeonID_s32, param_2_u8); } - SetScriptVarArrayValue(NULL,RESCUE_SCENARIO_CONQUEST_LIST,(u16)index_s32,param_2_u8); - } } // These two are literally the same @@ -186,15 +184,12 @@ const u8 *GetRescueDungeonName(s16 rescueDungeonId) } } -const u8 *GetCurrentMissionText(s16 index) +const u8 *GetCurrentMissionText(s16 rescueDungeonId) { - if(index < 0x1F) - { - const MissionText *mt = &sStoryMissionText[index]; + if (rescueDungeonId < NUM_STORY_MISSIONS) { + const MissionText *mt = &sStoryMissionText[rescueDungeonId]; return mt->text; } - else - { - return gBlankMission; - } + + return gBlankMission; } diff --git a/src/run_dungeon.c b/src/run_dungeon.c index f2b6dbd81..ebf8a4f6c 100644 --- a/src/run_dungeon.c +++ b/src/run_dungeon.c @@ -237,7 +237,7 @@ void RunDungeon_Async(DungeonSetupStruct *setupPtr) } while (TRUE) { - sub_8098080(); + ClearTempCutsceneFlags(); nullsub_16(); sub_80521D0(); ResetMessageLog(); @@ -270,7 +270,7 @@ void RunDungeon_Async(DungeonSetupStruct *setupPtr) gDungeon->unk2 = DUNGEON_UNK2_0; gDungeon->unk4 = 0; gDungeon->unk11 = 0; - gDungeon->unk8 = 0; + gDungeon->unk8 = FALSE; gDungeon->unk3 = 0; gDungeon->unk6 = 0; gDungeon->noActionInProgress = FALSE; @@ -494,7 +494,7 @@ void RunDungeon_Async(DungeonSetupStruct *setupPtr) DungeonFadeOutBGM(60); } - sub_803E708(4, 0x4F); + DungeonWaitFrames_Async(4, 0x4F); if (gDungeon->unk7 == 0) { sub_803E830(); } @@ -578,13 +578,11 @@ void RunDungeon_Async(DungeonSetupStruct *setupPtr) } if (gDungeon->unk644.dungeonLocation.floor + 1 < gDungeon->unk1CEC8) { gDungeon->unk644.dungeonLocation.floor++; - if (gDungeon->unk644.dungeonLocation.id == DUNGEON_FROSTY_FOREST - && gDungeon->unk644.dungeonLocation.floor == 6 - && !sub_8098100(0x1F)) + if (gDungeon->unk644.dungeonLocation.id == DUNGEON_FROSTY_FOREST && gDungeon->unk644.dungeonLocation.floor == 6 && !GetCutsceneFlag(CUTSCENE_FLAG_FROSTY_FOREST_INTRUDED)) { - sub_8097FA8(0x1F); - sub_8086130(); - sub_8097FF8(); + SetTempCutsceneFlag(CUTSCENE_FLAG_FROSTY_FOREST_INTRUDED); + FrostyForestIntrusionCutscene_Async(); + FlushTempCutsceneFlags(); } // We go back to the loop's start. continue; @@ -608,7 +606,7 @@ void RunDungeon_Async(DungeonSetupStruct *setupPtr) FAKEMATCH: gUnknown_203B40C = 0; setupPtr->info.unk7E = 0; - sub_8097FF8(); + FlushTempCutsceneFlags(); sub_80095CC(1, 0x14); sub_803E13C(); sub_800CDA8(4); diff --git a/src/save.c b/src/save.c index b3f541dff..22b3ca4cb 100644 --- a/src/save.c +++ b/src/save.c @@ -33,7 +33,7 @@ EWRAM_DATA s32 gUnknown_202DE28 = {0}; EWRAM_INIT u32 gUnknown_203B17C = {0}; EWRAM_INIT const char *gUnknown_203B180 = {"POKE_DUNGEON__05"}; -EWRAM_INIT struct UnkStruct_203B184 *gUnknown_203B184 = {NULL}; +EWRAM_INIT UnkStruct_203B184 *gUnknown_203B184 = { NULL }; ALIGNED(4) static const char fill_save0[] = _("pksdir0"); ALIGNED(4) static const char fill_save1[] = _("pksdir0"); @@ -473,23 +473,23 @@ UNUSED static void nullsub_200(u32 r0) { } -UNUSED static void sub_8012334(struct UnkStruct_203B184 *r0) +UNUSED static void sub_8012334(UnkStruct_203B184 *data) { - gUnknown_203B184 = r0; - if (r0 != NULL) { - gTeamInventoryRef = r0->MoneyItems; - gRecruitedPokemonRef = r0->recruitedPokemon; - gUnknown_203B480 = r0->unk8; - gUnknown_203B484 = r0->unkC; - gUnknown_203B488 = r0->unk10; - gUnknown_203B48C = r0->unk14; - gUnknown_203B490 = r0->mailInfo; - gRescueTeamInfoRef = r0->RescueTeamInfo; - gUnknown_203B494 = r0->unk20; - gUnknown_203B498 = r0->ExclusivePokemon; - gFriendAreas = r0->BoughtFriendAreas; - gGameOptionsRef = r0->gameOptions; - gPlayTimeRef = r0->playTime; + gUnknown_203B184 = data; + if (data != NULL) { + gTeamInventoryRef = data->MoneyItems; + gRecruitedPokemonRef = data->recruitedPokemon; + gUnknown_203B480 = data->unk8; + gUnknown_203B484 = data->unkC; + gUnknown_203B488 = data->unk10; + gUnknown_203B48C = data->unk14; + gUnknown_203B490 = data->mailInfo; + gRescueTeamInfoRef = data->RescueTeamInfo; + gUnknown_203B494 = data->unk20; + gExclusiveMonPtr = data->exclusivePokemon; + gFriendAreas = data->BoughtFriendAreas; + gGameOptionsRef = data->gameOptions; + gPlayTimeRef = data->playTime; } else { gTeamInventoryRef = GetMoneyItemsInfo(); @@ -501,7 +501,7 @@ UNUSED static void sub_8012334(struct UnkStruct_203B184 *r0) gUnknown_203B490 = GetMailInfo(); gRescueTeamInfoRef = GetRescueTeamInfo(); gUnknown_203B494 = sub_8097680(); - gUnknown_203B498 = GetExclusivePokemon(); + gExclusiveMonPtr = GetExclusivePokemon(); gFriendAreas = GetBoughtFriendAreas(); gGameOptionsRef = GetGameOptions(); gPlayTimeRef = GetPlayTime(); diff --git a/src/trap.c b/src/trap.c index 63ec5f590..b78eb0e6c 100644 --- a/src/trap.c +++ b/src/trap.c @@ -578,13 +578,13 @@ void HandlePitfallTrap(Entity *pokemon, Entity *target, Tile *tile) SetTrap(tile, 0x1B); flag = TRUE; sub_80421C0(target,0x193); - sub_803E708(0x1e,0x48); + DungeonWaitFrames_Async(0x1e,0x48); } if (info->isTeamLeader) { if (GetFloorType() != 2) { info->unk15C = 1; info->unk15E = 1; - sub_803E708(0x28,0x4b); + DungeonWaitFrames_Async(0x28,0x4b); DealDamageToEntity_Async(target,gPitfallTrapDmgValue,RESIDUAL_DAMAGE_PITFALL,DUNGEON_EXIT_FELL_INTO_PITFALL); gDungeon->unk2 = DUNGEON_UNK2_PITFALL_TRAP; return; @@ -835,7 +835,7 @@ void HandleTripTrap(Entity *pokemon, Entity *target) if (target != NULL) { sub_806CDD4(target, 6, NUM_DIRECTIONS); - sub_803E708(0x10, 0x55); + DungeonWaitFrames_Async(0x10, 0x55); sub_806CE68(target, NUM_DIRECTIONS); info = GetEntInfo(target); if ((info->heldItem).flags & ITEM_FLAG_EXISTS) { diff --git a/src/wigglytuff_shop2.c b/src/wigglytuff_shop2.c index baa6afc3a..5cc8eb295 100644 --- a/src/wigglytuff_shop2.c +++ b/src/wigglytuff_shop2.c @@ -156,7 +156,7 @@ static void sub_8021A60(void) } for (index = 0; index < MONSTER_MAX; index++) { - if (!sub_8098134(index)) + if (!GetMonSeenFlag(index)) continue; areaIndex = CheckSpeciesinWigglytuffFriendArea(index); diff --git a/src/wonder_mail_802D098.c b/src/wonder_mail_802D098.c index 1aa0f21ad..86ff1d888 100644 --- a/src/wonder_mail_802D098.c +++ b/src/wonder_mail_802D098.c @@ -227,16 +227,16 @@ static void sub_802D2A8(void) switch (sUnknown_203B2F8->mail->wonderMail.dungeonSeed.location.id) { case DUNGEON_ODDITY_CAVE: - sub_8097418(DUNGEON_ODDITY_CAVE - 1, 1); + SetRescueScenarioConquered(RESCUE_DUNGEON_ODDITY_CAVE, TRUE); break; case DUNGEON_REMAINS_ISLAND: - sub_8097418(DUNGEON_REMAINS_ISLAND - 1, 1); + SetRescueScenarioConquered(RESCUE_DUNGEON_REMAINS_ISLAND, TRUE); break; case DUNGEON_MARVELOUS_SEA: - sub_8097418(DUNGEON_MARVELOUS_SEA - 1, 1); + SetRescueScenarioConquered(RESCUE_DUNGEON_MARVELOUS_SEA, TRUE); break; case DUNGEON_FANTASY_STRAIT: - sub_8097418(DUNGEON_FANTASY_STRAIT - 1, 1); + SetRescueScenarioConquered(RESCUE_DUNGEON_FANTASY_STRAIT, TRUE); break; }