From 70cd67f962d6df75adb2e23c43944365e876a58d Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Tue, 10 Jul 2018 08:57:13 -0500 Subject: Move movement constants into include/constants/event_object_movement_constants.h --- .../constants/event_object_movement_constants.h | 221 +++++++++++++++++++++ include/event_object_movement.h | 221 --------------------- src/berry.c | 3 +- src/event_object_movement.c | 1 + src/field_effect.c | 1 + src/field_fadetransition.c | 3 +- src/field_player_avatar.c | 1 + src/field_specials.c | 9 +- src/rom6.c | 1 + src/trainer_see.c | 1 + 10 files changed, 235 insertions(+), 227 deletions(-) create mode 100755 include/constants/event_object_movement_constants.h diff --git a/include/constants/event_object_movement_constants.h b/include/constants/event_object_movement_constants.h new file mode 100755 index 000000000..81d2417a1 --- /dev/null +++ b/include/constants/event_object_movement_constants.h @@ -0,0 +1,221 @@ +#ifndef GUARD_CONSTANTS_EVENTOBJMV_H +#define GUARD_CONSTANTS_EVENTOBJMV_H + +#define MOVEMENT_TYPE_NONE 0x0 +#define MOVEMENT_TYPE_LOOK_AROUND 0x1 +#define MOVEMENT_TYPE_WANDER_AROUND 0x2 +#define MOVEMENT_TYPE_WANDER_UP_AND_DOWN 0x3 +#define MOVEMENT_TYPE_WANDER_DOWN_AND_UP 0x4 +#define MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT 0x5 +#define MOVEMENT_TYPE_WANDER_RIGHT_AND_LEFT 0x6 +#define MOVEMENT_TYPE_FACE_UP 0x7 +#define MOVEMENT_TYPE_FACE_DOWN 0x8 +#define MOVEMENT_TYPE_FACE_LEFT 0x9 +#define MOVEMENT_TYPE_FACE_RIGHT 0xA +#define MOVEMENT_TYPE_PLAYER 0xB +#define MOVEMENT_TYPE_BERRY_TREE_GROWTH 0xC +#define MOVEMENT_TYPE_FACE_DOWN_AND_UP 0xD +#define MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT 0xE +#define MOVEMENT_TYPE_FACE_UP_AND_LEFT 0xF +#define MOVEMENT_TYPE_FACE_UP_AND_RIGHT 0x10 +#define MOVEMENT_TYPE_FACE_DOWN_AND_LEFT 0x11 +#define MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT 0x12 +#define MOVEMENT_TYPE_FACE_DOWN_UP_AND_LEFT 0x13 +#define MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT 0x14 +#define MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT 0x15 +#define MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT 0x16 +#define MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE 0x17 +#define MOVEMENT_TYPE_ROTATE_CLOCKWISE 0x18 +#define MOVEMENT_TYPE_WALK_UP_AND_DOWN 0x19 +#define MOVEMENT_TYPE_WALK_DOWN_AND_UP 0x1A +#define MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT 0x1B +#define MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT 0x1C +#define MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_LEFT_DOWN 0x1D +#define MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_DOWN_UP 0x1E +#define MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_RIGHT_LEFT 0x1F +#define MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_UP_RIGHT 0x20 +#define MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_RIGHT_DOWN 0x21 +#define MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_DOWN_UP 0x22 +#define MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_LEFT_RIGHT 0x23 +#define MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_UP_LEFT 0x24 +#define MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_DOWN_RIGHT 0x25 +#define MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_RIGHT_LEFT 0x26 +#define MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_UP_DOWN 0x27 +#define MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_LEFT_UP 0x28 +#define MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_DOWN_LEFT 0x29 +#define MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_LEFT_RIGHT 0x2A +#define MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_UP_DOWN 0x2B +#define MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_RIGHT_UP 0x2C +#define MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT 0x2D +#define MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT 0x2E +#define MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_RIGHT_UP 0x2F +#define MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_LEFT_DOWN 0x30 +#define MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_DOWN_LEFT 0x31 +#define MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT 0x32 +#define MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN 0x33 +#define MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP 0x34 +#define MOVEMENT_TYPE_COPY_PLAYER 0x35 +#define MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE 0x36 +#define MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE 0x37 +#define MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE 0x38 +#define MOVEMENT_TYPE_TREE_DISGUISE 0x39 +#define MOVEMENT_TYPE_MOUNTAIN_DISGUISE 0x3A +#define MOVEMENT_TYPE_COPY_PLAYER_IN_GRASS 0x3B +#define MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS 0x3C +#define MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE_IN_GRASS 0x3D +#define MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE_IN_GRASS 0x3E +#define MOVEMENT_TYPE_HIDDEN 0x3F +#define MOVEMENT_TYPE_WALK_IN_PLACE_DOWN 0x40 +#define MOVEMENT_TYPE_WALK_IN_PLACE_UP 0x41 +#define MOVEMENT_TYPE_WALK_IN_PLACE_LEFT 0x42 +#define MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT 0x43 +#define MOVEMENT_TYPE_JOG_IN_PLACE_DOWN 0x44 +#define MOVEMENT_TYPE_JOG_IN_PLACE_UP 0x45 +#define MOVEMENT_TYPE_JOG_IN_PLACE_LEFT 0x46 +#define MOVEMENT_TYPE_JOG_IN_PLACE_RIGHT 0x47 +#define MOVEMENT_TYPE_RUN_IN_PLACE_DOWN 0x48 +#define MOVEMENT_TYPE_RUN_IN_PLACE_UP 0x49 +#define MOVEMENT_TYPE_RUN_IN_PLACE_LEFT 0x4A +#define MOVEMENT_TYPE_RUN_IN_PLACE_RIGHT 0x4B +#define MOVEMENT_TYPE_INVISIBLE 0x4C + +#define MOVEMENT_ACTION_FACE_DOWN 0x0 +#define MOVEMENT_ACTION_FACE_UP 0x1 +#define MOVEMENT_ACTION_FACE_LEFT 0x2 +#define MOVEMENT_ACTION_FACE_RIGHT 0x3 +#define MOVEMENT_ACTION_WALK_SLOW_DOWN 0x4 +#define MOVEMENT_ACTION_WALK_SLOW_UP 0x5 +#define MOVEMENT_ACTION_WALK_SLOW_LEFT 0x6 +#define MOVEMENT_ACTION_WALK_SLOW_RIGHT 0x7 +#define MOVEMENT_ACTION_WALK_NORMAL_DOWN 0x8 +#define MOVEMENT_ACTION_WALK_NORMAL_UP 0x9 +#define MOVEMENT_ACTION_WALK_NORMAL_LEFT 0xA +#define MOVEMENT_ACTION_WALK_NORMAL_RIGHT 0xB +#define MOVEMENT_ACTION_JUMP_2_DOWN 0xC +#define MOVEMENT_ACTION_JUMP_2_UP 0xD +#define MOVEMENT_ACTION_JUMP_2_LEFT 0xE +#define MOVEMENT_ACTION_JUMP_2_RIGHT 0xF +#define MOVEMENT_ACTION_DELAY_1 0x10 +#define MOVEMENT_ACTION_DELAY_2 0x11 +#define MOVEMENT_ACTION_DELAY_4 0x12 +#define MOVEMENT_ACTION_DELAY_8 0x13 +#define MOVEMENT_ACTION_DELAY_16 0x14 +#define MOVEMENT_ACTION_WALK_FAST_DOWN 0x15 +#define MOVEMENT_ACTION_WALK_FAST_UP 0x16 +#define MOVEMENT_ACTION_WALK_FAST_LEFT 0x17 +#define MOVEMENT_ACTION_WALK_FAST_RIGHT 0x18 +#define MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_DOWN 0x19 +#define MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_UP 0x1A +#define MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_LEFT 0x1B +#define MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_RIGHT 0x1C +#define MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_DOWN 0x1D +#define MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_UP 0x1E +#define MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_LEFT 0x1F +#define MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_RIGHT 0x20 +#define MOVEMENT_ACTION_WALK_IN_PLACE_FAST_DOWN 0x21 +#define MOVEMENT_ACTION_WALK_IN_PLACE_FAST_UP 0x22 +#define MOVEMENT_ACTION_WALK_IN_PLACE_FAST_LEFT 0x23 +#define MOVEMENT_ACTION_WALK_IN_PLACE_FAST_RIGHT 0x24 +#define MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_DOWN 0x25 +#define MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_UP 0x26 +#define MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_LEFT 0x27 +#define MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_RIGHT 0x28 +#define MOVEMENT_ACTION_RIDE_WATER_CURRENT_DOWN 0x29 +#define MOVEMENT_ACTION_RIDE_WATER_CURRENT_UP 0x2A +#define MOVEMENT_ACTION_RIDE_WATER_CURRENT_LEFT 0x2B +#define MOVEMENT_ACTION_RIDE_WATER_CURRENT_RIGHT 0x2C +#define MOVEMENT_ACTION_WALK_FASTEST_DOWN 0x2D +#define MOVEMENT_ACTION_WALK_FASTEST_UP 0x2E +#define MOVEMENT_ACTION_WALK_FASTEST_LEFT 0x2F +#define MOVEMENT_ACTION_WALK_FASTEST_RIGHT 0x30 +#define MOVEMENT_ACTION_SLIDE_DOWN 0x31 +#define MOVEMENT_ACTION_SLIDE_UP 0x32 +#define MOVEMENT_ACTION_SLIDE_LEFT 0x33 +#define MOVEMENT_ACTION_SLIDE_RIGHT 0x34 +#define MOVEMENT_ACTION_PLAYER_RUN_DOWN 0x35 +#define MOVEMENT_ACTION_PLAYER_RUN_UP 0x36 +#define MOVEMENT_ACTION_PLAYER_RUN_LEFT 0x37 +#define MOVEMENT_ACTION_PLAYER_RUN_RIGHT 0x38 +#define MOVEMENT_ACTION_START_ANIM_IN_DIRECTION 0x39 +#define MOVEMENT_ACTION_JUMP_SPECIAL_DOWN 0x3A +#define MOVEMENT_ACTION_JUMP_SPECIAL_UP 0x3B +#define MOVEMENT_ACTION_JUMP_SPECIAL_LEFT 0x3C +#define MOVEMENT_ACTION_JUMP_SPECIAL_RIGHT 0x3D +#define MOVEMENT_ACTION_FACE_PLAYER 0x3E +#define MOVEMENT_ACTION_FACE_AWAY_PLAYER 0x3F +#define MOVEMENT_ACTION_LOCK_FACING_DIRECTION 0x40 +#define MOVEMENT_ACTION_UNLOCK_FACING_DIRECTION 0x41 +#define MOVEMENT_ACTION_JUMP_DOWN 0x42 +#define MOVEMENT_ACTION_JUMP_UP 0x43 +#define MOVEMENT_ACTION_JUMP_LEFT 0x44 +#define MOVEMENT_ACTION_JUMP_RIGHT 0x45 +#define MOVEMENT_ACTION_JUMP_IN_PLACE_DOWN 0x46 +#define MOVEMENT_ACTION_JUMP_IN_PLACE_UP 0x47 +#define MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT 0x48 +#define MOVEMENT_ACTION_JUMP_IN_PLACE_RIGHT 0x49 +#define MOVEMENT_ACTION_JUMP_IN_PLACE_DOWN_UP 0x4A +#define MOVEMENT_ACTION_JUMP_IN_PLACE_UP_DOWN 0x4B +#define MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT_RIGHT 0x4C +#define MOVEMENT_ACTION_JUMP_IN_PLACE_RIGHT_LEFT 0x4D +#define MOVEMENT_ACTION_FACE_ORIGINAL_DIRECTION 0x4E +#define MOVEMENT_ACTION_NURSE_JOY_BOW_DOWN 0x4F +#define MOVEMENT_ACTION_ENABLE_JUMP_LANDING_GROUND_EFFECT 0x50 +#define MOVEMENT_ACTION_DISABLE_JUMP_LANDING_GROUND_EFFECT 0x51 +#define MOVEMENT_ACTION_DISABLE_ANIMATION 0x52 +#define MOVEMENT_ACTION_RESTORE_ANIMATION 0x53 +#define MOVEMENT_ACTION_SET_INVISIBLE 0x54 +#define MOVEMENT_ACTION_SET_VISIBLE 0x55 +#define MOVEMENT_ACTION_EMOTE_EXCLAMATION_MARK 0x56 +#define MOVEMENT_ACTION_EMOTE_QUESTION_MARK 0x57 +#define MOVEMENT_ACTION_EMOTE_HEART 0x58 +#define MOVEMENT_ACTION_REVEAL_TRAINER 0x59 +#define MOVEMENT_ACTION_ROCK_SMASH_BREAK 0x5A +#define MOVEMENT_ACTION_CUT_TREE 0x5B +#define MOVEMENT_ACTION_SET_FIXED_PRIORITY 0x5C +#define MOVEMENT_ACTION_CLEAR_FIXED_PRIORITY 0x5D +#define MOVEMENT_ACTION_INIT_AFFINE_ANIM 0x5E +#define MOVEMENT_ACTION_CLEAR_AFFINE_ANIM 0x5F +#define MOVEMENT_ACTION_WALK_DOWN_START_AFFINE 0x60 +#define MOVEMENT_ACTION_WALK_DOWN_AFFINE_1 0x61 +#define MOVEMENT_ACTION_ACRO_WHEELIE_FACE_DOWN 0x62 +#define MOVEMENT_ACTION_ACRO_WHEELIE_FACE_UP 0x63 +#define MOVEMENT_ACTION_ACRO_WHEELIE_FACE_LEFT 0x64 +#define MOVEMENT_ACTION_ACRO_WHEELIE_FACE_RIGHT 0x65 +#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_DOWN 0x66 +#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_UP 0x67 +#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_LEFT 0x68 +#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_RIGHT 0x69 +#define MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_DOWN 0x6A +#define MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_UP 0x6B +#define MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_LEFT 0x6C +#define MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_RIGHT 0x6D +#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_DOWN 0x6E +#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_UP 0x6F +#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_LEFT 0x70 +#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_RIGHT 0x71 +#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_DOWN 0x72 +#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_UP 0x73 +#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_LEFT 0x74 +#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_RIGHT 0x75 +#define MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_DOWN 0x76 +#define MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_UP 0x77 +#define MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_LEFT 0x78 +#define MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_RIGHT 0x79 +#define MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_DOWN 0x7A +#define MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_UP 0x7B +#define MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_LEFT 0x7C +#define MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_RIGHT 0x7D +#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_DOWN 0x7E +#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_UP 0x7F +#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_LEFT 0x80 +#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_RIGHT 0x81 +#define MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_DOWN 0x82 +#define MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_UP 0x83 +#define MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_LEFT 0x84 +#define MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_RIGHT 0x85 +#define MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_DOWN 0x86 +#define MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_UP 0x87 +#define MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_LEFT 0x88 +#define MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_RIGHT 0x89 + +#endif // GUARD_CONSTANTS_EVENTOBJMV_H diff --git a/include/event_object_movement.h b/include/event_object_movement.h index e1e7529ca..ece46fce0 100644 --- a/include/event_object_movement.h +++ b/include/event_object_movement.h @@ -3,227 +3,6 @@ #include "sprite.h" -enum { - MOVEMENT_TYPE_NONE, - MOVEMENT_TYPE_LOOK_AROUND, - MOVEMENT_TYPE_WANDER_AROUND, - MOVEMENT_TYPE_WANDER_UP_AND_DOWN, - MOVEMENT_TYPE_WANDER_DOWN_AND_UP, - MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, - MOVEMENT_TYPE_WANDER_RIGHT_AND_LEFT, - MOVEMENT_TYPE_FACE_UP, - MOVEMENT_TYPE_FACE_DOWN, - MOVEMENT_TYPE_FACE_LEFT, - MOVEMENT_TYPE_FACE_RIGHT, - MOVEMENT_TYPE_PLAYER, - MOVEMENT_TYPE_BERRY_TREE_GROWTH, - MOVEMENT_TYPE_FACE_DOWN_AND_UP, - MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, - MOVEMENT_TYPE_FACE_UP_AND_LEFT, - MOVEMENT_TYPE_FACE_UP_AND_RIGHT, - MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, - MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, - MOVEMENT_TYPE_FACE_DOWN_UP_AND_LEFT, - MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT, - MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT, - MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT, - MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, - MOVEMENT_TYPE_ROTATE_CLOCKWISE, - MOVEMENT_TYPE_WALK_UP_AND_DOWN, - MOVEMENT_TYPE_WALK_DOWN_AND_UP, - MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT, - MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, - MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_LEFT_DOWN, - MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_DOWN_UP, - MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_RIGHT_LEFT, - MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_UP_RIGHT, - MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_RIGHT_DOWN, - MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_DOWN_UP, - MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_LEFT_RIGHT, - MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_UP_LEFT, - MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_DOWN_RIGHT, - MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_RIGHT_LEFT, - MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_UP_DOWN, - MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_LEFT_UP, - MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_DOWN_LEFT, - MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_LEFT_RIGHT, - MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_UP_DOWN, - MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_RIGHT_UP, - MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT, - MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT, - MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_RIGHT_UP, - MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_LEFT_DOWN, - MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_DOWN_LEFT, - MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT, - MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN, - MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP, - MOVEMENT_TYPE_COPY_PLAYER, - MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE, - MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE, - MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE, - MOVEMENT_TYPE_TREE_DISGUISE, - MOVEMENT_TYPE_MOUNTAIN_DISGUISE, - MOVEMENT_TYPE_COPY_PLAYER_IN_GRASS, - MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS, - MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE_IN_GRASS, - MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE_IN_GRASS, - MOVEMENT_TYPE_HIDDEN, - MOVEMENT_TYPE_WALK_IN_PLACE_DOWN, - MOVEMENT_TYPE_WALK_IN_PLACE_UP, - MOVEMENT_TYPE_WALK_IN_PLACE_LEFT, - MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT, - MOVEMENT_TYPE_JOG_IN_PLACE_DOWN, - MOVEMENT_TYPE_JOG_IN_PLACE_UP, - MOVEMENT_TYPE_JOG_IN_PLACE_LEFT, - MOVEMENT_TYPE_JOG_IN_PLACE_RIGHT, - MOVEMENT_TYPE_RUN_IN_PLACE_DOWN, - MOVEMENT_TYPE_RUN_IN_PLACE_UP, - MOVEMENT_TYPE_RUN_IN_PLACE_LEFT, - MOVEMENT_TYPE_RUN_IN_PLACE_RIGHT, - MOVEMENT_TYPE_INVISIBLE, -}; - -enum { - MOVEMENT_ACTION_FACE_DOWN, - MOVEMENT_ACTION_FACE_UP, - MOVEMENT_ACTION_FACE_LEFT, - MOVEMENT_ACTION_FACE_RIGHT, - MOVEMENT_ACTION_WALK_SLOW_DOWN, - MOVEMENT_ACTION_WALK_SLOW_UP, - MOVEMENT_ACTION_WALK_SLOW_LEFT, - MOVEMENT_ACTION_WALK_SLOW_RIGHT, - MOVEMENT_ACTION_WALK_NORMAL_DOWN, - MOVEMENT_ACTION_WALK_NORMAL_UP, - MOVEMENT_ACTION_WALK_NORMAL_LEFT, - MOVEMENT_ACTION_WALK_NORMAL_RIGHT, - MOVEMENT_ACTION_JUMP_2_DOWN, - MOVEMENT_ACTION_JUMP_2_UP, - MOVEMENT_ACTION_JUMP_2_LEFT, - MOVEMENT_ACTION_JUMP_2_RIGHT, - MOVEMENT_ACTION_DELAY_1, - MOVEMENT_ACTION_DELAY_2, - MOVEMENT_ACTION_DELAY_4, - MOVEMENT_ACTION_DELAY_8, - MOVEMENT_ACTION_DELAY_16, - MOVEMENT_ACTION_WALK_FAST_DOWN, - MOVEMENT_ACTION_WALK_FAST_UP, - MOVEMENT_ACTION_WALK_FAST_LEFT, - MOVEMENT_ACTION_WALK_FAST_RIGHT, - MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_DOWN, - MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_UP, - MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_LEFT, - MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_RIGHT, - MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_DOWN, - MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_UP, - MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_LEFT, - MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_RIGHT, - MOVEMENT_ACTION_WALK_IN_PLACE_FAST_DOWN, - MOVEMENT_ACTION_WALK_IN_PLACE_FAST_UP, - MOVEMENT_ACTION_WALK_IN_PLACE_FAST_LEFT, - MOVEMENT_ACTION_WALK_IN_PLACE_FAST_RIGHT, - MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_DOWN, - MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_UP, - MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_LEFT, - MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_RIGHT, - MOVEMENT_ACTION_RIDE_WATER_CURRENT_DOWN, - MOVEMENT_ACTION_RIDE_WATER_CURRENT_UP, - MOVEMENT_ACTION_RIDE_WATER_CURRENT_LEFT, - MOVEMENT_ACTION_RIDE_WATER_CURRENT_RIGHT, - MOVEMENT_ACTION_WALK_FASTEST_DOWN, - MOVEMENT_ACTION_WALK_FASTEST_UP, - MOVEMENT_ACTION_WALK_FASTEST_LEFT, - MOVEMENT_ACTION_WALK_FASTEST_RIGHT, - MOVEMENT_ACTION_SLIDE_DOWN, - MOVEMENT_ACTION_SLIDE_UP, - MOVEMENT_ACTION_SLIDE_LEFT, - MOVEMENT_ACTION_SLIDE_RIGHT, - MOVEMENT_ACTION_PLAYER_RUN_DOWN, - MOVEMENT_ACTION_PLAYER_RUN_UP, - MOVEMENT_ACTION_PLAYER_RUN_LEFT, - MOVEMENT_ACTION_PLAYER_RUN_RIGHT, - MOVEMENT_ACTION_START_ANIM_IN_DIRECTION, - MOVEMENT_ACTION_JUMP_SPECIAL_DOWN, - MOVEMENT_ACTION_JUMP_SPECIAL_UP, - MOVEMENT_ACTION_JUMP_SPECIAL_LEFT , - MOVEMENT_ACTION_JUMP_SPECIAL_RIGHT, - MOVEMENT_ACTION_FACE_PLAYER, - MOVEMENT_ACTION_FACE_AWAY_PLAYER, - MOVEMENT_ACTION_LOCK_FACING_DIRECTION, - MOVEMENT_ACTION_UNLOCK_FACING_DIRECTION, - MOVEMENT_ACTION_JUMP_DOWN, - MOVEMENT_ACTION_JUMP_UP, - MOVEMENT_ACTION_JUMP_LEFT, - MOVEMENT_ACTION_JUMP_RIGHT, - MOVEMENT_ACTION_JUMP_IN_PLACE_DOWN, - MOVEMENT_ACTION_JUMP_IN_PLACE_UP, - MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT, - MOVEMENT_ACTION_JUMP_IN_PLACE_RIGHT, - MOVEMENT_ACTION_JUMP_IN_PLACE_DOWN_UP, - MOVEMENT_ACTION_JUMP_IN_PLACE_UP_DOWN, - MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT_RIGHT, - MOVEMENT_ACTION_JUMP_IN_PLACE_RIGHT_LEFT, - MOVEMENT_ACTION_FACE_ORIGINAL_DIRECTION, - MOVEMENT_ACTION_NURSE_JOY_BOW_DOWN, - MOVEMENT_ACTION_ENABLE_JUMP_LANDING_GROUND_EFFECT, - MOVEMENT_ACTION_DISABLE_JUMP_LANDING_GROUND_EFFECT, - MOVEMENT_ACTION_DISABLE_ANIMATION, - MOVEMENT_ACTION_RESTORE_ANIMATION, - MOVEMENT_ACTION_SET_INVISIBLE, - MOVEMENT_ACTION_SET_VISIBLE, - MOVEMENT_ACTION_EMOTE_EXCLAMATION_MARK, - MOVEMENT_ACTION_EMOTE_QUESTION_MARK, - MOVEMENT_ACTION_EMOTE_HEART, - MOVEMENT_ACTION_REVEAL_TRAINER, - MOVEMENT_ACTION_ROCK_SMASH_BREAK, - MOVEMENT_ACTION_CUT_TREE, - MOVEMENT_ACTION_SET_FIXED_PRIORITY, - MOVEMENT_ACTION_CLEAR_FIXED_PRIORITY, - MOVEMENT_ACTION_INIT_AFFINE_ANIM, - MOVEMENT_ACTION_CLEAR_AFFINE_ANIM, - MOVEMENT_ACTION_WALK_DOWN_START_AFFINE, - MOVEMENT_ACTION_WALK_DOWN_AFFINE_1, - MOVEMENT_ACTION_ACRO_WHEELIE_FACE_DOWN, - MOVEMENT_ACTION_ACRO_WHEELIE_FACE_UP, - MOVEMENT_ACTION_ACRO_WHEELIE_FACE_LEFT, - MOVEMENT_ACTION_ACRO_WHEELIE_FACE_RIGHT, - MOVEMENT_ACTION_ACRO_POP_WHEELIE_DOWN, - MOVEMENT_ACTION_ACRO_POP_WHEELIE_UP, - MOVEMENT_ACTION_ACRO_POP_WHEELIE_LEFT, - MOVEMENT_ACTION_ACRO_POP_WHEELIE_RIGHT, - MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_DOWN, - MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_UP, - MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_LEFT, - MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_RIGHT, - MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_DOWN, - MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_UP, - MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_LEFT, - MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_RIGHT, - MOVEMENT_ACTION_ACRO_WHEELIE_HOP_DOWN, - MOVEMENT_ACTION_ACRO_WHEELIE_HOP_UP, - MOVEMENT_ACTION_ACRO_WHEELIE_HOP_LEFT, - MOVEMENT_ACTION_ACRO_WHEELIE_HOP_RIGHT, - MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_DOWN, - MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_UP, - MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_LEFT, - MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_RIGHT, - MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_DOWN, - MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_UP, - MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_LEFT, - MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_RIGHT, - MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_DOWN, - MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_UP, - MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_LEFT, - MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_RIGHT, - MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_DOWN, - MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_UP, - MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_LEFT, - MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_RIGHT, - MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_DOWN, - MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_UP, - MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_LEFT, - MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_RIGHT, -}; - #define GROUND_EFFECT_FLAG_TALL_GRASS_ON_SPAWN (1 << 0) #define GROUND_EFFECT_FLAG_TALL_GRASS_ON_MOVE (1 << 1) #define GROUND_EFFECT_FLAG_LONG_GRASS_ON_SPAWN (1 << 2) diff --git a/src/berry.c b/src/berry.c index 323cb39cf..6e7d4592c 100644 --- a/src/berry.c +++ b/src/berry.c @@ -1,5 +1,4 @@ #include "global.h" -#include "constants/items.h" #include "berry.h" #include "field_control_avatar.h" #include "event_object_movement.h" @@ -12,6 +11,8 @@ #include "random.h" #include "task.h" #include "text.h" +#include "constants/event_object_movement_constants.h" +#include "constants/items.h" #ifdef ENGLISH #define NAME_CHERI_BERRY _("CHERI") diff --git a/src/event_object_movement.c b/src/event_object_movement.c index 5d498c1ff..c8685bb49 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -15,6 +15,7 @@ #include "trainer_see.h" #include "constants/field_effects.h" #include "constants/maps.h" +#include "constants/event_object_movement_constants.h" #include "constants/event_objects.h" // this file was known as evobjmv.c in Game Freak's original source diff --git a/src/field_effect.c b/src/field_effect.c index 90c11b8c3..cc5f9252a 100644 --- a/src/field_effect.c +++ b/src/field_effect.c @@ -24,6 +24,7 @@ #include "fieldmap.h" #include "util.h" #include "pokemon_storage_system.h" +#include "constants/event_object_movement_constants.h" #include "constants/field_effects.h" #include "constants/songs.h" diff --git a/src/field_fadetransition.c b/src/field_fadetransition.c index c52dc98c6..670d8c54b 100644 --- a/src/field_fadetransition.c +++ b/src/field_fadetransition.c @@ -16,10 +16,11 @@ #include "palette.h" #include "overworld.h" #include "script.h" -#include "constants/songs.h" #include "sound.h" #include "start_menu.h" #include "task.h" +#include "constants/event_object_movement_constants.h" +#include "constants/songs.h" void sub_8080B9C(u8); void task_map_chg_seq_0807E20C(u8); diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c index 9a4f5f6cd..47f43858b 100644 --- a/src/field_player_avatar.c +++ b/src/field_player_avatar.c @@ -22,6 +22,7 @@ #include "tv.h" #include "wild_encounter.h" #include "constants/field_effects.h" +#include "constants/event_object_movement_constants.h" #include "constants/event_objects.h" EWRAM_DATA struct PlayerAvatar gPlayerAvatar = {0}; diff --git a/src/field_specials.c b/src/field_specials.c index e8c83b376..043945a2f 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -18,10 +18,6 @@ #include "string_util.h" #include "strings.h" #include "pokeblock.h" -#include "constants/species.h" -#include "constants/abilities.h" -#include "constants/moves.h" -#include "constants/weather.h" #include "text.h" #include "wallclock.h" #include "tv.h" @@ -36,6 +32,11 @@ #include "field_weather.h" #include "pokemon_summary_screen.h" #include "random.h" +#include "constants/abilities.h" +#include "constants/event_object_movement_constants.h" +#include "constants/moves.h" +#include "constants/species.h" +#include "constants/weather.h" #if ENGLISH #define CHAR_DECIMAL_SEPARATOR CHAR_PERIOD diff --git a/src/rom6.c b/src/rom6.c index be14f1731..556a81293 100644 --- a/src/rom6.c +++ b/src/rom6.c @@ -13,6 +13,7 @@ #include "sound.h" #include "sprite.h" #include "task.h" +#include "constants/event_object_movement_constants.h" #include "constants/field_effects.h" extern u16 gSpecialVar_LastTalked; diff --git a/src/trainer_see.c b/src/trainer_see.c index dfbab1e3a..ee4cb6e0f 100644 --- a/src/trainer_see.c +++ b/src/trainer_see.c @@ -8,6 +8,7 @@ #include "sprite.h" #include "task.h" #include "util.h" +#include "constants/event_object_movement_constants.h" #include "constants/field_effects.h" static bool8 CheckTrainer(u8); -- cgit v1.2.3 From f96749deb674a2ae784708ee95c778585330b6ce Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Tue, 10 Jul 2018 09:17:29 -0500 Subject: Use movement constants in object_event macros --- data/map_events.s | 1 + data/maps/AbandonedShip_CaptainsOffice/events.inc | 4 +- data/maps/AbandonedShip_Corridors_1F/events.inc | 4 +- data/maps/AbandonedShip_Corridors_B1F/events.inc | 4 +- .../maps/AbandonedShip_HiddenFloorRooms/events.inc | 8 +-- data/maps/AbandonedShip_Room_B1F/events.inc | 2 +- data/maps/AbandonedShip_Rooms2_1F/events.inc | 6 +- data/maps/AbandonedShip_Rooms2_B1F/events.inc | 4 +- data/maps/AbandonedShip_Rooms_1F/events.inc | 4 +- data/maps/AbandonedShip_Rooms_B1F/events.inc | 4 +- data/maps/AncientTomb/events.inc | 2 +- data/maps/AquaHideout_1F/events.inc | 6 +- data/maps/AquaHideout_B1F/events.inc | 16 ++--- data/maps/AquaHideout_B2F/events.inc | 10 +-- data/maps/BattleTower_BattleRoom/events.inc | 4 +- data/maps/BattleTower_Corridor/events.inc | 2 +- data/maps/BattleTower_Elevator/events.inc | 2 +- data/maps/BattleTower_Lobby/events.inc | 12 ++-- data/maps/BattleTower_Outside/events.inc | 10 +-- data/maps/CaveOfOrigin_B3F/events.inc | 2 +- data/maps/CaveOfOrigin_B4F/events.inc | 2 +- data/maps/DesertRuins/events.inc | 2 +- data/maps/DewfordTown/events.inc | 10 +-- data/maps/DewfordTown_Gym/events.inc | 10 +-- data/maps/DewfordTown_Hall/events.inc | 18 ++--- data/maps/DewfordTown_House1/events.inc | 6 +- data/maps/DewfordTown_House2/events.inc | 4 +- data/maps/DewfordTown_PokemonCenter_1F/events.inc | 6 +- data/maps/DewfordTown_PokemonCenter_2F/events.inc | 6 +- data/maps/EverGrandeCity_ChampionsRoom/events.inc | 6 +- data/maps/EverGrandeCity_DrakesRoom/events.inc | 2 +- data/maps/EverGrandeCity_GlaciasRoom/events.inc | 2 +- data/maps/EverGrandeCity_HallOfFame/events.inc | 2 +- data/maps/EverGrandeCity_PhoebesRoom/events.inc | 2 +- .../EverGrandeCity_PokemonCenter_1F/events.inc | 6 +- .../EverGrandeCity_PokemonCenter_2F/events.inc | 6 +- data/maps/EverGrandeCity_PokemonLeague/events.inc | 8 +-- data/maps/EverGrandeCity_SidneysRoom/events.inc | 2 +- data/maps/FallarborTown/events.inc | 8 +-- data/maps/FallarborTown_ContestHall/events.inc | 6 +- data/maps/FallarborTown_ContestLobby/events.inc | 12 ++-- data/maps/FallarborTown_House1/events.inc | 4 +- data/maps/FallarborTown_House2/events.inc | 2 +- data/maps/FallarborTown_Mart/events.inc | 8 +-- .../maps/FallarborTown_PokemonCenter_1F/events.inc | 8 +-- .../maps/FallarborTown_PokemonCenter_2F/events.inc | 6 +- data/maps/FieryPath/events.inc | 16 ++--- data/maps/FortreeCity/events.inc | 14 ++-- data/maps/FortreeCity_DecorationShop/events.inc | 8 +-- data/maps/FortreeCity_Gym/events.inc | 12 ++-- data/maps/FortreeCity_House1/events.inc | 6 +- data/maps/FortreeCity_House2/events.inc | 2 +- data/maps/FortreeCity_House3/events.inc | 4 +- data/maps/FortreeCity_House4/events.inc | 6 +- data/maps/FortreeCity_House5/events.inc | 6 +- data/maps/FortreeCity_Mart/events.inc | 8 +-- data/maps/FortreeCity_PokemonCenter_1F/events.inc | 8 +-- data/maps/FortreeCity_PokemonCenter_2F/events.inc | 6 +- data/maps/GraniteCave_1F/events.inc | 4 +- data/maps/GraniteCave_B1F/events.inc | 2 +- data/maps/GraniteCave_B2F/events.inc | 18 ++--- data/maps/GraniteCave_StevensRoom/events.inc | 2 +- data/maps/InsideOfTruck/events.inc | 6 +- data/maps/IslandCave/events.inc | 2 +- data/maps/JaggedPass/events.inc | 8 +-- data/maps/LavaridgeTown/events.inc | 18 ++--- data/maps/LavaridgeTown_Gym_1F/events.inc | 14 ++-- data/maps/LavaridgeTown_HerbShop/events.inc | 6 +- data/maps/LavaridgeTown_House/events.inc | 4 +- data/maps/LavaridgeTown_Mart/events.inc | 6 +- .../maps/LavaridgeTown_PokemonCenter_1F/events.inc | 8 +-- .../maps/LavaridgeTown_PokemonCenter_2F/events.inc | 6 +- data/maps/LilycoveCity/events.inc | 34 ++++----- data/maps/LilycoveCity_ContestHall/events.inc | 64 ++++++++--------- data/maps/LilycoveCity_ContestLobby/events.inc | 28 ++++---- data/maps/LilycoveCity_CoveLilyMotel_1F/events.inc | 2 +- data/maps/LilycoveCity_CoveLilyMotel_2F/events.inc | 12 ++-- .../events.inc | 2 +- .../LilycoveCity_DepartmentStoreRooftop/events.inc | 6 +- .../LilycoveCity_DepartmentStore_1F/events.inc | 12 ++-- .../LilycoveCity_DepartmentStore_2F/events.inc | 10 +-- .../LilycoveCity_DepartmentStore_3F/events.inc | 10 +-- .../LilycoveCity_DepartmentStore_4F/events.inc | 10 +-- .../LilycoveCity_DepartmentStore_5F/events.inc | 14 ++-- data/maps/LilycoveCity_Harbor/events.inc | 8 +-- data/maps/LilycoveCity_House1/events.inc | 4 +- data/maps/LilycoveCity_House2/events.inc | 2 +- data/maps/LilycoveCity_House3/events.inc | 12 ++-- data/maps/LilycoveCity_House4/events.inc | 4 +- .../maps/LilycoveCity_LilycoveMuseum_1F/events.inc | 20 +++--- .../maps/LilycoveCity_LilycoveMuseum_2F/events.inc | 8 +-- .../maps/LilycoveCity_MoveDeletersHouse/events.inc | 2 +- data/maps/LilycoveCity_PokemonCenter_1F/events.inc | 6 +- data/maps/LilycoveCity_PokemonCenter_2F/events.inc | 6 +- .../LilycoveCity_PokemonTrainerFanClub/events.inc | 16 ++--- data/maps/LinkContestRoom1/events.inc | 30 ++++---- data/maps/LittlerootTown/events.inc | 12 ++-- .../LittlerootTown_BrendansHouse_1F/events.inc | 10 +-- .../LittlerootTown_BrendansHouse_2F/events.inc | 28 ++++---- data/maps/LittlerootTown_MaysHouse_1F/events.inc | 10 +-- data/maps/LittlerootTown_MaysHouse_2F/events.inc | 30 ++++---- .../LittlerootTown_ProfessorBirchsLab/events.inc | 6 +- data/maps/MagmaHideout_1F/events.inc | 6 +- data/maps/MagmaHideout_B1F/events.inc | 16 ++--- data/maps/MagmaHideout_B2F/events.inc | 10 +-- data/maps/MauvilleCity/events.inc | 18 ++--- data/maps/MauvilleCity_BikeShop/events.inc | 4 +- data/maps/MauvilleCity_GameCorner/events.inc | 24 +++---- data/maps/MauvilleCity_Gym/events.inc | 12 ++-- data/maps/MauvilleCity_House1/events.inc | 2 +- data/maps/MauvilleCity_House2/events.inc | 2 +- data/maps/MauvilleCity_Mart/events.inc | 6 +- data/maps/MauvilleCity_PokemonCenter_1F/events.inc | 10 +-- data/maps/MauvilleCity_PokemonCenter_2F/events.inc | 8 +-- data/maps/MeteorFalls_1F_1R/events.inc | 20 +++--- data/maps/MeteorFalls_1F_2R/events.inc | 6 +- data/maps/MeteorFalls_B1F_2R/events.inc | 2 +- data/maps/MossdeepCity/events.inc | 18 ++--- data/maps/MossdeepCity_GameCorner_1F/events.inc | 2 +- data/maps/MossdeepCity_GameCorner_B1F/events.inc | 2 +- data/maps/MossdeepCity_Gym/events.inc | 18 ++--- data/maps/MossdeepCity_House1/events.inc | 4 +- data/maps/MossdeepCity_House2/events.inc | 6 +- data/maps/MossdeepCity_House3/events.inc | 2 +- data/maps/MossdeepCity_House4/events.inc | 6 +- data/maps/MossdeepCity_Mart/events.inc | 8 +-- data/maps/MossdeepCity_PokemonCenter_1F/events.inc | 6 +- data/maps/MossdeepCity_PokemonCenter_2F/events.inc | 8 +-- data/maps/MossdeepCity_SpaceCenter_1F/events.inc | 10 +-- data/maps/MossdeepCity_SpaceCenter_2F/events.inc | 6 +- data/maps/MossdeepCity_StevensHouse/events.inc | 8 +-- data/maps/MtChimney/events.inc | 56 +++++++-------- data/maps/MtChimney_CableCarStation/events.inc | 4 +- data/maps/MtPyre_1F/events.inc | 6 +- data/maps/MtPyre_2F/events.inc | 12 ++-- data/maps/MtPyre_3F/events.inc | 6 +- data/maps/MtPyre_4F/events.inc | 4 +- data/maps/MtPyre_5F/events.inc | 4 +- data/maps/MtPyre_6F/events.inc | 4 +- data/maps/MtPyre_Exterior/events.inc | 4 +- data/maps/MtPyre_Summit/events.inc | 12 ++-- data/maps/NewMauville_Inside/events.inc | 16 ++--- data/maps/OldaleTown/events.inc | 8 +-- data/maps/OldaleTown_House1/events.inc | 2 +- data/maps/OldaleTown_House2/events.inc | 4 +- data/maps/OldaleTown_Mart/events.inc | 6 +- data/maps/OldaleTown_PokemonCenter_1F/events.inc | 8 +-- data/maps/OldaleTown_PokemonCenter_2F/events.inc | 6 +- data/maps/PacifidlogTown/events.inc | 6 +- data/maps/PacifidlogTown_House1/events.inc | 4 +- data/maps/PacifidlogTown_House2/events.inc | 6 +- data/maps/PacifidlogTown_House3/events.inc | 4 +- data/maps/PacifidlogTown_House4/events.inc | 6 +- data/maps/PacifidlogTown_House5/events.inc | 4 +- .../PacifidlogTown_PokemonCenter_1F/events.inc | 8 +-- .../PacifidlogTown_PokemonCenter_2F/events.inc | 6 +- data/maps/PetalburgCity/events.inc | 18 ++--- data/maps/PetalburgCity_Gym/events.inc | 20 +++--- data/maps/PetalburgCity_House1/events.inc | 4 +- data/maps/PetalburgCity_House2/events.inc | 4 +- data/maps/PetalburgCity_Mart/events.inc | 8 +-- .../maps/PetalburgCity_PokemonCenter_1F/events.inc | 10 +-- .../maps/PetalburgCity_PokemonCenter_2F/events.inc | 6 +- data/maps/PetalburgCity_WallysHouse/events.inc | 4 +- data/maps/PetalburgWoods/events.inc | 26 +++---- data/maps/RecordCorner/events.inc | 2 +- data/maps/Route101/events.inc | 12 ++-- data/maps/Route102/events.inc | 18 ++--- data/maps/Route103/events.inc | 30 ++++---- data/maps/Route104/events.inc | 64 ++++++++--------- data/maps/Route104_MrBrineysHouse/events.inc | 4 +- .../maps/Route104_PrettyPetalFlowerShop/events.inc | 6 +- data/maps/Route104_Prototype/events.inc | 24 +++---- .../events.inc | 2 +- data/maps/Route105/events.inc | 12 ++-- data/maps/Route106/events.inc | 10 +-- data/maps/Route107/events.inc | 12 ++-- data/maps/Route108/events.inc | 8 +-- data/maps/Route109/events.inc | 40 +++++------ data/maps/Route109_SeashoreHouse/events.inc | 8 +-- data/maps/Route110/events.inc | 62 ++++++++-------- .../events.inc | 2 +- .../events.inc | 2 +- data/maps/Route110_TrickHouseEnd/events.inc | 2 +- data/maps/Route110_TrickHouseEntrance/events.inc | 2 +- data/maps/Route110_TrickHousePuzzle1/events.inc | 38 +++++----- data/maps/Route110_TrickHousePuzzle2/events.inc | 10 +-- data/maps/Route110_TrickHousePuzzle3/events.inc | 22 +++--- data/maps/Route110_TrickHousePuzzle4/events.inc | 30 ++++---- data/maps/Route110_TrickHousePuzzle5/events.inc | 10 +-- data/maps/Route110_TrickHousePuzzle6/events.inc | 8 +-- data/maps/Route110_TrickHousePuzzle7/events.inc | 8 +-- data/maps/Route110_TrickHousePuzzle8/events.inc | 8 +-- data/maps/Route111/events.inc | 72 +++++++++---------- data/maps/Route111_OldLadysRestStop/events.inc | 2 +- .../maps/Route111_WinstrateFamilysHouse/events.inc | 8 +-- data/maps/Route112/events.inc | 24 +++---- data/maps/Route112_CableCarStation/events.inc | 4 +- data/maps/Route113/events.inc | 22 +++--- data/maps/Route113_GlassWorkshop/events.inc | 4 +- data/maps/Route114/events.inc | 46 ++++++------ data/maps/Route114_FossilManiacsHouse/events.inc | 2 +- data/maps/Route114_FossilManiacsTunnel/events.inc | 2 +- data/maps/Route114_LanettesHouse/events.inc | 2 +- data/maps/Route115/events.inc | 32 ++++----- data/maps/Route116/events.inc | 44 ++++++------ data/maps/Route116_TunnelersRestHouse/events.inc | 6 +- data/maps/Route117/events.inc | 42 +++++------ data/maps/Route117_PokemonDayCare/events.inc | 2 +- data/maps/Route118/events.inc | 40 +++++------ data/maps/Route119/events.inc | 74 +++++++++---------- data/maps/Route119_House/events.inc | 14 ++-- data/maps/Route119_WeatherInstitute_1F/events.inc | 10 +-- data/maps/Route119_WeatherInstitute_2F/events.inc | 12 ++-- data/maps/Route120/events.inc | 82 +++++++++++----------- data/maps/Route121/events.inc | 44 ++++++------ data/maps/Route121_SafariZoneEntrance/events.inc | 6 +- data/maps/Route123/events.inc | 68 +++++++++--------- data/maps/Route123_BerryMastersHouse/events.inc | 4 +- data/maps/Route124/events.inc | 20 +++--- .../Route124_DivingTreasureHuntersHouse/events.inc | 2 +- data/maps/Route125/events.inc | 14 ++-- data/maps/Route126/events.inc | 10 +-- data/maps/Route127/events.inc | 18 ++--- data/maps/Route128/events.inc | 16 ++--- data/maps/Route129/events.inc | 8 +-- data/maps/Route130/events.inc | 6 +- data/maps/Route131/events.inc | 12 ++-- data/maps/Route132/events.inc | 10 +-- data/maps/Route133/events.inc | 14 ++-- data/maps/Route134/events.inc | 10 +-- data/maps/RustboroCity/events.inc | 28 ++++---- data/maps/RustboroCity_CuttersHouse/events.inc | 4 +- data/maps/RustboroCity_DevonCorp_1F/events.inc | 6 +- data/maps/RustboroCity_DevonCorp_2F/events.inc | 10 +-- data/maps/RustboroCity_DevonCorp_3F/events.inc | 6 +- data/maps/RustboroCity_Flat1_1F/events.inc | 4 +- data/maps/RustboroCity_Flat1_2F/events.inc | 2 +- data/maps/RustboroCity_Flat2_1F/events.inc | 4 +- data/maps/RustboroCity_Flat2_2F/events.inc | 4 +- data/maps/RustboroCity_Flat2_3F/events.inc | 4 +- data/maps/RustboroCity_Gym/events.inc | 8 +-- data/maps/RustboroCity_House1/events.inc | 4 +- data/maps/RustboroCity_House2/events.inc | 4 +- data/maps/RustboroCity_House3/events.inc | 6 +- data/maps/RustboroCity_Mart/events.inc | 8 +-- data/maps/RustboroCity_PokemonCenter_1F/events.inc | 8 +-- data/maps/RustboroCity_PokemonCenter_2F/events.inc | 6 +- data/maps/RustboroCity_PokemonSchool/events.inc | 12 ++-- data/maps/RusturfTunnel/events.inc | 20 +++--- data/maps/SSTidalCorridor/events.inc | 8 +-- data/maps/SSTidalLowerDeck/events.inc | 4 +- data/maps/SSTidalRooms/events.inc | 16 ++--- data/maps/SafariZone_Northeast/events.inc | 18 ++--- data/maps/SafariZone_Northwest/events.inc | 4 +- data/maps/SafariZone_RestHouse/events.inc | 6 +- data/maps/SafariZone_Southeast/events.inc | 8 +-- data/maps/SafariZone_Southwest/events.inc | 4 +- data/maps/ScorchedSlab/events.inc | 2 +- data/maps/SeafloorCavern_Room1/events.inc | 10 +-- data/maps/SeafloorCavern_Room2/events.inc | 18 ++--- data/maps/SeafloorCavern_Room3/events.inc | 20 +++--- data/maps/SeafloorCavern_Room4/events.inc | 2 +- data/maps/SeafloorCavern_Room5/events.inc | 12 ++-- data/maps/SeafloorCavern_Room8/events.inc | 24 +++---- data/maps/SeafloorCavern_Room9/events.inc | 14 ++-- data/maps/SecretBase_BlueCave1/events.inc | 30 ++++---- data/maps/SecretBase_BlueCave2/events.inc | 30 ++++---- data/maps/SecretBase_BlueCave3/events.inc | 30 ++++---- data/maps/SecretBase_BlueCave4/events.inc | 30 ++++---- data/maps/SecretBase_BrownCave1/events.inc | 30 ++++---- data/maps/SecretBase_BrownCave2/events.inc | 30 ++++---- data/maps/SecretBase_BrownCave3/events.inc | 30 ++++---- data/maps/SecretBase_BrownCave4/events.inc | 30 ++++---- data/maps/SecretBase_RedCave1/events.inc | 30 ++++---- data/maps/SecretBase_RedCave2/events.inc | 30 ++++---- data/maps/SecretBase_RedCave3/events.inc | 30 ++++---- data/maps/SecretBase_RedCave4/events.inc | 30 ++++---- data/maps/SecretBase_Shrub1/events.inc | 30 ++++---- data/maps/SecretBase_Shrub2/events.inc | 30 ++++---- data/maps/SecretBase_Shrub3/events.inc | 30 ++++---- data/maps/SecretBase_Shrub4/events.inc | 30 ++++---- data/maps/SecretBase_Tree1/events.inc | 30 ++++---- data/maps/SecretBase_Tree2/events.inc | 30 ++++---- data/maps/SecretBase_Tree3/events.inc | 30 ++++---- data/maps/SecretBase_Tree4/events.inc | 30 ++++---- data/maps/SecretBase_YellowCave1/events.inc | 30 ++++---- data/maps/SecretBase_YellowCave2/events.inc | 30 ++++---- data/maps/SecretBase_YellowCave3/events.inc | 30 ++++---- data/maps/SecretBase_YellowCave4/events.inc | 30 ++++---- data/maps/ShoalCave_LowTideEntranceRoom/events.inc | 4 +- data/maps/ShoalCave_LowTideIceRoom/events.inc | 4 +- data/maps/ShoalCave_LowTideInnerRoom/events.inc | 2 +- data/maps/ShoalCave_LowTideLowerRoom/events.inc | 4 +- data/maps/ShoalCave_LowTideStairsRoom/events.inc | 2 +- data/maps/SingleBattleColosseum/events.inc | 2 +- data/maps/SkyPillar_Top/events.inc | 2 +- data/maps/SlateportCity/events.inc | 62 ++++++++-------- data/maps/SlateportCity_ContestHall/events.inc | 26 +++---- data/maps/SlateportCity_ContestLobby/events.inc | 16 ++--- data/maps/SlateportCity_Harbor/events.inc | 16 ++--- data/maps/SlateportCity_House1/events.inc | 2 +- data/maps/SlateportCity_House2/events.inc | 4 +- data/maps/SlateportCity_Mart/events.inc | 6 +- .../maps/SlateportCity_OceanicMuseum_1F/events.inc | 28 ++++---- .../maps/SlateportCity_OceanicMuseum_2F/events.inc | 14 ++-- .../maps/SlateportCity_PokemonCenter_1F/events.inc | 6 +- .../maps/SlateportCity_PokemonCenter_2F/events.inc | 6 +- data/maps/SlateportCity_PokemonFanClub/events.inc | 16 ++--- .../SlateportCity_SternsShipyard_1F/events.inc | 8 +-- .../SlateportCity_SternsShipyard_2F/events.inc | 6 +- data/maps/SootopolisCity/events.inc | 22 +++--- data/maps/SootopolisCity_Gym_1F/events.inc | 4 +- data/maps/SootopolisCity_Gym_B1F/events.inc | 16 ++--- data/maps/SootopolisCity_House1/events.inc | 4 +- data/maps/SootopolisCity_House2/events.inc | 2 +- data/maps/SootopolisCity_House3/events.inc | 4 +- data/maps/SootopolisCity_House4/events.inc | 6 +- data/maps/SootopolisCity_House5/events.inc | 4 +- data/maps/SootopolisCity_House6/events.inc | 2 +- data/maps/SootopolisCity_House7/events.inc | 4 +- data/maps/SootopolisCity_House8/events.inc | 4 +- data/maps/SootopolisCity_Mart/events.inc | 6 +- .../SootopolisCity_PokemonCenter_1F/events.inc | 6 +- .../SootopolisCity_PokemonCenter_2F/events.inc | 6 +- data/maps/SouthernIsland_Exterior/events.inc | 4 +- data/maps/SouthernIsland_Interior/events.inc | 4 +- data/maps/TradeCenter/events.inc | 2 +- data/maps/Underwater_SeafloorCavern/events.inc | 8 +-- data/maps/VerdanturfTown/events.inc | 8 +-- data/maps/VerdanturfTown_ContestHall/events.inc | 6 +- data/maps/VerdanturfTown_ContestLobby/events.inc | 12 ++-- .../events.inc | 4 +- data/maps/VerdanturfTown_House/events.inc | 4 +- data/maps/VerdanturfTown_Mart/events.inc | 8 +-- .../VerdanturfTown_PokemonCenter_1F/events.inc | 6 +- .../VerdanturfTown_PokemonCenter_2F/events.inc | 6 +- data/maps/VerdanturfTown_WandasHouse/events.inc | 10 +-- data/maps/VictoryRoad_1F/events.inc | 14 ++-- data/maps/VictoryRoad_B1F/events.inc | 38 +++++----- data/maps/VictoryRoad_B2F/events.inc | 10 +-- 341 files changed, 2104 insertions(+), 2103 deletions(-) diff --git a/data/map_events.s b/data/map_events.s index e6fe363f8..1b8faaf4d 100644 --- a/data/map_events.s +++ b/data/map_events.s @@ -1,5 +1,6 @@ #include "constants/flags.h" #include "constants/items.h" +#include "constants/event_object_movement_constants.h" #include "constants/event_objects.h" #include "constants/maps.h" #include "constants/secret_bases.h" diff --git a/data/maps/AbandonedShip_CaptainsOffice/events.inc b/data/maps/AbandonedShip_CaptainsOffice/events.inc index 791ab9754..47db14d42 100644 --- a/data/maps/AbandonedShip_CaptainsOffice/events.inc +++ b/data/maps/AbandonedShip_CaptainsOffice/events.inc @@ -1,6 +1,6 @@ AbandonedShip_CaptainsOffice_EventObjects:: @ 838E45C - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 3, 4, 3, 8, 0, 0, 0, 0, AbandonedShip_CaptainsOffice_EventScript_15EAF5, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 6, 3, 1, 1, 1, 0, 0, AbandonedShip_CaptainsOffice_EventScript_1B18BE, FLAG_ITEM_ABANDONED_SHIP_CAPTAINS_OFFICE_1 + object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, AbandonedShip_CaptainsOffice_EventScript_15EAF5, 0 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_CaptainsOffice_EventScript_1B18BE, FLAG_ITEM_ABANDONED_SHIP_CAPTAINS_OFFICE_1 AbandonedShip_CaptainsOffice_MapWarps:: @ 838E48C warp_def 7, 6, 3, 4, MAP_ABANDONED_SHIP_DECK diff --git a/data/maps/AbandonedShip_Corridors_1F/events.inc b/data/maps/AbandonedShip_Corridors_1F/events.inc index 82af88bce..a9d46dcb6 100644 --- a/data/maps/AbandonedShip_Corridors_1F/events.inc +++ b/data/maps/AbandonedShip_Corridors_1F/events.inc @@ -1,6 +1,6 @@ AbandonedShip_Corridors_1F_EventObjects:: @ 838E120 - object_event 1, EVENT_OBJ_GFX_YOUNGSTER, 0, 17, 7, 3, 2, 1, 1, 0, 0, AbandonedShip_Corridors_1F_EventScript_15E965, 0 - object_event 2, EVENT_OBJ_GFX_TUBER_M, 0, 5, 10, 3, 45, 4, 7, 1, 3, AbandonedShip_Corridors_1F_EventScript_15E96E, 0 + object_event 1, EVENT_OBJ_GFX_YOUNGSTER, 0, 17, 7, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, AbandonedShip_Corridors_1F_EventScript_15E965, 0 + object_event 2, EVENT_OBJ_GFX_TUBER_M, 0, 5, 10, 3, MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT, 4, 7, 1, 3, AbandonedShip_Corridors_1F_EventScript_15E96E, 0 AbandonedShip_Corridors_1F_MapWarps:: @ 838E150 warp_def 9, 11, 3, 2, MAP_ABANDONED_SHIP_DECK diff --git a/data/maps/AbandonedShip_Corridors_B1F/events.inc b/data/maps/AbandonedShip_Corridors_B1F/events.inc index 35dc34437..043160b69 100644 --- a/data/maps/AbandonedShip_Corridors_B1F/events.inc +++ b/data/maps/AbandonedShip_Corridors_B1F/events.inc @@ -1,6 +1,6 @@ AbandonedShip_Corridors_B1F_EventObjects:: @ 838E238 - object_event 1, EVENT_OBJ_GFX_TUBER_M, 0, 2, 8, 3, 2, 1, 1, 0, 0, AbandonedShip_Corridors_B1F_EventScript_15E9CA, 0 - object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 9, 6, 3, 14, 0, 0, 1, 4, AbandonedShip_Corridors_B1F_EventScript_15EA1E, 0 + object_event 1, EVENT_OBJ_GFX_TUBER_M, 0, 2, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, AbandonedShip_Corridors_B1F_EventScript_15E9CA, 0 + object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 9, 6, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 1, 4, AbandonedShip_Corridors_B1F_EventScript_15EA1E, 0 AbandonedShip_Corridors_B1F_MapWarps:: @ 838E268 warp_def 6, 4, 3, 2, MAP_ABANDONED_SHIP_ROOMS2_B1F diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/events.inc b/data/maps/AbandonedShip_HiddenFloorRooms/events.inc index 7c8135e89..8e15a7d6b 100644 --- a/data/maps/AbandonedShip_HiddenFloorRooms/events.inc +++ b/data/maps/AbandonedShip_HiddenFloorRooms/events.inc @@ -1,8 +1,8 @@ AbandonedShip_HiddenFloorRooms_EventObjects:: @ 838E540 - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 41, 4, 3, 1, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_1B18CB, FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS_1 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 10, 3, 1, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_1B18D8, FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS_2 - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 11, 3, 1, 1, 1, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_1B18F2, FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS_4 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 11, 3, 1, 1, 1, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_1B18E5, FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS_3 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 41, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_1B18CB, FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS_1 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_1B18D8, FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS_2 + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_1B18F2, FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS_4 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_1B18E5, FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS_3 AbandonedShip_HiddenFloorRooms_MapWarps:: @ 838E5A0 warp_def 6, 14, 3, 0, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS diff --git a/data/maps/AbandonedShip_Room_B1F/events.inc b/data/maps/AbandonedShip_Room_B1F/events.inc index e828890a5..17cb2e417 100644 --- a/data/maps/AbandonedShip_Room_B1F/events.inc +++ b/data/maps/AbandonedShip_Room_B1F/events.inc @@ -1,5 +1,5 @@ AbandonedShip_Room_B1F_EventObjects:: @ 838E3AC - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 4, 3, 1, 1, 1, 0, 0, AbandonedShip_Room_B1F_EventScript_1B18A4, FLAG_ITEM_ABANDONED_SHIP_ROOM_B1F_1 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_Room_B1F_EventScript_1B18A4, FLAG_ITEM_ABANDONED_SHIP_ROOM_B1F_1 AbandonedShip_Room_B1F_MapWarps:: @ 838E3C4 warp_def 4, 7, 3, 5, MAP_ABANDONED_SHIP_CORRIDORS_B1F diff --git a/data/maps/AbandonedShip_Rooms2_1F/events.inc b/data/maps/AbandonedShip_Rooms2_1F/events.inc index e29bd3b42..9ce7d09d7 100644 --- a/data/maps/AbandonedShip_Rooms2_1F/events.inc +++ b/data/maps/AbandonedShip_Rooms2_1F/events.inc @@ -1,7 +1,7 @@ AbandonedShip_Rooms2_1F_EventObjects:: @ 838E3E8 - object_event 1, EVENT_OBJ_GFX_MAN_5, 0, 7, 13, 3, 8, 0, 0, 1, 0, AbandonedShip_Rooms2_1F_EventScript_15EA68, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 6, 13, 3, 8, 0, 0, 1, 0, AbandonedShip_Rooms2_1F_EventScript_15EAAE, 0 - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 4, 3, 1, 1, 1, 0, 0, AbandonedShip_Rooms2_1F_EventScript_1B18B1, FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_1F_1 + object_event 1, EVENT_OBJ_GFX_MAN_5, 0, 7, 13, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, AbandonedShip_Rooms2_1F_EventScript_15EA68, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 6, 13, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, AbandonedShip_Rooms2_1F_EventScript_15EAAE, 0 + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms2_1F_EventScript_1B18B1, FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_1F_1 AbandonedShip_Rooms2_1F_MapWarps:: @ 838E430 warp_def 4, 16, 3, 8, MAP_ABANDONED_SHIP_CORRIDORS_1F diff --git a/data/maps/AbandonedShip_Rooms2_B1F/events.inc b/data/maps/AbandonedShip_Rooms2_B1F/events.inc index aa6eb759a..8b306ca47 100644 --- a/data/maps/AbandonedShip_Rooms2_B1F/events.inc +++ b/data/maps/AbandonedShip_Rooms2_B1F/events.inc @@ -1,6 +1,6 @@ AbandonedShip_Rooms2_B1F_EventObjects:: @ 838E324 - object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 3, 4, 3, 2, 1, 1, 0, 0, AbandonedShip_Rooms2_B1F_EventScript_15EA4E, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 3, 3, 1, 1, 1, 0, 0, AbandonedShip_Rooms2_B1F_EventScript_1B1897, FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_B1F_1 + object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 3, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms2_B1F_EventScript_15EA4E, 0 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms2_B1F_EventScript_1B1897, FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_B1F_1 AbandonedShip_Rooms2_B1F_MapWarps:: @ 838E354 warp_def 4, 7, 3, 1, MAP_ABANDONED_SHIP_CORRIDORS_B1F diff --git a/data/maps/AbandonedShip_Rooms_1F/events.inc b/data/maps/AbandonedShip_Rooms_1F/events.inc index 6ffe06615..427d653fd 100644 --- a/data/maps/AbandonedShip_Rooms_1F/events.inc +++ b/data/maps/AbandonedShip_Rooms_1F/events.inc @@ -1,6 +1,6 @@ AbandonedShip_Rooms_1F_EventObjects:: @ 838E1C4 - object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 11, 6, 3, 2, 1, 1, 0, 0, AbandonedShip_Rooms_1F_EventScript_15E986, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 5, 3, 1, 1, 1, 0, 0, AbandonedShip_Rooms_1F_EventScript_1B187D, FLAG_ITEM_ABANDONED_SHIP_ROOMS_1F_1 + object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 11, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms_1F_EventScript_15E986, 0 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms_1F_EventScript_1B187D, FLAG_ITEM_ABANDONED_SHIP_ROOMS_1F_1 AbandonedShip_Rooms_1F_MapWarps:: @ 838E1F4 warp_def 4, 16, 3, 4, MAP_ABANDONED_SHIP_CORRIDORS_1F diff --git a/data/maps/AbandonedShip_Rooms_B1F/events.inc b/data/maps/AbandonedShip_Rooms_B1F/events.inc index 405506b44..bf71689e8 100644 --- a/data/maps/AbandonedShip_Rooms_B1F/events.inc +++ b/data/maps/AbandonedShip_Rooms_B1F/events.inc @@ -1,6 +1,6 @@ AbandonedShip_Rooms_B1F_EventObjects:: @ 838E2C8 - object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 25, 6, 3, 9, 0, 0, 0, 0, AbandonedShip_Rooms_B1F_EventScript_15EA44, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 7, 3, 1, 1, 1, 0, 0, AbandonedShip_Rooms_B1F_EventScript_1B188A, FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_1 + object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 25, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, AbandonedShip_Rooms_B1F_EventScript_15EA44, 0 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms_B1F_EventScript_1B188A, FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_1 AbandonedShip_Rooms_B1F_MapWarps:: @ 838E2F8 warp_def 4, 1, 3, 2, MAP_ABANDONED_SHIP_CORRIDORS_B1F diff --git a/data/maps/AncientTomb/events.inc b/data/maps/AncientTomb/events.inc index 2699b9036..c7cfd76ba 100644 --- a/data/maps/AncientTomb/events.inc +++ b/data/maps/AncientTomb/events.inc @@ -1,5 +1,5 @@ AncientTomb_EventObjects:: @ 838E6DC - object_event 1, EVENT_OBJ_GFX_REGISTEEL, 0, 8, 7, 3, 8, 0, 0, 0, 0, AncientTomb_EventScript_15F050, FLAG_HIDE_REGISTEEL + object_event 1, EVENT_OBJ_GFX_REGISTEEL, 0, 8, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, AncientTomb_EventScript_15F050, FLAG_HIDE_REGISTEEL AncientTomb_MapWarps:: @ 838E6F4 warp_def 8, 29, 3, 0, MAP_ROUTE120 diff --git a/data/maps/AquaHideout_1F/events.inc b/data/maps/AquaHideout_1F/events.inc index 3c87be0d7..89bd9cdae 100644 --- a/data/maps/AquaHideout_1F/events.inc +++ b/data/maps/AquaHideout_1F/events.inc @@ -1,7 +1,7 @@ AquaHideout_1F_EventObjects:: @ 838CD0C - object_event 1, EVENT_OBJ_GFX_VAR_1, 0, 13, 11, 3, 8, 0, 0, 0, 0, AquaHideout_1F_EventScript_15D7CE, FLAG_HIDE_GRUNT_1_BLOCKING_HIDEOUT - object_event 2, EVENT_OBJ_GFX_VAR_1, 0, 14, 11, 3, 8, 0, 0, 0, 0, AquaHideout_1F_EventScript_15D7ED, FLAG_HIDE_GRUNT_2_BLOCKING_HIDEOUT - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 20, 4, 3, 50, 13, 5, 1, 3, AquaHideout_1F_EventScript_15D80C, FLAG_HIDE_GRUNTS_HIDEOUTS + object_event 1, EVENT_OBJ_GFX_VAR_1, 0, 13, 11, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, AquaHideout_1F_EventScript_15D7CE, FLAG_HIDE_GRUNT_1_BLOCKING_HIDEOUT + object_event 2, EVENT_OBJ_GFX_VAR_1, 0, 14, 11, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, AquaHideout_1F_EventScript_15D7ED, FLAG_HIDE_GRUNT_2_BLOCKING_HIDEOUT + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 20, 4, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT, 13, 5, 1, 3, AquaHideout_1F_EventScript_15D80C, FLAG_HIDE_GRUNTS_HIDEOUTS AquaHideout_1F_MapWarps:: @ 838CD54 warp_def 13, 27, 1, 6, MAP_LILYCOVE_CITY diff --git a/data/maps/AquaHideout_B1F/events.inc b/data/maps/AquaHideout_B1F/events.inc index 0a53d4cf9..b1ef6b598 100644 --- a/data/maps/AquaHideout_B1F/events.inc +++ b/data/maps/AquaHideout_B1F/events.inc @@ -1,12 +1,12 @@ AquaHideout_B1F_EventObjects:: @ 838CD80 - object_event 1, EVENT_OBJ_GFX_VAR_1, 0, 27, 18, 3, 24, 0, 0, 1, 3, AquaHideout_B1F_EventScript_15D850, FLAG_HIDE_GRUNTS_HIDEOUTS - object_event 2, EVENT_OBJ_GFX_VAR_1, 0, 6, 6, 3, 9, 0, 0, 1, 5, AquaHideout_B1F_EventScript_15D875, FLAG_HIDE_GRUNTS_HIDEOUTS - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 12, 3, 1, 0, 0, 0, 0, AquaHideout_B1F_EventScript_1B19A8, FLAG_ITEM_AQUA_HIDEOUT_B1F_1 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 20, 18, 3, 27, 4, 0, 1, 4, AquaHideout_B1F_EventScript_15D89A, FLAG_HIDE_GRUNTS_HIDEOUTS - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 9, 3, 1, 1, 1, 0, 0, AquaHideout_B1F_EventScript_1B198E, FLAG_ITEM_AQUA_HIDEOUT_B1F_2 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 9, 3, 1, 1, 1, 0, 0, AquaHideout_B1F_EventScript_1A04FD, FLAG_HIDE_ELECTRODE_1_HIDEOUT - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 10, 3, 1, 1, 1, 0, 0, AquaHideout_B1F_EventScript_1B199B, FLAG_ITEM_AQUA_HIDEOUT_B1F_3 - object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 10, 3, 1, 1, 1, 0, 0, AquaHideout_B1F_EventScript_1A051B, FLAG_HIDE_ELECTRODE_2_HIDEOUT + object_event 1, EVENT_OBJ_GFX_VAR_1, 0, 27, 18, 3, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 0, 0, 1, 3, AquaHideout_B1F_EventScript_15D850, FLAG_HIDE_GRUNTS_HIDEOUTS + object_event 2, EVENT_OBJ_GFX_VAR_1, 0, 6, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 5, AquaHideout_B1F_EventScript_15D875, FLAG_HIDE_GRUNTS_HIDEOUTS + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, AquaHideout_B1F_EventScript_1B19A8, FLAG_ITEM_AQUA_HIDEOUT_B1F_1 + object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 20, 18, 3, MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT, 4, 0, 1, 4, AquaHideout_B1F_EventScript_15D89A, FLAG_HIDE_GRUNTS_HIDEOUTS + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AquaHideout_B1F_EventScript_1B198E, FLAG_ITEM_AQUA_HIDEOUT_B1F_2 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AquaHideout_B1F_EventScript_1A04FD, FLAG_HIDE_ELECTRODE_1_HIDEOUT + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AquaHideout_B1F_EventScript_1B199B, FLAG_ITEM_AQUA_HIDEOUT_B1F_3 + object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AquaHideout_B1F_EventScript_1A051B, FLAG_HIDE_ELECTRODE_2_HIDEOUT AquaHideout_B1F_MapWarps:: @ 838CE40 warp_def 29, 1, 3, 2, MAP_AQUA_HIDEOUT_1F diff --git a/data/maps/AquaHideout_B2F/events.inc b/data/maps/AquaHideout_B2F/events.inc index 6eee30658..fed8e6da9 100644 --- a/data/maps/AquaHideout_B2F/events.inc +++ b/data/maps/AquaHideout_B2F/events.inc @@ -1,9 +1,9 @@ AquaHideout_B2F_EventObjects:: @ 838CF1C - object_event 1, EVENT_OBJ_GFX_VAR_1, 0, 23, 19, 3, 9, 0, 0, 0, 0, AquaHideout_B2F_EventScript_15D8E1, FLAG_HIDE_GRUNTS_HIDEOUTS - object_event 2, EVENT_OBJ_GFX_VAR_1, 0, 23, 10, 3, 45, 4, 3, 1, 3, AquaHideout_B2F_EventScript_15D962, FLAG_HIDE_GRUNTS_HIDEOUTS - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 13, 3, 1, 0, 0, 0, 0, AquaHideout_B2F_EventScript_1B19B5, FLAG_ITEM_AQUA_HIDEOUT_B2F_1 - object_event 4, EVENT_OBJ_GFX_SUBMARINE_SHADOW, 0, 19, 20, 1, 9, 0, 0, 0, 0, 0x0, FLAG_HIDE_SUBMARINE_SHADOW_HIDEOUT - object_event 5, EVENT_OBJ_GFX_VAR_2, 0, 10, 6, 3, 7, 1, 1, 1, 4, AquaHideout_B2F_EventScript_15D987, FLAG_HIDE_GRUNTS_HIDEOUTS + object_event 1, EVENT_OBJ_GFX_VAR_1, 0, 23, 19, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, AquaHideout_B2F_EventScript_15D8E1, FLAG_HIDE_GRUNTS_HIDEOUTS + object_event 2, EVENT_OBJ_GFX_VAR_1, 0, 23, 10, 3, MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT, 4, 3, 1, 3, AquaHideout_B2F_EventScript_15D962, FLAG_HIDE_GRUNTS_HIDEOUTS + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, AquaHideout_B2F_EventScript_1B19B5, FLAG_ITEM_AQUA_HIDEOUT_B2F_1 + object_event 4, EVENT_OBJ_GFX_SUBMARINE_SHADOW, 0, 19, 20, 1, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, FLAG_HIDE_SUBMARINE_SHADOW_HIDEOUT + object_event 5, EVENT_OBJ_GFX_VAR_2, 0, 10, 6, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 4, AquaHideout_B2F_EventScript_15D987, FLAG_HIDE_GRUNTS_HIDEOUTS AquaHideout_B2F_MapWarps:: @ 838CF94 warp_def 18, 1, 3, 1, MAP_AQUA_HIDEOUT_B1F diff --git a/data/maps/BattleTower_BattleRoom/events.inc b/data/maps/BattleTower_BattleRoom/events.inc index a4bbe9849..6b7cb0c6d 100644 --- a/data/maps/BattleTower_BattleRoom/events.inc +++ b/data/maps/BattleTower_BattleRoom/events.inc @@ -1,6 +1,6 @@ BattleTower_BattleRoom_EventObjects:: @ 8391DAC - object_event 1, EVENT_OBJ_GFX_VAR_0, 0, 5, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_HIDE_BATTLE_TOWER_OPPONENT - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 1, 7, 3, 10, 0, 0, 0, 0, 0x0, 0 + object_event 1, EVENT_OBJ_GFX_VAR_0, 0, 5, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_BATTLE_TOWER_OPPONENT + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 1, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 0 BattleTower_BattleRoom_MapWarps:: @ 8391DDC warp_def 5, 8, 0, 2, MAP_BATTLE_TOWER_LOBBY diff --git a/data/maps/BattleTower_Corridor/events.inc b/data/maps/BattleTower_Corridor/events.inc index 1233ff32c..fa312b4df 100644 --- a/data/maps/BattleTower_Corridor/events.inc +++ b/data/maps/BattleTower_Corridor/events.inc @@ -1,5 +1,5 @@ BattleTower_Corridor_EventObjects:: @ 8391D80 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 9, 2, 3, 9, 0, 0, 0, 0, 0x0, 0 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 9, 2, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, 0 BattleTower_Corridor_MapEvents:: @ 8391D98 map_events BattleTower_Corridor_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattleTower_Elevator/events.inc b/data/maps/BattleTower_Elevator/events.inc index 57434d3ac..8c9012067 100644 --- a/data/maps/BattleTower_Elevator/events.inc +++ b/data/maps/BattleTower_Elevator/events.inc @@ -1,5 +1,5 @@ BattleTower_Elevator_EventObjects:: @ 8391D54 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 1, 5, 3, 7, 0, 0, 0, 0, 0x0, 0 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0 BattleTower_Elevator_MapEvents:: @ 8391D6C map_events BattleTower_Elevator_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattleTower_Lobby/events.inc b/data/maps/BattleTower_Lobby/events.inc index ca33bdf95..12bb17e2d 100644 --- a/data/maps/BattleTower_Lobby/events.inc +++ b/data/maps/BattleTower_Lobby/events.inc @@ -1,10 +1,10 @@ BattleTower_Lobby_EventObjects:: @ 8391C8C - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 5, 3, 8, 0, 0, 0, 0, BattleTower_Lobby_EventScript_16049E, 0 - object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 12, 3, 3, 8, 0, 0, 0, 0, BattleTower_Lobby_EventScript_1606A5, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 10, 8, 3, 2, 1, 1, 0, 0, BattleTower_Lobby_EventScript_160715, 0 - object_event 4, EVENT_OBJ_GFX_BOY_1, 0, 1, 2, 3, 2, 1, 1, 0, 0, BattleTower_Lobby_EventScript_16071E, 0 - object_event 5, EVENT_OBJ_GFX_REPORTER_F, 0, 4, 7, 3, 1, 0, 0, 0, 0, BattleTower_Lobby_EventScript_1AE1FF, FLAG_HIDE_REPORTER_BATTLE_TOWER - object_event 6, EVENT_OBJ_GFX_MAN_2, 0, 7, 6, 3, 9, 0, 0, 0, 0, BattleTower_Lobby_EventScript_160733, FLAG_HIDE_AWARD_MAN_BATTLE_TOWER + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleTower_Lobby_EventScript_16049E, 0 + object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 12, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleTower_Lobby_EventScript_1606A5, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 10, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleTower_Lobby_EventScript_160715, 0 + object_event 4, EVENT_OBJ_GFX_BOY_1, 0, 1, 2, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleTower_Lobby_EventScript_16071E, 0 + object_event 5, EVENT_OBJ_GFX_REPORTER_F, 0, 4, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, BattleTower_Lobby_EventScript_1AE1FF, FLAG_HIDE_REPORTER_BATTLE_TOWER + object_event 6, EVENT_OBJ_GFX_MAN_2, 0, 7, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, BattleTower_Lobby_EventScript_160733, FLAG_HIDE_AWARD_MAN_BATTLE_TOWER BattleTower_Lobby_MapWarps:: @ 8391D1C warp_def 6, 8, 0, 0, MAP_BATTLE_TOWER_OUTSIDE diff --git a/data/maps/BattleTower_Outside/events.inc b/data/maps/BattleTower_Outside/events.inc index 2e02fcc1c..2fd7ac6bc 100644 --- a/data/maps/BattleTower_Outside/events.inc +++ b/data/maps/BattleTower_Outside/events.inc @@ -1,9 +1,9 @@ BattleTower_Outside_EventObjects:: @ 8391BEC - object_event 1, EVENT_OBJ_GFX_BUG_CATCHER, 0, 18, 11, 3, 2, 1, 1, 0, 0, BattleTower_Outside_EventScript_160263, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 11, 14, 3, 2, 1, 1, 0, 0, BattleTower_Outside_EventScript_16026C, 0 - object_event 3, EVENT_OBJ_GFX_BOY_2, 0, 10, 11, 3, 2, 1, 1, 0, 0, BattleTower_Outside_EventScript_160275, 0 - object_event 4, EVENT_OBJ_GFX_SS_TIDAL, 0, 19, 26, 1, 10, 1, 1, 0, 0, 0x0, 0 - object_event 5, EVENT_OBJ_GFX_BEAUTY, 0, 19, 24, 3, 7, 1, 1, 0, 0, BattleTower_Outside_EventScript_160168, 0 + object_event 1, EVENT_OBJ_GFX_BUG_CATCHER, 0, 18, 11, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleTower_Outside_EventScript_160263, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 11, 14, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleTower_Outside_EventScript_16026C, 0 + object_event 3, EVENT_OBJ_GFX_BOY_2, 0, 10, 11, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleTower_Outside_EventScript_160275, 0 + object_event 4, EVENT_OBJ_GFX_SS_TIDAL, 0, 19, 26, 1, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, 0 + object_event 5, EVENT_OBJ_GFX_BEAUTY, 0, 19, 24, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BattleTower_Outside_EventScript_160168, 0 BattleTower_Outside_MapWarps:: @ 8391C64 warp_def 14, 8, 0, 0, MAP_BATTLE_TOWER_LOBBY diff --git a/data/maps/CaveOfOrigin_B3F/events.inc b/data/maps/CaveOfOrigin_B3F/events.inc index dcf831a76..9a1c7540d 100644 --- a/data/maps/CaveOfOrigin_B3F/events.inc +++ b/data/maps/CaveOfOrigin_B3F/events.inc @@ -1,5 +1,5 @@ CaveOfOrigin_B3F_EventObjects:: @ 838D814 - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 5, 3, 1, 0, 0, 0, 0, CaveOfOrigin_B3F_EventScript_1B1A44, FLAG_ITEM_CAVE_OF_ORIGIN_B3F_1 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, CaveOfOrigin_B3F_EventScript_1B1A44, FLAG_ITEM_CAVE_OF_ORIGIN_B3F_1 CaveOfOrigin_B3F_MapWarps:: @ 838D82C warp_def 7, 14, 3, 1, MAP_CAVE_OF_ORIGIN_B2F diff --git a/data/maps/CaveOfOrigin_B4F/events.inc b/data/maps/CaveOfOrigin_B4F/events.inc index faa146570..2e603b827 100644 --- a/data/maps/CaveOfOrigin_B4F/events.inc +++ b/data/maps/CaveOfOrigin_B4F/events.inc @@ -1,5 +1,5 @@ CaveOfOrigin_B4F_EventObjects:: @ 838D880 - object_event 1, EVENT_OBJ_GFX_VAR_8, 0, 9, 10, 3, 8, 0, 0, 0, 0, 0x0, FLAG_HIDE_LEGEND_MON_CAVE_OF_ORIGIN + object_event 1, EVENT_OBJ_GFX_VAR_8, 0, 9, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_LEGEND_MON_CAVE_OF_ORIGIN CaveOfOrigin_B4F_MapWarps:: @ 838D898 warp_def 12, 5, 3, 1, MAP_CAVE_OF_ORIGIN_B3F diff --git a/data/maps/DesertRuins/events.inc b/data/maps/DesertRuins/events.inc index b1d8690c1..803dd4b5b 100644 --- a/data/maps/DesertRuins/events.inc +++ b/data/maps/DesertRuins/events.inc @@ -1,5 +1,5 @@ DesertRuins_EventObjects:: @ 838BEBC - object_event 1, EVENT_OBJ_GFX_REGIROCK, 0, 8, 7, 3, 8, 0, 0, 0, 0, DesertRuins_EventScript_15CB85, FLAG_HIDE_REGIROCK + object_event 1, EVENT_OBJ_GFX_REGIROCK, 0, 8, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, DesertRuins_EventScript_15CB85, FLAG_HIDE_REGIROCK DesertRuins_MapWarps:: @ 838BED4 warp_def 8, 29, 3, 1, MAP_ROUTE111 diff --git a/data/maps/DewfordTown/events.inc b/data/maps/DewfordTown/events.inc index 5cfb552ee..b2acd0c1a 100644 --- a/data/maps/DewfordTown/events.inc +++ b/data/maps/DewfordTown/events.inc @@ -1,9 +1,9 @@ DewfordTown_EventObjects:: @ 8380B88 - object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 7, 12, 3, 5, 1, 0, 0, 0, DewfordTown_EventScript_14E0A2, 0 - object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 12, 9, 3, 9, 0, 1, 0, 3, DewfordTown_EventScript_14E002, FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN - object_event 3, EVENT_OBJ_GFX_FISHERMAN, 0, 12, 14, 3, 5, 1, 0, 0, 0, DewfordTown_EventScript_14E0C6, 0 - object_event 4, EVENT_OBJ_GFX_MR_BRINEYS_BOAT, 0, 12, 8, 1, 8, 0, 0, 0, 0, 0x0, FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD - object_event 5, EVENT_OBJ_GFX_BOY_1, 0, 1, 6, 3, 1, 0, 0, 0, 0, DewfordTown_EventScript_14E413, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 7, 12, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, DewfordTown_EventScript_14E0A2, 0 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 12, 9, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 1, 0, 3, DewfordTown_EventScript_14E002, FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN + object_event 3, EVENT_OBJ_GFX_FISHERMAN, 0, 12, 14, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, DewfordTown_EventScript_14E0C6, 0 + object_event 4, EVENT_OBJ_GFX_MR_BRINEYS_BOAT, 0, 12, 8, 1, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD + object_event 5, EVENT_OBJ_GFX_BOY_1, 0, 1, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, DewfordTown_EventScript_14E413, 0 DewfordTown_MapWarps:: @ 8380C00 warp_def 3, 3, 0, 0, MAP_DEWFORD_TOWN_HALL diff --git a/data/maps/DewfordTown_Gym/events.inc b/data/maps/DewfordTown_Gym/events.inc index 237748602..4caadd80d 100644 --- a/data/maps/DewfordTown_Gym/events.inc +++ b/data/maps/DewfordTown_Gym/events.inc @@ -1,9 +1,9 @@ DewfordTown_Gym_EventObjects:: @ 8385FBC - object_event 1, EVENT_OBJ_GFX_BRAWLY, 0, 14, 4, 3, 8, 0, 0, 0, 0, DewfordTown_Gym_EventScript_153152, 0 - object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 2, 17, 3, 7, 0, 0, 1, 3, DewfordTown_Gym_EventScript_1531D9, 0 - object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 1, 10, 3, 7, 0, 0, 1, 3, DewfordTown_Gym_EventScript_1531FB, 0 - object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 12, 24, 3, 7, 0, 0, 1, 2, DewfordTown_Gym_EventScript_15321D, 0 - object_event 5, EVENT_OBJ_GFX_MAN_2, 0, 5, 24, 3, 8, 0, 0, 0, 0, DewfordTown_Gym_EventScript_15323F, 0 + object_event 1, EVENT_OBJ_GFX_BRAWLY, 0, 14, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, DewfordTown_Gym_EventScript_153152, 0 + object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 2, 17, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 3, DewfordTown_Gym_EventScript_1531D9, 0 + object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 1, 10, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 3, DewfordTown_Gym_EventScript_1531FB, 0 + object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 12, 24, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 2, DewfordTown_Gym_EventScript_15321D, 0 + object_event 5, EVENT_OBJ_GFX_MAN_2, 0, 5, 24, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, DewfordTown_Gym_EventScript_15323F, 0 DewfordTown_Gym_MapWarps:: @ 8386034 warp_def 5, 27, 0, 2, MAP_DEWFORD_TOWN diff --git a/data/maps/DewfordTown_Hall/events.inc b/data/maps/DewfordTown_Hall/events.inc index 3eb9818fe..16503c5ac 100644 --- a/data/maps/DewfordTown_Hall/events.inc +++ b/data/maps/DewfordTown_Hall/events.inc @@ -1,13 +1,13 @@ DewfordTown_Hall_EventObjects:: @ 8386088 - object_event 1, EVENT_OBJ_GFX_GIRL_2, 0, 4, 6, 0, 7, 0, 0, 0, 0, DewfordTown_Hall_EventScript_153293, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 1, 5, 0, 10, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1532BC, 0 - object_event 3, EVENT_OBJ_GFX_MAN_1, 0, 5, 4, 0, 9, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1532CD, 0 - object_event 4, EVENT_OBJ_GFX_OLD_MAN_1, 0, 9, 3, 0, 7, 0, 0, 0, 0, DewfordTown_Hall_EventScript_15330A, 0 - object_event 5, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 5, 2, 3, 7, 0, 0, 0, 0, DewfordTown_Hall_EventScript_153326, 0 - object_event 6, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 14, 7, 0, 5, 1, 0, 0, 0, DewfordTown_Hall_EventScript_153342, 0 - object_event 7, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 12, 3, 3, 10, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1533F2, 0 - object_event 8, EVENT_OBJ_GFX_PSYCHIC_M, 0, 15, 3, 3, 9, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1533FE, 0 - object_event 9, EVENT_OBJ_GFX_MANIAC, 0, 8, 6, 3, 5, 1, 0, 0, 0, DewfordTown_Hall_EventScript_15359D, FLAG_HIDE_SLUDGE_BOMB_MAN_DEWFORD_HALL + object_event 1, EVENT_OBJ_GFX_GIRL_2, 0, 4, 6, 0, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, DewfordTown_Hall_EventScript_153293, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 1, 5, 0, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1532BC, 0 + object_event 3, EVENT_OBJ_GFX_MAN_1, 0, 5, 4, 0, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1532CD, 0 + object_event 4, EVENT_OBJ_GFX_OLD_MAN_1, 0, 9, 3, 0, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, DewfordTown_Hall_EventScript_15330A, 0 + object_event 5, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 5, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, DewfordTown_Hall_EventScript_153326, 0 + object_event 6, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 14, 7, 0, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, DewfordTown_Hall_EventScript_153342, 0 + object_event 7, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 12, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1533F2, 0 + object_event 8, EVENT_OBJ_GFX_PSYCHIC_M, 0, 15, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1533FE, 0 + object_event 9, EVENT_OBJ_GFX_MANIAC, 0, 8, 6, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, DewfordTown_Hall_EventScript_15359D, FLAG_HIDE_SLUDGE_BOMB_MAN_DEWFORD_HALL DewfordTown_Hall_MapWarps:: @ 8386160 warp_def 5, 8, 0, 0, MAP_DEWFORD_TOWN diff --git a/data/maps/DewfordTown_House1/events.inc b/data/maps/DewfordTown_House1/events.inc index 69fd54d9c..834b717fa 100644 --- a/data/maps/DewfordTown_House1/events.inc +++ b/data/maps/DewfordTown_House1/events.inc @@ -1,7 +1,7 @@ DewfordTown_House1_EventObjects:: @ 8385E58 - object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 6, 3, 3, 9, 0, 0, 0, 0, DewfordTown_House1_EventScript_152FF8, 0 - object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 3, 3, 3, 10, 0, 0, 0, 0, DewfordTown_House1_EventScript_152FEF, 0 - object_event 3, EVENT_OBJ_GFX_ZIGZAGOON, 0, 4, 2, 3, 8, 3, 1, 0, 0, DewfordTown_House1_EventScript_153001, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 6, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, DewfordTown_House1_EventScript_152FF8, 0 + object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 3, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, DewfordTown_House1_EventScript_152FEF, 0 + object_event 3, EVENT_OBJ_GFX_ZIGZAGOON, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 3, 1, 0, 0, DewfordTown_House1_EventScript_153001, 0 DewfordTown_House1_MapWarps:: @ 8385EA0 warp_def 3, 7, 0, 3, MAP_DEWFORD_TOWN diff --git a/data/maps/DewfordTown_House2/events.inc b/data/maps/DewfordTown_House2/events.inc index f6858b846..45193e757 100644 --- a/data/maps/DewfordTown_House2/events.inc +++ b/data/maps/DewfordTown_House2/events.inc @@ -1,6 +1,6 @@ DewfordTown_House2_EventObjects:: @ 838619C - object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 6, 5, 3, 10, 0, 0, 0, 0, DewfordTown_House2_EventScript_1535DC, 0 - object_event 2, EVENT_OBJ_GFX_BOY_2, 0, 2, 3, 3, 1, 0, 0, 0, 0, DewfordTown_House2_EventScript_15361F, 0 + object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, DewfordTown_House2_EventScript_1535DC, 0 + object_event 2, EVENT_OBJ_GFX_BOY_2, 0, 2, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, DewfordTown_House2_EventScript_15361F, 0 DewfordTown_House2_MapWarps:: @ 83861CC warp_def 3, 8, 0, 4, MAP_DEWFORD_TOWN diff --git a/data/maps/DewfordTown_PokemonCenter_1F/events.inc b/data/maps/DewfordTown_PokemonCenter_1F/events.inc index 97b0e761a..296b3374b 100644 --- a/data/maps/DewfordTown_PokemonCenter_1F/events.inc +++ b/data/maps/DewfordTown_PokemonCenter_1F/events.inc @@ -1,7 +1,7 @@ DewfordTown_PokemonCenter_1F_EventObjects:: @ 8385EC4 - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, DewfordTown_PokemonCenter_1F_EventScript_153023, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 10, 6, 3, 10, 0, 0, 0, 0, DewfordTown_PokemonCenter_1F_EventScript_153031, 0 - object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 5, 5, 0, 5, 2, 1, 0, 0, DewfordTown_PokemonCenter_1F_EventScript_15303A, 0 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, DewfordTown_PokemonCenter_1F_EventScript_153023, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 10, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, DewfordTown_PokemonCenter_1F_EventScript_153031, 0 + object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 5, 5, 0, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 2, 1, 0, 0, DewfordTown_PokemonCenter_1F_EventScript_15303A, 0 DewfordTown_PokemonCenter_1F_MapWarps:: @ 8385F0C warp_def 7, 8, 3, 1, MAP_DEWFORD_TOWN diff --git a/data/maps/DewfordTown_PokemonCenter_2F/events.inc b/data/maps/DewfordTown_PokemonCenter_2F/events.inc index 333823536..d26fc4351 100644 --- a/data/maps/DewfordTown_PokemonCenter_2F/events.inc +++ b/data/maps/DewfordTown_PokemonCenter_2F/events.inc @@ -1,7 +1,7 @@ DewfordTown_PokemonCenter_2F_EventObjects:: @ 8385F38 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 2, 3, 8, 0, 0, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_153053, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 7, 2, 3, 8, 0, 0, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_153059, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, 8, 0, 0, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_15305F, 0 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_153053, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_153059, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_15305F, 0 DewfordTown_PokemonCenter_2F_MapWarps:: @ 8385F80 warp_def 1, 5, 4, 2, MAP_DEWFORD_TOWN_POKEMON_CENTER_1F diff --git a/data/maps/EverGrandeCity_ChampionsRoom/events.inc b/data/maps/EverGrandeCity_ChampionsRoom/events.inc index 832ddf206..ae5518f5e 100644 --- a/data/maps/EverGrandeCity_ChampionsRoom/events.inc +++ b/data/maps/EverGrandeCity_ChampionsRoom/events.inc @@ -1,7 +1,7 @@ EverGrandeCity_ChampionsRoom_EventObjects:: @ 838B334 - object_event 1, EVENT_OBJ_GFX_STEVEN, 0, 6, 5, 3, 8, 0, 0, 0, 0, 0x0, 0 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 6, 12, 3, 7, 0, 0, 0, 0, 0x0, FLAG_HIDE_RIVAL_CHAMPIONS_ROOM - object_event 3, EVENT_OBJ_GFX_PROF_BIRCH, 0, 6, 12, 3, 7, 0, 0, 0, 0, 0x0, FLAG_HIDE_BIRCH_CHAMPIONS_ROOM + object_event 1, EVENT_OBJ_GFX_STEVEN, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 0 + object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 6, 12, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_RIVAL_CHAMPIONS_ROOM + object_event 3, EVENT_OBJ_GFX_PROF_BIRCH, 0, 6, 12, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_BIRCH_CHAMPIONS_ROOM EverGrandeCity_ChampionsRoom_MapWarps:: @ 838B37C warp_def 6, 12, 3, 1, MAP_EVER_GRANDE_CITY_CORRIDOR4 diff --git a/data/maps/EverGrandeCity_DrakesRoom/events.inc b/data/maps/EverGrandeCity_DrakesRoom/events.inc index 6b69d45da..9ff011c34 100644 --- a/data/maps/EverGrandeCity_DrakesRoom/events.inc +++ b/data/maps/EverGrandeCity_DrakesRoom/events.inc @@ -1,5 +1,5 @@ EverGrandeCity_DrakesRoom_EventObjects:: @ 838B2F8 - object_event 1, EVENT_OBJ_GFX_DRAKE, 0, 6, 5, 3, 8, 0, 0, 0, 0, EverGrandeCity_DrakesRoom_EventScript_15B764, 0 + object_event 1, EVENT_OBJ_GFX_DRAKE, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, EverGrandeCity_DrakesRoom_EventScript_15B764, 0 EverGrandeCity_DrakesRoom_MapWarps:: @ 838B310 warp_def 6, 13, 3, 1, MAP_EVER_GRANDE_CITY_CORRIDOR3 diff --git a/data/maps/EverGrandeCity_GlaciasRoom/events.inc b/data/maps/EverGrandeCity_GlaciasRoom/events.inc index 8dba287fe..55eb82464 100644 --- a/data/maps/EverGrandeCity_GlaciasRoom/events.inc +++ b/data/maps/EverGrandeCity_GlaciasRoom/events.inc @@ -1,5 +1,5 @@ EverGrandeCity_GlaciasRoom_EventObjects:: @ 838B2BC - object_event 1, EVENT_OBJ_GFX_GLACIA, 0, 6, 5, 3, 8, 0, 0, 0, 0, EverGrandeCity_GlaciasRoom_EventScript_15B6CA, 0 + object_event 1, EVENT_OBJ_GFX_GLACIA, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, EverGrandeCity_GlaciasRoom_EventScript_15B6CA, 0 EverGrandeCity_GlaciasRoom_MapWarps:: @ 838B2D4 warp_def 6, 13, 3, 1, MAP_EVER_GRANDE_CITY_CORRIDOR2 diff --git a/data/maps/EverGrandeCity_HallOfFame/events.inc b/data/maps/EverGrandeCity_HallOfFame/events.inc index f5a3f9137..d8547fbda 100644 --- a/data/maps/EverGrandeCity_HallOfFame/events.inc +++ b/data/maps/EverGrandeCity_HallOfFame/events.inc @@ -1,5 +1,5 @@ EverGrandeCity_HallOfFame_EventObjects:: @ 838B528 - object_event 1, EVENT_OBJ_GFX_STEVEN, 0, 6, 16, 3, 7, 0, 0, 0, 0, 0x0, 0 + object_event 1, EVENT_OBJ_GFX_STEVEN, 0, 6, 16, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0 EverGrandeCity_HallOfFame_MapWarps:: @ 838B540 warp_def 7, 11, 3, 1, MAP_EVER_GRANDE_CITY_CHAMPIONS_ROOM diff --git a/data/maps/EverGrandeCity_PhoebesRoom/events.inc b/data/maps/EverGrandeCity_PhoebesRoom/events.inc index aa67e5912..714de97b8 100644 --- a/data/maps/EverGrandeCity_PhoebesRoom/events.inc +++ b/data/maps/EverGrandeCity_PhoebesRoom/events.inc @@ -1,5 +1,5 @@ EverGrandeCity_PhoebesRoom_EventObjects:: @ 838B280 - object_event 1, EVENT_OBJ_GFX_PHOEBE, 0, 6, 5, 3, 8, 0, 0, 0, 0, EverGrandeCity_PhoebesRoom_EventScript_15B630, 0 + object_event 1, EVENT_OBJ_GFX_PHOEBE, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, EverGrandeCity_PhoebesRoom_EventScript_15B630, 0 EverGrandeCity_PhoebesRoom_MapWarps:: @ 838B298 warp_def 6, 13, 3, 1, MAP_EVER_GRANDE_CITY_CORRIDOR1 diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/events.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/events.inc index ea1045d22..bf4e1db93 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_1F/events.inc +++ b/data/maps/EverGrandeCity_PokemonCenter_1F/events.inc @@ -1,7 +1,7 @@ EverGrandeCity_PokemonCenter_1F_EventObjects:: @ 838B55C - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_15BC70, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 5, 5, 3, 8, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_15BC7E, 0 - object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 10, 7, 3, 10, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_15BC87, 0 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_15BC70, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_15BC7E, 0 + object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 10, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_15BC87, 0 EverGrandeCity_PokemonCenter_1F_MapWarps:: @ 838B5A4 warp_def 7, 8, 3, 1, MAP_EVER_GRANDE_CITY diff --git a/data/maps/EverGrandeCity_PokemonCenter_2F/events.inc b/data/maps/EverGrandeCity_PokemonCenter_2F/events.inc index 36dfa01f7..cdbcd9f32 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_2F/events.inc +++ b/data/maps/EverGrandeCity_PokemonCenter_2F/events.inc @@ -1,7 +1,7 @@ EverGrandeCity_PokemonCenter_2F_EventObjects:: @ 838B5D0 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 2, 3, 8, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_15BCA0, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 7, 2, 3, 8, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_15BCA6, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, 8, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_15BCAC, 0 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_15BCA0, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_15BCA6, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_15BCAC, 0 EverGrandeCity_PokemonCenter_2F_MapWarps:: @ 838B618 warp_def 1, 5, 4, 2, MAP_EVER_GRANDE_CITY_POKEMON_CENTER_1F diff --git a/data/maps/EverGrandeCity_PokemonLeague/events.inc b/data/maps/EverGrandeCity_PokemonLeague/events.inc index 89c6973a5..711978a5a 100644 --- a/data/maps/EverGrandeCity_PokemonLeague/events.inc +++ b/data/maps/EverGrandeCity_PokemonLeague/events.inc @@ -1,8 +1,8 @@ EverGrandeCity_PokemonLeague_EventObjects:: @ 838B494 - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 3, 2, 3, 8, 0, 0, 0, 0, EverGrandeCity_PokemonLeague_EventScript_15BA9A, 0 - object_event 2, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 16, 2, 3, 8, 0, 0, 0, 0, EverGrandeCity_PokemonLeague_EventScript_15BAA8, 0 - object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 8, 2, 3, 8, 1, 1, 0, 0, EverGrandeCity_PokemonLeague_EventScript_15BAD2, 0 - object_event 4, EVENT_OBJ_GFX_MAN_4, 0, 11, 2, 3, 8, 1, 1, 0, 0, EverGrandeCity_PokemonLeague_EventScript_15BAD2, 0 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 3, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, EverGrandeCity_PokemonLeague_EventScript_15BA9A, 0 + object_event 2, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 16, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, EverGrandeCity_PokemonLeague_EventScript_15BAA8, 0 + object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 8, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonLeague_EventScript_15BAD2, 0 + object_event 4, EVENT_OBJ_GFX_MAN_4, 0, 11, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonLeague_EventScript_15BAD2, 0 EverGrandeCity_PokemonLeague_MapWarps:: @ 838B4F4 warp_def 9, 11, 3, 0, MAP_EVER_GRANDE_CITY diff --git a/data/maps/EverGrandeCity_SidneysRoom/events.inc b/data/maps/EverGrandeCity_SidneysRoom/events.inc index 552981282..d64e1f6df 100644 --- a/data/maps/EverGrandeCity_SidneysRoom/events.inc +++ b/data/maps/EverGrandeCity_SidneysRoom/events.inc @@ -1,5 +1,5 @@ EverGrandeCity_SidneysRoom_EventObjects:: @ 838B244 - object_event 1, EVENT_OBJ_GFX_SIDNEY, 0, 6, 5, 3, 8, 0, 0, 0, 0, EverGrandeCity_SidneysRoom_EventScript_15B596, 0 + object_event 1, EVENT_OBJ_GFX_SIDNEY, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, EverGrandeCity_SidneysRoom_EventScript_15B596, 0 EverGrandeCity_SidneysRoom_MapWarps:: @ 838B25C warp_def 6, 13, 3, 1, MAP_EVER_GRANDE_CITY_CORRIDOR5 diff --git a/data/maps/FallarborTown/events.inc b/data/maps/FallarborTown/events.inc index 37308b07c..64149231d 100644 --- a/data/maps/FallarborTown/events.inc +++ b/data/maps/FallarborTown/events.inc @@ -1,8 +1,8 @@ FallarborTown_EventObjects:: @ 8380E04 - object_event 1, EVENT_OBJ_GFX_GIRL_1, 0, 8, 11, 3, 8, 0, 1, 0, 0, FallarborTown_EventScript_14E814, 0 - object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 11, 9, 3, 5, 1, 0, 0, 0, FallarborTown_EventScript_14E7F5, 0 - object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 11, 15, 3, 3, 1, 1, 0, 0, FallarborTown_EventScript_14E81D, 0 - object_event 4, EVENT_OBJ_GFX_AZURILL, 0, 8, 12, 3, 1, 1, 0, 0, 0, FallarborTown_EventScript_14E826, FLAG_HIDE_AZURILL_FALLARBOR + object_event 1, EVENT_OBJ_GFX_GIRL_1, 0, 8, 11, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 1, 0, 0, FallarborTown_EventScript_14E814, 0 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 11, 9, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, FallarborTown_EventScript_14E7F5, 0 + object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 11, 15, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 1, 1, 0, 0, FallarborTown_EventScript_14E81D, 0 + object_event 4, EVENT_OBJ_GFX_AZURILL, 0, 8, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 0, 0, 0, FallarborTown_EventScript_14E826, FLAG_HIDE_AZURILL_FALLARBOR FallarborTown_MapWarps:: @ 8380E64 warp_def 15, 15, 0, 0, MAP_FALLARBOR_TOWN_MART diff --git a/data/maps/FallarborTown_ContestHall/events.inc b/data/maps/FallarborTown_ContestHall/events.inc index 9479c8db1..b57f1bf86 100644 --- a/data/maps/FallarborTown_ContestHall/events.inc +++ b/data/maps/FallarborTown_ContestHall/events.inc @@ -1,7 +1,7 @@ FallarborTown_ContestHall_EventObjects:: @ 83867DC - object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 19, 8, 0, 2, 2, 2, 0, 0, FallarborTown_ContestHall_EventScript_153ACF, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 5, 7, 0, 2, 2, 3, 0, 0, FallarborTown_ContestHall_EventScript_153AD8, 0 - object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 15, 0, 2, 3, 3, 0, 0, FallarborTown_ContestHall_EventScript_153AE1, 0 + object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 19, 8, 0, MOVEMENT_TYPE_WANDER_AROUND, 2, 2, 0, 0, FallarborTown_ContestHall_EventScript_153ACF, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 5, 7, 0, MOVEMENT_TYPE_WANDER_AROUND, 2, 3, 0, 0, FallarborTown_ContestHall_EventScript_153AD8, 0 + object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 15, 0, MOVEMENT_TYPE_WANDER_AROUND, 3, 3, 0, 0, FallarborTown_ContestHall_EventScript_153AE1, 0 FallarborTown_ContestHall_MapWarps:: @ 8386824 warp_def 10, 17, 0, 2, MAP_FALLARBOR_TOWN_CONTEST_LOBBY diff --git a/data/maps/FallarborTown_ContestLobby/events.inc b/data/maps/FallarborTown_ContestLobby/events.inc index 47144a554..35237f148 100644 --- a/data/maps/FallarborTown_ContestLobby/events.inc +++ b/data/maps/FallarborTown_ContestLobby/events.inc @@ -1,10 +1,10 @@ FallarborTown_ContestLobby_EventObjects:: @ 83866F0 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 5, 2, 3, 8, 0, 0, 0, 0, FallarborTown_ContestLobby_EventScript_1539CD, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 2, 6, 3, 5, 1, 0, 0, 0, FallarborTown_ContestLobby_EventScript_153A8E, 0 - object_event 3, EVENT_OBJ_GFX_LASS, 0, 0, 4, 3, 8, 0, 0, 0, 0, FallarborTown_ContestLobby_EventScript_153AB2, 0 - object_event 4, EVENT_OBJ_GFX_OLD_MAN_1, 0, 11, 5, 3, 10, 0, 0, 0, 0, FallarborTown_ContestLobby_EventScript_1B778A, 0 - object_event 5, EVENT_OBJ_GFX_REPORTER_M, 0, 7, 5, 3, 9, 0, 0, 0, 0, FallarborTown_ContestLobby_EventScript_1AE0B6, FLAG_HIDE_CONTEST_REPORTER_FALLARBOR - object_event 6, EVENT_OBJ_GFX_ARTIST, 0, 12, 2, 3, 8, 0, 0, 0, 0, FallarborTown_ContestLobby_EventScript_153A97, 0 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 5, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FallarborTown_ContestLobby_EventScript_1539CD, 0 + object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 2, 6, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, FallarborTown_ContestLobby_EventScript_153A8E, 0 + object_event 3, EVENT_OBJ_GFX_LASS, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FallarborTown_ContestLobby_EventScript_153AB2, 0 + object_event 4, EVENT_OBJ_GFX_OLD_MAN_1, 0, 11, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, FallarborTown_ContestLobby_EventScript_1B778A, 0 + object_event 5, EVENT_OBJ_GFX_REPORTER_M, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, FallarborTown_ContestLobby_EventScript_1AE0B6, FLAG_HIDE_CONTEST_REPORTER_FALLARBOR + object_event 6, EVENT_OBJ_GFX_ARTIST, 0, 12, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FallarborTown_ContestLobby_EventScript_153A97, 0 FallarborTown_ContestLobby_MapWarps:: @ 8386780 warp_def 5, 6, 0, 1, MAP_FALLARBOR_TOWN diff --git a/data/maps/FallarborTown_House1/events.inc b/data/maps/FallarborTown_House1/events.inc index fefaadc51..e0342279e 100644 --- a/data/maps/FallarborTown_House1/events.inc +++ b/data/maps/FallarborTown_House1/events.inc @@ -1,6 +1,6 @@ FallarborTown_House1_EventObjects:: @ 8386970 - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 6, 4, 3, 2, 1, 1, 0, 0, FallarborTown_House1_EventScript_153BB5, FLAG_HIDE_PROF_COSMO_FALLARBOR - object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 5, 6, 3, 5, 1, 0, 0, 0, FallarborTown_House1_EventScript_153C5E, 0 + object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 6, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, FallarborTown_House1_EventScript_153BB5, FLAG_HIDE_PROF_COSMO_FALLARBOR + object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 5, 6, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, FallarborTown_House1_EventScript_153C5E, 0 FallarborTown_House1_MapWarps:: @ 83869A0 warp_def 3, 8, 0, 3, MAP_FALLARBOR_TOWN diff --git a/data/maps/FallarborTown_House2/events.inc b/data/maps/FallarborTown_House2/events.inc index b873f95c8..216afb0df 100644 --- a/data/maps/FallarborTown_House2/events.inc +++ b/data/maps/FallarborTown_House2/events.inc @@ -1,5 +1,5 @@ FallarborTown_House2_EventObjects:: @ 83869C4 - object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 4, 4, 3, 8, 0, 0, 0, 0, FallarborTown_House2_EventScript_153C91, 0 + object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FallarborTown_House2_EventScript_153C91, 0 FallarborTown_House2_MapWarps:: @ 83869DC warp_def 3, 7, 0, 4, MAP_FALLARBOR_TOWN diff --git a/data/maps/FallarborTown_Mart/events.inc b/data/maps/FallarborTown_Mart/events.inc index bf3195eea..9fbea3ed8 100644 --- a/data/maps/FallarborTown_Mart/events.inc +++ b/data/maps/FallarborTown_Mart/events.inc @@ -1,8 +1,8 @@ FallarborTown_Mart_EventObjects:: @ 838666C - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, 0, FallarborTown_Mart_EventScript_153967, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 5, 3, 3, 2, 1, 1, 0, 0, FallarborTown_Mart_EventScript_15399C, 0 - object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 9, 6, 3, 8, 0, 0, 0, 0, FallarborTown_Mart_EventScript_1539A5, 0 - object_event 4, EVENT_OBJ_GFX_SKITTY, 0, 2, 5, 3, 1, 1, 1, 0, 0, FallarborTown_Mart_EventScript_1539AE, 0 + object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, FallarborTown_Mart_EventScript_153967, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 5, 3, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, FallarborTown_Mart_EventScript_15399C, 0 + object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 9, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FallarborTown_Mart_EventScript_1539A5, 0 + object_event 4, EVENT_OBJ_GFX_SKITTY, 0, 2, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, FallarborTown_Mart_EventScript_1539AE, 0 FallarborTown_Mart_MapWarps:: @ 83866CC warp_def 3, 7, 0, 0, MAP_FALLARBOR_TOWN diff --git a/data/maps/FallarborTown_PokemonCenter_1F/events.inc b/data/maps/FallarborTown_PokemonCenter_1F/events.inc index 06f8068c6..50f768c2c 100644 --- a/data/maps/FallarborTown_PokemonCenter_1F/events.inc +++ b/data/maps/FallarborTown_PokemonCenter_1F/events.inc @@ -1,8 +1,8 @@ FallarborTown_PokemonCenter_1F_EventObjects:: @ 8386860 - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_153B02, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 10, 6, 3, 10, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_153B10, 0 - object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 2, 3, 3, 8, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_153B19, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_3, 0, 10, 2, 3, 7, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_153B22, FLAG_HIDE_LANETTE_FALLARBOR + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_153B02, 0 + object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 10, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_153B10, 0 + object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_153B19, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_3, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_153B22, FLAG_HIDE_LANETTE_FALLARBOR FallarborTown_PokemonCenter_1F_MapWarps:: @ 83868C0 warp_def 7, 8, 3, 2, MAP_FALLARBOR_TOWN diff --git a/data/maps/FallarborTown_PokemonCenter_2F/events.inc b/data/maps/FallarborTown_PokemonCenter_2F/events.inc index 381051d01..df52f9505 100644 --- a/data/maps/FallarborTown_PokemonCenter_2F/events.inc +++ b/data/maps/FallarborTown_PokemonCenter_2F/events.inc @@ -1,7 +1,7 @@ FallarborTown_PokemonCenter_2F_EventObjects:: @ 83868EC - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, 8, 0, 0, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_153BA8, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 4, 2, 3, 8, 0, 0, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_153B9C, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 7, 2, 3, 8, 0, 0, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_153BA2, 0 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_153BA8, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_153B9C, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_153BA2, 0 FallarborTown_PokemonCenter_2F_MapWarps:: @ 8386934 warp_def 1, 5, 4, 2, MAP_FALLARBOR_TOWN_POKEMON_CENTER_1F diff --git a/data/maps/FieryPath/events.inc b/data/maps/FieryPath/events.inc index faf6d5011..52756fda8 100644 --- a/data/maps/FieryPath/events.inc +++ b/data/maps/FieryPath/events.inc @@ -1,12 +1,12 @@ FieryPath_EventObjects:: @ 838C718 - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 3, 3, 1, 1, 1, 0, 0, FieryPath_EventScript_1B17EE, FLAG_ITEM_FIERY_PATH_1 - object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 10, 15, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11 - object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 17, 15, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12 - object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 11, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_13 - object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 12, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_14 - object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 23, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_15 - object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 24, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_16 - object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 32, 3, 1, 1, 1, 0, 0, FieryPath_EventScript_1B17E1, FLAG_ITEM_FIERY_PATH_2 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, FieryPath_EventScript_1B17EE, FLAG_ITEM_FIERY_PATH_1 + object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 10, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11 + object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 17, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12 + object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_13 + object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_14 + object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 23, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_15 + object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 24, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_16 + object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 32, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, FieryPath_EventScript_1B17E1, FLAG_ITEM_FIERY_PATH_2 FieryPath_MapWarps:: @ 838C7D8 warp_def 26, 36, 3, 4, MAP_ROUTE112 diff --git a/data/maps/FortreeCity/events.inc b/data/maps/FortreeCity/events.inc index 485fd836f..5d7cfea6d 100644 --- a/data/maps/FortreeCity/events.inc +++ b/data/maps/FortreeCity/events.inc @@ -1,11 +1,11 @@ FortreeCity_EventObjects:: @ 8380020 - object_event 1, EVENT_OBJ_GFX_MAN_2, 0, 31, 3, 4, 1, 0, 0, 0, 0, FortreeCity_EventScript_14C955, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_1, 0, 32, 16, 3, 2, 1, 1, 0, 0, FortreeCity_EventScript_14C97D, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 32, 10, 3, 3, 0, 1, 0, 0, FortreeCity_EventScript_14C95E, 0 - object_event 4, EVENT_OBJ_GFX_BOY_1, 0, 11, 14, 4, 1, 0, 0, 0, 0, FortreeCity_EventScript_14C98F, 0 - object_event 5, EVENT_OBJ_GFX_OLD_MAN_2, 0, 8, 10, 3, 1, 0, 0, 0, 0, FortreeCity_EventScript_14C986, 0 - object_event 6, EVENT_OBJ_GFX_BOY_5, 0, 9, 16, 3, 8, 0, 0, 0, 0, FortreeCity_EventScript_14C998, 0 - object_event 7, EVENT_OBJ_GFX_KECLEON_1, 0, 25, 8, 3, 76, 1, 1, 0, 0, FortreeCity_EventScript_14C9B3, FLAG_HIDE_KECLEON_FORTREE + object_event 1, EVENT_OBJ_GFX_MAN_2, 0, 31, 3, 4, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FortreeCity_EventScript_14C955, 0 + object_event 2, EVENT_OBJ_GFX_GIRL_1, 0, 32, 16, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, FortreeCity_EventScript_14C97D, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 32, 10, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, FortreeCity_EventScript_14C95E, 0 + object_event 4, EVENT_OBJ_GFX_BOY_1, 0, 11, 14, 4, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FortreeCity_EventScript_14C98F, 0 + object_event 5, EVENT_OBJ_GFX_OLD_MAN_2, 0, 8, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FortreeCity_EventScript_14C986, 0 + object_event 6, EVENT_OBJ_GFX_BOY_5, 0, 9, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_EventScript_14C998, 0 + object_event 7, EVENT_OBJ_GFX_KECLEON_1, 0, 25, 8, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, FortreeCity_EventScript_14C9B3, FLAG_HIDE_KECLEON_FORTREE FortreeCity_MapWarps:: @ 83800C8 warp_def 5, 6, 0, 0, MAP_FORTREE_CITY_POKEMON_CENTER_1F diff --git a/data/maps/FortreeCity_DecorationShop/events.inc b/data/maps/FortreeCity_DecorationShop/events.inc index 47e635fa8..307e0b520 100644 --- a/data/maps/FortreeCity_DecorationShop/events.inc +++ b/data/maps/FortreeCity_DecorationShop/events.inc @@ -1,8 +1,8 @@ FortreeCity_DecorationShop_EventObjects:: @ 83893E0 - object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 6, 5, 3, 1, 1, 1, 0, 0, FortreeCity_DecorationShop_EventScript_158258, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 0, 4, 3, 9, 0, 0, 0, 0, FortreeCity_DecorationShop_EventScript_158261, 0 - object_event 3, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 2, 3, 8, 0, 0, 0, 0, FortreeCity_DecorationShop_EventScript_15826A, 0 - object_event 4, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 6, 2, 3, 8, 0, 0, 0, 0, FortreeCity_DecorationShop_EventScript_158298, 0 + object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 6, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, FortreeCity_DecorationShop_EventScript_158258, 0 + object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, FortreeCity_DecorationShop_EventScript_158261, 0 + object_event 3, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_DecorationShop_EventScript_15826A, 0 + object_event 4, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 6, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_DecorationShop_EventScript_158298, 0 FortreeCity_DecorationShop_MapWarps:: @ 8389440 warp_def 3, 5, 0, 8, MAP_FORTREE_CITY diff --git a/data/maps/FortreeCity_Gym/events.inc b/data/maps/FortreeCity_Gym/events.inc index 9ff31951b..27d70a810 100644 --- a/data/maps/FortreeCity_Gym/events.inc +++ b/data/maps/FortreeCity_Gym/events.inc @@ -1,10 +1,10 @@ FortreeCity_Gym_EventObjects:: @ 8389018 - object_event 1, EVENT_OBJ_GFX_WINONA, 0, 4, 1, 3, 8, 0, 0, 0, 0, FortreeCity_Gym_EventScript_157EF0, 0 - object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 12, 22, 3, 7, 0, 0, 1, 3, FortreeCity_Gym_EventScript_157F62, 0 - object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 9, 9, 3, 8, 0, 0, 1, 3, FortreeCity_Gym_EventScript_157F90, 0 - object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 18, 19, 3, 9, 0, 0, 1, 4, FortreeCity_Gym_EventScript_157FA7, 0 - object_event 5, EVENT_OBJ_GFX_MAN_6, 0, 18, 1, 3, 8, 0, 0, 1, 1, FortreeCity_Gym_EventScript_157F79, 0 - object_event 6, EVENT_OBJ_GFX_MAN_2, 0, 2, 19, 3, 8, 0, 0, 0, 0, FortreeCity_Gym_EventScript_157FBE, 0 + object_event 1, EVENT_OBJ_GFX_WINONA, 0, 4, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_Gym_EventScript_157EF0, 0 + object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 12, 22, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 3, FortreeCity_Gym_EventScript_157F62, 0 + object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 9, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, FortreeCity_Gym_EventScript_157F90, 0 + object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 18, 19, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 4, FortreeCity_Gym_EventScript_157FA7, 0 + object_event 5, EVENT_OBJ_GFX_MAN_6, 0, 18, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, FortreeCity_Gym_EventScript_157F79, 0 + object_event 6, EVENT_OBJ_GFX_MAN_2, 0, 2, 19, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_Gym_EventScript_157FBE, 0 FortreeCity_Gym_MapWarps:: @ 83890A8 warp_def 2, 24, 0, 2, MAP_FORTREE_CITY diff --git a/data/maps/FortreeCity_House1/events.inc b/data/maps/FortreeCity_House1/events.inc index 5e91f873e..96384694f 100644 --- a/data/maps/FortreeCity_House1/events.inc +++ b/data/maps/FortreeCity_House1/events.inc @@ -1,7 +1,7 @@ FortreeCity_House1_EventObjects:: @ 8388FAC - object_event 1, EVENT_OBJ_GFX_WOMAN_1, 0, 1, 3, 3, 10, 0, 0, 0, 0, FortreeCity_House1_EventScript_157E13, 0 - object_event 2, EVENT_OBJ_GFX_ZIGZAGOON, 0, 2, 3, 3, 9, 0, 0, 0, 0, FortreeCity_House1_EventScript_157EC0, 0 - object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 7, 4, 3, 1, 1, 1, 0, 0, FortreeCity_House1_EventScript_157EB7, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_1, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, FortreeCity_House1_EventScript_157E13, 0 + object_event 2, EVENT_OBJ_GFX_ZIGZAGOON, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, FortreeCity_House1_EventScript_157EC0, 0 + object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 7, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, FortreeCity_House1_EventScript_157EB7, 0 FortreeCity_House1_MapWarps:: @ 8388FF4 warp_def 3, 5, 0, 1, MAP_FORTREE_CITY diff --git a/data/maps/FortreeCity_House2/events.inc b/data/maps/FortreeCity_House2/events.inc index 41d8962fe..e4e46df46 100644 --- a/data/maps/FortreeCity_House2/events.inc +++ b/data/maps/FortreeCity_House2/events.inc @@ -1,5 +1,5 @@ FortreeCity_House2_EventObjects:: @ 8389278 - object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 2, 3, 3, 5, 1, 0, 0, 0, FortreeCity_House2_EventScript_1580B4, 0 + object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 2, 3, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, FortreeCity_House2_EventScript_1580B4, 0 FortreeCity_House2_MapWarps:: @ 8389290 warp_def 3, 5, 0, 4, MAP_FORTREE_CITY diff --git a/data/maps/FortreeCity_House3/events.inc b/data/maps/FortreeCity_House3/events.inc index e02749d0e..d153b4bf8 100644 --- a/data/maps/FortreeCity_House3/events.inc +++ b/data/maps/FortreeCity_House3/events.inc @@ -1,6 +1,6 @@ FortreeCity_House3_EventObjects:: @ 83892B4 - object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 0, 3, 3, 10, 0, 0, 0, 0, FortreeCity_House3_EventScript_15816C, 0 - object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 5, 4, 3, 2, 1, 1, 0, 0, FortreeCity_House3_EventScript_158175, 0 + object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, FortreeCity_House3_EventScript_15816C, 0 + object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 5, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, FortreeCity_House3_EventScript_158175, 0 FortreeCity_House3_MapWarps:: @ 83892E4 warp_def 3, 5, 0, 5, MAP_FORTREE_CITY diff --git a/data/maps/FortreeCity_House4/events.inc b/data/maps/FortreeCity_House4/events.inc index 58285c7f4..c66397c83 100644 --- a/data/maps/FortreeCity_House4/events.inc +++ b/data/maps/FortreeCity_House4/events.inc @@ -1,7 +1,7 @@ FortreeCity_House4_EventObjects:: @ 8389308 - object_event 1, EVENT_OBJ_GFX_WOMAN_5, 0, 6, 4, 3, 2, 1, 1, 0, 0, FortreeCity_House4_EventScript_15817F, 0 - object_event 2, EVENT_OBJ_GFX_BOY_3, 0, 1, 3, 3, 8, 0, 0, 0, 0, FortreeCity_House4_EventScript_158188, 0 - object_event 3, EVENT_OBJ_GFX_WINGULL, 0, 2, 3, 3, 8, 0, 0, 0, 0, FortreeCity_House4_EventScript_15821E, FLAG_HIDE_WINGULL_FORTREE_HOUSE + object_event 1, EVENT_OBJ_GFX_WOMAN_5, 0, 6, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, FortreeCity_House4_EventScript_15817F, 0 + object_event 2, EVENT_OBJ_GFX_BOY_3, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_House4_EventScript_158188, 0 + object_event 3, EVENT_OBJ_GFX_WINGULL, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_House4_EventScript_15821E, FLAG_HIDE_WINGULL_FORTREE_HOUSE FortreeCity_House4_MapWarps:: @ 8389350 warp_def 3, 5, 0, 6, MAP_FORTREE_CITY diff --git a/data/maps/FortreeCity_House5/events.inc b/data/maps/FortreeCity_House5/events.inc index 93447f739..109cdc162 100644 --- a/data/maps/FortreeCity_House5/events.inc +++ b/data/maps/FortreeCity_House5/events.inc @@ -1,7 +1,7 @@ FortreeCity_House5_EventObjects:: @ 8389374 - object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 6, 4, 3, 20, 0, 0, 0, 0, FortreeCity_House5_EventScript_158232, 0 - object_event 2, EVENT_OBJ_GFX_ZIGZAGOON, 0, 6, 3, 3, 8, 0, 0, 0, 0, FortreeCity_House5_EventScript_158244, 0 - object_event 3, EVENT_OBJ_GFX_MAN_1, 0, 2, 4, 3, 10, 0, 0, 0, 0, FortreeCity_House5_EventScript_15823B, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 6, 4, 3, MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT, 0, 0, 0, 0, FortreeCity_House5_EventScript_158232, 0 + object_event 2, EVENT_OBJ_GFX_ZIGZAGOON, 0, 6, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_House5_EventScript_158244, 0 + object_event 3, EVENT_OBJ_GFX_MAN_1, 0, 2, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, FortreeCity_House5_EventScript_15823B, 0 FortreeCity_House5_MapWarps:: @ 83893BC warp_def 3, 5, 0, 7, MAP_FORTREE_CITY diff --git a/data/maps/FortreeCity_Mart/events.inc b/data/maps/FortreeCity_Mart/events.inc index a9c48da93..344b70969 100644 --- a/data/maps/FortreeCity_Mart/events.inc +++ b/data/maps/FortreeCity_Mart/events.inc @@ -1,8 +1,8 @@ FortreeCity_Mart_EventObjects:: @ 83891F4 - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, 0, FortreeCity_Mart_EventScript_158067, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 9, 3, 3, 7, 0, 0, 0, 0, FortreeCity_Mart_EventScript_158098, 0 - object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 8, 5, 3, 2, 1, 1, 0, 0, FortreeCity_Mart_EventScript_1580A1, 0 - object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 5, 6, 3, 10, 1, 1, 0, 0, FortreeCity_Mart_EventScript_1580AA, 0 + object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, FortreeCity_Mart_EventScript_158067, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 9, 3, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, FortreeCity_Mart_EventScript_158098, 0 + object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 8, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, FortreeCity_Mart_EventScript_1580A1, 0 + object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 5, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, FortreeCity_Mart_EventScript_1580AA, 0 FortreeCity_Mart_MapWarps:: @ 8389254 warp_def 3, 7, 0, 3, MAP_FORTREE_CITY diff --git a/data/maps/FortreeCity_PokemonCenter_1F/events.inc b/data/maps/FortreeCity_PokemonCenter_1F/events.inc index dcf0e088a..b9aa0b6d2 100644 --- a/data/maps/FortreeCity_PokemonCenter_1F/events.inc +++ b/data/maps/FortreeCity_PokemonCenter_1F/events.inc @@ -1,8 +1,8 @@ FortreeCity_PokemonCenter_1F_EventObjects:: @ 83890E4 - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_15801B, 0 - object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 4, 7, 3, 1, 0, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_158029, 0 - object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 8, 5, 3, 1, 0, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_158032, 0 - object_event 4, EVENT_OBJ_GFX_BOY_3, 0, 2, 3, 3, 8, 1, 1, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_15803B, 0 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_15801B, 0 + object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 4, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_158029, 0 + object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 8, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_158032, 0 + object_event 4, EVENT_OBJ_GFX_BOY_3, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_15803B, 0 FortreeCity_PokemonCenter_1F_MapWarps:: @ 8389144 warp_def 7, 8, 3, 0, MAP_FORTREE_CITY diff --git a/data/maps/FortreeCity_PokemonCenter_2F/events.inc b/data/maps/FortreeCity_PokemonCenter_2F/events.inc index 2e410c319..450a9fd27 100644 --- a/data/maps/FortreeCity_PokemonCenter_2F/events.inc +++ b/data/maps/FortreeCity_PokemonCenter_2F/events.inc @@ -1,7 +1,7 @@ FortreeCity_PokemonCenter_2F_EventObjects:: @ 8389170 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 2, 3, 8, 0, 0, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_158054, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 7, 2, 3, 8, 0, 0, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_15805A, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, 8, 0, 0, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_158060, 0 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_158054, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_15805A, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_158060, 0 FortreeCity_PokemonCenter_2F_MapWarps:: @ 83891B8 warp_def 1, 5, 4, 2, MAP_FORTREE_CITY_POKEMON_CENTER_1F diff --git a/data/maps/GraniteCave_1F/events.inc b/data/maps/GraniteCave_1F/events.inc index 20ea8d4d5..67cdbae15 100644 --- a/data/maps/GraniteCave_1F/events.inc +++ b/data/maps/GraniteCave_1F/events.inc @@ -1,6 +1,6 @@ GraniteCave_1F_EventObjects:: @ 838BF24 - object_event 1, EVENT_OBJ_GFX_HIKER, 0, 36, 9, 3, 1, 0, 0, 0, 0, GraniteCave_1F_EventScript_15CBA7, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 17, 7, 3, 8, 0, 0, 0, 0, GraniteCave_1F_EventScript_1B17A0, FLAG_ITEM_GRANITE_CAVE_1F_1 + object_event 1, EVENT_OBJ_GFX_HIKER, 0, 36, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, GraniteCave_1F_EventScript_15CBA7, 0 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 17, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, GraniteCave_1F_EventScript_1B17A0, FLAG_ITEM_GRANITE_CAVE_1F_1 GraniteCave_1F_MapWarps:: @ 838BF54 warp_def 37, 12, 3, 0, MAP_ROUTE106 diff --git a/data/maps/GraniteCave_B1F/events.inc b/data/maps/GraniteCave_B1F/events.inc index 3d148a922..7516f579e 100644 --- a/data/maps/GraniteCave_B1F/events.inc +++ b/data/maps/GraniteCave_B1F/events.inc @@ -1,5 +1,5 @@ GraniteCave_B1F_EventObjects:: @ 838BF88 - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 21, 3, 1, 0, 0, 0, 0, GraniteCave_B1F_EventScript_1B17AD, FLAG_ITEM_GRANITE_CAVE_B1F_1 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 21, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, GraniteCave_B1F_EventScript_1B17AD, FLAG_ITEM_GRANITE_CAVE_B1F_1 GraniteCave_B1F_MapWarps:: @ 838BFA0 warp_def 25, 13, 3, 1, MAP_GRANITE_CAVE_1F diff --git a/data/maps/GraniteCave_B2F/events.inc b/data/maps/GraniteCave_B2F/events.inc index e5c7b1768..7f85264a3 100644 --- a/data/maps/GraniteCave_B2F/events.inc +++ b/data/maps/GraniteCave_B2F/events.inc @@ -1,13 +1,13 @@ GraniteCave_B2F_EventObjects:: @ 838BFEC - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 4, 3, 1, 0, 0, 0, 0, GraniteCave_B2F_EventScript_1B17BA, FLAG_ITEM_GRANITE_CAVE_B2F_1 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 4, 3, 1, 0, 0, 0, 0, GraniteCave_B2F_EventScript_1B17C7, FLAG_ITEM_GRANITE_CAVE_B2F_2 - object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 5, 14, 3, 1, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_11 - object_event 4, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 14, 3, 1, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_12 - object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 2, 16, 3, 1, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_13 - object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 7, 12, 3, 1, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_14 - object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 4, 22, 3, 1, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_15 - object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 6, 22, 3, 1, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_16 - object_event 9, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 21, 3, 1, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_17 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, GraniteCave_B2F_EventScript_1B17BA, FLAG_ITEM_GRANITE_CAVE_B2F_1 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, GraniteCave_B2F_EventScript_1B17C7, FLAG_ITEM_GRANITE_CAVE_B2F_2 + object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 5, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_11 + object_event 4, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_12 + object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 2, 16, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_13 + object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 7, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_14 + object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 4, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_15 + object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 6, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_16 + object_event 9, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 21, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_17 GraniteCave_B2F_MapWarps:: @ 838C0C4 warp_def 29, 13, 3, 2, MAP_GRANITE_CAVE_B1F diff --git a/data/maps/GraniteCave_StevensRoom/events.inc b/data/maps/GraniteCave_StevensRoom/events.inc index 9d8f4b2ba..06ea7e6fd 100644 --- a/data/maps/GraniteCave_StevensRoom/events.inc +++ b/data/maps/GraniteCave_StevensRoom/events.inc @@ -1,5 +1,5 @@ GraniteCave_StevensRoom_EventObjects:: @ 838C118 - object_event 1, EVENT_OBJ_GFX_STEVEN, 0, 7, 8, 3, 1, 0, 0, 0, 0, GraniteCave_StevensRoom_EventScript_15CBFA, FLAG_HIDE_STEVEN_GRANITE_CAVE + object_event 1, EVENT_OBJ_GFX_STEVEN, 0, 7, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, GraniteCave_StevensRoom_EventScript_15CBFA, FLAG_HIDE_STEVEN_GRANITE_CAVE GraniteCave_StevensRoom_MapWarps:: @ 838C130 warp_def 7, 3, 3, 3, MAP_GRANITE_CAVE_1F diff --git a/data/maps/InsideOfTruck/events.inc b/data/maps/InsideOfTruck/events.inc index 3aa3036de..cde317788 100644 --- a/data/maps/InsideOfTruck/events.inc +++ b/data/maps/InsideOfTruck/events.inc @@ -1,7 +1,7 @@ InsideOfTruck_EventObjects:: @ 8391618 - object_event 1, EVENT_OBJ_GFX_MOVING_BOX, 0, 0, 0, 8, 8, 0, 0, 0, 0, InsideOfTruck_EventScript_15FC8B, 0 - object_event 2, EVENT_OBJ_GFX_MOVING_BOX, 0, 0, 3, 8, 8, 0, 0, 0, 0, InsideOfTruck_EventScript_15FC8B, 0 - object_event 3, EVENT_OBJ_GFX_MOVING_BOX, 0, 2, 3, 8, 8, 0, 0, 0, 0, InsideOfTruck_EventScript_15FC8B, 0 + object_event 1, EVENT_OBJ_GFX_MOVING_BOX, 0, 0, 0, 8, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, InsideOfTruck_EventScript_15FC8B, 0 + object_event 2, EVENT_OBJ_GFX_MOVING_BOX, 0, 0, 3, 8, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, InsideOfTruck_EventScript_15FC8B, 0 + object_event 3, EVENT_OBJ_GFX_MOVING_BOX, 0, 2, 3, 8, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, InsideOfTruck_EventScript_15FC8B, 0 InsideOfTruck_MapWarps:: @ 8391660 warp_def 4, 1, 0, 127, MAP_NONE diff --git a/data/maps/IslandCave/events.inc b/data/maps/IslandCave/events.inc index 8c279596d..81c834a22 100644 --- a/data/maps/IslandCave/events.inc +++ b/data/maps/IslandCave/events.inc @@ -1,5 +1,5 @@ IslandCave_EventObjects:: @ 838E674 - object_event 1, EVENT_OBJ_GFX_REGICE, 0, 8, 7, 3, 8, 0, 0, 0, 0, IslandCave_EventScript_15EF9D, FLAG_HIDE_REGICE + object_event 1, EVENT_OBJ_GFX_REGICE, 0, 8, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, IslandCave_EventScript_15EF9D, FLAG_HIDE_REGICE IslandCave_MapWarps:: @ 838E68C warp_def 8, 29, 3, 0, MAP_ROUTE105 diff --git a/data/maps/JaggedPass/events.inc b/data/maps/JaggedPass/events.inc index 4b656e76e..f4c2fa515 100644 --- a/data/maps/JaggedPass/events.inc +++ b/data/maps/JaggedPass/events.inc @@ -1,8 +1,8 @@ JaggedPass_EventObjects:: @ 838C61C - object_event 1, EVENT_OBJ_GFX_HIKER, 0, 8, 18, 3, 8, 0, 0, 1, 3, JaggedPass_EventScript_15D285, 0 - object_event 2, EVENT_OBJ_GFX_CAMPER, 0, 16, 22, 3, 14, 0, 0, 1, 2, JaggedPass_EventScript_15D2DA, 0 - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 23, 24, 3, 1, 0, 0, 0, 0, JaggedPass_EventScript_1B17D4, FLAG_ITEM_JAGGED_PASS_1 - object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 13, 35, 3, 15, 1, 1, 1, 3, JaggedPass_EventScript_15D29C, 0 + object_event 1, EVENT_OBJ_GFX_HIKER, 0, 8, 18, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, JaggedPass_EventScript_15D285, 0 + object_event 2, EVENT_OBJ_GFX_CAMPER, 0, 16, 22, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 1, 2, JaggedPass_EventScript_15D2DA, 0 + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 23, 24, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, JaggedPass_EventScript_1B17D4, FLAG_ITEM_JAGGED_PASS_1 + object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 13, 35, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 3, JaggedPass_EventScript_15D29C, 0 JaggedPass_MapWarps:: @ 838C67C warp_def 14, 40, 3, 2, MAP_ROUTE112 diff --git a/data/maps/LavaridgeTown/events.inc b/data/maps/LavaridgeTown/events.inc index 895c792f4..4897197a0 100644 --- a/data/maps/LavaridgeTown/events.inc +++ b/data/maps/LavaridgeTown/events.inc @@ -1,13 +1,13 @@ LavaridgeTown_EventObjects:: @ 8380C78 - object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 8, 7, 3, 8, 0, 0, 0, 0, LavaridgeTown_EventScript_14E751, 0 - object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 5, 1, 3, 8, 0, 0, 0, 0, LavaridgeTown_EventScript_14E724, 0 - object_event 3, EVENT_OBJ_GFX_OLD_MAN_2, 0, 5, 8, 3, 8, 0, 0, 0, 0, LavaridgeTown_EventScript_14E72D, 0 - object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 10, 13, 3, 3, 0, 2, 0, 0, LavaridgeTown_EventScript_14E736, 0 - object_event 5, EVENT_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN, 0, 4, 4, 3, 18, 0, 0, 0, 0, LavaridgeTown_EventScript_14E73F, 0 - object_event 6, EVENT_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN, 0, 5, 4, 3, 17, 0, 0, 0, 0, LavaridgeTown_EventScript_14E748, 0 - object_event 7, EVENT_OBJ_GFX_VAR_3, 0, 6, 16, 3, 9, 0, 0, 0, 0, 0x0, FLAG_HIDE_RIVAL_LAVARIDGE_2 - object_event 8, EVENT_OBJ_GFX_VAR_0, 0, 12, 15, 0, 8, 0, 0, 0, 0, LavaridgeTown_EventScript_14E575, FLAG_HIDE_RIVAL_LAVARIDGE_1 - object_event 9, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 4, 7, 3, 8, 1, 1, 0, 0, LavaridgeTown_EventScript_14E75A, 0 + object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 8, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LavaridgeTown_EventScript_14E751, 0 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 5, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LavaridgeTown_EventScript_14E724, 0 + object_event 3, EVENT_OBJ_GFX_OLD_MAN_2, 0, 5, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LavaridgeTown_EventScript_14E72D, 0 + object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 10, 13, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 2, 0, 0, LavaridgeTown_EventScript_14E736, 0 + object_event 5, EVENT_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 0, 0, 0, 0, LavaridgeTown_EventScript_14E73F, 0 + object_event 6, EVENT_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN, 0, 5, 4, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 0, 0, 0, 0, LavaridgeTown_EventScript_14E748, 0 + object_event 7, EVENT_OBJ_GFX_VAR_3, 0, 6, 16, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, FLAG_HIDE_RIVAL_LAVARIDGE_2 + object_event 8, EVENT_OBJ_GFX_VAR_0, 0, 12, 15, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LavaridgeTown_EventScript_14E575, FLAG_HIDE_RIVAL_LAVARIDGE_1 + object_event 9, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 4, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LavaridgeTown_EventScript_14E75A, 0 LavaridgeTown_MapWarps:: @ 8380D50 warp_def 12, 15, 0, 0, MAP_LAVARIDGE_TOWN_HERB_SHOP diff --git a/data/maps/LavaridgeTown_Gym_1F/events.inc b/data/maps/LavaridgeTown_Gym_1F/events.inc index ed3cc738f..d89e670d2 100644 --- a/data/maps/LavaridgeTown_Gym_1F/events.inc +++ b/data/maps/LavaridgeTown_Gym_1F/events.inc @@ -1,11 +1,11 @@ LavaridgeTown_Gym_1F_EventObjects:: @ 838625C - object_event 1, EVENT_OBJ_GFX_FLANNERY, 0, 8, 10, 3, 8, 0, 0, 0, 0, LavaridgeTown_Gym_1F_EventScript_153741, 0 - object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 10, 19, 3, 8, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_1537CB, 0 - object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 4, 17, 3, 8, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_15383E, 0 - object_event 4, EVENT_OBJ_GFX_MAN_6, 0, 4, 12, 3, 8, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_1537ED, 0 - object_event 5, EVENT_OBJ_GFX_GIRL_3, 0, 0, 2, 3, 8, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_153823, 0 - object_event 6, EVENT_OBJ_GFX_MAN_2, 0, 6, 23, 3, 10, 0, 0, 0, 0, LavaridgeTown_Gym_1F_EventScript_153859, 0 - object_event 7, EVENT_OBJ_GFX_MAN_6, 0, 6, 2, 3, 8, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_153808, 0 + object_event 1, EVENT_OBJ_GFX_FLANNERY, 0, 8, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LavaridgeTown_Gym_1F_EventScript_153741, 0 + object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 10, 19, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_1537CB, 0 + object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 4, 17, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_15383E, 0 + object_event 4, EVENT_OBJ_GFX_MAN_6, 0, 4, 12, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_1537ED, 0 + object_event 5, EVENT_OBJ_GFX_GIRL_3, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_153823, 0 + object_event 6, EVENT_OBJ_GFX_MAN_2, 0, 6, 23, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LavaridgeTown_Gym_1F_EventScript_153859, 0 + object_event 7, EVENT_OBJ_GFX_MAN_6, 0, 6, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_153808, 0 LavaridgeTown_Gym_1F_MapWarps:: @ 8386304 warp_def 8, 23, 3, 1, MAP_LAVARIDGE_TOWN diff --git a/data/maps/LavaridgeTown_HerbShop/events.inc b/data/maps/LavaridgeTown_HerbShop/events.inc index 0e2c546b6..30aa9a965 100644 --- a/data/maps/LavaridgeTown_HerbShop/events.inc +++ b/data/maps/LavaridgeTown_HerbShop/events.inc @@ -1,7 +1,7 @@ LavaridgeTown_HerbShop_EventObjects:: @ 83861F0 - object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 3, 2, 3, 8, 0, 0, 0, 0, LavaridgeTown_HerbShop_EventScript_153629, 0 - object_event 2, EVENT_OBJ_GFX_OLD_MAN_2, 0, 7, 5, 3, 1, 1, 1, 0, 0, LavaridgeTown_HerbShop_EventScript_153655, 0 - object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 9, 3, 3, 5, 1, 1, 0, 0, LavaridgeTown_HerbShop_EventScript_15364C, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 3, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LavaridgeTown_HerbShop_EventScript_153629, 0 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_2, 0, 7, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, LavaridgeTown_HerbShop_EventScript_153655, 0 + object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 9, 3, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 1, 0, 0, LavaridgeTown_HerbShop_EventScript_15364C, 0 LavaridgeTown_HerbShop_MapWarps:: @ 8386238 warp_def 3, 7, 0, 0, MAP_LAVARIDGE_TOWN diff --git a/data/maps/LavaridgeTown_House/events.inc b/data/maps/LavaridgeTown_House/events.inc index 90e33480c..d3d4fe6ac 100644 --- a/data/maps/LavaridgeTown_House/events.inc +++ b/data/maps/LavaridgeTown_House/events.inc @@ -1,6 +1,6 @@ LavaridgeTown_House_EventObjects:: @ 8386494 - object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 2, 3, 3, 1, 1, 1, 0, 0, LavaridgeTown_House_EventScript_1538AE, 0 - object_event 2, EVENT_OBJ_GFX_ZIGZAGOON, 0, 6, 6, 3, 1, 1, 1, 0, 0, LavaridgeTown_House_EventScript_1538B7, 0 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 2, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, LavaridgeTown_House_EventScript_1538AE, 0 + object_event 2, EVENT_OBJ_GFX_ZIGZAGOON, 0, 6, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, LavaridgeTown_House_EventScript_1538B7, 0 LavaridgeTown_House_MapWarps:: @ 83864C4 warp_def 3, 7, 0, 4, MAP_LAVARIDGE_TOWN diff --git a/data/maps/LavaridgeTown_Mart/events.inc b/data/maps/LavaridgeTown_Mart/events.inc index 2d365da54..e0ea1e4a9 100644 --- a/data/maps/LavaridgeTown_Mart/events.inc +++ b/data/maps/LavaridgeTown_Mart/events.inc @@ -1,7 +1,7 @@ LavaridgeTown_Mart_EventObjects:: @ 83864E8 - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, 0, LavaridgeTown_Mart_EventScript_1538CB, 0 - object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 4, 2, 3, 8, 0, 0, 0, 0, LavaridgeTown_Mart_EventScript_1538FA, 0 - object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 9, 5, 3, 10, 0, 0, 0, 0, LavaridgeTown_Mart_EventScript_153903, 0 + object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LavaridgeTown_Mart_EventScript_1538CB, 0 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LavaridgeTown_Mart_EventScript_1538FA, 0 + object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 9, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LavaridgeTown_Mart_EventScript_153903, 0 LavaridgeTown_Mart_MapWarps:: @ 8386530 warp_def 3, 7, 0, 2, MAP_LAVARIDGE_TOWN diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/events.inc b/data/maps/LavaridgeTown_PokemonCenter_1F/events.inc index 98f670755..b76fc0b6b 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_1F/events.inc +++ b/data/maps/LavaridgeTown_PokemonCenter_1F/events.inc @@ -1,8 +1,8 @@ LavaridgeTown_PokemonCenter_1F_EventObjects:: @ 8386554 - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_15391B, 0 - object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 11, 8, 3, 7, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_153929, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_4, 0, 10, 6, 0, 9, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_153932, 0 - object_event 4, EVENT_OBJ_GFX_GENTLEMAN, 0, 1, 3, 3, 10, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_15393B, 0 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_15391B, 0 + object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 11, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_153929, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_4, 0, 10, 6, 0, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_153932, 0 + object_event 4, EVENT_OBJ_GFX_GENTLEMAN, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_15393B, 0 LavaridgeTown_PokemonCenter_1F_MapWarps:: @ 83865B4 warp_def 7, 8, 3, 3, MAP_LAVARIDGE_TOWN diff --git a/data/maps/LavaridgeTown_PokemonCenter_2F/events.inc b/data/maps/LavaridgeTown_PokemonCenter_2F/events.inc index 370feb889..2c1d4678a 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_2F/events.inc +++ b/data/maps/LavaridgeTown_PokemonCenter_2F/events.inc @@ -1,7 +1,7 @@ LavaridgeTown_PokemonCenter_2F_EventObjects:: @ 83865E8 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, 8, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_153960, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 4, 2, 3, 8, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_153954, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 7, 2, 3, 8, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_15395A, 0 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_153960, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_153954, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_15395A, 0 LavaridgeTown_PokemonCenter_2F_MapWarps:: @ 8386630 warp_def 1, 5, 4, 2, MAP_LAVARIDGE_TOWN_POKEMON_CENTER_1F diff --git a/data/maps/LilycoveCity/events.inc b/data/maps/LilycoveCity/events.inc index e2aa43d2d..8dbfff3b3 100644 --- a/data/maps/LilycoveCity/events.inc +++ b/data/maps/LilycoveCity/events.inc @@ -1,21 +1,21 @@ LilycoveCity_EventObjects:: @ 838016C - object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 32, 20, 3, 3, 0, 1, 0, 0, LilycoveCity_EventScript_14CBEF, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_1, 0, 15, 18, 3, 2, 1, 1, 0, 0, LilycoveCity_EventScript_14CBC7, 0 - object_event 3, EVENT_OBJ_GFX_MAN_1, 0, 28, 28, 3, 1, 0, 0, 0, 0, LilycoveCity_EventScript_14CBBE, 0 - object_event 4, EVENT_OBJ_GFX_BOY_4, 0, 21, 15, 3, 2, 1, 1, 0, 0, LilycoveCity_EventScript_14CBE6, 0 - object_event 5, EVENT_OBJ_GFX_MAN_2, 0, 16, 9, 5, 5, 1, 0, 0, 0, LilycoveCity_EventScript_14CC2D, 0 - object_event 6, EVENT_OBJ_GFX_WOMAN_3, 0, 35, 27, 3, 2, 1, 1, 0, 0, LilycoveCity_EventScript_14CC0E, 0 - object_event 7, EVENT_OBJ_GFX_OLD_MAN_1, 0, 35, 37, 5, 8, 0, 0, 0, 0, LilycoveCity_EventScript_14CC36, 0 - object_event 8, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 34, 37, 5, 8, 0, 0, 0, 0, LilycoveCity_EventScript_14CC3F, 0 - object_event 9, EVENT_OBJ_GFX_OLD_MAN_1, 0, 57, 17, 3, 1, 0, 0, 0, 0, LilycoveCity_EventScript_14CC48, 0 - object_event 10, EVENT_OBJ_GFX_VAR_1, 0, 73, 15, 3, 10, 0, 0, 0, 0, LilycoveCity_EventScript_14CCE5, FLAG_HIDE_GRUNTS_LILYCOVE - object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 61, 36, 5, 1, 0, 0, 0, 0, LilycoveCity_EventScript_1B1738, FLAG_ITEM_LILYCOVE_1 - object_event 12, EVENT_OBJ_GFX_VAR_1, 0, 43, 18, 3, 5, 1, 0, 0, 0, LilycoveCity_EventScript_14CD3D, FLAG_HIDE_GRUNTS_LILYCOVE - object_event 13, EVENT_OBJ_GFX_VAR_1, 0, 46, 12, 3, 9, 0, 0, 0, 0, LilycoveCity_EventScript_14CD22, FLAG_HIDE_GRUNTS_LILYCOVE - object_event 14, EVENT_OBJ_GFX_VAR_1, 0, 45, 12, 3, 10, 0, 0, 0, 0, LilycoveCity_EventScript_14CD2B, FLAG_HIDE_GRUNTS_LILYCOVE - object_event 15, EVENT_OBJ_GFX_VAR_1, 0, 38, 9, 5, 9, 0, 0, 0, 0, LilycoveCity_EventScript_14CD34, FLAG_HIDE_GRUNTS_LILYCOVE - object_event 16, EVENT_OBJ_GFX_GENTLEMAN, 0, 50, 7, 5, 2, 1, 1, 0, 0, LilycoveCity_EventScript_14CB74, 0 - object_event 17, EVENT_OBJ_GFX_VAR_0, 0, 27, 7, 5, 8, 1, 1, 0, 0, LilycoveCity_EventScript_14CD46, FLAG_HIDE_RIVAL_LILYCOVE_MART + object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 32, 20, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, LilycoveCity_EventScript_14CBEF, 0 + object_event 2, EVENT_OBJ_GFX_GIRL_1, 0, 15, 18, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_EventScript_14CBC7, 0 + object_event 3, EVENT_OBJ_GFX_MAN_1, 0, 28, 28, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, LilycoveCity_EventScript_14CBBE, 0 + object_event 4, EVENT_OBJ_GFX_BOY_4, 0, 21, 15, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_EventScript_14CBE6, 0 + object_event 5, EVENT_OBJ_GFX_MAN_2, 0, 16, 9, 5, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, LilycoveCity_EventScript_14CC2D, 0 + object_event 6, EVENT_OBJ_GFX_WOMAN_3, 0, 35, 27, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_EventScript_14CC0E, 0 + object_event 7, EVENT_OBJ_GFX_OLD_MAN_1, 0, 35, 37, 5, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_EventScript_14CC36, 0 + object_event 8, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 34, 37, 5, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_EventScript_14CC3F, 0 + object_event 9, EVENT_OBJ_GFX_OLD_MAN_1, 0, 57, 17, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, LilycoveCity_EventScript_14CC48, 0 + object_event 10, EVENT_OBJ_GFX_VAR_1, 0, 73, 15, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_EventScript_14CCE5, FLAG_HIDE_GRUNTS_LILYCOVE + object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 61, 36, 5, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, LilycoveCity_EventScript_1B1738, FLAG_ITEM_LILYCOVE_1 + object_event 12, EVENT_OBJ_GFX_VAR_1, 0, 43, 18, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, LilycoveCity_EventScript_14CD3D, FLAG_HIDE_GRUNTS_LILYCOVE + object_event 13, EVENT_OBJ_GFX_VAR_1, 0, 46, 12, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_EventScript_14CD22, FLAG_HIDE_GRUNTS_LILYCOVE + object_event 14, EVENT_OBJ_GFX_VAR_1, 0, 45, 12, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_EventScript_14CD2B, FLAG_HIDE_GRUNTS_LILYCOVE + object_event 15, EVENT_OBJ_GFX_VAR_1, 0, 38, 9, 5, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_EventScript_14CD34, FLAG_HIDE_GRUNTS_LILYCOVE + object_event 16, EVENT_OBJ_GFX_GENTLEMAN, 0, 50, 7, 5, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_EventScript_14CB74, 0 + object_event 17, EVENT_OBJ_GFX_VAR_0, 0, 27, 7, 5, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_EventScript_14CD46, FLAG_HIDE_RIVAL_LILYCOVE_MART LilycoveCity_MapWarps:: @ 8380304 warp_def 27, 6, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F diff --git a/data/maps/LilycoveCity_ContestHall/events.inc b/data/maps/LilycoveCity_ContestHall/events.inc index bc4331484..cfb6349d5 100644 --- a/data/maps/LilycoveCity_ContestHall/events.inc +++ b/data/maps/LilycoveCity_ContestHall/events.inc @@ -1,36 +1,36 @@ LilycoveCity_ContestHall_EventObjects:: @ 8389A18 - object_event 1, EVENT_OBJ_GFX_BOY_1, 0, 30, 30, 3, 2, 4, 4, 0, 0, LilycoveCity_ContestHall_EventScript_15909B, 0 - object_event 2, EVENT_OBJ_GFX_BOY_3, 0, 11, 7, 3, 2, 3, 3, 0, 0, LilycoveCity_ContestHall_EventScript_1590A4, 0 - object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 40, 8, 3, 2, 2, 2, 0, 0, LilycoveCity_ContestHall_EventScript_1590AD, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 12, 22, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1590BF, 0 - object_event 5, EVENT_OBJ_GFX_CONTEST_JUDGE, 0, 15, 22, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1590D4, 0 - object_event 6, EVENT_OBJ_GFX_BLACK_BELT, 0, 10, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1590E9, 0 - object_event 7, EVENT_OBJ_GFX_OLD_MAN_1, 0, 12, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1590FE, 0 - object_event 8, EVENT_OBJ_GFX_MANIAC, 0, 14, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159113, 0 - object_event 9, EVENT_OBJ_GFX_WOMAN_6, 0, 16, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159128, 0 - object_event 10, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 8, 24, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_15913D, 0 - object_event 11, EVENT_OBJ_GFX_WOMAN_7, 0, 18, 24, 3, 9, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159170, 0 - object_event 12, EVENT_OBJ_GFX_BOY_1, 0, 8, 22, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159146, 0 - object_event 13, EVENT_OBJ_GFX_WOMAN_4, 0, 24, 10, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159185, 0 - object_event 14, EVENT_OBJ_GFX_CONTEST_JUDGE, 0, 27, 10, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_15919A, 0 - object_event 15, EVENT_OBJ_GFX_WOMAN_5, 0, 22, 13, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1591AF, 0 - object_event 16, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 24, 13, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1591C4, 0 - object_event 17, EVENT_OBJ_GFX_PSYCHIC_M, 0, 26, 13, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1591D9, 0 - object_event 18, EVENT_OBJ_GFX_WOMAN_2, 0, 28, 13, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1591EE, 0 - object_event 19, EVENT_OBJ_GFX_WOMAN_3, 0, 20, 10, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159203, 0 - object_event 20, EVENT_OBJ_GFX_WOMAN_1, 0, 30, 11, 3, 9, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_15922D, 0 - object_event 21, EVENT_OBJ_GFX_MAN_1, 0, 26, 8, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159218, 0 - object_event 22, EVENT_OBJ_GFX_CAMPER, 0, 13, 20, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_15915B, 0 - object_event 23, EVENT_OBJ_GFX_WOMAN_4, 0, 36, 22, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159242, 0 - object_event 24, EVENT_OBJ_GFX_CONTEST_JUDGE, 0, 39, 22, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159257, 0 - object_event 25, EVENT_OBJ_GFX_BOY_2, 0, 34, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_15926C, 0 - object_event 26, EVENT_OBJ_GFX_GIRL_2, 0, 36, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159281, 0 - object_event 27, EVENT_OBJ_GFX_BOY_3, 0, 38, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159296, 0 - object_event 28, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 40, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1592AB, 0 - object_event 29, EVENT_OBJ_GFX_WOMAN_3, 0, 32, 23, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1592C0, 0 - object_event 30, EVENT_OBJ_GFX_MAN_1, 0, 37, 20, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1592F7, 0 - object_event 31, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 42, 24, 3, 9, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1592E2, 0 - object_event 32, EVENT_OBJ_GFX_SAILOR, 0, 23, 26, 3, 2, 1, 1, 0, 0, LilycoveCity_ContestHall_EventScript_1590B6, 0 + object_event 1, EVENT_OBJ_GFX_BOY_1, 0, 30, 30, 3, MOVEMENT_TYPE_WANDER_AROUND, 4, 4, 0, 0, LilycoveCity_ContestHall_EventScript_15909B, 0 + object_event 2, EVENT_OBJ_GFX_BOY_3, 0, 11, 7, 3, MOVEMENT_TYPE_WANDER_AROUND, 3, 3, 0, 0, LilycoveCity_ContestHall_EventScript_1590A4, 0 + object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 40, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 2, 0, 0, LilycoveCity_ContestHall_EventScript_1590AD, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 12, 22, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1590BF, 0 + object_event 5, EVENT_OBJ_GFX_CONTEST_JUDGE, 0, 15, 22, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1590D4, 0 + object_event 6, EVENT_OBJ_GFX_BLACK_BELT, 0, 10, 25, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1590E9, 0 + object_event 7, EVENT_OBJ_GFX_OLD_MAN_1, 0, 12, 25, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1590FE, 0 + object_event 8, EVENT_OBJ_GFX_MANIAC, 0, 14, 25, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159113, 0 + object_event 9, EVENT_OBJ_GFX_WOMAN_6, 0, 16, 25, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159128, 0 + object_event 10, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 8, 24, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_15913D, 0 + object_event 11, EVENT_OBJ_GFX_WOMAN_7, 0, 18, 24, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159170, 0 + object_event 12, EVENT_OBJ_GFX_BOY_1, 0, 8, 22, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159146, 0 + object_event 13, EVENT_OBJ_GFX_WOMAN_4, 0, 24, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159185, 0 + object_event 14, EVENT_OBJ_GFX_CONTEST_JUDGE, 0, 27, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_15919A, 0 + object_event 15, EVENT_OBJ_GFX_WOMAN_5, 0, 22, 13, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1591AF, 0 + object_event 16, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 24, 13, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1591C4, 0 + object_event 17, EVENT_OBJ_GFX_PSYCHIC_M, 0, 26, 13, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1591D9, 0 + object_event 18, EVENT_OBJ_GFX_WOMAN_2, 0, 28, 13, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1591EE, 0 + object_event 19, EVENT_OBJ_GFX_WOMAN_3, 0, 20, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159203, 0 + object_event 20, EVENT_OBJ_GFX_WOMAN_1, 0, 30, 11, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_15922D, 0 + object_event 21, EVENT_OBJ_GFX_MAN_1, 0, 26, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159218, 0 + object_event 22, EVENT_OBJ_GFX_CAMPER, 0, 13, 20, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_15915B, 0 + object_event 23, EVENT_OBJ_GFX_WOMAN_4, 0, 36, 22, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159242, 0 + object_event 24, EVENT_OBJ_GFX_CONTEST_JUDGE, 0, 39, 22, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159257, 0 + object_event 25, EVENT_OBJ_GFX_BOY_2, 0, 34, 25, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_15926C, 0 + object_event 26, EVENT_OBJ_GFX_GIRL_2, 0, 36, 25, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159281, 0 + object_event 27, EVENT_OBJ_GFX_BOY_3, 0, 38, 25, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159296, 0 + object_event 28, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 40, 25, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1592AB, 0 + object_event 29, EVENT_OBJ_GFX_WOMAN_3, 0, 32, 23, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1592C0, 0 + object_event 30, EVENT_OBJ_GFX_MAN_1, 0, 37, 20, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1592F7, 0 + object_event 31, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 42, 24, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1592E2, 0 + object_event 32, EVENT_OBJ_GFX_SAILOR, 0, 23, 26, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_ContestHall_EventScript_1590B6, 0 LilycoveCity_ContestHall_MapWarps:: @ 8389D18 warp_def 19, 32, 0, 2, MAP_LILYCOVE_CITY_CONTEST_LOBBY diff --git a/data/maps/LilycoveCity_ContestLobby/events.inc b/data/maps/LilycoveCity_ContestLobby/events.inc index b44590d65..710d5e661 100644 --- a/data/maps/LilycoveCity_ContestLobby/events.inc +++ b/data/maps/LilycoveCity_ContestLobby/events.inc @@ -1,18 +1,18 @@ LilycoveCity_ContestLobby_EventObjects:: @ 838984C - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 3, 8, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_158EB0, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 7, 2, 3, 8, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_158B85, 0 - object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 17, 9, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_1B77AB, 0 - object_event 4, EVENT_OBJ_GFX_ARTIST, 0, 1, 1, 0, 1, 0, 0, 0, 0, 0x0, FLAG_HIDE_LILYCOVE_CONTEST_ATTENDENT_1 - object_event 5, EVENT_OBJ_GFX_BLACK_BELT, 0, 14, 6, 3, 2, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_15901E, 0 - object_event 6, EVENT_OBJ_GFX_GIRL_2, 0, 3, 10, 3, 2, 2, 2, 0, 0, LilycoveCity_ContestLobby_EventScript_159027, 0 - object_event 7, EVENT_OBJ_GFX_ARTIST, 0, 20, 2, 3, 2, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_159042, 0 - object_event 8, EVENT_OBJ_GFX_REPORTER_M, 0, 8, 10, 3, 9, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_1AE0B6, FLAG_HIDE_CONTEST_REPORTER_LILYCOVE - object_event 9, EVENT_OBJ_GFX_BOY_1, 0, 18, 8, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_15907B, 0 - object_event 10, EVENT_OBJ_GFX_GIRL_1, 0, 19, 9, 3, 9, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_159084, 0 - object_event 11, EVENT_OBJ_GFX_ARTIST, 0, 13, 1, 0, 8, 0, 0, 0, 0, 0x0, FLAG_HIDE_ARTIST_LILCOVE_CONTEST - object_event 12, EVENT_OBJ_GFX_FISHERMAN, 0, 13, 10, 3, 2, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_159054, 0 - object_event 13, EVENT_OBJ_GFX_FAT_MAN, 0, 1, 6, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_15904B, 0 - object_event 14, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 7, 7, 3, 3, 0, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_15905D, 0 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_158EB0, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_158B85, 0 + object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 17, 9, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_1B77AB, 0 + object_event 4, EVENT_OBJ_GFX_ARTIST, 0, 1, 1, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_HIDE_LILYCOVE_CONTEST_ATTENDENT_1 + object_event 5, EVENT_OBJ_GFX_BLACK_BELT, 0, 14, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_15901E, 0 + object_event 6, EVENT_OBJ_GFX_GIRL_2, 0, 3, 10, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 2, 0, 0, LilycoveCity_ContestLobby_EventScript_159027, 0 + object_event 7, EVENT_OBJ_GFX_ARTIST, 0, 20, 2, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_159042, 0 + object_event 8, EVENT_OBJ_GFX_REPORTER_M, 0, 8, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_1AE0B6, FLAG_HIDE_CONTEST_REPORTER_LILYCOVE + object_event 9, EVENT_OBJ_GFX_BOY_1, 0, 18, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_15907B, 0 + object_event 10, EVENT_OBJ_GFX_GIRL_1, 0, 19, 9, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_159084, 0 + object_event 11, EVENT_OBJ_GFX_ARTIST, 0, 13, 1, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_ARTIST_LILCOVE_CONTEST + object_event 12, EVENT_OBJ_GFX_FISHERMAN, 0, 13, 10, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_159054, 0 + object_event 13, EVENT_OBJ_GFX_FAT_MAN, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_15904B, 0 + object_event 14, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 7, 7, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_15905D, 0 LilycoveCity_ContestLobby_MapWarps:: @ 838999C warp_def 6, 11, 0, 4, MAP_LILYCOVE_CITY diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/events.inc b/data/maps/LilycoveCity_CoveLilyMotel_1F/events.inc index eee09c890..89eff2309 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_1F/events.inc +++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/events.inc @@ -1,5 +1,5 @@ LilycoveCity_CoveLilyMotel_1F_EventObjects:: @ 8389464 - object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 10, 3, 3, 7, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_1F_EventScript_1582C5, 0 + object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 10, 3, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_1F_EventScript_1582C5, 0 LilycoveCity_CoveLilyMotel_1F_MapWarps:: @ 838947C warp_def 5, 8, 0, 1, MAP_LILYCOVE_CITY diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/events.inc b/data/maps/LilycoveCity_CoveLilyMotel_2F/events.inc index 4469cddb0..fcda95632 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_2F/events.inc +++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/events.inc @@ -1,10 +1,10 @@ LilycoveCity_CoveLilyMotel_2F_EventObjects:: @ 83894B8 - object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 4, 6, 3, 9, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_1583A1, FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE - object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 1, 4, 3, 10, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_1583F7, FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE - object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 7, 7, 3, 10, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_158400, FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE - object_event 4, EVENT_OBJ_GFX_MAN_5, 0, 10, 3, 3, 9, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_1583EE, FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE - object_event 5, EVENT_OBJ_GFX_BOY_5, 0, 7, 3, 3, 8, 1, 1, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_158412, FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE - object_event 6, EVENT_OBJ_GFX_WOMAN_3, 0, 4, 4, 3, 9, 1, 1, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_158409, FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE + object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 4, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_1583A1, FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE + object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_1583F7, FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE + object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 7, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_158400, FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE + object_event 4, EVENT_OBJ_GFX_MAN_5, 0, 10, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_1583EE, FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE + object_event 5, EVENT_OBJ_GFX_BOY_5, 0, 7, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_158412, FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE + object_event 6, EVENT_OBJ_GFX_WOMAN_3, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_158409, FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE LilycoveCity_CoveLilyMotel_2F_MapWarps:: @ 8389548 warp_def 2, 1, 0, 2, MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_1F diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/events.inc b/data/maps/LilycoveCity_DepartmentStoreElevator/events.inc index eca98b599..7e88550d7 100644 --- a/data/maps/LilycoveCity_DepartmentStoreElevator/events.inc +++ b/data/maps/LilycoveCity_DepartmentStoreElevator/events.inc @@ -1,5 +1,5 @@ LilycoveCity_DepartmentStoreElevator_EventObjects:: @ 838A624 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 5, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStoreElevator_EventScript_15A39C, 0 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_DepartmentStoreElevator_EventScript_15A39C, 0 LilycoveCity_DepartmentStoreElevator_MapWarps:: @ 838A63C warp_def 1, 5, 3, 127, MAP_NONE diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/events.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/events.inc index 71d34fa68..da8ad5342 100644 --- a/data/maps/LilycoveCity_DepartmentStoreRooftop/events.inc +++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/events.inc @@ -1,7 +1,7 @@ LilycoveCity_DepartmentStoreRooftop_EventObjects:: @ 838A5A8 - object_event 1, EVENT_OBJ_GFX_MAN_2, 0, 4, 4, 3, 7, 0, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_15A1A0, 0 - object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 7, 5, 3, 5, 1, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_15A1C4, 0 - object_event 3, EVENT_OBJ_GFX_ROOFTOP_SALE_WOMAN, 0, 6, 1, 3, 8, 1, 1, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_15A167, FLAG_HIDE_ROOFTOP_LADY_LILYCOVE_MART + object_event 1, EVENT_OBJ_GFX_MAN_2, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_15A1A0, 0 + object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 7, 5, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_15A1C4, 0 + object_event 3, EVENT_OBJ_GFX_ROOFTOP_SALE_WOMAN, 0, 6, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_15A167, FLAG_HIDE_ROOFTOP_LADY_LILYCOVE_MART LilycoveCity_DepartmentStoreRooftop_MapWarps:: @ 838A5F0 warp_def 13, 3, 0, 2, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/events.inc b/data/maps/LilycoveCity_DepartmentStore_1F/events.inc index d5170d4c1..da2bea5ab 100644 --- a/data/maps/LilycoveCity_DepartmentStore_1F/events.inc +++ b/data/maps/LilycoveCity_DepartmentStore_1F/events.inc @@ -1,10 +1,10 @@ LilycoveCity_DepartmentStore_1F_EventObjects:: @ 838A218 - object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 8, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_159D55, 0 - object_event 2, EVENT_OBJ_GFX_BEAUTY, 0, 10, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_159D5E, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 14, 5, 3, 2, 1, 1, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_159ED7, 0 - object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 4, 4, 3, 2, 1, 1, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_159EE0, 0 - object_event 5, EVENT_OBJ_GFX_MAN_3, 0, 3, 6, 3, 2, 1, 1, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_159EE9, 0 - object_event 6, EVENT_OBJ_GFX_AZUMARILL, 0, 2, 6, 3, 1, 1, 1, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_159EF2, 0 + object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 8, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_159D55, 0 + object_event 2, EVENT_OBJ_GFX_BEAUTY, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_159D5E, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 14, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_159ED7, 0 + object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 4, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_159EE0, 0 + object_event 5, EVENT_OBJ_GFX_MAN_3, 0, 3, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_159EE9, 0 + object_event 6, EVENT_OBJ_GFX_AZUMARILL, 0, 2, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_159EF2, 0 LilycoveCity_DepartmentStore_1F_MapWarps:: @ 838A2A8 warp_def 8, 7, 0, 0, MAP_LILYCOVE_CITY diff --git a/data/maps/LilycoveCity_DepartmentStore_2F/events.inc b/data/maps/LilycoveCity_DepartmentStore_2F/events.inc index 65c22a60f..762a98c1d 100644 --- a/data/maps/LilycoveCity_DepartmentStore_2F/events.inc +++ b/data/maps/LilycoveCity_DepartmentStore_2F/events.inc @@ -1,9 +1,9 @@ LilycoveCity_DepartmentStore_2F_EventObjects:: @ 838A2E8 - object_event 1, EVENT_OBJ_GFX_COOK, 0, 8, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_159F0F, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 5, 3, 2, 1, 1, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_159F18, 0 - object_event 3, EVENT_OBJ_GFX_SAILOR, 0, 13, 5, 3, 2, 1, 1, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_159F21, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 10, 6, 3, 7, 0, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_159F5E, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_4, 0, 7, 6, 3, 7, 0, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_159F2A, 0 + object_event 1, EVENT_OBJ_GFX_COOK, 0, 8, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_159F0F, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_159F18, 0 + object_event 3, EVENT_OBJ_GFX_SAILOR, 0, 13, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_159F21, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 10, 6, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_159F5E, 0 + object_event 5, EVENT_OBJ_GFX_WOMAN_4, 0, 7, 6, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_159F2A, 0 LilycoveCity_DepartmentStore_2F_MapWarps:: @ 838A360 warp_def 16, 1, 0, 2, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F diff --git a/data/maps/LilycoveCity_DepartmentStore_3F/events.inc b/data/maps/LilycoveCity_DepartmentStore_3F/events.inc index 212d44971..fcf7a410e 100644 --- a/data/maps/LilycoveCity_DepartmentStore_3F/events.inc +++ b/data/maps/LilycoveCity_DepartmentStore_3F/events.inc @@ -1,9 +1,9 @@ LilycoveCity_DepartmentStore_3F_EventObjects:: @ 838A38C - object_event 1, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M, 0, 0, 5, 3, 2, 1, 1, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_159FE2, 0 - object_event 2, EVENT_OBJ_GFX_MAN_3, 0, 7, 7, 3, 2, 1, 1, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_159FEB, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 13, 5, 3, 2, 1, 1, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_159FF4, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 8, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_159F91, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_4, 0, 10, 2, 3, 8, 1, 1, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_159FB8, 0 + object_event 1, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M, 0, 0, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_159FE2, 0 + object_event 2, EVENT_OBJ_GFX_MAN_3, 0, 7, 7, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_159FEB, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 13, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_159FF4, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 8, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_159F91, 0 + object_event 5, EVENT_OBJ_GFX_WOMAN_4, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_159FB8, 0 LilycoveCity_DepartmentStore_3F_MapWarps:: @ 838A404 warp_def 13, 1, 0, 1, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_2F diff --git a/data/maps/LilycoveCity_DepartmentStore_4F/events.inc b/data/maps/LilycoveCity_DepartmentStore_4F/events.inc index 40b8eab37..e3b47e523 100644 --- a/data/maps/LilycoveCity_DepartmentStore_4F/events.inc +++ b/data/maps/LilycoveCity_DepartmentStore_4F/events.inc @@ -1,9 +1,9 @@ LilycoveCity_DepartmentStore_4F_EventObjects:: @ 838A430 - object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 2, 3, 2, 1, 1, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_159FFE, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 6, 2, 3, 2, 1, 1, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_15A007, 0 - object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 13, 4, 3, 2, 1, 1, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_15A010, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 7, 6, 3, 7, 0, 0, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_15A019, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_4, 0, 9, 6, 3, 7, 0, 0, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_15A03C, 0 + object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 2, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_159FFE, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 6, 2, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_15A007, 0 + object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 13, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_15A010, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 7, 6, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_15A019, 0 + object_event 5, EVENT_OBJ_GFX_WOMAN_4, 0, 9, 6, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_15A03C, 0 LilycoveCity_DepartmentStore_4F_MapWarps:: @ 838A4A8 warp_def 16, 1, 0, 1, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_3F diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/events.inc b/data/maps/LilycoveCity_DepartmentStore_5F/events.inc index 2883d167b..73e9e6733 100644 --- a/data/maps/LilycoveCity_DepartmentStore_5F/events.inc +++ b/data/maps/LilycoveCity_DepartmentStore_5F/events.inc @@ -1,11 +1,11 @@ LilycoveCity_DepartmentStore_5F_EventObjects:: @ 838A4D4 - object_event 1, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 1, 6, 3, 2, 1, 1, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_15A136, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 7, 7, 3, 17, 1, 1, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_15A124, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_4, 0, 7, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_15A061, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 9, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_15A094, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_4, 0, 15, 6, 3, 9, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_15A0C2, 0 - object_event 6, EVENT_OBJ_GFX_WOMAN_4, 0, 17, 6, 3, 7, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_15A0F2, 0 - object_event 7, EVENT_OBJ_GFX_WOMAN_3, 0, 9, 5, 3, 10, 1, 1, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_15A12D, 0 + object_event 1, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 1, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_15A136, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 7, 7, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_15A124, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_4, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_15A061, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 9, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_15A094, 0 + object_event 5, EVENT_OBJ_GFX_WOMAN_4, 0, 15, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_15A0C2, 0 + object_event 6, EVENT_OBJ_GFX_WOMAN_4, 0, 17, 6, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_15A0F2, 0 + object_event 7, EVENT_OBJ_GFX_WOMAN_3, 0, 9, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_15A12D, 0 LilycoveCity_DepartmentStore_5F_MapWarps:: @ 838A57C warp_def 13, 1, 0, 1, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_4F diff --git a/data/maps/LilycoveCity_Harbor/events.inc b/data/maps/LilycoveCity_Harbor/events.inc index 35a34928f..49f63e89a 100644 --- a/data/maps/LilycoveCity_Harbor/events.inc +++ b/data/maps/LilycoveCity_Harbor/events.inc @@ -1,8 +1,8 @@ LilycoveCity_Harbor_EventObjects:: @ 8389F94 - object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 8, 10, 3, 8, 0, 0, 0, 0, LilycoveCity_Harbor_EventScript_1598A2, FLAG_HIDE_FERRY_ATTENDANT_LILYCOVE - object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 8, 9, 1, 10, 0, 0, 0, 0, 0x0, FLAG_HIDE_SS_TIDAL_LILYCOVE_HARBOR - object_event 3, EVENT_OBJ_GFX_SAILOR, 0, 3, 13, 3, 2, 1, 1, 0, 0, LilycoveCity_Harbor_EventScript_159A8D, 0 - object_event 4, EVENT_OBJ_GFX_SAILOR, 0, 8, 10, 3, 8, 0, 0, 0, 0, 0x0, FLAG_HIDE_FERRY_SAILOR_LILYCOVE + object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 8, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_Harbor_EventScript_1598A2, FLAG_HIDE_FERRY_ATTENDANT_LILYCOVE + object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 8, 9, 1, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_SS_TIDAL_LILYCOVE_HARBOR + object_event 3, EVENT_OBJ_GFX_SAILOR, 0, 3, 13, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_Harbor_EventScript_159A8D, 0 + object_event 4, EVENT_OBJ_GFX_SAILOR, 0, 8, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_FERRY_SAILOR_LILYCOVE LilycoveCity_Harbor_MapWarps:: @ 8389FF4 warp_def 11, 14, 0, 12, MAP_LILYCOVE_CITY diff --git a/data/maps/LilycoveCity_House1/events.inc b/data/maps/LilycoveCity_House1/events.inc index 482ebf0b6..54fb68433 100644 --- a/data/maps/LilycoveCity_House1/events.inc +++ b/data/maps/LilycoveCity_House1/events.inc @@ -1,6 +1,6 @@ LilycoveCity_House1_EventObjects:: @ 838A080 - object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 4, 5, 3, 9, 1, 1, 0, 0, LilycoveCity_House1_EventScript_159B86, 0 - object_event 2, EVENT_OBJ_GFX_KECLEON_1, 0, 4, 4, 3, 8, 0, 0, 0, 0, LilycoveCity_House1_EventScript_159B8F, 0 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, LilycoveCity_House1_EventScript_159B86, 0 + object_event 2, EVENT_OBJ_GFX_KECLEON_1, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_House1_EventScript_159B8F, 0 LilycoveCity_House1_MapWarps:: @ 838A0B0 warp_def 3, 8, 0, 8, MAP_LILYCOVE_CITY diff --git a/data/maps/LilycoveCity_House2/events.inc b/data/maps/LilycoveCity_House2/events.inc index d557cd75a..7362a4d53 100644 --- a/data/maps/LilycoveCity_House2/events.inc +++ b/data/maps/LilycoveCity_House2/events.inc @@ -1,5 +1,5 @@ LilycoveCity_House2_EventObjects:: @ 838A0D4 - object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 4, 3, 8, 0, 0, 0, 0, LilycoveCity_House2_EventScript_159BA3, 0 + object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_House2_EventScript_159BA3, 0 LilycoveCity_House2_MapWarps:: @ 838A0EC warp_def 2, 7, 0, 9, MAP_LILYCOVE_CITY diff --git a/data/maps/LilycoveCity_House3/events.inc b/data/maps/LilycoveCity_House3/events.inc index 2186eb0d2..c6922695e 100644 --- a/data/maps/LilycoveCity_House3/events.inc +++ b/data/maps/LilycoveCity_House3/events.inc @@ -1,10 +1,10 @@ LilycoveCity_House3_EventObjects:: @ 838A110 - object_event 1, EVENT_OBJ_GFX_BOY_5, 0, 3, 4, 3, 8, 1, 1, 0, 0, LilycoveCity_House3_EventScript_159CE5, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 7, 4, 3, 9, 0, 0, 0, 0, LilycoveCity_House3_EventScript_159BF3, 0 - object_event 3, EVENT_OBJ_GFX_BOY_5, 0, 1, 4, 3, 8, 1, 1, 0, 0, LilycoveCity_House3_EventScript_159C7D, 0 - object_event 4, EVENT_OBJ_GFX_BOY_5, 0, 2, 5, 3, 7, 1, 1, 0, 0, LilycoveCity_House3_EventScript_159CB1, 0 - object_event 5, EVENT_OBJ_GFX_BOY_5, 0, 2, 3, 3, 8, 1, 1, 0, 0, LilycoveCity_House3_EventScript_159C49, 0 - object_event 6, EVENT_OBJ_GFX_MAN_1, 0, 7, 5, 3, 9, 1, 1, 0, 0, LilycoveCity_House3_EventScript_159C32, 0 + object_event 1, EVENT_OBJ_GFX_BOY_5, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_House3_EventScript_159CE5, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_House3_EventScript_159BF3, 0 + object_event 3, EVENT_OBJ_GFX_BOY_5, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_House3_EventScript_159C7D, 0 + object_event 4, EVENT_OBJ_GFX_BOY_5, 0, 2, 5, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, LilycoveCity_House3_EventScript_159CB1, 0 + object_event 5, EVENT_OBJ_GFX_BOY_5, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_House3_EventScript_159C49, 0 + object_event 6, EVENT_OBJ_GFX_MAN_1, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, LilycoveCity_House3_EventScript_159C32, 0 LilycoveCity_House3_MapWarps:: @ 838A1A0 warp_def 3, 7, 0, 10, MAP_LILYCOVE_CITY diff --git a/data/maps/LilycoveCity_House4/events.inc b/data/maps/LilycoveCity_House4/events.inc index d5ebda9f2..82117837c 100644 --- a/data/maps/LilycoveCity_House4/events.inc +++ b/data/maps/LilycoveCity_House4/events.inc @@ -1,6 +1,6 @@ LilycoveCity_House4_EventObjects:: @ 838A1C4 - object_event 1, EVENT_OBJ_GFX_MAN_5, 0, 1, 4, 3, 2, 1, 1, 0, 0, LilycoveCity_House4_EventScript_159D42, 0 - object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 7, 4, 3, 2, 1, 1, 0, 0, LilycoveCity_House4_EventScript_159D4B, 0 + object_event 1, EVENT_OBJ_GFX_MAN_5, 0, 1, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_House4_EventScript_159D42, 0 + object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 7, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_House4_EventScript_159D4B, 0 LilycoveCity_House4_MapWarps:: @ 838A1F4 warp_def 3, 8, 0, 11, MAP_LILYCOVE_CITY diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/events.inc b/data/maps/LilycoveCity_LilycoveMuseum_1F/events.inc index a081a6523..93952d8e2 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_1F/events.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/events.inc @@ -1,14 +1,14 @@ LilycoveCity_LilycoveMuseum_1F_EventObjects:: @ 8389564 - object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 5, 12, 3, 10, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_15841C, 0 - object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 16, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158425, FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR - object_event 3, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 13, 7, 3, 10, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158558, 0 - object_event 4, EVENT_OBJ_GFX_ARTIST, 0, 13, 10, 3, 5, 2, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158561, 0 - object_event 5, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 2, 8, 3, 7, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_15856A, 0 - object_event 6, EVENT_OBJ_GFX_WOMAN_5, 0, 3, 8, 3, 7, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158573, 0 - object_event 7, EVENT_OBJ_GFX_WOMAN_3, 0, 11, 3, 3, 2, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_15857C, FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_LADY - object_event 8, EVENT_OBJ_GFX_ARTIST, 0, 19, 3, 3, 7, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_15858E, FLAG_HIDE_LILYCOVE_MUSEUM_PAINTER - object_event 9, EVENT_OBJ_GFX_FAT_MAN, 0, 2, 2, 3, 2, 2, 2, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_1585A3, FLAG_HIDE_LILYCOVE_MUSEUM_VISITORS - object_event 10, EVENT_OBJ_GFX_PSYCHIC_M, 0, 6, 2, 3, 2, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158585, FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_MAN + object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 5, 12, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_15841C, 0 + object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 16, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158425, FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR + object_event 3, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 13, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158558, 0 + object_event 4, EVENT_OBJ_GFX_ARTIST, 0, 13, 10, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 2, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158561, 0 + object_event 5, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 2, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_15856A, 0 + object_event 6, EVENT_OBJ_GFX_WOMAN_5, 0, 3, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158573, 0 + object_event 7, EVENT_OBJ_GFX_WOMAN_3, 0, 11, 3, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_15857C, FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_LADY + object_event 8, EVENT_OBJ_GFX_ARTIST, 0, 19, 3, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_15858E, FLAG_HIDE_LILYCOVE_MUSEUM_PAINTER + object_event 9, EVENT_OBJ_GFX_FAT_MAN, 0, 2, 2, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 2, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_1585A3, FLAG_HIDE_LILYCOVE_MUSEUM_VISITORS + object_event 10, EVENT_OBJ_GFX_PSYCHIC_M, 0, 6, 2, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158585, FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_MAN LilycoveCity_LilycoveMuseum_1F_MapWarps:: @ 8389654 warp_def 9, 13, 0, 3, MAP_LILYCOVE_CITY diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/events.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/events.inc index 4e2ffe49f..e3123c678 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_2F/events.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/events.inc @@ -1,8 +1,8 @@ LilycoveCity_LilycoveMuseum_2F_EventObjects:: @ 8389740 - object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 10, 8, 3, 7, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_1586D8, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_2, 0, 19, 10, 3, 2, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_158805, FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_GIRL - object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 7, 3, 3, 2, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_15880E, FLAG_HIDE_LILYCOVE_MUSEUM_VISITORS - object_event 4, EVENT_OBJ_GFX_BOY_4, 0, 14, 6, 3, 2, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_158817, FLAG_HIDE_LILYCOVE_MUSEUM_VISITORS + object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 10, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_1586D8, 0 + object_event 2, EVENT_OBJ_GFX_GIRL_2, 0, 19, 10, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_158805, FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_GIRL + object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 7, 3, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_15880E, FLAG_HIDE_LILYCOVE_MUSEUM_VISITORS + object_event 4, EVENT_OBJ_GFX_BOY_4, 0, 14, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_158817, FLAG_HIDE_LILYCOVE_MUSEUM_VISITORS LilycoveCity_LilycoveMuseum_2F_MapWarps:: @ 83897A0 warp_def 13, 1, 0, 2, MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F diff --git a/data/maps/LilycoveCity_MoveDeletersHouse/events.inc b/data/maps/LilycoveCity_MoveDeletersHouse/events.inc index d28c4631c..46bf5506a 100644 --- a/data/maps/LilycoveCity_MoveDeletersHouse/events.inc +++ b/data/maps/LilycoveCity_MoveDeletersHouse/events.inc @@ -1,5 +1,5 @@ LilycoveCity_MoveDeletersHouse_EventObjects:: @ 838A044 - object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 4, 4, 3, 8, 0, 0, 0, 0, LilycoveCity_MoveDeletersHouse_EventScript_159AAE, 0 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_MoveDeletersHouse_EventScript_159AAE, 0 LilycoveCity_MoveDeletersHouse_MapWarps:: @ 838A05C warp_def 3, 7, 0, 7, MAP_LILYCOVE_CITY diff --git a/data/maps/LilycoveCity_PokemonCenter_1F/events.inc b/data/maps/LilycoveCity_PokemonCenter_1F/events.inc index 2505adbc3..41bc25d85 100644 --- a/data/maps/LilycoveCity_PokemonCenter_1F/events.inc +++ b/data/maps/LilycoveCity_PokemonCenter_1F/events.inc @@ -1,7 +1,7 @@ LilycoveCity_PokemonCenter_1F_EventObjects:: @ 8389D94 - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_159331, 0 - object_event 2, EVENT_OBJ_GFX_BOY_1, 0, 10, 7, 3, 10, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_15933F, 0 - object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 11, 8, 3, 7, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_159348, 0 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_159331, 0 + object_event 2, EVENT_OBJ_GFX_BOY_1, 0, 10, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_15933F, 0 + object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 11, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_159348, 0 LilycoveCity_PokemonCenter_1F_MapWarps:: @ 8389DDC warp_def 7, 8, 3, 2, MAP_LILYCOVE_CITY diff --git a/data/maps/LilycoveCity_PokemonCenter_2F/events.inc b/data/maps/LilycoveCity_PokemonCenter_2F/events.inc index b8fd09d02..406266099 100644 --- a/data/maps/LilycoveCity_PokemonCenter_2F/events.inc +++ b/data/maps/LilycoveCity_PokemonCenter_2F/events.inc @@ -1,7 +1,7 @@ LilycoveCity_PokemonCenter_2F_EventObjects:: @ 8389E08 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_159377, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 7, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_15937D, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_159383, 0 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_159377, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_15937D, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_159383, 0 LilycoveCity_PokemonCenter_2F_MapWarps:: @ 8389E50 warp_def 1, 5, 4, 2, MAP_LILYCOVE_CITY_POKEMON_CENTER_1F diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/events.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/events.inc index 4f1d4ff4d..e5b68f635 100644 --- a/data/maps/LilycoveCity_PokemonTrainerFanClub/events.inc +++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/events.inc @@ -1,12 +1,12 @@ LilycoveCity_PokemonTrainerFanClub_EventObjects:: @ 8389EB0 - object_event 1, EVENT_OBJ_GFX_LASS, 0, 3, 11, 3, 7, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_1595A6, 0 - object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 8, 10, 3, 9, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_15952F, 0 - object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 6, 11, 3, 7, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_15961D, 0 - object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 5, 8, 3, 8, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_159694, 0 - object_event 5, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 7, 11, 3, 7, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_15970B, FLAG_HIDE_FANCLUB_LITTLE_BOY - object_event 6, EVENT_OBJ_GFX_BOY_2, 0, 1, 9, 3, 8, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_15976D, FLAG_HIDE_FANCLUB_BOY - object_event 7, EVENT_OBJ_GFX_WOMAN_4, 0, 3, 10, 3, 10, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_1597CF, FLAG_HIDE_FANCLUB_LADY - object_event 8, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 10, 10, 3, 9, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_159831, FLAG_HIDE_FANCLUB_OLD_LADY + object_event 1, EVENT_OBJ_GFX_LASS, 0, 3, 11, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_1595A6, 0 + object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 8, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_15952F, 0 + object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 6, 11, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_15961D, 0 + object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 5, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_159694, 0 + object_event 5, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 7, 11, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_15970B, FLAG_HIDE_FANCLUB_LITTLE_BOY + object_event 6, EVENT_OBJ_GFX_BOY_2, 0, 1, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_15976D, FLAG_HIDE_FANCLUB_BOY + object_event 7, EVENT_OBJ_GFX_WOMAN_4, 0, 3, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_1597CF, FLAG_HIDE_FANCLUB_LADY + object_event 8, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 10, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_159831, FLAG_HIDE_FANCLUB_OLD_LADY LilycoveCity_PokemonTrainerFanClub_MapWarps:: @ 8389F70 warp_def 6, 13, 0, 5, MAP_LILYCOVE_CITY diff --git a/data/maps/LinkContestRoom1/events.inc b/data/maps/LinkContestRoom1/events.inc index 9bcf27a90..13470e4f5 100644 --- a/data/maps/LinkContestRoom1/events.inc +++ b/data/maps/LinkContestRoom1/events.inc @@ -1,18 +1,18 @@ LinkContestRoom1_EventObjects:: @ 839149C - object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 6, 4, 3, 8, 0, 0, 0, 0, 0x0, 0 - object_event 2, EVENT_OBJ_GFX_CONTEST_JUDGE, 0, 7, 4, 3, 8, 0, 0, 0, 0, 0x0, 0 - object_event 3, EVENT_OBJ_GFX_VAR_0, 0, 4, 7, 3, 7, 0, 0, 0, 0, 0x0, 0 - object_event 4, EVENT_OBJ_GFX_VAR_1, 0, 6, 7, 3, 7, 0, 0, 0, 0, 0x0, 0 - object_event 5, EVENT_OBJ_GFX_VAR_2, 0, 8, 7, 3, 7, 0, 0, 0, 0, 0x0, 0 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 2, 6, 3, 10, 0, 0, 0, 0, 0x0, 0 - object_event 7, EVENT_OBJ_GFX_VAR_6, 0, 4, 2, 3, 8, 0, 0, 0, 0, 0x0, 0 - object_event 8, EVENT_OBJ_GFX_VAR_7, 0, 5, 2, 3, 8, 0, 0, 0, 0, 0x0, 0 - object_event 9, EVENT_OBJ_GFX_VAR_8, 0, 9, 2, 3, 8, 0, 0, 0, 0, 0x0, 0 - object_event 10, EVENT_OBJ_GFX_VAR_9, 0, 10, 2, 3, 8, 0, 0, 0, 0, 0x0, 0 - object_event 11, EVENT_OBJ_GFX_VAR_A, 0, 12, 5, 3, 9, 0, 0, 0, 0, 0x0, 0 - object_event 12, EVENT_OBJ_GFX_VAR_5, 0, 2, 5, 3, 10, 0, 0, 0, 0, 0x0, 0 - object_event 13, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 5, 3, 1, 0, 0, 0, 0, 0x0, FLAG_LINK_CONTEST_ROOM_POKEBALL - object_event 14, EVENT_OBJ_GFX_VAR_3, 0, 10, 7, 3, 7, 0, 0, 0, 0, 0x0, 0 - object_event 15, EVENT_OBJ_GFX_ARTIST, 0, 12, 6, 3, 9, 0, 0, 0, 0, 0x0, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 6, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 0 + object_event 2, EVENT_OBJ_GFX_CONTEST_JUDGE, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 0 + object_event 3, EVENT_OBJ_GFX_VAR_0, 0, 4, 7, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0 + object_event 4, EVENT_OBJ_GFX_VAR_1, 0, 6, 7, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0 + object_event 5, EVENT_OBJ_GFX_VAR_2, 0, 8, 7, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0 + object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 2, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 0 + object_event 7, EVENT_OBJ_GFX_VAR_6, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 0 + object_event 8, EVENT_OBJ_GFX_VAR_7, 0, 5, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 0 + object_event 9, EVENT_OBJ_GFX_VAR_8, 0, 9, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 0 + object_event 10, EVENT_OBJ_GFX_VAR_9, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 0 + object_event 11, EVENT_OBJ_GFX_VAR_A, 0, 12, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, 0 + object_event 12, EVENT_OBJ_GFX_VAR_5, 0, 2, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 0 + object_event 13, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_LINK_CONTEST_ROOM_POKEBALL + object_event 14, EVENT_OBJ_GFX_VAR_3, 0, 10, 7, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0 + object_event 15, EVENT_OBJ_GFX_ARTIST, 0, 12, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, 0 LinkContestRoom1_MapEvents:: @ 8391604 diff --git a/data/maps/LittlerootTown/events.inc b/data/maps/LittlerootTown/events.inc index b50dbc7e1..0f439d9bb 100644 --- a/data/maps/LittlerootTown/events.inc +++ b/data/maps/LittlerootTown/events.inc @@ -1,10 +1,10 @@ LittlerootTown_EventObjects:: @ 83808FC - object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_3, 0, 16, 10, 3, 2, 1, 2, 0, 0, LittlerootTown_EventScript_14D6DF, 0 - object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 12, 13, 3, 2, 2, 1, 0, 0, LittlerootTown_EventScript_14D6CD, FLAG_HIDE_FAT_MAN_LITTLEROOT - object_event 3, EVENT_OBJ_GFX_BOY_2, 0, 14, 17, 3, 2, 2, 1, 0, 0, LittlerootTown_EventScript_14D6D6, 0 - object_event 4, EVENT_OBJ_GFX_MOM, 0, 5, 8, 3, 7, 0, 0, 0, 0, LittlerootTown_EventScript_14DCE2, FLAG_HIDE_MOM_LITTLEROOT - object_event 5, EVENT_OBJ_GFX_TRUCK, 0, 2, 10, 4, 10, 0, 0, 0, 0, 0x0, FLAG_HIDE_MOVING_TRUCK_BRENDAN - object_event 6, EVENT_OBJ_GFX_TRUCK, 0, 11, 10, 4, 10, 0, 0, 0, 0, 0x0, FLAG_HIDE_MOVING_TRUCK_MAY + object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_3, 0, 16, 10, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 2, 0, 0, LittlerootTown_EventScript_14D6DF, 0 + object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 12, 13, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 1, 0, 0, LittlerootTown_EventScript_14D6CD, FLAG_HIDE_FAT_MAN_LITTLEROOT + object_event 3, EVENT_OBJ_GFX_BOY_2, 0, 14, 17, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 1, 0, 0, LittlerootTown_EventScript_14D6D6, 0 + object_event 4, EVENT_OBJ_GFX_MOM, 0, 5, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LittlerootTown_EventScript_14DCE2, FLAG_HIDE_MOM_LITTLEROOT + object_event 5, EVENT_OBJ_GFX_TRUCK, 0, 2, 10, 4, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_MOVING_TRUCK_BRENDAN + object_event 6, EVENT_OBJ_GFX_TRUCK, 0, 11, 10, 4, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_MOVING_TRUCK_MAY LittlerootTown_MapWarps:: @ 838098C warp_def 14, 8, 0, 1, MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/events.inc b/data/maps/LittlerootTown_BrendansHouse_1F/events.inc index 4ac7d4b3c..2da4c5748 100644 --- a/data/maps/LittlerootTown_BrendansHouse_1F/events.inc +++ b/data/maps/LittlerootTown_BrendansHouse_1F/events.inc @@ -1,9 +1,9 @@ LittlerootTown_BrendansHouse_1F_EventObjects:: @ 8385674 - object_event 1, EVENT_OBJ_GFX_MOM, 0, 2, 6, 3, 10, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1B6BE9, FLAG_HIDE_BRENDAN_MOM_DOWNSTAIRS - object_event 2, EVENT_OBJ_GFX_MACHOKE_CARRYING_BOX, 0, 1, 3, 3, 28, 3, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1B6CB9, FLAG_HIDE_MACHOKE_MOVER_2 - object_event 3, EVENT_OBJ_GFX_MACHOKE_FACING_AWAY, 0, 4, 5, 3, 65, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1B6CA6, FLAG_HIDE_MACHOKE_MOVER_1 - object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 2, 7, 3, 10, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1529EB, FLAG_HIDE_BRENDAN_MOM - object_event 5, EVENT_OBJ_GFX_NORMAN, 0, 5, 6, 3, 9, 1, 1, 0, 0, 0x0, FLAG_HIDE_NORMAN_LITTLEROOT + object_event 1, EVENT_OBJ_GFX_MOM, 0, 2, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1B6BE9, FLAG_HIDE_BRENDAN_MOM_DOWNSTAIRS + object_event 2, EVENT_OBJ_GFX_MACHOKE_CARRYING_BOX, 0, 1, 3, 3, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 3, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1B6CB9, FLAG_HIDE_MACHOKE_MOVER_2 + object_event 3, EVENT_OBJ_GFX_MACHOKE_FACING_AWAY, 0, 4, 5, 3, MOVEMENT_TYPE_WALK_IN_PLACE_UP, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1B6CA6, FLAG_HIDE_MACHOKE_MOVER_1 + object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 2, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1529EB, FLAG_HIDE_BRENDAN_MOM + object_event 5, EVENT_OBJ_GFX_NORMAN, 0, 5, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, 0x0, FLAG_HIDE_NORMAN_LITTLEROOT LittlerootTown_BrendansHouse_1F_MapWarps:: @ 83856EC warp_def 9, 8, 0, 1, MAP_LITTLEROOT_TOWN diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/events.inc b/data/maps/LittlerootTown_BrendansHouse_2F/events.inc index 2e4c4b6ae..882f54534 100644 --- a/data/maps/LittlerootTown_BrendansHouse_2F/events.inc +++ b/data/maps/LittlerootTown_BrendansHouse_2F/events.inc @@ -1,18 +1,18 @@ LittlerootTown_BrendansHouse_2F_EventObjects:: @ 8385728 - object_event 1, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 2, 3, 7, 1, 0, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_152A9D, FLAG_HIDE_BRENDAN_UPSTAIRS - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 1, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 1, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 0, 1, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 4, 1, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 1, 0, 1, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 2, 3, 1, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 3, 3, 1, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 4, 3, 1, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 5, 0, 1, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 14, EVENT_OBJ_GFX_MOM, 0, 7, 1, 3, 8, 1, 0, 0, 0, 0x0, FLAG_HIDE_MOM_UPSTAIRS + object_event 1, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_UP, 1, 0, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_152A9D, FLAG_HIDE_BRENDAN_UPSTAIRS + object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 + object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 + object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 + object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 + object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 4, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 + object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 1, 0, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 + object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 1, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 + object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 + object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 + object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 + object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 5, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 + object_event 14, EVENT_OBJ_GFX_MOM, 0, 7, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 0, 0, 0, 0x0, FLAG_HIDE_MOM_UPSTAIRS LittlerootTown_BrendansHouse_2F_MapWarps:: @ 8385878 warp_def 7, 1, 0, 2, MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F diff --git a/data/maps/LittlerootTown_MaysHouse_1F/events.inc b/data/maps/LittlerootTown_MaysHouse_1F/events.inc index 353dc00a8..f5fe93e03 100644 --- a/data/maps/LittlerootTown_MaysHouse_1F/events.inc +++ b/data/maps/LittlerootTown_MaysHouse_1F/events.inc @@ -1,9 +1,9 @@ LittlerootTown_MaysHouse_1F_EventObjects:: @ 83858C4 - object_event 1, EVENT_OBJ_GFX_MOM, 0, 8, 6, 3, 9, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1B6BE9, FLAG_HIDE_MAY_MOM_DOWNSTAIRS - object_event 2, EVENT_OBJ_GFX_MACHOKE_FACING_AWAY, 0, 6, 5, 3, 65, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1B6CA6, FLAG_HIDE_MACHOKE_MOVER_1 - object_event 3, EVENT_OBJ_GFX_MACHOKE_CARRYING_BOX, 0, 9, 3, 3, 27, 3, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1B6CB9, FLAG_HIDE_MACHOKE_MOVER_2 - object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 8, 7, 3, 9, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1529EB, FLAG_HIDE_MAY_MOM - object_event 5, EVENT_OBJ_GFX_NORMAN, 0, 5, 6, 3, 10, 1, 1, 0, 0, 0x0, FLAG_HIDE_NORMAN_LITTLEROOT + object_event 1, EVENT_OBJ_GFX_MOM, 0, 8, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1B6BE9, FLAG_HIDE_MAY_MOM_DOWNSTAIRS + object_event 2, EVENT_OBJ_GFX_MACHOKE_FACING_AWAY, 0, 6, 5, 3, MOVEMENT_TYPE_WALK_IN_PLACE_UP, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1B6CA6, FLAG_HIDE_MACHOKE_MOVER_1 + object_event 3, EVENT_OBJ_GFX_MACHOKE_CARRYING_BOX, 0, 9, 3, 3, MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT, 3, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1B6CB9, FLAG_HIDE_MACHOKE_MOVER_2 + object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 8, 7, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1529EB, FLAG_HIDE_MAY_MOM + object_event 5, EVENT_OBJ_GFX_NORMAN, 0, 5, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, FLAG_HIDE_NORMAN_LITTLEROOT LittlerootTown_MaysHouse_1F_MapWarps:: @ 838593C warp_def 1, 8, 0, 0, MAP_LITTLEROOT_TOWN diff --git a/data/maps/LittlerootTown_MaysHouse_2F/events.inc b/data/maps/LittlerootTown_MaysHouse_2F/events.inc index 98a144305..98c1f9660 100644 --- a/data/maps/LittlerootTown_MaysHouse_2F/events.inc +++ b/data/maps/LittlerootTown_MaysHouse_2F/events.inc @@ -1,19 +1,19 @@ LittlerootTown_MaysHouse_2F_EventObjects:: @ 8385978 - object_event 1, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL, 0, 8, 2, 3, 7, 1, 0, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_152A9D, FLAG_HIDE_MAY_UPSTAIRS - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 6, 0, 1, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 1, 6, 3, 1, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 2, 6, 0, 1, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 3, 6, 3, 1, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 4, 6, 3, 1, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 5, 6, 3, 1, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 7, 3, 1, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 7, 3, 1, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 2, 7, 3, 1, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 3, 7, 3, 1, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 4, 7, 3, 1, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 5, 7, 3, 1, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 14, EVENT_OBJ_GFX_MOM, 0, 1, 1, 3, 8, 1, 0, 0, 0, 0x0, FLAG_HIDE_MOM_UPSTAIRS - object_event 15, EVENT_OBJ_GFX_PICHU_DOLL, 0, 3, 4, 4, 8, 1, 1, 0, 0, 0x0, FLAG_HIDE_MAY_PICHU_DOLL + object_event 1, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL, 0, 8, 2, 3, MOVEMENT_TYPE_FACE_UP, 1, 0, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_152A9D, FLAG_HIDE_MAY_UPSTAIRS + object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 6, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 1, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 + object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 2, 6, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 + object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 3, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 + object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 4, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 + object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 5, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 + object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 + object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 + object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 2, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 + object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 3, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 + object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 4, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 + object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 5, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 + object_event 14, EVENT_OBJ_GFX_MOM, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 0, 0, 0, 0x0, FLAG_HIDE_MOM_UPSTAIRS + object_event 15, EVENT_OBJ_GFX_PICHU_DOLL, 0, 3, 4, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_MAY_PICHU_DOLL LittlerootTown_MaysHouse_2F_MapWarps:: @ 8385AE0 warp_def 1, 1, 0, 2, MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/events.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/events.inc index bca8009b5..54d74f9ac 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/events.inc +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/events.inc @@ -1,7 +1,7 @@ LittlerootTown_ProfessorBirchsLab_EventObjects:: @ 8385B2C - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 9, 8, 3, 2, 1, 1, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152D63, 0 - object_event 2, EVENT_OBJ_GFX_PROF_BIRCH, 0, 6, 4, 3, 8, 0, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152D9A, FLAG_HIDE_BIRCH_IN_LAB - object_event 3, EVENT_OBJ_GFX_VAR_0, 0, 7, 4, 3, 8, 0, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152EA3, FLAG_HIDE_RIVAL_BIRCH_LAB + object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 9, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152D63, 0 + object_event 2, EVENT_OBJ_GFX_PROF_BIRCH, 0, 6, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152D9A, FLAG_HIDE_BIRCH_IN_LAB + object_event 3, EVENT_OBJ_GFX_VAR_0, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152EA3, FLAG_HIDE_RIVAL_BIRCH_LAB LittlerootTown_ProfessorBirchsLab_MapWarps:: @ 8385B74 warp_def 6, 12, 0, 2, MAP_LITTLEROOT_TOWN diff --git a/data/maps/MagmaHideout_1F/events.inc b/data/maps/MagmaHideout_1F/events.inc index 362d9b719..b9ae7e567 100644 --- a/data/maps/MagmaHideout_1F/events.inc +++ b/data/maps/MagmaHideout_1F/events.inc @@ -1,7 +1,7 @@ MagmaHideout_1F_EventObjects:: @ 838E9BC - object_event 1, EVENT_OBJ_GFX_VAR_1, 0, 13, 19, 3, 8, 1, 1, 0, 0, MagmaHideout_1F_EventScript_15D7CE, FLAG_HIDE_GRUNT_1_BLOCKING_HIDEOUT - object_event 2, EVENT_OBJ_GFX_VAR_1, 0, 14, 19, 3, 8, 1, 1, 0, 0, MagmaHideout_1F_EventScript_15D7ED, FLAG_HIDE_GRUNT_2_BLOCKING_HIDEOUT - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 20, 3, 3, 50, 14, 6, 1, 3, MagmaHideout_1F_EventScript_15D80C, 0 + object_event 1, EVENT_OBJ_GFX_VAR_1, 0, 13, 19, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MagmaHideout_1F_EventScript_15D7CE, FLAG_HIDE_GRUNT_1_BLOCKING_HIDEOUT + object_event 2, EVENT_OBJ_GFX_VAR_1, 0, 14, 19, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MagmaHideout_1F_EventScript_15D7ED, FLAG_HIDE_GRUNT_2_BLOCKING_HIDEOUT + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 20, 3, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT, 14, 6, 1, 3, MagmaHideout_1F_EventScript_15D80C, 0 MagmaHideout_1F_MapWarps:: @ 838EA04 warp_def 13, 27, 1, 14, MAP_LILYCOVE_CITY diff --git a/data/maps/MagmaHideout_B1F/events.inc b/data/maps/MagmaHideout_B1F/events.inc index 5e4c3a078..1301f69f4 100644 --- a/data/maps/MagmaHideout_B1F/events.inc +++ b/data/maps/MagmaHideout_B1F/events.inc @@ -1,12 +1,12 @@ MagmaHideout_B1F_EventObjects:: @ 838EA28 - object_event 1, EVENT_OBJ_GFX_VAR_1, 0, 33, 3, 3, 9, 1, 1, 1, 5, MagmaHideout_B1F_EventScript_15D850, 0 - object_event 2, EVENT_OBJ_GFX_VAR_1, 0, 41, 17, 3, 23, 1, 1, 1, 3, MagmaHideout_B1F_EventScript_15D875, 0 - object_event 3, EVENT_OBJ_GFX_VAR_2, 0, 33, 19, 3, 27, 4, 1, 1, 3, MagmaHideout_B1F_EventScript_15D89A, 0 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 26, 10, 3, 1, 1, 1, 0, 0, MagmaHideout_B1F_EventScript_1B19C2, FLAG_ITEM_MAGMA_HIDEOUT_B1F_1 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 18, 3, 1, 1, 1, 0, 0, MagmaHideout_B1F_EventScript_1B19DC, FLAG_ITEM_MAGMA_HIDEOUT_B1F_2 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 10, 3, 1, 1, 1, 0, 0, MagmaHideout_B1F_EventScript_1A04FD, FLAG_HIDE_ELECTRODE_1_HIDEOUT - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 26, 11, 3, 1, 1, 1, 0, 0, MagmaHideout_B1F_EventScript_1B19CF, FLAG_ITEM_MAGMA_HIDEOUT_B1F_3 - object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 11, 3, 1, 1, 1, 0, 0, MagmaHideout_B1F_EventScript_1A051B, FLAG_HIDE_ELECTRODE_2_HIDEOUT + object_event 1, EVENT_OBJ_GFX_VAR_1, 0, 33, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 5, MagmaHideout_B1F_EventScript_15D850, 0 + object_event 2, EVENT_OBJ_GFX_VAR_1, 0, 41, 17, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 1, 1, 1, 3, MagmaHideout_B1F_EventScript_15D875, 0 + object_event 3, EVENT_OBJ_GFX_VAR_2, 0, 33, 19, 3, MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT, 4, 1, 1, 3, MagmaHideout_B1F_EventScript_15D89A, 0 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 26, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MagmaHideout_B1F_EventScript_1B19C2, FLAG_ITEM_MAGMA_HIDEOUT_B1F_1 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 18, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MagmaHideout_B1F_EventScript_1B19DC, FLAG_ITEM_MAGMA_HIDEOUT_B1F_2 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MagmaHideout_B1F_EventScript_1A04FD, FLAG_HIDE_ELECTRODE_1_HIDEOUT + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 26, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MagmaHideout_B1F_EventScript_1B19CF, FLAG_ITEM_MAGMA_HIDEOUT_B1F_3 + object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MagmaHideout_B1F_EventScript_1A051B, FLAG_HIDE_ELECTRODE_2_HIDEOUT MagmaHideout_B1F_MapWarps:: @ 838EAE8 warp_def 3, 3, 3, 1, MAP_MAGMA_HIDEOUT_1F diff --git a/data/maps/MagmaHideout_B2F/events.inc b/data/maps/MagmaHideout_B2F/events.inc index 111b97e42..7b547f68c 100644 --- a/data/maps/MagmaHideout_B2F/events.inc +++ b/data/maps/MagmaHideout_B2F/events.inc @@ -1,9 +1,9 @@ MagmaHideout_B2F_EventObjects:: @ 838EBE4 - object_event 1, EVENT_OBJ_GFX_VAR_1, 0, 8, 19, 3, 10, 1, 1, 0, 0, MagmaHideout_B2F_EventScript_15D8E1, FLAG_HIDE_GRUNTS_HIDEOUTS - object_event 2, EVENT_OBJ_GFX_VAR_1, 0, 31, 11, 3, 51, 7, 4, 1, 3, MagmaHideout_B2F_EventScript_15D962, FLAG_HIDE_GRUNTS_HIDEOUTS - object_event 3, EVENT_OBJ_GFX_SUBMARINE_SHADOW, 0, 12, 20, 1, 10, 1, 1, 0, 0, 0x0, FLAG_HIDE_SUBMARINE_SHADOW_HIDEOUT - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 13, 3, 3, 9, 1, 1, 1, 4, MagmaHideout_B2F_EventScript_15D987, FLAG_HIDE_GRUNTS_HIDEOUTS - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 20, 3, 8, 1, 1, 0, 0, MagmaHideout_B2F_EventScript_1B19E9, FLAG_ITEM_MAGMA_HIDEOUT_B2F_1 + object_event 1, EVENT_OBJ_GFX_VAR_1, 0, 8, 19, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, MagmaHideout_B2F_EventScript_15D8E1, FLAG_HIDE_GRUNTS_HIDEOUTS + object_event 2, EVENT_OBJ_GFX_VAR_1, 0, 31, 11, 3, MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN, 7, 4, 1, 3, MagmaHideout_B2F_EventScript_15D962, FLAG_HIDE_GRUNTS_HIDEOUTS + object_event 3, EVENT_OBJ_GFX_SUBMARINE_SHADOW, 0, 12, 20, 1, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, FLAG_HIDE_SUBMARINE_SHADOW_HIDEOUT + object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 13, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 4, MagmaHideout_B2F_EventScript_15D987, FLAG_HIDE_GRUNTS_HIDEOUTS + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 20, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MagmaHideout_B2F_EventScript_1B19E9, FLAG_ITEM_MAGMA_HIDEOUT_B2F_1 MagmaHideout_B2F_MapWarps:: @ 838EC5C warp_def 3, 3, 3, 1, MAP_MAGMA_HIDEOUT_B1F diff --git a/data/maps/MauvilleCity/events.inc b/data/maps/MauvilleCity/events.inc index 6b26c7973..7fda28c46 100644 --- a/data/maps/MauvilleCity/events.inc +++ b/data/maps/MauvilleCity/events.inc @@ -1,13 +1,13 @@ MauvilleCity_EventObjects:: @ 837FB90 - object_event 1, EVENT_OBJ_GFX_BOY_3, 0, 29, 16, 3, 5, 1, 1, 0, 0, MauvilleCity_EventScript_14C05A, 0 - object_event 2, EVENT_OBJ_GFX_BOY_4, 0, 24, 10, 3, 5, 1, 0, 0, 0, MauvilleCity_EventScript_14C075, 0 - object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 14, 11, 3, 10, 0, 0, 0, 0, MauvilleCity_EventScript_14C063, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 18, 6, 3, 1, 0, 0, 0, 0, MauvilleCity_EventScript_14C06C, 0 - object_event 5, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 17, 14, 3, 8, 0, 0, 0, 0, MauvilleCity_EventScript_14C0A2, 0 - object_event 6, EVENT_OBJ_GFX_WALLY, 0, 8, 6, 3, 7, 0, 0, 0, 0, MauvilleCity_EventScript_14C0F9, FLAG_HIDE_WALLY_MAUVILLE - object_event 7, EVENT_OBJ_GFX_MAN_3, 0, 9, 6, 3, 9, 0, 0, 0, 0, MauvilleCity_EventScript_14C0C4, FLAG_HIDE_WALLY_FATHER_MAUVILLE - object_event 8, EVENT_OBJ_GFX_WATTSON, 0, 29, 9, 3, 1, 0, 0, 0, 0, MauvilleCity_EventScript_14C2F2, FLAG_HIDE_WATTSON_MAUVILLE - object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 28, 19, 3, 1, 1, 1, 0, 0, MauvilleCity_EventScript_1B171E, FLAG_ITEM_MAUVILLE_1 + object_event 1, EVENT_OBJ_GFX_BOY_3, 0, 29, 16, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 1, 0, 0, MauvilleCity_EventScript_14C05A, 0 + object_event 2, EVENT_OBJ_GFX_BOY_4, 0, 24, 10, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, MauvilleCity_EventScript_14C075, 0 + object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 14, 11, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MauvilleCity_EventScript_14C063, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 18, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MauvilleCity_EventScript_14C06C, 0 + object_event 5, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 17, 14, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MauvilleCity_EventScript_14C0A2, 0 + object_event 6, EVENT_OBJ_GFX_WALLY, 0, 8, 6, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MauvilleCity_EventScript_14C0F9, FLAG_HIDE_WALLY_MAUVILLE + object_event 7, EVENT_OBJ_GFX_MAN_3, 0, 9, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MauvilleCity_EventScript_14C0C4, FLAG_HIDE_WALLY_FATHER_MAUVILLE + object_event 8, EVENT_OBJ_GFX_WATTSON, 0, 29, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MauvilleCity_EventScript_14C2F2, FLAG_HIDE_WATTSON_MAUVILLE + object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 28, 19, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MauvilleCity_EventScript_1B171E, FLAG_ITEM_MAUVILLE_1 MauvilleCity_MapWarps:: @ 837FC68 warp_def 8, 5, 0, 0, MAP_MAUVILLE_CITY_GYM diff --git a/data/maps/MauvilleCity_BikeShop/events.inc b/data/maps/MauvilleCity_BikeShop/events.inc index 83b5f66d8..0d9a0e735 100644 --- a/data/maps/MauvilleCity_BikeShop/events.inc +++ b/data/maps/MauvilleCity_BikeShop/events.inc @@ -1,6 +1,6 @@ MauvilleCity_BikeShop_EventObjects:: @ 8388318 - object_event 1, EVENT_OBJ_GFX_MAN_2, 0, 2, 5, 3, 9, 0, 0, 0, 0, MauvilleCity_BikeShop_EventScript_156796, 0 - object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 7, 6, 3, 2, 1, 1, 0, 0, MauvilleCity_BikeShop_EventScript_15690B, 0 + object_event 1, EVENT_OBJ_GFX_MAN_2, 0, 2, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MauvilleCity_BikeShop_EventScript_156796, 0 + object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 7, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, MauvilleCity_BikeShop_EventScript_15690B, 0 MauvilleCity_BikeShop_MapWarps:: @ 8388348 warp_def 3, 8, 0, 2, MAP_MAUVILLE_CITY diff --git a/data/maps/MauvilleCity_GameCorner/events.inc b/data/maps/MauvilleCity_GameCorner/events.inc index 7b789a34e..d1ad5e4e9 100644 --- a/data/maps/MauvilleCity_GameCorner/events.inc +++ b/data/maps/MauvilleCity_GameCorner/events.inc @@ -1,16 +1,16 @@ MauvilleCity_GameCorner_EventObjects:: @ 83883C0 - object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 12, 7, 3, 8, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_156F84, 0 - object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 16, 5, 3, 8, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_156F8D, 0 - object_event 3, EVENT_OBJ_GFX_BEAUTY, 0, 11, 2, 3, 8, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_156A34, 0 - object_event 4, EVENT_OBJ_GFX_BEAUTY, 0, 14, 2, 3, 8, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_156B6C, 0 - object_event 5, EVENT_OBJ_GFX_GIRL_2, 0, 7, 3, 3, 8, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_156F96, 0 - object_event 6, EVENT_OBJ_GFX_MAN_3, 0, 19, 4, 3, 8, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_15707C, 0 - object_event 7, EVENT_OBJ_GFX_OLD_MAN_2, 0, 20, 8, 3, 9, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1570D8, 0 - object_event 8, EVENT_OBJ_GFX_COOK, 0, 6, 8, 3, 10, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1570E8, 0 - object_event 9, EVENT_OBJ_GFX_BEAUTY, 0, 13, 2, 3, 8, 1, 1, 0, 0, MauvilleCity_GameCorner_EventScript_156D1A, 0 - object_event 10, EVENT_OBJ_GFX_MAN_4, 0, 1, 7, 3, 10, 1, 1, 0, 0, MauvilleCity_GameCorner_EventScript_1570F8, 0 - object_event 11, EVENT_OBJ_GFX_MANIAC, 0, 9, 8, 3, 9, 1, 1, 0, 0, MauvilleCity_GameCorner_EventScript_157115, 0 - object_event 12, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 6, 3, 9, 1, 1, 0, 0, MauvilleCity_GameCorner_EventScript_157125, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 12, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_156F84, 0 + object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 16, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_156F8D, 0 + object_event 3, EVENT_OBJ_GFX_BEAUTY, 0, 11, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_156A34, 0 + object_event 4, EVENT_OBJ_GFX_BEAUTY, 0, 14, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_156B6C, 0 + object_event 5, EVENT_OBJ_GFX_GIRL_2, 0, 7, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_156F96, 0 + object_event 6, EVENT_OBJ_GFX_MAN_3, 0, 19, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_15707C, 0 + object_event 7, EVENT_OBJ_GFX_OLD_MAN_2, 0, 20, 8, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1570D8, 0 + object_event 8, EVENT_OBJ_GFX_COOK, 0, 6, 8, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1570E8, 0 + object_event 9, EVENT_OBJ_GFX_BEAUTY, 0, 13, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MauvilleCity_GameCorner_EventScript_156D1A, 0 + object_event 10, EVENT_OBJ_GFX_MAN_4, 0, 1, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, MauvilleCity_GameCorner_EventScript_1570F8, 0 + object_event 11, EVENT_OBJ_GFX_MANIAC, 0, 9, 8, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, MauvilleCity_GameCorner_EventScript_157115, 0 + object_event 12, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, MauvilleCity_GameCorner_EventScript_157125, 0 MauvilleCity_GameCorner_MapWarps:: @ 83884E0 warp_def 11, 10, 3, 5, MAP_MAUVILLE_CITY diff --git a/data/maps/MauvilleCity_Gym/events.inc b/data/maps/MauvilleCity_Gym/events.inc index cfcbbc4c6..cfc798095 100644 --- a/data/maps/MauvilleCity_Gym/events.inc +++ b/data/maps/MauvilleCity_Gym/events.inc @@ -1,10 +1,10 @@ MauvilleCity_Gym_EventObjects:: @ 838821C - object_event 1, EVENT_OBJ_GFX_WATTSON, 0, 4, 3, 3, 8, 0, 0, 0, 0, MauvilleCity_Gym_EventScript_1565AB, FLAG_HIDE_WATTSON_MAUVILLE_GYM - object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 6, 9, 3, 9, 0, 0, 1, 2, MauvilleCity_Gym_EventScript_1566FD, 0 - object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 7, 11, 3, 8, 0, 0, 1, 1, MauvilleCity_Gym_EventScript_15672B, 0 - object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 1, 13, 3, 10, 0, 0, 1, 1, MauvilleCity_Gym_EventScript_156714, 0 - object_event 5, EVENT_OBJ_GFX_MAN_6, 0, 2, 15, 3, 8, 0, 0, 1, 2, MauvilleCity_Gym_EventScript_1566E6, 0 - object_event 6, EVENT_OBJ_GFX_MAN_2, 0, 7, 20, 3, 9, 0, 0, 0, 0, MauvilleCity_Gym_EventScript_156742, 0 + object_event 1, EVENT_OBJ_GFX_WATTSON, 0, 4, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MauvilleCity_Gym_EventScript_1565AB, FLAG_HIDE_WATTSON_MAUVILLE_GYM + object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 6, 9, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, MauvilleCity_Gym_EventScript_1566FD, 0 + object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 7, 11, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, MauvilleCity_Gym_EventScript_15672B, 0 + object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 1, 13, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 1, MauvilleCity_Gym_EventScript_156714, 0 + object_event 5, EVENT_OBJ_GFX_MAN_6, 0, 2, 15, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 2, MauvilleCity_Gym_EventScript_1566E6, 0 + object_event 6, EVENT_OBJ_GFX_MAN_2, 0, 7, 20, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MauvilleCity_Gym_EventScript_156742, 0 MauvilleCity_Gym_MapWarps:: @ 83882AC warp_def 4, 20, 0, 0, MAP_MAUVILLE_CITY diff --git a/data/maps/MauvilleCity_House1/events.inc b/data/maps/MauvilleCity_House1/events.inc index 07044121d..1555f7069 100644 --- a/data/maps/MauvilleCity_House1/events.inc +++ b/data/maps/MauvilleCity_House1/events.inc @@ -1,5 +1,5 @@ MauvilleCity_House1_EventObjects:: @ 8388384 - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 4, 4, 3, 10, 0, 0, 0, 0, MauvilleCity_House1_EventScript_1569FD, 0 + object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MauvilleCity_House1_EventScript_1569FD, 0 MauvilleCity_House1_MapWarps:: @ 838839C warp_def 3, 7, 0, 4, MAP_MAUVILLE_CITY diff --git a/data/maps/MauvilleCity_House2/events.inc b/data/maps/MauvilleCity_House2/events.inc index 58d8d5a24..8b44f4f1a 100644 --- a/data/maps/MauvilleCity_House2/events.inc +++ b/data/maps/MauvilleCity_House2/events.inc @@ -1,5 +1,5 @@ MauvilleCity_House2_EventObjects:: @ 8388624 - object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 4, 5, 3, 9, 0, 0, 0, 0, MauvilleCity_House2_EventScript_1572C0, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MauvilleCity_House2_EventScript_1572C0, 0 MauvilleCity_House2_MapWarps:: @ 838863C warp_def 3, 8, 0, 6, MAP_MAUVILLE_CITY diff --git a/data/maps/MauvilleCity_Mart/events.inc b/data/maps/MauvilleCity_Mart/events.inc index cb8397726..15ad6437c 100644 --- a/data/maps/MauvilleCity_Mart/events.inc +++ b/data/maps/MauvilleCity_Mart/events.inc @@ -1,7 +1,7 @@ MauvilleCity_Mart_EventObjects:: @ 83887A0 - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, 0, MauvilleCity_Mart_EventScript_1573BE, 0 - object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 5, 4, 3, 10, 0, 0, 0, 0, MauvilleCity_Mart_EventScript_1573F4, 0 - object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 5, 5, 3, 10, 0, 0, 0, 0, MauvilleCity_Mart_EventScript_1573FD, 0 + object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MauvilleCity_Mart_EventScript_1573BE, 0 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 5, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MauvilleCity_Mart_EventScript_1573F4, 0 + object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MauvilleCity_Mart_EventScript_1573FD, 0 MauvilleCity_Mart_MapWarps:: @ 83887E8 warp_def 3, 7, 0, 3, MAP_MAUVILLE_CITY diff --git a/data/maps/MauvilleCity_PokemonCenter_1F/events.inc b/data/maps/MauvilleCity_PokemonCenter_1F/events.inc index 30f702a6f..966cc2b8a 100644 --- a/data/maps/MauvilleCity_PokemonCenter_1F/events.inc +++ b/data/maps/MauvilleCity_PokemonCenter_1F/events.inc @@ -1,9 +1,9 @@ MauvilleCity_PokemonCenter_1F_EventObjects:: @ 8388660 - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_157369, 0 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 2, 3, 3, 9, 1, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_1AE744, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_1, 0, 8, 6, 3, 1, 0, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_157377, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_7, 0, 11, 4, 3, 3, 0, 1, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_157380, 0 - object_event 5, EVENT_OBJ_GFX_YOUNGSTER, 0, 2, 8, 3, 1, 1, 1, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_157389, 0 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_157369, 0 + object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_1AE744, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_1, 0, 8, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_157377, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_7, 0, 11, 4, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_157380, 0 + object_event 5, EVENT_OBJ_GFX_YOUNGSTER, 0, 2, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_157389, 0 MauvilleCity_PokemonCenter_1F_MapWarps:: @ 83886D8 warp_def 7, 8, 3, 1, MAP_MAUVILLE_CITY diff --git a/data/maps/MauvilleCity_PokemonCenter_2F/events.inc b/data/maps/MauvilleCity_PokemonCenter_2F/events.inc index aef1d63ed..77bf817c7 100644 --- a/data/maps/MauvilleCity_PokemonCenter_2F/events.inc +++ b/data/maps/MauvilleCity_PokemonCenter_2F/events.inc @@ -1,8 +1,8 @@ MauvilleCity_PokemonCenter_2F_EventObjects:: @ 8388704 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 2, 3, 8, 0, 0, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_1573A2, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 7, 2, 3, 8, 0, 0, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_1573A8, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, 8, 0, 0, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_1573AE, 0 - object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 6, 7, 3, 5, 1, 0, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_1573B4, 0 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_1573A2, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_1573A8, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_1573AE, 0 + object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 6, 7, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_1573B4, 0 MauvilleCity_PokemonCenter_2F_MapWarps:: @ 8388764 warp_def 1, 5, 4, 2, MAP_MAUVILLE_CITY_POKEMON_CENTER_1F diff --git a/data/maps/MeteorFalls_1F_1R/events.inc b/data/maps/MeteorFalls_1F_1R/events.inc index 0b85c4e98..c21b5928e 100644 --- a/data/maps/MeteorFalls_1F_1R/events.inc +++ b/data/maps/MeteorFalls_1F_1R/events.inc @@ -1,14 +1,14 @@ MeteorFalls_1F_1R_EventObjects:: @ 838BACC - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 4, 3, 1, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_1B17FB, FLAG_ITEM_METEOR_FALLS_1F_1R_1 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 14, 3, 1, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_1B1815, FLAG_ITEM_METEOR_FALLS_1F_1R_3 - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 5, 3, 1, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_1B1808, FLAG_ITEM_METEOR_FALLS_1F_1R_2 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 26, 32, 3, 1, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_1B1822, FLAG_ITEM_METEOR_FALLS_1F_1R_4 - object_event 5, EVENT_OBJ_GFX_VAR_1, 0, 12, 20, 3, 8, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNTS_METEOR_FALLS_1F - object_event 6, EVENT_OBJ_GFX_VAR_1, 0, 14, 21, 3, 9, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNTS_METEOR_FALLS_1F - object_event 7, EVENT_OBJ_GFX_VAR_7, 0, 6, 20, 3, 10, 0, 0, 0, 0, 0x0, FLAG_HIDE_OTHER_TEAM_METEOR_FALLS_1F - object_event 8, EVENT_OBJ_GFX_VAR_4, 0, 6, 20, 3, 10, 0, 0, 0, 0, 0x0, FLAG_HIDE_OTHER_TEAM_METEOR_FALLS_1F - object_event 9, EVENT_OBJ_GFX_VAR_4, 0, 6, 21, 3, 1, 0, 0, 0, 0, 0x0, FLAG_HIDE_OTHER_TEAM_METEOR_FALLS_1F - object_event 10, EVENT_OBJ_GFX_SCIENTIST_1, 0, 13, 23, 3, 21, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_15C656, FLAG_HIDE_PROF_COSMO_METEOR_FALLS + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_1B17FB, FLAG_ITEM_METEOR_FALLS_1F_1R_1 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_1B1815, FLAG_ITEM_METEOR_FALLS_1F_1R_3 + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_1B1808, FLAG_ITEM_METEOR_FALLS_1F_1R_2 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 26, 32, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_1B1822, FLAG_ITEM_METEOR_FALLS_1F_1R_4 + object_event 5, EVENT_OBJ_GFX_VAR_1, 0, 12, 20, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNTS_METEOR_FALLS_1F + object_event 6, EVENT_OBJ_GFX_VAR_1, 0, 14, 21, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNTS_METEOR_FALLS_1F + object_event 7, EVENT_OBJ_GFX_VAR_7, 0, 6, 20, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_OTHER_TEAM_METEOR_FALLS_1F + object_event 8, EVENT_OBJ_GFX_VAR_4, 0, 6, 20, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_OTHER_TEAM_METEOR_FALLS_1F + object_event 9, EVENT_OBJ_GFX_VAR_4, 0, 6, 21, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_HIDE_OTHER_TEAM_METEOR_FALLS_1F + object_event 10, EVENT_OBJ_GFX_SCIENTIST_1, 0, 13, 23, 3, MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_15C656, FLAG_HIDE_PROF_COSMO_METEOR_FALLS MeteorFalls_1F_1R_MapWarps:: @ 838BBBC warp_def 27, 18, 4, 0, MAP_ROUTE114 diff --git a/data/maps/MeteorFalls_1F_2R/events.inc b/data/maps/MeteorFalls_1F_2R/events.inc index 5264fcb5e..cee79720c 100644 --- a/data/maps/MeteorFalls_1F_2R/events.inc +++ b/data/maps/MeteorFalls_1F_2R/events.inc @@ -1,7 +1,7 @@ MeteorFalls_1F_2R_EventObjects:: @ 838BC20 - object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 13, 2, 3, 8, 0, 0, 1, 1, MeteorFalls_1F_2R_EventScript_15C679, 0 - object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 6, 12, 3, 8, 1, 1, 1, 0, MeteorFalls_1F_2R_EventScript_15C6B7, 0 - object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 7, 12, 3, 8, 1, 1, 1, 0, MeteorFalls_1F_2R_EventScript_15C6FD, 0 + object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 13, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, MeteorFalls_1F_2R_EventScript_15C679, 0 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 6, 12, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 0, MeteorFalls_1F_2R_EventScript_15C6B7, 0 + object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 7, 12, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 0, MeteorFalls_1F_2R_EventScript_15C6FD, 0 MeteorFalls_1F_2R_MapWarps:: @ 838BC68 warp_def 10, 29, 3, 2, MAP_METEOR_FALLS_1F_1R diff --git a/data/maps/MeteorFalls_B1F_2R/events.inc b/data/maps/MeteorFalls_B1F_2R/events.inc index 964a6c447..5058ca6bd 100644 --- a/data/maps/MeteorFalls_B1F_2R/events.inc +++ b/data/maps/MeteorFalls_B1F_2R/events.inc @@ -1,5 +1,5 @@ MeteorFalls_B1F_2R_EventObjects:: @ 838BCF8 - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 3, 3, 1, 1, 1, 0, 0, MeteorFalls_B1F_2R_EventScript_1B182F, FLAG_ITEM_METEOR_FALLS_B1F_2R_1 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MeteorFalls_B1F_2R_EventScript_1B182F, FLAG_ITEM_METEOR_FALLS_B1F_2R_1 MeteorFalls_B1F_2R_MapWarps:: @ 838BD10 warp_def 5, 15, 3, 3, MAP_METEOR_FALLS_B1F_1R diff --git a/data/maps/MossdeepCity/events.inc b/data/maps/MossdeepCity/events.inc index 4803f9347..743b8c876 100644 --- a/data/maps/MossdeepCity/events.inc +++ b/data/maps/MossdeepCity/events.inc @@ -1,13 +1,13 @@ MossdeepCity_EventObjects:: @ 838042C - object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 42, 24, 5, 2, 1, 1, 0, 0, MossdeepCity_EventScript_14CFB7, 0 - object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 50, 34, 5, 5, 1, 0, 0, 0, MossdeepCity_EventScript_14CFC9, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 32, 12, 5, 2, 1, 1, 0, 0, MossdeepCity_EventScript_14CFAE, 0 - object_event 4, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 26, 21, 5, 3, 0, 1, 0, 0, MossdeepCity_EventScript_14CFC0, 0 - object_event 5, EVENT_OBJ_GFX_GIRL_1, 0, 45, 18, 7, 9, 0, 0, 0, 0, MossdeepCity_EventScript_14CFD2, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 62, 35, 5, 1, 0, 0, 0, 0, MossdeepCity_EventScript_1B1745, FLAG_ITEM_MOSSDEEP_1 - object_event 7, EVENT_OBJ_GFX_MAN_1, 0, 53, 5, 7, 7, 0, 0, 0, 0, MossdeepCity_EventScript_14D011, 0 - object_event 8, EVENT_OBJ_GFX_GIRL_1, 0, 56, 21, 7, 10, 1, 1, 0, 0, MossdeepCity_EventScript_14CFDB, 0 - object_event 9, EVENT_OBJ_GFX_BOY_2, 0, 23, 13, 5, 2, 1, 1, 0, 0, MossdeepCity_EventScript_14D027, 0 + object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 42, 24, 5, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, MossdeepCity_EventScript_14CFB7, 0 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 50, 34, 5, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, MossdeepCity_EventScript_14CFC9, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 32, 12, 5, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, MossdeepCity_EventScript_14CFAE, 0 + object_event 4, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 26, 21, 5, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, MossdeepCity_EventScript_14CFC0, 0 + object_event 5, EVENT_OBJ_GFX_GIRL_1, 0, 45, 18, 7, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MossdeepCity_EventScript_14CFD2, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 62, 35, 5, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MossdeepCity_EventScript_1B1745, FLAG_ITEM_MOSSDEEP_1 + object_event 7, EVENT_OBJ_GFX_MAN_1, 0, 53, 5, 7, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MossdeepCity_EventScript_14D011, 0 + object_event 8, EVENT_OBJ_GFX_GIRL_1, 0, 56, 21, 7, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, MossdeepCity_EventScript_14CFDB, 0 + object_event 9, EVENT_OBJ_GFX_BOY_2, 0, 23, 13, 5, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, MossdeepCity_EventScript_14D027, 0 MossdeepCity_MapWarps:: @ 8380504 warp_def 28, 9, 0, 0, MAP_MOSSDEEP_CITY_HOUSE1 diff --git a/data/maps/MossdeepCity_GameCorner_1F/events.inc b/data/maps/MossdeepCity_GameCorner_1F/events.inc index 2d10740b1..b721fccca 100644 --- a/data/maps/MossdeepCity_GameCorner_1F/events.inc +++ b/data/maps/MossdeepCity_GameCorner_1F/events.inc @@ -1,5 +1,5 @@ MossdeepCity_GameCorner_1F_EventObjects:: @ 838AC6C - object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 4, 4, 3, 10, 0, 0, 0, 0, MossdeepCity_GameCorner_1F_EventScript_15AD42, 0 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MossdeepCity_GameCorner_1F_EventScript_15AD42, 0 MossdeepCity_GameCorner_1F_MapWarps:: @ 838AC84 warp_def 3, 7, 0, 9, MAP_MOSSDEEP_CITY diff --git a/data/maps/MossdeepCity_GameCorner_B1F/events.inc b/data/maps/MossdeepCity_GameCorner_B1F/events.inc index da6316421..e74b89a16 100644 --- a/data/maps/MossdeepCity_GameCorner_B1F/events.inc +++ b/data/maps/MossdeepCity_GameCorner_B1F/events.inc @@ -1,5 +1,5 @@ MossdeepCity_GameCorner_B1F_EventObjects:: @ 838ACBC - object_event 1, EVENT_OBJ_GFX_VAR_0, 0, 6, 5, 3, 9, 0, 0, 0, 0, 0x0, 0 + object_event 1, EVENT_OBJ_GFX_VAR_0, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, 0 MossdeepCity_GameCorner_B1F_MapWarps:: @ 838ACD4 warp_def 3, 1, 0, 2, MAP_MOSSDEEP_CITY_GAME_CORNER_1F diff --git a/data/maps/MossdeepCity_Gym/events.inc b/data/maps/MossdeepCity_Gym/events.inc index 7c7a25777..8c6afaff4 100644 --- a/data/maps/MossdeepCity_Gym/events.inc +++ b/data/maps/MossdeepCity_Gym/events.inc @@ -1,13 +1,13 @@ MossdeepCity_Gym_EventObjects:: @ 838A660 - object_event 1, EVENT_OBJ_GFX_TATE, 0, 8, 3, 3, 8, 0, 0, 0, 0, MossdeepCity_Gym_EventScript_15A56B, 0 - object_event 2, EVENT_OBJ_GFX_PSYCHIC_M, 0, 2, 24, 3, 7, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_15A74E, 0 - object_event 3, EVENT_OBJ_GFX_PSYCHIC_M, 0, 17, 18, 3, 7, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_15A77C, 0 - object_event 4, EVENT_OBJ_GFX_LASS, 0, 9, 17, 3, 9, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_15A7C1, 0 - object_event 5, EVENT_OBJ_GFX_LASS, 0, 11, 10, 3, 8, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_15A7AA, 0 - object_event 6, EVENT_OBJ_GFX_PSYCHIC_M, 0, 0, 7, 3, 10, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_15A765, 0 - object_event 7, EVENT_OBJ_GFX_LASS, 0, 4, 3, 3, 8, 0, 0, 1, 2, MossdeepCity_Gym_EventScript_15A793, 0 - object_event 8, EVENT_OBJ_GFX_MAN_2, 0, 8, 29, 3, 10, 0, 0, 0, 0, MossdeepCity_Gym_EventScript_15A7D8, 0 - object_event 9, EVENT_OBJ_GFX_LIZA, 0, 9, 3, 3, 8, 0, 0, 0, 0, MossdeepCity_Gym_EventScript_15A56B, 0 + object_event 1, EVENT_OBJ_GFX_TATE, 0, 8, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MossdeepCity_Gym_EventScript_15A56B, 0 + object_event 2, EVENT_OBJ_GFX_PSYCHIC_M, 0, 2, 24, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_15A74E, 0 + object_event 3, EVENT_OBJ_GFX_PSYCHIC_M, 0, 17, 18, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_15A77C, 0 + object_event 4, EVENT_OBJ_GFX_LASS, 0, 9, 17, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_15A7C1, 0 + object_event 5, EVENT_OBJ_GFX_LASS, 0, 11, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_15A7AA, 0 + object_event 6, EVENT_OBJ_GFX_PSYCHIC_M, 0, 0, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_15A765, 0 + object_event 7, EVENT_OBJ_GFX_LASS, 0, 4, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 2, MossdeepCity_Gym_EventScript_15A793, 0 + object_event 8, EVENT_OBJ_GFX_MAN_2, 0, 8, 29, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MossdeepCity_Gym_EventScript_15A7D8, 0 + object_event 9, EVENT_OBJ_GFX_LIZA, 0, 9, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MossdeepCity_Gym_EventScript_15A56B, 0 MossdeepCity_Gym_MapWarps:: @ 838A738 warp_def 9, 29, 0, 1, MAP_MOSSDEEP_CITY diff --git a/data/maps/MossdeepCity_House1/events.inc b/data/maps/MossdeepCity_House1/events.inc index 2fe9e0373..0929cb305 100644 --- a/data/maps/MossdeepCity_House1/events.inc +++ b/data/maps/MossdeepCity_House1/events.inc @@ -1,6 +1,6 @@ MossdeepCity_House1_EventObjects:: @ 838A7B4 - object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 3, 3, 3, 3, 1, 1, 0, 0, MossdeepCity_House1_EventScript_15A82F, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 7, 4, 3, 9, 0, 0, 0, 0, MossdeepCity_House1_EventScript_15A85F, 0 + object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 3, 3, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 1, 1, 0, 0, MossdeepCity_House1_EventScript_15A82F, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MossdeepCity_House1_EventScript_15A85F, 0 MossdeepCity_House1_MapWarps:: @ 838A7E4 warp_def 3, 7, 0, 0, MAP_MOSSDEEP_CITY diff --git a/data/maps/MossdeepCity_House2/events.inc b/data/maps/MossdeepCity_House2/events.inc index 743350683..cfd30ea15 100644 --- a/data/maps/MossdeepCity_House2/events.inc +++ b/data/maps/MossdeepCity_House2/events.inc @@ -1,7 +1,7 @@ MossdeepCity_House2_EventObjects:: @ 838A808 - object_event 1, EVENT_OBJ_GFX_MAN_5, 0, 6, 6, 3, 9, 0, 0, 0, 0, MossdeepCity_House2_EventScript_15A869, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 4, 4, 3, 8, 0, 0, 0, 0, MossdeepCity_House2_EventScript_15A872, 0 - object_event 3, EVENT_OBJ_GFX_WINGULL, 0, 4, 5, 3, 7, 0, 0, 0, 0, MossdeepCity_House2_EventScript_15A87B, FLAG_HIDE_WINGULL_MOSSDEEP_HOUSE + object_event 1, EVENT_OBJ_GFX_MAN_5, 0, 6, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MossdeepCity_House2_EventScript_15A869, 0 + object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MossdeepCity_House2_EventScript_15A872, 0 + object_event 3, EVENT_OBJ_GFX_WINGULL, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MossdeepCity_House2_EventScript_15A87B, FLAG_HIDE_WINGULL_MOSSDEEP_HOUSE MossdeepCity_House2_MapWarps:: @ 838A850 warp_def 3, 8, 0, 3, MAP_MOSSDEEP_CITY diff --git a/data/maps/MossdeepCity_House3/events.inc b/data/maps/MossdeepCity_House3/events.inc index f601038e6..8560b6e1a 100644 --- a/data/maps/MossdeepCity_House3/events.inc +++ b/data/maps/MossdeepCity_House3/events.inc @@ -1,5 +1,5 @@ MossdeepCity_House3_EventObjects:: @ 838AA08 - object_event 1, EVENT_OBJ_GFX_FISHERMAN, 0, 4, 4, 3, 10, 0, 0, 0, 0, MossdeepCity_House3_EventScript_15A972, 0 + object_event 1, EVENT_OBJ_GFX_FISHERMAN, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MossdeepCity_House3_EventScript_15A972, 0 MossdeepCity_House3_MapWarps:: @ 838AA20 warp_def 3, 7, 0, 5, MAP_MOSSDEEP_CITY diff --git a/data/maps/MossdeepCity_House4/events.inc b/data/maps/MossdeepCity_House4/events.inc index cfde3a35e..5df0f4f4f 100644 --- a/data/maps/MossdeepCity_House4/events.inc +++ b/data/maps/MossdeepCity_House4/events.inc @@ -1,7 +1,7 @@ MossdeepCity_House4_EventObjects:: @ 838AAF8 - object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 3, 4, 3, 9, 0, 0, 0, 0, MossdeepCity_House4_EventScript_15AB31, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 6, 6, 3, 5, 1, 0, 0, 0, MossdeepCity_House4_EventScript_15AB50, 0 - object_event 3, EVENT_OBJ_GFX_SKITTY, 0, 2, 4, 3, 1, 1, 1, 0, 0, MossdeepCity_House4_EventScript_15AB77, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MossdeepCity_House4_EventScript_15AB31, 0 + object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 6, 6, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, MossdeepCity_House4_EventScript_15AB50, 0 + object_event 3, EVENT_OBJ_GFX_SKITTY, 0, 2, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MossdeepCity_House4_EventScript_15AB77, 0 MossdeepCity_House4_MapWarps:: @ 838AB40 warp_def 4, 7, 0, 7, MAP_MOSSDEEP_CITY diff --git a/data/maps/MossdeepCity_Mart/events.inc b/data/maps/MossdeepCity_Mart/events.inc index 92f4a8cbd..b0cb8e67e 100644 --- a/data/maps/MossdeepCity_Mart/events.inc +++ b/data/maps/MossdeepCity_Mart/events.inc @@ -1,8 +1,8 @@ MossdeepCity_Mart_EventObjects:: @ 838A984 - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, 0, MossdeepCity_Mart_EventScript_15A926, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 1, 5, 3, 7, 0, 0, 0, 0, MossdeepCity_Mart_EventScript_15A956, 0 - object_event 3, EVENT_OBJ_GFX_BOY_2, 0, 8, 3, 3, 3, 0, 1, 0, 0, MossdeepCity_Mart_EventScript_15A95F, 0 - object_event 4, EVENT_OBJ_GFX_SAILOR, 0, 5, 3, 3, 2, 1, 1, 0, 0, MossdeepCity_Mart_EventScript_15A968, 0 + object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MossdeepCity_Mart_EventScript_15A926, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MossdeepCity_Mart_EventScript_15A956, 0 + object_event 3, EVENT_OBJ_GFX_BOY_2, 0, 8, 3, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, MossdeepCity_Mart_EventScript_15A95F, 0 + object_event 4, EVENT_OBJ_GFX_SAILOR, 0, 5, 3, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, MossdeepCity_Mart_EventScript_15A968, 0 MossdeepCity_Mart_MapWarps:: @ 838A9E4 warp_def 3, 7, 0, 4, MAP_MOSSDEEP_CITY diff --git a/data/maps/MossdeepCity_PokemonCenter_1F/events.inc b/data/maps/MossdeepCity_PokemonCenter_1F/events.inc index da310c9f7..6f193ba1f 100644 --- a/data/maps/MossdeepCity_PokemonCenter_1F/events.inc +++ b/data/maps/MossdeepCity_PokemonCenter_1F/events.inc @@ -1,7 +1,7 @@ MossdeepCity_PokemonCenter_1F_EventObjects:: @ 838A874 - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, MossdeepCity_PokemonCenter_1F_EventScript_15A8DA, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 8, 4, 3, 7, 0, 0, 0, 0, MossdeepCity_PokemonCenter_1F_EventScript_15A8E8, 0 - object_event 3, EVENT_OBJ_GFX_GIRL_1, 0, 3, 5, 3, 1, 0, 0, 0, 0, MossdeepCity_PokemonCenter_1F_EventScript_15A8F1, 0 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MossdeepCity_PokemonCenter_1F_EventScript_15A8DA, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 8, 4, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MossdeepCity_PokemonCenter_1F_EventScript_15A8E8, 0 + object_event 3, EVENT_OBJ_GFX_GIRL_1, 0, 3, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MossdeepCity_PokemonCenter_1F_EventScript_15A8F1, 0 MossdeepCity_PokemonCenter_1F_MapWarps:: @ 838A8BC warp_def 7, 8, 3, 2, MAP_MOSSDEEP_CITY diff --git a/data/maps/MossdeepCity_PokemonCenter_2F/events.inc b/data/maps/MossdeepCity_PokemonCenter_2F/events.inc index 4af09479f..cad002147 100644 --- a/data/maps/MossdeepCity_PokemonCenter_2F/events.inc +++ b/data/maps/MossdeepCity_PokemonCenter_2F/events.inc @@ -1,8 +1,8 @@ MossdeepCity_PokemonCenter_2F_EventObjects:: @ 838A8E8 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 2, 3, 8, 0, 0, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_15A913, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 7, 2, 3, 8, 0, 0, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_15A919, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, 8, 0, 0, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_15A91F, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_7, 0, 10, 6, 3, 5, 2, 1, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_15A90A, 0 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_15A913, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_15A919, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_15A91F, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_7, 0, 10, 6, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 2, 1, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_15A90A, 0 MossdeepCity_PokemonCenter_2F_MapWarps:: @ 838A948 warp_def 1, 5, 4, 2, MAP_MOSSDEEP_CITY_POKEMON_CENTER_1F diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/events.inc b/data/maps/MossdeepCity_SpaceCenter_1F/events.inc index 85e716a93..f640b9cff 100644 --- a/data/maps/MossdeepCity_SpaceCenter_1F/events.inc +++ b/data/maps/MossdeepCity_SpaceCenter_1F/events.inc @@ -1,9 +1,9 @@ MossdeepCity_SpaceCenter_1F_EventObjects:: @ 838AB64 - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 7, 2, 3, 7, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_15AB8B, 0 - object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 2, 2, 3, 7, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_15ABCC, 0 - object_event 3, EVENT_OBJ_GFX_SAILOR, 0, 6, 6, 3, 9, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_15ABD5, 0 - object_event 4, EVENT_OBJ_GFX_OLD_MAN_2, 0, 10, 2, 3, 7, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_15AC1F, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_5, 0, 14, 7, 3, 3, 1, 1, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_15AC16, 0 + object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_15AB8B, 0 + object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_15ABCC, 0 + object_event 3, EVENT_OBJ_GFX_SAILOR, 0, 6, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_15ABD5, 0 + object_event 4, EVENT_OBJ_GFX_OLD_MAN_2, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_15AC1F, 0 + object_event 5, EVENT_OBJ_GFX_WOMAN_5, 0, 14, 7, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 1, 1, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_15AC16, 0 MossdeepCity_SpaceCenter_1F_MapWarps:: @ 838ABDC warp_def 7, 9, 0, 8, MAP_MOSSDEEP_CITY diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/events.inc b/data/maps/MossdeepCity_SpaceCenter_2F/events.inc index faf5d89fa..c275eac21 100644 --- a/data/maps/MossdeepCity_SpaceCenter_2F/events.inc +++ b/data/maps/MossdeepCity_SpaceCenter_2F/events.inc @@ -1,7 +1,7 @@ MossdeepCity_SpaceCenter_2F_EventObjects:: @ 838AC08 - object_event 1, EVENT_OBJ_GFX_BOY_4, 0, 6, 2, 3, 7, 0, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_15AC49, 0 - object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 11, 8, 3, 7, 0, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_15AC40, 0 - object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 5, 6, 3, 2, 1, 1, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_15AC37, 0 + object_event 1, EVENT_OBJ_GFX_BOY_4, 0, 6, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_15AC49, 0 + object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 11, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_15AC40, 0 + object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 5, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_15AC37, 0 MossdeepCity_SpaceCenter_2F_MapWarps:: @ 838AC50 warp_def 13, 1, 0, 2, MAP_MOSSDEEP_CITY_SPACE_CENTER_1F diff --git a/data/maps/MossdeepCity_StevensHouse/events.inc b/data/maps/MossdeepCity_StevensHouse/events.inc index 7a8fee393..a2859732d 100644 --- a/data/maps/MossdeepCity_StevensHouse/events.inc +++ b/data/maps/MossdeepCity_StevensHouse/events.inc @@ -1,8 +1,8 @@ MossdeepCity_StevensHouse_EventObjects:: @ 838AA44 - object_event 1, EVENT_OBJ_GFX_STEVEN, 0, 9, 6, 3, 10, 0, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_15AAF9, FLAG_HIDE_STEVEN_STEVENS_HOUSE - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 3, 3, 1, 1, 1, 0, 0, MossdeepCity_StevensHouse_EventScript_15AA7C, FLAG_HIDE_BELDUM_BALL_STEVENS_HOUSE - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 3, 3, 1, 1, 1, 0, 0, MossdeepCity_StevensHouse_EventScript_15AB20, FLAG_ITEM_MOSSDEEP_STEVENS_HOUSE_1 - object_event 4, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 6, 4, 3, 76, 1, 1, 0, 0, MossdeepCity_StevensHouse_EventScript_15AB02, FLAG_HIDE_STEVENS_LETTER + object_event 1, EVENT_OBJ_GFX_STEVEN, 0, 9, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_15AAF9, FLAG_HIDE_STEVEN_STEVENS_HOUSE + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MossdeepCity_StevensHouse_EventScript_15AA7C, FLAG_HIDE_BELDUM_BALL_STEVENS_HOUSE + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MossdeepCity_StevensHouse_EventScript_15AB20, FLAG_ITEM_MOSSDEEP_STEVENS_HOUSE_1 + object_event 4, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 6, 4, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, MossdeepCity_StevensHouse_EventScript_15AB02, FLAG_HIDE_STEVENS_LETTER MossdeepCity_StevensHouse_MapWarps:: @ 838AAA4 warp_def 3, 7, 0, 6, MAP_MOSSDEEP_CITY diff --git a/data/maps/MtChimney/events.inc b/data/maps/MtChimney/events.inc index f011502f2..833feb45d 100644 --- a/data/maps/MtChimney/events.inc +++ b/data/maps/MtChimney/events.inc @@ -1,32 +1,32 @@ MtChimney_EventObjects:: @ 838C330 - object_event 1, EVENT_OBJ_GFX_VAR_7, 0, 24, 19, 3, 9, 0, 0, 0, 0, MtChimney_EventScript_1B2C95, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY - object_event 2, EVENT_OBJ_GFX_VAR_6, 0, 13, 6, 3, 10, 0, 0, 0, 0, MtChimney_EventScript_1B2CCB, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 12, 11, 3, 9, 0, 0, 1, 2, MtChimney_EventScript_15D110, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY - object_event 4, EVENT_OBJ_GFX_VAR_1, 0, 32, 5, 3, 9, 0, 0, 0, 0, MtChimney_EventScript_15D162, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY - object_event 5, EVENT_OBJ_GFX_VAR_1, 0, 28, 12, 3, 10, 0, 0, 0, 0, MtChimney_EventScript_15D159, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 19, 39, 3, 10, 0, 0, 0, 0, MtChimney_EventScript_15D0FE, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY - object_event 7, EVENT_OBJ_GFX_VAR_4, 0, 29, 5, 3, 10, 0, 0, 0, 0, MtChimney_EventScript_15D0F5, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY - object_event 8, EVENT_OBJ_GFX_VAR_4, 0, 31, 12, 3, 9, 0, 0, 0, 0, MtChimney_EventScript_15D107, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY - object_event 9, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 16, 37, 3, 8, 0, 0, 0, 0, MtChimney_EventScript_15CF95, FLAG_HIDE_MT_CHIMNEY_PEOPLE - object_event 10, EVENT_OBJ_GFX_VAR_1, 0, 22, 39, 3, 9, 0, 0, 0, 0, MtChimney_EventScript_15D162, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY - object_event 11, EVENT_OBJ_GFX_POOCHYENA, 0, 23, 19, 3, 74, 0, 0, 0, 0, MtChimney_EventScript_15D174, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY - object_event 12, EVENT_OBJ_GFX_POOCHYENA, 0, 23, 18, 3, 64, 0, 0, 0, 0, MtChimney_EventScript_15D16B, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY - object_event 13, EVENT_OBJ_GFX_VAR_1, 0, 23, 17, 3, 8, 0, 0, 0, 0, MtChimney_EventScript_15D13E, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY - object_event 14, EVENT_OBJ_GFX_POOCHYENA, 0, 23, 20, 3, 65, 0, 0, 0, 0, MtChimney_EventScript_15D16B, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY - object_event 15, EVENT_OBJ_GFX_POOCHYENA, 0, 22, 19, 3, 67, 0, 0, 0, 0, MtChimney_EventScript_15D16B, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY - object_event 16, EVENT_OBJ_GFX_VAR_1, 0, 23, 21, 3, 7, 0, 0, 0, 0, MtChimney_EventScript_15D150, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY - object_event 17, EVENT_OBJ_GFX_VAR_1, 0, 21, 19, 3, 10, 0, 0, 0, 0, MtChimney_EventScript_15D13E, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY - object_event 18, EVENT_OBJ_GFX_POOCHYENA, 0, 30, 12, 3, 66, 0, 0, 0, 0, MtChimney_EventScript_15D174, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY - object_event 19, EVENT_OBJ_GFX_POOCHYENA, 0, 29, 12, 3, 67, 0, 0, 0, 0, MtChimney_EventScript_15D16B, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY - object_event 20, EVENT_OBJ_GFX_POOCHYENA, 0, 30, 5, 3, 67, 0, 0, 0, 0, MtChimney_EventScript_15D174, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY - object_event 21, EVENT_OBJ_GFX_POOCHYENA, 0, 31, 5, 3, 66, 0, 0, 0, 0, MtChimney_EventScript_15D16B, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY - object_event 22, EVENT_OBJ_GFX_VAR_1, 0, 9, 15, 3, 10, 0, 0, 1, 3, MtChimney_EventScript_15D127, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY - object_event 23, EVENT_OBJ_GFX_POOCHYENA, 0, 20, 39, 3, 67, 0, 0, 0, 0, MtChimney_EventScript_15D174, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY - object_event 24, EVENT_OBJ_GFX_POOCHYENA, 0, 21, 39, 3, 66, 0, 0, 0, 0, MtChimney_EventScript_15D16B, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY - object_event 25, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 16, 18, 3, 13, 0, 0, 1, 3, MtChimney_EventScript_15D1E3, FLAG_HIDE_MT_CHIMNEY_PEOPLE - object_event 26, EVENT_OBJ_GFX_BEAUTY, 0, 14, 7, 3, 70, 0, 0, 1, 4, MtChimney_EventScript_15D221, FLAG_HIDE_MT_CHIMNEY_PEOPLE - object_event 27, EVENT_OBJ_GFX_BEAUTY, 0, 29, 7, 3, 17, 1, 1, 1, 3, MtChimney_EventScript_15D238, FLAG_HIDE_MT_CHIMNEY_PEOPLE - object_event 28, EVENT_OBJ_GFX_BEAUTY, 0, 27, 17, 3, 16, 1, 1, 1, 3, MtChimney_EventScript_15D24F, FLAG_HIDE_MT_CHIMNEY_PEOPLE + object_event 1, EVENT_OBJ_GFX_VAR_7, 0, 24, 19, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MtChimney_EventScript_1B2C95, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY + object_event 2, EVENT_OBJ_GFX_VAR_6, 0, 13, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_1B2CCB, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 12, 11, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, MtChimney_EventScript_15D110, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY + object_event 4, EVENT_OBJ_GFX_VAR_1, 0, 32, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MtChimney_EventScript_15D162, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY + object_event 5, EVENT_OBJ_GFX_VAR_1, 0, 28, 12, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_15D159, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY + object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 19, 39, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_15D0FE, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY + object_event 7, EVENT_OBJ_GFX_VAR_4, 0, 29, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_15D0F5, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY + object_event 8, EVENT_OBJ_GFX_VAR_4, 0, 31, 12, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MtChimney_EventScript_15D107, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY + object_event 9, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 16, 37, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MtChimney_EventScript_15CF95, FLAG_HIDE_MT_CHIMNEY_PEOPLE + object_event 10, EVENT_OBJ_GFX_VAR_1, 0, 22, 39, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MtChimney_EventScript_15D162, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY + object_event 11, EVENT_OBJ_GFX_POOCHYENA, 0, 23, 19, 3, MOVEMENT_TYPE_RUN_IN_PLACE_LEFT, 0, 0, 0, 0, MtChimney_EventScript_15D174, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY + object_event 12, EVENT_OBJ_GFX_POOCHYENA, 0, 23, 18, 3, MOVEMENT_TYPE_WALK_IN_PLACE_DOWN, 0, 0, 0, 0, MtChimney_EventScript_15D16B, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY + object_event 13, EVENT_OBJ_GFX_VAR_1, 0, 23, 17, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MtChimney_EventScript_15D13E, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY + object_event 14, EVENT_OBJ_GFX_POOCHYENA, 0, 23, 20, 3, MOVEMENT_TYPE_WALK_IN_PLACE_UP, 0, 0, 0, 0, MtChimney_EventScript_15D16B, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY + object_event 15, EVENT_OBJ_GFX_POOCHYENA, 0, 22, 19, 3, MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_15D16B, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY + object_event 16, EVENT_OBJ_GFX_VAR_1, 0, 23, 21, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MtChimney_EventScript_15D150, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY + object_event 17, EVENT_OBJ_GFX_VAR_1, 0, 21, 19, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_15D13E, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY + object_event 18, EVENT_OBJ_GFX_POOCHYENA, 0, 30, 12, 3, MOVEMENT_TYPE_WALK_IN_PLACE_LEFT, 0, 0, 0, 0, MtChimney_EventScript_15D174, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY + object_event 19, EVENT_OBJ_GFX_POOCHYENA, 0, 29, 12, 3, MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_15D16B, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY + object_event 20, EVENT_OBJ_GFX_POOCHYENA, 0, 30, 5, 3, MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_15D174, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY + object_event 21, EVENT_OBJ_GFX_POOCHYENA, 0, 31, 5, 3, MOVEMENT_TYPE_WALK_IN_PLACE_LEFT, 0, 0, 0, 0, MtChimney_EventScript_15D16B, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY + object_event 22, EVENT_OBJ_GFX_VAR_1, 0, 9, 15, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 3, MtChimney_EventScript_15D127, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY + object_event 23, EVENT_OBJ_GFX_POOCHYENA, 0, 20, 39, 3, MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_15D174, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY + object_event 24, EVENT_OBJ_GFX_POOCHYENA, 0, 21, 39, 3, MOVEMENT_TYPE_WALK_IN_PLACE_LEFT, 0, 0, 0, 0, MtChimney_EventScript_15D16B, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY + object_event 25, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 16, 18, 3, MOVEMENT_TYPE_FACE_DOWN_AND_UP, 0, 0, 1, 3, MtChimney_EventScript_15D1E3, FLAG_HIDE_MT_CHIMNEY_PEOPLE + object_event 26, EVENT_OBJ_GFX_BEAUTY, 0, 14, 7, 3, MOVEMENT_TYPE_JOG_IN_PLACE_LEFT, 0, 0, 1, 4, MtChimney_EventScript_15D221, FLAG_HIDE_MT_CHIMNEY_PEOPLE + object_event 27, EVENT_OBJ_GFX_BEAUTY, 0, 29, 7, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 3, MtChimney_EventScript_15D238, FLAG_HIDE_MT_CHIMNEY_PEOPLE + object_event 28, EVENT_OBJ_GFX_BEAUTY, 0, 27, 17, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 3, MtChimney_EventScript_15D24F, FLAG_HIDE_MT_CHIMNEY_PEOPLE MtChimney_MapWarps:: @ 838C5D0 warp_def 17, 36, 0, 0, MAP_MT_CHIMNEY_CABLE_CAR_STATION diff --git a/data/maps/MtChimney_CableCarStation/events.inc b/data/maps/MtChimney_CableCarStation/events.inc index e5d69ee75..ca437c92d 100644 --- a/data/maps/MtChimney_CableCarStation/events.inc +++ b/data/maps/MtChimney_CableCarStation/events.inc @@ -1,6 +1,6 @@ MtChimney_CableCarStation_EventObjects:: @ 838B828 - object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 6, 6, 3, 8, 0, 0, 0, 0, MtChimney_CableCarStation_EventScript_15C14B, 0 - object_event 2, EVENT_OBJ_GFX_CABLE_CAR, 0, 6, 3, 3, 1, 0, 0, 0, 0, 0x0, 0 + object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 6, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MtChimney_CableCarStation_EventScript_15C14B, 0 + object_event 2, EVENT_OBJ_GFX_CABLE_CAR, 0, 6, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 0 MtChimney_CableCarStation_MapWarps:: @ 838B858 warp_def 6, 11, 0, 0, MAP_MT_CHIMNEY diff --git a/data/maps/MtPyre_1F/events.inc b/data/maps/MtPyre_1F/events.inc index f547a9a98..01b4052a6 100644 --- a/data/maps/MtPyre_1F/events.inc +++ b/data/maps/MtPyre_1F/events.inc @@ -1,7 +1,7 @@ MtPyre_1F_EventObjects:: @ 838C7FC - object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 21, 2, 3, 8, 1, 1, 0, 0, MtPyre_1F_EventScript_15D323, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 17, 8, 3, 7, 1, 1, 0, 0, MtPyre_1F_EventScript_15D35C, 0 - object_event 3, EVENT_OBJ_GFX_MAN_5, 0, 13, 10, 3, 9, 1, 1, 0, 0, MtPyre_1F_EventScript_15D365, 0 + object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 21, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MtPyre_1F_EventScript_15D323, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 17, 8, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, MtPyre_1F_EventScript_15D35C, 0 + object_event 3, EVENT_OBJ_GFX_MAN_5, 0, 13, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, MtPyre_1F_EventScript_15D365, 0 MtPyre_1F_MapWarps:: @ 838C844 warp_def 17, 18, 3, 0, MAP_ROUTE122 diff --git a/data/maps/MtPyre_2F/events.inc b/data/maps/MtPyre_2F/events.inc index 9f8041366..d6f401581 100644 --- a/data/maps/MtPyre_2F/events.inc +++ b/data/maps/MtPyre_2F/events.inc @@ -1,10 +1,10 @@ MtPyre_2F_EventObjects:: @ 838C888 - object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 6, 6, 3, 17, 1, 1, 1, 2, MtPyre_2F_EventScript_15D39B, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 10, 3, 1, 1, 1, 0, 0, MtPyre_2F_EventScript_1B1933, FLAG_ITEM_MT_PYRE_2F_1 - object_event 3, EVENT_OBJ_GFX_WOMAN_1, 0, 5, 3, 3, 10, 1, 1, 0, 0, MtPyre_2F_EventScript_15D389, 0 - object_event 4, EVENT_OBJ_GFX_MAN_3, 0, 7, 11, 3, 8, 1, 1, 0, 0, MtPyre_2F_EventScript_15D392, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_5, 0, 2, 8, 3, 8, 1, 1, 1, 0, MtPyre_2F_EventScript_15D3CD, 0 - object_event 6, EVENT_OBJ_GFX_MAN_5, 0, 3, 8, 3, 8, 1, 1, 1, 0, MtPyre_2F_EventScript_15D3B2, 0 + object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 6, 6, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 2, MtPyre_2F_EventScript_15D39B, 0 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MtPyre_2F_EventScript_1B1933, FLAG_ITEM_MT_PYRE_2F_1 + object_event 3, EVENT_OBJ_GFX_WOMAN_1, 0, 5, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, MtPyre_2F_EventScript_15D389, 0 + object_event 4, EVENT_OBJ_GFX_MAN_3, 0, 7, 11, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MtPyre_2F_EventScript_15D392, 0 + object_event 5, EVENT_OBJ_GFX_WOMAN_5, 0, 2, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 0, MtPyre_2F_EventScript_15D3CD, 0 + object_event 6, EVENT_OBJ_GFX_MAN_5, 0, 3, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 0, MtPyre_2F_EventScript_15D3B2, 0 MtPyre_2F_MapWarps:: @ 838C918 warp_def 2, 1, 3, 4, MAP_MT_PYRE_1F diff --git a/data/maps/MtPyre_3F/events.inc b/data/maps/MtPyre_3F/events.inc index fbaf6fa4b..4a5263be5 100644 --- a/data/maps/MtPyre_3F/events.inc +++ b/data/maps/MtPyre_3F/events.inc @@ -1,7 +1,7 @@ MtPyre_3F_EventObjects:: @ 838C954 - object_event 1, EVENT_OBJ_GFX_PSYCHIC_M, 0, 1, 4, 3, 18, 1, 1, 1, 3, MtPyre_3F_EventScript_15D3E9, 0 - object_event 2, EVENT_OBJ_GFX_LASS, 0, 12, 7, 3, 17, 1, 1, 1, 3, MtPyre_3F_EventScript_15D400, 0 - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 3, 1, 1, 1, 0, 0, MtPyre_3F_EventScript_1B1940, FLAG_ITEM_MT_PYRE_3F_1 + object_event 1, EVENT_OBJ_GFX_PSYCHIC_M, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 3, MtPyre_3F_EventScript_15D3E9, 0 + object_event 2, EVENT_OBJ_GFX_LASS, 0, 12, 7, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 3, MtPyre_3F_EventScript_15D400, 0 + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MtPyre_3F_EventScript_1B1940, FLAG_ITEM_MT_PYRE_3F_1 MtPyre_3F_MapWarps:: @ 838C99C warp_def 10, 1, 3, 1, MAP_MT_PYRE_2F diff --git a/data/maps/MtPyre_4F/events.inc b/data/maps/MtPyre_4F/events.inc index 9de527f2d..633f5a45b 100644 --- a/data/maps/MtPyre_4F/events.inc +++ b/data/maps/MtPyre_4F/events.inc @@ -1,6 +1,6 @@ MtPyre_4F_EventObjects:: @ 838C9E0 - object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 11, 7, 3, 24, 1, 1, 1, 2, MtPyre_4F_EventScript_15D418, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 11, 3, 1, 1, 1, 0, 0, MtPyre_4F_EventScript_1B194D, FLAG_ITEM_MT_PYRE_4F_1 + object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 11, 7, 3, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 1, 1, 1, 2, MtPyre_4F_EventScript_15D418, 0 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MtPyre_4F_EventScript_1B194D, FLAG_ITEM_MT_PYRE_4F_1 MtPyre_4F_MapWarps:: @ 838CA10 warp_def 10, 1, 3, 1, MAP_MT_PYRE_5F diff --git a/data/maps/MtPyre_5F/events.inc b/data/maps/MtPyre_5F/events.inc index cbf1b64b4..21ffd9e1a 100644 --- a/data/maps/MtPyre_5F/events.inc +++ b/data/maps/MtPyre_5F/events.inc @@ -1,6 +1,6 @@ MtPyre_5F_EventObjects:: @ 838CA54 - object_event 1, EVENT_OBJ_GFX_HEX_MANIAC, 0, 3, 7, 3, 17, 1, 1, 1, 2, MtPyre_5F_EventScript_15D430, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 11, 3, 1, 1, 1, 0, 0, MtPyre_5F_EventScript_1B195A, FLAG_ITEM_MT_PYRE_5F_1 + object_event 1, EVENT_OBJ_GFX_HEX_MANIAC, 0, 3, 7, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 2, MtPyre_5F_EventScript_15D430, 0 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MtPyre_5F_EventScript_1B195A, FLAG_ITEM_MT_PYRE_5F_1 MtPyre_5F_MapWarps:: @ 838CA84 warp_def 2, 1, 3, 0, MAP_MT_PYRE_6F diff --git a/data/maps/MtPyre_6F/events.inc b/data/maps/MtPyre_6F/events.inc index d65a3a8c6..804b6be27 100644 --- a/data/maps/MtPyre_6F/events.inc +++ b/data/maps/MtPyre_6F/events.inc @@ -1,6 +1,6 @@ MtPyre_6F_EventObjects:: @ 838CAC0 - object_event 1, EVENT_OBJ_GFX_HEX_MANIAC, 0, 6, 3, 3, 23, 1, 1, 1, 2, MtPyre_6F_EventScript_15D448, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 9, 3, 1, 1, 1, 0, 0, MtPyre_6F_EventScript_1B1967, FLAG_ITEM_MT_PYRE_6F_1 + object_event 1, EVENT_OBJ_GFX_HEX_MANIAC, 0, 6, 3, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 1, 1, 1, 2, MtPyre_6F_EventScript_15D448, 0 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MtPyre_6F_EventScript_1B1967, FLAG_ITEM_MT_PYRE_6F_1 MtPyre_6F_MapWarps:: @ 838CAF0 warp_def 2, 1, 3, 0, MAP_MT_PYRE_5F diff --git a/data/maps/MtPyre_Exterior/events.inc b/data/maps/MtPyre_Exterior/events.inc index 48593481e..2e69de9d2 100644 --- a/data/maps/MtPyre_Exterior/events.inc +++ b/data/maps/MtPyre_Exterior/events.inc @@ -1,6 +1,6 @@ MtPyre_Exterior_EventObjects:: @ 838CB14 - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 15, 3, 1, 0, 0, 0, 0, MtPyre_Exterior_EventScript_1B1974, FLAG_ITEM_MT_PYRE_EXTERIOR_1 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 40, 3, 1, 0, 0, 0, 0, MtPyre_Exterior_EventScript_1B1981, FLAG_ITEM_MT_PYRE_EXTERIOR_2 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MtPyre_Exterior_EventScript_1B1974, FLAG_ITEM_MT_PYRE_EXTERIOR_1 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 40, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MtPyre_Exterior_EventScript_1B1981, FLAG_ITEM_MT_PYRE_EXTERIOR_2 MtPyre_Exterior_MapWarps:: @ 838CB44 warp_def 10, 42, 3, 1, MAP_MT_PYRE_1F diff --git a/data/maps/MtPyre_Summit/events.inc b/data/maps/MtPyre_Summit/events.inc index 3ddc6f36b..b04e9fb48 100644 --- a/data/maps/MtPyre_Summit/events.inc +++ b/data/maps/MtPyre_Summit/events.inc @@ -1,10 +1,10 @@ MtPyre_Summit_EventObjects:: @ 838CBD8 - object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 22, 5, 3, 8, 0, 0, 0, 0, MtPyre_Summit_EventScript_15D5EF, 0 - object_event 2, EVENT_OBJ_GFX_VAR_6, 0, 23, 6, 3, 7, 0, 0, 0, 0, 0x0, FLAG_HIDE_LEADER_MT_PYRE_SUMMIT - object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 23, 5, 3, 8, 0, 0, 0, 0, MtPyre_Summit_EventScript_15D623, 0 - object_event 4, EVENT_OBJ_GFX_VAR_1, 0, 21, 18, 3, 10, 0, 0, 1, 3, MtPyre_Summit_EventScript_1B2DA9, FLAG_HIDE_GRUNTS_MT_PYRE_SUMMIT - object_event 5, EVENT_OBJ_GFX_VAR_1, 0, 25, 15, 3, 9, 0, 0, 1, 3, MtPyre_Summit_EventScript_1B2DC0, FLAG_HIDE_GRUNTS_MT_PYRE_SUMMIT - object_event 6, EVENT_OBJ_GFX_VAR_1, 0, 21, 11, 3, 10, 0, 0, 1, 3, MtPyre_Summit_EventScript_1B2DD7, FLAG_HIDE_GRUNTS_MT_PYRE_SUMMIT + object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 22, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MtPyre_Summit_EventScript_15D5EF, 0 + object_event 2, EVENT_OBJ_GFX_VAR_6, 0, 23, 6, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_LEADER_MT_PYRE_SUMMIT + object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 23, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MtPyre_Summit_EventScript_15D623, 0 + object_event 4, EVENT_OBJ_GFX_VAR_1, 0, 21, 18, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 3, MtPyre_Summit_EventScript_1B2DA9, FLAG_HIDE_GRUNTS_MT_PYRE_SUMMIT + object_event 5, EVENT_OBJ_GFX_VAR_1, 0, 25, 15, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 3, MtPyre_Summit_EventScript_1B2DC0, FLAG_HIDE_GRUNTS_MT_PYRE_SUMMIT + object_event 6, EVENT_OBJ_GFX_VAR_1, 0, 21, 11, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 3, MtPyre_Summit_EventScript_1B2DD7, FLAG_HIDE_GRUNTS_MT_PYRE_SUMMIT MtPyre_Summit_MapWarps:: @ 838CC68 warp_def 22, 31, 3, 1, MAP_MT_PYRE_EXTERIOR diff --git a/data/maps/NewMauville_Inside/events.inc b/data/maps/NewMauville_Inside/events.inc index be85150e3..f94178046 100644 --- a/data/maps/NewMauville_Inside/events.inc +++ b/data/maps/NewMauville_Inside/events.inc @@ -1,12 +1,12 @@ NewMauville_Inside_EventObjects:: @ 838DF08 - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 32, 25, 3, 1, 0, 0, 0, 0, NewMauville_Inside_EventScript_1B183C, FLAG_ITEM_NEW_MAUVILLE_INSIDE_1 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 22, 3, 1, 0, 0, 0, 0, NewMauville_Inside_EventScript_1B1849, FLAG_ITEM_NEW_MAUVILLE_INSIDE_2 - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 39, 4, 3, 1, 1, 1, 0, 0, NewMauville_Inside_EventScript_1B1856, FLAG_ITEM_NEW_MAUVILLE_INSIDE_3 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 17, 10, 3, 1, 1, 1, 0, 0, NewMauville_Inside_EventScript_1B1863, FLAG_ITEM_NEW_MAUVILLE_INSIDE_4 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 11, 3, 1, 1, 1, 0, 0, NewMauville_Inside_EventScript_1B1870, FLAG_ITEM_NEW_MAUVILLE_INSIDE_5 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 25, 18, 3, 1, 1, 1, 0, 0, NewMauville_Inside_EventScript_15E900, FLAG_HIDE_VOLTORB_1_NEW_MAUVILLE - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 11, 3, 1, 1, 1, 0, 0, NewMauville_Inside_EventScript_15E91E, FLAG_HIDE_VOLTORB_2_NEW_MAUVILLE - object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 10, 3, 1, 1, 1, 0, 0, NewMauville_Inside_EventScript_15E93C, FLAG_HIDE_VOLTORB_3_NEW_MAUVILLE + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 32, 25, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, NewMauville_Inside_EventScript_1B183C, FLAG_ITEM_NEW_MAUVILLE_INSIDE_1 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, NewMauville_Inside_EventScript_1B1849, FLAG_ITEM_NEW_MAUVILLE_INSIDE_2 + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 39, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, NewMauville_Inside_EventScript_1B1856, FLAG_ITEM_NEW_MAUVILLE_INSIDE_3 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 17, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, NewMauville_Inside_EventScript_1B1863, FLAG_ITEM_NEW_MAUVILLE_INSIDE_4 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, NewMauville_Inside_EventScript_1B1870, FLAG_ITEM_NEW_MAUVILLE_INSIDE_5 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 25, 18, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, NewMauville_Inside_EventScript_15E900, FLAG_HIDE_VOLTORB_1_NEW_MAUVILLE + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, NewMauville_Inside_EventScript_15E91E, FLAG_HIDE_VOLTORB_2_NEW_MAUVILLE + object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, NewMauville_Inside_EventScript_15E93C, FLAG_HIDE_VOLTORB_3_NEW_MAUVILLE NewMauville_Inside_MapWarps:: @ 838DFC8 warp_def 32, 33, 3, 1, MAP_NEW_MAUVILLE_ENTRANCE diff --git a/data/maps/OldaleTown/events.inc b/data/maps/OldaleTown/events.inc index ac50e1197..b1479a947 100644 --- a/data/maps/OldaleTown/events.inc +++ b/data/maps/OldaleTown/events.inc @@ -1,8 +1,8 @@ OldaleTown_EventObjects:: @ 8380A78 - object_event 1, EVENT_OBJ_GFX_GIRL_3, 0, 16, 11, 3, 9, 0, 0, 0, 0, OldaleTown_EventScript_14DDB3, 0 - object_event 2, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 13, 7, 3, 8, 0, 0, 0, 0, OldaleTown_EventScript_14DDBC, 0 - object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 8, 9, 3, 10, 0, 0, 0, 0, OldaleTown_EventScript_14DEDF, 0 - object_event 4, EVENT_OBJ_GFX_VAR_0, 0, 11, 19, 3, 7, 1, 1, 0, 0, OldaleTown_EventScript_14DF30, FLAG_HIDE_RIVAL_OLDALE_TOWN + object_event 1, EVENT_OBJ_GFX_GIRL_3, 0, 16, 11, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, OldaleTown_EventScript_14DDB3, 0 + object_event 2, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 13, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, OldaleTown_EventScript_14DDBC, 0 + object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 8, 9, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, OldaleTown_EventScript_14DEDF, 0 + object_event 4, EVENT_OBJ_GFX_VAR_0, 0, 11, 19, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, OldaleTown_EventScript_14DF30, FLAG_HIDE_RIVAL_OLDALE_TOWN OldaleTown_MapWarps:: @ 8380AD8 warp_def 5, 7, 0, 0, MAP_OLDALE_TOWN_HOUSE1 diff --git a/data/maps/OldaleTown_House1/events.inc b/data/maps/OldaleTown_House1/events.inc index e037e3b0e..5120c3cfb 100644 --- a/data/maps/OldaleTown_House1/events.inc +++ b/data/maps/OldaleTown_House1/events.inc @@ -1,5 +1,5 @@ OldaleTown_House1_EventObjects:: @ 8385C4C - object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 6, 4, 3, 2, 1, 1, 0, 0, OldaleTown_House1_EventScript_152EEC, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 6, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, OldaleTown_House1_EventScript_152EEC, 0 OldaleTown_House1_MapWarps:: @ 8385C64 warp_def 3, 8, 0, 0, MAP_OLDALE_TOWN diff --git a/data/maps/OldaleTown_House2/events.inc b/data/maps/OldaleTown_House2/events.inc index 0968fda57..daca96055 100644 --- a/data/maps/OldaleTown_House2/events.inc +++ b/data/maps/OldaleTown_House2/events.inc @@ -1,6 +1,6 @@ OldaleTown_House2_EventObjects:: @ 8385C88 - object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 4, 4, 3, 10, 0, 0, 0, 0, OldaleTown_House2_EventScript_152EF6, 0 - object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 7, 4, 3, 9, 0, 0, 0, 0, OldaleTown_House2_EventScript_152EFF, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, OldaleTown_House2_EventScript_152EF6, 0 + object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, OldaleTown_House2_EventScript_152EFF, 0 OldaleTown_House2_MapWarps:: @ 8385CB8 warp_def 3, 7, 0, 1, MAP_OLDALE_TOWN diff --git a/data/maps/OldaleTown_Mart/events.inc b/data/maps/OldaleTown_Mart/events.inc index 9d0b70937..3ef2a0036 100644 --- a/data/maps/OldaleTown_Mart/events.inc +++ b/data/maps/OldaleTown_Mart/events.inc @@ -1,7 +1,7 @@ OldaleTown_Mart_EventObjects:: @ 8385DEC - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, 0, OldaleTown_Mart_EventScript_152F79, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 5, 5, 3, 10, 0, 0, 0, 0, OldaleTown_Mart_EventScript_152FC6, 0 - object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 9, 4, 3, 3, 0, 1, 0, 0, OldaleTown_Mart_EventScript_152FE5, 0 + object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, OldaleTown_Mart_EventScript_152F79, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, OldaleTown_Mart_EventScript_152FC6, 0 + object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 9, 4, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, OldaleTown_Mart_EventScript_152FE5, 0 OldaleTown_Mart_MapWarps:: @ 8385E34 warp_def 3, 7, 0, 3, MAP_OLDALE_TOWN diff --git a/data/maps/OldaleTown_PokemonCenter_1F/events.inc b/data/maps/OldaleTown_PokemonCenter_1F/events.inc index 89ad23d8f..55b3efeaf 100644 --- a/data/maps/OldaleTown_PokemonCenter_1F/events.inc +++ b/data/maps/OldaleTown_PokemonCenter_1F/events.inc @@ -1,8 +1,8 @@ OldaleTown_PokemonCenter_1F_EventObjects:: @ 8385CDC - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_152F17, 0 - object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 4, 4, 3, 8, 0, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_152F25, 0 - object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 10, 6, 3, 10, 0, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_152F2E, 0 - object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 3, 7, 3, 10, 1, 1, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_152F37, 0 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_152F17, 0 + object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_152F25, 0 + object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 10, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_152F2E, 0 + object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 3, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_152F37, 0 OldaleTown_PokemonCenter_1F_MapWarps:: @ 8385D3C warp_def 7, 8, 3, 2, MAP_OLDALE_TOWN diff --git a/data/maps/OldaleTown_PokemonCenter_2F/events.inc b/data/maps/OldaleTown_PokemonCenter_2F/events.inc index 9af6ec676..0eef80a2d 100644 --- a/data/maps/OldaleTown_PokemonCenter_2F/events.inc +++ b/data/maps/OldaleTown_PokemonCenter_2F/events.inc @@ -1,7 +1,7 @@ OldaleTown_PokemonCenter_2F_EventObjects:: @ 8385D68 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 2, 3, 8, 0, 0, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_152F66, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 7, 2, 3, 8, 0, 0, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_152F6C, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, 8, 0, 0, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_152F72, 0 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_152F66, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_152F6C, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_152F72, 0 OldaleTown_PokemonCenter_2F_MapWarps:: @ 8385DB0 warp_def 1, 5, 4, 2, MAP_OLDALE_TOWN_POKEMON_CENTER_1F diff --git a/data/maps/PacifidlogTown/events.inc b/data/maps/PacifidlogTown/events.inc index f8db75501..c27d356b3 100644 --- a/data/maps/PacifidlogTown/events.inc +++ b/data/maps/PacifidlogTown/events.inc @@ -1,7 +1,7 @@ PacifidlogTown_EventObjects:: @ 838100C - object_event 1, EVENT_OBJ_GFX_GIRL_1, 0, 10, 23, 3, 9, 0, 0, 0, 0, PacifidlogTown_EventScript_14E909, 0 - object_event 2, EVENT_OBJ_GFX_FISHERMAN, 0, 11, 14, 3, 10, 0, 0, 0, 0, PacifidlogTown_EventScript_14E912, 0 - object_event 3, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 9, 16, 3, 8, 0, 0, 0, 0, PacifidlogTown_EventScript_14E900, 0 + object_event 1, EVENT_OBJ_GFX_GIRL_1, 0, 10, 23, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, PacifidlogTown_EventScript_14E909, 0 + object_event 2, EVENT_OBJ_GFX_FISHERMAN, 0, 11, 14, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, PacifidlogTown_EventScript_14E912, 0 + object_event 3, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 9, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PacifidlogTown_EventScript_14E900, 0 PacifidlogTown_MapWarps:: @ 8381054 warp_def 8, 15, 0, 0, MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_1F diff --git a/data/maps/PacifidlogTown_House1/events.inc b/data/maps/PacifidlogTown_House1/events.inc index 95d0009d9..1319b260f 100644 --- a/data/maps/PacifidlogTown_House1/events.inc +++ b/data/maps/PacifidlogTown_House1/events.inc @@ -1,6 +1,6 @@ PacifidlogTown_House1_EventObjects:: @ 8386F40 - object_event 1, EVENT_OBJ_GFX_MAN_6, 0, 3, 5, 3, 8, 0, 0, 0, 0, PacifidlogTown_House1_EventScript_154155, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 6, 4, 3, 9, 0, 0, 0, 0, PacifidlogTown_House1_EventScript_15415E, 0 + object_event 1, EVENT_OBJ_GFX_MAN_6, 0, 3, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PacifidlogTown_House1_EventScript_154155, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 6, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, PacifidlogTown_House1_EventScript_15415E, 0 PacifidlogTown_House1_MapWarps:: @ 8386F70 warp_def 4, 8, 0, 1, MAP_PACIFIDLOG_TOWN diff --git a/data/maps/PacifidlogTown_House2/events.inc b/data/maps/PacifidlogTown_House2/events.inc index 00493650a..6d4575739 100644 --- a/data/maps/PacifidlogTown_House2/events.inc +++ b/data/maps/PacifidlogTown_House2/events.inc @@ -1,7 +1,7 @@ PacifidlogTown_House2_EventObjects:: @ 8386F94 - object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 3, 5, 3, 8, 1, 1, 0, 0, PacifidlogTown_House2_EventScript_154168, 0 - object_event 2, EVENT_OBJ_GFX_AZURILL, 0, 8, 6, 3, 1, 1, 1, 0, 0, PacifidlogTown_House2_EventScript_154267, 0 - object_event 3, EVENT_OBJ_GFX_AZURILL, 0, 1, 7, 3, 1, 1, 1, 0, 0, PacifidlogTown_House2_EventScript_154282, 0 + object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 3, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, PacifidlogTown_House2_EventScript_154168, 0 + object_event 2, EVENT_OBJ_GFX_AZURILL, 0, 8, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, PacifidlogTown_House2_EventScript_154267, 0 + object_event 3, EVENT_OBJ_GFX_AZURILL, 0, 1, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, PacifidlogTown_House2_EventScript_154282, 0 PacifidlogTown_House2_MapWarps:: @ 8386FDC warp_def 4, 8, 0, 2, MAP_PACIFIDLOG_TOWN diff --git a/data/maps/PacifidlogTown_House3/events.inc b/data/maps/PacifidlogTown_House3/events.inc index 0f7bb798b..0202b381d 100644 --- a/data/maps/PacifidlogTown_House3/events.inc +++ b/data/maps/PacifidlogTown_House3/events.inc @@ -1,6 +1,6 @@ PacifidlogTown_House3_EventObjects:: @ 8387000 - object_event 1, EVENT_OBJ_GFX_GIRL_2, 0, 3, 5, 3, 18, 0, 0, 0, 0, PacifidlogTown_House3_EventScript_154342, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 4, 2, 3, 10, 1, 1, 0, 0, PacifidlogTown_House3_EventScript_15429E, 0 + object_event 1, EVENT_OBJ_GFX_GIRL_2, 0, 3, 5, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 0, 0, 0, 0, PacifidlogTown_House3_EventScript_154342, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, PacifidlogTown_House3_EventScript_15429E, 0 PacifidlogTown_House3_MapWarps:: @ 8387030 warp_def 4, 8, 0, 3, MAP_PACIFIDLOG_TOWN diff --git a/data/maps/PacifidlogTown_House4/events.inc b/data/maps/PacifidlogTown_House4/events.inc index e41a86e44..af0f50a5f 100644 --- a/data/maps/PacifidlogTown_House4/events.inc +++ b/data/maps/PacifidlogTown_House4/events.inc @@ -1,7 +1,7 @@ PacifidlogTown_House4_EventObjects:: @ 8387054 - object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 3, 4, 3, 8, 0, 0, 0, 0, PacifidlogTown_House4_EventScript_154355, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 7, 5, 3, 2, 1, 1, 0, 0, PacifidlogTown_House4_EventScript_15434C, 0 - object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 7, 4, 3, 2, 1, 1, 0, 0, PacifidlogTown_House4_EventScript_15435E, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PacifidlogTown_House4_EventScript_154355, 0 + object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 7, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, PacifidlogTown_House4_EventScript_15434C, 0 + object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 7, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, PacifidlogTown_House4_EventScript_15435E, 0 PacifidlogTown_House4_MapWarps:: @ 838709C warp_def 4, 8, 0, 4, MAP_PACIFIDLOG_TOWN diff --git a/data/maps/PacifidlogTown_House5/events.inc b/data/maps/PacifidlogTown_House5/events.inc index bac0ca3e1..87d4434af 100644 --- a/data/maps/PacifidlogTown_House5/events.inc +++ b/data/maps/PacifidlogTown_House5/events.inc @@ -1,6 +1,6 @@ PacifidlogTown_House5_EventObjects:: @ 83870C0 - object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 9, 4, 3, 10, 0, 0, 0, 0, PacifidlogTown_House5_EventScript_154394, 0 - object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 3, 4, 3, 10, 0, 0, 0, 0, PacifidlogTown_House5_EventScript_1543BA, 0 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 9, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, PacifidlogTown_House5_EventScript_154394, 0 + object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, PacifidlogTown_House5_EventScript_1543BA, 0 PacifidlogTown_House5_MapWarps:: @ 83870F0 warp_def 4, 8, 0, 5, MAP_PACIFIDLOG_TOWN diff --git a/data/maps/PacifidlogTown_PokemonCenter_1F/events.inc b/data/maps/PacifidlogTown_PokemonCenter_1F/events.inc index 05f1e9698..c59b1979a 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_1F/events.inc +++ b/data/maps/PacifidlogTown_PokemonCenter_1F/events.inc @@ -1,8 +1,8 @@ PacifidlogTown_PokemonCenter_1F_EventObjects:: @ 8386E30 - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_153F18, 0 - object_event 2, EVENT_OBJ_GFX_OLD_MAN_2, 0, 10, 6, 3, 9, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_154129, 0 - object_event 3, EVENT_OBJ_GFX_GIRL_2, 0, 2, 2, 3, 7, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_154117, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_1, 0, 4, 5, 3, 1, 1, 1, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_154120, 0 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_153F18, 0 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_2, 0, 10, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_154129, 0 + object_event 3, EVENT_OBJ_GFX_GIRL_2, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_154117, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_1, 0, 4, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_154120, 0 PacifidlogTown_PokemonCenter_1F_MapWarps:: @ 8386E90 warp_def 7, 8, 3, 0, MAP_PACIFIDLOG_TOWN diff --git a/data/maps/PacifidlogTown_PokemonCenter_2F/events.inc b/data/maps/PacifidlogTown_PokemonCenter_2F/events.inc index 8bc70f400..7e31a4ef3 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_2F/events.inc +++ b/data/maps/PacifidlogTown_PokemonCenter_2F/events.inc @@ -1,7 +1,7 @@ PacifidlogTown_PokemonCenter_2F_EventObjects:: @ 8386EBC - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 2, 3, 8, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_153F48, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 7, 2, 3, 8, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_153F4E, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, 8, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_15414E, 0 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_153F48, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_153F4E, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_15414E, 0 PacifidlogTown_PokemonCenter_2F_MapWarps:: @ 8386F04 warp_def 1, 5, 4, 2, MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_1F diff --git a/data/maps/PetalburgCity/events.inc b/data/maps/PetalburgCity/events.inc index 43216cdc9..66bedb893 100644 --- a/data/maps/PetalburgCity/events.inc +++ b/data/maps/PetalburgCity/events.inc @@ -1,13 +1,13 @@ PetalburgCity_EventObjects:: @ 837F5F0 - object_event 1, EVENT_OBJ_GFX_WOMAN_5, 0, 16, 18, 3, 2, 1, 1, 0, 0, PetalburgCity_EventScript_14B7C3, FLAG_HIDE_WALLY_MOM_PETALBURG_1 - object_event 2, EVENT_OBJ_GFX_WALLY, 0, 15, 10, 3, 7, 0, 0, 0, 0, 0x0, FLAG_HIDE_WALLY_PETALBURG - object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 8, 22, 3, 8, 0, 0, 0, 0, PetalburgCity_EventScript_14B7AC, 0 - object_event 4, EVENT_OBJ_GFX_GENTLEMAN, 0, 20, 10, 3, 3, 0, 1, 0, 0, PetalburgCity_EventScript_14B824, 0 - object_event 5, EVENT_OBJ_GFX_MAN_1, 0, 15, 11, 3, 7, 0, 0, 0, 0, 0x0, FLAG_HIDE_WALLY_FATHER_PETALBURG - object_event 6, EVENT_OBJ_GFX_WOMAN_2, 0, 14, 11, 3, 7, 0, 0, 0, 0, 0x0, FLAG_HIDE_WALLY_MOTHER_PETALBURG - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 2, 3, 1, 0, 0, 0, 0, PetalburgCity_EventScript_1B1704, FLAG_ITEM_PETALBURG_1 - object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 28, 3, 1, 0, 0, 0, 0, PetalburgCity_EventScript_1B1711, FLAG_ITEM_PETALBURG_2 - object_event 9, EVENT_OBJ_GFX_BOY_2, 0, 12, 15, 3, 1, 0, 0, 0, 0, PetalburgCity_EventScript_14BA2D, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_5, 0, 16, 18, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, PetalburgCity_EventScript_14B7C3, FLAG_HIDE_WALLY_MOM_PETALBURG_1 + object_event 2, EVENT_OBJ_GFX_WALLY, 0, 15, 10, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_WALLY_PETALBURG + object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 8, 22, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_EventScript_14B7AC, 0 + object_event 4, EVENT_OBJ_GFX_GENTLEMAN, 0, 20, 10, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, PetalburgCity_EventScript_14B824, 0 + object_event 5, EVENT_OBJ_GFX_MAN_1, 0, 15, 11, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_WALLY_FATHER_PETALBURG + object_event 6, EVENT_OBJ_GFX_WOMAN_2, 0, 14, 11, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_WALLY_MOTHER_PETALBURG + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, PetalburgCity_EventScript_1B1704, FLAG_ITEM_PETALBURG_1 + object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 28, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, PetalburgCity_EventScript_1B1711, FLAG_ITEM_PETALBURG_2 + object_event 9, EVENT_OBJ_GFX_BOY_2, 0, 12, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, PetalburgCity_EventScript_14BA2D, 0 PetalburgCity_MapWarps:: @ 837F6C8 warp_def 10, 19, 0, 0, MAP_PETALBURG_CITY_HOUSE1 diff --git a/data/maps/PetalburgCity_Gym/events.inc b/data/maps/PetalburgCity_Gym/events.inc index b5dd1f57b..d4ea2bf06 100644 --- a/data/maps/PetalburgCity_Gym/events.inc +++ b/data/maps/PetalburgCity_Gym/events.inc @@ -1,14 +1,14 @@ PetalburgCity_Gym_EventObjects:: @ 8387168 - object_event 1, EVENT_OBJ_GFX_NORMAN, 0, 4, 3, 3, 8, 0, 0, 0, 0, PetalburgCity_Gym_EventScript_1545B9, FLAG_HIDE_NORMAN_PETALBURG_GYM - object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 94, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_154EE6, 0 - object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 4, 81, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_154DF6, 0 - object_event 4, EVENT_OBJ_GFX_MAN_4, 0, 4, 42, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_154E32, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 55, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_154F22, 0 - object_event 6, EVENT_OBJ_GFX_MAN_4, 0, 4, 68, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_154E6E, 0 - object_event 7, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 16, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_154F5E, 0 - object_event 8, EVENT_OBJ_GFX_MAN_4, 0, 4, 29, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_154EAA, 0 - object_event 9, EVENT_OBJ_GFX_MAN_2, 0, 3, 109, 3, 8, 0, 0, 0, 0, PetalburgCity_Gym_EventScript_15518B, FLAG_HIDE_PETALBURG_GYM_GUIDE - object_event 10, EVENT_OBJ_GFX_WALLY, 0, 4, 111, 3, 7, 0, 0, 0, 0, 0x0, FLAG_HIDE_WALLY_PETALBURG_GYM + object_event 1, EVENT_OBJ_GFX_NORMAN, 0, 4, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_Gym_EventScript_1545B9, FLAG_HIDE_NORMAN_PETALBURG_GYM + object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 94, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_154EE6, 0 + object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 4, 81, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_154DF6, 0 + object_event 4, EVENT_OBJ_GFX_MAN_4, 0, 4, 42, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_154E32, 0 + object_event 5, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 55, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_154F22, 0 + object_event 6, EVENT_OBJ_GFX_MAN_4, 0, 4, 68, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_154E6E, 0 + object_event 7, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_154F5E, 0 + object_event 8, EVENT_OBJ_GFX_MAN_4, 0, 4, 29, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_154EAA, 0 + object_event 9, EVENT_OBJ_GFX_MAN_2, 0, 3, 109, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_Gym_EventScript_15518B, FLAG_HIDE_PETALBURG_GYM_GUIDE + object_event 10, EVENT_OBJ_GFX_WALLY, 0, 4, 111, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_WALLY_PETALBURG_GYM PetalburgCity_Gym_MapWarps:: @ 8387258 warp_def 4, 111, 3, 2, MAP_PETALBURG_CITY diff --git a/data/maps/PetalburgCity_House1/events.inc b/data/maps/PetalburgCity_House1/events.inc index df1970bd4..7ab13826e 100644 --- a/data/maps/PetalburgCity_House1/events.inc +++ b/data/maps/PetalburgCity_House1/events.inc @@ -1,6 +1,6 @@ PetalburgCity_House1_EventObjects:: @ 8387444 - object_event 1, EVENT_OBJ_GFX_GIRL_1, 0, 7, 4, 3, 2, 2, 2, 0, 0, PetalburgCity_House1_EventScript_1551E8, 0 - object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 4, 4, 3, 8, 0, 0, 0, 0, PetalburgCity_House1_EventScript_1551DF, 0 + object_event 1, EVENT_OBJ_GFX_GIRL_1, 0, 7, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 2, 0, 0, PetalburgCity_House1_EventScript_1551E8, 0 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_House1_EventScript_1551DF, 0 PetalburgCity_House1_MapWarps:: @ 8387474 warp_def 3, 8, 0, 0, MAP_PETALBURG_CITY diff --git a/data/maps/PetalburgCity_House2/events.inc b/data/maps/PetalburgCity_House2/events.inc index b26cc139f..1999ba316 100644 --- a/data/maps/PetalburgCity_House2/events.inc +++ b/data/maps/PetalburgCity_House2/events.inc @@ -1,6 +1,6 @@ PetalburgCity_House2_EventObjects:: @ 8387498 - object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 2, 5, 3, 2, 1, 1, 0, 0, PetalburgCity_House2_EventScript_1551F2, 0 - object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 7, 5, 3, 8, 0, 0, 0, 0, PetalburgCity_House2_EventScript_1551FB, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 2, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, PetalburgCity_House2_EventScript_1551F2, 0 + object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_House2_EventScript_1551FB, 0 PetalburgCity_House2_MapWarps:: @ 83874C8 warp_def 3, 7, 0, 4, MAP_PETALBURG_CITY diff --git a/data/maps/PetalburgCity_Mart/events.inc b/data/maps/PetalburgCity_Mart/events.inc index 3171dca99..9b34bc9fc 100644 --- a/data/maps/PetalburgCity_Mart/events.inc +++ b/data/maps/PetalburgCity_Mart/events.inc @@ -1,8 +1,8 @@ PetalburgCity_Mart_EventObjects:: @ 8387614 - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_1552B0, 0 - object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 9, 4, 3, 10, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_15532C, 0 - object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 6, 3, 3, 8, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_155323, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_3, 0, 5, 5, 3, 10, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_15531A, 0 + object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_1552B0, 0 + object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 9, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_15532C, 0 + object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 6, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_155323, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_3, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_15531A, 0 PetalburgCity_Mart_MapWarps:: @ 8387674 warp_def 3, 7, 0, 5, MAP_PETALBURG_CITY diff --git a/data/maps/PetalburgCity_PokemonCenter_1F/events.inc b/data/maps/PetalburgCity_PokemonCenter_1F/events.inc index d4dc0c63e..ded0fd6d5 100644 --- a/data/maps/PetalburgCity_PokemonCenter_1F/events.inc +++ b/data/maps/PetalburgCity_PokemonCenter_1F/events.inc @@ -1,9 +1,9 @@ PetalburgCity_PokemonCenter_1F_EventObjects:: @ 83874EC - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_155213, 0 - object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 11, 2, 3, 8, 0, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_1B1B14, 0 - object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 2, 3, 3, 8, 0, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_155221, 0 - object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 9, 6, 3, 2, 1, 1, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_15522A, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_7, 0, 5, 4, 3, 1, 1, 1, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_155233, 0 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_155213, 0 + object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 11, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_1B1B14, 0 + object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_155221, 0 + object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 9, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_15522A, 0 + object_event 5, EVENT_OBJ_GFX_WOMAN_7, 0, 5, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_155233, 0 PetalburgCity_PokemonCenter_1F_MapWarps:: @ 8387564 warp_def 7, 8, 3, 3, MAP_PETALBURG_CITY diff --git a/data/maps/PetalburgCity_PokemonCenter_2F/events.inc b/data/maps/PetalburgCity_PokemonCenter_2F/events.inc index 365e3a258..e90059281 100644 --- a/data/maps/PetalburgCity_PokemonCenter_2F/events.inc +++ b/data/maps/PetalburgCity_PokemonCenter_2F/events.inc @@ -1,7 +1,7 @@ PetalburgCity_PokemonCenter_2F_EventObjects:: @ 8387590 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 2, 3, 8, 0, 0, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_15529D, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 7, 2, 3, 8, 0, 0, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_1552A3, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, 8, 0, 0, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_1552A9, 0 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_15529D, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_1552A3, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_1552A9, 0 PetalburgCity_PokemonCenter_2F_MapWarps:: @ 83875D8 warp_def 1, 5, 4, 2, MAP_PETALBURG_CITY_POKEMON_CENTER_1F diff --git a/data/maps/PetalburgCity_WallysHouse/events.inc b/data/maps/PetalburgCity_WallysHouse/events.inc index bc33ab969..b96ee85c8 100644 --- a/data/maps/PetalburgCity_WallysHouse/events.inc +++ b/data/maps/PetalburgCity_WallysHouse/events.inc @@ -1,6 +1,6 @@ PetalburgCity_WallysHouse_EventObjects:: @ 8387114 - object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 3, 4, 3, 10, 0, 0, 0, 0, PetalburgCity_WallysHouse_EventScript_1543C4, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 7, 5, 3, 9, 0, 0, 0, 0, PetalburgCity_WallysHouse_EventScript_154445, 0 + object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, PetalburgCity_WallysHouse_EventScript_1543C4, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, PetalburgCity_WallysHouse_EventScript_154445, 0 PetalburgCity_WallysHouse_MapWarps:: @ 8387144 warp_def 3, 7, 0, 1, MAP_PETALBURG_CITY diff --git a/data/maps/PetalburgWoods/events.inc b/data/maps/PetalburgWoods/events.inc index d624d94dc..de7cdf95b 100644 --- a/data/maps/PetalburgWoods/events.inc +++ b/data/maps/PetalburgWoods/events.inc @@ -1,17 +1,17 @@ PetalburgWoods_EventObjects:: @ 838C14C - object_event 1, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 19, 10, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11 - object_event 2, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 19, 11, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_12 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 26, 17, 3, 10, 0, 0, 0, 0, 0x0, FLAG_HIDE_EVIL_TEAM_PETALBURG_WOODS - object_event 4, EVENT_OBJ_GFX_MAN_2, 0, 26, 20, 3, 1, 0, 0, 0, 0, 0x0, FLAG_HIDE_DEVON_PETALBURG_WOODS - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 45, 7, 3, 8, 0, 0, 0, 0, PetalburgWoods_EventScript_1B175F, FLAG_ITEM_PETALBURG_WOODS_2 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 35, 20, 3, 8, 0, 0, 0, 0, PetalburgWoods_EventScript_1B1752, FLAG_ITEM_PETALBURG_WOODS_1 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 8, 3, 1, 0, 0, 0, 0, PetalburgWoods_EventScript_1B176C, FLAG_ITEM_PETALBURG_WOODS_3 - object_event 8, EVENT_OBJ_GFX_BOY_2, 0, 15, 19, 3, 3, 1, 2, 0, 0, PetalburgWoods_EventScript_15CECA, 0 - object_event 9, EVENT_OBJ_GFX_BUG_CATCHER, 0, 7, 32, 3, 22, 0, 0, 1, 3, PetalburgWoods_EventScript_15CF27, 0 - object_event 10, EVENT_OBJ_GFX_BUG_CATCHER, 0, 4, 14, 3, 20, 0, 0, 1, 3, PetalburgWoods_EventScript_15CF3E, 0 - object_event 11, EVENT_OBJ_GFX_BOY_3, 0, 30, 34, 3, 2, 2, 1, 0, 0, PetalburgWoods_EventScript_15CED3, 0 - object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 26, 3, 1, 1, 1, 0, 0, PetalburgWoods_EventScript_1B1779, FLAG_ITEM_PETALBURG_WOODS_4 - object_event 13, EVENT_OBJ_GFX_GIRL_2, 0, 33, 5, 3, 1, 1, 1, 0, 0, PetalburgWoods_EventScript_15CEDC, 0 + object_event 1, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 19, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11 + object_event 2, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 19, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_12 + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 26, 17, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_EVIL_TEAM_PETALBURG_WOODS + object_event 4, EVENT_OBJ_GFX_MAN_2, 0, 26, 20, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_HIDE_DEVON_PETALBURG_WOODS + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 45, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgWoods_EventScript_1B175F, FLAG_ITEM_PETALBURG_WOODS_2 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 35, 20, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgWoods_EventScript_1B1752, FLAG_ITEM_PETALBURG_WOODS_1 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, PetalburgWoods_EventScript_1B176C, FLAG_ITEM_PETALBURG_WOODS_3 + object_event 8, EVENT_OBJ_GFX_BOY_2, 0, 15, 19, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 1, 2, 0, 0, PetalburgWoods_EventScript_15CECA, 0 + object_event 9, EVENT_OBJ_GFX_BUG_CATCHER, 0, 7, 32, 3, MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT, 0, 0, 1, 3, PetalburgWoods_EventScript_15CF27, 0 + object_event 10, EVENT_OBJ_GFX_BUG_CATCHER, 0, 4, 14, 3, MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT, 0, 0, 1, 3, PetalburgWoods_EventScript_15CF3E, 0 + object_event 11, EVENT_OBJ_GFX_BOY_3, 0, 30, 34, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 1, 0, 0, PetalburgWoods_EventScript_15CED3, 0 + object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 26, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, PetalburgWoods_EventScript_1B1779, FLAG_ITEM_PETALBURG_WOODS_4 + object_event 13, EVENT_OBJ_GFX_GIRL_2, 0, 33, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, PetalburgWoods_EventScript_15CEDC, 0 PetalburgWoods_MapWarps:: @ 838C284 warp_def 14, 5, 0, 2, MAP_ROUTE104 diff --git a/data/maps/RecordCorner/events.inc b/data/maps/RecordCorner/events.inc index e8c27a9c9..8d1fd9309 100644 --- a/data/maps/RecordCorner/events.inc +++ b/data/maps/RecordCorner/events.inc @@ -1,5 +1,5 @@ RecordCorner_EventObjects:: @ 839139C - object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 10, 5, 3, 8, 0, 0, 0, 0, RecordCorner_EventScript_1A44BC, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 10, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RecordCorner_EventScript_1A44BC, 0 RecordCorner_MapWarps:: @ 83913B4 warp_def 8, 9, 3, 127, MAP_NONE diff --git a/data/maps/Route101/events.inc b/data/maps/Route101/events.inc index 933509835..f991b75b8 100644 --- a/data/maps/Route101/events.inc +++ b/data/maps/Route101/events.inc @@ -1,10 +1,10 @@ Route101_EventObjects:: @ 83810BC - object_event 1, EVENT_OBJ_GFX_YOUNGSTER, 0, 16, 8, 3, 1, 0, 0, 0, 0, Route101_EventScript_14EA64, 0 - object_event 2, EVENT_OBJ_GFX_PROF_BIRCH, 0, 9, 13, 0, 71, 0, 0, 0, 0, 0x0, FLAG_HIDE_BIRCH_BATTLE_POOCHYENA - object_event 3, EVENT_OBJ_GFX_BIRCHS_BAG, 0, 7, 14, 3, 1, 0, 0, 0, 0, Route101_EventScript_14EA7F, FLAG_HIDE_BIRCH_STARTERS_BAG - object_event 4, EVENT_OBJ_GFX_POOCHYENA, 0, 10, 13, 0, 70, 0, 0, 0, 0, 0x0, FLAG_HIDE_POOCHYENA_ROUTE101 - object_event 5, EVENT_OBJ_GFX_PROF_BIRCH, 0, 5, 11, 3, 1, 0, 0, 0, 0, Route101_EventScript_1A037F, FLAG_HIDE_BIRCH_ROUTE101 - object_event 6, EVENT_OBJ_GFX_BOY_2, 0, 2, 13, 3, 5, 1, 1, 0, 0, Route101_EventScript_14EA6D, FLAG_HIDE_BOY_ROUTE101 + object_event 1, EVENT_OBJ_GFX_YOUNGSTER, 0, 16, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route101_EventScript_14EA64, 0 + object_event 2, EVENT_OBJ_GFX_PROF_BIRCH, 0, 9, 13, 0, MOVEMENT_TYPE_JOG_IN_PLACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_BIRCH_BATTLE_POOCHYENA + object_event 3, EVENT_OBJ_GFX_BIRCHS_BAG, 0, 7, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route101_EventScript_14EA7F, FLAG_HIDE_BIRCH_STARTERS_BAG + object_event 4, EVENT_OBJ_GFX_POOCHYENA, 0, 10, 13, 0, MOVEMENT_TYPE_JOG_IN_PLACE_LEFT, 0, 0, 0, 0, 0x0, FLAG_HIDE_POOCHYENA_ROUTE101 + object_event 5, EVENT_OBJ_GFX_PROF_BIRCH, 0, 5, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route101_EventScript_1A037F, FLAG_HIDE_BIRCH_ROUTE101 + object_event 6, EVENT_OBJ_GFX_BOY_2, 0, 2, 13, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 1, 0, 0, Route101_EventScript_14EA6D, FLAG_HIDE_BOY_ROUTE101 Route101_MapCoordEvents:: @ 838114C coord_event 10, 19, 3, 0, VAR_ROUTE101_STATE, 1, 0, Route101_EventScript_14E948 diff --git a/data/maps/Route102/events.inc b/data/maps/Route102/events.inc index 4de0e95d2..72345ef0e 100644 --- a/data/maps/Route102/events.inc +++ b/data/maps/Route102/events.inc @@ -1,13 +1,13 @@ Route102_EventObjects:: @ 83811FC - object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 18, 11, 3, 1, 0, 0, 0, 0, Route102_EventScript_14EADA, 0 - object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 33, 14, 3, 8, 0, 0, 1, 3, Route102_EventScript_14EAFE, 0 - object_event 3, EVENT_OBJ_GFX_BUG_CATCHER, 0, 25, 15, 3, 7, 0, 0, 1, 2, Route102_EventScript_14EB3C, 0 - object_event 4, EVENT_OBJ_GFX_LASS, 0, 8, 7, 3, 18, 0, 0, 1, 3, Route102_EventScript_14EB53, 0 - object_event 5, EVENT_OBJ_GFX_BOY_1, 0, 37, 4, 3, 2, 1, 1, 0, 0, Route102_EventScript_14EAF5, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 11, 15, 3, 8, 0, 0, 0, 0, Route102_EventScript_1B1439, FLAG_ITEM_ROUTE102_1 - object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 24, 2, 3, 12, 0, 0, 0, 2, S_BerryTree, 0 - object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 25, 2, 3, 12, 0, 0, 0, 1, S_BerryTree, 0 - object_event 9, EVENT_OBJ_GFX_YOUNGSTER, 0, 19, 4, 3, 8, 1, 1, 1, 3, Route102_EventScript_14EB6A, 0 + object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 18, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route102_EventScript_14EADA, 0 + object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 33, 14, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, Route102_EventScript_14EAFE, 0 + object_event 3, EVENT_OBJ_GFX_BUG_CATCHER, 0, 25, 15, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 2, Route102_EventScript_14EB3C, 0 + object_event 4, EVENT_OBJ_GFX_LASS, 0, 8, 7, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 0, 0, 1, 3, Route102_EventScript_14EB53, 0 + object_event 5, EVENT_OBJ_GFX_BOY_1, 0, 37, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route102_EventScript_14EAF5, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 11, 15, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route102_EventScript_1B1439, FLAG_ITEM_ROUTE102_1 + object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 24, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 2, S_BerryTree, 0 + object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 25, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 1, S_BerryTree, 0 + object_event 9, EVENT_OBJ_GFX_YOUNGSTER, 0, 19, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 3, Route102_EventScript_14EB6A, 0 Route102_MapBGEvents:: @ 83812D4 bg_event 17, 2, 0, 0, 0, Route102_EventScript_14EAEC diff --git a/data/maps/Route103/events.inc b/data/maps/Route103/events.inc index f131106da..386d68dd9 100644 --- a/data/maps/Route103/events.inc +++ b/data/maps/Route103/events.inc @@ -1,19 +1,19 @@ Route103_EventObjects:: @ 8381300 - object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 49, 12, 3, 9, 0, 0, 0, 0, Route103_EventScript_14ED82, 0 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 10, 2, 3, 7, 0, 0, 0, 0, Route103_EventScript_14EB92, FLAG_HIDE_RIVAL_ROUTE103 - object_event 3, EVENT_OBJ_GFX_WOMAN_3, 0, 71, 10, 3, 18, 0, 0, 1, 3, Route103_EventScript_14ED94, 0 - object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 65, 11, 3, 8, 0, 0, 1, 0, Route103_EventScript_14EDF1, 0 - object_event 5, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 64, 11, 3, 8, 0, 0, 1, 0, Route103_EventScript_14EDAB, 0 - object_event 6, EVENT_OBJ_GFX_FISHERMAN, 0, 50, 8, 3, 26, 0, 1, 1, 3, Route103_EventScript_14EE37, 0 - object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 58, 5, 3, 12, 0, 0, 0, 5, S_BerryTree, 0 - object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 59, 5, 3, 12, 0, 0, 0, 6, S_BerryTree, 0 - object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 60, 5, 3, 12, 0, 0, 0, 7, S_BerryTree, 0 - object_event 10, EVENT_OBJ_GFX_BOY_1, 0, 20, 10, 3, 2, 1, 2, 0, 0, Route103_EventScript_14ED79, 0 - object_event 11, EVENT_OBJ_GFX_PROF_BIRCH, 0, 7, 3, 3, 2, 1, 1, 0, 0, Route103_EventScript_1A037F, FLAG_HIDE_BIRCH_ROUTE103 - object_event 12, EVENT_OBJ_GFX_MAN_3, 0, 56, 12, 3, 10, 0, 0, 1, 5, Route103_EventScript_14EE4E, 0 - object_event 13, EVENT_OBJ_GFX_ITEM_BALL, 0, 63, 8, 3, 1, 1, 1, 0, 0, Route103_EventScript_1B1446, FLAG_ITEM_ROUTE103_1 - object_event 14, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 67, 7, 3, 1, 1, 1, 0, 0, S_CuttableTree, FLAG_TEMP_12 - object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 69, 7, 3, 1, 1, 1, 0, 0, S_CuttableTree, FLAG_TEMP_13 + object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 49, 12, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route103_EventScript_14ED82, 0 + object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, Route103_EventScript_14EB92, FLAG_HIDE_RIVAL_ROUTE103 + object_event 3, EVENT_OBJ_GFX_WOMAN_3, 0, 71, 10, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 0, 0, 1, 3, Route103_EventScript_14ED94, 0 + object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 65, 11, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, Route103_EventScript_14EDF1, 0 + object_event 5, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 64, 11, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, Route103_EventScript_14EDAB, 0 + object_event 6, EVENT_OBJ_GFX_FISHERMAN, 0, 50, 8, 3, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 0, 1, 1, 3, Route103_EventScript_14EE37, 0 + object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 58, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 5, S_BerryTree, 0 + object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 59, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 6, S_BerryTree, 0 + object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 60, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 7, S_BerryTree, 0 + object_event 10, EVENT_OBJ_GFX_BOY_1, 0, 20, 10, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 2, 0, 0, Route103_EventScript_14ED79, 0 + object_event 11, EVENT_OBJ_GFX_PROF_BIRCH, 0, 7, 3, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route103_EventScript_1A037F, FLAG_HIDE_BIRCH_ROUTE103 + object_event 12, EVENT_OBJ_GFX_MAN_3, 0, 56, 12, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 5, Route103_EventScript_14EE4E, 0 + object_event 13, EVENT_OBJ_GFX_ITEM_BALL, 0, 63, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route103_EventScript_1B1446, FLAG_ITEM_ROUTE103_1 + object_event 14, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 67, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, S_CuttableTree, FLAG_TEMP_12 + object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 69, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, S_CuttableTree, FLAG_TEMP_13 Route103_MapBGEvents:: @ 8381468 bg_event 11, 9, 0, 0, 0, Route103_EventScript_14ED8B diff --git a/data/maps/Route104/events.inc b/data/maps/Route104/events.inc index 61934c590..33fe912fa 100644 --- a/data/maps/Route104/events.inc +++ b/data/maps/Route104/events.inc @@ -1,36 +1,36 @@ Route104_EventObjects:: @ 8381488 - object_event 1, EVENT_OBJ_GFX_BUG_CATCHER, 0, 15, 60, 3, 9, 0, 0, 0, 0, Route104_EventScript_14EF4B, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_2, 0, 25, 49, 3, 2, 1, 1, 0, 0, Route104_EventScript_14EF42, 0 - object_event 3, EVENT_OBJ_GFX_LASS, 0, 31, 24, 3, 9, 0, 0, 1, 7, Route104_EventScript_14F1A0, 0 - object_event 4, EVENT_OBJ_GFX_BOY_1, 0, 27, 63, 3, 3, 0, 1, 0, 0, Route104_EventScript_14EF81, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_3, 0, 30, 50, 3, 2, 1, 1, 0, 0, Route104_EventScript_14EF8A, 0 - object_event 6, EVENT_OBJ_GFX_GIRL_3, 0, 28, 74, 3, 7, 0, 0, 0, 0, Route104_EventScript_14EFCC, 0 - object_event 7, EVENT_OBJ_GFX_MR_BRINEYS_BOAT, 0, 12, 54, 1, 7, 0, 0, 0, 0, 0x0, FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104 - object_event 8, EVENT_OBJ_GFX_OLD_MAN_1, 0, 12, 51, 4, 10, 0, 0, 0, 0, 0x0, FLAG_HIDE_MR_BRINEY_ROUTE104 - object_event 9, EVENT_OBJ_GFX_FISHERMAN, 0, 29, 8, 3, 8, 0, 0, 1, 0, Route104_EventScript_14F172, 0 - object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 34, 6, 3, 12, 0, 0, 0, 8, S_BerryTree, 0 - object_event 11, EVENT_OBJ_GFX_BERRY_TREE, 0, 35, 6, 3, 12, 0, 0, 0, 9, S_BerryTree, 0 - object_event 12, EVENT_OBJ_GFX_BERRY_TREE, 0, 36, 6, 3, 12, 0, 0, 0, 10, S_BerryTree, 0 - object_event 13, EVENT_OBJ_GFX_BERRY_TREE, 0, 22, 41, 3, 12, 0, 0, 0, 11, S_BerryTree, 0 - object_event 14, EVENT_OBJ_GFX_BERRY_TREE, 0, 23, 41, 3, 12, 0, 0, 0, 12, S_BerryTree, 0 - object_event 15, EVENT_OBJ_GFX_BERRY_TREE, 0, 24, 41, 3, 12, 0, 0, 0, 13, S_BerryTree, 0 - object_event 16, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 37, 8, 3, 9, 1, 1, 0, 0, Route104_EventScript_14EEC8, 0 - object_event 17, EVENT_OBJ_GFX_BERRY_TREE, 0, 3, 22, 3, 12, 0, 0, 0, 3, S_BerryTree, 0 - object_event 18, EVENT_OBJ_GFX_BERRY_TREE, 0, 3, 23, 3, 12, 0, 0, 0, 4, S_BerryTree, 0 - object_event 19, EVENT_OBJ_GFX_BERRY_TREE, 0, 3, 24, 3, 12, 0, 0, 0, 75, S_BerryTree, 0 - object_event 20, EVENT_OBJ_GFX_BERRY_TREE, 0, 3, 25, 3, 12, 0, 0, 0, 76, S_BerryTree, 0 - object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 39, 15, 3, 1, 0, 0, 0, 0, Route104_EventScript_1B1453, FLAG_ITEM_ROUTE104_1 - object_event 22, EVENT_OBJ_GFX_WOMAN_7, 0, 8, 19, 3, 5, 1, 0, 0, 0, Route104_EventScript_14EF09, FLAG_HIDE_FLOWER_SHOP_WORKER_OUTSIDE - object_event 23, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 27, 15, 3, 8, 0, 0, 1, 0, Route104_EventScript_14F25A, 0 - object_event 24, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 28, 15, 3, 8, 0, 0, 1, 0, Route104_EventScript_14F279, 0 - object_event 25, EVENT_OBJ_GFX_BOY_4, 0, 11, 44, 3, 16, 0, 0, 1, 3, Route104_EventScript_14F1DE, 0 - object_event 26, EVENT_OBJ_GFX_WOMAN_3, 0, 22, 25, 3, 23, 0, 0, 1, 3, Route104_EventScript_14F21C, 0 - object_event 27, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 53, 3, 1, 1, 1, 0, 0, Route104_EventScript_1B1460, FLAG_ITEM_ROUTE104_2 - object_event 28, EVENT_OBJ_GFX_YOUNGSTER, 0, 18, 67, 3, 46, 5, 6, 1, 2, Route104_EventScript_14F189, 0 - object_event 29, EVENT_OBJ_GFX_ITEM_BALL, 0, 37, 22, 3, 1, 1, 1, 0, 0, Route104_EventScript_1B146D, FLAG_ITEM_ROUTE104_3 - object_event 30, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 35, 22, 3, 1, 1, 1, 0, 0, S_CuttableTree, FLAG_TEMP_11 - object_event 31, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 8, 3, 1, 1, 1, 0, 0, Route104_EventScript_1B147A, FLAG_ITEM_ROUTE104_4 - object_event 32, EVENT_OBJ_GFX_BOY_2, 0, 5, 26, 3, 1, 1, 1, 0, 0, Route104_EventScript_14EF93, 0 + object_event 1, EVENT_OBJ_GFX_BUG_CATCHER, 0, 15, 60, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route104_EventScript_14EF4B, 0 + object_event 2, EVENT_OBJ_GFX_GIRL_2, 0, 25, 49, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route104_EventScript_14EF42, 0 + object_event 3, EVENT_OBJ_GFX_LASS, 0, 31, 24, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 7, Route104_EventScript_14F1A0, 0 + object_event 4, EVENT_OBJ_GFX_BOY_1, 0, 27, 63, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, Route104_EventScript_14EF81, 0 + object_event 5, EVENT_OBJ_GFX_WOMAN_3, 0, 30, 50, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route104_EventScript_14EF8A, 0 + object_event 6, EVENT_OBJ_GFX_GIRL_3, 0, 28, 74, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, Route104_EventScript_14EFCC, 0 + object_event 7, EVENT_OBJ_GFX_MR_BRINEYS_BOAT, 0, 12, 54, 1, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104 + object_event 8, EVENT_OBJ_GFX_OLD_MAN_1, 0, 12, 51, 4, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_MR_BRINEY_ROUTE104 + object_event 9, EVENT_OBJ_GFX_FISHERMAN, 0, 29, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, Route104_EventScript_14F172, 0 + object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 34, 6, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 8, S_BerryTree, 0 + object_event 11, EVENT_OBJ_GFX_BERRY_TREE, 0, 35, 6, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 9, S_BerryTree, 0 + object_event 12, EVENT_OBJ_GFX_BERRY_TREE, 0, 36, 6, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 10, S_BerryTree, 0 + object_event 13, EVENT_OBJ_GFX_BERRY_TREE, 0, 22, 41, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 11, S_BerryTree, 0 + object_event 14, EVENT_OBJ_GFX_BERRY_TREE, 0, 23, 41, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 12, S_BerryTree, 0 + object_event 15, EVENT_OBJ_GFX_BERRY_TREE, 0, 24, 41, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 13, S_BerryTree, 0 + object_event 16, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 37, 8, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, Route104_EventScript_14EEC8, 0 + object_event 17, EVENT_OBJ_GFX_BERRY_TREE, 0, 3, 22, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 3, S_BerryTree, 0 + object_event 18, EVENT_OBJ_GFX_BERRY_TREE, 0, 3, 23, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 4, S_BerryTree, 0 + object_event 19, EVENT_OBJ_GFX_BERRY_TREE, 0, 3, 24, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 75, S_BerryTree, 0 + object_event 20, EVENT_OBJ_GFX_BERRY_TREE, 0, 3, 25, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 76, S_BerryTree, 0 + object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 39, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route104_EventScript_1B1453, FLAG_ITEM_ROUTE104_1 + object_event 22, EVENT_OBJ_GFX_WOMAN_7, 0, 8, 19, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, Route104_EventScript_14EF09, FLAG_HIDE_FLOWER_SHOP_WORKER_OUTSIDE + object_event 23, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 27, 15, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, Route104_EventScript_14F25A, 0 + object_event 24, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 28, 15, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, Route104_EventScript_14F279, 0 + object_event 25, EVENT_OBJ_GFX_BOY_4, 0, 11, 44, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 0, 0, 1, 3, Route104_EventScript_14F1DE, 0 + object_event 26, EVENT_OBJ_GFX_WOMAN_3, 0, 22, 25, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 0, 0, 1, 3, Route104_EventScript_14F21C, 0 + object_event 27, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 53, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route104_EventScript_1B1460, FLAG_ITEM_ROUTE104_2 + object_event 28, EVENT_OBJ_GFX_YOUNGSTER, 0, 18, 67, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT, 5, 6, 1, 2, Route104_EventScript_14F189, 0 + object_event 29, EVENT_OBJ_GFX_ITEM_BALL, 0, 37, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route104_EventScript_1B146D, FLAG_ITEM_ROUTE104_3 + object_event 30, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 35, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, S_CuttableTree, FLAG_TEMP_11 + object_event 31, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route104_EventScript_1B147A, FLAG_ITEM_ROUTE104_4 + object_event 32, EVENT_OBJ_GFX_BOY_2, 0, 5, 26, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route104_EventScript_14EF93, 0 Route104_MapWarps:: @ 8381788 warp_def 17, 50, 0, 0, MAP_ROUTE104_MR_BRINEYS_HOUSE diff --git a/data/maps/Route104_MrBrineysHouse/events.inc b/data/maps/Route104_MrBrineysHouse/events.inc index 9ae66cabb..bff32a029 100644 --- a/data/maps/Route104_MrBrineysHouse/events.inc +++ b/data/maps/Route104_MrBrineysHouse/events.inc @@ -1,6 +1,6 @@ Route104_MrBrineysHouse_EventObjects:: @ 838B654 - object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 5, 3, 3, 50, 3, 3, 0, 0, Route104_MrBrineysHouse_EventScript_15BCEB, FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE - object_event 2, EVENT_OBJ_GFX_WINGULL, 0, 6, 3, 3, 8, 3, 3, 0, 0, Route104_MrBrineysHouse_EventScript_15BDD1, FLAG_HIDE_PEEKO_BRINEY_HOUSE + object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 5, 3, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT, 3, 3, 0, 0, Route104_MrBrineysHouse_EventScript_15BCEB, FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE + object_event 2, EVENT_OBJ_GFX_WINGULL, 0, 6, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 3, 3, 0, 0, Route104_MrBrineysHouse_EventScript_15BDD1, FLAG_HIDE_PEEKO_BRINEY_HOUSE Route104_MrBrineysHouse_MapWarps:: @ 838B684 warp_def 5, 8, 0, 0, MAP_ROUTE104 diff --git a/data/maps/Route104_PrettyPetalFlowerShop/events.inc b/data/maps/Route104_PrettyPetalFlowerShop/events.inc index edf18089d..2af3c6c04 100644 --- a/data/maps/Route104_PrettyPetalFlowerShop/events.inc +++ b/data/maps/Route104_PrettyPetalFlowerShop/events.inc @@ -1,7 +1,7 @@ Route104_PrettyPetalFlowerShop_EventObjects:: @ 838B6A8 - object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 3, 3, 10, 0, 0, 0, 0, Route104_PrettyPetalFlowerShop_EventScript_15BE0B, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 7, 3, 3, 5, 1, 0, 0, 0, Route104_PrettyPetalFlowerShop_EventScript_15BEA4, 0 - object_event 3, EVENT_OBJ_GFX_GIRL_1, 0, 11, 6, 4, 2, 2, 2, 0, 0, Route104_PrettyPetalFlowerShop_EventScript_15BEDA, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route104_PrettyPetalFlowerShop_EventScript_15BE0B, 0 + object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 7, 3, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, Route104_PrettyPetalFlowerShop_EventScript_15BEA4, 0 + object_event 3, EVENT_OBJ_GFX_GIRL_1, 0, 11, 6, 4, MOVEMENT_TYPE_WANDER_AROUND, 2, 2, 0, 0, Route104_PrettyPetalFlowerShop_EventScript_15BEDA, 0 Route104_PrettyPetalFlowerShop_MapWarps:: @ 838B6F0 warp_def 2, 8, 0, 1, MAP_ROUTE104 diff --git a/data/maps/Route104_Prototype/events.inc b/data/maps/Route104_Prototype/events.inc index 2d7c90dc1..d08288c3c 100644 --- a/data/maps/Route104_Prototype/events.inc +++ b/data/maps/Route104_Prototype/events.inc @@ -1,16 +1,16 @@ Route104_Prototype_EventObjects:: @ 8391F2C - object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 27, 9, 3, 23, 0, 0, 1, 1, Route104_Prototype_EventScript_160D2E, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 13, 9, 3, 10, 0, 0, 1, 0, Route104_Prototype_EventScript_160D60, 0 - object_event 3, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 13, 10, 3, 10, 0, 0, 1, 0, Route104_Prototype_EventScript_160D60, 0 - object_event 4, EVENT_OBJ_GFX_HIKER, 0, 25, 21, 3, 8, 0, 0, 1, 1, Route104_Prototype_EventScript_160D7B, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_3, 0, 16, 30, 3, 24, 0, 0, 1, 1, Route104_Prototype_EventScript_160D92, 0 - object_event 6, EVENT_OBJ_GFX_HIKER, 0, 34, 2, 3, 8, 0, 0, 1, 3, Route104_Prototype_EventScript_160DA9, 0 - object_event 7, EVENT_OBJ_GFX_BOY_1, 0, 15, 4, 3, 8, 0, 0, 0, 0, Route104_Prototype_EventScript_160C4B, 0 - object_event 8, EVENT_OBJ_GFX_GIRL_1, 0, 14, 4, 3, 8, 0, 0, 0, 0, Route104_Prototype_EventScript_160CA3, 0 - object_event 9, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 27, 29, 3, 8, 0, 0, 1, 0, Route104_Prototype_EventScript_160D45, 0 - object_event 10, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 26, 29, 3, 8, 0, 0, 1, 0, Route104_Prototype_EventScript_160D45, 0 - object_event 11, EVENT_OBJ_GFX_BOY_1, 0, 17, 37, 3, 7, 0, 0, 0, 0, Route104_Prototype_EventScript_160D13, 0 - object_event 12, EVENT_OBJ_GFX_MAN_3, 0, 11, 28, 3, 2, 1, 1, 0, 0, Route104_Prototype_EventScript_160D0A, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 27, 9, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 0, 0, 1, 1, Route104_Prototype_EventScript_160D2E, 0 + object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 13, 9, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 0, Route104_Prototype_EventScript_160D60, 0 + object_event 3, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 13, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 0, Route104_Prototype_EventScript_160D60, 0 + object_event 4, EVENT_OBJ_GFX_HIKER, 0, 25, 21, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route104_Prototype_EventScript_160D7B, 0 + object_event 5, EVENT_OBJ_GFX_WOMAN_3, 0, 16, 30, 3, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 0, 0, 1, 1, Route104_Prototype_EventScript_160D92, 0 + object_event 6, EVENT_OBJ_GFX_HIKER, 0, 34, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, Route104_Prototype_EventScript_160DA9, 0 + object_event 7, EVENT_OBJ_GFX_BOY_1, 0, 15, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route104_Prototype_EventScript_160C4B, 0 + object_event 8, EVENT_OBJ_GFX_GIRL_1, 0, 14, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route104_Prototype_EventScript_160CA3, 0 + object_event 9, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 27, 29, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, Route104_Prototype_EventScript_160D45, 0 + object_event 10, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 26, 29, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, Route104_Prototype_EventScript_160D45, 0 + object_event 11, EVENT_OBJ_GFX_BOY_1, 0, 17, 37, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, Route104_Prototype_EventScript_160D13, 0 + object_event 12, EVENT_OBJ_GFX_MAN_3, 0, 11, 28, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route104_Prototype_EventScript_160D0A, 0 Route104_Prototype_MapWarps:: @ 839204C warp_def 5, 24, 0, 0, MAP_ROUTE104_PROTOTYPE_PRETTY_PETAL_FLOWER_SHOP diff --git a/data/maps/Route104_PrototypePrettyPetalFlowerShop/events.inc b/data/maps/Route104_PrototypePrettyPetalFlowerShop/events.inc index 89ceb8270..be85c689b 100644 --- a/data/maps/Route104_PrototypePrettyPetalFlowerShop/events.inc +++ b/data/maps/Route104_PrototypePrettyPetalFlowerShop/events.inc @@ -1,5 +1,5 @@ Route104_PrototypePrettyPetalFlowerShop_EventObjects:: @ 8392080 - object_event 1, EVENT_OBJ_GFX_GIRL_1, 0, 2, 3, 3, 8, 0, 0, 0, 0, Route104_PrototypePrettyPetalFlowerShop_EventScript_160DC1, 0 + object_event 1, EVENT_OBJ_GFX_GIRL_1, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route104_PrototypePrettyPetalFlowerShop_EventScript_160DC1, 0 Route104_PrototypePrettyPetalFlowerShop_MapWarps:: @ 8392098 warp_def 2, 8, 0, 0, MAP_ROUTE104_PROTOTYPE diff --git a/data/maps/Route105/events.inc b/data/maps/Route105/events.inc index 999966093..720991748 100644 --- a/data/maps/Route105/events.inc +++ b/data/maps/Route105/events.inc @@ -1,10 +1,10 @@ Route105_EventObjects:: @ 8381854 - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 18, 60, 1, 10, 0, 0, 1, 6, Route105_EventScript_14F2D2, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 10, 44, 1, 27, 7, 0, 1, 3, Route105_EventScript_14F2E9, 0 - object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 26, 36, 1, 25, 0, 7, 1, 3, Route105_EventScript_14F300, 0 - object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 19, 9, 1, 24, 0, 5, 1, 3, Route105_EventScript_14F317, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 73, 3, 1, 0, 0, 0, 0, Route105_EventScript_1B1487, FLAG_ITEM_ROUTE105_1 - object_event 6, EVENT_OBJ_GFX_HIKER, 0, 12, 51, 3, 13, 0, 0, 1, 3, Route105_EventScript_14F2BB, 0 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 18, 60, 1, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 6, Route105_EventScript_14F2D2, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 10, 44, 1, MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT, 7, 0, 1, 3, Route105_EventScript_14F2E9, 0 + object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 26, 36, 1, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 0, 7, 1, 3, Route105_EventScript_14F300, 0 + object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 19, 9, 1, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 0, 5, 1, 3, Route105_EventScript_14F317, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 73, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route105_EventScript_1B1487, FLAG_ITEM_ROUTE105_1 + object_event 6, EVENT_OBJ_GFX_HIKER, 0, 12, 51, 3, MOVEMENT_TYPE_FACE_DOWN_AND_UP, 0, 0, 1, 3, Route105_EventScript_14F2BB, 0 Route105_MapWarps:: @ 83818E4 warp_def 9, 20, 0, 0, MAP_ISLAND_CAVE diff --git a/data/maps/Route106/events.inc b/data/maps/Route106/events.inc index 55f395ded..14629157b 100644 --- a/data/maps/Route106/events.inc +++ b/data/maps/Route106/events.inc @@ -1,9 +1,9 @@ Route106_EventObjects:: @ 838190C - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 29, 11, 1, 27, 4, 0, 1, 3, Route106_EventScript_14F338, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 18, 5, 3, 1, 0, 0, 1, 3, Route106_EventScript_14F34F, 0 - object_event 3, EVENT_OBJ_GFX_FISHERMAN, 0, 51, 14, 3, 10, 0, 0, 1, 4, Route106_EventScript_14F366, 0 - object_event 4, EVENT_OBJ_GFX_FISHERMAN, 0, 65, 14, 3, 1, 0, 0, 1, 3, Route106_EventScript_14F3A4, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 14, 3, 1, 0, 0, 0, 0, Route106_EventScript_1B1494, FLAG_ITEM_ROUTE106_1 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 29, 11, 1, MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT, 4, 0, 1, 3, Route106_EventScript_14F338, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 18, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 1, 3, Route106_EventScript_14F34F, 0 + object_event 3, EVENT_OBJ_GFX_FISHERMAN, 0, 51, 14, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 4, Route106_EventScript_14F366, 0 + object_event 4, EVENT_OBJ_GFX_FISHERMAN, 0, 65, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 1, 3, Route106_EventScript_14F3A4, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route106_EventScript_1B1494, FLAG_ITEM_ROUTE106_1 Route106_MapWarps:: @ 8381984 warp_def 48, 16, 0, 0, MAP_GRANITE_CAVE_1F diff --git a/data/maps/Route107/events.inc b/data/maps/Route107/events.inc index 9bdeaf3b0..9f98360d4 100644 --- a/data/maps/Route107/events.inc +++ b/data/maps/Route107/events.inc @@ -1,10 +1,10 @@ Route107_EventObjects:: @ 83819D0 - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 27, 10, 1, 24, 1, 1, 1, 3, Route107_EventScript_14F3BC, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 38, 11, 1, 52, 6, 2, 1, 2, Route107_EventScript_14F3D3, 0 - object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 50, 6, 1, 14, 0, 0, 1, 3, Route107_EventScript_14F411, 0 - object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 16, 11, 1, 7, 0, 0, 1, 4, Route107_EventScript_14F428, 0 - object_event 5, EVENT_OBJ_GFX_SWIMMER_F, 0, 33, 4, 1, 8, 1, 1, 1, 0, Route107_EventScript_14F43F, 0 - object_event 6, EVENT_OBJ_GFX_TUBER_M_SWIMMING, 0, 32, 4, 1, 8, 1, 1, 1, 0, Route107_EventScript_14F45A, 0 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 27, 10, 1, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 1, 1, 1, 3, Route107_EventScript_14F3BC, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 38, 11, 1, MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP, 6, 2, 1, 2, Route107_EventScript_14F3D3, 0 + object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 50, 6, 1, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 1, 3, Route107_EventScript_14F411, 0 + object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 16, 11, 1, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 4, Route107_EventScript_14F428, 0 + object_event 5, EVENT_OBJ_GFX_SWIMMER_F, 0, 33, 4, 1, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 0, Route107_EventScript_14F43F, 0 + object_event 6, EVENT_OBJ_GFX_TUBER_M_SWIMMING, 0, 32, 4, 1, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 0, Route107_EventScript_14F45A, 0 Route107_MapEvents:: @ 8381A60 map_events Route107_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/Route108/events.inc b/data/maps/Route108/events.inc index 997fb5ce2..2d6ba0b35 100644 --- a/data/maps/Route108/events.inc +++ b/data/maps/Route108/events.inc @@ -1,8 +1,8 @@ Route108_EventObjects:: @ 8381A74 - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 17, 13, 1, 45, 3, 3, 1, 3, Route108_EventScript_14F476, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 8, 6, 1, 13, 1, 1, 1, 3, Route108_EventScript_14F4A4, 0 - object_event 3, EVENT_OBJ_GFX_SWIMMER_M, 0, 50, 10, 1, 24, 0, 0, 1, 3, Route108_EventScript_14F48D, 0 - object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 36, 12, 1, 51, 6, 3, 1, 3, Route108_EventScript_14F4BB, 0 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 17, 13, 1, MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT, 3, 3, 1, 3, Route108_EventScript_14F476, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 8, 6, 1, MOVEMENT_TYPE_FACE_DOWN_AND_UP, 1, 1, 1, 3, Route108_EventScript_14F4A4, 0 + object_event 3, EVENT_OBJ_GFX_SWIMMER_M, 0, 50, 10, 1, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 0, 0, 1, 3, Route108_EventScript_14F48D, 0 + object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 36, 12, 1, MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN, 6, 3, 1, 3, Route108_EventScript_14F4BB, 0 Route108_MapWarps:: @ 8381AD4 warp_def 29, 6, 3, 0, MAP_ABANDONED_SHIP_DECK diff --git a/data/maps/Route109/events.inc b/data/maps/Route109/events.inc index 7376fd4bf..8178651c3 100644 --- a/data/maps/Route109/events.inc +++ b/data/maps/Route109/events.inc @@ -1,24 +1,24 @@ Route109_EventObjects:: @ 8381AFC - object_event 1, EVENT_OBJ_GFX_MR_BRINEYS_BOAT, 0, 21, 26, 1, 7, 0, 0, 0, 0, 0x0, FLAG_HIDE_MR_BRINEY_BOAT_ROUTE109 - object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 21, 24, 3, 7, 0, 0, 0, 0, Route109_EventScript_14F680, FLAG_HIDE_MR_BRINEY_ROUTE109 - object_event 3, EVENT_OBJ_GFX_SWIMMER_M, 0, 12, 36, 3, 10, 0, 0, 1, 5, Route109_EventScript_14F7AD, 0 - object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 25, 42, 3, 15, 0, 0, 1, 5, Route109_EventScript_14F7C4, 0 - object_event 5, EVENT_OBJ_GFX_SAILOR, 0, 19, 19, 3, 10, 0, 0, 1, 4, Route109_EventScript_14F7DB, 0 - object_event 6, EVENT_OBJ_GFX_SAILOR, 0, 14, 11, 4, 8, 0, 0, 1, 1, Route109_EventScript_14F7F2, 0 - object_event 7, EVENT_OBJ_GFX_TUBER_M, 0, 21, 11, 3, 23, 0, 0, 1, 3, Route109_EventScript_14F809, 0 - object_event 8, EVENT_OBJ_GFX_TUBER_F, 0, 28, 8, 3, 10, 0, 0, 1, 4, Route109_EventScript_14F847, 0 - object_event 9, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 11, 6, 3, 8, 0, 0, 0, 0, Route109_EventScript_14F705, 0 - object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 48, 3, 1, 0, 0, 0, 0, Route109_EventScript_1B14A1, FLAG_ITEM_ROUTE109_1 - object_event 11, EVENT_OBJ_GFX_TUBER_F, 0, 29, 32, 3, 13, 0, 0, 1, 3, Route109_EventScript_14F89C, 0 - object_event 12, EVENT_OBJ_GFX_TUBER_F, 0, 28, 31, 3, 17, 0, 0, 1, 3, Route109_EventScript_14F885, 0 - object_event 13, EVENT_OBJ_GFX_FISHERMAN, 0, 15, 52, 3, 10, 0, 0, 1, 0, Route109_EventScript_14F8B3, 0 - object_event 14, EVENT_OBJ_GFX_TUBER_M, 0, 24, 17, 3, 10, 1, 1, 0, 0, Route109_EventScript_14F70E, 0 - object_event 15, EVENT_OBJ_GFX_TUBER_F, 0, 25, 17, 3, 9, 1, 1, 0, 0, Route109_EventScript_14F725, 0 - object_event 16, EVENT_OBJ_GFX_WOMAN_2, 0, 30, 32, 3, 8, 1, 1, 0, 0, Route109_EventScript_14F776, 0 - object_event 17, EVENT_OBJ_GFX_WOMAN_5, 0, 8, 41, 3, 8, 1, 1, 1, 0, Route109_EventScript_14F8E5, 0 - object_event 18, EVENT_OBJ_GFX_MAN_5, 0, 9, 41, 3, 8, 1, 1, 1, 0, Route109_EventScript_14F8CA, 0 - object_event 19, EVENT_OBJ_GFX_OLD_MAN_2, 0, 33, 6, 3, 1, 1, 1, 0, 0, Route109_EventScript_14F77F, 0 - object_event 20, EVENT_OBJ_GFX_ZIGZAGOON, 0, 32, 6, 3, 1, 1, 1, 0, 0, Route109_EventScript_14F788, 0 + object_event 1, EVENT_OBJ_GFX_MR_BRINEYS_BOAT, 0, 21, 26, 1, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_MR_BRINEY_BOAT_ROUTE109 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 21, 24, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, Route109_EventScript_14F680, FLAG_HIDE_MR_BRINEY_ROUTE109 + object_event 3, EVENT_OBJ_GFX_SWIMMER_M, 0, 12, 36, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 5, Route109_EventScript_14F7AD, 0 + object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 25, 42, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 0, 0, 1, 5, Route109_EventScript_14F7C4, 0 + object_event 5, EVENT_OBJ_GFX_SAILOR, 0, 19, 19, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 4, Route109_EventScript_14F7DB, 0 + object_event 6, EVENT_OBJ_GFX_SAILOR, 0, 14, 11, 4, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route109_EventScript_14F7F2, 0 + object_event 7, EVENT_OBJ_GFX_TUBER_M, 0, 21, 11, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 0, 0, 1, 3, Route109_EventScript_14F809, 0 + object_event 8, EVENT_OBJ_GFX_TUBER_F, 0, 28, 8, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 4, Route109_EventScript_14F847, 0 + object_event 9, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 11, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route109_EventScript_14F705, 0 + object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 48, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route109_EventScript_1B14A1, FLAG_ITEM_ROUTE109_1 + object_event 11, EVENT_OBJ_GFX_TUBER_F, 0, 29, 32, 3, MOVEMENT_TYPE_FACE_DOWN_AND_UP, 0, 0, 1, 3, Route109_EventScript_14F89C, 0 + object_event 12, EVENT_OBJ_GFX_TUBER_F, 0, 28, 31, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 0, 0, 1, 3, Route109_EventScript_14F885, 0 + object_event 13, EVENT_OBJ_GFX_FISHERMAN, 0, 15, 52, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 0, Route109_EventScript_14F8B3, 0 + object_event 14, EVENT_OBJ_GFX_TUBER_M, 0, 24, 17, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, Route109_EventScript_14F70E, 0 + object_event 15, EVENT_OBJ_GFX_TUBER_F, 0, 25, 17, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, Route109_EventScript_14F725, 0 + object_event 16, EVENT_OBJ_GFX_WOMAN_2, 0, 30, 32, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, Route109_EventScript_14F776, 0 + object_event 17, EVENT_OBJ_GFX_WOMAN_5, 0, 8, 41, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 0, Route109_EventScript_14F8E5, 0 + object_event 18, EVENT_OBJ_GFX_MAN_5, 0, 9, 41, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 0, Route109_EventScript_14F8CA, 0 + object_event 19, EVENT_OBJ_GFX_OLD_MAN_2, 0, 33, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route109_EventScript_14F77F, 0 + object_event 20, EVENT_OBJ_GFX_ZIGZAGOON, 0, 32, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route109_EventScript_14F788, 0 Route109_MapWarps:: @ 8381CDC warp_def 12, 5, 0, 0, MAP_ROUTE109_SEASHORE_HOUSE diff --git a/data/maps/Route109_SeashoreHouse/events.inc b/data/maps/Route109_SeashoreHouse/events.inc index f82513f08..b62a1b372 100644 --- a/data/maps/Route109_SeashoreHouse/events.inc +++ b/data/maps/Route109_SeashoreHouse/events.inc @@ -1,8 +1,8 @@ Route109_SeashoreHouse_EventObjects:: @ 83920BC - object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 6, 2, 3, 8, 0, 0, 0, 0, Route109_SeashoreHouse_EventScript_160DD4, 0 - object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 2, 3, 3, 8, 0, 0, 1, 2, Route109_SeashoreHouse_EventScript_160EB8, 0 - object_event 3, EVENT_OBJ_GFX_TUBER_M, 0, 14, 9, 3, 9, 0, 0, 1, 2, Route109_SeashoreHouse_EventScript_160EEE, 0 - object_event 4, EVENT_OBJ_GFX_BEAUTY, 0, 10, 5, 3, 14, 0, 0, 1, 2, Route109_SeashoreHouse_EventScript_160ED3, 0 + object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 6, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route109_SeashoreHouse_EventScript_160DD4, 0 + object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 2, Route109_SeashoreHouse_EventScript_160EB8, 0 + object_event 3, EVENT_OBJ_GFX_TUBER_M, 0, 14, 9, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, Route109_SeashoreHouse_EventScript_160EEE, 0 + object_event 4, EVENT_OBJ_GFX_BEAUTY, 0, 10, 5, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 1, 2, Route109_SeashoreHouse_EventScript_160ED3, 0 Route109_SeashoreHouse_MapWarps:: @ 839211C warp_def 6, 9, 0, 0, MAP_ROUTE109 diff --git a/data/maps/Route110/events.inc b/data/maps/Route110/events.inc index eb032e0cc..1602413f0 100644 --- a/data/maps/Route110/events.inc +++ b/data/maps/Route110/events.inc @@ -1,35 +1,35 @@ Route110_EventObjects:: @ 8381D58 - object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 17, 90, 3, 8, 0, 0, 0, 0, Route110_EventScript_14F9D4, 0 - object_event 2, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 29, 79, 4, 8, 0, 0, 0, 0, Route110_EventScript_14F9CB, 0 - object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 14, 69, 3, 3, 0, 1, 0, 0, Route110_EventScript_14F9C2, 0 - object_event 4, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 9, 57, 4, 2, 1, 1, 0, 0, Route110_EventScript_14F9B0, 0 - object_event 5, EVENT_OBJ_GFX_OLD_MAN_1, 0, 10, 11, 3, 2, 1, 1, 0, 0, Route110_EventScript_14F9B9, 0 - object_event 6, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 27, 24, 4, 2, 1, 3, 0, 0, Route110_EventScript_14F9A7, 0 - object_event 7, EVENT_OBJ_GFX_BOY_3, 0, 15, 7, 3, 2, 1, 1, 0, 0, Route110_EventScript_14F99E, 0 - object_event 8, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 16, 73, 4, 49, 2, 14, 1, 3, Route110_EventScript_14FB7D, 0 - object_event 9, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 19, 31, 4, 51, 10, 1, 1, 3, Route110_EventScript_14FB28, 0 - object_event 10, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 30, 31, 4, 9, 1, 1, 1, 4, Route110_EventScript_14FB94, 0 - object_event 11, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 16, 55, 4, 45, 4, 4, 1, 3, Route110_EventScript_14FB3F, 0 - object_event 12, EVENT_OBJ_GFX_PSYCHIC_M, 0, 5, 39, 3, 23, 0, 0, 1, 3, Route110_EventScript_14FA8E, 0 - object_event 13, EVENT_OBJ_GFX_LASS, 0, 33, 15, 3, 9, 0, 0, 1, 1, Route110_EventScript_14FAA5, 0 - object_event 14, EVENT_OBJ_GFX_MANIAC, 0, 23, 40, 3, 20, 0, 0, 1, 3, Route110_EventScript_14FABC, 0 - object_event 15, EVENT_OBJ_GFX_FISHERMAN, 0, 10, 19, 3, 8, 0, 0, 1, 1, Route110_EventScript_14FAFA, 0 - object_event 16, EVENT_OBJ_GFX_BERRY_TREE, 0, 5, 11, 3, 12, 0, 0, 0, 16, S_BerryTree, 0 - object_event 17, EVENT_OBJ_GFX_BERRY_TREE, 0, 6, 11, 3, 12, 0, 0, 0, 17, S_BerryTree, 0 - object_event 18, EVENT_OBJ_GFX_BERRY_TREE, 0, 7, 11, 3, 12, 0, 0, 0, 18, S_BerryTree, 0 - object_event 19, EVENT_OBJ_GFX_ITEM_BALL, 0, 30, 69, 3, 1, 0, 0, 0, 0, Route110_EventScript_1B14BB, FLAG_ITEM_ROUTE110_2 - object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 26, 47, 3, 1, 0, 0, 0, 0, Route110_EventScript_1B14AE, FLAG_ITEM_ROUTE110_1 - object_event 21, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 27, 92, 3, 8, 0, 0, 0, 0, Route110_EventScript_14FA53, 0 - object_event 22, EVENT_OBJ_GFX_VAR_1, 0, 7, 83, 3, 7, 0, 0, 0, 0, Route110_EventScript_14F946, FLAG_HIDE_EVIL_TEAM_ROUTE110 - object_event 23, EVENT_OBJ_GFX_VAR_1, 0, 8, 83, 3, 7, 0, 0, 0, 0, Route110_EventScript_14F95C, FLAG_HIDE_EVIL_TEAM_ROUTE110 - object_event 24, EVENT_OBJ_GFX_VAR_1, 0, 9, 83, 3, 7, 0, 0, 0, 0, Route110_EventScript_14F972, FLAG_HIDE_EVIL_TEAM_ROUTE110 - object_event 25, EVENT_OBJ_GFX_VAR_1, 0, 10, 83, 3, 7, 0, 0, 0, 0, Route110_EventScript_14F988, FLAG_HIDE_EVIL_TEAM_ROUTE110 - object_event 26, EVENT_OBJ_GFX_VAR_1, 0, 8, 82, 0, 8, 0, 0, 0, 0, 0x0, FLAG_HIDE_EVIL_TEAM_ROUTE110 - object_event 27, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 21, 78, 4, 51, 7, 1, 1, 2, Route110_EventScript_14FB11, 0 - object_event 28, EVENT_OBJ_GFX_VAR_0, 0, 34, 54, 3, 14, 0, 0, 0, 0, 0x0, FLAG_HIDE_RIVAL_ROUTE110 - object_event 29, EVENT_OBJ_GFX_VAR_3, 0, 34, 54, 3, 8, 0, 0, 0, 0, 0x0, FLAG_HIDE_RIVAL_ON_BIKE_ROUTE110 - object_event 30, EVENT_OBJ_GFX_YOUNGSTER, 0, 33, 69, 3, 14, 0, 0, 1, 3, Route110_EventScript_14FC10, 0 - object_event 31, EVENT_OBJ_GFX_WOMAN_2, 0, 11, 73, 3, 9, 0, 0, 1, 4, Route110_EventScript_14FBD2, 0 + object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 17, 90, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route110_EventScript_14F9D4, 0 + object_event 2, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 29, 79, 4, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route110_EventScript_14F9CB, 0 + object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 14, 69, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, Route110_EventScript_14F9C2, 0 + object_event 4, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 9, 57, 4, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route110_EventScript_14F9B0, 0 + object_event 5, EVENT_OBJ_GFX_OLD_MAN_1, 0, 10, 11, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route110_EventScript_14F9B9, 0 + object_event 6, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 27, 24, 4, MOVEMENT_TYPE_WANDER_AROUND, 1, 3, 0, 0, Route110_EventScript_14F9A7, 0 + object_event 7, EVENT_OBJ_GFX_BOY_3, 0, 15, 7, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route110_EventScript_14F99E, 0 + object_event 8, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 16, 73, 4, MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_DOWN_LEFT, 2, 14, 1, 3, Route110_EventScript_14FB7D, 0 + object_event 9, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 19, 31, 4, MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN, 10, 1, 1, 3, Route110_EventScript_14FB28, 0 + object_event 10, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 30, 31, 4, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 4, Route110_EventScript_14FB94, 0 + object_event 11, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 16, 55, 4, MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT, 4, 4, 1, 3, Route110_EventScript_14FB3F, 0 + object_event 12, EVENT_OBJ_GFX_PSYCHIC_M, 0, 5, 39, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 0, 0, 1, 3, Route110_EventScript_14FA8E, 0 + object_event 13, EVENT_OBJ_GFX_LASS, 0, 33, 15, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 1, Route110_EventScript_14FAA5, 0 + object_event 14, EVENT_OBJ_GFX_MANIAC, 0, 23, 40, 3, MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT, 0, 0, 1, 3, Route110_EventScript_14FABC, 0 + object_event 15, EVENT_OBJ_GFX_FISHERMAN, 0, 10, 19, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route110_EventScript_14FAFA, 0 + object_event 16, EVENT_OBJ_GFX_BERRY_TREE, 0, 5, 11, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 16, S_BerryTree, 0 + object_event 17, EVENT_OBJ_GFX_BERRY_TREE, 0, 6, 11, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 17, S_BerryTree, 0 + object_event 18, EVENT_OBJ_GFX_BERRY_TREE, 0, 7, 11, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 18, S_BerryTree, 0 + object_event 19, EVENT_OBJ_GFX_ITEM_BALL, 0, 30, 69, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_EventScript_1B14BB, FLAG_ITEM_ROUTE110_2 + object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 26, 47, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_EventScript_1B14AE, FLAG_ITEM_ROUTE110_1 + object_event 21, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 27, 92, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route110_EventScript_14FA53, 0 + object_event 22, EVENT_OBJ_GFX_VAR_1, 0, 7, 83, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, Route110_EventScript_14F946, FLAG_HIDE_EVIL_TEAM_ROUTE110 + object_event 23, EVENT_OBJ_GFX_VAR_1, 0, 8, 83, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, Route110_EventScript_14F95C, FLAG_HIDE_EVIL_TEAM_ROUTE110 + object_event 24, EVENT_OBJ_GFX_VAR_1, 0, 9, 83, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, Route110_EventScript_14F972, FLAG_HIDE_EVIL_TEAM_ROUTE110 + object_event 25, EVENT_OBJ_GFX_VAR_1, 0, 10, 83, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, Route110_EventScript_14F988, FLAG_HIDE_EVIL_TEAM_ROUTE110 + object_event 26, EVENT_OBJ_GFX_VAR_1, 0, 8, 82, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_EVIL_TEAM_ROUTE110 + object_event 27, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 21, 78, 4, MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN, 7, 1, 1, 2, Route110_EventScript_14FB11, 0 + object_event 28, EVENT_OBJ_GFX_VAR_0, 0, 34, 54, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_RIVAL_ROUTE110 + object_event 29, EVENT_OBJ_GFX_VAR_3, 0, 34, 54, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_RIVAL_ON_BIKE_ROUTE110 + object_event 30, EVENT_OBJ_GFX_YOUNGSTER, 0, 33, 69, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 1, 3, Route110_EventScript_14FC10, 0 + object_event 31, EVENT_OBJ_GFX_WOMAN_2, 0, 11, 73, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 4, Route110_EventScript_14FBD2, 0 Route110_MapWarps:: @ 8382040 warp_def 35, 24, 3, 0, MAP_NEW_MAUVILLE_ENTRANCE diff --git a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/events.inc b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/events.inc index 0474772cb..680a1884d 100644 --- a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/events.inc +++ b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/events.inc @@ -1,5 +1,5 @@ Route110_SeasideCyclingRoadNorthEntrance_EventObjects:: @ 8392CAC - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 7, 2, 3, 8, 0, 0, 0, 0, Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634EB, 0 + object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634EB, 0 Route110_SeasideCyclingRoadNorthEntrance_MapWarps:: @ 8392CC4 warp_def 1, 5, 0, 2, MAP_ROUTE110 diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/events.inc b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/events.inc index 996562b61..bba2d583d 100644 --- a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/events.inc +++ b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/events.inc @@ -1,5 +1,5 @@ Route110_SeasideCyclingRoadSouthEntrance_EventObjects:: @ 8392C40 - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 7, 2, 3, 8, 0, 0, 0, 0, Route110_SeasideCyclingRoadSouthEntrance_EventScript_16347F, 0 + object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route110_SeasideCyclingRoadSouthEntrance_EventScript_16347F, 0 Route110_SeasideCyclingRoadSouthEntrance_MapWarps:: @ 8392C58 warp_def 1, 5, 0, 4, MAP_ROUTE110 diff --git a/data/maps/Route110_TrickHouseEnd/events.inc b/data/maps/Route110_TrickHouseEnd/events.inc index 732c6c705..d794cfd35 100644 --- a/data/maps/Route110_TrickHouseEnd/events.inc +++ b/data/maps/Route110_TrickHouseEnd/events.inc @@ -1,5 +1,5 @@ Route110_TrickHouseEnd_EventObjects:: @ 83921D0 - object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 4, 5, 3, 10, 0, 0, 0, 0, Route110_TrickHouseEnd_EventScript_16199E, FLAG_HIDE_TRICKMASTER_END + object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route110_TrickHouseEnd_EventScript_16199E, FLAG_HIDE_TRICKMASTER_END Route110_TrickHouseEnd_MapWarps:: @ 83921E8 warp_def 10, 1, 3, 2, MAP_ROUTE110_TRICK_HOUSE_PUZZLE1 diff --git a/data/maps/Route110_TrickHouseEntrance/events.inc b/data/maps/Route110_TrickHouseEntrance/events.inc index 07c5a6555..44a86bd6f 100644 --- a/data/maps/Route110_TrickHouseEntrance/events.inc +++ b/data/maps/Route110_TrickHouseEntrance/events.inc @@ -1,5 +1,5 @@ Route110_TrickHouseEntrance_EventObjects:: @ 8392140 - object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 6, 2, 3, 9, 0, 0, 0, 0, Route110_TrickHouseEntrance_EventScript_16121A, FLAG_HIDE_TRICKMASTER_ENTRANCE + object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 6, 2, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route110_TrickHouseEntrance_EventScript_16121A, FLAG_HIDE_TRICKMASTER_ENTRANCE Route110_TrickHouseEntrance_MapWarps:: @ 8392158 warp_def 5, 7, 3, 1, MAP_ROUTE110 diff --git a/data/maps/Route110_TrickHousePuzzle1/events.inc b/data/maps/Route110_TrickHousePuzzle1/events.inc index ef5b7732f..1de294b5a 100644 --- a/data/maps/Route110_TrickHousePuzzle1/events.inc +++ b/data/maps/Route110_TrickHousePuzzle1/events.inc @@ -1,23 +1,23 @@ Route110_TrickHousePuzzle1_EventObjects:: @ 839225C - object_event 1, EVENT_OBJ_GFX_LASS, 0, 13, 21, 3, 9, 0, 0, 1, 5, Route110_TrickHousePuzzle1_EventScript_161D31, 0 - object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 13, 7, 3, 8, 0, 0, 1, 2, Route110_TrickHousePuzzle1_EventScript_161D48, 0 - object_event 3, EVENT_OBJ_GFX_LASS, 0, 3, 8, 3, 9, 0, 0, 1, 3, Route110_TrickHousePuzzle1_EventScript_161D5F, 0 - object_event 4, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 3, 18, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_13 - object_event 5, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 7, 21, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11 - object_event 6, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 12, 18, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_12 - object_event 7, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 10, 16, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_14 - object_event 8, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 12, 12, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_17 - object_event 9, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 3, 12, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_16 - object_event 10, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 14, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_15 - object_event 11, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 6, 10, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_19 - object_event 12, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 2, 10, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_18 - object_event 13, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 9, 8, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_1A - object_event 14, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 2, 4, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_1C - object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 6, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_1B - object_event 16, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 6, 4, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_1D - object_event 17, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 11, 4, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_1E - object_event 18, EVENT_OBJ_GFX_ITEM_BALL, 0, 9, 12, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_1B1A51, FLAG_ITEM_TRICK_HOUSE_PUZZLE_1_1 - object_event 19, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 14, 14, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_1F + object_event 1, EVENT_OBJ_GFX_LASS, 0, 13, 21, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 5, Route110_TrickHousePuzzle1_EventScript_161D31, 0 + object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 13, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 2, Route110_TrickHousePuzzle1_EventScript_161D48, 0 + object_event 3, EVENT_OBJ_GFX_LASS, 0, 3, 8, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 3, Route110_TrickHousePuzzle1_EventScript_161D5F, 0 + object_event 4, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 3, 18, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_13 + object_event 5, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 7, 21, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11 + object_event 6, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 12, 18, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_12 + object_event 7, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 10, 16, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_14 + object_event 8, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 12, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_17 + object_event 9, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 3, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_16 + object_event 10, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_15 + object_event 11, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 6, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_19 + object_event 12, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 2, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_18 + object_event 13, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 9, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_1A + object_event 14, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 2, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_1C + object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_1B + object_event 16, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 6, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_1D + object_event 17, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 11, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_1E + object_event 18, EVENT_OBJ_GFX_ITEM_BALL, 0, 9, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_1B1A51, FLAG_ITEM_TRICK_HOUSE_PUZZLE_1_1 + object_event 19, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 14, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_1F Route110_TrickHousePuzzle1_MapWarps:: @ 8392424 warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE diff --git a/data/maps/Route110_TrickHousePuzzle2/events.inc b/data/maps/Route110_TrickHousePuzzle2/events.inc index c815a1624..bc1bef2d6 100644 --- a/data/maps/Route110_TrickHousePuzzle2/events.inc +++ b/data/maps/Route110_TrickHousePuzzle2/events.inc @@ -1,9 +1,9 @@ Route110_TrickHousePuzzle2_EventObjects:: @ 839245C - object_event 1, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 13, 16, 3, 8, 0, 0, 1, 1, Route110_TrickHousePuzzle2_EventScript_161E78, 0 - object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 0, 10, 3, 10, 0, 0, 1, 2, Route110_TrickHousePuzzle2_EventScript_161E8F, 0 - object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 9, 7, 3, 9, 0, 0, 1, 3, Route110_TrickHousePuzzle2_EventScript_161EA6, 0 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 19, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle2_EventScript_1B1A6B, FLAG_ITEM_TRICK_HOUSE_PUZZLE_2_2 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 2, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle2_EventScript_1B1A5E, FLAG_ITEM_TRICK_HOUSE_PUZZLE_2_1 + object_event 1, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 13, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route110_TrickHousePuzzle2_EventScript_161E78, 0 + object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 0, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 2, Route110_TrickHousePuzzle2_EventScript_161E8F, 0 + object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 9, 7, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 3, Route110_TrickHousePuzzle2_EventScript_161EA6, 0 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 19, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle2_EventScript_1B1A6B, FLAG_ITEM_TRICK_HOUSE_PUZZLE_2_2 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle2_EventScript_1B1A5E, FLAG_ITEM_TRICK_HOUSE_PUZZLE_2_1 Route110_TrickHousePuzzle2_MapWarps:: @ 83924D4 warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE diff --git a/data/maps/Route110_TrickHousePuzzle3/events.inc b/data/maps/Route110_TrickHousePuzzle3/events.inc index e45f2d33b..1b4bbabcb 100644 --- a/data/maps/Route110_TrickHousePuzzle3/events.inc +++ b/data/maps/Route110_TrickHousePuzzle3/events.inc @@ -1,15 +1,15 @@ Route110_TrickHousePuzzle3_EventObjects:: @ 839254C - object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 10, 16, 3, 8, 0, 0, 1, 1, Route110_TrickHousePuzzle3_EventScript_162708, 0 - object_event 2, EVENT_OBJ_GFX_PICNICKER, 0, 1, 13, 3, 10, 0, 0, 1, 1, Route110_TrickHousePuzzle3_EventScript_16271F, 0 - object_event 3, EVENT_OBJ_GFX_HIKER, 0, 11, 4, 3, 8, 0, 0, 1, 1, Route110_TrickHousePuzzle3_EventScript_162736, 0 - object_event 4, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 4, 12, 3, 1, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_11 - object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 1, 3, 3, 1, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_12 - object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 10, 3, 1, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_13 - object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 13, 7, 3, 1, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_14 - object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 11, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_1B1A85, FLAG_ITEM_TRICK_HOUSE_PUZZLE_3_2 - object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 2, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_1B1A78, FLAG_ITEM_TRICK_HOUSE_PUZZLE_3_1 - object_event 10, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 1, 20, 3, 1, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_15 - object_event 11, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 2, 21, 3, 1, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_16 + object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 10, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route110_TrickHousePuzzle3_EventScript_162708, 0 + object_event 2, EVENT_OBJ_GFX_PICNICKER, 0, 1, 13, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 1, Route110_TrickHousePuzzle3_EventScript_16271F, 0 + object_event 3, EVENT_OBJ_GFX_HIKER, 0, 11, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route110_TrickHousePuzzle3_EventScript_162736, 0 + object_event 4, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 4, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_11 + object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 1, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_12 + object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_13 + object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 13, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_14 + object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_1B1A85, FLAG_ITEM_TRICK_HOUSE_PUZZLE_3_2 + object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_1B1A78, FLAG_ITEM_TRICK_HOUSE_PUZZLE_3_1 + object_event 10, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 1, 20, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_15 + object_event 11, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 2, 21, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_16 Route110_TrickHousePuzzle3_MapWarps:: @ 8392654 warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE diff --git a/data/maps/Route110_TrickHousePuzzle4/events.inc b/data/maps/Route110_TrickHousePuzzle4/events.inc index 4d7189920..a46e6d9e5 100644 --- a/data/maps/Route110_TrickHousePuzzle4/events.inc +++ b/data/maps/Route110_TrickHousePuzzle4/events.inc @@ -1,19 +1,19 @@ Route110_TrickHousePuzzle4_EventObjects:: @ 83926FC - object_event 1, EVENT_OBJ_GFX_GIRL_3, 0, 12, 8, 3, 9, 0, 0, 1, 1, Route110_TrickHousePuzzle4_EventScript_16276B, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 10, 4, 3, 10, 0, 0, 1, 1, Route110_TrickHousePuzzle4_EventScript_162799, 0 - object_event 3, EVENT_OBJ_GFX_BLACK_BELT, 0, 7, 4, 3, 9, 0, 0, 1, 2, Route110_TrickHousePuzzle4_EventScript_162782, 0 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 4, 0, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_1B1A92, FLAG_ITEM_TRICK_HOUSE_PUZZLE_4_1 - object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 3, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11 - object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 14, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12 - object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 2, 12, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_13 - object_event 8, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 9, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_14 - object_event 9, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 2, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_15 - object_event 10, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 8, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_16 - object_event 11, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 7, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_17 - object_event 12, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 13, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_18 - object_event 13, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 14, 2, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_19 - object_event 14, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 14, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_1A - object_event 15, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 14, 9, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_1B + object_event 1, EVENT_OBJ_GFX_GIRL_3, 0, 12, 8, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 1, Route110_TrickHousePuzzle4_EventScript_16276B, 0 + object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 10, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 1, Route110_TrickHousePuzzle4_EventScript_162799, 0 + object_event 3, EVENT_OBJ_GFX_BLACK_BELT, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, Route110_TrickHousePuzzle4_EventScript_162782, 0 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 4, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_1B1A92, FLAG_ITEM_TRICK_HOUSE_PUZZLE_4_1 + object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11 + object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12 + object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 2, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_13 + object_event 8, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_14 + object_event 9, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_15 + object_event 10, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_16 + object_event 11, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_17 + object_event 12, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_18 + object_event 13, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 14, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_19 + object_event 14, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_1A + object_event 15, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 14, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_1B Route110_TrickHousePuzzle4_MapWarps:: @ 8392864 warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE diff --git a/data/maps/Route110_TrickHousePuzzle5/events.inc b/data/maps/Route110_TrickHousePuzzle5/events.inc index 66884fc3d..c46d6f8b7 100644 --- a/data/maps/Route110_TrickHousePuzzle5/events.inc +++ b/data/maps/Route110_TrickHousePuzzle5/events.inc @@ -1,9 +1,9 @@ Route110_TrickHousePuzzle5_EventObjects:: @ 839289C - object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 9, 19, 3, 9, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_1627F2, 0 - object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 5, 14, 3, 10, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_162813, 0 - object_event 3, EVENT_OBJ_GFX_MAN_1, 0, 12, 10, 3, 9, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_162834, 0 - object_event 4, EVENT_OBJ_GFX_MAN_1, 0, 12, 5, 3, 9, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_162855, 0 - object_event 5, EVENT_OBJ_GFX_MAN_1, 0, 1, 6, 3, 10, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_162876, 0 + object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 9, 19, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_1627F2, 0 + object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 5, 14, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_162813, 0 + object_event 3, EVENT_OBJ_GFX_MAN_1, 0, 12, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_162834, 0 + object_event 4, EVENT_OBJ_GFX_MAN_1, 0, 12, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_162855, 0 + object_event 5, EVENT_OBJ_GFX_MAN_1, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_162876, 0 Route110_TrickHousePuzzle5_MapWarps:: @ 8392914 warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE diff --git a/data/maps/Route110_TrickHousePuzzle6/events.inc b/data/maps/Route110_TrickHousePuzzle6/events.inc index 6ac299c5f..7e2cce846 100644 --- a/data/maps/Route110_TrickHousePuzzle6/events.inc +++ b/data/maps/Route110_TrickHousePuzzle6/events.inc @@ -1,8 +1,8 @@ Route110_TrickHousePuzzle6_EventObjects:: @ 8392A2C - object_event 1, EVENT_OBJ_GFX_PICNICKER, 0, 10, 9, 3, 9, 0, 0, 1, 2, Route110_TrickHousePuzzle6_EventScript_163107, 0 - object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 14, 12, 3, 9, 0, 0, 1, 2, Route110_TrickHousePuzzle6_EventScript_16311E, 0 - object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 0, 3, 3, 10, 0, 0, 1, 4, Route110_TrickHousePuzzle6_EventScript_163135, 0 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 2, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle6_EventScript_1B1A9F, FLAG_ITEM_TRICK_HOUSE_PUZZLE_6_1 + object_event 1, EVENT_OBJ_GFX_PICNICKER, 0, 10, 9, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, Route110_TrickHousePuzzle6_EventScript_163107, 0 + object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 14, 12, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, Route110_TrickHousePuzzle6_EventScript_16311E, 0 + object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 4, Route110_TrickHousePuzzle6_EventScript_163135, 0 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle6_EventScript_1B1A9F, FLAG_ITEM_TRICK_HOUSE_PUZZLE_6_1 Route110_TrickHousePuzzle6_MapWarps:: @ 8392A8C warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE diff --git a/data/maps/Route110_TrickHousePuzzle7/events.inc b/data/maps/Route110_TrickHousePuzzle7/events.inc index d57546ce1..221c4b035 100644 --- a/data/maps/Route110_TrickHousePuzzle7/events.inc +++ b/data/maps/Route110_TrickHousePuzzle7/events.inc @@ -1,8 +1,8 @@ Route110_TrickHousePuzzle7_EventObjects:: @ 8392AC4 - object_event 1, EVENT_OBJ_GFX_PSYCHIC_M, 0, 0, 3, 3, 10, 0, 0, 1, 2, Route110_TrickHousePuzzle7_EventScript_1633D6, 0 - object_event 2, EVENT_OBJ_GFX_LASS, 0, 14, 3, 3, 7, 0, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_163404, 0 - object_event 3, EVENT_OBJ_GFX_HEX_MANIAC, 0, 9, 10, 3, 23, 0, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_1633ED, 0 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 11, 10, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle7_EventScript_1B1AAC, FLAG_ITEM_TRICK_HOUSE_PUZZLE_7_1 + object_event 1, EVENT_OBJ_GFX_PSYCHIC_M, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 2, Route110_TrickHousePuzzle7_EventScript_1633D6, 0 + object_event 2, EVENT_OBJ_GFX_LASS, 0, 14, 3, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_163404, 0 + object_event 3, EVENT_OBJ_GFX_HEX_MANIAC, 0, 9, 10, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 0, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_1633ED, 0 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 11, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle7_EventScript_1B1AAC, FLAG_ITEM_TRICK_HOUSE_PUZZLE_7_1 Route110_TrickHousePuzzle7_MapWarps:: @ 8392B24 warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE diff --git a/data/maps/Route110_TrickHousePuzzle8/events.inc b/data/maps/Route110_TrickHousePuzzle8/events.inc index 481b2d926..a92cffc31 100644 --- a/data/maps/Route110_TrickHousePuzzle8/events.inc +++ b/data/maps/Route110_TrickHousePuzzle8/events.inc @@ -1,8 +1,8 @@ Route110_TrickHousePuzzle8_EventObjects:: @ 8392BA8 - object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 12, 21, 3, 10, 0, 0, 1, 2, Route110_TrickHousePuzzle8_EventScript_163439, 0 - object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 12, 11, 3, 10, 0, 0, 1, 2, Route110_TrickHousePuzzle8_EventScript_163467, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 10, 11, 3, 8, 0, 0, 1, 1, Route110_TrickHousePuzzle8_EventScript_163450, 0 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 11, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle8_EventScript_1B1AB9, FLAG_ITEM_TRICK_HOUSE_PUZZLE_8_1 + object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 12, 21, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 2, Route110_TrickHousePuzzle8_EventScript_163439, 0 + object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 12, 11, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 2, Route110_TrickHousePuzzle8_EventScript_163467, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 10, 11, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route110_TrickHousePuzzle8_EventScript_163450, 0 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle8_EventScript_1B1AB9, FLAG_ITEM_TRICK_HOUSE_PUZZLE_8_1 Route110_TrickHousePuzzle8_MapWarps:: @ 8392C08 warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE diff --git a/data/maps/Route111/events.inc b/data/maps/Route111/events.inc index 837c17c39..10af8dcd4 100644 --- a/data/maps/Route111/events.inc +++ b/data/maps/Route111/events.inc @@ -1,40 +1,40 @@ Route111_EventObjects:: @ 83821A0 - object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 13, 114, 3, 8, 0, 0, 0, 0, Route111_EventScript_1501D1, FLAG_HIDE_VICTOR_WINSTRATE - object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 13, 113, 0, 8, 0, 0, 0, 0, 0x0, FLAG_HIDE_VICTORIA_WINSTRATE - object_event 3, EVENT_OBJ_GFX_LASS, 0, 13, 113, 0, 8, 1, 0, 0, 0, 0x0, FLAG_HIDE_VIVI_WINSTRATE - object_event 4, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 13, 113, 0, 8, 0, 0, 0, 0, 0x0, FLAG_HIDE_VICKI_WINSTRATE - object_event 5, EVENT_OBJ_GFX_PICNICKER, 0, 28, 51, 3, 17, 0, 0, 1, 3, Route111_EventScript_1503BE, 0 - object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 22, 5, 3, 12, 0, 0, 0, 19, S_BerryTree, 0 - object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 23, 5, 3, 12, 0, 0, 0, 20, S_BerryTree, 0 - object_event 8, EVENT_OBJ_GFX_MAN_4, 0, 8, 91, 3, 2, 1, 1, 0, 0, Route111_EventScript_150395, 0 - object_event 9, EVENT_OBJ_GFX_CAMPER, 0, 24, 60, 3, 21, 0, 0, 1, 3, Route111_EventScript_1503A7, 0 - object_event 10, EVENT_OBJ_GFX_HIKER, 0, 27, 69, 3, 50, 2, 2, 1, 2, Route111_EventScript_150403, 0 - object_event 11, EVENT_OBJ_GFX_CAMPER, 0, 21, 47, 3, 9, 0, 0, 1, 4, Route111_EventScript_1503D5, 0 - object_event 12, EVENT_OBJ_GFX_PICNICKER, 0, 32, 72, 3, 24, 0, 0, 1, 3, Route111_EventScript_1503EC, 0 - object_event 13, EVENT_OBJ_GFX_CAMERAMAN, 0, 14, 86, 3, 8, 0, 0, 0, 0, Route111_EventScript_1AE442, FLAG_HIDE_GABBY_AND_TY_ROUTE111_1 - object_event 14, EVENT_OBJ_GFX_REPORTER_F, 0, 13, 86, 3, 8, 0, 0, 0, 0, Route111_EventScript_1AE422, FLAG_HIDE_GABBY_AND_TY_ROUTE111_1 - object_event 15, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 18, 101, 3, 1, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_11 - object_event 16, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 19, 100, 3, 1, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_12 - object_event 17, EVENT_OBJ_GFX_GIRL_1, 0, 23, 8, 3, 5, 1, 0, 0, 0, Route111_EventScript_1500C5, 0 - object_event 18, EVENT_OBJ_GFX_ITEM_BALL, 0, 32, 105, 3, 1, 0, 0, 0, 0, Route111_EventScript_1B14C8, FLAG_ITEM_ROUTE111_1 - object_event 19, EVENT_OBJ_GFX_BERRY_TREE, 0, 18, 5, 3, 12, 0, 0, 0, 80, S_BerryTree, 0 - object_event 20, EVENT_OBJ_GFX_BERRY_TREE, 0, 19, 5, 3, 12, 0, 0, 0, 81, S_BerryTree, 0 - object_event 21, EVENT_OBJ_GFX_REPORTER_F, 0, 13, 86, 3, 8, 0, 0, 0, 0, Route111_EventScript_1AE4E2, FLAG_HIDE_GABBY_AND_TY_ROUTE111_2 - object_event 22, EVENT_OBJ_GFX_CAMERAMAN, 0, 14, 86, 3, 8, 0, 0, 0, 0, Route111_EventScript_1AE502, FLAG_HIDE_GABBY_AND_TY_ROUTE111_2 - object_event 23, EVENT_OBJ_GFX_REPORTER_F, 0, 13, 86, 3, 8, 0, 0, 0, 0, Route111_EventScript_1AE562, FLAG_HIDE_GABBY_AND_TY_ROUTE111_3 - object_event 24, EVENT_OBJ_GFX_CAMERAMAN, 0, 14, 86, 3, 8, 0, 0, 0, 0, Route111_EventScript_1AE582, FLAG_HIDE_GABBY_AND_TY_ROUTE111_3 - object_event 25, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 54, 3, 1, 0, 0, 0, 0, Route111_EventScript_1B14D5, FLAG_ITEM_ROUTE111_2 - object_event 26, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 114, 3, 1, 0, 0, 0, 0, Route111_EventScript_1B14E2, FLAG_ITEM_ROUTE111_3 - object_event 27, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 22, 21, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_13 - object_event 28, EVENT_OBJ_GFX_PICNICKER, 0, 10, 82, 3, 14, 0, 0, 1, 2, Route111_EventScript_150458, 0 - object_event 29, EVENT_OBJ_GFX_CAMPER, 0, 11, 71, 3, 22, 0, 0, 1, 3, Route111_EventScript_150441, 0 - object_event 30, EVENT_OBJ_GFX_BLACK_BELT, 0, 32, 29, 3, 28, 1, 0, 1, 2, Route111_EventScript_15046F, 0 - object_event 31, EVENT_OBJ_GFX_WOMAN_7, 0, 11, 12, 3, 7, 4, 0, 1, 4, Route111_EventScript_1504C4, 0 - object_event 32, EVENT_OBJ_GFX_MAN_4, 0, 9, 27, 3, 17, 0, 0, 1, 3, Route111_EventScript_150486, 0 - object_event 33, EVENT_OBJ_GFX_BOY_1, 0, 13, 20, 3, 7, 1, 1, 0, 0, Route111_EventScript_1A3858, FLAG_HIDE_SECRET_POWER_MAN - object_event 34, EVENT_OBJ_GFX_FOSSIL, 0, 32, 38, 3, 1, 1, 1, 0, 0, Route111_EventScript_150023, FLAG_HIDE_ROOT_FOSSIL - object_event 35, EVENT_OBJ_GFX_FOSSIL, 0, 33, 38, 3, 1, 1, 1, 0, 0, Route111_EventScript_150069, FLAG_HIDE_CLAW_FOSSIL - object_event 36, EVENT_OBJ_GFX_MAN_5, 0, 20, 114, 3, 2, 1, 1, 0, 0, Route111_EventScript_15039E, 0 + object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 13, 114, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route111_EventScript_1501D1, FLAG_HIDE_VICTOR_WINSTRATE + object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 13, 113, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_VICTORIA_WINSTRATE + object_event 3, EVENT_OBJ_GFX_LASS, 0, 13, 113, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 0, 0, 0, 0x0, FLAG_HIDE_VIVI_WINSTRATE + object_event 4, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 13, 113, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_VICKI_WINSTRATE + object_event 5, EVENT_OBJ_GFX_PICNICKER, 0, 28, 51, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 0, 0, 1, 3, Route111_EventScript_1503BE, 0 + object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 22, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 19, S_BerryTree, 0 + object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 23, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 20, S_BerryTree, 0 + object_event 8, EVENT_OBJ_GFX_MAN_4, 0, 8, 91, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route111_EventScript_150395, 0 + object_event 9, EVENT_OBJ_GFX_CAMPER, 0, 24, 60, 3, MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT, 0, 0, 1, 3, Route111_EventScript_1503A7, 0 + object_event 10, EVENT_OBJ_GFX_HIKER, 0, 27, 69, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT, 2, 2, 1, 2, Route111_EventScript_150403, 0 + object_event 11, EVENT_OBJ_GFX_CAMPER, 0, 21, 47, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 4, Route111_EventScript_1503D5, 0 + object_event 12, EVENT_OBJ_GFX_PICNICKER, 0, 32, 72, 3, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 0, 0, 1, 3, Route111_EventScript_1503EC, 0 + object_event 13, EVENT_OBJ_GFX_CAMERAMAN, 0, 14, 86, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route111_EventScript_1AE442, FLAG_HIDE_GABBY_AND_TY_ROUTE111_1 + object_event 14, EVENT_OBJ_GFX_REPORTER_F, 0, 13, 86, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route111_EventScript_1AE422, FLAG_HIDE_GABBY_AND_TY_ROUTE111_1 + object_event 15, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 18, 101, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_11 + object_event 16, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 19, 100, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_12 + object_event 17, EVENT_OBJ_GFX_GIRL_1, 0, 23, 8, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, Route111_EventScript_1500C5, 0 + object_event 18, EVENT_OBJ_GFX_ITEM_BALL, 0, 32, 105, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route111_EventScript_1B14C8, FLAG_ITEM_ROUTE111_1 + object_event 19, EVENT_OBJ_GFX_BERRY_TREE, 0, 18, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 80, S_BerryTree, 0 + object_event 20, EVENT_OBJ_GFX_BERRY_TREE, 0, 19, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 81, S_BerryTree, 0 + object_event 21, EVENT_OBJ_GFX_REPORTER_F, 0, 13, 86, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route111_EventScript_1AE4E2, FLAG_HIDE_GABBY_AND_TY_ROUTE111_2 + object_event 22, EVENT_OBJ_GFX_CAMERAMAN, 0, 14, 86, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route111_EventScript_1AE502, FLAG_HIDE_GABBY_AND_TY_ROUTE111_2 + object_event 23, EVENT_OBJ_GFX_REPORTER_F, 0, 13, 86, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route111_EventScript_1AE562, FLAG_HIDE_GABBY_AND_TY_ROUTE111_3 + object_event 24, EVENT_OBJ_GFX_CAMERAMAN, 0, 14, 86, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route111_EventScript_1AE582, FLAG_HIDE_GABBY_AND_TY_ROUTE111_3 + object_event 25, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 54, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route111_EventScript_1B14D5, FLAG_ITEM_ROUTE111_2 + object_event 26, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 114, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route111_EventScript_1B14E2, FLAG_ITEM_ROUTE111_3 + object_event 27, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 22, 21, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_13 + object_event 28, EVENT_OBJ_GFX_PICNICKER, 0, 10, 82, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 1, 2, Route111_EventScript_150458, 0 + object_event 29, EVENT_OBJ_GFX_CAMPER, 0, 11, 71, 3, MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT, 0, 0, 1, 3, Route111_EventScript_150441, 0 + object_event 30, EVENT_OBJ_GFX_BLACK_BELT, 0, 32, 29, 3, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 1, 0, 1, 2, Route111_EventScript_15046F, 0 + object_event 31, EVENT_OBJ_GFX_WOMAN_7, 0, 11, 12, 3, MOVEMENT_TYPE_FACE_UP, 4, 0, 1, 4, Route111_EventScript_1504C4, 0 + object_event 32, EVENT_OBJ_GFX_MAN_4, 0, 9, 27, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 0, 0, 1, 3, Route111_EventScript_150486, 0 + object_event 33, EVENT_OBJ_GFX_BOY_1, 0, 13, 20, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, Route111_EventScript_1A3858, FLAG_HIDE_SECRET_POWER_MAN + object_event 34, EVENT_OBJ_GFX_FOSSIL, 0, 32, 38, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route111_EventScript_150023, FLAG_HIDE_ROOT_FOSSIL + object_event 35, EVENT_OBJ_GFX_FOSSIL, 0, 33, 38, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route111_EventScript_150069, FLAG_HIDE_CLAW_FOSSIL + object_event 36, EVENT_OBJ_GFX_MAN_5, 0, 20, 114, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route111_EventScript_15039E, 0 Route111_MapWarps:: @ 8382500 warp_def 13, 113, 0, 0, MAP_ROUTE111_WINSTRATE_FAMILYS_HOUSE diff --git a/data/maps/Route111_OldLadysRestStop/events.inc b/data/maps/Route111_OldLadysRestStop/events.inc index da7f2f605..3a7c3802e 100644 --- a/data/maps/Route111_OldLadysRestStop/events.inc +++ b/data/maps/Route111_OldLadysRestStop/events.inc @@ -1,5 +1,5 @@ Route111_OldLadysRestStop_EventObjects:: @ 838B798 - object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 6, 3, 3, 9, 0, 0, 0, 0, Route111_OldLadysRestStop_EventScript_15BFDB, 0 + object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 6, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route111_OldLadysRestStop_EventScript_15BFDB, 0 Route111_OldLadysRestStop_MapWarps:: @ 838B7B0 warp_def 3, 7, 0, 2, MAP_ROUTE111 diff --git a/data/maps/Route111_WinstrateFamilysHouse/events.inc b/data/maps/Route111_WinstrateFamilysHouse/events.inc index 70d00eabc..623df9b73 100644 --- a/data/maps/Route111_WinstrateFamilysHouse/events.inc +++ b/data/maps/Route111_WinstrateFamilysHouse/events.inc @@ -1,8 +1,8 @@ Route111_WinstrateFamilysHouse_EventObjects:: @ 838B714 - object_event 1, EVENT_OBJ_GFX_LASS, 0, 7, 5, 3, 9, 0, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_15BF80, 0 - object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 4, 5, 3, 10, 0, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_15BF25, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 7, 4, 3, 9, 1, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_15BF3A, 0 - object_event 4, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 4, 4, 3, 10, 0, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_15BF95, 0 + object_event 1, EVENT_OBJ_GFX_LASS, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_15BF80, 0 + object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_15BF25, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_15BF3A, 0 + object_event 4, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_15BF95, 0 Route111_WinstrateFamilysHouse_MapWarps:: @ 838B774 warp_def 3, 7, 0, 0, MAP_ROUTE111 diff --git a/data/maps/Route112/events.inc b/data/maps/Route112/events.inc index e1673dc69..51c0e1154 100644 --- a/data/maps/Route112/events.inc +++ b/data/maps/Route112/events.inc @@ -1,16 +1,16 @@ Route112_EventObjects:: @ 8382818 - object_event 1, EVENT_OBJ_GFX_VAR_1, 0, 26, 30, 3, 8, 1, 1, 0, 0, Route112_EventScript_150513, FLAG_HIDE_GRUNTS_BLOCKING_CABLE_CAR - object_event 2, EVENT_OBJ_GFX_HIKER, 0, 24, 34, 3, 14, 0, 0, 1, 2, Route112_EventScript_150549, 0 - object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 29, 49, 3, 8, 0, 0, 1, 3, Route112_EventScript_15059E, 0 - object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 22, 46, 3, 23, 0, 0, 1, 3, Route112_EventScript_1505B5, 0 - object_event 5, EVENT_OBJ_GFX_HIKER, 0, 17, 40, 3, 16, 0, 0, 1, 4, Route112_EventScript_150560, 0 - object_event 6, EVENT_OBJ_GFX_VAR_1, 0, 27, 30, 3, 8, 0, 0, 0, 0, Route112_EventScript_15051C, FLAG_HIDE_GRUNTS_BLOCKING_CABLE_CAR - object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 27, 6, 0, 12, 0, 0, 0, 24, S_BerryTree, 0 - object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 28, 6, 0, 12, 0, 0, 0, 23, S_BerryTree, 0 - object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 29, 6, 0, 12, 0, 0, 0, 22, S_BerryTree, 0 - object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 30, 6, 3, 12, 0, 0, 0, 21, S_BerryTree, 0 - object_event 11, EVENT_OBJ_GFX_HIKER, 0, 8, 50, 3, 26, 0, 3, 0, 0, Route112_EventScript_150540, 0 - object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 43, 3, 1, 0, 0, 0, 0, Route112_EventScript_1B14EF, FLAG_ITEM_ROUTE112_1 + object_event 1, EVENT_OBJ_GFX_VAR_1, 0, 26, 30, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, Route112_EventScript_150513, FLAG_HIDE_GRUNTS_BLOCKING_CABLE_CAR + object_event 2, EVENT_OBJ_GFX_HIKER, 0, 24, 34, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 1, 2, Route112_EventScript_150549, 0 + object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 29, 49, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, Route112_EventScript_15059E, 0 + object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 22, 46, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 0, 0, 1, 3, Route112_EventScript_1505B5, 0 + object_event 5, EVENT_OBJ_GFX_HIKER, 0, 17, 40, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 0, 0, 1, 4, Route112_EventScript_150560, 0 + object_event 6, EVENT_OBJ_GFX_VAR_1, 0, 27, 30, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route112_EventScript_15051C, FLAG_HIDE_GRUNTS_BLOCKING_CABLE_CAR + object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 27, 6, 0, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 24, S_BerryTree, 0 + object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 28, 6, 0, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 23, S_BerryTree, 0 + object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 29, 6, 0, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 22, S_BerryTree, 0 + object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 30, 6, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 21, S_BerryTree, 0 + object_event 11, EVENT_OBJ_GFX_HIKER, 0, 8, 50, 3, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 0, 3, 0, 0, Route112_EventScript_150540, 0 + object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 43, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route112_EventScript_1B14EF, FLAG_ITEM_ROUTE112_1 Route112_MapWarps:: @ 8382938 warp_def 28, 27, 0, 0, MAP_ROUTE112_CABLE_CAR_STATION diff --git a/data/maps/Route112_CableCarStation/events.inc b/data/maps/Route112_CableCarStation/events.inc index a2c93ca9d..22d25f3df 100644 --- a/data/maps/Route112_CableCarStation/events.inc +++ b/data/maps/Route112_CableCarStation/events.inc @@ -1,6 +1,6 @@ Route112_CableCarStation_EventObjects:: @ 838B7D4 - object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 6, 6, 3, 8, 0, 0, 0, 0, Route112_CableCarStation_EventScript_15C08C, 0 - object_event 2, EVENT_OBJ_GFX_CABLE_CAR, 0, 6, 3, 3, 1, 0, 0, 0, 0, 0x0, 0 + object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 6, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route112_CableCarStation_EventScript_15C08C, 0 + object_event 2, EVENT_OBJ_GFX_CABLE_CAR, 0, 6, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 0 Route112_CableCarStation_MapWarps:: @ 838B804 warp_def 6, 11, 0, 0, MAP_ROUTE112 diff --git a/data/maps/Route113/events.inc b/data/maps/Route113/events.inc index 3fd5ea281..9c0122345 100644 --- a/data/maps/Route113/events.inc +++ b/data/maps/Route113/events.inc @@ -1,15 +1,15 @@ Route113_EventObjects:: @ 83829A0 - object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 66, 12, 3, 5, 1, 0, 0, 0, Route113_EventScript_15060E, 0 - object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 36, 10, 3, 3, 0, 1, 0, 0, Route113_EventScript_150605, 0 - object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 62, 8, 3, 8, 0, 0, 1, 3, Route113_EventScript_15063B, 0 - object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 21, 11, 3, 17, 0, 0, 1, 3, Route113_EventScript_150652, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_7, 0, 51, 11, 3, 23, 0, 0, 1, 2, Route113_EventScript_150669, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 53, 7, 3, 1, 0, 0, 0, 0, Route113_EventScript_1B14FC, FLAG_ITEM_ROUTE113_1 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 78, 5, 3, 1, 0, 0, 0, 0, Route113_EventScript_1B1509, FLAG_ITEM_ROUTE113_2 - object_event 8, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 66, 3, 3, 63, 0, 0, 3, 1, Route113_EventScript_1506A7, 0 - object_event 9, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 29, 6, 3, 63, 0, 0, 3, 1, Route113_EventScript_1506E5, 0 - object_event 10, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 45, 6, 3, 8, 1, 1, 1, 0, Route113_EventScript_1506FC, 0 - object_event 11, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 46, 6, 3, 8, 1, 1, 1, 0, Route113_EventScript_150717, 0 + object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 66, 12, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, Route113_EventScript_15060E, 0 + object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 36, 10, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, Route113_EventScript_150605, 0 + object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 62, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, Route113_EventScript_15063B, 0 + object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 21, 11, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 0, 0, 1, 3, Route113_EventScript_150652, 0 + object_event 5, EVENT_OBJ_GFX_WOMAN_7, 0, 51, 11, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 0, 0, 1, 2, Route113_EventScript_150669, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 53, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route113_EventScript_1B14FC, FLAG_ITEM_ROUTE113_1 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 78, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route113_EventScript_1B1509, FLAG_ITEM_ROUTE113_2 + object_event 8, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 66, 3, 3, MOVEMENT_TYPE_HIDDEN, 0, 0, 3, 1, Route113_EventScript_1506A7, 0 + object_event 9, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 29, 6, 3, MOVEMENT_TYPE_HIDDEN, 0, 0, 3, 1, Route113_EventScript_1506E5, 0 + object_event 10, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 45, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 0, Route113_EventScript_1506FC, 0 + object_event 11, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 46, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 0, Route113_EventScript_150717, 0 Route113_MapWarps:: @ 8382AA8 warp_def 33, 5, 0, 0, MAP_ROUTE113_GLASS_WORKSHOP diff --git a/data/maps/Route113_GlassWorkshop/events.inc b/data/maps/Route113_GlassWorkshop/events.inc index 24b90b2d7..15aa74311 100644 --- a/data/maps/Route113_GlassWorkshop/events.inc +++ b/data/maps/Route113_GlassWorkshop/events.inc @@ -1,6 +1,6 @@ Route113_GlassWorkshop_EventObjects:: @ 8392D18 - object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 2, 3, 3, 8, 0, 0, 0, 0, Route113_GlassWorkshop_EventScript_163565, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 5, 4, 3, 2, 1, 1, 0, 0, Route113_GlassWorkshop_EventScript_1639D6, 0 + object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route113_GlassWorkshop_EventScript_163565, 0 + object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 5, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route113_GlassWorkshop_EventScript_1639D6, 0 Route113_GlassWorkshop_MapWarps:: @ 8392D48 warp_def 3, 8, 0, 0, MAP_ROUTE113 diff --git a/data/maps/Route114/events.inc b/data/maps/Route114/events.inc index eb05dd1ce..6a6eeade6 100644 --- a/data/maps/Route114/events.inc +++ b/data/maps/Route114/events.inc @@ -1,27 +1,27 @@ Route114_EventObjects:: @ 8382C48 - object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 43, 3, 12, 0, 0, 0, 77, S_BerryTree, 0 - object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 44, 3, 12, 0, 0, 0, 78, S_BerryTree, 0 - object_event 3, EVENT_OBJ_GFX_HIKER, 0, 15, 65, 7, 10, 0, 0, 1, 6, Route114_EventScript_1507F1, 0 - object_event 4, EVENT_OBJ_GFX_HIKER, 0, 30, 72, 5, 15, 0, 0, 1, 4, Route114_EventScript_150808, 0 - object_event 5, EVENT_OBJ_GFX_CAMPER, 0, 22, 50, 3, 10, 0, 0, 1, 3, Route114_EventScript_15081F, 0 - object_event 6, EVENT_OBJ_GFX_PICNICKER, 0, 19, 35, 3, 1, 0, 0, 1, 3, Route114_EventScript_150836, 0 - object_event 7, EVENT_OBJ_GFX_MANIAC, 0, 20, 56, 3, 7, 0, 0, 1, 3, Route114_EventScript_15084D, 0 - object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 45, 3, 12, 0, 0, 0, 68, S_BerryTree, 0 - object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 6, 3, 1, 0, 0, 0, 0, Route114_EventScript_1B1516, FLAG_ITEM_ROUTE114_1 - object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 11, 37, 4, 1, 0, 0, 0, 0, Route114_EventScript_1B1523, FLAG_ITEM_ROUTE114_2 - object_event 11, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 12, 43, 4, 1, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_11 - object_event 12, EVENT_OBJ_GFX_GENTLEMAN, 0, 19, 11, 3, 10, 0, 0, 0, 0, Route114_EventScript_150782, 0 - object_event 13, EVENT_OBJ_GFX_POOCHYENA, 0, 19, 12, 3, 10, 0, 0, 0, 0, Route114_EventScript_1507C3, 0 - object_event 14, EVENT_OBJ_GFX_MAN_5, 0, 27, 42, 3, 3, 0, 1, 0, 0, Route114_EventScript_150733, 0 - object_event 15, EVENT_OBJ_GFX_FISHERMAN, 0, 23, 20, 3, 8, 0, 0, 1, 0, Route114_EventScript_1508E0, 0 - object_event 16, EVENT_OBJ_GFX_FISHERMAN, 0, 19, 26, 3, 9, 0, 0, 1, 0, Route114_EventScript_1508C9, 0 - object_event 17, EVENT_OBJ_GFX_MAN_6, 0, 30, 58, 5, 23, 0, 0, 1, 3, Route114_EventScript_15088B, 0 - object_event 18, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 29, 53, 5, 1, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_12 - object_event 19, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 30, 54, 5, 1, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_13 - object_event 20, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 22, 69, 7, 1, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_14 - object_event 21, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 64, 5, 1, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_15 - object_event 22, EVENT_OBJ_GFX_LASS, 0, 24, 44, 3, 8, 1, 1, 1, 0, Route114_EventScript_150912, 0 - object_event 23, EVENT_OBJ_GFX_LASS, 0, 23, 44, 3, 8, 1, 1, 1, 0, Route114_EventScript_1508F7, 0 + object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 43, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 77, S_BerryTree, 0 + object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 44, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 78, S_BerryTree, 0 + object_event 3, EVENT_OBJ_GFX_HIKER, 0, 15, 65, 7, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 6, Route114_EventScript_1507F1, 0 + object_event 4, EVENT_OBJ_GFX_HIKER, 0, 30, 72, 5, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 0, 0, 1, 4, Route114_EventScript_150808, 0 + object_event 5, EVENT_OBJ_GFX_CAMPER, 0, 22, 50, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 3, Route114_EventScript_15081F, 0 + object_event 6, EVENT_OBJ_GFX_PICNICKER, 0, 19, 35, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 1, 3, Route114_EventScript_150836, 0 + object_event 7, EVENT_OBJ_GFX_MANIAC, 0, 20, 56, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 3, Route114_EventScript_15084D, 0 + object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 45, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 68, S_BerryTree, 0 + object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route114_EventScript_1B1516, FLAG_ITEM_ROUTE114_1 + object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 11, 37, 4, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route114_EventScript_1B1523, FLAG_ITEM_ROUTE114_2 + object_event 11, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 12, 43, 4, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_11 + object_event 12, EVENT_OBJ_GFX_GENTLEMAN, 0, 19, 11, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route114_EventScript_150782, 0 + object_event 13, EVENT_OBJ_GFX_POOCHYENA, 0, 19, 12, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route114_EventScript_1507C3, 0 + object_event 14, EVENT_OBJ_GFX_MAN_5, 0, 27, 42, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, Route114_EventScript_150733, 0 + object_event 15, EVENT_OBJ_GFX_FISHERMAN, 0, 23, 20, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, Route114_EventScript_1508E0, 0 + object_event 16, EVENT_OBJ_GFX_FISHERMAN, 0, 19, 26, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 0, Route114_EventScript_1508C9, 0 + object_event 17, EVENT_OBJ_GFX_MAN_6, 0, 30, 58, 5, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 0, 0, 1, 3, Route114_EventScript_15088B, 0 + object_event 18, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 29, 53, 5, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_12 + object_event 19, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 30, 54, 5, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_13 + object_event 20, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 22, 69, 7, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_14 + object_event 21, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 64, 5, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_15 + object_event 22, EVENT_OBJ_GFX_LASS, 0, 24, 44, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 0, Route114_EventScript_150912, 0 + object_event 23, EVENT_OBJ_GFX_LASS, 0, 23, 44, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 0, Route114_EventScript_1508F7, 0 Route114_MapWarps:: @ 8382E70 warp_def 8, 63, 0, 0, MAP_METEOR_FALLS_1F_1R diff --git a/data/maps/Route114_FossilManiacsHouse/events.inc b/data/maps/Route114_FossilManiacsHouse/events.inc index 1f41db668..86c7dd7c9 100644 --- a/data/maps/Route114_FossilManiacsHouse/events.inc +++ b/data/maps/Route114_FossilManiacsHouse/events.inc @@ -1,5 +1,5 @@ Route114_FossilManiacsHouse_EventObjects:: @ 838B87C - object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 3, 2, 3, 8, 1, 1, 0, 0, Route114_FossilManiacsHouse_EventScript_15C1C3, 0 + object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 3, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, Route114_FossilManiacsHouse_EventScript_15C1C3, 0 Route114_FossilManiacsHouse_MapWarps:: @ 838B894 warp_def 4, 7, 0, 1, MAP_ROUTE114 diff --git a/data/maps/Route114_FossilManiacsTunnel/events.inc b/data/maps/Route114_FossilManiacsTunnel/events.inc index 13db6a8ca..c647ebbcc 100644 --- a/data/maps/Route114_FossilManiacsTunnel/events.inc +++ b/data/maps/Route114_FossilManiacsTunnel/events.inc @@ -1,5 +1,5 @@ Route114_FossilManiacsTunnel_EventObjects:: @ 838B8F0 - object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 5, 3, 3, 7, 1, 1, 0, 0, Route114_FossilManiacsTunnel_EventScript_15C20F, 0 + object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 5, 3, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, Route114_FossilManiacsTunnel_EventScript_15C20F, 0 Route114_FossilManiacsTunnel_MapWarps:: @ 838B908 warp_def 6, 25, 3, 2, MAP_ROUTE114_FOSSIL_MANIACS_HOUSE diff --git a/data/maps/Route114_LanettesHouse/events.inc b/data/maps/Route114_LanettesHouse/events.inc index 86ebf06de..ee91acbe2 100644 --- a/data/maps/Route114_LanettesHouse/events.inc +++ b/data/maps/Route114_LanettesHouse/events.inc @@ -1,5 +1,5 @@ Route114_LanettesHouse_EventObjects:: @ 838B92C - object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 5, 4, 3, 1, 0, 0, 0, 0, Route114_LanettesHouse_EventScript_15C262, FLAG_HIDE_LANETTE + object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 5, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route114_LanettesHouse_EventScript_15C262, FLAG_HIDE_LANETTE Route114_LanettesHouse_MapWarps:: @ 838B944 warp_def 5, 7, 0, 2, MAP_ROUTE114 diff --git a/data/maps/Route115/events.inc b/data/maps/Route115/events.inc index e03d62fb4..8c40e7ae9 100644 --- a/data/maps/Route115/events.inc +++ b/data/maps/Route115/events.inc @@ -1,20 +1,20 @@ Route115_EventObjects:: @ 8382F2C - object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 18, 68, 3, 2, 1, 1, 0, 0, Route115_EventScript_15092E, 0 - object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 5, 15, 3, 10, 0, 0, 1, 6, Route115_EventScript_150949, 0 - object_event 3, EVENT_OBJ_GFX_BLACK_BELT, 0, 27, 53, 3, 15, 1, 1, 1, 4, Route115_EventScript_15099E, 0 - object_event 4, EVENT_OBJ_GFX_BERRY_TREE, 0, 11, 5, 3, 12, 0, 0, 0, 69, S_BerryTree, 0 - object_event 5, EVENT_OBJ_GFX_BERRY_TREE, 0, 12, 5, 3, 12, 0, 0, 0, 70, S_BerryTree, 0 - object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 13, 5, 3, 12, 0, 0, 0, 71, S_BerryTree, 0 - object_event 7, EVENT_OBJ_GFX_GIRL_3, 0, 15, 50, 3, 64, 0, 0, 1, 3, Route115_EventScript_1509DC, 0 - object_event 8, EVENT_OBJ_GFX_BLACK_BELT, 0, 17, 17, 3, 50, 3, 3, 1, 2, Route115_EventScript_150987, 0 - object_event 9, EVENT_OBJ_GFX_MANIAC, 0, 25, 61, 3, 14, 0, 0, 1, 3, Route115_EventScript_150A1A, 0 - object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 20, 60, 3, 1, 0, 0, 0, 0, Route115_EventScript_1B1530, FLAG_ITEM_ROUTE115_1 - object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 5, 3, 1, 0, 0, 0, 0, Route115_EventScript_1B153D, FLAG_ITEM_ROUTE115_2 - object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 23, 29, 3, 1, 0, 0, 0, 0, Route115_EventScript_1B154A, FLAG_ITEM_ROUTE115_3 - object_event 13, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 64, 3, 12, 0, 0, 0, 55, S_BerryTree, 0 - object_event 14, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 65, 3, 12, 0, 0, 0, 56, S_BerryTree, 0 - object_event 15, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 29, 50, 3, 1, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_11 - object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 56, 3, 1, 1, 1, 0, 0, Route115_EventScript_1B1557, FLAG_ITEM_ROUTE115_4 + object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 18, 68, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route115_EventScript_15092E, 0 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 5, 15, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 6, Route115_EventScript_150949, 0 + object_event 3, EVENT_OBJ_GFX_BLACK_BELT, 0, 27, 53, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 4, Route115_EventScript_15099E, 0 + object_event 4, EVENT_OBJ_GFX_BERRY_TREE, 0, 11, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 69, S_BerryTree, 0 + object_event 5, EVENT_OBJ_GFX_BERRY_TREE, 0, 12, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 70, S_BerryTree, 0 + object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 13, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 71, S_BerryTree, 0 + object_event 7, EVENT_OBJ_GFX_GIRL_3, 0, 15, 50, 3, MOVEMENT_TYPE_WALK_IN_PLACE_DOWN, 0, 0, 1, 3, Route115_EventScript_1509DC, 0 + object_event 8, EVENT_OBJ_GFX_BLACK_BELT, 0, 17, 17, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT, 3, 3, 1, 2, Route115_EventScript_150987, 0 + object_event 9, EVENT_OBJ_GFX_MANIAC, 0, 25, 61, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 1, 3, Route115_EventScript_150A1A, 0 + object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 20, 60, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route115_EventScript_1B1530, FLAG_ITEM_ROUTE115_1 + object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route115_EventScript_1B153D, FLAG_ITEM_ROUTE115_2 + object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 23, 29, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route115_EventScript_1B154A, FLAG_ITEM_ROUTE115_3 + object_event 13, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 64, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 55, S_BerryTree, 0 + object_event 14, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 65, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 56, S_BerryTree, 0 + object_event 15, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 29, 50, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_11 + object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 56, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route115_EventScript_1B1557, FLAG_ITEM_ROUTE115_4 Route115_MapWarps:: @ 83830AC warp_def 27, 37, 0, 1, MAP_METEOR_FALLS_1F_1R diff --git a/data/maps/Route116/events.inc b/data/maps/Route116/events.inc index fd1b98f0a..01eb269c4 100644 --- a/data/maps/Route116/events.inc +++ b/data/maps/Route116/events.inc @@ -1,26 +1,26 @@ Route116_EventObjects:: @ 8383170 - object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 18, 2, 3, 12, 0, 0, 0, 25, S_BerryTree, 0 - object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 19, 2, 3, 12, 0, 0, 0, 26, S_BerryTree, 0 - object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 12, 7, 3, 16, 0, 0, 1, 3, Route116_EventScript_150C62, 0 - object_event 4, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 21, 6, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11 - object_event 5, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 33, 8, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_12 - object_event 6, EVENT_OBJ_GFX_BUG_CATCHER, 0, 13, 17, 3, 24, 0, 0, 1, 2, Route116_EventScript_150C79, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 6, 3, 1, 0, 0, 0, 0, Route116_EventScript_1B1571, FLAG_ITEM_ROUTE116_2 - object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 10, 17, 3, 1, 0, 0, 0, 0, Route116_EventScript_1B157E, FLAG_ITEM_ROUTE116_3 - object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 20, 2, 3, 12, 0, 0, 0, 66, S_BerryTree, 0 - object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 21, 2, 3, 12, 0, 0, 0, 67, S_BerryTree, 0 - object_event 11, EVENT_OBJ_GFX_OLD_MAN_1, 0, 46, 9, 3, 1, 0, 0, 0, 0, Route116_EventScript_150B5D, FLAG_HIDE_BRINEY_ROUTE116 - object_event 12, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 30, 6, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_13 - object_event 13, EVENT_OBJ_GFX_HIKER, 0, 36, 15, 3, 13, 0, 0, 1, 2, Route116_EventScript_150CCE, 0 - object_event 14, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 24, 9, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_14 - object_event 15, EVENT_OBJ_GFX_ITEM_BALL, 0, 80, 8, 3, 1, 0, 0, 0, 0, Route116_EventScript_1B158B, FLAG_ITEM_ROUTE116_4 - object_event 16, EVENT_OBJ_GFX_LASS, 0, 22, 16, 3, 13, 0, 0, 1, 3, Route116_EventScript_150CE5, 0 - object_event 17, EVENT_OBJ_GFX_GIRL_3, 0, 25, 4, 3, 8, 0, 0, 1, 2, Route116_EventScript_150CFC, 0 - object_event 18, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 31, 9, 3, 9, 0, 0, 1, 2, Route116_EventScript_150C90, 0 - object_event 19, EVENT_OBJ_GFX_MAN_2, 0, 46, 11, 3, 1, 1, 1, 0, 0, Route116_EventScript_150A7B, FLAG_HIDE_DEVON_EMPLOYEE_ROUTE116 - object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 56, 12, 4, 1, 1, 1, 0, 0, Route116_EventScript_1B1564, FLAG_ITEM_ROUTE116_1 - object_event 21, EVENT_OBJ_GFX_BLACK_BELT, 0, 38, 9, 3, 10, 1, 1, 0, 0, Route116_EventScript_150A49, FLAG_HIDE_TUNNER_DIGGER_ROUTE116 - object_event 22, EVENT_OBJ_GFX_MANIAC, 0, 74, 13, 3, 1, 1, 1, 0, 0, Route116_EventScript_150B8F, FLAG_HIDE_LOST_GLASSES_MAN + object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 18, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 25, S_BerryTree, 0 + object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 19, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 26, S_BerryTree, 0 + object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 12, 7, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 0, 0, 1, 3, Route116_EventScript_150C62, 0 + object_event 4, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 21, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11 + object_event 5, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 33, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_12 + object_event 6, EVENT_OBJ_GFX_BUG_CATCHER, 0, 13, 17, 3, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 0, 0, 1, 2, Route116_EventScript_150C79, 0 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route116_EventScript_1B1571, FLAG_ITEM_ROUTE116_2 + object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 10, 17, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route116_EventScript_1B157E, FLAG_ITEM_ROUTE116_3 + object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 20, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 66, S_BerryTree, 0 + object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 21, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 67, S_BerryTree, 0 + object_event 11, EVENT_OBJ_GFX_OLD_MAN_1, 0, 46, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route116_EventScript_150B5D, FLAG_HIDE_BRINEY_ROUTE116 + object_event 12, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 30, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_13 + object_event 13, EVENT_OBJ_GFX_HIKER, 0, 36, 15, 3, MOVEMENT_TYPE_FACE_DOWN_AND_UP, 0, 0, 1, 2, Route116_EventScript_150CCE, 0 + object_event 14, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 24, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_14 + object_event 15, EVENT_OBJ_GFX_ITEM_BALL, 0, 80, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route116_EventScript_1B158B, FLAG_ITEM_ROUTE116_4 + object_event 16, EVENT_OBJ_GFX_LASS, 0, 22, 16, 3, MOVEMENT_TYPE_FACE_DOWN_AND_UP, 0, 0, 1, 3, Route116_EventScript_150CE5, 0 + object_event 17, EVENT_OBJ_GFX_GIRL_3, 0, 25, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 2, Route116_EventScript_150CFC, 0 + object_event 18, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 31, 9, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, Route116_EventScript_150C90, 0 + object_event 19, EVENT_OBJ_GFX_MAN_2, 0, 46, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route116_EventScript_150A7B, FLAG_HIDE_DEVON_EMPLOYEE_ROUTE116 + object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 56, 12, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route116_EventScript_1B1564, FLAG_ITEM_ROUTE116_1 + object_event 21, EVENT_OBJ_GFX_BLACK_BELT, 0, 38, 9, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, Route116_EventScript_150A49, FLAG_HIDE_TUNNER_DIGGER_ROUTE116 + object_event 22, EVENT_OBJ_GFX_MANIAC, 0, 74, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route116_EventScript_150B8F, FLAG_HIDE_LOST_GLASSES_MAN Route116_MapWarps:: @ 8383380 warp_def 47, 8, 0, 0, MAP_RUSTURF_TUNNEL diff --git a/data/maps/Route116_TunnelersRestHouse/events.inc b/data/maps/Route116_TunnelersRestHouse/events.inc index 454f184e3..6fa894ff7 100644 --- a/data/maps/Route116_TunnelersRestHouse/events.inc +++ b/data/maps/Route116_TunnelersRestHouse/events.inc @@ -1,7 +1,7 @@ Route116_TunnelersRestHouse_EventObjects:: @ 838B98C - object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 6, 5, 3, 10, 0, 0, 0, 0, Route116_TunnelersRestHouse_EventScript_15C2E8, 0 - object_event 2, EVENT_OBJ_GFX_MAN_3, 0, 3, 6, 3, 1, 1, 1, 0, 0, Route116_TunnelersRestHouse_EventScript_15C2FA, 0 - object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 7, 2, 3, 7, 1, 0, 0, 0, Route116_TunnelersRestHouse_EventScript_15C2F1, 0 + object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route116_TunnelersRestHouse_EventScript_15C2E8, 0 + object_event 2, EVENT_OBJ_GFX_MAN_3, 0, 3, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route116_TunnelersRestHouse_EventScript_15C2FA, 0 + object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_UP, 1, 0, 0, 0, Route116_TunnelersRestHouse_EventScript_15C2F1, 0 Route116_TunnelersRestHouse_MapWarps:: @ 838B9D4 warp_def 4, 8, 0, 1, MAP_ROUTE116 diff --git a/data/maps/Route117/events.inc b/data/maps/Route117/events.inc index a668f4b32..8b09d7b2c 100644 --- a/data/maps/Route117/events.inc +++ b/data/maps/Route117/events.inc @@ -1,25 +1,25 @@ Route117_EventObjects:: @ 8383440 - object_event 1, EVENT_OBJ_GFX_WOMAN_1, 0, 13, 13, 3, 8, 0, 0, 0, 0, Route117_EventScript_150D57, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 26, 13, 3, 33, 2, 2, 0, 0, Route117_EventScript_150D60, 0 - object_event 3, EVENT_OBJ_GFX_OLD_MAN_2, 0, 47, 4, 3, 8, 0, 0, 0, 0, Route117_EventScript_1B222D, 0 - object_event 4, EVENT_OBJ_GFX_ZIGZAGOON, 0, 33, 3, 3, 1, 1, 1, 0, 0, 0x0, 0 - object_event 5, EVENT_OBJ_GFX_KECLEON_1, 0, 39, 4, 3, 1, 0, 0, 0, 0, 0x0, 0 - object_event 6, EVENT_OBJ_GFX_AZUMARILL, 0, 42, 2, 3, 1, 1, 1, 0, 0, 0x0, 0 - object_event 7, EVENT_OBJ_GFX_PIKACHU, 0, 49, 2, 3, 1, 0, 0, 0, 0, 0x0, 0 - object_event 8, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M, 0, 35, 7, 3, 28, 7, 0, 1, 4, Route117_EventScript_150E09, 0 - object_event 9, EVENT_OBJ_GFX_WOMAN_3, 0, 31, 11, 3, 23, 0, 0, 1, 3, Route117_EventScript_150DCB, 0 - object_event 10, EVENT_OBJ_GFX_MAN_5, 0, 10, 9, 3, 18, 0, 0, 1, 3, Route117_EventScript_150D8D, 0 - object_event 11, EVENT_OBJ_GFX_BERRY_TREE, 0, 41, 13, 3, 12, 0, 0, 0, 29, S_BerryTree, 0 - object_event 12, EVENT_OBJ_GFX_BERRY_TREE, 0, 42, 13, 3, 12, 0, 0, 0, 28, S_BerryTree, 0 - object_event 13, EVENT_OBJ_GFX_BERRY_TREE, 0, 43, 13, 3, 12, 0, 0, 0, 27, S_BerryTree, 0 - object_event 14, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 18, 3, 1, 0, 0, 0, 0, Route117_EventScript_1B1598, FLAG_ITEM_ROUTE117_1 - object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 15, 2, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11 - object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 9, 1, 3, 1, 0, 0, 0, 0, Route117_EventScript_1B15A5, FLAG_ITEM_ROUTE117_2 - object_event 17, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 21, 1, 3, 40, 4, 4, 1, 3, Route117_EventScript_150E47, 0 - object_event 18, EVENT_OBJ_GFX_MANIAC, 0, 17, 12, 3, 7, 1, 1, 1, 4, Route117_EventScript_150E85, 0 - object_event 19, EVENT_OBJ_GFX_LASS, 0, 46, 15, 3, 8, 0, 0, 1, 0, Route117_EventScript_150EE2, 0 - object_event 20, EVENT_OBJ_GFX_LASS, 0, 45, 15, 3, 8, 0, 0, 1, 0, Route117_EventScript_150E9C, 0 - object_event 21, EVENT_OBJ_GFX_GIRL_2, 0, 48, 10, 3, 2, 1, 1, 0, 0, Route117_EventScript_150D69, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_1, 0, 13, 13, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route117_EventScript_150D57, 0 + object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 26, 13, 3, MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_RIGHT_DOWN, 2, 2, 0, 0, Route117_EventScript_150D60, 0 + object_event 3, EVENT_OBJ_GFX_OLD_MAN_2, 0, 47, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route117_EventScript_1B222D, 0 + object_event 4, EVENT_OBJ_GFX_ZIGZAGOON, 0, 33, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 + object_event 5, EVENT_OBJ_GFX_KECLEON_1, 0, 39, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 0 + object_event 6, EVENT_OBJ_GFX_AZUMARILL, 0, 42, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 + object_event 7, EVENT_OBJ_GFX_PIKACHU, 0, 49, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 0 + object_event 8, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M, 0, 35, 7, 3, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 7, 0, 1, 4, Route117_EventScript_150E09, 0 + object_event 9, EVENT_OBJ_GFX_WOMAN_3, 0, 31, 11, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 0, 0, 1, 3, Route117_EventScript_150DCB, 0 + object_event 10, EVENT_OBJ_GFX_MAN_5, 0, 10, 9, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 0, 0, 1, 3, Route117_EventScript_150D8D, 0 + object_event 11, EVENT_OBJ_GFX_BERRY_TREE, 0, 41, 13, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 29, S_BerryTree, 0 + object_event 12, EVENT_OBJ_GFX_BERRY_TREE, 0, 42, 13, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 28, S_BerryTree, 0 + object_event 13, EVENT_OBJ_GFX_BERRY_TREE, 0, 43, 13, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 27, S_BerryTree, 0 + object_event 14, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 18, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route117_EventScript_1B1598, FLAG_ITEM_ROUTE117_1 + object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 15, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11 + object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 9, 1, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route117_EventScript_1B15A5, FLAG_ITEM_ROUTE117_2 + object_event 17, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 21, 1, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_LEFT_UP, 4, 4, 1, 3, Route117_EventScript_150E47, 0 + object_event 18, EVENT_OBJ_GFX_MANIAC, 0, 17, 12, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 4, Route117_EventScript_150E85, 0 + object_event 19, EVENT_OBJ_GFX_LASS, 0, 46, 15, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, Route117_EventScript_150EE2, 0 + object_event 20, EVENT_OBJ_GFX_LASS, 0, 45, 15, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, Route117_EventScript_150E9C, 0 + object_event 21, EVENT_OBJ_GFX_GIRL_2, 0, 48, 10, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route117_EventScript_150D69, 0 Route117_MapWarps:: @ 8383638 warp_def 51, 5, 0, 0, MAP_ROUTE117_POKEMON_DAY_CARE diff --git a/data/maps/Route117_PokemonDayCare/events.inc b/data/maps/Route117_PokemonDayCare/events.inc index 3f2c3be51..cbdf9475b 100644 --- a/data/maps/Route117_PokemonDayCare/events.inc +++ b/data/maps/Route117_PokemonDayCare/events.inc @@ -1,5 +1,5 @@ Route117_PokemonDayCare_EventObjects:: @ 838B9F8 - object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 2, 2, 3, 8, 0, 0, 0, 0, Route117_PokemonDayCare_EventScript_1B2327, 0 + object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route117_PokemonDayCare_EventScript_1B2327, 0 Route117_PokemonDayCare_MapWarps:: @ 838BA10 warp_def 2, 8, 0, 0, MAP_ROUTE117 diff --git a/data/maps/Route118/events.inc b/data/maps/Route118/events.inc index c12e77bd9..faeb837e5 100644 --- a/data/maps/Route118/events.inc +++ b/data/maps/Route118/events.inc @@ -1,24 +1,24 @@ Route118_EventObjects:: @ 8383684 - object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 35, 5, 3, 12, 0, 0, 0, 31, S_BerryTree, 0 - object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 36, 5, 3, 12, 0, 0, 0, 32, S_BerryTree, 0 - object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 37, 5, 3, 12, 0, 0, 0, 33, S_BerryTree, 0 - object_event 4, EVENT_OBJ_GFX_MAN_6, 0, 64, 10, 3, 8, 0, 0, 1, 3, Route118_EventScript_151139, 0 - object_event 5, EVENT_OBJ_GFX_REPORTER_F, 0, 33, 8, 3, 8, 0, 0, 0, 0, Route118_EventScript_1AE462, FLAG_HIDE_GABBY_AND_TY_ROUTE118_1 - object_event 6, EVENT_OBJ_GFX_CAMERAMAN, 0, 34, 8, 3, 8, 0, 0, 0, 0, Route118_EventScript_1AE482, FLAG_HIDE_GABBY_AND_TY_ROUTE118_1 - object_event 7, EVENT_OBJ_GFX_GIRL_2, 0, 12, 8, 3, 2, 1, 1, 0, 0, Route118_EventScript_150F93, 0 - object_event 8, EVENT_OBJ_GFX_REPORTER_F, 0, 33, 8, 3, 8, 0, 0, 0, 0, Route118_EventScript_1AE522, FLAG_HIDE_GABBY_AND_TY_ROUTE118_2 - object_event 9, EVENT_OBJ_GFX_CAMERAMAN, 0, 34, 8, 3, 8, 0, 0, 0, 0, Route118_EventScript_1AE542, FLAG_HIDE_GABBY_AND_TY_ROUTE118_2 - object_event 10, EVENT_OBJ_GFX_REPORTER_F, 0, 33, 8, 3, 8, 0, 0, 0, 0, Route118_EventScript_1AE562, FLAG_HIDE_GABBY_AND_TY_ROUTE118_3 - object_event 11, EVENT_OBJ_GFX_CAMERAMAN, 0, 34, 8, 3, 8, 0, 0, 0, 0, Route118_EventScript_1AE582, FLAG_HIDE_GABBY_AND_TY_ROUTE118_3 - object_event 12, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 38, 8, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11 - object_event 13, EVENT_OBJ_GFX_FISHERMAN, 0, 28, 8, 3, 9, 0, 0, 0, 0, Route118_EventScript_150F34, 0 - object_event 14, EVENT_OBJ_GFX_WOMAN_3, 0, 7, 10, 3, 24, 0, 0, 1, 4, Route118_EventScript_15108F, 0 - object_event 15, EVENT_OBJ_GFX_FISHERMAN, 0, 14, 14, 3, 8, 0, 0, 1, 0, Route118_EventScript_1510E4, 0 - object_event 16, EVENT_OBJ_GFX_MAN_6, 0, 56, 7, 3, 16, 0, 0, 1, 3, Route118_EventScript_151150, 0 - object_event 17, EVENT_OBJ_GFX_FISHERMAN, 0, 39, 15, 3, 1, 0, 0, 1, 2, Route118_EventScript_1510CD, 0 - object_event 18, EVENT_OBJ_GFX_MAN_6, 0, 17, 11, 3, 15, 1, 1, 1, 3, Route118_EventScript_1510FB, 0 - object_event 19, EVENT_OBJ_GFX_STEVEN, 0, 44, 7, 3, 8, 1, 1, 0, 0, 0x0, FLAG_HIDE_STEVEN_ROUTE118 - object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 69, 7, 3, 1, 1, 1, 0, 0, Route118_EventScript_1B15B2, FLAG_ITEM_ROUTE118_1 + object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 35, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 31, S_BerryTree, 0 + object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 36, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 32, S_BerryTree, 0 + object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 37, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 33, S_BerryTree, 0 + object_event 4, EVENT_OBJ_GFX_MAN_6, 0, 64, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, Route118_EventScript_151139, 0 + object_event 5, EVENT_OBJ_GFX_REPORTER_F, 0, 33, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route118_EventScript_1AE462, FLAG_HIDE_GABBY_AND_TY_ROUTE118_1 + object_event 6, EVENT_OBJ_GFX_CAMERAMAN, 0, 34, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route118_EventScript_1AE482, FLAG_HIDE_GABBY_AND_TY_ROUTE118_1 + object_event 7, EVENT_OBJ_GFX_GIRL_2, 0, 12, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route118_EventScript_150F93, 0 + object_event 8, EVENT_OBJ_GFX_REPORTER_F, 0, 33, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route118_EventScript_1AE522, FLAG_HIDE_GABBY_AND_TY_ROUTE118_2 + object_event 9, EVENT_OBJ_GFX_CAMERAMAN, 0, 34, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route118_EventScript_1AE542, FLAG_HIDE_GABBY_AND_TY_ROUTE118_2 + object_event 10, EVENT_OBJ_GFX_REPORTER_F, 0, 33, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route118_EventScript_1AE562, FLAG_HIDE_GABBY_AND_TY_ROUTE118_3 + object_event 11, EVENT_OBJ_GFX_CAMERAMAN, 0, 34, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route118_EventScript_1AE582, FLAG_HIDE_GABBY_AND_TY_ROUTE118_3 + object_event 12, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 38, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11 + object_event 13, EVENT_OBJ_GFX_FISHERMAN, 0, 28, 8, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route118_EventScript_150F34, 0 + object_event 14, EVENT_OBJ_GFX_WOMAN_3, 0, 7, 10, 3, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 0, 0, 1, 4, Route118_EventScript_15108F, 0 + object_event 15, EVENT_OBJ_GFX_FISHERMAN, 0, 14, 14, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, Route118_EventScript_1510E4, 0 + object_event 16, EVENT_OBJ_GFX_MAN_6, 0, 56, 7, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 0, 0, 1, 3, Route118_EventScript_151150, 0 + object_event 17, EVENT_OBJ_GFX_FISHERMAN, 0, 39, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 1, 2, Route118_EventScript_1510CD, 0 + object_event 18, EVENT_OBJ_GFX_MAN_6, 0, 17, 11, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 3, Route118_EventScript_1510FB, 0 + object_event 19, EVENT_OBJ_GFX_STEVEN, 0, 44, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_STEVEN_ROUTE118 + object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 69, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route118_EventScript_1B15B2, FLAG_ITEM_ROUTE118_1 Route118_MapCoordEvents:: @ 8383864 coord_event 43, 11, 3, 0, VAR_ROUTE118_STATE, 0, 0, Route118_EventScript_150FAE diff --git a/data/maps/Route119/events.inc b/data/maps/Route119/events.inc index 49677e8e5..16bb236d2 100644 --- a/data/maps/Route119/events.inc +++ b/data/maps/Route119/events.inc @@ -1,41 +1,41 @@ Route119_EventObjects:: @ 8383914 - object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 24, 5, 3, 12, 0, 0, 0, 34, S_BerryTree, 0 - object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 25, 5, 3, 12, 0, 0, 0, 35, S_BerryTree, 0 - object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 26, 5, 3, 12, 0, 0, 0, 36, S_BerryTree, 0 - object_event 4, EVENT_OBJ_GFX_BUG_CATCHER, 0, 12, 123, 3, 59, 0, 0, 1, 1, Route119_EventScript_151491, 0 - object_event 5, EVENT_OBJ_GFX_MANIAC, 0, 26, 123, 3, 60, 0, 0, 1, 1, Route119_EventScript_151463, 0 - object_event 6, EVENT_OBJ_GFX_MANIAC, 0, 5, 125, 3, 62, 0, 0, 1, 1, Route119_EventScript_15144C, 0 - object_event 7, EVENT_OBJ_GFX_CAMPER, 0, 7, 74, 3, 18, 0, 0, 1, 3, Route119_EventScript_1514BF, 0 - object_event 8, EVENT_OBJ_GFX_MANIAC, 0, 28, 116, 3, 60, 0, 0, 1, 1, Route119_EventScript_151435, 0 - object_event 9, EVENT_OBJ_GFX_PICNICKER, 0, 35, 83, 4, 8, 0, 0, 1, 2, Route119_EventScript_1514FD, 0 - object_event 10, EVENT_OBJ_GFX_BUG_CATCHER, 0, 34, 122, 3, 61, 0, 0, 1, 1, Route119_EventScript_15147A, 0 - object_event 11, EVENT_OBJ_GFX_BUG_CATCHER, 0, 17, 128, 3, 61, 0, 0, 1, 1, Route119_EventScript_1514A8, 0 - object_event 12, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 28, 16, 3, 57, 0, 0, 1, 2, Route119_EventScript_151569, 0 - object_event 13, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 19, 49, 3, 58, 0, 0, 1, 3, Route119_EventScript_151580, 0 - object_event 14, EVENT_OBJ_GFX_MAN_6, 0, 10, 50, 4, 10, 0, 0, 1, 3, Route119_EventScript_15153B, 0 - object_event 15, EVENT_OBJ_GFX_MAN_6, 0, 8, 62, 3, 8, 0, 0, 1, 3, Route119_EventScript_151552, 0 - object_event 16, EVENT_OBJ_GFX_VAR_0, 0, 25, 32, 3, 7, 0, 0, 0, 0, 0x0, FLAG_HIDE_RIVAL_ROUTE119 - object_event 17, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 121, 3, 1, 0, 0, 0, 0, Route119_EventScript_1B15BF, FLAG_ITEM_ROUTE119_1 - object_event 18, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 96, 3, 1, 0, 0, 0, 0, Route119_EventScript_1B15CC, FLAG_ITEM_ROUTE119_2 - object_event 19, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 53, 3, 1, 0, 0, 0, 0, Route119_EventScript_1B15D9, FLAG_ITEM_ROUTE119_3 - object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 25, 76, 3, 1, 0, 0, 0, 0, Route119_EventScript_1B15E6, FLAG_ITEM_ROUTE119_4 - object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 18, 3, 1, 0, 0, 0, 0, Route119_EventScript_1B15F3, FLAG_ITEM_ROUTE119_5 - object_event 22, EVENT_OBJ_GFX_ITEM_BALL, 0, 33, 117, 3, 1, 0, 0, 0, 0, Route119_EventScript_1B1600, FLAG_ITEM_ROUTE119_6 - object_event 23, EVENT_OBJ_GFX_VAR_1, 0, 13, 33, 4, 10, 0, 0, 0, 0, Route119_EventScript_1515C5, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE - object_event 24, EVENT_OBJ_GFX_VAR_1, 0, 13, 34, 4, 10, 0, 0, 0, 0, Route119_EventScript_1515DC, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE - object_event 25, EVENT_OBJ_GFX_VAR_3, 0, 17, 33, 4, 7, 0, 0, 0, 0, 0x0, FLAG_HIDE_RIVAL_ROUTE119_ON_BIKE - object_event 26, EVENT_OBJ_GFX_BOY_3, 0, 31, 109, 3, 8, 1, 1, 0, 0, Route119_EventScript_1515F3, 0 - object_event 27, EVENT_OBJ_GFX_BERRY_TREE, 0, 8, 23, 3, 12, 0, 0, 0, 83, S_BerryTree, 0 - object_event 28, EVENT_OBJ_GFX_BERRY_TREE, 0, 9, 23, 3, 12, 0, 0, 0, 84, S_BerryTree, 0 - object_event 29, EVENT_OBJ_GFX_BERRY_TREE, 0, 29, 90, 3, 12, 0, 0, 0, 85, S_BerryTree, 0 - object_event 30, EVENT_OBJ_GFX_BERRY_TREE, 0, 30, 90, 3, 12, 0, 0, 0, 86, S_BerryTree, 0 - object_event 31, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 19, 133, 3, 5, 2, 1, 0, 0, Route119_EventScript_15141A, 0 - object_event 32, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 56, 3, 1, 1, 1, 0, 0, Route119_EventScript_1B160D, FLAG_ITEM_ROUTE119_7 - object_event 33, EVENT_OBJ_GFX_BOY_2, 0, 35, 93, 4, 2, 1, 1, 0, 0, Route119_EventScript_1515FC, 0 - object_event 34, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 29, 6, 3, 57, 1, 1, 1, 3, Route119_EventScript_151597, 0 - object_event 35, EVENT_OBJ_GFX_KECLEON_1, 0, 31, 6, 3, 76, 1, 1, 0, 0, Route119_EventScript_1A057A, FLAG_HIDE_KECLEON_ROUTE119_1 - object_event 36, EVENT_OBJ_GFX_KECLEON_1, 0, 20, 13, 4, 76, 1, 1, 0, 0, Route119_EventScript_1A0587, FLAG_HIDE_KECLEON_ROUTE119_2 - object_event 37, EVENT_OBJ_GFX_FISHERMAN, 0, 13, 104, 3, 10, 1, 1, 1, 0, Route119_EventScript_1515AE, 0 + object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 24, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 34, S_BerryTree, 0 + object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 25, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 35, S_BerryTree, 0 + object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 26, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 36, S_BerryTree, 0 + object_event 4, EVENT_OBJ_GFX_BUG_CATCHER, 0, 12, 123, 3, MOVEMENT_TYPE_COPY_PLAYER_IN_GRASS, 0, 0, 1, 1, Route119_EventScript_151491, 0 + object_event 5, EVENT_OBJ_GFX_MANIAC, 0, 26, 123, 3, MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS, 0, 0, 1, 1, Route119_EventScript_151463, 0 + object_event 6, EVENT_OBJ_GFX_MANIAC, 0, 5, 125, 3, MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE_IN_GRASS, 0, 0, 1, 1, Route119_EventScript_15144C, 0 + object_event 7, EVENT_OBJ_GFX_CAMPER, 0, 7, 74, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 0, 0, 1, 3, Route119_EventScript_1514BF, 0 + object_event 8, EVENT_OBJ_GFX_MANIAC, 0, 28, 116, 3, MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS, 0, 0, 1, 1, Route119_EventScript_151435, 0 + object_event 9, EVENT_OBJ_GFX_PICNICKER, 0, 35, 83, 4, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 2, Route119_EventScript_1514FD, 0 + object_event 10, EVENT_OBJ_GFX_BUG_CATCHER, 0, 34, 122, 3, MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE_IN_GRASS, 0, 0, 1, 1, Route119_EventScript_15147A, 0 + object_event 11, EVENT_OBJ_GFX_BUG_CATCHER, 0, 17, 128, 3, MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE_IN_GRASS, 0, 0, 1, 1, Route119_EventScript_1514A8, 0 + object_event 12, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 28, 16, 3, MOVEMENT_TYPE_TREE_DISGUISE, 0, 0, 1, 2, Route119_EventScript_151569, 0 + object_event 13, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 19, 49, 3, MOVEMENT_TYPE_MOUNTAIN_DISGUISE, 0, 0, 1, 3, Route119_EventScript_151580, 0 + object_event 14, EVENT_OBJ_GFX_MAN_6, 0, 10, 50, 4, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 3, Route119_EventScript_15153B, 0 + object_event 15, EVENT_OBJ_GFX_MAN_6, 0, 8, 62, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, Route119_EventScript_151552, 0 + object_event 16, EVENT_OBJ_GFX_VAR_0, 0, 25, 32, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_RIVAL_ROUTE119 + object_event 17, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 121, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route119_EventScript_1B15BF, FLAG_ITEM_ROUTE119_1 + object_event 18, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 96, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route119_EventScript_1B15CC, FLAG_ITEM_ROUTE119_2 + object_event 19, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 53, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route119_EventScript_1B15D9, FLAG_ITEM_ROUTE119_3 + object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 25, 76, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route119_EventScript_1B15E6, FLAG_ITEM_ROUTE119_4 + object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 18, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route119_EventScript_1B15F3, FLAG_ITEM_ROUTE119_5 + object_event 22, EVENT_OBJ_GFX_ITEM_BALL, 0, 33, 117, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route119_EventScript_1B1600, FLAG_ITEM_ROUTE119_6 + object_event 23, EVENT_OBJ_GFX_VAR_1, 0, 13, 33, 4, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route119_EventScript_1515C5, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE + object_event 24, EVENT_OBJ_GFX_VAR_1, 0, 13, 34, 4, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route119_EventScript_1515DC, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE + object_event 25, EVENT_OBJ_GFX_VAR_3, 0, 17, 33, 4, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_RIVAL_ROUTE119_ON_BIKE + object_event 26, EVENT_OBJ_GFX_BOY_3, 0, 31, 109, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, Route119_EventScript_1515F3, 0 + object_event 27, EVENT_OBJ_GFX_BERRY_TREE, 0, 8, 23, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 83, S_BerryTree, 0 + object_event 28, EVENT_OBJ_GFX_BERRY_TREE, 0, 9, 23, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 84, S_BerryTree, 0 + object_event 29, EVENT_OBJ_GFX_BERRY_TREE, 0, 29, 90, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 85, S_BerryTree, 0 + object_event 30, EVENT_OBJ_GFX_BERRY_TREE, 0, 30, 90, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 86, S_BerryTree, 0 + object_event 31, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 19, 133, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 2, 1, 0, 0, Route119_EventScript_15141A, 0 + object_event 32, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 56, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route119_EventScript_1B160D, FLAG_ITEM_ROUTE119_7 + object_event 33, EVENT_OBJ_GFX_BOY_2, 0, 35, 93, 4, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route119_EventScript_1515FC, 0 + object_event 34, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 29, 6, 3, MOVEMENT_TYPE_TREE_DISGUISE, 1, 1, 1, 3, Route119_EventScript_151597, 0 + object_event 35, EVENT_OBJ_GFX_KECLEON_1, 0, 31, 6, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route119_EventScript_1A057A, FLAG_HIDE_KECLEON_ROUTE119_1 + object_event 36, EVENT_OBJ_GFX_KECLEON_1, 0, 20, 13, 4, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route119_EventScript_1A0587, FLAG_HIDE_KECLEON_ROUTE119_2 + object_event 37, EVENT_OBJ_GFX_FISHERMAN, 0, 13, 104, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 0, Route119_EventScript_1515AE, 0 Route119_MapWarps:: @ 8383C8C warp_def 6, 32, 0, 0, MAP_ROUTE119_WEATHER_INSTITUTE_1F diff --git a/data/maps/Route119_House/events.inc b/data/maps/Route119_House/events.inc index 0b7bc6b70..f8b334714 100644 --- a/data/maps/Route119_House/events.inc +++ b/data/maps/Route119_House/events.inc @@ -1,11 +1,11 @@ Route119_House_EventObjects:: @ 8392F40 - object_event 1, EVENT_OBJ_GFX_WOMAN_5, 0, 7, 2, 3, 8, 0, 0, 0, 0, Route119_House_EventScript_163DDE, 0 - object_event 2, EVENT_OBJ_GFX_WINGULL, 0, 1, 6, 3, 2, 2, 2, 0, 0, Route119_House_EventScript_163DE7, 0 - object_event 3, EVENT_OBJ_GFX_WINGULL, 0, 0, 4, 3, 2, 3, 1, 0, 0, Route119_House_EventScript_163DE7, 0 - object_event 4, EVENT_OBJ_GFX_WINGULL, 0, 2, 2, 3, 2, 1, 1, 0, 0, Route119_House_EventScript_163DE7, 0 - object_event 5, EVENT_OBJ_GFX_WINGULL, 0, 8, 5, 3, 2, 3, 2, 0, 0, Route119_House_EventScript_163DE7, 0 - object_event 6, EVENT_OBJ_GFX_WINGULL, 0, 6, 6, 3, 2, 2, 2, 0, 0, Route119_House_EventScript_163DE7, 0 - object_event 7, EVENT_OBJ_GFX_WINGULL, 0, 5, 3, 3, 2, 1, 3, 0, 0, Route119_House_EventScript_163DE7, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_5, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route119_House_EventScript_163DDE, 0 + object_event 2, EVENT_OBJ_GFX_WINGULL, 0, 1, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 2, 0, 0, Route119_House_EventScript_163DE7, 0 + object_event 3, EVENT_OBJ_GFX_WINGULL, 0, 0, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 3, 1, 0, 0, Route119_House_EventScript_163DE7, 0 + object_event 4, EVENT_OBJ_GFX_WINGULL, 0, 2, 2, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route119_House_EventScript_163DE7, 0 + object_event 5, EVENT_OBJ_GFX_WINGULL, 0, 8, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 3, 2, 0, 0, Route119_House_EventScript_163DE7, 0 + object_event 6, EVENT_OBJ_GFX_WINGULL, 0, 6, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 2, 0, 0, Route119_House_EventScript_163DE7, 0 + object_event 7, EVENT_OBJ_GFX_WINGULL, 0, 5, 3, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 3, 0, 0, Route119_House_EventScript_163DE7, 0 Route119_House_MapWarps:: @ 8392FE8 warp_def 3, 8, 0, 1, MAP_ROUTE119 diff --git a/data/maps/Route119_WeatherInstitute_1F/events.inc b/data/maps/Route119_WeatherInstitute_1F/events.inc index 0107020cd..5b30ff21d 100644 --- a/data/maps/Route119_WeatherInstitute_1F/events.inc +++ b/data/maps/Route119_WeatherInstitute_1F/events.inc @@ -1,9 +1,9 @@ Route119_WeatherInstitute_1F_EventObjects:: @ 8392DC0 - object_event 1, EVENT_OBJ_GFX_VAR_1, 0, 15, 3, 3, 9, 0, 0, 1, 3, Route119_WeatherInstitute_1F_EventScript_163C94, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE - object_event 2, EVENT_OBJ_GFX_VAR_2, 0, 10, 5, 3, 8, 0, 0, 1, 2, Route119_WeatherInstitute_1F_EventScript_163CAB, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE - object_event 3, EVENT_OBJ_GFX_MAN_5, 0, 5, 4, 3, 8, 0, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_163C7A, FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_1F - object_event 4, EVENT_OBJ_GFX_MAN_5, 0, 2, 11, 3, 1, 1, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_163C71, FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_1F - object_event 5, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 14, 11, 3, 2, 1, 1, 0, 0, Route119_WeatherInstitute_1F_EventScript_163C4D, 0 + object_event 1, EVENT_OBJ_GFX_VAR_1, 0, 15, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 3, Route119_WeatherInstitute_1F_EventScript_163C94, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE + object_event 2, EVENT_OBJ_GFX_VAR_2, 0, 10, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 2, Route119_WeatherInstitute_1F_EventScript_163CAB, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE + object_event 3, EVENT_OBJ_GFX_MAN_5, 0, 5, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_163C7A, FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_1F + object_event 4, EVENT_OBJ_GFX_MAN_5, 0, 2, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_163C71, FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_1F + object_event 5, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 14, 11, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route119_WeatherInstitute_1F_EventScript_163C4D, 0 Route119_WeatherInstitute_1F_MapWarps:: @ 8392E38 warp_def 9, 12, 0, 0, MAP_ROUTE119 diff --git a/data/maps/Route119_WeatherInstitute_2F/events.inc b/data/maps/Route119_WeatherInstitute_2F/events.inc index 62cb0391f..e6356b47f 100644 --- a/data/maps/Route119_WeatherInstitute_2F/events.inc +++ b/data/maps/Route119_WeatherInstitute_2F/events.inc @@ -1,10 +1,10 @@ Route119_WeatherInstitute_2F_EventObjects:: @ 8392E94 - object_event 1, EVENT_OBJ_GFX_VAR_1, 0, 15, 6, 3, 10, 0, 0, 1, 4, Route119_WeatherInstitute_2F_EventScript_163CFC, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE - object_event 2, EVENT_OBJ_GFX_VAR_1, 0, 10, 8, 3, 13, 0, 0, 1, 2, Route119_WeatherInstitute_2F_EventScript_163D13, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE - object_event 3, EVENT_OBJ_GFX_VAR_2, 0, 4, 6, 3, 10, 0, 0, 1, 0, Route119_WeatherInstitute_2F_EventScript_163D2A, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE - object_event 4, EVENT_OBJ_GFX_MAN_5, 0, 0, 6, 3, 10, 0, 0, 0, 0, 0x0, FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_2F - object_event 5, EVENT_OBJ_GFX_SCIENTIST_1, 0, 18, 6, 3, 1, 2, 1, 0, 0, Route119_WeatherInstitute_2F_EventScript_163DCC, 0 - object_event 6, EVENT_OBJ_GFX_MAN_5, 0, 1, 7, 3, 10, 0, 0, 0, 0, 0x0, FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_2F + object_event 1, EVENT_OBJ_GFX_VAR_1, 0, 15, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 4, Route119_WeatherInstitute_2F_EventScript_163CFC, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE + object_event 2, EVENT_OBJ_GFX_VAR_1, 0, 10, 8, 3, MOVEMENT_TYPE_FACE_DOWN_AND_UP, 0, 0, 1, 2, Route119_WeatherInstitute_2F_EventScript_163D13, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE + object_event 3, EVENT_OBJ_GFX_VAR_2, 0, 4, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 0, Route119_WeatherInstitute_2F_EventScript_163D2A, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE + object_event 4, EVENT_OBJ_GFX_MAN_5, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_2F + object_event 5, EVENT_OBJ_GFX_SCIENTIST_1, 0, 18, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 2, 1, 0, 0, Route119_WeatherInstitute_2F_EventScript_163DCC, 0 + object_event 6, EVENT_OBJ_GFX_MAN_5, 0, 1, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_2F Route119_WeatherInstitute_2F_MapWarps:: @ 8392F24 warp_def 17, 1, 0, 2, MAP_ROUTE119_WEATHER_INSTITUTE_1F diff --git a/data/maps/Route120/events.inc b/data/maps/Route120/events.inc index 1c0444b22..2e86c9e8c 100644 --- a/data/maps/Route120/events.inc +++ b/data/maps/Route120/events.inc @@ -1,45 +1,45 @@ Route120_EventObjects:: @ 8383F30 - object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 4, 79, 3, 12, 0, 0, 0, 46, S_BerryTree, 0 - object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 5, 79, 3, 12, 0, 0, 0, 45, S_BerryTree, 0 - object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 6, 79, 3, 12, 0, 0, 0, 44, S_BerryTree, 0 - object_event 4, EVENT_OBJ_GFX_BERRY_TREE, 0, 7, 79, 3, 12, 0, 0, 0, 43, S_BerryTree, 0 - object_event 5, EVENT_OBJ_GFX_BERRY_TREE, 0, 34, 24, 3, 12, 0, 0, 0, 37, S_BerryTree, 0 - object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 35, 24, 3, 12, 0, 0, 0, 38, S_BerryTree, 0 - object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 36, 24, 3, 12, 0, 0, 0, 39, S_BerryTree, 0 - object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 9, 92, 5, 12, 0, 0, 0, 40, S_BerryTree, 0 - object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 10, 92, 5, 12, 0, 0, 0, 41, S_BerryTree, 0 - object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 11, 92, 5, 12, 0, 0, 0, 42, S_BerryTree, 0 - object_event 11, EVENT_OBJ_GFX_MAN_6, 0, 5, 22, 3, 14, 0, 0, 1, 3, Route120_EventScript_1519B3, 0 - object_event 12, EVENT_OBJ_GFX_MAN_6, 0, 32, 14, 3, 10, 0, 0, 1, 3, Route120_EventScript_1519CA, 0 - object_event 13, EVENT_OBJ_GFX_CAMPER, 0, 27, 51, 3, 9, 0, 0, 1, 7, Route120_EventScript_151A08, 0 - object_event 14, EVENT_OBJ_GFX_PICNICKER, 0, 36, 45, 3, 9, 0, 0, 1, 2, Route120_EventScript_151A1F, 0 - object_event 15, EVENT_OBJ_GFX_MANIAC, 0, 19, 80, 5, 15, 0, 0, 1, 3, Route120_EventScript_151A36, 0 - object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 20, 55, 3, 1, 0, 0, 0, 0, Route120_EventScript_1B161A, FLAG_ITEM_ROUTE120_1 - object_event 17, EVENT_OBJ_GFX_CAMERAMAN, 0, 37, 5, 3, 8, 0, 0, 0, 0, Route120_EventScript_1AE4C2, FLAG_HIDE_GABBY_AND_TY_ROUTE120_1 - object_event 18, EVENT_OBJ_GFX_REPORTER_F, 0, 36, 5, 3, 8, 0, 0, 0, 0, Route120_EventScript_1AE4A2, FLAG_HIDE_GABBY_AND_TY_ROUTE120_1 - object_event 19, EVENT_OBJ_GFX_REPORTER_F, 0, 36, 5, 3, 8, 0, 0, 0, 0, Route120_EventScript_1AE562, FLAG_HIDE_GABBY_AND_TY_ROUTE120_2 - object_event 20, EVENT_OBJ_GFX_CAMERAMAN, 0, 37, 5, 3, 8, 0, 0, 0, 0, Route120_EventScript_1AE582, FLAG_HIDE_GABBY_AND_TY_ROUTE120_2 - object_event 21, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 35, 32, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11 - object_event 22, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 89, 3, 1, 0, 0, 0, 0, Route120_EventScript_1B1627, FLAG_ITEM_ROUTE120_2 - object_event 23, EVENT_OBJ_GFX_BEAUTY, 0, 14, 92, 5, 5, 1, 0, 0, 0, Route120_EventScript_151739, 0 - object_event 24, EVENT_OBJ_GFX_WOMAN_7, 0, 28, 35, 3, 15, 0, 0, 1, 4, Route120_EventScript_151A74, 0 - object_event 25, EVENT_OBJ_GFX_HIKER, 0, 9, 60, 3, 21, 0, 0, 1, 4, Route120_EventScript_151A8B, 0 - object_event 26, EVENT_OBJ_GFX_WOMAN_7, 0, 16, 6, 3, 23, 0, 0, 1, 4, Route120_EventScript_151AA2, 0 - object_event 27, EVENT_OBJ_GFX_WOMAN_7, 0, 18, 34, 3, 17, 0, 0, 1, 3, Route120_EventScript_151AB9, 0 - object_event 28, EVENT_OBJ_GFX_ITEM_BALL, 0, 22, 13, 3, 1, 1, 1, 0, 0, Route120_EventScript_1B1641, FLAG_ITEM_ROUTE120_4 - object_event 29, EVENT_OBJ_GFX_ITEM_BALL, 0, 23, 82, 5, 1, 1, 1, 0, 0, Route120_EventScript_1B1634, FLAG_ITEM_ROUTE120_3 - object_event 30, EVENT_OBJ_GFX_KECLEON_1, 0, 12, 16, 4, 76, 1, 1, 0, 0, Route120_EventScript_151998, FLAG_HIDE_KECLEON_ROUTE120_1 - object_event 31, EVENT_OBJ_GFX_STEVEN, 0, 13, 15, 4, 8, 1, 1, 0, 0, Route120_EventScript_151853, FLAG_HIDE_STEVEN_ROUTE120 - object_event 32, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 20, 1, 3, 1, 1, 1, 0, 0, S_CuttableTree, FLAG_TEMP_14 - object_event 33, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 15, 1, 3, 1, 1, 1, 0, 0, S_CuttableTree, FLAG_TEMP_12 - object_event 34, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 10, 72, 3, 58, 1, 1, 1, 3, Route120_EventScript_151AD0, 0 - object_event 35, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 19, 28, 3, 57, 1, 1, 1, 3, Route120_EventScript_151AE7, 0 - object_event 36, EVENT_OBJ_GFX_KECLEON_2, 0, 12, 16, 3, 8, 1, 1, 0, 0, 0x0, FLAG_HIDE_KECLEON_ROUTE120_2 - object_event 37, EVENT_OBJ_GFX_KECLEON_1, 0, 20, 11, 3, 76, 1, 1, 0, 0, Route120_EventScript_1A0539, FLAG_HIDE_KECLEON_ROUTE120_3 - object_event 38, EVENT_OBJ_GFX_KECLEON_1, 0, 27, 2, 3, 76, 1, 1, 0, 0, Route120_EventScript_1A0546, FLAG_HIDE_KECLEON_ROUTE120_4 - object_event 39, EVENT_OBJ_GFX_KECLEON_1, 0, 4, 77, 3, 76, 1, 1, 0, 0, Route120_EventScript_1A0553, FLAG_HIDE_KECLEON_ROUTE120_5 - object_event 40, EVENT_OBJ_GFX_KECLEON_1, 0, 7, 51, 3, 76, 1, 1, 0, 0, Route120_EventScript_1A056D, FLAG_HIDE_KECLEON_ROUTE120_7 - object_event 41, EVENT_OBJ_GFX_KECLEON_1, 0, 19, 48, 3, 76, 1, 1, 0, 0, Route120_EventScript_1A0560, FLAG_HIDE_KECLEON_ROUTE120_6 + object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 4, 79, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 46, S_BerryTree, 0 + object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 5, 79, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 45, S_BerryTree, 0 + object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 6, 79, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 44, S_BerryTree, 0 + object_event 4, EVENT_OBJ_GFX_BERRY_TREE, 0, 7, 79, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 43, S_BerryTree, 0 + object_event 5, EVENT_OBJ_GFX_BERRY_TREE, 0, 34, 24, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 37, S_BerryTree, 0 + object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 35, 24, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 38, S_BerryTree, 0 + object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 36, 24, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 39, S_BerryTree, 0 + object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 9, 92, 5, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 40, S_BerryTree, 0 + object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 10, 92, 5, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 41, S_BerryTree, 0 + object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 11, 92, 5, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 42, S_BerryTree, 0 + object_event 11, EVENT_OBJ_GFX_MAN_6, 0, 5, 22, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 1, 3, Route120_EventScript_1519B3, 0 + object_event 12, EVENT_OBJ_GFX_MAN_6, 0, 32, 14, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 3, Route120_EventScript_1519CA, 0 + object_event 13, EVENT_OBJ_GFX_CAMPER, 0, 27, 51, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 7, Route120_EventScript_151A08, 0 + object_event 14, EVENT_OBJ_GFX_PICNICKER, 0, 36, 45, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, Route120_EventScript_151A1F, 0 + object_event 15, EVENT_OBJ_GFX_MANIAC, 0, 19, 80, 5, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 0, 0, 1, 3, Route120_EventScript_151A36, 0 + object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 20, 55, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route120_EventScript_1B161A, FLAG_ITEM_ROUTE120_1 + object_event 17, EVENT_OBJ_GFX_CAMERAMAN, 0, 37, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route120_EventScript_1AE4C2, FLAG_HIDE_GABBY_AND_TY_ROUTE120_1 + object_event 18, EVENT_OBJ_GFX_REPORTER_F, 0, 36, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route120_EventScript_1AE4A2, FLAG_HIDE_GABBY_AND_TY_ROUTE120_1 + object_event 19, EVENT_OBJ_GFX_REPORTER_F, 0, 36, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route120_EventScript_1AE562, FLAG_HIDE_GABBY_AND_TY_ROUTE120_2 + object_event 20, EVENT_OBJ_GFX_CAMERAMAN, 0, 37, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route120_EventScript_1AE582, FLAG_HIDE_GABBY_AND_TY_ROUTE120_2 + object_event 21, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 35, 32, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11 + object_event 22, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 89, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route120_EventScript_1B1627, FLAG_ITEM_ROUTE120_2 + object_event 23, EVENT_OBJ_GFX_BEAUTY, 0, 14, 92, 5, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, Route120_EventScript_151739, 0 + object_event 24, EVENT_OBJ_GFX_WOMAN_7, 0, 28, 35, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 0, 0, 1, 4, Route120_EventScript_151A74, 0 + object_event 25, EVENT_OBJ_GFX_HIKER, 0, 9, 60, 3, MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT, 0, 0, 1, 4, Route120_EventScript_151A8B, 0 + object_event 26, EVENT_OBJ_GFX_WOMAN_7, 0, 16, 6, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 0, 0, 1, 4, Route120_EventScript_151AA2, 0 + object_event 27, EVENT_OBJ_GFX_WOMAN_7, 0, 18, 34, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 0, 0, 1, 3, Route120_EventScript_151AB9, 0 + object_event 28, EVENT_OBJ_GFX_ITEM_BALL, 0, 22, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route120_EventScript_1B1641, FLAG_ITEM_ROUTE120_4 + object_event 29, EVENT_OBJ_GFX_ITEM_BALL, 0, 23, 82, 5, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route120_EventScript_1B1634, FLAG_ITEM_ROUTE120_3 + object_event 30, EVENT_OBJ_GFX_KECLEON_1, 0, 12, 16, 4, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route120_EventScript_151998, FLAG_HIDE_KECLEON_ROUTE120_1 + object_event 31, EVENT_OBJ_GFX_STEVEN, 0, 13, 15, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, Route120_EventScript_151853, FLAG_HIDE_STEVEN_ROUTE120 + object_event 32, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 20, 1, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, S_CuttableTree, FLAG_TEMP_14 + object_event 33, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 15, 1, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, S_CuttableTree, FLAG_TEMP_12 + object_event 34, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 10, 72, 3, MOVEMENT_TYPE_MOUNTAIN_DISGUISE, 1, 1, 1, 3, Route120_EventScript_151AD0, 0 + object_event 35, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 19, 28, 3, MOVEMENT_TYPE_TREE_DISGUISE, 1, 1, 1, 3, Route120_EventScript_151AE7, 0 + object_event 36, EVENT_OBJ_GFX_KECLEON_2, 0, 12, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_KECLEON_ROUTE120_2 + object_event 37, EVENT_OBJ_GFX_KECLEON_1, 0, 20, 11, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route120_EventScript_1A0539, FLAG_HIDE_KECLEON_ROUTE120_3 + object_event 38, EVENT_OBJ_GFX_KECLEON_1, 0, 27, 2, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route120_EventScript_1A0546, FLAG_HIDE_KECLEON_ROUTE120_4 + object_event 39, EVENT_OBJ_GFX_KECLEON_1, 0, 4, 77, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route120_EventScript_1A0553, FLAG_HIDE_KECLEON_ROUTE120_5 + object_event 40, EVENT_OBJ_GFX_KECLEON_1, 0, 7, 51, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route120_EventScript_1A056D, FLAG_HIDE_KECLEON_ROUTE120_7 + object_event 41, EVENT_OBJ_GFX_KECLEON_1, 0, 19, 48, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route120_EventScript_1A0560, FLAG_HIDE_KECLEON_ROUTE120_6 Route120_MapWarps:: @ 8384308 warp_def 7, 55, 0, 0, MAP_ANCIENT_TOMB diff --git a/data/maps/Route121/events.inc b/data/maps/Route121/events.inc index 7405af540..3aee16842 100644 --- a/data/maps/Route121/events.inc +++ b/data/maps/Route121/events.inc @@ -1,26 +1,26 @@ Route121_EventObjects:: @ 8384504 - object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 29, 14, 3, 10, 1, 1, 0, 0, Route121_EventScript_151B0A, 0 - object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 14, 2, 3, 12, 0, 0, 0, 47, S_BerryTree, 0 - object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 15, 2, 3, 12, 0, 0, 0, 48, S_BerryTree, 0 - object_event 4, EVENT_OBJ_GFX_BERRY_TREE, 0, 16, 2, 3, 12, 0, 0, 0, 49, S_BerryTree, 0 - object_event 5, EVENT_OBJ_GFX_BERRY_TREE, 0, 17, 2, 3, 12, 0, 0, 0, 50, S_BerryTree, 0 - object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 64, 14, 3, 12, 0, 0, 0, 51, S_BerryTree, 0 - object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 65, 14, 3, 12, 0, 0, 0, 52, S_BerryTree, 0 - object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 66, 14, 3, 12, 0, 0, 0, 53, S_BerryTree, 0 - object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 67, 14, 3, 12, 0, 0, 0, 54, S_BerryTree, 0 - object_event 10, EVENT_OBJ_GFX_LASS, 0, 39, 9, 3, 8, 0, 0, 1, 0, Route121_EventScript_151BDE, 0 - object_event 11, EVENT_OBJ_GFX_LASS, 0, 40, 9, 3, 8, 0, 0, 1, 0, Route121_EventScript_151BF9, 0 - object_event 12, EVENT_OBJ_GFX_VAR_1, 0, 30, 8, 3, 7, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNTS_ROUTE121 - object_event 13, EVENT_OBJ_GFX_VAR_1, 0, 30, 7, 3, 10, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNTS_ROUTE121 - object_event 14, EVENT_OBJ_GFX_VAR_1, 0, 31, 7, 3, 9, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNTS_ROUTE121 - object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 32, 5, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11 - object_event 16, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 65, 4, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_12 - object_event 17, EVENT_OBJ_GFX_WOMAN_2, 0, 63, 5, 3, 9, 0, 0, 1, 4, Route121_EventScript_151B72, 0 - object_event 18, EVENT_OBJ_GFX_GENTLEMAN, 0, 55, 8, 3, 17, 0, 0, 1, 3, Route121_EventScript_151B89, 0 - object_event 19, EVENT_OBJ_GFX_HEX_MANIAC, 0, 11, 10, 3, 15, 0, 0, 1, 4, Route121_EventScript_151BC7, 0 - object_event 20, EVENT_OBJ_GFX_BEAUTY, 0, 22, 5, 3, 17, 0, 0, 1, 4, Route121_EventScript_151C14, 0 - object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 55, 10, 3, 1, 1, 1, 0, 0, Route121_EventScript_1B164E, FLAG_ITEM_ROUTE121_1 - object_event 22, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 26, 12, 3, 1, 1, 1, 0, 0, S_CuttableTree, FLAG_TEMP_13 + object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 29, 14, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, Route121_EventScript_151B0A, 0 + object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 14, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 47, S_BerryTree, 0 + object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 15, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 48, S_BerryTree, 0 + object_event 4, EVENT_OBJ_GFX_BERRY_TREE, 0, 16, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 49, S_BerryTree, 0 + object_event 5, EVENT_OBJ_GFX_BERRY_TREE, 0, 17, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 50, S_BerryTree, 0 + object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 64, 14, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 51, S_BerryTree, 0 + object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 65, 14, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 52, S_BerryTree, 0 + object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 66, 14, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 53, S_BerryTree, 0 + object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 67, 14, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 54, S_BerryTree, 0 + object_event 10, EVENT_OBJ_GFX_LASS, 0, 39, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, Route121_EventScript_151BDE, 0 + object_event 11, EVENT_OBJ_GFX_LASS, 0, 40, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, Route121_EventScript_151BF9, 0 + object_event 12, EVENT_OBJ_GFX_VAR_1, 0, 30, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNTS_ROUTE121 + object_event 13, EVENT_OBJ_GFX_VAR_1, 0, 30, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNTS_ROUTE121 + object_event 14, EVENT_OBJ_GFX_VAR_1, 0, 31, 7, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNTS_ROUTE121 + object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 32, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11 + object_event 16, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 65, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_12 + object_event 17, EVENT_OBJ_GFX_WOMAN_2, 0, 63, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 4, Route121_EventScript_151B72, 0 + object_event 18, EVENT_OBJ_GFX_GENTLEMAN, 0, 55, 8, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 0, 0, 1, 3, Route121_EventScript_151B89, 0 + object_event 19, EVENT_OBJ_GFX_HEX_MANIAC, 0, 11, 10, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 0, 0, 1, 4, Route121_EventScript_151BC7, 0 + object_event 20, EVENT_OBJ_GFX_BEAUTY, 0, 22, 5, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 0, 0, 1, 4, Route121_EventScript_151C14, 0 + object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 55, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route121_EventScript_1B164E, FLAG_ITEM_ROUTE121_1 + object_event 22, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 26, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, S_CuttableTree, FLAG_TEMP_13 Route121_MapWarps:: @ 8384714 warp_def 37, 5, 0, 2, MAP_ROUTE121_SAFARI_ZONE_ENTRANCE diff --git a/data/maps/Route121_SafariZoneEntrance/events.inc b/data/maps/Route121_SafariZoneEntrance/events.inc index 6ed6613ec..c915c5265 100644 --- a/data/maps/Route121_SafariZoneEntrance/events.inc +++ b/data/maps/Route121_SafariZoneEntrance/events.inc @@ -1,7 +1,7 @@ Route121_SafariZoneEntrance_EventObjects:: @ 838BA34 - object_event 1, EVENT_OBJ_GFX_PICNICKER, 0, 17, 9, 3, 9, 0, 0, 0, 0, Route121_SafariZoneEntrance_EventScript_15C351, 0 - object_event 2, EVENT_OBJ_GFX_CAMPER, 0, 10, 2, 3, 8, 0, 0, 0, 0, Route121_SafariZoneEntrance_EventScript_15C35A, 0 - object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 8, 2, 3, 8, 0, 0, 0, 0, 0x0, 0 + object_event 1, EVENT_OBJ_GFX_PICNICKER, 0, 17, 9, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route121_SafariZoneEntrance_EventScript_15C351, 0 + object_event 2, EVENT_OBJ_GFX_CAMPER, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route121_SafariZoneEntrance_EventScript_15C35A, 0 + object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 8, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 0 Route121_SafariZoneEntrance_MapWarps:: @ 838BA7C warp_def 2, 5, 0, 0, MAP_SAFARI_ZONE_SOUTHEAST diff --git a/data/maps/Route123/events.inc b/data/maps/Route123/events.inc index b25ec5c64..bcf8e820a 100644 --- a/data/maps/Route123/events.inc +++ b/data/maps/Route123/events.inc @@ -1,38 +1,38 @@ Route123_EventObjects:: @ 83847F8 - object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 11, 3, 3, 12, 0, 0, 0, 58, S_BerryTree, 0 - object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 12, 3, 3, 12, 0, 0, 0, 59, S_BerryTree, 0 - object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 14, 3, 3, 12, 0, 0, 0, 60, S_BerryTree, 0 - object_event 4, EVENT_OBJ_GFX_BERRY_TREE, 0, 15, 3, 3, 12, 0, 0, 0, 61, S_BerryTree, 0 - object_event 5, EVENT_OBJ_GFX_BERRY_TREE, 0, 81, 1, 3, 12, 0, 0, 0, 62, S_BerryTree, 0 - object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 82, 1, 3, 12, 0, 0, 0, 63, S_BerryTree, 0 - object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 83, 1, 3, 12, 0, 0, 0, 64, S_BerryTree, 0 - object_event 8, EVENT_OBJ_GFX_WOMAN_7, 0, 70, 12, 3, 24, 0, 0, 1, 1, Route123_EventScript_151CD1, 0 - object_event 9, EVENT_OBJ_GFX_MAN_4, 0, 58, 7, 3, 17, 0, 0, 1, 2, Route123_EventScript_151CE8, 0 - object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 14, 5, 3, 12, 0, 0, 0, 65, S_BerryTree, 0 - object_event 11, EVENT_OBJ_GFX_BERRY_TREE, 0, 15, 5, 3, 12, 0, 0, 0, 72, S_BerryTree, 0 - object_event 12, EVENT_OBJ_GFX_BERRY_TREE, 0, 17, 5, 3, 12, 0, 0, 0, 73, S_BerryTree, 0 - object_event 13, EVENT_OBJ_GFX_BERRY_TREE, 0, 18, 5, 3, 12, 0, 0, 0, 74, S_BerryTree, 0 - object_event 14, EVENT_OBJ_GFX_BERRY_TREE, 0, 17, 3, 3, 12, 0, 0, 0, 79, S_BerryTree, 0 - object_event 15, EVENT_OBJ_GFX_BERRY_TREE, 0, 18, 3, 3, 12, 0, 0, 0, 14, S_BerryTree, 0 - object_event 16, EVENT_OBJ_GFX_BERRY_TREE, 0, 11, 5, 3, 12, 0, 0, 0, 15, S_BerryTree, 0 - object_event 17, EVENT_OBJ_GFX_BERRY_TREE, 0, 12, 5, 3, 12, 0, 0, 0, 30, S_BerryTree, 0 - object_event 18, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 101, 13, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11 - object_event 19, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 129, 14, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_12 - object_event 20, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 92, 9, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_13 - object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 8, 3, 1, 0, 0, 0, 0, Route123_EventScript_1B165B, FLAG_ITEM_ROUTE123_1 - object_event 22, EVENT_OBJ_GFX_ITEM_BALL, 0, 139, 18, 3, 1, 0, 0, 0, 0, Route123_EventScript_1B1668, FLAG_ITEM_ROUTE123_2 - object_event 23, EVENT_OBJ_GFX_GIRL_3, 0, 108, 13, 3, 15, 0, 0, 0, 0, Route123_EventScript_151C5D, 0 - object_event 24, EVENT_OBJ_GFX_BERRY_TREE, 0, 109, 13, 3, 12, 0, 0, 0, 87, S_BerryTree, 0 - object_event 25, EVENT_OBJ_GFX_BERRY_TREE, 0, 110, 13, 3, 12, 0, 0, 0, 88, S_BerryTree, 0 - object_event 26, EVENT_OBJ_GFX_BERRY_TREE, 0, 111, 13, 3, 12, 0, 0, 0, 89, S_BerryTree, 0 - object_event 27, EVENT_OBJ_GFX_WOMAN_3, 0, 16, 9, 3, 23, 0, 0, 1, 2, Route123_EventScript_151CFF, 0 - object_event 28, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 38, 13, 3, 8, 0, 0, 1, 0, Route123_EventScript_151DAD, 0 - object_event 29, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 37, 13, 3, 8, 0, 0, 1, 0, Route123_EventScript_151D92, 0 - object_event 30, EVENT_OBJ_GFX_PSYCHIC_M, 0, 138, 12, 3, 9, 0, 0, 1, 6, Route123_EventScript_151D16, 0 - object_event 31, EVENT_OBJ_GFX_LASS, 0, 50, 16, 3, 8, 0, 0, 1, 1, Route123_EventScript_151D54, 0 - object_event 32, EVENT_OBJ_GFX_HEX_MANIAC, 0, 87, 14, 3, 1, 0, 0, 1, 3, Route123_EventScript_151DC8, 0 - object_event 33, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 18, 3, 1, 1, 1, 0, 0, Route123_EventScript_1B1675, FLAG_ITEM_ROUTE123_3 - object_event 34, EVENT_OBJ_GFX_ITEM_BALL, 0, 75, 9, 3, 1, 1, 1, 0, 0, Route123_EventScript_1B1682, FLAG_ITEM_ROUTE123_4 + object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 11, 3, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 58, S_BerryTree, 0 + object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 12, 3, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 59, S_BerryTree, 0 + object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 14, 3, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 60, S_BerryTree, 0 + object_event 4, EVENT_OBJ_GFX_BERRY_TREE, 0, 15, 3, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 61, S_BerryTree, 0 + object_event 5, EVENT_OBJ_GFX_BERRY_TREE, 0, 81, 1, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 62, S_BerryTree, 0 + object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 82, 1, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 63, S_BerryTree, 0 + object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 83, 1, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 64, S_BerryTree, 0 + object_event 8, EVENT_OBJ_GFX_WOMAN_7, 0, 70, 12, 3, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 0, 0, 1, 1, Route123_EventScript_151CD1, 0 + object_event 9, EVENT_OBJ_GFX_MAN_4, 0, 58, 7, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 0, 0, 1, 2, Route123_EventScript_151CE8, 0 + object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 14, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 65, S_BerryTree, 0 + object_event 11, EVENT_OBJ_GFX_BERRY_TREE, 0, 15, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 72, S_BerryTree, 0 + object_event 12, EVENT_OBJ_GFX_BERRY_TREE, 0, 17, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 73, S_BerryTree, 0 + object_event 13, EVENT_OBJ_GFX_BERRY_TREE, 0, 18, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 74, S_BerryTree, 0 + object_event 14, EVENT_OBJ_GFX_BERRY_TREE, 0, 17, 3, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 79, S_BerryTree, 0 + object_event 15, EVENT_OBJ_GFX_BERRY_TREE, 0, 18, 3, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 14, S_BerryTree, 0 + object_event 16, EVENT_OBJ_GFX_BERRY_TREE, 0, 11, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 15, S_BerryTree, 0 + object_event 17, EVENT_OBJ_GFX_BERRY_TREE, 0, 12, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 30, S_BerryTree, 0 + object_event 18, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 101, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11 + object_event 19, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 129, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_12 + object_event 20, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 92, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_13 + object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route123_EventScript_1B165B, FLAG_ITEM_ROUTE123_1 + object_event 22, EVENT_OBJ_GFX_ITEM_BALL, 0, 139, 18, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route123_EventScript_1B1668, FLAG_ITEM_ROUTE123_2 + object_event 23, EVENT_OBJ_GFX_GIRL_3, 0, 108, 13, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 0, 0, 0, 0, Route123_EventScript_151C5D, 0 + object_event 24, EVENT_OBJ_GFX_BERRY_TREE, 0, 109, 13, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 87, S_BerryTree, 0 + object_event 25, EVENT_OBJ_GFX_BERRY_TREE, 0, 110, 13, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 88, S_BerryTree, 0 + object_event 26, EVENT_OBJ_GFX_BERRY_TREE, 0, 111, 13, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 89, S_BerryTree, 0 + object_event 27, EVENT_OBJ_GFX_WOMAN_3, 0, 16, 9, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 0, 0, 1, 2, Route123_EventScript_151CFF, 0 + object_event 28, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 38, 13, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, Route123_EventScript_151DAD, 0 + object_event 29, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 37, 13, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, Route123_EventScript_151D92, 0 + object_event 30, EVENT_OBJ_GFX_PSYCHIC_M, 0, 138, 12, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 6, Route123_EventScript_151D16, 0 + object_event 31, EVENT_OBJ_GFX_LASS, 0, 50, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route123_EventScript_151D54, 0 + object_event 32, EVENT_OBJ_GFX_HEX_MANIAC, 0, 87, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 1, 3, Route123_EventScript_151DC8, 0 + object_event 33, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 18, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route123_EventScript_1B1675, FLAG_ITEM_ROUTE123_3 + object_event 34, EVENT_OBJ_GFX_ITEM_BALL, 0, 75, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route123_EventScript_1B1682, FLAG_ITEM_ROUTE123_4 Route123_MapWarps:: @ 8384B28 warp_def 22, 6, 0, 0, MAP_ROUTE123_BERRY_MASTERS_HOUSE diff --git a/data/maps/Route123_BerryMastersHouse/events.inc b/data/maps/Route123_BerryMastersHouse/events.inc index ff950e5cb..75a0dcb3b 100644 --- a/data/maps/Route123_BerryMastersHouse/events.inc +++ b/data/maps/Route123_BerryMastersHouse/events.inc @@ -1,6 +1,6 @@ Route123_BerryMastersHouse_EventObjects:: @ 8392D6C - object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 4, 4, 3, 8, 0, 0, 0, 0, Route123_BerryMastersHouse_EventScript_1639E9, 0 - object_event 2, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 7, 4, 3, 8, 0, 0, 0, 0, Route123_BerryMastersHouse_EventScript_163A64, 0 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route123_BerryMastersHouse_EventScript_1639E9, 0 + object_event 2, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route123_BerryMastersHouse_EventScript_163A64, 0 Route123_BerryMastersHouse_MapWarps:: @ 8392D9C warp_def 3, 7, 0, 0, MAP_ROUTE123 diff --git a/data/maps/Route124/events.inc b/data/maps/Route124/events.inc index 694718fb6..0d43521c4 100644 --- a/data/maps/Route124/events.inc +++ b/data/maps/Route124/events.inc @@ -1,14 +1,14 @@ Route124_EventObjects:: @ 8384D10 - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 58, 59, 1, 1, 5, 0, 1, 3, Route124_EventScript_151DF8, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 33, 25, 1, 52, 5, 3, 1, 3, Route124_EventScript_151E0F, 0 - object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 14, 27, 1, 24, 0, 0, 1, 3, Route124_EventScript_151E26, 0 - object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 49, 45, 1, 24, 6, 8, 1, 3, Route124_EventScript_151E64, 0 - object_event 5, EVENT_OBJ_GFX_SWIMMER_M, 0, 60, 74, 1, 28, 7, 0, 1, 2, Route124_EventScript_151E7B, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 28, 12, 3, 1, 1, 1, 0, 0, Route124_EventScript_1B168F, FLAG_ITEM_ROUTE124_2 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 53, 3, 1, 1, 1, 0, 0, Route124_EventScript_1B169C, FLAG_ITEM_ROUTE124_3 - object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 58, 11, 3, 1, 1, 1, 0, 0, Route124_EventScript_1B16A9, FLAG_ITEM_ROUTE124_1 - object_event 9, EVENT_OBJ_GFX_SWIMMER_F, 0, 18, 44, 1, 8, 1, 1, 1, 0, Route124_EventScript_151E92, 0 - object_event 10, EVENT_OBJ_GFX_TUBER_M_SWIMMING, 0, 17, 44, 1, 8, 1, 1, 1, 0, Route124_EventScript_151ED8, 0 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 58, 59, 1, MOVEMENT_TYPE_LOOK_AROUND, 5, 0, 1, 3, Route124_EventScript_151DF8, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 33, 25, 1, MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP, 5, 3, 1, 3, Route124_EventScript_151E0F, 0 + object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 14, 27, 1, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 0, 0, 1, 3, Route124_EventScript_151E26, 0 + object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 49, 45, 1, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 6, 8, 1, 3, Route124_EventScript_151E64, 0 + object_event 5, EVENT_OBJ_GFX_SWIMMER_M, 0, 60, 74, 1, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 7, 0, 1, 2, Route124_EventScript_151E7B, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 28, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route124_EventScript_1B168F, FLAG_ITEM_ROUTE124_2 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 53, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route124_EventScript_1B169C, FLAG_ITEM_ROUTE124_3 + object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 58, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route124_EventScript_1B16A9, FLAG_ITEM_ROUTE124_1 + object_event 9, EVENT_OBJ_GFX_SWIMMER_F, 0, 18, 44, 1, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 0, Route124_EventScript_151E92, 0 + object_event 10, EVENT_OBJ_GFX_TUBER_M_SWIMMING, 0, 17, 44, 1, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 0, Route124_EventScript_151ED8, 0 Route124_MapWarps:: @ 8384E00 warp_def 70, 48, 3, 0, MAP_ROUTE124_DIVING_TREASURE_HUNTERS_HOUSE diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/events.inc b/data/maps/Route124_DivingTreasureHuntersHouse/events.inc index e165c9da8..c696e0bf9 100644 --- a/data/maps/Route124_DivingTreasureHuntersHouse/events.inc +++ b/data/maps/Route124_DivingTreasureHuntersHouse/events.inc @@ -1,5 +1,5 @@ Route124_DivingTreasureHuntersHouse_EventObjects:: @ 839300C - object_event 1, EVENT_OBJ_GFX_MAN_6, 0, 5, 4, 0, 9, 0, 0, 0, 0, Route124_DivingTreasureHuntersHouse_EventScript_163E04, 0 + object_event 1, EVENT_OBJ_GFX_MAN_6, 0, 5, 4, 0, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route124_DivingTreasureHuntersHouse_EventScript_163E04, 0 Route124_DivingTreasureHuntersHouse_MapWarps:: @ 8393024 warp_def 3, 8, 0, 0, MAP_ROUTE124 diff --git a/data/maps/Route125/events.inc b/data/maps/Route125/events.inc index 8ad4ce22a..8e816c833 100644 --- a/data/maps/Route125/events.inc +++ b/data/maps/Route125/events.inc @@ -1,11 +1,11 @@ Route125_EventObjects:: @ 8384E28 - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 46, 9, 1, 23, 0, 0, 1, 2, Route125_EventScript_151F2E, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 9, 32, 1, 10, 2, 5, 1, 2, Route125_EventScript_151F45, 0 - object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 31, 33, 1, 28, 6, 0, 1, 3, Route125_EventScript_151F5C, 0 - object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 39, 20, 1, 52, 9, 9, 1, 3, Route125_EventScript_151F73, 0 - object_event 5, EVENT_OBJ_GFX_SAILOR, 0, 23, 28, 3, 14, 0, 0, 1, 2, Route125_EventScript_151F8A, 0 - object_event 6, EVENT_OBJ_GFX_LASS, 0, 20, 21, 3, 8, 1, 1, 1, 0, Route125_EventScript_151FC8, 0 - object_event 7, EVENT_OBJ_GFX_LASS, 0, 21, 21, 3, 8, 1, 1, 1, 0, Route125_EventScript_151FE3, 0 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 46, 9, 1, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 0, 0, 1, 2, Route125_EventScript_151F2E, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 9, 32, 1, MOVEMENT_TYPE_FACE_RIGHT, 2, 5, 1, 2, Route125_EventScript_151F45, 0 + object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 31, 33, 1, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 6, 0, 1, 3, Route125_EventScript_151F5C, 0 + object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 39, 20, 1, MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP, 9, 9, 1, 3, Route125_EventScript_151F73, 0 + object_event 5, EVENT_OBJ_GFX_SAILOR, 0, 23, 28, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 1, 2, Route125_EventScript_151F8A, 0 + object_event 6, EVENT_OBJ_GFX_LASS, 0, 20, 21, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 0, Route125_EventScript_151FC8, 0 + object_event 7, EVENT_OBJ_GFX_LASS, 0, 21, 21, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 0, Route125_EventScript_151FE3, 0 Route125_MapWarps:: @ 8384ED0 warp_def 22, 19, 0, 0, MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM diff --git a/data/maps/Route126/events.inc b/data/maps/Route126/events.inc index f90152ea4..ddd532202 100644 --- a/data/maps/Route126/events.inc +++ b/data/maps/Route126/events.inc @@ -1,9 +1,9 @@ Route126_EventObjects:: @ 8384F1C - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 55, 22, 1, 51, 10, 3, 1, 3, Route126_EventScript_15200E, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 33, 63, 1, 28, 9, 0, 1, 3, Route126_EventScript_152025, 0 - object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 9, 49, 1, 7, 0, 0, 1, 3, Route126_EventScript_15203C, 0 - object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 64, 44, 1, 24, 0, 0, 1, 3, Route126_EventScript_152053, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 1, 3, 1, 1, 1, 0, 0, Route126_EventScript_1B16B6, FLAG_ITEM_ROUTE126_1 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 55, 22, 1, MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN, 10, 3, 1, 3, Route126_EventScript_15200E, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 33, 63, 1, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 9, 0, 1, 3, Route126_EventScript_152025, 0 + object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 9, 49, 1, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 3, Route126_EventScript_15203C, 0 + object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 64, 44, 1, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 0, 0, 1, 3, Route126_EventScript_152053, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 1, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route126_EventScript_1B16B6, FLAG_ITEM_ROUTE126_1 Route126_MapEvents:: @ 8384F94 map_events Route126_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/Route127/events.inc b/data/maps/Route127/events.inc index 66078b122..946a390b9 100644 --- a/data/maps/Route127/events.inc +++ b/data/maps/Route127/events.inc @@ -1,13 +1,13 @@ Route127_EventObjects:: @ 8384FA8 - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 18, 68, 1, 14, 0, 0, 1, 2, Route127_EventScript_15207A, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 45, 44, 1, 21, 0, 0, 1, 4, Route127_EventScript_152091, 0 - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 10, 7, 3, 1, 0, 0, 0, 0, Route127_EventScript_1B16C3, FLAG_ITEM_ROUTE127_1 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 64, 39, 3, 1, 0, 0, 0, 0, Route127_EventScript_1B16D0, FLAG_ITEM_ROUTE127_2 - object_event 5, EVENT_OBJ_GFX_FISHERMAN, 0, 53, 13, 3, 7, 1, 1, 1, 0, Route127_EventScript_1520A8, 0 - object_event 6, EVENT_OBJ_GFX_FISHERMAN, 0, 52, 25, 3, 8, 1, 1, 1, 0, Route127_EventScript_1520D6, 0 - object_event 7, EVENT_OBJ_GFX_FISHERMAN, 0, 64, 19, 3, 10, 1, 1, 1, 0, Route127_EventScript_1520BF, 0 - object_event 8, EVENT_OBJ_GFX_MAN_6, 0, 12, 18, 3, 24, 1, 1, 1, 2, Route127_EventScript_152104, 0 - object_event 9, EVENT_OBJ_GFX_BLACK_BELT, 0, 63, 63, 3, 1, 1, 1, 1, 3, Route127_EventScript_1520ED, 0 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 18, 68, 1, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 1, 2, Route127_EventScript_15207A, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 45, 44, 1, MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT, 0, 0, 1, 4, Route127_EventScript_152091, 0 + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 10, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route127_EventScript_1B16C3, FLAG_ITEM_ROUTE127_1 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 64, 39, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route127_EventScript_1B16D0, FLAG_ITEM_ROUTE127_2 + object_event 5, EVENT_OBJ_GFX_FISHERMAN, 0, 53, 13, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 0, Route127_EventScript_1520A8, 0 + object_event 6, EVENT_OBJ_GFX_FISHERMAN, 0, 52, 25, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 0, Route127_EventScript_1520D6, 0 + object_event 7, EVENT_OBJ_GFX_FISHERMAN, 0, 64, 19, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 0, Route127_EventScript_1520BF, 0 + object_event 8, EVENT_OBJ_GFX_MAN_6, 0, 12, 18, 3, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 1, 1, 1, 2, Route127_EventScript_152104, 0 + object_event 9, EVENT_OBJ_GFX_BLACK_BELT, 0, 63, 63, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 1, 3, Route127_EventScript_1520ED, 0 Route127_MapBGEvents:: @ 8385080 bg_secret_base_event 59, 67, 0, SECRET_BASE_RED_CAVE4_1 diff --git a/data/maps/Route128/events.inc b/data/maps/Route128/events.inc index 9ea71c52e..c9f86f02f 100644 --- a/data/maps/Route128/events.inc +++ b/data/maps/Route128/events.inc @@ -1,12 +1,12 @@ Route128_EventObjects:: @ 83850D0 - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 77, 24, 1, 48, 5, 5, 1, 3, Route128_EventScript_1522A4, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 35, 34, 1, 28, 5, 0, 1, 7, Route128_EventScript_1522E2, 0 - object_event 3, EVENT_OBJ_GFX_STEVEN, 0, 40, 22, 3, 8, 0, 0, 0, 0, 0x0, FLAG_HIDE_STEVEN_ROUTE128 - object_event 4, EVENT_OBJ_GFX_VAR_6, 0, 37, 22, 3, 9, 1, 1, 0, 0, 0x0, FLAG_HIDE_EVIL_LEADER_ROUTE128 - object_event 5, EVENT_OBJ_GFX_VAR_7, 0, 38, 21, 3, 7, 1, 1, 0, 0, 0x0, FLAG_HIDE_OTHER_LEADER_ROUTE128 - object_event 6, EVENT_OBJ_GFX_FISHERMAN, 0, 63, 28, 3, 7, 1, 1, 1, 0, Route128_EventScript_15234E, 0 - object_event 7, EVENT_OBJ_GFX_MAN_4, 0, 24, 8, 3, 17, 1, 1, 1, 2, Route128_EventScript_152337, 0 - object_event 8, EVENT_OBJ_GFX_WOMAN_7, 0, 47, 9, 3, 10, 1, 1, 1, 3, Route128_EventScript_152320, 0 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 77, 24, 1, MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_LEFT_DOWN, 5, 5, 1, 3, Route128_EventScript_1522A4, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 35, 34, 1, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 5, 0, 1, 7, Route128_EventScript_1522E2, 0 + object_event 3, EVENT_OBJ_GFX_STEVEN, 0, 40, 22, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_STEVEN_ROUTE128 + object_event 4, EVENT_OBJ_GFX_VAR_6, 0, 37, 22, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, 0x0, FLAG_HIDE_EVIL_LEADER_ROUTE128 + object_event 5, EVENT_OBJ_GFX_VAR_7, 0, 38, 21, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, FLAG_HIDE_OTHER_LEADER_ROUTE128 + object_event 6, EVENT_OBJ_GFX_FISHERMAN, 0, 63, 28, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 0, Route128_EventScript_15234E, 0 + object_event 7, EVENT_OBJ_GFX_MAN_4, 0, 24, 8, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 2, Route128_EventScript_152337, 0 + object_event 8, EVENT_OBJ_GFX_WOMAN_7, 0, 47, 9, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, Route128_EventScript_152320, 0 Route128_MapBGEvents:: @ 8385190 bg_hidden_item_event 49, 9, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_5C diff --git a/data/maps/Route129/events.inc b/data/maps/Route129/events.inc index e86dd6ce0..fc458f93b 100644 --- a/data/maps/Route129/events.inc +++ b/data/maps/Route129/events.inc @@ -1,8 +1,8 @@ Route129_EventObjects:: @ 83851C8 - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 15, 23, 1, 50, 3, 4, 1, 3, Route129_EventScript_152366, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 35, 9, 1, 52, 5, 2, 1, 2, Route129_EventScript_15237D, 0 - object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 9, 14, 1, 1, 1, 1, 1, 2, Route129_EventScript_1523AB, 0 - object_event 4, EVENT_OBJ_GFX_SWIMMER_M, 0, 28, 16, 1, 24, 1, 1, 1, 2, Route129_EventScript_152394, 0 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 15, 23, 1, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT, 3, 4, 1, 3, Route129_EventScript_152366, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 35, 9, 1, MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP, 5, 2, 1, 2, Route129_EventScript_15237D, 0 + object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 9, 14, 1, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 1, 2, Route129_EventScript_1523AB, 0 + object_event 4, EVENT_OBJ_GFX_SWIMMER_M, 0, 28, 16, 1, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 1, 1, 1, 2, Route129_EventScript_152394, 0 Route129_MapEvents:: @ 8385228 map_events Route129_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/Route130/events.inc b/data/maps/Route130/events.inc index f6770fa34..958352568 100644 --- a/data/maps/Route130/events.inc +++ b/data/maps/Route130/events.inc @@ -1,7 +1,7 @@ Route130_EventObjects:: @ 838523C - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 7, 26, 1, 29, 3, 6, 1, 3, Route130_EventScript_152410, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 68, 22, 1, 13, 1, 1, 1, 3, Route130_EventScript_152427, 0 - object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 52, 9, 3, 12, 0, 0, 0, 82, S_BerryTree, FLAG_TEMP_11 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 7, 26, 1, MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_LEFT_DOWN, 3, 6, 1, 3, Route130_EventScript_152410, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 68, 22, 1, MOVEMENT_TYPE_FACE_DOWN_AND_UP, 1, 1, 1, 3, Route130_EventScript_152427, 0 + object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 52, 9, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 82, S_BerryTree, FLAG_TEMP_11 Route130_MapEvents:: @ 8385284 map_events Route130_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/Route131/events.inc b/data/maps/Route131/events.inc index 0d61e6f95..badc6d45c 100644 --- a/data/maps/Route131/events.inc +++ b/data/maps/Route131/events.inc @@ -1,10 +1,10 @@ Route131_EventObjects:: @ 8385298 - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 17, 25, 1, 29, 5, 7, 1, 3, Route131_EventScript_152452, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 36, 26, 1, 8, 0, 0, 1, 3, Route131_EventScript_152469, 0 - object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 33, 28, 1, 7, 0, 0, 1, 4, Route131_EventScript_152480, 0 - object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 45, 23, 1, 47, 1, 4, 1, 3, Route131_EventScript_152497, 0 - object_event 5, EVENT_OBJ_GFX_SWIMMER_F, 0, 9, 16, 1, 8, 1, 1, 1, 0, Route131_EventScript_1524AE, 0 - object_event 6, EVENT_OBJ_GFX_TUBER_M_SWIMMING, 0, 8, 16, 1, 8, 1, 1, 1, 0, Route131_EventScript_1524C9, 0 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 17, 25, 1, MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_LEFT_DOWN, 5, 7, 1, 3, Route131_EventScript_152452, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 36, 26, 1, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, Route131_EventScript_152469, 0 + object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 33, 28, 1, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 4, Route131_EventScript_152480, 0 + object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 45, 23, 1, MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_RIGHT_UP, 1, 4, 1, 3, Route131_EventScript_152497, 0 + object_event 5, EVENT_OBJ_GFX_SWIMMER_F, 0, 9, 16, 1, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 0, Route131_EventScript_1524AE, 0 + object_event 6, EVENT_OBJ_GFX_TUBER_M_SWIMMING, 0, 8, 16, 1, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 0, Route131_EventScript_1524C9, 0 Route131_MapWarps:: @ 8385328 warp_def 36, 6, 3, 0, MAP_SKY_PILLAR_ENTRANCE diff --git a/data/maps/Route132/events.inc b/data/maps/Route132/events.inc index 167fbfd4b..1ee13237c 100644 --- a/data/maps/Route132/events.inc +++ b/data/maps/Route132/events.inc @@ -1,9 +1,9 @@ Route132_EventObjects:: @ 8385344 - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 7, 3, 1, 46, 3, 3, 1, 2, Route132_EventScript_1524E5, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 41, 16, 1, 49, 4, 4, 1, 2, Route132_EventScript_1524FC, 0 - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 10, 11, 3, 1, 0, 0, 0, 0, Route132_EventScript_1B16DD, FLAG_ITEM_ROUTE132_1 - object_event 4, EVENT_OBJ_GFX_BLACK_BELT, 0, 46, 28, 3, 10, 0, 0, 1, 4, Route132_EventScript_15252A, 0 - object_event 5, EVENT_OBJ_GFX_FISHERMAN, 0, 9, 16, 3, 8, 0, 0, 1, 1, Route132_EventScript_152513, 0 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 7, 3, 1, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT, 3, 3, 1, 2, Route132_EventScript_1524E5, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 41, 16, 1, MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_DOWN_LEFT, 4, 4, 1, 2, Route132_EventScript_1524FC, 0 + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 10, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route132_EventScript_1B16DD, FLAG_ITEM_ROUTE132_1 + object_event 4, EVENT_OBJ_GFX_BLACK_BELT, 0, 46, 28, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 4, Route132_EventScript_15252A, 0 + object_event 5, EVENT_OBJ_GFX_FISHERMAN, 0, 9, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route132_EventScript_152513, 0 Route132_MapEvents:: @ 83853BC map_events Route132_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/Route133/events.inc b/data/maps/Route133/events.inc index d71755575..22fd8807b 100644 --- a/data/maps/Route133/events.inc +++ b/data/maps/Route133/events.inc @@ -1,11 +1,11 @@ Route133_EventObjects:: @ 83853D0 - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 6, 4, 1, 1, 0, 0, 1, 3, Route133_EventScript_152542, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 68, 24, 1, 8, 0, 0, 1, 3, Route133_EventScript_152570, 0 - object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 69, 24, 1, 8, 0, 0, 1, 3, Route133_EventScript_152559, 0 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 58, 15, 3, 1, 0, 0, 0, 0, Route133_EventScript_1B16EA, FLAG_ITEM_ROUTE133_1 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 10, 3, 1, 0, 0, 0, 0, Route133_EventScript_1B16F7, FLAG_ITEM_ROUTE133_2 - object_event 6, EVENT_OBJ_GFX_MAN_6, 0, 37, 16, 3, 13, 1, 1, 1, 1, Route133_EventScript_15259E, 0 - object_event 7, EVENT_OBJ_GFX_MAN_4, 0, 7, 14, 3, 10, 0, 0, 1, 4, Route133_EventScript_152587, 0 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 6, 4, 1, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 1, 3, Route133_EventScript_152542, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 68, 24, 1, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, Route133_EventScript_152570, 0 + object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 69, 24, 1, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, Route133_EventScript_152559, 0 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 58, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route133_EventScript_1B16EA, FLAG_ITEM_ROUTE133_1 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route133_EventScript_1B16F7, FLAG_ITEM_ROUTE133_2 + object_event 6, EVENT_OBJ_GFX_MAN_6, 0, 37, 16, 3, MOVEMENT_TYPE_FACE_DOWN_AND_UP, 1, 1, 1, 1, Route133_EventScript_15259E, 0 + object_event 7, EVENT_OBJ_GFX_MAN_4, 0, 7, 14, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 4, Route133_EventScript_152587, 0 Route133_MapEvents:: @ 8385478 map_events Route133_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/Route134/events.inc b/data/maps/Route134/events.inc index b167d48b1..5e203e526 100644 --- a/data/maps/Route134/events.inc +++ b/data/maps/Route134/events.inc @@ -1,9 +1,9 @@ Route134_EventObjects:: @ 838548C - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 52, 9, 1, 49, 3, 5, 1, 2, Route134_EventScript_1525C4, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 45, 5, 1, 1, 0, 0, 1, 3, Route134_EventScript_1525DB, 0 - object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 41, 23, 3, 10, 0, 0, 1, 1, Route134_EventScript_152609, 0 - object_event 4, EVENT_OBJ_GFX_MAN_6, 0, 65, 14, 3, 18, 0, 0, 1, 2, Route134_EventScript_1525F2, 0 - object_event 5, EVENT_OBJ_GFX_BLACK_BELT, 0, 56, 16, 3, 27, 10, 0, 1, 3, Route134_EventScript_152620, 0 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 52, 9, 1, MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_DOWN_LEFT, 3, 5, 1, 2, Route134_EventScript_1525C4, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 45, 5, 1, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 1, 3, Route134_EventScript_1525DB, 0 + object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 41, 23, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 1, Route134_EventScript_152609, 0 + object_event 4, EVENT_OBJ_GFX_MAN_6, 0, 65, 14, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 0, 0, 1, 2, Route134_EventScript_1525F2, 0 + object_event 5, EVENT_OBJ_GFX_BLACK_BELT, 0, 56, 16, 3, MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT, 10, 0, 1, 3, Route134_EventScript_152620, 0 Route134_MapEvents:: @ 8385504 map_events Route134_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/RustboroCity/events.inc b/data/maps/RustboroCity/events.inc index bfc6cff77..4f88e7dd4 100644 --- a/data/maps/RustboroCity/events.inc +++ b/data/maps/RustboroCity/events.inc @@ -1,18 +1,18 @@ RustboroCity_EventObjects:: @ 837FD14 - object_event 1, EVENT_OBJ_GFX_WOMAN_7, 0, 22, 34, 3, 3, 0, 1, 0, 0, RustboroCity_EventScript_14C3B1, 0 - object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 19, 13, 3, 1, 1, 1, 0, 0, RustboroCity_EventScript_14C386, 0 - object_event 3, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 25, 37, 3, 7, 0, 0, 0, 0, RustboroCity_EventScript_14C401, 0 - object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 21, 46, 3, 3, 0, 1, 0, 0, RustboroCity_EventScript_14C3F8, 0 - object_event 5, EVENT_OBJ_GFX_BOY_2, 0, 12, 45, 3, 1, 0, 0, 0, 0, RustboroCity_EventScript_14C3D9, 0 - object_event 6, EVENT_OBJ_GFX_MAN_4, 0, 26, 23, 3, 1, 1, 1, 0, 0, RustboroCity_EventScript_14C3BA, 0 - object_event 7, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 24, 51, 3, 10, 0, 0, 0, 0, RustboroCity_EventScript_14C449, 0 - object_event 8, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 25, 51, 3, 9, 0, 0, 0, 0, RustboroCity_EventScript_14C45F, 0 - object_event 9, EVENT_OBJ_GFX_MAN_2, 0, 30, 10, 3, 10, 1, 1, 0, 0, RustboroCity_EventScript_14C5FF, FLAG_HIDE_DEVON_RUSTBORO - object_event 10, EVENT_OBJ_GFX_VAR_1, 0, 13, 21, 3, 10, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNT_RUSTBORO - object_event 11, EVENT_OBJ_GFX_MAN_7, 0, 13, 34, 3, 2, 1, 1, 0, 0, RustboroCity_EventScript_14C3A5, 0 - object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 36, 51, 3, 1, 0, 0, 0, 0, RustboroCity_EventScript_1B172B, FLAG_ITEM_RUSTBORO_1 - object_event 13, EVENT_OBJ_GFX_MAN_5, 0, 19, 27, 3, 8, 0, 1, 0, 0, RustboroCity_EventScript_14C475, 0 - object_event 14, EVENT_OBJ_GFX_VAR_0, 0, 16, 50, 3, 1, 1, 1, 0, 0, RustboroCity_EventScript_14C8DA, FLAG_HIDE_RIVAL_RUSTBORO + object_event 1, EVENT_OBJ_GFX_WOMAN_7, 0, 22, 34, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, RustboroCity_EventScript_14C3B1, 0 + object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 19, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, RustboroCity_EventScript_14C386, 0 + object_event 3, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 25, 37, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, RustboroCity_EventScript_14C401, 0 + object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 21, 46, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, RustboroCity_EventScript_14C3F8, 0 + object_event 5, EVENT_OBJ_GFX_BOY_2, 0, 12, 45, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, RustboroCity_EventScript_14C3D9, 0 + object_event 6, EVENT_OBJ_GFX_MAN_4, 0, 26, 23, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, RustboroCity_EventScript_14C3BA, 0 + object_event 7, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 24, 51, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_EventScript_14C449, 0 + object_event 8, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 25, 51, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RustboroCity_EventScript_14C45F, 0 + object_event 9, EVENT_OBJ_GFX_MAN_2, 0, 30, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, RustboroCity_EventScript_14C5FF, FLAG_HIDE_DEVON_RUSTBORO + object_event 10, EVENT_OBJ_GFX_VAR_1, 0, 13, 21, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNT_RUSTBORO + object_event 11, EVENT_OBJ_GFX_MAN_7, 0, 13, 34, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, RustboroCity_EventScript_14C3A5, 0 + object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 36, 51, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, RustboroCity_EventScript_1B172B, FLAG_ITEM_RUSTBORO_1 + object_event 13, EVENT_OBJ_GFX_MAN_5, 0, 19, 27, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 1, 0, 0, RustboroCity_EventScript_14C475, 0 + object_event 14, EVENT_OBJ_GFX_VAR_0, 0, 16, 50, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, RustboroCity_EventScript_14C8DA, FLAG_HIDE_RIVAL_RUSTBORO RustboroCity_MapWarps:: @ 837FE64 warp_def 27, 19, 0, 0, MAP_RUSTBORO_CITY_GYM diff --git a/data/maps/RustboroCity_CuttersHouse/events.inc b/data/maps/RustboroCity_CuttersHouse/events.inc index 6a96e223c..8426e6f66 100644 --- a/data/maps/RustboroCity_CuttersHouse/events.inc +++ b/data/maps/RustboroCity_CuttersHouse/events.inc @@ -1,6 +1,6 @@ RustboroCity_CuttersHouse_EventObjects:: @ 8388D9C - object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 7, 5, 3, 10, 0, 0, 0, 0, RustboroCity_CuttersHouse_EventScript_157D27, 0 - object_event 2, EVENT_OBJ_GFX_LASS, 0, 9, 2, 3, 5, 1, 0, 0, 0, RustboroCity_CuttersHouse_EventScript_157D5D, 0 + object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_CuttersHouse_EventScript_157D27, 0 + object_event 2, EVENT_OBJ_GFX_LASS, 0, 9, 2, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, RustboroCity_CuttersHouse_EventScript_157D5D, 0 RustboroCity_CuttersHouse_MapWarps:: @ 8388DCC warp_def 5, 8, 0, 8, MAP_RUSTBORO_CITY diff --git a/data/maps/RustboroCity_DevonCorp_1F/events.inc b/data/maps/RustboroCity_DevonCorp_1F/events.inc index 5cfbd5134..4908cbd00 100644 --- a/data/maps/RustboroCity_DevonCorp_1F/events.inc +++ b/data/maps/RustboroCity_DevonCorp_1F/events.inc @@ -1,7 +1,7 @@ RustboroCity_DevonCorp_1F_EventObjects:: @ 838880C - object_event 1, EVENT_OBJ_GFX_MAN_7, 0, 2, 6, 3, 2, 1, 1, 0, 0, RustboroCity_DevonCorp_1F_EventScript_157422, 0 - object_event 2, EVENT_OBJ_GFX_MAN_7, 0, 15, 5, 3, 2, 2, 1, 0, 0, RustboroCity_DevonCorp_1F_EventScript_157454, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_4, 0, 5, 3, 3, 8, 0, 0, 0, 0, RustboroCity_DevonCorp_1F_EventScript_15748F, 0 + object_event 1, EVENT_OBJ_GFX_MAN_7, 0, 2, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, RustboroCity_DevonCorp_1F_EventScript_157422, 0 + object_event 2, EVENT_OBJ_GFX_MAN_7, 0, 15, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 1, 0, 0, RustboroCity_DevonCorp_1F_EventScript_157454, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_4, 0, 5, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RustboroCity_DevonCorp_1F_EventScript_15748F, 0 RustboroCity_DevonCorp_1F_MapWarps:: @ 8388854 warp_def 5, 8, 0, 5, MAP_RUSTBORO_CITY diff --git a/data/maps/RustboroCity_DevonCorp_2F/events.inc b/data/maps/RustboroCity_DevonCorp_2F/events.inc index 1babeffd7..956b7d89d 100644 --- a/data/maps/RustboroCity_DevonCorp_2F/events.inc +++ b/data/maps/RustboroCity_DevonCorp_2F/events.inc @@ -1,9 +1,9 @@ RustboroCity_DevonCorp_2F_EventObjects:: @ 8388880 - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 6, 5, 3, 7, 0, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_1574E2, 0 - object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 1, 5, 3, 10, 0, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_1574F9, 0 - object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 2, 6, 3, 15, 0, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_157523, 0 - object_event 4, EVENT_OBJ_GFX_SCIENTIST_1, 0, 10, 5, 3, 7, 0, 10, 0, 0, RustboroCity_DevonCorp_2F_EventScript_15754D, 0 - object_event 5, EVENT_OBJ_GFX_SCIENTIST_1, 0, 14, 8, 3, 7, 1, 1, 0, 0, RustboroCity_DevonCorp_2F_EventScript_157564, 0 + object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_1574E2, 0 + object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_1574F9, 0 + object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 2, 6, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 0, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_157523, 0 + object_event 4, EVENT_OBJ_GFX_SCIENTIST_1, 0, 10, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 10, 0, 0, RustboroCity_DevonCorp_2F_EventScript_15754D, 0 + object_event 5, EVENT_OBJ_GFX_SCIENTIST_1, 0, 14, 8, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, RustboroCity_DevonCorp_2F_EventScript_157564, 0 RustboroCity_DevonCorp_2F_MapWarps:: @ 83888F8 warp_def 14, 1, 0, 2, MAP_RUSTBORO_CITY_DEVON_CORP_1F diff --git a/data/maps/RustboroCity_DevonCorp_3F/events.inc b/data/maps/RustboroCity_DevonCorp_3F/events.inc index b77f343af..84b7f23bc 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/events.inc +++ b/data/maps/RustboroCity_DevonCorp_3F/events.inc @@ -1,7 +1,7 @@ RustboroCity_DevonCorp_3F_EventObjects:: @ 838891C - object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 17, 5, 3, 9, 0, 0, 0, 0, RustboroCity_DevonCorp_3F_EventScript_15783B, 0 - object_event 2, EVENT_OBJ_GFX_MAN_2, 0, 3, 5, 3, 10, 0, 0, 0, 0, RustboroCity_DevonCorp_3F_EventScript_1578B0, FLAG_HIDE_EMPLOYEE_DEVON_CORP_3F - object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 15, 5, 3, 76, 1, 1, 0, 0, RustboroCity_DevonCorp_3F_EventScript_15783B, 0 + object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 17, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RustboroCity_DevonCorp_3F_EventScript_15783B, 0 + object_event 2, EVENT_OBJ_GFX_MAN_2, 0, 3, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_DevonCorp_3F_EventScript_1578B0, FLAG_HIDE_EMPLOYEE_DEVON_CORP_3F + object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 15, 5, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, RustboroCity_DevonCorp_3F_EventScript_15783B, 0 RustboroCity_DevonCorp_3F_MapWarps:: @ 8388964 warp_def 2, 1, 0, 1, MAP_RUSTBORO_CITY_DEVON_CORP_2F diff --git a/data/maps/RustboroCity_Flat1_1F/events.inc b/data/maps/RustboroCity_Flat1_1F/events.inc index 22a262f47..9dd65fd69 100644 --- a/data/maps/RustboroCity_Flat1_1F/events.inc +++ b/data/maps/RustboroCity_Flat1_1F/events.inc @@ -1,6 +1,6 @@ RustboroCity_Flat1_1F_EventObjects:: @ 8388CB8 - object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 9, 4, 3, 10, 0, 0, 0, 0, RustboroCity_Flat1_1F_EventScript_157C60, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 12, 4, 3, 9, 0, 0, 0, 0, RustboroCity_Flat1_1F_EventScript_157C69, 0 + object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 9, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_Flat1_1F_EventScript_157C60, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 12, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RustboroCity_Flat1_1F_EventScript_157C69, 0 RustboroCity_Flat1_1F_MapWarps:: @ 8388CE8 warp_def 6, 7, 0, 1, MAP_RUSTBORO_CITY diff --git a/data/maps/RustboroCity_Flat1_2F/events.inc b/data/maps/RustboroCity_Flat1_2F/events.inc index e906fe011..1caaa105e 100644 --- a/data/maps/RustboroCity_Flat1_2F/events.inc +++ b/data/maps/RustboroCity_Flat1_2F/events.inc @@ -1,5 +1,5 @@ RustboroCity_Flat1_2F_EventObjects:: @ 8388D14 - object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 8, 6, 3, 5, 3, 1, 0, 0, RustboroCity_Flat1_2F_EventScript_157C73, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 8, 6, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 3, 1, 0, 0, RustboroCity_Flat1_2F_EventScript_157C73, 0 RustboroCity_Flat1_2F_MapWarps:: @ 8388D2C warp_def 2, 1, 0, 2, MAP_RUSTBORO_CITY_FLAT1_1F diff --git a/data/maps/RustboroCity_Flat2_1F/events.inc b/data/maps/RustboroCity_Flat2_1F/events.inc index 76ed3f04e..55a840cc0 100644 --- a/data/maps/RustboroCity_Flat2_1F/events.inc +++ b/data/maps/RustboroCity_Flat2_1F/events.inc @@ -1,6 +1,6 @@ RustboroCity_Flat2_1F_EventObjects:: @ 8388E44 - object_event 1, EVENT_OBJ_GFX_SKITTY, 0, 11, 4, 3, 9, 0, 0, 0, 0, RustboroCity_Flat2_1F_EventScript_157D83, 0 - object_event 2, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 8, 4, 3, 10, 0, 0, 0, 0, RustboroCity_Flat2_1F_EventScript_157D7A, 0 + object_event 1, EVENT_OBJ_GFX_SKITTY, 0, 11, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RustboroCity_Flat2_1F_EventScript_157D83, 0 + object_event 2, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 8, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_Flat2_1F_EventScript_157D7A, 0 RustboroCity_Flat2_1F_MapWarps:: @ 8388E74 warp_def 2, 8, 0, 10, MAP_RUSTBORO_CITY diff --git a/data/maps/RustboroCity_Flat2_2F/events.inc b/data/maps/RustboroCity_Flat2_2F/events.inc index 3f56e718c..190bb838b 100644 --- a/data/maps/RustboroCity_Flat2_2F/events.inc +++ b/data/maps/RustboroCity_Flat2_2F/events.inc @@ -1,6 +1,6 @@ RustboroCity_Flat2_2F_EventObjects:: @ 8388EA0 - object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 11, 4, 3, 10, 0, 0, 0, 0, RustboroCity_Flat2_2F_EventScript_157D97, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 7, 3, 3, 5, 2, 0, 0, 0, RustboroCity_Flat2_2F_EventScript_157DA0, 0 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 11, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_Flat2_2F_EventScript_157D97, 0 + object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 7, 3, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 2, 0, 0, 0, RustboroCity_Flat2_2F_EventScript_157DA0, 0 RustboroCity_Flat2_2F_MapWarps:: @ 8388ED0 warp_def 3, 1, 0, 2, MAP_RUSTBORO_CITY_FLAT2_1F diff --git a/data/maps/RustboroCity_Flat2_3F/events.inc b/data/maps/RustboroCity_Flat2_3F/events.inc index ed3ef80e7..d6b3ecd48 100644 --- a/data/maps/RustboroCity_Flat2_3F/events.inc +++ b/data/maps/RustboroCity_Flat2_3F/events.inc @@ -1,6 +1,6 @@ RustboroCity_Flat2_3F_EventObjects:: @ 8388EF4 - object_event 1, EVENT_OBJ_GFX_MAN_7, 0, 7, 3, 3, 5, 2, 0, 0, 0, RustboroCity_Flat2_3F_EventScript_157DDA, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_1, 0, 12, 2, 3, 8, 0, 0, 0, 0, RustboroCity_Flat2_3F_EventScript_157DE3, 0 + object_event 1, EVENT_OBJ_GFX_MAN_7, 0, 7, 3, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 2, 0, 0, 0, RustboroCity_Flat2_3F_EventScript_157DDA, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_1, 0, 12, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RustboroCity_Flat2_3F_EventScript_157DE3, 0 RustboroCity_Flat2_3F_MapWarps:: @ 8388F24 warp_def 1, 1, 0, 1, MAP_RUSTBORO_CITY_FLAT2_2F diff --git a/data/maps/RustboroCity_Gym/events.inc b/data/maps/RustboroCity_Gym/events.inc index 97b5a6627..2bb04f3be 100644 --- a/data/maps/RustboroCity_Gym/events.inc +++ b/data/maps/RustboroCity_Gym/events.inc @@ -1,8 +1,8 @@ RustboroCity_Gym_EventObjects:: @ 8388998 - object_event 1, EVENT_OBJ_GFX_ROXANNE, 0, 5, 2, 3, 8, 0, 0, 0, 0, RustboroCity_Gym_EventScript_1578D9, 0 - object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 7, 12, 3, 9, 0, 0, 1, 3, RustboroCity_Gym_EventScript_157960, 0 - object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 3, 7, 3, 10, 0, 0, 1, 3, RustboroCity_Gym_EventScript_157977, 0 - object_event 4, EVENT_OBJ_GFX_MAN_2, 0, 3, 17, 3, 8, 0, 0, 0, 0, RustboroCity_Gym_EventScript_15798E, 0 + object_event 1, EVENT_OBJ_GFX_ROXANNE, 0, 5, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RustboroCity_Gym_EventScript_1578D9, 0 + object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 7, 12, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 3, RustboroCity_Gym_EventScript_157960, 0 + object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 3, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 3, RustboroCity_Gym_EventScript_157977, 0 + object_event 4, EVENT_OBJ_GFX_MAN_2, 0, 3, 17, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RustboroCity_Gym_EventScript_15798E, 0 RustboroCity_Gym_MapWarps:: @ 83889F8 warp_def 5, 18, 0, 0, MAP_RUSTBORO_CITY diff --git a/data/maps/RustboroCity_House1/events.inc b/data/maps/RustboroCity_House1/events.inc index 5a8023d2f..3d083ca20 100644 --- a/data/maps/RustboroCity_House1/events.inc +++ b/data/maps/RustboroCity_House1/events.inc @@ -1,6 +1,6 @@ RustboroCity_House1_EventObjects:: @ 8388D48 - object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 6, 4, 3, 9, 0, 0, 0, 0, RustboroCity_House1_EventScript_157C7D, 0 - object_event 2, EVENT_OBJ_GFX_HIKER, 0, 9, 2, 3, 8, 0, 0, 0, 0, RustboroCity_House1_EventScript_157D1D, 0 + object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 6, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RustboroCity_House1_EventScript_157C7D, 0 + object_event 2, EVENT_OBJ_GFX_HIKER, 0, 9, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RustboroCity_House1_EventScript_157D1D, 0 RustboroCity_House1_MapWarps:: @ 8388D78 warp_def 5, 7, 0, 7, MAP_RUSTBORO_CITY diff --git a/data/maps/RustboroCity_House2/events.inc b/data/maps/RustboroCity_House2/events.inc index 4a7a60f12..e4a749d56 100644 --- a/data/maps/RustboroCity_House2/events.inc +++ b/data/maps/RustboroCity_House2/events.inc @@ -1,6 +1,6 @@ RustboroCity_House2_EventObjects:: @ 8388DF0 - object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 4, 4, 3, 8, 0, 0, 0, 0, RustboroCity_House2_EventScript_157D67, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 4, 5, 3, 7, 0, 0, 0, 0, RustboroCity_House2_EventScript_157D70, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RustboroCity_House2_EventScript_157D67, 0 + object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, RustboroCity_House2_EventScript_157D70, 0 RustboroCity_House2_MapWarps:: @ 8388E20 warp_def 5, 8, 0, 9, MAP_RUSTBORO_CITY diff --git a/data/maps/RustboroCity_House3/events.inc b/data/maps/RustboroCity_House3/events.inc index bdd17333c..9cb1c5194 100644 --- a/data/maps/RustboroCity_House3/events.inc +++ b/data/maps/RustboroCity_House3/events.inc @@ -1,7 +1,7 @@ RustboroCity_House3_EventObjects:: @ 8388F40 - object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 4, 5, 3, 10, 0, 0, 0, 0, RustboroCity_House3_EventScript_157DED, 0 - object_event 2, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 7, 5, 3, 9, 0, 0, 0, 0, RustboroCity_House3_EventScript_157DF6, 0 - object_event 3, EVENT_OBJ_GFX_PIKACHU, 0, 4, 4, 3, 8, 0, 0, 0, 0, RustboroCity_House3_EventScript_157DFF, 0 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_House3_EventScript_157DED, 0 + object_event 2, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RustboroCity_House3_EventScript_157DF6, 0 + object_event 3, EVENT_OBJ_GFX_PIKACHU, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RustboroCity_House3_EventScript_157DFF, 0 RustboroCity_House3_MapWarps:: @ 8388F88 warp_def 5, 8, 0, 11, MAP_RUSTBORO_CITY diff --git a/data/maps/RustboroCity_Mart/events.inc b/data/maps/RustboroCity_Mart/events.inc index b39aec815..fa34e3192 100644 --- a/data/maps/RustboroCity_Mart/events.inc +++ b/data/maps/RustboroCity_Mart/events.inc @@ -1,8 +1,8 @@ RustboroCity_Mart_EventObjects:: @ 8388C34 - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, 0, RustboroCity_Mart_EventScript_157BD4, 0 - object_event 2, EVENT_OBJ_GFX_BOY_1, 0, 2, 5, 3, 7, 0, 0, 0, 0, RustboroCity_Mart_EventScript_157C4D, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 8, 4, 3, 3, 0, 1, 0, 0, RustboroCity_Mart_EventScript_157C44, 0 - object_event 4, EVENT_OBJ_GFX_BUG_CATCHER, 0, 8, 2, 3, 7, 1, 1, 0, 0, RustboroCity_Mart_EventScript_157C56, 0 + object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_Mart_EventScript_157BD4, 0 + object_event 2, EVENT_OBJ_GFX_BOY_1, 0, 2, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, RustboroCity_Mart_EventScript_157C4D, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 8, 4, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, RustboroCity_Mart_EventScript_157C44, 0 + object_event 4, EVENT_OBJ_GFX_BUG_CATCHER, 0, 8, 2, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, RustboroCity_Mart_EventScript_157C56, 0 RustboroCity_Mart_MapWarps:: @ 8388C94 warp_def 3, 7, 0, 2, MAP_RUSTBORO_CITY diff --git a/data/maps/RustboroCity_PokemonCenter_1F/events.inc b/data/maps/RustboroCity_PokemonCenter_1F/events.inc index 7173fb49c..08413fc93 100644 --- a/data/maps/RustboroCity_PokemonCenter_1F/events.inc +++ b/data/maps/RustboroCity_PokemonCenter_1F/events.inc @@ -1,8 +1,8 @@ RustboroCity_PokemonCenter_1F_EventObjects:: @ 8388B24 - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_157B88, 0 - object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 11, 2, 3, 9, 0, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_157B96, 0 - object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 3, 4, 3, 2, 1, 1, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_157B9F, 0 - object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 10, 6, 3, 10, 0, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_157BA8, 0 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_157B88, 0 + object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 11, 2, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_157B96, 0 + object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 3, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_157B9F, 0 + object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 10, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_157BA8, 0 RustboroCity_PokemonCenter_1F_MapWarps:: @ 8388B84 warp_def 7, 8, 3, 3, MAP_RUSTBORO_CITY diff --git a/data/maps/RustboroCity_PokemonCenter_2F/events.inc b/data/maps/RustboroCity_PokemonCenter_2F/events.inc index bf5737d14..86d2e6929 100644 --- a/data/maps/RustboroCity_PokemonCenter_2F/events.inc +++ b/data/maps/RustboroCity_PokemonCenter_2F/events.inc @@ -1,7 +1,7 @@ RustboroCity_PokemonCenter_2F_EventObjects:: @ 8388BB0 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 2, 3, 8, 0, 0, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_157BC1, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 7, 2, 3, 8, 0, 0, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_157BC7, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, 8, 0, 0, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_157BCD, 0 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_157BC1, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_157BC7, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_157BCD, 0 RustboroCity_PokemonCenter_2F_MapWarps:: @ 8388BF8 warp_def 1, 5, 4, 2, MAP_RUSTBORO_CITY_POKEMON_CENTER_1F diff --git a/data/maps/RustboroCity_PokemonSchool/events.inc b/data/maps/RustboroCity_PokemonSchool/events.inc index fc3f934fa..7089d2803 100644 --- a/data/maps/RustboroCity_PokemonSchool/events.inc +++ b/data/maps/RustboroCity_PokemonSchool/events.inc @@ -1,10 +1,10 @@ RustboroCity_PokemonSchool_EventObjects:: @ 8388A34 - object_event 1, EVENT_OBJ_GFX_BOY_5, 0, 8, 6, 3, 10, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_157A98, 0 - object_event 2, EVENT_OBJ_GFX_BOY_5, 0, 9, 6, 3, 9, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_157AA1, 0 - object_event 3, EVENT_OBJ_GFX_BOY_4, 0, 3, 8, 3, 7, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_157AAA, 0 - object_event 4, EVENT_OBJ_GFX_LASS, 0, 10, 8, 3, 7, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_157AB3, 0 - object_event 5, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 3, 6, 3, 8, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_157ABC, 0 - object_event 6, EVENT_OBJ_GFX_GENTLEMAN, 0, 5, 3, 3, 8, 1, 1, 0, 0, RustboroCity_PokemonSchool_EventScript_157ACE, 0 + object_event 1, EVENT_OBJ_GFX_BOY_5, 0, 8, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_157A98, 0 + object_event 2, EVENT_OBJ_GFX_BOY_5, 0, 9, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_157AA1, 0 + object_event 3, EVENT_OBJ_GFX_BOY_4, 0, 3, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_157AAA, 0 + object_event 4, EVENT_OBJ_GFX_LASS, 0, 10, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_157AB3, 0 + object_event 5, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 3, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_157ABC, 0 + object_event 6, EVENT_OBJ_GFX_GENTLEMAN, 0, 5, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, RustboroCity_PokemonSchool_EventScript_157ACE, 0 RustboroCity_PokemonSchool_MapWarps:: @ 8388AC4 warp_def 5, 10, 0, 4, MAP_RUSTBORO_CITY diff --git a/data/maps/RusturfTunnel/events.inc b/data/maps/RusturfTunnel/events.inc index 9dda724af..5af870e72 100644 --- a/data/maps/RusturfTunnel/events.inc +++ b/data/maps/RusturfTunnel/events.inc @@ -1,14 +1,14 @@ RusturfTunnel_EventObjects:: @ 838BD2C - object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 23, 5, 3, 10, 0, 0, 0, 0, RusturfTunnel_EventScript_15C799, FLAG_HIDE_BOYFRIEND_RUSTURF_TUNNEL - object_event 2, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 24, 5, 3, 1, 0, 0, 0, 0, S_BreakableRock, FLAG_HIDE_RUSTURF_TUNNEL_ROCK_1 - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 1, 3, 1, 0, 0, 0, 0, RusturfTunnel_EventScript_1B1786, FLAG_ITEM_RUSTURF_TUNNEL_1 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 30, 2, 3, 1, 0, 0, 0, 0, RusturfTunnel_EventScript_1B1793, FLAG_ITEM_RUSTURF_TUNNEL_2 - object_event 5, EVENT_OBJ_GFX_OLD_MAN_1, 0, 5, 4, 3, 10, 0, 0, 0, 0, 0x0, FLAG_HIDE_BRINEY_RUSTURF_TUNNEL - object_event 6, EVENT_OBJ_GFX_VAR_1, 0, 14, 5, 3, 9, 0, 0, 0, 0, RusturfTunnel_EventScript_15C9EA, FLAG_HIDE_GRUNT_RUSTURF_TUNNEL - object_event 7, EVENT_OBJ_GFX_WINGULL, 0, 14, 4, 3, 9, 0, 0, 0, 0, RusturfTunnel_EventScript_15C9D7, FLAG_HIDE_PEEKO_RUSTURF_TUNNEL - object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 24, 4, 3, 8, 0, 0, 0, 0, S_BreakableRock, FLAG_HIDE_RUSTURF_TUNNEL_ROCK_2 - object_event 9, EVENT_OBJ_GFX_HIKER, 0, 32, 13, 3, 9, 1, 1, 1, 3, RusturfTunnel_EventScript_15CACD, 0 - object_event 10, EVENT_OBJ_GFX_WOMAN_3, 0, 25, 4, 3, 9, 1, 1, 0, 0, RusturfTunnel_EventScript_15C782, FLAG_HIDE_GIRLFRIEND_RUSTURF_TUNNEL + object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 23, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RusturfTunnel_EventScript_15C799, FLAG_HIDE_BOYFRIEND_RUSTURF_TUNNEL + object_event 2, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 24, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_BreakableRock, FLAG_HIDE_RUSTURF_TUNNEL_ROCK_1 + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 1, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, RusturfTunnel_EventScript_1B1786, FLAG_ITEM_RUSTURF_TUNNEL_1 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 30, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, RusturfTunnel_EventScript_1B1793, FLAG_ITEM_RUSTURF_TUNNEL_2 + object_event 5, EVENT_OBJ_GFX_OLD_MAN_1, 0, 5, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_BRINEY_RUSTURF_TUNNEL + object_event 6, EVENT_OBJ_GFX_VAR_1, 0, 14, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RusturfTunnel_EventScript_15C9EA, FLAG_HIDE_GRUNT_RUSTURF_TUNNEL + object_event 7, EVENT_OBJ_GFX_WINGULL, 0, 14, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RusturfTunnel_EventScript_15C9D7, FLAG_HIDE_PEEKO_RUSTURF_TUNNEL + object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 24, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, S_BreakableRock, FLAG_HIDE_RUSTURF_TUNNEL_ROCK_2 + object_event 9, EVENT_OBJ_GFX_HIKER, 0, 32, 13, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 3, RusturfTunnel_EventScript_15CACD, 0 + object_event 10, EVENT_OBJ_GFX_WOMAN_3, 0, 25, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, RusturfTunnel_EventScript_15C782, FLAG_HIDE_GIRLFRIEND_RUSTURF_TUNNEL RusturfTunnel_MapWarps:: @ 838BE1C warp_def 4, 10, 3, 0, MAP_ROUTE116 diff --git a/data/maps/SSTidalCorridor/events.inc b/data/maps/SSTidalCorridor/events.inc index 0e034da5c..e94d506d8 100644 --- a/data/maps/SSTidalCorridor/events.inc +++ b/data/maps/SSTidalCorridor/events.inc @@ -1,8 +1,8 @@ SSTidalCorridor_EventObjects:: @ 83916F8 - object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 1, 11, 3, 7, 0, 0, 0, 0, SSTidalCorridor_EventScript_15FDD6, 0 - object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 16, 7, 3, 3, 0, 2, 0, 0, SSTidalCorridor_EventScript_15FE60, 0 - object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 9, 2, 3, 8, 1, 1, 0, 0, SSTidalCorridor_EventScript_15FD96, FLAG_HIDE_BRINEY_AND_PEEKO_SS_TIDAL - object_event 4, EVENT_OBJ_GFX_WINGULL, 0, 7, 2, 3, 1, 1, 1, 0, 0, SSTidalCorridor_EventScript_15FD9F, FLAG_HIDE_BRINEY_AND_PEEKO_SS_TIDAL + object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 1, 11, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SSTidalCorridor_EventScript_15FDD6, 0 + object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 16, 7, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 2, 0, 0, SSTidalCorridor_EventScript_15FE60, 0 + object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 9, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SSTidalCorridor_EventScript_15FD96, FLAG_HIDE_BRINEY_AND_PEEKO_SS_TIDAL + object_event 4, EVENT_OBJ_GFX_WINGULL, 0, 7, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SSTidalCorridor_EventScript_15FD9F, FLAG_HIDE_BRINEY_AND_PEEKO_SS_TIDAL SSTidalCorridor_MapWarps:: @ 8391758 warp_def 4, 9, 3, 0, MAP_SS_TIDAL_ROOMS diff --git a/data/maps/SSTidalLowerDeck/events.inc b/data/maps/SSTidalLowerDeck/events.inc index c9cbf6715..4660e56b5 100644 --- a/data/maps/SSTidalLowerDeck/events.inc +++ b/data/maps/SSTidalLowerDeck/events.inc @@ -1,6 +1,6 @@ SSTidalLowerDeck_EventObjects:: @ 8391844 - object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 10, 4, 3, 46, 4, 4, 1, 3, SSTidalLowerDeck_EventScript_15FED7, 0 - object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 7, 4, 3, 50, 7, 4, 1, 3, SSTidalLowerDeck_EventScript_15FEEE, 0 + object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 10, 4, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT, 4, 4, 1, 3, SSTidalLowerDeck_EventScript_15FED7, 0 + object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 7, 4, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT, 7, 4, 1, 3, SSTidalLowerDeck_EventScript_15FEEE, 0 SSTidalLowerDeck_MapWarps:: @ 8391874 warp_def 15, 2, 3, 8, MAP_SS_TIDAL_CORRIDOR diff --git a/data/maps/SSTidalRooms/events.inc b/data/maps/SSTidalRooms/events.inc index e86c60ed6..6c24c610b 100644 --- a/data/maps/SSTidalRooms/events.inc +++ b/data/maps/SSTidalRooms/events.inc @@ -1,12 +1,12 @@ SSTidalRooms_EventObjects:: @ 839189C - object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 4, 7, 3, 10, 0, 0, 1, 0, SSTidalRooms_EventScript_15FF5D, 0 - object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 34, 11, 3, 9, 0, 0, 1, 3, SSTidalRooms_EventScript_15FF74, 0 - object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 21, 5, 3, 10, 0, 0, 1, 0, SSTidalRooms_EventScript_15FF8B, 0 - object_event 4, EVENT_OBJ_GFX_MAN_5, 0, 7, 13, 3, 8, 0, 0, 1, 0, SSTidalRooms_EventScript_15FFA2, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_5, 0, 6, 13, 3, 8, 0, 0, 1, 0, SSTidalRooms_EventScript_15FFBD, 0 - object_event 6, EVENT_OBJ_GFX_BOY_4, 0, 22, 11, 3, 8, 1, 1, 1, 3, SSTidalRooms_EventScript_15FFD8, 0 - object_event 7, EVENT_OBJ_GFX_WOMAN_3, 0, 15, 6, 3, 9, 0, 0, 1, 0, SSTidalRooms_EventScript_15FFEF, 0 - object_event 8, EVENT_OBJ_GFX_MANIAC, 0, 28, 5, 3, 7, 1, 1, 0, 0, SSTidalRooms_EventScript_15FF06, FLAG_HIDE_TM_49_GIVER_SS_TIDAL + object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 4, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 0, SSTidalRooms_EventScript_15FF5D, 0 + object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 34, 11, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 3, SSTidalRooms_EventScript_15FF74, 0 + object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 21, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 0, SSTidalRooms_EventScript_15FF8B, 0 + object_event 4, EVENT_OBJ_GFX_MAN_5, 0, 7, 13, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, SSTidalRooms_EventScript_15FFA2, 0 + object_event 5, EVENT_OBJ_GFX_WOMAN_5, 0, 6, 13, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, SSTidalRooms_EventScript_15FFBD, 0 + object_event 6, EVENT_OBJ_GFX_BOY_4, 0, 22, 11, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 3, SSTidalRooms_EventScript_15FFD8, 0 + object_event 7, EVENT_OBJ_GFX_WOMAN_3, 0, 15, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 0, SSTidalRooms_EventScript_15FFEF, 0 + object_event 8, EVENT_OBJ_GFX_MANIAC, 0, 28, 5, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, SSTidalRooms_EventScript_15FF06, FLAG_HIDE_TM_49_GIVER_SS_TIDAL SSTidalRooms_MapWarps:: @ 839195C warp_def 4, 16, 0, 0, MAP_SS_TIDAL_CORRIDOR diff --git a/data/maps/SafariZone_Northeast/events.inc b/data/maps/SafariZone_Northeast/events.inc index ed750532f..8e4aa6378 100644 --- a/data/maps/SafariZone_Northeast/events.inc +++ b/data/maps/SafariZone_Northeast/events.inc @@ -1,13 +1,13 @@ SafariZone_Northeast_EventObjects:: @ 8391A2C - object_event 1, EVENT_OBJ_GFX_FISHERMAN, 0, 22, 9, 3, 2, 1, 1, 0, 0, SafariZone_Northeast_EventScript_160011, 0 - object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 6, 29, 3, 2, 1, 1, 0, 0, SafariZone_Northeast_EventScript_16001A, 0 - object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 25, 10, 3, 1, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_11 - object_event 4, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 25, 13, 3, 1, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_12 - object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 28, 14, 3, 1, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_13 - object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 23, 6, 3, 1, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_14 - object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 7, 3, 1, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_15 - object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 27, 7, 3, 1, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_16 - object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 6, 3, 1, 1, 1, 0, 0, SafariZone_Northeast_EventScript_1B1919, FLAG_ITEM_SAFARI_ZONE_NORTHEAST_1 + object_event 1, EVENT_OBJ_GFX_FISHERMAN, 0, 22, 9, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SafariZone_Northeast_EventScript_160011, 0 + object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 6, 29, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SafariZone_Northeast_EventScript_16001A, 0 + object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 25, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_11 + object_event 4, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 25, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_12 + object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 28, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_13 + object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 23, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_14 + object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_15 + object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 27, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_16 + object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northeast_EventScript_1B1919, FLAG_ITEM_SAFARI_ZONE_NORTHEAST_1 SafariZone_Northeast_MapEvents:: @ 8391B04 map_events SafariZone_Northeast_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/SafariZone_Northwest/events.inc b/data/maps/SafariZone_Northwest/events.inc index 18a6db38e..b1808d57c 100644 --- a/data/maps/SafariZone_Northwest/events.inc +++ b/data/maps/SafariZone_Northwest/events.inc @@ -1,6 +1,6 @@ SafariZone_Northwest_EventObjects:: @ 83919E8 - object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 8, 8, 5, 8, 0, 0, 0, 0, SafariZone_Northwest_EventScript_160007, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 33, 7, 3, 1, 1, 1, 0, 0, SafariZone_Northwest_EventScript_1B190C, FLAG_ITEM_SAFARI_ZONE_NORTHWEST_1 + object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 8, 8, 5, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SafariZone_Northwest_EventScript_160007, 0 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 33, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northwest_EventScript_1B190C, FLAG_ITEM_SAFARI_ZONE_NORTHWEST_1 SafariZone_Northwest_MapEvents:: @ 8391A18 map_events SafariZone_Northwest_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/SafariZone_RestHouse/events.inc b/data/maps/SafariZone_RestHouse/events.inc index 8ed841ff1..db69b02ba 100644 --- a/data/maps/SafariZone_RestHouse/events.inc +++ b/data/maps/SafariZone_RestHouse/events.inc @@ -1,7 +1,7 @@ SafariZone_RestHouse_EventObjects:: @ 8391EC0 - object_event 1, EVENT_OBJ_GFX_YOUNGSTER, 0, 7, 4, 0, 10, 1, 1, 0, 0, SafariZone_RestHouse_EventScript_160C2F, 0 - object_event 2, EVENT_OBJ_GFX_PSYCHIC_M, 0, 8, 4, 0, 9, 1, 1, 0, 0, SafariZone_RestHouse_EventScript_160C38, 0 - object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 2, 5, 3, 10, 1, 1, 0, 0, SafariZone_RestHouse_EventScript_160C41, 0 + object_event 1, EVENT_OBJ_GFX_YOUNGSTER, 0, 7, 4, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SafariZone_RestHouse_EventScript_160C2F, 0 + object_event 2, EVENT_OBJ_GFX_PSYCHIC_M, 0, 8, 4, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, SafariZone_RestHouse_EventScript_160C38, 0 + object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 2, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SafariZone_RestHouse_EventScript_160C41, 0 SafariZone_RestHouse_MapWarps:: @ 8391F08 warp_def 3, 8, 0, 0, MAP_SAFARI_ZONE_SOUTHWEST diff --git a/data/maps/SafariZone_Southeast/events.inc b/data/maps/SafariZone_Southeast/events.inc index a18b2b394..25453c883 100644 --- a/data/maps/SafariZone_Southeast/events.inc +++ b/data/maps/SafariZone_Southeast/events.inc @@ -1,8 +1,8 @@ SafariZone_Southeast_EventObjects:: @ 8391B70 - object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 32, 34, 4, 8, 0, 0, 0, 0, SafariZone_Southeast_EventScript_1600A7, 0 - object_event 2, EVENT_OBJ_GFX_BOY_1, 0, 26, 28, 3, 2, 1, 1, 0, 0, SafariZone_Southeast_EventScript_16008C, 0 - object_event 3, EVENT_OBJ_GFX_MAN_5, 0, 16, 6, 5, 8, 0, 0, 0, 0, SafariZone_Southeast_EventScript_160095, 0 - object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 15, 31, 3, 2, 1, 1, 0, 0, SafariZone_Southeast_EventScript_16009E, 0 + object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 32, 34, 4, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SafariZone_Southeast_EventScript_1600A7, 0 + object_event 2, EVENT_OBJ_GFX_BOY_1, 0, 26, 28, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SafariZone_Southeast_EventScript_16008C, 0 + object_event 3, EVENT_OBJ_GFX_MAN_5, 0, 16, 6, 5, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SafariZone_Southeast_EventScript_160095, 0 + object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 15, 31, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SafariZone_Southeast_EventScript_16009E, 0 SafariZone_Southeast_MapWarps:: @ 8391BD0 warp_def 32, 33, 0, 0, MAP_ROUTE121_SAFARI_ZONE_ENTRANCE diff --git a/data/maps/SafariZone_Southwest/events.inc b/data/maps/SafariZone_Southwest/events.inc index 909997d64..22960b860 100644 --- a/data/maps/SafariZone_Southwest/events.inc +++ b/data/maps/SafariZone_Southwest/events.inc @@ -1,6 +1,6 @@ SafariZone_Southwest_EventObjects:: @ 8391B18 - object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 22, 9, 3, 8, 0, 0, 0, 0, SafariZone_Southwest_EventScript_160024, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 37, 3, 1, 1, 1, 0, 0, SafariZone_Southwest_EventScript_1B1926, FLAG_ITEM_SAFARI_ZONE_SOUTHWEST + object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 22, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SafariZone_Southwest_EventScript_160024, 0 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 37, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Southwest_EventScript_1B1926, FLAG_ITEM_SAFARI_ZONE_SOUTHWEST SafariZone_Southwest_MapWarps:: @ 8391B48 warp_def 29, 7, 3, 0, MAP_SAFARI_ZONE_REST_HOUSE diff --git a/data/maps/ScorchedSlab/events.inc b/data/maps/ScorchedSlab/events.inc index a90403222..7643dcc1c 100644 --- a/data/maps/ScorchedSlab/events.inc +++ b/data/maps/ScorchedSlab/events.inc @@ -1,5 +1,5 @@ ScorchedSlab_EventObjects:: @ 838E988 - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 5, 3, 1, 0, 0, 0, 0, ScorchedSlab_EventScript_1B18FF, FLAG_ITEM_SCORCHED_SLAB_1 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, ScorchedSlab_EventScript_1B18FF, FLAG_ITEM_SCORCHED_SLAB_1 ScorchedSlab_MapWarps:: @ 838E9A0 warp_def 7, 16, 1, 1, MAP_ROUTE120 diff --git a/data/maps/SeafloorCavern_Room1/events.inc b/data/maps/SeafloorCavern_Room1/events.inc index cb6442135..f4ff3eb05 100644 --- a/data/maps/SeafloorCavern_Room1/events.inc +++ b/data/maps/SeafloorCavern_Room1/events.inc @@ -1,9 +1,9 @@ SeafloorCavern_Room1_EventObjects:: @ 838D0B8 - object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 11, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11 - object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 11, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12 - object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 5, 10, 3, 1, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_13 - object_event 4, EVENT_OBJ_GFX_VAR_1, 0, 8, 6, 3, 1, 1, 1, 1, 2, SeafloorCavern_Room1_EventScript_15DA6D, FLAG_HIDE_EVIL_TEAM_GRUNTS_SEAFLOOR_CAVERN - object_event 5, EVENT_OBJ_GFX_VAR_1, 0, 15, 10, 3, 16, 1, 1, 1, 3, SeafloorCavern_Room1_EventScript_15DA84, FLAG_HIDE_EVIL_TEAM_GRUNTS_SEAFLOOR_CAVERN + object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11 + object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12 + object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 5, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_13 + object_event 4, EVENT_OBJ_GFX_VAR_1, 0, 8, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 1, 2, SeafloorCavern_Room1_EventScript_15DA6D, FLAG_HIDE_EVIL_TEAM_GRUNTS_SEAFLOOR_CAVERN + object_event 5, EVENT_OBJ_GFX_VAR_1, 0, 15, 10, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 3, SeafloorCavern_Room1_EventScript_15DA84, FLAG_HIDE_EVIL_TEAM_GRUNTS_SEAFLOOR_CAVERN SeafloorCavern_Room1_MapWarps:: @ 838D130 warp_def 5, 18, 3, 1, MAP_SEAFLOOR_CAVERN_ENTRANCE diff --git a/data/maps/SeafloorCavern_Room2/events.inc b/data/maps/SeafloorCavern_Room2/events.inc index eefcffd2e..02edc38e3 100644 --- a/data/maps/SeafloorCavern_Room2/events.inc +++ b/data/maps/SeafloorCavern_Room2/events.inc @@ -1,13 +1,13 @@ SeafloorCavern_Room2_EventObjects:: @ 838D15C - object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 14, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11 - object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 10, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12 - object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 6, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_13 - object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 6, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_14 - object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 10, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_15 - object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 14, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_16 - object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 9, 3, 1, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_18 - object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 7, 6, 3, 1, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_19 - object_event 9, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 15, 11, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_17 + object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11 + object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12 + object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_13 + object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_14 + object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_15 + object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_16 + object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_18 + object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 7, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_19 + object_event 9, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 15, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_17 SeafloorCavern_Room2_MapWarps:: @ 838D234 warp_def 12, 19, 3, 2, MAP_SEAFLOOR_CAVERN_ROOM1 diff --git a/data/maps/SeafloorCavern_Room3/events.inc b/data/maps/SeafloorCavern_Room3/events.inc index 5f8f769d3..7ee486f74 100644 --- a/data/maps/SeafloorCavern_Room3/events.inc +++ b/data/maps/SeafloorCavern_Room3/events.inc @@ -1,14 +1,14 @@ SeafloorCavern_Room3_EventObjects:: @ 838D268 - object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 13, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11 - object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 12, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12 - object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 11, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_13 - object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 11, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_14 - object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 10, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_15 - object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 10, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_16 - object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 9, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_17 - object_event 8, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 9, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_18 - object_event 9, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 9, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_19 - object_event 10, EVENT_OBJ_GFX_VAR_2, 0, 10, 5, 3, 8, 1, 1, 1, 3, SeafloorCavern_Room3_EventScript_15DAA8, FLAG_HIDE_EVIL_TEAM_GRUNTS_SEAFLOOR_CAVERN + object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11 + object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12 + object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_13 + object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_14 + object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_15 + object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_16 + object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_17 + object_event 8, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_18 + object_event 9, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_19 + object_event 10, EVENT_OBJ_GFX_VAR_2, 0, 10, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 3, SeafloorCavern_Room3_EventScript_15DAA8, FLAG_HIDE_EVIL_TEAM_GRUNTS_SEAFLOOR_CAVERN SeafloorCavern_Room3_MapWarps:: @ 838D358 warp_def 8, 1, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM8 diff --git a/data/maps/SeafloorCavern_Room4/events.inc b/data/maps/SeafloorCavern_Room4/events.inc index a31f0f5d8..a1e3f8326 100644 --- a/data/maps/SeafloorCavern_Room4/events.inc +++ b/data/maps/SeafloorCavern_Room4/events.inc @@ -1,5 +1,5 @@ SeafloorCavern_Room4_EventObjects:: @ 838D384 - object_event 1, EVENT_OBJ_GFX_VAR_1, 0, 4, 8, 3, 23, 1, 1, 1, 3, SeafloorCavern_Room4_EventScript_15DACB, FLAG_HIDE_EVIL_TEAM_GRUNTS_SEAFLOOR_CAVERN + object_event 1, EVENT_OBJ_GFX_VAR_1, 0, 4, 8, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 1, 1, 1, 3, SeafloorCavern_Room4_EventScript_15DACB, FLAG_HIDE_EVIL_TEAM_GRUNTS_SEAFLOOR_CAVERN SeafloorCavern_Room4_MapWarps:: @ 838D39C warp_def 13, 1, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM2 diff --git a/data/maps/SeafloorCavern_Room5/events.inc b/data/maps/SeafloorCavern_Room5/events.inc index 767fa6dc1..b14c5cdf4 100644 --- a/data/maps/SeafloorCavern_Room5/events.inc +++ b/data/maps/SeafloorCavern_Room5/events.inc @@ -1,10 +1,10 @@ SeafloorCavern_Room5_EventObjects:: @ 838D3D0 - object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 11, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11 - object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 11, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12 - object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 7, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_13 - object_event 4, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 13, 3, 1, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_15 - object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 13, 8, 3, 1, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_16 - object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 8, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_14 + object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11 + object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12 + object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_13 + object_event 4, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_15 + object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 13, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_16 + object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_14 SeafloorCavern_Room5_MapWarps:: @ 838D460 warp_def 4, 1, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM1 diff --git a/data/maps/SeafloorCavern_Room8/events.inc b/data/maps/SeafloorCavern_Room8/events.inc index 450eb894a..080e6c8f5 100644 --- a/data/maps/SeafloorCavern_Room8/events.inc +++ b/data/maps/SeafloorCavern_Room8/events.inc @@ -1,16 +1,16 @@ SeafloorCavern_Room8_EventObjects:: @ 838D4DC - object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 7, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11 - object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 7, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12 - object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 7, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_13 - object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 6, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_14 - object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 6, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_15 - object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 5, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_16 - object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 5, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_17 - object_event 8, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 5, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_18 - object_event 9, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 4, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_19 - object_event 10, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 4, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_1A - object_event 11, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 4, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_1B - object_event 12, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 4, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_1C + object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11 + object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12 + object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_13 + object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_14 + object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_15 + object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_16 + object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_17 + object_event 8, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_18 + object_event 9, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_19 + object_event 10, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_1A + object_event 11, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_1B + object_event 12, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_1C SeafloorCavern_Room8_MapWarps:: @ 838D5FC warp_def 5, 2, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM9 diff --git a/data/maps/SeafloorCavern_Room9/events.inc b/data/maps/SeafloorCavern_Room9/events.inc index f4efdbcc0..2da610c24 100644 --- a/data/maps/SeafloorCavern_Room9/events.inc +++ b/data/maps/SeafloorCavern_Room9/events.inc @@ -1,11 +1,11 @@ SeafloorCavern_Room9_EventObjects:: @ 838D620 - object_event 1, EVENT_OBJ_GFX_VAR_8, 0, 17, 38, 3, 8, 0, 0, 0, 0, 0x0, FLAG_HIDE_AWAKENED_MON_SEAFLOOR_CAVERN - object_event 2, EVENT_OBJ_GFX_VAR_6, 0, 9, 42, 3, 10, 0, 0, 0, 0, 0x0, FLAG_HIDE_EVIL_LEADER_SEAFLOOR_CAVERN - object_event 3, EVENT_OBJ_GFX_VAR_7, 0, 9, 42, 3, 10, 0, 0, 0, 0, 0x0, FLAG_HIDE_OTHER_LEADER_SEAFLOOR_CAVERN - object_event 4, EVENT_OBJ_GFX_VAR_4, 0, 8, 41, 3, 10, 0, 0, 0, 0, 0x0, FLAG_HIDE_OTHER_TEAM_GRUNTS_SEAFLOOR_CAVERN - object_event 5, EVENT_OBJ_GFX_VAR_5, 0, 8, 42, 3, 10, 0, 0, 0, 0, 0x0, FLAG_HIDE_OTHER_TEAM_GRUNTS_SEAFLOOR_CAVERN - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 5, 3, 1, 1, 1, 0, 0, SeafloorCavern_Room9_EventScript_1B1A37, FLAG_ITEM_SEAFLOOR_CAVERN_ROOM_9_1 - object_event 7, EVENT_OBJ_GFX_VAR_9, 0, 17, 38, 3, 8, 1, 1, 0, 0, 0x0, FLAG_HIDE_SLEEPING_MON_SEAFLOOR_CAVERN + object_event 1, EVENT_OBJ_GFX_VAR_8, 0, 17, 38, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_AWAKENED_MON_SEAFLOOR_CAVERN + object_event 2, EVENT_OBJ_GFX_VAR_6, 0, 9, 42, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_EVIL_LEADER_SEAFLOOR_CAVERN + object_event 3, EVENT_OBJ_GFX_VAR_7, 0, 9, 42, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_OTHER_LEADER_SEAFLOOR_CAVERN + object_event 4, EVENT_OBJ_GFX_VAR_4, 0, 8, 41, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_OTHER_TEAM_GRUNTS_SEAFLOOR_CAVERN + object_event 5, EVENT_OBJ_GFX_VAR_5, 0, 8, 42, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_OTHER_TEAM_GRUNTS_SEAFLOOR_CAVERN + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SeafloorCavern_Room9_EventScript_1B1A37, FLAG_ITEM_SEAFLOOR_CAVERN_ROOM_9_1 + object_event 7, EVENT_OBJ_GFX_VAR_9, 0, 17, 38, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_SLEEPING_MON_SEAFLOOR_CAVERN SeafloorCavern_Room9_MapWarps:: @ 838D6C8 warp_def 5, 4, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM8 diff --git a/data/maps/SecretBase_BlueCave1/events.inc b/data/maps/SecretBase_BlueCave1/events.inc index 7f883e7e9..945c13138 100644 --- a/data/maps/SecretBase_BlueCave1/events.inc +++ b/data/maps/SecretBase_BlueCave1/events.inc @@ -1,19 +1,19 @@ SecretBase_BlueCave1_EventObjects:: @ 838F18C - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 4, 2, 3, 8, 0, 0, 0, 0, SecretBase_BlueCave1_EventScript_1A2FC0, FLAG_DECORATION_1 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 + object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BlueCave1_EventScript_1A2FC0, FLAG_DECORATION_1 + object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 + object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 + object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 + object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 + object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 + object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 + object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 + object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 + object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 + object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 + object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 + object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 + object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 SecretBase_BlueCave1_MapWarps:: @ 838F2F4 warp_def 5, 7, 0, 126, MAP_NONE diff --git a/data/maps/SecretBase_BlueCave2/events.inc b/data/maps/SecretBase_BlueCave2/events.inc index 93e7b67f8..91cfeb26f 100644 --- a/data/maps/SecretBase_BlueCave2/events.inc +++ b/data/maps/SecretBase_BlueCave2/events.inc @@ -1,19 +1,19 @@ SecretBase_BlueCave2_EventObjects:: @ 838FAA4 - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 2, 1, 3, 8, 0, 0, 0, 0, SecretBase_BlueCave2_EventScript_1A2FC0, FLAG_DECORATION_1 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 + object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 2, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BlueCave2_EventScript_1A2FC0, FLAG_DECORATION_1 + object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 + object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 + object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 + object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 + object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 + object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 + object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 + object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 + object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 + object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 + object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 + object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 + object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 SecretBase_BlueCave2_MapWarps:: @ 838FC0C warp_def 7, 5, 0, 126, MAP_NONE diff --git a/data/maps/SecretBase_BlueCave3/events.inc b/data/maps/SecretBase_BlueCave3/events.inc index bb761d2e8..51df3d661 100644 --- a/data/maps/SecretBase_BlueCave3/events.inc +++ b/data/maps/SecretBase_BlueCave3/events.inc @@ -1,19 +1,19 @@ SecretBase_BlueCave3_EventObjects:: @ 83903BC - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 5, 1, 3, 8, 0, 0, 0, 0, SecretBase_BlueCave3_EventScript_1A2FC0, FLAG_DECORATION_1 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 + object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 5, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BlueCave3_EventScript_1A2FC0, FLAG_DECORATION_1 + object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 + object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 + object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 + object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 + object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 + object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 + object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 + object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 + object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 + object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 + object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 + object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 + object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 SecretBase_BlueCave3_MapWarps:: @ 8390524 warp_def 4, 15, 0, 126, MAP_NONE diff --git a/data/maps/SecretBase_BlueCave4/events.inc b/data/maps/SecretBase_BlueCave4/events.inc index 082600bec..6adf080fe 100644 --- a/data/maps/SecretBase_BlueCave4/events.inc +++ b/data/maps/SecretBase_BlueCave4/events.inc @@ -1,19 +1,19 @@ SecretBase_BlueCave4_EventObjects:: @ 8390CD4 - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 5, 13, 3, 8, 0, 0, 0, 0, SecretBase_BlueCave4_EventScript_1A2FC0, FLAG_DECORATION_1 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 + object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 5, 13, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BlueCave4_EventScript_1A2FC0, FLAG_DECORATION_1 + object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 + object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 + object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 + object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 + object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 + object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 + object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 + object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 + object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 + object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 + object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 + object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 + object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 SecretBase_BlueCave4_MapWarps:: @ 8390E3C warp_def 4, 15, 0, 126, MAP_NONE diff --git a/data/maps/SecretBase_BrownCave1/events.inc b/data/maps/SecretBase_BrownCave1/events.inc index c3219bf43..ad4d84b85 100644 --- a/data/maps/SecretBase_BrownCave1/events.inc +++ b/data/maps/SecretBase_BrownCave1/events.inc @@ -1,19 +1,19 @@ SecretBase_BrownCave1_EventObjects:: @ 838F008 - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 5, 2, 3, 8, 0, 0, 0, 0, SecretBase_BrownCave1_EventScript_1A2FC0, FLAG_DECORATION_1 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 + object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 5, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BrownCave1_EventScript_1A2FC0, FLAG_DECORATION_1 + object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 + object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 + object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 + object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 + object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 + object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 + object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 + object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 + object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 + object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 + object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 + object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 + object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 SecretBase_BrownCave1_MapWarps:: @ 838F170 warp_def 5, 7, 0, 126, MAP_NONE diff --git a/data/maps/SecretBase_BrownCave2/events.inc b/data/maps/SecretBase_BrownCave2/events.inc index e57348a00..88616c152 100644 --- a/data/maps/SecretBase_BrownCave2/events.inc +++ b/data/maps/SecretBase_BrownCave2/events.inc @@ -1,19 +1,19 @@ SecretBase_BrownCave2_EventObjects:: @ 838F920 - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 11, 2, 3, 8, 0, 0, 0, 0, SecretBase_BrownCave2_EventScript_1A2FC0, FLAG_DECORATION_1 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 + object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 11, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BrownCave2_EventScript_1A2FC0, FLAG_DECORATION_1 + object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 + object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 + object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 + object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 + object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 + object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 + object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 + object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 + object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 + object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 + object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 + object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 + object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 SecretBase_BrownCave2_MapWarps:: @ 838FA88 warp_def 1, 7, 0, 126, MAP_NONE diff --git a/data/maps/SecretBase_BrownCave3/events.inc b/data/maps/SecretBase_BrownCave3/events.inc index c1003816a..109aa9183 100644 --- a/data/maps/SecretBase_BrownCave3/events.inc +++ b/data/maps/SecretBase_BrownCave3/events.inc @@ -1,19 +1,19 @@ SecretBase_BrownCave3_EventObjects:: @ 8390238 - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 1, 7, 3, 8, 0, 0, 0, 0, SecretBase_BrownCave3_EventScript_1A2FC0, FLAG_DECORATION_1 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 + object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 1, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BrownCave3_EventScript_1A2FC0, FLAG_DECORATION_1 + object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 + object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 + object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 + object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 + object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 + object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 + object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 + object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 + object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 + object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 + object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 + object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 + object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 SecretBase_BrownCave3_MapWarps:: @ 83903A0 warp_def 11, 9, 0, 126, MAP_NONE diff --git a/data/maps/SecretBase_BrownCave4/events.inc b/data/maps/SecretBase_BrownCave4/events.inc index 02afc20c4..b88734f71 100644 --- a/data/maps/SecretBase_BrownCave4/events.inc +++ b/data/maps/SecretBase_BrownCave4/events.inc @@ -1,19 +1,19 @@ SecretBase_BrownCave4_EventObjects:: @ 8390B50 - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 2, 1, 3, 8, 0, 0, 0, 0, SecretBase_BrownCave4_EventScript_1A2FC0, FLAG_DECORATION_1 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 + object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 2, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BrownCave4_EventScript_1A2FC0, FLAG_DECORATION_1 + object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 + object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 + object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 + object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 + object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 + object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 + object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 + object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 + object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 + object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 + object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 + object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 + object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 SecretBase_BrownCave4_MapWarps:: @ 8390CB8 warp_def 2, 8, 0, 126, MAP_NONE diff --git a/data/maps/SecretBase_RedCave1/events.inc b/data/maps/SecretBase_RedCave1/events.inc index 18fea4c40..8dee80036 100644 --- a/data/maps/SecretBase_RedCave1/events.inc +++ b/data/maps/SecretBase_RedCave1/events.inc @@ -1,19 +1,19 @@ SecretBase_RedCave1_EventObjects:: @ 838EE84 - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 7, 4, 3, 8, 0, 0, 0, 0, SecretBase_RedCave1_EventScript_1A2FC0, FLAG_DECORATION_1 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 + object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_RedCave1_EventScript_1A2FC0, FLAG_DECORATION_1 + object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 + object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 + object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 + object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 + object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 + object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 + object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 + object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 + object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 + object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 + object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 + object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 + object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 SecretBase_RedCave1_MapWarps:: @ 838EFEC warp_def 5, 7, 0, 126, MAP_NONE diff --git a/data/maps/SecretBase_RedCave2/events.inc b/data/maps/SecretBase_RedCave2/events.inc index 1d9bdde09..f13e0ee48 100644 --- a/data/maps/SecretBase_RedCave2/events.inc +++ b/data/maps/SecretBase_RedCave2/events.inc @@ -1,19 +1,19 @@ SecretBase_RedCave2_EventObjects:: @ 838F79C - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 3, 1, 3, 8, 0, 0, 0, 0, SecretBase_RedCave2_EventScript_1A2FC0, FLAG_DECORATION_1 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 + object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 3, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_RedCave2_EventScript_1A2FC0, FLAG_DECORATION_1 + object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 + object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 + object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 + object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 + object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 + object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 + object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 + object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 + object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 + object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 + object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 + object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 + object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 SecretBase_RedCave2_MapWarps:: @ 838F904 warp_def 3, 14, 0, 126, MAP_NONE diff --git a/data/maps/SecretBase_RedCave3/events.inc b/data/maps/SecretBase_RedCave3/events.inc index 923616945..d3701ae77 100644 --- a/data/maps/SecretBase_RedCave3/events.inc +++ b/data/maps/SecretBase_RedCave3/events.inc @@ -1,19 +1,19 @@ SecretBase_RedCave3_EventObjects:: @ 83900B4 - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 12, 1, 3, 8, 0, 0, 0, 0, SecretBase_RedCave3_EventScript_1A2FC0, FLAG_DECORATION_1 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 + object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 12, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_RedCave3_EventScript_1A2FC0, FLAG_DECORATION_1 + object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 + object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 + object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 + object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 + object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 + object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 + object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 + object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 + object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 + object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 + object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 + object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 + object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 SecretBase_RedCave3_MapWarps:: @ 839021C warp_def 3, 6, 0, 126, MAP_NONE diff --git a/data/maps/SecretBase_RedCave4/events.inc b/data/maps/SecretBase_RedCave4/events.inc index 25a0f2ec6..438e6606f 100644 --- a/data/maps/SecretBase_RedCave4/events.inc +++ b/data/maps/SecretBase_RedCave4/events.inc @@ -1,19 +1,19 @@ SecretBase_RedCave4_EventObjects:: @ 83909CC - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 5, 8, 3, 8, 0, 0, 0, 0, SecretBase_RedCave4_EventScript_1A2FC0, FLAG_DECORATION_1 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 + object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 5, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_RedCave4_EventScript_1A2FC0, FLAG_DECORATION_1 + object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 + object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 + object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 + object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 + object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 + object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 + object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 + object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 + object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 + object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 + object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 + object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 + object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 SecretBase_RedCave4_MapWarps:: @ 8390B34 warp_def 2, 12, 0, 126, MAP_NONE diff --git a/data/maps/SecretBase_Shrub1/events.inc b/data/maps/SecretBase_Shrub1/events.inc index e1583e86d..07deae47f 100644 --- a/data/maps/SecretBase_Shrub1/events.inc +++ b/data/maps/SecretBase_Shrub1/events.inc @@ -1,19 +1,19 @@ SecretBase_Shrub1_EventObjects:: @ 838F618 - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 5, 2, 3, 8, 0, 0, 0, 0, SecretBase_Shrub1_EventScript_1A2FC0, FLAG_DECORATION_1 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 + object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 5, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Shrub1_EventScript_1A2FC0, FLAG_DECORATION_1 + object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 + object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 + object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 + object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 + object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 + object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 + object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 + object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 + object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 + object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 + object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 + object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 + object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 SecretBase_Shrub1_MapWarps:: @ 838F780 warp_def 5, 7, 0, 126, MAP_NONE diff --git a/data/maps/SecretBase_Shrub2/events.inc b/data/maps/SecretBase_Shrub2/events.inc index 72bdcc380..f1317d44f 100644 --- a/data/maps/SecretBase_Shrub2/events.inc +++ b/data/maps/SecretBase_Shrub2/events.inc @@ -1,19 +1,19 @@ SecretBase_Shrub2_EventObjects:: @ 838FF30 - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 13, 2, 3, 8, 0, 0, 0, 0, SecretBase_Shrub2_EventScript_1A2FC0, FLAG_DECORATION_1 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 + object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 13, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Shrub2_EventScript_1A2FC0, FLAG_DECORATION_1 + object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 + object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 + object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 + object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 + object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 + object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 + object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 + object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 + object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 + object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 + object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 + object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 + object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 SecretBase_Shrub2_MapWarps:: @ 8390098 warp_def 7, 5, 0, 126, MAP_NONE diff --git a/data/maps/SecretBase_Shrub3/events.inc b/data/maps/SecretBase_Shrub3/events.inc index b09c206e7..da09c9853 100644 --- a/data/maps/SecretBase_Shrub3/events.inc +++ b/data/maps/SecretBase_Shrub3/events.inc @@ -1,19 +1,19 @@ SecretBase_Shrub3_EventObjects:: @ 8390848 - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 5, 7, 3, 8, 0, 0, 0, 0, SecretBase_Shrub3_EventScript_1A2FC0, FLAG_DECORATION_1 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 + object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 5, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Shrub3_EventScript_1A2FC0, FLAG_DECORATION_1 + object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 + object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 + object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 + object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 + object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 + object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 + object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 + object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 + object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 + object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 + object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 + object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 + object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 SecretBase_Shrub3_MapWarps:: @ 83909B0 warp_def 6, 9, 0, 126, MAP_NONE diff --git a/data/maps/SecretBase_Shrub4/events.inc b/data/maps/SecretBase_Shrub4/events.inc index a9f636e54..d64c9a37e 100644 --- a/data/maps/SecretBase_Shrub4/events.inc +++ b/data/maps/SecretBase_Shrub4/events.inc @@ -1,19 +1,19 @@ SecretBase_Shrub4_EventObjects:: @ 8391160 - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 9, 7, 3, 8, 0, 0, 0, 0, SecretBase_Shrub4_EventScript_1A2FC0, FLAG_DECORATION_1 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 + object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 9, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Shrub4_EventScript_1A2FC0, FLAG_DECORATION_1 + object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 + object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 + object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 + object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 + object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 + object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 + object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 + object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 + object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 + object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 + object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 + object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 + object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 SecretBase_Shrub4_MapWarps:: @ 83912C8 warp_def 11, 8, 0, 126, MAP_NONE diff --git a/data/maps/SecretBase_Tree1/events.inc b/data/maps/SecretBase_Tree1/events.inc index 467789f32..fdc9dae5a 100644 --- a/data/maps/SecretBase_Tree1/events.inc +++ b/data/maps/SecretBase_Tree1/events.inc @@ -1,19 +1,19 @@ SecretBase_Tree1_EventObjects:: @ 838F494 - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 5, 1, 3, 8, 0, 0, 0, 0, SecretBase_Tree1_EventScript_1A2FC0, FLAG_DECORATION_1 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 + object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 5, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Tree1_EventScript_1A2FC0, FLAG_DECORATION_1 + object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 + object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 + object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 + object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 + object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 + object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 + object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 + object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 + object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 + object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 + object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 + object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 + object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 SecretBase_Tree1_MapWarps:: @ 838F5FC warp_def 5, 7, 0, 126, MAP_NONE diff --git a/data/maps/SecretBase_Tree2/events.inc b/data/maps/SecretBase_Tree2/events.inc index ef2280e01..0f4bfa258 100644 --- a/data/maps/SecretBase_Tree2/events.inc +++ b/data/maps/SecretBase_Tree2/events.inc @@ -1,19 +1,19 @@ SecretBase_Tree2_EventObjects:: @ 838FDAC - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 3, 1, 3, 8, 0, 0, 0, 0, SecretBase_Tree2_EventScript_1A2FC0, FLAG_DECORATION_1 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 + object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 3, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Tree2_EventScript_1A2FC0, FLAG_DECORATION_1 + object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 + object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 + object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 + object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 + object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 + object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 + object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 + object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 + object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 + object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 + object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 + object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 + object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 SecretBase_Tree2_MapWarps:: @ 838FF14 warp_def 3, 14, 0, 126, MAP_NONE diff --git a/data/maps/SecretBase_Tree3/events.inc b/data/maps/SecretBase_Tree3/events.inc index 25bc95466..4c85b7f94 100644 --- a/data/maps/SecretBase_Tree3/events.inc +++ b/data/maps/SecretBase_Tree3/events.inc @@ -1,19 +1,19 @@ SecretBase_Tree3_EventObjects:: @ 83906C4 - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 1, 2, 3, 8, 0, 0, 0, 0, SecretBase_Tree3_EventScript_1A2FC0, FLAG_DECORATION_1 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 + object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Tree3_EventScript_1A2FC0, FLAG_DECORATION_1 + object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 + object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 + object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 + object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 + object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 + object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 + object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 + object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 + object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 + object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 + object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 + object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 + object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 SecretBase_Tree3_MapWarps:: @ 839082C warp_def 8, 6, 0, 126, MAP_NONE diff --git a/data/maps/SecretBase_Tree4/events.inc b/data/maps/SecretBase_Tree4/events.inc index 6f0e5b3b5..ae56d68e7 100644 --- a/data/maps/SecretBase_Tree4/events.inc +++ b/data/maps/SecretBase_Tree4/events.inc @@ -1,19 +1,19 @@ SecretBase_Tree4_EventObjects:: @ 8390FDC - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 10, 9, 3, 8, 0, 0, 0, 0, SecretBase_Tree4_EventScript_1A2FC0, FLAG_DECORATION_1 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 + object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 10, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Tree4_EventScript_1A2FC0, FLAG_DECORATION_1 + object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 + object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 + object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 + object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 + object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 + object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 + object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 + object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 + object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 + object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 + object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 + object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 + object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 SecretBase_Tree4_MapWarps:: @ 8391144 warp_def 7, 12, 0, 126, MAP_NONE diff --git a/data/maps/SecretBase_YellowCave1/events.inc b/data/maps/SecretBase_YellowCave1/events.inc index 930cbc21d..795377ecc 100644 --- a/data/maps/SecretBase_YellowCave1/events.inc +++ b/data/maps/SecretBase_YellowCave1/events.inc @@ -1,19 +1,19 @@ SecretBase_YellowCave1_EventObjects:: @ 838F310 - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 3, 1, 3, 8, 0, 0, 0, 0, SecretBase_YellowCave1_EventScript_1A2FC0, FLAG_DECORATION_1 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 + object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 3, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_YellowCave1_EventScript_1A2FC0, FLAG_DECORATION_1 + object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 + object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 + object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 + object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 + object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 + object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 + object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 + object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 + object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 + object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 + object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 + object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 + object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 SecretBase_YellowCave1_MapWarps:: @ 838F478 warp_def 5, 7, 0, 126, MAP_NONE diff --git a/data/maps/SecretBase_YellowCave2/events.inc b/data/maps/SecretBase_YellowCave2/events.inc index fd3e265e5..894e7e89a 100644 --- a/data/maps/SecretBase_YellowCave2/events.inc +++ b/data/maps/SecretBase_YellowCave2/events.inc @@ -1,19 +1,19 @@ SecretBase_YellowCave2_EventObjects:: @ 838FC28 - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 1, 1, 3, 8, 0, 0, 0, 0, SecretBase_YellowCave2_EventScript_1A2FC0, FLAG_DECORATION_1 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 + object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_YellowCave2_EventScript_1A2FC0, FLAG_DECORATION_1 + object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 + object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 + object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 + object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 + object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 + object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 + object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 + object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 + object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 + object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 + object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 + object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 + object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 SecretBase_YellowCave2_MapWarps:: @ 838FD90 warp_def 12, 7, 0, 126, MAP_NONE diff --git a/data/maps/SecretBase_YellowCave3/events.inc b/data/maps/SecretBase_YellowCave3/events.inc index 99f0ae8b4..939cd3a17 100644 --- a/data/maps/SecretBase_YellowCave3/events.inc +++ b/data/maps/SecretBase_YellowCave3/events.inc @@ -1,19 +1,19 @@ SecretBase_YellowCave3_EventObjects:: @ 8390540 - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 7, 5, 3, 8, 0, 0, 0, 0, SecretBase_YellowCave3_EventScript_1A2FC0, FLAG_DECORATION_1 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 + object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_YellowCave3_EventScript_1A2FC0, FLAG_DECORATION_1 + object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 + object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 + object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 + object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 + object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 + object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 + object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 + object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 + object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 + object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 + object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 + object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 + object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 SecretBase_YellowCave3_MapWarps:: @ 83906A8 warp_def 5, 9, 0, 126, MAP_NONE diff --git a/data/maps/SecretBase_YellowCave4/events.inc b/data/maps/SecretBase_YellowCave4/events.inc index af59e0067..369205b90 100644 --- a/data/maps/SecretBase_YellowCave4/events.inc +++ b/data/maps/SecretBase_YellowCave4/events.inc @@ -1,19 +1,19 @@ SecretBase_YellowCave4_EventObjects:: @ 8390E58 - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 9, 8, 3, 8, 0, 0, 0, 0, SecretBase_YellowCave4_EventScript_1A2FC0, FLAG_DECORATION_1 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 + object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 9, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_YellowCave4_EventScript_1A2FC0, FLAG_DECORATION_1 + object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 + object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 + object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 + object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 + object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 + object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 + object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 + object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 + object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 + object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 + object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 + object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 + object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 SecretBase_YellowCave4_MapWarps:: @ 8390FC0 warp_def 6, 12, 0, 126, MAP_NONE diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/events.inc b/data/maps/ShoalCave_LowTideEntranceRoom/events.inc index fe4a2eae9..a043bbe68 100644 --- a/data/maps/ShoalCave_LowTideEntranceRoom/events.inc +++ b/data/maps/ShoalCave_LowTideEntranceRoom/events.inc @@ -1,6 +1,6 @@ ShoalCave_LowTideEntranceRoom_EventObjects:: @ 838DCDC - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 30, 3, 3, 1, 1, 1, 0, 0, ShoalCave_LowTideEntranceRoom_EventScript_1B19F6, FLAG_ITEM_SHOAL_CAVE_LOW_TIDE_ENTRANCE_1 - object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 18, 15, 3, 9, 1, 1, 0, 0, ShoalCave_LowTideEntranceRoom_EventScript_15E076, 0 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 30, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, ShoalCave_LowTideEntranceRoom_EventScript_1B19F6, FLAG_ITEM_SHOAL_CAVE_LOW_TIDE_ENTRANCE_1 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 18, 15, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, ShoalCave_LowTideEntranceRoom_EventScript_15E076, 0 ShoalCave_LowTideEntranceRoom_MapWarps:: @ 838DD0C warp_def 20, 30, 3, 0, MAP_ROUTE125 diff --git a/data/maps/ShoalCave_LowTideIceRoom/events.inc b/data/maps/ShoalCave_LowTideIceRoom/events.inc index 87d291c40..d6d8cbdb0 100644 --- a/data/maps/ShoalCave_LowTideIceRoom/events.inc +++ b/data/maps/ShoalCave_LowTideIceRoom/events.inc @@ -1,6 +1,6 @@ ShoalCave_LowTideIceRoom_EventObjects:: @ 838EDE0 - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 8, 3, 1, 1, 1, 0, 0, ShoalCave_LowTideIceRoom_EventScript_1B1A1D, FLAG_ITEM_SHOAL_CAVE_LOW_TIDE_ICE_ROOM_1 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 21, 4, 1, 1, 1, 0, 0, ShoalCave_LowTideIceRoom_EventScript_1B1A2A, FLAG_ITEM_SHOAL_CAVE_LOW_TIDE_ICE_ROOM_2 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, ShoalCave_LowTideIceRoom_EventScript_1B1A1D, FLAG_ITEM_SHOAL_CAVE_LOW_TIDE_ICE_ROOM_1 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 21, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, ShoalCave_LowTideIceRoom_EventScript_1B1A2A, FLAG_ITEM_SHOAL_CAVE_LOW_TIDE_ICE_ROOM_2 ShoalCave_LowTideIceRoom_MapWarps:: @ 838EE10 warp_def 17, 10, 3, 3, MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM diff --git a/data/maps/ShoalCave_LowTideInnerRoom/events.inc b/data/maps/ShoalCave_LowTideInnerRoom/events.inc index 746f36cdc..660544863 100644 --- a/data/maps/ShoalCave_LowTideInnerRoom/events.inc +++ b/data/maps/ShoalCave_LowTideInnerRoom/events.inc @@ -1,5 +1,5 @@ ShoalCave_LowTideInnerRoom_EventObjects:: @ 838DD40 - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 26, 14, 5, 1, 1, 1, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_1B1A03, FLAG_ITEM_SHOAL_CAVE_LOW_TIDE_INNER_ROOM_1 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 26, 14, 5, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_1B1A03, FLAG_ITEM_SHOAL_CAVE_LOW_TIDE_INNER_ROOM_1 ShoalCave_LowTideInnerRoom_MapWarps:: @ 838DD58 warp_def 34, 29, 3, 1, MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM diff --git a/data/maps/ShoalCave_LowTideLowerRoom/events.inc b/data/maps/ShoalCave_LowTideLowerRoom/events.inc index 6ff9a44b3..c70c0291c 100644 --- a/data/maps/ShoalCave_LowTideLowerRoom/events.inc +++ b/data/maps/ShoalCave_LowTideLowerRoom/events.inc @@ -1,6 +1,6 @@ ShoalCave_LowTideLowerRoom_EventObjects:: @ 838DE3C - object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 25, 3, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11 - object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 11, 4, 3, 2, 1, 1, 0, 0, ShoalCave_LowTideLowerRoom_EventScript_15E44F, 0 + object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 25, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11 + object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 11, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, ShoalCave_LowTideLowerRoom_EventScript_15E44F, 0 ShoalCave_LowTideLowerRoom_MapWarps:: @ 838DE6C warp_def 7, 2, 3, 3, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM diff --git a/data/maps/ShoalCave_LowTideStairsRoom/events.inc b/data/maps/ShoalCave_LowTideStairsRoom/events.inc index 65570d256..ab5727820 100644 --- a/data/maps/ShoalCave_LowTideStairsRoom/events.inc +++ b/data/maps/ShoalCave_LowTideStairsRoom/events.inc @@ -1,5 +1,5 @@ ShoalCave_LowTideStairsRoom_EventObjects:: @ 838DDF4 - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 12, 3, 1, 1, 1, 0, 0, ShoalCave_LowTideStairsRoom_EventScript_1B1A10, FLAG_ITEM_SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM_1 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, ShoalCave_LowTideStairsRoom_EventScript_1B1A10, FLAG_ITEM_SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM_1 ShoalCave_LowTideStairsRoom_MapWarps:: @ 838DE0C warp_def 3, 12, 3, 1, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM diff --git a/data/maps/SingleBattleColosseum/events.inc b/data/maps/SingleBattleColosseum/events.inc index e6da2e027..e9857075c 100644 --- a/data/maps/SingleBattleColosseum/events.inc +++ b/data/maps/SingleBattleColosseum/events.inc @@ -1,5 +1,5 @@ SingleBattleColosseum_EventObjects:: @ 83912E4 - object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 9, 3, 3, 9, 0, 0, 0, 0, SingleBattleColosseum_EventScript_1A449E, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 9, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SingleBattleColosseum_EventScript_1A449E, 0 SingleBattleColosseum_MapWarps:: @ 83912FC warp_def 6, 8, 3, 127, MAP_NONE diff --git a/data/maps/SkyPillar_Top/events.inc b/data/maps/SkyPillar_Top/events.inc index 9fc989c78..e497f5db2 100644 --- a/data/maps/SkyPillar_Top/events.inc +++ b/data/maps/SkyPillar_Top/events.inc @@ -1,5 +1,5 @@ SkyPillar_Top_EventObjects:: @ 838EE50 - object_event 1, EVENT_OBJ_GFX_RAYQUAZA, 0, 14, 6, 3, 8, 1, 1, 0, 0, SkyPillar_Top_EventScript_15F316, FLAG_HIDE_RAYQUAZA + object_event 1, EVENT_OBJ_GFX_RAYQUAZA, 0, 14, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SkyPillar_Top_EventScript_15F316, FLAG_HIDE_RAYQUAZA SkyPillar_Top_MapWarps:: @ 838EE68 warp_def 16, 14, 3, 1, MAP_SKY_PILLAR_5F diff --git a/data/maps/SlateportCity/events.inc b/data/maps/SlateportCity/events.inc index 685bc7359..426b87ac5 100644 --- a/data/maps/SlateportCity/events.inc +++ b/data/maps/SlateportCity/events.inc @@ -1,35 +1,35 @@ SlateportCity_EventObjects:: @ 837F7AC - object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 21, 11, 3, 2, 1, 1, 0, 0, SlateportCity_EventScript_14BBD6, 0 - object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 35, 27, 3, 5, 1, 0, 0, 0, SlateportCity_EventScript_14BBF3, 0 - object_event 3, EVENT_OBJ_GFX_BOY_4, 0, 15, 13, 3, 2, 1, 2, 0, 0, SlateportCity_EventScript_14BBB5, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 26, 29, 3, 1, 0, 0, 0, 0, SlateportCity_EventScript_14BC14, 0 - object_event 5, EVENT_OBJ_GFX_VAR_0, 0, 31, 27, 3, 7, 0, 0, 0, 0, SlateportCity_EventScript_14BD3A, FLAG_HIDE_EVIL_TEAM_SLATEPORT - object_event 6, EVENT_OBJ_GFX_COOK, 0, 5, 43, 3, 8, 0, 0, 0, 0, SlateportCity_EventScript_14BB3F, 0 - object_event 7, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 20, 37, 3, 1, 1, 1, 0, 0, SlateportCity_EventScript_14BB60, 0 - object_event 8, EVENT_OBJ_GFX_GIRL_1, 0, 8, 42, 3, 2, 1, 1, 0, 0, SlateportCity_EventScript_14BB81, 0 - object_event 9, EVENT_OBJ_GFX_CAMERAMAN, 0, 29, 13, 3, 9, 0, 0, 0, 0, SlateportCity_EventScript_14C017, FLAG_HIDE_GABBY_AND_TY_SLATEPORT - object_event 10, EVENT_OBJ_GFX_REPORTER_F, 0, 28, 14, 3, 7, 0, 0, 0, 0, SlateportCity_EventScript_14C020, FLAG_HIDE_GABBY_AND_TY_SLATEPORT - object_event 11, EVENT_OBJ_GFX_SCIENTIST_1, 0, 28, 13, 3, 10, 0, 0, 0, 0, SlateportCity_EventScript_14BEBC, FLAG_HIDE_STERN_SLATEPORT - object_event 12, EVENT_OBJ_GFX_SAILOR, 0, 35, 36, 3, 10, 0, 0, 0, 0, SlateportCity_EventScript_14BCE2, 0 - object_event 13, EVENT_OBJ_GFX_SAILOR, 0, 28, 46, 3, 5, 1, 0, 0, 0, SlateportCity_EventScript_14BCEB, 0 - object_event 14, EVENT_OBJ_GFX_WOMAN_2, 0, 9, 50, 3, 3, 0, 1, 0, 0, SlateportCity_EventScript_14BCF4, 0 - object_event 15, EVENT_OBJ_GFX_MAN_4, 0, 16, 46, 3, 2, 1, 1, 0, 0, SlateportCity_EventScript_14BCFD, 0 - object_event 16, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 12, 18, 3, 2, 1, 1, 0, 0, SlateportCity_EventScript_14BD06, 0 - object_event 17, EVENT_OBJ_GFX_MANIAC, 0, 8, 24, 3, 3, 0, 1, 0, 0, SlateportCity_EventScript_14BCB8, 0 - object_event 18, EVENT_OBJ_GFX_WOMAN_7, 0, 15, 31, 3, 1, 0, 0, 0, 0, SlateportCity_EventScript_14BCD9, 0 - object_event 19, EVENT_OBJ_GFX_VAR_1, 0, 30, 27, 3, 10, 0, 0, 0, 0, SlateportCity_EventScript_14BD51, FLAG_HIDE_EVIL_TEAM_SLATEPORT - object_event 20, EVENT_OBJ_GFX_VAR_1, 0, 29, 27, 3, 10, 0, 0, 0, 0, SlateportCity_EventScript_14BD68, FLAG_HIDE_EVIL_TEAM_SLATEPORT - object_event 21, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 6, 38, 3, 10, 0, 0, 0, 0, SlateportCity_EventScript_14BE20, 0 - object_event 22, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 5, 51, 3, 8, 0, 0, 0, 0, SlateportCity_EventScript_14BDF2, 0 - object_event 23, EVENT_OBJ_GFX_MAN_6, 0, 34, 51, 3, 8, 0, 0, 0, 0, SlateportCity_EventScript_14C029, 0 - object_event 24, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 47, 3, 8, 0, 0, 0, 0, SlateportCity_EventScript_14BAE0, 0 - object_event 25, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 11, 47, 3, 8, 1, 1, 0, 0, SlateportCity_EventScript_14BE9A, FLAG_HIDE_TM_SALESMAN_SLATEPORT - object_event 26, EVENT_OBJ_GFX_MAN_3, 0, 5, 47, 3, 8, 1, 1, 0, 0, SlateportCity_EventScript_14BAB6, 0 - object_event 27, EVENT_OBJ_GFX_VAR_1, 0, 22, 27, 3, 10, 1, 1, 0, 0, SlateportCity_EventScript_14BD7F, FLAG_HIDE_EVIL_TEAM_SLATEPORT - object_event 28, EVENT_OBJ_GFX_VAR_1, 0, 23, 27, 3, 7, 1, 1, 0, 0, SlateportCity_EventScript_14BD96, FLAG_HIDE_EVIL_TEAM_SLATEPORT - object_event 29, EVENT_OBJ_GFX_VAR_1, 0, 24, 27, 3, 10, 1, 1, 0, 0, SlateportCity_EventScript_14BDAD, FLAG_HIDE_EVIL_TEAM_SLATEPORT - object_event 30, EVENT_OBJ_GFX_VAR_1, 0, 21, 26, 3, 10, 1, 1, 0, 0, SlateportCity_EventScript_14BDC4, FLAG_HIDE_EVIL_TEAM_SLATEPORT - object_event 31, EVENT_OBJ_GFX_VAR_1, 0, 20, 26, 3, 10, 1, 1, 0, 0, SlateportCity_EventScript_14BDDB, FLAG_HIDE_EVIL_TEAM_SLATEPORT + object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 21, 11, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SlateportCity_EventScript_14BBD6, 0 + object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 35, 27, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, SlateportCity_EventScript_14BBF3, 0 + object_event 3, EVENT_OBJ_GFX_BOY_4, 0, 15, 13, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 2, 0, 0, SlateportCity_EventScript_14BBB5, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 26, 29, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SlateportCity_EventScript_14BC14, 0 + object_event 5, EVENT_OBJ_GFX_VAR_0, 0, 31, 27, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_EventScript_14BD3A, FLAG_HIDE_EVIL_TEAM_SLATEPORT + object_event 6, EVENT_OBJ_GFX_COOK, 0, 5, 43, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_EventScript_14BB3F, 0 + object_event 7, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 20, 37, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SlateportCity_EventScript_14BB60, 0 + object_event 8, EVENT_OBJ_GFX_GIRL_1, 0, 8, 42, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SlateportCity_EventScript_14BB81, 0 + object_event 9, EVENT_OBJ_GFX_CAMERAMAN, 0, 29, 13, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SlateportCity_EventScript_14C017, FLAG_HIDE_GABBY_AND_TY_SLATEPORT + object_event 10, EVENT_OBJ_GFX_REPORTER_F, 0, 28, 14, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_EventScript_14C020, FLAG_HIDE_GABBY_AND_TY_SLATEPORT + object_event 11, EVENT_OBJ_GFX_SCIENTIST_1, 0, 28, 13, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_EventScript_14BEBC, FLAG_HIDE_STERN_SLATEPORT + object_event 12, EVENT_OBJ_GFX_SAILOR, 0, 35, 36, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_EventScript_14BCE2, 0 + object_event 13, EVENT_OBJ_GFX_SAILOR, 0, 28, 46, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, SlateportCity_EventScript_14BCEB, 0 + object_event 14, EVENT_OBJ_GFX_WOMAN_2, 0, 9, 50, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, SlateportCity_EventScript_14BCF4, 0 + object_event 15, EVENT_OBJ_GFX_MAN_4, 0, 16, 46, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SlateportCity_EventScript_14BCFD, 0 + object_event 16, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 12, 18, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SlateportCity_EventScript_14BD06, 0 + object_event 17, EVENT_OBJ_GFX_MANIAC, 0, 8, 24, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, SlateportCity_EventScript_14BCB8, 0 + object_event 18, EVENT_OBJ_GFX_WOMAN_7, 0, 15, 31, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SlateportCity_EventScript_14BCD9, 0 + object_event 19, EVENT_OBJ_GFX_VAR_1, 0, 30, 27, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_EventScript_14BD51, FLAG_HIDE_EVIL_TEAM_SLATEPORT + object_event 20, EVENT_OBJ_GFX_VAR_1, 0, 29, 27, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_EventScript_14BD68, FLAG_HIDE_EVIL_TEAM_SLATEPORT + object_event 21, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 6, 38, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_EventScript_14BE20, 0 + object_event 22, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 5, 51, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_EventScript_14BDF2, 0 + object_event 23, EVENT_OBJ_GFX_MAN_6, 0, 34, 51, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_EventScript_14C029, 0 + object_event 24, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 47, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_EventScript_14BAE0, 0 + object_event 25, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 11, 47, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SlateportCity_EventScript_14BE9A, FLAG_HIDE_TM_SALESMAN_SLATEPORT + object_event 26, EVENT_OBJ_GFX_MAN_3, 0, 5, 47, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SlateportCity_EventScript_14BAB6, 0 + object_event 27, EVENT_OBJ_GFX_VAR_1, 0, 22, 27, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SlateportCity_EventScript_14BD7F, FLAG_HIDE_EVIL_TEAM_SLATEPORT + object_event 28, EVENT_OBJ_GFX_VAR_1, 0, 23, 27, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, SlateportCity_EventScript_14BD96, FLAG_HIDE_EVIL_TEAM_SLATEPORT + object_event 29, EVENT_OBJ_GFX_VAR_1, 0, 24, 27, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SlateportCity_EventScript_14BDAD, FLAG_HIDE_EVIL_TEAM_SLATEPORT + object_event 30, EVENT_OBJ_GFX_VAR_1, 0, 21, 26, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SlateportCity_EventScript_14BDC4, FLAG_HIDE_EVIL_TEAM_SLATEPORT + object_event 31, EVENT_OBJ_GFX_VAR_1, 0, 20, 26, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SlateportCity_EventScript_14BDDB, FLAG_HIDE_EVIL_TEAM_SLATEPORT SlateportCity_MapWarps:: @ 837FA94 warp_def 19, 19, 0, 0, MAP_SLATEPORT_CITY_POKEMON_CENTER_1F diff --git a/data/maps/SlateportCity_ContestHall/events.inc b/data/maps/SlateportCity_ContestHall/events.inc index b2a57ccc9..4be7d9159 100644 --- a/data/maps/SlateportCity_ContestHall/events.inc +++ b/data/maps/SlateportCity_ContestHall/events.inc @@ -1,17 +1,17 @@ SlateportCity_ContestHall_EventObjects:: @ 83878A4 - object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 19, 15, 3, 2, 2, 2, 0, 0, SlateportCity_ContestHall_EventScript_15554C, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 1, 4, 3, 2, 3, 3, 0, 0, SlateportCity_ContestHall_EventScript_155555, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_4, 0, 9, 8, 3, 8, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_15559F, 0 - object_event 4, EVENT_OBJ_GFX_CONTEST_JUDGE, 0, 12, 8, 3, 8, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_1555B4, 0 - object_event 5, EVENT_OBJ_GFX_GIRL_1, 0, 7, 11, 3, 7, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_1555C9, 0 - object_event 6, EVENT_OBJ_GFX_BOY_2, 0, 9, 11, 3, 7, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_1555DE, 0 - object_event 7, EVENT_OBJ_GFX_BOY_1, 0, 11, 11, 3, 7, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_1555F3, 0 - object_event 8, EVENT_OBJ_GFX_FAT_MAN, 0, 13, 11, 3, 7, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_155608, 0 - object_event 9, EVENT_OBJ_GFX_MANIAC, 0, 8, 6, 3, 8, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_15561D, 0 - object_event 10, EVENT_OBJ_GFX_HIKER, 0, 12, 6, 3, 8, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_155632, 0 - object_event 11, EVENT_OBJ_GFX_BOY_3, 0, 5, 10, 3, 10, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_15565C, 0 - object_event 12, EVENT_OBJ_GFX_BOY_1, 0, 15, 10, 3, 9, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_155647, 0 - object_event 13, EVENT_OBJ_GFX_SAILOR, 0, 0, 17, 3, 2, 1, 4, 0, 0, SlateportCity_ContestHall_EventScript_15555E, 0 + object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 19, 15, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 2, 0, 0, SlateportCity_ContestHall_EventScript_15554C, 0 + object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 1, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 3, 3, 0, 0, SlateportCity_ContestHall_EventScript_155555, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_4, 0, 9, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_15559F, 0 + object_event 4, EVENT_OBJ_GFX_CONTEST_JUDGE, 0, 12, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_1555B4, 0 + object_event 5, EVENT_OBJ_GFX_GIRL_1, 0, 7, 11, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_1555C9, 0 + object_event 6, EVENT_OBJ_GFX_BOY_2, 0, 9, 11, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_1555DE, 0 + object_event 7, EVENT_OBJ_GFX_BOY_1, 0, 11, 11, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_1555F3, 0 + object_event 8, EVENT_OBJ_GFX_FAT_MAN, 0, 13, 11, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_155608, 0 + object_event 9, EVENT_OBJ_GFX_MANIAC, 0, 8, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_15561D, 0 + object_event 10, EVENT_OBJ_GFX_HIKER, 0, 12, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_155632, 0 + object_event 11, EVENT_OBJ_GFX_BOY_3, 0, 5, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_15565C, 0 + object_event 12, EVENT_OBJ_GFX_BOY_1, 0, 15, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_155647, 0 + object_event 13, EVENT_OBJ_GFX_SAILOR, 0, 0, 17, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 4, 0, 0, SlateportCity_ContestHall_EventScript_15555E, 0 SlateportCity_ContestHall_MapWarps:: @ 83879DC warp_def 10, 17, 0, 2, MAP_SLATEPORT_CITY_CONTEST_LOBBY diff --git a/data/maps/SlateportCity_ContestLobby/events.inc b/data/maps/SlateportCity_ContestLobby/events.inc index 8981bf455..8da6e62ad 100644 --- a/data/maps/SlateportCity_ContestLobby/events.inc +++ b/data/maps/SlateportCity_ContestLobby/events.inc @@ -1,12 +1,12 @@ SlateportCity_ContestLobby_EventObjects:: @ 8387788 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 5, 2, 3, 8, 0, 3, 0, 0, SlateportCity_ContestLobby_EventScript_15541D, 0 - object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 11, 5, 3, 10, 0, 0, 0, 0, SlateportCity_ContestLobby_EventScript_1B7795, 0 - object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 0, 3, 3, 3, 0, 1, 0, 0, SlateportCity_ContestLobby_EventScript_1554DE, 0 - object_event 4, EVENT_OBJ_GFX_GIRL_1, 0, 9, 6, 3, 2, 1, 1, 0, 0, SlateportCity_ContestLobby_EventScript_1554E7, 0 - object_event 5, EVENT_OBJ_GFX_REPORTER_M, 0, 7, 5, 3, 9, 0, 0, 0, 0, SlateportCity_ContestLobby_EventScript_1AE0B6, FLAG_HIDE_CONTEST_REPORTER_SLATEPORT - object_event 6, EVENT_OBJ_GFX_BOY_1, 0, 13, 5, 3, 9, 0, 0, 0, 0, SlateportCity_ContestLobby_EventScript_155536, 0 - object_event 7, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 1, 5, 3, 8, 0, 0, 0, 0, SlateportCity_ContestLobby_EventScript_1554F9, 0 - object_event 8, EVENT_OBJ_GFX_WOMAN_3, 0, 12, 2, 3, 8, 0, 0, 0, 0, SlateportCity_ContestLobby_EventScript_1554F0, 0 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 5, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 3, 0, 0, SlateportCity_ContestLobby_EventScript_15541D, 0 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 11, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_ContestLobby_EventScript_1B7795, 0 + object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 0, 3, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, SlateportCity_ContestLobby_EventScript_1554DE, 0 + object_event 4, EVENT_OBJ_GFX_GIRL_1, 0, 9, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SlateportCity_ContestLobby_EventScript_1554E7, 0 + object_event 5, EVENT_OBJ_GFX_REPORTER_M, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SlateportCity_ContestLobby_EventScript_1AE0B6, FLAG_HIDE_CONTEST_REPORTER_SLATEPORT + object_event 6, EVENT_OBJ_GFX_BOY_1, 0, 13, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SlateportCity_ContestLobby_EventScript_155536, 0 + object_event 7, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_ContestLobby_EventScript_1554F9, 0 + object_event 8, EVENT_OBJ_GFX_WOMAN_3, 0, 12, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_ContestLobby_EventScript_1554F0, 0 SlateportCity_ContestLobby_MapWarps:: @ 8387848 warp_def 5, 6, 0, 3, MAP_SLATEPORT_CITY diff --git a/data/maps/SlateportCity_Harbor/events.inc b/data/maps/SlateportCity_Harbor/events.inc index a7581ab2a..85da00123 100644 --- a/data/maps/SlateportCity_Harbor/events.inc +++ b/data/maps/SlateportCity_Harbor/events.inc @@ -1,12 +1,12 @@ SlateportCity_Harbor_EventObjects:: @ 8387F30 - object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 8, 10, 3, 8, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_1560C4, FLAG_HIDE_WORKERS_SLATEPORT_HARBOR - object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 4, 12, 3, 9, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_1561FF, FLAG_HIDE_WORKERS_SLATEPORT_HARBOR - object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 1, 12, 3, 10, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_156208, FLAG_HIDE_WORKERS_SLATEPORT_HARBOR - object_event 4, EVENT_OBJ_GFX_SCIENTIST_1, 0, 6, 13, 3, 1, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_156211, FLAG_HIDE_STERN_SLATEPORT_HARBOR - object_event 5, EVENT_OBJ_GFX_SS_TIDAL, 0, 8, 9, 1, 10, 0, 0, 0, 0, 0x0, FLAG_HIDE_SS_TIDAL_SLATEPORT_HARBOR - object_event 6, EVENT_OBJ_GFX_VAR_1, 0, 7, 10, 3, 10, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNT_1_SLATEPORT_HARBOR - object_event 7, EVENT_OBJ_GFX_VAR_6, 0, 8, 10, 3, 9, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNT_2_SLATEPORT_HARBOR - object_event 8, EVENT_OBJ_GFX_SUBMARINE_SHADOW, 0, 7, 9, 1, 10, 0, 0, 0, 0, 0x0, FLAG_HIDE_SUBMARINE_SHADOW_SLATEPORT_HARBOR + object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 8, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_1560C4, FLAG_HIDE_WORKERS_SLATEPORT_HARBOR + object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 4, 12, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_1561FF, FLAG_HIDE_WORKERS_SLATEPORT_HARBOR + object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 1, 12, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_156208, FLAG_HIDE_WORKERS_SLATEPORT_HARBOR + object_event 4, EVENT_OBJ_GFX_SCIENTIST_1, 0, 6, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_156211, FLAG_HIDE_STERN_SLATEPORT_HARBOR + object_event 5, EVENT_OBJ_GFX_SS_TIDAL, 0, 8, 9, 1, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_SS_TIDAL_SLATEPORT_HARBOR + object_event 6, EVENT_OBJ_GFX_VAR_1, 0, 7, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNT_1_SLATEPORT_HARBOR + object_event 7, EVENT_OBJ_GFX_VAR_6, 0, 8, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNT_2_SLATEPORT_HARBOR + object_event 8, EVENT_OBJ_GFX_SUBMARINE_SHADOW, 0, 7, 9, 1, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_SUBMARINE_SHADOW_SLATEPORT_HARBOR SlateportCity_Harbor_MapWarps:: @ 8387FF0 warp_def 11, 14, 0, 8, MAP_SLATEPORT_CITY diff --git a/data/maps/SlateportCity_House1/events.inc b/data/maps/SlateportCity_House1/events.inc index bc83e91ce..bb9fb2875 100644 --- a/data/maps/SlateportCity_House1/events.inc +++ b/data/maps/SlateportCity_House1/events.inc @@ -1,5 +1,5 @@ SlateportCity_House1_EventObjects:: @ 8387A18 - object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 7, 5, 3, 8, 0, 0, 0, 0, SlateportCity_House1_EventScript_15567B, 0 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_House1_EventScript_15567B, 0 SlateportCity_House1_MapWarps:: @ 8387A30 warp_def 3, 7, 0, 6, MAP_SLATEPORT_CITY diff --git a/data/maps/SlateportCity_House2/events.inc b/data/maps/SlateportCity_House2/events.inc index d115e8225..6c89b9e73 100644 --- a/data/maps/SlateportCity_House2/events.inc +++ b/data/maps/SlateportCity_House2/events.inc @@ -1,6 +1,6 @@ SlateportCity_House2_EventObjects:: @ 8388064 - object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 4, 4, 3, 10, 0, 0, 0, 0, SlateportCity_House2_EventScript_156390, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 7, 4, 3, 9, 0, 0, 0, 0, SlateportCity_House2_EventScript_156399, 0 + object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_House2_EventScript_156390, 0 + object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SlateportCity_House2_EventScript_156399, 0 SlateportCity_House2_MapWarps:: @ 8388094 warp_def 3, 7, 0, 10, MAP_SLATEPORT_CITY diff --git a/data/maps/SlateportCity_Mart/events.inc b/data/maps/SlateportCity_Mart/events.inc index abf6ebdce..03efeb9bb 100644 --- a/data/maps/SlateportCity_Mart/events.inc +++ b/data/maps/SlateportCity_Mart/events.inc @@ -1,7 +1,7 @@ SlateportCity_Mart_EventObjects:: @ 83881B0 - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, 0, SlateportCity_Mart_EventScript_156411, 0 - object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 4, 2, 3, 7, 0, 0, 0, 0, SlateportCity_Mart_EventScript_15643E, 0 - object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 5, 5, 3, 1, 0, 0, 0, 0, SlateportCity_Mart_EventScript_156447, 0 + object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_Mart_EventScript_156411, 0 + object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_Mart_EventScript_15643E, 0 + object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 5, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SlateportCity_Mart_EventScript_156447, 0 SlateportCity_Mart_MapWarps:: @ 83881F8 warp_def 3, 7, 0, 1, MAP_SLATEPORT_CITY diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/events.inc b/data/maps/SlateportCity_OceanicMuseum_1F/events.inc index 825c589de..ba7c570f3 100644 --- a/data/maps/SlateportCity_OceanicMuseum_1F/events.inc +++ b/data/maps/SlateportCity_OceanicMuseum_1F/events.inc @@ -1,18 +1,18 @@ SlateportCity_OceanicMuseum_1F_EventObjects:: @ 8387B38 - object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 7, 7, 3, 10, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155ADB, 0 - object_event 2, EVENT_OBJ_GFX_VAR_1, 0, 18, 5, 3, 7, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BA1, FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 12, 2, 3, 7, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BAA, FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM - object_event 4, EVENT_OBJ_GFX_VAR_1, 0, 2, 8, 3, 7, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155B98, FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM - object_event 5, EVENT_OBJ_GFX_VAR_0, 0, 3, 4, 3, 9, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155B8F, FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM - object_event 6, EVENT_OBJ_GFX_VAR_1, 0, 14, 4, 3, 10, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BB3, FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM - object_event 7, EVENT_OBJ_GFX_BEAUTY, 0, 12, 7, 3, 9, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155ADB, 0 - object_event 8, EVENT_OBJ_GFX_VAR_1, 0, 8, 3, 3, 8, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BBC, FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM - object_event 9, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 2, 3, 1, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C16, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS - object_event 10, EVENT_OBJ_GFX_MANIAC, 0, 10, 2, 3, 7, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C1F, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS - object_event 11, EVENT_OBJ_GFX_MAN_3, 0, 17, 7, 3, 10, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C28, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS - object_event 12, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 18, 8, 3, 7, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C31, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS - object_event 13, EVENT_OBJ_GFX_VAR_1, 0, 9, 4, 3, 21, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C3A, FLAG_HIDE_SCARED_GRUNT_OCEANIC_MUSEUM - object_event 14, EVENT_OBJ_GFX_REPORTER_M, 0, 7, 4, 3, 1, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_1ADEE0, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS + object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 7, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155ADB, 0 + object_event 2, EVENT_OBJ_GFX_VAR_1, 0, 18, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BA1, FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 12, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BAA, FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM + object_event 4, EVENT_OBJ_GFX_VAR_1, 0, 2, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155B98, FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM + object_event 5, EVENT_OBJ_GFX_VAR_0, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155B8F, FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM + object_event 6, EVENT_OBJ_GFX_VAR_1, 0, 14, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BB3, FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM + object_event 7, EVENT_OBJ_GFX_BEAUTY, 0, 12, 7, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155ADB, 0 + object_event 8, EVENT_OBJ_GFX_VAR_1, 0, 8, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BBC, FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM + object_event 9, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C16, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS + object_event 10, EVENT_OBJ_GFX_MANIAC, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C1F, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS + object_event 11, EVENT_OBJ_GFX_MAN_3, 0, 17, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C28, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS + object_event 12, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 18, 8, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C31, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS + object_event 13, EVENT_OBJ_GFX_VAR_1, 0, 9, 4, 3, MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C3A, FLAG_HIDE_SCARED_GRUNT_OCEANIC_MUSEUM + object_event 14, EVENT_OBJ_GFX_REPORTER_M, 0, 7, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_1ADEE0, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS SlateportCity_OceanicMuseum_1F_MapWarps:: @ 8387C88 warp_def 9, 8, 0, 5, MAP_SLATEPORT_CITY diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/events.inc b/data/maps/SlateportCity_OceanicMuseum_2F/events.inc index bb52f2403..2b4760f78 100644 --- a/data/maps/SlateportCity_OceanicMuseum_2F/events.inc +++ b/data/maps/SlateportCity_OceanicMuseum_2F/events.inc @@ -1,11 +1,11 @@ SlateportCity_OceanicMuseum_2F_EventObjects:: @ 8387D70 - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 13, 6, 3, 8, 0, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155CE6, FLAG_HIDE_STERN_OCEANIC_MUSEUM_2F - object_event 2, EVENT_OBJ_GFX_VAR_6, 0, 6, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_HIDE_EVIL_TEAM_LEADER_OCEANIC_MUSEUM_2F - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 6, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNT_1_OCEANIC_MUSEUM_2F - object_event 4, EVENT_OBJ_GFX_VAR_1, 0, 6, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNT_2_OCEANIC_MUSEUM_2F - object_event 5, EVENT_OBJ_GFX_OLD_MAN_2, 0, 12, 7, 3, 10, 1, 1, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F34, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS - object_event 6, EVENT_OBJ_GFX_WOMAN_2, 0, 9, 6, 3, 1, 1, 1, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F3D, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS - object_event 7, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 1, 3, 3, 10, 1, 1, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F46, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS + object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 13, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155CE6, FLAG_HIDE_STERN_OCEANIC_MUSEUM_2F + object_event 2, EVENT_OBJ_GFX_VAR_6, 0, 6, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_EVIL_TEAM_LEADER_OCEANIC_MUSEUM_2F + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 6, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNT_1_OCEANIC_MUSEUM_2F + object_event 4, EVENT_OBJ_GFX_VAR_1, 0, 6, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNT_2_OCEANIC_MUSEUM_2F + object_event 5, EVENT_OBJ_GFX_OLD_MAN_2, 0, 12, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F34, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS + object_event 6, EVENT_OBJ_GFX_WOMAN_2, 0, 9, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F3D, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS + object_event 7, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F46, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS SlateportCity_OceanicMuseum_2F_MapWarps:: @ 8387E18 warp_def 6, 1, 0, 2, MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_1F diff --git a/data/maps/SlateportCity_PokemonCenter_1F/events.inc b/data/maps/SlateportCity_PokemonCenter_1F/events.inc index d4d9ab405..69319b4b4 100644 --- a/data/maps/SlateportCity_PokemonCenter_1F/events.inc +++ b/data/maps/SlateportCity_PokemonCenter_1F/events.inc @@ -1,7 +1,7 @@ SlateportCity_PokemonCenter_1F_EventObjects:: @ 83880B8 - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, SlateportCity_PokemonCenter_1F_EventScript_1563CE, 0 - object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 2, 3, 3, 8, 0, 0, 0, 0, SlateportCity_PokemonCenter_1F_EventScript_1563DC, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 10, 7, 3, 10, 0, 0, 0, 0, SlateportCity_PokemonCenter_1F_EventScript_1563E5, 0 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_PokemonCenter_1F_EventScript_1563CE, 0 + object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_PokemonCenter_1F_EventScript_1563DC, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 10, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_PokemonCenter_1F_EventScript_1563E5, 0 SlateportCity_PokemonCenter_1F_MapWarps:: @ 8388100 warp_def 7, 8, 3, 0, MAP_SLATEPORT_CITY diff --git a/data/maps/SlateportCity_PokemonCenter_2F/events.inc b/data/maps/SlateportCity_PokemonCenter_2F/events.inc index df2da68bb..4ff0809c5 100644 --- a/data/maps/SlateportCity_PokemonCenter_2F/events.inc +++ b/data/maps/SlateportCity_PokemonCenter_2F/events.inc @@ -1,7 +1,7 @@ SlateportCity_PokemonCenter_2F_EventObjects:: @ 838812C - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 2, 3, 8, 0, 0, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_1563FE, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 7, 2, 3, 8, 0, 0, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_156404, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, 8, 0, 0, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_15640A, 0 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_1563FE, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_156404, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_15640A, 0 SlateportCity_PokemonCenter_2F_MapWarps:: @ 8388174 warp_def 1, 5, 4, 2, MAP_SLATEPORT_CITY_POKEMON_CENTER_1F diff --git a/data/maps/SlateportCity_PokemonFanClub/events.inc b/data/maps/SlateportCity_PokemonFanClub/events.inc index 55b0a693d..4201af00e 100644 --- a/data/maps/SlateportCity_PokemonFanClub/events.inc +++ b/data/maps/SlateportCity_PokemonFanClub/events.inc @@ -1,12 +1,12 @@ SlateportCity_PokemonFanClub_EventObjects:: @ 8387A54 - object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 11, 4, 0, 8, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_155A7F, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 1, 5, 0, 3, 0, 1, 0, 0, SlateportCity_PokemonFanClub_EventScript_155A88, 0 - object_event 3, EVENT_OBJ_GFX_REPORTER_F, 0, 11, 5, 0, 7, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_1ADFA0, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 6, 2, 3, 1, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_155A15, 0 - object_event 5, EVENT_OBJ_GFX_GENTLEMAN, 0, 6, 5, 4, 8, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_15576B, 0 - object_event 6, EVENT_OBJ_GFX_ZIGZAGOON, 0, 3, 9, 3, 1, 1, 1, 0, 0, SlateportCity_PokemonFanClub_EventScript_155AA4, 0 - object_event 7, EVENT_OBJ_GFX_SKITTY, 0, 8, 3, 3, 1, 1, 1, 0, 0, SlateportCity_PokemonFanClub_EventScript_155A91, 0 - object_event 8, EVENT_OBJ_GFX_AZUMARILL, 0, 10, 8, 3, 1, 1, 1, 0, 0, SlateportCity_PokemonFanClub_EventScript_155AB7, 0 + object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 11, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_155A7F, 0 + object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 1, 5, 0, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, SlateportCity_PokemonFanClub_EventScript_155A88, 0 + object_event 3, EVENT_OBJ_GFX_REPORTER_F, 0, 11, 5, 0, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_1ADFA0, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 6, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_155A15, 0 + object_event 5, EVENT_OBJ_GFX_GENTLEMAN, 0, 6, 5, 4, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_15576B, 0 + object_event 6, EVENT_OBJ_GFX_ZIGZAGOON, 0, 3, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SlateportCity_PokemonFanClub_EventScript_155AA4, 0 + object_event 7, EVENT_OBJ_GFX_SKITTY, 0, 8, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SlateportCity_PokemonFanClub_EventScript_155A91, 0 + object_event 8, EVENT_OBJ_GFX_AZUMARILL, 0, 10, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SlateportCity_PokemonFanClub_EventScript_155AB7, 0 SlateportCity_PokemonFanClub_MapWarps:: @ 8387B14 warp_def 6, 10, 0, 4, MAP_SLATEPORT_CITY diff --git a/data/maps/SlateportCity_SternsShipyard_1F/events.inc b/data/maps/SlateportCity_SternsShipyard_1F/events.inc index cd5c7c25b..b729cad75 100644 --- a/data/maps/SlateportCity_SternsShipyard_1F/events.inc +++ b/data/maps/SlateportCity_SternsShipyard_1F/events.inc @@ -1,8 +1,8 @@ SlateportCity_SternsShipyard_1F_EventObjects:: @ 8387698 - object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 5, 5, 3, 8, 0, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_155336, 0 - object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 10, 7, 3, 7, 0, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_1553E3, 0 - object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 18, 8, 3, 5, 1, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_1553EC, 0 - object_event 4, EVENT_OBJ_GFX_OLD_MAN_1, 0, 12, 11, 3, 2, 1, 2, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_1553F5, FLAG_HIDE_BRINEY_SLATEPORT_SHIPYARD + object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_155336, 0 + object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 10, 7, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_1553E3, 0 + object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 18, 8, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_1553EC, 0 + object_event 4, EVENT_OBJ_GFX_OLD_MAN_1, 0, 12, 11, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 2, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_1553F5, FLAG_HIDE_BRINEY_SLATEPORT_SHIPYARD SlateportCity_SternsShipyard_1F_MapWarps:: @ 83876F8 warp_def 2, 14, 0, 2, MAP_SLATEPORT_CITY diff --git a/data/maps/SlateportCity_SternsShipyard_2F/events.inc b/data/maps/SlateportCity_SternsShipyard_2F/events.inc index aa5c02e40..09a319dfd 100644 --- a/data/maps/SlateportCity_SternsShipyard_2F/events.inc +++ b/data/maps/SlateportCity_SternsShipyard_2F/events.inc @@ -1,7 +1,7 @@ SlateportCity_SternsShipyard_2F_EventObjects:: @ 8387724 - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 10, 7, 3, 7, 0, 0, 0, 0, 0x0, 0 - object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 8, 4, 3, 10, 0, 0, 0, 0, SlateportCity_SternsShipyard_2F_EventScript_1553FF, 0 - object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 9, 3, 7, 0, 0, 0, 0, SlateportCity_SternsShipyard_2F_EventScript_155408, 0 + object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 10, 7, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0 + object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 8, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_SternsShipyard_2F_EventScript_1553FF, 0 + object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 9, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_SternsShipyard_2F_EventScript_155408, 0 SlateportCity_SternsShipyard_2F_MapWarps:: @ 838776C warp_def 3, 1, 0, 2, MAP_SLATEPORT_CITY_STERNS_SHIPYARD_1F diff --git a/data/maps/SootopolisCity/events.inc b/data/maps/SootopolisCity/events.inc index cb793ea47..955cadb60 100644 --- a/data/maps/SootopolisCity/events.inc +++ b/data/maps/SootopolisCity/events.inc @@ -1,15 +1,15 @@ SootopolisCity_EventObjects:: @ 8380608 - object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 29, 20, 3, 8, 0, 0, 0, 0, SootopolisCity_EventScript_14D18D, FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_1 - object_event 2, EVENT_OBJ_GFX_BEAUTY, 0, 33, 20, 3, 8, 0, 0, 0, 0, SootopolisCity_EventScript_14D196, FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_2 - object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 36, 21, 3, 8, 0, 0, 0, 0, SootopolisCity_EventScript_14D16E, FLAG_HIDE_SOOTOPOLIS_RESIDENTS - object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 47, 42, 3, 8, 0, 0, 0, 0, SootopolisCity_EventScript_14D268, FLAG_HIDE_SOOTOPOLIS_RESIDENTS - object_event 5, EVENT_OBJ_GFX_WALLACE, 0, 32, 21, 3, 9, 0, 0, 0, 0, SootopolisCity_EventScript_14D48F, FLAG_HIDE_WALLACE_SOOTOPOLIS - object_event 6, EVENT_OBJ_GFX_GIRL_2, 0, 9, 43, 3, 5, 1, 0, 0, 0, SootopolisCity_EventScript_14D19F, FLAG_HIDE_SOOTOPOLIS_RESIDENTS - object_event 7, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 51, 14, 3, 8, 0, 0, 0, 0, SootopolisCity_EventScript_14D2C5, FLAG_HIDE_SOOTOPOLIS_RESIDENTS - object_event 8, EVENT_OBJ_GFX_BOY_1, 0, 43, 26, 3, 1, 0, 0, 0, 0, SootopolisCity_EventScript_14D2E4, FLAG_HIDE_SOOTOPOLIS_RESIDENTS - object_event 9, EVENT_OBJ_GFX_MAN_1, 0, 26, 4, 3, 5, 1, 0, 0, 0, SootopolisCity_EventScript_14D287, FLAG_HIDE_SOOTOPOLIS_RESIDENTS - object_event 10, EVENT_OBJ_GFX_STEVEN, 0, 30, 21, 3, 10, 1, 1, 0, 0, SootopolisCity_EventScript_14D498, FLAG_HIDE_STEVEN_SOOTOPOLIS - object_event 11, EVENT_OBJ_GFX_WOMAN_7, 0, 49, 34, 3, 3, 1, 1, 0, 0, SootopolisCity_EventScript_14D2A6, FLAG_HIDE_SOOTOPOLIS_RESIDENTS + object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 29, 20, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SootopolisCity_EventScript_14D18D, FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_1 + object_event 2, EVENT_OBJ_GFX_BEAUTY, 0, 33, 20, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SootopolisCity_EventScript_14D196, FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_2 + object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 36, 21, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SootopolisCity_EventScript_14D16E, FLAG_HIDE_SOOTOPOLIS_RESIDENTS + object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 47, 42, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SootopolisCity_EventScript_14D268, FLAG_HIDE_SOOTOPOLIS_RESIDENTS + object_event 5, EVENT_OBJ_GFX_WALLACE, 0, 32, 21, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SootopolisCity_EventScript_14D48F, FLAG_HIDE_WALLACE_SOOTOPOLIS + object_event 6, EVENT_OBJ_GFX_GIRL_2, 0, 9, 43, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, SootopolisCity_EventScript_14D19F, FLAG_HIDE_SOOTOPOLIS_RESIDENTS + object_event 7, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 51, 14, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SootopolisCity_EventScript_14D2C5, FLAG_HIDE_SOOTOPOLIS_RESIDENTS + object_event 8, EVENT_OBJ_GFX_BOY_1, 0, 43, 26, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SootopolisCity_EventScript_14D2E4, FLAG_HIDE_SOOTOPOLIS_RESIDENTS + object_event 9, EVENT_OBJ_GFX_MAN_1, 0, 26, 4, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, SootopolisCity_EventScript_14D287, FLAG_HIDE_SOOTOPOLIS_RESIDENTS + object_event 10, EVENT_OBJ_GFX_STEVEN, 0, 30, 21, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SootopolisCity_EventScript_14D498, FLAG_HIDE_STEVEN_SOOTOPOLIS + object_event 11, EVENT_OBJ_GFX_WOMAN_7, 0, 49, 34, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 1, 1, 0, 0, SootopolisCity_EventScript_14D2A6, FLAG_HIDE_SOOTOPOLIS_RESIDENTS SootopolisCity_MapWarps:: @ 8380710 warp_def 43, 31, 0, 0, MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_1F diff --git a/data/maps/SootopolisCity_Gym_1F/events.inc b/data/maps/SootopolisCity_Gym_1F/events.inc index 43cd0fe75..bb178f9b9 100644 --- a/data/maps/SootopolisCity_Gym_1F/events.inc +++ b/data/maps/SootopolisCity_Gym_1F/events.inc @@ -1,6 +1,6 @@ SootopolisCity_Gym_1F_EventObjects:: @ 838ACF0 - object_event 1, EVENT_OBJ_GFX_WALLACE, 0, 8, 2, 3, 8, 0, 0, 0, 0, SootopolisCity_Gym_1F_EventScript_15AFFF, FLAG_HIDE_WALLACE_SOOTOPOLIS_GYM - object_event 2, EVENT_OBJ_GFX_MAN_2, 0, 7, 24, 3, 8, 0, 0, 0, 0, SootopolisCity_Gym_1F_EventScript_15B084, 0 + object_event 1, EVENT_OBJ_GFX_WALLACE, 0, 8, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SootopolisCity_Gym_1F_EventScript_15AFFF, FLAG_HIDE_WALLACE_SOOTOPOLIS_GYM + object_event 2, EVENT_OBJ_GFX_MAN_2, 0, 7, 24, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SootopolisCity_Gym_1F_EventScript_15B084, 0 SootopolisCity_Gym_1F_MapWarps:: @ 838AD20 warp_def 8, 25, 0, 2, MAP_SOOTOPOLIS_CITY diff --git a/data/maps/SootopolisCity_Gym_B1F/events.inc b/data/maps/SootopolisCity_Gym_B1F/events.inc index 9ccf07ef6..542326bfe 100644 --- a/data/maps/SootopolisCity_Gym_B1F/events.inc +++ b/data/maps/SootopolisCity_Gym_B1F/events.inc @@ -1,12 +1,12 @@ SootopolisCity_Gym_B1F_EventObjects:: @ 838AD64 - object_event 1, EVENT_OBJ_GFX_LASS, 0, 7, 19, 3, 10, 0, 0, 1, 1, SootopolisCity_Gym_B1F_EventScript_15B0D8, 0 - object_event 2, EVENT_OBJ_GFX_BEAUTY, 0, 9, 17, 3, 9, 0, 0, 1, 1, SootopolisCity_Gym_B1F_EventScript_15B11D, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_3, 0, 9, 14, 3, 9, 0, 0, 1, 1, SootopolisCity_Gym_B1F_EventScript_15B106, 0 - object_event 4, EVENT_OBJ_GFX_BEAUTY, 0, 6, 13, 3, 10, 0, 0, 1, 5, SootopolisCity_Gym_B1F_EventScript_15B134, 0 - object_event 5, EVENT_OBJ_GFX_BEAUTY, 0, 3, 9, 3, 10, 0, 0, 1, 4, SootopolisCity_Gym_B1F_EventScript_15B162, 0 - object_event 6, EVENT_OBJ_GFX_WOMAN_2, 0, 11, 9, 3, 9, 0, 0, 1, 2, SootopolisCity_Gym_B1F_EventScript_15B179, 0 - object_event 7, EVENT_OBJ_GFX_LASS, 0, 8, 7, 3, 8, 0, 0, 1, 2, SootopolisCity_Gym_B1F_EventScript_15B0EF, 0 - object_event 8, EVENT_OBJ_GFX_BEAUTY, 0, 12, 7, 3, 9, 0, 0, 1, 3, SootopolisCity_Gym_B1F_EventScript_15B14B, 0 + object_event 1, EVENT_OBJ_GFX_LASS, 0, 7, 19, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 1, SootopolisCity_Gym_B1F_EventScript_15B0D8, 0 + object_event 2, EVENT_OBJ_GFX_BEAUTY, 0, 9, 17, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 1, SootopolisCity_Gym_B1F_EventScript_15B11D, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_3, 0, 9, 14, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 1, SootopolisCity_Gym_B1F_EventScript_15B106, 0 + object_event 4, EVENT_OBJ_GFX_BEAUTY, 0, 6, 13, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 5, SootopolisCity_Gym_B1F_EventScript_15B134, 0 + object_event 5, EVENT_OBJ_GFX_BEAUTY, 0, 3, 9, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 4, SootopolisCity_Gym_B1F_EventScript_15B162, 0 + object_event 6, EVENT_OBJ_GFX_WOMAN_2, 0, 11, 9, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, SootopolisCity_Gym_B1F_EventScript_15B179, 0 + object_event 7, EVENT_OBJ_GFX_LASS, 0, 8, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 2, SootopolisCity_Gym_B1F_EventScript_15B0EF, 0 + object_event 8, EVENT_OBJ_GFX_BEAUTY, 0, 12, 7, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 3, SootopolisCity_Gym_B1F_EventScript_15B14B, 0 SootopolisCity_Gym_B1F_MapWarps:: @ 838AE24 warp_def 11, 22, 3, 2, MAP_SOOTOPOLIS_CITY_GYM_1F diff --git a/data/maps/SootopolisCity_House1/events.inc b/data/maps/SootopolisCity_House1/events.inc index a4b4c7932..fb7a318d2 100644 --- a/data/maps/SootopolisCity_House1/events.inc +++ b/data/maps/SootopolisCity_House1/events.inc @@ -1,6 +1,6 @@ SootopolisCity_House1_EventObjects:: @ 838AFA4 - object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 2, 4, 3, 10, 0, 0, 0, 0, SootopolisCity_House1_EventScript_15B29B, 0 - object_event 2, EVENT_OBJ_GFX_KECLEON_1, 0, 2, 3, 3, 8, 0, 0, 0, 0, SootopolisCity_House1_EventScript_15B2D1, 0 + object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 2, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SootopolisCity_House1_EventScript_15B29B, 0 + object_event 2, EVENT_OBJ_GFX_KECLEON_1, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SootopolisCity_House1_EventScript_15B2D1, 0 SootopolisCity_House1_MapWarps:: @ 838AFD4 warp_def 3, 6, 0, 4, MAP_SOOTOPOLIS_CITY diff --git a/data/maps/SootopolisCity_House2/events.inc b/data/maps/SootopolisCity_House2/events.inc index 146a1d871..241961795 100644 --- a/data/maps/SootopolisCity_House2/events.inc +++ b/data/maps/SootopolisCity_House2/events.inc @@ -1,5 +1,5 @@ SootopolisCity_House2_EventObjects:: @ 838AFF8 - object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 3, 3, 3, 10, 0, 0, 0, 0, SootopolisCity_House2_EventScript_15B2E5, 0 + object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 3, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SootopolisCity_House2_EventScript_15B2E5, 0 SootopolisCity_House2_MapWarps:: @ 838B010 warp_def 3, 6, 0, 5, MAP_SOOTOPOLIS_CITY diff --git a/data/maps/SootopolisCity_House3/events.inc b/data/maps/SootopolisCity_House3/events.inc index d813189e8..987aa7a30 100644 --- a/data/maps/SootopolisCity_House3/events.inc +++ b/data/maps/SootopolisCity_House3/events.inc @@ -1,6 +1,6 @@ SootopolisCity_House3_EventObjects:: @ 838B034 - object_event 1, EVENT_OBJ_GFX_WOMAN_5, 0, 2, 4, 3, 8, 0, 0, 0, 0, SootopolisCity_House3_EventScript_15B31A, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_2, 0, 6, 4, 3, 2, 1, 1, 0, 0, SootopolisCity_House3_EventScript_15B343, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_5, 0, 2, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SootopolisCity_House3_EventScript_15B31A, 0 + object_event 2, EVENT_OBJ_GFX_GIRL_2, 0, 6, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SootopolisCity_House3_EventScript_15B343, 0 SootopolisCity_House3_MapWarps:: @ 838B064 warp_def 3, 6, 0, 6, MAP_SOOTOPOLIS_CITY diff --git a/data/maps/SootopolisCity_House4/events.inc b/data/maps/SootopolisCity_House4/events.inc index 128d0ff99..6f4eeb127 100644 --- a/data/maps/SootopolisCity_House4/events.inc +++ b/data/maps/SootopolisCity_House4/events.inc @@ -1,7 +1,7 @@ SootopolisCity_House4_EventObjects:: @ 838B088 - object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 2, 4, 3, 10, 0, 0, 0, 0, SootopolisCity_House4_EventScript_15B34D, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 5, 2, 3, 7, 1, 2, 0, 0, SootopolisCity_House4_EventScript_15B356, 0 - object_event 3, EVENT_OBJ_GFX_AZUMARILL, 0, 2, 3, 3, 1, 1, 1, 0, 0, SootopolisCity_House4_EventScript_15B35F, 0 + object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 2, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SootopolisCity_House4_EventScript_15B34D, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 5, 2, 3, MOVEMENT_TYPE_FACE_UP, 1, 2, 0, 0, SootopolisCity_House4_EventScript_15B356, 0 + object_event 3, EVENT_OBJ_GFX_AZUMARILL, 0, 2, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SootopolisCity_House4_EventScript_15B35F, 0 SootopolisCity_House4_MapWarps:: @ 838B0D0 warp_def 3, 6, 0, 7, MAP_SOOTOPOLIS_CITY diff --git a/data/maps/SootopolisCity_House5/events.inc b/data/maps/SootopolisCity_House5/events.inc index 2217f3e0f..f256463bb 100644 --- a/data/maps/SootopolisCity_House5/events.inc +++ b/data/maps/SootopolisCity_House5/events.inc @@ -1,6 +1,6 @@ SootopolisCity_House5_EventObjects:: @ 838B0F4 - object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 3, 3, 3, 10, 0, 0, 0, 0, SootopolisCity_House5_EventScript_15B373, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 6, 3, 3, 9, 0, 0, 0, 0, SootopolisCity_House5_EventScript_15B37C, 0 + object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 3, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SootopolisCity_House5_EventScript_15B373, 0 + object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 6, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SootopolisCity_House5_EventScript_15B37C, 0 SootopolisCity_House5_MapWarps:: @ 838B124 warp_def 3, 6, 0, 8, MAP_SOOTOPOLIS_CITY diff --git a/data/maps/SootopolisCity_House6/events.inc b/data/maps/SootopolisCity_House6/events.inc index a189b98ba..24534b199 100644 --- a/data/maps/SootopolisCity_House6/events.inc +++ b/data/maps/SootopolisCity_House6/events.inc @@ -1,5 +1,5 @@ SootopolisCity_House6_EventObjects:: @ 838B148 - object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 4, 3, 3, 2, 1, 1, 0, 0, SootopolisCity_House6_EventScript_15B386, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 4, 3, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SootopolisCity_House6_EventScript_15B386, 0 SootopolisCity_House6_MapWarps:: @ 838B160 warp_def 3, 6, 0, 9, MAP_SOOTOPOLIS_CITY diff --git a/data/maps/SootopolisCity_House7/events.inc b/data/maps/SootopolisCity_House7/events.inc index 39bc71e79..291e041cb 100644 --- a/data/maps/SootopolisCity_House7/events.inc +++ b/data/maps/SootopolisCity_House7/events.inc @@ -1,6 +1,6 @@ SootopolisCity_House7_EventObjects:: @ 838B184 - object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 5, 3, 3, 9, 0, 0, 0, 0, SootopolisCity_House7_EventScript_15B3EE, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 1, 4, 3, 2, 1, 1, 0, 0, SootopolisCity_House7_EventScript_15B3F7, 0 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 5, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SootopolisCity_House7_EventScript_15B3EE, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 1, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SootopolisCity_House7_EventScript_15B3F7, 0 SootopolisCity_House7_MapWarps:: @ 838B1B4 warp_def 3, 6, 0, 10, MAP_SOOTOPOLIS_CITY diff --git a/data/maps/SootopolisCity_House8/events.inc b/data/maps/SootopolisCity_House8/events.inc index d6b139f34..e05198354 100644 --- a/data/maps/SootopolisCity_House8/events.inc +++ b/data/maps/SootopolisCity_House8/events.inc @@ -1,6 +1,6 @@ SootopolisCity_House8_EventObjects:: @ 838B1D8 - object_event 1, EVENT_OBJ_GFX_FISHERMAN, 0, 2, 4, 3, 10, 0, 0, 0, 0, SootopolisCity_House8_EventScript_15B492, 0 - object_event 2, EVENT_OBJ_GFX_HIKER, 0, 5, 4, 3, 9, 0, 0, 0, 0, SootopolisCity_House8_EventScript_15B401, 0 + object_event 1, EVENT_OBJ_GFX_FISHERMAN, 0, 2, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SootopolisCity_House8_EventScript_15B492, 0 + object_event 2, EVENT_OBJ_GFX_HIKER, 0, 5, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SootopolisCity_House8_EventScript_15B401, 0 SootopolisCity_House8_MapWarps:: @ 838B208 warp_def 3, 6, 0, 11, MAP_SOOTOPOLIS_CITY diff --git a/data/maps/SootopolisCity_Mart/events.inc b/data/maps/SootopolisCity_Mart/events.inc index 38d3f30f0..ba99aa4de 100644 --- a/data/maps/SootopolisCity_Mart/events.inc +++ b/data/maps/SootopolisCity_Mart/events.inc @@ -1,7 +1,7 @@ SootopolisCity_Mart_EventObjects:: @ 838AF38 - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, 0, SootopolisCity_Mart_EventScript_15B21B, 0 - object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 5, 5, 3, 10, 0, 0, 0, 0, SootopolisCity_Mart_EventScript_15B24A, 0 - object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 9, 5, 3, 10, 0, 0, 0, 0, SootopolisCity_Mart_EventScript_15B272, 0 + object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SootopolisCity_Mart_EventScript_15B21B, 0 + object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SootopolisCity_Mart_EventScript_15B24A, 0 + object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 9, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SootopolisCity_Mart_EventScript_15B272, 0 SootopolisCity_Mart_MapWarps:: @ 838AF80 warp_def 3, 7, 0, 1, MAP_SOOTOPOLIS_CITY diff --git a/data/maps/SootopolisCity_PokemonCenter_1F/events.inc b/data/maps/SootopolisCity_PokemonCenter_1F/events.inc index 8852ba87c..f2c8fb7d1 100644 --- a/data/maps/SootopolisCity_PokemonCenter_1F/events.inc +++ b/data/maps/SootopolisCity_PokemonCenter_1F/events.inc @@ -1,7 +1,7 @@ SootopolisCity_PokemonCenter_1F_EventObjects:: @ 838AE40 - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_15BC70, 0 - object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 12, 4, 3, 2, 1, 1, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_15B1A8, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 7, 3, 5, 1, 0, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_15B1D0, 0 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_15BC70, 0 + object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 12, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_15B1A8, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 7, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_15B1D0, 0 SootopolisCity_PokemonCenter_1F_MapWarps:: @ 838AE88 warp_def 7, 8, 3, 0, MAP_SOOTOPOLIS_CITY diff --git a/data/maps/SootopolisCity_PokemonCenter_2F/events.inc b/data/maps/SootopolisCity_PokemonCenter_2F/events.inc index 2b6b7a022..4117f8e0f 100644 --- a/data/maps/SootopolisCity_PokemonCenter_2F/events.inc +++ b/data/maps/SootopolisCity_PokemonCenter_2F/events.inc @@ -1,7 +1,7 @@ SootopolisCity_PokemonCenter_2F_EventObjects:: @ 838AEB4 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 2, 3, 8, 0, 0, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_15B208, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 7, 2, 3, 8, 0, 0, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_15B20E, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, 8, 0, 0, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_15B214, 0 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_15B208, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_15B20E, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_15B214, 0 SootopolisCity_PokemonCenter_2F_MapWarps:: @ 838AEFC warp_def 1, 5, 4, 2, MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_1F diff --git a/data/maps/SouthernIsland_Exterior/events.inc b/data/maps/SouthernIsland_Exterior/events.inc index 38ff07de5..4b934883b 100644 --- a/data/maps/SouthernIsland_Exterior/events.inc +++ b/data/maps/SouthernIsland_Exterior/events.inc @@ -1,6 +1,6 @@ SouthernIsland_Exterior_EventObjects:: @ 8391E00 - object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 13, 23, 3, 7, 0, 0, 0, 0, SouthernIsland_Exterior_EventScript_160AE0, 0 - object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 13, 25, 1, 10, 0, 0, 0, 0, 0x0, 0 + object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 13, 23, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SouthernIsland_Exterior_EventScript_160AE0, 0 + object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 13, 25, 1, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 0 SouthernIsland_Exterior_MapWarps:: @ 8391E30 warp_def 14, 5, 3, 0, MAP_SOUTHERN_ISLAND_INTERIOR diff --git a/data/maps/SouthernIsland_Interior/events.inc b/data/maps/SouthernIsland_Interior/events.inc index cba468ef7..8e7405bfb 100644 --- a/data/maps/SouthernIsland_Interior/events.inc +++ b/data/maps/SouthernIsland_Interior/events.inc @@ -1,6 +1,6 @@ SouthernIsland_Interior_EventObjects:: @ 8391E60 - object_event 1, EVENT_OBJ_GFX_VAR_0, 0, 13, 12, 3, 7, 0, 0, 0, 0, 0x0, FLAG_HIDE_LATIOS_OR_LATIAS_FLYING - object_event 2, EVENT_OBJ_GFX_VAR_1, 0, 13, 2, 0, 8, 0, 0, 0, 0, 0x0, FLAG_HIDE_LATIOS_OR_LATIAS_STATIONARY + object_event 1, EVENT_OBJ_GFX_VAR_0, 0, 13, 12, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_LATIOS_OR_LATIAS_FLYING + object_event 2, EVENT_OBJ_GFX_VAR_1, 0, 13, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_LATIOS_OR_LATIAS_STATIONARY SouthernIsland_Interior_MapWarps:: @ 8391E90 warp_def 13, 18, 3, 0, MAP_SOUTHERN_ISLAND_EXTERIOR diff --git a/data/maps/TradeCenter/events.inc b/data/maps/TradeCenter/events.inc index bb69d402e..121518f90 100644 --- a/data/maps/TradeCenter/events.inc +++ b/data/maps/TradeCenter/events.inc @@ -1,5 +1,5 @@ TradeCenter_EventObjects:: @ 8391340 - object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 9, 6, 3, 9, 0, 0, 0, 0, TradeCenter_EventScript_1A44AD, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 9, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, TradeCenter_EventScript_1A44AD, 0 TradeCenter_MapWarps:: @ 8391358 warp_def 5, 8, 3, 127, MAP_NONE diff --git a/data/maps/Underwater_SeafloorCavern/events.inc b/data/maps/Underwater_SeafloorCavern/events.inc index 3b1798716..db16aaab4 100644 --- a/data/maps/Underwater_SeafloorCavern/events.inc +++ b/data/maps/Underwater_SeafloorCavern/events.inc @@ -1,8 +1,8 @@ Underwater_SeafloorCavern_EventObjects:: @ 838D018 - object_event 1, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 5, 4, 3, 76, 1, 1, 0, 0, Underwater_SeafloorCavern_EventScript_15DA3F, FLAG_HIDE_UNDERWATER_SUBMARINE_INTERACTION - object_event 2, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 6, 4, 3, 76, 1, 1, 0, 0, Underwater_SeafloorCavern_EventScript_15DA3F, FLAG_HIDE_UNDERWATER_SUBMARINE_INTERACTION - object_event 3, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 7, 4, 3, 76, 1, 1, 0, 0, Underwater_SeafloorCavern_EventScript_15DA3F, FLAG_HIDE_UNDERWATER_SUBMARINE_INTERACTION - object_event 4, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 8, 4, 3, 76, 1, 1, 0, 0, Underwater_SeafloorCavern_EventScript_15DA3F, FLAG_HIDE_UNDERWATER_SUBMARINE_INTERACTION + object_event 1, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 5, 4, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Underwater_SeafloorCavern_EventScript_15DA3F, FLAG_HIDE_UNDERWATER_SUBMARINE_INTERACTION + object_event 2, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 6, 4, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Underwater_SeafloorCavern_EventScript_15DA3F, FLAG_HIDE_UNDERWATER_SUBMARINE_INTERACTION + object_event 3, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 7, 4, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Underwater_SeafloorCavern_EventScript_15DA3F, FLAG_HIDE_UNDERWATER_SUBMARINE_INTERACTION + object_event 4, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 8, 4, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Underwater_SeafloorCavern_EventScript_15DA3F, FLAG_HIDE_UNDERWATER_SUBMARINE_INTERACTION Underwater_SeafloorCavern_MapWarps:: @ 838D078 warp_def 6, 7, 0, 0, MAP_UNDERWATER4 diff --git a/data/maps/VerdanturfTown/events.inc b/data/maps/VerdanturfTown/events.inc index 920703b72..1608835ca 100644 --- a/data/maps/VerdanturfTown/events.inc +++ b/data/maps/VerdanturfTown/events.inc @@ -1,8 +1,8 @@ VerdanturfTown_EventObjects:: @ 8380F00 - object_event 1, EVENT_OBJ_GFX_MAN_2, 0, 4, 17, 3, 5, 1, 0, 0, 0, VerdanturfTown_EventScript_14E899, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 9, 2, 3, 9, 1, 0, 0, 0, VerdanturfTown_EventScript_14E866, 0 - object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 11, 9, 3, 3, 0, 1, 0, 0, VerdanturfTown_EventScript_14E8AB, 0 - object_event 4, EVENT_OBJ_GFX_CAMPER, 0, 6, 10, 3, 5, 1, 0, 0, 0, VerdanturfTown_EventScript_14E8A2, 0 + object_event 1, EVENT_OBJ_GFX_MAN_2, 0, 4, 17, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, VerdanturfTown_EventScript_14E899, 0 + object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 9, 2, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 0, 0, 0, VerdanturfTown_EventScript_14E866, 0 + object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 11, 9, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, VerdanturfTown_EventScript_14E8AB, 0 + object_event 4, EVENT_OBJ_GFX_CAMPER, 0, 6, 10, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, VerdanturfTown_EventScript_14E8A2, 0 VerdanturfTown_MapWarps:: @ 8380F60 warp_def 4, 7, 0, 0, MAP_VERDANTURF_TOWN_CONTEST_LOBBY diff --git a/data/maps/VerdanturfTown_ContestHall/events.inc b/data/maps/VerdanturfTown_ContestHall/events.inc index 78224364f..c524c05ee 100644 --- a/data/maps/VerdanturfTown_ContestHall/events.inc +++ b/data/maps/VerdanturfTown_ContestHall/events.inc @@ -1,7 +1,7 @@ VerdanturfTown_ContestHall_EventObjects:: @ 8386AEC - object_event 1, EVENT_OBJ_GFX_BOY_4, 0, 0, 7, 0, 2, 1, 3, 0, 0, VerdanturfTown_ContestHall_EventScript_153EA9, 0 - object_event 2, EVENT_OBJ_GFX_BOY_3, 0, 20, 15, 0, 2, 1, 1, 0, 0, VerdanturfTown_ContestHall_EventScript_153E97, 0 - object_event 3, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 9, 8, 3, 2, 2, 2, 0, 0, VerdanturfTown_ContestHall_EventScript_153EA0, 0 + object_event 1, EVENT_OBJ_GFX_BOY_4, 0, 0, 7, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 3, 0, 0, VerdanturfTown_ContestHall_EventScript_153EA9, 0 + object_event 2, EVENT_OBJ_GFX_BOY_3, 0, 20, 15, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, VerdanturfTown_ContestHall_EventScript_153E97, 0 + object_event 3, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 9, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 2, 0, 0, VerdanturfTown_ContestHall_EventScript_153EA0, 0 VerdanturfTown_ContestHall_MapWarps:: @ 8386B34 warp_def 11, 17, 0, 2, MAP_VERDANTURF_TOWN_CONTEST_LOBBY diff --git a/data/maps/VerdanturfTown_ContestLobby/events.inc b/data/maps/VerdanturfTown_ContestLobby/events.inc index 3ab316792..7a4027fbb 100644 --- a/data/maps/VerdanturfTown_ContestLobby/events.inc +++ b/data/maps/VerdanturfTown_ContestLobby/events.inc @@ -1,10 +1,10 @@ VerdanturfTown_ContestLobby_EventObjects:: @ 8386A00 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 5, 2, 3, 8, 0, 3, 0, 0, VerdanturfTown_ContestLobby_EventScript_153D76, 0 - object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 11, 5, 3, 10, 0, 0, 0, 0, VerdanturfTown_ContestLobby_EventScript_1B77A0, 0 - object_event 3, EVENT_OBJ_GFX_GIRL_1, 0, 14, 2, 3, 9, 0, 0, 0, 0, VerdanturfTown_ContestLobby_EventScript_153E47, 0 - object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 1, 6, 3, 2, 1, 1, 0, 0, VerdanturfTown_ContestLobby_EventScript_153E3E, 0 - object_event 5, EVENT_OBJ_GFX_REPORTER_M, 0, 7, 5, 3, 9, 0, 0, 0, 0, VerdanturfTown_ContestLobby_EventScript_1AE0B6, FLAG_HIDE_CONTEST_REPORTER_VERDANTURF - object_event 6, EVENT_OBJ_GFX_BOY_3, 0, 0, 3, 3, 3, 0, 1, 0, 0, VerdanturfTown_ContestLobby_EventScript_153E80, 0 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 5, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 3, 0, 0, VerdanturfTown_ContestLobby_EventScript_153D76, 0 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 11, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, VerdanturfTown_ContestLobby_EventScript_1B77A0, 0 + object_event 3, EVENT_OBJ_GFX_GIRL_1, 0, 14, 2, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, VerdanturfTown_ContestLobby_EventScript_153E47, 0 + object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 1, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, VerdanturfTown_ContestLobby_EventScript_153E3E, 0 + object_event 5, EVENT_OBJ_GFX_REPORTER_M, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, VerdanturfTown_ContestLobby_EventScript_1AE0B6, FLAG_HIDE_CONTEST_REPORTER_VERDANTURF + object_event 6, EVENT_OBJ_GFX_BOY_3, 0, 0, 3, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, VerdanturfTown_ContestLobby_EventScript_153E80, 0 VerdanturfTown_ContestLobby_MapWarps:: @ 8386A90 warp_def 5, 6, 0, 0, MAP_VERDANTURF_TOWN diff --git a/data/maps/VerdanturfTown_FriendshipRatersHouse/events.inc b/data/maps/VerdanturfTown_FriendshipRatersHouse/events.inc index c03706d90..81b2a84de 100644 --- a/data/maps/VerdanturfTown_FriendshipRatersHouse/events.inc +++ b/data/maps/VerdanturfTown_FriendshipRatersHouse/events.inc @@ -1,6 +1,6 @@ VerdanturfTown_FriendshipRatersHouse_EventObjects:: @ 8386D88 - object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 3, 4, 3, 8, 0, 0, 0, 0, VerdanturfTown_FriendshipRatersHouse_EventScript_154030, 0 - object_event 2, EVENT_OBJ_GFX_PIKACHU, 0, 4, 4, 3, 8, 0, 0, 0, 0, VerdanturfTown_FriendshipRatersHouse_EventScript_1540D9, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, VerdanturfTown_FriendshipRatersHouse_EventScript_154030, 0 + object_event 2, EVENT_OBJ_GFX_PIKACHU, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, VerdanturfTown_FriendshipRatersHouse_EventScript_1540D9, 0 VerdanturfTown_FriendshipRatersHouse_MapWarps:: @ 8386DB8 warp_def 3, 7, 0, 5, MAP_VERDANTURF_TOWN diff --git a/data/maps/VerdanturfTown_House/events.inc b/data/maps/VerdanturfTown_House/events.inc index ca7d2a4dd..b0856c090 100644 --- a/data/maps/VerdanturfTown_House/events.inc +++ b/data/maps/VerdanturfTown_House/events.inc @@ -1,6 +1,6 @@ VerdanturfTown_House_EventObjects:: @ 8386DDC - object_event 1, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 5, 3, 7, 0, 0, 0, 0, VerdanturfTown_House_EventScript_1540ED, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 4, 3, 8, 0, 0, 0, 0, VerdanturfTown_House_EventScript_1540F6, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, VerdanturfTown_House_EventScript_1540ED, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, VerdanturfTown_House_EventScript_1540F6, 0 VerdanturfTown_House_MapWarps:: @ 8386E0C warp_def 3, 8, 0, 6, MAP_VERDANTURF_TOWN diff --git a/data/maps/VerdanturfTown_Mart/events.inc b/data/maps/VerdanturfTown_Mart/events.inc index f4ca8b8f3..0565d10b4 100644 --- a/data/maps/VerdanturfTown_Mart/events.inc +++ b/data/maps/VerdanturfTown_Mart/events.inc @@ -1,8 +1,8 @@ VerdanturfTown_Mart_EventObjects:: @ 8386B70 - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, 0, VerdanturfTown_Mart_EventScript_153EBC, 0 - object_event 2, EVENT_OBJ_GFX_BOY_2, 0, 5, 4, 3, 10, 0, 0, 0, 0, VerdanturfTown_Mart_EventScript_153EEE, 0 - object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 8, 5, 3, 9, 0, 0, 0, 0, VerdanturfTown_Mart_EventScript_153EF7, 0 - object_event 4, EVENT_OBJ_GFX_LASS, 0, 3, 2, 3, 9, 1, 1, 0, 0, VerdanturfTown_Mart_EventScript_153F00, 0 + object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, VerdanturfTown_Mart_EventScript_153EBC, 0 + object_event 2, EVENT_OBJ_GFX_BOY_2, 0, 5, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, VerdanturfTown_Mart_EventScript_153EEE, 0 + object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 8, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, VerdanturfTown_Mart_EventScript_153EF7, 0 + object_event 4, EVENT_OBJ_GFX_LASS, 0, 3, 2, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, VerdanturfTown_Mart_EventScript_153F00, 0 VerdanturfTown_Mart_MapWarps:: @ 8386BD0 warp_def 3, 7, 0, 1, MAP_VERDANTURF_TOWN diff --git a/data/maps/VerdanturfTown_PokemonCenter_1F/events.inc b/data/maps/VerdanturfTown_PokemonCenter_1F/events.inc index 8cf8b1dab..b5d3c658a 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_1F/events.inc +++ b/data/maps/VerdanturfTown_PokemonCenter_1F/events.inc @@ -1,7 +1,7 @@ VerdanturfTown_PokemonCenter_1F_EventObjects:: @ 8386BF4 - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_153F18, 0 - object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 4, 5, 3, 5, 1, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_153F26, 0 - object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 12, 2, 3, 7, 0, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_153F2F, 0 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_153F18, 0 + object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 4, 5, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_153F26, 0 + object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 12, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_153F2F, 0 VerdanturfTown_PokemonCenter_1F_MapWarps:: @ 8386C3C warp_def 7, 8, 3, 2, MAP_VERDANTURF_TOWN diff --git a/data/maps/VerdanturfTown_PokemonCenter_2F/events.inc b/data/maps/VerdanturfTown_PokemonCenter_2F/events.inc index 51fe22275..1e99a098d 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_2F/events.inc +++ b/data/maps/VerdanturfTown_PokemonCenter_2F/events.inc @@ -1,7 +1,7 @@ VerdanturfTown_PokemonCenter_2F_EventObjects:: @ 8386C68 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 2, 3, 8, 0, 0, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_153F48, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 7, 2, 3, 8, 0, 0, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_153F4E, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, 8, 0, 0, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_153F54, 0 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_153F48, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_153F4E, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_153F54, 0 VerdanturfTown_PokemonCenter_2F_MapWarps:: @ 8386CB0 warp_def 1, 5, 4, 2, MAP_VERDANTURF_TOWN_POKEMON_CENTER_1F diff --git a/data/maps/VerdanturfTown_WandasHouse/events.inc b/data/maps/VerdanturfTown_WandasHouse/events.inc index 709c5aeb6..462b93b73 100644 --- a/data/maps/VerdanturfTown_WandasHouse/events.inc +++ b/data/maps/VerdanturfTown_WandasHouse/events.inc @@ -1,9 +1,9 @@ VerdanturfTown_WandasHouse_EventObjects:: @ 8386CEC - object_event 1, EVENT_OBJ_GFX_WALLY, 0, 14, 5, 3, 2, 1, 1, 0, 0, VerdanturfTown_WandasHouse_EventScript_153F5B, FLAG_HIDE_WALLY_WANDAS_HOUSE - object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 5, 4, 3, 8, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_153FAF, FLAG_HIDE_BOYFRIEND_WANDAS_HOUSE - object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 7, 2, 3, 8, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_153F7D, FLAG_HIDE_WALLY_FATHER_WANDAS_HOUSE - object_event 4, EVENT_OBJ_GFX_WOMAN_2, 0, 2, 4, 3, 10, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_153FEA, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_3, 0, 5, 5, 3, 9, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_153FB8, FLAG_HIDE_GIRLFRIEND_WANDAS_HOUSE + object_event 1, EVENT_OBJ_GFX_WALLY, 0, 14, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, VerdanturfTown_WandasHouse_EventScript_153F5B, FLAG_HIDE_WALLY_WANDAS_HOUSE + object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 5, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_153FAF, FLAG_HIDE_BOYFRIEND_WANDAS_HOUSE + object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_153F7D, FLAG_HIDE_WALLY_FATHER_WANDAS_HOUSE + object_event 4, EVENT_OBJ_GFX_WOMAN_2, 0, 2, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_153FEA, 0 + object_event 5, EVENT_OBJ_GFX_WOMAN_3, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_153FB8, FLAG_HIDE_GIRLFRIEND_WANDAS_HOUSE VerdanturfTown_WandasHouse_MapWarps:: @ 8386D64 warp_def 7, 7, 0, 3, MAP_VERDANTURF_TOWN diff --git a/data/maps/VictoryRoad_1F/events.inc b/data/maps/VictoryRoad_1F/events.inc index 916e9bfc2..1b3fc3e1c 100644 --- a/data/maps/VictoryRoad_1F/events.inc +++ b/data/maps/VictoryRoad_1F/events.inc @@ -1,11 +1,11 @@ VictoryRoad_1F_EventObjects:: @ 838D8E4 - object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 33, 22, 3, 8, 0, 0, 1, 3, VictoryRoad_1F_EventScript_15DF6F, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 6, 15, 4, 9, 0, 0, 1, 4, VictoryRoad_1F_EventScript_15DF9D, 0 - object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 27, 34, 3, 18, 0, 0, 1, 3, VictoryRoad_1F_EventScript_15DF86, 0 - object_event 4, EVENT_OBJ_GFX_WALLY, 0, 31, 12, 3, 7, 1, 1, 0, 0, VictoryRoad_1F_EventScript_15DF28, FLAG_HIDE_WALLY_BATTLE_VICTORY_ROAD - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 40, 26, 3, 1, 1, 1, 0, 0, VictoryRoad_1F_EventScript_1B1AC6, FLAG_ITEM_VICTORY_ROAD_1F_1 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 37, 39, 4, 1, 1, 1, 0, 0, VictoryRoad_1F_EventScript_1B1AD3, FLAG_ITEM_VICTORY_ROAD_1F_2 - object_event 7, EVENT_OBJ_GFX_WALLY, 0, 31, 9, 3, 1, 1, 1, 0, 0, VictoryRoad_1F_EventScript_15DF31, FLAG_HIDE_WALLY_DEFEATED_VICTORY_ROAD + object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 33, 22, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, VictoryRoad_1F_EventScript_15DF6F, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 6, 15, 4, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 4, VictoryRoad_1F_EventScript_15DF9D, 0 + object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 27, 34, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 0, 0, 1, 3, VictoryRoad_1F_EventScript_15DF86, 0 + object_event 4, EVENT_OBJ_GFX_WALLY, 0, 31, 12, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, VictoryRoad_1F_EventScript_15DF28, FLAG_HIDE_WALLY_BATTLE_VICTORY_ROAD + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 40, 26, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, VictoryRoad_1F_EventScript_1B1AC6, FLAG_ITEM_VICTORY_ROAD_1F_1 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 37, 39, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, VictoryRoad_1F_EventScript_1B1AD3, FLAG_ITEM_VICTORY_ROAD_1F_2 + object_event 7, EVENT_OBJ_GFX_WALLY, 0, 31, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, VictoryRoad_1F_EventScript_15DF31, FLAG_HIDE_WALLY_DEFEATED_VICTORY_ROAD VictoryRoad_1F_MapWarps:: @ 838D98C warp_def 15, 40, 3, 2, MAP_EVER_GRANDE_CITY diff --git a/data/maps/VictoryRoad_B1F/events.inc b/data/maps/VictoryRoad_B1F/events.inc index af5c86254..94e995b66 100644 --- a/data/maps/VictoryRoad_B1F/events.inc +++ b/data/maps/VictoryRoad_B1F/events.inc @@ -1,23 +1,23 @@ VictoryRoad_B1F_EventObjects:: @ 838DA04 - object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 20, 5, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_13 - object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 21, 4, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_14 - object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 7, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11 - object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 10, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12 - object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 20, 26, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_17 - object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 21, 25, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_16 - object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 35, 6, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_1E - object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 19, 5, 3, 1, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_19 - object_event 9, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 4, 3, 1, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_1A - object_event 10, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 18, 12, 3, 1, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_1B - object_event 11, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 25, 3, 1, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_1C - object_event 12, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 21, 26, 3, 1, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_1D - object_event 13, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 34, 4, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_1F - object_event 14, EVENT_OBJ_GFX_MAN_4, 0, 37, 12, 3, 9, 0, 0, 1, 3, VictoryRoad_B1F_EventScript_15DFB5, 0 - object_event 15, EVENT_OBJ_GFX_WOMAN_7, 0, 26, 16, 3, 7, 0, 0, 1, 4, VictoryRoad_B1F_EventScript_15DFCC, 0 - object_event 16, EVENT_OBJ_GFX_WOMAN_7, 0, 5, 21, 3, 9, 0, 0, 1, 2, VictoryRoad_B1F_EventScript_15DFE3, 0 - object_event 17, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 34, 3, 3, 1, 1, 1, 0, 0, S_BreakableRock, FLAG_VICTORY_ROAD_ROCK - object_event 18, EVENT_OBJ_GFX_ITEM_BALL, 0, 42, 8, 4, 1, 1, 1, 0, 0, VictoryRoad_B1F_EventScript_1B1AE0, FLAG_ITEM_VICTORY_ROAD_B1F_1 - object_event 19, EVENT_OBJ_GFX_ITEM_BALL, 0, 32, 3, 3, 1, 1, 1, 0, 0, VictoryRoad_B1F_EventScript_1B1AED, FLAG_ITEM_VICTORY_ROAD_B1F_2 + object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 20, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_13 + object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 21, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_14 + object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11 + object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12 + object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 20, 26, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_17 + object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 21, 25, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_16 + object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 35, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_1E + object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 19, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_19 + object_event 9, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_1A + object_event 10, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 18, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_1B + object_event 11, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 25, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_1C + object_event 12, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 21, 26, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_1D + object_event 13, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 34, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_1F + object_event 14, EVENT_OBJ_GFX_MAN_4, 0, 37, 12, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 3, VictoryRoad_B1F_EventScript_15DFB5, 0 + object_event 15, EVENT_OBJ_GFX_WOMAN_7, 0, 26, 16, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 4, VictoryRoad_B1F_EventScript_15DFCC, 0 + object_event 16, EVENT_OBJ_GFX_WOMAN_7, 0, 5, 21, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, VictoryRoad_B1F_EventScript_15DFE3, 0 + object_event 17, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 34, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, S_BreakableRock, FLAG_VICTORY_ROAD_ROCK + object_event 18, EVENT_OBJ_GFX_ITEM_BALL, 0, 42, 8, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, VictoryRoad_B1F_EventScript_1B1AE0, FLAG_ITEM_VICTORY_ROAD_B1F_1 + object_event 19, EVENT_OBJ_GFX_ITEM_BALL, 0, 32, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, VictoryRoad_B1F_EventScript_1B1AED, FLAG_ITEM_VICTORY_ROAD_B1F_2 VictoryRoad_B1F_MapWarps:: @ 838DBCC warp_def 30, 25, 3, 0, MAP_VICTORY_ROAD_B2F diff --git a/data/maps/VictoryRoad_B2F/events.inc b/data/maps/VictoryRoad_B2F/events.inc index b482e6f04..c58ff33f3 100644 --- a/data/maps/VictoryRoad_B2F/events.inc +++ b/data/maps/VictoryRoad_B2F/events.inc @@ -1,9 +1,9 @@ VictoryRoad_B2F_EventObjects:: @ 838DC18 - object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 15, 6, 3, 8, 1, 1, 1, 2, VictoryRoad_B2F_EventScript_15DFFB, 0 - object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 43, 14, 3, 7, 1, 1, 1, 4, VictoryRoad_B2F_EventScript_15E012, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 2, 17, 3, 8, 1, 1, 1, 2, VictoryRoad_B2F_EventScript_15E029, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_7, 0, 35, 22, 3, 9, 1, 1, 1, 2, VictoryRoad_B2F_EventScript_15E040, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 8, 3, 1, 1, 1, 0, 0, VictoryRoad_B2F_EventScript_1B1AFA, FLAG_ITEM_VICTORY_ROAD_B2F_1 + object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 15, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 2, VictoryRoad_B2F_EventScript_15DFFB, 0 + object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 43, 14, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 4, VictoryRoad_B2F_EventScript_15E012, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 2, 17, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 2, VictoryRoad_B2F_EventScript_15E029, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_7, 0, 35, 22, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 2, VictoryRoad_B2F_EventScript_15E040, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, VictoryRoad_B2F_EventScript_1B1AFA, FLAG_ITEM_VICTORY_ROAD_B2F_1 VictoryRoad_B2F_MapWarps:: @ 838DC90 warp_def 30, 25, 3, 0, MAP_VICTORY_ROAD_B1F -- cgit v1.2.3 From 4fbad04ec2de7ca2529620f292356f1916b4d59d Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Wed, 11 Jul 2018 09:45:06 -0500 Subject: Use bg event type constants and remove unneeded bg_event argument --- data/map_events.s | 1 + data/maps/AbandonedShip_Corridors_B1F/events.inc | 2 +- .../AbandonedShip_HiddenFloorCorridors/events.inc | 8 +-- .../maps/AbandonedShip_HiddenFloorRooms/events.inc | 12 ++--- data/maps/AncientTomb/events.inc | 6 +-- data/maps/BattleTower_Lobby/events.inc | 2 +- data/maps/BattleTower_Outside/events.inc | 2 +- data/maps/DesertRuins/events.inc | 6 +-- data/maps/DewfordTown/events.inc | 10 ++-- data/maps/DewfordTown_Gym/events.inc | 8 +-- data/maps/DewfordTown_Hall/events.inc | 4 +- data/maps/EverGrandeCity/events.inc | 10 ++-- data/maps/FallarborTown/events.inc | 14 +++--- data/maps/FallarborTown_ContestHall/events.inc | 4 +- data/maps/FallarborTown_ContestLobby/events.inc | 8 +-- data/maps/FortreeCity/events.inc | 12 ++--- data/maps/FortreeCity_Gym/events.inc | 4 +- data/maps/InsideOfTruck/events.inc | 10 ++-- data/maps/IslandCave/events.inc | 6 +-- data/maps/LavaridgeTown/events.inc | 14 +++--- data/maps/LavaridgeTown_Gym_1F/events.inc | 4 +- data/maps/LilycoveCity/events.inc | 20 ++++---- data/maps/LilycoveCity_ContestHall/events.inc | 12 ++--- data/maps/LilycoveCity_ContestLobby/events.inc | 12 ++--- .../LilycoveCity_DepartmentStoreRooftop/events.inc | 4 +- .../LilycoveCity_DepartmentStore_1F/events.inc | 2 +- .../maps/LilycoveCity_LilycoveMuseum_1F/events.inc | 32 ++++++------ .../maps/LilycoveCity_LilycoveMuseum_2F/events.inc | 24 ++++----- data/maps/LittlerootTown/events.inc | 8 +-- .../LittlerootTown_BrendansHouse_2F/events.inc | 8 +-- data/maps/LittlerootTown_MaysHouse_2F/events.inc | 8 +-- .../LittlerootTown_ProfessorBirchsLab/events.inc | 30 +++++------ data/maps/MauvilleCity/events.inc | 16 +++--- data/maps/MauvilleCity_BikeShop/events.inc | 4 +- data/maps/MauvilleCity_GameCorner/events.inc | 48 +++++++++--------- data/maps/MauvilleCity_Gym/events.inc | 4 +- data/maps/MeteorFalls_1F_1R/events.inc | 4 +- data/maps/MeteorFalls_1F_2R/events.inc | 4 +- data/maps/MossdeepCity/events.inc | 16 +++--- data/maps/MossdeepCity_GameCorner_1F/events.inc | 2 +- data/maps/MossdeepCity_Gym/events.inc | 12 ++--- data/maps/MossdeepCity_StevensHouse/events.inc | 8 +-- data/maps/MtChimney/events.inc | 4 +- data/maps/NewMauville_Inside/events.inc | 16 +++--- data/maps/OldaleTown/events.inc | 10 ++-- data/maps/PacifidlogTown/events.inc | 6 +-- data/maps/PetalburgCity/events.inc | 14 +++--- data/maps/PetalburgCity_Gym/events.inc | 28 +++++------ data/maps/PetalburgWoods/events.inc | 4 +- data/maps/Route101/events.inc | 2 +- data/maps/Route102/events.inc | 4 +- data/maps/Route103/events.inc | 2 +- data/maps/Route104/events.inc | 10 ++-- data/maps/Route104_Prototype/events.inc | 4 +- data/maps/Route106/events.inc | 2 +- data/maps/Route109/events.inc | 4 +- data/maps/Route110/events.inc | 22 ++++---- data/maps/Route110_TrickHouseEntrance/events.inc | 2 +- data/maps/Route110_TrickHousePuzzle1/events.inc | 2 +- data/maps/Route110_TrickHousePuzzle2/events.inc | 2 +- data/maps/Route110_TrickHousePuzzle3/events.inc | 2 +- data/maps/Route110_TrickHousePuzzle4/events.inc | 2 +- data/maps/Route110_TrickHousePuzzle5/events.inc | 2 +- data/maps/Route110_TrickHousePuzzle6/events.inc | 2 +- data/maps/Route110_TrickHousePuzzle7/events.inc | 12 ++--- data/maps/Route110_TrickHousePuzzle8/events.inc | 2 +- data/maps/Route111/events.inc | 12 ++--- data/maps/Route112/events.inc | 6 +-- data/maps/Route113/events.inc | 8 +-- data/maps/Route114/events.inc | 6 +-- data/maps/Route114_FossilManiacsHouse/events.inc | 8 +-- data/maps/Route114_LanettesHouse/events.inc | 6 +-- data/maps/Route115/events.inc | 4 +- data/maps/Route116/events.inc | 10 ++-- data/maps/Route117/events.inc | 6 +-- data/maps/Route118/events.inc | 4 +- data/maps/Route119/events.inc | 6 +-- data/maps/Route119_WeatherInstitute_1F/events.inc | 8 +-- data/maps/Route120/events.inc | 4 +- data/maps/Route121/events.inc | 4 +- data/maps/Route121_SafariZoneEntrance/events.inc | 2 +- data/maps/Route123/events.inc | 6 +-- data/maps/Route124/events.inc | 2 +- .../Route124_DivingTreasureHuntersHouse/events.inc | 2 +- data/maps/RustboroCity/events.inc | 20 ++++---- data/maps/RustboroCity_DevonCorp_3F/events.inc | 4 +- data/maps/RustboroCity_Gym/events.inc | 4 +- data/maps/RustboroCity_PokemonSchool/events.inc | 10 ++-- data/maps/SSTidalCorridor/events.inc | 24 ++++----- data/maps/SSTidalRooms/events.inc | 4 +- data/maps/SafariZone_Southwest/events.inc | 2 +- data/maps/SealedChamber_InnerRoom/events.inc | 18 +++---- data/maps/SealedChamber_OuterRoom/events.inc | 58 +++++++++++----------- data/maps/ShoalCave_LowTideInnerRoom/events.inc | 12 ++--- data/maps/ShoalCave_LowTideLowerRoom/events.inc | 2 +- data/maps/ShoalCave_LowTideStairsRoom/events.inc | 2 +- data/maps/SlateportCity/events.inc | 24 ++++----- data/maps/SlateportCity_ContestHall/events.inc | 4 +- data/maps/SlateportCity_ContestLobby/events.inc | 8 +-- .../maps/SlateportCity_OceanicMuseum_1F/events.inc | 26 +++++----- .../maps/SlateportCity_OceanicMuseum_2F/events.inc | 42 ++++++++-------- data/maps/SootopolisCity/events.inc | 12 ++--- data/maps/SootopolisCity_Gym_1F/events.inc | 4 +- data/maps/SootopolisCity_House8/events.inc | 4 +- data/maps/SouthernIsland_Exterior/events.inc | 2 +- data/maps/SouthernIsland_Interior/events.inc | 2 +- data/maps/Underwater_SealedChamber/events.inc | 2 +- data/maps/VerdanturfTown/events.inc | 16 +++--- data/maps/VerdanturfTown_ContestHall/events.inc | 4 +- data/maps/VerdanturfTown_ContestLobby/events.inc | 8 +-- include/constants/bg_event_constants.h | 13 +++++ include/macros/map.inc | 10 ++-- src/field_control_avatar.c | 15 +++--- src/item_use.c | 9 ++-- src/secret_base.c | 16 +++--- 115 files changed, 543 insertions(+), 527 deletions(-) create mode 100755 include/constants/bg_event_constants.h diff --git a/data/map_events.s b/data/map_events.s index 1b8faaf4d..27ff67eb5 100644 --- a/data/map_events.s +++ b/data/map_events.s @@ -1,5 +1,6 @@ #include "constants/flags.h" #include "constants/items.h" +#include "constants/bg_event_constants.h" #include "constants/event_object_movement_constants.h" #include "constants/event_objects.h" #include "constants/maps.h" diff --git a/data/maps/AbandonedShip_Corridors_B1F/events.inc b/data/maps/AbandonedShip_Corridors_B1F/events.inc index 043160b69..cd8c266b1 100644 --- a/data/maps/AbandonedShip_Corridors_B1F/events.inc +++ b/data/maps/AbandonedShip_Corridors_B1F/events.inc @@ -13,7 +13,7 @@ AbandonedShip_Corridors_B1F_MapWarps:: @ 838E268 warp_def 8, 2, 3, 9, MAP_ABANDONED_SHIP_CORRIDORS_1F AbandonedShip_Corridors_B1F_MapBGEvents:: @ 838E2A8 - bg_event 11, 4, 3, 0, 0, AbandonedShip_Corridors_B1F_EventScript_15E9D3 + bg_event 11, 4, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_Corridors_B1F_EventScript_15E9D3 AbandonedShip_Corridors_B1F_MapEvents:: @ 838E2B4 map_events AbandonedShip_Corridors_B1F_EventObjects, AbandonedShip_Corridors_B1F_MapWarps, 0x0, AbandonedShip_Corridors_B1F_MapBGEvents diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/events.inc b/data/maps/AbandonedShip_HiddenFloorCorridors/events.inc index 97bdf37c5..b227d8813 100644 --- a/data/maps/AbandonedShip_HiddenFloorCorridors/events.inc +++ b/data/maps/AbandonedShip_HiddenFloorCorridors/events.inc @@ -7,10 +7,10 @@ AbandonedShip_HiddenFloorCorridors_MapWarps:: @ 838E4CC warp_def 9, 3, 3, 8, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS AbandonedShip_HiddenFloorCorridors_MapBGEvents:: @ 838E4FC - bg_event 3, 8, 3, 0, 0, AbandonedShip_HiddenFloorCorridors_EventScript_15EBF3 - bg_event 6, 8, 3, 0, 0, AbandonedShip_HiddenFloorCorridors_EventScript_15EC2A - bg_event 3, 4, 0, 0, 0, AbandonedShip_HiddenFloorCorridors_EventScript_15EC61 - bg_event 9, 4, 0, 0, 0, AbandonedShip_HiddenFloorCorridors_EventScript_15EC98 + bg_event 3, 8, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorCorridors_EventScript_15EBF3 + bg_event 6, 8, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorCorridors_EventScript_15EC2A + bg_event 3, 4, 0, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorCorridors_EventScript_15EC61 + bg_event 9, 4, 0, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorCorridors_EventScript_15EC98 AbandonedShip_HiddenFloorCorridors_MapEvents:: @ 838E52C map_events 0x0, AbandonedShip_HiddenFloorCorridors_MapWarps, 0x0, AbandonedShip_HiddenFloorCorridors_MapBGEvents diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/events.inc b/data/maps/AbandonedShip_HiddenFloorRooms/events.inc index 8e15a7d6b..c6c094edd 100644 --- a/data/maps/AbandonedShip_HiddenFloorRooms/events.inc +++ b/data/maps/AbandonedShip_HiddenFloorRooms/events.inc @@ -20,12 +20,12 @@ AbandonedShip_HiddenFloorRooms_MapBGEvents:: @ 838E5E8 bg_hidden_item_event 20, 5, 3, ITEM_ROOM_2_KEY, FLAG_HIDDEN_ITEM_20 bg_hidden_item_event 1, 12, 3, ITEM_ROOM_4_KEY, FLAG_HIDDEN_ITEM_21 bg_hidden_item_event 1, 2, 0, ITEM_ROOM_6_KEY, FLAG_HIDDEN_ITEM_22 - bg_event 8, 5, 3, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_15EEAB - bg_event 11, 3, 3, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_15EEAB - bg_event 10, 10, 3, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_15EEAB - bg_event 16, 3, 3, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_15EEAB - bg_event 25, 2, 3, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_15EEAB - bg_event 24, 6, 3, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_15EEAB + bg_event 8, 5, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorRooms_EventScript_15EEAB + bg_event 11, 3, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorRooms_EventScript_15EEAB + bg_event 10, 10, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorRooms_EventScript_15EEAB + bg_event 16, 3, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorRooms_EventScript_15EEAB + bg_event 25, 2, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorRooms_EventScript_15EEAB + bg_event 24, 6, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorRooms_EventScript_15EEAB AbandonedShip_HiddenFloorRooms_MapEvents:: @ 838E660 map_events AbandonedShip_HiddenFloorRooms_EventObjects, AbandonedShip_HiddenFloorRooms_MapWarps, 0x0, AbandonedShip_HiddenFloorRooms_MapBGEvents diff --git a/data/maps/AncientTomb/events.inc b/data/maps/AncientTomb/events.inc index c7cfd76ba..7e3d33c70 100644 --- a/data/maps/AncientTomb/events.inc +++ b/data/maps/AncientTomb/events.inc @@ -7,9 +7,9 @@ AncientTomb_MapWarps:: @ 838E6F4 warp_def 8, 11, 3, 1, MAP_ANCIENT_TOMB AncientTomb_MapBGEvents:: @ 838E70C - bg_event 8, 20, 0, 0, 0, AncientTomb_EventScript_15F021 - bg_event 7, 20, 0, 0, 0, AncientTomb_EventScript_15F042 - bg_event 9, 20, 0, 0, 0, AncientTomb_EventScript_15F042 + bg_event 8, 20, 0, BG_EVENT_PLAYER_FACING_ANY, AncientTomb_EventScript_15F021 + bg_event 7, 20, 0, BG_EVENT_PLAYER_FACING_ANY, AncientTomb_EventScript_15F042 + bg_event 9, 20, 0, BG_EVENT_PLAYER_FACING_ANY, AncientTomb_EventScript_15F042 AncientTomb_MapEvents:: @ 838E730 map_events AncientTomb_EventObjects, AncientTomb_MapWarps, 0x0, AncientTomb_MapBGEvents diff --git a/data/maps/BattleTower_Lobby/events.inc b/data/maps/BattleTower_Lobby/events.inc index 12bb17e2d..a07d608ed 100644 --- a/data/maps/BattleTower_Lobby/events.inc +++ b/data/maps/BattleTower_Lobby/events.inc @@ -12,7 +12,7 @@ BattleTower_Lobby_MapWarps:: @ 8391D1C warp_def 6, 1, 0, 0, MAP_BATTLE_TOWER_BATTLE_ROOM BattleTower_Lobby_MapBGEvents:: @ 8391D34 - bg_event 3, 5, 3, 1, 0, BattleTower_Lobby_EventScript_160727 + bg_event 3, 5, 3, BG_EVENT_PLAYER_FACING_NORTH, BattleTower_Lobby_EventScript_160727 BattleTower_Lobby_MapEvents:: @ 8391D40 map_events BattleTower_Lobby_EventObjects, BattleTower_Lobby_MapWarps, 0x0, BattleTower_Lobby_MapBGEvents diff --git a/data/maps/BattleTower_Outside/events.inc b/data/maps/BattleTower_Outside/events.inc index 2fd7ac6bc..f7eaa89f9 100644 --- a/data/maps/BattleTower_Outside/events.inc +++ b/data/maps/BattleTower_Outside/events.inc @@ -9,7 +9,7 @@ BattleTower_Outside_MapWarps:: @ 8391C64 warp_def 14, 8, 0, 0, MAP_BATTLE_TOWER_LOBBY BattleTower_Outside_MapBGEvents:: @ 8391C6C - bg_event 16, 13, 0, 0, 0, BattleTower_Outside_EventScript_16025A + bg_event 16, 13, 0, BG_EVENT_PLAYER_FACING_ANY, BattleTower_Outside_EventScript_16025A BattleTower_Outside_MapEvents:: @ 8391C78 map_events BattleTower_Outside_EventObjects, BattleTower_Outside_MapWarps, 0x0, BattleTower_Outside_MapBGEvents diff --git a/data/maps/DesertRuins/events.inc b/data/maps/DesertRuins/events.inc index 803dd4b5b..b3070e794 100644 --- a/data/maps/DesertRuins/events.inc +++ b/data/maps/DesertRuins/events.inc @@ -7,9 +7,9 @@ DesertRuins_MapWarps:: @ 838BED4 warp_def 8, 11, 3, 1, MAP_DESERT_RUINS DesertRuins_MapBGEvents:: @ 838BEEC - bg_event 8, 20, 0, 0, 0, DesertRuins_EventScript_15CB56 - bg_event 7, 20, 0, 0, 0, DesertRuins_EventScript_15CB77 - bg_event 9, 20, 0, 0, 0, DesertRuins_EventScript_15CB77 + bg_event 8, 20, 0, BG_EVENT_PLAYER_FACING_ANY, DesertRuins_EventScript_15CB56 + bg_event 7, 20, 0, BG_EVENT_PLAYER_FACING_ANY, DesertRuins_EventScript_15CB77 + bg_event 9, 20, 0, BG_EVENT_PLAYER_FACING_ANY, DesertRuins_EventScript_15CB77 DesertRuins_MapEvents:: @ 838BF10 map_events DesertRuins_EventObjects, DesertRuins_MapWarps, 0x0, DesertRuins_MapBGEvents diff --git a/data/maps/DewfordTown/events.inc b/data/maps/DewfordTown/events.inc index b2acd0c1a..c034ab5ab 100644 --- a/data/maps/DewfordTown/events.inc +++ b/data/maps/DewfordTown/events.inc @@ -13,11 +13,11 @@ DewfordTown_MapWarps:: @ 8380C00 warp_def 8, 8, 0, 0, MAP_DEWFORD_TOWN_HOUSE2 DewfordTown_MapBGEvents:: @ 8380C28 - bg_event 10, 10, 0, 0, 0, DewfordTown_EventScript_14E0AB - bg_event 11, 16, 0, 0, 0, DewfordTown_EventScript_14E0B4 - bg_event 4, 10, 0, 1, 0, DewfordTown_EventScript_1A00EA - bg_event 3, 10, 0, 1, 0, DewfordTown_EventScript_1A00EA - bg_event 2, 4, 0, 0, 0, DewfordTown_EventScript_14E0BD + bg_event 10, 10, 0, BG_EVENT_PLAYER_FACING_ANY, DewfordTown_EventScript_14E0AB + bg_event 11, 16, 0, BG_EVENT_PLAYER_FACING_ANY, DewfordTown_EventScript_14E0B4 + bg_event 4, 10, 0, BG_EVENT_PLAYER_FACING_NORTH, DewfordTown_EventScript_1A00EA + bg_event 3, 10, 0, BG_EVENT_PLAYER_FACING_NORTH, DewfordTown_EventScript_1A00EA + bg_event 2, 4, 0, BG_EVENT_PLAYER_FACING_ANY, DewfordTown_EventScript_14E0BD DewfordTown_MapEvents:: @ 8380C64 map_events DewfordTown_EventObjects, DewfordTown_MapWarps, 0x0, DewfordTown_MapBGEvents diff --git a/data/maps/DewfordTown_Gym/events.inc b/data/maps/DewfordTown_Gym/events.inc index 4caadd80d..ce6cc9c37 100644 --- a/data/maps/DewfordTown_Gym/events.inc +++ b/data/maps/DewfordTown_Gym/events.inc @@ -10,10 +10,10 @@ DewfordTown_Gym_MapWarps:: @ 8386034 warp_def 6, 27, 0, 2, MAP_DEWFORD_TOWN DewfordTown_Gym_MapBGEvents:: @ 8386044 - bg_event 7, 21, 0, 1, 0, DewfordTown_Gym_EventScript_15325E - bg_event 10, 21, 0, 1, 0, DewfordTown_Gym_EventScript_15326E - bg_event 4, 24, 0, 1, 0, DewfordTown_Gym_EventScript_15325E - bg_event 7, 24, 0, 1, 0, DewfordTown_Gym_EventScript_15326E + bg_event 7, 21, 0, BG_EVENT_PLAYER_FACING_NORTH, DewfordTown_Gym_EventScript_15325E + bg_event 10, 21, 0, BG_EVENT_PLAYER_FACING_NORTH, DewfordTown_Gym_EventScript_15326E + bg_event 4, 24, 0, BG_EVENT_PLAYER_FACING_NORTH, DewfordTown_Gym_EventScript_15325E + bg_event 7, 24, 0, BG_EVENT_PLAYER_FACING_NORTH, DewfordTown_Gym_EventScript_15326E DewfordTown_Gym_MapEvents:: @ 8386074 map_events DewfordTown_Gym_EventObjects, DewfordTown_Gym_MapWarps, 0x0, DewfordTown_Gym_MapBGEvents diff --git a/data/maps/DewfordTown_Hall/events.inc b/data/maps/DewfordTown_Hall/events.inc index 16503c5ac..d0753ecff 100644 --- a/data/maps/DewfordTown_Hall/events.inc +++ b/data/maps/DewfordTown_Hall/events.inc @@ -14,8 +14,8 @@ DewfordTown_Hall_MapWarps:: @ 8386160 warp_def 6, 8, 0, 0, MAP_DEWFORD_TOWN DewfordTown_Hall_MapBGEvents:: @ 8386170 - bg_event 0, 1, 3, 0, 0, DewfordTown_Hall_EventScript_153353 - bg_event 7, 1, 3, 0, 0, DewfordTown_Hall_EventScript_153363 + bg_event 0, 1, 3, BG_EVENT_PLAYER_FACING_ANY, DewfordTown_Hall_EventScript_153353 + bg_event 7, 1, 3, BG_EVENT_PLAYER_FACING_ANY, DewfordTown_Hall_EventScript_153363 DewfordTown_Hall_MapEvents:: @ 8386188 map_events DewfordTown_Hall_EventObjects, DewfordTown_Hall_MapWarps, 0x0, DewfordTown_Hall_MapBGEvents diff --git a/data/maps/EverGrandeCity/events.inc b/data/maps/EverGrandeCity/events.inc index 0a619b93d..39f72e713 100644 --- a/data/maps/EverGrandeCity/events.inc +++ b/data/maps/EverGrandeCity/events.inc @@ -18,11 +18,11 @@ EverGrandeCity_MapCoordEvents:: @ 83807FC coord_event 26, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_14D500 EverGrandeCity_MapBGEvents:: @ 83808AC - bg_event 19, 43, 5, 0, 0, EverGrandeCity_EventScript_14D4E5 - bg_event 29, 48, 0, 1, 0, EverGrandeCity_EventScript_1A00EA - bg_event 18, 52, 5, 0, 0, EverGrandeCity_EventScript_14D4EE - bg_event 23, 15, 0, 0, 0, EverGrandeCity_EventScript_14D4F7 - bg_event 28, 48, 0, 1, 0, EverGrandeCity_EventScript_1A00EA + bg_event 19, 43, 5, BG_EVENT_PLAYER_FACING_ANY, EverGrandeCity_EventScript_14D4E5 + bg_event 29, 48, 0, BG_EVENT_PLAYER_FACING_NORTH, EverGrandeCity_EventScript_1A00EA + bg_event 18, 52, 5, BG_EVENT_PLAYER_FACING_ANY, EverGrandeCity_EventScript_14D4EE + bg_event 23, 15, 0, BG_EVENT_PLAYER_FACING_ANY, EverGrandeCity_EventScript_14D4F7 + bg_event 28, 48, 0, BG_EVENT_PLAYER_FACING_NORTH, EverGrandeCity_EventScript_1A00EA EverGrandeCity_MapEvents:: @ 83808E8 map_events 0x0, EverGrandeCity_MapWarps, EverGrandeCity_MapCoordEvents, EverGrandeCity_MapBGEvents diff --git a/data/maps/FallarborTown/events.inc b/data/maps/FallarborTown/events.inc index 64149231d..dec80a540 100644 --- a/data/maps/FallarborTown/events.inc +++ b/data/maps/FallarborTown/events.inc @@ -12,13 +12,13 @@ FallarborTown_MapWarps:: @ 8380E64 warp_def 1, 6, 0, 0, MAP_FALLARBOR_TOWN_HOUSE2 FallarborTown_MapBGEvents:: @ 8380E8C - bg_event 16, 15, 0, 1, 0, FallarborTown_EventScript_1A00E1 - bg_event 15, 7, 0, 1, 0, FallarborTown_EventScript_1A00EA - bg_event 6, 8, 0, 0, 0, FallarborTown_EventScript_14E839 - bg_event 16, 7, 0, 1, 0, FallarborTown_EventScript_1A00EA - bg_event 10, 11, 0, 0, 0, FallarborTown_EventScript_14E842 - bg_event 17, 15, 0, 1, 0, FallarborTown_EventScript_1A00E1 - bg_event 3, 7, 0, 0, 0, FallarborTown_EventScript_14E84B + bg_event 16, 15, 0, BG_EVENT_PLAYER_FACING_NORTH, FallarborTown_EventScript_1A00E1 + bg_event 15, 7, 0, BG_EVENT_PLAYER_FACING_NORTH, FallarborTown_EventScript_1A00EA + bg_event 6, 8, 0, BG_EVENT_PLAYER_FACING_ANY, FallarborTown_EventScript_14E839 + bg_event 16, 7, 0, BG_EVENT_PLAYER_FACING_NORTH, FallarborTown_EventScript_1A00EA + bg_event 10, 11, 0, BG_EVENT_PLAYER_FACING_ANY, FallarborTown_EventScript_14E842 + bg_event 17, 15, 0, BG_EVENT_PLAYER_FACING_NORTH, FallarborTown_EventScript_1A00E1 + bg_event 3, 7, 0, BG_EVENT_PLAYER_FACING_ANY, FallarborTown_EventScript_14E84B bg_hidden_item_event 2, 15, 3, ITEM_NUGGET, FLAG_HIDDEN_ITEM_1C FallarborTown_MapEvents:: @ 8380EEC diff --git a/data/maps/FallarborTown_ContestHall/events.inc b/data/maps/FallarborTown_ContestHall/events.inc index b57f1bf86..d8c4eee55 100644 --- a/data/maps/FallarborTown_ContestHall/events.inc +++ b/data/maps/FallarborTown_ContestHall/events.inc @@ -8,8 +8,8 @@ FallarborTown_ContestHall_MapWarps:: @ 8386824 warp_def 11, 17, 0, 2, MAP_FALLARBOR_TOWN_CONTEST_LOBBY FallarborTown_ContestHall_MapBGEvents:: @ 8386834 - bg_event 12, 14, 3, 0, 0, FallarborTown_ContestHall_EventScript_153AEA - bg_event 8, 14, 3, 0, 0, FallarborTown_ContestHall_EventScript_153AEA + bg_event 12, 14, 3, BG_EVENT_PLAYER_FACING_ANY, FallarborTown_ContestHall_EventScript_153AEA + bg_event 8, 14, 3, BG_EVENT_PLAYER_FACING_ANY, FallarborTown_ContestHall_EventScript_153AEA FallarborTown_ContestHall_MapEvents:: @ 838684C map_events FallarborTown_ContestHall_EventObjects, FallarborTown_ContestHall_MapWarps, 0x0, FallarborTown_ContestHall_MapBGEvents diff --git a/data/maps/FallarborTown_ContestLobby/events.inc b/data/maps/FallarborTown_ContestLobby/events.inc index 35237f148..0c5d3ca23 100644 --- a/data/maps/FallarborTown_ContestLobby/events.inc +++ b/data/maps/FallarborTown_ContestLobby/events.inc @@ -12,10 +12,10 @@ FallarborTown_ContestLobby_MapWarps:: @ 8386780 warp_def 1, 1, 0, 0, MAP_FALLARBOR_TOWN_CONTEST_HALL FallarborTown_ContestLobby_MapBGEvents:: @ 8386798 - bg_event 10, 3, 0, 0, 0, FallarborTown_ContestLobby_EventScript_1B7823 - bg_event 12, 5, 0, 0, 0, FallarborTown_ContestLobby_EventScript_1B7604 - bg_event 11, 1, 3, 0, 0, FallarborTown_ContestLobby_EventScript_153ABB - bg_event 13, 1, 0, 0, 0, FallarborTown_ContestLobby_EventScript_153AC2 + bg_event 10, 3, 0, BG_EVENT_PLAYER_FACING_ANY, FallarborTown_ContestLobby_EventScript_1B7823 + bg_event 12, 5, 0, BG_EVENT_PLAYER_FACING_ANY, FallarborTown_ContestLobby_EventScript_1B7604 + bg_event 11, 1, 3, BG_EVENT_PLAYER_FACING_ANY, FallarborTown_ContestLobby_EventScript_153ABB + bg_event 13, 1, 0, BG_EVENT_PLAYER_FACING_ANY, FallarborTown_ContestLobby_EventScript_153AC2 FallarborTown_ContestLobby_MapEvents:: @ 83867C8 map_events FallarborTown_ContestLobby_EventObjects, FallarborTown_ContestLobby_MapWarps, 0x0, FallarborTown_ContestLobby_MapBGEvents diff --git a/data/maps/FortreeCity/events.inc b/data/maps/FortreeCity/events.inc index 5d7cfea6d..e289f7a88 100644 --- a/data/maps/FortreeCity/events.inc +++ b/data/maps/FortreeCity/events.inc @@ -19,12 +19,12 @@ FortreeCity_MapWarps:: @ 83800C8 warp_def 37, 13, 0, 0, MAP_FORTREE_CITY_DECORATION_SHOP FortreeCity_MapBGEvents:: @ 8380110 - bg_event 6, 9, 0, 0, 0, FortreeCity_EventScript_14C9A1 - bg_event 7, 6, 0, 1, 0, FortreeCity_EventScript_1A00EA - bg_event 5, 14, 0, 1, 0, FortreeCity_EventScript_1A00E1 - bg_event 26, 10, 0, 0, 0, FortreeCity_EventScript_14C9AA - bg_event 6, 6, 0, 1, 0, FortreeCity_EventScript_1A00EA - bg_event 6, 14, 0, 1, 0, FortreeCity_EventScript_1A00E1 + bg_event 6, 9, 0, BG_EVENT_PLAYER_FACING_ANY, FortreeCity_EventScript_14C9A1 + bg_event 7, 6, 0, BG_EVENT_PLAYER_FACING_NORTH, FortreeCity_EventScript_1A00EA + bg_event 5, 14, 0, BG_EVENT_PLAYER_FACING_NORTH, FortreeCity_EventScript_1A00E1 + bg_event 26, 10, 0, BG_EVENT_PLAYER_FACING_ANY, FortreeCity_EventScript_14C9AA + bg_event 6, 6, 0, BG_EVENT_PLAYER_FACING_NORTH, FortreeCity_EventScript_1A00EA + bg_event 6, 14, 0, BG_EVENT_PLAYER_FACING_NORTH, FortreeCity_EventScript_1A00E1 FortreeCity_MapEvents:: @ 8380158 map_events FortreeCity_EventObjects, FortreeCity_MapWarps, 0x0, FortreeCity_MapBGEvents diff --git a/data/maps/FortreeCity_Gym/events.inc b/data/maps/FortreeCity_Gym/events.inc index 27d70a810..d6728885d 100644 --- a/data/maps/FortreeCity_Gym/events.inc +++ b/data/maps/FortreeCity_Gym/events.inc @@ -11,8 +11,8 @@ FortreeCity_Gym_MapWarps:: @ 83890A8 warp_def 3, 24, 0, 2, MAP_FORTREE_CITY FortreeCity_Gym_MapBGEvents:: @ 83890B8 - bg_event 1, 21, 0, 1, 0, FortreeCity_Gym_EventScript_157FDD - bg_event 4, 21, 0, 1, 0, FortreeCity_Gym_EventScript_157FED + bg_event 1, 21, 0, BG_EVENT_PLAYER_FACING_NORTH, FortreeCity_Gym_EventScript_157FDD + bg_event 4, 21, 0, BG_EVENT_PLAYER_FACING_NORTH, FortreeCity_Gym_EventScript_157FED FortreeCity_Gym_MapEvents:: @ 83890D0 map_events FortreeCity_Gym_EventObjects, FortreeCity_Gym_MapWarps, 0x0, FortreeCity_Gym_MapBGEvents diff --git a/data/maps/InsideOfTruck/events.inc b/data/maps/InsideOfTruck/events.inc index cde317788..c29631ae4 100644 --- a/data/maps/InsideOfTruck/events.inc +++ b/data/maps/InsideOfTruck/events.inc @@ -14,11 +14,11 @@ InsideOfTruck_MapCoordEvents:: @ 8391678 coord_event 3, 3, 3, 0, VAR_LITTLEROOT_INTRO_STATE, 0, 0, InsideOfTruck_EventScript_15FC29 InsideOfTruck_MapBGEvents:: @ 83916A8 - bg_event 1, 0, 0, 0, 0, InsideOfTruck_EventScript_15FC8B - bg_event 3, 4, 0, 0, 0, InsideOfTruck_EventScript_15FC8B - bg_event 2, 3, 0, 0, 0, InsideOfTruck_EventScript_15FC8B - bg_event 0, 1, 0, 0, 0, InsideOfTruck_EventScript_15FC8B - bg_event 0, 2, 0, 0, 0, InsideOfTruck_EventScript_15FC8B + bg_event 1, 0, 0, BG_EVENT_PLAYER_FACING_ANY, InsideOfTruck_EventScript_15FC8B + bg_event 3, 4, 0, BG_EVENT_PLAYER_FACING_ANY, InsideOfTruck_EventScript_15FC8B + bg_event 2, 3, 0, BG_EVENT_PLAYER_FACING_ANY, InsideOfTruck_EventScript_15FC8B + bg_event 0, 1, 0, BG_EVENT_PLAYER_FACING_ANY, InsideOfTruck_EventScript_15FC8B + bg_event 0, 2, 0, BG_EVENT_PLAYER_FACING_ANY, InsideOfTruck_EventScript_15FC8B InsideOfTruck_MapEvents:: @ 83916E4 map_events InsideOfTruck_EventObjects, InsideOfTruck_MapWarps, InsideOfTruck_MapCoordEvents, InsideOfTruck_MapBGEvents diff --git a/data/maps/IslandCave/events.inc b/data/maps/IslandCave/events.inc index 81c834a22..6ef74d72d 100644 --- a/data/maps/IslandCave/events.inc +++ b/data/maps/IslandCave/events.inc @@ -7,9 +7,9 @@ IslandCave_MapWarps:: @ 838E68C warp_def 8, 11, 3, 1, MAP_ISLAND_CAVE IslandCave_MapBGEvents:: @ 838E6A4 - bg_event 8, 20, 0, 0, 0, IslandCave_EventScript_15EF59 - bg_event 7, 20, 0, 0, 0, IslandCave_EventScript_15EF7C - bg_event 9, 20, 0, 0, 0, IslandCave_EventScript_15EF7C + bg_event 8, 20, 0, BG_EVENT_PLAYER_FACING_ANY, IslandCave_EventScript_15EF59 + bg_event 7, 20, 0, BG_EVENT_PLAYER_FACING_ANY, IslandCave_EventScript_15EF7C + bg_event 9, 20, 0, BG_EVENT_PLAYER_FACING_ANY, IslandCave_EventScript_15EF7C IslandCave_MapEvents:: @ 838E6C8 map_events IslandCave_EventObjects, IslandCave_MapWarps, 0x0, IslandCave_MapBGEvents diff --git a/data/maps/LavaridgeTown/events.inc b/data/maps/LavaridgeTown/events.inc index 4897197a0..6afd86a20 100644 --- a/data/maps/LavaridgeTown/events.inc +++ b/data/maps/LavaridgeTown/events.inc @@ -21,13 +21,13 @@ LavaridgeTown_MapCoordEvents:: @ 8380D80 coord_event 6, 3, 3, 0, 0, 0, 0, LavaridgeTown_EventScript_14E710 LavaridgeTown_MapBGEvents:: @ 8380D90 - bg_event 14, 16, 0, 0, 0, LavaridgeTown_EventScript_14E7D7 - bg_event 7, 15, 0, 0, 0, LavaridgeTown_EventScript_14E7C5 - bg_event 17, 5, 0, 1, 0, LavaridgeTown_EventScript_1A00E1 - bg_event 13, 8, 0, 0, 0, LavaridgeTown_EventScript_14E7BC - bg_event 10, 6, 0, 1, 0, LavaridgeTown_EventScript_1A00EA - bg_event 16, 5, 0, 1, 0, LavaridgeTown_EventScript_1A00E1 - bg_event 11, 6, 0, 1, 0, LavaridgeTown_EventScript_1A00EA + bg_event 14, 16, 0, BG_EVENT_PLAYER_FACING_ANY, LavaridgeTown_EventScript_14E7D7 + bg_event 7, 15, 0, BG_EVENT_PLAYER_FACING_ANY, LavaridgeTown_EventScript_14E7C5 + bg_event 17, 5, 0, BG_EVENT_PLAYER_FACING_NORTH, LavaridgeTown_EventScript_1A00E1 + bg_event 13, 8, 0, BG_EVENT_PLAYER_FACING_ANY, LavaridgeTown_EventScript_14E7BC + bg_event 10, 6, 0, BG_EVENT_PLAYER_FACING_NORTH, LavaridgeTown_EventScript_1A00EA + bg_event 16, 5, 0, BG_EVENT_PLAYER_FACING_NORTH, LavaridgeTown_EventScript_1A00E1 + bg_event 11, 6, 0, BG_EVENT_PLAYER_FACING_NORTH, LavaridgeTown_EventScript_1A00EA bg_hidden_item_event 4, 5, 3, ITEM_ICE_HEAL, FLAG_HIDDEN_ITEM_0 LavaridgeTown_MapEvents:: @ 8380DF0 diff --git a/data/maps/LavaridgeTown_Gym_1F/events.inc b/data/maps/LavaridgeTown_Gym_1F/events.inc index d89e670d2..697fae482 100644 --- a/data/maps/LavaridgeTown_Gym_1F/events.inc +++ b/data/maps/LavaridgeTown_Gym_1F/events.inc @@ -32,8 +32,8 @@ LavaridgeTown_Gym_1F_MapWarps:: @ 8386304 warp_def 10, 6, 3, 19, MAP_LAVARIDGE_TOWN_GYM_B1F LavaridgeTown_Gym_1F_MapBGEvents:: @ 83863B4 - bg_event 6, 17, 0, 1, 0, LavaridgeTown_Gym_1F_EventScript_153878 - bg_event 10, 17, 0, 1, 0, LavaridgeTown_Gym_1F_EventScript_153888 + bg_event 6, 17, 0, BG_EVENT_PLAYER_FACING_NORTH, LavaridgeTown_Gym_1F_EventScript_153878 + bg_event 10, 17, 0, BG_EVENT_PLAYER_FACING_NORTH, LavaridgeTown_Gym_1F_EventScript_153888 LavaridgeTown_Gym_1F_MapEvents:: @ 83863CC map_events LavaridgeTown_Gym_1F_EventObjects, LavaridgeTown_Gym_1F_MapWarps, 0x0, LavaridgeTown_Gym_1F_MapBGEvents diff --git a/data/maps/LilycoveCity/events.inc b/data/maps/LilycoveCity/events.inc index 8dbfff3b3..fe3bd0516 100644 --- a/data/maps/LilycoveCity/events.inc +++ b/data/maps/LilycoveCity/events.inc @@ -35,16 +35,16 @@ LilycoveCity_MapWarps:: @ 8380304 warp_def 71, 5, 1, 0, MAP_MAGMA_HIDEOUT_1F LilycoveCity_MapBGEvents:: @ 838037C - bg_event 19, 7, 0, 0, 0, LilycoveCity_EventScript_14CC82 - bg_event 25, 14, 0, 1, 0, LilycoveCity_EventScript_1A00EA - bg_event 29, 7, 0, 0, 0, LilycoveCity_EventScript_14CCD3 - bg_event 26, 14, 0, 1, 0, LilycoveCity_EventScript_1A00EA - bg_event 6, 15, 0, 0, 0, LilycoveCity_EventScript_14CC67 - bg_event 29, 24, 0, 0, 0, LilycoveCity_EventScript_14CC70 - bg_event 35, 24, 0, 0, 0, LilycoveCity_EventScript_14CC79 - bg_event 6, 30, 3, 0, 0, LilycoveCity_EventScript_14CCAC - bg_event 36, 14, 0, 0, 0, LilycoveCity_EventScript_14CCCA - bg_event 34, 6, 0, 0, 0, LilycoveCity_EventScript_14CCDC + bg_event 19, 7, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_EventScript_14CC82 + bg_event 25, 14, 0, BG_EVENT_PLAYER_FACING_NORTH, LilycoveCity_EventScript_1A00EA + bg_event 29, 7, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_EventScript_14CCD3 + bg_event 26, 14, 0, BG_EVENT_PLAYER_FACING_NORTH, LilycoveCity_EventScript_1A00EA + bg_event 6, 15, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_EventScript_14CC67 + bg_event 29, 24, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_EventScript_14CC70 + bg_event 35, 24, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_EventScript_14CC79 + bg_event 6, 30, 3, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_EventScript_14CCAC + bg_event 36, 14, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_EventScript_14CCCA + bg_event 34, 6, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_EventScript_14CCDC bg_hidden_item_event 36, 31, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_1B bg_hidden_item_event 61, 7, 0, ITEM_PP_UP, FLAG_HIDDEN_ITEM_2B bg_hidden_item_event 64, 31, 0, ITEM_POKE_BALL, FLAG_HIDDEN_ITEM_4B diff --git a/data/maps/LilycoveCity_ContestHall/events.inc b/data/maps/LilycoveCity_ContestHall/events.inc index cfb6349d5..a7c58d274 100644 --- a/data/maps/LilycoveCity_ContestHall/events.inc +++ b/data/maps/LilycoveCity_ContestHall/events.inc @@ -39,12 +39,12 @@ LilycoveCity_ContestHall_MapWarps:: @ 8389D18 warp_def 31, 32, 0, 3, MAP_LILYCOVE_CITY_CONTEST_LOBBY LilycoveCity_ContestHall_MapBGEvents:: @ 8389D38 - bg_event 27, 16, 0, 0, 0, LilycoveCity_ContestHall_EventScript_15930C - bg_event 39, 28, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159315 - bg_event 11, 28, 0, 0, 0, LilycoveCity_ContestHall_EventScript_15931E - bg_event 15, 28, 0, 0, 0, LilycoveCity_ContestHall_EventScript_15931E - bg_event 23, 16, 0, 0, 0, LilycoveCity_ContestHall_EventScript_15930C - bg_event 35, 28, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159315 + bg_event 27, 16, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestHall_EventScript_15930C + bg_event 39, 28, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestHall_EventScript_159315 + bg_event 11, 28, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestHall_EventScript_15931E + bg_event 15, 28, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestHall_EventScript_15931E + bg_event 23, 16, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestHall_EventScript_15930C + bg_event 35, 28, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestHall_EventScript_159315 LilycoveCity_ContestHall_MapEvents:: @ 8389D80 map_events LilycoveCity_ContestHall_EventObjects, LilycoveCity_ContestHall_MapWarps, 0x0, LilycoveCity_ContestHall_MapBGEvents diff --git a/data/maps/LilycoveCity_ContestLobby/events.inc b/data/maps/LilycoveCity_ContestLobby/events.inc index 710d5e661..5e0bc7c7d 100644 --- a/data/maps/LilycoveCity_ContestLobby/events.inc +++ b/data/maps/LilycoveCity_ContestLobby/events.inc @@ -21,12 +21,12 @@ LilycoveCity_ContestLobby_MapWarps:: @ 838999C warp_def 13, 1, 0, 1, MAP_LILYCOVE_CITY_CONTEST_HALL LilycoveCity_ContestLobby_MapBGEvents:: @ 83899BC - bg_event 18, 5, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_1B7835 - bg_event 18, 9, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_1B7659 - bg_event 15, 1, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_159066 - bg_event 17, 1, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_15906D - bg_event 19, 1, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_159074 - bg_event 22, 1, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_15908D + bg_event 18, 5, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_1B7835 + bg_event 18, 9, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_1B7659 + bg_event 15, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_159066 + bg_event 17, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_15906D + bg_event 19, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_159074 + bg_event 22, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_15908D LilycoveCity_ContestLobby_MapEvents:: @ 8389A04 map_events LilycoveCity_ContestLobby_EventObjects, LilycoveCity_ContestLobby_MapWarps, 0x0, LilycoveCity_ContestLobby_MapBGEvents diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/events.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/events.inc index da8ad5342..fbe7205e2 100644 --- a/data/maps/LilycoveCity_DepartmentStoreRooftop/events.inc +++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/events.inc @@ -7,8 +7,8 @@ LilycoveCity_DepartmentStoreRooftop_MapWarps:: @ 838A5F0 warp_def 13, 3, 0, 2, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F LilycoveCity_DepartmentStoreRooftop_MapBGEvents:: @ 838A5F8 - bg_event 9, 1, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_15A1CD - bg_event 10, 1, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_15A1CD + bg_event 9, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_DepartmentStoreRooftop_EventScript_15A1CD + bg_event 10, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_DepartmentStoreRooftop_EventScript_15A1CD LilycoveCity_DepartmentStoreRooftop_MapEvents:: @ 838A610 map_events LilycoveCity_DepartmentStoreRooftop_EventObjects, LilycoveCity_DepartmentStoreRooftop_MapWarps, 0x0, LilycoveCity_DepartmentStoreRooftop_MapBGEvents diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/events.inc b/data/maps/LilycoveCity_DepartmentStore_1F/events.inc index da2bea5ab..a7bb9a356 100644 --- a/data/maps/LilycoveCity_DepartmentStore_1F/events.inc +++ b/data/maps/LilycoveCity_DepartmentStore_1F/events.inc @@ -13,7 +13,7 @@ LilycoveCity_DepartmentStore_1F_MapWarps:: @ 838A2A8 warp_def 2, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR LilycoveCity_DepartmentStore_1F_MapBGEvents:: @ 838A2C8 - bg_event 0, 8, 0, 1, 0, LilycoveCity_DepartmentStore_1F_EventScript_159F05 + bg_event 0, 8, 0, BG_EVENT_PLAYER_FACING_NORTH, LilycoveCity_DepartmentStore_1F_EventScript_159F05 LilycoveCity_DepartmentStore_1F_MapEvents:: @ 838A2D4 map_events LilycoveCity_DepartmentStore_1F_EventObjects, LilycoveCity_DepartmentStore_1F_MapWarps, 0x0, LilycoveCity_DepartmentStore_1F_MapBGEvents diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/events.inc b/data/maps/LilycoveCity_LilycoveMuseum_1F/events.inc index 93952d8e2..f9fc9231e 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_1F/events.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/events.inc @@ -16,22 +16,22 @@ LilycoveCity_LilycoveMuseum_1F_MapWarps:: @ 8389654 warp_def 16, 1, 0, 0, MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F LilycoveCity_LilycoveMuseum_1F_MapBGEvents:: @ 838966C - bg_event 1, 1, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158510 - bg_event 2, 1, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158510 - bg_event 5, 1, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158534 - bg_event 6, 1, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158534 - bg_event 9, 1, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158507 - bg_event 3, 6, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158519 - bg_event 2, 6, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158519 - bg_event 15, 12, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_15853D - bg_event 11, 1, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158507 - bg_event 6, 6, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_15852B - bg_event 17, 9, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_15854F - bg_event 19, 1, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158522 - bg_event 20, 1, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158522 - bg_event 18, 9, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_15854F - bg_event 18, 11, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158546 - bg_event 16, 9, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_15854F + bg_event 1, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_158510 + bg_event 2, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_158510 + bg_event 5, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_158534 + bg_event 6, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_158534 + bg_event 9, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_158507 + bg_event 3, 6, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_158519 + bg_event 2, 6, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_158519 + bg_event 15, 12, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_15853D + bg_event 11, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_158507 + bg_event 6, 6, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_15852B + bg_event 17, 9, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_15854F + bg_event 19, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_158522 + bg_event 20, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_158522 + bg_event 18, 9, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_15854F + bg_event 18, 11, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_158546 + bg_event 16, 9, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_15854F LilycoveCity_LilycoveMuseum_1F_MapEvents:: @ 838972C map_events LilycoveCity_LilycoveMuseum_1F_EventObjects, LilycoveCity_LilycoveMuseum_1F_MapWarps, 0x0, LilycoveCity_LilycoveMuseum_1F_MapBGEvents diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/events.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/events.inc index e3123c678..ae0a59a89 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_2F/events.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/events.inc @@ -8,18 +8,18 @@ LilycoveCity_LilycoveMuseum_2F_MapWarps:: @ 83897A0 warp_def 13, 1, 0, 2, MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F LilycoveCity_LilycoveMuseum_2F_MapBGEvents:: @ 83897A8 - bg_event 14, 10, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_15879D - bg_event 15, 10, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_15879D - bg_event 3, 6, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_1587B0 - bg_event 2, 6, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_1587B0 - bg_event 10, 6, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_1587C3 - bg_event 11, 6, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_1587C3 - bg_event 19, 6, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_1587D6 - bg_event 18, 6, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_1587D6 - bg_event 6, 10, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_1587E9 - bg_event 7, 10, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_1587E9 - bg_event 11, 2, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_15853D - bg_event 15, 2, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_15853D + bg_event 14, 10, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_15879D + bg_event 15, 10, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_15879D + bg_event 3, 6, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_1587B0 + bg_event 2, 6, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_1587B0 + bg_event 10, 6, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_1587C3 + bg_event 11, 6, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_1587C3 + bg_event 19, 6, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_1587D6 + bg_event 18, 6, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_1587D6 + bg_event 6, 10, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_1587E9 + bg_event 7, 10, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_1587E9 + bg_event 11, 2, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_15853D + bg_event 15, 2, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_15853D LilycoveCity_LilycoveMuseum_2F_MapEvents:: @ 8389838 map_events LilycoveCity_LilycoveMuseum_2F_EventObjects, LilycoveCity_LilycoveMuseum_2F_MapWarps, 0x0, LilycoveCity_LilycoveMuseum_2F_MapBGEvents diff --git a/data/maps/LittlerootTown/events.inc b/data/maps/LittlerootTown/events.inc index 0f439d9bb..45a8ee503 100644 --- a/data/maps/LittlerootTown/events.inc +++ b/data/maps/LittlerootTown/events.inc @@ -23,10 +23,10 @@ LittlerootTown_MapCoordEvents:: @ 83809A4 coord_event 11, 2, 3, 0, VAR_LITTLEROOT_STATE, 3, 0, LittlerootTown_EventScript_14D873 LittlerootTown_MapBGEvents:: @ 8380A34 - bg_event 15, 13, 0, 0, 0, LittlerootTown_EventScript_14D7F6 - bg_event 6, 17, 0, 0, 0, LittlerootTown_EventScript_14D7FF - bg_event 7, 8, 3, 0, 0, LittlerootTown_EventScript_14D808 - bg_event 12, 8, 3, 0, 0, LittlerootTown_EventScript_14D834 + bg_event 15, 13, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_EventScript_14D7F6 + bg_event 6, 17, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_EventScript_14D7FF + bg_event 7, 8, 3, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_EventScript_14D808 + bg_event 12, 8, 3, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_EventScript_14D834 LittlerootTown_MapEvents:: @ 8380A64 map_events LittlerootTown_EventObjects, LittlerootTown_MapWarps, LittlerootTown_MapCoordEvents, LittlerootTown_MapBGEvents diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/events.inc b/data/maps/LittlerootTown_BrendansHouse_2F/events.inc index 882f54534..82215977c 100644 --- a/data/maps/LittlerootTown_BrendansHouse_2F/events.inc +++ b/data/maps/LittlerootTown_BrendansHouse_2F/events.inc @@ -18,10 +18,10 @@ LittlerootTown_BrendansHouse_2F_MapWarps:: @ 8385878 warp_def 7, 1, 0, 2, MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F LittlerootTown_BrendansHouse_2F_MapBGEvents:: @ 8385880 - bg_event 0, 1, 0, 1, 0, LittlerootTown_BrendansHouse_2F_EventScript_15281E - bg_event 1, 1, 0, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_152867 - bg_event 5, 1, 0, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_1B69D3 - bg_event 3, 1, 0, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_152870 + bg_event 0, 1, 0, BG_EVENT_PLAYER_FACING_NORTH, LittlerootTown_BrendansHouse_2F_EventScript_15281E + bg_event 1, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_BrendansHouse_2F_EventScript_152867 + bg_event 5, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_BrendansHouse_2F_EventScript_1B69D3 + bg_event 3, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_BrendansHouse_2F_EventScript_152870 LittlerootTown_BrendansHouse_2F_MapEvents:: @ 83858B0 map_events LittlerootTown_BrendansHouse_2F_EventObjects, LittlerootTown_BrendansHouse_2F_MapWarps, 0x0, LittlerootTown_BrendansHouse_2F_MapBGEvents diff --git a/data/maps/LittlerootTown_MaysHouse_2F/events.inc b/data/maps/LittlerootTown_MaysHouse_2F/events.inc index 98c1f9660..b0c88e6b7 100644 --- a/data/maps/LittlerootTown_MaysHouse_2F/events.inc +++ b/data/maps/LittlerootTown_MaysHouse_2F/events.inc @@ -19,10 +19,10 @@ LittlerootTown_MaysHouse_2F_MapWarps:: @ 8385AE0 warp_def 1, 1, 0, 2, MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F LittlerootTown_MaysHouse_2F_MapBGEvents:: @ 8385AE8 - bg_event 5, 1, 0, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_152870 - bg_event 7, 1, 0, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_152867 - bg_event 3, 1, 0, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_1B69DF - bg_event 8, 1, 0, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_152C39 + bg_event 5, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_MaysHouse_2F_EventScript_152870 + bg_event 7, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_MaysHouse_2F_EventScript_152867 + bg_event 3, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_MaysHouse_2F_EventScript_1B69DF + bg_event 8, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_MaysHouse_2F_EventScript_152C39 LittlerootTown_MaysHouse_2F_MapEvents:: @ 8385B18 map_events LittlerootTown_MaysHouse_2F_EventObjects, LittlerootTown_MaysHouse_2F_MapWarps, 0x0, LittlerootTown_MaysHouse_2F_MapBGEvents diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/events.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/events.inc index 54d74f9ac..e7cdfad32 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/events.inc +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/events.inc @@ -8,21 +8,21 @@ LittlerootTown_ProfessorBirchsLab_MapWarps:: @ 8385B74 warp_def 7, 12, 0, 2, MAP_LITTLEROOT_TOWN LittlerootTown_ProfessorBirchsLab_MapBGEvents:: @ 8385B84 - bg_event 10, 7, 0, 1, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152E9A - bg_event 11, 7, 0, 1, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152E9A - bg_event 7, 1, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152EE2 - bg_event 8, 1, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152EE2 - bg_event 1, 1, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152ED9 - bg_event 0, 7, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152ED9 - bg_event 1, 7, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152ED9 - bg_event 2, 7, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152ED9 - bg_event 3, 7, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152ED9 - bg_event 4, 1, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152ED0 - bg_event 3, 1, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152ED0 - bg_event 1, 10, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152ED0 - bg_event 1, 9, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152ED0 - bg_event 11, 10, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152ED0 - bg_event 11, 9, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152ED0 + bg_event 10, 7, 0, BG_EVENT_PLAYER_FACING_NORTH, LittlerootTown_ProfessorBirchsLab_EventScript_152E9A + bg_event 11, 7, 0, BG_EVENT_PLAYER_FACING_NORTH, LittlerootTown_ProfessorBirchsLab_EventScript_152E9A + bg_event 7, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_152EE2 + bg_event 8, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_152EE2 + bg_event 1, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_152ED9 + bg_event 0, 7, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_152ED9 + bg_event 1, 7, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_152ED9 + bg_event 2, 7, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_152ED9 + bg_event 3, 7, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_152ED9 + bg_event 4, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_152ED0 + bg_event 3, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_152ED0 + bg_event 1, 10, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_152ED0 + bg_event 1, 9, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_152ED0 + bg_event 11, 10, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_152ED0 + bg_event 11, 9, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_152ED0 LittlerootTown_ProfessorBirchsLab_MapEvents:: @ 8385C38 map_events LittlerootTown_ProfessorBirchsLab_EventObjects, LittlerootTown_ProfessorBirchsLab_MapWarps, 0x0, LittlerootTown_ProfessorBirchsLab_MapBGEvents diff --git a/data/maps/MauvilleCity/events.inc b/data/maps/MauvilleCity/events.inc index 7fda28c46..cd0d99bbf 100644 --- a/data/maps/MauvilleCity/events.inc +++ b/data/maps/MauvilleCity/events.inc @@ -19,14 +19,14 @@ MauvilleCity_MapWarps:: @ 837FC68 warp_def 19, 14, 0, 0, MAP_MAUVILLE_CITY_HOUSE2 MauvilleCity_MapBGEvents:: @ 837FCA0 - bg_event 23, 5, 0, 1, 0, MauvilleCity_EventScript_1A00EA - bg_event 11, 6, 3, 0, 0, MauvilleCity_EventScript_14C087 - bg_event 24, 14, 0, 1, 0, MauvilleCity_EventScript_1A00E1 - bg_event 25, 14, 0, 1, 0, MauvilleCity_EventScript_1A00E1 - bg_event 24, 5, 0, 1, 0, MauvilleCity_EventScript_1A00EA - bg_event 19, 7, 0, 0, 0, MauvilleCity_EventScript_14C07E - bg_event 33, 6, 0, 0, 0, MauvilleCity_EventScript_14C090 - bg_event 11, 15, 0, 0, 0, MauvilleCity_EventScript_14C099 + bg_event 23, 5, 0, BG_EVENT_PLAYER_FACING_NORTH, MauvilleCity_EventScript_1A00EA + bg_event 11, 6, 3, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_EventScript_14C087 + bg_event 24, 14, 0, BG_EVENT_PLAYER_FACING_NORTH, MauvilleCity_EventScript_1A00E1 + bg_event 25, 14, 0, BG_EVENT_PLAYER_FACING_NORTH, MauvilleCity_EventScript_1A00E1 + bg_event 24, 5, 0, BG_EVENT_PLAYER_FACING_NORTH, MauvilleCity_EventScript_1A00EA + bg_event 19, 7, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_EventScript_14C07E + bg_event 33, 6, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_EventScript_14C090 + bg_event 11, 15, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_EventScript_14C099 MauvilleCity_MapEvents:: @ 837FD00 map_events MauvilleCity_EventObjects, MauvilleCity_MapWarps, 0x0, MauvilleCity_MapBGEvents diff --git a/data/maps/MauvilleCity_BikeShop/events.inc b/data/maps/MauvilleCity_BikeShop/events.inc index 0d9a0e735..242db7632 100644 --- a/data/maps/MauvilleCity_BikeShop/events.inc +++ b/data/maps/MauvilleCity_BikeShop/events.inc @@ -7,8 +7,8 @@ MauvilleCity_BikeShop_MapWarps:: @ 8388348 warp_def 4, 8, 0, 2, MAP_MAUVILLE_CITY MauvilleCity_BikeShop_MapBGEvents:: @ 8388358 - bg_event 8, 1, 0, 0, 0, MauvilleCity_BikeShop_EventScript_156914 - bg_event 11, 1, 0, 0, 0, MauvilleCity_BikeShop_EventScript_156988 + bg_event 8, 1, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_BikeShop_EventScript_156914 + bg_event 11, 1, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_BikeShop_EventScript_156988 MauvilleCity_BikeShop_MapEvents:: @ 8388370 map_events MauvilleCity_BikeShop_EventObjects, MauvilleCity_BikeShop_MapWarps, 0x0, MauvilleCity_BikeShop_MapBGEvents diff --git a/data/maps/MauvilleCity_GameCorner/events.inc b/data/maps/MauvilleCity_GameCorner/events.inc index d1ad5e4e9..521074d8e 100644 --- a/data/maps/MauvilleCity_GameCorner/events.inc +++ b/data/maps/MauvilleCity_GameCorner/events.inc @@ -17,30 +17,30 @@ MauvilleCity_GameCorner_MapWarps:: @ 83884E0 warp_def 12, 10, 3, 5, MAP_MAUVILLE_CITY MauvilleCity_GameCorner_MapBGEvents:: @ 83884F0 - bg_event 2, 6, 0, 3, 0, MauvilleCity_GameCorner_EventScript_157135 - bg_event 2, 8, 0, 3, 0, MauvilleCity_GameCorner_EventScript_157155 - bg_event 2, 9, 0, 3, 0, MauvilleCity_GameCorner_EventScript_157175 - bg_event 3, 7, 0, 4, 0, MauvilleCity_GameCorner_EventScript_157195 - bg_event 3, 8, 0, 4, 0, MauvilleCity_GameCorner_EventScript_1571B5 - bg_event 3, 9, 0, 4, 0, MauvilleCity_GameCorner_EventScript_1571D5 - bg_event 7, 6, 0, 3, 0, MauvilleCity_GameCorner_EventScript_1571F5 - bg_event 7, 7, 0, 3, 0, MauvilleCity_GameCorner_EventScript_157215 - bg_event 7, 9, 0, 3, 0, MauvilleCity_GameCorner_EventScript_157235 - bg_event 8, 6, 0, 4, 0, MauvilleCity_GameCorner_EventScript_157255 - bg_event 8, 7, 0, 4, 0, MauvilleCity_GameCorner_EventScript_157275 - bg_event 8, 9, 0, 4, 0, MauvilleCity_GameCorner_EventScript_157295 - bg_event 14, 6, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1C407E - bg_event 15, 6, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1C407E - bg_event 14, 7, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1C407E - bg_event 15, 7, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1C407E - bg_event 14, 8, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1C407E - bg_event 15, 8, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1C407E - bg_event 18, 6, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1C40AC - bg_event 19, 6, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1C40AC - bg_event 18, 7, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1C40AC - bg_event 19, 7, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1C40AC - bg_event 18, 8, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1C40AC - bg_event 19, 8, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1C40AC + bg_event 2, 6, 0, BG_EVENT_PLAYER_FACING_EAST, MauvilleCity_GameCorner_EventScript_157135 + bg_event 2, 8, 0, BG_EVENT_PLAYER_FACING_EAST, MauvilleCity_GameCorner_EventScript_157155 + bg_event 2, 9, 0, BG_EVENT_PLAYER_FACING_EAST, MauvilleCity_GameCorner_EventScript_157175 + bg_event 3, 7, 0, BG_EVENT_PLAYER_FACING_WEST, MauvilleCity_GameCorner_EventScript_157195 + bg_event 3, 8, 0, BG_EVENT_PLAYER_FACING_WEST, MauvilleCity_GameCorner_EventScript_1571B5 + bg_event 3, 9, 0, BG_EVENT_PLAYER_FACING_WEST, MauvilleCity_GameCorner_EventScript_1571D5 + bg_event 7, 6, 0, BG_EVENT_PLAYER_FACING_EAST, MauvilleCity_GameCorner_EventScript_1571F5 + bg_event 7, 7, 0, BG_EVENT_PLAYER_FACING_EAST, MauvilleCity_GameCorner_EventScript_157215 + bg_event 7, 9, 0, BG_EVENT_PLAYER_FACING_EAST, MauvilleCity_GameCorner_EventScript_157235 + bg_event 8, 6, 0, BG_EVENT_PLAYER_FACING_WEST, MauvilleCity_GameCorner_EventScript_157255 + bg_event 8, 7, 0, BG_EVENT_PLAYER_FACING_WEST, MauvilleCity_GameCorner_EventScript_157275 + bg_event 8, 9, 0, BG_EVENT_PLAYER_FACING_WEST, MauvilleCity_GameCorner_EventScript_157295 + bg_event 14, 6, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_GameCorner_EventScript_1C407E + bg_event 15, 6, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_GameCorner_EventScript_1C407E + bg_event 14, 7, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_GameCorner_EventScript_1C407E + bg_event 15, 7, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_GameCorner_EventScript_1C407E + bg_event 14, 8, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_GameCorner_EventScript_1C407E + bg_event 15, 8, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_GameCorner_EventScript_1C407E + bg_event 18, 6, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_GameCorner_EventScript_1C40AC + bg_event 19, 6, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_GameCorner_EventScript_1C40AC + bg_event 18, 7, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_GameCorner_EventScript_1C40AC + bg_event 19, 7, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_GameCorner_EventScript_1C40AC + bg_event 18, 8, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_GameCorner_EventScript_1C40AC + bg_event 19, 8, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_GameCorner_EventScript_1C40AC MauvilleCity_GameCorner_MapEvents:: @ 8388610 map_events MauvilleCity_GameCorner_EventObjects, MauvilleCity_GameCorner_MapWarps, 0x0, MauvilleCity_GameCorner_MapBGEvents diff --git a/data/maps/MauvilleCity_Gym/events.inc b/data/maps/MauvilleCity_Gym/events.inc index cfc798095..29784deec 100644 --- a/data/maps/MauvilleCity_Gym/events.inc +++ b/data/maps/MauvilleCity_Gym/events.inc @@ -16,8 +16,8 @@ MauvilleCity_Gym_MapCoordEvents:: @ 83882BC coord_event 4, 15, 3, 0, VAR_TEMP_0, 0, 0, MauvilleCity_Gym_EventScript_156695 MauvilleCity_Gym_MapBGEvents:: @ 83882EC - bg_event 3, 18, 0, 1, 0, MauvilleCity_Gym_EventScript_156761 - bg_event 6, 18, 0, 1, 0, MauvilleCity_Gym_EventScript_156771 + bg_event 3, 18, 0, BG_EVENT_PLAYER_FACING_NORTH, MauvilleCity_Gym_EventScript_156761 + bg_event 6, 18, 0, BG_EVENT_PLAYER_FACING_NORTH, MauvilleCity_Gym_EventScript_156771 MauvilleCity_Gym_MapEvents:: @ 8388304 map_events MauvilleCity_Gym_EventObjects, MauvilleCity_Gym_MapWarps, MauvilleCity_Gym_MapCoordEvents, MauvilleCity_Gym_MapBGEvents diff --git a/data/maps/MeteorFalls_1F_1R/events.inc b/data/maps/MeteorFalls_1F_1R/events.inc index c21b5928e..5af472b66 100644 --- a/data/maps/MeteorFalls_1F_1R/events.inc +++ b/data/maps/MeteorFalls_1F_1R/events.inc @@ -21,8 +21,8 @@ MeteorFalls_1F_1R_MapCoordEvents:: @ 838BBE4 coord_event 14, 18, 4, 0, VAR_METEOR_FALLS_STATE, 0, 0, MeteorFalls_1F_1R_EventScript_15C49C MeteorFalls_1F_1R_MapBGEvents:: @ 838BBF4 - bg_event 38, 9, 0, 1, 0, MeteorFalls_1F_1R_EventScript_14E842 - bg_event 9, 58, 0, 0, 0, 0x0 + bg_event 38, 9, 0, BG_EVENT_PLAYER_FACING_NORTH, MeteorFalls_1F_1R_EventScript_14E842 + bg_event 9, 58, 0, BG_EVENT_PLAYER_FACING_ANY, 0x0 MeteorFalls_1F_1R_MapEvents:: @ 838BC0C map_events MeteorFalls_1F_1R_EventObjects, MeteorFalls_1F_1R_MapWarps, MeteorFalls_1F_1R_MapCoordEvents, MeteorFalls_1F_1R_MapBGEvents diff --git a/data/maps/MeteorFalls_1F_2R/events.inc b/data/maps/MeteorFalls_1F_2R/events.inc index cee79720c..b65223677 100644 --- a/data/maps/MeteorFalls_1F_2R/events.inc +++ b/data/maps/MeteorFalls_1F_2R/events.inc @@ -10,8 +10,8 @@ MeteorFalls_1F_2R_MapWarps:: @ 838BC68 warp_def 21, 23, 3, 2, MAP_METEOR_FALLS_B1F_1R MeteorFalls_1F_2R_MapBGEvents:: @ 838BC88 - bg_event 38, 9, 0, 1, 0, MeteorFalls_1F_2R_EventScript_14E842 - bg_event 9, 58, 0, 0, 0, 0x0 + bg_event 38, 9, 0, BG_EVENT_PLAYER_FACING_NORTH, MeteorFalls_1F_2R_EventScript_14E842 + bg_event 9, 58, 0, BG_EVENT_PLAYER_FACING_ANY, 0x0 MeteorFalls_1F_2R_MapEvents:: @ 838BCA0 map_events MeteorFalls_1F_2R_EventObjects, MeteorFalls_1F_2R_MapWarps, 0x0, MeteorFalls_1F_2R_MapBGEvents diff --git a/data/maps/MossdeepCity/events.inc b/data/maps/MossdeepCity/events.inc index 743b8c876..376ef71ce 100644 --- a/data/maps/MossdeepCity/events.inc +++ b/data/maps/MossdeepCity/events.inc @@ -28,14 +28,14 @@ MossdeepCity_MapCoordEvents:: @ 8380554 coord_event 33, 27, 0, 0, VAR_TEMP_1, 0, 0, MossdeepCity_EventScript_14D008 MossdeepCity_MapBGEvents:: @ 8380594 - bg_event 25, 16, 0, 0, 0, MossdeepCity_EventScript_14CFF6 - bg_event 34, 9, 0, 0, 0, MossdeepCity_EventScript_14CFED - bg_event 29, 16, 0, 1, 0, MossdeepCity_EventScript_1A00EA - bg_event 38, 18, 0, 1, 0, MossdeepCity_EventScript_1A00E1 - bg_event 66, 14, 0, 0, 0, MossdeepCity_EventScript_14CFFF - bg_event 30, 16, 0, 1, 0, MossdeepCity_EventScript_1A00EA - bg_event 39, 18, 0, 1, 0, MossdeepCity_EventScript_1A00E1 - bg_event 57, 21, 7, 0, 0, MossdeepCity_EventScript_14CFE4 + bg_event 25, 16, 0, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_EventScript_14CFF6 + bg_event 34, 9, 0, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_EventScript_14CFED + bg_event 29, 16, 0, BG_EVENT_PLAYER_FACING_NORTH, MossdeepCity_EventScript_1A00EA + bg_event 38, 18, 0, BG_EVENT_PLAYER_FACING_NORTH, MossdeepCity_EventScript_1A00E1 + bg_event 66, 14, 0, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_EventScript_14CFFF + bg_event 30, 16, 0, BG_EVENT_PLAYER_FACING_NORTH, MossdeepCity_EventScript_1A00EA + bg_event 39, 18, 0, BG_EVENT_PLAYER_FACING_NORTH, MossdeepCity_EventScript_1A00E1 + bg_event 57, 21, 7, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_EventScript_14CFE4 MossdeepCity_MapEvents:: @ 83805F4 map_events MossdeepCity_EventObjects, MossdeepCity_MapWarps, MossdeepCity_MapCoordEvents, MossdeepCity_MapBGEvents diff --git a/data/maps/MossdeepCity_GameCorner_1F/events.inc b/data/maps/MossdeepCity_GameCorner_1F/events.inc index b721fccca..9aa705e0e 100644 --- a/data/maps/MossdeepCity_GameCorner_1F/events.inc +++ b/data/maps/MossdeepCity_GameCorner_1F/events.inc @@ -7,7 +7,7 @@ MossdeepCity_GameCorner_1F_MapWarps:: @ 838AC84 warp_def 3, 1, 0, 0, MAP_MOSSDEEP_CITY_GAME_CORNER_B1F MossdeepCity_GameCorner_1F_MapBGEvents:: @ 838AC9C - bg_event 3, 1, 0, 0, 0, MossdeepCity_GameCorner_1F_EventScript_15AE4C + bg_event 3, 1, 0, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_GameCorner_1F_EventScript_15AE4C MossdeepCity_GameCorner_1F_MapEvents:: @ 838ACA8 map_events MossdeepCity_GameCorner_1F_EventObjects, MossdeepCity_GameCorner_1F_MapWarps, 0x0, MossdeepCity_GameCorner_1F_MapBGEvents diff --git a/data/maps/MossdeepCity_Gym/events.inc b/data/maps/MossdeepCity_Gym/events.inc index 8c6afaff4..554985b3c 100644 --- a/data/maps/MossdeepCity_Gym/events.inc +++ b/data/maps/MossdeepCity_Gym/events.inc @@ -17,12 +17,12 @@ MossdeepCity_Gym_MapCoordEvents:: @ 838A748 coord_event 12, 3, 3, 0, VAR_TEMP_1, 0, 0, MossdeepCity_Gym_EventScript_15A742 MossdeepCity_Gym_MapBGEvents:: @ 838A758 - bg_event 2, 7, 0, 0, 0, MossdeepCity_Gym_EventScript_15A5EA - bg_event 8, 10, 0, 0, 0, MossdeepCity_Gym_EventScript_15A646 - bg_event 17, 15, 0, 0, 0, MossdeepCity_Gym_EventScript_15A69A - bg_event 5, 24, 0, 0, 0, MossdeepCity_Gym_EventScript_15A6EE - bg_event 7, 27, 0, 1, 0, MossdeepCity_Gym_EventScript_15A7FA - bg_event 11, 27, 0, 1, 0, MossdeepCity_Gym_EventScript_15A80A + bg_event 2, 7, 0, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_Gym_EventScript_15A5EA + bg_event 8, 10, 0, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_Gym_EventScript_15A646 + bg_event 17, 15, 0, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_Gym_EventScript_15A69A + bg_event 5, 24, 0, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_Gym_EventScript_15A6EE + bg_event 7, 27, 0, BG_EVENT_PLAYER_FACING_NORTH, MossdeepCity_Gym_EventScript_15A7FA + bg_event 11, 27, 0, BG_EVENT_PLAYER_FACING_NORTH, MossdeepCity_Gym_EventScript_15A80A MossdeepCity_Gym_MapEvents:: @ 838A7A0 map_events MossdeepCity_Gym_EventObjects, MossdeepCity_Gym_MapWarps, MossdeepCity_Gym_MapCoordEvents, MossdeepCity_Gym_MapBGEvents diff --git a/data/maps/MossdeepCity_StevensHouse/events.inc b/data/maps/MossdeepCity_StevensHouse/events.inc index a2859732d..c08546238 100644 --- a/data/maps/MossdeepCity_StevensHouse/events.inc +++ b/data/maps/MossdeepCity_StevensHouse/events.inc @@ -9,10 +9,10 @@ MossdeepCity_StevensHouse_MapWarps:: @ 838AAA4 warp_def 4, 7, 0, 6, MAP_MOSSDEEP_CITY MossdeepCity_StevensHouse_MapBGEvents:: @ 838AAB4 - bg_event 0, 1, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_15AAF0 - bg_event 1, 1, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_15AAF0 - bg_event 10, 4, 3, 0, 0, MossdeepCity_StevensHouse_EventScript_15AAF0 - bg_event 10, 6, 3, 0, 0, MossdeepCity_StevensHouse_EventScript_15AAF0 + bg_event 0, 1, 0, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_StevensHouse_EventScript_15AAF0 + bg_event 1, 1, 0, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_StevensHouse_EventScript_15AAF0 + bg_event 10, 4, 3, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_StevensHouse_EventScript_15AAF0 + bg_event 10, 6, 3, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_StevensHouse_EventScript_15AAF0 MossdeepCity_StevensHouse_MapEvents:: @ 838AAE4 map_events MossdeepCity_StevensHouse_EventObjects, MossdeepCity_StevensHouse_MapWarps, 0x0, MossdeepCity_StevensHouse_MapBGEvents diff --git a/data/maps/MtChimney/events.inc b/data/maps/MtChimney/events.inc index 833feb45d..bc071c7b1 100644 --- a/data/maps/MtChimney/events.inc +++ b/data/maps/MtChimney/events.inc @@ -35,8 +35,8 @@ MtChimney_MapWarps:: @ 838C5D0 warp_def 21, 41, 3, 3, MAP_JAGGED_PASS MtChimney_MapBGEvents:: @ 838C5F0 - bg_event 14, 6, 0, 0, 0, MtChimney_EventScript_15D17D - bg_event 24, 37, 3, 0, 0, MtChimney_EventScript_15D1DA + bg_event 14, 6, 0, BG_EVENT_PLAYER_FACING_ANY, MtChimney_EventScript_15D17D + bg_event 24, 37, 3, BG_EVENT_PLAYER_FACING_ANY, MtChimney_EventScript_15D1DA MtChimney_MapEvents:: @ 838C608 map_events MtChimney_EventObjects, MtChimney_MapWarps, 0x0, MtChimney_MapBGEvents diff --git a/data/maps/NewMauville_Inside/events.inc b/data/maps/NewMauville_Inside/events.inc index f94178046..fcea0498e 100644 --- a/data/maps/NewMauville_Inside/events.inc +++ b/data/maps/NewMauville_Inside/events.inc @@ -24,14 +24,14 @@ NewMauville_Inside_MapCoordEvents:: @ 838DFD0 coord_event 33, 6, 3, 0, VAR_NEW_MAUVILLE_STATE, 1, 0, NewMauville_Inside_EventScript_15E876 NewMauville_Inside_MapBGEvents:: @ 838E070 - bg_event 32, 4, 3, 0, 0, NewMauville_Inside_EventScript_15E8E0 - bg_event 32, 3, 3, 0, 0, NewMauville_Inside_EventScript_15E8E0 - bg_event 32, 2, 0, 0, 0, NewMauville_Inside_EventScript_15E8E0 - bg_event 33, 4, 3, 0, 0, NewMauville_Inside_EventScript_15E8E0 - bg_event 34, 4, 3, 0, 0, NewMauville_Inside_EventScript_15E8E0 - bg_event 35, 4, 3, 0, 0, NewMauville_Inside_EventScript_15E8E0 - bg_event 35, 3, 3, 0, 0, NewMauville_Inside_EventScript_15E8E0 - bg_event 35, 2, 0, 0, 0, NewMauville_Inside_EventScript_15E8E0 + bg_event 32, 4, 3, BG_EVENT_PLAYER_FACING_ANY, NewMauville_Inside_EventScript_15E8E0 + bg_event 32, 3, 3, BG_EVENT_PLAYER_FACING_ANY, NewMauville_Inside_EventScript_15E8E0 + bg_event 32, 2, 0, BG_EVENT_PLAYER_FACING_ANY, NewMauville_Inside_EventScript_15E8E0 + bg_event 33, 4, 3, BG_EVENT_PLAYER_FACING_ANY, NewMauville_Inside_EventScript_15E8E0 + bg_event 34, 4, 3, BG_EVENT_PLAYER_FACING_ANY, NewMauville_Inside_EventScript_15E8E0 + bg_event 35, 4, 3, BG_EVENT_PLAYER_FACING_ANY, NewMauville_Inside_EventScript_15E8E0 + bg_event 35, 3, 3, BG_EVENT_PLAYER_FACING_ANY, NewMauville_Inside_EventScript_15E8E0 + bg_event 35, 2, 0, BG_EVENT_PLAYER_FACING_ANY, NewMauville_Inside_EventScript_15E8E0 NewMauville_Inside_MapEvents:: @ 838E0D0 map_events NewMauville_Inside_EventObjects, NewMauville_Inside_MapWarps, NewMauville_Inside_MapCoordEvents, NewMauville_Inside_MapBGEvents diff --git a/data/maps/OldaleTown/events.inc b/data/maps/OldaleTown/events.inc index b1479a947..b9530f0e1 100644 --- a/data/maps/OldaleTown/events.inc +++ b/data/maps/OldaleTown/events.inc @@ -17,11 +17,11 @@ OldaleTown_MapCoordEvents:: @ 8380AF8 coord_event 10, 19, 3, 0, VAR_OLDALE_STATE, 1, 0, OldaleTown_EventScript_14DF77 OldaleTown_MapBGEvents:: @ 8380B38 - bg_event 11, 9, 0, 0, 0, OldaleTown_EventScript_14DDAA - bg_event 7, 16, 0, 1, 0, OldaleTown_EventScript_1A00EA - bg_event 15, 6, 0, 1, 0, OldaleTown_EventScript_1A00E1 - bg_event 8, 16, 0, 1, 0, OldaleTown_EventScript_1A00EA - bg_event 16, 6, 0, 1, 0, OldaleTown_EventScript_1A00E1 + bg_event 11, 9, 0, BG_EVENT_PLAYER_FACING_ANY, OldaleTown_EventScript_14DDAA + bg_event 7, 16, 0, BG_EVENT_PLAYER_FACING_NORTH, OldaleTown_EventScript_1A00EA + bg_event 15, 6, 0, BG_EVENT_PLAYER_FACING_NORTH, OldaleTown_EventScript_1A00E1 + bg_event 8, 16, 0, BG_EVENT_PLAYER_FACING_NORTH, OldaleTown_EventScript_1A00EA + bg_event 16, 6, 0, BG_EVENT_PLAYER_FACING_NORTH, OldaleTown_EventScript_1A00E1 OldaleTown_MapEvents:: @ 8380B74 map_events OldaleTown_EventObjects, OldaleTown_MapWarps, OldaleTown_MapCoordEvents, OldaleTown_MapBGEvents diff --git a/data/maps/PacifidlogTown/events.inc b/data/maps/PacifidlogTown/events.inc index c27d356b3..b96b701c1 100644 --- a/data/maps/PacifidlogTown/events.inc +++ b/data/maps/PacifidlogTown/events.inc @@ -12,9 +12,9 @@ PacifidlogTown_MapWarps:: @ 8381054 warp_def 17, 21, 0, 0, MAP_PACIFIDLOG_TOWN_HOUSE5 PacifidlogTown_MapBGEvents:: @ 8381084 - bg_event 9, 15, 0, 1, 0, PacifidlogTown_EventScript_1A00EA - bg_event 7, 16, 0, 0, 0, PacifidlogTown_EventScript_14E91B - bg_event 10, 15, 0, 1, 0, PacifidlogTown_EventScript_1A00EA + bg_event 9, 15, 0, BG_EVENT_PLAYER_FACING_NORTH, PacifidlogTown_EventScript_1A00EA + bg_event 7, 16, 0, BG_EVENT_PLAYER_FACING_ANY, PacifidlogTown_EventScript_14E91B + bg_event 10, 15, 0, BG_EVENT_PLAYER_FACING_NORTH, PacifidlogTown_EventScript_1A00EA PacifidlogTown_MapEvents:: @ 83810A8 map_events PacifidlogTown_EventObjects, PacifidlogTown_MapWarps, 0x0, PacifidlogTown_MapBGEvents diff --git a/data/maps/PetalburgCity/events.inc b/data/maps/PetalburgCity/events.inc index 66bedb893..718794df1 100644 --- a/data/maps/PetalburgCity/events.inc +++ b/data/maps/PetalburgCity/events.inc @@ -24,13 +24,13 @@ PetalburgCity_MapCoordEvents:: @ 837F6F8 coord_event 8, 13, 3, 0, VAR_PETALBURG_STATE, 0, 0, PetalburgCity_EventScript_14B85A PetalburgCity_MapBGEvents:: @ 837F738 - bg_event 17, 10, 0, 0, 0, PetalburgCity_EventScript_14B812 - bg_event 26, 12, 0, 1, 0, PetalburgCity_EventScript_1A00E1 - bg_event 21, 16, 0, 1, 0, PetalburgCity_EventScript_1A00EA - bg_event 17, 16, 0, 0, 0, PetalburgCity_EventScript_14B81B - bg_event 22, 16, 0, 1, 0, PetalburgCity_EventScript_1A00EA - bg_event 27, 12, 0, 1, 0, PetalburgCity_EventScript_1A00E1 - bg_event 8, 9, 0, 0, 0, PetalburgCity_EventScript_14B82D + bg_event 17, 10, 0, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_EventScript_14B812 + bg_event 26, 12, 0, BG_EVENT_PLAYER_FACING_NORTH, PetalburgCity_EventScript_1A00E1 + bg_event 21, 16, 0, BG_EVENT_PLAYER_FACING_NORTH, PetalburgCity_EventScript_1A00EA + bg_event 17, 16, 0, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_EventScript_14B81B + bg_event 22, 16, 0, BG_EVENT_PLAYER_FACING_NORTH, PetalburgCity_EventScript_1A00EA + bg_event 27, 12, 0, BG_EVENT_PLAYER_FACING_NORTH, PetalburgCity_EventScript_1A00E1 + bg_event 8, 9, 0, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_EventScript_14B82D bg_hidden_item_event 11, 29, 3, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_5F PetalburgCity_MapEvents:: @ 837F798 diff --git a/data/maps/PetalburgCity_Gym/events.inc b/data/maps/PetalburgCity_Gym/events.inc index d4ea2bf06..002eb56ad 100644 --- a/data/maps/PetalburgCity_Gym/events.inc +++ b/data/maps/PetalburgCity_Gym/events.inc @@ -51,20 +51,20 @@ PetalburgCity_Gym_MapWarps:: @ 8387258 warp_def 6, 7, 3, 33, MAP_PETALBURG_CITY_GYM PetalburgCity_Gym_MapBGEvents:: @ 8387388 - bg_event 1, 105, 3, 0, 0, PetalburgCity_Gym_EventScript_154B73 - bg_event 7, 105, 3, 0, 0, PetalburgCity_Gym_EventScript_154BC3 - bg_event 1, 79, 3, 0, 0, PetalburgCity_Gym_EventScript_154BF8 - bg_event 7, 79, 3, 0, 0, PetalburgCity_Gym_EventScript_154C2B - bg_event 1, 92, 3, 0, 0, PetalburgCity_Gym_EventScript_154C5E - bg_event 7, 92, 3, 0, 0, PetalburgCity_Gym_EventScript_154C91 - bg_event 7, 40, 3, 0, 0, PetalburgCity_Gym_EventScript_154CC4 - bg_event 1, 53, 3, 0, 0, PetalburgCity_Gym_EventScript_154CF7 - bg_event 7, 53, 3, 0, 0, PetalburgCity_Gym_EventScript_154D2A - bg_event 1, 66, 3, 0, 0, PetalburgCity_Gym_EventScript_154D5D - bg_event 7, 14, 3, 0, 0, PetalburgCity_Gym_EventScript_154D90 - bg_event 1, 27, 3, 0, 0, PetalburgCity_Gym_EventScript_154DC3 - bg_event 1, 110, 3, 1, 0, PetalburgCity_Gym_EventScript_1551AA - bg_event 7, 110, 3, 1, 0, PetalburgCity_Gym_EventScript_1551BA + bg_event 1, 105, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_Gym_EventScript_154B73 + bg_event 7, 105, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_Gym_EventScript_154BC3 + bg_event 1, 79, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_Gym_EventScript_154BF8 + bg_event 7, 79, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_Gym_EventScript_154C2B + bg_event 1, 92, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_Gym_EventScript_154C5E + bg_event 7, 92, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_Gym_EventScript_154C91 + bg_event 7, 40, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_Gym_EventScript_154CC4 + bg_event 1, 53, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_Gym_EventScript_154CF7 + bg_event 7, 53, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_Gym_EventScript_154D2A + bg_event 1, 66, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_Gym_EventScript_154D5D + bg_event 7, 14, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_Gym_EventScript_154D90 + bg_event 1, 27, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_Gym_EventScript_154DC3 + bg_event 1, 110, 3, BG_EVENT_PLAYER_FACING_NORTH, PetalburgCity_Gym_EventScript_1551AA + bg_event 7, 110, 3, BG_EVENT_PLAYER_FACING_NORTH, PetalburgCity_Gym_EventScript_1551BA PetalburgCity_Gym_MapEvents:: @ 8387430 map_events PetalburgCity_Gym_EventObjects, PetalburgCity_Gym_MapWarps, 0x0, PetalburgCity_Gym_MapBGEvents diff --git a/data/maps/PetalburgWoods/events.inc b/data/maps/PetalburgWoods/events.inc index de7cdf95b..dd0ae1bc1 100644 --- a/data/maps/PetalburgWoods/events.inc +++ b/data/maps/PetalburgWoods/events.inc @@ -26,12 +26,12 @@ PetalburgWoods_MapCoordEvents:: @ 838C2B4 coord_event 27, 23, 3, 0, VAR_PETALBURG_WOODS_STATE, 0, 0, PetalburgWoods_EventScript_15CD42 PetalburgWoods_MapBGEvents:: @ 838C2D4 - bg_event 14, 32, 3, 0, 0, PetalburgWoods_EventScript_15CF15 + bg_event 14, 32, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgWoods_EventScript_15CF15 bg_hidden_item_event 39, 35, 3, ITEM_POTION, FLAG_HIDDEN_ITEM_3A bg_hidden_item_event 26, 6, 3, ITEM_TINY_MUSHROOM, FLAG_HIDDEN_ITEM_3B bg_hidden_item_event 40, 29, 3, ITEM_TINY_MUSHROOM, FLAG_HIDDEN_ITEM_3C bg_hidden_item_event 4, 19, 3, ITEM_POKE_BALL, FLAG_HIDDEN_ITEM_3D - bg_event 11, 8, 3, 0, 0, PetalburgWoods_EventScript_15CF1E + bg_event 11, 8, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgWoods_EventScript_15CF1E PetalburgWoods_MapEvents:: @ 838C31C map_events PetalburgWoods_EventObjects, PetalburgWoods_MapWarps, PetalburgWoods_MapCoordEvents, PetalburgWoods_MapBGEvents diff --git a/data/maps/Route101/events.inc b/data/maps/Route101/events.inc index f991b75b8..39a40e414 100644 --- a/data/maps/Route101/events.inc +++ b/data/maps/Route101/events.inc @@ -18,7 +18,7 @@ Route101_MapCoordEvents:: @ 838114C coord_event 7, 13, 3, 0, VAR_ROUTE101_STATE, 2, 0, Route101_EventScript_14E9E4 Route101_MapBGEvents:: @ 83811DC - bg_event 5, 9, 0, 0, 0, Route101_EventScript_14EA76 + bg_event 5, 9, 0, BG_EVENT_PLAYER_FACING_ANY, Route101_EventScript_14EA76 Route101_MapEvents:: @ 83811E8 map_events Route101_EventObjects, 0x0, Route101_MapCoordEvents, Route101_MapBGEvents diff --git a/data/maps/Route102/events.inc b/data/maps/Route102/events.inc index 72345ef0e..9ba4b1ecd 100644 --- a/data/maps/Route102/events.inc +++ b/data/maps/Route102/events.inc @@ -10,8 +10,8 @@ Route102_EventObjects:: @ 83811FC object_event 9, EVENT_OBJ_GFX_YOUNGSTER, 0, 19, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 3, Route102_EventScript_14EB6A, 0 Route102_MapBGEvents:: @ 83812D4 - bg_event 17, 2, 0, 0, 0, Route102_EventScript_14EAEC - bg_event 40, 9, 0, 0, 0, Route102_EventScript_14EAE3 + bg_event 17, 2, 0, BG_EVENT_PLAYER_FACING_ANY, Route102_EventScript_14EAEC + bg_event 40, 9, 0, BG_EVENT_PLAYER_FACING_ANY, Route102_EventScript_14EAE3 Route102_MapEvents:: @ 83812EC map_events Route102_EventObjects, 0x0, 0x0, Route102_MapBGEvents diff --git a/data/maps/Route103/events.inc b/data/maps/Route103/events.inc index 386d68dd9..1c180dcdc 100644 --- a/data/maps/Route103/events.inc +++ b/data/maps/Route103/events.inc @@ -16,7 +16,7 @@ Route103_EventObjects:: @ 8381300 object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 69, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, S_CuttableTree, FLAG_TEMP_13 Route103_MapBGEvents:: @ 8381468 - bg_event 11, 9, 0, 0, 0, Route103_EventScript_14ED8B + bg_event 11, 9, 0, BG_EVENT_PLAYER_FACING_ANY, Route103_EventScript_14ED8B Route103_MapEvents:: @ 8381474 map_events Route103_EventObjects, 0x0, 0x0, Route103_MapBGEvents diff --git a/data/maps/Route104/events.inc b/data/maps/Route104/events.inc index 33fe912fa..221fe7536 100644 --- a/data/maps/Route104/events.inc +++ b/data/maps/Route104/events.inc @@ -43,11 +43,11 @@ Route104_MapWarps:: @ 8381788 warp_def 33, 42, 3, 5, MAP_PETALBURG_WOODS Route104_MapBGEvents:: @ 83817C8 - bg_event 20, 50, 0, 0, 0, Route104_EventScript_14EF54 - bg_event 27, 66, 0, 0, 0, Route104_EventScript_14EF5D - bg_event 23, 5, 0, 0, 0, Route104_EventScript_14EF66 - bg_event 7, 20, 0, 0, 0, Route104_EventScript_14EF6F - bg_event 17, 23, 3, 0, 0, Route104_EventScript_14EF78 + bg_event 20, 50, 0, BG_EVENT_PLAYER_FACING_ANY, Route104_EventScript_14EF54 + bg_event 27, 66, 0, BG_EVENT_PLAYER_FACING_ANY, Route104_EventScript_14EF5D + bg_event 23, 5, 0, BG_EVENT_PLAYER_FACING_ANY, Route104_EventScript_14EF66 + bg_event 7, 20, 0, BG_EVENT_PLAYER_FACING_ANY, Route104_EventScript_14EF6F + bg_event 17, 23, 3, BG_EVENT_PLAYER_FACING_ANY, Route104_EventScript_14EF78 bg_hidden_item_event 7, 6, 3, ITEM_SUPER_POTION, FLAG_HIDDEN_ITEM_2C bg_hidden_item_event 3, 9, 3, ITEM_POKE_BALL, FLAG_HIDDEN_ITEM_3E bg_hidden_item_event 14, 55, 3, ITEM_POTION, FLAG_HIDDEN_ITEM_25 diff --git a/data/maps/Route104_Prototype/events.inc b/data/maps/Route104_Prototype/events.inc index d08288c3c..ba5b77572 100644 --- a/data/maps/Route104_Prototype/events.inc +++ b/data/maps/Route104_Prototype/events.inc @@ -16,8 +16,8 @@ Route104_Prototype_MapWarps:: @ 839204C warp_def 5, 24, 0, 0, MAP_ROUTE104_PROTOTYPE_PRETTY_PETAL_FLOWER_SHOP Route104_Prototype_MapBGEvents:: @ 8392054 - bg_event 7, 26, 0, 0, 0, Route104_Prototype_EventScript_160D1C - bg_event 18, 8, 0, 0, 0, Route104_Prototype_EventScript_160D25 + bg_event 7, 26, 0, BG_EVENT_PLAYER_FACING_ANY, Route104_Prototype_EventScript_160D1C + bg_event 18, 8, 0, BG_EVENT_PLAYER_FACING_ANY, Route104_Prototype_EventScript_160D25 Route104_Prototype_MapEvents:: @ 839206C map_events Route104_Prototype_EventObjects, Route104_Prototype_MapWarps, 0x0, Route104_Prototype_MapBGEvents diff --git a/data/maps/Route106/events.inc b/data/maps/Route106/events.inc index 14629157b..bac423c22 100644 --- a/data/maps/Route106/events.inc +++ b/data/maps/Route106/events.inc @@ -12,7 +12,7 @@ Route106_MapBGEvents:: @ 838198C bg_hidden_item_event 41, 11, 3, ITEM_POKE_BALL, FLAG_HIDDEN_ITEM_3F bg_hidden_item_event 53, 12, 0, ITEM_STARDUST, FLAG_HIDDEN_ITEM_2E bg_hidden_item_event 68, 15, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_2F - bg_event 59, 13, 3, 0, 0, Route106_EventScript_14F32F + bg_event 59, 13, 3, BG_EVENT_PLAYER_FACING_ANY, Route106_EventScript_14F32F Route106_MapEvents:: @ 83819BC map_events Route106_EventObjects, Route106_MapWarps, 0x0, Route106_MapBGEvents diff --git a/data/maps/Route109/events.inc b/data/maps/Route109/events.inc index 8178651c3..8bc876f7f 100644 --- a/data/maps/Route109/events.inc +++ b/data/maps/Route109/events.inc @@ -24,8 +24,8 @@ Route109_MapWarps:: @ 8381CDC warp_def 12, 5, 0, 0, MAP_ROUTE109_SEASHORE_HOUSE Route109_MapBGEvents:: @ 8381CE4 - bg_event 15, 5, 0, 0, 0, Route109_EventScript_14F79B - bg_event 29, 10, 3, 0, 0, Route109_EventScript_14F7A4 + bg_event 15, 5, 0, BG_EVENT_PLAYER_FACING_ANY, Route109_EventScript_14F79B + bg_event 29, 10, 3, BG_EVENT_PLAYER_FACING_ANY, Route109_EventScript_14F7A4 bg_hidden_item_event 16, 23, 3, ITEM_REVIVE, FLAG_HIDDEN_ITEM_32 bg_hidden_item_event 33, 5, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_34 bg_hidden_item_event 9, 10, 3, ITEM_GREAT_BALL, FLAG_HIDDEN_ITEM_33 diff --git a/data/maps/Route110/events.inc b/data/maps/Route110/events.inc index 1602413f0..6df7b8276 100644 --- a/data/maps/Route110/events.inc +++ b/data/maps/Route110/events.inc @@ -47,23 +47,23 @@ Route110_MapCoordEvents:: @ 8382070 coord_event 35, 56, 3, 0, VAR_ROUTE110_STATE, 0, 0, Route110_EventScript_14FD29 Route110_MapBGEvents:: @ 83820C0 - bg_event 15, 25, 0, 0, 0, Route110_EventScript_14F9EF - bg_event 9, 51, 0, 0, 0, Route110_EventScript_14FA01 - bg_event 14, 88, 0, 0, 0, Route110_EventScript_14F9E6 - bg_event 20, 94, 0, 0, 0, Route110_EventScript_14F9DD - bg_event 7, 75, 0, 0, 0, Route110_EventScript_14F9F8 - bg_event 3, 17, 0, 0, 0, Route110_EventScript_14FA0A + bg_event 15, 25, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_14F9EF + bg_event 9, 51, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_14FA01 + bg_event 14, 88, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_14F9E6 + bg_event 20, 94, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_14F9DD + bg_event 7, 75, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_14F9F8 + bg_event 3, 17, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_14FA0A bg_secret_base_event 16, 25, 0, SECRET_BASE_TREE3_1 bg_secret_base_event 17, 25, 0, SECRET_BASE_TREE4_1 - bg_event 35, 39, 3, 0, 0, Route110_EventScript_14FA13 - bg_event 37, 70, 3, 0, 0, Route110_EventScript_14FA1C - bg_event 8, 67, 0, 0, 0, Route110_EventScript_14FA25 - bg_event 32, 93, 0, 0, 0, Route110_EventScript_14FA2E + bg_event 35, 39, 3, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_14FA13 + bg_event 37, 70, 3, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_14FA1C + bg_event 8, 67, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_14FA25 + bg_event 32, 93, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_14FA2E bg_hidden_item_event 26, 40, 3, ITEM_REVIVE, FLAG_HIDDEN_ITEM_36 bg_hidden_item_event 34, 42, 3, ITEM_GREAT_BALL, FLAG_HIDDEN_ITEM_35 bg_hidden_item_event 4, 35, 3, ITEM_POKE_BALL, FLAG_HIDDEN_ITEM_41 bg_hidden_item_event 37, 67, 3, ITEM_FULL_HEAL, FLAG_HIDDEN_ITEM_37 - bg_event 13, 16, 0, 0, 0, Route110_EventScript_14F9E6 + bg_event 13, 16, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_14F9E6 Route110_MapEvents:: @ 838218C map_events Route110_EventObjects, Route110_MapWarps, Route110_MapCoordEvents, Route110_MapBGEvents diff --git a/data/maps/Route110_TrickHouseEntrance/events.inc b/data/maps/Route110_TrickHouseEntrance/events.inc index 44a86bd6f..e24acb4b7 100644 --- a/data/maps/Route110_TrickHouseEntrance/events.inc +++ b/data/maps/Route110_TrickHouseEntrance/events.inc @@ -13,7 +13,7 @@ Route110_TrickHouseEntrance_MapCoordEvents:: @ 8392170 coord_event 7, 7, 3, 0, VAR_TRICK_HOUSE_ENTRANCE_STATE, 0, 0, Route110_TrickHouseEntrance_EventScript_1618B0 Route110_TrickHouseEntrance_MapBGEvents:: @ 83921B0 - bg_event 5, 1, 0, 1, 0, Route110_TrickHouseEntrance_EventScript_16158A + bg_event 5, 1, 0, BG_EVENT_PLAYER_FACING_NORTH, Route110_TrickHouseEntrance_EventScript_16158A Route110_TrickHouseEntrance_MapEvents:: @ 83921BC map_events Route110_TrickHouseEntrance_EventObjects, Route110_TrickHouseEntrance_MapWarps, Route110_TrickHouseEntrance_MapCoordEvents, Route110_TrickHouseEntrance_MapBGEvents diff --git a/data/maps/Route110_TrickHousePuzzle1/events.inc b/data/maps/Route110_TrickHousePuzzle1/events.inc index 1de294b5a..c7e93f221 100644 --- a/data/maps/Route110_TrickHousePuzzle1/events.inc +++ b/data/maps/Route110_TrickHousePuzzle1/events.inc @@ -25,7 +25,7 @@ Route110_TrickHousePuzzle1_MapWarps:: @ 8392424 warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END Route110_TrickHousePuzzle1_MapBGEvents:: @ 839243C - bg_event 14, 8, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_161D14 + bg_event 14, 8, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_TrickHousePuzzle1_EventScript_161D14 Route110_TrickHousePuzzle1_MapEvents:: @ 8392448 map_events Route110_TrickHousePuzzle1_EventObjects, Route110_TrickHousePuzzle1_MapWarps, 0x0, Route110_TrickHousePuzzle1_MapBGEvents diff --git a/data/maps/Route110_TrickHousePuzzle2/events.inc b/data/maps/Route110_TrickHousePuzzle2/events.inc index bc1bef2d6..2eb41f50d 100644 --- a/data/maps/Route110_TrickHousePuzzle2/events.inc +++ b/data/maps/Route110_TrickHousePuzzle2/events.inc @@ -17,7 +17,7 @@ Route110_TrickHousePuzzle2_MapCoordEvents:: @ 83924EC coord_event 5, 2, 0, 0, VAR_TEMP_4, 0, 0, Route110_TrickHousePuzzle2_EventScript_161E19 Route110_TrickHousePuzzle2_MapBGEvents:: @ 839252C - bg_event 14, 5, 0, 0, 0, Route110_TrickHousePuzzle2_EventScript_161DC3 + bg_event 14, 5, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_TrickHousePuzzle2_EventScript_161DC3 Route110_TrickHousePuzzle2_MapEvents:: @ 8392538 map_events Route110_TrickHousePuzzle2_EventObjects, Route110_TrickHousePuzzle2_MapWarps, Route110_TrickHousePuzzle2_MapCoordEvents, Route110_TrickHousePuzzle2_MapBGEvents diff --git a/data/maps/Route110_TrickHousePuzzle3/events.inc b/data/maps/Route110_TrickHousePuzzle3/events.inc index 1b4bbabcb..1f74281a1 100644 --- a/data/maps/Route110_TrickHousePuzzle3/events.inc +++ b/data/maps/Route110_TrickHousePuzzle3/events.inc @@ -26,7 +26,7 @@ Route110_TrickHousePuzzle3_MapCoordEvents:: @ 839266C coord_event 10, 2, 3, 0, VAR_TEMP_7, 0, 0, Route110_TrickHousePuzzle3_EventScript_1625F3 Route110_TrickHousePuzzle3_MapBGEvents:: @ 83926DC - bg_event 0, 8, 3, 0, 0, Route110_TrickHousePuzzle3_EventScript_1626EB + bg_event 0, 8, 3, BG_EVENT_PLAYER_FACING_ANY, Route110_TrickHousePuzzle3_EventScript_1626EB Route110_TrickHousePuzzle3_MapEvents:: @ 83926E8 map_events Route110_TrickHousePuzzle3_EventObjects, Route110_TrickHousePuzzle3_MapWarps, Route110_TrickHousePuzzle3_MapCoordEvents, Route110_TrickHousePuzzle3_MapBGEvents diff --git a/data/maps/Route110_TrickHousePuzzle4/events.inc b/data/maps/Route110_TrickHousePuzzle4/events.inc index a46e6d9e5..1b4fa2e1a 100644 --- a/data/maps/Route110_TrickHousePuzzle4/events.inc +++ b/data/maps/Route110_TrickHousePuzzle4/events.inc @@ -21,7 +21,7 @@ Route110_TrickHousePuzzle4_MapWarps:: @ 8392864 warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END Route110_TrickHousePuzzle4_MapBGEvents:: @ 839287C - bg_event 0, 5, 3, 0, 0, Route110_TrickHousePuzzle4_EventScript_16274E + bg_event 0, 5, 3, BG_EVENT_PLAYER_FACING_ANY, Route110_TrickHousePuzzle4_EventScript_16274E Route110_TrickHousePuzzle4_MapEvents:: @ 8392888 map_events Route110_TrickHousePuzzle4_EventObjects, Route110_TrickHousePuzzle4_MapWarps, 0x0, Route110_TrickHousePuzzle4_MapBGEvents diff --git a/data/maps/Route110_TrickHousePuzzle5/events.inc b/data/maps/Route110_TrickHousePuzzle5/events.inc index c46d6f8b7..82138284a 100644 --- a/data/maps/Route110_TrickHousePuzzle5/events.inc +++ b/data/maps/Route110_TrickHousePuzzle5/events.inc @@ -27,7 +27,7 @@ Route110_TrickHousePuzzle5_MapCoordEvents:: @ 839292C coord_event 4, 6, 3, 0, VAR_TEMP_5, 0, 0, Route110_TrickHousePuzzle5_EventScript_162933 Route110_TrickHousePuzzle5_MapBGEvents:: @ 8392A0C - bg_event 2, 9, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_1627D5 + bg_event 2, 9, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_TrickHousePuzzle5_EventScript_1627D5 Route110_TrickHousePuzzle5_MapEvents:: @ 8392A18 map_events Route110_TrickHousePuzzle5_EventObjects, Route110_TrickHousePuzzle5_MapWarps, Route110_TrickHousePuzzle5_MapCoordEvents, Route110_TrickHousePuzzle5_MapBGEvents diff --git a/data/maps/Route110_TrickHousePuzzle6/events.inc b/data/maps/Route110_TrickHousePuzzle6/events.inc index 7e2cce846..065a18579 100644 --- a/data/maps/Route110_TrickHousePuzzle6/events.inc +++ b/data/maps/Route110_TrickHousePuzzle6/events.inc @@ -10,7 +10,7 @@ Route110_TrickHousePuzzle6_MapWarps:: @ 8392A8C warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END Route110_TrickHousePuzzle6_MapBGEvents:: @ 8392AA4 - bg_event 13, 9, 3, 0, 0, Route110_TrickHousePuzzle6_EventScript_1630EA + bg_event 13, 9, 3, BG_EVENT_PLAYER_FACING_ANY, Route110_TrickHousePuzzle6_EventScript_1630EA Route110_TrickHousePuzzle6_MapEvents:: @ 8392AB0 map_events Route110_TrickHousePuzzle6_EventObjects, Route110_TrickHousePuzzle6_MapWarps, 0x0, Route110_TrickHousePuzzle6_MapBGEvents diff --git a/data/maps/Route110_TrickHousePuzzle7/events.inc b/data/maps/Route110_TrickHousePuzzle7/events.inc index 221c4b035..b9ab8aaf1 100644 --- a/data/maps/Route110_TrickHousePuzzle7/events.inc +++ b/data/maps/Route110_TrickHousePuzzle7/events.inc @@ -13,12 +13,12 @@ Route110_TrickHousePuzzle7_MapCoordEvents:: @ 8392B3C coord_event 9, 2, 3, 0, VAR_TEMP_1, 0, 0, Route110_TrickHousePuzzle7_EventScript_1632A8 Route110_TrickHousePuzzle7_MapBGEvents:: @ 8392B4C - bg_event 7, 2, 3, 0, 0, Route110_TrickHousePuzzle7_EventScript_16328B - bg_event 12, 16, 3, 0, 0, Route110_TrickHousePuzzle7_EventScript_1632B9 - bg_event 5, 10, 3, 0, 0, Route110_TrickHousePuzzle7_EventScript_163317 - bg_event 12, 11, 3, 0, 0, Route110_TrickHousePuzzle7_EventScript_1632E8 - bg_event 4, 4, 3, 0, 0, Route110_TrickHousePuzzle7_EventScript_163346 - bg_event 7, 5, 3, 0, 0, Route110_TrickHousePuzzle7_EventScript_163375 + bg_event 7, 2, 3, BG_EVENT_PLAYER_FACING_ANY, Route110_TrickHousePuzzle7_EventScript_16328B + bg_event 12, 16, 3, BG_EVENT_PLAYER_FACING_ANY, Route110_TrickHousePuzzle7_EventScript_1632B9 + bg_event 5, 10, 3, BG_EVENT_PLAYER_FACING_ANY, Route110_TrickHousePuzzle7_EventScript_163317 + bg_event 12, 11, 3, BG_EVENT_PLAYER_FACING_ANY, Route110_TrickHousePuzzle7_EventScript_1632E8 + bg_event 4, 4, 3, BG_EVENT_PLAYER_FACING_ANY, Route110_TrickHousePuzzle7_EventScript_163346 + bg_event 7, 5, 3, BG_EVENT_PLAYER_FACING_ANY, Route110_TrickHousePuzzle7_EventScript_163375 Route110_TrickHousePuzzle7_MapEvents:: @ 8392B94 map_events Route110_TrickHousePuzzle7_EventObjects, Route110_TrickHousePuzzle7_MapWarps, Route110_TrickHousePuzzle7_MapCoordEvents, Route110_TrickHousePuzzle7_MapBGEvents diff --git a/data/maps/Route110_TrickHousePuzzle8/events.inc b/data/maps/Route110_TrickHousePuzzle8/events.inc index a92cffc31..b7cdab48f 100644 --- a/data/maps/Route110_TrickHousePuzzle8/events.inc +++ b/data/maps/Route110_TrickHousePuzzle8/events.inc @@ -10,7 +10,7 @@ Route110_TrickHousePuzzle8_MapWarps:: @ 8392C08 warp_def 13, 1, 0, 0, MAP_ROUTE110_TRICK_HOUSE_END Route110_TrickHousePuzzle8_MapBGEvents:: @ 8392C20 - bg_event 7, 11, 3, 0, 0, Route110_TrickHousePuzzle8_EventScript_16341C + bg_event 7, 11, 3, BG_EVENT_PLAYER_FACING_ANY, Route110_TrickHousePuzzle8_EventScript_16341C Route110_TrickHousePuzzle8_MapEvents:: @ 8392C2C map_events Route110_TrickHousePuzzle8_EventObjects, Route110_TrickHousePuzzle8_MapWarps, 0x0, Route110_TrickHousePuzzle8_MapBGEvents diff --git a/data/maps/Route111/events.inc b/data/maps/Route111/events.inc index 10af8dcd4..c245097c1 100644 --- a/data/maps/Route111/events.inc +++ b/data/maps/Route111/events.inc @@ -78,19 +78,19 @@ Route111_MapCoordEvents:: @ 8382518 coord_event 11, 44, 3, 0, 0, 0, 0, Route111_EventScript_1501C9 Route111_MapBGEvents:: @ 8382738 - bg_event 16, 114, 0, 0, 0, Route111_EventScript_150368 - bg_event 24, 126, 0, 0, 0, Route111_EventScript_15035F - bg_event 7, 66, 0, 0, 0, Route111_EventScript_150371 - bg_event 13, 6, 0, 0, 0, Route111_EventScript_15037A + bg_event 16, 114, 0, BG_EVENT_PLAYER_FACING_ANY, Route111_EventScript_150368 + bg_event 24, 126, 0, BG_EVENT_PLAYER_FACING_ANY, Route111_EventScript_15035F + bg_event 7, 66, 0, BG_EVENT_PLAYER_FACING_ANY, Route111_EventScript_150371 + bg_event 13, 6, 0, BG_EVENT_PLAYER_FACING_ANY, Route111_EventScript_15037A bg_secret_base_event 24, 36, 0, SECRET_BASE_YELLOW_CAVE2_1 bg_secret_base_event 34, 50, 0, SECRET_BASE_YELLOW_CAVE3_1 bg_secret_base_event 33, 34, 0, SECRET_BASE_YELLOW_CAVE1_1 - bg_event 25, 19, 0, 0, 0, Route111_EventScript_150383 + bg_event 25, 19, 0, BG_EVENT_PLAYER_FACING_ANY, Route111_EventScript_150383 bg_secret_base_event 35, 1, 0, SECRET_BASE_RED_CAVE2_3 bg_secret_base_event 35, 31, 0, SECRET_BASE_YELLOW_CAVE4_3 bg_hidden_item_event 26, 70, 0, ITEM_STARDUST, FLAG_HIDDEN_ITEM_2 bg_secret_base_event 27, 27, 3, SECRET_BASE_RED_CAVE4_3 - bg_event 7, 84, 3, 0, 0, Route111_EventScript_15038C + bg_event 7, 84, 3, BG_EVENT_PLAYER_FACING_ANY, Route111_EventScript_15038C bg_secret_base_event 14, 19, 0, SECRET_BASE_TREE1_4 bg_secret_base_event 13, 19, 0, SECRET_BASE_TREE1_1 bg_hidden_item_event 19, 55, 0, ITEM_PROTEIN, FLAG_HIDDEN_ITEM_38 diff --git a/data/maps/Route112/events.inc b/data/maps/Route112/events.inc index 51c0e1154..ef6d227b8 100644 --- a/data/maps/Route112/events.inc +++ b/data/maps/Route112/events.inc @@ -21,9 +21,9 @@ Route112_MapWarps:: @ 8382938 warp_def 22, 10, 0, 1, MAP_FIERY_PATH Route112_MapBGEvents:: @ 8382968 - bg_event 19, 44, 3, 0, 0, Route112_EventScript_15052E - bg_event 22, 37, 0, 0, 0, Route112_EventScript_150525 - bg_event 4, 49, 0, 0, 0, Route112_EventScript_150537 + bg_event 19, 44, 3, BG_EVENT_PLAYER_FACING_ANY, Route112_EventScript_15052E + bg_event 22, 37, 0, BG_EVENT_PLAYER_FACING_ANY, Route112_EventScript_150525 + bg_event 4, 49, 0, BG_EVENT_PLAYER_FACING_ANY, Route112_EventScript_150537 Route112_MapEvents:: @ 838298C map_events Route112_EventObjects, Route112_MapWarps, 0x0, Route112_MapBGEvents diff --git a/data/maps/Route113/events.inc b/data/maps/Route113/events.inc index 9c0122345..81f0c48c9 100644 --- a/data/maps/Route113/events.inc +++ b/data/maps/Route113/events.inc @@ -36,10 +36,10 @@ Route113_MapCoordEvents:: @ 8382AB0 coord_weather_event 88, 7, 3, COORD_EVENT_WEATHER_ASH Route113_MapBGEvents:: @ 8382BE0 - bg_event 85, 6, 0, 0, 0, Route113_EventScript_150617 - bg_event 11, 9, 0, 0, 0, Route113_EventScript_150620 - bg_event 58, 4, 3, 0, 0, Route113_EventScript_150632 - bg_event 31, 5, 0, 0, 0, Route113_EventScript_150629 + bg_event 85, 6, 0, BG_EVENT_PLAYER_FACING_ANY, Route113_EventScript_150617 + bg_event 11, 9, 0, BG_EVENT_PLAYER_FACING_ANY, Route113_EventScript_150620 + bg_event 58, 4, 3, BG_EVENT_PLAYER_FACING_ANY, Route113_EventScript_150632 + bg_event 31, 5, 0, BG_EVENT_PLAYER_FACING_ANY, Route113_EventScript_150629 bg_secret_base_event 49, 8, 0, SECRET_BASE_RED_CAVE1_3 bg_hidden_item_event 72, 4, 3, ITEM_ETHER, FLAG_HIDDEN_ITEM_3 bg_hidden_item_event 22, 5, 3, ITEM_TM32_DOUBLE_TEAM, FLAG_HIDDEN_ITEM_1E diff --git a/data/maps/Route114/events.inc b/data/maps/Route114/events.inc index 6a6eeade6..a4edc3489 100644 --- a/data/maps/Route114/events.inc +++ b/data/maps/Route114/events.inc @@ -29,15 +29,15 @@ Route114_MapWarps:: @ 8382E70 warp_def 27, 36, 0, 0, MAP_ROUTE114_LANETTES_HOUSE Route114_MapBGEvents:: @ 8382E88 - bg_event 7, 64, 0, 0, 0, Route114_EventScript_1507D6 - bg_event 31, 7, 0, 0, 0, Route114_EventScript_1507DF + bg_event 7, 64, 0, BG_EVENT_PLAYER_FACING_ANY, Route114_EventScript_1507D6 + bg_event 31, 7, 0, BG_EVENT_PLAYER_FACING_ANY, Route114_EventScript_1507DF bg_secret_base_event 9, 47, 0, SECRET_BASE_BROWN_CAVE1_1 bg_secret_base_event 30, 51, 0, SECRET_BASE_BROWN_CAVE2_1 bg_secret_base_event 11, 62, 0, SECRET_BASE_BROWN_CAVE3_1 bg_secret_base_event 19, 70, 0, SECRET_BASE_BROWN_CAVE4_1 bg_secret_base_event 11, 27, 0, SECRET_BASE_TREE3_2 bg_secret_base_event 12, 27, 0, SECRET_BASE_TREE4_2 - bg_event 25, 38, 3, 0, 0, Route114_EventScript_1507E8 + bg_event 25, 38, 3, BG_EVENT_PLAYER_FACING_ANY, Route114_EventScript_1507E8 bg_hidden_item_event 20, 57, 3, ITEM_CARBOS, FLAG_HIDDEN_ITEM_4 bg_secret_base_event 32, 57, 0, SECRET_BASE_BROWN_CAVE4_3 bg_hidden_item_event 7, 30, 3, ITEM_REVIVE, FLAG_HIDDEN_ITEM_2A diff --git a/data/maps/Route114_FossilManiacsHouse/events.inc b/data/maps/Route114_FossilManiacsHouse/events.inc index 86c7dd7c9..1396fe276 100644 --- a/data/maps/Route114_FossilManiacsHouse/events.inc +++ b/data/maps/Route114_FossilManiacsHouse/events.inc @@ -7,10 +7,10 @@ Route114_FossilManiacsHouse_MapWarps:: @ 838B894 warp_def 4, 1, 0, 0, MAP_ROUTE114_FOSSIL_MANIACS_TUNNEL Route114_FossilManiacsHouse_MapBGEvents:: @ 838B8AC - bg_event 5, 3, 0, 1, 0, Route114_FossilManiacsHouse_EventScript_15C1FC - bg_event 6, 3, 0, 1, 0, Route114_FossilManiacsHouse_EventScript_15C1FC - bg_event 7, 2, 0, 1, 0, Route114_FossilManiacsHouse_EventScript_15C205 - bg_event 8, 2, 0, 1, 0, Route114_FossilManiacsHouse_EventScript_15C205 + bg_event 5, 3, 0, BG_EVENT_PLAYER_FACING_NORTH, Route114_FossilManiacsHouse_EventScript_15C1FC + bg_event 6, 3, 0, BG_EVENT_PLAYER_FACING_NORTH, Route114_FossilManiacsHouse_EventScript_15C1FC + bg_event 7, 2, 0, BG_EVENT_PLAYER_FACING_NORTH, Route114_FossilManiacsHouse_EventScript_15C205 + bg_event 8, 2, 0, BG_EVENT_PLAYER_FACING_NORTH, Route114_FossilManiacsHouse_EventScript_15C205 Route114_FossilManiacsHouse_MapEvents:: @ 838B8DC map_events Route114_FossilManiacsHouse_EventObjects, Route114_FossilManiacsHouse_MapWarps, 0x0, Route114_FossilManiacsHouse_MapBGEvents diff --git a/data/maps/Route114_LanettesHouse/events.inc b/data/maps/Route114_LanettesHouse/events.inc index ee91acbe2..f79c9be44 100644 --- a/data/maps/Route114_LanettesHouse/events.inc +++ b/data/maps/Route114_LanettesHouse/events.inc @@ -6,9 +6,9 @@ Route114_LanettesHouse_MapWarps:: @ 838B944 warp_def 6, 7, 0, 2, MAP_ROUTE114 Route114_LanettesHouse_MapBGEvents:: @ 838B954 - bg_event 5, 1, 0, 0, 0, Route114_LanettesHouse_EventScript_15C299 - bg_event 8, 1, 0, 0, 0, Route114_LanettesHouse_EventScript_15C2D5 - bg_event 7, 1, 0, 0, 0, Route114_LanettesHouse_EventScript_15C2D5 + bg_event 5, 1, 0, BG_EVENT_PLAYER_FACING_ANY, Route114_LanettesHouse_EventScript_15C299 + bg_event 8, 1, 0, BG_EVENT_PLAYER_FACING_ANY, Route114_LanettesHouse_EventScript_15C2D5 + bg_event 7, 1, 0, BG_EVENT_PLAYER_FACING_ANY, Route114_LanettesHouse_EventScript_15C2D5 Route114_LanettesHouse_MapEvents:: @ 838B978 map_events Route114_LanettesHouse_EventObjects, Route114_LanettesHouse_MapWarps, 0x0, Route114_LanettesHouse_MapBGEvents diff --git a/data/maps/Route115/events.inc b/data/maps/Route115/events.inc index 8c40e7ae9..0888896ac 100644 --- a/data/maps/Route115/events.inc +++ b/data/maps/Route115/events.inc @@ -22,8 +22,8 @@ Route115_MapWarps:: @ 83830AC Route115_MapBGEvents:: @ 83830B4 bg_secret_base_event 32, 6, 0, SECRET_BASE_BROWN_CAVE4_2 bg_secret_base_event 21, 18, 0, SECRET_BASE_BROWN_CAVE3_2 - bg_event 16, 64, 0, 0, 0, Route115_EventScript_150937 - bg_event 25, 38, 3, 0, 0, Route115_EventScript_150940 + bg_event 16, 64, 0, BG_EVENT_PLAYER_FACING_ANY, Route115_EventScript_150937 + bg_event 25, 38, 3, BG_EVENT_PLAYER_FACING_ANY, Route115_EventScript_150940 bg_secret_base_event 8, 30, 0, SECRET_BASE_YELLOW_CAVE2_3 bg_secret_base_event 32, 39, 0, SECRET_BASE_BROWN_CAVE1_2 bg_secret_base_event 26, 15, 0, SECRET_BASE_BROWN_CAVE2_2 diff --git a/data/maps/Route116/events.inc b/data/maps/Route116/events.inc index 01eb269c4..12dfa495f 100644 --- a/data/maps/Route116/events.inc +++ b/data/maps/Route116/events.inc @@ -31,13 +31,13 @@ Route116_MapCoordEvents:: @ 8383398 coord_event 47, 9, 3, 0, VAR_ROUTE116_STATE, 1, 0, Route116_EventScript_150B6E Route116_MapBGEvents:: @ 83833A8 - bg_event 5, 10, 0, 0, 0, Route116_EventScript_150B30 - bg_event 48, 9, 0, 0, 0, Route116_EventScript_150B39 - bg_event 40, 9, 0, 0, 0, Route116_EventScript_150B42 + bg_event 5, 10, 0, BG_EVENT_PLAYER_FACING_ANY, Route116_EventScript_150B30 + bg_event 48, 9, 0, BG_EVENT_PLAYER_FACING_ANY, Route116_EventScript_150B39 + bg_event 40, 9, 0, BG_EVENT_PLAYER_FACING_ANY, Route116_EventScript_150B42 bg_secret_base_event 71, 4, 0, SECRET_BASE_BLUE_CAVE1_1 bg_secret_base_event 79, 11, 0, SECRET_BASE_BLUE_CAVE2_1 - bg_event 16, 12, 0, 0, 0, Route116_EventScript_150B4B - bg_event 29, 10, 0, 0, 0, Route116_EventScript_150B54 + bg_event 16, 12, 0, BG_EVENT_PLAYER_FACING_ANY, Route116_EventScript_150B4B + bg_event 29, 10, 0, BG_EVENT_PLAYER_FACING_ANY, Route116_EventScript_150B54 bg_secret_base_event 56, 6, 0, SECRET_BASE_BLUE_CAVE3_2 bg_secret_base_event 55, 15, 0, SECRET_BASE_BLUE_CAVE4_2 bg_hidden_item_event 22, 9, 3, ITEM_SUPER_POTION, FLAG_HIDDEN_ITEM_2D diff --git a/data/maps/Route117/events.inc b/data/maps/Route117/events.inc index 8b09d7b2c..555ca1c08 100644 --- a/data/maps/Route117/events.inc +++ b/data/maps/Route117/events.inc @@ -25,9 +25,9 @@ Route117_MapWarps:: @ 8383638 warp_def 51, 5, 0, 0, MAP_ROUTE117_POKEMON_DAY_CARE Route117_MapBGEvents:: @ 8383640 - bg_event 16, 6, 0, 0, 0, Route117_EventScript_150D72 - bg_event 49, 12, 0, 0, 0, Route117_EventScript_150D7B - bg_event 49, 5, 0, 0, 0, Route117_EventScript_150D84 + bg_event 16, 6, 0, BG_EVENT_PLAYER_FACING_ANY, Route117_EventScript_150D72 + bg_event 49, 12, 0, BG_EVENT_PLAYER_FACING_ANY, Route117_EventScript_150D7B + bg_event 49, 5, 0, BG_EVENT_PLAYER_FACING_ANY, Route117_EventScript_150D84 bg_hidden_item_event 3, 18, 3, ITEM_REPEL, FLAG_HIDDEN_ITEM_48 Route117_MapEvents:: @ 8383670 diff --git a/data/maps/Route118/events.inc b/data/maps/Route118/events.inc index faeb837e5..4c9aa47cb 100644 --- a/data/maps/Route118/events.inc +++ b/data/maps/Route118/events.inc @@ -27,8 +27,8 @@ Route118_MapCoordEvents:: @ 8383864 Route118_MapBGEvents:: @ 8383894 bg_secret_base_event 47, 14, 0, SECRET_BASE_RED_CAVE1_1 - bg_event 13, 6, 0, 0, 0, Route118_EventScript_150F9C - bg_event 56, 8, 0, 0, 0, Route118_EventScript_150FA5 + bg_event 13, 6, 0, BG_EVENT_PLAYER_FACING_ANY, Route118_EventScript_150F9C + bg_event 56, 8, 0, BG_EVENT_PLAYER_FACING_ANY, Route118_EventScript_150FA5 bg_secret_base_event 67, 6, 0, SECRET_BASE_RED_CAVE2_1 bg_secret_base_event 29, 5, 0, SECRET_BASE_YELLOW_CAVE1_2 bg_secret_base_event 47, 5, 0, SECRET_BASE_TREE1_3 diff --git a/data/maps/Route119/events.inc b/data/maps/Route119/events.inc index 16bb236d2..8e895e9ba 100644 --- a/data/maps/Route119/events.inc +++ b/data/maps/Route119/events.inc @@ -69,8 +69,8 @@ Route119_MapCoordEvents:: @ 8383C9C coord_weather_event 20, 137, 3, COORD_EVENT_WEATHER_SUNNY Route119_MapBGEvents:: @ 8383E2C - bg_event 9, 33, 0, 0, 0, Route119_EventScript_15142C - bg_event 27, 19, 0, 0, 0, Route119_EventScript_151423 + bg_event 9, 33, 0, BG_EVENT_PLAYER_FACING_ANY, Route119_EventScript_15142C + bg_event 27, 19, 0, BG_EVENT_PLAYER_FACING_ANY, Route119_EventScript_151423 bg_secret_base_event 5, 2, 0, SECRET_BASE_SHRUB1_1 bg_secret_base_event 4, 89, 0, SECRET_BASE_SHRUB1_2 bg_secret_base_event 5, 15, 0, SECRET_BASE_SHRUB2_1 @@ -88,7 +88,7 @@ Route119_MapBGEvents:: @ 8383E2C bg_secret_base_event 6, 2, 0, SECRET_BASE_SHRUB4_3 bg_hidden_item_event 26, 120, 3, ITEM_FULL_HEAL, FLAG_HIDDEN_ITEM_44 bg_hidden_item_event 20, 29, 3, ITEM_MAX_ETHER, FLAG_HIDDEN_ITEM_57 - bg_event 28, 9, 0, 0, 0, Route119_EventScript_151605 + bg_event 28, 9, 0, BG_EVENT_PLAYER_FACING_ANY, Route119_EventScript_151605 Route119_MapEvents:: @ 8383F1C map_events Route119_EventObjects, Route119_MapWarps, Route119_MapCoordEvents, Route119_MapBGEvents diff --git a/data/maps/Route119_WeatherInstitute_1F/events.inc b/data/maps/Route119_WeatherInstitute_1F/events.inc index 5b30ff21d..91d0568dc 100644 --- a/data/maps/Route119_WeatherInstitute_1F/events.inc +++ b/data/maps/Route119_WeatherInstitute_1F/events.inc @@ -11,10 +11,10 @@ Route119_WeatherInstitute_1F_MapWarps:: @ 8392E38 warp_def 17, 1, 0, 0, MAP_ROUTE119_WEATHER_INSTITUTE_2F Route119_WeatherInstitute_1F_MapBGEvents:: @ 8392E50 - bg_event 1, 2, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_163C83 - bg_event 1, 3, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_163C83 - bg_event 0, 2, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_163C83 - bg_event 0, 3, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_163C83 + bg_event 1, 2, 0, BG_EVENT_PLAYER_FACING_ANY, Route119_WeatherInstitute_1F_EventScript_163C83 + bg_event 1, 3, 0, BG_EVENT_PLAYER_FACING_ANY, Route119_WeatherInstitute_1F_EventScript_163C83 + bg_event 0, 2, 0, BG_EVENT_PLAYER_FACING_ANY, Route119_WeatherInstitute_1F_EventScript_163C83 + bg_event 0, 3, 0, BG_EVENT_PLAYER_FACING_ANY, Route119_WeatherInstitute_1F_EventScript_163C83 Route119_WeatherInstitute_1F_MapEvents:: @ 8392E80 map_events Route119_WeatherInstitute_1F_EventObjects, Route119_WeatherInstitute_1F_MapWarps, 0x0, Route119_WeatherInstitute_1F_MapBGEvents diff --git a/data/maps/Route120/events.inc b/data/maps/Route120/events.inc index 2e86c9e8c..e4372712e 100644 --- a/data/maps/Route120/events.inc +++ b/data/maps/Route120/events.inc @@ -67,8 +67,8 @@ Route120_MapCoordEvents:: @ 8384318 coord_weather_event 13, 75, 3, COORD_EVENT_WEATHER_CLOUDS Route120_MapBGEvents:: @ 8384448 - bg_event 27, 3, 3, 0, 0, Route120_EventScript_1519A1 - bg_event 38, 88, 3, 0, 0, Route120_EventScript_1519AA + bg_event 27, 3, 3, BG_EVENT_PLAYER_FACING_ANY, Route120_EventScript_1519A1 + bg_event 38, 88, 3, BG_EVENT_PLAYER_FACING_ANY, Route120_EventScript_1519AA bg_secret_base_event 28, 62, 0, SECRET_BASE_BLUE_CAVE3_1 bg_secret_base_event 30, 62, 0, SECRET_BASE_BLUE_CAVE4_1 bg_secret_base_event 26, 10, 0, SECRET_BASE_SHRUB3_2 diff --git a/data/maps/Route121/events.inc b/data/maps/Route121/events.inc index 3aee16842..dbd311f31 100644 --- a/data/maps/Route121/events.inc +++ b/data/maps/Route121/events.inc @@ -32,12 +32,12 @@ Route121_MapCoordEvents:: @ 838471C coord_event 25, 8, 3, 0, VAR_ROUTE121_STATE, 0, 0, Route121_EventScript_151B25 Route121_MapBGEvents:: @ 838475C - bg_event 32, 14, 0, 0, 0, Route121_EventScript_151B13 + bg_event 32, 14, 0, BG_EVENT_PLAYER_FACING_ANY, Route121_EventScript_151B13 bg_secret_base_event 40, 11, 0, SECRET_BASE_RED_CAVE2_2 bg_secret_base_event 18, 13, 0, SECRET_BASE_RED_CAVE3_2 bg_secret_base_event 43, 7, 0, SECRET_BASE_TREE1_2 bg_secret_base_event 42, 7, 0, SECRET_BASE_TREE2_2 - bg_event 39, 6, 0, 0, 0, Route121_EventScript_151B1C + bg_event 39, 6, 0, BG_EVENT_PLAYER_FACING_ANY, Route121_EventScript_151B1C bg_hidden_item_event 23, 10, 3, ITEM_HP_UP, FLAG_HIDDEN_ITEM_27 bg_hidden_item_event 58, 3, 3, ITEM_NUGGET, FLAG_HIDDEN_ITEM_28 bg_hidden_item_event 72, 5, 3, ITEM_FULL_HEAL, FLAG_HIDDEN_ITEM_49 diff --git a/data/maps/Route121_SafariZoneEntrance/events.inc b/data/maps/Route121_SafariZoneEntrance/events.inc index c915c5265..b10cfecab 100644 --- a/data/maps/Route121_SafariZoneEntrance/events.inc +++ b/data/maps/Route121_SafariZoneEntrance/events.inc @@ -13,7 +13,7 @@ Route121_SafariZoneEntrance_MapCoordEvents:: @ 838BA9C coord_event 8, 4, 3, 0, VAR_TEMP_1, 0, 0, Route121_SafariZoneEntrance_EventScript_15C383 Route121_SafariZoneEntrance_MapBGEvents:: @ 838BAAC - bg_event 15, 1, 0, 0, 0, Route121_SafariZoneEntrance_EventScript_15C487 + bg_event 15, 1, 0, BG_EVENT_PLAYER_FACING_ANY, Route121_SafariZoneEntrance_EventScript_15C487 Route121_SafariZoneEntrance_MapEvents:: @ 838BAB8 map_events Route121_SafariZoneEntrance_EventObjects, Route121_SafariZoneEntrance_MapWarps, Route121_SafariZoneEntrance_MapCoordEvents, Route121_SafariZoneEntrance_MapBGEvents diff --git a/data/maps/Route123/events.inc b/data/maps/Route123/events.inc index bcf8e820a..8485020e3 100644 --- a/data/maps/Route123/events.inc +++ b/data/maps/Route123/events.inc @@ -62,12 +62,12 @@ Route123_MapCoordEvents:: @ 8384B30 coord_weather_event 94, 10, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE Route123_MapBGEvents:: @ 8384C90 - bg_event 117, 10, 0, 0, 0, Route123_EventScript_151CBF + bg_event 117, 10, 0, BG_EVENT_PLAYER_FACING_ANY, Route123_EventScript_151CBF bg_secret_base_event 47, 3, 0, SECRET_BASE_BLUE_CAVE1_2 bg_secret_base_event 49, 3, 0, SECRET_BASE_BLUE_CAVE2_2 - bg_event 10, 12, 3, 0, 0, Route123_EventScript_151CB6 + bg_event 10, 12, 3, BG_EVENT_PLAYER_FACING_ANY, Route123_EventScript_151CB6 bg_hidden_item_event 75, 1, 3, ITEM_SUPER_REPEL, FLAG_HIDDEN_ITEM_7 - bg_event 20, 7, 3, 0, 0, Route123_EventScript_151CC8 + bg_event 20, 7, 3, BG_EVENT_PLAYER_FACING_ANY, Route123_EventScript_151CC8 bg_secret_base_event 57, 5, 0, SECRET_BASE_BLUE_CAVE1_3 bg_hidden_item_event 12, 1, 3, ITEM_REVIVE, FLAG_HIDDEN_ITEM_29 bg_hidden_item_event 91, 15, 3, ITEM_HYPER_POTION, FLAG_HIDDEN_ITEM_4A diff --git a/data/maps/Route124/events.inc b/data/maps/Route124/events.inc index 0d43521c4..4106bf390 100644 --- a/data/maps/Route124/events.inc +++ b/data/maps/Route124/events.inc @@ -14,7 +14,7 @@ Route124_MapWarps:: @ 8384E00 warp_def 70, 48, 3, 0, MAP_ROUTE124_DIVING_TREASURE_HUNTERS_HOUSE Route124_MapBGEvents:: @ 8384E08 - bg_event 73, 48, 3, 0, 0, Route124_EventScript_151DEF + bg_event 73, 48, 3, BG_EVENT_PLAYER_FACING_ANY, Route124_EventScript_151DEF Route124_MapEvents:: @ 8384E14 map_events Route124_EventObjects, Route124_MapWarps, 0x0, Route124_MapBGEvents diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/events.inc b/data/maps/Route124_DivingTreasureHuntersHouse/events.inc index c696e0bf9..2fa178b70 100644 --- a/data/maps/Route124_DivingTreasureHuntersHouse/events.inc +++ b/data/maps/Route124_DivingTreasureHuntersHouse/events.inc @@ -6,7 +6,7 @@ Route124_DivingTreasureHuntersHouse_MapWarps:: @ 8393024 warp_def 4, 8, 0, 0, MAP_ROUTE124 Route124_DivingTreasureHuntersHouse_MapBGEvents:: @ 8393034 - bg_event 7, 1, 0, 0, 0, Route124_DivingTreasureHuntersHouse_EventScript_164335 + bg_event 7, 1, 0, BG_EVENT_PLAYER_FACING_ANY, Route124_DivingTreasureHuntersHouse_EventScript_164335 Route124_DivingTreasureHuntersHouse_MapEvents:: @ 8393040 map_events Route124_DivingTreasureHuntersHouse_EventObjects, Route124_DivingTreasureHuntersHouse_MapWarps, 0x0, Route124_DivingTreasureHuntersHouse_MapBGEvents diff --git a/data/maps/RustboroCity/events.inc b/data/maps/RustboroCity/events.inc index 4f88e7dd4..041eeaebb 100644 --- a/data/maps/RustboroCity/events.inc +++ b/data/maps/RustboroCity/events.inc @@ -44,16 +44,16 @@ RustboroCity_MapCoordEvents:: @ 837FEC4 coord_event 30, 12, 3, 0, VAR_RUSTBORO_STATE, 4, 0, RustboroCity_EventScript_14C771 RustboroCity_MapBGEvents:: @ 837FF94 - bg_event 23, 19, 0, 0, 0, RustboroCity_EventScript_14C41C - bg_event 25, 35, 0, 0, 0, RustboroCity_EventScript_14C437 - bg_event 17, 45, 0, 1, 0, RustboroCity_EventScript_1A00E1 - bg_event 18, 38, 0, 1, 0, RustboroCity_EventScript_1A00EA - bg_event 19, 49, 0, 0, 0, RustboroCity_EventScript_14C42E - bg_event 18, 45, 0, 1, 0, RustboroCity_EventScript_1A00E1 - bg_event 17, 38, 0, 1, 0, RustboroCity_EventScript_1A00EA - bg_event 17, 20, 0, 0, 0, RustboroCity_EventScript_14C413 - bg_event 30, 8, 0, 0, 0, RustboroCity_EventScript_14C40A - bg_event 12, 38, 3, 0, 0, RustboroCity_EventScript_14C440 + bg_event 23, 19, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_EventScript_14C41C + bg_event 25, 35, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_EventScript_14C437 + bg_event 17, 45, 0, BG_EVENT_PLAYER_FACING_NORTH, RustboroCity_EventScript_1A00E1 + bg_event 18, 38, 0, BG_EVENT_PLAYER_FACING_NORTH, RustboroCity_EventScript_1A00EA + bg_event 19, 49, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_EventScript_14C42E + bg_event 18, 45, 0, BG_EVENT_PLAYER_FACING_NORTH, RustboroCity_EventScript_1A00E1 + bg_event 17, 38, 0, BG_EVENT_PLAYER_FACING_NORTH, RustboroCity_EventScript_1A00EA + bg_event 17, 20, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_EventScript_14C413 + bg_event 30, 8, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_EventScript_14C40A + bg_event 12, 38, 3, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_EventScript_14C440 RustboroCity_MapEvents:: @ 838000C map_events RustboroCity_EventObjects, RustboroCity_MapWarps, RustboroCity_MapCoordEvents, RustboroCity_MapBGEvents diff --git a/data/maps/RustboroCity_DevonCorp_3F/events.inc b/data/maps/RustboroCity_DevonCorp_3F/events.inc index 84b7f23bc..f8f3033ba 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/events.inc +++ b/data/maps/RustboroCity_DevonCorp_3F/events.inc @@ -7,8 +7,8 @@ RustboroCity_DevonCorp_3F_MapWarps:: @ 8388964 warp_def 2, 1, 0, 1, MAP_RUSTBORO_CITY_DEVON_CORP_2F RustboroCity_DevonCorp_3F_MapBGEvents:: @ 838896C - bg_event 1, 5, 3, 0, 0, RustboroCity_DevonCorp_3F_EventScript_1578CF - bg_event 1, 7, 3, 0, 0, RustboroCity_DevonCorp_3F_EventScript_1578CF + bg_event 1, 5, 3, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_DevonCorp_3F_EventScript_1578CF + bg_event 1, 7, 3, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_DevonCorp_3F_EventScript_1578CF RustboroCity_DevonCorp_3F_MapEvents:: @ 8388984 map_events RustboroCity_DevonCorp_3F_EventObjects, RustboroCity_DevonCorp_3F_MapWarps, 0x0, RustboroCity_DevonCorp_3F_MapBGEvents diff --git a/data/maps/RustboroCity_Gym/events.inc b/data/maps/RustboroCity_Gym/events.inc index 2bb04f3be..c78fb9799 100644 --- a/data/maps/RustboroCity_Gym/events.inc +++ b/data/maps/RustboroCity_Gym/events.inc @@ -9,8 +9,8 @@ RustboroCity_Gym_MapWarps:: @ 83889F8 warp_def 6, 18, 0, 0, MAP_RUSTBORO_CITY RustboroCity_Gym_MapBGEvents:: @ 8388A08 - bg_event 2, 17, 0, 1, 0, RustboroCity_Gym_EventScript_1579AD - bg_event 8, 17, 0, 1, 0, RustboroCity_Gym_EventScript_1579BD + bg_event 2, 17, 0, BG_EVENT_PLAYER_FACING_NORTH, RustboroCity_Gym_EventScript_1579AD + bg_event 8, 17, 0, BG_EVENT_PLAYER_FACING_NORTH, RustboroCity_Gym_EventScript_1579BD RustboroCity_Gym_MapEvents:: @ 8388A20 map_events RustboroCity_Gym_EventObjects, RustboroCity_Gym_MapWarps, 0x0, RustboroCity_Gym_MapBGEvents diff --git a/data/maps/RustboroCity_PokemonSchool/events.inc b/data/maps/RustboroCity_PokemonSchool/events.inc index 7089d2803..6c4485f9a 100644 --- a/data/maps/RustboroCity_PokemonSchool/events.inc +++ b/data/maps/RustboroCity_PokemonSchool/events.inc @@ -11,11 +11,11 @@ RustboroCity_PokemonSchool_MapWarps:: @ 8388AC4 warp_def 6, 10, 0, 4, MAP_RUSTBORO_CITY RustboroCity_PokemonSchool_MapBGEvents:: @ 8388AD4 - bg_event 5, 2, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_1579E2 - bg_event 4, 2, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_1579E2 - bg_event 6, 2, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_1579E2 - bg_event 7, 2, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_1579E2 - bg_event 3, 5, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_157AC5 + bg_event 5, 2, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_PokemonSchool_EventScript_1579E2 + bg_event 4, 2, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_PokemonSchool_EventScript_1579E2 + bg_event 6, 2, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_PokemonSchool_EventScript_1579E2 + bg_event 7, 2, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_PokemonSchool_EventScript_1579E2 + bg_event 3, 5, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_PokemonSchool_EventScript_157AC5 RustboroCity_PokemonSchool_MapEvents:: @ 8388B10 map_events RustboroCity_PokemonSchool_EventObjects, RustboroCity_PokemonSchool_MapWarps, 0x0, RustboroCity_PokemonSchool_MapBGEvents diff --git a/data/maps/SSTidalCorridor/events.inc b/data/maps/SSTidalCorridor/events.inc index e94d506d8..ba5a350d6 100644 --- a/data/maps/SSTidalCorridor/events.inc +++ b/data/maps/SSTidalCorridor/events.inc @@ -16,18 +16,18 @@ SSTidalCorridor_MapWarps:: @ 8391758 warp_def 16, 2, 3, 0, MAP_SS_TIDAL_LOWER_DECK SSTidalCorridor_MapBGEvents:: @ 83917A0 - bg_event 2, 1, 0, 0, 0, SSTidalCorridor_EventScript_15FE3A - bg_event 4, 1, 0, 0, 0, SSTidalCorridor_EventScript_15FE3A - bg_event 6, 1, 0, 0, 0, SSTidalCorridor_EventScript_15FE3A - bg_event 8, 1, 0, 0, 0, SSTidalCorridor_EventScript_15FE3A - bg_event 10, 1, 0, 0, 0, SSTidalCorridor_EventScript_15FE3A - bg_event 12, 1, 0, 0, 0, SSTidalCorridor_EventScript_15FE3A - bg_event 14, 1, 0, 0, 0, SSTidalCorridor_EventScript_15FE3A - bg_event 16, 1, 0, 0, 0, SSTidalCorridor_EventScript_15FE3A - bg_event 5, 9, 0, 1, 0, SSTidalCorridor_EventScript_15FDB2 - bg_event 8, 9, 0, 1, 0, SSTidalCorridor_EventScript_15FDBB - bg_event 11, 9, 0, 1, 0, SSTidalCorridor_EventScript_15FDC4 - bg_event 14, 9, 0, 1, 0, SSTidalCorridor_EventScript_15FDCD + bg_event 2, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SSTidalCorridor_EventScript_15FE3A + bg_event 4, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SSTidalCorridor_EventScript_15FE3A + bg_event 6, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SSTidalCorridor_EventScript_15FE3A + bg_event 8, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SSTidalCorridor_EventScript_15FE3A + bg_event 10, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SSTidalCorridor_EventScript_15FE3A + bg_event 12, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SSTidalCorridor_EventScript_15FE3A + bg_event 14, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SSTidalCorridor_EventScript_15FE3A + bg_event 16, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SSTidalCorridor_EventScript_15FE3A + bg_event 5, 9, 0, BG_EVENT_PLAYER_FACING_NORTH, SSTidalCorridor_EventScript_15FDB2 + bg_event 8, 9, 0, BG_EVENT_PLAYER_FACING_NORTH, SSTidalCorridor_EventScript_15FDBB + bg_event 11, 9, 0, BG_EVENT_PLAYER_FACING_NORTH, SSTidalCorridor_EventScript_15FDC4 + bg_event 14, 9, 0, BG_EVENT_PLAYER_FACING_NORTH, SSTidalCorridor_EventScript_15FDCD SSTidalCorridor_MapEvents:: @ 8391830 map_events SSTidalCorridor_EventObjects, SSTidalCorridor_MapWarps, 0x0, SSTidalCorridor_MapBGEvents diff --git a/data/maps/SSTidalRooms/events.inc b/data/maps/SSTidalRooms/events.inc index 6c24c610b..5de9aa019 100644 --- a/data/maps/SSTidalRooms/events.inc +++ b/data/maps/SSTidalRooms/events.inc @@ -23,8 +23,8 @@ SSTidalRooms_MapWarps:: @ 839195C warp_def 31, 1, 0, 7, MAP_SS_TIDAL_CORRIDOR SSTidalRooms_MapBGEvents:: @ 83919BC - bg_event 15, 11, 0, 0, 0, SSTidalRooms_EventScript_15FF47 - bg_event 15, 12, 0, 0, 0, SSTidalRooms_EventScript_15FF47 + bg_event 15, 11, 0, BG_EVENT_PLAYER_FACING_ANY, SSTidalRooms_EventScript_15FF47 + bg_event 15, 12, 0, BG_EVENT_PLAYER_FACING_ANY, SSTidalRooms_EventScript_15FF47 SSTidalRooms_MapEvents:: @ 83919D4 map_events SSTidalRooms_EventObjects, SSTidalRooms_MapWarps, 0x0, SSTidalRooms_MapBGEvents diff --git a/data/maps/SafariZone_Southwest/events.inc b/data/maps/SafariZone_Southwest/events.inc index 22960b860..7ac33182f 100644 --- a/data/maps/SafariZone_Southwest/events.inc +++ b/data/maps/SafariZone_Southwest/events.inc @@ -6,7 +6,7 @@ SafariZone_Southwest_MapWarps:: @ 8391B48 warp_def 29, 7, 3, 0, MAP_SAFARI_ZONE_REST_HOUSE SafariZone_Southwest_MapBGEvents:: @ 8391B50 - bg_event 32, 7, 3, 0, 0, SafariZone_Southwest_EventScript_16002D + bg_event 32, 7, 3, BG_EVENT_PLAYER_FACING_ANY, SafariZone_Southwest_EventScript_16002D SafariZone_Southwest_MapEvents:: @ 8391B5C map_events SafariZone_Southwest_EventObjects, SafariZone_Southwest_MapWarps, 0x0, SafariZone_Southwest_MapBGEvents diff --git a/data/maps/SealedChamber_InnerRoom/events.inc b/data/maps/SealedChamber_InnerRoom/events.inc index a457a4e03..e84f52269 100644 --- a/data/maps/SealedChamber_InnerRoom/events.inc +++ b/data/maps/SealedChamber_InnerRoom/events.inc @@ -2,15 +2,15 @@ SealedChamber_InnerRoom_MapWarps:: @ 838E900 warp_def 10, 19, 3, 0, MAP_SEALED_CHAMBER_OUTER_ROOM SealedChamber_InnerRoom_MapBGEvents:: @ 838E908 - bg_event 10, 4, 0, 0, 0, SealedChamber_InnerRoom_EventScript_15F1E8 - bg_event 6, 8, 0, 0, 0, SealedChamber_InnerRoom_EventScript_15F249 - bg_event 14, 8, 0, 0, 0, SealedChamber_InnerRoom_EventScript_15F257 - bg_event 4, 13, 0, 0, 0, SealedChamber_InnerRoom_EventScript_15F265 - bg_event 16, 13, 0, 0, 0, SealedChamber_InnerRoom_EventScript_15F273 - bg_event 6, 18, 0, 0, 0, SealedChamber_InnerRoom_EventScript_15F281 - bg_event 14, 18, 0, 0, 0, SealedChamber_InnerRoom_EventScript_15F28F - bg_event 9, 4, 0, 0, 0, SealedChamber_InnerRoom_EventScript_15F1E8 - bg_event 11, 4, 0, 0, 0, SealedChamber_InnerRoom_EventScript_15F1E8 + bg_event 10, 4, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_InnerRoom_EventScript_15F1E8 + bg_event 6, 8, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_InnerRoom_EventScript_15F249 + bg_event 14, 8, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_InnerRoom_EventScript_15F257 + bg_event 4, 13, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_InnerRoom_EventScript_15F265 + bg_event 16, 13, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_InnerRoom_EventScript_15F273 + bg_event 6, 18, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_InnerRoom_EventScript_15F281 + bg_event 14, 18, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_InnerRoom_EventScript_15F28F + bg_event 9, 4, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_InnerRoom_EventScript_15F1E8 + bg_event 11, 4, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_InnerRoom_EventScript_15F1E8 SealedChamber_InnerRoom_MapEvents:: @ 838E974 map_events 0x0, SealedChamber_InnerRoom_MapWarps, 0x0, SealedChamber_InnerRoom_MapBGEvents diff --git a/data/maps/SealedChamber_OuterRoom/events.inc b/data/maps/SealedChamber_OuterRoom/events.inc index 634f41f60..c102f86d8 100644 --- a/data/maps/SealedChamber_OuterRoom/events.inc +++ b/data/maps/SealedChamber_OuterRoom/events.inc @@ -2,35 +2,35 @@ SealedChamber_OuterRoom_MapWarps:: @ 838E788 warp_def 10, 2, 3, 0, MAP_SEALED_CHAMBER_INNER_ROOM SealedChamber_OuterRoom_MapBGEvents:: @ 838E790 - bg_event 5, 6, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F12C - bg_event 5, 9, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F13A - bg_event 5, 12, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F148 - bg_event 5, 15, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F156 - bg_event 11, 6, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F164 - bg_event 11, 9, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F172 - bg_event 11, 12, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F180 - bg_event 11, 15, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F19C - bg_event 16, 6, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F18E - bg_event 16, 9, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F1AA - bg_event 10, 2, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F1B8 - bg_event 6, 6, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F12C - bg_event 4, 6, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F12C - bg_event 4, 9, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F13A - bg_event 6, 9, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F13A - bg_event 4, 12, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F148 - bg_event 6, 12, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F148 - bg_event 4, 15, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F156 - bg_event 6, 15, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F156 - bg_event 10, 6, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F164 - bg_event 12, 6, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F164 - bg_event 10, 9, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F172 - bg_event 12, 9, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F172 - bg_event 10, 12, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F180 - bg_event 12, 12, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F180 - bg_event 10, 15, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F19C - bg_event 12, 15, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F19C - bg_event 9, 2, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F1D9 - bg_event 11, 2, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F1D9 + bg_event 5, 6, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_15F12C + bg_event 5, 9, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_15F13A + bg_event 5, 12, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_15F148 + bg_event 5, 15, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_15F156 + bg_event 11, 6, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_15F164 + bg_event 11, 9, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_15F172 + bg_event 11, 12, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_15F180 + bg_event 11, 15, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_15F19C + bg_event 16, 6, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_15F18E + bg_event 16, 9, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_15F1AA + bg_event 10, 2, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_15F1B8 + bg_event 6, 6, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_15F12C + bg_event 4, 6, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_15F12C + bg_event 4, 9, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_15F13A + bg_event 6, 9, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_15F13A + bg_event 4, 12, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_15F148 + bg_event 6, 12, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_15F148 + bg_event 4, 15, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_15F156 + bg_event 6, 15, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_15F156 + bg_event 10, 6, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_15F164 + bg_event 12, 6, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_15F164 + bg_event 10, 9, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_15F172 + bg_event 12, 9, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_15F172 + bg_event 10, 12, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_15F180 + bg_event 12, 12, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_15F180 + bg_event 10, 15, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_15F19C + bg_event 12, 15, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_15F19C + bg_event 9, 2, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_15F1D9 + bg_event 11, 2, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_15F1D9 SealedChamber_OuterRoom_MapEvents:: @ 838E8EC map_events 0x0, SealedChamber_OuterRoom_MapWarps, 0x0, SealedChamber_OuterRoom_MapBGEvents diff --git a/data/maps/ShoalCave_LowTideInnerRoom/events.inc b/data/maps/ShoalCave_LowTideInnerRoom/events.inc index 660544863..07d6e60dc 100644 --- a/data/maps/ShoalCave_LowTideInnerRoom/events.inc +++ b/data/maps/ShoalCave_LowTideInnerRoom/events.inc @@ -12,12 +12,12 @@ ShoalCave_LowTideInnerRoom_MapWarps:: @ 838DD58 warp_def 40, 33, 5, 3, MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM ShoalCave_LowTideInnerRoom_MapBGEvents:: @ 838DD98 - bg_event 31, 8, 5, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_15E329 - bg_event 14, 26, 3, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_15E365 - bg_event 41, 20, 5, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_15E257 - bg_event 41, 10, 5, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_15E293 - bg_event 6, 9, 3, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_15E2C5 - bg_event 16, 13, 5, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_15E2F7 + bg_event 31, 8, 5, BG_EVENT_PLAYER_FACING_ANY, ShoalCave_LowTideInnerRoom_EventScript_15E329 + bg_event 14, 26, 3, BG_EVENT_PLAYER_FACING_ANY, ShoalCave_LowTideInnerRoom_EventScript_15E365 + bg_event 41, 20, 5, BG_EVENT_PLAYER_FACING_ANY, ShoalCave_LowTideInnerRoom_EventScript_15E257 + bg_event 41, 10, 5, BG_EVENT_PLAYER_FACING_ANY, ShoalCave_LowTideInnerRoom_EventScript_15E293 + bg_event 6, 9, 3, BG_EVENT_PLAYER_FACING_ANY, ShoalCave_LowTideInnerRoom_EventScript_15E2C5 + bg_event 16, 13, 5, BG_EVENT_PLAYER_FACING_ANY, ShoalCave_LowTideInnerRoom_EventScript_15E2F7 ShoalCave_LowTideInnerRoom_MapEvents:: @ 838DDE0 map_events ShoalCave_LowTideInnerRoom_EventObjects, ShoalCave_LowTideInnerRoom_MapWarps, 0x0, ShoalCave_LowTideInnerRoom_MapBGEvents diff --git a/data/maps/ShoalCave_LowTideLowerRoom/events.inc b/data/maps/ShoalCave_LowTideLowerRoom/events.inc index c70c0291c..9159098e6 100644 --- a/data/maps/ShoalCave_LowTideLowerRoom/events.inc +++ b/data/maps/ShoalCave_LowTideLowerRoom/events.inc @@ -9,7 +9,7 @@ ShoalCave_LowTideLowerRoom_MapWarps:: @ 838DE6C warp_def 28, 11, 3, 0, MAP_SHOAL_CAVE_LOW_TIDE_ICE_ROOM ShoalCave_LowTideLowerRoom_MapBGEvents:: @ 838DE8C - bg_event 18, 2, 3, 0, 0, ShoalCave_LowTideLowerRoom_EventScript_15E413 + bg_event 18, 2, 3, BG_EVENT_PLAYER_FACING_ANY, ShoalCave_LowTideLowerRoom_EventScript_15E413 ShoalCave_LowTideLowerRoom_MapEvents:: @ 838DE98 map_events ShoalCave_LowTideLowerRoom_EventObjects, ShoalCave_LowTideLowerRoom_MapWarps, 0x0, ShoalCave_LowTideLowerRoom_MapBGEvents diff --git a/data/maps/ShoalCave_LowTideStairsRoom/events.inc b/data/maps/ShoalCave_LowTideStairsRoom/events.inc index ab5727820..63b0f279c 100644 --- a/data/maps/ShoalCave_LowTideStairsRoom/events.inc +++ b/data/maps/ShoalCave_LowTideStairsRoom/events.inc @@ -6,7 +6,7 @@ ShoalCave_LowTideStairsRoom_MapWarps:: @ 838DE0C warp_def 7, 4, 3, 2, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM ShoalCave_LowTideStairsRoom_MapBGEvents:: @ 838DE1C - bg_event 11, 11, 3, 0, 0, ShoalCave_LowTideStairsRoom_EventScript_15E3B7 + bg_event 11, 11, 3, BG_EVENT_PLAYER_FACING_ANY, ShoalCave_LowTideStairsRoom_EventScript_15E3B7 ShoalCave_LowTideStairsRoom_MapEvents:: @ 838DE28 map_events ShoalCave_LowTideStairsRoom_EventObjects, ShoalCave_LowTideStairsRoom_MapWarps, 0x0, ShoalCave_LowTideStairsRoom_MapBGEvents diff --git a/data/maps/SlateportCity/events.inc b/data/maps/SlateportCity/events.inc index 426b87ac5..af197d461 100644 --- a/data/maps/SlateportCity/events.inc +++ b/data/maps/SlateportCity/events.inc @@ -45,18 +45,18 @@ SlateportCity_MapWarps:: @ 837FA94 warp_def 21, 44, 0, 0, MAP_SLATEPORT_CITY_HOUSE2 SlateportCity_MapBGEvents:: @ 837FAEC - bg_event 8, 19, 0, 0, 0, SlateportCity_EventScript_14BCAF - bg_event 20, 19, 0, 1, 0, SlateportCity_EventScript_1A00EA - bg_event 21, 19, 0, 1, 0, SlateportCity_EventScript_1A00EA - bg_event 14, 26, 0, 1, 0, SlateportCity_EventScript_1A00E1 - bg_event 24, 12, 0, 0, 0, SlateportCity_EventScript_14BC91 - bg_event 15, 26, 0, 1, 0, SlateportCity_EventScript_1A00E1 - bg_event 14, 51, 0, 0, 0, SlateportCity_EventScript_14BC88 - bg_event 26, 26, 0, 0, 0, SlateportCity_EventScript_14BC76 - bg_event 16, 22, 0, 0, 0, SlateportCity_EventScript_14BC7F - bg_event 8, 26, 0, 0, 0, SlateportCity_EventScript_14BC6D - bg_event 7, 13, 0, 0, 0, SlateportCity_EventScript_14BC33 - bg_event 23, 38, 0, 0, 0, SlateportCity_EventScript_14BC3C + bg_event 8, 19, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_EventScript_14BCAF + bg_event 20, 19, 0, BG_EVENT_PLAYER_FACING_NORTH, SlateportCity_EventScript_1A00EA + bg_event 21, 19, 0, BG_EVENT_PLAYER_FACING_NORTH, SlateportCity_EventScript_1A00EA + bg_event 14, 26, 0, BG_EVENT_PLAYER_FACING_NORTH, SlateportCity_EventScript_1A00E1 + bg_event 24, 12, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_EventScript_14BC91 + bg_event 15, 26, 0, BG_EVENT_PLAYER_FACING_NORTH, SlateportCity_EventScript_1A00E1 + bg_event 14, 51, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_EventScript_14BC88 + bg_event 26, 26, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_EventScript_14BC76 + bg_event 16, 22, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_EventScript_14BC7F + bg_event 8, 26, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_EventScript_14BC6D + bg_event 7, 13, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_EventScript_14BC33 + bg_event 23, 38, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_EventScript_14BC3C SlateportCity_MapEvents:: @ 837FB7C map_events SlateportCity_EventObjects, SlateportCity_MapWarps, 0x0, SlateportCity_MapBGEvents diff --git a/data/maps/SlateportCity_ContestHall/events.inc b/data/maps/SlateportCity_ContestHall/events.inc index 4be7d9159..1dfff2ffd 100644 --- a/data/maps/SlateportCity_ContestHall/events.inc +++ b/data/maps/SlateportCity_ContestHall/events.inc @@ -18,8 +18,8 @@ SlateportCity_ContestHall_MapWarps:: @ 83879DC warp_def 11, 17, 0, 2, MAP_SLATEPORT_CITY_CONTEST_LOBBY SlateportCity_ContestHall_MapBGEvents:: @ 83879EC - bg_event 12, 14, 3, 0, 0, SlateportCity_ContestHall_EventScript_155671 - bg_event 8, 14, 3, 0, 0, SlateportCity_ContestHall_EventScript_155671 + bg_event 12, 14, 3, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_ContestHall_EventScript_155671 + bg_event 8, 14, 3, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_ContestHall_EventScript_155671 SlateportCity_ContestHall_MapEvents:: @ 8387A04 map_events SlateportCity_ContestHall_EventObjects, SlateportCity_ContestHall_MapWarps, 0x0, SlateportCity_ContestHall_MapBGEvents diff --git a/data/maps/SlateportCity_ContestLobby/events.inc b/data/maps/SlateportCity_ContestLobby/events.inc index 8da6e62ad..cb437b8d9 100644 --- a/data/maps/SlateportCity_ContestLobby/events.inc +++ b/data/maps/SlateportCity_ContestLobby/events.inc @@ -14,10 +14,10 @@ SlateportCity_ContestLobby_MapWarps:: @ 8387848 warp_def 1, 1, 0, 0, MAP_SLATEPORT_CITY_CONTEST_HALL SlateportCity_ContestLobby_MapBGEvents:: @ 8387860 - bg_event 10, 3, 0, 0, 0, SlateportCity_ContestLobby_EventScript_1B7829 - bg_event 12, 5, 0, 0, 0, SlateportCity_ContestLobby_EventScript_1B761E - bg_event 11, 1, 0, 0, 0, SlateportCity_ContestLobby_EventScript_15552F - bg_event 13, 1, 0, 0, 0, SlateportCity_ContestLobby_EventScript_15908D + bg_event 10, 3, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_ContestLobby_EventScript_1B7829 + bg_event 12, 5, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_ContestLobby_EventScript_1B761E + bg_event 11, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_ContestLobby_EventScript_15552F + bg_event 13, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_ContestLobby_EventScript_15908D SlateportCity_ContestLobby_MapEvents:: @ 8387890 map_events SlateportCity_ContestLobby_EventObjects, SlateportCity_ContestLobby_MapWarps, 0x0, SlateportCity_ContestLobby_MapBGEvents diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/events.inc b/data/maps/SlateportCity_OceanicMuseum_1F/events.inc index ba7c570f3..feb7bbdd8 100644 --- a/data/maps/SlateportCity_OceanicMuseum_1F/events.inc +++ b/data/maps/SlateportCity_OceanicMuseum_1F/events.inc @@ -24,19 +24,19 @@ SlateportCity_OceanicMuseum_1F_MapCoordEvents:: @ 8387CA0 coord_event 10, 7, 3, 0, VAR_SLATEPORT_MUSEUM_1F_STATE, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155AF5 SlateportCity_OceanicMuseum_1F_MapBGEvents:: @ 8387CC0 - bg_event 2, 7, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BC5 - bg_event 2, 4, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BCE - bg_event 9, 1, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BD7 - bg_event 12, 1, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BE0 - bg_event 10, 1, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BD7 - bg_event 13, 1, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BE0 - bg_event 15, 4, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BE9 - bg_event 18, 4, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BF2 - bg_event 18, 7, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BFB - bg_event 2, 1, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C04 - bg_event 3, 1, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C04 - bg_event 16, 1, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C0D - bg_event 17, 1, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C0D + bg_event 2, 7, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_155BC5 + bg_event 2, 4, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_155BCE + bg_event 9, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_155BD7 + bg_event 12, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_155BE0 + bg_event 10, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_155BD7 + bg_event 13, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_155BE0 + bg_event 15, 4, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_155BE9 + bg_event 18, 4, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_155BF2 + bg_event 18, 7, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_155BFB + bg_event 2, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_155C04 + bg_event 3, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_155C04 + bg_event 16, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_155C0D + bg_event 17, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_155C0D SlateportCity_OceanicMuseum_1F_MapEvents:: @ 8387D5C map_events SlateportCity_OceanicMuseum_1F_EventObjects, SlateportCity_OceanicMuseum_1F_MapWarps, SlateportCity_OceanicMuseum_1F_MapCoordEvents, SlateportCity_OceanicMuseum_1F_MapBGEvents diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/events.inc b/data/maps/SlateportCity_OceanicMuseum_2F/events.inc index 2b4760f78..cb3945e7a 100644 --- a/data/maps/SlateportCity_OceanicMuseum_2F/events.inc +++ b/data/maps/SlateportCity_OceanicMuseum_2F/events.inc @@ -11,27 +11,27 @@ SlateportCity_OceanicMuseum_2F_MapWarps:: @ 8387E18 warp_def 6, 1, 0, 2, MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_1F SlateportCity_OceanicMuseum_2F_MapBGEvents:: @ 8387E20 - bg_event 18, 4, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155EDA - bg_event 18, 7, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155EE3 - bg_event 4, 3, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F22 - bg_event 4, 4, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F22 - bg_event 3, 3, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F19 - bg_event 2, 3, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F19 - bg_event 3, 4, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F19 - bg_event 3, 6, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F10 - bg_event 4, 6, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F10 - bg_event 13, 7, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F2B - bg_event 14, 7, 3, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F2B - bg_event 18, 1, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F07 - bg_event 19, 1, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F07 - bg_event 15, 1, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155EFE - bg_event 16, 1, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155EFE - bg_event 8, 1, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155EF5 - bg_event 9, 1, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155EF5 - bg_event 12, 1, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155EEC - bg_event 13, 1, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155EEC - bg_event 3, 7, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F10 - bg_event 4, 7, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F10 + bg_event 18, 4, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_155EDA + bg_event 18, 7, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_155EE3 + bg_event 4, 3, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_155F22 + bg_event 4, 4, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_155F22 + bg_event 3, 3, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_155F19 + bg_event 2, 3, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_155F19 + bg_event 3, 4, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_155F19 + bg_event 3, 6, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_155F10 + bg_event 4, 6, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_155F10 + bg_event 13, 7, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_155F2B + bg_event 14, 7, 3, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_155F2B + bg_event 18, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_155F07 + bg_event 19, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_155F07 + bg_event 15, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_155EFE + bg_event 16, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_155EFE + bg_event 8, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_155EF5 + bg_event 9, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_155EF5 + bg_event 12, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_155EEC + bg_event 13, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_155EEC + bg_event 3, 7, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_155F10 + bg_event 4, 7, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_155F10 SlateportCity_OceanicMuseum_2F_MapEvents:: @ 8387F1C map_events SlateportCity_OceanicMuseum_2F_EventObjects, SlateportCity_OceanicMuseum_2F_MapWarps, 0x0, SlateportCity_OceanicMuseum_2F_MapBGEvents diff --git a/data/maps/SootopolisCity/events.inc b/data/maps/SootopolisCity/events.inc index 955cadb60..7da75af04 100644 --- a/data/maps/SootopolisCity/events.inc +++ b/data/maps/SootopolisCity/events.inc @@ -29,12 +29,12 @@ SootopolisCity_MapCoordEvents:: @ 8380770 coord_event 25, 6, 3, 0, VAR_SOOTOPOLIS_STATE, 1, 0, SootopolisCity_EventScript_14D308 SootopolisCity_MapBGEvents:: @ 8380780 - bg_event 32, 34, 0, 0, 0, SootopolisCity_EventScript_14D2ED - bg_event 19, 29, 0, 1, 0, SootopolisCity_EventScript_1A00E1 - bg_event 44, 31, 0, 1, 0, SootopolisCity_EventScript_1A00EA - bg_event 45, 31, 0, 1, 0, SootopolisCity_EventScript_1A00EA - bg_event 18, 29, 0, 1, 0, SootopolisCity_EventScript_1A00E1 - bg_event 41, 37, 0, 0, 0, SootopolisCity_EventScript_14D2F6 + bg_event 32, 34, 0, BG_EVENT_PLAYER_FACING_ANY, SootopolisCity_EventScript_14D2ED + bg_event 19, 29, 0, BG_EVENT_PLAYER_FACING_NORTH, SootopolisCity_EventScript_1A00E1 + bg_event 44, 31, 0, BG_EVENT_PLAYER_FACING_NORTH, SootopolisCity_EventScript_1A00EA + bg_event 45, 31, 0, BG_EVENT_PLAYER_FACING_NORTH, SootopolisCity_EventScript_1A00EA + bg_event 18, 29, 0, BG_EVENT_PLAYER_FACING_NORTH, SootopolisCity_EventScript_1A00E1 + bg_event 41, 37, 0, BG_EVENT_PLAYER_FACING_ANY, SootopolisCity_EventScript_14D2F6 SootopolisCity_MapEvents:: @ 83807C8 map_events SootopolisCity_EventObjects, SootopolisCity_MapWarps, SootopolisCity_MapCoordEvents, SootopolisCity_MapBGEvents diff --git a/data/maps/SootopolisCity_Gym_1F/events.inc b/data/maps/SootopolisCity_Gym_1F/events.inc index bb178f9b9..8922b5920 100644 --- a/data/maps/SootopolisCity_Gym_1F/events.inc +++ b/data/maps/SootopolisCity_Gym_1F/events.inc @@ -8,8 +8,8 @@ SootopolisCity_Gym_1F_MapWarps:: @ 838AD20 warp_def 11, 22, 3, 0, MAP_SOOTOPOLIS_CITY_GYM_B1F SootopolisCity_Gym_1F_MapBGEvents:: @ 838AD38 - bg_event 6, 24, 0, 0, 0, SootopolisCity_Gym_1F_EventScript_15B0A3 - bg_event 10, 24, 0, 1, 0, SootopolisCity_Gym_1F_EventScript_15B0B3 + bg_event 6, 24, 0, BG_EVENT_PLAYER_FACING_ANY, SootopolisCity_Gym_1F_EventScript_15B0A3 + bg_event 10, 24, 0, BG_EVENT_PLAYER_FACING_NORTH, SootopolisCity_Gym_1F_EventScript_15B0B3 SootopolisCity_Gym_1F_MapEvents:: @ 838AD50 map_events SootopolisCity_Gym_1F_EventObjects, SootopolisCity_Gym_1F_MapWarps, 0x0, SootopolisCity_Gym_1F_MapBGEvents diff --git a/data/maps/SootopolisCity_House8/events.inc b/data/maps/SootopolisCity_House8/events.inc index e05198354..8cf607f25 100644 --- a/data/maps/SootopolisCity_House8/events.inc +++ b/data/maps/SootopolisCity_House8/events.inc @@ -7,8 +7,8 @@ SootopolisCity_House8_MapWarps:: @ 838B208 warp_def 4, 6, 0, 11, MAP_SOOTOPOLIS_CITY SootopolisCity_House8_MapBGEvents:: @ 838B218 - bg_event 5, 1, 0, 0, 0, SootopolisCity_House8_EventScript_15B523 - bg_event 2, 1, 0, 0, 0, SootopolisCity_House8_EventScript_15B531 + bg_event 5, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SootopolisCity_House8_EventScript_15B523 + bg_event 2, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SootopolisCity_House8_EventScript_15B531 SootopolisCity_House8_MapEvents:: @ 838B230 map_events SootopolisCity_House8_EventObjects, SootopolisCity_House8_MapWarps, 0x0, SootopolisCity_House8_MapBGEvents diff --git a/data/maps/SouthernIsland_Exterior/events.inc b/data/maps/SouthernIsland_Exterior/events.inc index 4b934883b..42b61bdd8 100644 --- a/data/maps/SouthernIsland_Exterior/events.inc +++ b/data/maps/SouthernIsland_Exterior/events.inc @@ -7,7 +7,7 @@ SouthernIsland_Exterior_MapWarps:: @ 8391E30 warp_def 15, 5, 3, 1, MAP_SOUTHERN_ISLAND_INTERIOR SouthernIsland_Exterior_MapBGEvents:: @ 8391E40 - bg_event 16, 7, 3, 0, 0, SouthernIsland_Exterior_EventScript_160B4A + bg_event 16, 7, 3, BG_EVENT_PLAYER_FACING_ANY, SouthernIsland_Exterior_EventScript_160B4A SouthernIsland_Exterior_MapEvents:: @ 8391E4C map_events SouthernIsland_Exterior_EventObjects, SouthernIsland_Exterior_MapWarps, 0x0, SouthernIsland_Exterior_MapBGEvents diff --git a/data/maps/SouthernIsland_Interior/events.inc b/data/maps/SouthernIsland_Interior/events.inc index 8e7405bfb..6ad29dd5f 100644 --- a/data/maps/SouthernIsland_Interior/events.inc +++ b/data/maps/SouthernIsland_Interior/events.inc @@ -7,7 +7,7 @@ SouthernIsland_Interior_MapWarps:: @ 8391E90 warp_def 14, 18, 3, 1, MAP_SOUTHERN_ISLAND_EXTERIOR SouthernIsland_Interior_MapBGEvents:: @ 8391EA0 - bg_event 13, 11, 3, 1, 0, SouthernIsland_Interior_EventScript_160B9B + bg_event 13, 11, 3, BG_EVENT_PLAYER_FACING_NORTH, SouthernIsland_Interior_EventScript_160B9B SouthernIsland_Interior_MapEvents:: @ 8391EAC map_events SouthernIsland_Interior_EventObjects, SouthernIsland_Interior_MapWarps, 0x0, SouthernIsland_Interior_MapBGEvents diff --git a/data/maps/Underwater_SealedChamber/events.inc b/data/maps/Underwater_SealedChamber/events.inc index ede501142..b7794a9ce 100644 --- a/data/maps/Underwater_SealedChamber/events.inc +++ b/data/maps/Underwater_SealedChamber/events.inc @@ -2,7 +2,7 @@ Underwater_SealedChamber_MapWarps:: @ 838E760 warp_def 7, 1, 0, 0, MAP_UNDERWATER_ROUTE134 Underwater_SealedChamber_MapBGEvents:: @ 838E768 - bg_event 12, 43, 0, 0, 0, Underwater_SealedChamber_EventScript_15F0B8 + bg_event 12, 43, 0, BG_EVENT_PLAYER_FACING_ANY, Underwater_SealedChamber_EventScript_15F0B8 Underwater_SealedChamber_MapEvents:: @ 838E774 map_events 0x0, Underwater_SealedChamber_MapWarps, 0x0, Underwater_SealedChamber_MapBGEvents diff --git a/data/maps/VerdanturfTown/events.inc b/data/maps/VerdanturfTown/events.inc index 1608835ca..8438ff430 100644 --- a/data/maps/VerdanturfTown/events.inc +++ b/data/maps/VerdanturfTown/events.inc @@ -14,14 +14,14 @@ VerdanturfTown_MapWarps:: @ 8380F60 warp_def 17, 15, 0, 0, MAP_VERDANTURF_TOWN_HOUSE VerdanturfTown_MapBGEvents:: @ 8380F98 - bg_event 14, 3, 0, 1, 0, VerdanturfTown_EventScript_1A00E1 - bg_event 14, 6, 0, 0, 0, VerdanturfTown_EventScript_14E8CA - bg_event 17, 3, 0, 1, 0, VerdanturfTown_EventScript_1A00EA - bg_event 7, 14, 0, 0, 0, VerdanturfTown_EventScript_14E8D3 - bg_event 13, 3, 0, 1, 0, VerdanturfTown_EventScript_1A00E1 - bg_event 18, 3, 0, 1, 0, VerdanturfTown_EventScript_1A00EA - bg_event 3, 8, 0, 0, 0, VerdanturfTown_EventScript_14E8DC - bg_event 7, 3, 0, 0, 0, VerdanturfTown_EventScript_14E8E5 + bg_event 14, 3, 0, BG_EVENT_PLAYER_FACING_NORTH, VerdanturfTown_EventScript_1A00E1 + bg_event 14, 6, 0, BG_EVENT_PLAYER_FACING_ANY, VerdanturfTown_EventScript_14E8CA + bg_event 17, 3, 0, BG_EVENT_PLAYER_FACING_NORTH, VerdanturfTown_EventScript_1A00EA + bg_event 7, 14, 0, BG_EVENT_PLAYER_FACING_ANY, VerdanturfTown_EventScript_14E8D3 + bg_event 13, 3, 0, BG_EVENT_PLAYER_FACING_NORTH, VerdanturfTown_EventScript_1A00E1 + bg_event 18, 3, 0, BG_EVENT_PLAYER_FACING_NORTH, VerdanturfTown_EventScript_1A00EA + bg_event 3, 8, 0, BG_EVENT_PLAYER_FACING_ANY, VerdanturfTown_EventScript_14E8DC + bg_event 7, 3, 0, BG_EVENT_PLAYER_FACING_ANY, VerdanturfTown_EventScript_14E8E5 VerdanturfTown_MapEvents:: @ 8380FF8 map_events VerdanturfTown_EventObjects, VerdanturfTown_MapWarps, 0x0, VerdanturfTown_MapBGEvents diff --git a/data/maps/VerdanturfTown_ContestHall/events.inc b/data/maps/VerdanturfTown_ContestHall/events.inc index c524c05ee..50a0fcf27 100644 --- a/data/maps/VerdanturfTown_ContestHall/events.inc +++ b/data/maps/VerdanturfTown_ContestHall/events.inc @@ -8,8 +8,8 @@ VerdanturfTown_ContestHall_MapWarps:: @ 8386B34 warp_def 10, 17, 0, 2, MAP_VERDANTURF_TOWN_CONTEST_LOBBY VerdanturfTown_ContestHall_MapBGEvents:: @ 8386B44 - bg_event 12, 14, 3, 0, 0, VerdanturfTown_ContestHall_EventScript_153EB2 - bg_event 8, 14, 3, 0, 0, VerdanturfTown_ContestHall_EventScript_153EB2 + bg_event 12, 14, 3, BG_EVENT_PLAYER_FACING_ANY, VerdanturfTown_ContestHall_EventScript_153EB2 + bg_event 8, 14, 3, BG_EVENT_PLAYER_FACING_ANY, VerdanturfTown_ContestHall_EventScript_153EB2 VerdanturfTown_ContestHall_MapEvents:: @ 8386B5C map_events VerdanturfTown_ContestHall_EventObjects, VerdanturfTown_ContestHall_MapWarps, 0x0, VerdanturfTown_ContestHall_MapBGEvents diff --git a/data/maps/VerdanturfTown_ContestLobby/events.inc b/data/maps/VerdanturfTown_ContestLobby/events.inc index 7a4027fbb..bcb7d9328 100644 --- a/data/maps/VerdanturfTown_ContestLobby/events.inc +++ b/data/maps/VerdanturfTown_ContestLobby/events.inc @@ -12,10 +12,10 @@ VerdanturfTown_ContestLobby_MapWarps:: @ 8386A90 warp_def 1, 1, 0, 1, MAP_VERDANTURF_TOWN_CONTEST_HALL VerdanturfTown_ContestLobby_MapBGEvents:: @ 8386AA8 - bg_event 10, 3, 0, 0, 0, VerdanturfTown_ContestLobby_EventScript_1B782F - bg_event 12, 5, 0, 0, 0, VerdanturfTown_ContestLobby_EventScript_1B763F - bg_event 11, 1, 0, 0, 0, VerdanturfTown_ContestLobby_EventScript_153E37 - bg_event 13, 1, 0, 0, 0, VerdanturfTown_ContestLobby_EventScript_153E89 + bg_event 10, 3, 0, BG_EVENT_PLAYER_FACING_ANY, VerdanturfTown_ContestLobby_EventScript_1B782F + bg_event 12, 5, 0, BG_EVENT_PLAYER_FACING_ANY, VerdanturfTown_ContestLobby_EventScript_1B763F + bg_event 11, 1, 0, BG_EVENT_PLAYER_FACING_ANY, VerdanturfTown_ContestLobby_EventScript_153E37 + bg_event 13, 1, 0, BG_EVENT_PLAYER_FACING_ANY, VerdanturfTown_ContestLobby_EventScript_153E89 VerdanturfTown_ContestLobby_MapEvents:: @ 8386AD8 map_events VerdanturfTown_ContestLobby_EventObjects, VerdanturfTown_ContestLobby_MapWarps, 0x0, VerdanturfTown_ContestLobby_MapBGEvents diff --git a/include/constants/bg_event_constants.h b/include/constants/bg_event_constants.h new file mode 100755 index 000000000..a915bc509 --- /dev/null +++ b/include/constants/bg_event_constants.h @@ -0,0 +1,13 @@ +#ifndef GUARD_CONSTANTS_BG_EVENT_H +#define GUARD_CONSTANTS_BG_EVENT_H + +#define BG_EVENT_PLAYER_FACING_ANY 0 +#define BG_EVENT_PLAYER_FACING_NORTH 1 +#define BG_EVENT_PLAYER_FACING_SOUTH 2 +#define BG_EVENT_PLAYER_FACING_EAST 3 +#define BG_EVENT_PLAYER_FACING_WEST 4 + +#define BG_EVENT_HIDDEN_ITEM 7 +#define BG_EVENT_SECRET_BASE 8 + +#endif // GUARD_CONSTANTS_BG_EVENT_H diff --git a/include/macros/map.inc b/include/macros/map.inc index bc54271d4..5a4b550b0 100644 --- a/include/macros/map.inc +++ b/include/macros/map.inc @@ -46,10 +46,10 @@ coord_event \x, \y, \height, 0, \weather, 0, 0, 0x0 .endm - .macro bg_event x, y, byte, kind, word, arg6, arg7, arg8 + .macro bg_event x, y, elevation, kind, arg6, arg7, arg8 .2byte \x, \y - .byte \byte, \kind - .2byte \word + .byte \elevation, \kind + .2byte 0 .if \kind < 5 .4byte \arg6 .else @@ -60,11 +60,11 @@ .endm .macro bg_hidden_item_event x, y, height, item, flag - bg_event \x, \y, \height, 7, 0, \item, ((\flag) - FLAG_HIDDEN_ITEMS_START), 0 + bg_event \x, \y, \height, 7, \item, ((\flag) - FLAG_HIDDEN_ITEMS_START), 0 .endm .macro bg_secret_base_event x, y, height, secret_base_id - bg_event \x, \y, \height, 8, 0, \secret_base_id, 0, 0 + bg_event \x, \y, \height, 8, \secret_base_id, 0, 0 .endm .macro map_events npcs, warps, traps, signs diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c index ffdf926f5..296d9ef63 100644 --- a/src/field_control_avatar.c +++ b/src/field_control_avatar.c @@ -24,6 +24,7 @@ #include "trainer_see.h" #include "constants/vars.h" #include "wild_encounter.h" +#include "constants/bg_event_constants.h" struct Coords32 { @@ -409,34 +410,34 @@ static u8 *GetInteractedBackgroundEventScript(struct MapPosition *position, u8 m switch (bgEvent->kind) { - case 0: + case BG_EVENT_PLAYER_FACING_ANY: default: return bgEvent->bgUnion.script; - case 1: + case BG_EVENT_PLAYER_FACING_NORTH: if (direction != DIR_NORTH) return NULL; break; - case 2: + case BG_EVENT_PLAYER_FACING_SOUTH: if (direction != DIR_SOUTH) return NULL; break; - case 3: + case BG_EVENT_PLAYER_FACING_EAST: if (direction != DIR_EAST) return NULL; break; - case 4: + case BG_EVENT_PLAYER_FACING_WEST: if (direction != DIR_WEST) return NULL; break; case 5: case 6: - case 7: + case BG_EVENT_HIDDEN_ITEM: gSpecialVar_0x8004 = ((u32)bgEvent->bgUnion.script >> 16) + FLAG_HIDDEN_ITEMS_START; gSpecialVar_0x8005 = (u32)bgEvent->bgUnion.script; if (FlagGet(gSpecialVar_0x8004) == TRUE) return NULL; return HiddenItemScript; - case 8: + case BG_EVENT_SECRET_BASE: if (direction == DIR_NORTH) { gSpecialVar_0x8004 = bgEvent->bgUnion.secretBaseId; diff --git a/src/item_use.c b/src/item_use.c index 4e76ea434..91c17399f 100644 --- a/src/item_use.c +++ b/src/item_use.c @@ -34,6 +34,7 @@ #include "string_util.h" #include "strings.h" #include "task.h" +#include "constants/bg_event_constants.h" #include "constants/species.h" #include "constants/vars.h" @@ -335,12 +336,12 @@ bool8 ItemfinderCheckForHiddenItems(struct MapEvents *events, u8 taskId) for (i = 0; i < events->bgEventCount; i++) { - if ((events -> bgEvents[i].kind == 7) && !FlagGet(events -> bgEvents[i].bgUnion.hiddenItem.hiddenItemId + FLAG_HIDDEN_ITEMS_START)) + if ((events->bgEvents[i].kind == BG_EVENT_HIDDEN_ITEM) && !FlagGet(events->bgEvents[i].bgUnion.hiddenItem.hiddenItemId + FLAG_HIDDEN_ITEMS_START)) { // do a distance lookup of each item so long as the index remains less than the objects on the current map. - distanceX = (u16)events -> bgEvents[i].x + 7; + distanceX = (u16)events->bgEvents[i].x + 7; newDistanceX = distanceX - x; - distanceY = (u16)events -> bgEvents[i].y + 7; + distanceY = (u16)events->bgEvents[i].y + 7; newDistanceY = distanceY - y; // is item in range? @@ -365,7 +366,7 @@ bool8 HiddenItemAtPos(struct MapEvents *events, s16 x, s16 y) for (i = 0; i < bgEventCount; i++) { - if (bgEvent[i].kind == 7 && x == (u16)bgEvent[i].x && y == (u16)bgEvent[i].y) // hidden item and coordinates matches x and y passed? + if (bgEvent[i].kind == BG_EVENT_HIDDEN_ITEM && x == (u16)bgEvent[i].x && y == (u16)bgEvent[i].y) // hidden item and coordinates matches x and y passed? { if (!FlagGet(bgEvent[i].bgUnion.hiddenItem.hiddenItemId + FLAG_HIDDEN_ITEMS_START)) return TRUE; diff --git a/src/secret_base.c b/src/secret_base.c index 5bec7a06d..d155bda0c 100644 --- a/src/secret_base.c +++ b/src/secret_base.c @@ -1,10 +1,6 @@ #include "global.h" -#include "constants/decorations.h" #include "secret_base.h" #include "decoration.h" -#include "constants/species.h" -#include "constants/items.h" -#include "constants/moves.h" #include "event_data.h" #include "field_camera.h" #include "field_effect.h" @@ -29,11 +25,15 @@ #include "overworld.h" #include "script.h" #include "sound.h" -#include "constants/species.h" #include "string_util.h" #include "strings.h" #include "task.h" #include "text.h" +#include "constants/bg_event_constants.h" +#include "constants/decorations.h" +#include "constants/items.h" +#include "constants/moves.h" +#include "constants/species.h" #include "constants/vars.h" @@ -317,7 +317,7 @@ void sub_80BB970(struct MapEvents *events) for (bgevidx = 0; bgevidx < events->bgEventCount; bgevidx++) { - if (events->bgEvents[bgevidx].kind == 8) + if (events->bgEvents[bgevidx].kind == BG_EVENT_SECRET_BASE) { for (jdx = 0; jdx < MAX_SECRET_BASES; jdx++) { @@ -538,7 +538,7 @@ void SetCurrentSecretBaseFromPosition(struct MapPosition *position, struct MapEv for (i = 0; i < events->bgEventCount; i++) { - if (events->bgEvents[i].kind == 8 && position->x == events->bgEvents[i].x + 7 + if (events->bgEvents[i].kind == BG_EVENT_SECRET_BASE && position->x == events->bgEvents[i].x + 7 && position->y == events->bgEvents[i].y + 7) { gCurrentSecretBaseId = events->bgEvents[i].bgUnion.secretBaseId; @@ -871,7 +871,7 @@ void sub_80BC474(void) for (eventId = 0; eventId < mapEvents->bgEventCount; eventId++) { - if (mapEvents->bgEvents[eventId].kind == 8 + if (mapEvents->bgEvents[eventId].kind == BG_EVENT_SECRET_BASE && gSaveBlock1.secretBases[0].secretBaseId == mapEvents->bgEvents[eventId].bgUnion.secretBaseId) { u16 i; -- cgit v1.2.3 From e1170a09c9a870f209f2b2f8fe3bd4fc3e9a263a Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Wed, 11 Jul 2018 11:15:39 -0500 Subject: Trim fat from coord_event macro --- data/maps/AquaHideout_B2F/events.inc | 4 +- data/maps/CaveOfOrigin_1F/events.inc | 6 +- data/maps/CaveOfOrigin_B1F/events.inc | 6 +- data/maps/CaveOfOrigin_B2F/events.inc | 6 +- data/maps/CaveOfOrigin_B3F/events.inc | 6 +- data/maps/CaveOfOrigin_B4F/events.inc | 6 +- data/maps/DoubleBattleColosseum/events.inc | 8 +-- data/maps/EverGrandeCity/events.inc | 22 +++---- data/maps/InsideOfTruck/events.inc | 6 +- data/maps/LavaridgeTown/events.inc | 2 +- data/maps/LilycoveCity_CoveLilyMotel_1F/events.inc | 2 +- data/maps/LittlerootTown/events.inc | 18 +++--- .../LittlerootTown_BrendansHouse_1F/events.inc | 2 +- data/maps/LittlerootTown_MaysHouse_1F/events.inc | 2 +- data/maps/MagmaHideout_B2F/events.inc | 8 +-- data/maps/MauvilleCity_Gym/events.inc | 6 +- data/maps/MeteorFalls_1F_1R/events.inc | 2 +- data/maps/MossdeepCity/events.inc | 8 +-- data/maps/MossdeepCity_Gym/events.inc | 2 +- data/maps/MtPyre_Exterior/events.inc | 10 ++-- data/maps/MtPyre_Summit/events.inc | 12 ++-- data/maps/NewMauville_Entrance/events.inc | 2 +- data/maps/NewMauville_Inside/events.inc | 20 +++---- data/maps/OldaleTown/events.inc | 8 +-- data/maps/PetalburgCity/events.inc | 8 +-- data/maps/PetalburgWoods/events.inc | 4 +- data/maps/RecordCorner/events.inc | 8 +-- data/maps/Route101/events.inc | 18 +++--- data/maps/Route110/events.inc | 10 ++-- .../events.inc | 4 +- .../events.inc | 4 +- data/maps/Route110_TrickHouseEnd/events.inc | 2 +- data/maps/Route110_TrickHouseEntrance/events.inc | 8 +-- data/maps/Route110_TrickHousePuzzle2/events.inc | 8 +-- data/maps/Route110_TrickHousePuzzle3/events.inc | 14 ++--- data/maps/Route110_TrickHousePuzzle5/events.inc | 28 ++++----- data/maps/Route110_TrickHousePuzzle7/events.inc | 2 +- data/maps/Route111/events.inc | 68 +++++++++++----------- data/maps/Route116/events.inc | 2 +- data/maps/Route118/events.inc | 6 +- data/maps/Route119/events.inc | 4 +- data/maps/Route121/events.inc | 8 +-- data/maps/Route121_SafariZoneEntrance/events.inc | 2 +- data/maps/RustboroCity/events.inc | 26 ++++----- data/maps/RusturfTunnel/events.inc | 10 ++-- data/maps/SeafloorCavern_Room9/events.inc | 2 +- data/maps/SingleBattleColosseum/events.inc | 4 +- data/maps/SlateportCity_Harbor/events.inc | 8 +-- .../maps/SlateportCity_OceanicMuseum_1F/events.inc | 4 +- data/maps/SootopolisCity/events.inc | 2 +- data/maps/TradeCenter/events.inc | 4 +- data/maps/VictoryRoad_1F/events.inc | 6 +- include/macros/map.inc | 15 +++-- 53 files changed, 234 insertions(+), 229 deletions(-) diff --git a/data/maps/AquaHideout_B2F/events.inc b/data/maps/AquaHideout_B2F/events.inc index fed8e6da9..ac44e95b8 100644 --- a/data/maps/AquaHideout_B2F/events.inc +++ b/data/maps/AquaHideout_B2F/events.inc @@ -18,8 +18,8 @@ AquaHideout_B2F_MapWarps:: @ 838CF94 warp_def 32, 20, 3, 4, MAP_AQUA_HIDEOUT_B1F AquaHideout_B2F_MapCoordEvents:: @ 838CFE4 - coord_event 28, 17, 3, 0, VAR_TEMP_1, 0, 0, AquaHideout_B2F_EventScript_15D8BD - coord_event 28, 16, 3, 0, VAR_TEMP_1, 0, 0, AquaHideout_B2F_EventScript_15D8BD + coord_event 28, 17, 3, VAR_TEMP_1, 0, AquaHideout_B2F_EventScript_15D8BD + coord_event 28, 16, 3, VAR_TEMP_1, 0, AquaHideout_B2F_EventScript_15D8BD AquaHideout_B2F_MapEvents:: @ 838D004 map_events AquaHideout_B2F_EventObjects, AquaHideout_B2F_MapWarps, AquaHideout_B2F_MapCoordEvents, 0x0 diff --git a/data/maps/CaveOfOrigin_1F/events.inc b/data/maps/CaveOfOrigin_1F/events.inc index b0d77795c..5fe7e2c39 100644 --- a/data/maps/CaveOfOrigin_1F/events.inc +++ b/data/maps/CaveOfOrigin_1F/events.inc @@ -3,9 +3,9 @@ CaveOfOrigin_1F_MapWarps:: @ 838D718 warp_def 14, 5, 3, 0, MAP_CAVE_OF_ORIGIN_B1F CaveOfOrigin_1F_MapCoordEvents:: @ 838D728 - coord_event 7, 11, 3, 0, VAR_TEMP_1, 0, 0, CaveOfOrigin_1F_EventScript_1A04AF - coord_event 6, 11, 3, 0, VAR_TEMP_1, 0, 0, CaveOfOrigin_1F_EventScript_1A04AF - coord_event 5, 11, 3, 0, VAR_TEMP_1, 0, 0, CaveOfOrigin_1F_EventScript_1A04AF + coord_event 7, 11, 3, VAR_TEMP_1, 0, CaveOfOrigin_1F_EventScript_1A04AF + coord_event 6, 11, 3, VAR_TEMP_1, 0, CaveOfOrigin_1F_EventScript_1A04AF + coord_event 5, 11, 3, VAR_TEMP_1, 0, CaveOfOrigin_1F_EventScript_1A04AF CaveOfOrigin_1F_MapEvents:: @ 838D758 map_events 0x0, CaveOfOrigin_1F_MapWarps, CaveOfOrigin_1F_MapCoordEvents, 0x0 diff --git a/data/maps/CaveOfOrigin_B1F/events.inc b/data/maps/CaveOfOrigin_B1F/events.inc index a91ee50e4..4f9864804 100644 --- a/data/maps/CaveOfOrigin_B1F/events.inc +++ b/data/maps/CaveOfOrigin_B1F/events.inc @@ -3,9 +3,9 @@ CaveOfOrigin_B1F_MapWarps:: @ 838D76C warp_def 5, 11, 3, 0, MAP_CAVE_OF_ORIGIN_B2F CaveOfOrigin_B1F_MapCoordEvents:: @ 838D77C - coord_event 12, 15, 3, 0, VAR_TEMP_1, 0, 0, CaveOfOrigin_B1F_EventScript_1A04AF - coord_event 12, 16, 3, 0, VAR_TEMP_1, 0, 0, CaveOfOrigin_B1F_EventScript_1A04AF - coord_event 12, 17, 3, 0, VAR_TEMP_1, 0, 0, CaveOfOrigin_B1F_EventScript_1A04AF + coord_event 12, 15, 3, VAR_TEMP_1, 0, CaveOfOrigin_B1F_EventScript_1A04AF + coord_event 12, 16, 3, VAR_TEMP_1, 0, CaveOfOrigin_B1F_EventScript_1A04AF + coord_event 12, 17, 3, VAR_TEMP_1, 0, CaveOfOrigin_B1F_EventScript_1A04AF CaveOfOrigin_B1F_MapEvents:: @ 838D7AC map_events 0x0, CaveOfOrigin_B1F_MapWarps, CaveOfOrigin_B1F_MapCoordEvents, 0x0 diff --git a/data/maps/CaveOfOrigin_B2F/events.inc b/data/maps/CaveOfOrigin_B2F/events.inc index 5d03aaaa2..03889799e 100644 --- a/data/maps/CaveOfOrigin_B2F/events.inc +++ b/data/maps/CaveOfOrigin_B2F/events.inc @@ -3,9 +3,9 @@ CaveOfOrigin_B2F_MapWarps:: @ 838D7C0 warp_def 8, 14, 3, 0, MAP_CAVE_OF_ORIGIN_B3F CaveOfOrigin_B2F_MapCoordEvents:: @ 838D7D0 - coord_event 10, 6, 3, 0, VAR_TEMP_1, 0, 0, CaveOfOrigin_B2F_EventScript_1A04AF - coord_event 10, 5, 3, 0, VAR_TEMP_1, 0, 0, CaveOfOrigin_B2F_EventScript_1A04AF - coord_event 14, 13, 3, 0, VAR_TEMP_2, 0, 0, CaveOfOrigin_B2F_EventScript_1A04BB + coord_event 10, 6, 3, VAR_TEMP_1, 0, CaveOfOrigin_B2F_EventScript_1A04AF + coord_event 10, 5, 3, VAR_TEMP_1, 0, CaveOfOrigin_B2F_EventScript_1A04AF + coord_event 14, 13, 3, VAR_TEMP_2, 0, CaveOfOrigin_B2F_EventScript_1A04BB CaveOfOrigin_B2F_MapEvents:: @ 838D800 map_events 0x0, CaveOfOrigin_B2F_MapWarps, CaveOfOrigin_B2F_MapCoordEvents, 0x0 diff --git a/data/maps/CaveOfOrigin_B3F/events.inc b/data/maps/CaveOfOrigin_B3F/events.inc index 9a1c7540d..fb8737421 100644 --- a/data/maps/CaveOfOrigin_B3F/events.inc +++ b/data/maps/CaveOfOrigin_B3F/events.inc @@ -6,9 +6,9 @@ CaveOfOrigin_B3F_MapWarps:: @ 838D82C warp_def 12, 6, 3, 0, MAP_CAVE_OF_ORIGIN_B4F CaveOfOrigin_B3F_MapCoordEvents:: @ 838D83C - coord_event 5, 11, 3, 0, VAR_TEMP_1, 0, 0, CaveOfOrigin_B3F_EventScript_1A04AF - coord_event 8, 6, 3, 0, VAR_TEMP_2, 0, 0, CaveOfOrigin_B3F_EventScript_1A04BB - coord_event 8, 5, 3, 0, VAR_TEMP_2, 0, 0, CaveOfOrigin_B3F_EventScript_1A04BB + coord_event 5, 11, 3, VAR_TEMP_1, 0, CaveOfOrigin_B3F_EventScript_1A04AF + coord_event 8, 6, 3, VAR_TEMP_2, 0, CaveOfOrigin_B3F_EventScript_1A04BB + coord_event 8, 5, 3, VAR_TEMP_2, 0, CaveOfOrigin_B3F_EventScript_1A04BB CaveOfOrigin_B3F_MapEvents:: @ 838D86C map_events CaveOfOrigin_B3F_EventObjects, CaveOfOrigin_B3F_MapWarps, CaveOfOrigin_B3F_MapCoordEvents, 0x0 diff --git a/data/maps/CaveOfOrigin_B4F/events.inc b/data/maps/CaveOfOrigin_B4F/events.inc index 2e603b827..4679edb0e 100644 --- a/data/maps/CaveOfOrigin_B4F/events.inc +++ b/data/maps/CaveOfOrigin_B4F/events.inc @@ -5,9 +5,9 @@ CaveOfOrigin_B4F_MapWarps:: @ 838D898 warp_def 12, 5, 3, 1, MAP_CAVE_OF_ORIGIN_B3F CaveOfOrigin_B4F_MapCoordEvents:: @ 838D8A0 - coord_event 9, 13, 3, 0, VAR_CAVE_OF_ORIGIN_B4F_STATE, 0, 0, CaveOfOrigin_B4F_EventScript_15DDD7 - coord_event 13, 9, 3, 0, VAR_TEMP_5, 0, 0, CaveOfOrigin_B4F_EventScript_1A04A0 - coord_event 5, 9, 3, 0, VAR_TEMP_5, 0, 0, CaveOfOrigin_B4F_EventScript_1A04A0 + coord_event 9, 13, 3, VAR_CAVE_OF_ORIGIN_B4F_STATE, 0, CaveOfOrigin_B4F_EventScript_15DDD7 + coord_event 13, 9, 3, VAR_TEMP_5, 0, CaveOfOrigin_B4F_EventScript_1A04A0 + coord_event 5, 9, 3, VAR_TEMP_5, 0, CaveOfOrigin_B4F_EventScript_1A04A0 CaveOfOrigin_B4F_MapEvents:: @ 838D8D0 map_events CaveOfOrigin_B4F_EventObjects, CaveOfOrigin_B4F_MapWarps, CaveOfOrigin_B4F_MapCoordEvents, 0x0 diff --git a/data/maps/DoubleBattleColosseum/events.inc b/data/maps/DoubleBattleColosseum/events.inc index a04c7a3a9..1c6f9e983 100644 --- a/data/maps/DoubleBattleColosseum/events.inc +++ b/data/maps/DoubleBattleColosseum/events.inc @@ -5,10 +5,10 @@ DoubleBattleColosseum_MapWarps:: @ 8391428 warp_def 8, 8, 3, 127, MAP_NONE DoubleBattleColosseum_MapCoordEvents:: @ 8391448 - coord_event 3, 4, 3, 0, VAR_TEMP_0, 0, 0, DoubleBattleColosseum_EventScript_1A4383 - coord_event 3, 6, 3, 0, VAR_TEMP_0, 0, 0, DoubleBattleColosseum_EventScript_1A43B9 - coord_event 10, 4, 3, 0, VAR_TEMP_0, 0, 0, DoubleBattleColosseum_EventScript_1A439E - coord_event 10, 6, 3, 0, VAR_TEMP_0, 0, 0, DoubleBattleColosseum_EventScript_1A43D4 + coord_event 3, 4, 3, VAR_TEMP_0, 0, DoubleBattleColosseum_EventScript_1A4383 + coord_event 3, 6, 3, VAR_TEMP_0, 0, DoubleBattleColosseum_EventScript_1A43B9 + coord_event 10, 4, 3, VAR_TEMP_0, 0, DoubleBattleColosseum_EventScript_1A439E + coord_event 10, 6, 3, VAR_TEMP_0, 0, DoubleBattleColosseum_EventScript_1A43D4 DoubleBattleColosseum_MapEvents:: @ 8391488 map_events 0x0, DoubleBattleColosseum_MapWarps, DoubleBattleColosseum_MapCoordEvents, 0x0 diff --git a/data/maps/EverGrandeCity/events.inc b/data/maps/EverGrandeCity/events.inc index 39f72e713..757f33b6c 100644 --- a/data/maps/EverGrandeCity/events.inc +++ b/data/maps/EverGrandeCity/events.inc @@ -5,17 +5,17 @@ EverGrandeCity_MapWarps:: @ 83807DC warp_def 18, 27, 0, 1, MAP_VICTORY_ROAD_1F EverGrandeCity_MapCoordEvents:: @ 83807FC - coord_event 17, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_14D500 - coord_event 16, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_14D500 - coord_event 18, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_14D500 - coord_event 19, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_14D500 - coord_event 20, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_14D500 - coord_event 21, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_14D500 - coord_event 22, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_14D500 - coord_event 23, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_14D500 - coord_event 24, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_14D500 - coord_event 25, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_14D500 - coord_event 26, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_14D500 + coord_event 17, 58, 1, VAR_TEMP_1, 0, EverGrandeCity_EventScript_14D500 + coord_event 16, 58, 1, VAR_TEMP_1, 0, EverGrandeCity_EventScript_14D500 + coord_event 18, 58, 1, VAR_TEMP_1, 0, EverGrandeCity_EventScript_14D500 + coord_event 19, 58, 1, VAR_TEMP_1, 0, EverGrandeCity_EventScript_14D500 + coord_event 20, 58, 1, VAR_TEMP_1, 0, EverGrandeCity_EventScript_14D500 + coord_event 21, 58, 1, VAR_TEMP_1, 0, EverGrandeCity_EventScript_14D500 + coord_event 22, 58, 1, VAR_TEMP_1, 0, EverGrandeCity_EventScript_14D500 + coord_event 23, 58, 1, VAR_TEMP_1, 0, EverGrandeCity_EventScript_14D500 + coord_event 24, 58, 1, VAR_TEMP_1, 0, EverGrandeCity_EventScript_14D500 + coord_event 25, 58, 1, VAR_TEMP_1, 0, EverGrandeCity_EventScript_14D500 + coord_event 26, 58, 1, VAR_TEMP_1, 0, EverGrandeCity_EventScript_14D500 EverGrandeCity_MapBGEvents:: @ 83808AC bg_event 19, 43, 5, BG_EVENT_PLAYER_FACING_ANY, EverGrandeCity_EventScript_14D4E5 diff --git a/data/maps/InsideOfTruck/events.inc b/data/maps/InsideOfTruck/events.inc index c29631ae4..7000e2927 100644 --- a/data/maps/InsideOfTruck/events.inc +++ b/data/maps/InsideOfTruck/events.inc @@ -9,9 +9,9 @@ InsideOfTruck_MapWarps:: @ 8391660 warp_def 4, 3, 0, 127, MAP_NONE InsideOfTruck_MapCoordEvents:: @ 8391678 - coord_event 3, 1, 3, 0, VAR_LITTLEROOT_INTRO_STATE, 0, 0, InsideOfTruck_EventScript_15FC29 - coord_event 3, 2, 3, 0, VAR_LITTLEROOT_INTRO_STATE, 0, 0, InsideOfTruck_EventScript_15FC29 - coord_event 3, 3, 3, 0, VAR_LITTLEROOT_INTRO_STATE, 0, 0, InsideOfTruck_EventScript_15FC29 + coord_event 3, 1, 3, VAR_LITTLEROOT_INTRO_STATE, 0, InsideOfTruck_EventScript_15FC29 + coord_event 3, 2, 3, VAR_LITTLEROOT_INTRO_STATE, 0, InsideOfTruck_EventScript_15FC29 + coord_event 3, 3, 3, VAR_LITTLEROOT_INTRO_STATE, 0, InsideOfTruck_EventScript_15FC29 InsideOfTruck_MapBGEvents:: @ 83916A8 bg_event 1, 0, 0, BG_EVENT_PLAYER_FACING_ANY, InsideOfTruck_EventScript_15FC8B diff --git a/data/maps/LavaridgeTown/events.inc b/data/maps/LavaridgeTown/events.inc index 6afd86a20..90dfa5417 100644 --- a/data/maps/LavaridgeTown/events.inc +++ b/data/maps/LavaridgeTown/events.inc @@ -18,7 +18,7 @@ LavaridgeTown_MapWarps:: @ 8380D50 warp_def 9, 2, 3, 3, MAP_LAVARIDGE_TOWN_POKEMON_CENTER_1F LavaridgeTown_MapCoordEvents:: @ 8380D80 - coord_event 6, 3, 3, 0, 0, 0, 0, LavaridgeTown_EventScript_14E710 + coord_event 6, 3, 3, 0, 0, LavaridgeTown_EventScript_14E710 LavaridgeTown_MapBGEvents:: @ 8380D90 bg_event 14, 16, 0, BG_EVENT_PLAYER_FACING_ANY, LavaridgeTown_EventScript_14E7D7 diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/events.inc b/data/maps/LilycoveCity_CoveLilyMotel_1F/events.inc index 89eff2309..d823696f2 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_1F/events.inc +++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/events.inc @@ -7,7 +7,7 @@ LilycoveCity_CoveLilyMotel_1F_MapWarps:: @ 838947C warp_def 2, 1, 0, 0, MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_2F LilycoveCity_CoveLilyMotel_1F_MapCoordEvents:: @ 8389494 - coord_event 10, 2, 3, 0, VAR_TEMP_1, 0, 0, LilycoveCity_CoveLilyMotel_1F_EventScript_15834D + coord_event 10, 2, 3, VAR_TEMP_1, 0, LilycoveCity_CoveLilyMotel_1F_EventScript_15834D LilycoveCity_CoveLilyMotel_1F_MapEvents:: @ 83894A4 map_events LilycoveCity_CoveLilyMotel_1F_EventObjects, LilycoveCity_CoveLilyMotel_1F_MapWarps, LilycoveCity_CoveLilyMotel_1F_MapCoordEvents, 0x0 diff --git a/data/maps/LittlerootTown/events.inc b/data/maps/LittlerootTown/events.inc index 45a8ee503..a12324334 100644 --- a/data/maps/LittlerootTown/events.inc +++ b/data/maps/LittlerootTown/events.inc @@ -12,15 +12,15 @@ LittlerootTown_MapWarps:: @ 838098C warp_def 7, 16, 0, 0, MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB LittlerootTown_MapCoordEvents:: @ 83809A4 - coord_event 10, 1, 3, 0, VAR_LITTLEROOT_STATE, 0, 0, LittlerootTown_EventScript_14D739 - coord_event 11, 1, 3, 0, VAR_LITTLEROOT_STATE, 0, 0, LittlerootTown_EventScript_14D797 - coord_event 11, 1, 3, 0, VAR_LITTLEROOT_STATE, 1, 0, LittlerootTown_EventScript_14D7C7 - coord_event 8, 9, 3, 0, VAR_LITTLEROOT_STATE, 3, 0, LittlerootTown_EventScript_14D89E - coord_event 9, 9, 3, 0, VAR_LITTLEROOT_STATE, 3, 0, LittlerootTown_EventScript_14D8AA - coord_event 10, 9, 3, 0, VAR_LITTLEROOT_STATE, 3, 0, LittlerootTown_EventScript_14D886 - coord_event 11, 9, 3, 0, VAR_LITTLEROOT_STATE, 3, 0, LittlerootTown_EventScript_14D892 - coord_event 10, 2, 3, 0, VAR_LITTLEROOT_STATE, 3, 0, LittlerootTown_EventScript_14D860 - coord_event 11, 2, 3, 0, VAR_LITTLEROOT_STATE, 3, 0, LittlerootTown_EventScript_14D873 + coord_event 10, 1, 3, VAR_LITTLEROOT_STATE, 0, LittlerootTown_EventScript_14D739 + coord_event 11, 1, 3, VAR_LITTLEROOT_STATE, 0, LittlerootTown_EventScript_14D797 + coord_event 11, 1, 3, VAR_LITTLEROOT_STATE, 1, LittlerootTown_EventScript_14D7C7 + coord_event 8, 9, 3, VAR_LITTLEROOT_STATE, 3, LittlerootTown_EventScript_14D89E + coord_event 9, 9, 3, VAR_LITTLEROOT_STATE, 3, LittlerootTown_EventScript_14D8AA + coord_event 10, 9, 3, VAR_LITTLEROOT_STATE, 3, LittlerootTown_EventScript_14D886 + coord_event 11, 9, 3, VAR_LITTLEROOT_STATE, 3, LittlerootTown_EventScript_14D892 + coord_event 10, 2, 3, VAR_LITTLEROOT_STATE, 3, LittlerootTown_EventScript_14D860 + coord_event 11, 2, 3, VAR_LITTLEROOT_STATE, 3, LittlerootTown_EventScript_14D873 LittlerootTown_MapBGEvents:: @ 8380A34 bg_event 15, 13, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_EventScript_14D7F6 diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/events.inc b/data/maps/LittlerootTown_BrendansHouse_1F/events.inc index 2da4c5748..00ebc746f 100644 --- a/data/maps/LittlerootTown_BrendansHouse_1F/events.inc +++ b/data/maps/LittlerootTown_BrendansHouse_1F/events.inc @@ -11,7 +11,7 @@ LittlerootTown_BrendansHouse_1F_MapWarps:: @ 83856EC warp_def 8, 2, 0, 0, MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F LittlerootTown_BrendansHouse_1F_MapCoordEvents:: @ 8385704 - coord_event 8, 8, 0, 0, VAR_LITTLEROOT_INTRO_STATE, 4, 0, LittlerootTown_BrendansHouse_1F_EventScript_152789 + coord_event 8, 8, 0, VAR_LITTLEROOT_INTRO_STATE, 4, LittlerootTown_BrendansHouse_1F_EventScript_152789 LittlerootTown_BrendansHouse_1F_MapEvents:: @ 8385714 map_events LittlerootTown_BrendansHouse_1F_EventObjects, LittlerootTown_BrendansHouse_1F_MapWarps, LittlerootTown_BrendansHouse_1F_MapCoordEvents, 0x0 diff --git a/data/maps/LittlerootTown_MaysHouse_1F/events.inc b/data/maps/LittlerootTown_MaysHouse_1F/events.inc index f5fe93e03..e31790eb9 100644 --- a/data/maps/LittlerootTown_MaysHouse_1F/events.inc +++ b/data/maps/LittlerootTown_MaysHouse_1F/events.inc @@ -11,7 +11,7 @@ LittlerootTown_MaysHouse_1F_MapWarps:: @ 838593C warp_def 2, 2, 0, 0, MAP_LITTLEROOT_TOWN_MAYS_HOUSE_2F LittlerootTown_MaysHouse_1F_MapCoordEvents:: @ 8385954 - coord_event 2, 8, 0, 0, VAR_LITTLEROOT_INTRO_STATE, 4, 0, LittlerootTown_MaysHouse_1F_EventScript_152A35 + coord_event 2, 8, 0, VAR_LITTLEROOT_INTRO_STATE, 4, LittlerootTown_MaysHouse_1F_EventScript_152A35 LittlerootTown_MaysHouse_1F_MapEvents:: @ 8385964 map_events LittlerootTown_MaysHouse_1F_EventObjects, LittlerootTown_MaysHouse_1F_MapWarps, LittlerootTown_MaysHouse_1F_MapCoordEvents, 0x0 diff --git a/data/maps/MagmaHideout_B2F/events.inc b/data/maps/MagmaHideout_B2F/events.inc index 7b547f68c..f4d2b459e 100644 --- a/data/maps/MagmaHideout_B2F/events.inc +++ b/data/maps/MagmaHideout_B2F/events.inc @@ -16,10 +16,10 @@ MagmaHideout_B2F_MapWarps:: @ 838EC5C warp_def 31, 16, 3, 6, MAP_MAGMA_HIDEOUT_B2F MagmaHideout_B2F_MapCoordEvents:: @ 838EC9C - coord_event 7, 16, 3, 0, VAR_TEMP_1, 0, 0, MagmaHideout_B2F_EventScript_15D8BD - coord_event 6, 16, 3, 0, VAR_TEMP_1, 0, 0, MagmaHideout_B2F_EventScript_15D8BD - coord_event 5, 16, 3, 0, VAR_TEMP_1, 0, 0, MagmaHideout_B2F_EventScript_15D8BD - coord_event 4, 16, 3, 0, VAR_TEMP_1, 0, 0, MagmaHideout_B2F_EventScript_15D8BD + coord_event 7, 16, 3, VAR_TEMP_1, 0, MagmaHideout_B2F_EventScript_15D8BD + coord_event 6, 16, 3, VAR_TEMP_1, 0, MagmaHideout_B2F_EventScript_15D8BD + coord_event 5, 16, 3, VAR_TEMP_1, 0, MagmaHideout_B2F_EventScript_15D8BD + coord_event 4, 16, 3, VAR_TEMP_1, 0, MagmaHideout_B2F_EventScript_15D8BD MagmaHideout_B2F_MapEvents:: @ 838ECDC map_events MagmaHideout_B2F_EventObjects, MagmaHideout_B2F_MapWarps, MagmaHideout_B2F_MapCoordEvents, 0x0 diff --git a/data/maps/MauvilleCity_Gym/events.inc b/data/maps/MauvilleCity_Gym/events.inc index 29784deec..0d0104cf6 100644 --- a/data/maps/MauvilleCity_Gym/events.inc +++ b/data/maps/MauvilleCity_Gym/events.inc @@ -11,9 +11,9 @@ MauvilleCity_Gym_MapWarps:: @ 83882AC warp_def 5, 20, 0, 0, MAP_MAUVILLE_CITY MauvilleCity_Gym_MapCoordEvents:: @ 83882BC - coord_event 0, 9, 3, 0, VAR_TEMP_0, 0, 0, MauvilleCity_Gym_EventScript_15664B - coord_event 8, 11, 3, 0, VAR_TEMP_0, 0, 0, MauvilleCity_Gym_EventScript_156670 - coord_event 4, 15, 3, 0, VAR_TEMP_0, 0, 0, MauvilleCity_Gym_EventScript_156695 + coord_event 0, 9, 3, VAR_TEMP_0, 0, MauvilleCity_Gym_EventScript_15664B + coord_event 8, 11, 3, VAR_TEMP_0, 0, MauvilleCity_Gym_EventScript_156670 + coord_event 4, 15, 3, VAR_TEMP_0, 0, MauvilleCity_Gym_EventScript_156695 MauvilleCity_Gym_MapBGEvents:: @ 83882EC bg_event 3, 18, 0, BG_EVENT_PLAYER_FACING_NORTH, MauvilleCity_Gym_EventScript_156761 diff --git a/data/maps/MeteorFalls_1F_1R/events.inc b/data/maps/MeteorFalls_1F_1R/events.inc index 5af472b66..b3f3db1b0 100644 --- a/data/maps/MeteorFalls_1F_1R/events.inc +++ b/data/maps/MeteorFalls_1F_1R/events.inc @@ -18,7 +18,7 @@ MeteorFalls_1F_1R_MapWarps:: @ 838BBBC warp_def 26, 28, 3, 5, MAP_METEOR_FALLS_B1F_1R MeteorFalls_1F_1R_MapCoordEvents:: @ 838BBE4 - coord_event 14, 18, 4, 0, VAR_METEOR_FALLS_STATE, 0, 0, MeteorFalls_1F_1R_EventScript_15C49C + coord_event 14, 18, 4, VAR_METEOR_FALLS_STATE, 0, MeteorFalls_1F_1R_EventScript_15C49C MeteorFalls_1F_1R_MapBGEvents:: @ 838BBF4 bg_event 38, 9, 0, BG_EVENT_PLAYER_FACING_NORTH, MeteorFalls_1F_1R_EventScript_14E842 diff --git a/data/maps/MossdeepCity/events.inc b/data/maps/MossdeepCity/events.inc index 376ef71ce..9880bbf87 100644 --- a/data/maps/MossdeepCity/events.inc +++ b/data/maps/MossdeepCity/events.inc @@ -22,10 +22,10 @@ MossdeepCity_MapWarps:: @ 8380504 warp_def 36, 24, 0, 0, MAP_MOSSDEEP_CITY_GAME_CORNER_1F MossdeepCity_MapCoordEvents:: @ 8380554 - coord_event 25, 25, 0, 0, VAR_TEMP_1, 0, 0, MossdeepCity_EventScript_14D008 - coord_event 26, 25, 0, 0, VAR_TEMP_1, 0, 0, MossdeepCity_EventScript_14D008 - coord_event 32, 27, 0, 0, VAR_TEMP_1, 0, 0, MossdeepCity_EventScript_14D008 - coord_event 33, 27, 0, 0, VAR_TEMP_1, 0, 0, MossdeepCity_EventScript_14D008 + coord_event 25, 25, 0, VAR_TEMP_1, 0, MossdeepCity_EventScript_14D008 + coord_event 26, 25, 0, VAR_TEMP_1, 0, MossdeepCity_EventScript_14D008 + coord_event 32, 27, 0, VAR_TEMP_1, 0, MossdeepCity_EventScript_14D008 + coord_event 33, 27, 0, VAR_TEMP_1, 0, MossdeepCity_EventScript_14D008 MossdeepCity_MapBGEvents:: @ 8380594 bg_event 25, 16, 0, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_EventScript_14CFF6 diff --git a/data/maps/MossdeepCity_Gym/events.inc b/data/maps/MossdeepCity_Gym/events.inc index 554985b3c..96ff7b032 100644 --- a/data/maps/MossdeepCity_Gym/events.inc +++ b/data/maps/MossdeepCity_Gym/events.inc @@ -14,7 +14,7 @@ MossdeepCity_Gym_MapWarps:: @ 838A738 warp_def 10, 29, 0, 1, MAP_MOSSDEEP_CITY MossdeepCity_Gym_MapCoordEvents:: @ 838A748 - coord_event 12, 3, 3, 0, VAR_TEMP_1, 0, 0, MossdeepCity_Gym_EventScript_15A742 + coord_event 12, 3, 3, VAR_TEMP_1, 0, MossdeepCity_Gym_EventScript_15A742 MossdeepCity_Gym_MapBGEvents:: @ 838A758 bg_event 2, 7, 0, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_Gym_EventScript_15A5EA diff --git a/data/maps/MtPyre_Exterior/events.inc b/data/maps/MtPyre_Exterior/events.inc index 2e69de9d2..9eb337714 100644 --- a/data/maps/MtPyre_Exterior/events.inc +++ b/data/maps/MtPyre_Exterior/events.inc @@ -8,11 +8,11 @@ MtPyre_Exterior_MapWarps:: @ 838CB44 warp_def 20, 10, 3, 1, MAP_MT_PYRE_SUMMIT MtPyre_Exterior_MapCoordEvents:: @ 838CB5C - coord_event 24, 21, 3, 0, 0, 0, 0, MtPyre_Exterior_EventScript_15D4A7 - coord_event 25, 21, 3, 0, 0, 0, 0, MtPyre_Exterior_EventScript_15D4A7 - coord_event 22, 27, 3, 0, 0, 0, 0, MtPyre_Exterior_EventScript_15D4AC - coord_event 23, 28, 3, 0, 0, 0, 0, MtPyre_Exterior_EventScript_15D4AC - coord_event 26, 21, 3, 0, 0, 0, 0, MtPyre_Exterior_EventScript_15D4A7 + coord_event 24, 21, 3, 0, 0, MtPyre_Exterior_EventScript_15D4A7 + coord_event 25, 21, 3, 0, 0, MtPyre_Exterior_EventScript_15D4A7 + coord_event 22, 27, 3, 0, 0, MtPyre_Exterior_EventScript_15D4AC + coord_event 23, 28, 3, 0, 0, MtPyre_Exterior_EventScript_15D4AC + coord_event 26, 21, 3, 0, 0, MtPyre_Exterior_EventScript_15D4A7 MtPyre_Exterior_MapBGEvents:: @ 838CBAC bg_hidden_item_event 9, 8, 0, ITEM_ULTRA_BALL, FLAG_HIDDEN_ITEM_1D diff --git a/data/maps/MtPyre_Summit/events.inc b/data/maps/MtPyre_Summit/events.inc index b04e9fb48..9b7a08e62 100644 --- a/data/maps/MtPyre_Summit/events.inc +++ b/data/maps/MtPyre_Summit/events.inc @@ -12,12 +12,12 @@ MtPyre_Summit_MapWarps:: @ 838CC68 warp_def 24, 31, 3, 1, MAP_MT_PYRE_EXTERIOR MtPyre_Summit_MapCoordEvents:: @ 838CC80 - coord_event 22, 7, 3, 0, VAR_MT_PYRE_STATE, 0, 0, MtPyre_Summit_EventScript_15D4BD - coord_event 23, 7, 3, 0, VAR_MT_PYRE_STATE, 0, 0, MtPyre_Summit_EventScript_15D4C9 - coord_event 24, 7, 3, 0, VAR_MT_PYRE_STATE, 0, 0, MtPyre_Summit_EventScript_15D4D5 - coord_event 22, 7, 3, 0, VAR_MT_PYRE_STATE, 2, 0, MtPyre_Summit_EventScript_15D6CE - coord_event 23, 7, 3, 0, VAR_MT_PYRE_STATE, 2, 0, MtPyre_Summit_EventScript_15D6DA - coord_event 24, 7, 3, 0, VAR_MT_PYRE_STATE, 2, 0, MtPyre_Summit_EventScript_15D6E6 + coord_event 22, 7, 3, VAR_MT_PYRE_STATE, 0, MtPyre_Summit_EventScript_15D4BD + coord_event 23, 7, 3, VAR_MT_PYRE_STATE, 0, MtPyre_Summit_EventScript_15D4C9 + coord_event 24, 7, 3, VAR_MT_PYRE_STATE, 0, MtPyre_Summit_EventScript_15D4D5 + coord_event 22, 7, 3, VAR_MT_PYRE_STATE, 2, MtPyre_Summit_EventScript_15D6CE + coord_event 23, 7, 3, VAR_MT_PYRE_STATE, 2, MtPyre_Summit_EventScript_15D6DA + coord_event 24, 7, 3, VAR_MT_PYRE_STATE, 2, MtPyre_Summit_EventScript_15D6E6 MtPyre_Summit_MapBGEvents:: @ 838CCE0 bg_hidden_item_event 9, 25, 0, ITEM_ZINC, FLAG_HIDDEN_ITEM_4F diff --git a/data/maps/NewMauville_Entrance/events.inc b/data/maps/NewMauville_Entrance/events.inc index 8967a1df0..71628459c 100644 --- a/data/maps/NewMauville_Entrance/events.inc +++ b/data/maps/NewMauville_Entrance/events.inc @@ -3,7 +3,7 @@ NewMauville_Entrance_MapWarps:: @ 838DED4 warp_def 4, 1, 3, 0, MAP_NEW_MAUVILLE_INSIDE NewMauville_Entrance_MapCoordEvents:: @ 838DEE4 - coord_event 4, 2, 3, 0, VAR_NEW_MAUVILLE_STATE, 0, 0, NewMauville_Entrance_EventScript_15E4DC + coord_event 4, 2, 3, VAR_NEW_MAUVILLE_STATE, 0, NewMauville_Entrance_EventScript_15E4DC NewMauville_Entrance_MapEvents:: @ 838DEF4 map_events 0x0, NewMauville_Entrance_MapWarps, NewMauville_Entrance_MapCoordEvents, 0x0 diff --git a/data/maps/NewMauville_Inside/events.inc b/data/maps/NewMauville_Inside/events.inc index fcea0498e..bd1e79656 100644 --- a/data/maps/NewMauville_Inside/events.inc +++ b/data/maps/NewMauville_Inside/events.inc @@ -12,16 +12,16 @@ NewMauville_Inside_MapWarps:: @ 838DFC8 warp_def 32, 33, 3, 1, MAP_NEW_MAUVILLE_ENTRANCE NewMauville_Inside_MapCoordEvents:: @ 838DFD0 - coord_event 30, 38, 3, 0, VAR_TEMP_1, 0, 0, NewMauville_Inside_EventScript_15E5AA - coord_event 18, 36, 3, 0, VAR_TEMP_2, 0, 0, NewMauville_Inside_EventScript_15E5C2 - coord_event 4, 26, 3, 0, VAR_TEMP_1, 0, 0, NewMauville_Inside_EventScript_15E5AA - coord_event 16, 22, 3, 0, VAR_TEMP_1, 0, 0, NewMauville_Inside_EventScript_15E5AA - coord_event 25, 18, 3, 0, VAR_TEMP_2, 0, 0, NewMauville_Inside_EventScript_15E5C2 - coord_event 2, 11, 3, 0, VAR_TEMP_2, 0, 0, NewMauville_Inside_EventScript_15E5C2 - coord_event 6, 11, 3, 0, VAR_TEMP_1, 0, 0, NewMauville_Inside_EventScript_15E5AA - coord_event 13, 10, 3, 0, VAR_TEMP_1, 0, 0, NewMauville_Inside_EventScript_15E5AA - coord_event 17, 10, 3, 0, VAR_TEMP_2, 0, 0, NewMauville_Inside_EventScript_15E5C2 - coord_event 33, 6, 3, 0, VAR_NEW_MAUVILLE_STATE, 1, 0, NewMauville_Inside_EventScript_15E876 + coord_event 30, 38, 3, VAR_TEMP_1, 0, NewMauville_Inside_EventScript_15E5AA + coord_event 18, 36, 3, VAR_TEMP_2, 0, NewMauville_Inside_EventScript_15E5C2 + coord_event 4, 26, 3, VAR_TEMP_1, 0, NewMauville_Inside_EventScript_15E5AA + coord_event 16, 22, 3, VAR_TEMP_1, 0, NewMauville_Inside_EventScript_15E5AA + coord_event 25, 18, 3, VAR_TEMP_2, 0, NewMauville_Inside_EventScript_15E5C2 + coord_event 2, 11, 3, VAR_TEMP_2, 0, NewMauville_Inside_EventScript_15E5C2 + coord_event 6, 11, 3, VAR_TEMP_1, 0, NewMauville_Inside_EventScript_15E5AA + coord_event 13, 10, 3, VAR_TEMP_1, 0, NewMauville_Inside_EventScript_15E5AA + coord_event 17, 10, 3, VAR_TEMP_2, 0, NewMauville_Inside_EventScript_15E5C2 + coord_event 33, 6, 3, VAR_NEW_MAUVILLE_STATE, 1, NewMauville_Inside_EventScript_15E876 NewMauville_Inside_MapBGEvents:: @ 838E070 bg_event 32, 4, 3, BG_EVENT_PLAYER_FACING_ANY, NewMauville_Inside_EventScript_15E8E0 diff --git a/data/maps/OldaleTown/events.inc b/data/maps/OldaleTown/events.inc index b9530f0e1..dd1833d00 100644 --- a/data/maps/OldaleTown/events.inc +++ b/data/maps/OldaleTown/events.inc @@ -11,10 +11,10 @@ OldaleTown_MapWarps:: @ 8380AD8 warp_def 14, 6, 0, 0, MAP_OLDALE_TOWN_MART OldaleTown_MapCoordEvents:: @ 8380AF8 - coord_event 0, 10, 3, 0, VAR_ROUTE102_ACCESSIBLE, 0, 0, OldaleTown_EventScript_14DEFF - coord_event 8, 19, 3, 0, VAR_OLDALE_STATE, 1, 0, OldaleTown_EventScript_14DF41 - coord_event 9, 19, 3, 0, VAR_OLDALE_STATE, 1, 0, OldaleTown_EventScript_14DF5C - coord_event 10, 19, 3, 0, VAR_OLDALE_STATE, 1, 0, OldaleTown_EventScript_14DF77 + coord_event 0, 10, 3, VAR_ROUTE102_ACCESSIBLE, 0, OldaleTown_EventScript_14DEFF + coord_event 8, 19, 3, VAR_OLDALE_STATE, 1, OldaleTown_EventScript_14DF41 + coord_event 9, 19, 3, VAR_OLDALE_STATE, 1, OldaleTown_EventScript_14DF5C + coord_event 10, 19, 3, VAR_OLDALE_STATE, 1, OldaleTown_EventScript_14DF77 OldaleTown_MapBGEvents:: @ 8380B38 bg_event 11, 9, 0, BG_EVENT_PLAYER_FACING_ANY, OldaleTown_EventScript_14DDAA diff --git a/data/maps/PetalburgCity/events.inc b/data/maps/PetalburgCity/events.inc index 718794df1..bb1df04d7 100644 --- a/data/maps/PetalburgCity/events.inc +++ b/data/maps/PetalburgCity/events.inc @@ -18,10 +18,10 @@ PetalburgCity_MapWarps:: @ 837F6C8 warp_def 25, 12, 0, 0, MAP_PETALBURG_CITY_MART PetalburgCity_MapCoordEvents:: @ 837F6F8 - coord_event 8, 10, 3, 0, VAR_PETALBURG_STATE, 0, 0, PetalburgCity_EventScript_14B836 - coord_event 8, 11, 3, 0, VAR_PETALBURG_STATE, 0, 0, PetalburgCity_EventScript_14B842 - coord_event 8, 12, 3, 0, VAR_PETALBURG_STATE, 0, 0, PetalburgCity_EventScript_14B84E - coord_event 8, 13, 3, 0, VAR_PETALBURG_STATE, 0, 0, PetalburgCity_EventScript_14B85A + coord_event 8, 10, 3, VAR_PETALBURG_STATE, 0, PetalburgCity_EventScript_14B836 + coord_event 8, 11, 3, VAR_PETALBURG_STATE, 0, PetalburgCity_EventScript_14B842 + coord_event 8, 12, 3, VAR_PETALBURG_STATE, 0, PetalburgCity_EventScript_14B84E + coord_event 8, 13, 3, VAR_PETALBURG_STATE, 0, PetalburgCity_EventScript_14B85A PetalburgCity_MapBGEvents:: @ 837F738 bg_event 17, 10, 0, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_EventScript_14B812 diff --git a/data/maps/PetalburgWoods/events.inc b/data/maps/PetalburgWoods/events.inc index dd0ae1bc1..95e4a00ef 100644 --- a/data/maps/PetalburgWoods/events.inc +++ b/data/maps/PetalburgWoods/events.inc @@ -22,8 +22,8 @@ PetalburgWoods_MapWarps:: @ 838C284 warp_def 37, 38, 0, 7, MAP_ROUTE104 PetalburgWoods_MapCoordEvents:: @ 838C2B4 - coord_event 26, 23, 3, 0, VAR_PETALBURG_WOODS_STATE, 0, 0, PetalburgWoods_EventScript_15CCA8 - coord_event 27, 23, 3, 0, VAR_PETALBURG_WOODS_STATE, 0, 0, PetalburgWoods_EventScript_15CD42 + coord_event 26, 23, 3, VAR_PETALBURG_WOODS_STATE, 0, PetalburgWoods_EventScript_15CCA8 + coord_event 27, 23, 3, VAR_PETALBURG_WOODS_STATE, 0, PetalburgWoods_EventScript_15CD42 PetalburgWoods_MapBGEvents:: @ 838C2D4 bg_event 14, 32, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgWoods_EventScript_15CF15 diff --git a/data/maps/RecordCorner/events.inc b/data/maps/RecordCorner/events.inc index 8d1fd9309..6d6b02339 100644 --- a/data/maps/RecordCorner/events.inc +++ b/data/maps/RecordCorner/events.inc @@ -8,10 +8,10 @@ RecordCorner_MapWarps:: @ 83913B4 warp_def 10, 9, 3, 127, MAP_NONE RecordCorner_MapCoordEvents:: @ 83913D4 - coord_event 6, 4, 3, 0, VAR_TEMP_0, 0, 0, RecordCorner_EventScript_1A4418 - coord_event 6, 6, 3, 0, VAR_TEMP_0, 0, 0, RecordCorner_EventScript_1A4442 - coord_event 13, 4, 3, 0, VAR_TEMP_0, 0, 0, RecordCorner_EventScript_1A442D - coord_event 13, 6, 3, 0, VAR_TEMP_0, 0, 0, RecordCorner_EventScript_1A4457 + coord_event 6, 4, 3, VAR_TEMP_0, 0, RecordCorner_EventScript_1A4418 + coord_event 6, 6, 3, VAR_TEMP_0, 0, RecordCorner_EventScript_1A4442 + coord_event 13, 4, 3, VAR_TEMP_0, 0, RecordCorner_EventScript_1A442D + coord_event 13, 6, 3, VAR_TEMP_0, 0, RecordCorner_EventScript_1A4457 RecordCorner_MapEvents:: @ 8391414 map_events RecordCorner_EventObjects, RecordCorner_MapWarps, RecordCorner_MapCoordEvents, 0x0 diff --git a/data/maps/Route101/events.inc b/data/maps/Route101/events.inc index 39a40e414..9299c484a 100644 --- a/data/maps/Route101/events.inc +++ b/data/maps/Route101/events.inc @@ -7,15 +7,15 @@ Route101_EventObjects:: @ 83810BC object_event 6, EVENT_OBJ_GFX_BOY_2, 0, 2, 13, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 1, 0, 0, Route101_EventScript_14EA6D, FLAG_HIDE_BOY_ROUTE101 Route101_MapCoordEvents:: @ 838114C - coord_event 10, 19, 3, 0, VAR_ROUTE101_STATE, 1, 0, Route101_EventScript_14E948 - coord_event 11, 19, 3, 0, VAR_ROUTE101_STATE, 1, 0, Route101_EventScript_14E948 - coord_event 10, 18, 3, 0, VAR_ROUTE101_STATE, 2, 0, Route101_EventScript_14E9B8 - coord_event 11, 18, 3, 0, VAR_ROUTE101_STATE, 2, 0, Route101_EventScript_14E9B8 - coord_event 6, 16, 3, 0, VAR_ROUTE101_STATE, 2, 0, Route101_EventScript_14E9CE - coord_event 6, 15, 3, 0, VAR_ROUTE101_STATE, 2, 0, Route101_EventScript_14E9CE - coord_event 6, 17, 3, 0, VAR_ROUTE101_STATE, 2, 0, Route101_EventScript_14E9CE - coord_event 6, 18, 3, 0, VAR_ROUTE101_STATE, 2, 0, Route101_EventScript_14E9CE - coord_event 7, 13, 3, 0, VAR_ROUTE101_STATE, 2, 0, Route101_EventScript_14E9E4 + coord_event 10, 19, 3, VAR_ROUTE101_STATE, 1, Route101_EventScript_14E948 + coord_event 11, 19, 3, VAR_ROUTE101_STATE, 1, Route101_EventScript_14E948 + coord_event 10, 18, 3, VAR_ROUTE101_STATE, 2, Route101_EventScript_14E9B8 + coord_event 11, 18, 3, VAR_ROUTE101_STATE, 2, Route101_EventScript_14E9B8 + coord_event 6, 16, 3, VAR_ROUTE101_STATE, 2, Route101_EventScript_14E9CE + coord_event 6, 15, 3, VAR_ROUTE101_STATE, 2, Route101_EventScript_14E9CE + coord_event 6, 17, 3, VAR_ROUTE101_STATE, 2, Route101_EventScript_14E9CE + coord_event 6, 18, 3, VAR_ROUTE101_STATE, 2, Route101_EventScript_14E9CE + coord_event 7, 13, 3, VAR_ROUTE101_STATE, 2, Route101_EventScript_14E9E4 Route101_MapBGEvents:: @ 83811DC bg_event 5, 9, 0, BG_EVENT_PLAYER_FACING_ANY, Route101_EventScript_14EA76 diff --git a/data/maps/Route110/events.inc b/data/maps/Route110/events.inc index 6df7b8276..f164df80b 100644 --- a/data/maps/Route110/events.inc +++ b/data/maps/Route110/events.inc @@ -40,11 +40,11 @@ Route110_MapWarps:: @ 8382040 warp_def 19, 88, 0, 2, MAP_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE Route110_MapCoordEvents:: @ 8382070 - coord_event 28, 92, 3, 0, VAR_CYCLING_CHALLENGE_STATE, 2, 0, Route110_EventScript_14FC27 - coord_event 29, 92, 3, 0, VAR_CYCLING_CHALLENGE_STATE, 2, 0, Route110_EventScript_14FC27 - coord_event 33, 56, 3, 0, VAR_ROUTE110_STATE, 0, 0, Route110_EventScript_14FD13 - coord_event 34, 56, 3, 0, VAR_ROUTE110_STATE, 0, 0, Route110_EventScript_14FD1E - coord_event 35, 56, 3, 0, VAR_ROUTE110_STATE, 0, 0, Route110_EventScript_14FD29 + coord_event 28, 92, 3, VAR_CYCLING_CHALLENGE_STATE, 2, Route110_EventScript_14FC27 + coord_event 29, 92, 3, VAR_CYCLING_CHALLENGE_STATE, 2, Route110_EventScript_14FC27 + coord_event 33, 56, 3, VAR_ROUTE110_STATE, 0, Route110_EventScript_14FD13 + coord_event 34, 56, 3, VAR_ROUTE110_STATE, 0, Route110_EventScript_14FD1E + coord_event 35, 56, 3, VAR_ROUTE110_STATE, 0, Route110_EventScript_14FD29 Route110_MapBGEvents:: @ 83820C0 bg_event 15, 25, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_14F9EF diff --git a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/events.inc b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/events.inc index 680a1884d..1eb0e9c40 100644 --- a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/events.inc +++ b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/events.inc @@ -8,8 +8,8 @@ Route110_SeasideCyclingRoadNorthEntrance_MapWarps:: @ 8392CC4 warp_def 13, 5, 0, 3, MAP_ROUTE110 Route110_SeasideCyclingRoadNorthEntrance_MapCoordEvents:: @ 8392CE4 - coord_event 7, 4, 3, 0, VAR_TEMP_1, 0, 0, Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634F7 - coord_event 5, 4, 3, 0, VAR_TEMP_1, 1, 0, Route110_SeasideCyclingRoadNorthEntrance_EventScript_16353A + coord_event 7, 4, 3, VAR_TEMP_1, 0, Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634F7 + coord_event 5, 4, 3, VAR_TEMP_1, 1, Route110_SeasideCyclingRoadNorthEntrance_EventScript_16353A Route110_SeasideCyclingRoadNorthEntrance_MapEvents:: @ 8392D04 map_events Route110_SeasideCyclingRoadNorthEntrance_EventObjects, Route110_SeasideCyclingRoadNorthEntrance_MapWarps, Route110_SeasideCyclingRoadNorthEntrance_MapCoordEvents, 0x0 diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/events.inc b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/events.inc index bba2d583d..998927469 100644 --- a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/events.inc +++ b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/events.inc @@ -8,8 +8,8 @@ Route110_SeasideCyclingRoadSouthEntrance_MapWarps:: @ 8392C58 warp_def 13, 5, 0, 5, MAP_ROUTE110 Route110_SeasideCyclingRoadSouthEntrance_MapCoordEvents:: @ 8392C78 - coord_event 7, 4, 3, 0, VAR_TEMP_1, 0, 0, Route110_SeasideCyclingRoadSouthEntrance_EventScript_16348B - coord_event 5, 4, 3, 0, VAR_TEMP_1, 1, 0, Route110_SeasideCyclingRoadSouthEntrance_EventScript_1634BD + coord_event 7, 4, 3, VAR_TEMP_1, 0, Route110_SeasideCyclingRoadSouthEntrance_EventScript_16348B + coord_event 5, 4, 3, VAR_TEMP_1, 1, Route110_SeasideCyclingRoadSouthEntrance_EventScript_1634BD Route110_SeasideCyclingRoadSouthEntrance_MapEvents:: @ 8392C98 map_events Route110_SeasideCyclingRoadSouthEntrance_EventObjects, Route110_SeasideCyclingRoadSouthEntrance_MapWarps, Route110_SeasideCyclingRoadSouthEntrance_MapCoordEvents, 0x0 diff --git a/data/maps/Route110_TrickHouseEnd/events.inc b/data/maps/Route110_TrickHouseEnd/events.inc index d794cfd35..21e894a34 100644 --- a/data/maps/Route110_TrickHouseEnd/events.inc +++ b/data/maps/Route110_TrickHouseEnd/events.inc @@ -6,7 +6,7 @@ Route110_TrickHouseEnd_MapWarps:: @ 83921E8 warp_def 2, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_CORRIDOR Route110_TrickHouseEnd_MapCoordEvents:: @ 83921F8 - coord_event 2, 2, 3, 0, VAR_TEMP_2, 0, 0, Route110_TrickHouseEnd_EventScript_161CA0 + coord_event 2, 2, 3, VAR_TEMP_2, 0, Route110_TrickHouseEnd_EventScript_161CA0 Route110_TrickHouseEnd_MapBGEvents:: @ 8392208 bg_hidden_item_event 4, 5, 3, ITEM_NUGGET, FLAG_HIDDEN_ITEM_1 diff --git a/data/maps/Route110_TrickHouseEntrance/events.inc b/data/maps/Route110_TrickHouseEntrance/events.inc index e24acb4b7..64679678f 100644 --- a/data/maps/Route110_TrickHouseEntrance/events.inc +++ b/data/maps/Route110_TrickHouseEntrance/events.inc @@ -7,10 +7,10 @@ Route110_TrickHouseEntrance_MapWarps:: @ 8392158 warp_def 5, 2, 3, 0, MAP_ROUTE110_TRICK_HOUSE_PUZZLE1 Route110_TrickHouseEntrance_MapCoordEvents:: @ 8392170 - coord_event 4, 7, 3, 0, VAR_TRICK_HOUSE_ENTRANCE_STATE, 0, 0, Route110_TrickHouseEntrance_EventScript_1618B0 - coord_event 5, 6, 3, 0, VAR_TRICK_HOUSE_ENTRANCE_STATE, 0, 0, Route110_TrickHouseEntrance_EventScript_1618B0 - coord_event 6, 6, 3, 0, VAR_TRICK_HOUSE_ENTRANCE_STATE, 0, 0, Route110_TrickHouseEntrance_EventScript_1618B0 - coord_event 7, 7, 3, 0, VAR_TRICK_HOUSE_ENTRANCE_STATE, 0, 0, Route110_TrickHouseEntrance_EventScript_1618B0 + coord_event 4, 7, 3, VAR_TRICK_HOUSE_ENTRANCE_STATE, 0, Route110_TrickHouseEntrance_EventScript_1618B0 + coord_event 5, 6, 3, VAR_TRICK_HOUSE_ENTRANCE_STATE, 0, Route110_TrickHouseEntrance_EventScript_1618B0 + coord_event 6, 6, 3, VAR_TRICK_HOUSE_ENTRANCE_STATE, 0, Route110_TrickHouseEntrance_EventScript_1618B0 + coord_event 7, 7, 3, VAR_TRICK_HOUSE_ENTRANCE_STATE, 0, Route110_TrickHouseEntrance_EventScript_1618B0 Route110_TrickHouseEntrance_MapBGEvents:: @ 83921B0 bg_event 5, 1, 0, BG_EVENT_PLAYER_FACING_NORTH, Route110_TrickHouseEntrance_EventScript_16158A diff --git a/data/maps/Route110_TrickHousePuzzle2/events.inc b/data/maps/Route110_TrickHousePuzzle2/events.inc index 2eb41f50d..7fecac70a 100644 --- a/data/maps/Route110_TrickHousePuzzle2/events.inc +++ b/data/maps/Route110_TrickHousePuzzle2/events.inc @@ -11,10 +11,10 @@ Route110_TrickHousePuzzle2_MapWarps:: @ 83924D4 warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END Route110_TrickHousePuzzle2_MapCoordEvents:: @ 83924EC - coord_event 14, 21, 3, 0, VAR_TEMP_1, 0, 0, Route110_TrickHousePuzzle2_EventScript_161DE0 - coord_event 8, 17, 3, 0, VAR_TEMP_2, 0, 0, Route110_TrickHousePuzzle2_EventScript_161DF3 - coord_event 4, 10, 3, 0, VAR_TEMP_3, 0, 0, Route110_TrickHousePuzzle2_EventScript_161E06 - coord_event 5, 2, 0, 0, VAR_TEMP_4, 0, 0, Route110_TrickHousePuzzle2_EventScript_161E19 + coord_event 14, 21, 3, VAR_TEMP_1, 0, Route110_TrickHousePuzzle2_EventScript_161DE0 + coord_event 8, 17, 3, VAR_TEMP_2, 0, Route110_TrickHousePuzzle2_EventScript_161DF3 + coord_event 4, 10, 3, VAR_TEMP_3, 0, Route110_TrickHousePuzzle2_EventScript_161E06 + coord_event 5, 2, 0, VAR_TEMP_4, 0, Route110_TrickHousePuzzle2_EventScript_161E19 Route110_TrickHousePuzzle2_MapBGEvents:: @ 839252C bg_event 14, 5, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_TrickHousePuzzle2_EventScript_161DC3 diff --git a/data/maps/Route110_TrickHousePuzzle3/events.inc b/data/maps/Route110_TrickHousePuzzle3/events.inc index 1f74281a1..54b8bc708 100644 --- a/data/maps/Route110_TrickHousePuzzle3/events.inc +++ b/data/maps/Route110_TrickHousePuzzle3/events.inc @@ -17,13 +17,13 @@ Route110_TrickHousePuzzle3_MapWarps:: @ 8392654 warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END Route110_TrickHousePuzzle3_MapCoordEvents:: @ 839266C - coord_event 5, 20, 3, 0, VAR_TEMP_1, 0, 0, Route110_TrickHousePuzzle3_EventScript_1625AB - coord_event 4, 12, 3, 0, VAR_TEMP_2, 0, 0, Route110_TrickHousePuzzle3_EventScript_1625B7 - coord_event 11, 10, 3, 0, VAR_TEMP_3, 0, 0, Route110_TrickHousePuzzle3_EventScript_1625C3 - coord_event 3, 8, 3, 0, VAR_TEMP_4, 0, 0, Route110_TrickHousePuzzle3_EventScript_1625CF - coord_event 13, 7, 3, 0, VAR_TEMP_5, 0, 0, Route110_TrickHousePuzzle3_EventScript_1625DB - coord_event 1, 3, 3, 0, VAR_TEMP_6, 0, 0, Route110_TrickHousePuzzle3_EventScript_1625E7 - coord_event 10, 2, 3, 0, VAR_TEMP_7, 0, 0, Route110_TrickHousePuzzle3_EventScript_1625F3 + coord_event 5, 20, 3, VAR_TEMP_1, 0, Route110_TrickHousePuzzle3_EventScript_1625AB + coord_event 4, 12, 3, VAR_TEMP_2, 0, Route110_TrickHousePuzzle3_EventScript_1625B7 + coord_event 11, 10, 3, VAR_TEMP_3, 0, Route110_TrickHousePuzzle3_EventScript_1625C3 + coord_event 3, 8, 3, VAR_TEMP_4, 0, Route110_TrickHousePuzzle3_EventScript_1625CF + coord_event 13, 7, 3, VAR_TEMP_5, 0, Route110_TrickHousePuzzle3_EventScript_1625DB + coord_event 1, 3, 3, VAR_TEMP_6, 0, Route110_TrickHousePuzzle3_EventScript_1625E7 + coord_event 10, 2, 3, VAR_TEMP_7, 0, Route110_TrickHousePuzzle3_EventScript_1625F3 Route110_TrickHousePuzzle3_MapBGEvents:: @ 83926DC bg_event 0, 8, 3, BG_EVENT_PLAYER_FACING_ANY, Route110_TrickHousePuzzle3_EventScript_1626EB diff --git a/data/maps/Route110_TrickHousePuzzle5/events.inc b/data/maps/Route110_TrickHousePuzzle5/events.inc index 82138284a..5a553d8b3 100644 --- a/data/maps/Route110_TrickHousePuzzle5/events.inc +++ b/data/maps/Route110_TrickHousePuzzle5/events.inc @@ -11,20 +11,20 @@ Route110_TrickHousePuzzle5_MapWarps:: @ 8392914 warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END Route110_TrickHousePuzzle5_MapCoordEvents:: @ 839292C - coord_event 8, 19, 3, 0, VAR_TEMP_1, 0, 0, Route110_TrickHousePuzzle5_EventScript_162897 - coord_event 7, 19, 3, 0, VAR_TEMP_1, 0, 0, Route110_TrickHousePuzzle5_EventScript_1628A3 - coord_event 6, 19, 3, 0, VAR_TEMP_1, 0, 0, Route110_TrickHousePuzzle5_EventScript_1628AF - coord_event 5, 19, 3, 0, VAR_TEMP_1, 0, 0, Route110_TrickHousePuzzle5_EventScript_1628BB - coord_event 6, 14, 3, 0, VAR_TEMP_2, 0, 0, Route110_TrickHousePuzzle5_EventScript_1628C7 - coord_event 7, 14, 3, 0, VAR_TEMP_2, 0, 0, Route110_TrickHousePuzzle5_EventScript_1628D3 - coord_event 11, 10, 3, 0, VAR_TEMP_3, 0, 0, Route110_TrickHousePuzzle5_EventScript_1628DF - coord_event 10, 10, 3, 0, VAR_TEMP_3, 0, 0, Route110_TrickHousePuzzle5_EventScript_1628EB - coord_event 9, 10, 3, 0, VAR_TEMP_3, 0, 0, Route110_TrickHousePuzzle5_EventScript_1628F7 - coord_event 11, 5, 3, 0, VAR_TEMP_4, 0, 0, Route110_TrickHousePuzzle5_EventScript_162903 - coord_event 10, 5, 3, 0, VAR_TEMP_4, 0, 0, Route110_TrickHousePuzzle5_EventScript_16290F - coord_event 2, 6, 3, 0, VAR_TEMP_5, 0, 0, Route110_TrickHousePuzzle5_EventScript_16291B - coord_event 3, 6, 3, 0, VAR_TEMP_5, 0, 0, Route110_TrickHousePuzzle5_EventScript_162927 - coord_event 4, 6, 3, 0, VAR_TEMP_5, 0, 0, Route110_TrickHousePuzzle5_EventScript_162933 + coord_event 8, 19, 3, VAR_TEMP_1, 0, Route110_TrickHousePuzzle5_EventScript_162897 + coord_event 7, 19, 3, VAR_TEMP_1, 0, Route110_TrickHousePuzzle5_EventScript_1628A3 + coord_event 6, 19, 3, VAR_TEMP_1, 0, Route110_TrickHousePuzzle5_EventScript_1628AF + coord_event 5, 19, 3, VAR_TEMP_1, 0, Route110_TrickHousePuzzle5_EventScript_1628BB + coord_event 6, 14, 3, VAR_TEMP_2, 0, Route110_TrickHousePuzzle5_EventScript_1628C7 + coord_event 7, 14, 3, VAR_TEMP_2, 0, Route110_TrickHousePuzzle5_EventScript_1628D3 + coord_event 11, 10, 3, VAR_TEMP_3, 0, Route110_TrickHousePuzzle5_EventScript_1628DF + coord_event 10, 10, 3, VAR_TEMP_3, 0, Route110_TrickHousePuzzle5_EventScript_1628EB + coord_event 9, 10, 3, VAR_TEMP_3, 0, Route110_TrickHousePuzzle5_EventScript_1628F7 + coord_event 11, 5, 3, VAR_TEMP_4, 0, Route110_TrickHousePuzzle5_EventScript_162903 + coord_event 10, 5, 3, VAR_TEMP_4, 0, Route110_TrickHousePuzzle5_EventScript_16290F + coord_event 2, 6, 3, VAR_TEMP_5, 0, Route110_TrickHousePuzzle5_EventScript_16291B + coord_event 3, 6, 3, VAR_TEMP_5, 0, Route110_TrickHousePuzzle5_EventScript_162927 + coord_event 4, 6, 3, VAR_TEMP_5, 0, Route110_TrickHousePuzzle5_EventScript_162933 Route110_TrickHousePuzzle5_MapBGEvents:: @ 8392A0C bg_event 2, 9, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_TrickHousePuzzle5_EventScript_1627D5 diff --git a/data/maps/Route110_TrickHousePuzzle7/events.inc b/data/maps/Route110_TrickHousePuzzle7/events.inc index b9ab8aaf1..38823faa4 100644 --- a/data/maps/Route110_TrickHousePuzzle7/events.inc +++ b/data/maps/Route110_TrickHousePuzzle7/events.inc @@ -10,7 +10,7 @@ Route110_TrickHousePuzzle7_MapWarps:: @ 8392B24 warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END Route110_TrickHousePuzzle7_MapCoordEvents:: @ 8392B3C - coord_event 9, 2, 3, 0, VAR_TEMP_1, 0, 0, Route110_TrickHousePuzzle7_EventScript_1632A8 + coord_event 9, 2, 3, VAR_TEMP_1, 0, Route110_TrickHousePuzzle7_EventScript_1632A8 Route110_TrickHousePuzzle7_MapBGEvents:: @ 8392B4C bg_event 7, 2, 3, BG_EVENT_PLAYER_FACING_ANY, Route110_TrickHousePuzzle7_EventScript_16328B diff --git a/data/maps/Route111/events.inc b/data/maps/Route111/events.inc index c245097c1..e79548b9c 100644 --- a/data/maps/Route111/events.inc +++ b/data/maps/Route111/events.inc @@ -42,40 +42,40 @@ Route111_MapWarps:: @ 8382500 warp_def 26, 18, 0, 0, MAP_ROUTE111_OLD_LADYS_REST_STOP Route111_MapCoordEvents:: @ 8382518 - coord_event 12, 62, 3, 0, 0, 0, 0, Route111_EventScript_1501C9 - coord_event 11, 61, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_150116 - coord_event 12, 61, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_150116 - coord_event 13, 61, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_150116 - coord_event 7, 63, 3, 0, 0, 0, 0, Route111_EventScript_1501BC - coord_event 12, 44, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_150122 - coord_event 13, 43, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_150122 - coord_event 14, 42, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_150122 - coord_event 16, 40, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_150122 - coord_event 14, 61, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_150116 - coord_event 18, 32, 3, 0, 0, 0, 0, Route111_EventScript_1501BC - coord_event 17, 31, 3, 0, 0, 0, 0, Route111_EventScript_1501BC - coord_event 9, 37, 3, 0, 0, 0, 0, Route111_EventScript_1501BC - coord_event 10, 36, 3, 0, 0, 0, 0, Route111_EventScript_1501BC - coord_event 17, 39, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_150122 - coord_event 18, 38, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_150122 - coord_event 8, 64, 3, 0, 0, 0, 0, Route111_EventScript_1501BC - coord_event 9, 65, 3, 0, 0, 0, 0, Route111_EventScript_1501BC - coord_event 10, 65, 3, 0, 0, 0, 0, Route111_EventScript_1501BC - coord_event 11, 66, 3, 0, 0, 0, 0, Route111_EventScript_1501BC - coord_event 12, 67, 3, 0, 0, 0, 0, Route111_EventScript_1501BC - coord_event 13, 68, 3, 0, 0, 0, 0, Route111_EventScript_1501BC - coord_event 14, 69, 3, 0, 0, 0, 0, Route111_EventScript_1501BC - coord_event 10, 61, 3, 0, 0, 0, 0, Route111_EventScript_1501C9 - coord_event 11, 62, 3, 0, 0, 0, 0, Route111_EventScript_1501C9 - coord_event 13, 62, 3, 0, 0, 0, 0, Route111_EventScript_1501C9 - coord_event 14, 62, 3, 0, 0, 0, 0, Route111_EventScript_1501C9 - coord_event 17, 38, 3, 0, 0, 0, 0, Route111_EventScript_1501C9 - coord_event 16, 39, 3, 0, 0, 0, 0, Route111_EventScript_1501C9 - coord_event 15, 40, 3, 0, 0, 0, 0, Route111_EventScript_1501C9 - coord_event 14, 41, 3, 0, 0, 0, 0, Route111_EventScript_1501C9 - coord_event 13, 42, 3, 0, 0, 0, 0, Route111_EventScript_1501C9 - coord_event 12, 43, 3, 0, 0, 0, 0, Route111_EventScript_1501C9 - coord_event 11, 44, 3, 0, 0, 0, 0, Route111_EventScript_1501C9 + coord_event 12, 62, 3, 0, 0, Route111_EventScript_1501C9 + coord_event 11, 61, 3, VAR_TEMP_3, 0, Route111_EventScript_150116 + coord_event 12, 61, 3, VAR_TEMP_3, 0, Route111_EventScript_150116 + coord_event 13, 61, 3, VAR_TEMP_3, 0, Route111_EventScript_150116 + coord_event 7, 63, 3, 0, 0, Route111_EventScript_1501BC + coord_event 12, 44, 3, VAR_TEMP_3, 0, Route111_EventScript_150122 + coord_event 13, 43, 3, VAR_TEMP_3, 0, Route111_EventScript_150122 + coord_event 14, 42, 3, VAR_TEMP_3, 0, Route111_EventScript_150122 + coord_event 16, 40, 3, VAR_TEMP_3, 0, Route111_EventScript_150122 + coord_event 14, 61, 3, VAR_TEMP_3, 0, Route111_EventScript_150116 + coord_event 18, 32, 3, 0, 0, Route111_EventScript_1501BC + coord_event 17, 31, 3, 0, 0, Route111_EventScript_1501BC + coord_event 9, 37, 3, 0, 0, Route111_EventScript_1501BC + coord_event 10, 36, 3, 0, 0, Route111_EventScript_1501BC + coord_event 17, 39, 3, VAR_TEMP_3, 0, Route111_EventScript_150122 + coord_event 18, 38, 3, VAR_TEMP_3, 0, Route111_EventScript_150122 + coord_event 8, 64, 3, 0, 0, Route111_EventScript_1501BC + coord_event 9, 65, 3, 0, 0, Route111_EventScript_1501BC + coord_event 10, 65, 3, 0, 0, Route111_EventScript_1501BC + coord_event 11, 66, 3, 0, 0, Route111_EventScript_1501BC + coord_event 12, 67, 3, 0, 0, Route111_EventScript_1501BC + coord_event 13, 68, 3, 0, 0, Route111_EventScript_1501BC + coord_event 14, 69, 3, 0, 0, Route111_EventScript_1501BC + coord_event 10, 61, 3, 0, 0, Route111_EventScript_1501C9 + coord_event 11, 62, 3, 0, 0, Route111_EventScript_1501C9 + coord_event 13, 62, 3, 0, 0, Route111_EventScript_1501C9 + coord_event 14, 62, 3, 0, 0, Route111_EventScript_1501C9 + coord_event 17, 38, 3, 0, 0, Route111_EventScript_1501C9 + coord_event 16, 39, 3, 0, 0, Route111_EventScript_1501C9 + coord_event 15, 40, 3, 0, 0, Route111_EventScript_1501C9 + coord_event 14, 41, 3, 0, 0, Route111_EventScript_1501C9 + coord_event 13, 42, 3, 0, 0, Route111_EventScript_1501C9 + coord_event 12, 43, 3, 0, 0, Route111_EventScript_1501C9 + coord_event 11, 44, 3, 0, 0, Route111_EventScript_1501C9 Route111_MapBGEvents:: @ 8382738 bg_event 16, 114, 0, BG_EVENT_PLAYER_FACING_ANY, Route111_EventScript_150368 diff --git a/data/maps/Route116/events.inc b/data/maps/Route116/events.inc index 12dfa495f..b6f6b3be9 100644 --- a/data/maps/Route116/events.inc +++ b/data/maps/Route116/events.inc @@ -28,7 +28,7 @@ Route116_MapWarps:: @ 8383380 warp_def 65, 10, 0, 2, MAP_RUSTURF_TUNNEL Route116_MapCoordEvents:: @ 8383398 - coord_event 47, 9, 3, 0, VAR_ROUTE116_STATE, 1, 0, Route116_EventScript_150B6E + coord_event 47, 9, 3, VAR_ROUTE116_STATE, 1, Route116_EventScript_150B6E Route116_MapBGEvents:: @ 83833A8 bg_event 5, 10, 0, BG_EVENT_PLAYER_FACING_ANY, Route116_EventScript_150B30 diff --git a/data/maps/Route118/events.inc b/data/maps/Route118/events.inc index 4c9aa47cb..96b52a7eb 100644 --- a/data/maps/Route118/events.inc +++ b/data/maps/Route118/events.inc @@ -21,9 +21,9 @@ Route118_EventObjects:: @ 8383684 object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 69, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route118_EventScript_1B15B2, FLAG_ITEM_ROUTE118_1 Route118_MapCoordEvents:: @ 8383864 - coord_event 43, 11, 3, 0, VAR_ROUTE118_STATE, 0, 0, Route118_EventScript_150FAE - coord_event 44, 11, 3, 0, VAR_ROUTE118_STATE, 0, 0, Route118_EventScript_150FCE - coord_event 45, 11, 3, 0, VAR_ROUTE118_STATE, 0, 0, Route118_EventScript_150FE4 + coord_event 43, 11, 3, VAR_ROUTE118_STATE, 0, Route118_EventScript_150FAE + coord_event 44, 11, 3, VAR_ROUTE118_STATE, 0, Route118_EventScript_150FCE + coord_event 45, 11, 3, VAR_ROUTE118_STATE, 0, Route118_EventScript_150FE4 Route118_MapBGEvents:: @ 8383894 bg_secret_base_event 47, 14, 0, SECRET_BASE_RED_CAVE1_1 diff --git a/data/maps/Route119/events.inc b/data/maps/Route119/events.inc index 8e895e9ba..0ced918ab 100644 --- a/data/maps/Route119/events.inc +++ b/data/maps/Route119/events.inc @@ -42,8 +42,8 @@ Route119_MapWarps:: @ 8383C8C warp_def 33, 109, 0, 0, MAP_ROUTE119_HOUSE Route119_MapCoordEvents:: @ 8383C9C - coord_event 25, 31, 0, 0, VAR_ROUTE119_STATE, 0, 0, Route119_EventScript_1511C5 - coord_event 26, 31, 0, 0, VAR_ROUTE119_STATE, 0, 0, Route119_EventScript_1511D0 + coord_event 25, 31, 0, VAR_ROUTE119_STATE, 0, Route119_EventScript_1511C5 + coord_event 26, 31, 0, VAR_ROUTE119_STATE, 0, Route119_EventScript_1511D0 coord_weather_event 28, 13, 0, COORD_EVENT_WEATHER_ROUTE119_CYCLE coord_weather_event 29, 13, 3, COORD_EVENT_WEATHER_ROUTE119_CYCLE coord_weather_event 30, 13, 3, COORD_EVENT_WEATHER_ROUTE119_CYCLE diff --git a/data/maps/Route121/events.inc b/data/maps/Route121/events.inc index dbd311f31..e4fbbb8ca 100644 --- a/data/maps/Route121/events.inc +++ b/data/maps/Route121/events.inc @@ -26,10 +26,10 @@ Route121_MapWarps:: @ 8384714 warp_def 37, 5, 0, 2, MAP_ROUTE121_SAFARI_ZONE_ENTRANCE Route121_MapCoordEvents:: @ 838471C - coord_event 25, 5, 3, 0, VAR_ROUTE121_STATE, 0, 0, Route121_EventScript_151B25 - coord_event 25, 6, 3, 0, VAR_ROUTE121_STATE, 0, 0, Route121_EventScript_151B25 - coord_event 25, 7, 3, 0, VAR_ROUTE121_STATE, 0, 0, Route121_EventScript_151B25 - coord_event 25, 8, 3, 0, VAR_ROUTE121_STATE, 0, 0, Route121_EventScript_151B25 + coord_event 25, 5, 3, VAR_ROUTE121_STATE, 0, Route121_EventScript_151B25 + coord_event 25, 6, 3, VAR_ROUTE121_STATE, 0, Route121_EventScript_151B25 + coord_event 25, 7, 3, VAR_ROUTE121_STATE, 0, Route121_EventScript_151B25 + coord_event 25, 8, 3, VAR_ROUTE121_STATE, 0, Route121_EventScript_151B25 Route121_MapBGEvents:: @ 838475C bg_event 32, 14, 0, BG_EVENT_PLAYER_FACING_ANY, Route121_EventScript_151B13 diff --git a/data/maps/Route121_SafariZoneEntrance/events.inc b/data/maps/Route121_SafariZoneEntrance/events.inc index b10cfecab..8d1f350c0 100644 --- a/data/maps/Route121_SafariZoneEntrance/events.inc +++ b/data/maps/Route121_SafariZoneEntrance/events.inc @@ -10,7 +10,7 @@ Route121_SafariZoneEntrance_MapWarps:: @ 838BA7C warp_def 15, 13, 0, 0, MAP_ROUTE121 Route121_SafariZoneEntrance_MapCoordEvents:: @ 838BA9C - coord_event 8, 4, 3, 0, VAR_TEMP_1, 0, 0, Route121_SafariZoneEntrance_EventScript_15C383 + coord_event 8, 4, 3, VAR_TEMP_1, 0, Route121_SafariZoneEntrance_EventScript_15C383 Route121_SafariZoneEntrance_MapBGEvents:: @ 838BAAC bg_event 15, 1, 0, BG_EVENT_PLAYER_FACING_ANY, Route121_SafariZoneEntrance_EventScript_15C487 diff --git a/data/maps/RustboroCity/events.inc b/data/maps/RustboroCity/events.inc index 041eeaebb..f8d2fa1ef 100644 --- a/data/maps/RustboroCity/events.inc +++ b/data/maps/RustboroCity/events.inc @@ -29,19 +29,19 @@ RustboroCity_MapWarps:: @ 837FE64 warp_def 26, 46, 0, 0, MAP_RUSTBORO_CITY_HOUSE3 RustboroCity_MapCoordEvents:: @ 837FEC4 - coord_event 23, 20, 3, 0, VAR_RUSTBORO_STATE, 1, 0, RustboroCity_EventScript_14C481 - coord_event 23, 21, 3, 0, VAR_RUSTBORO_STATE, 1, 0, RustboroCity_EventScript_14C498 - coord_event 23, 22, 3, 0, VAR_RUSTBORO_STATE, 1, 0, RustboroCity_EventScript_14C4AF - coord_event 23, 23, 3, 0, VAR_RUSTBORO_STATE, 1, 0, RustboroCity_EventScript_14C4C6 - coord_event 23, 24, 3, 0, VAR_RUSTBORO_STATE, 1, 0, RustboroCity_EventScript_14C4DD - coord_event 30, 9, 3, 0, VAR_RUSTBORO_STATE, 2, 0, RustboroCity_EventScript_14C620 - coord_event 29, 10, 3, 0, VAR_RUSTBORO_STATE, 2, 0, RustboroCity_EventScript_14C62C - coord_event 30, 11, 3, 0, VAR_RUSTBORO_STATE, 2, 0, RustboroCity_EventScript_14C638 - coord_event 30, 12, 3, 0, VAR_RUSTBORO_STATE, 2, 0, RustboroCity_EventScript_14C644 - coord_event 30, 9, 3, 0, VAR_RUSTBORO_STATE, 4, 0, RustboroCity_EventScript_14C74D - coord_event 31, 10, 3, 0, VAR_RUSTBORO_STATE, 4, 0, RustboroCity_EventScript_14C759 - coord_event 30, 11, 3, 0, VAR_RUSTBORO_STATE, 4, 0, RustboroCity_EventScript_14C765 - coord_event 30, 12, 3, 0, VAR_RUSTBORO_STATE, 4, 0, RustboroCity_EventScript_14C771 + coord_event 23, 20, 3, VAR_RUSTBORO_STATE, 1, RustboroCity_EventScript_14C481 + coord_event 23, 21, 3, VAR_RUSTBORO_STATE, 1, RustboroCity_EventScript_14C498 + coord_event 23, 22, 3, VAR_RUSTBORO_STATE, 1, RustboroCity_EventScript_14C4AF + coord_event 23, 23, 3, VAR_RUSTBORO_STATE, 1, RustboroCity_EventScript_14C4C6 + coord_event 23, 24, 3, VAR_RUSTBORO_STATE, 1, RustboroCity_EventScript_14C4DD + coord_event 30, 9, 3, VAR_RUSTBORO_STATE, 2, RustboroCity_EventScript_14C620 + coord_event 29, 10, 3, VAR_RUSTBORO_STATE, 2, RustboroCity_EventScript_14C62C + coord_event 30, 11, 3, VAR_RUSTBORO_STATE, 2, RustboroCity_EventScript_14C638 + coord_event 30, 12, 3, VAR_RUSTBORO_STATE, 2, RustboroCity_EventScript_14C644 + coord_event 30, 9, 3, VAR_RUSTBORO_STATE, 4, RustboroCity_EventScript_14C74D + coord_event 31, 10, 3, VAR_RUSTBORO_STATE, 4, RustboroCity_EventScript_14C759 + coord_event 30, 11, 3, VAR_RUSTBORO_STATE, 4, RustboroCity_EventScript_14C765 + coord_event 30, 12, 3, VAR_RUSTBORO_STATE, 4, RustboroCity_EventScript_14C771 RustboroCity_MapBGEvents:: @ 837FF94 bg_event 23, 19, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_EventScript_14C41C diff --git a/data/maps/RusturfTunnel/events.inc b/data/maps/RusturfTunnel/events.inc index 5af870e72..71aeb5943 100644 --- a/data/maps/RusturfTunnel/events.inc +++ b/data/maps/RusturfTunnel/events.inc @@ -16,11 +16,11 @@ RusturfTunnel_MapWarps:: @ 838BE1C warp_def 18, 20, 3, 2, MAP_ROUTE116 RusturfTunnel_MapCoordEvents:: @ 838BE34 - coord_event 23, 4, 3, 0, 0, 0, 0, RusturfTunnel_EventScript_15C999 - coord_event 9, 4, 3, 0, VAR_RUSTURF_TUNNEL_STATE, 2, 0, RusturfTunnel_EventScript_15C9AB - coord_event 9, 5, 3, 0, VAR_RUSTURF_TUNNEL_STATE, 2, 0, RusturfTunnel_EventScript_15C9AB - coord_event 25, 4, 3, 0, 0, 0, 0, RusturfTunnel_EventScript_15C99F - coord_event 25, 5, 3, 0, 0, 0, 0, RusturfTunnel_EventScript_15C9A5 + coord_event 23, 4, 3, 0, 0, RusturfTunnel_EventScript_15C999 + coord_event 9, 4, 3, VAR_RUSTURF_TUNNEL_STATE, 2, RusturfTunnel_EventScript_15C9AB + coord_event 9, 5, 3, VAR_RUSTURF_TUNNEL_STATE, 2, RusturfTunnel_EventScript_15C9AB + coord_event 25, 4, 3, 0, 0, RusturfTunnel_EventScript_15C99F + coord_event 25, 5, 3, 0, 0, RusturfTunnel_EventScript_15C9A5 RusturfTunnel_MapEvents:: @ 838BE84 map_events RusturfTunnel_EventObjects, RusturfTunnel_MapWarps, RusturfTunnel_MapCoordEvents, 0x0 diff --git a/data/maps/SeafloorCavern_Room9/events.inc b/data/maps/SeafloorCavern_Room9/events.inc index 2da610c24..b68acc7da 100644 --- a/data/maps/SeafloorCavern_Room9/events.inc +++ b/data/maps/SeafloorCavern_Room9/events.inc @@ -11,7 +11,7 @@ SeafloorCavern_Room9_MapWarps:: @ 838D6C8 warp_def 5, 4, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM8 SeafloorCavern_Room9_MapCoordEvents:: @ 838D6D0 - coord_event 17, 42, 3, 0, VAR_SEAFLOOR_CAVERN_STATE, 0, 0, SeafloorCavern_Room9_EventScript_15DAFA + coord_event 17, 42, 3, VAR_SEAFLOOR_CAVERN_STATE, 0, SeafloorCavern_Room9_EventScript_15DAFA SeafloorCavern_Room9_MapEvents:: @ 838D6E0 map_events SeafloorCavern_Room9_EventObjects, SeafloorCavern_Room9_MapWarps, SeafloorCavern_Room9_MapCoordEvents, 0x0 diff --git a/data/maps/SingleBattleColosseum/events.inc b/data/maps/SingleBattleColosseum/events.inc index e9857075c..6984485ea 100644 --- a/data/maps/SingleBattleColosseum/events.inc +++ b/data/maps/SingleBattleColosseum/events.inc @@ -6,8 +6,8 @@ SingleBattleColosseum_MapWarps:: @ 83912FC warp_def 7, 8, 3, 127, MAP_NONE SingleBattleColosseum_MapCoordEvents:: @ 839130C - coord_event 3, 5, 3, 0, VAR_TEMP_0, 0, 0, SingleBattleColosseum_EventScript_1A436F - coord_event 10, 5, 3, 0, VAR_TEMP_0, 0, 0, SingleBattleColosseum_EventScript_1A4379 + coord_event 3, 5, 3, VAR_TEMP_0, 0, SingleBattleColosseum_EventScript_1A436F + coord_event 10, 5, 3, VAR_TEMP_0, 0, SingleBattleColosseum_EventScript_1A4379 SingleBattleColosseum_MapEvents:: @ 839132C map_events SingleBattleColosseum_EventObjects, SingleBattleColosseum_MapWarps, SingleBattleColosseum_MapCoordEvents, 0x0 diff --git a/data/maps/SlateportCity_Harbor/events.inc b/data/maps/SlateportCity_Harbor/events.inc index 85da00123..1f5cb2936 100644 --- a/data/maps/SlateportCity_Harbor/events.inc +++ b/data/maps/SlateportCity_Harbor/events.inc @@ -15,10 +15,10 @@ SlateportCity_Harbor_MapWarps:: @ 8387FF0 warp_def 20, 15, 0, 9, MAP_SLATEPORT_CITY SlateportCity_Harbor_MapCoordEvents:: @ 8388010 - coord_event 8, 11, 3, 0, VAR_SLATEPORT_HARBOR_STATE, 1, 0, SlateportCity_Harbor_EventScript_155F9B - coord_event 8, 12, 3, 0, VAR_SLATEPORT_HARBOR_STATE, 1, 0, SlateportCity_Harbor_EventScript_155FA7 - coord_event 8, 13, 3, 0, VAR_SLATEPORT_HARBOR_STATE, 1, 0, SlateportCity_Harbor_EventScript_155FB3 - coord_event 8, 14, 3, 0, VAR_SLATEPORT_HARBOR_STATE, 1, 0, SlateportCity_Harbor_EventScript_155FBF + coord_event 8, 11, 3, VAR_SLATEPORT_HARBOR_STATE, 1, SlateportCity_Harbor_EventScript_155F9B + coord_event 8, 12, 3, VAR_SLATEPORT_HARBOR_STATE, 1, SlateportCity_Harbor_EventScript_155FA7 + coord_event 8, 13, 3, VAR_SLATEPORT_HARBOR_STATE, 1, SlateportCity_Harbor_EventScript_155FB3 + coord_event 8, 14, 3, VAR_SLATEPORT_HARBOR_STATE, 1, SlateportCity_Harbor_EventScript_155FBF SlateportCity_Harbor_MapEvents:: @ 8388050 map_events SlateportCity_Harbor_EventObjects, SlateportCity_Harbor_MapWarps, SlateportCity_Harbor_MapCoordEvents, 0x0 diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/events.inc b/data/maps/SlateportCity_OceanicMuseum_1F/events.inc index feb7bbdd8..2b65dc440 100644 --- a/data/maps/SlateportCity_OceanicMuseum_1F/events.inc +++ b/data/maps/SlateportCity_OceanicMuseum_1F/events.inc @@ -20,8 +20,8 @@ SlateportCity_OceanicMuseum_1F_MapWarps:: @ 8387C88 warp_def 6, 1, 0, 0, MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_2F SlateportCity_OceanicMuseum_1F_MapCoordEvents:: @ 8387CA0 - coord_event 9, 7, 3, 0, VAR_SLATEPORT_MUSEUM_1F_STATE, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155AE4 - coord_event 10, 7, 3, 0, VAR_SLATEPORT_MUSEUM_1F_STATE, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155AF5 + coord_event 9, 7, 3, VAR_SLATEPORT_MUSEUM_1F_STATE, 0, SlateportCity_OceanicMuseum_1F_EventScript_155AE4 + coord_event 10, 7, 3, VAR_SLATEPORT_MUSEUM_1F_STATE, 0, SlateportCity_OceanicMuseum_1F_EventScript_155AF5 SlateportCity_OceanicMuseum_1F_MapBGEvents:: @ 8387CC0 bg_event 2, 7, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_155BC5 diff --git a/data/maps/SootopolisCity/events.inc b/data/maps/SootopolisCity/events.inc index 7da75af04..4d3ae2462 100644 --- a/data/maps/SootopolisCity/events.inc +++ b/data/maps/SootopolisCity/events.inc @@ -26,7 +26,7 @@ SootopolisCity_MapWarps:: @ 8380710 warp_def 48, 25, 0, 0, MAP_SOOTOPOLIS_CITY_HOUSE8 SootopolisCity_MapCoordEvents:: @ 8380770 - coord_event 25, 6, 3, 0, VAR_SOOTOPOLIS_STATE, 1, 0, SootopolisCity_EventScript_14D308 + coord_event 25, 6, 3, VAR_SOOTOPOLIS_STATE, 1, SootopolisCity_EventScript_14D308 SootopolisCity_MapBGEvents:: @ 8380780 bg_event 32, 34, 0, BG_EVENT_PLAYER_FACING_ANY, SootopolisCity_EventScript_14D2ED diff --git a/data/maps/TradeCenter/events.inc b/data/maps/TradeCenter/events.inc index 121518f90..dbeb2c20b 100644 --- a/data/maps/TradeCenter/events.inc +++ b/data/maps/TradeCenter/events.inc @@ -6,8 +6,8 @@ TradeCenter_MapWarps:: @ 8391358 warp_def 6, 8, 3, 127, MAP_NONE TradeCenter_MapCoordEvents:: @ 8391368 - coord_event 4, 5, 3, 0, VAR_TEMP_0, 0, 0, TradeCenter_EventScript_1A43F0 - coord_event 7, 5, 3, 0, VAR_TEMP_0, 0, 0, TradeCenter_EventScript_1A43FA + coord_event 4, 5, 3, VAR_TEMP_0, 0, TradeCenter_EventScript_1A43F0 + coord_event 7, 5, 3, VAR_TEMP_0, 0, TradeCenter_EventScript_1A43FA TradeCenter_MapEvents:: @ 8391388 map_events TradeCenter_EventObjects, TradeCenter_MapWarps, TradeCenter_MapCoordEvents, 0x0 diff --git a/data/maps/VictoryRoad_1F/events.inc b/data/maps/VictoryRoad_1F/events.inc index 1b3fc3e1c..54bed846b 100644 --- a/data/maps/VictoryRoad_1F/events.inc +++ b/data/maps/VictoryRoad_1F/events.inc @@ -15,9 +15,9 @@ VictoryRoad_1F_MapWarps:: @ 838D98C warp_def 9, 14, 4, 4, MAP_VICTORY_ROAD_B1F VictoryRoad_1F_MapCoordEvents:: @ 838D9B4 - coord_event 34, 3, 3, 0, VAR_VICTORY_ROAD_1F_STATE, 0, 0, VictoryRoad_1F_EventScript_15DE97 - coord_event 34, 4, 3, 0, VAR_VICTORY_ROAD_1F_STATE, 0, 0, VictoryRoad_1F_EventScript_15DEAB - coord_event 34, 5, 3, 0, VAR_VICTORY_ROAD_1F_STATE, 0, 0, VictoryRoad_1F_EventScript_15DEBF + coord_event 34, 3, 3, VAR_VICTORY_ROAD_1F_STATE, 0, VictoryRoad_1F_EventScript_15DE97 + coord_event 34, 4, 3, VAR_VICTORY_ROAD_1F_STATE, 0, VictoryRoad_1F_EventScript_15DEAB + coord_event 34, 5, 3, VAR_VICTORY_ROAD_1F_STATE, 0, VictoryRoad_1F_EventScript_15DEBF VictoryRoad_1F_MapBGEvents:: @ 838D9E4 bg_hidden_item_event 30, 39, 4, ITEM_ULTRA_BALL, FLAG_HIDDEN_ITEM_51 diff --git a/include/macros/map.inc b/include/macros/map.inc index 5a4b550b0..f5f09dea9 100644 --- a/include/macros/map.inc +++ b/include/macros/map.inc @@ -34,16 +34,21 @@ inc _num_warps .endm - .macro coord_event x, y, byte1, byte2, word1, word2, word3, script + .macro coord_event x, y, elevation, trigger, index, script .2byte \x, \y - .byte \byte1, \byte2 - .2byte \word1, \word2, \word3 + .byte \elevation, 0 + .2byte \trigger, \index, 0 .4byte \script inc _num_traps .endm - .macro coord_weather_event x, y, height, weather - coord_event \x, \y, \height, 0, \weather, 0, 0, 0x0 + .macro coord_weather_event x, y, elevation, weather + .2byte \x, \y + .byte \elevation, 0 + .2byte \weather + .2byte 0, 0 + .4byte 0 + inc _num_traps .endm .macro bg_event x, y, elevation, kind, arg6, arg7, arg8 -- cgit v1.2.3 From 05c1d40e3d32674d56f925eb7e74b8a4131e0f2b Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Thu, 12 Jul 2018 21:42:18 -0500 Subject: Use region map section constants in map headers --- data/maps.s | 1 + data/maps/AbandonedShip_CaptainsOffice/header.inc | 2 +- data/maps/AbandonedShip_Corridors_1F/header.inc | 2 +- data/maps/AbandonedShip_Corridors_B1F/header.inc | 2 +- data/maps/AbandonedShip_Deck/header.inc | 2 +- .../AbandonedShip_HiddenFloorCorridors/header.inc | 2 +- .../maps/AbandonedShip_HiddenFloorRooms/header.inc | 2 +- data/maps/AbandonedShip_Room_B1F/header.inc | 2 +- data/maps/AbandonedShip_Rooms2_1F/header.inc | 2 +- data/maps/AbandonedShip_Rooms2_B1F/header.inc | 2 +- data/maps/AbandonedShip_Rooms_1F/header.inc | 2 +- data/maps/AbandonedShip_Rooms_B1F/header.inc | 2 +- data/maps/AbandonedShip_Underwater1/header.inc | 2 +- data/maps/AbandonedShip_Underwater2/header.inc | 2 +- data/maps/AncientTomb/header.inc | 2 +- data/maps/AquaHideout_1F/header.inc | 2 +- data/maps/AquaHideout_B1F/header.inc | 2 +- data/maps/AquaHideout_B2F/header.inc | 2 +- data/maps/BattleTower_BattleRoom/header.inc | 2 +- data/maps/BattleTower_Corridor/header.inc | 2 +- data/maps/BattleTower_Elevator/header.inc | 2 +- data/maps/BattleTower_Lobby/header.inc | 2 +- data/maps/BattleTower_Outside/header.inc | 2 +- data/maps/CaveOfOrigin_1F/header.inc | 2 +- data/maps/CaveOfOrigin_B1F/header.inc | 2 +- data/maps/CaveOfOrigin_B2F/header.inc | 2 +- data/maps/CaveOfOrigin_B3F/header.inc | 2 +- data/maps/CaveOfOrigin_B4F/header.inc | 2 +- data/maps/CaveOfOrigin_Entrance/header.inc | 2 +- data/maps/DesertRuins/header.inc | 2 +- data/maps/DewfordTown/header.inc | 2 +- data/maps/DewfordTown_Gym/header.inc | 2 +- data/maps/DewfordTown_Hall/header.inc | 2 +- data/maps/DewfordTown_House1/header.inc | 2 +- data/maps/DewfordTown_House2/header.inc | 2 +- data/maps/DewfordTown_PokemonCenter_1F/header.inc | 2 +- data/maps/DewfordTown_PokemonCenter_2F/header.inc | 2 +- data/maps/DoubleBattleColosseum/header.inc | 2 +- data/maps/EverGrandeCity/header.inc | 2 +- data/maps/EverGrandeCity_ChampionsRoom/header.inc | 2 +- data/maps/EverGrandeCity_Corridor1/header.inc | 2 +- data/maps/EverGrandeCity_Corridor2/header.inc | 2 +- data/maps/EverGrandeCity_Corridor3/header.inc | 2 +- data/maps/EverGrandeCity_Corridor4/header.inc | 2 +- data/maps/EverGrandeCity_Corridor5/header.inc | 2 +- data/maps/EverGrandeCity_DrakesRoom/header.inc | 2 +- data/maps/EverGrandeCity_GlaciasRoom/header.inc | 2 +- data/maps/EverGrandeCity_HallOfFame/header.inc | 2 +- data/maps/EverGrandeCity_PhoebesRoom/header.inc | 2 +- .../EverGrandeCity_PokemonCenter_1F/header.inc | 2 +- .../EverGrandeCity_PokemonCenter_2F/header.inc | 2 +- data/maps/EverGrandeCity_PokemonLeague/header.inc | 2 +- data/maps/EverGrandeCity_SidneysRoom/header.inc | 2 +- data/maps/FallarborTown/header.inc | 2 +- data/maps/FallarborTown_ContestHall/header.inc | 2 +- data/maps/FallarborTown_ContestLobby/header.inc | 2 +- data/maps/FallarborTown_House1/header.inc | 2 +- data/maps/FallarborTown_House2/header.inc | 2 +- data/maps/FallarborTown_Mart/header.inc | 2 +- .../maps/FallarborTown_PokemonCenter_1F/header.inc | 2 +- .../maps/FallarborTown_PokemonCenter_2F/header.inc | 2 +- data/maps/FieryPath/header.inc | 2 +- data/maps/FortreeCity/header.inc | 2 +- data/maps/FortreeCity_DecorationShop/header.inc | 2 +- data/maps/FortreeCity_Gym/header.inc | 2 +- data/maps/FortreeCity_House1/header.inc | 2 +- data/maps/FortreeCity_House2/header.inc | 2 +- data/maps/FortreeCity_House3/header.inc | 2 +- data/maps/FortreeCity_House4/header.inc | 2 +- data/maps/FortreeCity_House5/header.inc | 2 +- data/maps/FortreeCity_Mart/header.inc | 2 +- data/maps/FortreeCity_PokemonCenter_1F/header.inc | 2 +- data/maps/FortreeCity_PokemonCenter_2F/header.inc | 2 +- data/maps/GraniteCave_1F/header.inc | 2 +- data/maps/GraniteCave_B1F/header.inc | 2 +- data/maps/GraniteCave_B2F/header.inc | 2 +- data/maps/GraniteCave_StevensRoom/header.inc | 2 +- data/maps/InsideOfTruck/header.inc | 2 +- data/maps/IslandCave/header.inc | 2 +- data/maps/JaggedPass/header.inc | 2 +- data/maps/LavaridgeTown/header.inc | 2 +- data/maps/LavaridgeTown_Gym_1F/header.inc | 2 +- data/maps/LavaridgeTown_Gym_B1F/header.inc | 2 +- data/maps/LavaridgeTown_HerbShop/header.inc | 2 +- data/maps/LavaridgeTown_House/header.inc | 2 +- data/maps/LavaridgeTown_Mart/header.inc | 2 +- .../maps/LavaridgeTown_PokemonCenter_1F/header.inc | 2 +- .../maps/LavaridgeTown_PokemonCenter_2F/header.inc | 2 +- data/maps/LilycoveCity/header.inc | 2 +- data/maps/LilycoveCity_ContestHall/header.inc | 2 +- data/maps/LilycoveCity_ContestLobby/header.inc | 2 +- data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc | 2 +- data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc | 2 +- .../header.inc | 2 +- .../LilycoveCity_DepartmentStoreRooftop/header.inc | 2 +- .../LilycoveCity_DepartmentStore_1F/header.inc | 2 +- .../LilycoveCity_DepartmentStore_2F/header.inc | 2 +- .../LilycoveCity_DepartmentStore_3F/header.inc | 2 +- .../LilycoveCity_DepartmentStore_4F/header.inc | 2 +- .../LilycoveCity_DepartmentStore_5F/header.inc | 2 +- data/maps/LilycoveCity_EmptyMap/header.inc | 2 +- data/maps/LilycoveCity_Harbor/header.inc | 2 +- data/maps/LilycoveCity_House1/header.inc | 2 +- data/maps/LilycoveCity_House2/header.inc | 2 +- data/maps/LilycoveCity_House3/header.inc | 2 +- data/maps/LilycoveCity_House4/header.inc | 2 +- .../maps/LilycoveCity_LilycoveMuseum_1F/header.inc | 2 +- .../maps/LilycoveCity_LilycoveMuseum_2F/header.inc | 2 +- .../maps/LilycoveCity_MoveDeletersHouse/header.inc | 2 +- data/maps/LilycoveCity_PokemonCenter_1F/header.inc | 2 +- data/maps/LilycoveCity_PokemonCenter_2F/header.inc | 2 +- .../LilycoveCity_PokemonTrainerFanClub/header.inc | 2 +- data/maps/LilycoveCity_UnusedMart/header.inc | 2 +- data/maps/LinkContestRoom1/header.inc | 2 +- data/maps/LinkContestRoom2/header.inc | 2 +- data/maps/LinkContestRoom3/header.inc | 2 +- data/maps/LinkContestRoom4/header.inc | 2 +- data/maps/LinkContestRoom5/header.inc | 2 +- data/maps/LinkContestRoom6/header.inc | 2 +- data/maps/LittlerootTown/header.inc | 2 +- .../LittlerootTown_BrendansHouse_1F/header.inc | 2 +- .../LittlerootTown_BrendansHouse_2F/header.inc | 2 +- data/maps/LittlerootTown_MaysHouse_1F/header.inc | 2 +- data/maps/LittlerootTown_MaysHouse_2F/header.inc | 2 +- .../LittlerootTown_ProfessorBirchsLab/header.inc | 2 +- data/maps/MagmaHideout_1F/header.inc | 2 +- data/maps/MagmaHideout_B1F/header.inc | 2 +- data/maps/MagmaHideout_B2F/header.inc | 2 +- data/maps/MauvilleCity/header.inc | 2 +- data/maps/MauvilleCity_BikeShop/header.inc | 2 +- data/maps/MauvilleCity_GameCorner/header.inc | 2 +- data/maps/MauvilleCity_Gym/header.inc | 2 +- data/maps/MauvilleCity_House1/header.inc | 2 +- data/maps/MauvilleCity_House2/header.inc | 2 +- data/maps/MauvilleCity_Mart/header.inc | 2 +- data/maps/MauvilleCity_PokemonCenter_1F/header.inc | 2 +- data/maps/MauvilleCity_PokemonCenter_2F/header.inc | 2 +- data/maps/MeteorFalls_1F_1R/header.inc | 2 +- data/maps/MeteorFalls_1F_2R/header.inc | 2 +- data/maps/MeteorFalls_B1F_1R/header.inc | 2 +- data/maps/MeteorFalls_B1F_2R/header.inc | 2 +- data/maps/MossdeepCity/header.inc | 2 +- data/maps/MossdeepCity_GameCorner_1F/header.inc | 2 +- data/maps/MossdeepCity_GameCorner_B1F/header.inc | 2 +- data/maps/MossdeepCity_Gym/header.inc | 2 +- data/maps/MossdeepCity_House1/header.inc | 2 +- data/maps/MossdeepCity_House2/header.inc | 2 +- data/maps/MossdeepCity_House3/header.inc | 2 +- data/maps/MossdeepCity_House4/header.inc | 2 +- data/maps/MossdeepCity_Mart/header.inc | 2 +- data/maps/MossdeepCity_PokemonCenter_1F/header.inc | 2 +- data/maps/MossdeepCity_PokemonCenter_2F/header.inc | 2 +- data/maps/MossdeepCity_SpaceCenter_1F/header.inc | 2 +- data/maps/MossdeepCity_SpaceCenter_2F/header.inc | 2 +- data/maps/MossdeepCity_StevensHouse/header.inc | 2 +- data/maps/MtChimney/header.inc | 2 +- data/maps/MtChimney_CableCarStation/header.inc | 2 +- data/maps/MtPyre_1F/header.inc | 2 +- data/maps/MtPyre_2F/header.inc | 2 +- data/maps/MtPyre_3F/header.inc | 2 +- data/maps/MtPyre_4F/header.inc | 2 +- data/maps/MtPyre_5F/header.inc | 2 +- data/maps/MtPyre_6F/header.inc | 2 +- data/maps/MtPyre_Exterior/header.inc | 2 +- data/maps/MtPyre_Summit/header.inc | 2 +- data/maps/NewMauville_Entrance/header.inc | 2 +- data/maps/NewMauville_Inside/header.inc | 2 +- data/maps/OldaleTown/header.inc | 2 +- data/maps/OldaleTown_House1/header.inc | 2 +- data/maps/OldaleTown_House2/header.inc | 2 +- data/maps/OldaleTown_Mart/header.inc | 2 +- data/maps/OldaleTown_PokemonCenter_1F/header.inc | 2 +- data/maps/OldaleTown_PokemonCenter_2F/header.inc | 2 +- data/maps/PacifidlogTown/header.inc | 2 +- data/maps/PacifidlogTown_House1/header.inc | 2 +- data/maps/PacifidlogTown_House2/header.inc | 2 +- data/maps/PacifidlogTown_House3/header.inc | 2 +- data/maps/PacifidlogTown_House4/header.inc | 2 +- data/maps/PacifidlogTown_House5/header.inc | 2 +- .../PacifidlogTown_PokemonCenter_1F/header.inc | 2 +- .../PacifidlogTown_PokemonCenter_2F/header.inc | 2 +- data/maps/PetalburgCity/header.inc | 2 +- data/maps/PetalburgCity_Gym/header.inc | 2 +- data/maps/PetalburgCity_House1/header.inc | 2 +- data/maps/PetalburgCity_House2/header.inc | 2 +- data/maps/PetalburgCity_Mart/header.inc | 2 +- .../maps/PetalburgCity_PokemonCenter_1F/header.inc | 2 +- .../maps/PetalburgCity_PokemonCenter_2F/header.inc | 2 +- data/maps/PetalburgCity_WallysHouse/header.inc | 2 +- data/maps/PetalburgWoods/header.inc | 2 +- data/maps/RecordCorner/header.inc | 2 +- data/maps/Route101/header.inc | 2 +- data/maps/Route102/header.inc | 2 +- data/maps/Route103/header.inc | 2 +- data/maps/Route104/header.inc | 2 +- data/maps/Route104_MrBrineysHouse/header.inc | 2 +- .../maps/Route104_PrettyPetalFlowerShop/header.inc | 2 +- data/maps/Route104_Prototype/header.inc | 2 +- .../header.inc | 2 +- data/maps/Route105/header.inc | 2 +- data/maps/Route106/header.inc | 2 +- data/maps/Route107/header.inc | 2 +- data/maps/Route108/header.inc | 2 +- data/maps/Route109/header.inc | 2 +- data/maps/Route109_SeashoreHouse/header.inc | 2 +- data/maps/Route110/header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- data/maps/Route110_TrickHouseCorridor/header.inc | 2 +- data/maps/Route110_TrickHouseEnd/header.inc | 2 +- data/maps/Route110_TrickHouseEntrance/header.inc | 2 +- data/maps/Route110_TrickHousePuzzle1/header.inc | 2 +- data/maps/Route110_TrickHousePuzzle2/header.inc | 2 +- data/maps/Route110_TrickHousePuzzle3/header.inc | 2 +- data/maps/Route110_TrickHousePuzzle4/header.inc | 2 +- data/maps/Route110_TrickHousePuzzle5/header.inc | 2 +- data/maps/Route110_TrickHousePuzzle6/header.inc | 2 +- data/maps/Route110_TrickHousePuzzle7/header.inc | 2 +- data/maps/Route110_TrickHousePuzzle8/header.inc | 2 +- data/maps/Route111/header.inc | 2 +- data/maps/Route111_OldLadysRestStop/header.inc | 2 +- .../maps/Route111_WinstrateFamilysHouse/header.inc | 2 +- data/maps/Route112/header.inc | 2 +- data/maps/Route112_CableCarStation/header.inc | 2 +- data/maps/Route113/header.inc | 2 +- data/maps/Route113_GlassWorkshop/header.inc | 2 +- data/maps/Route114/header.inc | 2 +- data/maps/Route114_FossilManiacsHouse/header.inc | 2 +- data/maps/Route114_FossilManiacsTunnel/header.inc | 2 +- data/maps/Route114_LanettesHouse/header.inc | 2 +- data/maps/Route115/header.inc | 2 +- data/maps/Route116/header.inc | 2 +- data/maps/Route116_TunnelersRestHouse/header.inc | 2 +- data/maps/Route117/header.inc | 2 +- data/maps/Route117_PokemonDayCare/header.inc | 2 +- data/maps/Route118/header.inc | 2 +- data/maps/Route119/header.inc | 2 +- data/maps/Route119_House/header.inc | 2 +- data/maps/Route119_WeatherInstitute_1F/header.inc | 2 +- data/maps/Route119_WeatherInstitute_2F/header.inc | 2 +- data/maps/Route120/header.inc | 2 +- data/maps/Route121/header.inc | 2 +- data/maps/Route121_SafariZoneEntrance/header.inc | 2 +- data/maps/Route122/header.inc | 2 +- data/maps/Route123/header.inc | 2 +- data/maps/Route123_BerryMastersHouse/header.inc | 2 +- data/maps/Route124/header.inc | 2 +- .../Route124_DivingTreasureHuntersHouse/header.inc | 2 +- data/maps/Route125/header.inc | 2 +- data/maps/Route126/header.inc | 2 +- data/maps/Route127/header.inc | 2 +- data/maps/Route128/header.inc | 2 +- data/maps/Route129/header.inc | 2 +- data/maps/Route130/header.inc | 2 +- data/maps/Route131/header.inc | 2 +- data/maps/Route132/header.inc | 2 +- data/maps/Route133/header.inc | 2 +- data/maps/Route134/header.inc | 2 +- data/maps/RustboroCity/header.inc | 2 +- data/maps/RustboroCity_CuttersHouse/header.inc | 2 +- data/maps/RustboroCity_DevonCorp_1F/header.inc | 2 +- data/maps/RustboroCity_DevonCorp_2F/header.inc | 2 +- data/maps/RustboroCity_DevonCorp_3F/header.inc | 2 +- data/maps/RustboroCity_Flat1_1F/header.inc | 2 +- data/maps/RustboroCity_Flat1_2F/header.inc | 2 +- data/maps/RustboroCity_Flat2_1F/header.inc | 2 +- data/maps/RustboroCity_Flat2_2F/header.inc | 2 +- data/maps/RustboroCity_Flat2_3F/header.inc | 2 +- data/maps/RustboroCity_Gym/header.inc | 2 +- data/maps/RustboroCity_House1/header.inc | 2 +- data/maps/RustboroCity_House2/header.inc | 2 +- data/maps/RustboroCity_House3/header.inc | 2 +- data/maps/RustboroCity_Mart/header.inc | 2 +- data/maps/RustboroCity_PokemonCenter_1F/header.inc | 2 +- data/maps/RustboroCity_PokemonCenter_2F/header.inc | 2 +- data/maps/RustboroCity_PokemonSchool/header.inc | 2 +- data/maps/RusturfTunnel/header.inc | 2 +- data/maps/SSTidalCorridor/header.inc | 2 +- data/maps/SSTidalLowerDeck/header.inc | 2 +- data/maps/SSTidalRooms/header.inc | 2 +- data/maps/SafariZone_Northeast/header.inc | 2 +- data/maps/SafariZone_Northwest/header.inc | 2 +- data/maps/SafariZone_RestHouse/header.inc | 2 +- data/maps/SafariZone_Southeast/header.inc | 2 +- data/maps/SafariZone_Southwest/header.inc | 2 +- data/maps/ScorchedSlab/header.inc | 2 +- data/maps/SeafloorCavern_Entrance/header.inc | 2 +- data/maps/SeafloorCavern_Room1/header.inc | 2 +- data/maps/SeafloorCavern_Room2/header.inc | 2 +- data/maps/SeafloorCavern_Room3/header.inc | 2 +- data/maps/SeafloorCavern_Room4/header.inc | 2 +- data/maps/SeafloorCavern_Room5/header.inc | 2 +- data/maps/SeafloorCavern_Room6/header.inc | 2 +- data/maps/SeafloorCavern_Room7/header.inc | 2 +- data/maps/SeafloorCavern_Room8/header.inc | 2 +- data/maps/SeafloorCavern_Room9/header.inc | 2 +- data/maps/SealedChamber_InnerRoom/header.inc | 2 +- data/maps/SealedChamber_OuterRoom/header.inc | 2 +- data/maps/SecretBase_BlueCave1/header.inc | 2 +- data/maps/SecretBase_BlueCave2/header.inc | 2 +- data/maps/SecretBase_BlueCave3/header.inc | 2 +- data/maps/SecretBase_BlueCave4/header.inc | 2 +- data/maps/SecretBase_BrownCave1/header.inc | 2 +- data/maps/SecretBase_BrownCave2/header.inc | 2 +- data/maps/SecretBase_BrownCave3/header.inc | 2 +- data/maps/SecretBase_BrownCave4/header.inc | 2 +- data/maps/SecretBase_RedCave1/header.inc | 2 +- data/maps/SecretBase_RedCave2/header.inc | 2 +- data/maps/SecretBase_RedCave3/header.inc | 2 +- data/maps/SecretBase_RedCave4/header.inc | 2 +- data/maps/SecretBase_Shrub1/header.inc | 2 +- data/maps/SecretBase_Shrub2/header.inc | 2 +- data/maps/SecretBase_Shrub3/header.inc | 2 +- data/maps/SecretBase_Shrub4/header.inc | 2 +- data/maps/SecretBase_Tree1/header.inc | 2 +- data/maps/SecretBase_Tree2/header.inc | 2 +- data/maps/SecretBase_Tree3/header.inc | 2 +- data/maps/SecretBase_Tree4/header.inc | 2 +- data/maps/SecretBase_YellowCave1/header.inc | 2 +- data/maps/SecretBase_YellowCave2/header.inc | 2 +- data/maps/SecretBase_YellowCave3/header.inc | 2 +- data/maps/SecretBase_YellowCave4/header.inc | 2 +- .../maps/ShoalCave_HighTideEntranceRoom/header.inc | 2 +- data/maps/ShoalCave_HighTideInnerRoom/header.inc | 2 +- data/maps/ShoalCave_LowTideEntranceRoom/header.inc | 2 +- data/maps/ShoalCave_LowTideIceRoom/header.inc | 2 +- data/maps/ShoalCave_LowTideInnerRoom/header.inc | 2 +- data/maps/ShoalCave_LowTideLowerRoom/header.inc | 2 +- data/maps/ShoalCave_LowTideStairsRoom/header.inc | 2 +- data/maps/SingleBattleColosseum/header.inc | 2 +- data/maps/SkyPillar_1F/header.inc | 2 +- data/maps/SkyPillar_2F/header.inc | 2 +- data/maps/SkyPillar_3F/header.inc | 2 +- data/maps/SkyPillar_4F/header.inc | 2 +- data/maps/SkyPillar_5F/header.inc | 2 +- data/maps/SkyPillar_Entrance/header.inc | 2 +- data/maps/SkyPillar_Outside/header.inc | 2 +- data/maps/SkyPillar_Top/header.inc | 2 +- data/maps/SlateportCity/header.inc | 2 +- data/maps/SlateportCity_ContestHall/header.inc | 2 +- data/maps/SlateportCity_ContestLobby/header.inc | 2 +- data/maps/SlateportCity_Harbor/header.inc | 2 +- data/maps/SlateportCity_House1/header.inc | 2 +- data/maps/SlateportCity_House2/header.inc | 2 +- data/maps/SlateportCity_Mart/header.inc | 2 +- .../maps/SlateportCity_OceanicMuseum_1F/header.inc | 2 +- .../maps/SlateportCity_OceanicMuseum_2F/header.inc | 2 +- .../maps/SlateportCity_PokemonCenter_1F/header.inc | 2 +- .../maps/SlateportCity_PokemonCenter_2F/header.inc | 2 +- data/maps/SlateportCity_PokemonFanClub/header.inc | 2 +- .../SlateportCity_SternsShipyard_1F/header.inc | 2 +- .../SlateportCity_SternsShipyard_2F/header.inc | 2 +- data/maps/SootopolisCity/header.inc | 2 +- data/maps/SootopolisCity_Gym_1F/header.inc | 2 +- data/maps/SootopolisCity_Gym_B1F/header.inc | 2 +- data/maps/SootopolisCity_House1/header.inc | 2 +- data/maps/SootopolisCity_House2/header.inc | 2 +- data/maps/SootopolisCity_House3/header.inc | 2 +- data/maps/SootopolisCity_House4/header.inc | 2 +- data/maps/SootopolisCity_House5/header.inc | 2 +- data/maps/SootopolisCity_House6/header.inc | 2 +- data/maps/SootopolisCity_House7/header.inc | 2 +- data/maps/SootopolisCity_House8/header.inc | 2 +- data/maps/SootopolisCity_Mart/header.inc | 2 +- .../SootopolisCity_PokemonCenter_1F/header.inc | 2 +- .../SootopolisCity_PokemonCenter_2F/header.inc | 2 +- data/maps/SouthernIsland_Exterior/header.inc | 2 +- data/maps/SouthernIsland_Interior/header.inc | 2 +- data/maps/TradeCenter/header.inc | 2 +- data/maps/Underwater1/header.inc | 2 +- data/maps/Underwater2/header.inc | 2 +- data/maps/Underwater3/header.inc | 2 +- data/maps/Underwater4/header.inc | 2 +- data/maps/Underwater_Route134/header.inc | 2 +- data/maps/Underwater_SeafloorCavern/header.inc | 2 +- data/maps/Underwater_SealedChamber/header.inc | 2 +- data/maps/Underwater_SootopolisCity/header.inc | 2 +- data/maps/UnknownMap_25_29/header.inc | 2 +- data/maps/UnknownMap_25_30/header.inc | 2 +- data/maps/UnknownMap_25_31/header.inc | 2 +- data/maps/UnknownMap_25_32/header.inc | 2 +- data/maps/UnknownMap_25_33/header.inc | 2 +- data/maps/UnknownMap_25_34/header.inc | 2 +- data/maps/VerdanturfTown/header.inc | 2 +- data/maps/VerdanturfTown_ContestHall/header.inc | 2 +- data/maps/VerdanturfTown_ContestLobby/header.inc | 2 +- .../header.inc | 2 +- data/maps/VerdanturfTown_House/header.inc | 2 +- data/maps/VerdanturfTown_Mart/header.inc | 2 +- .../VerdanturfTown_PokemonCenter_1F/header.inc | 2 +- .../VerdanturfTown_PokemonCenter_2F/header.inc | 2 +- data/maps/VerdanturfTown_WandasHouse/header.inc | 2 +- data/maps/VictoryRoad_1F/header.inc | 2 +- data/maps/VictoryRoad_B1F/header.inc | 2 +- data/maps/VictoryRoad_B2F/header.inc | 2 +- include/constants/region_map_sections.h | 181 ++++++++++----------- 396 files changed, 484 insertions(+), 486 deletions(-) diff --git a/data/maps.s b/data/maps.s index f8be7f31f..b0cf69d9d 100644 --- a/data/maps.s +++ b/data/maps.s @@ -1,4 +1,5 @@ #include "constants/maps.h" +#include "constants/region_map_sections.h" #include "constants/songs.h" .include "include/macros.inc" .include "constants/constants.inc" diff --git a/data/maps/AbandonedShip_CaptainsOffice/header.inc b/data/maps/AbandonedShip_CaptainsOffice/header.inc index 67112ba78..d00ed43da 100644 --- a/data/maps/AbandonedShip_CaptainsOffice/header.inc +++ b/data/maps/AbandonedShip_CaptainsOffice/header.inc @@ -5,7 +5,7 @@ AbandonedShip_CaptainsOffice:: @ 8307454 .4byte 0x0 .2byte MUS_DAN02 .2byte 196 - .byte 61 + .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte 11 .byte 4 diff --git a/data/maps/AbandonedShip_Corridors_1F/header.inc b/data/maps/AbandonedShip_Corridors_1F/header.inc index c228ebc29..1f1c3ae27 100644 --- a/data/maps/AbandonedShip_Corridors_1F/header.inc +++ b/data/maps/AbandonedShip_Corridors_1F/header.inc @@ -5,7 +5,7 @@ AbandonedShip_Corridors_1F:: @ 8307374 .4byte 0x0 .2byte MUS_DAN02 .2byte 188 - .byte 61 + .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte 11 .byte 4 diff --git a/data/maps/AbandonedShip_Corridors_B1F/header.inc b/data/maps/AbandonedShip_Corridors_B1F/header.inc index bbca3eaba..91bb7808e 100644 --- a/data/maps/AbandonedShip_Corridors_B1F/header.inc +++ b/data/maps/AbandonedShip_Corridors_B1F/header.inc @@ -5,7 +5,7 @@ AbandonedShip_Corridors_B1F:: @ 83073AC .4byte 0x0 .2byte MUS_DAN02 .2byte 190 - .byte 61 + .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte 11 .byte 4 diff --git a/data/maps/AbandonedShip_Deck/header.inc b/data/maps/AbandonedShip_Deck/header.inc index 84b45db3a..86b21b7ff 100644 --- a/data/maps/AbandonedShip_Deck/header.inc +++ b/data/maps/AbandonedShip_Deck/header.inc @@ -5,7 +5,7 @@ AbandonedShip_Deck:: @ 8307358 .4byte 0x0 .2byte MUS_DAN02 .2byte 187 - .byte 61 + .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte 0 .byte 4 diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc b/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc index 99b22902b..ecf1ba891 100644 --- a/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc +++ b/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc @@ -5,7 +5,7 @@ AbandonedShip_HiddenFloorCorridors:: @ 830748C .4byte 0x0 .2byte MUS_DAN02 .2byte 290 - .byte 61 + .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte 11 .byte 4 diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/header.inc b/data/maps/AbandonedShip_HiddenFloorRooms/header.inc index 8f5d464a2..49e5519a1 100644 --- a/data/maps/AbandonedShip_HiddenFloorRooms/header.inc +++ b/data/maps/AbandonedShip_HiddenFloorRooms/header.inc @@ -5,7 +5,7 @@ AbandonedShip_HiddenFloorRooms:: @ 83074A8 .4byte 0x0 .2byte MUS_DAN02 .2byte 311 - .byte 61 + .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte 11 .byte 4 diff --git a/data/maps/AbandonedShip_Room_B1F/header.inc b/data/maps/AbandonedShip_Room_B1F/header.inc index 335c10f7a..f0d3167e9 100644 --- a/data/maps/AbandonedShip_Room_B1F/header.inc +++ b/data/maps/AbandonedShip_Room_B1F/header.inc @@ -5,7 +5,7 @@ AbandonedShip_Room_B1F:: @ 830741C .4byte 0x0 .2byte MUS_DAN02 .2byte 194 - .byte 61 + .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte 11 .byte 4 diff --git a/data/maps/AbandonedShip_Rooms2_1F/header.inc b/data/maps/AbandonedShip_Rooms2_1F/header.inc index bb6b7be08..e7b172bd5 100644 --- a/data/maps/AbandonedShip_Rooms2_1F/header.inc +++ b/data/maps/AbandonedShip_Rooms2_1F/header.inc @@ -5,7 +5,7 @@ AbandonedShip_Rooms2_1F:: @ 8307438 .4byte 0x0 .2byte MUS_DAN02 .2byte 195 - .byte 61 + .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte 11 .byte 4 diff --git a/data/maps/AbandonedShip_Rooms2_B1F/header.inc b/data/maps/AbandonedShip_Rooms2_B1F/header.inc index 538209d37..7150ed946 100644 --- a/data/maps/AbandonedShip_Rooms2_B1F/header.inc +++ b/data/maps/AbandonedShip_Rooms2_B1F/header.inc @@ -5,7 +5,7 @@ AbandonedShip_Rooms2_B1F:: @ 83073E4 .4byte 0x0 .2byte MUS_DAN02 .2byte 192 - .byte 61 + .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte 11 .byte 4 diff --git a/data/maps/AbandonedShip_Rooms_1F/header.inc b/data/maps/AbandonedShip_Rooms_1F/header.inc index 39866961f..6b44c3244 100644 --- a/data/maps/AbandonedShip_Rooms_1F/header.inc +++ b/data/maps/AbandonedShip_Rooms_1F/header.inc @@ -5,7 +5,7 @@ AbandonedShip_Rooms_1F:: @ 8307390 .4byte 0x0 .2byte MUS_DAN02 .2byte 189 - .byte 61 + .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte 11 .byte 4 diff --git a/data/maps/AbandonedShip_Rooms_B1F/header.inc b/data/maps/AbandonedShip_Rooms_B1F/header.inc index ac27a4798..e633cb467 100644 --- a/data/maps/AbandonedShip_Rooms_B1F/header.inc +++ b/data/maps/AbandonedShip_Rooms_B1F/header.inc @@ -5,7 +5,7 @@ AbandonedShip_Rooms_B1F:: @ 83073C8 .4byte 0x0 .2byte MUS_DAN02 .2byte 191 - .byte 61 + .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte 11 .byte 4 diff --git a/data/maps/AbandonedShip_Underwater1/header.inc b/data/maps/AbandonedShip_Underwater1/header.inc index bf4004eb2..d948fcc74 100644 --- a/data/maps/AbandonedShip_Underwater1/header.inc +++ b/data/maps/AbandonedShip_Underwater1/header.inc @@ -5,7 +5,7 @@ AbandonedShip_Underwater1:: @ 8307400 .4byte 0x0 .2byte MUS_DEEPDEEP .2byte 193 - .byte 61 + .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte 14 .byte 5 diff --git a/data/maps/AbandonedShip_Underwater2/header.inc b/data/maps/AbandonedShip_Underwater2/header.inc index ad7380354..45d3c6008 100644 --- a/data/maps/AbandonedShip_Underwater2/header.inc +++ b/data/maps/AbandonedShip_Underwater2/header.inc @@ -5,7 +5,7 @@ AbandonedShip_Underwater2:: @ 8307470 .4byte 0x0 .2byte MUS_DEEPDEEP .2byte 197 - .byte 61 + .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte 14 .byte 5 diff --git a/data/maps/AncientTomb/header.inc b/data/maps/AncientTomb/header.inc index f559acdd4..f5354ca7e 100644 --- a/data/maps/AncientTomb/header.inc +++ b/data/maps/AncientTomb/header.inc @@ -5,7 +5,7 @@ AncientTomb:: @ 83074E0 .4byte 0x0 .2byte MUS_MABOROSI .2byte 282 - .byte 83 + .byte MAPSEC_ANCIENT_TOMB .byte 0 .byte 0 .byte 4 diff --git a/data/maps/AquaHideout_1F/header.inc b/data/maps/AquaHideout_1F/header.inc index 7fc84658d..f3527ccfd 100644 --- a/data/maps/AquaHideout_1F/header.inc +++ b/data/maps/AquaHideout_1F/header.inc @@ -5,7 +5,7 @@ AquaHideout_1F:: @ 8306FF4 .4byte 0x0 .2byte MUS_AJITO .2byte 144 - .byte 66 + .byte MAPSEC_EVIL_TEAM_HIDEOUT .byte 0 .byte 0 .byte 8 diff --git a/data/maps/AquaHideout_B1F/header.inc b/data/maps/AquaHideout_B1F/header.inc index 94abd0406..82244295e 100644 --- a/data/maps/AquaHideout_B1F/header.inc +++ b/data/maps/AquaHideout_B1F/header.inc @@ -5,7 +5,7 @@ AquaHideout_B1F:: @ 8307010 .4byte 0x0 .2byte MUS_AJITO .2byte 145 - .byte 66 + .byte MAPSEC_EVIL_TEAM_HIDEOUT .byte 0 .byte 0 .byte 8 diff --git a/data/maps/AquaHideout_B2F/header.inc b/data/maps/AquaHideout_B2F/header.inc index c700ac8dd..f72dc8bd3 100644 --- a/data/maps/AquaHideout_B2F/header.inc +++ b/data/maps/AquaHideout_B2F/header.inc @@ -5,7 +5,7 @@ AquaHideout_B2F:: @ 830702C .4byte 0x0 .2byte MUS_AJITO .2byte 146 - .byte 66 + .byte MAPSEC_EVIL_TEAM_HIDEOUT .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleTower_BattleRoom/header.inc b/data/maps/BattleTower_BattleRoom/header.inc index 9712d2535..6e7a51ca5 100644 --- a/data/maps/BattleTower_BattleRoom/header.inc +++ b/data/maps/BattleTower_BattleRoom/header.inc @@ -5,7 +5,7 @@ BattleTower_BattleRoom:: @ 8307C88 .4byte 0x0 .2byte MUS_B_TOWER .2byte 269 - .byte 58 + .byte MAPSEC_BATTLE_TOWER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleTower_Corridor/header.inc b/data/maps/BattleTower_Corridor/header.inc index 33ab24b7c..f0eff7fc3 100644 --- a/data/maps/BattleTower_Corridor/header.inc +++ b/data/maps/BattleTower_Corridor/header.inc @@ -5,7 +5,7 @@ BattleTower_Corridor:: @ 8307C6C .4byte 0x0 .2byte MUS_B_TOWER .2byte 268 - .byte 58 + .byte MAPSEC_BATTLE_TOWER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleTower_Elevator/header.inc b/data/maps/BattleTower_Elevator/header.inc index 0718e7924..c1e15c213 100644 --- a/data/maps/BattleTower_Elevator/header.inc +++ b/data/maps/BattleTower_Elevator/header.inc @@ -5,7 +5,7 @@ BattleTower_Elevator:: @ 8307C50 .4byte 0x0 .2byte MUS_B_TOWER .2byte 267 - .byte 58 + .byte MAPSEC_BATTLE_TOWER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleTower_Lobby/header.inc b/data/maps/BattleTower_Lobby/header.inc index ae2eaaa14..eeee38922 100644 --- a/data/maps/BattleTower_Lobby/header.inc +++ b/data/maps/BattleTower_Lobby/header.inc @@ -5,7 +5,7 @@ BattleTower_Lobby:: @ 8307C34 .4byte 0x0 .2byte MUS_B_TOWER .2byte 265 - .byte 58 + .byte MAPSEC_BATTLE_TOWER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleTower_Outside/header.inc b/data/maps/BattleTower_Outside/header.inc index 28035f749..5af2c97cb 100644 --- a/data/maps/BattleTower_Outside/header.inc +++ b/data/maps/BattleTower_Outside/header.inc @@ -5,7 +5,7 @@ BattleTower_Outside:: @ 8307C18 .4byte 0x0 .2byte MUS_B_TOWER .2byte 266 - .byte 58 + .byte MAPSEC_BATTLE_TOWER .byte 0 .byte 0 .byte 3 diff --git a/data/maps/CaveOfOrigin_1F/header.inc b/data/maps/CaveOfOrigin_1F/header.inc index 1797ed327..d17d56acc 100644 --- a/data/maps/CaveOfOrigin_1F/header.inc +++ b/data/maps/CaveOfOrigin_1F/header.inc @@ -5,7 +5,7 @@ CaveOfOrigin_1F:: @ 8307198 .4byte 0x0 .2byte MUS_DAN03 .2byte 159 - .byte 72 + .byte MAPSEC_CAVE_OF_ORIGIN .byte 1 .byte 0 .byte 4 diff --git a/data/maps/CaveOfOrigin_B1F/header.inc b/data/maps/CaveOfOrigin_B1F/header.inc index d9b38b628..18e24047a 100644 --- a/data/maps/CaveOfOrigin_B1F/header.inc +++ b/data/maps/CaveOfOrigin_B1F/header.inc @@ -5,7 +5,7 @@ CaveOfOrigin_B1F:: @ 83071B4 .4byte 0x0 .2byte MUS_DAN03 .2byte 160 - .byte 72 + .byte MAPSEC_CAVE_OF_ORIGIN .byte 1 .byte 0 .byte 4 diff --git a/data/maps/CaveOfOrigin_B2F/header.inc b/data/maps/CaveOfOrigin_B2F/header.inc index 1b3bf2902..e9c6d472a 100644 --- a/data/maps/CaveOfOrigin_B2F/header.inc +++ b/data/maps/CaveOfOrigin_B2F/header.inc @@ -5,7 +5,7 @@ CaveOfOrigin_B2F:: @ 83071D0 .4byte 0x0 .2byte MUS_DAN03 .2byte 161 - .byte 72 + .byte MAPSEC_CAVE_OF_ORIGIN .byte 1 .byte 6 .byte 4 diff --git a/data/maps/CaveOfOrigin_B3F/header.inc b/data/maps/CaveOfOrigin_B3F/header.inc index cc196d0c8..80529906d 100644 --- a/data/maps/CaveOfOrigin_B3F/header.inc +++ b/data/maps/CaveOfOrigin_B3F/header.inc @@ -5,7 +5,7 @@ CaveOfOrigin_B3F:: @ 83071EC .4byte 0x0 .2byte MUS_DAN03 .2byte 162 - .byte 72 + .byte MAPSEC_CAVE_OF_ORIGIN .byte 1 .byte 6 .byte 4 diff --git a/data/maps/CaveOfOrigin_B4F/header.inc b/data/maps/CaveOfOrigin_B4F/header.inc index 97a58ddd6..af47ad097 100644 --- a/data/maps/CaveOfOrigin_B4F/header.inc +++ b/data/maps/CaveOfOrigin_B4F/header.inc @@ -5,7 +5,7 @@ CaveOfOrigin_B4F:: @ 8307208 .4byte 0x0 .2byte SE_STOP .2byte 163 - .byte 72 + .byte MAPSEC_CAVE_OF_ORIGIN .byte 0 .byte 6 .byte 4 diff --git a/data/maps/CaveOfOrigin_Entrance/header.inc b/data/maps/CaveOfOrigin_Entrance/header.inc index 70ad445c4..bd63d13d8 100644 --- a/data/maps/CaveOfOrigin_Entrance/header.inc +++ b/data/maps/CaveOfOrigin_Entrance/header.inc @@ -5,7 +5,7 @@ CaveOfOrigin_Entrance:: @ 830717C .4byte 0x0 .2byte MUS_DAN03 .2byte 158 - .byte 72 + .byte MAPSEC_CAVE_OF_ORIGIN .byte 0 .byte 0 .byte 4 diff --git a/data/maps/DesertRuins/header.inc b/data/maps/DesertRuins/header.inc index 4a9ceab39..5181cd77d 100644 --- a/data/maps/DesertRuins/header.inc +++ b/data/maps/DesertRuins/header.inc @@ -5,7 +5,7 @@ DesertRuins:: @ 8306E18 .4byte 0x0 .2byte MUS_MABOROSI .2byte 132 - .byte 82 + .byte MAPSEC_DESERT_RUINS .byte 0 .byte 0 .byte 4 diff --git a/data/maps/DewfordTown/header.inc b/data/maps/DewfordTown/header.inc index 0bd56d96d..02aeb91dc 100644 --- a/data/maps/DewfordTown/header.inc +++ b/data/maps/DewfordTown/header.inc @@ -5,7 +5,7 @@ DewfordTown:: @ 830557C .4byte DewfordTown_MapConnections .2byte MUS_HIGHTOWN .2byte 12 - .byte 2 + .byte MAPSEC_DEWFORD_TOWN .byte 0 .byte 2 .byte 1 diff --git a/data/maps/DewfordTown_Gym/header.inc b/data/maps/DewfordTown_Gym/header.inc index c5c9540e5..2a7cb88dd 100644 --- a/data/maps/DewfordTown_Gym/header.inc +++ b/data/maps/DewfordTown_Gym/header.inc @@ -5,7 +5,7 @@ DewfordTown_Gym:: @ 8305B9C .4byte 0x0 .2byte MUS_GIM .2byte 65 - .byte 2 + .byte MAPSEC_DEWFORD_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/DewfordTown_Hall/header.inc b/data/maps/DewfordTown_Hall/header.inc index 38b662f4d..9bcbe90f3 100644 --- a/data/maps/DewfordTown_Hall/header.inc +++ b/data/maps/DewfordTown_Hall/header.inc @@ -5,7 +5,7 @@ DewfordTown_Hall:: @ 8305BB8 .4byte 0x0 .2byte MUS_HIGHTOWN .2byte 66 - .byte 2 + .byte MAPSEC_DEWFORD_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/DewfordTown_House1/header.inc b/data/maps/DewfordTown_House1/header.inc index 9f56cdf5d..1414d620e 100644 --- a/data/maps/DewfordTown_House1/header.inc +++ b/data/maps/DewfordTown_House1/header.inc @@ -5,7 +5,7 @@ DewfordTown_House1:: @ 8305B48 .4byte 0x0 .2byte MUS_HIGHTOWN .2byte 64 - .byte 2 + .byte MAPSEC_DEWFORD_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/DewfordTown_House2/header.inc b/data/maps/DewfordTown_House2/header.inc index 35fd959eb..1e2736ebe 100644 --- a/data/maps/DewfordTown_House2/header.inc +++ b/data/maps/DewfordTown_House2/header.inc @@ -5,7 +5,7 @@ DewfordTown_House2:: @ 8305BD4 .4byte 0x0 .2byte MUS_HIGHTOWN .2byte 67 - .byte 2 + .byte MAPSEC_DEWFORD_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/DewfordTown_PokemonCenter_1F/header.inc b/data/maps/DewfordTown_PokemonCenter_1F/header.inc index b7630e6c3..6cb407275 100644 --- a/data/maps/DewfordTown_PokemonCenter_1F/header.inc +++ b/data/maps/DewfordTown_PokemonCenter_1F/header.inc @@ -5,7 +5,7 @@ DewfordTown_PokemonCenter_1F:: @ 8305B64 .4byte 0x0 .2byte MUS_POKECEN .2byte 61 - .byte 2 + .byte MAPSEC_DEWFORD_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/DewfordTown_PokemonCenter_2F/header.inc b/data/maps/DewfordTown_PokemonCenter_2F/header.inc index 5d0babd91..07a4f63f1 100644 --- a/data/maps/DewfordTown_PokemonCenter_2F/header.inc +++ b/data/maps/DewfordTown_PokemonCenter_2F/header.inc @@ -5,7 +5,7 @@ DewfordTown_PokemonCenter_2F:: @ 8305B80 .4byte 0x0 .2byte MUS_POKECEN .2byte 62 - .byte 2 + .byte MAPSEC_DEWFORD_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/DoubleBattleColosseum/header.inc b/data/maps/DoubleBattleColosseum/header.inc index bf41ae872..91750d7f7 100644 --- a/data/maps/DoubleBattleColosseum/header.inc +++ b/data/maps/DoubleBattleColosseum/header.inc @@ -5,7 +5,7 @@ DoubleBattleColosseum:: @ 83079CC .4byte 0x0 .2byte MUS_RAINBOW .2byte 225 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/EverGrandeCity/header.inc b/data/maps/EverGrandeCity/header.inc index 89386b78c..d391a9409 100644 --- a/data/maps/EverGrandeCity/header.inc +++ b/data/maps/EverGrandeCity/header.inc @@ -5,7 +5,7 @@ EverGrandeCity:: @ 8305528 .4byte EverGrandeCity_MapConnections .2byte MUS_RAINBOW .2byte 9 - .byte 15 + .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte 2 .byte 2 diff --git a/data/maps/EverGrandeCity_ChampionsRoom/header.inc b/data/maps/EverGrandeCity_ChampionsRoom/header.inc index 85afeb078..43e8c9443 100644 --- a/data/maps/EverGrandeCity_ChampionsRoom/header.inc +++ b/data/maps/EverGrandeCity_ChampionsRoom/header.inc @@ -5,7 +5,7 @@ EverGrandeCity_ChampionsRoom:: @ 8306B08 .4byte 0x0 .2byte MUS_C_ROAD .2byte 116 - .byte 15 + .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/EverGrandeCity_Corridor1/header.inc b/data/maps/EverGrandeCity_Corridor1/header.inc index c15955ae1..ffb682ee5 100644 --- a/data/maps/EverGrandeCity_Corridor1/header.inc +++ b/data/maps/EverGrandeCity_Corridor1/header.inc @@ -5,7 +5,7 @@ EverGrandeCity_Corridor1:: @ 8306B24 .4byte 0x0 .2byte MUS_C_ROAD .2byte 117 - .byte 15 + .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/EverGrandeCity_Corridor2/header.inc b/data/maps/EverGrandeCity_Corridor2/header.inc index 774dd8bf9..1240cf7e6 100644 --- a/data/maps/EverGrandeCity_Corridor2/header.inc +++ b/data/maps/EverGrandeCity_Corridor2/header.inc @@ -5,7 +5,7 @@ EverGrandeCity_Corridor2:: @ 8306B40 .4byte 0x0 .2byte MUS_C_ROAD .2byte 117 - .byte 15 + .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/EverGrandeCity_Corridor3/header.inc b/data/maps/EverGrandeCity_Corridor3/header.inc index 2799a2256..34047aab0 100644 --- a/data/maps/EverGrandeCity_Corridor3/header.inc +++ b/data/maps/EverGrandeCity_Corridor3/header.inc @@ -5,7 +5,7 @@ EverGrandeCity_Corridor3:: @ 8306B5C .4byte 0x0 .2byte MUS_C_ROAD .2byte 117 - .byte 15 + .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/EverGrandeCity_Corridor4/header.inc b/data/maps/EverGrandeCity_Corridor4/header.inc index 254553ab4..27ae6772c 100644 --- a/data/maps/EverGrandeCity_Corridor4/header.inc +++ b/data/maps/EverGrandeCity_Corridor4/header.inc @@ -5,7 +5,7 @@ EverGrandeCity_Corridor4:: @ 8306B78 .4byte 0x0 .2byte MUS_C_ROAD .2byte 316 - .byte 15 + .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/EverGrandeCity_Corridor5/header.inc b/data/maps/EverGrandeCity_Corridor5/header.inc index 176d27e1e..6efeed94c 100644 --- a/data/maps/EverGrandeCity_Corridor5/header.inc +++ b/data/maps/EverGrandeCity_Corridor5/header.inc @@ -5,7 +5,7 @@ EverGrandeCity_Corridor5:: @ 8306B94 .4byte 0x0 .2byte MUS_C_ROAD .2byte 117 - .byte 15 + .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/EverGrandeCity_DrakesRoom/header.inc b/data/maps/EverGrandeCity_DrakesRoom/header.inc index 4f5cb96b6..6fa06eb1c 100644 --- a/data/maps/EverGrandeCity_DrakesRoom/header.inc +++ b/data/maps/EverGrandeCity_DrakesRoom/header.inc @@ -5,7 +5,7 @@ EverGrandeCity_DrakesRoom:: @ 8306AEC .4byte 0x0 .2byte MUS_C_ROAD .2byte 115 - .byte 15 + .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/EverGrandeCity_GlaciasRoom/header.inc b/data/maps/EverGrandeCity_GlaciasRoom/header.inc index f0ba099ac..37dcc4de4 100644 --- a/data/maps/EverGrandeCity_GlaciasRoom/header.inc +++ b/data/maps/EverGrandeCity_GlaciasRoom/header.inc @@ -5,7 +5,7 @@ EverGrandeCity_GlaciasRoom:: @ 8306AD0 .4byte 0x0 .2byte MUS_C_ROAD .2byte 114 - .byte 15 + .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/EverGrandeCity_HallOfFame/header.inc b/data/maps/EverGrandeCity_HallOfFame/header.inc index 3a8c1a263..ada0e84d3 100644 --- a/data/maps/EverGrandeCity_HallOfFame/header.inc +++ b/data/maps/EverGrandeCity_HallOfFame/header.inc @@ -5,7 +5,7 @@ EverGrandeCity_HallOfFame:: @ 8306BCC .4byte 0x0 .2byte MUS_EIKOU_R .2byte 299 - .byte 15 + .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/EverGrandeCity_PhoebesRoom/header.inc b/data/maps/EverGrandeCity_PhoebesRoom/header.inc index 8d34dd0ba..4a1f9ee07 100644 --- a/data/maps/EverGrandeCity_PhoebesRoom/header.inc +++ b/data/maps/EverGrandeCity_PhoebesRoom/header.inc @@ -5,7 +5,7 @@ EverGrandeCity_PhoebesRoom:: @ 8306AB4 .4byte 0x0 .2byte MUS_C_ROAD .2byte 113 - .byte 15 + .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc index 489b5bd52..9394714a3 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc +++ b/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc @@ -5,7 +5,7 @@ EverGrandeCity_PokemonCenter_1F:: @ 8306BE8 .4byte 0x0 .2byte MUS_POKECEN .2byte 61 - .byte 15 + .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc b/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc index 35167d6c1..86d5a5894 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc +++ b/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc @@ -5,7 +5,7 @@ EverGrandeCity_PokemonCenter_2F:: @ 8306C04 .4byte 0x0 .2byte MUS_POKECEN .2byte 62 - .byte 15 + .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/EverGrandeCity_PokemonLeague/header.inc b/data/maps/EverGrandeCity_PokemonLeague/header.inc index 56bb00438..519a20fab 100644 --- a/data/maps/EverGrandeCity_PokemonLeague/header.inc +++ b/data/maps/EverGrandeCity_PokemonLeague/header.inc @@ -5,7 +5,7 @@ EverGrandeCity_PokemonLeague:: @ 8306BB0 .4byte 0x0 .2byte MUS_POKECEN .2byte 271 - .byte 15 + .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/EverGrandeCity_SidneysRoom/header.inc b/data/maps/EverGrandeCity_SidneysRoom/header.inc index 41ea61fd8..5f0684ea4 100644 --- a/data/maps/EverGrandeCity_SidneysRoom/header.inc +++ b/data/maps/EverGrandeCity_SidneysRoom/header.inc @@ -5,7 +5,7 @@ EverGrandeCity_SidneysRoom:: @ 8306A98 .4byte 0x0 .2byte MUS_C_ROAD .2byte 112 - .byte 15 + .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/FallarborTown/header.inc b/data/maps/FallarborTown/header.inc index e6e0041b6..892e58628 100644 --- a/data/maps/FallarborTown/header.inc +++ b/data/maps/FallarborTown/header.inc @@ -5,7 +5,7 @@ FallarborTown:: @ 83055B4 .4byte FallarborTown_MapConnections .2byte MUS_TONEKUSA .2byte 14 - .byte 4 + .byte MAPSEC_FALLARBOR_TOWN .byte 0 .byte 2 .byte 1 diff --git a/data/maps/FallarborTown_ContestHall/header.inc b/data/maps/FallarborTown_ContestHall/header.inc index 38f414c10..8f69223a5 100644 --- a/data/maps/FallarborTown_ContestHall/header.inc +++ b/data/maps/FallarborTown_ContestHall/header.inc @@ -5,7 +5,7 @@ FallarborTown_ContestHall:: @ 8305CEC .4byte 0x0 .2byte MUS_CONLOBBY .2byte 73 - .byte 4 + .byte MAPSEC_FALLARBOR_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/FallarborTown_ContestLobby/header.inc b/data/maps/FallarborTown_ContestLobby/header.inc index 2b8d9a18b..f9031d69d 100644 --- a/data/maps/FallarborTown_ContestLobby/header.inc +++ b/data/maps/FallarborTown_ContestLobby/header.inc @@ -5,7 +5,7 @@ FallarborTown_ContestLobby:: @ 8305CD0 .4byte 0x0 .2byte MUS_CONLOBBY .2byte 72 - .byte 4 + .byte MAPSEC_FALLARBOR_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/FallarborTown_House1/header.inc b/data/maps/FallarborTown_House1/header.inc index e6eacc77c..21acaf42b 100644 --- a/data/maps/FallarborTown_House1/header.inc +++ b/data/maps/FallarborTown_House1/header.inc @@ -5,7 +5,7 @@ FallarborTown_House1:: @ 8305D40 .4byte 0x0 .2byte MUS_TONEKUSA .2byte 59 - .byte 4 + .byte MAPSEC_FALLARBOR_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/FallarborTown_House2/header.inc b/data/maps/FallarborTown_House2/header.inc index 246bc12db..ef8fb0f2e 100644 --- a/data/maps/FallarborTown_House2/header.inc +++ b/data/maps/FallarborTown_House2/header.inc @@ -5,7 +5,7 @@ FallarborTown_House2:: @ 8305D5C .4byte 0x0 .2byte MUS_TONEKUSA .2byte 60 - .byte 4 + .byte MAPSEC_FALLARBOR_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/FallarborTown_Mart/header.inc b/data/maps/FallarborTown_Mart/header.inc index de16583f4..e6e8d837f 100644 --- a/data/maps/FallarborTown_Mart/header.inc +++ b/data/maps/FallarborTown_Mart/header.inc @@ -5,7 +5,7 @@ FallarborTown_Mart:: @ 8305CB4 .4byte 0x0 .2byte MUS_FRIENDLY .2byte 63 - .byte 4 + .byte MAPSEC_FALLARBOR_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/FallarborTown_PokemonCenter_1F/header.inc b/data/maps/FallarborTown_PokemonCenter_1F/header.inc index e51dea9cc..cab60710f 100644 --- a/data/maps/FallarborTown_PokemonCenter_1F/header.inc +++ b/data/maps/FallarborTown_PokemonCenter_1F/header.inc @@ -5,7 +5,7 @@ FallarborTown_PokemonCenter_1F:: @ 8305D08 .4byte 0x0 .2byte MUS_POKECEN .2byte 61 - .byte 4 + .byte MAPSEC_FALLARBOR_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/FallarborTown_PokemonCenter_2F/header.inc b/data/maps/FallarborTown_PokemonCenter_2F/header.inc index 91613d680..f093c8feb 100644 --- a/data/maps/FallarborTown_PokemonCenter_2F/header.inc +++ b/data/maps/FallarborTown_PokemonCenter_2F/header.inc @@ -5,7 +5,7 @@ FallarborTown_PokemonCenter_2F:: @ 8305D24 .4byte 0x0 .2byte MUS_POKECEN .2byte 62 - .byte 4 + .byte MAPSEC_FALLARBOR_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/FieryPath/header.inc b/data/maps/FieryPath/header.inc index dcc4d55ea..512f5af55 100644 --- a/data/maps/FieryPath/header.inc +++ b/data/maps/FieryPath/header.inc @@ -5,7 +5,7 @@ FieryPath:: @ 8306EF8 .4byte 0x0 .2byte MUS_DAN01 .2byte 294 - .byte 74 + .byte MAPSEC_FIERY_PATH .byte 0 .byte 0 .byte 4 diff --git a/data/maps/FortreeCity/header.inc b/data/maps/FortreeCity/header.inc index eb04f8bcb..23dc10dd6 100644 --- a/data/maps/FortreeCity/header.inc +++ b/data/maps/FortreeCity/header.inc @@ -5,7 +5,7 @@ FortreeCity:: @ 83054B8 .4byte FortreeCity_MapConnections .2byte MUS_MACHI_S3 .2byte 5 - .byte 11 + .byte MAPSEC_FORTREE_CITY .byte 0 .byte 2 .byte 2 diff --git a/data/maps/FortreeCity_DecorationShop/header.inc b/data/maps/FortreeCity_DecorationShop/header.inc index 78b54e060..7c61563ae 100644 --- a/data/maps/FortreeCity_DecorationShop/header.inc +++ b/data/maps/FortreeCity_DecorationShop/header.inc @@ -5,7 +5,7 @@ FortreeCity_DecorationShop:: @ 8306504 .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 256 - .byte 11 + .byte MAPSEC_FORTREE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/FortreeCity_Gym/header.inc b/data/maps/FortreeCity_Gym/header.inc index 9ecaef8b4..adb4179c8 100644 --- a/data/maps/FortreeCity_Gym/header.inc +++ b/data/maps/FortreeCity_Gym/header.inc @@ -5,7 +5,7 @@ FortreeCity_Gym:: @ 8306424 .4byte 0x0 .2byte MUS_GIM .2byte 100 - .byte 11 + .byte MAPSEC_FORTREE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/FortreeCity_House1/header.inc b/data/maps/FortreeCity_House1/header.inc index 79d0466d7..3349b857b 100644 --- a/data/maps/FortreeCity_House1/header.inc +++ b/data/maps/FortreeCity_House1/header.inc @@ -5,7 +5,7 @@ FortreeCity_House1:: @ 8306408 .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 99 - .byte 11 + .byte MAPSEC_FORTREE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/FortreeCity_House2/header.inc b/data/maps/FortreeCity_House2/header.inc index 44447c390..7baf0aa63 100644 --- a/data/maps/FortreeCity_House2/header.inc +++ b/data/maps/FortreeCity_House2/header.inc @@ -5,7 +5,7 @@ FortreeCity_House2:: @ 8306494 .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 101 - .byte 11 + .byte MAPSEC_FORTREE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/FortreeCity_House3/header.inc b/data/maps/FortreeCity_House3/header.inc index aa77bbf4e..d9d65297a 100644 --- a/data/maps/FortreeCity_House3/header.inc +++ b/data/maps/FortreeCity_House3/header.inc @@ -5,7 +5,7 @@ FortreeCity_House3:: @ 83064B0 .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 99 - .byte 11 + .byte MAPSEC_FORTREE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/FortreeCity_House4/header.inc b/data/maps/FortreeCity_House4/header.inc index dcd41d274..3b905352b 100644 --- a/data/maps/FortreeCity_House4/header.inc +++ b/data/maps/FortreeCity_House4/header.inc @@ -5,7 +5,7 @@ FortreeCity_House4:: @ 83064CC .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 101 - .byte 11 + .byte MAPSEC_FORTREE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/FortreeCity_House5/header.inc b/data/maps/FortreeCity_House5/header.inc index 98faa0aee..c3c361104 100644 --- a/data/maps/FortreeCity_House5/header.inc +++ b/data/maps/FortreeCity_House5/header.inc @@ -5,7 +5,7 @@ FortreeCity_House5:: @ 83064E8 .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 99 - .byte 11 + .byte MAPSEC_FORTREE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/FortreeCity_Mart/header.inc b/data/maps/FortreeCity_Mart/header.inc index a43cd9466..a4dd40285 100644 --- a/data/maps/FortreeCity_Mart/header.inc +++ b/data/maps/FortreeCity_Mart/header.inc @@ -5,7 +5,7 @@ FortreeCity_Mart:: @ 8306478 .4byte 0x0 .2byte MUS_FRIENDLY .2byte 63 - .byte 11 + .byte MAPSEC_FORTREE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/FortreeCity_PokemonCenter_1F/header.inc b/data/maps/FortreeCity_PokemonCenter_1F/header.inc index 97c8403b2..d606c08d8 100644 --- a/data/maps/FortreeCity_PokemonCenter_1F/header.inc +++ b/data/maps/FortreeCity_PokemonCenter_1F/header.inc @@ -5,7 +5,7 @@ FortreeCity_PokemonCenter_1F:: @ 8306440 .4byte 0x0 .2byte MUS_POKECEN .2byte 61 - .byte 11 + .byte MAPSEC_FORTREE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/FortreeCity_PokemonCenter_2F/header.inc b/data/maps/FortreeCity_PokemonCenter_2F/header.inc index 57e8510b8..9c5b3af3c 100644 --- a/data/maps/FortreeCity_PokemonCenter_2F/header.inc +++ b/data/maps/FortreeCity_PokemonCenter_2F/header.inc @@ -5,7 +5,7 @@ FortreeCity_PokemonCenter_2F:: @ 830645C .4byte 0x0 .2byte MUS_POKECEN .2byte 62 - .byte 11 + .byte MAPSEC_FORTREE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/GraniteCave_1F/header.inc b/data/maps/GraniteCave_1F/header.inc index b3682961a..707197625 100644 --- a/data/maps/GraniteCave_1F/header.inc +++ b/data/maps/GraniteCave_1F/header.inc @@ -5,7 +5,7 @@ GraniteCave_1F:: @ 8306E34 .4byte 0x0 .2byte MUS_DAN01 .2byte 133 - .byte 55 + .byte MAPSEC_GRANITE_CAVE .byte 0 .byte 0 .byte 4 diff --git a/data/maps/GraniteCave_B1F/header.inc b/data/maps/GraniteCave_B1F/header.inc index 80af713ad..c9b9a85f4 100644 --- a/data/maps/GraniteCave_B1F/header.inc +++ b/data/maps/GraniteCave_B1F/header.inc @@ -5,7 +5,7 @@ GraniteCave_B1F:: @ 8306E50 .4byte 0x0 .2byte MUS_DAN01 .2byte 134 - .byte 55 + .byte MAPSEC_GRANITE_CAVE .byte 1 .byte 0 .byte 4 diff --git a/data/maps/GraniteCave_B2F/header.inc b/data/maps/GraniteCave_B2F/header.inc index 9b3dc1610..a6db19127 100644 --- a/data/maps/GraniteCave_B2F/header.inc +++ b/data/maps/GraniteCave_B2F/header.inc @@ -5,7 +5,7 @@ GraniteCave_B2F:: @ 8306E6C .4byte 0x0 .2byte MUS_DAN01 .2byte 135 - .byte 55 + .byte MAPSEC_GRANITE_CAVE .byte 1 .byte 0 .byte 4 diff --git a/data/maps/GraniteCave_StevensRoom/header.inc b/data/maps/GraniteCave_StevensRoom/header.inc index da9664943..75a3089b3 100644 --- a/data/maps/GraniteCave_StevensRoom/header.inc +++ b/data/maps/GraniteCave_StevensRoom/header.inc @@ -5,7 +5,7 @@ GraniteCave_StevensRoom:: @ 8306E88 .4byte 0x0 .2byte MUS_DAN01 .2byte 289 - .byte 55 + .byte MAPSEC_GRANITE_CAVE .byte 0 .byte 0 .byte 4 diff --git a/data/maps/InsideOfTruck/header.inc b/data/maps/InsideOfTruck/header.inc index b406937ca..05478e8f3 100644 --- a/data/maps/InsideOfTruck/header.inc +++ b/data/maps/InsideOfTruck/header.inc @@ -5,7 +5,7 @@ InsideOfTruck:: @ 8307B38 .4byte 0x0 .2byte SE_STOP .2byte 238 - .byte 84 + .byte MAPSEC_INSIDE_OF_TRUCK .byte 0 .byte 0 .byte 8 diff --git a/data/maps/IslandCave/header.inc b/data/maps/IslandCave/header.inc index 70b8a62c6..baccbc500 100644 --- a/data/maps/IslandCave/header.inc +++ b/data/maps/IslandCave/header.inc @@ -5,7 +5,7 @@ IslandCave:: @ 83074C4 .4byte 0x0 .2byte MUS_MABOROSI .2byte 281 - .byte 81 + .byte MAPSEC_ISLAND_CAVE .byte 0 .byte 0 .byte 4 diff --git a/data/maps/JaggedPass/header.inc b/data/maps/JaggedPass/header.inc index cb9b61bb3..c70af745f 100644 --- a/data/maps/JaggedPass/header.inc +++ b/data/maps/JaggedPass/header.inc @@ -5,7 +5,7 @@ JaggedPass:: @ 8306EDC .4byte 0x0 .2byte MUS_DAN01 .2byte 293 - .byte 76 + .byte MAPSEC_JAGGED_PASS .byte 0 .byte 0 .byte 3 diff --git a/data/maps/LavaridgeTown/header.inc b/data/maps/LavaridgeTown/header.inc index 8e8eaaee6..57eae401c 100644 --- a/data/maps/LavaridgeTown/header.inc +++ b/data/maps/LavaridgeTown/header.inc @@ -5,7 +5,7 @@ LavaridgeTown:: @ 8305598 .4byte LavaridgeTown_MapConnections .2byte MUS_MACHI_S4 .2byte 13 - .byte 3 + .byte MAPSEC_LAVARIDGE_TOWN .byte 0 .byte 2 .byte 1 diff --git a/data/maps/LavaridgeTown_Gym_1F/header.inc b/data/maps/LavaridgeTown_Gym_1F/header.inc index 05c0b2dbc..add939b34 100644 --- a/data/maps/LavaridgeTown_Gym_1F/header.inc +++ b/data/maps/LavaridgeTown_Gym_1F/header.inc @@ -5,7 +5,7 @@ LavaridgeTown_Gym_1F:: @ 8305C0C .4byte 0x0 .2byte MUS_GIM .2byte 69 - .byte 3 + .byte MAPSEC_LAVARIDGE_TOWN .byte 0 .byte 6 .byte 8 diff --git a/data/maps/LavaridgeTown_Gym_B1F/header.inc b/data/maps/LavaridgeTown_Gym_B1F/header.inc index 0ae5a8634..393e0a72a 100644 --- a/data/maps/LavaridgeTown_Gym_B1F/header.inc +++ b/data/maps/LavaridgeTown_Gym_B1F/header.inc @@ -5,7 +5,7 @@ LavaridgeTown_Gym_B1F:: @ 8305C28 .4byte 0x0 .2byte MUS_GIM .2byte 70 - .byte 3 + .byte MAPSEC_LAVARIDGE_TOWN .byte 0 .byte 6 .byte 8 diff --git a/data/maps/LavaridgeTown_HerbShop/header.inc b/data/maps/LavaridgeTown_HerbShop/header.inc index 8ab9e4807..69aa9b41f 100644 --- a/data/maps/LavaridgeTown_HerbShop/header.inc +++ b/data/maps/LavaridgeTown_HerbShop/header.inc @@ -5,7 +5,7 @@ LavaridgeTown_HerbShop:: @ 8305BF0 .4byte 0x0 .2byte MUS_MACHI_S4 .2byte 68 - .byte 3 + .byte MAPSEC_LAVARIDGE_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LavaridgeTown_House/header.inc b/data/maps/LavaridgeTown_House/header.inc index 5b85bcbac..acb853281 100644 --- a/data/maps/LavaridgeTown_House/header.inc +++ b/data/maps/LavaridgeTown_House/header.inc @@ -5,7 +5,7 @@ LavaridgeTown_House:: @ 8305C44 .4byte 0x0 .2byte MUS_MACHI_S4 .2byte 64 - .byte 3 + .byte MAPSEC_LAVARIDGE_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LavaridgeTown_Mart/header.inc b/data/maps/LavaridgeTown_Mart/header.inc index 97c192d21..2dde392de 100644 --- a/data/maps/LavaridgeTown_Mart/header.inc +++ b/data/maps/LavaridgeTown_Mart/header.inc @@ -5,7 +5,7 @@ LavaridgeTown_Mart:: @ 8305C60 .4byte 0x0 .2byte MUS_FRIENDLY .2byte 63 - .byte 3 + .byte MAPSEC_LAVARIDGE_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc b/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc index 27bdfe3f2..a7ed83dcf 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc +++ b/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc @@ -5,7 +5,7 @@ LavaridgeTown_PokemonCenter_1F:: @ 8305C7C .4byte 0x0 .2byte MUS_POKECEN .2byte 71 - .byte 3 + .byte MAPSEC_LAVARIDGE_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc b/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc index 096759809..ae3bde4ee 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc +++ b/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc @@ -5,7 +5,7 @@ LavaridgeTown_PokemonCenter_2F:: @ 8305C98 .4byte 0x0 .2byte MUS_POKECEN .2byte 62 - .byte 3 + .byte MAPSEC_LAVARIDGE_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LilycoveCity/header.inc b/data/maps/LilycoveCity/header.inc index 2c067668e..d46ea1da3 100644 --- a/data/maps/LilycoveCity/header.inc +++ b/data/maps/LilycoveCity/header.inc @@ -5,7 +5,7 @@ LilycoveCity:: @ 83054D4 .4byte LilycoveCity_MapConnections .2byte MUS_MINAMO .2byte 6 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte 2 .byte 2 diff --git a/data/maps/LilycoveCity_ContestHall/header.inc b/data/maps/LilycoveCity_ContestHall/header.inc index 9e690f9a7..354a87c68 100644 --- a/data/maps/LilycoveCity_ContestHall/header.inc +++ b/data/maps/LilycoveCity_ContestHall/header.inc @@ -5,7 +5,7 @@ LilycoveCity_ContestHall:: @ 83065AC .4byte 0x0 .2byte MUS_CONLOBBY .2byte 106 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LilycoveCity_ContestLobby/header.inc b/data/maps/LilycoveCity_ContestLobby/header.inc index 37415383b..b3ecad4e6 100644 --- a/data/maps/LilycoveCity_ContestLobby/header.inc +++ b/data/maps/LilycoveCity_ContestLobby/header.inc @@ -5,7 +5,7 @@ LilycoveCity_ContestLobby:: @ 8306590 .4byte 0x0 .2byte MUS_CONLOBBY .2byte 105 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc b/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc index 15a8aa7d0..6931785d9 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc +++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc @@ -5,7 +5,7 @@ LilycoveCity_CoveLilyMotel_1F:: @ 8306520 .4byte 0x0 .2byte MUS_MINAMO .2byte 300 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc b/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc index a39f3acf0..adeb46f6d 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc +++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc @@ -5,7 +5,7 @@ LilycoveCity_CoveLilyMotel_2F:: @ 830653C .4byte 0x0 .2byte MUS_MINAMO .2byte 301 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc b/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc index 65b573d92..83b55aa11 100644 --- a/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc +++ b/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc @@ -5,7 +5,7 @@ LilycoveCity_DepartmentStoreElevator:: @ 83067A4 .4byte 0x0 .2byte MUS_MINAMO .2byte 274 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc index 0131ea7f1..21883b620 100644 --- a/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc +++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc @@ -5,7 +5,7 @@ LilycoveCity_DepartmentStoreRooftop:: @ 8306788 .4byte 0x0 .2byte MUS_MINAMO .2byte 263 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/header.inc b/data/maps/LilycoveCity_DepartmentStore_1F/header.inc index 6f5da636f..5c7496738 100644 --- a/data/maps/LilycoveCity_DepartmentStore_1F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_1F/header.inc @@ -5,7 +5,7 @@ LilycoveCity_DepartmentStore_1F:: @ 83066FC .4byte 0x0 .2byte MUS_MINAMO .2byte 258 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LilycoveCity_DepartmentStore_2F/header.inc b/data/maps/LilycoveCity_DepartmentStore_2F/header.inc index 7bc576b3f..9bdbe7b5c 100644 --- a/data/maps/LilycoveCity_DepartmentStore_2F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_2F/header.inc @@ -5,7 +5,7 @@ LilycoveCity_DepartmentStore_2F:: @ 8306718 .4byte 0x0 .2byte MUS_FRIENDLY .2byte 259 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LilycoveCity_DepartmentStore_3F/header.inc b/data/maps/LilycoveCity_DepartmentStore_3F/header.inc index 402d1a137..558a4ba33 100644 --- a/data/maps/LilycoveCity_DepartmentStore_3F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_3F/header.inc @@ -5,7 +5,7 @@ LilycoveCity_DepartmentStore_3F:: @ 8306734 .4byte 0x0 .2byte MUS_FRIENDLY .2byte 260 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LilycoveCity_DepartmentStore_4F/header.inc b/data/maps/LilycoveCity_DepartmentStore_4F/header.inc index 57bea5077..3d207e42d 100644 --- a/data/maps/LilycoveCity_DepartmentStore_4F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_4F/header.inc @@ -5,7 +5,7 @@ LilycoveCity_DepartmentStore_4F:: @ 8306750 .4byte 0x0 .2byte MUS_FRIENDLY .2byte 261 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/header.inc b/data/maps/LilycoveCity_DepartmentStore_5F/header.inc index 1159ddeaf..d5ff57c67 100644 --- a/data/maps/LilycoveCity_DepartmentStore_5F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_5F/header.inc @@ -5,7 +5,7 @@ LilycoveCity_DepartmentStore_5F:: @ 830676C .4byte 0x0 .2byte MUS_FRIENDLY .2byte 262 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LilycoveCity_EmptyMap/header.inc b/data/maps/LilycoveCity_EmptyMap/header.inc index 469b52893..5dfb291b2 100644 --- a/data/maps/LilycoveCity_EmptyMap/header.inc +++ b/data/maps/LilycoveCity_EmptyMap/header.inc @@ -5,7 +5,7 @@ LilycoveCity_EmptyMap:: @ 8306654 .4byte 0x0 .2byte MUS_MINAMO .2byte 108 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LilycoveCity_Harbor/header.inc b/data/maps/LilycoveCity_Harbor/header.inc index 75b924e8f..eb5be90b5 100644 --- a/data/maps/LilycoveCity_Harbor/header.inc +++ b/data/maps/LilycoveCity_Harbor/header.inc @@ -5,7 +5,7 @@ LilycoveCity_Harbor:: @ 8306638 .4byte 0x0 .2byte MUS_MINAMO .2byte 88 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LilycoveCity_House1/header.inc b/data/maps/LilycoveCity_House1/header.inc index 20675582b..ac84648bf 100644 --- a/data/maps/LilycoveCity_House1/header.inc +++ b/data/maps/LilycoveCity_House1/header.inc @@ -5,7 +5,7 @@ LilycoveCity_House1:: @ 830668C .4byte 0x0 .2byte MUS_MINAMO .2byte 59 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LilycoveCity_House2/header.inc b/data/maps/LilycoveCity_House2/header.inc index 1948d4470..f511a39fc 100644 --- a/data/maps/LilycoveCity_House2/header.inc +++ b/data/maps/LilycoveCity_House2/header.inc @@ -5,7 +5,7 @@ LilycoveCity_House2:: @ 83066A8 .4byte 0x0 .2byte MUS_MINAMO .2byte 74 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LilycoveCity_House3/header.inc b/data/maps/LilycoveCity_House3/header.inc index df0d576b4..5f4e49c44 100644 --- a/data/maps/LilycoveCity_House3/header.inc +++ b/data/maps/LilycoveCity_House3/header.inc @@ -5,7 +5,7 @@ LilycoveCity_House3:: @ 83066C4 .4byte 0x0 .2byte MUS_MINAMO .2byte 60 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LilycoveCity_House4/header.inc b/data/maps/LilycoveCity_House4/header.inc index a8d4d1bcc..e84ade915 100644 --- a/data/maps/LilycoveCity_House4/header.inc +++ b/data/maps/LilycoveCity_House4/header.inc @@ -5,7 +5,7 @@ LilycoveCity_House4:: @ 83066E0 .4byte 0x0 .2byte MUS_MINAMO .2byte 59 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc b/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc index 3af5b4c90..a8d3a44b2 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc @@ -5,7 +5,7 @@ LilycoveCity_LilycoveMuseum_1F:: @ 8306558 .4byte 0x0 .2byte MUS_BIJYUTU .2byte 103 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc index 3ceabddcb..da1fcadba 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc @@ -5,7 +5,7 @@ LilycoveCity_LilycoveMuseum_2F:: @ 8306574 .4byte 0x0 .2byte MUS_BIJYUTU .2byte 104 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LilycoveCity_MoveDeletersHouse/header.inc b/data/maps/LilycoveCity_MoveDeletersHouse/header.inc index a2216160d..d31f1403f 100644 --- a/data/maps/LilycoveCity_MoveDeletersHouse/header.inc +++ b/data/maps/LilycoveCity_MoveDeletersHouse/header.inc @@ -5,7 +5,7 @@ LilycoveCity_MoveDeletersHouse:: @ 8306670 .4byte 0x0 .2byte MUS_MINAMO .2byte 60 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LilycoveCity_PokemonCenter_1F/header.inc b/data/maps/LilycoveCity_PokemonCenter_1F/header.inc index c94501f23..05d628be7 100644 --- a/data/maps/LilycoveCity_PokemonCenter_1F/header.inc +++ b/data/maps/LilycoveCity_PokemonCenter_1F/header.inc @@ -5,7 +5,7 @@ LilycoveCity_PokemonCenter_1F:: @ 83065C8 .4byte 0x0 .2byte MUS_POKECEN .2byte 61 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LilycoveCity_PokemonCenter_2F/header.inc b/data/maps/LilycoveCity_PokemonCenter_2F/header.inc index 78816dbe9..9458e81e3 100644 --- a/data/maps/LilycoveCity_PokemonCenter_2F/header.inc +++ b/data/maps/LilycoveCity_PokemonCenter_2F/header.inc @@ -5,7 +5,7 @@ LilycoveCity_PokemonCenter_2F:: @ 83065E4 .4byte 0x0 .2byte MUS_POKECEN .2byte 62 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc index 4445ed0df..8902c8a3e 100644 --- a/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc +++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc @@ -5,7 +5,7 @@ LilycoveCity_PokemonTrainerFanClub:: @ 830661C .4byte 0x0 .2byte MUS_MINAMO .2byte 107 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LilycoveCity_UnusedMart/header.inc b/data/maps/LilycoveCity_UnusedMart/header.inc index fb20ddc79..a01efd98a 100644 --- a/data/maps/LilycoveCity_UnusedMart/header.inc +++ b/data/maps/LilycoveCity_UnusedMart/header.inc @@ -5,7 +5,7 @@ LilycoveCity_UnusedMart:: @ 8306600 .4byte 0x0 .2byte MUS_FRIENDLY .2byte 63 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LinkContestRoom1/header.inc b/data/maps/LinkContestRoom1/header.inc index 7aea3de5f..e762efb22 100644 --- a/data/maps/LinkContestRoom1/header.inc +++ b/data/maps/LinkContestRoom1/header.inc @@ -5,7 +5,7 @@ LinkContestRoom1:: @ 83079E8 .4byte 0x0 .2byte MUS_CONTEST0 .2byte 226 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LinkContestRoom2/header.inc b/data/maps/LinkContestRoom2/header.inc index a3d60c4f8..636b94c72 100644 --- a/data/maps/LinkContestRoom2/header.inc +++ b/data/maps/LinkContestRoom2/header.inc @@ -5,7 +5,7 @@ LinkContestRoom2:: @ 8307AAC .4byte 0x0 .2byte MUS_CONTEST0 .2byte 233 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LinkContestRoom3/header.inc b/data/maps/LinkContestRoom3/header.inc index 4ee1f0e7d..ed19b4610 100644 --- a/data/maps/LinkContestRoom3/header.inc +++ b/data/maps/LinkContestRoom3/header.inc @@ -5,7 +5,7 @@ LinkContestRoom3:: @ 8307AC8 .4byte 0x0 .2byte MUS_CONTEST0 .2byte 234 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LinkContestRoom4/header.inc b/data/maps/LinkContestRoom4/header.inc index 56ee5906c..f93f2f429 100644 --- a/data/maps/LinkContestRoom4/header.inc +++ b/data/maps/LinkContestRoom4/header.inc @@ -5,7 +5,7 @@ LinkContestRoom4:: @ 8307AE4 .4byte 0x0 .2byte MUS_CONTEST0 .2byte 235 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LinkContestRoom5/header.inc b/data/maps/LinkContestRoom5/header.inc index fb2a66640..904ad041f 100644 --- a/data/maps/LinkContestRoom5/header.inc +++ b/data/maps/LinkContestRoom5/header.inc @@ -5,7 +5,7 @@ LinkContestRoom5:: @ 8307B00 .4byte 0x0 .2byte MUS_CONTEST0 .2byte 236 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LinkContestRoom6/header.inc b/data/maps/LinkContestRoom6/header.inc index db9343180..e3e736c11 100644 --- a/data/maps/LinkContestRoom6/header.inc +++ b/data/maps/LinkContestRoom6/header.inc @@ -5,7 +5,7 @@ LinkContestRoom6:: @ 8307B1C .4byte 0x0 .2byte MUS_CONTEST0 .2byte 237 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LittlerootTown/header.inc b/data/maps/LittlerootTown/header.inc index 88f6763e3..d81a753a4 100644 --- a/data/maps/LittlerootTown/header.inc +++ b/data/maps/LittlerootTown/header.inc @@ -5,7 +5,7 @@ LittlerootTown:: @ 8305544 .4byte LittlerootTown_MapConnections .2byte MUS_MISHIRO .2byte 10 - .byte 0 + .byte MAPSEC_LITTLEROOT_TOWN .byte 0 .byte 2 .byte 1 diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/header.inc b/data/maps/LittlerootTown_BrendansHouse_1F/header.inc index eebc7b989..cec139767 100644 --- a/data/maps/LittlerootTown_BrendansHouse_1F/header.inc +++ b/data/maps/LittlerootTown_BrendansHouse_1F/header.inc @@ -5,7 +5,7 @@ LittlerootTown_BrendansHouse_1F:: @ 8305A30 .4byte 0x0 .2byte MUS_MISHIRO .2byte 54 - .byte 0 + .byte MAPSEC_LITTLEROOT_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/header.inc b/data/maps/LittlerootTown_BrendansHouse_2F/header.inc index 660c1e08e..e7d78680d 100644 --- a/data/maps/LittlerootTown_BrendansHouse_2F/header.inc +++ b/data/maps/LittlerootTown_BrendansHouse_2F/header.inc @@ -5,7 +5,7 @@ LittlerootTown_BrendansHouse_2F:: @ 8305A4C .4byte 0x0 .2byte MUS_MISHIRO .2byte 55 - .byte 0 + .byte MAPSEC_LITTLEROOT_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LittlerootTown_MaysHouse_1F/header.inc b/data/maps/LittlerootTown_MaysHouse_1F/header.inc index 329380b39..10e6e58e7 100644 --- a/data/maps/LittlerootTown_MaysHouse_1F/header.inc +++ b/data/maps/LittlerootTown_MaysHouse_1F/header.inc @@ -5,7 +5,7 @@ LittlerootTown_MaysHouse_1F:: @ 8305A68 .4byte 0x0 .2byte MUS_MISHIRO .2byte 56 - .byte 0 + .byte MAPSEC_LITTLEROOT_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LittlerootTown_MaysHouse_2F/header.inc b/data/maps/LittlerootTown_MaysHouse_2F/header.inc index cfb150c46..c4f3682ab 100644 --- a/data/maps/LittlerootTown_MaysHouse_2F/header.inc +++ b/data/maps/LittlerootTown_MaysHouse_2F/header.inc @@ -5,7 +5,7 @@ LittlerootTown_MaysHouse_2F:: @ 8305A84 .4byte 0x0 .2byte MUS_MISHIRO .2byte 57 - .byte 0 + .byte MAPSEC_LITTLEROOT_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc index 1961431b9..acb0882ff 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc @@ -5,7 +5,7 @@ LittlerootTown_ProfessorBirchsLab:: @ 8305AA0 .4byte 0x0 .2byte MUS_ODAMAKI .2byte 58 - .byte 0 + .byte MAPSEC_LITTLEROOT_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/MagmaHideout_1F/header.inc b/data/maps/MagmaHideout_1F/header.inc index c236bdae1..d6c31983e 100644 --- a/data/maps/MagmaHideout_1F/header.inc +++ b/data/maps/MagmaHideout_1F/header.inc @@ -5,7 +5,7 @@ MagmaHideout_1F:: @ 8307588 .4byte 0x0 .2byte MUS_AJITO .2byte 317 - .byte 66 + .byte MAPSEC_EVIL_TEAM_HIDEOUT .byte 0 .byte 0 .byte 8 diff --git a/data/maps/MagmaHideout_B1F/header.inc b/data/maps/MagmaHideout_B1F/header.inc index 18a1bd49c..67b117125 100644 --- a/data/maps/MagmaHideout_B1F/header.inc +++ b/data/maps/MagmaHideout_B1F/header.inc @@ -5,7 +5,7 @@ MagmaHideout_B1F:: @ 83075A4 .4byte 0x0 .2byte MUS_AJITO .2byte 318 - .byte 66 + .byte MAPSEC_EVIL_TEAM_HIDEOUT .byte 0 .byte 0 .byte 8 diff --git a/data/maps/MagmaHideout_B2F/header.inc b/data/maps/MagmaHideout_B2F/header.inc index 6cb9a6a47..10bd7266d 100644 --- a/data/maps/MagmaHideout_B2F/header.inc +++ b/data/maps/MagmaHideout_B2F/header.inc @@ -5,7 +5,7 @@ MagmaHideout_B2F:: @ 83075C0 .4byte 0x0 .2byte MUS_AJITO .2byte 319 - .byte 66 + .byte MAPSEC_EVIL_TEAM_HIDEOUT .byte 0 .byte 0 .byte 8 diff --git a/data/maps/MauvilleCity/header.inc b/data/maps/MauvilleCity/header.inc index 9ea461f4c..ffd7f9145 100644 --- a/data/maps/MauvilleCity/header.inc +++ b/data/maps/MauvilleCity/header.inc @@ -5,7 +5,7 @@ MauvilleCity:: @ 8305480 .4byte MauvilleCity_MapConnections .2byte MUS_GOTOWN .2byte 3 - .byte 9 + .byte MAPSEC_MAUVILLE_CITY .byte 0 .byte 2 .byte 2 diff --git a/data/maps/MauvilleCity_BikeShop/header.inc b/data/maps/MauvilleCity_BikeShop/header.inc index a1e3e56bc..e29d2d1cf 100644 --- a/data/maps/MauvilleCity_BikeShop/header.inc +++ b/data/maps/MauvilleCity_BikeShop/header.inc @@ -5,7 +5,7 @@ MauvilleCity_BikeShop:: @ 8306168 .4byte 0x0 .2byte MUS_GOTOWN .2byte 90 - .byte 9 + .byte MAPSEC_MAUVILLE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/MauvilleCity_GameCorner/header.inc b/data/maps/MauvilleCity_GameCorner/header.inc index 7e9bb00fa..af7ab0b1e 100644 --- a/data/maps/MauvilleCity_GameCorner/header.inc +++ b/data/maps/MauvilleCity_GameCorner/header.inc @@ -5,7 +5,7 @@ MauvilleCity_GameCorner:: @ 83061A0 .4byte 0x0 .2byte MUS_CASINO .2byte 91 - .byte 9 + .byte MAPSEC_MAUVILLE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/MauvilleCity_Gym/header.inc b/data/maps/MauvilleCity_Gym/header.inc index a52423319..a16bdf7de 100644 --- a/data/maps/MauvilleCity_Gym/header.inc +++ b/data/maps/MauvilleCity_Gym/header.inc @@ -5,7 +5,7 @@ MauvilleCity_Gym:: @ 830614C .4byte 0x0 .2byte MUS_GIM .2byte 89 - .byte 9 + .byte MAPSEC_MAUVILLE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/MauvilleCity_House1/header.inc b/data/maps/MauvilleCity_House1/header.inc index 0d464b6c0..c0053d42a 100644 --- a/data/maps/MauvilleCity_House1/header.inc +++ b/data/maps/MauvilleCity_House1/header.inc @@ -5,7 +5,7 @@ MauvilleCity_House1:: @ 8306184 .4byte 0x0 .2byte MUS_GOTOWN .2byte 60 - .byte 9 + .byte MAPSEC_MAUVILLE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/MauvilleCity_House2/header.inc b/data/maps/MauvilleCity_House2/header.inc index 7a8c72f6e..0446fb462 100644 --- a/data/maps/MauvilleCity_House2/header.inc +++ b/data/maps/MauvilleCity_House2/header.inc @@ -5,7 +5,7 @@ MauvilleCity_House2:: @ 83061BC .4byte 0x0 .2byte MUS_GOTOWN .2byte 59 - .byte 9 + .byte MAPSEC_MAUVILLE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/MauvilleCity_Mart/header.inc b/data/maps/MauvilleCity_Mart/header.inc index 169089f69..67fcf17ac 100644 --- a/data/maps/MauvilleCity_Mart/header.inc +++ b/data/maps/MauvilleCity_Mart/header.inc @@ -5,7 +5,7 @@ MauvilleCity_Mart:: @ 8306210 .4byte 0x0 .2byte MUS_FRIENDLY .2byte 63 - .byte 9 + .byte MAPSEC_MAUVILLE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/MauvilleCity_PokemonCenter_1F/header.inc b/data/maps/MauvilleCity_PokemonCenter_1F/header.inc index 74cc8bfe2..fd9dc4050 100644 --- a/data/maps/MauvilleCity_PokemonCenter_1F/header.inc +++ b/data/maps/MauvilleCity_PokemonCenter_1F/header.inc @@ -5,7 +5,7 @@ MauvilleCity_PokemonCenter_1F:: @ 83061D8 .4byte 0x0 .2byte MUS_POKECEN .2byte 61 - .byte 9 + .byte MAPSEC_MAUVILLE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/MauvilleCity_PokemonCenter_2F/header.inc b/data/maps/MauvilleCity_PokemonCenter_2F/header.inc index fd7bf6a2d..988d2941b 100644 --- a/data/maps/MauvilleCity_PokemonCenter_2F/header.inc +++ b/data/maps/MauvilleCity_PokemonCenter_2F/header.inc @@ -5,7 +5,7 @@ MauvilleCity_PokemonCenter_2F:: @ 83061F4 .4byte 0x0 .2byte MUS_POKECEN .2byte 62 - .byte 9 + .byte MAPSEC_MAUVILLE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/MeteorFalls_1F_1R/header.inc b/data/maps/MeteorFalls_1F_1R/header.inc index 506463120..908cb3d75 100644 --- a/data/maps/MeteorFalls_1F_1R/header.inc +++ b/data/maps/MeteorFalls_1F_1R/header.inc @@ -5,7 +5,7 @@ MeteorFalls_1F_1R:: @ 8306D70 .4byte 0x0 .2byte MUS_DAN03 .2byte 126 - .byte 63 + .byte MAPSEC_METEOR_FALLS .byte 0 .byte 0 .byte 4 diff --git a/data/maps/MeteorFalls_1F_2R/header.inc b/data/maps/MeteorFalls_1F_2R/header.inc index f46645b7e..9b4a00a03 100644 --- a/data/maps/MeteorFalls_1F_2R/header.inc +++ b/data/maps/MeteorFalls_1F_2R/header.inc @@ -5,7 +5,7 @@ MeteorFalls_1F_2R:: @ 8306D8C .4byte 0x0 .2byte MUS_DAN03 .2byte 127 - .byte 63 + .byte MAPSEC_METEOR_FALLS .byte 0 .byte 0 .byte 4 diff --git a/data/maps/MeteorFalls_B1F_1R/header.inc b/data/maps/MeteorFalls_B1F_1R/header.inc index 6e34052ce..021440754 100644 --- a/data/maps/MeteorFalls_B1F_1R/header.inc +++ b/data/maps/MeteorFalls_B1F_1R/header.inc @@ -5,7 +5,7 @@ MeteorFalls_B1F_1R:: @ 8306DA8 .4byte 0x0 .2byte MUS_DAN03 .2byte 128 - .byte 63 + .byte MAPSEC_METEOR_FALLS .byte 0 .byte 0 .byte 4 diff --git a/data/maps/MeteorFalls_B1F_2R/header.inc b/data/maps/MeteorFalls_B1F_2R/header.inc index 487cf19e9..7bbfdb6c2 100644 --- a/data/maps/MeteorFalls_B1F_2R/header.inc +++ b/data/maps/MeteorFalls_B1F_2R/header.inc @@ -5,7 +5,7 @@ MeteorFalls_B1F_2R:: @ 8306DC4 .4byte 0x0 .2byte MUS_DAN03 .2byte 129 - .byte 63 + .byte MAPSEC_METEOR_FALLS .byte 0 .byte 0 .byte 4 diff --git a/data/maps/MossdeepCity/header.inc b/data/maps/MossdeepCity/header.inc index 93aeb648a..77049e9cc 100644 --- a/data/maps/MossdeepCity/header.inc +++ b/data/maps/MossdeepCity/header.inc @@ -5,7 +5,7 @@ MossdeepCity:: @ 83054F0 .4byte MossdeepCity_MapConnections .2byte MUS_GOTOWN .2byte 7 - .byte 13 + .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte 2 .byte 2 diff --git a/data/maps/MossdeepCity_GameCorner_1F/header.inc b/data/maps/MossdeepCity_GameCorner_1F/header.inc index dc11469e0..ac4f95a11 100644 --- a/data/maps/MossdeepCity_GameCorner_1F/header.inc +++ b/data/maps/MossdeepCity_GameCorner_1F/header.inc @@ -5,7 +5,7 @@ MossdeepCity_GameCorner_1F:: @ 83068F4 .4byte 0x0 .2byte MUS_GOTOWN .2byte 306 - .byte 13 + .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/MossdeepCity_GameCorner_B1F/header.inc b/data/maps/MossdeepCity_GameCorner_B1F/header.inc index fd8e210cc..8f25b162b 100644 --- a/data/maps/MossdeepCity_GameCorner_B1F/header.inc +++ b/data/maps/MossdeepCity_GameCorner_B1F/header.inc @@ -5,7 +5,7 @@ MossdeepCity_GameCorner_B1F:: @ 8306910 .4byte 0x0 .2byte MUS_GOTOWN .2byte 307 - .byte 13 + .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/MossdeepCity_Gym/header.inc b/data/maps/MossdeepCity_Gym/header.inc index cabaf610a..f815d2654 100644 --- a/data/maps/MossdeepCity_Gym/header.inc +++ b/data/maps/MossdeepCity_Gym/header.inc @@ -5,7 +5,7 @@ MossdeepCity_Gym:: @ 83067C0 .4byte 0x0 .2byte MUS_GIM .2byte 109 - .byte 13 + .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/MossdeepCity_House1/header.inc b/data/maps/MossdeepCity_House1/header.inc index f6815842d..3619ee650 100644 --- a/data/maps/MossdeepCity_House1/header.inc +++ b/data/maps/MossdeepCity_House1/header.inc @@ -5,7 +5,7 @@ MossdeepCity_House1:: @ 83067DC .4byte 0x0 .2byte MUS_GOTOWN .2byte 60 - .byte 13 + .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/MossdeepCity_House2/header.inc b/data/maps/MossdeepCity_House2/header.inc index 36964f8ee..cb67f3876 100644 --- a/data/maps/MossdeepCity_House2/header.inc +++ b/data/maps/MossdeepCity_House2/header.inc @@ -5,7 +5,7 @@ MossdeepCity_House2:: @ 83067F8 .4byte 0x0 .2byte MUS_GOTOWN .2byte 59 - .byte 13 + .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/MossdeepCity_House3/header.inc b/data/maps/MossdeepCity_House3/header.inc index e395c29f6..498487232 100644 --- a/data/maps/MossdeepCity_House3/header.inc +++ b/data/maps/MossdeepCity_House3/header.inc @@ -5,7 +5,7 @@ MossdeepCity_House3:: @ 8306868 .4byte 0x0 .2byte MUS_GOTOWN .2byte 60 - .byte 13 + .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/MossdeepCity_House4/header.inc b/data/maps/MossdeepCity_House4/header.inc index fe346cb0a..751c4e344 100644 --- a/data/maps/MossdeepCity_House4/header.inc +++ b/data/maps/MossdeepCity_House4/header.inc @@ -5,7 +5,7 @@ MossdeepCity_House4:: @ 83068A0 .4byte 0x0 .2byte MUS_GOTOWN .2byte 80 - .byte 13 + .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/MossdeepCity_Mart/header.inc b/data/maps/MossdeepCity_Mart/header.inc index 6c8b09d32..a9c359807 100644 --- a/data/maps/MossdeepCity_Mart/header.inc +++ b/data/maps/MossdeepCity_Mart/header.inc @@ -5,7 +5,7 @@ MossdeepCity_Mart:: @ 830684C .4byte 0x0 .2byte MUS_FRIENDLY .2byte 63 - .byte 13 + .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/MossdeepCity_PokemonCenter_1F/header.inc b/data/maps/MossdeepCity_PokemonCenter_1F/header.inc index ef51b2588..0dbd52d01 100644 --- a/data/maps/MossdeepCity_PokemonCenter_1F/header.inc +++ b/data/maps/MossdeepCity_PokemonCenter_1F/header.inc @@ -5,7 +5,7 @@ MossdeepCity_PokemonCenter_1F:: @ 8306814 .4byte 0x0 .2byte MUS_POKECEN .2byte 61 - .byte 13 + .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/MossdeepCity_PokemonCenter_2F/header.inc b/data/maps/MossdeepCity_PokemonCenter_2F/header.inc index db24bf9e5..64fa94ed7 100644 --- a/data/maps/MossdeepCity_PokemonCenter_2F/header.inc +++ b/data/maps/MossdeepCity_PokemonCenter_2F/header.inc @@ -5,7 +5,7 @@ MossdeepCity_PokemonCenter_2F:: @ 8306830 .4byte 0x0 .2byte MUS_POKECEN .2byte 62 - .byte 13 + .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/header.inc b/data/maps/MossdeepCity_SpaceCenter_1F/header.inc index bc2152a58..4b195f109 100644 --- a/data/maps/MossdeepCity_SpaceCenter_1F/header.inc +++ b/data/maps/MossdeepCity_SpaceCenter_1F/header.inc @@ -5,7 +5,7 @@ MossdeepCity_SpaceCenter_1F:: @ 83068BC .4byte 0x0 .2byte MUS_GOTOWN .2byte 276 - .byte 13 + .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/header.inc b/data/maps/MossdeepCity_SpaceCenter_2F/header.inc index 46c44758d..2ea7660f0 100644 --- a/data/maps/MossdeepCity_SpaceCenter_2F/header.inc +++ b/data/maps/MossdeepCity_SpaceCenter_2F/header.inc @@ -5,7 +5,7 @@ MossdeepCity_SpaceCenter_2F:: @ 83068D8 .4byte 0x0 .2byte MUS_GOTOWN .2byte 277 - .byte 13 + .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/MossdeepCity_StevensHouse/header.inc b/data/maps/MossdeepCity_StevensHouse/header.inc index abbe4b98b..c488186d7 100644 --- a/data/maps/MossdeepCity_StevensHouse/header.inc +++ b/data/maps/MossdeepCity_StevensHouse/header.inc @@ -5,7 +5,7 @@ MossdeepCity_StevensHouse:: @ 8306884 .4byte 0x0 .2byte MUS_GOTOWN .2byte 328 - .byte 13 + .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/MtChimney/header.inc b/data/maps/MtChimney/header.inc index 690312635..bd3d1a404 100644 --- a/data/maps/MtChimney/header.inc +++ b/data/maps/MtChimney/header.inc @@ -5,7 +5,7 @@ MtChimney:: @ 8306EC0 .4byte 0x0 .2byte MUS_TOZAN .2byte 137 - .byte 56 + .byte MAPSEC_MT_CHIMNEY .byte 0 .byte 7 .byte 3 diff --git a/data/maps/MtChimney_CableCarStation/header.inc b/data/maps/MtChimney_CableCarStation/header.inc index 9584ed7a2..4489e2050 100644 --- a/data/maps/MtChimney_CableCarStation/header.inc +++ b/data/maps/MtChimney_CableCarStation/header.inc @@ -5,7 +5,7 @@ MtChimney_CableCarStation:: @ 8306CAC .4byte 0x0 .2byte MUS_DOORO_X1 .2byte 119 - .byte 56 + .byte MAPSEC_MT_CHIMNEY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/MtPyre_1F/header.inc b/data/maps/MtPyre_1F/header.inc index a75471d53..b9613f8f5 100644 --- a/data/maps/MtPyre_1F/header.inc +++ b/data/maps/MtPyre_1F/header.inc @@ -5,7 +5,7 @@ MtPyre_1F:: @ 8306F14 .4byte 0x0 .2byte MUS_M_DUNGON .2byte 138 - .byte 65 + .byte MAPSEC_MT_PYRE .byte 0 .byte 0 .byte 8 diff --git a/data/maps/MtPyre_2F/header.inc b/data/maps/MtPyre_2F/header.inc index 081adb3e9..8b6c62f95 100644 --- a/data/maps/MtPyre_2F/header.inc +++ b/data/maps/MtPyre_2F/header.inc @@ -5,7 +5,7 @@ MtPyre_2F:: @ 8306F30 .4byte 0x0 .2byte MUS_M_DUNGON .2byte 139 - .byte 65 + .byte MAPSEC_MT_PYRE .byte 0 .byte 0 .byte 8 diff --git a/data/maps/MtPyre_3F/header.inc b/data/maps/MtPyre_3F/header.inc index 253facf61..7f380ebbc 100644 --- a/data/maps/MtPyre_3F/header.inc +++ b/data/maps/MtPyre_3F/header.inc @@ -5,7 +5,7 @@ MtPyre_3F:: @ 8306F4C .4byte 0x0 .2byte MUS_M_DUNGON .2byte 140 - .byte 65 + .byte MAPSEC_MT_PYRE .byte 0 .byte 0 .byte 8 diff --git a/data/maps/MtPyre_4F/header.inc b/data/maps/MtPyre_4F/header.inc index 720ff831e..8f4ec2190 100644 --- a/data/maps/MtPyre_4F/header.inc +++ b/data/maps/MtPyre_4F/header.inc @@ -5,7 +5,7 @@ MtPyre_4F:: @ 8306F68 .4byte 0x0 .2byte MUS_M_DUNGON .2byte 141 - .byte 65 + .byte MAPSEC_MT_PYRE .byte 0 .byte 0 .byte 8 diff --git a/data/maps/MtPyre_5F/header.inc b/data/maps/MtPyre_5F/header.inc index dc8d93e29..990e55706 100644 --- a/data/maps/MtPyre_5F/header.inc +++ b/data/maps/MtPyre_5F/header.inc @@ -5,7 +5,7 @@ MtPyre_5F:: @ 8306F84 .4byte 0x0 .2byte MUS_M_DUNGON .2byte 142 - .byte 65 + .byte MAPSEC_MT_PYRE .byte 0 .byte 0 .byte 8 diff --git a/data/maps/MtPyre_6F/header.inc b/data/maps/MtPyre_6F/header.inc index 986c3b538..59376a8a5 100644 --- a/data/maps/MtPyre_6F/header.inc +++ b/data/maps/MtPyre_6F/header.inc @@ -5,7 +5,7 @@ MtPyre_6F:: @ 8306FA0 .4byte 0x0 .2byte MUS_M_DUNGON .2byte 143 - .byte 65 + .byte MAPSEC_MT_PYRE .byte 0 .byte 0 .byte 8 diff --git a/data/maps/MtPyre_Exterior/header.inc b/data/maps/MtPyre_Exterior/header.inc index 0c115cd95..4947de176 100644 --- a/data/maps/MtPyre_Exterior/header.inc +++ b/data/maps/MtPyre_Exterior/header.inc @@ -5,7 +5,7 @@ MtPyre_Exterior:: @ 8306FBC .4byte 0x0 .2byte MUS_MACHUPI .2byte 303 - .byte 65 + .byte MAPSEC_MT_PYRE .byte 0 .byte 0 .byte 3 diff --git a/data/maps/MtPyre_Summit/header.inc b/data/maps/MtPyre_Summit/header.inc index fc8a0a82e..4af2bb0cd 100644 --- a/data/maps/MtPyre_Summit/header.inc +++ b/data/maps/MtPyre_Summit/header.inc @@ -5,7 +5,7 @@ MtPyre_Summit:: @ 8306FD8 .4byte 0x0 .2byte MUS_MACHUPI .2byte 304 - .byte 65 + .byte MAPSEC_MT_PYRE .byte 0 .byte 6 .byte 3 diff --git a/data/maps/NewMauville_Entrance/header.inc b/data/maps/NewMauville_Entrance/header.inc index 7ca1c1b96..452a89a1e 100644 --- a/data/maps/NewMauville_Entrance/header.inc +++ b/data/maps/NewMauville_Entrance/header.inc @@ -5,7 +5,7 @@ NewMauville_Entrance:: @ 8307320 .4byte 0x0 .2byte MUS_M_DUNGON .2byte 185 - .byte 62 + .byte MAPSEC_NEW_MAUVILLE .byte 0 .byte 0 .byte 4 diff --git a/data/maps/NewMauville_Inside/header.inc b/data/maps/NewMauville_Inside/header.inc index 44a3d1895..c76ee0b84 100644 --- a/data/maps/NewMauville_Inside/header.inc +++ b/data/maps/NewMauville_Inside/header.inc @@ -5,7 +5,7 @@ NewMauville_Inside:: @ 830733C .4byte 0x0 .2byte MUS_M_DUNGON .2byte 186 - .byte 62 + .byte MAPSEC_NEW_MAUVILLE .byte 0 .byte 0 .byte 4 diff --git a/data/maps/OldaleTown/header.inc b/data/maps/OldaleTown/header.inc index 7f89ef759..5ae65bc80 100644 --- a/data/maps/OldaleTown/header.inc +++ b/data/maps/OldaleTown/header.inc @@ -5,7 +5,7 @@ OldaleTown:: @ 8305560 .4byte OldaleTown_MapConnections .2byte MUS_MACHI_S4 .2byte 11 - .byte 1 + .byte MAPSEC_OLDALE_TOWN .byte 0 .byte 2 .byte 1 diff --git a/data/maps/OldaleTown_House1/header.inc b/data/maps/OldaleTown_House1/header.inc index b2b31cb73..9eef00f1b 100644 --- a/data/maps/OldaleTown_House1/header.inc +++ b/data/maps/OldaleTown_House1/header.inc @@ -5,7 +5,7 @@ OldaleTown_House1:: @ 8305ABC .4byte 0x0 .2byte MUS_MACHI_S4 .2byte 59 - .byte 1 + .byte MAPSEC_OLDALE_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/OldaleTown_House2/header.inc b/data/maps/OldaleTown_House2/header.inc index 33ad6fcd7..49e6e363b 100644 --- a/data/maps/OldaleTown_House2/header.inc +++ b/data/maps/OldaleTown_House2/header.inc @@ -5,7 +5,7 @@ OldaleTown_House2:: @ 8305AD8 .4byte 0x0 .2byte MUS_MACHI_S4 .2byte 60 - .byte 1 + .byte MAPSEC_OLDALE_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/OldaleTown_Mart/header.inc b/data/maps/OldaleTown_Mart/header.inc index d74999efb..2cb202aff 100644 --- a/data/maps/OldaleTown_Mart/header.inc +++ b/data/maps/OldaleTown_Mart/header.inc @@ -5,7 +5,7 @@ OldaleTown_Mart:: @ 8305B2C .4byte 0x0 .2byte MUS_FRIENDLY .2byte 63 - .byte 1 + .byte MAPSEC_OLDALE_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/OldaleTown_PokemonCenter_1F/header.inc b/data/maps/OldaleTown_PokemonCenter_1F/header.inc index a3bfaff18..71570da63 100644 --- a/data/maps/OldaleTown_PokemonCenter_1F/header.inc +++ b/data/maps/OldaleTown_PokemonCenter_1F/header.inc @@ -5,7 +5,7 @@ OldaleTown_PokemonCenter_1F:: @ 8305AF4 .4byte 0x0 .2byte MUS_POKECEN .2byte 61 - .byte 1 + .byte MAPSEC_OLDALE_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/OldaleTown_PokemonCenter_2F/header.inc b/data/maps/OldaleTown_PokemonCenter_2F/header.inc index 73c9d23d4..73eaa3e7a 100644 --- a/data/maps/OldaleTown_PokemonCenter_2F/header.inc +++ b/data/maps/OldaleTown_PokemonCenter_2F/header.inc @@ -5,7 +5,7 @@ OldaleTown_PokemonCenter_2F:: @ 8305B10 .4byte 0x0 .2byte MUS_POKECEN .2byte 62 - .byte 1 + .byte MAPSEC_OLDALE_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/PacifidlogTown/header.inc b/data/maps/PacifidlogTown/header.inc index dd589e122..0c3f8dc14 100644 --- a/data/maps/PacifidlogTown/header.inc +++ b/data/maps/PacifidlogTown/header.inc @@ -5,7 +5,7 @@ PacifidlogTown:: @ 83055EC .4byte PacifidlogTown_MapConnections .2byte MUS_MINAMO .2byte 16 - .byte 6 + .byte MAPSEC_PACIFIDLOG_TOWN .byte 0 .byte 2 .byte 1 diff --git a/data/maps/PacifidlogTown_House1/header.inc b/data/maps/PacifidlogTown_House1/header.inc index dcf7d338d..960510a10 100644 --- a/data/maps/PacifidlogTown_House1/header.inc +++ b/data/maps/PacifidlogTown_House1/header.inc @@ -5,7 +5,7 @@ PacifidlogTown_House1:: @ 8305E90 .4byte 0x0 .2byte MUS_MINAMO .2byte 77 - .byte 6 + .byte MAPSEC_PACIFIDLOG_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/PacifidlogTown_House2/header.inc b/data/maps/PacifidlogTown_House2/header.inc index 758c10751..e1389d640 100644 --- a/data/maps/PacifidlogTown_House2/header.inc +++ b/data/maps/PacifidlogTown_House2/header.inc @@ -5,7 +5,7 @@ PacifidlogTown_House2:: @ 8305EAC .4byte 0x0 .2byte MUS_MINAMO .2byte 78 - .byte 6 + .byte MAPSEC_PACIFIDLOG_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/PacifidlogTown_House3/header.inc b/data/maps/PacifidlogTown_House3/header.inc index 55427804f..370c68fb9 100644 --- a/data/maps/PacifidlogTown_House3/header.inc +++ b/data/maps/PacifidlogTown_House3/header.inc @@ -5,7 +5,7 @@ PacifidlogTown_House3:: @ 8305EC8 .4byte 0x0 .2byte MUS_MINAMO .2byte 77 - .byte 6 + .byte MAPSEC_PACIFIDLOG_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/PacifidlogTown_House4/header.inc b/data/maps/PacifidlogTown_House4/header.inc index fbadb5440..a4696948f 100644 --- a/data/maps/PacifidlogTown_House4/header.inc +++ b/data/maps/PacifidlogTown_House4/header.inc @@ -5,7 +5,7 @@ PacifidlogTown_House4:: @ 8305EE4 .4byte 0x0 .2byte MUS_MINAMO .2byte 78 - .byte 6 + .byte MAPSEC_PACIFIDLOG_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/PacifidlogTown_House5/header.inc b/data/maps/PacifidlogTown_House5/header.inc index c8d5bcf3c..7e784c5d9 100644 --- a/data/maps/PacifidlogTown_House5/header.inc +++ b/data/maps/PacifidlogTown_House5/header.inc @@ -5,7 +5,7 @@ PacifidlogTown_House5:: @ 8305F00 .4byte 0x0 .2byte MUS_MINAMO .2byte 77 - .byte 6 + .byte MAPSEC_PACIFIDLOG_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc b/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc index 706a9d8b2..c482332f2 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc +++ b/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc @@ -5,7 +5,7 @@ PacifidlogTown_PokemonCenter_1F:: @ 8305E58 .4byte 0x0 .2byte MUS_POKECEN .2byte 61 - .byte 6 + .byte MAPSEC_PACIFIDLOG_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc b/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc index 9408e8611..95818df6e 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc +++ b/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc @@ -5,7 +5,7 @@ PacifidlogTown_PokemonCenter_2F:: @ 8305E74 .4byte 0x0 .2byte MUS_POKECEN .2byte 62 - .byte 6 + .byte MAPSEC_PACIFIDLOG_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/PetalburgCity/header.inc b/data/maps/PetalburgCity/header.inc index ddda0a3b0..ecd98a176 100644 --- a/data/maps/PetalburgCity/header.inc +++ b/data/maps/PetalburgCity/header.inc @@ -5,7 +5,7 @@ PetalburgCity:: @ 8305448 .4byte PetalburgCity_MapConnections .2byte MUS_MACHI_S2 .2byte 1 - .byte 7 + .byte MAPSEC_PETALBURG_CITY .byte 0 .byte 2 .byte 2 diff --git a/data/maps/PetalburgCity_Gym/header.inc b/data/maps/PetalburgCity_Gym/header.inc index 6c519b07e..2307f6c4c 100644 --- a/data/maps/PetalburgCity_Gym/header.inc +++ b/data/maps/PetalburgCity_Gym/header.inc @@ -5,7 +5,7 @@ PetalburgCity_Gym:: @ 8305F38 .4byte 0x0 .2byte MUS_GIM .2byte 79 - .byte 7 + .byte MAPSEC_PETALBURG_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/PetalburgCity_House1/header.inc b/data/maps/PetalburgCity_House1/header.inc index 1aaa3ee6d..318b4701e 100644 --- a/data/maps/PetalburgCity_House1/header.inc +++ b/data/maps/PetalburgCity_House1/header.inc @@ -5,7 +5,7 @@ PetalburgCity_House1:: @ 8305F54 .4byte 0x0 .2byte MUS_MACHI_S2 .2byte 59 - .byte 7 + .byte MAPSEC_PETALBURG_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/PetalburgCity_House2/header.inc b/data/maps/PetalburgCity_House2/header.inc index 1f115285c..530a7fee6 100644 --- a/data/maps/PetalburgCity_House2/header.inc +++ b/data/maps/PetalburgCity_House2/header.inc @@ -5,7 +5,7 @@ PetalburgCity_House2:: @ 8305F70 .4byte 0x0 .2byte MUS_MACHI_S2 .2byte 80 - .byte 7 + .byte MAPSEC_PETALBURG_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/PetalburgCity_Mart/header.inc b/data/maps/PetalburgCity_Mart/header.inc index 21a487898..8a7109207 100644 --- a/data/maps/PetalburgCity_Mart/header.inc +++ b/data/maps/PetalburgCity_Mart/header.inc @@ -5,7 +5,7 @@ PetalburgCity_Mart:: @ 8305FC4 .4byte 0x0 .2byte MUS_FRIENDLY .2byte 63 - .byte 7 + .byte MAPSEC_PETALBURG_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/PetalburgCity_PokemonCenter_1F/header.inc b/data/maps/PetalburgCity_PokemonCenter_1F/header.inc index 0c87b4934..d7b4c6631 100644 --- a/data/maps/PetalburgCity_PokemonCenter_1F/header.inc +++ b/data/maps/PetalburgCity_PokemonCenter_1F/header.inc @@ -5,7 +5,7 @@ PetalburgCity_PokemonCenter_1F:: @ 8305F8C .4byte 0x0 .2byte MUS_POKECEN .2byte 61 - .byte 7 + .byte MAPSEC_PETALBURG_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/PetalburgCity_PokemonCenter_2F/header.inc b/data/maps/PetalburgCity_PokemonCenter_2F/header.inc index 7646fd56e..c74854e62 100644 --- a/data/maps/PetalburgCity_PokemonCenter_2F/header.inc +++ b/data/maps/PetalburgCity_PokemonCenter_2F/header.inc @@ -5,7 +5,7 @@ PetalburgCity_PokemonCenter_2F:: @ 8305FA8 .4byte 0x0 .2byte MUS_POKECEN .2byte 62 - .byte 7 + .byte MAPSEC_PETALBURG_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/PetalburgCity_WallysHouse/header.inc b/data/maps/PetalburgCity_WallysHouse/header.inc index 297065253..01c75ceb4 100644 --- a/data/maps/PetalburgCity_WallysHouse/header.inc +++ b/data/maps/PetalburgCity_WallysHouse/header.inc @@ -5,7 +5,7 @@ PetalburgCity_WallysHouse:: @ 8305F1C .4byte 0x0 .2byte MUS_MACHI_S2 .2byte 60 - .byte 7 + .byte MAPSEC_PETALBURG_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/PetalburgWoods/header.inc b/data/maps/PetalburgWoods/header.inc index d473ea6ed..88a9b5782 100644 --- a/data/maps/PetalburgWoods/header.inc +++ b/data/maps/PetalburgWoods/header.inc @@ -5,7 +5,7 @@ PetalburgWoods:: @ 8306EA4 .4byte 0x0 .2byte MUS_DAN01 .2byte 136 - .byte 59 + .byte MAPSEC_PETALBURG_WOODS .byte 0 .byte 11 .byte 3 diff --git a/data/maps/RecordCorner/header.inc b/data/maps/RecordCorner/header.inc index ee1142c85..d45299b9b 100644 --- a/data/maps/RecordCorner/header.inc +++ b/data/maps/RecordCorner/header.inc @@ -5,7 +5,7 @@ RecordCorner:: @ 83079B0 .4byte 0x0 .2byte MUS_RAINBOW .2byte 224 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route101/header.inc b/data/maps/Route101/header.inc index c3d5606d5..a5fa12d17 100644 --- a/data/maps/Route101/header.inc +++ b/data/maps/Route101/header.inc @@ -5,7 +5,7 @@ Route101:: @ 8305608 .4byte Route101_MapConnections .2byte MUS_DOORO1 .2byte 17 - .byte 16 + .byte MAPSEC_ROUTE_101 .byte 0 .byte 2 .byte 3 diff --git a/data/maps/Route102/header.inc b/data/maps/Route102/header.inc index a84770fae..47474298f 100644 --- a/data/maps/Route102/header.inc +++ b/data/maps/Route102/header.inc @@ -5,7 +5,7 @@ Route102:: @ 8305624 .4byte Route102_MapConnections .2byte MUS_DOORO1 .2byte 18 - .byte 17 + .byte MAPSEC_ROUTE_102 .byte 0 .byte 2 .byte 3 diff --git a/data/maps/Route103/header.inc b/data/maps/Route103/header.inc index f0423adeb..22659ecde 100644 --- a/data/maps/Route103/header.inc +++ b/data/maps/Route103/header.inc @@ -5,7 +5,7 @@ Route103:: @ 8305640 .4byte Route103_MapConnections .2byte MUS_DOORO1 .2byte 19 - .byte 18 + .byte MAPSEC_ROUTE_103 .byte 0 .byte 2 .byte 3 diff --git a/data/maps/Route104/header.inc b/data/maps/Route104/header.inc index da47dab56..4f2c4f972 100644 --- a/data/maps/Route104/header.inc +++ b/data/maps/Route104/header.inc @@ -5,7 +5,7 @@ Route104:: @ 830565C .4byte Route104_MapConnections .2byte MUS_NEXTROAD .2byte 20 - .byte 19 + .byte MAPSEC_ROUTE_104 .byte 0 .byte 2 .byte 3 diff --git a/data/maps/Route104_MrBrineysHouse/header.inc b/data/maps/Route104_MrBrineysHouse/header.inc index e5a626a43..008c91ec1 100644 --- a/data/maps/Route104_MrBrineysHouse/header.inc +++ b/data/maps/Route104_MrBrineysHouse/header.inc @@ -5,7 +5,7 @@ Route104_MrBrineysHouse:: @ 8306C20 .4byte 0x0 .2byte MUS_MACHI_S2 .2byte 102 - .byte 19 + .byte MAPSEC_ROUTE_104 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route104_PrettyPetalFlowerShop/header.inc b/data/maps/Route104_PrettyPetalFlowerShop/header.inc index 30e6625d8..ebcdaf716 100644 --- a/data/maps/Route104_PrettyPetalFlowerShop/header.inc +++ b/data/maps/Route104_PrettyPetalFlowerShop/header.inc @@ -5,7 +5,7 @@ Route104_PrettyPetalFlowerShop:: @ 8306C3C .4byte 0x0 .2byte MUS_MACHI_S2 .2byte 118 - .byte 19 + .byte MAPSEC_ROUTE_104 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route104_Prototype/header.inc b/data/maps/Route104_Prototype/header.inc index 3fbbdad95..a6226895e 100644 --- a/data/maps/Route104_Prototype/header.inc +++ b/data/maps/Route104_Prototype/header.inc @@ -5,7 +5,7 @@ Route104_Prototype:: @ 8307CF8 .4byte 0x0 .2byte MUS_NEXTROAD .2byte 288 - .byte 19 + .byte MAPSEC_ROUTE_104 .byte 0 .byte 2 .byte 3 diff --git a/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc b/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc index f7b4982aa..55d13f166 100644 --- a/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc +++ b/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc @@ -5,7 +5,7 @@ Route104_PrototypePrettyPetalFlowerShop:: @ 8307D14 .4byte 0x0 .2byte MUS_NEXTROAD .2byte 118 - .byte 19 + .byte MAPSEC_ROUTE_104 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route105/header.inc b/data/maps/Route105/header.inc index 79fedb244..596cd3f2f 100644 --- a/data/maps/Route105/header.inc +++ b/data/maps/Route105/header.inc @@ -5,7 +5,7 @@ Route105:: @ 8305678 .4byte Route105_MapConnections .2byte MUS_NEXTROAD .2byte 21 - .byte 20 + .byte MAPSEC_ROUTE_105 .byte 0 .byte 2 .byte 3 diff --git a/data/maps/Route106/header.inc b/data/maps/Route106/header.inc index bf8dd9626..a27e29335 100644 --- a/data/maps/Route106/header.inc +++ b/data/maps/Route106/header.inc @@ -5,7 +5,7 @@ Route106:: @ 8305694 .4byte Route106_MapConnections .2byte MUS_NEXTROAD .2byte 22 - .byte 21 + .byte MAPSEC_ROUTE_106 .byte 0 .byte 2 .byte 3 diff --git a/data/maps/Route107/header.inc b/data/maps/Route107/header.inc index 19ba4ebd6..cbb0a51d4 100644 --- a/data/maps/Route107/header.inc +++ b/data/maps/Route107/header.inc @@ -5,7 +5,7 @@ Route107:: @ 83056B0 .4byte Route107_MapConnections .2byte MUS_NEXTROAD .2byte 23 - .byte 22 + .byte MAPSEC_ROUTE_107 .byte 0 .byte 2 .byte 3 diff --git a/data/maps/Route108/header.inc b/data/maps/Route108/header.inc index 0169859e0..10b5577a7 100644 --- a/data/maps/Route108/header.inc +++ b/data/maps/Route108/header.inc @@ -5,7 +5,7 @@ Route108:: @ 83056CC .4byte Route108_MapConnections .2byte MUS_NEXTROAD .2byte 24 - .byte 23 + .byte MAPSEC_ROUTE_108 .byte 0 .byte 2 .byte 3 diff --git a/data/maps/Route109/header.inc b/data/maps/Route109/header.inc index 95c3cfaeb..fb6a4cfa5 100644 --- a/data/maps/Route109/header.inc +++ b/data/maps/Route109/header.inc @@ -5,7 +5,7 @@ Route109:: @ 83056E8 .4byte Route109_MapConnections .2byte MUS_NEXTROAD .2byte 25 - .byte 24 + .byte MAPSEC_ROUTE_109 .byte 0 .byte 2 .byte 3 diff --git a/data/maps/Route109_SeashoreHouse/header.inc b/data/maps/Route109_SeashoreHouse/header.inc index 6677181f7..2b862890c 100644 --- a/data/maps/Route109_SeashoreHouse/header.inc +++ b/data/maps/Route109_SeashoreHouse/header.inc @@ -5,7 +5,7 @@ Route109_SeashoreHouse:: @ 8307D30 .4byte 0x0 .2byte MUS_HIGHTOWN .2byte 244 - .byte 24 + .byte MAPSEC_ROUTE_109 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route110/header.inc b/data/maps/Route110/header.inc index 952233450..44f9171c5 100644 --- a/data/maps/Route110/header.inc +++ b/data/maps/Route110/header.inc @@ -5,7 +5,7 @@ Route110:: @ 8305704 .4byte Route110_MapConnections .2byte MUS_DOORO_X1 .2byte 26 - .byte 25 + .byte MAPSEC_ROUTE_110 .byte 0 .byte 2 .byte 3 diff --git a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc index 1fb9928b3..3c8cbc913 100644 --- a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc +++ b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc @@ -5,7 +5,7 @@ Route110_SeasideCyclingRoadNorthEntrance:: @ 8307E9C .4byte 0x0 .2byte MUS_FINECITY .2byte 257 - .byte 25 + .byte MAPSEC_ROUTE_110 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc index a4da7397c..92a567e79 100644 --- a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc +++ b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc @@ -5,7 +5,7 @@ Route110_SeasideCyclingRoadSouthEntrance:: @ 8307E80 .4byte 0x0 .2byte MUS_FINECITY .2byte 257 - .byte 25 + .byte MAPSEC_ROUTE_110 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route110_TrickHouseCorridor/header.inc b/data/maps/Route110_TrickHouseCorridor/header.inc index 14997e663..1917ca9e8 100644 --- a/data/maps/Route110_TrickHouseCorridor/header.inc +++ b/data/maps/Route110_TrickHouseCorridor/header.inc @@ -5,7 +5,7 @@ Route110_TrickHouseCorridor:: @ 8307D84 .4byte 0x0 .2byte MUS_KARAKURI .2byte 247 - .byte 25 + .byte MAPSEC_ROUTE_110 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route110_TrickHouseEnd/header.inc b/data/maps/Route110_TrickHouseEnd/header.inc index 58ca3e71d..bbd71f6e0 100644 --- a/data/maps/Route110_TrickHouseEnd/header.inc +++ b/data/maps/Route110_TrickHouseEnd/header.inc @@ -5,7 +5,7 @@ Route110_TrickHouseEnd:: @ 8307D68 .4byte 0x0 .2byte MUS_KARAKURI .2byte 246 - .byte 25 + .byte MAPSEC_ROUTE_110 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route110_TrickHouseEntrance/header.inc b/data/maps/Route110_TrickHouseEntrance/header.inc index 8146c2fa0..9e85c08b4 100644 --- a/data/maps/Route110_TrickHouseEntrance/header.inc +++ b/data/maps/Route110_TrickHouseEntrance/header.inc @@ -5,7 +5,7 @@ Route110_TrickHouseEntrance:: @ 8307D4C .4byte 0x0 .2byte MUS_KARAKURI .2byte 245 - .byte 25 + .byte MAPSEC_ROUTE_110 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route110_TrickHousePuzzle1/header.inc b/data/maps/Route110_TrickHousePuzzle1/header.inc index 18d772089..5ccf92339 100644 --- a/data/maps/Route110_TrickHousePuzzle1/header.inc +++ b/data/maps/Route110_TrickHousePuzzle1/header.inc @@ -5,7 +5,7 @@ Route110_TrickHousePuzzle1:: @ 8307DA0 .4byte 0x0 .2byte MUS_KARAKURI .2byte 248 - .byte 25 + .byte MAPSEC_ROUTE_110 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route110_TrickHousePuzzle2/header.inc b/data/maps/Route110_TrickHousePuzzle2/header.inc index 489d213d9..79956b4ce 100644 --- a/data/maps/Route110_TrickHousePuzzle2/header.inc +++ b/data/maps/Route110_TrickHousePuzzle2/header.inc @@ -5,7 +5,7 @@ Route110_TrickHousePuzzle2:: @ 8307DBC .4byte 0x0 .2byte MUS_KARAKURI .2byte 249 - .byte 25 + .byte MAPSEC_ROUTE_110 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route110_TrickHousePuzzle3/header.inc b/data/maps/Route110_TrickHousePuzzle3/header.inc index c8b2da4a3..39757f11c 100644 --- a/data/maps/Route110_TrickHousePuzzle3/header.inc +++ b/data/maps/Route110_TrickHousePuzzle3/header.inc @@ -5,7 +5,7 @@ Route110_TrickHousePuzzle3:: @ 8307DD8 .4byte 0x0 .2byte MUS_KARAKURI .2byte 250 - .byte 25 + .byte MAPSEC_ROUTE_110 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route110_TrickHousePuzzle4/header.inc b/data/maps/Route110_TrickHousePuzzle4/header.inc index b06a1404f..42240589e 100644 --- a/data/maps/Route110_TrickHousePuzzle4/header.inc +++ b/data/maps/Route110_TrickHousePuzzle4/header.inc @@ -5,7 +5,7 @@ Route110_TrickHousePuzzle4:: @ 8307DF4 .4byte 0x0 .2byte MUS_KARAKURI .2byte 251 - .byte 25 + .byte MAPSEC_ROUTE_110 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route110_TrickHousePuzzle5/header.inc b/data/maps/Route110_TrickHousePuzzle5/header.inc index dc42453f4..66633e116 100644 --- a/data/maps/Route110_TrickHousePuzzle5/header.inc +++ b/data/maps/Route110_TrickHousePuzzle5/header.inc @@ -5,7 +5,7 @@ Route110_TrickHousePuzzle5:: @ 8307E10 .4byte 0x0 .2byte MUS_KARAKURI .2byte 252 - .byte 25 + .byte MAPSEC_ROUTE_110 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route110_TrickHousePuzzle6/header.inc b/data/maps/Route110_TrickHousePuzzle6/header.inc index 3377987da..8e481c0d2 100644 --- a/data/maps/Route110_TrickHousePuzzle6/header.inc +++ b/data/maps/Route110_TrickHousePuzzle6/header.inc @@ -5,7 +5,7 @@ Route110_TrickHousePuzzle6:: @ 8307E2C .4byte 0x0 .2byte MUS_KARAKURI .2byte 253 - .byte 25 + .byte MAPSEC_ROUTE_110 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route110_TrickHousePuzzle7/header.inc b/data/maps/Route110_TrickHousePuzzle7/header.inc index 84014fdb5..7dbfeee9c 100644 --- a/data/maps/Route110_TrickHousePuzzle7/header.inc +++ b/data/maps/Route110_TrickHousePuzzle7/header.inc @@ -5,7 +5,7 @@ Route110_TrickHousePuzzle7:: @ 8307E48 .4byte 0x0 .2byte MUS_KARAKURI .2byte 254 - .byte 25 + .byte MAPSEC_ROUTE_110 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route110_TrickHousePuzzle8/header.inc b/data/maps/Route110_TrickHousePuzzle8/header.inc index ede90bbe4..b5c19da8c 100644 --- a/data/maps/Route110_TrickHousePuzzle8/header.inc +++ b/data/maps/Route110_TrickHousePuzzle8/header.inc @@ -5,7 +5,7 @@ Route110_TrickHousePuzzle8:: @ 8307E64 .4byte 0x0 .2byte MUS_KARAKURI .2byte 255 - .byte 25 + .byte MAPSEC_ROUTE_110 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route111/header.inc b/data/maps/Route111/header.inc index 3dd09e33b..08bdee199 100644 --- a/data/maps/Route111/header.inc +++ b/data/maps/Route111/header.inc @@ -5,7 +5,7 @@ Route111:: @ 8305720 .4byte Route111_MapConnections .2byte MUS_DOORO_X1 .2byte 27 - .byte 26 + .byte MAPSEC_ROUTE_111 .byte 0 .byte 2 .byte 3 diff --git a/data/maps/Route111_OldLadysRestStop/header.inc b/data/maps/Route111_OldLadysRestStop/header.inc index 8536613b9..da9e9f2b2 100644 --- a/data/maps/Route111_OldLadysRestStop/header.inc +++ b/data/maps/Route111_OldLadysRestStop/header.inc @@ -5,7 +5,7 @@ Route111_OldLadysRestStop:: @ 8306C74 .4byte 0x0 .2byte MUS_GOTOWN .2byte 64 - .byte 26 + .byte MAPSEC_ROUTE_111 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route111_WinstrateFamilysHouse/header.inc b/data/maps/Route111_WinstrateFamilysHouse/header.inc index 7cac82463..286ba879b 100644 --- a/data/maps/Route111_WinstrateFamilysHouse/header.inc +++ b/data/maps/Route111_WinstrateFamilysHouse/header.inc @@ -5,7 +5,7 @@ Route111_WinstrateFamilysHouse:: @ 8306C58 .4byte 0x0 .2byte MUS_GOTOWN .2byte 60 - .byte 26 + .byte MAPSEC_ROUTE_111 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route112/header.inc b/data/maps/Route112/header.inc index dc9a96bd6..9181e6742 100644 --- a/data/maps/Route112/header.inc +++ b/data/maps/Route112/header.inc @@ -5,7 +5,7 @@ Route112:: @ 830573C .4byte Route112_MapConnections .2byte MUS_DOORO_X1 .2byte 28 - .byte 27 + .byte MAPSEC_ROUTE_112 .byte 0 .byte 2 .byte 3 diff --git a/data/maps/Route112_CableCarStation/header.inc b/data/maps/Route112_CableCarStation/header.inc index 881f4591d..3621f354d 100644 --- a/data/maps/Route112_CableCarStation/header.inc +++ b/data/maps/Route112_CableCarStation/header.inc @@ -5,7 +5,7 @@ Route112_CableCarStation:: @ 8306C90 .4byte 0x0 .2byte MUS_DOORO_X1 .2byte 119 - .byte 27 + .byte MAPSEC_ROUTE_112 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route113/header.inc b/data/maps/Route113/header.inc index 9097be2f9..fb951f745 100644 --- a/data/maps/Route113/header.inc +++ b/data/maps/Route113/header.inc @@ -5,7 +5,7 @@ Route113:: @ 8305758 .4byte Route113_MapConnections .2byte MUS_KAZANBAI .2byte 29 - .byte 28 + .byte MAPSEC_ROUTE_113 .byte 0 .byte 2 .byte 3 diff --git a/data/maps/Route113_GlassWorkshop/header.inc b/data/maps/Route113_GlassWorkshop/header.inc index e63be2dee..b91ea7e31 100644 --- a/data/maps/Route113_GlassWorkshop/header.inc +++ b/data/maps/Route113_GlassWorkshop/header.inc @@ -5,7 +5,7 @@ Route113_GlassWorkshop:: @ 8307EB8 .4byte 0x0 .2byte MUS_GOTOWN .2byte 67 - .byte 28 + .byte MAPSEC_ROUTE_113 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route114/header.inc b/data/maps/Route114/header.inc index afeb34813..463b73fc6 100644 --- a/data/maps/Route114/header.inc +++ b/data/maps/Route114/header.inc @@ -5,7 +5,7 @@ Route114:: @ 8305774 .4byte Route114_MapConnections .2byte MUS_DOORO_X1 .2byte 30 - .byte 29 + .byte MAPSEC_ROUTE_114 .byte 0 .byte 2 .byte 3 diff --git a/data/maps/Route114_FossilManiacsHouse/header.inc b/data/maps/Route114_FossilManiacsHouse/header.inc index cd580f692..6d3a91f9b 100644 --- a/data/maps/Route114_FossilManiacsHouse/header.inc +++ b/data/maps/Route114_FossilManiacsHouse/header.inc @@ -5,7 +5,7 @@ Route114_FossilManiacsHouse:: @ 8306CC8 .4byte 0x0 .2byte MUS_TONEKUSA .2byte 120 - .byte 29 + .byte MAPSEC_ROUTE_114 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route114_FossilManiacsTunnel/header.inc b/data/maps/Route114_FossilManiacsTunnel/header.inc index 7cd10eb1a..fb13a0014 100644 --- a/data/maps/Route114_FossilManiacsTunnel/header.inc +++ b/data/maps/Route114_FossilManiacsTunnel/header.inc @@ -5,7 +5,7 @@ Route114_FossilManiacsTunnel:: @ 8306CE4 .4byte 0x0 .2byte MUS_TONEKUSA .2byte 121 - .byte 29 + .byte MAPSEC_ROUTE_114 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route114_LanettesHouse/header.inc b/data/maps/Route114_LanettesHouse/header.inc index d37f4a323..5ec566a97 100644 --- a/data/maps/Route114_LanettesHouse/header.inc +++ b/data/maps/Route114_LanettesHouse/header.inc @@ -5,7 +5,7 @@ Route114_LanettesHouse:: @ 8306D00 .4byte 0x0 .2byte MUS_TONEKUSA .2byte 122 - .byte 29 + .byte MAPSEC_ROUTE_114 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route115/header.inc b/data/maps/Route115/header.inc index 208c24a76..2b4ed1a8e 100644 --- a/data/maps/Route115/header.inc +++ b/data/maps/Route115/header.inc @@ -5,7 +5,7 @@ Route115:: @ 8305790 .4byte Route115_MapConnections .2byte MUS_NEXTROAD .2byte 31 - .byte 30 + .byte MAPSEC_ROUTE_115 .byte 0 .byte 2 .byte 3 diff --git a/data/maps/Route116/header.inc b/data/maps/Route116/header.inc index 27d26658f..ca397e802 100644 --- a/data/maps/Route116/header.inc +++ b/data/maps/Route116/header.inc @@ -5,7 +5,7 @@ Route116:: @ 83057AC .4byte Route116_MapConnections .2byte MUS_NEXTROAD .2byte 32 - .byte 31 + .byte MAPSEC_ROUTE_116 .byte 0 .byte 2 .byte 3 diff --git a/data/maps/Route116_TunnelersRestHouse/header.inc b/data/maps/Route116_TunnelersRestHouse/header.inc index a446833da..1dfc79fd7 100644 --- a/data/maps/Route116_TunnelersRestHouse/header.inc +++ b/data/maps/Route116_TunnelersRestHouse/header.inc @@ -5,7 +5,7 @@ Route116_TunnelersRestHouse:: @ 8306D1C .4byte 0x0 .2byte MUS_GOTOWN .2byte 123 - .byte 31 + .byte MAPSEC_ROUTE_116 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route117/header.inc b/data/maps/Route117/header.inc index 11df4b60f..05481f3f6 100644 --- a/data/maps/Route117/header.inc +++ b/data/maps/Route117/header.inc @@ -5,7 +5,7 @@ Route117:: @ 83057C8 .4byte Route117_MapConnections .2byte MUS_DOORO_X1 .2byte 33 - .byte 32 + .byte MAPSEC_ROUTE_117 .byte 0 .byte 2 .byte 3 diff --git a/data/maps/Route117_PokemonDayCare/header.inc b/data/maps/Route117_PokemonDayCare/header.inc index 0a4f59499..1f3e8ab1b 100644 --- a/data/maps/Route117_PokemonDayCare/header.inc +++ b/data/maps/Route117_PokemonDayCare/header.inc @@ -5,7 +5,7 @@ Route117_PokemonDayCare:: @ 8306D38 .4byte 0x0 .2byte MUS_GOTOWN .2byte 124 - .byte 32 + .byte MAPSEC_ROUTE_117 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route118/header.inc b/data/maps/Route118/header.inc index 930a9d860..7db58629e 100644 --- a/data/maps/Route118/header.inc +++ b/data/maps/Route118/header.inc @@ -5,7 +5,7 @@ Route118:: @ 83057E4 .4byte Route118_MapConnections .2byte MUS_ROUTE_118 .2byte 34 - .byte 33 + .byte MAPSEC_ROUTE_118 .byte 0 .byte 2 .byte 3 diff --git a/data/maps/Route119/header.inc b/data/maps/Route119/header.inc index 98d0ea5f6..31ff54e69 100644 --- a/data/maps/Route119/header.inc +++ b/data/maps/Route119/header.inc @@ -5,7 +5,7 @@ Route119:: @ 8305800 .4byte Route119_MapConnections .2byte MUS_GRANROAD .2byte 35 - .byte 34 + .byte MAPSEC_ROUTE_119 .byte 0 .byte 2 .byte 3 diff --git a/data/maps/Route119_House/header.inc b/data/maps/Route119_House/header.inc index 3a7cdcbbd..3f3a674c1 100644 --- a/data/maps/Route119_House/header.inc +++ b/data/maps/Route119_House/header.inc @@ -5,7 +5,7 @@ Route119_House:: @ 8307F28 .4byte 0x0 .2byte MUS_GOTOWN .2byte 59 - .byte 34 + .byte MAPSEC_ROUTE_119 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route119_WeatherInstitute_1F/header.inc b/data/maps/Route119_WeatherInstitute_1F/header.inc index b35d3cccf..c1d5e4a19 100644 --- a/data/maps/Route119_WeatherInstitute_1F/header.inc +++ b/data/maps/Route119_WeatherInstitute_1F/header.inc @@ -5,7 +5,7 @@ Route119_WeatherInstitute_1F:: @ 8307EF0 .4byte 0x0 .2byte MUS_GOTOWN .2byte 272 - .byte 34 + .byte MAPSEC_ROUTE_119 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route119_WeatherInstitute_2F/header.inc b/data/maps/Route119_WeatherInstitute_2F/header.inc index b93deba00..cab0cff36 100644 --- a/data/maps/Route119_WeatherInstitute_2F/header.inc +++ b/data/maps/Route119_WeatherInstitute_2F/header.inc @@ -5,7 +5,7 @@ Route119_WeatherInstitute_2F:: @ 8307F0C .4byte 0x0 .2byte MUS_GOTOWN .2byte 273 - .byte 34 + .byte MAPSEC_ROUTE_119 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route120/header.inc b/data/maps/Route120/header.inc index 10f7725b7..329aad838 100644 --- a/data/maps/Route120/header.inc +++ b/data/maps/Route120/header.inc @@ -5,7 +5,7 @@ Route120:: @ 830581C .4byte Route120_MapConnections .2byte MUS_DOORO_X3 .2byte 36 - .byte 35 + .byte MAPSEC_ROUTE_120 .byte 0 .byte 2 .byte 3 diff --git a/data/maps/Route121/header.inc b/data/maps/Route121/header.inc index 918fe47f6..096e898e7 100644 --- a/data/maps/Route121/header.inc +++ b/data/maps/Route121/header.inc @@ -5,7 +5,7 @@ Route121:: @ 8305838 .4byte Route121_MapConnections .2byte MUS_DOORO_X3 .2byte 37 - .byte 36 + .byte MAPSEC_ROUTE_121 .byte 0 .byte 2 .byte 3 diff --git a/data/maps/Route121_SafariZoneEntrance/header.inc b/data/maps/Route121_SafariZoneEntrance/header.inc index 0d97afab4..eaf333fab 100644 --- a/data/maps/Route121_SafariZoneEntrance/header.inc +++ b/data/maps/Route121_SafariZoneEntrance/header.inc @@ -5,7 +5,7 @@ Route121_SafariZoneEntrance:: @ 8306D54 .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 125 - .byte 36 + .byte MAPSEC_ROUTE_121 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route122/header.inc b/data/maps/Route122/header.inc index c6a2d4e4d..8dbd09231 100644 --- a/data/maps/Route122/header.inc +++ b/data/maps/Route122/header.inc @@ -5,7 +5,7 @@ Route122:: @ 8305854 .4byte Route122_MapConnections .2byte MUS_DOORO_X4 .2byte 38 - .byte 37 + .byte MAPSEC_ROUTE_122 .byte 0 .byte 2 .byte 3 diff --git a/data/maps/Route123/header.inc b/data/maps/Route123/header.inc index 87c3ed8a6..49d62bc91 100644 --- a/data/maps/Route123/header.inc +++ b/data/maps/Route123/header.inc @@ -5,7 +5,7 @@ Route123:: @ 8305870 .4byte Route123_MapConnections .2byte MUS_DOORO_X4 .2byte 39 - .byte 38 + .byte MAPSEC_ROUTE_123 .byte 0 .byte 2 .byte 3 diff --git a/data/maps/Route123_BerryMastersHouse/header.inc b/data/maps/Route123_BerryMastersHouse/header.inc index 427ef4720..8925ce819 100644 --- a/data/maps/Route123_BerryMastersHouse/header.inc +++ b/data/maps/Route123_BerryMastersHouse/header.inc @@ -5,7 +5,7 @@ Route123_BerryMastersHouse:: @ 8307ED4 .4byte 0x0 .2byte MUS_GOTOWN .2byte 60 - .byte 38 + .byte MAPSEC_ROUTE_123 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route124/header.inc b/data/maps/Route124/header.inc index c2c5cd41d..ec5f01fa1 100644 --- a/data/maps/Route124/header.inc +++ b/data/maps/Route124/header.inc @@ -5,7 +5,7 @@ Route124:: @ 830588C .4byte Route124_MapConnections .2byte MUS_DOORO_X3 .2byte 40 - .byte 39 + .byte MAPSEC_ROUTE_124 .byte 0 .byte 2 .byte 6 diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/header.inc b/data/maps/Route124_DivingTreasureHuntersHouse/header.inc index 259e378de..48c9a240b 100644 --- a/data/maps/Route124_DivingTreasureHuntersHouse/header.inc +++ b/data/maps/Route124_DivingTreasureHuntersHouse/header.inc @@ -5,7 +5,7 @@ Route124_DivingTreasureHuntersHouse:: @ 8307F44 .4byte 0x0 .2byte MUS_MINAMO .2byte 302 - .byte 39 + .byte MAPSEC_ROUTE_124 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route125/header.inc b/data/maps/Route125/header.inc index cb315cc66..baadfc335 100644 --- a/data/maps/Route125/header.inc +++ b/data/maps/Route125/header.inc @@ -5,7 +5,7 @@ Route125:: @ 83058A8 .4byte Route125_MapConnections .2byte MUS_DOORO_X3 .2byte 41 - .byte 40 + .byte MAPSEC_ROUTE_125 .byte 0 .byte 2 .byte 6 diff --git a/data/maps/Route126/header.inc b/data/maps/Route126/header.inc index 0539f9007..de5cd84ff 100644 --- a/data/maps/Route126/header.inc +++ b/data/maps/Route126/header.inc @@ -5,7 +5,7 @@ Route126:: @ 83058C4 .4byte Route126_MapConnections .2byte MUS_DOORO_X3 .2byte 42 - .byte 41 + .byte MAPSEC_ROUTE_126 .byte 0 .byte 2 .byte 6 diff --git a/data/maps/Route127/header.inc b/data/maps/Route127/header.inc index abd4154cc..b29d15194 100644 --- a/data/maps/Route127/header.inc +++ b/data/maps/Route127/header.inc @@ -5,7 +5,7 @@ Route127:: @ 83058E0 .4byte Route127_MapConnections .2byte MUS_DOORO_X3 .2byte 43 - .byte 42 + .byte MAPSEC_ROUTE_127 .byte 0 .byte 2 .byte 6 diff --git a/data/maps/Route128/header.inc b/data/maps/Route128/header.inc index df2b21a6e..76abd4ac8 100644 --- a/data/maps/Route128/header.inc +++ b/data/maps/Route128/header.inc @@ -5,7 +5,7 @@ Route128:: @ 83058FC .4byte Route128_MapConnections .2byte MUS_DOORO_X3 .2byte 44 - .byte 43 + .byte MAPSEC_ROUTE_128 .byte 0 .byte 2 .byte 6 diff --git a/data/maps/Route129/header.inc b/data/maps/Route129/header.inc index a1285fe08..608152d59 100644 --- a/data/maps/Route129/header.inc +++ b/data/maps/Route129/header.inc @@ -5,7 +5,7 @@ Route129:: @ 8305918 .4byte Route129_MapConnections .2byte MUS_GRANROAD .2byte 45 - .byte 44 + .byte MAPSEC_ROUTE_129 .byte 0 .byte 2 .byte 6 diff --git a/data/maps/Route130/header.inc b/data/maps/Route130/header.inc index f286a2b81..c52b1a515 100644 --- a/data/maps/Route130/header.inc +++ b/data/maps/Route130/header.inc @@ -5,7 +5,7 @@ Route130:: @ 8305934 .4byte Route130_MapConnections .2byte MUS_GRANROAD .2byte 264 - .byte 45 + .byte MAPSEC_ROUTE_130 .byte 0 .byte 2 .byte 6 diff --git a/data/maps/Route131/header.inc b/data/maps/Route131/header.inc index 51b4d9e4f..fbda14a39 100644 --- a/data/maps/Route131/header.inc +++ b/data/maps/Route131/header.inc @@ -5,7 +5,7 @@ Route131:: @ 8305950 .4byte Route131_MapConnections .2byte MUS_GRANROAD .2byte 47 - .byte 46 + .byte MAPSEC_ROUTE_131 .byte 0 .byte 2 .byte 6 diff --git a/data/maps/Route132/header.inc b/data/maps/Route132/header.inc index 4f2e2d47f..591450ca8 100644 --- a/data/maps/Route132/header.inc +++ b/data/maps/Route132/header.inc @@ -5,7 +5,7 @@ Route132:: @ 830596C .4byte Route132_MapConnections .2byte MUS_GRANROAD .2byte 48 - .byte 47 + .byte MAPSEC_ROUTE_132 .byte 0 .byte 2 .byte 6 diff --git a/data/maps/Route133/header.inc b/data/maps/Route133/header.inc index 3cd851068..37673de99 100644 --- a/data/maps/Route133/header.inc +++ b/data/maps/Route133/header.inc @@ -5,7 +5,7 @@ Route133:: @ 8305988 .4byte Route133_MapConnections .2byte MUS_GRANROAD .2byte 49 - .byte 48 + .byte MAPSEC_ROUTE_133 .byte 0 .byte 2 .byte 6 diff --git a/data/maps/Route134/header.inc b/data/maps/Route134/header.inc index 15fe8168e..7583194dc 100644 --- a/data/maps/Route134/header.inc +++ b/data/maps/Route134/header.inc @@ -5,7 +5,7 @@ Route134:: @ 83059A4 .4byte Route134_MapConnections .2byte MUS_GRANROAD .2byte 50 - .byte 49 + .byte MAPSEC_ROUTE_134 .byte 0 .byte 2 .byte 6 diff --git a/data/maps/RustboroCity/header.inc b/data/maps/RustboroCity/header.inc index 73af7f1fc..6bb3148f3 100644 --- a/data/maps/RustboroCity/header.inc +++ b/data/maps/RustboroCity/header.inc @@ -5,7 +5,7 @@ RustboroCity:: @ 830549C .4byte RustboroCity_MapConnections .2byte MUS_GOTOWN .2byte 4 - .byte 10 + .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte 2 .byte 2 diff --git a/data/maps/RustboroCity_CuttersHouse/header.inc b/data/maps/RustboroCity_CuttersHouse/header.inc index c1aa1fc37..da7f7fc19 100644 --- a/data/maps/RustboroCity_CuttersHouse/header.inc +++ b/data/maps/RustboroCity_CuttersHouse/header.inc @@ -5,7 +5,7 @@ RustboroCity_CuttersHouse:: @ 8306360 .4byte 0x0 .2byte MUS_GOTOWN .2byte 98 - .byte 10 + .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/RustboroCity_DevonCorp_1F/header.inc b/data/maps/RustboroCity_DevonCorp_1F/header.inc index e0148dea7..50d4eb0a1 100644 --- a/data/maps/RustboroCity_DevonCorp_1F/header.inc +++ b/data/maps/RustboroCity_DevonCorp_1F/header.inc @@ -5,7 +5,7 @@ RustboroCity_DevonCorp_1F:: @ 830622C .4byte 0x0 .2byte MUS_GOTOWN .2byte 92 - .byte 10 + .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/RustboroCity_DevonCorp_2F/header.inc b/data/maps/RustboroCity_DevonCorp_2F/header.inc index dbed45197..3824d26af 100644 --- a/data/maps/RustboroCity_DevonCorp_2F/header.inc +++ b/data/maps/RustboroCity_DevonCorp_2F/header.inc @@ -5,7 +5,7 @@ RustboroCity_DevonCorp_2F:: @ 8306248 .4byte 0x0 .2byte MUS_GOTOWN .2byte 93 - .byte 10 + .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/RustboroCity_DevonCorp_3F/header.inc b/data/maps/RustboroCity_DevonCorp_3F/header.inc index b8cadbed2..5b9c9f610 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/header.inc +++ b/data/maps/RustboroCity_DevonCorp_3F/header.inc @@ -5,7 +5,7 @@ RustboroCity_DevonCorp_3F:: @ 8306264 .4byte 0x0 .2byte MUS_GOTOWN .2byte 270 - .byte 10 + .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/RustboroCity_Flat1_1F/header.inc b/data/maps/RustboroCity_Flat1_1F/header.inc index 3d1739875..c8651f6e4 100644 --- a/data/maps/RustboroCity_Flat1_1F/header.inc +++ b/data/maps/RustboroCity_Flat1_1F/header.inc @@ -5,7 +5,7 @@ RustboroCity_Flat1_1F:: @ 830630C .4byte 0x0 .2byte MUS_GOTOWN .2byte 314 - .byte 10 + .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/RustboroCity_Flat1_2F/header.inc b/data/maps/RustboroCity_Flat1_2F/header.inc index 0ae9dd797..623105877 100644 --- a/data/maps/RustboroCity_Flat1_2F/header.inc +++ b/data/maps/RustboroCity_Flat1_2F/header.inc @@ -5,7 +5,7 @@ RustboroCity_Flat1_2F:: @ 8306328 .4byte 0x0 .2byte MUS_GOTOWN .2byte 315 - .byte 10 + .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/RustboroCity_Flat2_1F/header.inc b/data/maps/RustboroCity_Flat2_1F/header.inc index 3a9ee86c3..7a3e8e6ed 100644 --- a/data/maps/RustboroCity_Flat2_1F/header.inc +++ b/data/maps/RustboroCity_Flat2_1F/header.inc @@ -5,7 +5,7 @@ RustboroCity_Flat2_1F:: @ 8306398 .4byte 0x0 .2byte MUS_GOTOWN .2byte 295 - .byte 10 + .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/RustboroCity_Flat2_2F/header.inc b/data/maps/RustboroCity_Flat2_2F/header.inc index da3544023..b3d46b826 100644 --- a/data/maps/RustboroCity_Flat2_2F/header.inc +++ b/data/maps/RustboroCity_Flat2_2F/header.inc @@ -5,7 +5,7 @@ RustboroCity_Flat2_2F:: @ 83063B4 .4byte 0x0 .2byte MUS_GOTOWN .2byte 296 - .byte 10 + .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/RustboroCity_Flat2_3F/header.inc b/data/maps/RustboroCity_Flat2_3F/header.inc index 9d5235d93..26340c97f 100644 --- a/data/maps/RustboroCity_Flat2_3F/header.inc +++ b/data/maps/RustboroCity_Flat2_3F/header.inc @@ -5,7 +5,7 @@ RustboroCity_Flat2_3F:: @ 83063D0 .4byte 0x0 .2byte MUS_GOTOWN .2byte 297 - .byte 10 + .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/RustboroCity_Gym/header.inc b/data/maps/RustboroCity_Gym/header.inc index d98b04da8..eff57079b 100644 --- a/data/maps/RustboroCity_Gym/header.inc +++ b/data/maps/RustboroCity_Gym/header.inc @@ -5,7 +5,7 @@ RustboroCity_Gym:: @ 8306280 .4byte 0x0 .2byte MUS_GIM .2byte 94 - .byte 10 + .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/RustboroCity_House1/header.inc b/data/maps/RustboroCity_House1/header.inc index 34d733c02..d8186a144 100644 --- a/data/maps/RustboroCity_House1/header.inc +++ b/data/maps/RustboroCity_House1/header.inc @@ -5,7 +5,7 @@ RustboroCity_House1:: @ 8306344 .4byte 0x0 .2byte MUS_GOTOWN .2byte 97 - .byte 10 + .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/RustboroCity_House2/header.inc b/data/maps/RustboroCity_House2/header.inc index be12d46f8..51c2df96d 100644 --- a/data/maps/RustboroCity_House2/header.inc +++ b/data/maps/RustboroCity_House2/header.inc @@ -5,7 +5,7 @@ RustboroCity_House2:: @ 830637C .4byte 0x0 .2byte MUS_GOTOWN .2byte 96 - .byte 10 + .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/RustboroCity_House3/header.inc b/data/maps/RustboroCity_House3/header.inc index 7c23668ca..3fe416c2e 100644 --- a/data/maps/RustboroCity_House3/header.inc +++ b/data/maps/RustboroCity_House3/header.inc @@ -5,7 +5,7 @@ RustboroCity_House3:: @ 83063EC .4byte 0x0 .2byte MUS_GOTOWN .2byte 96 - .byte 10 + .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/RustboroCity_Mart/header.inc b/data/maps/RustboroCity_Mart/header.inc index 88af62f92..dc4e5fa95 100644 --- a/data/maps/RustboroCity_Mart/header.inc +++ b/data/maps/RustboroCity_Mart/header.inc @@ -5,7 +5,7 @@ RustboroCity_Mart:: @ 83062F0 .4byte 0x0 .2byte MUS_FRIENDLY .2byte 63 - .byte 10 + .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/RustboroCity_PokemonCenter_1F/header.inc b/data/maps/RustboroCity_PokemonCenter_1F/header.inc index 9b98aff0c..c6d157934 100644 --- a/data/maps/RustboroCity_PokemonCenter_1F/header.inc +++ b/data/maps/RustboroCity_PokemonCenter_1F/header.inc @@ -5,7 +5,7 @@ RustboroCity_PokemonCenter_1F:: @ 83062B8 .4byte 0x0 .2byte MUS_POKECEN .2byte 61 - .byte 10 + .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/RustboroCity_PokemonCenter_2F/header.inc b/data/maps/RustboroCity_PokemonCenter_2F/header.inc index ff85dfc1d..519a795b3 100644 --- a/data/maps/RustboroCity_PokemonCenter_2F/header.inc +++ b/data/maps/RustboroCity_PokemonCenter_2F/header.inc @@ -5,7 +5,7 @@ RustboroCity_PokemonCenter_2F:: @ 83062D4 .4byte 0x0 .2byte MUS_POKECEN .2byte 62 - .byte 10 + .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/RustboroCity_PokemonSchool/header.inc b/data/maps/RustboroCity_PokemonSchool/header.inc index 98f0e1b1d..c2fcd9dcb 100644 --- a/data/maps/RustboroCity_PokemonSchool/header.inc +++ b/data/maps/RustboroCity_PokemonSchool/header.inc @@ -5,7 +5,7 @@ RustboroCity_PokemonSchool:: @ 830629C .4byte 0x0 .2byte MUS_P_SCHOOL .2byte 95 - .byte 10 + .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/RusturfTunnel/header.inc b/data/maps/RusturfTunnel/header.inc index a3d4108ce..8ad0d2d1a 100644 --- a/data/maps/RusturfTunnel/header.inc +++ b/data/maps/RusturfTunnel/header.inc @@ -5,7 +5,7 @@ RusturfTunnel:: @ 8306DE0 .4byte 0x0 .2byte MUS_DAN01 .2byte 130 - .byte 60 + .byte MAPSEC_RUSTURF_TUNNEL .byte 0 .byte 6 .byte 4 diff --git a/data/maps/SSTidalCorridor/header.inc b/data/maps/SSTidalCorridor/header.inc index 4f55319d8..ddb74ae22 100644 --- a/data/maps/SSTidalCorridor/header.inc +++ b/data/maps/SSTidalCorridor/header.inc @@ -5,7 +5,7 @@ SSTidalCorridor:: @ 8307B54 .4byte 0x0 .2byte MUS_M_BOAT .2byte 278 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SSTidalLowerDeck/header.inc b/data/maps/SSTidalLowerDeck/header.inc index c52690612..dac40a5a8 100644 --- a/data/maps/SSTidalLowerDeck/header.inc +++ b/data/maps/SSTidalLowerDeck/header.inc @@ -5,7 +5,7 @@ SSTidalLowerDeck:: @ 8307B70 .4byte 0x0 .2byte MUS_M_BOAT .2byte 279 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SSTidalRooms/header.inc b/data/maps/SSTidalRooms/header.inc index 09fb99472..837feae65 100644 --- a/data/maps/SSTidalRooms/header.inc +++ b/data/maps/SSTidalRooms/header.inc @@ -5,7 +5,7 @@ SSTidalRooms:: @ 8307B8C .4byte 0x0 .2byte MUS_M_BOAT .2byte 280 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SafariZone_Northeast/header.inc b/data/maps/SafariZone_Northeast/header.inc index b4939c053..07e2a6b79 100644 --- a/data/maps/SafariZone_Northeast/header.inc +++ b/data/maps/SafariZone_Northeast/header.inc @@ -5,7 +5,7 @@ SafariZone_Northeast:: @ 8307BC4 .4byte SafariZone_Northeast_MapConnections .2byte MUS_SAFARI .2byte 240 - .byte 57 + .byte MAPSEC_SAFARI_ZONE .byte 0 .byte 0 .byte 3 diff --git a/data/maps/SafariZone_Northwest/header.inc b/data/maps/SafariZone_Northwest/header.inc index 533f797a5..850d29f3b 100644 --- a/data/maps/SafariZone_Northwest/header.inc +++ b/data/maps/SafariZone_Northwest/header.inc @@ -5,7 +5,7 @@ SafariZone_Northwest:: @ 8307BA8 .4byte SafariZone_Northwest_MapConnections .2byte MUS_SAFARI .2byte 239 - .byte 57 + .byte MAPSEC_SAFARI_ZONE .byte 0 .byte 0 .byte 3 diff --git a/data/maps/SafariZone_RestHouse/header.inc b/data/maps/SafariZone_RestHouse/header.inc index f13ab4f49..b6bc6ec1a 100644 --- a/data/maps/SafariZone_RestHouse/header.inc +++ b/data/maps/SafariZone_RestHouse/header.inc @@ -5,7 +5,7 @@ SafariZone_RestHouse:: @ 8307CDC .4byte 0x0 .2byte MUS_SAFARI .2byte 330 - .byte 57 + .byte MAPSEC_SAFARI_ZONE .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SafariZone_Southeast/header.inc b/data/maps/SafariZone_Southeast/header.inc index f60a67472..41aa821c7 100644 --- a/data/maps/SafariZone_Southeast/header.inc +++ b/data/maps/SafariZone_Southeast/header.inc @@ -5,7 +5,7 @@ SafariZone_Southeast:: @ 8307BFC .4byte SafariZone_Southeast_MapConnections .2byte MUS_SAFARI .2byte 242 - .byte 57 + .byte MAPSEC_SAFARI_ZONE .byte 0 .byte 0 .byte 3 diff --git a/data/maps/SafariZone_Southwest/header.inc b/data/maps/SafariZone_Southwest/header.inc index 9a472f3ec..823c795b5 100644 --- a/data/maps/SafariZone_Southwest/header.inc +++ b/data/maps/SafariZone_Southwest/header.inc @@ -5,7 +5,7 @@ SafariZone_Southwest:: @ 8307BE0 .4byte SafariZone_Southwest_MapConnections .2byte MUS_SAFARI .2byte 241 - .byte 57 + .byte MAPSEC_SAFARI_ZONE .byte 0 .byte 0 .byte 3 diff --git a/data/maps/ScorchedSlab/header.inc b/data/maps/ScorchedSlab/header.inc index 43b6b24b5..73a32b237 100644 --- a/data/maps/ScorchedSlab/header.inc +++ b/data/maps/ScorchedSlab/header.inc @@ -5,7 +5,7 @@ ScorchedSlab:: @ 830756C .4byte 0x0 .2byte MUS_DAN01 .2byte 312 - .byte 80 + .byte MAPSEC_SCORCHED_SLAB .byte 0 .byte 0 .byte 4 diff --git a/data/maps/SeafloorCavern_Entrance/header.inc b/data/maps/SeafloorCavern_Entrance/header.inc index 4f48878a8..17791949a 100644 --- a/data/maps/SeafloorCavern_Entrance/header.inc +++ b/data/maps/SeafloorCavern_Entrance/header.inc @@ -5,7 +5,7 @@ SeafloorCavern_Entrance:: @ 8307064 .4byte 0x0 .2byte MUS_TOZAN .2byte 148 - .byte 68 + .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 .byte 0 .byte 4 diff --git a/data/maps/SeafloorCavern_Room1/header.inc b/data/maps/SeafloorCavern_Room1/header.inc index 411e65b1b..0114d308c 100644 --- a/data/maps/SeafloorCavern_Room1/header.inc +++ b/data/maps/SeafloorCavern_Room1/header.inc @@ -5,7 +5,7 @@ SeafloorCavern_Room1:: @ 8307080 .4byte 0x0 .2byte MUS_TOZAN .2byte 149 - .byte 68 + .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 .byte 0 .byte 4 diff --git a/data/maps/SeafloorCavern_Room2/header.inc b/data/maps/SeafloorCavern_Room2/header.inc index a8e6ce80e..bf7fd880b 100644 --- a/data/maps/SeafloorCavern_Room2/header.inc +++ b/data/maps/SeafloorCavern_Room2/header.inc @@ -5,7 +5,7 @@ SeafloorCavern_Room2:: @ 830709C .4byte 0x0 .2byte MUS_TOZAN .2byte 150 - .byte 68 + .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 .byte 0 .byte 4 diff --git a/data/maps/SeafloorCavern_Room3/header.inc b/data/maps/SeafloorCavern_Room3/header.inc index b062079b7..6cee15884 100644 --- a/data/maps/SeafloorCavern_Room3/header.inc +++ b/data/maps/SeafloorCavern_Room3/header.inc @@ -5,7 +5,7 @@ SeafloorCavern_Room3:: @ 83070B8 .4byte 0x0 .2byte MUS_TOZAN .2byte 151 - .byte 68 + .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 .byte 0 .byte 4 diff --git a/data/maps/SeafloorCavern_Room4/header.inc b/data/maps/SeafloorCavern_Room4/header.inc index bee900fed..f905e314a 100644 --- a/data/maps/SeafloorCavern_Room4/header.inc +++ b/data/maps/SeafloorCavern_Room4/header.inc @@ -5,7 +5,7 @@ SeafloorCavern_Room4:: @ 83070D4 .4byte 0x0 .2byte MUS_TOZAN .2byte 152 - .byte 68 + .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 .byte 0 .byte 4 diff --git a/data/maps/SeafloorCavern_Room5/header.inc b/data/maps/SeafloorCavern_Room5/header.inc index 9e7560fe2..01aa3fa28 100644 --- a/data/maps/SeafloorCavern_Room5/header.inc +++ b/data/maps/SeafloorCavern_Room5/header.inc @@ -5,7 +5,7 @@ SeafloorCavern_Room5:: @ 83070F0 .4byte 0x0 .2byte MUS_TOZAN .2byte 153 - .byte 68 + .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 .byte 0 .byte 4 diff --git a/data/maps/SeafloorCavern_Room6/header.inc b/data/maps/SeafloorCavern_Room6/header.inc index 0b9fdb9d1..f5b5834b4 100644 --- a/data/maps/SeafloorCavern_Room6/header.inc +++ b/data/maps/SeafloorCavern_Room6/header.inc @@ -5,7 +5,7 @@ SeafloorCavern_Room6:: @ 830710C .4byte 0x0 .2byte MUS_TOZAN .2byte 154 - .byte 68 + .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 .byte 0 .byte 4 diff --git a/data/maps/SeafloorCavern_Room7/header.inc b/data/maps/SeafloorCavern_Room7/header.inc index ee640a183..db9b37207 100644 --- a/data/maps/SeafloorCavern_Room7/header.inc +++ b/data/maps/SeafloorCavern_Room7/header.inc @@ -5,7 +5,7 @@ SeafloorCavern_Room7:: @ 8307128 .4byte 0x0 .2byte MUS_TOZAN .2byte 155 - .byte 68 + .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 .byte 0 .byte 4 diff --git a/data/maps/SeafloorCavern_Room8/header.inc b/data/maps/SeafloorCavern_Room8/header.inc index 43ff7baa4..eab61c222 100644 --- a/data/maps/SeafloorCavern_Room8/header.inc +++ b/data/maps/SeafloorCavern_Room8/header.inc @@ -5,7 +5,7 @@ SeafloorCavern_Room8:: @ 8307144 .4byte 0x0 .2byte MUS_TOZAN .2byte 156 - .byte 68 + .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 .byte 0 .byte 4 diff --git a/data/maps/SeafloorCavern_Room9/header.inc b/data/maps/SeafloorCavern_Room9/header.inc index c45181c89..dce89bbbc 100644 --- a/data/maps/SeafloorCavern_Room9/header.inc +++ b/data/maps/SeafloorCavern_Room9/header.inc @@ -5,7 +5,7 @@ SeafloorCavern_Room9:: @ 8307160 .4byte 0x0 .2byte MUS_TOZAN .2byte 157 - .byte 68 + .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 .byte 6 .byte 4 diff --git a/data/maps/SealedChamber_InnerRoom/header.inc b/data/maps/SealedChamber_InnerRoom/header.inc index d919de498..70bdac83d 100644 --- a/data/maps/SealedChamber_InnerRoom/header.inc +++ b/data/maps/SealedChamber_InnerRoom/header.inc @@ -5,7 +5,7 @@ SealedChamber_InnerRoom:: @ 8307550 .4byte 0x0 .2byte MUS_MABOROSI .2byte 305 - .byte 78 + .byte MAPSEC_SEALED_CHAMBER .byte 0 .byte 0 .byte 4 diff --git a/data/maps/SealedChamber_OuterRoom/header.inc b/data/maps/SealedChamber_OuterRoom/header.inc index f40159b44..52c512435 100644 --- a/data/maps/SealedChamber_OuterRoom/header.inc +++ b/data/maps/SealedChamber_OuterRoom/header.inc @@ -5,7 +5,7 @@ SealedChamber_OuterRoom:: @ 8307534 .4byte 0x0 .2byte MUS_MABOROSI .2byte 285 - .byte 78 + .byte MAPSEC_SEALED_CHAMBER .byte 0 .byte 0 .byte 4 diff --git a/data/maps/SecretBase_BlueCave1/header.inc b/data/maps/SecretBase_BlueCave1/header.inc index 08ab9ab97..f6394943b 100644 --- a/data/maps/SecretBase_BlueCave1/header.inc +++ b/data/maps/SecretBase_BlueCave1/header.inc @@ -5,7 +5,7 @@ SecretBase_BlueCave1:: @ 8307710 .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 200 - .byte 86 + .byte MAPSEC_SECRET_BASE .byte 0 .byte 0 .byte 9 diff --git a/data/maps/SecretBase_BlueCave2/header.inc b/data/maps/SecretBase_BlueCave2/header.inc index 89546ddaf..c9c12aaeb 100644 --- a/data/maps/SecretBase_BlueCave2/header.inc +++ b/data/maps/SecretBase_BlueCave2/header.inc @@ -5,7 +5,7 @@ SecretBase_BlueCave2:: @ 83077B8 .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 206 - .byte 86 + .byte MAPSEC_SECRET_BASE .byte 0 .byte 0 .byte 9 diff --git a/data/maps/SecretBase_BlueCave3/header.inc b/data/maps/SecretBase_BlueCave3/header.inc index 67df8c009..b8595d2d2 100644 --- a/data/maps/SecretBase_BlueCave3/header.inc +++ b/data/maps/SecretBase_BlueCave3/header.inc @@ -5,7 +5,7 @@ SecretBase_BlueCave3:: @ 8307860 .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 212 - .byte 86 + .byte MAPSEC_SECRET_BASE .byte 0 .byte 0 .byte 9 diff --git a/data/maps/SecretBase_BlueCave4/header.inc b/data/maps/SecretBase_BlueCave4/header.inc index 7cf1ed137..a14dc57db 100644 --- a/data/maps/SecretBase_BlueCave4/header.inc +++ b/data/maps/SecretBase_BlueCave4/header.inc @@ -5,7 +5,7 @@ SecretBase_BlueCave4:: @ 8307908 .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 218 - .byte 86 + .byte MAPSEC_SECRET_BASE .byte 0 .byte 0 .byte 9 diff --git a/data/maps/SecretBase_BrownCave1/header.inc b/data/maps/SecretBase_BrownCave1/header.inc index b6d298eb9..baf7cf883 100644 --- a/data/maps/SecretBase_BrownCave1/header.inc +++ b/data/maps/SecretBase_BrownCave1/header.inc @@ -5,7 +5,7 @@ SecretBase_BrownCave1:: @ 83076F4 .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 199 - .byte 86 + .byte MAPSEC_SECRET_BASE .byte 0 .byte 0 .byte 9 diff --git a/data/maps/SecretBase_BrownCave2/header.inc b/data/maps/SecretBase_BrownCave2/header.inc index 3a50de1fa..7b1d7426e 100644 --- a/data/maps/SecretBase_BrownCave2/header.inc +++ b/data/maps/SecretBase_BrownCave2/header.inc @@ -5,7 +5,7 @@ SecretBase_BrownCave2:: @ 830779C .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 205 - .byte 86 + .byte MAPSEC_SECRET_BASE .byte 0 .byte 0 .byte 9 diff --git a/data/maps/SecretBase_BrownCave3/header.inc b/data/maps/SecretBase_BrownCave3/header.inc index 4da609d11..4fabbe72e 100644 --- a/data/maps/SecretBase_BrownCave3/header.inc +++ b/data/maps/SecretBase_BrownCave3/header.inc @@ -5,7 +5,7 @@ SecretBase_BrownCave3:: @ 8307844 .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 211 - .byte 86 + .byte MAPSEC_SECRET_BASE .byte 0 .byte 0 .byte 9 diff --git a/data/maps/SecretBase_BrownCave4/header.inc b/data/maps/SecretBase_BrownCave4/header.inc index 471b29596..84bddecc5 100644 --- a/data/maps/SecretBase_BrownCave4/header.inc +++ b/data/maps/SecretBase_BrownCave4/header.inc @@ -5,7 +5,7 @@ SecretBase_BrownCave4:: @ 83078EC .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 217 - .byte 86 + .byte MAPSEC_SECRET_BASE .byte 0 .byte 0 .byte 9 diff --git a/data/maps/SecretBase_RedCave1/header.inc b/data/maps/SecretBase_RedCave1/header.inc index 6508fe62a..556c9f570 100644 --- a/data/maps/SecretBase_RedCave1/header.inc +++ b/data/maps/SecretBase_RedCave1/header.inc @@ -5,7 +5,7 @@ SecretBase_RedCave1:: @ 83076D8 .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 198 - .byte 86 + .byte MAPSEC_SECRET_BASE .byte 0 .byte 0 .byte 9 diff --git a/data/maps/SecretBase_RedCave2/header.inc b/data/maps/SecretBase_RedCave2/header.inc index f4c61d108..9a2cc0779 100644 --- a/data/maps/SecretBase_RedCave2/header.inc +++ b/data/maps/SecretBase_RedCave2/header.inc @@ -5,7 +5,7 @@ SecretBase_RedCave2:: @ 8307780 .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 204 - .byte 86 + .byte MAPSEC_SECRET_BASE .byte 0 .byte 0 .byte 9 diff --git a/data/maps/SecretBase_RedCave3/header.inc b/data/maps/SecretBase_RedCave3/header.inc index 681f4c403..9f35ae51f 100644 --- a/data/maps/SecretBase_RedCave3/header.inc +++ b/data/maps/SecretBase_RedCave3/header.inc @@ -5,7 +5,7 @@ SecretBase_RedCave3:: @ 8307828 .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 210 - .byte 86 + .byte MAPSEC_SECRET_BASE .byte 0 .byte 0 .byte 9 diff --git a/data/maps/SecretBase_RedCave4/header.inc b/data/maps/SecretBase_RedCave4/header.inc index 77b6e06a7..fa8fd1873 100644 --- a/data/maps/SecretBase_RedCave4/header.inc +++ b/data/maps/SecretBase_RedCave4/header.inc @@ -5,7 +5,7 @@ SecretBase_RedCave4:: @ 83078D0 .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 216 - .byte 86 + .byte MAPSEC_SECRET_BASE .byte 0 .byte 0 .byte 9 diff --git a/data/maps/SecretBase_Shrub1/header.inc b/data/maps/SecretBase_Shrub1/header.inc index cc85dea9e..c533388d6 100644 --- a/data/maps/SecretBase_Shrub1/header.inc +++ b/data/maps/SecretBase_Shrub1/header.inc @@ -5,7 +5,7 @@ SecretBase_Shrub1:: @ 8307764 .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 203 - .byte 86 + .byte MAPSEC_SECRET_BASE .byte 0 .byte 0 .byte 9 diff --git a/data/maps/SecretBase_Shrub2/header.inc b/data/maps/SecretBase_Shrub2/header.inc index 932fcaca5..1eabc4746 100644 --- a/data/maps/SecretBase_Shrub2/header.inc +++ b/data/maps/SecretBase_Shrub2/header.inc @@ -5,7 +5,7 @@ SecretBase_Shrub2:: @ 830780C .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 209 - .byte 86 + .byte MAPSEC_SECRET_BASE .byte 0 .byte 0 .byte 9 diff --git a/data/maps/SecretBase_Shrub3/header.inc b/data/maps/SecretBase_Shrub3/header.inc index a3a660338..28f64c790 100644 --- a/data/maps/SecretBase_Shrub3/header.inc +++ b/data/maps/SecretBase_Shrub3/header.inc @@ -5,7 +5,7 @@ SecretBase_Shrub3:: @ 83078B4 .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 215 - .byte 86 + .byte MAPSEC_SECRET_BASE .byte 0 .byte 0 .byte 9 diff --git a/data/maps/SecretBase_Shrub4/header.inc b/data/maps/SecretBase_Shrub4/header.inc index 0966db367..1cd544da9 100644 --- a/data/maps/SecretBase_Shrub4/header.inc +++ b/data/maps/SecretBase_Shrub4/header.inc @@ -5,7 +5,7 @@ SecretBase_Shrub4:: @ 830795C .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 221 - .byte 86 + .byte MAPSEC_SECRET_BASE .byte 0 .byte 0 .byte 9 diff --git a/data/maps/SecretBase_Tree1/header.inc b/data/maps/SecretBase_Tree1/header.inc index 1d0ce9509..05d689a97 100644 --- a/data/maps/SecretBase_Tree1/header.inc +++ b/data/maps/SecretBase_Tree1/header.inc @@ -5,7 +5,7 @@ SecretBase_Tree1:: @ 8307748 .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 202 - .byte 86 + .byte MAPSEC_SECRET_BASE .byte 0 .byte 0 .byte 9 diff --git a/data/maps/SecretBase_Tree2/header.inc b/data/maps/SecretBase_Tree2/header.inc index 7138440cd..302beabbc 100644 --- a/data/maps/SecretBase_Tree2/header.inc +++ b/data/maps/SecretBase_Tree2/header.inc @@ -5,7 +5,7 @@ SecretBase_Tree2:: @ 83077F0 .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 208 - .byte 86 + .byte MAPSEC_SECRET_BASE .byte 0 .byte 0 .byte 9 diff --git a/data/maps/SecretBase_Tree3/header.inc b/data/maps/SecretBase_Tree3/header.inc index d3f49d3e0..0064346c7 100644 --- a/data/maps/SecretBase_Tree3/header.inc +++ b/data/maps/SecretBase_Tree3/header.inc @@ -5,7 +5,7 @@ SecretBase_Tree3:: @ 8307898 .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 214 - .byte 86 + .byte MAPSEC_SECRET_BASE .byte 0 .byte 0 .byte 9 diff --git a/data/maps/SecretBase_Tree4/header.inc b/data/maps/SecretBase_Tree4/header.inc index 53a723432..802125e65 100644 --- a/data/maps/SecretBase_Tree4/header.inc +++ b/data/maps/SecretBase_Tree4/header.inc @@ -5,7 +5,7 @@ SecretBase_Tree4:: @ 8307940 .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 220 - .byte 86 + .byte MAPSEC_SECRET_BASE .byte 0 .byte 0 .byte 9 diff --git a/data/maps/SecretBase_YellowCave1/header.inc b/data/maps/SecretBase_YellowCave1/header.inc index ecf3d4ea2..3d56690c5 100644 --- a/data/maps/SecretBase_YellowCave1/header.inc +++ b/data/maps/SecretBase_YellowCave1/header.inc @@ -5,7 +5,7 @@ SecretBase_YellowCave1:: @ 830772C .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 201 - .byte 86 + .byte MAPSEC_SECRET_BASE .byte 0 .byte 0 .byte 9 diff --git a/data/maps/SecretBase_YellowCave2/header.inc b/data/maps/SecretBase_YellowCave2/header.inc index cbee83030..62a4c15b3 100644 --- a/data/maps/SecretBase_YellowCave2/header.inc +++ b/data/maps/SecretBase_YellowCave2/header.inc @@ -5,7 +5,7 @@ SecretBase_YellowCave2:: @ 83077D4 .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 207 - .byte 86 + .byte MAPSEC_SECRET_BASE .byte 0 .byte 0 .byte 9 diff --git a/data/maps/SecretBase_YellowCave3/header.inc b/data/maps/SecretBase_YellowCave3/header.inc index cea1c9175..64b67fa80 100644 --- a/data/maps/SecretBase_YellowCave3/header.inc +++ b/data/maps/SecretBase_YellowCave3/header.inc @@ -5,7 +5,7 @@ SecretBase_YellowCave3:: @ 830787C .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 213 - .byte 86 + .byte MAPSEC_SECRET_BASE .byte 0 .byte 0 .byte 9 diff --git a/data/maps/SecretBase_YellowCave4/header.inc b/data/maps/SecretBase_YellowCave4/header.inc index e744080bd..31e96a7a4 100644 --- a/data/maps/SecretBase_YellowCave4/header.inc +++ b/data/maps/SecretBase_YellowCave4/header.inc @@ -5,7 +5,7 @@ SecretBase_YellowCave4:: @ 8307924 .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 219 - .byte 86 + .byte MAPSEC_SECRET_BASE .byte 0 .byte 0 .byte 9 diff --git a/data/maps/ShoalCave_HighTideEntranceRoom/header.inc b/data/maps/ShoalCave_HighTideEntranceRoom/header.inc index 16287338d..c835cf25b 100644 --- a/data/maps/ShoalCave_HighTideEntranceRoom/header.inc +++ b/data/maps/ShoalCave_HighTideEntranceRoom/header.inc @@ -5,7 +5,7 @@ ShoalCave_HighTideEntranceRoom:: @ 83072E8 .4byte 0x0 .2byte MUS_M_DUNGON .2byte 169 - .byte 67 + .byte MAPSEC_SHOAL_CAVE .byte 0 .byte 0 .byte 4 diff --git a/data/maps/ShoalCave_HighTideInnerRoom/header.inc b/data/maps/ShoalCave_HighTideInnerRoom/header.inc index 63bb3f47e..19f7c3a5c 100644 --- a/data/maps/ShoalCave_HighTideInnerRoom/header.inc +++ b/data/maps/ShoalCave_HighTideInnerRoom/header.inc @@ -5,7 +5,7 @@ ShoalCave_HighTideInnerRoom:: @ 8307304 .4byte 0x0 .2byte MUS_M_DUNGON .2byte 170 - .byte 67 + .byte MAPSEC_SHOAL_CAVE .byte 0 .byte 0 .byte 4 diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/header.inc b/data/maps/ShoalCave_LowTideEntranceRoom/header.inc index 05cac9619..81e4ac4c9 100644 --- a/data/maps/ShoalCave_LowTideEntranceRoom/header.inc +++ b/data/maps/ShoalCave_LowTideEntranceRoom/header.inc @@ -5,7 +5,7 @@ ShoalCave_LowTideEntranceRoom:: @ 8307278 .4byte 0x0 .2byte MUS_M_DUNGON .2byte 165 - .byte 67 + .byte MAPSEC_SHOAL_CAVE .byte 0 .byte 0 .byte 4 diff --git a/data/maps/ShoalCave_LowTideIceRoom/header.inc b/data/maps/ShoalCave_LowTideIceRoom/header.inc index 3cc9967fb..3a2b4d823 100644 --- a/data/maps/ShoalCave_LowTideIceRoom/header.inc +++ b/data/maps/ShoalCave_LowTideIceRoom/header.inc @@ -5,7 +5,7 @@ ShoalCave_LowTideIceRoom:: @ 8307684 .4byte 0x0 .2byte MUS_M_DUNGON .2byte 329 - .byte 67 + .byte MAPSEC_SHOAL_CAVE .byte 0 .byte 0 .byte 4 diff --git a/data/maps/ShoalCave_LowTideInnerRoom/header.inc b/data/maps/ShoalCave_LowTideInnerRoom/header.inc index be5fb9413..5f519df30 100644 --- a/data/maps/ShoalCave_LowTideInnerRoom/header.inc +++ b/data/maps/ShoalCave_LowTideInnerRoom/header.inc @@ -5,7 +5,7 @@ ShoalCave_LowTideInnerRoom:: @ 8307294 .4byte 0x0 .2byte MUS_M_DUNGON .2byte 166 - .byte 67 + .byte MAPSEC_SHOAL_CAVE .byte 0 .byte 0 .byte 4 diff --git a/data/maps/ShoalCave_LowTideLowerRoom/header.inc b/data/maps/ShoalCave_LowTideLowerRoom/header.inc index 5d82ba865..b2c727d43 100644 --- a/data/maps/ShoalCave_LowTideLowerRoom/header.inc +++ b/data/maps/ShoalCave_LowTideLowerRoom/header.inc @@ -5,7 +5,7 @@ ShoalCave_LowTideLowerRoom:: @ 83072CC .4byte 0x0 .2byte MUS_M_DUNGON .2byte 168 - .byte 67 + .byte MAPSEC_SHOAL_CAVE .byte 0 .byte 0 .byte 4 diff --git a/data/maps/ShoalCave_LowTideStairsRoom/header.inc b/data/maps/ShoalCave_LowTideStairsRoom/header.inc index 976bc6ad9..bf0cb0e99 100644 --- a/data/maps/ShoalCave_LowTideStairsRoom/header.inc +++ b/data/maps/ShoalCave_LowTideStairsRoom/header.inc @@ -5,7 +5,7 @@ ShoalCave_LowTideStairsRoom:: @ 83072B0 .4byte 0x0 .2byte MUS_M_DUNGON .2byte 167 - .byte 67 + .byte MAPSEC_SHOAL_CAVE .byte 0 .byte 0 .byte 4 diff --git a/data/maps/SingleBattleColosseum/header.inc b/data/maps/SingleBattleColosseum/header.inc index 99e0b090b..66aec206f 100644 --- a/data/maps/SingleBattleColosseum/header.inc +++ b/data/maps/SingleBattleColosseum/header.inc @@ -5,7 +5,7 @@ SingleBattleColosseum:: @ 8307978 .4byte 0x0 .2byte MUS_RAINBOW .2byte 222 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SkyPillar_1F/header.inc b/data/maps/SkyPillar_1F/header.inc index c530fde86..2df988714 100644 --- a/data/maps/SkyPillar_1F/header.inc +++ b/data/maps/SkyPillar_1F/header.inc @@ -5,7 +5,7 @@ SkyPillar_1F:: @ 8307614 .4byte 0x0 .2byte MUS_TOZAN .2byte 323 - .byte 85 + .byte MAPSEC_SKY_PILLAR .byte 0 .byte 0 .byte 4 diff --git a/data/maps/SkyPillar_2F/header.inc b/data/maps/SkyPillar_2F/header.inc index ce61cf5b8..934d1b34b 100644 --- a/data/maps/SkyPillar_2F/header.inc +++ b/data/maps/SkyPillar_2F/header.inc @@ -5,7 +5,7 @@ SkyPillar_2F:: @ 8307630 .4byte 0x0 .2byte MUS_TOZAN .2byte 324 - .byte 85 + .byte MAPSEC_SKY_PILLAR .byte 0 .byte 0 .byte 4 diff --git a/data/maps/SkyPillar_3F/header.inc b/data/maps/SkyPillar_3F/header.inc index eaed10d93..5dc93b962 100644 --- a/data/maps/SkyPillar_3F/header.inc +++ b/data/maps/SkyPillar_3F/header.inc @@ -5,7 +5,7 @@ SkyPillar_3F:: @ 830764C .4byte 0x0 .2byte MUS_TOZAN .2byte 325 - .byte 85 + .byte MAPSEC_SKY_PILLAR .byte 0 .byte 0 .byte 4 diff --git a/data/maps/SkyPillar_4F/header.inc b/data/maps/SkyPillar_4F/header.inc index f14e016c8..bfbaa0ff6 100644 --- a/data/maps/SkyPillar_4F/header.inc +++ b/data/maps/SkyPillar_4F/header.inc @@ -5,7 +5,7 @@ SkyPillar_4F:: @ 8307668 .4byte 0x0 .2byte MUS_TOZAN .2byte 326 - .byte 85 + .byte MAPSEC_SKY_PILLAR .byte 0 .byte 0 .byte 4 diff --git a/data/maps/SkyPillar_5F/header.inc b/data/maps/SkyPillar_5F/header.inc index e4ff00b1a..3f31f0dbf 100644 --- a/data/maps/SkyPillar_5F/header.inc +++ b/data/maps/SkyPillar_5F/header.inc @@ -5,7 +5,7 @@ SkyPillar_5F:: @ 83076A0 .4byte 0x0 .2byte MUS_TOZAN .2byte 331 - .byte 85 + .byte MAPSEC_SKY_PILLAR .byte 0 .byte 0 .byte 4 diff --git a/data/maps/SkyPillar_Entrance/header.inc b/data/maps/SkyPillar_Entrance/header.inc index 84dfe9b5c..144431800 100644 --- a/data/maps/SkyPillar_Entrance/header.inc +++ b/data/maps/SkyPillar_Entrance/header.inc @@ -5,7 +5,7 @@ SkyPillar_Entrance:: @ 83075DC .4byte 0x0 .2byte MUS_TOZAN .2byte 321 - .byte 85 + .byte MAPSEC_SKY_PILLAR .byte 0 .byte 0 .byte 4 diff --git a/data/maps/SkyPillar_Outside/header.inc b/data/maps/SkyPillar_Outside/header.inc index 71aa1ad84..02812eca8 100644 --- a/data/maps/SkyPillar_Outside/header.inc +++ b/data/maps/SkyPillar_Outside/header.inc @@ -5,7 +5,7 @@ SkyPillar_Outside:: @ 83075F8 .4byte 0x0 .2byte MUS_TOZAN .2byte 322 - .byte 85 + .byte MAPSEC_SKY_PILLAR .byte 0 .byte 0 .byte 3 diff --git a/data/maps/SkyPillar_Top/header.inc b/data/maps/SkyPillar_Top/header.inc index aaaf40fc4..106b3284e 100644 --- a/data/maps/SkyPillar_Top/header.inc +++ b/data/maps/SkyPillar_Top/header.inc @@ -5,7 +5,7 @@ SkyPillar_Top:: @ 83076BC .4byte 0x0 .2byte MUS_TOZAN .2byte 332 - .byte 85 + .byte MAPSEC_SKY_PILLAR .byte 0 .byte 0 .byte 3 diff --git a/data/maps/SlateportCity/header.inc b/data/maps/SlateportCity/header.inc index 738a383e7..07a0ee53b 100644 --- a/data/maps/SlateportCity/header.inc +++ b/data/maps/SlateportCity/header.inc @@ -5,7 +5,7 @@ SlateportCity:: @ 8305464 .4byte SlateportCity_MapConnections .2byte MUS_FINECITY .2byte 2 - .byte 8 + .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte 2 .byte 2 diff --git a/data/maps/SlateportCity_ContestHall/header.inc b/data/maps/SlateportCity_ContestHall/header.inc index d327e87c7..2e17d0f9c 100644 --- a/data/maps/SlateportCity_ContestHall/header.inc +++ b/data/maps/SlateportCity_ContestHall/header.inc @@ -5,7 +5,7 @@ SlateportCity_ContestHall:: @ 8306034 .4byte 0x0 .2byte MUS_CONLOBBY .2byte 73 - .byte 8 + .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SlateportCity_ContestLobby/header.inc b/data/maps/SlateportCity_ContestLobby/header.inc index 0531ef226..a040be082 100644 --- a/data/maps/SlateportCity_ContestLobby/header.inc +++ b/data/maps/SlateportCity_ContestLobby/header.inc @@ -5,7 +5,7 @@ SlateportCity_ContestLobby:: @ 8306018 .4byte 0x0 .2byte MUS_CONLOBBY .2byte 72 - .byte 8 + .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SlateportCity_Harbor/header.inc b/data/maps/SlateportCity_Harbor/header.inc index 5de5d2e5f..05c2ef2c8 100644 --- a/data/maps/SlateportCity_Harbor/header.inc +++ b/data/maps/SlateportCity_Harbor/header.inc @@ -5,7 +5,7 @@ SlateportCity_Harbor:: @ 83060C0 .4byte 0x0 .2byte MUS_FINECITY .2byte 88 - .byte 8 + .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SlateportCity_House1/header.inc b/data/maps/SlateportCity_House1/header.inc index 548424b49..04f67d4bb 100644 --- a/data/maps/SlateportCity_House1/header.inc +++ b/data/maps/SlateportCity_House1/header.inc @@ -5,7 +5,7 @@ SlateportCity_House1:: @ 8306050 .4byte 0x0 .2byte MUS_FINECITY .2byte 80 - .byte 8 + .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SlateportCity_House2/header.inc b/data/maps/SlateportCity_House2/header.inc index d731c0542..191ff10fb 100644 --- a/data/maps/SlateportCity_House2/header.inc +++ b/data/maps/SlateportCity_House2/header.inc @@ -5,7 +5,7 @@ SlateportCity_House2:: @ 83060DC .4byte 0x0 .2byte MUS_FINECITY .2byte 60 - .byte 8 + .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SlateportCity_Mart/header.inc b/data/maps/SlateportCity_Mart/header.inc index d66d2452e..ee7297450 100644 --- a/data/maps/SlateportCity_Mart/header.inc +++ b/data/maps/SlateportCity_Mart/header.inc @@ -5,7 +5,7 @@ SlateportCity_Mart:: @ 8306130 .4byte 0x0 .2byte MUS_FRIENDLY .2byte 63 - .byte 8 + .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/header.inc b/data/maps/SlateportCity_OceanicMuseum_1F/header.inc index 60fe69e70..6374023f6 100644 --- a/data/maps/SlateportCity_OceanicMuseum_1F/header.inc +++ b/data/maps/SlateportCity_OceanicMuseum_1F/header.inc @@ -5,7 +5,7 @@ SlateportCity_OceanicMuseum_1F:: @ 8306088 .4byte 0x0 .2byte MUS_FUNE_KAN .2byte 86 - .byte 8 + .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/header.inc b/data/maps/SlateportCity_OceanicMuseum_2F/header.inc index 8baa101fa..2e0446fb2 100644 --- a/data/maps/SlateportCity_OceanicMuseum_2F/header.inc +++ b/data/maps/SlateportCity_OceanicMuseum_2F/header.inc @@ -5,7 +5,7 @@ SlateportCity_OceanicMuseum_2F:: @ 83060A4 .4byte 0x0 .2byte MUS_FUNE_KAN .2byte 87 - .byte 8 + .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SlateportCity_PokemonCenter_1F/header.inc b/data/maps/SlateportCity_PokemonCenter_1F/header.inc index 35d90cdc2..cb52dece1 100644 --- a/data/maps/SlateportCity_PokemonCenter_1F/header.inc +++ b/data/maps/SlateportCity_PokemonCenter_1F/header.inc @@ -5,7 +5,7 @@ SlateportCity_PokemonCenter_1F:: @ 83060F8 .4byte 0x0 .2byte MUS_POKECEN .2byte 61 - .byte 8 + .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SlateportCity_PokemonCenter_2F/header.inc b/data/maps/SlateportCity_PokemonCenter_2F/header.inc index 738074ba1..6129dda83 100644 --- a/data/maps/SlateportCity_PokemonCenter_2F/header.inc +++ b/data/maps/SlateportCity_PokemonCenter_2F/header.inc @@ -5,7 +5,7 @@ SlateportCity_PokemonCenter_2F:: @ 8306114 .4byte 0x0 .2byte MUS_POKECEN .2byte 62 - .byte 8 + .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SlateportCity_PokemonFanClub/header.inc b/data/maps/SlateportCity_PokemonFanClub/header.inc index 8094f192f..2a48b1895 100644 --- a/data/maps/SlateportCity_PokemonFanClub/header.inc +++ b/data/maps/SlateportCity_PokemonFanClub/header.inc @@ -5,7 +5,7 @@ SlateportCity_PokemonFanClub:: @ 830606C .4byte 0x0 .2byte MUS_FINECITY .2byte 85 - .byte 8 + .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SlateportCity_SternsShipyard_1F/header.inc b/data/maps/SlateportCity_SternsShipyard_1F/header.inc index 2d98ef5b8..76b3f037f 100644 --- a/data/maps/SlateportCity_SternsShipyard_1F/header.inc +++ b/data/maps/SlateportCity_SternsShipyard_1F/header.inc @@ -5,7 +5,7 @@ SlateportCity_SternsShipyard_1F:: @ 8305FE0 .4byte 0x0 .2byte MUS_FINECITY .2byte 81 - .byte 8 + .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SlateportCity_SternsShipyard_2F/header.inc b/data/maps/SlateportCity_SternsShipyard_2F/header.inc index e7f1b74b8..56f613dcf 100644 --- a/data/maps/SlateportCity_SternsShipyard_2F/header.inc +++ b/data/maps/SlateportCity_SternsShipyard_2F/header.inc @@ -5,7 +5,7 @@ SlateportCity_SternsShipyard_2F:: @ 8305FFC .4byte 0x0 .2byte MUS_FINECITY .2byte 82 - .byte 8 + .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SootopolisCity/header.inc b/data/maps/SootopolisCity/header.inc index bd41a5c2b..9c169ab6d 100644 --- a/data/maps/SootopolisCity/header.inc +++ b/data/maps/SootopolisCity/header.inc @@ -5,7 +5,7 @@ SootopolisCity:: @ 830550C .4byte 0x0 .2byte MUS_RUNECITY .2byte 8 - .byte 14 + .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte 2 .byte 2 diff --git a/data/maps/SootopolisCity_Gym_1F/header.inc b/data/maps/SootopolisCity_Gym_1F/header.inc index 0583679dc..1e1e16868 100644 --- a/data/maps/SootopolisCity_Gym_1F/header.inc +++ b/data/maps/SootopolisCity_Gym_1F/header.inc @@ -5,7 +5,7 @@ SootopolisCity_Gym_1F:: @ 830692C .4byte 0x0 .2byte MUS_GIM .2byte 110 - .byte 14 + .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SootopolisCity_Gym_B1F/header.inc b/data/maps/SootopolisCity_Gym_B1F/header.inc index ea131c587..c9745ae62 100644 --- a/data/maps/SootopolisCity_Gym_B1F/header.inc +++ b/data/maps/SootopolisCity_Gym_B1F/header.inc @@ -5,7 +5,7 @@ SootopolisCity_Gym_B1F:: @ 8306948 .4byte 0x0 .2byte MUS_GIM .2byte 111 - .byte 14 + .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SootopolisCity_House1/header.inc b/data/maps/SootopolisCity_House1/header.inc index 924b6a382..612e3f71e 100644 --- a/data/maps/SootopolisCity_House1/header.inc +++ b/data/maps/SootopolisCity_House1/header.inc @@ -5,7 +5,7 @@ SootopolisCity_House1:: @ 83069B8 .4byte 0x0 .2byte MUS_RUNECITY .2byte 308 - .byte 14 + .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SootopolisCity_House2/header.inc b/data/maps/SootopolisCity_House2/header.inc index 6360bcf03..63fb280c6 100644 --- a/data/maps/SootopolisCity_House2/header.inc +++ b/data/maps/SootopolisCity_House2/header.inc @@ -5,7 +5,7 @@ SootopolisCity_House2:: @ 83069D4 .4byte 0x0 .2byte MUS_RUNECITY .2byte 309 - .byte 14 + .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SootopolisCity_House3/header.inc b/data/maps/SootopolisCity_House3/header.inc index f7d724e5f..b59e13c13 100644 --- a/data/maps/SootopolisCity_House3/header.inc +++ b/data/maps/SootopolisCity_House3/header.inc @@ -5,7 +5,7 @@ SootopolisCity_House3:: @ 83069F0 .4byte 0x0 .2byte MUS_RUNECITY .2byte 310 - .byte 14 + .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SootopolisCity_House4/header.inc b/data/maps/SootopolisCity_House4/header.inc index d18dc2edc..f6fe5781e 100644 --- a/data/maps/SootopolisCity_House4/header.inc +++ b/data/maps/SootopolisCity_House4/header.inc @@ -5,7 +5,7 @@ SootopolisCity_House4:: @ 8306A0C .4byte 0x0 .2byte MUS_RUNECITY .2byte 308 - .byte 14 + .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SootopolisCity_House5/header.inc b/data/maps/SootopolisCity_House5/header.inc index f34f45f53..0b3f89d67 100644 --- a/data/maps/SootopolisCity_House5/header.inc +++ b/data/maps/SootopolisCity_House5/header.inc @@ -5,7 +5,7 @@ SootopolisCity_House5:: @ 8306A28 .4byte 0x0 .2byte MUS_RUNECITY .2byte 309 - .byte 14 + .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SootopolisCity_House6/header.inc b/data/maps/SootopolisCity_House6/header.inc index 639ea99ba..34df34e66 100644 --- a/data/maps/SootopolisCity_House6/header.inc +++ b/data/maps/SootopolisCity_House6/header.inc @@ -5,7 +5,7 @@ SootopolisCity_House6:: @ 8306A44 .4byte 0x0 .2byte MUS_RUNECITY .2byte 310 - .byte 14 + .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SootopolisCity_House7/header.inc b/data/maps/SootopolisCity_House7/header.inc index 1d785ec47..26501506c 100644 --- a/data/maps/SootopolisCity_House7/header.inc +++ b/data/maps/SootopolisCity_House7/header.inc @@ -5,7 +5,7 @@ SootopolisCity_House7:: @ 8306A60 .4byte 0x0 .2byte MUS_RUNECITY .2byte 308 - .byte 14 + .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SootopolisCity_House8/header.inc b/data/maps/SootopolisCity_House8/header.inc index 58432de80..c9710a4b5 100644 --- a/data/maps/SootopolisCity_House8/header.inc +++ b/data/maps/SootopolisCity_House8/header.inc @@ -5,7 +5,7 @@ SootopolisCity_House8:: @ 8306A7C .4byte 0x0 .2byte MUS_RUNECITY .2byte 298 - .byte 14 + .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SootopolisCity_Mart/header.inc b/data/maps/SootopolisCity_Mart/header.inc index ecf6040c4..2f40d838e 100644 --- a/data/maps/SootopolisCity_Mart/header.inc +++ b/data/maps/SootopolisCity_Mart/header.inc @@ -5,7 +5,7 @@ SootopolisCity_Mart:: @ 830699C .4byte 0x0 .2byte MUS_FRIENDLY .2byte 63 - .byte 14 + .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SootopolisCity_PokemonCenter_1F/header.inc b/data/maps/SootopolisCity_PokemonCenter_1F/header.inc index 496a40444..e73cff2cc 100644 --- a/data/maps/SootopolisCity_PokemonCenter_1F/header.inc +++ b/data/maps/SootopolisCity_PokemonCenter_1F/header.inc @@ -5,7 +5,7 @@ SootopolisCity_PokemonCenter_1F:: @ 8306964 .4byte 0x0 .2byte MUS_POKECEN .2byte 61 - .byte 14 + .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SootopolisCity_PokemonCenter_2F/header.inc b/data/maps/SootopolisCity_PokemonCenter_2F/header.inc index 78a1a486d..bffe4d8fc 100644 --- a/data/maps/SootopolisCity_PokemonCenter_2F/header.inc +++ b/data/maps/SootopolisCity_PokemonCenter_2F/header.inc @@ -5,7 +5,7 @@ SootopolisCity_PokemonCenter_2F:: @ 8306980 .4byte 0x0 .2byte MUS_POKECEN .2byte 62 - .byte 14 + .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SouthernIsland_Exterior/header.inc b/data/maps/SouthernIsland_Exterior/header.inc index e70d1a97a..9552a0238 100644 --- a/data/maps/SouthernIsland_Exterior/header.inc +++ b/data/maps/SouthernIsland_Exterior/header.inc @@ -5,7 +5,7 @@ SouthernIsland_Exterior:: @ 8307CA4 .4byte 0x0 .2byte MUS_DAN02 .2byte 291 - .byte 73 + .byte MAPSEC_SOUTHERN_ISLAND .byte 0 .byte 0 .byte 3 diff --git a/data/maps/SouthernIsland_Interior/header.inc b/data/maps/SouthernIsland_Interior/header.inc index 2dbee0b85..83a5d4deb 100644 --- a/data/maps/SouthernIsland_Interior/header.inc +++ b/data/maps/SouthernIsland_Interior/header.inc @@ -5,7 +5,7 @@ SouthernIsland_Interior:: @ 8307CC0 .4byte 0x0 .2byte MUS_DAN02 .2byte 292 - .byte 73 + .byte MAPSEC_SOUTHERN_ISLAND .byte 0 .byte 11 .byte 3 diff --git a/data/maps/TradeCenter/header.inc b/data/maps/TradeCenter/header.inc index dc60b2dd1..9a8ed09ca 100644 --- a/data/maps/TradeCenter/header.inc +++ b/data/maps/TradeCenter/header.inc @@ -5,7 +5,7 @@ TradeCenter:: @ 8307994 .4byte 0x0 .2byte MUS_RAINBOW .2byte 223 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Underwater1/header.inc b/data/maps/Underwater1/header.inc index 87e3260c9..e932d4d8e 100644 --- a/data/maps/Underwater1/header.inc +++ b/data/maps/Underwater1/header.inc @@ -5,7 +5,7 @@ Underwater1:: @ 83059C0 .4byte Underwater1_MapConnections .2byte MUS_DEEPDEEP .2byte 275 - .byte 50 + .byte MAPSEC_UNDERWATER_124 .byte 0 .byte 14 .byte 5 diff --git a/data/maps/Underwater2/header.inc b/data/maps/Underwater2/header.inc index 244cab761..e8da93769 100644 --- a/data/maps/Underwater2/header.inc +++ b/data/maps/Underwater2/header.inc @@ -5,7 +5,7 @@ Underwater2:: @ 83059DC .4byte Underwater2_MapConnections .2byte MUS_DEEPDEEP .2byte 51 - .byte 51 + .byte MAPSEC_UNDERWATER_125 .byte 0 .byte 14 .byte 5 diff --git a/data/maps/Underwater3/header.inc b/data/maps/Underwater3/header.inc index 965109718..ade3cc87d 100644 --- a/data/maps/Underwater3/header.inc +++ b/data/maps/Underwater3/header.inc @@ -5,7 +5,7 @@ Underwater3:: @ 83059F8 .4byte Underwater3_MapConnections .2byte MUS_DEEPDEEP .2byte 52 - .byte 52 + .byte MAPSEC_UNDERWATER_126 .byte 0 .byte 14 .byte 5 diff --git a/data/maps/Underwater4/header.inc b/data/maps/Underwater4/header.inc index 6433cde8e..eaec11402 100644 --- a/data/maps/Underwater4/header.inc +++ b/data/maps/Underwater4/header.inc @@ -5,7 +5,7 @@ Underwater4:: @ 8305A14 .4byte Underwater4_MapConnections .2byte MUS_DEEPDEEP .2byte 53 - .byte 53 + .byte MAPSEC_UNDERWATER_127 .byte 0 .byte 14 .byte 5 diff --git a/data/maps/Underwater_Route134/header.inc b/data/maps/Underwater_Route134/header.inc index 94328b851..7a80a7562 100644 --- a/data/maps/Underwater_Route134/header.inc +++ b/data/maps/Underwater_Route134/header.inc @@ -5,7 +5,7 @@ Underwater_Route134:: @ 83074FC .4byte 0x0 .2byte MUS_DEEPDEEP .2byte 283 - .byte 79 + .byte MAPSEC_UNDERWATER_SEALED_CHAMBER .byte 0 .byte 14 .byte 5 diff --git a/data/maps/Underwater_SeafloorCavern/header.inc b/data/maps/Underwater_SeafloorCavern/header.inc index e4a84f835..08dbac56e 100644 --- a/data/maps/Underwater_SeafloorCavern/header.inc +++ b/data/maps/Underwater_SeafloorCavern/header.inc @@ -5,7 +5,7 @@ Underwater_SeafloorCavern:: @ 8307048 .4byte 0x0 .2byte MUS_DEEPDEEP .2byte 147 - .byte 69 + .byte MAPSEC_UNDERWATER_128 .byte 0 .byte 14 .byte 5 diff --git a/data/maps/Underwater_SealedChamber/header.inc b/data/maps/Underwater_SealedChamber/header.inc index f11030bd8..dcdf4e82f 100644 --- a/data/maps/Underwater_SealedChamber/header.inc +++ b/data/maps/Underwater_SealedChamber/header.inc @@ -5,7 +5,7 @@ Underwater_SealedChamber:: @ 8307518 .4byte 0x0 .2byte MUS_DEEPDEEP .2byte 284 - .byte 79 + .byte MAPSEC_UNDERWATER_SEALED_CHAMBER .byte 0 .byte 14 .byte 5 diff --git a/data/maps/Underwater_SootopolisCity/header.inc b/data/maps/Underwater_SootopolisCity/header.inc index f7626d966..9c42e65e9 100644 --- a/data/maps/Underwater_SootopolisCity/header.inc +++ b/data/maps/Underwater_SootopolisCity/header.inc @@ -5,7 +5,7 @@ Underwater_SootopolisCity:: @ 8306DFC .4byte 0x0 .2byte MUS_DEEPDEEP .2byte 131 - .byte 54 + .byte MAPSEC_UNDERWATER_SOOTOPOLIS .byte 0 .byte 14 .byte 5 diff --git a/data/maps/UnknownMap_25_29/header.inc b/data/maps/UnknownMap_25_29/header.inc index 0a2845319..2d0894c97 100644 --- a/data/maps/UnknownMap_25_29/header.inc +++ b/data/maps/UnknownMap_25_29/header.inc @@ -5,7 +5,7 @@ UnknownMap_25_29:: @ 8307A04 .4byte 0x0 .2byte MUS_NIBI .2byte 227 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/UnknownMap_25_30/header.inc b/data/maps/UnknownMap_25_30/header.inc index 699998409..5227b240d 100644 --- a/data/maps/UnknownMap_25_30/header.inc +++ b/data/maps/UnknownMap_25_30/header.inc @@ -5,7 +5,7 @@ UnknownMap_25_30:: @ 8307A20 .4byte 0x0 .2byte MUS_NIBI .2byte 228 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/UnknownMap_25_31/header.inc b/data/maps/UnknownMap_25_31/header.inc index 704562ea1..46ff55e2a 100644 --- a/data/maps/UnknownMap_25_31/header.inc +++ b/data/maps/UnknownMap_25_31/header.inc @@ -5,7 +5,7 @@ UnknownMap_25_31:: @ 8307A3C .4byte 0x0 .2byte MUS_NIBI .2byte 229 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/UnknownMap_25_32/header.inc b/data/maps/UnknownMap_25_32/header.inc index ef1d675de..c54f50c7e 100644 --- a/data/maps/UnknownMap_25_32/header.inc +++ b/data/maps/UnknownMap_25_32/header.inc @@ -5,7 +5,7 @@ UnknownMap_25_32:: @ 8307A58 .4byte 0x0 .2byte MUS_NIBI .2byte 230 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/UnknownMap_25_33/header.inc b/data/maps/UnknownMap_25_33/header.inc index ba13111f1..3c8177616 100644 --- a/data/maps/UnknownMap_25_33/header.inc +++ b/data/maps/UnknownMap_25_33/header.inc @@ -5,7 +5,7 @@ UnknownMap_25_33:: @ 8307A74 .4byte 0x0 .2byte MUS_NIBI .2byte 231 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/UnknownMap_25_34/header.inc b/data/maps/UnknownMap_25_34/header.inc index f082e3c09..7eaf0d349 100644 --- a/data/maps/UnknownMap_25_34/header.inc +++ b/data/maps/UnknownMap_25_34/header.inc @@ -5,7 +5,7 @@ UnknownMap_25_34:: @ 8307A90 .4byte 0x0 .2byte MUS_NIBI .2byte 232 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/VerdanturfTown/header.inc b/data/maps/VerdanturfTown/header.inc index cbba95897..bbf9f1634 100644 --- a/data/maps/VerdanturfTown/header.inc +++ b/data/maps/VerdanturfTown/header.inc @@ -5,7 +5,7 @@ VerdanturfTown:: @ 83055D0 .4byte VerdanturfTown_MapConnections .2byte MUS_GOMACHI0 .2byte 15 - .byte 5 + .byte MAPSEC_VERDANTURF_TOWN .byte 0 .byte 2 .byte 1 diff --git a/data/maps/VerdanturfTown_ContestHall/header.inc b/data/maps/VerdanturfTown_ContestHall/header.inc index de3e6848e..24e8ad4a6 100644 --- a/data/maps/VerdanturfTown_ContestHall/header.inc +++ b/data/maps/VerdanturfTown_ContestHall/header.inc @@ -5,7 +5,7 @@ VerdanturfTown_ContestHall:: @ 8305D94 .4byte 0x0 .2byte MUS_CONLOBBY .2byte 73 - .byte 5 + .byte MAPSEC_VERDANTURF_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/VerdanturfTown_ContestLobby/header.inc b/data/maps/VerdanturfTown_ContestLobby/header.inc index 60849fb0a..89093874f 100644 --- a/data/maps/VerdanturfTown_ContestLobby/header.inc +++ b/data/maps/VerdanturfTown_ContestLobby/header.inc @@ -5,7 +5,7 @@ VerdanturfTown_ContestLobby:: @ 8305D78 .4byte 0x0 .2byte MUS_CONLOBBY .2byte 72 - .byte 5 + .byte MAPSEC_VERDANTURF_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc b/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc index 4152aef1b..8d7bbb286 100644 --- a/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc +++ b/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc @@ -5,7 +5,7 @@ VerdanturfTown_FriendshipRatersHouse:: @ 8305E20 .4byte 0x0 .2byte MUS_GOMACHI0 .2byte 60 - .byte 5 + .byte MAPSEC_VERDANTURF_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/VerdanturfTown_House/header.inc b/data/maps/VerdanturfTown_House/header.inc index 838905374..311688d18 100644 --- a/data/maps/VerdanturfTown_House/header.inc +++ b/data/maps/VerdanturfTown_House/header.inc @@ -5,7 +5,7 @@ VerdanturfTown_House:: @ 8305E3C .4byte 0x0 .2byte MUS_GOMACHI0 .2byte 59 - .byte 5 + .byte MAPSEC_VERDANTURF_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/VerdanturfTown_Mart/header.inc b/data/maps/VerdanturfTown_Mart/header.inc index 7d34f77a7..5b2334b53 100644 --- a/data/maps/VerdanturfTown_Mart/header.inc +++ b/data/maps/VerdanturfTown_Mart/header.inc @@ -5,7 +5,7 @@ VerdanturfTown_Mart:: @ 8305DB0 .4byte 0x0 .2byte MUS_FRIENDLY .2byte 63 - .byte 5 + .byte MAPSEC_VERDANTURF_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc b/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc index 7e1269720..eb8415d15 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc +++ b/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc @@ -5,7 +5,7 @@ VerdanturfTown_PokemonCenter_1F:: @ 8305DCC .4byte 0x0 .2byte MUS_POKECEN .2byte 61 - .byte 5 + .byte MAPSEC_VERDANTURF_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc b/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc index c29f42e15..a2dbaf237 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc +++ b/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc @@ -5,7 +5,7 @@ VerdanturfTown_PokemonCenter_2F:: @ 8305DE8 .4byte 0x0 .2byte MUS_POKECEN .2byte 62 - .byte 5 + .byte MAPSEC_VERDANTURF_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/VerdanturfTown_WandasHouse/header.inc b/data/maps/VerdanturfTown_WandasHouse/header.inc index 57e835308..11752a9d1 100644 --- a/data/maps/VerdanturfTown_WandasHouse/header.inc +++ b/data/maps/VerdanturfTown_WandasHouse/header.inc @@ -5,7 +5,7 @@ VerdanturfTown_WandasHouse:: @ 8305E04 .4byte 0x0 .2byte MUS_GOMACHI0 .2byte 76 - .byte 5 + .byte MAPSEC_VERDANTURF_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/VictoryRoad_1F/header.inc b/data/maps/VictoryRoad_1F/header.inc index 61c47f001..20fe01115 100644 --- a/data/maps/VictoryRoad_1F/header.inc +++ b/data/maps/VictoryRoad_1F/header.inc @@ -5,7 +5,7 @@ VictoryRoad_1F:: @ 8307224 .4byte 0x0 .2byte MUS_C_ROAD .2byte 164 - .byte 70 + .byte MAPSEC_VICTORY_ROAD .byte 0 .byte 0 .byte 4 diff --git a/data/maps/VictoryRoad_B1F/header.inc b/data/maps/VictoryRoad_B1F/header.inc index b705dc527..3ba564a4b 100644 --- a/data/maps/VictoryRoad_B1F/header.inc +++ b/data/maps/VictoryRoad_B1F/header.inc @@ -5,7 +5,7 @@ VictoryRoad_B1F:: @ 8307240 .4byte 0x0 .2byte MUS_C_ROAD .2byte 286 - .byte 70 + .byte MAPSEC_VICTORY_ROAD .byte 1 .byte 0 .byte 4 diff --git a/data/maps/VictoryRoad_B2F/header.inc b/data/maps/VictoryRoad_B2F/header.inc index 7eb649cfb..17eb818ba 100644 --- a/data/maps/VictoryRoad_B2F/header.inc +++ b/data/maps/VictoryRoad_B2F/header.inc @@ -5,7 +5,7 @@ VictoryRoad_B2F:: @ 830725C .4byte 0x0 .2byte MUS_C_ROAD .2byte 287 - .byte 70 + .byte MAPSEC_VICTORY_ROAD .byte 1 .byte 0 .byte 4 diff --git a/include/constants/region_map_sections.h b/include/constants/region_map_sections.h index 38ca06e1b..254ae2edd 100644 --- a/include/constants/region_map_sections.h +++ b/include/constants/region_map_sections.h @@ -1,97 +1,94 @@ #ifndef GUARD_REGIONMAPSEC_H #define GUARD_REGIONMAPSEC_H -enum -{ - MAPSEC_LITTLEROOT_TOWN, // 0x00 - MAPSEC_OLDALE_TOWN, // 0x01 - MAPSEC_DEWFORD_TOWN, // 0x02 - MAPSEC_LAVARIDGE_TOWN, // 0x03 - MAPSEC_FALLARBOR_TOWN, // 0x04 - MAPSEC_VERDANTURF_TOWN, // 0x05 - MAPSEC_PACIFIDLOG_TOWN, // 0x06 - MAPSEC_PETALBURG_CITY, // 0x07 - MAPSEC_SLATEPORT_CITY, // 0x08 - MAPSEC_MAUVILLE_CITY, // 0x09 - MAPSEC_RUSTBORO_CITY, // 0x0A - MAPSEC_FORTREE_CITY, // 0x0B - MAPSEC_LILYCOVE_CITY, // 0x0C - MAPSEC_MOSSDEEP_CITY, // 0x0D - MAPSEC_SOOTOPOLIS_CITY, // 0x0E - MAPSEC_EVER_GRANDE_CITY, // 0x0F - MAPSEC_ROUTE_101, // 0x10 - MAPSEC_ROUTE_102, // 0x11 - MAPSEC_ROUTE_103, // 0x12 - MAPSEC_ROUTE_104, // 0x13 - MAPSEC_ROUTE_105, // 0x14 - MAPSEC_ROUTE_106, // 0x15 - MAPSEC_ROUTE_107, // 0x16 - MAPSEC_ROUTE_108, // 0x17 - MAPSEC_ROUTE_109, // 0x18 - MAPSEC_ROUTE_110, // 0x19 - MAPSEC_ROUTE_111, // 0x1A - MAPSEC_ROUTE_112, // 0x1B - MAPSEC_ROUTE_113, // 0x1C - MAPSEC_ROUTE_114, // 0x1D - MAPSEC_ROUTE_115, // 0x1E - MAPSEC_ROUTE_116, // 0x1F - MAPSEC_ROUTE_117, // 0x20 - MAPSEC_ROUTE_118, // 0x21 - MAPSEC_ROUTE_119, // 0x22 - MAPSEC_ROUTE_120, // 0x23 - MAPSEC_ROUTE_121, // 0x24 - MAPSEC_ROUTE_122, // 0x25 - MAPSEC_ROUTE_123, // 0x26 - MAPSEC_ROUTE_124, // 0x27 - MAPSEC_ROUTE_125, // 0x28 - MAPSEC_ROUTE_126, // 0x29 - MAPSEC_ROUTE_127, // 0x2A - MAPSEC_ROUTE_128, // 0x2B - MAPSEC_ROUTE_129, // 0x2C - MAPSEC_ROUTE_130, // 0x2D - MAPSEC_ROUTE_131, // 0x2E - MAPSEC_ROUTE_132, // 0x2F - MAPSEC_ROUTE_133, // 0x30 - MAPSEC_ROUTE_134, // 0x31 - MAPSEC_UNDERWATER_124, // 0x32 - MAPSEC_UNDERWATER_125, // 0x33 - MAPSEC_UNDERWATER_126, // 0x34 - MAPSEC_UNDERWATER_127, // 0x35 - MAPSEC_UNDERWATER_SOOTOPOLIS, // 0x36 - MAPSEC_GRANITE_CAVE, // 0x37 - MAPSEC_MT_CHIMNEY, // 0x38 - MAPSEC_SAFARI_ZONE, // 0x39 - MAPSEC_BATTLE_TOWER, // 0x3A - MAPSEC_PETALBURG_WOODS, // 0x3B - MAPSEC_RUSTURF_TUNNEL, // 0x3C - MAPSEC_ABANDONED_SHIP, // 0x3D - MAPSEC_NEW_MAUVILLE, // 0x3E - MAPSEC_METEOR_FALLS, // 0x3F - MAPSEC_METEOR_FALLS_2, // 0x40 - MAPSEC_MT_PYRE, // 0x41 - MAPSEC_EVIL_TEAM_HIDEOUT, // 0x42 - MAPSEC_SHOAL_CAVE, // 0x43 - MAPSEC_SEAFLOOR_CAVERN, // 0x44 - MAPSEC_UNDERWATER_128, // 0x45 - MAPSEC_VICTORY_ROAD, // 0x46 - MAPSEC_MIRAGE_ISLAND, // 0x47 - MAPSEC_CAVE_OF_ORIGIN, // 0x48 - MAPSEC_SOUTHERN_ISLAND, // 0x49 - MAPSEC_FIERY_PATH, // 0x4A - MAPSEC_FIERY_PATH_2, // 0x4B - MAPSEC_JAGGED_PASS, // 0x4C - MAPSEC_JAGGED_PASS_2, // 0x4D - MAPSEC_SEALED_CHAMBER, // 0x4E - MAPSEC_UNDERWATER_SEALED_CHAMBER, // 0x4F - MAPSEC_SCORCHED_SLAB, // 0x50 - MAPSEC_ISLAND_CAVE, // 0x51 - MAPSEC_DESERT_RUINS, // 0x52 - MAPSEC_ANCIENT_TOMB, // 0x53 - MAPSEC_INSIDE_OF_TRUCK, // 0x54 - MAPSEC_SKY_PILLAR, // 0x55 - MAPSEC_SECRET_BASE, // 0x56 - MAPSEC_DYNAMIC, // 0x57 - MAPSEC_NOTHING // 0x58 -}; +#define MAPSEC_LITTLEROOT_TOWN 0x00 +#define MAPSEC_OLDALE_TOWN 0x01 +#define MAPSEC_DEWFORD_TOWN 0x02 +#define MAPSEC_LAVARIDGE_TOWN 0x03 +#define MAPSEC_FALLARBOR_TOWN 0x04 +#define MAPSEC_VERDANTURF_TOWN 0x05 +#define MAPSEC_PACIFIDLOG_TOWN 0x06 +#define MAPSEC_PETALBURG_CITY 0x07 +#define MAPSEC_SLATEPORT_CITY 0x08 +#define MAPSEC_MAUVILLE_CITY 0x09 +#define MAPSEC_RUSTBORO_CITY 0x0A +#define MAPSEC_FORTREE_CITY 0x0B +#define MAPSEC_LILYCOVE_CITY 0x0C +#define MAPSEC_MOSSDEEP_CITY 0x0D +#define MAPSEC_SOOTOPOLIS_CITY 0x0E +#define MAPSEC_EVER_GRANDE_CITY 0x0F +#define MAPSEC_ROUTE_101 0x10 +#define MAPSEC_ROUTE_102 0x11 +#define MAPSEC_ROUTE_103 0x12 +#define MAPSEC_ROUTE_104 0x13 +#define MAPSEC_ROUTE_105 0x14 +#define MAPSEC_ROUTE_106 0x15 +#define MAPSEC_ROUTE_107 0x16 +#define MAPSEC_ROUTE_108 0x17 +#define MAPSEC_ROUTE_109 0x18 +#define MAPSEC_ROUTE_110 0x19 +#define MAPSEC_ROUTE_111 0x1A +#define MAPSEC_ROUTE_112 0x1B +#define MAPSEC_ROUTE_113 0x1C +#define MAPSEC_ROUTE_114 0x1D +#define MAPSEC_ROUTE_115 0x1E +#define MAPSEC_ROUTE_116 0x1F +#define MAPSEC_ROUTE_117 0x20 +#define MAPSEC_ROUTE_118 0x21 +#define MAPSEC_ROUTE_119 0x22 +#define MAPSEC_ROUTE_120 0x23 +#define MAPSEC_ROUTE_121 0x24 +#define MAPSEC_ROUTE_122 0x25 +#define MAPSEC_ROUTE_123 0x26 +#define MAPSEC_ROUTE_124 0x27 +#define MAPSEC_ROUTE_125 0x28 +#define MAPSEC_ROUTE_126 0x29 +#define MAPSEC_ROUTE_127 0x2A +#define MAPSEC_ROUTE_128 0x2B +#define MAPSEC_ROUTE_129 0x2C +#define MAPSEC_ROUTE_130 0x2D +#define MAPSEC_ROUTE_131 0x2E +#define MAPSEC_ROUTE_132 0x2F +#define MAPSEC_ROUTE_133 0x30 +#define MAPSEC_ROUTE_134 0x31 +#define MAPSEC_UNDERWATER_124 0x32 +#define MAPSEC_UNDERWATER_125 0x33 +#define MAPSEC_UNDERWATER_126 0x34 +#define MAPSEC_UNDERWATER_127 0x35 +#define MAPSEC_UNDERWATER_SOOTOPOLIS 0x36 +#define MAPSEC_GRANITE_CAVE 0x37 +#define MAPSEC_MT_CHIMNEY 0x38 +#define MAPSEC_SAFARI_ZONE 0x39 +#define MAPSEC_BATTLE_TOWER 0x3A +#define MAPSEC_PETALBURG_WOODS 0x3B +#define MAPSEC_RUSTURF_TUNNEL 0x3C +#define MAPSEC_ABANDONED_SHIP 0x3D +#define MAPSEC_NEW_MAUVILLE 0x3E +#define MAPSEC_METEOR_FALLS 0x3F +#define MAPSEC_METEOR_FALLS_2 0x40 +#define MAPSEC_MT_PYRE 0x41 +#define MAPSEC_EVIL_TEAM_HIDEOUT 0x42 +#define MAPSEC_SHOAL_CAVE 0x43 +#define MAPSEC_SEAFLOOR_CAVERN 0x44 +#define MAPSEC_UNDERWATER_128 0x45 +#define MAPSEC_VICTORY_ROAD 0x46 +#define MAPSEC_MIRAGE_ISLAND 0x47 +#define MAPSEC_CAVE_OF_ORIGIN 0x48 +#define MAPSEC_SOUTHERN_ISLAND 0x49 +#define MAPSEC_FIERY_PATH 0x4A +#define MAPSEC_FIERY_PATH_2 0x4B +#define MAPSEC_JAGGED_PASS 0x4C +#define MAPSEC_JAGGED_PASS_2 0x4D +#define MAPSEC_SEALED_CHAMBER 0x4E +#define MAPSEC_UNDERWATER_SEALED_CHAMBER 0x4F +#define MAPSEC_SCORCHED_SLAB 0x50 +#define MAPSEC_ISLAND_CAVE 0x51 +#define MAPSEC_DESERT_RUINS 0x52 +#define MAPSEC_ANCIENT_TOMB 0x53 +#define MAPSEC_INSIDE_OF_TRUCK 0x54 +#define MAPSEC_SKY_PILLAR 0x55 +#define MAPSEC_SECRET_BASE 0x56 +#define MAPSEC_DYNAMIC 0x57 +#define MAPSEC_NOTHING 0x58 #endif // GUARD_REGIONMAPSEC_H -- cgit v1.2.3 From 6ac3d87d11143461c37e6d0a2bba1fd77a1bd21d Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Thu, 12 Jul 2018 22:13:52 -0500 Subject: Use weather constants in map headers --- data/maps.s | 1 + data/maps/AbandonedShip_CaptainsOffice/header.inc | 2 +- data/maps/AbandonedShip_Corridors_1F/header.inc | 2 +- data/maps/AbandonedShip_Corridors_B1F/header.inc | 2 +- data/maps/AbandonedShip_Deck/header.inc | 2 +- data/maps/AbandonedShip_HiddenFloorCorridors/header.inc | 2 +- data/maps/AbandonedShip_HiddenFloorRooms/header.inc | 2 +- data/maps/AbandonedShip_Room_B1F/header.inc | 2 +- data/maps/AbandonedShip_Rooms2_1F/header.inc | 2 +- data/maps/AbandonedShip_Rooms2_B1F/header.inc | 2 +- data/maps/AbandonedShip_Rooms_1F/header.inc | 2 +- data/maps/AbandonedShip_Rooms_B1F/header.inc | 2 +- data/maps/AbandonedShip_Underwater1/header.inc | 2 +- data/maps/AbandonedShip_Underwater2/header.inc | 2 +- data/maps/AncientTomb/header.inc | 2 +- data/maps/AquaHideout_1F/header.inc | 2 +- data/maps/AquaHideout_B1F/header.inc | 2 +- data/maps/AquaHideout_B2F/header.inc | 2 +- data/maps/BattleTower_BattleRoom/header.inc | 2 +- data/maps/BattleTower_Corridor/header.inc | 2 +- data/maps/BattleTower_Elevator/header.inc | 2 +- data/maps/BattleTower_Lobby/header.inc | 2 +- data/maps/BattleTower_Outside/header.inc | 2 +- data/maps/CaveOfOrigin_1F/header.inc | 2 +- data/maps/CaveOfOrigin_B1F/header.inc | 2 +- data/maps/CaveOfOrigin_B2F/header.inc | 2 +- data/maps/CaveOfOrigin_B3F/header.inc | 2 +- data/maps/CaveOfOrigin_B4F/header.inc | 2 +- data/maps/CaveOfOrigin_Entrance/header.inc | 2 +- data/maps/DesertRuins/header.inc | 2 +- data/maps/DewfordTown/header.inc | 2 +- data/maps/DewfordTown_Gym/header.inc | 2 +- data/maps/DewfordTown_Hall/header.inc | 2 +- data/maps/DewfordTown_House1/header.inc | 2 +- data/maps/DewfordTown_House2/header.inc | 2 +- data/maps/DewfordTown_PokemonCenter_1F/header.inc | 2 +- data/maps/DewfordTown_PokemonCenter_2F/header.inc | 2 +- data/maps/DoubleBattleColosseum/header.inc | 2 +- data/maps/EverGrandeCity/header.inc | 2 +- data/maps/EverGrandeCity_ChampionsRoom/header.inc | 2 +- data/maps/EverGrandeCity_Corridor1/header.inc | 2 +- data/maps/EverGrandeCity_Corridor2/header.inc | 2 +- data/maps/EverGrandeCity_Corridor3/header.inc | 2 +- data/maps/EverGrandeCity_Corridor4/header.inc | 2 +- data/maps/EverGrandeCity_Corridor5/header.inc | 2 +- data/maps/EverGrandeCity_DrakesRoom/header.inc | 2 +- data/maps/EverGrandeCity_GlaciasRoom/header.inc | 2 +- data/maps/EverGrandeCity_HallOfFame/header.inc | 2 +- data/maps/EverGrandeCity_PhoebesRoom/header.inc | 2 +- data/maps/EverGrandeCity_PokemonCenter_1F/header.inc | 2 +- data/maps/EverGrandeCity_PokemonCenter_2F/header.inc | 2 +- data/maps/EverGrandeCity_PokemonLeague/header.inc | 2 +- data/maps/EverGrandeCity_SidneysRoom/header.inc | 2 +- data/maps/FallarborTown/header.inc | 2 +- data/maps/FallarborTown_ContestHall/header.inc | 2 +- data/maps/FallarborTown_ContestLobby/header.inc | 2 +- data/maps/FallarborTown_House1/header.inc | 2 +- data/maps/FallarborTown_House2/header.inc | 2 +- data/maps/FallarborTown_Mart/header.inc | 2 +- data/maps/FallarborTown_PokemonCenter_1F/header.inc | 2 +- data/maps/FallarborTown_PokemonCenter_2F/header.inc | 2 +- data/maps/FieryPath/header.inc | 2 +- data/maps/FortreeCity/header.inc | 2 +- data/maps/FortreeCity_DecorationShop/header.inc | 2 +- data/maps/FortreeCity_Gym/header.inc | 2 +- data/maps/FortreeCity_House1/header.inc | 2 +- data/maps/FortreeCity_House2/header.inc | 2 +- data/maps/FortreeCity_House3/header.inc | 2 +- data/maps/FortreeCity_House4/header.inc | 2 +- data/maps/FortreeCity_House5/header.inc | 2 +- data/maps/FortreeCity_Mart/header.inc | 2 +- data/maps/FortreeCity_PokemonCenter_1F/header.inc | 2 +- data/maps/FortreeCity_PokemonCenter_2F/header.inc | 2 +- data/maps/GraniteCave_1F/header.inc | 2 +- data/maps/GraniteCave_B1F/header.inc | 2 +- data/maps/GraniteCave_B2F/header.inc | 2 +- data/maps/GraniteCave_StevensRoom/header.inc | 2 +- data/maps/InsideOfTruck/header.inc | 2 +- data/maps/IslandCave/header.inc | 2 +- data/maps/JaggedPass/header.inc | 2 +- data/maps/LavaridgeTown/header.inc | 2 +- data/maps/LavaridgeTown_Gym_1F/header.inc | 2 +- data/maps/LavaridgeTown_Gym_B1F/header.inc | 2 +- data/maps/LavaridgeTown_HerbShop/header.inc | 2 +- data/maps/LavaridgeTown_House/header.inc | 2 +- data/maps/LavaridgeTown_Mart/header.inc | 2 +- data/maps/LavaridgeTown_PokemonCenter_1F/header.inc | 2 +- data/maps/LavaridgeTown_PokemonCenter_2F/header.inc | 2 +- data/maps/LilycoveCity/header.inc | 2 +- data/maps/LilycoveCity_ContestHall/header.inc | 2 +- data/maps/LilycoveCity_ContestLobby/header.inc | 2 +- data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc | 2 +- data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc | 2 +- data/maps/LilycoveCity_DepartmentStoreElevator/header.inc | 2 +- data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc | 2 +- data/maps/LilycoveCity_DepartmentStore_1F/header.inc | 2 +- data/maps/LilycoveCity_DepartmentStore_2F/header.inc | 2 +- data/maps/LilycoveCity_DepartmentStore_3F/header.inc | 2 +- data/maps/LilycoveCity_DepartmentStore_4F/header.inc | 2 +- data/maps/LilycoveCity_DepartmentStore_5F/header.inc | 2 +- data/maps/LilycoveCity_EmptyMap/header.inc | 2 +- data/maps/LilycoveCity_Harbor/header.inc | 2 +- data/maps/LilycoveCity_House1/header.inc | 2 +- data/maps/LilycoveCity_House2/header.inc | 2 +- data/maps/LilycoveCity_House3/header.inc | 2 +- data/maps/LilycoveCity_House4/header.inc | 2 +- data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc | 2 +- data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc | 2 +- data/maps/LilycoveCity_MoveDeletersHouse/header.inc | 2 +- data/maps/LilycoveCity_PokemonCenter_1F/header.inc | 2 +- data/maps/LilycoveCity_PokemonCenter_2F/header.inc | 2 +- data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc | 2 +- data/maps/LilycoveCity_UnusedMart/header.inc | 2 +- data/maps/LinkContestRoom1/header.inc | 2 +- data/maps/LinkContestRoom2/header.inc | 2 +- data/maps/LinkContestRoom3/header.inc | 2 +- data/maps/LinkContestRoom4/header.inc | 2 +- data/maps/LinkContestRoom5/header.inc | 2 +- data/maps/LinkContestRoom6/header.inc | 2 +- data/maps/LittlerootTown/header.inc | 2 +- data/maps/LittlerootTown_BrendansHouse_1F/header.inc | 2 +- data/maps/LittlerootTown_BrendansHouse_2F/header.inc | 2 +- data/maps/LittlerootTown_MaysHouse_1F/header.inc | 2 +- data/maps/LittlerootTown_MaysHouse_2F/header.inc | 2 +- data/maps/LittlerootTown_ProfessorBirchsLab/header.inc | 2 +- data/maps/MagmaHideout_1F/header.inc | 2 +- data/maps/MagmaHideout_B1F/header.inc | 2 +- data/maps/MagmaHideout_B2F/header.inc | 2 +- data/maps/MauvilleCity/header.inc | 2 +- data/maps/MauvilleCity_BikeShop/header.inc | 2 +- data/maps/MauvilleCity_GameCorner/header.inc | 2 +- data/maps/MauvilleCity_Gym/header.inc | 2 +- data/maps/MauvilleCity_House1/header.inc | 2 +- data/maps/MauvilleCity_House2/header.inc | 2 +- data/maps/MauvilleCity_Mart/header.inc | 2 +- data/maps/MauvilleCity_PokemonCenter_1F/header.inc | 2 +- data/maps/MauvilleCity_PokemonCenter_2F/header.inc | 2 +- data/maps/MeteorFalls_1F_1R/header.inc | 2 +- data/maps/MeteorFalls_1F_2R/header.inc | 2 +- data/maps/MeteorFalls_B1F_1R/header.inc | 2 +- data/maps/MeteorFalls_B1F_2R/header.inc | 2 +- data/maps/MossdeepCity/header.inc | 2 +- data/maps/MossdeepCity_GameCorner_1F/header.inc | 2 +- data/maps/MossdeepCity_GameCorner_B1F/header.inc | 2 +- data/maps/MossdeepCity_Gym/header.inc | 2 +- data/maps/MossdeepCity_House1/header.inc | 2 +- data/maps/MossdeepCity_House2/header.inc | 2 +- data/maps/MossdeepCity_House3/header.inc | 2 +- data/maps/MossdeepCity_House4/header.inc | 2 +- data/maps/MossdeepCity_Mart/header.inc | 2 +- data/maps/MossdeepCity_PokemonCenter_1F/header.inc | 2 +- data/maps/MossdeepCity_PokemonCenter_2F/header.inc | 2 +- data/maps/MossdeepCity_SpaceCenter_1F/header.inc | 2 +- data/maps/MossdeepCity_SpaceCenter_2F/header.inc | 2 +- data/maps/MossdeepCity_StevensHouse/header.inc | 2 +- data/maps/MtChimney/header.inc | 2 +- data/maps/MtChimney_CableCarStation/header.inc | 2 +- data/maps/MtPyre_1F/header.inc | 2 +- data/maps/MtPyre_2F/header.inc | 2 +- data/maps/MtPyre_3F/header.inc | 2 +- data/maps/MtPyre_4F/header.inc | 2 +- data/maps/MtPyre_5F/header.inc | 2 +- data/maps/MtPyre_6F/header.inc | 2 +- data/maps/MtPyre_Exterior/header.inc | 2 +- data/maps/MtPyre_Summit/header.inc | 2 +- data/maps/NewMauville_Entrance/header.inc | 2 +- data/maps/NewMauville_Inside/header.inc | 2 +- data/maps/OldaleTown/header.inc | 2 +- data/maps/OldaleTown_House1/header.inc | 2 +- data/maps/OldaleTown_House2/header.inc | 2 +- data/maps/OldaleTown_Mart/header.inc | 2 +- data/maps/OldaleTown_PokemonCenter_1F/header.inc | 2 +- data/maps/OldaleTown_PokemonCenter_2F/header.inc | 2 +- data/maps/PacifidlogTown/header.inc | 2 +- data/maps/PacifidlogTown_House1/header.inc | 2 +- data/maps/PacifidlogTown_House2/header.inc | 2 +- data/maps/PacifidlogTown_House3/header.inc | 2 +- data/maps/PacifidlogTown_House4/header.inc | 2 +- data/maps/PacifidlogTown_House5/header.inc | 2 +- data/maps/PacifidlogTown_PokemonCenter_1F/header.inc | 2 +- data/maps/PacifidlogTown_PokemonCenter_2F/header.inc | 2 +- data/maps/PetalburgCity/header.inc | 2 +- data/maps/PetalburgCity_Gym/header.inc | 2 +- data/maps/PetalburgCity_House1/header.inc | 2 +- data/maps/PetalburgCity_House2/header.inc | 2 +- data/maps/PetalburgCity_Mart/header.inc | 2 +- data/maps/PetalburgCity_PokemonCenter_1F/header.inc | 2 +- data/maps/PetalburgCity_PokemonCenter_2F/header.inc | 2 +- data/maps/PetalburgCity_WallysHouse/header.inc | 2 +- data/maps/PetalburgWoods/header.inc | 2 +- data/maps/RecordCorner/header.inc | 2 +- data/maps/Route101/header.inc | 2 +- data/maps/Route102/header.inc | 2 +- data/maps/Route103/header.inc | 2 +- data/maps/Route104/header.inc | 2 +- data/maps/Route104_MrBrineysHouse/header.inc | 2 +- data/maps/Route104_PrettyPetalFlowerShop/header.inc | 2 +- data/maps/Route104_Prototype/header.inc | 2 +- data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc | 2 +- data/maps/Route105/header.inc | 2 +- data/maps/Route106/header.inc | 2 +- data/maps/Route107/header.inc | 2 +- data/maps/Route108/header.inc | 2 +- data/maps/Route109/header.inc | 2 +- data/maps/Route109_SeashoreHouse/header.inc | 2 +- data/maps/Route110/header.inc | 2 +- data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc | 2 +- data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc | 2 +- data/maps/Route110_TrickHouseCorridor/header.inc | 2 +- data/maps/Route110_TrickHouseEnd/header.inc | 2 +- data/maps/Route110_TrickHouseEntrance/header.inc | 2 +- data/maps/Route110_TrickHousePuzzle1/header.inc | 2 +- data/maps/Route110_TrickHousePuzzle2/header.inc | 2 +- data/maps/Route110_TrickHousePuzzle3/header.inc | 2 +- data/maps/Route110_TrickHousePuzzle4/header.inc | 2 +- data/maps/Route110_TrickHousePuzzle5/header.inc | 2 +- data/maps/Route110_TrickHousePuzzle6/header.inc | 2 +- data/maps/Route110_TrickHousePuzzle7/header.inc | 2 +- data/maps/Route110_TrickHousePuzzle8/header.inc | 2 +- data/maps/Route111/header.inc | 2 +- data/maps/Route111_OldLadysRestStop/header.inc | 2 +- data/maps/Route111_WinstrateFamilysHouse/header.inc | 2 +- data/maps/Route112/header.inc | 2 +- data/maps/Route112_CableCarStation/header.inc | 2 +- data/maps/Route113/header.inc | 2 +- data/maps/Route113_GlassWorkshop/header.inc | 2 +- data/maps/Route114/header.inc | 2 +- data/maps/Route114_FossilManiacsHouse/header.inc | 2 +- data/maps/Route114_FossilManiacsTunnel/header.inc | 2 +- data/maps/Route114_LanettesHouse/header.inc | 2 +- data/maps/Route115/header.inc | 2 +- data/maps/Route116/header.inc | 2 +- data/maps/Route116_TunnelersRestHouse/header.inc | 2 +- data/maps/Route117/header.inc | 2 +- data/maps/Route117_PokemonDayCare/header.inc | 2 +- data/maps/Route118/header.inc | 2 +- data/maps/Route119/header.inc | 2 +- data/maps/Route119_House/header.inc | 2 +- data/maps/Route119_WeatherInstitute_1F/header.inc | 2 +- data/maps/Route119_WeatherInstitute_2F/header.inc | 2 +- data/maps/Route120/header.inc | 2 +- data/maps/Route121/header.inc | 2 +- data/maps/Route121_SafariZoneEntrance/header.inc | 2 +- data/maps/Route122/header.inc | 2 +- data/maps/Route123/header.inc | 2 +- data/maps/Route123_BerryMastersHouse/header.inc | 2 +- data/maps/Route124/header.inc | 2 +- data/maps/Route124_DivingTreasureHuntersHouse/header.inc | 2 +- data/maps/Route125/header.inc | 2 +- data/maps/Route126/header.inc | 2 +- data/maps/Route127/header.inc | 2 +- data/maps/Route128/header.inc | 2 +- data/maps/Route129/header.inc | 2 +- data/maps/Route130/header.inc | 2 +- data/maps/Route131/header.inc | 2 +- data/maps/Route132/header.inc | 2 +- data/maps/Route133/header.inc | 2 +- data/maps/Route134/header.inc | 2 +- data/maps/RustboroCity/header.inc | 2 +- data/maps/RustboroCity_CuttersHouse/header.inc | 2 +- data/maps/RustboroCity_DevonCorp_1F/header.inc | 2 +- data/maps/RustboroCity_DevonCorp_2F/header.inc | 2 +- data/maps/RustboroCity_DevonCorp_3F/header.inc | 2 +- data/maps/RustboroCity_Flat1_1F/header.inc | 2 +- data/maps/RustboroCity_Flat1_2F/header.inc | 2 +- data/maps/RustboroCity_Flat2_1F/header.inc | 2 +- data/maps/RustboroCity_Flat2_2F/header.inc | 2 +- data/maps/RustboroCity_Flat2_3F/header.inc | 2 +- data/maps/RustboroCity_Gym/header.inc | 2 +- data/maps/RustboroCity_House1/header.inc | 2 +- data/maps/RustboroCity_House2/header.inc | 2 +- data/maps/RustboroCity_House3/header.inc | 2 +- data/maps/RustboroCity_Mart/header.inc | 2 +- data/maps/RustboroCity_PokemonCenter_1F/header.inc | 2 +- data/maps/RustboroCity_PokemonCenter_2F/header.inc | 2 +- data/maps/RustboroCity_PokemonSchool/header.inc | 2 +- data/maps/RusturfTunnel/header.inc | 2 +- data/maps/SSTidalCorridor/header.inc | 2 +- data/maps/SSTidalLowerDeck/header.inc | 2 +- data/maps/SSTidalRooms/header.inc | 2 +- data/maps/SafariZone_Northeast/header.inc | 2 +- data/maps/SafariZone_Northwest/header.inc | 2 +- data/maps/SafariZone_RestHouse/header.inc | 2 +- data/maps/SafariZone_Southeast/header.inc | 2 +- data/maps/SafariZone_Southwest/header.inc | 2 +- data/maps/ScorchedSlab/header.inc | 2 +- data/maps/SeafloorCavern_Entrance/header.inc | 2 +- data/maps/SeafloorCavern_Room1/header.inc | 2 +- data/maps/SeafloorCavern_Room2/header.inc | 2 +- data/maps/SeafloorCavern_Room3/header.inc | 2 +- data/maps/SeafloorCavern_Room4/header.inc | 2 +- data/maps/SeafloorCavern_Room5/header.inc | 2 +- data/maps/SeafloorCavern_Room6/header.inc | 2 +- data/maps/SeafloorCavern_Room7/header.inc | 2 +- data/maps/SeafloorCavern_Room8/header.inc | 2 +- data/maps/SeafloorCavern_Room9/header.inc | 2 +- data/maps/SealedChamber_InnerRoom/header.inc | 2 +- data/maps/SealedChamber_OuterRoom/header.inc | 2 +- data/maps/SecretBase_BlueCave1/header.inc | 2 +- data/maps/SecretBase_BlueCave2/header.inc | 2 +- data/maps/SecretBase_BlueCave3/header.inc | 2 +- data/maps/SecretBase_BlueCave4/header.inc | 2 +- data/maps/SecretBase_BrownCave1/header.inc | 2 +- data/maps/SecretBase_BrownCave2/header.inc | 2 +- data/maps/SecretBase_BrownCave3/header.inc | 2 +- data/maps/SecretBase_BrownCave4/header.inc | 2 +- data/maps/SecretBase_RedCave1/header.inc | 2 +- data/maps/SecretBase_RedCave2/header.inc | 2 +- data/maps/SecretBase_RedCave3/header.inc | 2 +- data/maps/SecretBase_RedCave4/header.inc | 2 +- data/maps/SecretBase_Shrub1/header.inc | 2 +- data/maps/SecretBase_Shrub2/header.inc | 2 +- data/maps/SecretBase_Shrub3/header.inc | 2 +- data/maps/SecretBase_Shrub4/header.inc | 2 +- data/maps/SecretBase_Tree1/header.inc | 2 +- data/maps/SecretBase_Tree2/header.inc | 2 +- data/maps/SecretBase_Tree3/header.inc | 2 +- data/maps/SecretBase_Tree4/header.inc | 2 +- data/maps/SecretBase_YellowCave1/header.inc | 2 +- data/maps/SecretBase_YellowCave2/header.inc | 2 +- data/maps/SecretBase_YellowCave3/header.inc | 2 +- data/maps/SecretBase_YellowCave4/header.inc | 2 +- data/maps/ShoalCave_HighTideEntranceRoom/header.inc | 2 +- data/maps/ShoalCave_HighTideInnerRoom/header.inc | 2 +- data/maps/ShoalCave_LowTideEntranceRoom/header.inc | 2 +- data/maps/ShoalCave_LowTideIceRoom/header.inc | 2 +- data/maps/ShoalCave_LowTideInnerRoom/header.inc | 2 +- data/maps/ShoalCave_LowTideLowerRoom/header.inc | 2 +- data/maps/ShoalCave_LowTideStairsRoom/header.inc | 2 +- data/maps/SingleBattleColosseum/header.inc | 2 +- data/maps/SkyPillar_1F/header.inc | 2 +- data/maps/SkyPillar_2F/header.inc | 2 +- data/maps/SkyPillar_3F/header.inc | 2 +- data/maps/SkyPillar_4F/header.inc | 2 +- data/maps/SkyPillar_5F/header.inc | 2 +- data/maps/SkyPillar_Entrance/header.inc | 2 +- data/maps/SkyPillar_Outside/header.inc | 2 +- data/maps/SkyPillar_Top/header.inc | 2 +- data/maps/SlateportCity/header.inc | 2 +- data/maps/SlateportCity_ContestHall/header.inc | 2 +- data/maps/SlateportCity_ContestLobby/header.inc | 2 +- data/maps/SlateportCity_Harbor/header.inc | 2 +- data/maps/SlateportCity_House1/header.inc | 2 +- data/maps/SlateportCity_House2/header.inc | 2 +- data/maps/SlateportCity_Mart/header.inc | 2 +- data/maps/SlateportCity_OceanicMuseum_1F/header.inc | 2 +- data/maps/SlateportCity_OceanicMuseum_2F/header.inc | 2 +- data/maps/SlateportCity_PokemonCenter_1F/header.inc | 2 +- data/maps/SlateportCity_PokemonCenter_2F/header.inc | 2 +- data/maps/SlateportCity_PokemonFanClub/header.inc | 2 +- data/maps/SlateportCity_SternsShipyard_1F/header.inc | 2 +- data/maps/SlateportCity_SternsShipyard_2F/header.inc | 2 +- data/maps/SootopolisCity/header.inc | 2 +- data/maps/SootopolisCity_Gym_1F/header.inc | 2 +- data/maps/SootopolisCity_Gym_B1F/header.inc | 2 +- data/maps/SootopolisCity_House1/header.inc | 2 +- data/maps/SootopolisCity_House2/header.inc | 2 +- data/maps/SootopolisCity_House3/header.inc | 2 +- data/maps/SootopolisCity_House4/header.inc | 2 +- data/maps/SootopolisCity_House5/header.inc | 2 +- data/maps/SootopolisCity_House6/header.inc | 2 +- data/maps/SootopolisCity_House7/header.inc | 2 +- data/maps/SootopolisCity_House8/header.inc | 2 +- data/maps/SootopolisCity_Mart/header.inc | 2 +- data/maps/SootopolisCity_PokemonCenter_1F/header.inc | 2 +- data/maps/SootopolisCity_PokemonCenter_2F/header.inc | 2 +- data/maps/SouthernIsland_Exterior/header.inc | 2 +- data/maps/SouthernIsland_Interior/header.inc | 2 +- data/maps/TradeCenter/header.inc | 2 +- data/maps/Underwater1/header.inc | 2 +- data/maps/Underwater2/header.inc | 2 +- data/maps/Underwater3/header.inc | 2 +- data/maps/Underwater4/header.inc | 2 +- data/maps/Underwater_Route134/header.inc | 2 +- data/maps/Underwater_SeafloorCavern/header.inc | 2 +- data/maps/Underwater_SealedChamber/header.inc | 2 +- data/maps/Underwater_SootopolisCity/header.inc | 2 +- data/maps/UnknownMap_25_29/header.inc | 2 +- data/maps/UnknownMap_25_30/header.inc | 2 +- data/maps/UnknownMap_25_31/header.inc | 2 +- data/maps/UnknownMap_25_32/header.inc | 2 +- data/maps/UnknownMap_25_33/header.inc | 2 +- data/maps/UnknownMap_25_34/header.inc | 2 +- data/maps/VerdanturfTown/header.inc | 2 +- data/maps/VerdanturfTown_ContestHall/header.inc | 2 +- data/maps/VerdanturfTown_ContestLobby/header.inc | 2 +- data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc | 2 +- data/maps/VerdanturfTown_House/header.inc | 2 +- data/maps/VerdanturfTown_Mart/header.inc | 2 +- data/maps/VerdanturfTown_PokemonCenter_1F/header.inc | 2 +- data/maps/VerdanturfTown_PokemonCenter_2F/header.inc | 2 +- data/maps/VerdanturfTown_WandasHouse/header.inc | 2 +- data/maps/VictoryRoad_1F/header.inc | 2 +- data/maps/VictoryRoad_B1F/header.inc | 2 +- data/maps/VictoryRoad_B2F/header.inc | 2 +- 395 files changed, 395 insertions(+), 394 deletions(-) diff --git a/data/maps.s b/data/maps.s index b0cf69d9d..ed1a6bed6 100644 --- a/data/maps.s +++ b/data/maps.s @@ -1,6 +1,7 @@ #include "constants/maps.h" #include "constants/region_map_sections.h" #include "constants/songs.h" +#include "constants/weather.h" .include "include/macros.inc" .include "constants/constants.inc" diff --git a/data/maps/AbandonedShip_CaptainsOffice/header.inc b/data/maps/AbandonedShip_CaptainsOffice/header.inc index d00ed43da..8cec689af 100644 --- a/data/maps/AbandonedShip_CaptainsOffice/header.inc +++ b/data/maps/AbandonedShip_CaptainsOffice/header.inc @@ -7,7 +7,7 @@ AbandonedShip_CaptainsOffice:: @ 8307454 .2byte 196 .byte MAPSEC_ABANDONED_SHIP .byte 0 - .byte 11 + .byte WEATHER_SHADE .byte 4 .2byte 0 .byte 1 diff --git a/data/maps/AbandonedShip_Corridors_1F/header.inc b/data/maps/AbandonedShip_Corridors_1F/header.inc index 1f1c3ae27..54e660513 100644 --- a/data/maps/AbandonedShip_Corridors_1F/header.inc +++ b/data/maps/AbandonedShip_Corridors_1F/header.inc @@ -7,7 +7,7 @@ AbandonedShip_Corridors_1F:: @ 8307374 .2byte 188 .byte MAPSEC_ABANDONED_SHIP .byte 0 - .byte 11 + .byte WEATHER_SHADE .byte 4 .2byte 0 .byte 1 diff --git a/data/maps/AbandonedShip_Corridors_B1F/header.inc b/data/maps/AbandonedShip_Corridors_B1F/header.inc index 91bb7808e..87c3b7f7b 100644 --- a/data/maps/AbandonedShip_Corridors_B1F/header.inc +++ b/data/maps/AbandonedShip_Corridors_B1F/header.inc @@ -7,7 +7,7 @@ AbandonedShip_Corridors_B1F:: @ 83073AC .2byte 190 .byte MAPSEC_ABANDONED_SHIP .byte 0 - .byte 11 + .byte WEATHER_SHADE .byte 4 .2byte 0 .byte 1 diff --git a/data/maps/AbandonedShip_Deck/header.inc b/data/maps/AbandonedShip_Deck/header.inc index 86b21b7ff..b4a526392 100644 --- a/data/maps/AbandonedShip_Deck/header.inc +++ b/data/maps/AbandonedShip_Deck/header.inc @@ -7,7 +7,7 @@ AbandonedShip_Deck:: @ 8307358 .2byte 187 .byte MAPSEC_ABANDONED_SHIP .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 1 diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc b/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc index ecf1ba891..4a79ed9d1 100644 --- a/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc +++ b/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc @@ -7,7 +7,7 @@ AbandonedShip_HiddenFloorCorridors:: @ 830748C .2byte 290 .byte MAPSEC_ABANDONED_SHIP .byte 0 - .byte 11 + .byte WEATHER_SHADE .byte 4 .2byte 0 .byte 1 diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/header.inc b/data/maps/AbandonedShip_HiddenFloorRooms/header.inc index 49e5519a1..d00d48363 100644 --- a/data/maps/AbandonedShip_HiddenFloorRooms/header.inc +++ b/data/maps/AbandonedShip_HiddenFloorRooms/header.inc @@ -7,7 +7,7 @@ AbandonedShip_HiddenFloorRooms:: @ 83074A8 .2byte 311 .byte MAPSEC_ABANDONED_SHIP .byte 0 - .byte 11 + .byte WEATHER_SHADE .byte 4 .2byte 0 .byte 0 diff --git a/data/maps/AbandonedShip_Room_B1F/header.inc b/data/maps/AbandonedShip_Room_B1F/header.inc index f0d3167e9..efea716b2 100644 --- a/data/maps/AbandonedShip_Room_B1F/header.inc +++ b/data/maps/AbandonedShip_Room_B1F/header.inc @@ -7,7 +7,7 @@ AbandonedShip_Room_B1F:: @ 830741C .2byte 194 .byte MAPSEC_ABANDONED_SHIP .byte 0 - .byte 11 + .byte WEATHER_SHADE .byte 4 .2byte 0 .byte 1 diff --git a/data/maps/AbandonedShip_Rooms2_1F/header.inc b/data/maps/AbandonedShip_Rooms2_1F/header.inc index e7b172bd5..13362610f 100644 --- a/data/maps/AbandonedShip_Rooms2_1F/header.inc +++ b/data/maps/AbandonedShip_Rooms2_1F/header.inc @@ -7,7 +7,7 @@ AbandonedShip_Rooms2_1F:: @ 8307438 .2byte 195 .byte MAPSEC_ABANDONED_SHIP .byte 0 - .byte 11 + .byte WEATHER_SHADE .byte 4 .2byte 0 .byte 1 diff --git a/data/maps/AbandonedShip_Rooms2_B1F/header.inc b/data/maps/AbandonedShip_Rooms2_B1F/header.inc index 7150ed946..2bb3d1c35 100644 --- a/data/maps/AbandonedShip_Rooms2_B1F/header.inc +++ b/data/maps/AbandonedShip_Rooms2_B1F/header.inc @@ -7,7 +7,7 @@ AbandonedShip_Rooms2_B1F:: @ 83073E4 .2byte 192 .byte MAPSEC_ABANDONED_SHIP .byte 0 - .byte 11 + .byte WEATHER_SHADE .byte 4 .2byte 0 .byte 1 diff --git a/data/maps/AbandonedShip_Rooms_1F/header.inc b/data/maps/AbandonedShip_Rooms_1F/header.inc index 6b44c3244..818e1bf37 100644 --- a/data/maps/AbandonedShip_Rooms_1F/header.inc +++ b/data/maps/AbandonedShip_Rooms_1F/header.inc @@ -7,7 +7,7 @@ AbandonedShip_Rooms_1F:: @ 8307390 .2byte 189 .byte MAPSEC_ABANDONED_SHIP .byte 0 - .byte 11 + .byte WEATHER_SHADE .byte 4 .2byte 0 .byte 1 diff --git a/data/maps/AbandonedShip_Rooms_B1F/header.inc b/data/maps/AbandonedShip_Rooms_B1F/header.inc index e633cb467..a5e23f06d 100644 --- a/data/maps/AbandonedShip_Rooms_B1F/header.inc +++ b/data/maps/AbandonedShip_Rooms_B1F/header.inc @@ -7,7 +7,7 @@ AbandonedShip_Rooms_B1F:: @ 83073C8 .2byte 191 .byte MAPSEC_ABANDONED_SHIP .byte 0 - .byte 11 + .byte WEATHER_SHADE .byte 4 .2byte 0 .byte 1 diff --git a/data/maps/AbandonedShip_Underwater1/header.inc b/data/maps/AbandonedShip_Underwater1/header.inc index d948fcc74..9c20b5253 100644 --- a/data/maps/AbandonedShip_Underwater1/header.inc +++ b/data/maps/AbandonedShip_Underwater1/header.inc @@ -7,7 +7,7 @@ AbandonedShip_Underwater1:: @ 8307400 .2byte 193 .byte MAPSEC_ABANDONED_SHIP .byte 0 - .byte 14 + .byte WEATHER_BUBBLES .byte 5 .2byte 0 .byte 1 diff --git a/data/maps/AbandonedShip_Underwater2/header.inc b/data/maps/AbandonedShip_Underwater2/header.inc index 45d3c6008..6238607c2 100644 --- a/data/maps/AbandonedShip_Underwater2/header.inc +++ b/data/maps/AbandonedShip_Underwater2/header.inc @@ -7,7 +7,7 @@ AbandonedShip_Underwater2:: @ 8307470 .2byte 197 .byte MAPSEC_ABANDONED_SHIP .byte 0 - .byte 14 + .byte WEATHER_BUBBLES .byte 5 .2byte 0 .byte 1 diff --git a/data/maps/AncientTomb/header.inc b/data/maps/AncientTomb/header.inc index f5354ca7e..7281a0ed2 100644 --- a/data/maps/AncientTomb/header.inc +++ b/data/maps/AncientTomb/header.inc @@ -7,7 +7,7 @@ AncientTomb:: @ 83074E0 .2byte 282 .byte MAPSEC_ANCIENT_TOMB .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 1 diff --git a/data/maps/AquaHideout_1F/header.inc b/data/maps/AquaHideout_1F/header.inc index f3527ccfd..3eb77788b 100644 --- a/data/maps/AquaHideout_1F/header.inc +++ b/data/maps/AquaHideout_1F/header.inc @@ -7,7 +7,7 @@ AquaHideout_1F:: @ 8306FF4 .2byte 144 .byte MAPSEC_EVIL_TEAM_HIDEOUT .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 1 diff --git a/data/maps/AquaHideout_B1F/header.inc b/data/maps/AquaHideout_B1F/header.inc index 82244295e..97b0c3d41 100644 --- a/data/maps/AquaHideout_B1F/header.inc +++ b/data/maps/AquaHideout_B1F/header.inc @@ -7,7 +7,7 @@ AquaHideout_B1F:: @ 8307010 .2byte 145 .byte MAPSEC_EVIL_TEAM_HIDEOUT .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 1 diff --git a/data/maps/AquaHideout_B2F/header.inc b/data/maps/AquaHideout_B2F/header.inc index f72dc8bd3..bed8c39c7 100644 --- a/data/maps/AquaHideout_B2F/header.inc +++ b/data/maps/AquaHideout_B2F/header.inc @@ -7,7 +7,7 @@ AquaHideout_B2F:: @ 830702C .2byte 146 .byte MAPSEC_EVIL_TEAM_HIDEOUT .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 1 diff --git a/data/maps/BattleTower_BattleRoom/header.inc b/data/maps/BattleTower_BattleRoom/header.inc index 6e7a51ca5..dd0d0a715 100644 --- a/data/maps/BattleTower_BattleRoom/header.inc +++ b/data/maps/BattleTower_BattleRoom/header.inc @@ -7,7 +7,7 @@ BattleTower_BattleRoom:: @ 8307C88 .2byte 269 .byte MAPSEC_BATTLE_TOWER .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/BattleTower_Corridor/header.inc b/data/maps/BattleTower_Corridor/header.inc index f0eff7fc3..34304ab0f 100644 --- a/data/maps/BattleTower_Corridor/header.inc +++ b/data/maps/BattleTower_Corridor/header.inc @@ -7,7 +7,7 @@ BattleTower_Corridor:: @ 8307C6C .2byte 268 .byte MAPSEC_BATTLE_TOWER .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/BattleTower_Elevator/header.inc b/data/maps/BattleTower_Elevator/header.inc index c1e15c213..d455c8d2d 100644 --- a/data/maps/BattleTower_Elevator/header.inc +++ b/data/maps/BattleTower_Elevator/header.inc @@ -7,7 +7,7 @@ BattleTower_Elevator:: @ 8307C50 .2byte 267 .byte MAPSEC_BATTLE_TOWER .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/BattleTower_Lobby/header.inc b/data/maps/BattleTower_Lobby/header.inc index eeee38922..9595fc740 100644 --- a/data/maps/BattleTower_Lobby/header.inc +++ b/data/maps/BattleTower_Lobby/header.inc @@ -7,7 +7,7 @@ BattleTower_Lobby:: @ 8307C34 .2byte 265 .byte MAPSEC_BATTLE_TOWER .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/BattleTower_Outside/header.inc b/data/maps/BattleTower_Outside/header.inc index 5af2c97cb..7963d80a1 100644 --- a/data/maps/BattleTower_Outside/header.inc +++ b/data/maps/BattleTower_Outside/header.inc @@ -7,7 +7,7 @@ BattleTower_Outside:: @ 8307C18 .2byte 266 .byte MAPSEC_BATTLE_TOWER .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 3 .2byte 0 .byte 1 diff --git a/data/maps/CaveOfOrigin_1F/header.inc b/data/maps/CaveOfOrigin_1F/header.inc index d17d56acc..8a956b330 100644 --- a/data/maps/CaveOfOrigin_1F/header.inc +++ b/data/maps/CaveOfOrigin_1F/header.inc @@ -7,7 +7,7 @@ CaveOfOrigin_1F:: @ 8307198 .2byte 159 .byte MAPSEC_CAVE_OF_ORIGIN .byte 1 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 1 diff --git a/data/maps/CaveOfOrigin_B1F/header.inc b/data/maps/CaveOfOrigin_B1F/header.inc index 18e24047a..1c53aee5a 100644 --- a/data/maps/CaveOfOrigin_B1F/header.inc +++ b/data/maps/CaveOfOrigin_B1F/header.inc @@ -7,7 +7,7 @@ CaveOfOrigin_B1F:: @ 83071B4 .2byte 160 .byte MAPSEC_CAVE_OF_ORIGIN .byte 1 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 1 diff --git a/data/maps/CaveOfOrigin_B2F/header.inc b/data/maps/CaveOfOrigin_B2F/header.inc index e9c6d472a..5cfe0b079 100644 --- a/data/maps/CaveOfOrigin_B2F/header.inc +++ b/data/maps/CaveOfOrigin_B2F/header.inc @@ -7,7 +7,7 @@ CaveOfOrigin_B2F:: @ 83071D0 .2byte 161 .byte MAPSEC_CAVE_OF_ORIGIN .byte 1 - .byte 6 + .byte WEATHER_FOG_1 .byte 4 .2byte 0 .byte 1 diff --git a/data/maps/CaveOfOrigin_B3F/header.inc b/data/maps/CaveOfOrigin_B3F/header.inc index 80529906d..272595dd8 100644 --- a/data/maps/CaveOfOrigin_B3F/header.inc +++ b/data/maps/CaveOfOrigin_B3F/header.inc @@ -7,7 +7,7 @@ CaveOfOrigin_B3F:: @ 83071EC .2byte 162 .byte MAPSEC_CAVE_OF_ORIGIN .byte 1 - .byte 6 + .byte WEATHER_FOG_1 .byte 4 .2byte 0 .byte 1 diff --git a/data/maps/CaveOfOrigin_B4F/header.inc b/data/maps/CaveOfOrigin_B4F/header.inc index af47ad097..c12476d63 100644 --- a/data/maps/CaveOfOrigin_B4F/header.inc +++ b/data/maps/CaveOfOrigin_B4F/header.inc @@ -7,7 +7,7 @@ CaveOfOrigin_B4F:: @ 8307208 .2byte 163 .byte MAPSEC_CAVE_OF_ORIGIN .byte 0 - .byte 6 + .byte WEATHER_FOG_1 .byte 4 .2byte 0 .byte 1 diff --git a/data/maps/CaveOfOrigin_Entrance/header.inc b/data/maps/CaveOfOrigin_Entrance/header.inc index bd63d13d8..877948756 100644 --- a/data/maps/CaveOfOrigin_Entrance/header.inc +++ b/data/maps/CaveOfOrigin_Entrance/header.inc @@ -7,7 +7,7 @@ CaveOfOrigin_Entrance:: @ 830717C .2byte 158 .byte MAPSEC_CAVE_OF_ORIGIN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 1 diff --git a/data/maps/DesertRuins/header.inc b/data/maps/DesertRuins/header.inc index 5181cd77d..55feda880 100644 --- a/data/maps/DesertRuins/header.inc +++ b/data/maps/DesertRuins/header.inc @@ -7,7 +7,7 @@ DesertRuins:: @ 8306E18 .2byte 132 .byte MAPSEC_DESERT_RUINS .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 1 diff --git a/data/maps/DewfordTown/header.inc b/data/maps/DewfordTown/header.inc index 02aeb91dc..1bbfba597 100644 --- a/data/maps/DewfordTown/header.inc +++ b/data/maps/DewfordTown/header.inc @@ -7,7 +7,7 @@ DewfordTown:: @ 830557C .2byte 12 .byte MAPSEC_DEWFORD_TOWN .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 1 .2byte 0 .byte 1 diff --git a/data/maps/DewfordTown_Gym/header.inc b/data/maps/DewfordTown_Gym/header.inc index 2a7cb88dd..e001c5346 100644 --- a/data/maps/DewfordTown_Gym/header.inc +++ b/data/maps/DewfordTown_Gym/header.inc @@ -7,7 +7,7 @@ DewfordTown_Gym:: @ 8305B9C .2byte 65 .byte MAPSEC_DEWFORD_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/DewfordTown_Hall/header.inc b/data/maps/DewfordTown_Hall/header.inc index 9bcbe90f3..516039595 100644 --- a/data/maps/DewfordTown_Hall/header.inc +++ b/data/maps/DewfordTown_Hall/header.inc @@ -7,7 +7,7 @@ DewfordTown_Hall:: @ 8305BB8 .2byte 66 .byte MAPSEC_DEWFORD_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/DewfordTown_House1/header.inc b/data/maps/DewfordTown_House1/header.inc index 1414d620e..efd85c949 100644 --- a/data/maps/DewfordTown_House1/header.inc +++ b/data/maps/DewfordTown_House1/header.inc @@ -7,7 +7,7 @@ DewfordTown_House1:: @ 8305B48 .2byte 64 .byte MAPSEC_DEWFORD_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/DewfordTown_House2/header.inc b/data/maps/DewfordTown_House2/header.inc index 1e2736ebe..625c4cce8 100644 --- a/data/maps/DewfordTown_House2/header.inc +++ b/data/maps/DewfordTown_House2/header.inc @@ -7,7 +7,7 @@ DewfordTown_House2:: @ 8305BD4 .2byte 67 .byte MAPSEC_DEWFORD_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/DewfordTown_PokemonCenter_1F/header.inc b/data/maps/DewfordTown_PokemonCenter_1F/header.inc index 6cb407275..48032deca 100644 --- a/data/maps/DewfordTown_PokemonCenter_1F/header.inc +++ b/data/maps/DewfordTown_PokemonCenter_1F/header.inc @@ -7,7 +7,7 @@ DewfordTown_PokemonCenter_1F:: @ 8305B64 .2byte 61 .byte MAPSEC_DEWFORD_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/DewfordTown_PokemonCenter_2F/header.inc b/data/maps/DewfordTown_PokemonCenter_2F/header.inc index 07a4f63f1..6f65eba2c 100644 --- a/data/maps/DewfordTown_PokemonCenter_2F/header.inc +++ b/data/maps/DewfordTown_PokemonCenter_2F/header.inc @@ -7,7 +7,7 @@ DewfordTown_PokemonCenter_2F:: @ 8305B80 .2byte 62 .byte MAPSEC_DEWFORD_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/DoubleBattleColosseum/header.inc b/data/maps/DoubleBattleColosseum/header.inc index 91750d7f7..1bcd8ff52 100644 --- a/data/maps/DoubleBattleColosseum/header.inc +++ b/data/maps/DoubleBattleColosseum/header.inc @@ -7,7 +7,7 @@ DoubleBattleColosseum:: @ 83079CC .2byte 225 .byte MAPSEC_DYNAMIC .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/EverGrandeCity/header.inc b/data/maps/EverGrandeCity/header.inc index d391a9409..e2698bca6 100644 --- a/data/maps/EverGrandeCity/header.inc +++ b/data/maps/EverGrandeCity/header.inc @@ -7,7 +7,7 @@ EverGrandeCity:: @ 8305528 .2byte 9 .byte MAPSEC_EVER_GRANDE_CITY .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 2 .2byte 0 .byte 1 diff --git a/data/maps/EverGrandeCity_ChampionsRoom/header.inc b/data/maps/EverGrandeCity_ChampionsRoom/header.inc index 43e8c9443..fbf4a207d 100644 --- a/data/maps/EverGrandeCity_ChampionsRoom/header.inc +++ b/data/maps/EverGrandeCity_ChampionsRoom/header.inc @@ -7,7 +7,7 @@ EverGrandeCity_ChampionsRoom:: @ 8306B08 .2byte 116 .byte MAPSEC_EVER_GRANDE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/EverGrandeCity_Corridor1/header.inc b/data/maps/EverGrandeCity_Corridor1/header.inc index ffb682ee5..5f0094f42 100644 --- a/data/maps/EverGrandeCity_Corridor1/header.inc +++ b/data/maps/EverGrandeCity_Corridor1/header.inc @@ -7,7 +7,7 @@ EverGrandeCity_Corridor1:: @ 8306B24 .2byte 117 .byte MAPSEC_EVER_GRANDE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/EverGrandeCity_Corridor2/header.inc b/data/maps/EverGrandeCity_Corridor2/header.inc index 1240cf7e6..3ef9c7ecf 100644 --- a/data/maps/EverGrandeCity_Corridor2/header.inc +++ b/data/maps/EverGrandeCity_Corridor2/header.inc @@ -7,7 +7,7 @@ EverGrandeCity_Corridor2:: @ 8306B40 .2byte 117 .byte MAPSEC_EVER_GRANDE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/EverGrandeCity_Corridor3/header.inc b/data/maps/EverGrandeCity_Corridor3/header.inc index 34047aab0..b20ca5309 100644 --- a/data/maps/EverGrandeCity_Corridor3/header.inc +++ b/data/maps/EverGrandeCity_Corridor3/header.inc @@ -7,7 +7,7 @@ EverGrandeCity_Corridor3:: @ 8306B5C .2byte 117 .byte MAPSEC_EVER_GRANDE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/EverGrandeCity_Corridor4/header.inc b/data/maps/EverGrandeCity_Corridor4/header.inc index 27ae6772c..1f4249601 100644 --- a/data/maps/EverGrandeCity_Corridor4/header.inc +++ b/data/maps/EverGrandeCity_Corridor4/header.inc @@ -7,7 +7,7 @@ EverGrandeCity_Corridor4:: @ 8306B78 .2byte 316 .byte MAPSEC_EVER_GRANDE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/EverGrandeCity_Corridor5/header.inc b/data/maps/EverGrandeCity_Corridor5/header.inc index 6efeed94c..bab472a2e 100644 --- a/data/maps/EverGrandeCity_Corridor5/header.inc +++ b/data/maps/EverGrandeCity_Corridor5/header.inc @@ -7,7 +7,7 @@ EverGrandeCity_Corridor5:: @ 8306B94 .2byte 117 .byte MAPSEC_EVER_GRANDE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/EverGrandeCity_DrakesRoom/header.inc b/data/maps/EverGrandeCity_DrakesRoom/header.inc index 6fa06eb1c..9d636477b 100644 --- a/data/maps/EverGrandeCity_DrakesRoom/header.inc +++ b/data/maps/EverGrandeCity_DrakesRoom/header.inc @@ -7,7 +7,7 @@ EverGrandeCity_DrakesRoom:: @ 8306AEC .2byte 115 .byte MAPSEC_EVER_GRANDE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/EverGrandeCity_GlaciasRoom/header.inc b/data/maps/EverGrandeCity_GlaciasRoom/header.inc index 37dcc4de4..379f5c6ad 100644 --- a/data/maps/EverGrandeCity_GlaciasRoom/header.inc +++ b/data/maps/EverGrandeCity_GlaciasRoom/header.inc @@ -7,7 +7,7 @@ EverGrandeCity_GlaciasRoom:: @ 8306AD0 .2byte 114 .byte MAPSEC_EVER_GRANDE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/EverGrandeCity_HallOfFame/header.inc b/data/maps/EverGrandeCity_HallOfFame/header.inc index ada0e84d3..e80e06438 100644 --- a/data/maps/EverGrandeCity_HallOfFame/header.inc +++ b/data/maps/EverGrandeCity_HallOfFame/header.inc @@ -7,7 +7,7 @@ EverGrandeCity_HallOfFame:: @ 8306BCC .2byte 299 .byte MAPSEC_EVER_GRANDE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/EverGrandeCity_PhoebesRoom/header.inc b/data/maps/EverGrandeCity_PhoebesRoom/header.inc index 4a1f9ee07..ef989ba1d 100644 --- a/data/maps/EverGrandeCity_PhoebesRoom/header.inc +++ b/data/maps/EverGrandeCity_PhoebesRoom/header.inc @@ -7,7 +7,7 @@ EverGrandeCity_PhoebesRoom:: @ 8306AB4 .2byte 113 .byte MAPSEC_EVER_GRANDE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc index 9394714a3..c1132827d 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc +++ b/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc @@ -7,7 +7,7 @@ EverGrandeCity_PokemonCenter_1F:: @ 8306BE8 .2byte 61 .byte MAPSEC_EVER_GRANDE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc b/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc index 86d5a5894..7d9025d64 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc +++ b/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc @@ -7,7 +7,7 @@ EverGrandeCity_PokemonCenter_2F:: @ 8306C04 .2byte 62 .byte MAPSEC_EVER_GRANDE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/EverGrandeCity_PokemonLeague/header.inc b/data/maps/EverGrandeCity_PokemonLeague/header.inc index 519a20fab..ed461a017 100644 --- a/data/maps/EverGrandeCity_PokemonLeague/header.inc +++ b/data/maps/EverGrandeCity_PokemonLeague/header.inc @@ -7,7 +7,7 @@ EverGrandeCity_PokemonLeague:: @ 8306BB0 .2byte 271 .byte MAPSEC_EVER_GRANDE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/EverGrandeCity_SidneysRoom/header.inc b/data/maps/EverGrandeCity_SidneysRoom/header.inc index 5f0684ea4..780b231a0 100644 --- a/data/maps/EverGrandeCity_SidneysRoom/header.inc +++ b/data/maps/EverGrandeCity_SidneysRoom/header.inc @@ -7,7 +7,7 @@ EverGrandeCity_SidneysRoom:: @ 8306A98 .2byte 112 .byte MAPSEC_EVER_GRANDE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/FallarborTown/header.inc b/data/maps/FallarborTown/header.inc index 892e58628..c369416e9 100644 --- a/data/maps/FallarborTown/header.inc +++ b/data/maps/FallarborTown/header.inc @@ -7,7 +7,7 @@ FallarborTown:: @ 83055B4 .2byte 14 .byte MAPSEC_FALLARBOR_TOWN .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 1 .2byte 0 .byte 1 diff --git a/data/maps/FallarborTown_ContestHall/header.inc b/data/maps/FallarborTown_ContestHall/header.inc index 8f69223a5..38ebb2471 100644 --- a/data/maps/FallarborTown_ContestHall/header.inc +++ b/data/maps/FallarborTown_ContestHall/header.inc @@ -7,7 +7,7 @@ FallarborTown_ContestHall:: @ 8305CEC .2byte 73 .byte MAPSEC_FALLARBOR_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/FallarborTown_ContestLobby/header.inc b/data/maps/FallarborTown_ContestLobby/header.inc index f9031d69d..8ade4110f 100644 --- a/data/maps/FallarborTown_ContestLobby/header.inc +++ b/data/maps/FallarborTown_ContestLobby/header.inc @@ -7,7 +7,7 @@ FallarborTown_ContestLobby:: @ 8305CD0 .2byte 72 .byte MAPSEC_FALLARBOR_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/FallarborTown_House1/header.inc b/data/maps/FallarborTown_House1/header.inc index 21acaf42b..b62e28430 100644 --- a/data/maps/FallarborTown_House1/header.inc +++ b/data/maps/FallarborTown_House1/header.inc @@ -7,7 +7,7 @@ FallarborTown_House1:: @ 8305D40 .2byte 59 .byte MAPSEC_FALLARBOR_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/FallarborTown_House2/header.inc b/data/maps/FallarborTown_House2/header.inc index ef8fb0f2e..f2d509782 100644 --- a/data/maps/FallarborTown_House2/header.inc +++ b/data/maps/FallarborTown_House2/header.inc @@ -7,7 +7,7 @@ FallarborTown_House2:: @ 8305D5C .2byte 60 .byte MAPSEC_FALLARBOR_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/FallarborTown_Mart/header.inc b/data/maps/FallarborTown_Mart/header.inc index e6e8d837f..ca22edf3e 100644 --- a/data/maps/FallarborTown_Mart/header.inc +++ b/data/maps/FallarborTown_Mart/header.inc @@ -7,7 +7,7 @@ FallarborTown_Mart:: @ 8305CB4 .2byte 63 .byte MAPSEC_FALLARBOR_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/FallarborTown_PokemonCenter_1F/header.inc b/data/maps/FallarborTown_PokemonCenter_1F/header.inc index cab60710f..4908d9fd0 100644 --- a/data/maps/FallarborTown_PokemonCenter_1F/header.inc +++ b/data/maps/FallarborTown_PokemonCenter_1F/header.inc @@ -7,7 +7,7 @@ FallarborTown_PokemonCenter_1F:: @ 8305D08 .2byte 61 .byte MAPSEC_FALLARBOR_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/FallarborTown_PokemonCenter_2F/header.inc b/data/maps/FallarborTown_PokemonCenter_2F/header.inc index f093c8feb..832987fb0 100644 --- a/data/maps/FallarborTown_PokemonCenter_2F/header.inc +++ b/data/maps/FallarborTown_PokemonCenter_2F/header.inc @@ -7,7 +7,7 @@ FallarborTown_PokemonCenter_2F:: @ 8305D24 .2byte 62 .byte MAPSEC_FALLARBOR_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/FieryPath/header.inc b/data/maps/FieryPath/header.inc index 512f5af55..05437213c 100644 --- a/data/maps/FieryPath/header.inc +++ b/data/maps/FieryPath/header.inc @@ -7,7 +7,7 @@ FieryPath:: @ 8306EF8 .2byte 294 .byte MAPSEC_FIERY_PATH .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 1 diff --git a/data/maps/FortreeCity/header.inc b/data/maps/FortreeCity/header.inc index 23dc10dd6..fe916ca3c 100644 --- a/data/maps/FortreeCity/header.inc +++ b/data/maps/FortreeCity/header.inc @@ -7,7 +7,7 @@ FortreeCity:: @ 83054B8 .2byte 5 .byte MAPSEC_FORTREE_CITY .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 2 .2byte 0 .byte 1 diff --git a/data/maps/FortreeCity_DecorationShop/header.inc b/data/maps/FortreeCity_DecorationShop/header.inc index 7c61563ae..31271754b 100644 --- a/data/maps/FortreeCity_DecorationShop/header.inc +++ b/data/maps/FortreeCity_DecorationShop/header.inc @@ -7,7 +7,7 @@ FortreeCity_DecorationShop:: @ 8306504 .2byte 256 .byte MAPSEC_FORTREE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/FortreeCity_Gym/header.inc b/data/maps/FortreeCity_Gym/header.inc index adb4179c8..5a2c428ea 100644 --- a/data/maps/FortreeCity_Gym/header.inc +++ b/data/maps/FortreeCity_Gym/header.inc @@ -7,7 +7,7 @@ FortreeCity_Gym:: @ 8306424 .2byte 100 .byte MAPSEC_FORTREE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/FortreeCity_House1/header.inc b/data/maps/FortreeCity_House1/header.inc index 3349b857b..96d70e9ae 100644 --- a/data/maps/FortreeCity_House1/header.inc +++ b/data/maps/FortreeCity_House1/header.inc @@ -7,7 +7,7 @@ FortreeCity_House1:: @ 8306408 .2byte 99 .byte MAPSEC_FORTREE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/FortreeCity_House2/header.inc b/data/maps/FortreeCity_House2/header.inc index 7baf0aa63..fadf57dd9 100644 --- a/data/maps/FortreeCity_House2/header.inc +++ b/data/maps/FortreeCity_House2/header.inc @@ -7,7 +7,7 @@ FortreeCity_House2:: @ 8306494 .2byte 101 .byte MAPSEC_FORTREE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/FortreeCity_House3/header.inc b/data/maps/FortreeCity_House3/header.inc index d9d65297a..30997ef40 100644 --- a/data/maps/FortreeCity_House3/header.inc +++ b/data/maps/FortreeCity_House3/header.inc @@ -7,7 +7,7 @@ FortreeCity_House3:: @ 83064B0 .2byte 99 .byte MAPSEC_FORTREE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/FortreeCity_House4/header.inc b/data/maps/FortreeCity_House4/header.inc index 3b905352b..306914ca1 100644 --- a/data/maps/FortreeCity_House4/header.inc +++ b/data/maps/FortreeCity_House4/header.inc @@ -7,7 +7,7 @@ FortreeCity_House4:: @ 83064CC .2byte 101 .byte MAPSEC_FORTREE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/FortreeCity_House5/header.inc b/data/maps/FortreeCity_House5/header.inc index c3c361104..0dca5438d 100644 --- a/data/maps/FortreeCity_House5/header.inc +++ b/data/maps/FortreeCity_House5/header.inc @@ -7,7 +7,7 @@ FortreeCity_House5:: @ 83064E8 .2byte 99 .byte MAPSEC_FORTREE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/FortreeCity_Mart/header.inc b/data/maps/FortreeCity_Mart/header.inc index a4dd40285..3c82dbab1 100644 --- a/data/maps/FortreeCity_Mart/header.inc +++ b/data/maps/FortreeCity_Mart/header.inc @@ -7,7 +7,7 @@ FortreeCity_Mart:: @ 8306478 .2byte 63 .byte MAPSEC_FORTREE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/FortreeCity_PokemonCenter_1F/header.inc b/data/maps/FortreeCity_PokemonCenter_1F/header.inc index d606c08d8..229410991 100644 --- a/data/maps/FortreeCity_PokemonCenter_1F/header.inc +++ b/data/maps/FortreeCity_PokemonCenter_1F/header.inc @@ -7,7 +7,7 @@ FortreeCity_PokemonCenter_1F:: @ 8306440 .2byte 61 .byte MAPSEC_FORTREE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/FortreeCity_PokemonCenter_2F/header.inc b/data/maps/FortreeCity_PokemonCenter_2F/header.inc index 9c5b3af3c..ca8700a84 100644 --- a/data/maps/FortreeCity_PokemonCenter_2F/header.inc +++ b/data/maps/FortreeCity_PokemonCenter_2F/header.inc @@ -7,7 +7,7 @@ FortreeCity_PokemonCenter_2F:: @ 830645C .2byte 62 .byte MAPSEC_FORTREE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/GraniteCave_1F/header.inc b/data/maps/GraniteCave_1F/header.inc index 707197625..bb37b2323 100644 --- a/data/maps/GraniteCave_1F/header.inc +++ b/data/maps/GraniteCave_1F/header.inc @@ -7,7 +7,7 @@ GraniteCave_1F:: @ 8306E34 .2byte 133 .byte MAPSEC_GRANITE_CAVE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 1 diff --git a/data/maps/GraniteCave_B1F/header.inc b/data/maps/GraniteCave_B1F/header.inc index c9b9a85f4..6cf10e555 100644 --- a/data/maps/GraniteCave_B1F/header.inc +++ b/data/maps/GraniteCave_B1F/header.inc @@ -7,7 +7,7 @@ GraniteCave_B1F:: @ 8306E50 .2byte 134 .byte MAPSEC_GRANITE_CAVE .byte 1 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 1 diff --git a/data/maps/GraniteCave_B2F/header.inc b/data/maps/GraniteCave_B2F/header.inc index a6db19127..39347ab71 100644 --- a/data/maps/GraniteCave_B2F/header.inc +++ b/data/maps/GraniteCave_B2F/header.inc @@ -7,7 +7,7 @@ GraniteCave_B2F:: @ 8306E6C .2byte 135 .byte MAPSEC_GRANITE_CAVE .byte 1 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 1 diff --git a/data/maps/GraniteCave_StevensRoom/header.inc b/data/maps/GraniteCave_StevensRoom/header.inc index 75a3089b3..f599bd9ce 100644 --- a/data/maps/GraniteCave_StevensRoom/header.inc +++ b/data/maps/GraniteCave_StevensRoom/header.inc @@ -7,7 +7,7 @@ GraniteCave_StevensRoom:: @ 8306E88 .2byte 289 .byte MAPSEC_GRANITE_CAVE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 1 diff --git a/data/maps/InsideOfTruck/header.inc b/data/maps/InsideOfTruck/header.inc index 05478e8f3..0a7d172b2 100644 --- a/data/maps/InsideOfTruck/header.inc +++ b/data/maps/InsideOfTruck/header.inc @@ -7,7 +7,7 @@ InsideOfTruck:: @ 8307B38 .2byte 238 .byte MAPSEC_INSIDE_OF_TRUCK .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/IslandCave/header.inc b/data/maps/IslandCave/header.inc index baccbc500..a225616e6 100644 --- a/data/maps/IslandCave/header.inc +++ b/data/maps/IslandCave/header.inc @@ -7,7 +7,7 @@ IslandCave:: @ 83074C4 .2byte 281 .byte MAPSEC_ISLAND_CAVE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 1 diff --git a/data/maps/JaggedPass/header.inc b/data/maps/JaggedPass/header.inc index c70af745f..4229556bc 100644 --- a/data/maps/JaggedPass/header.inc +++ b/data/maps/JaggedPass/header.inc @@ -7,7 +7,7 @@ JaggedPass:: @ 8306EDC .2byte 293 .byte MAPSEC_JAGGED_PASS .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 3 .2byte 0 .byte 1 diff --git a/data/maps/LavaridgeTown/header.inc b/data/maps/LavaridgeTown/header.inc index 57eae401c..ff1247e0c 100644 --- a/data/maps/LavaridgeTown/header.inc +++ b/data/maps/LavaridgeTown/header.inc @@ -7,7 +7,7 @@ LavaridgeTown:: @ 8305598 .2byte 13 .byte MAPSEC_LAVARIDGE_TOWN .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 1 .2byte 0 .byte 1 diff --git a/data/maps/LavaridgeTown_Gym_1F/header.inc b/data/maps/LavaridgeTown_Gym_1F/header.inc index add939b34..cc7b6a041 100644 --- a/data/maps/LavaridgeTown_Gym_1F/header.inc +++ b/data/maps/LavaridgeTown_Gym_1F/header.inc @@ -7,7 +7,7 @@ LavaridgeTown_Gym_1F:: @ 8305C0C .2byte 69 .byte MAPSEC_LAVARIDGE_TOWN .byte 0 - .byte 6 + .byte WEATHER_FOG_1 .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/LavaridgeTown_Gym_B1F/header.inc b/data/maps/LavaridgeTown_Gym_B1F/header.inc index 393e0a72a..28a526f9d 100644 --- a/data/maps/LavaridgeTown_Gym_B1F/header.inc +++ b/data/maps/LavaridgeTown_Gym_B1F/header.inc @@ -7,7 +7,7 @@ LavaridgeTown_Gym_B1F:: @ 8305C28 .2byte 70 .byte MAPSEC_LAVARIDGE_TOWN .byte 0 - .byte 6 + .byte WEATHER_FOG_1 .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/LavaridgeTown_HerbShop/header.inc b/data/maps/LavaridgeTown_HerbShop/header.inc index 69aa9b41f..fc647bca7 100644 --- a/data/maps/LavaridgeTown_HerbShop/header.inc +++ b/data/maps/LavaridgeTown_HerbShop/header.inc @@ -7,7 +7,7 @@ LavaridgeTown_HerbShop:: @ 8305BF0 .2byte 68 .byte MAPSEC_LAVARIDGE_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/LavaridgeTown_House/header.inc b/data/maps/LavaridgeTown_House/header.inc index acb853281..01c1c07ed 100644 --- a/data/maps/LavaridgeTown_House/header.inc +++ b/data/maps/LavaridgeTown_House/header.inc @@ -7,7 +7,7 @@ LavaridgeTown_House:: @ 8305C44 .2byte 64 .byte MAPSEC_LAVARIDGE_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/LavaridgeTown_Mart/header.inc b/data/maps/LavaridgeTown_Mart/header.inc index 2dde392de..e110eb8d1 100644 --- a/data/maps/LavaridgeTown_Mart/header.inc +++ b/data/maps/LavaridgeTown_Mart/header.inc @@ -7,7 +7,7 @@ LavaridgeTown_Mart:: @ 8305C60 .2byte 63 .byte MAPSEC_LAVARIDGE_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc b/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc index a7ed83dcf..63fff42ab 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc +++ b/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc @@ -7,7 +7,7 @@ LavaridgeTown_PokemonCenter_1F:: @ 8305C7C .2byte 71 .byte MAPSEC_LAVARIDGE_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc b/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc index ae3bde4ee..c8c4d647d 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc +++ b/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc @@ -7,7 +7,7 @@ LavaridgeTown_PokemonCenter_2F:: @ 8305C98 .2byte 62 .byte MAPSEC_LAVARIDGE_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/LilycoveCity/header.inc b/data/maps/LilycoveCity/header.inc index d46ea1da3..894507849 100644 --- a/data/maps/LilycoveCity/header.inc +++ b/data/maps/LilycoveCity/header.inc @@ -7,7 +7,7 @@ LilycoveCity:: @ 83054D4 .2byte 6 .byte MAPSEC_LILYCOVE_CITY .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 2 .2byte 0 .byte 1 diff --git a/data/maps/LilycoveCity_ContestHall/header.inc b/data/maps/LilycoveCity_ContestHall/header.inc index 354a87c68..e2c30ab32 100644 --- a/data/maps/LilycoveCity_ContestHall/header.inc +++ b/data/maps/LilycoveCity_ContestHall/header.inc @@ -7,7 +7,7 @@ LilycoveCity_ContestHall:: @ 83065AC .2byte 106 .byte MAPSEC_LILYCOVE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_ContestLobby/header.inc b/data/maps/LilycoveCity_ContestLobby/header.inc index b3ecad4e6..df2d526d2 100644 --- a/data/maps/LilycoveCity_ContestLobby/header.inc +++ b/data/maps/LilycoveCity_ContestLobby/header.inc @@ -7,7 +7,7 @@ LilycoveCity_ContestLobby:: @ 8306590 .2byte 105 .byte MAPSEC_LILYCOVE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc b/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc index 6931785d9..39b5e3601 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc +++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc @@ -7,7 +7,7 @@ LilycoveCity_CoveLilyMotel_1F:: @ 8306520 .2byte 300 .byte MAPSEC_LILYCOVE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc b/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc index adeb46f6d..660c3f4b7 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc +++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc @@ -7,7 +7,7 @@ LilycoveCity_CoveLilyMotel_2F:: @ 830653C .2byte 301 .byte MAPSEC_LILYCOVE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc b/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc index 83b55aa11..ebf5ca0b6 100644 --- a/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc +++ b/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc @@ -7,7 +7,7 @@ LilycoveCity_DepartmentStoreElevator:: @ 83067A4 .2byte 274 .byte MAPSEC_LILYCOVE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc index 21883b620..7497fcdbd 100644 --- a/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc +++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc @@ -7,7 +7,7 @@ LilycoveCity_DepartmentStoreRooftop:: @ 8306788 .2byte 263 .byte MAPSEC_LILYCOVE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/header.inc b/data/maps/LilycoveCity_DepartmentStore_1F/header.inc index 5c7496738..9d08da924 100644 --- a/data/maps/LilycoveCity_DepartmentStore_1F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_1F/header.inc @@ -7,7 +7,7 @@ LilycoveCity_DepartmentStore_1F:: @ 83066FC .2byte 258 .byte MAPSEC_LILYCOVE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_DepartmentStore_2F/header.inc b/data/maps/LilycoveCity_DepartmentStore_2F/header.inc index 9bdbe7b5c..27403ca84 100644 --- a/data/maps/LilycoveCity_DepartmentStore_2F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_2F/header.inc @@ -7,7 +7,7 @@ LilycoveCity_DepartmentStore_2F:: @ 8306718 .2byte 259 .byte MAPSEC_LILYCOVE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_DepartmentStore_3F/header.inc b/data/maps/LilycoveCity_DepartmentStore_3F/header.inc index 558a4ba33..574f3bc8b 100644 --- a/data/maps/LilycoveCity_DepartmentStore_3F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_3F/header.inc @@ -7,7 +7,7 @@ LilycoveCity_DepartmentStore_3F:: @ 8306734 .2byte 260 .byte MAPSEC_LILYCOVE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_DepartmentStore_4F/header.inc b/data/maps/LilycoveCity_DepartmentStore_4F/header.inc index 3d207e42d..f395a6c07 100644 --- a/data/maps/LilycoveCity_DepartmentStore_4F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_4F/header.inc @@ -7,7 +7,7 @@ LilycoveCity_DepartmentStore_4F:: @ 8306750 .2byte 261 .byte MAPSEC_LILYCOVE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/header.inc b/data/maps/LilycoveCity_DepartmentStore_5F/header.inc index d5ff57c67..bf6e8463d 100644 --- a/data/maps/LilycoveCity_DepartmentStore_5F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_5F/header.inc @@ -7,7 +7,7 @@ LilycoveCity_DepartmentStore_5F:: @ 830676C .2byte 262 .byte MAPSEC_LILYCOVE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_EmptyMap/header.inc b/data/maps/LilycoveCity_EmptyMap/header.inc index 5dfb291b2..463ffe1c4 100644 --- a/data/maps/LilycoveCity_EmptyMap/header.inc +++ b/data/maps/LilycoveCity_EmptyMap/header.inc @@ -7,7 +7,7 @@ LilycoveCity_EmptyMap:: @ 8306654 .2byte 108 .byte MAPSEC_LILYCOVE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_Harbor/header.inc b/data/maps/LilycoveCity_Harbor/header.inc index eb5be90b5..b673fc6c6 100644 --- a/data/maps/LilycoveCity_Harbor/header.inc +++ b/data/maps/LilycoveCity_Harbor/header.inc @@ -7,7 +7,7 @@ LilycoveCity_Harbor:: @ 8306638 .2byte 88 .byte MAPSEC_LILYCOVE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_House1/header.inc b/data/maps/LilycoveCity_House1/header.inc index ac84648bf..79f604787 100644 --- a/data/maps/LilycoveCity_House1/header.inc +++ b/data/maps/LilycoveCity_House1/header.inc @@ -7,7 +7,7 @@ LilycoveCity_House1:: @ 830668C .2byte 59 .byte MAPSEC_LILYCOVE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_House2/header.inc b/data/maps/LilycoveCity_House2/header.inc index f511a39fc..fe11ad801 100644 --- a/data/maps/LilycoveCity_House2/header.inc +++ b/data/maps/LilycoveCity_House2/header.inc @@ -7,7 +7,7 @@ LilycoveCity_House2:: @ 83066A8 .2byte 74 .byte MAPSEC_LILYCOVE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_House3/header.inc b/data/maps/LilycoveCity_House3/header.inc index 5f4e49c44..4b068d0cd 100644 --- a/data/maps/LilycoveCity_House3/header.inc +++ b/data/maps/LilycoveCity_House3/header.inc @@ -7,7 +7,7 @@ LilycoveCity_House3:: @ 83066C4 .2byte 60 .byte MAPSEC_LILYCOVE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_House4/header.inc b/data/maps/LilycoveCity_House4/header.inc index e84ade915..a814cf979 100644 --- a/data/maps/LilycoveCity_House4/header.inc +++ b/data/maps/LilycoveCity_House4/header.inc @@ -7,7 +7,7 @@ LilycoveCity_House4:: @ 83066E0 .2byte 59 .byte MAPSEC_LILYCOVE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc b/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc index a8d3a44b2..ace7e9249 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc @@ -7,7 +7,7 @@ LilycoveCity_LilycoveMuseum_1F:: @ 8306558 .2byte 103 .byte MAPSEC_LILYCOVE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc index da1fcadba..e39663e7a 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc @@ -7,7 +7,7 @@ LilycoveCity_LilycoveMuseum_2F:: @ 8306574 .2byte 104 .byte MAPSEC_LILYCOVE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_MoveDeletersHouse/header.inc b/data/maps/LilycoveCity_MoveDeletersHouse/header.inc index d31f1403f..ec4d01087 100644 --- a/data/maps/LilycoveCity_MoveDeletersHouse/header.inc +++ b/data/maps/LilycoveCity_MoveDeletersHouse/header.inc @@ -7,7 +7,7 @@ LilycoveCity_MoveDeletersHouse:: @ 8306670 .2byte 60 .byte MAPSEC_LILYCOVE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_PokemonCenter_1F/header.inc b/data/maps/LilycoveCity_PokemonCenter_1F/header.inc index 05d628be7..174043d19 100644 --- a/data/maps/LilycoveCity_PokemonCenter_1F/header.inc +++ b/data/maps/LilycoveCity_PokemonCenter_1F/header.inc @@ -7,7 +7,7 @@ LilycoveCity_PokemonCenter_1F:: @ 83065C8 .2byte 61 .byte MAPSEC_LILYCOVE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_PokemonCenter_2F/header.inc b/data/maps/LilycoveCity_PokemonCenter_2F/header.inc index 9458e81e3..1b01f3f10 100644 --- a/data/maps/LilycoveCity_PokemonCenter_2F/header.inc +++ b/data/maps/LilycoveCity_PokemonCenter_2F/header.inc @@ -7,7 +7,7 @@ LilycoveCity_PokemonCenter_2F:: @ 83065E4 .2byte 62 .byte MAPSEC_LILYCOVE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc index 8902c8a3e..00892a27e 100644 --- a/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc +++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc @@ -7,7 +7,7 @@ LilycoveCity_PokemonTrainerFanClub:: @ 830661C .2byte 107 .byte MAPSEC_LILYCOVE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_UnusedMart/header.inc b/data/maps/LilycoveCity_UnusedMart/header.inc index a01efd98a..246dc32be 100644 --- a/data/maps/LilycoveCity_UnusedMart/header.inc +++ b/data/maps/LilycoveCity_UnusedMart/header.inc @@ -7,7 +7,7 @@ LilycoveCity_UnusedMart:: @ 8306600 .2byte 63 .byte MAPSEC_LILYCOVE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/LinkContestRoom1/header.inc b/data/maps/LinkContestRoom1/header.inc index e762efb22..86468e12a 100644 --- a/data/maps/LinkContestRoom1/header.inc +++ b/data/maps/LinkContestRoom1/header.inc @@ -7,7 +7,7 @@ LinkContestRoom1:: @ 83079E8 .2byte 226 .byte MAPSEC_DYNAMIC .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/LinkContestRoom2/header.inc b/data/maps/LinkContestRoom2/header.inc index 636b94c72..b692a095a 100644 --- a/data/maps/LinkContestRoom2/header.inc +++ b/data/maps/LinkContestRoom2/header.inc @@ -7,7 +7,7 @@ LinkContestRoom2:: @ 8307AAC .2byte 233 .byte MAPSEC_DYNAMIC .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/LinkContestRoom3/header.inc b/data/maps/LinkContestRoom3/header.inc index ed19b4610..0e6dc2892 100644 --- a/data/maps/LinkContestRoom3/header.inc +++ b/data/maps/LinkContestRoom3/header.inc @@ -7,7 +7,7 @@ LinkContestRoom3:: @ 8307AC8 .2byte 234 .byte MAPSEC_DYNAMIC .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/LinkContestRoom4/header.inc b/data/maps/LinkContestRoom4/header.inc index f93f2f429..81eef5228 100644 --- a/data/maps/LinkContestRoom4/header.inc +++ b/data/maps/LinkContestRoom4/header.inc @@ -7,7 +7,7 @@ LinkContestRoom4:: @ 8307AE4 .2byte 235 .byte MAPSEC_DYNAMIC .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/LinkContestRoom5/header.inc b/data/maps/LinkContestRoom5/header.inc index 904ad041f..8cfccbefd 100644 --- a/data/maps/LinkContestRoom5/header.inc +++ b/data/maps/LinkContestRoom5/header.inc @@ -7,7 +7,7 @@ LinkContestRoom5:: @ 8307B00 .2byte 236 .byte MAPSEC_DYNAMIC .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/LinkContestRoom6/header.inc b/data/maps/LinkContestRoom6/header.inc index e3e736c11..b192f855f 100644 --- a/data/maps/LinkContestRoom6/header.inc +++ b/data/maps/LinkContestRoom6/header.inc @@ -7,7 +7,7 @@ LinkContestRoom6:: @ 8307B1C .2byte 237 .byte MAPSEC_DYNAMIC .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/LittlerootTown/header.inc b/data/maps/LittlerootTown/header.inc index d81a753a4..22cafceda 100644 --- a/data/maps/LittlerootTown/header.inc +++ b/data/maps/LittlerootTown/header.inc @@ -7,7 +7,7 @@ LittlerootTown:: @ 8305544 .2byte 10 .byte MAPSEC_LITTLEROOT_TOWN .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 1 .2byte 0 .byte 1 diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/header.inc b/data/maps/LittlerootTown_BrendansHouse_1F/header.inc index cec139767..b52e72f56 100644 --- a/data/maps/LittlerootTown_BrendansHouse_1F/header.inc +++ b/data/maps/LittlerootTown_BrendansHouse_1F/header.inc @@ -7,7 +7,7 @@ LittlerootTown_BrendansHouse_1F:: @ 8305A30 .2byte 54 .byte MAPSEC_LITTLEROOT_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/header.inc b/data/maps/LittlerootTown_BrendansHouse_2F/header.inc index e7d78680d..30fa363a5 100644 --- a/data/maps/LittlerootTown_BrendansHouse_2F/header.inc +++ b/data/maps/LittlerootTown_BrendansHouse_2F/header.inc @@ -7,7 +7,7 @@ LittlerootTown_BrendansHouse_2F:: @ 8305A4C .2byte 55 .byte MAPSEC_LITTLEROOT_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/LittlerootTown_MaysHouse_1F/header.inc b/data/maps/LittlerootTown_MaysHouse_1F/header.inc index 10e6e58e7..841b4292d 100644 --- a/data/maps/LittlerootTown_MaysHouse_1F/header.inc +++ b/data/maps/LittlerootTown_MaysHouse_1F/header.inc @@ -7,7 +7,7 @@ LittlerootTown_MaysHouse_1F:: @ 8305A68 .2byte 56 .byte MAPSEC_LITTLEROOT_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/LittlerootTown_MaysHouse_2F/header.inc b/data/maps/LittlerootTown_MaysHouse_2F/header.inc index c4f3682ab..82f9e51da 100644 --- a/data/maps/LittlerootTown_MaysHouse_2F/header.inc +++ b/data/maps/LittlerootTown_MaysHouse_2F/header.inc @@ -7,7 +7,7 @@ LittlerootTown_MaysHouse_2F:: @ 8305A84 .2byte 57 .byte MAPSEC_LITTLEROOT_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc index acb0882ff..fbcd67c94 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc @@ -7,7 +7,7 @@ LittlerootTown_ProfessorBirchsLab:: @ 8305AA0 .2byte 58 .byte MAPSEC_LITTLEROOT_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/MagmaHideout_1F/header.inc b/data/maps/MagmaHideout_1F/header.inc index d6c31983e..30e74f114 100644 --- a/data/maps/MagmaHideout_1F/header.inc +++ b/data/maps/MagmaHideout_1F/header.inc @@ -7,7 +7,7 @@ MagmaHideout_1F:: @ 8307588 .2byte 317 .byte MAPSEC_EVIL_TEAM_HIDEOUT .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 1 diff --git a/data/maps/MagmaHideout_B1F/header.inc b/data/maps/MagmaHideout_B1F/header.inc index 67b117125..9d62ae97e 100644 --- a/data/maps/MagmaHideout_B1F/header.inc +++ b/data/maps/MagmaHideout_B1F/header.inc @@ -7,7 +7,7 @@ MagmaHideout_B1F:: @ 83075A4 .2byte 318 .byte MAPSEC_EVIL_TEAM_HIDEOUT .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 1 diff --git a/data/maps/MagmaHideout_B2F/header.inc b/data/maps/MagmaHideout_B2F/header.inc index 10bd7266d..aaf19142c 100644 --- a/data/maps/MagmaHideout_B2F/header.inc +++ b/data/maps/MagmaHideout_B2F/header.inc @@ -7,7 +7,7 @@ MagmaHideout_B2F:: @ 83075C0 .2byte 319 .byte MAPSEC_EVIL_TEAM_HIDEOUT .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 1 diff --git a/data/maps/MauvilleCity/header.inc b/data/maps/MauvilleCity/header.inc index ffd7f9145..ce31e4c56 100644 --- a/data/maps/MauvilleCity/header.inc +++ b/data/maps/MauvilleCity/header.inc @@ -7,7 +7,7 @@ MauvilleCity:: @ 8305480 .2byte 3 .byte MAPSEC_MAUVILLE_CITY .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 2 .2byte 0 .byte 1 diff --git a/data/maps/MauvilleCity_BikeShop/header.inc b/data/maps/MauvilleCity_BikeShop/header.inc index e29d2d1cf..88c493a1f 100644 --- a/data/maps/MauvilleCity_BikeShop/header.inc +++ b/data/maps/MauvilleCity_BikeShop/header.inc @@ -7,7 +7,7 @@ MauvilleCity_BikeShop:: @ 8306168 .2byte 90 .byte MAPSEC_MAUVILLE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/MauvilleCity_GameCorner/header.inc b/data/maps/MauvilleCity_GameCorner/header.inc index af7ab0b1e..4ff122c70 100644 --- a/data/maps/MauvilleCity_GameCorner/header.inc +++ b/data/maps/MauvilleCity_GameCorner/header.inc @@ -7,7 +7,7 @@ MauvilleCity_GameCorner:: @ 83061A0 .2byte 91 .byte MAPSEC_MAUVILLE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/MauvilleCity_Gym/header.inc b/data/maps/MauvilleCity_Gym/header.inc index a16bdf7de..7ac3e60db 100644 --- a/data/maps/MauvilleCity_Gym/header.inc +++ b/data/maps/MauvilleCity_Gym/header.inc @@ -7,7 +7,7 @@ MauvilleCity_Gym:: @ 830614C .2byte 89 .byte MAPSEC_MAUVILLE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/MauvilleCity_House1/header.inc b/data/maps/MauvilleCity_House1/header.inc index c0053d42a..ce170e2ea 100644 --- a/data/maps/MauvilleCity_House1/header.inc +++ b/data/maps/MauvilleCity_House1/header.inc @@ -7,7 +7,7 @@ MauvilleCity_House1:: @ 8306184 .2byte 60 .byte MAPSEC_MAUVILLE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/MauvilleCity_House2/header.inc b/data/maps/MauvilleCity_House2/header.inc index 0446fb462..114991fb2 100644 --- a/data/maps/MauvilleCity_House2/header.inc +++ b/data/maps/MauvilleCity_House2/header.inc @@ -7,7 +7,7 @@ MauvilleCity_House2:: @ 83061BC .2byte 59 .byte MAPSEC_MAUVILLE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/MauvilleCity_Mart/header.inc b/data/maps/MauvilleCity_Mart/header.inc index 67fcf17ac..b8b5543e7 100644 --- a/data/maps/MauvilleCity_Mart/header.inc +++ b/data/maps/MauvilleCity_Mart/header.inc @@ -7,7 +7,7 @@ MauvilleCity_Mart:: @ 8306210 .2byte 63 .byte MAPSEC_MAUVILLE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/MauvilleCity_PokemonCenter_1F/header.inc b/data/maps/MauvilleCity_PokemonCenter_1F/header.inc index fd9dc4050..a040b8302 100644 --- a/data/maps/MauvilleCity_PokemonCenter_1F/header.inc +++ b/data/maps/MauvilleCity_PokemonCenter_1F/header.inc @@ -7,7 +7,7 @@ MauvilleCity_PokemonCenter_1F:: @ 83061D8 .2byte 61 .byte MAPSEC_MAUVILLE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/MauvilleCity_PokemonCenter_2F/header.inc b/data/maps/MauvilleCity_PokemonCenter_2F/header.inc index 988d2941b..1558e9805 100644 --- a/data/maps/MauvilleCity_PokemonCenter_2F/header.inc +++ b/data/maps/MauvilleCity_PokemonCenter_2F/header.inc @@ -7,7 +7,7 @@ MauvilleCity_PokemonCenter_2F:: @ 83061F4 .2byte 62 .byte MAPSEC_MAUVILLE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/MeteorFalls_1F_1R/header.inc b/data/maps/MeteorFalls_1F_1R/header.inc index 908cb3d75..a37240eb3 100644 --- a/data/maps/MeteorFalls_1F_1R/header.inc +++ b/data/maps/MeteorFalls_1F_1R/header.inc @@ -7,7 +7,7 @@ MeteorFalls_1F_1R:: @ 8306D70 .2byte 126 .byte MAPSEC_METEOR_FALLS .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 1 diff --git a/data/maps/MeteorFalls_1F_2R/header.inc b/data/maps/MeteorFalls_1F_2R/header.inc index 9b4a00a03..f8ae25204 100644 --- a/data/maps/MeteorFalls_1F_2R/header.inc +++ b/data/maps/MeteorFalls_1F_2R/header.inc @@ -7,7 +7,7 @@ MeteorFalls_1F_2R:: @ 8306D8C .2byte 127 .byte MAPSEC_METEOR_FALLS .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 1 diff --git a/data/maps/MeteorFalls_B1F_1R/header.inc b/data/maps/MeteorFalls_B1F_1R/header.inc index 021440754..b18035650 100644 --- a/data/maps/MeteorFalls_B1F_1R/header.inc +++ b/data/maps/MeteorFalls_B1F_1R/header.inc @@ -7,7 +7,7 @@ MeteorFalls_B1F_1R:: @ 8306DA8 .2byte 128 .byte MAPSEC_METEOR_FALLS .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 1 diff --git a/data/maps/MeteorFalls_B1F_2R/header.inc b/data/maps/MeteorFalls_B1F_2R/header.inc index 7bbfdb6c2..88a145b9a 100644 --- a/data/maps/MeteorFalls_B1F_2R/header.inc +++ b/data/maps/MeteorFalls_B1F_2R/header.inc @@ -7,7 +7,7 @@ MeteorFalls_B1F_2R:: @ 8306DC4 .2byte 129 .byte MAPSEC_METEOR_FALLS .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 1 diff --git a/data/maps/MossdeepCity/header.inc b/data/maps/MossdeepCity/header.inc index 77049e9cc..6602cc4c0 100644 --- a/data/maps/MossdeepCity/header.inc +++ b/data/maps/MossdeepCity/header.inc @@ -7,7 +7,7 @@ MossdeepCity:: @ 83054F0 .2byte 7 .byte MAPSEC_MOSSDEEP_CITY .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 2 .2byte 0 .byte 1 diff --git a/data/maps/MossdeepCity_GameCorner_1F/header.inc b/data/maps/MossdeepCity_GameCorner_1F/header.inc index ac4f95a11..0aec2853a 100644 --- a/data/maps/MossdeepCity_GameCorner_1F/header.inc +++ b/data/maps/MossdeepCity_GameCorner_1F/header.inc @@ -7,7 +7,7 @@ MossdeepCity_GameCorner_1F:: @ 83068F4 .2byte 306 .byte MAPSEC_MOSSDEEP_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/MossdeepCity_GameCorner_B1F/header.inc b/data/maps/MossdeepCity_GameCorner_B1F/header.inc index 8f25b162b..afa7bde80 100644 --- a/data/maps/MossdeepCity_GameCorner_B1F/header.inc +++ b/data/maps/MossdeepCity_GameCorner_B1F/header.inc @@ -7,7 +7,7 @@ MossdeepCity_GameCorner_B1F:: @ 8306910 .2byte 307 .byte MAPSEC_MOSSDEEP_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/MossdeepCity_Gym/header.inc b/data/maps/MossdeepCity_Gym/header.inc index f815d2654..5968775c0 100644 --- a/data/maps/MossdeepCity_Gym/header.inc +++ b/data/maps/MossdeepCity_Gym/header.inc @@ -7,7 +7,7 @@ MossdeepCity_Gym:: @ 83067C0 .2byte 109 .byte MAPSEC_MOSSDEEP_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/MossdeepCity_House1/header.inc b/data/maps/MossdeepCity_House1/header.inc index 3619ee650..ca0150822 100644 --- a/data/maps/MossdeepCity_House1/header.inc +++ b/data/maps/MossdeepCity_House1/header.inc @@ -7,7 +7,7 @@ MossdeepCity_House1:: @ 83067DC .2byte 60 .byte MAPSEC_MOSSDEEP_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/MossdeepCity_House2/header.inc b/data/maps/MossdeepCity_House2/header.inc index cb67f3876..4a41ce5b0 100644 --- a/data/maps/MossdeepCity_House2/header.inc +++ b/data/maps/MossdeepCity_House2/header.inc @@ -7,7 +7,7 @@ MossdeepCity_House2:: @ 83067F8 .2byte 59 .byte MAPSEC_MOSSDEEP_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/MossdeepCity_House3/header.inc b/data/maps/MossdeepCity_House3/header.inc index 498487232..52b897474 100644 --- a/data/maps/MossdeepCity_House3/header.inc +++ b/data/maps/MossdeepCity_House3/header.inc @@ -7,7 +7,7 @@ MossdeepCity_House3:: @ 8306868 .2byte 60 .byte MAPSEC_MOSSDEEP_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/MossdeepCity_House4/header.inc b/data/maps/MossdeepCity_House4/header.inc index 751c4e344..e7471fd62 100644 --- a/data/maps/MossdeepCity_House4/header.inc +++ b/data/maps/MossdeepCity_House4/header.inc @@ -7,7 +7,7 @@ MossdeepCity_House4:: @ 83068A0 .2byte 80 .byte MAPSEC_MOSSDEEP_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/MossdeepCity_Mart/header.inc b/data/maps/MossdeepCity_Mart/header.inc index a9c359807..fce4c42df 100644 --- a/data/maps/MossdeepCity_Mart/header.inc +++ b/data/maps/MossdeepCity_Mart/header.inc @@ -7,7 +7,7 @@ MossdeepCity_Mart:: @ 830684C .2byte 63 .byte MAPSEC_MOSSDEEP_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/MossdeepCity_PokemonCenter_1F/header.inc b/data/maps/MossdeepCity_PokemonCenter_1F/header.inc index 0dbd52d01..55b2b5ff0 100644 --- a/data/maps/MossdeepCity_PokemonCenter_1F/header.inc +++ b/data/maps/MossdeepCity_PokemonCenter_1F/header.inc @@ -7,7 +7,7 @@ MossdeepCity_PokemonCenter_1F:: @ 8306814 .2byte 61 .byte MAPSEC_MOSSDEEP_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/MossdeepCity_PokemonCenter_2F/header.inc b/data/maps/MossdeepCity_PokemonCenter_2F/header.inc index 64fa94ed7..cd1506e76 100644 --- a/data/maps/MossdeepCity_PokemonCenter_2F/header.inc +++ b/data/maps/MossdeepCity_PokemonCenter_2F/header.inc @@ -7,7 +7,7 @@ MossdeepCity_PokemonCenter_2F:: @ 8306830 .2byte 62 .byte MAPSEC_MOSSDEEP_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/header.inc b/data/maps/MossdeepCity_SpaceCenter_1F/header.inc index 4b195f109..1ffe38a89 100644 --- a/data/maps/MossdeepCity_SpaceCenter_1F/header.inc +++ b/data/maps/MossdeepCity_SpaceCenter_1F/header.inc @@ -7,7 +7,7 @@ MossdeepCity_SpaceCenter_1F:: @ 83068BC .2byte 276 .byte MAPSEC_MOSSDEEP_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/header.inc b/data/maps/MossdeepCity_SpaceCenter_2F/header.inc index 2ea7660f0..adfefc039 100644 --- a/data/maps/MossdeepCity_SpaceCenter_2F/header.inc +++ b/data/maps/MossdeepCity_SpaceCenter_2F/header.inc @@ -7,7 +7,7 @@ MossdeepCity_SpaceCenter_2F:: @ 83068D8 .2byte 277 .byte MAPSEC_MOSSDEEP_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/MossdeepCity_StevensHouse/header.inc b/data/maps/MossdeepCity_StevensHouse/header.inc index c488186d7..fb1c1e84b 100644 --- a/data/maps/MossdeepCity_StevensHouse/header.inc +++ b/data/maps/MossdeepCity_StevensHouse/header.inc @@ -7,7 +7,7 @@ MossdeepCity_StevensHouse:: @ 8306884 .2byte 328 .byte MAPSEC_MOSSDEEP_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/MtChimney/header.inc b/data/maps/MtChimney/header.inc index bd3d1a404..84871bbce 100644 --- a/data/maps/MtChimney/header.inc +++ b/data/maps/MtChimney/header.inc @@ -7,7 +7,7 @@ MtChimney:: @ 8306EC0 .2byte 137 .byte MAPSEC_MT_CHIMNEY .byte 0 - .byte 7 + .byte WEATHER_ASH .byte 3 .2byte 0 .byte 1 diff --git a/data/maps/MtChimney_CableCarStation/header.inc b/data/maps/MtChimney_CableCarStation/header.inc index 4489e2050..0e1f7e70d 100644 --- a/data/maps/MtChimney_CableCarStation/header.inc +++ b/data/maps/MtChimney_CableCarStation/header.inc @@ -7,7 +7,7 @@ MtChimney_CableCarStation:: @ 8306CAC .2byte 119 .byte MAPSEC_MT_CHIMNEY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/MtPyre_1F/header.inc b/data/maps/MtPyre_1F/header.inc index b9613f8f5..fbfe0ce06 100644 --- a/data/maps/MtPyre_1F/header.inc +++ b/data/maps/MtPyre_1F/header.inc @@ -7,7 +7,7 @@ MtPyre_1F:: @ 8306F14 .2byte 138 .byte MAPSEC_MT_PYRE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 1 diff --git a/data/maps/MtPyre_2F/header.inc b/data/maps/MtPyre_2F/header.inc index 8b6c62f95..726d0b074 100644 --- a/data/maps/MtPyre_2F/header.inc +++ b/data/maps/MtPyre_2F/header.inc @@ -7,7 +7,7 @@ MtPyre_2F:: @ 8306F30 .2byte 139 .byte MAPSEC_MT_PYRE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 1 diff --git a/data/maps/MtPyre_3F/header.inc b/data/maps/MtPyre_3F/header.inc index 7f380ebbc..cef743b5b 100644 --- a/data/maps/MtPyre_3F/header.inc +++ b/data/maps/MtPyre_3F/header.inc @@ -7,7 +7,7 @@ MtPyre_3F:: @ 8306F4C .2byte 140 .byte MAPSEC_MT_PYRE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 1 diff --git a/data/maps/MtPyre_4F/header.inc b/data/maps/MtPyre_4F/header.inc index 8f4ec2190..85e3b82fc 100644 --- a/data/maps/MtPyre_4F/header.inc +++ b/data/maps/MtPyre_4F/header.inc @@ -7,7 +7,7 @@ MtPyre_4F:: @ 8306F68 .2byte 141 .byte MAPSEC_MT_PYRE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 1 diff --git a/data/maps/MtPyre_5F/header.inc b/data/maps/MtPyre_5F/header.inc index 990e55706..c2793a829 100644 --- a/data/maps/MtPyre_5F/header.inc +++ b/data/maps/MtPyre_5F/header.inc @@ -7,7 +7,7 @@ MtPyre_5F:: @ 8306F84 .2byte 142 .byte MAPSEC_MT_PYRE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 1 diff --git a/data/maps/MtPyre_6F/header.inc b/data/maps/MtPyre_6F/header.inc index 59376a8a5..091951b0f 100644 --- a/data/maps/MtPyre_6F/header.inc +++ b/data/maps/MtPyre_6F/header.inc @@ -7,7 +7,7 @@ MtPyre_6F:: @ 8306FA0 .2byte 143 .byte MAPSEC_MT_PYRE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 1 diff --git a/data/maps/MtPyre_Exterior/header.inc b/data/maps/MtPyre_Exterior/header.inc index 4947de176..f2978daf7 100644 --- a/data/maps/MtPyre_Exterior/header.inc +++ b/data/maps/MtPyre_Exterior/header.inc @@ -7,7 +7,7 @@ MtPyre_Exterior:: @ 8306FBC .2byte 303 .byte MAPSEC_MT_PYRE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 3 .2byte 0 .byte 1 diff --git a/data/maps/MtPyre_Summit/header.inc b/data/maps/MtPyre_Summit/header.inc index 4af2bb0cd..32d205526 100644 --- a/data/maps/MtPyre_Summit/header.inc +++ b/data/maps/MtPyre_Summit/header.inc @@ -7,7 +7,7 @@ MtPyre_Summit:: @ 8306FD8 .2byte 304 .byte MAPSEC_MT_PYRE .byte 0 - .byte 6 + .byte WEATHER_FOG_1 .byte 3 .2byte 0 .byte 1 diff --git a/data/maps/NewMauville_Entrance/header.inc b/data/maps/NewMauville_Entrance/header.inc index 452a89a1e..a90bb8d98 100644 --- a/data/maps/NewMauville_Entrance/header.inc +++ b/data/maps/NewMauville_Entrance/header.inc @@ -7,7 +7,7 @@ NewMauville_Entrance:: @ 8307320 .2byte 185 .byte MAPSEC_NEW_MAUVILLE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 1 diff --git a/data/maps/NewMauville_Inside/header.inc b/data/maps/NewMauville_Inside/header.inc index c76ee0b84..9b5d04a42 100644 --- a/data/maps/NewMauville_Inside/header.inc +++ b/data/maps/NewMauville_Inside/header.inc @@ -7,7 +7,7 @@ NewMauville_Inside:: @ 830733C .2byte 186 .byte MAPSEC_NEW_MAUVILLE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 1 diff --git a/data/maps/OldaleTown/header.inc b/data/maps/OldaleTown/header.inc index 5ae65bc80..822507c96 100644 --- a/data/maps/OldaleTown/header.inc +++ b/data/maps/OldaleTown/header.inc @@ -7,7 +7,7 @@ OldaleTown:: @ 8305560 .2byte 11 .byte MAPSEC_OLDALE_TOWN .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 1 .2byte 0 .byte 1 diff --git a/data/maps/OldaleTown_House1/header.inc b/data/maps/OldaleTown_House1/header.inc index 9eef00f1b..05d20a2c3 100644 --- a/data/maps/OldaleTown_House1/header.inc +++ b/data/maps/OldaleTown_House1/header.inc @@ -7,7 +7,7 @@ OldaleTown_House1:: @ 8305ABC .2byte 59 .byte MAPSEC_OLDALE_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/OldaleTown_House2/header.inc b/data/maps/OldaleTown_House2/header.inc index 49e6e363b..e62c95dfb 100644 --- a/data/maps/OldaleTown_House2/header.inc +++ b/data/maps/OldaleTown_House2/header.inc @@ -7,7 +7,7 @@ OldaleTown_House2:: @ 8305AD8 .2byte 60 .byte MAPSEC_OLDALE_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/OldaleTown_Mart/header.inc b/data/maps/OldaleTown_Mart/header.inc index 2cb202aff..bfc8b43fa 100644 --- a/data/maps/OldaleTown_Mart/header.inc +++ b/data/maps/OldaleTown_Mart/header.inc @@ -7,7 +7,7 @@ OldaleTown_Mart:: @ 8305B2C .2byte 63 .byte MAPSEC_OLDALE_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/OldaleTown_PokemonCenter_1F/header.inc b/data/maps/OldaleTown_PokemonCenter_1F/header.inc index 71570da63..53305c00d 100644 --- a/data/maps/OldaleTown_PokemonCenter_1F/header.inc +++ b/data/maps/OldaleTown_PokemonCenter_1F/header.inc @@ -7,7 +7,7 @@ OldaleTown_PokemonCenter_1F:: @ 8305AF4 .2byte 61 .byte MAPSEC_OLDALE_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/OldaleTown_PokemonCenter_2F/header.inc b/data/maps/OldaleTown_PokemonCenter_2F/header.inc index 73eaa3e7a..74a468d80 100644 --- a/data/maps/OldaleTown_PokemonCenter_2F/header.inc +++ b/data/maps/OldaleTown_PokemonCenter_2F/header.inc @@ -7,7 +7,7 @@ OldaleTown_PokemonCenter_2F:: @ 8305B10 .2byte 62 .byte MAPSEC_OLDALE_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/PacifidlogTown/header.inc b/data/maps/PacifidlogTown/header.inc index 0c3f8dc14..1ed15c94b 100644 --- a/data/maps/PacifidlogTown/header.inc +++ b/data/maps/PacifidlogTown/header.inc @@ -7,7 +7,7 @@ PacifidlogTown:: @ 83055EC .2byte 16 .byte MAPSEC_PACIFIDLOG_TOWN .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 1 .2byte 0 .byte 1 diff --git a/data/maps/PacifidlogTown_House1/header.inc b/data/maps/PacifidlogTown_House1/header.inc index 960510a10..f1f377547 100644 --- a/data/maps/PacifidlogTown_House1/header.inc +++ b/data/maps/PacifidlogTown_House1/header.inc @@ -7,7 +7,7 @@ PacifidlogTown_House1:: @ 8305E90 .2byte 77 .byte MAPSEC_PACIFIDLOG_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/PacifidlogTown_House2/header.inc b/data/maps/PacifidlogTown_House2/header.inc index e1389d640..5d586fb3e 100644 --- a/data/maps/PacifidlogTown_House2/header.inc +++ b/data/maps/PacifidlogTown_House2/header.inc @@ -7,7 +7,7 @@ PacifidlogTown_House2:: @ 8305EAC .2byte 78 .byte MAPSEC_PACIFIDLOG_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/PacifidlogTown_House3/header.inc b/data/maps/PacifidlogTown_House3/header.inc index 370c68fb9..f889259ce 100644 --- a/data/maps/PacifidlogTown_House3/header.inc +++ b/data/maps/PacifidlogTown_House3/header.inc @@ -7,7 +7,7 @@ PacifidlogTown_House3:: @ 8305EC8 .2byte 77 .byte MAPSEC_PACIFIDLOG_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/PacifidlogTown_House4/header.inc b/data/maps/PacifidlogTown_House4/header.inc index a4696948f..bd5ab6270 100644 --- a/data/maps/PacifidlogTown_House4/header.inc +++ b/data/maps/PacifidlogTown_House4/header.inc @@ -7,7 +7,7 @@ PacifidlogTown_House4:: @ 8305EE4 .2byte 78 .byte MAPSEC_PACIFIDLOG_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/PacifidlogTown_House5/header.inc b/data/maps/PacifidlogTown_House5/header.inc index 7e784c5d9..90515cc79 100644 --- a/data/maps/PacifidlogTown_House5/header.inc +++ b/data/maps/PacifidlogTown_House5/header.inc @@ -7,7 +7,7 @@ PacifidlogTown_House5:: @ 8305F00 .2byte 77 .byte MAPSEC_PACIFIDLOG_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc b/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc index c482332f2..332274802 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc +++ b/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc @@ -7,7 +7,7 @@ PacifidlogTown_PokemonCenter_1F:: @ 8305E58 .2byte 61 .byte MAPSEC_PACIFIDLOG_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc b/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc index 95818df6e..2f71ff564 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc +++ b/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc @@ -7,7 +7,7 @@ PacifidlogTown_PokemonCenter_2F:: @ 8305E74 .2byte 62 .byte MAPSEC_PACIFIDLOG_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/PetalburgCity/header.inc b/data/maps/PetalburgCity/header.inc index ecd98a176..db85c511a 100644 --- a/data/maps/PetalburgCity/header.inc +++ b/data/maps/PetalburgCity/header.inc @@ -7,7 +7,7 @@ PetalburgCity:: @ 8305448 .2byte 1 .byte MAPSEC_PETALBURG_CITY .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 2 .2byte 0 .byte 1 diff --git a/data/maps/PetalburgCity_Gym/header.inc b/data/maps/PetalburgCity_Gym/header.inc index 2307f6c4c..4d225221c 100644 --- a/data/maps/PetalburgCity_Gym/header.inc +++ b/data/maps/PetalburgCity_Gym/header.inc @@ -7,7 +7,7 @@ PetalburgCity_Gym:: @ 8305F38 .2byte 79 .byte MAPSEC_PETALBURG_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/PetalburgCity_House1/header.inc b/data/maps/PetalburgCity_House1/header.inc index 318b4701e..d4ca14c65 100644 --- a/data/maps/PetalburgCity_House1/header.inc +++ b/data/maps/PetalburgCity_House1/header.inc @@ -7,7 +7,7 @@ PetalburgCity_House1:: @ 8305F54 .2byte 59 .byte MAPSEC_PETALBURG_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/PetalburgCity_House2/header.inc b/data/maps/PetalburgCity_House2/header.inc index 530a7fee6..5637a2bef 100644 --- a/data/maps/PetalburgCity_House2/header.inc +++ b/data/maps/PetalburgCity_House2/header.inc @@ -7,7 +7,7 @@ PetalburgCity_House2:: @ 8305F70 .2byte 80 .byte MAPSEC_PETALBURG_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/PetalburgCity_Mart/header.inc b/data/maps/PetalburgCity_Mart/header.inc index 8a7109207..aef1d717b 100644 --- a/data/maps/PetalburgCity_Mart/header.inc +++ b/data/maps/PetalburgCity_Mart/header.inc @@ -7,7 +7,7 @@ PetalburgCity_Mart:: @ 8305FC4 .2byte 63 .byte MAPSEC_PETALBURG_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/PetalburgCity_PokemonCenter_1F/header.inc b/data/maps/PetalburgCity_PokemonCenter_1F/header.inc index d7b4c6631..281733cce 100644 --- a/data/maps/PetalburgCity_PokemonCenter_1F/header.inc +++ b/data/maps/PetalburgCity_PokemonCenter_1F/header.inc @@ -7,7 +7,7 @@ PetalburgCity_PokemonCenter_1F:: @ 8305F8C .2byte 61 .byte MAPSEC_PETALBURG_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/PetalburgCity_PokemonCenter_2F/header.inc b/data/maps/PetalburgCity_PokemonCenter_2F/header.inc index c74854e62..3da47f4a7 100644 --- a/data/maps/PetalburgCity_PokemonCenter_2F/header.inc +++ b/data/maps/PetalburgCity_PokemonCenter_2F/header.inc @@ -7,7 +7,7 @@ PetalburgCity_PokemonCenter_2F:: @ 8305FA8 .2byte 62 .byte MAPSEC_PETALBURG_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/PetalburgCity_WallysHouse/header.inc b/data/maps/PetalburgCity_WallysHouse/header.inc index 01c75ceb4..d6f106ce2 100644 --- a/data/maps/PetalburgCity_WallysHouse/header.inc +++ b/data/maps/PetalburgCity_WallysHouse/header.inc @@ -7,7 +7,7 @@ PetalburgCity_WallysHouse:: @ 8305F1C .2byte 60 .byte MAPSEC_PETALBURG_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/PetalburgWoods/header.inc b/data/maps/PetalburgWoods/header.inc index 88a9b5782..31b8491b6 100644 --- a/data/maps/PetalburgWoods/header.inc +++ b/data/maps/PetalburgWoods/header.inc @@ -7,7 +7,7 @@ PetalburgWoods:: @ 8306EA4 .2byte 136 .byte MAPSEC_PETALBURG_WOODS .byte 0 - .byte 11 + .byte WEATHER_SHADE .byte 3 .2byte 0 .byte 1 diff --git a/data/maps/RecordCorner/header.inc b/data/maps/RecordCorner/header.inc index d45299b9b..983654e2d 100644 --- a/data/maps/RecordCorner/header.inc +++ b/data/maps/RecordCorner/header.inc @@ -7,7 +7,7 @@ RecordCorner:: @ 83079B0 .2byte 224 .byte MAPSEC_DYNAMIC .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/Route101/header.inc b/data/maps/Route101/header.inc index a5fa12d17..fc21038b4 100644 --- a/data/maps/Route101/header.inc +++ b/data/maps/Route101/header.inc @@ -7,7 +7,7 @@ Route101:: @ 8305608 .2byte 17 .byte MAPSEC_ROUTE_101 .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 3 .2byte 0 .byte 1 diff --git a/data/maps/Route102/header.inc b/data/maps/Route102/header.inc index 47474298f..874d665f0 100644 --- a/data/maps/Route102/header.inc +++ b/data/maps/Route102/header.inc @@ -7,7 +7,7 @@ Route102:: @ 8305624 .2byte 18 .byte MAPSEC_ROUTE_102 .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 3 .2byte 0 .byte 1 diff --git a/data/maps/Route103/header.inc b/data/maps/Route103/header.inc index 22659ecde..0c3cc1803 100644 --- a/data/maps/Route103/header.inc +++ b/data/maps/Route103/header.inc @@ -7,7 +7,7 @@ Route103:: @ 8305640 .2byte 19 .byte MAPSEC_ROUTE_103 .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 3 .2byte 0 .byte 1 diff --git a/data/maps/Route104/header.inc b/data/maps/Route104/header.inc index 4f2c4f972..c90a091c9 100644 --- a/data/maps/Route104/header.inc +++ b/data/maps/Route104/header.inc @@ -7,7 +7,7 @@ Route104:: @ 830565C .2byte 20 .byte MAPSEC_ROUTE_104 .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 3 .2byte 0 .byte 1 diff --git a/data/maps/Route104_MrBrineysHouse/header.inc b/data/maps/Route104_MrBrineysHouse/header.inc index 008c91ec1..05632e3b0 100644 --- a/data/maps/Route104_MrBrineysHouse/header.inc +++ b/data/maps/Route104_MrBrineysHouse/header.inc @@ -7,7 +7,7 @@ Route104_MrBrineysHouse:: @ 8306C20 .2byte 102 .byte MAPSEC_ROUTE_104 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/Route104_PrettyPetalFlowerShop/header.inc b/data/maps/Route104_PrettyPetalFlowerShop/header.inc index ebcdaf716..3ff72f780 100644 --- a/data/maps/Route104_PrettyPetalFlowerShop/header.inc +++ b/data/maps/Route104_PrettyPetalFlowerShop/header.inc @@ -7,7 +7,7 @@ Route104_PrettyPetalFlowerShop:: @ 8306C3C .2byte 118 .byte MAPSEC_ROUTE_104 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/Route104_Prototype/header.inc b/data/maps/Route104_Prototype/header.inc index a6226895e..ba6601509 100644 --- a/data/maps/Route104_Prototype/header.inc +++ b/data/maps/Route104_Prototype/header.inc @@ -7,7 +7,7 @@ Route104_Prototype:: @ 8307CF8 .2byte 288 .byte MAPSEC_ROUTE_104 .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 3 .2byte 0 .byte 1 diff --git a/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc b/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc index 55d13f166..cc2c17416 100644 --- a/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc +++ b/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc @@ -7,7 +7,7 @@ Route104_PrototypePrettyPetalFlowerShop:: @ 8307D14 .2byte 118 .byte MAPSEC_ROUTE_104 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 1 diff --git a/data/maps/Route105/header.inc b/data/maps/Route105/header.inc index 596cd3f2f..29480a593 100644 --- a/data/maps/Route105/header.inc +++ b/data/maps/Route105/header.inc @@ -7,7 +7,7 @@ Route105:: @ 8305678 .2byte 21 .byte MAPSEC_ROUTE_105 .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 3 .2byte 0 .byte 1 diff --git a/data/maps/Route106/header.inc b/data/maps/Route106/header.inc index a27e29335..06100a263 100644 --- a/data/maps/Route106/header.inc +++ b/data/maps/Route106/header.inc @@ -7,7 +7,7 @@ Route106:: @ 8305694 .2byte 22 .byte MAPSEC_ROUTE_106 .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 3 .2byte 0 .byte 1 diff --git a/data/maps/Route107/header.inc b/data/maps/Route107/header.inc index cbb0a51d4..164b31f41 100644 --- a/data/maps/Route107/header.inc +++ b/data/maps/Route107/header.inc @@ -7,7 +7,7 @@ Route107:: @ 83056B0 .2byte 23 .byte MAPSEC_ROUTE_107 .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 3 .2byte 0 .byte 1 diff --git a/data/maps/Route108/header.inc b/data/maps/Route108/header.inc index 10b5577a7..e0bf0a4cf 100644 --- a/data/maps/Route108/header.inc +++ b/data/maps/Route108/header.inc @@ -7,7 +7,7 @@ Route108:: @ 83056CC .2byte 24 .byte MAPSEC_ROUTE_108 .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 3 .2byte 0 .byte 1 diff --git a/data/maps/Route109/header.inc b/data/maps/Route109/header.inc index fb6a4cfa5..d89810726 100644 --- a/data/maps/Route109/header.inc +++ b/data/maps/Route109/header.inc @@ -7,7 +7,7 @@ Route109:: @ 83056E8 .2byte 25 .byte MAPSEC_ROUTE_109 .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 3 .2byte 0 .byte 1 diff --git a/data/maps/Route109_SeashoreHouse/header.inc b/data/maps/Route109_SeashoreHouse/header.inc index 2b862890c..2bcef541a 100644 --- a/data/maps/Route109_SeashoreHouse/header.inc +++ b/data/maps/Route109_SeashoreHouse/header.inc @@ -7,7 +7,7 @@ Route109_SeashoreHouse:: @ 8307D30 .2byte 244 .byte MAPSEC_ROUTE_109 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/Route110/header.inc b/data/maps/Route110/header.inc index 44f9171c5..dc8c879e2 100644 --- a/data/maps/Route110/header.inc +++ b/data/maps/Route110/header.inc @@ -7,7 +7,7 @@ Route110:: @ 8305704 .2byte 26 .byte MAPSEC_ROUTE_110 .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 3 .2byte 0 .byte 1 diff --git a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc index 3c8cbc913..a58634ce9 100644 --- a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc +++ b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc @@ -7,7 +7,7 @@ Route110_SeasideCyclingRoadNorthEntrance:: @ 8307E9C .2byte 257 .byte MAPSEC_ROUTE_110 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc index 92a567e79..648eb731a 100644 --- a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc +++ b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc @@ -7,7 +7,7 @@ Route110_SeasideCyclingRoadSouthEntrance:: @ 8307E80 .2byte 257 .byte MAPSEC_ROUTE_110 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/Route110_TrickHouseCorridor/header.inc b/data/maps/Route110_TrickHouseCorridor/header.inc index 1917ca9e8..b443725c7 100644 --- a/data/maps/Route110_TrickHouseCorridor/header.inc +++ b/data/maps/Route110_TrickHouseCorridor/header.inc @@ -7,7 +7,7 @@ Route110_TrickHouseCorridor:: @ 8307D84 .2byte 247 .byte MAPSEC_ROUTE_110 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/Route110_TrickHouseEnd/header.inc b/data/maps/Route110_TrickHouseEnd/header.inc index bbd71f6e0..c93534396 100644 --- a/data/maps/Route110_TrickHouseEnd/header.inc +++ b/data/maps/Route110_TrickHouseEnd/header.inc @@ -7,7 +7,7 @@ Route110_TrickHouseEnd:: @ 8307D68 .2byte 246 .byte MAPSEC_ROUTE_110 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/Route110_TrickHouseEntrance/header.inc b/data/maps/Route110_TrickHouseEntrance/header.inc index 9e85c08b4..6a292f3be 100644 --- a/data/maps/Route110_TrickHouseEntrance/header.inc +++ b/data/maps/Route110_TrickHouseEntrance/header.inc @@ -7,7 +7,7 @@ Route110_TrickHouseEntrance:: @ 8307D4C .2byte 245 .byte MAPSEC_ROUTE_110 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/Route110_TrickHousePuzzle1/header.inc b/data/maps/Route110_TrickHousePuzzle1/header.inc index 5ccf92339..25c8ac058 100644 --- a/data/maps/Route110_TrickHousePuzzle1/header.inc +++ b/data/maps/Route110_TrickHousePuzzle1/header.inc @@ -7,7 +7,7 @@ Route110_TrickHousePuzzle1:: @ 8307DA0 .2byte 248 .byte MAPSEC_ROUTE_110 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/Route110_TrickHousePuzzle2/header.inc b/data/maps/Route110_TrickHousePuzzle2/header.inc index 79956b4ce..6bc98e718 100644 --- a/data/maps/Route110_TrickHousePuzzle2/header.inc +++ b/data/maps/Route110_TrickHousePuzzle2/header.inc @@ -7,7 +7,7 @@ Route110_TrickHousePuzzle2:: @ 8307DBC .2byte 249 .byte MAPSEC_ROUTE_110 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/Route110_TrickHousePuzzle3/header.inc b/data/maps/Route110_TrickHousePuzzle3/header.inc index 39757f11c..e4da788a6 100644 --- a/data/maps/Route110_TrickHousePuzzle3/header.inc +++ b/data/maps/Route110_TrickHousePuzzle3/header.inc @@ -7,7 +7,7 @@ Route110_TrickHousePuzzle3:: @ 8307DD8 .2byte 250 .byte MAPSEC_ROUTE_110 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/Route110_TrickHousePuzzle4/header.inc b/data/maps/Route110_TrickHousePuzzle4/header.inc index 42240589e..9648e360b 100644 --- a/data/maps/Route110_TrickHousePuzzle4/header.inc +++ b/data/maps/Route110_TrickHousePuzzle4/header.inc @@ -7,7 +7,7 @@ Route110_TrickHousePuzzle4:: @ 8307DF4 .2byte 251 .byte MAPSEC_ROUTE_110 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/Route110_TrickHousePuzzle5/header.inc b/data/maps/Route110_TrickHousePuzzle5/header.inc index 66633e116..5188630fd 100644 --- a/data/maps/Route110_TrickHousePuzzle5/header.inc +++ b/data/maps/Route110_TrickHousePuzzle5/header.inc @@ -7,7 +7,7 @@ Route110_TrickHousePuzzle5:: @ 8307E10 .2byte 252 .byte MAPSEC_ROUTE_110 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/Route110_TrickHousePuzzle6/header.inc b/data/maps/Route110_TrickHousePuzzle6/header.inc index 8e481c0d2..214460bf8 100644 --- a/data/maps/Route110_TrickHousePuzzle6/header.inc +++ b/data/maps/Route110_TrickHousePuzzle6/header.inc @@ -7,7 +7,7 @@ Route110_TrickHousePuzzle6:: @ 8307E2C .2byte 253 .byte MAPSEC_ROUTE_110 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/Route110_TrickHousePuzzle7/header.inc b/data/maps/Route110_TrickHousePuzzle7/header.inc index 7dbfeee9c..6e9a22746 100644 --- a/data/maps/Route110_TrickHousePuzzle7/header.inc +++ b/data/maps/Route110_TrickHousePuzzle7/header.inc @@ -7,7 +7,7 @@ Route110_TrickHousePuzzle7:: @ 8307E48 .2byte 254 .byte MAPSEC_ROUTE_110 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/Route110_TrickHousePuzzle8/header.inc b/data/maps/Route110_TrickHousePuzzle8/header.inc index b5c19da8c..6e7683b8c 100644 --- a/data/maps/Route110_TrickHousePuzzle8/header.inc +++ b/data/maps/Route110_TrickHousePuzzle8/header.inc @@ -7,7 +7,7 @@ Route110_TrickHousePuzzle8:: @ 8307E64 .2byte 255 .byte MAPSEC_ROUTE_110 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/Route111/header.inc b/data/maps/Route111/header.inc index 08bdee199..973e43ad3 100644 --- a/data/maps/Route111/header.inc +++ b/data/maps/Route111/header.inc @@ -7,7 +7,7 @@ Route111:: @ 8305720 .2byte 27 .byte MAPSEC_ROUTE_111 .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 3 .2byte 0 .byte 1 diff --git a/data/maps/Route111_OldLadysRestStop/header.inc b/data/maps/Route111_OldLadysRestStop/header.inc index da9e9f2b2..af1b5d7f0 100644 --- a/data/maps/Route111_OldLadysRestStop/header.inc +++ b/data/maps/Route111_OldLadysRestStop/header.inc @@ -7,7 +7,7 @@ Route111_OldLadysRestStop:: @ 8306C74 .2byte 64 .byte MAPSEC_ROUTE_111 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/Route111_WinstrateFamilysHouse/header.inc b/data/maps/Route111_WinstrateFamilysHouse/header.inc index 286ba879b..100cd4b8a 100644 --- a/data/maps/Route111_WinstrateFamilysHouse/header.inc +++ b/data/maps/Route111_WinstrateFamilysHouse/header.inc @@ -7,7 +7,7 @@ Route111_WinstrateFamilysHouse:: @ 8306C58 .2byte 60 .byte MAPSEC_ROUTE_111 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/Route112/header.inc b/data/maps/Route112/header.inc index 9181e6742..845b656d9 100644 --- a/data/maps/Route112/header.inc +++ b/data/maps/Route112/header.inc @@ -7,7 +7,7 @@ Route112:: @ 830573C .2byte 28 .byte MAPSEC_ROUTE_112 .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 3 .2byte 0 .byte 1 diff --git a/data/maps/Route112_CableCarStation/header.inc b/data/maps/Route112_CableCarStation/header.inc index 3621f354d..c04ae3a85 100644 --- a/data/maps/Route112_CableCarStation/header.inc +++ b/data/maps/Route112_CableCarStation/header.inc @@ -7,7 +7,7 @@ Route112_CableCarStation:: @ 8306C90 .2byte 119 .byte MAPSEC_ROUTE_112 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/Route113/header.inc b/data/maps/Route113/header.inc index fb951f745..bcad63fca 100644 --- a/data/maps/Route113/header.inc +++ b/data/maps/Route113/header.inc @@ -7,7 +7,7 @@ Route113:: @ 8305758 .2byte 29 .byte MAPSEC_ROUTE_113 .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 3 .2byte 0 .byte 1 diff --git a/data/maps/Route113_GlassWorkshop/header.inc b/data/maps/Route113_GlassWorkshop/header.inc index b91ea7e31..66bfc8b21 100644 --- a/data/maps/Route113_GlassWorkshop/header.inc +++ b/data/maps/Route113_GlassWorkshop/header.inc @@ -7,7 +7,7 @@ Route113_GlassWorkshop:: @ 8307EB8 .2byte 67 .byte MAPSEC_ROUTE_113 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/Route114/header.inc b/data/maps/Route114/header.inc index 463b73fc6..d51ee825e 100644 --- a/data/maps/Route114/header.inc +++ b/data/maps/Route114/header.inc @@ -7,7 +7,7 @@ Route114:: @ 8305774 .2byte 30 .byte MAPSEC_ROUTE_114 .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 3 .2byte 0 .byte 1 diff --git a/data/maps/Route114_FossilManiacsHouse/header.inc b/data/maps/Route114_FossilManiacsHouse/header.inc index 6d3a91f9b..8d22a1314 100644 --- a/data/maps/Route114_FossilManiacsHouse/header.inc +++ b/data/maps/Route114_FossilManiacsHouse/header.inc @@ -7,7 +7,7 @@ Route114_FossilManiacsHouse:: @ 8306CC8 .2byte 120 .byte MAPSEC_ROUTE_114 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/Route114_FossilManiacsTunnel/header.inc b/data/maps/Route114_FossilManiacsTunnel/header.inc index fb13a0014..f5f2c877c 100644 --- a/data/maps/Route114_FossilManiacsTunnel/header.inc +++ b/data/maps/Route114_FossilManiacsTunnel/header.inc @@ -7,7 +7,7 @@ Route114_FossilManiacsTunnel:: @ 8306CE4 .2byte 121 .byte MAPSEC_ROUTE_114 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/Route114_LanettesHouse/header.inc b/data/maps/Route114_LanettesHouse/header.inc index 5ec566a97..44f4d47bc 100644 --- a/data/maps/Route114_LanettesHouse/header.inc +++ b/data/maps/Route114_LanettesHouse/header.inc @@ -7,7 +7,7 @@ Route114_LanettesHouse:: @ 8306D00 .2byte 122 .byte MAPSEC_ROUTE_114 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/Route115/header.inc b/data/maps/Route115/header.inc index 2b4ed1a8e..640735ac3 100644 --- a/data/maps/Route115/header.inc +++ b/data/maps/Route115/header.inc @@ -7,7 +7,7 @@ Route115:: @ 8305790 .2byte 31 .byte MAPSEC_ROUTE_115 .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 3 .2byte 0 .byte 1 diff --git a/data/maps/Route116/header.inc b/data/maps/Route116/header.inc index ca397e802..2ba0a7ade 100644 --- a/data/maps/Route116/header.inc +++ b/data/maps/Route116/header.inc @@ -7,7 +7,7 @@ Route116:: @ 83057AC .2byte 32 .byte MAPSEC_ROUTE_116 .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 3 .2byte 0 .byte 1 diff --git a/data/maps/Route116_TunnelersRestHouse/header.inc b/data/maps/Route116_TunnelersRestHouse/header.inc index 1dfc79fd7..802c04403 100644 --- a/data/maps/Route116_TunnelersRestHouse/header.inc +++ b/data/maps/Route116_TunnelersRestHouse/header.inc @@ -7,7 +7,7 @@ Route116_TunnelersRestHouse:: @ 8306D1C .2byte 123 .byte MAPSEC_ROUTE_116 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/Route117/header.inc b/data/maps/Route117/header.inc index 05481f3f6..c19c87950 100644 --- a/data/maps/Route117/header.inc +++ b/data/maps/Route117/header.inc @@ -7,7 +7,7 @@ Route117:: @ 83057C8 .2byte 33 .byte MAPSEC_ROUTE_117 .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 3 .2byte 0 .byte 1 diff --git a/data/maps/Route117_PokemonDayCare/header.inc b/data/maps/Route117_PokemonDayCare/header.inc index 1f3e8ab1b..46923947b 100644 --- a/data/maps/Route117_PokemonDayCare/header.inc +++ b/data/maps/Route117_PokemonDayCare/header.inc @@ -7,7 +7,7 @@ Route117_PokemonDayCare:: @ 8306D38 .2byte 124 .byte MAPSEC_ROUTE_117 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/Route118/header.inc b/data/maps/Route118/header.inc index 7db58629e..944a9695d 100644 --- a/data/maps/Route118/header.inc +++ b/data/maps/Route118/header.inc @@ -7,7 +7,7 @@ Route118:: @ 83057E4 .2byte 34 .byte MAPSEC_ROUTE_118 .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 3 .2byte 0 .byte 1 diff --git a/data/maps/Route119/header.inc b/data/maps/Route119/header.inc index 31ff54e69..b8a2d42bc 100644 --- a/data/maps/Route119/header.inc +++ b/data/maps/Route119/header.inc @@ -7,7 +7,7 @@ Route119:: @ 8305800 .2byte 35 .byte MAPSEC_ROUTE_119 .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 3 .2byte 0 .byte 1 diff --git a/data/maps/Route119_House/header.inc b/data/maps/Route119_House/header.inc index 3f3a674c1..4ff380fed 100644 --- a/data/maps/Route119_House/header.inc +++ b/data/maps/Route119_House/header.inc @@ -7,7 +7,7 @@ Route119_House:: @ 8307F28 .2byte 59 .byte MAPSEC_ROUTE_119 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/Route119_WeatherInstitute_1F/header.inc b/data/maps/Route119_WeatherInstitute_1F/header.inc index c1d5e4a19..26ff382a1 100644 --- a/data/maps/Route119_WeatherInstitute_1F/header.inc +++ b/data/maps/Route119_WeatherInstitute_1F/header.inc @@ -7,7 +7,7 @@ Route119_WeatherInstitute_1F:: @ 8307EF0 .2byte 272 .byte MAPSEC_ROUTE_119 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/Route119_WeatherInstitute_2F/header.inc b/data/maps/Route119_WeatherInstitute_2F/header.inc index cab0cff36..27aa20836 100644 --- a/data/maps/Route119_WeatherInstitute_2F/header.inc +++ b/data/maps/Route119_WeatherInstitute_2F/header.inc @@ -7,7 +7,7 @@ Route119_WeatherInstitute_2F:: @ 8307F0C .2byte 273 .byte MAPSEC_ROUTE_119 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/Route120/header.inc b/data/maps/Route120/header.inc index 329aad838..6c1f1cde3 100644 --- a/data/maps/Route120/header.inc +++ b/data/maps/Route120/header.inc @@ -7,7 +7,7 @@ Route120:: @ 830581C .2byte 36 .byte MAPSEC_ROUTE_120 .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 3 .2byte 0 .byte 1 diff --git a/data/maps/Route121/header.inc b/data/maps/Route121/header.inc index 096e898e7..fb8fc3838 100644 --- a/data/maps/Route121/header.inc +++ b/data/maps/Route121/header.inc @@ -7,7 +7,7 @@ Route121:: @ 8305838 .2byte 37 .byte MAPSEC_ROUTE_121 .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 3 .2byte 0 .byte 1 diff --git a/data/maps/Route121_SafariZoneEntrance/header.inc b/data/maps/Route121_SafariZoneEntrance/header.inc index eaf333fab..f00791155 100644 --- a/data/maps/Route121_SafariZoneEntrance/header.inc +++ b/data/maps/Route121_SafariZoneEntrance/header.inc @@ -7,7 +7,7 @@ Route121_SafariZoneEntrance:: @ 8306D54 .2byte 125 .byte MAPSEC_ROUTE_121 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/Route122/header.inc b/data/maps/Route122/header.inc index 8dbd09231..8154c3934 100644 --- a/data/maps/Route122/header.inc +++ b/data/maps/Route122/header.inc @@ -7,7 +7,7 @@ Route122:: @ 8305854 .2byte 38 .byte MAPSEC_ROUTE_122 .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 3 .2byte 0 .byte 1 diff --git a/data/maps/Route123/header.inc b/data/maps/Route123/header.inc index 49d62bc91..fdd481274 100644 --- a/data/maps/Route123/header.inc +++ b/data/maps/Route123/header.inc @@ -7,7 +7,7 @@ Route123:: @ 8305870 .2byte 39 .byte MAPSEC_ROUTE_123 .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 3 .2byte 0 .byte 1 diff --git a/data/maps/Route123_BerryMastersHouse/header.inc b/data/maps/Route123_BerryMastersHouse/header.inc index 8925ce819..2942daf3b 100644 --- a/data/maps/Route123_BerryMastersHouse/header.inc +++ b/data/maps/Route123_BerryMastersHouse/header.inc @@ -7,7 +7,7 @@ Route123_BerryMastersHouse:: @ 8307ED4 .2byte 60 .byte MAPSEC_ROUTE_123 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/Route124/header.inc b/data/maps/Route124/header.inc index ec5f01fa1..4e08e972b 100644 --- a/data/maps/Route124/header.inc +++ b/data/maps/Route124/header.inc @@ -7,7 +7,7 @@ Route124:: @ 830588C .2byte 40 .byte MAPSEC_ROUTE_124 .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 6 .2byte 0 .byte 1 diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/header.inc b/data/maps/Route124_DivingTreasureHuntersHouse/header.inc index 48c9a240b..474d3ec5d 100644 --- a/data/maps/Route124_DivingTreasureHuntersHouse/header.inc +++ b/data/maps/Route124_DivingTreasureHuntersHouse/header.inc @@ -7,7 +7,7 @@ Route124_DivingTreasureHuntersHouse:: @ 8307F44 .2byte 302 .byte MAPSEC_ROUTE_124 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/Route125/header.inc b/data/maps/Route125/header.inc index baadfc335..1fb334b25 100644 --- a/data/maps/Route125/header.inc +++ b/data/maps/Route125/header.inc @@ -7,7 +7,7 @@ Route125:: @ 83058A8 .2byte 41 .byte MAPSEC_ROUTE_125 .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 6 .2byte 0 .byte 1 diff --git a/data/maps/Route126/header.inc b/data/maps/Route126/header.inc index de5cd84ff..92fdbf714 100644 --- a/data/maps/Route126/header.inc +++ b/data/maps/Route126/header.inc @@ -7,7 +7,7 @@ Route126:: @ 83058C4 .2byte 42 .byte MAPSEC_ROUTE_126 .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 6 .2byte 0 .byte 1 diff --git a/data/maps/Route127/header.inc b/data/maps/Route127/header.inc index b29d15194..7d9cf6d0f 100644 --- a/data/maps/Route127/header.inc +++ b/data/maps/Route127/header.inc @@ -7,7 +7,7 @@ Route127:: @ 83058E0 .2byte 43 .byte MAPSEC_ROUTE_127 .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 6 .2byte 0 .byte 1 diff --git a/data/maps/Route128/header.inc b/data/maps/Route128/header.inc index 76abd4ac8..b0b4e1cee 100644 --- a/data/maps/Route128/header.inc +++ b/data/maps/Route128/header.inc @@ -7,7 +7,7 @@ Route128:: @ 83058FC .2byte 44 .byte MAPSEC_ROUTE_128 .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 6 .2byte 0 .byte 1 diff --git a/data/maps/Route129/header.inc b/data/maps/Route129/header.inc index 608152d59..a6f5bf6c7 100644 --- a/data/maps/Route129/header.inc +++ b/data/maps/Route129/header.inc @@ -7,7 +7,7 @@ Route129:: @ 8305918 .2byte 45 .byte MAPSEC_ROUTE_129 .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 6 .2byte 0 .byte 1 diff --git a/data/maps/Route130/header.inc b/data/maps/Route130/header.inc index c52b1a515..db1c520e8 100644 --- a/data/maps/Route130/header.inc +++ b/data/maps/Route130/header.inc @@ -7,7 +7,7 @@ Route130:: @ 8305934 .2byte 264 .byte MAPSEC_ROUTE_130 .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 6 .2byte 0 .byte 1 diff --git a/data/maps/Route131/header.inc b/data/maps/Route131/header.inc index fbda14a39..4e5a506f8 100644 --- a/data/maps/Route131/header.inc +++ b/data/maps/Route131/header.inc @@ -7,7 +7,7 @@ Route131:: @ 8305950 .2byte 47 .byte MAPSEC_ROUTE_131 .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 6 .2byte 0 .byte 1 diff --git a/data/maps/Route132/header.inc b/data/maps/Route132/header.inc index 591450ca8..5cd03df69 100644 --- a/data/maps/Route132/header.inc +++ b/data/maps/Route132/header.inc @@ -7,7 +7,7 @@ Route132:: @ 830596C .2byte 48 .byte MAPSEC_ROUTE_132 .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 6 .2byte 0 .byte 1 diff --git a/data/maps/Route133/header.inc b/data/maps/Route133/header.inc index 37673de99..5f96d2fcd 100644 --- a/data/maps/Route133/header.inc +++ b/data/maps/Route133/header.inc @@ -7,7 +7,7 @@ Route133:: @ 8305988 .2byte 49 .byte MAPSEC_ROUTE_133 .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 6 .2byte 0 .byte 1 diff --git a/data/maps/Route134/header.inc b/data/maps/Route134/header.inc index 7583194dc..69cfa8900 100644 --- a/data/maps/Route134/header.inc +++ b/data/maps/Route134/header.inc @@ -7,7 +7,7 @@ Route134:: @ 83059A4 .2byte 50 .byte MAPSEC_ROUTE_134 .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 6 .2byte 0 .byte 1 diff --git a/data/maps/RustboroCity/header.inc b/data/maps/RustboroCity/header.inc index 6bb3148f3..4e766abdc 100644 --- a/data/maps/RustboroCity/header.inc +++ b/data/maps/RustboroCity/header.inc @@ -7,7 +7,7 @@ RustboroCity:: @ 830549C .2byte 4 .byte MAPSEC_RUSTBORO_CITY .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 2 .2byte 0 .byte 1 diff --git a/data/maps/RustboroCity_CuttersHouse/header.inc b/data/maps/RustboroCity_CuttersHouse/header.inc index da7f7fc19..24f14733b 100644 --- a/data/maps/RustboroCity_CuttersHouse/header.inc +++ b/data/maps/RustboroCity_CuttersHouse/header.inc @@ -7,7 +7,7 @@ RustboroCity_CuttersHouse:: @ 8306360 .2byte 98 .byte MAPSEC_RUSTBORO_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/RustboroCity_DevonCorp_1F/header.inc b/data/maps/RustboroCity_DevonCorp_1F/header.inc index 50d4eb0a1..fe6db5565 100644 --- a/data/maps/RustboroCity_DevonCorp_1F/header.inc +++ b/data/maps/RustboroCity_DevonCorp_1F/header.inc @@ -7,7 +7,7 @@ RustboroCity_DevonCorp_1F:: @ 830622C .2byte 92 .byte MAPSEC_RUSTBORO_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/RustboroCity_DevonCorp_2F/header.inc b/data/maps/RustboroCity_DevonCorp_2F/header.inc index 3824d26af..65f4831a1 100644 --- a/data/maps/RustboroCity_DevonCorp_2F/header.inc +++ b/data/maps/RustboroCity_DevonCorp_2F/header.inc @@ -7,7 +7,7 @@ RustboroCity_DevonCorp_2F:: @ 8306248 .2byte 93 .byte MAPSEC_RUSTBORO_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/RustboroCity_DevonCorp_3F/header.inc b/data/maps/RustboroCity_DevonCorp_3F/header.inc index 5b9c9f610..06f287b0b 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/header.inc +++ b/data/maps/RustboroCity_DevonCorp_3F/header.inc @@ -7,7 +7,7 @@ RustboroCity_DevonCorp_3F:: @ 8306264 .2byte 270 .byte MAPSEC_RUSTBORO_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/RustboroCity_Flat1_1F/header.inc b/data/maps/RustboroCity_Flat1_1F/header.inc index c8651f6e4..db75752ef 100644 --- a/data/maps/RustboroCity_Flat1_1F/header.inc +++ b/data/maps/RustboroCity_Flat1_1F/header.inc @@ -7,7 +7,7 @@ RustboroCity_Flat1_1F:: @ 830630C .2byte 314 .byte MAPSEC_RUSTBORO_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/RustboroCity_Flat1_2F/header.inc b/data/maps/RustboroCity_Flat1_2F/header.inc index 623105877..6db4c4517 100644 --- a/data/maps/RustboroCity_Flat1_2F/header.inc +++ b/data/maps/RustboroCity_Flat1_2F/header.inc @@ -7,7 +7,7 @@ RustboroCity_Flat1_2F:: @ 8306328 .2byte 315 .byte MAPSEC_RUSTBORO_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/RustboroCity_Flat2_1F/header.inc b/data/maps/RustboroCity_Flat2_1F/header.inc index 7a3e8e6ed..98c12c63f 100644 --- a/data/maps/RustboroCity_Flat2_1F/header.inc +++ b/data/maps/RustboroCity_Flat2_1F/header.inc @@ -7,7 +7,7 @@ RustboroCity_Flat2_1F:: @ 8306398 .2byte 295 .byte MAPSEC_RUSTBORO_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/RustboroCity_Flat2_2F/header.inc b/data/maps/RustboroCity_Flat2_2F/header.inc index b3d46b826..8ada38a32 100644 --- a/data/maps/RustboroCity_Flat2_2F/header.inc +++ b/data/maps/RustboroCity_Flat2_2F/header.inc @@ -7,7 +7,7 @@ RustboroCity_Flat2_2F:: @ 83063B4 .2byte 296 .byte MAPSEC_RUSTBORO_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/RustboroCity_Flat2_3F/header.inc b/data/maps/RustboroCity_Flat2_3F/header.inc index 26340c97f..af691c218 100644 --- a/data/maps/RustboroCity_Flat2_3F/header.inc +++ b/data/maps/RustboroCity_Flat2_3F/header.inc @@ -7,7 +7,7 @@ RustboroCity_Flat2_3F:: @ 83063D0 .2byte 297 .byte MAPSEC_RUSTBORO_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/RustboroCity_Gym/header.inc b/data/maps/RustboroCity_Gym/header.inc index eff57079b..9b7d28c1f 100644 --- a/data/maps/RustboroCity_Gym/header.inc +++ b/data/maps/RustboroCity_Gym/header.inc @@ -7,7 +7,7 @@ RustboroCity_Gym:: @ 8306280 .2byte 94 .byte MAPSEC_RUSTBORO_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/RustboroCity_House1/header.inc b/data/maps/RustboroCity_House1/header.inc index d8186a144..b118dded3 100644 --- a/data/maps/RustboroCity_House1/header.inc +++ b/data/maps/RustboroCity_House1/header.inc @@ -7,7 +7,7 @@ RustboroCity_House1:: @ 8306344 .2byte 97 .byte MAPSEC_RUSTBORO_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/RustboroCity_House2/header.inc b/data/maps/RustboroCity_House2/header.inc index 51c2df96d..b78218af5 100644 --- a/data/maps/RustboroCity_House2/header.inc +++ b/data/maps/RustboroCity_House2/header.inc @@ -7,7 +7,7 @@ RustboroCity_House2:: @ 830637C .2byte 96 .byte MAPSEC_RUSTBORO_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/RustboroCity_House3/header.inc b/data/maps/RustboroCity_House3/header.inc index 3fe416c2e..8ad464628 100644 --- a/data/maps/RustboroCity_House3/header.inc +++ b/data/maps/RustboroCity_House3/header.inc @@ -7,7 +7,7 @@ RustboroCity_House3:: @ 83063EC .2byte 96 .byte MAPSEC_RUSTBORO_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/RustboroCity_Mart/header.inc b/data/maps/RustboroCity_Mart/header.inc index dc4e5fa95..e702ddeb4 100644 --- a/data/maps/RustboroCity_Mart/header.inc +++ b/data/maps/RustboroCity_Mart/header.inc @@ -7,7 +7,7 @@ RustboroCity_Mart:: @ 83062F0 .2byte 63 .byte MAPSEC_RUSTBORO_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/RustboroCity_PokemonCenter_1F/header.inc b/data/maps/RustboroCity_PokemonCenter_1F/header.inc index c6d157934..e2be65513 100644 --- a/data/maps/RustboroCity_PokemonCenter_1F/header.inc +++ b/data/maps/RustboroCity_PokemonCenter_1F/header.inc @@ -7,7 +7,7 @@ RustboroCity_PokemonCenter_1F:: @ 83062B8 .2byte 61 .byte MAPSEC_RUSTBORO_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/RustboroCity_PokemonCenter_2F/header.inc b/data/maps/RustboroCity_PokemonCenter_2F/header.inc index 519a795b3..7ec96a5f1 100644 --- a/data/maps/RustboroCity_PokemonCenter_2F/header.inc +++ b/data/maps/RustboroCity_PokemonCenter_2F/header.inc @@ -7,7 +7,7 @@ RustboroCity_PokemonCenter_2F:: @ 83062D4 .2byte 62 .byte MAPSEC_RUSTBORO_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/RustboroCity_PokemonSchool/header.inc b/data/maps/RustboroCity_PokemonSchool/header.inc index c2fcd9dcb..d561151f6 100644 --- a/data/maps/RustboroCity_PokemonSchool/header.inc +++ b/data/maps/RustboroCity_PokemonSchool/header.inc @@ -7,7 +7,7 @@ RustboroCity_PokemonSchool:: @ 830629C .2byte 95 .byte MAPSEC_RUSTBORO_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/RusturfTunnel/header.inc b/data/maps/RusturfTunnel/header.inc index 8ad0d2d1a..849bb8b26 100644 --- a/data/maps/RusturfTunnel/header.inc +++ b/data/maps/RusturfTunnel/header.inc @@ -7,7 +7,7 @@ RusturfTunnel:: @ 8306DE0 .2byte 130 .byte MAPSEC_RUSTURF_TUNNEL .byte 0 - .byte 6 + .byte WEATHER_FOG_1 .byte 4 .2byte 0 .byte 1 diff --git a/data/maps/SSTidalCorridor/header.inc b/data/maps/SSTidalCorridor/header.inc index ddb74ae22..e0f4a7272 100644 --- a/data/maps/SSTidalCorridor/header.inc +++ b/data/maps/SSTidalCorridor/header.inc @@ -7,7 +7,7 @@ SSTidalCorridor:: @ 8307B54 .2byte 278 .byte MAPSEC_DYNAMIC .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/SSTidalLowerDeck/header.inc b/data/maps/SSTidalLowerDeck/header.inc index dac40a5a8..9cb467b69 100644 --- a/data/maps/SSTidalLowerDeck/header.inc +++ b/data/maps/SSTidalLowerDeck/header.inc @@ -7,7 +7,7 @@ SSTidalLowerDeck:: @ 8307B70 .2byte 279 .byte MAPSEC_DYNAMIC .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/SSTidalRooms/header.inc b/data/maps/SSTidalRooms/header.inc index 837feae65..b109ebfdf 100644 --- a/data/maps/SSTidalRooms/header.inc +++ b/data/maps/SSTidalRooms/header.inc @@ -7,7 +7,7 @@ SSTidalRooms:: @ 8307B8C .2byte 280 .byte MAPSEC_DYNAMIC .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/SafariZone_Northeast/header.inc b/data/maps/SafariZone_Northeast/header.inc index 07e2a6b79..52f9ef066 100644 --- a/data/maps/SafariZone_Northeast/header.inc +++ b/data/maps/SafariZone_Northeast/header.inc @@ -7,7 +7,7 @@ SafariZone_Northeast:: @ 8307BC4 .2byte 240 .byte MAPSEC_SAFARI_ZONE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 3 .2byte 0 .byte 1 diff --git a/data/maps/SafariZone_Northwest/header.inc b/data/maps/SafariZone_Northwest/header.inc index 850d29f3b..c5237f87e 100644 --- a/data/maps/SafariZone_Northwest/header.inc +++ b/data/maps/SafariZone_Northwest/header.inc @@ -7,7 +7,7 @@ SafariZone_Northwest:: @ 8307BA8 .2byte 239 .byte MAPSEC_SAFARI_ZONE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 3 .2byte 0 .byte 1 diff --git a/data/maps/SafariZone_RestHouse/header.inc b/data/maps/SafariZone_RestHouse/header.inc index b6bc6ec1a..1bd2bdfe0 100644 --- a/data/maps/SafariZone_RestHouse/header.inc +++ b/data/maps/SafariZone_RestHouse/header.inc @@ -7,7 +7,7 @@ SafariZone_RestHouse:: @ 8307CDC .2byte 330 .byte MAPSEC_SAFARI_ZONE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/SafariZone_Southeast/header.inc b/data/maps/SafariZone_Southeast/header.inc index 41aa821c7..6d73c00a0 100644 --- a/data/maps/SafariZone_Southeast/header.inc +++ b/data/maps/SafariZone_Southeast/header.inc @@ -7,7 +7,7 @@ SafariZone_Southeast:: @ 8307BFC .2byte 242 .byte MAPSEC_SAFARI_ZONE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 3 .2byte 0 .byte 1 diff --git a/data/maps/SafariZone_Southwest/header.inc b/data/maps/SafariZone_Southwest/header.inc index 823c795b5..a1072acdd 100644 --- a/data/maps/SafariZone_Southwest/header.inc +++ b/data/maps/SafariZone_Southwest/header.inc @@ -7,7 +7,7 @@ SafariZone_Southwest:: @ 8307BE0 .2byte 241 .byte MAPSEC_SAFARI_ZONE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 3 .2byte 0 .byte 1 diff --git a/data/maps/ScorchedSlab/header.inc b/data/maps/ScorchedSlab/header.inc index 73a32b237..2ba712fb1 100644 --- a/data/maps/ScorchedSlab/header.inc +++ b/data/maps/ScorchedSlab/header.inc @@ -7,7 +7,7 @@ ScorchedSlab:: @ 830756C .2byte 312 .byte MAPSEC_SCORCHED_SLAB .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 1 diff --git a/data/maps/SeafloorCavern_Entrance/header.inc b/data/maps/SeafloorCavern_Entrance/header.inc index 17791949a..e87d6da67 100644 --- a/data/maps/SeafloorCavern_Entrance/header.inc +++ b/data/maps/SeafloorCavern_Entrance/header.inc @@ -7,7 +7,7 @@ SeafloorCavern_Entrance:: @ 8307064 .2byte 148 .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 1 diff --git a/data/maps/SeafloorCavern_Room1/header.inc b/data/maps/SeafloorCavern_Room1/header.inc index 0114d308c..6cb956807 100644 --- a/data/maps/SeafloorCavern_Room1/header.inc +++ b/data/maps/SeafloorCavern_Room1/header.inc @@ -7,7 +7,7 @@ SeafloorCavern_Room1:: @ 8307080 .2byte 149 .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 1 diff --git a/data/maps/SeafloorCavern_Room2/header.inc b/data/maps/SeafloorCavern_Room2/header.inc index bf7fd880b..b0091d99c 100644 --- a/data/maps/SeafloorCavern_Room2/header.inc +++ b/data/maps/SeafloorCavern_Room2/header.inc @@ -7,7 +7,7 @@ SeafloorCavern_Room2:: @ 830709C .2byte 150 .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 1 diff --git a/data/maps/SeafloorCavern_Room3/header.inc b/data/maps/SeafloorCavern_Room3/header.inc index 6cee15884..5bcbdc4b2 100644 --- a/data/maps/SeafloorCavern_Room3/header.inc +++ b/data/maps/SeafloorCavern_Room3/header.inc @@ -7,7 +7,7 @@ SeafloorCavern_Room3:: @ 83070B8 .2byte 151 .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 1 diff --git a/data/maps/SeafloorCavern_Room4/header.inc b/data/maps/SeafloorCavern_Room4/header.inc index f905e314a..113aad4cb 100644 --- a/data/maps/SeafloorCavern_Room4/header.inc +++ b/data/maps/SeafloorCavern_Room4/header.inc @@ -7,7 +7,7 @@ SeafloorCavern_Room4:: @ 83070D4 .2byte 152 .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 1 diff --git a/data/maps/SeafloorCavern_Room5/header.inc b/data/maps/SeafloorCavern_Room5/header.inc index 01aa3fa28..e65505a88 100644 --- a/data/maps/SeafloorCavern_Room5/header.inc +++ b/data/maps/SeafloorCavern_Room5/header.inc @@ -7,7 +7,7 @@ SeafloorCavern_Room5:: @ 83070F0 .2byte 153 .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 1 diff --git a/data/maps/SeafloorCavern_Room6/header.inc b/data/maps/SeafloorCavern_Room6/header.inc index f5b5834b4..3f6b78090 100644 --- a/data/maps/SeafloorCavern_Room6/header.inc +++ b/data/maps/SeafloorCavern_Room6/header.inc @@ -7,7 +7,7 @@ SeafloorCavern_Room6:: @ 830710C .2byte 154 .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 1 diff --git a/data/maps/SeafloorCavern_Room7/header.inc b/data/maps/SeafloorCavern_Room7/header.inc index db9b37207..e1c507457 100644 --- a/data/maps/SeafloorCavern_Room7/header.inc +++ b/data/maps/SeafloorCavern_Room7/header.inc @@ -7,7 +7,7 @@ SeafloorCavern_Room7:: @ 8307128 .2byte 155 .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 1 diff --git a/data/maps/SeafloorCavern_Room8/header.inc b/data/maps/SeafloorCavern_Room8/header.inc index eab61c222..5e777fdf9 100644 --- a/data/maps/SeafloorCavern_Room8/header.inc +++ b/data/maps/SeafloorCavern_Room8/header.inc @@ -7,7 +7,7 @@ SeafloorCavern_Room8:: @ 8307144 .2byte 156 .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 1 diff --git a/data/maps/SeafloorCavern_Room9/header.inc b/data/maps/SeafloorCavern_Room9/header.inc index dce89bbbc..8b723673a 100644 --- a/data/maps/SeafloorCavern_Room9/header.inc +++ b/data/maps/SeafloorCavern_Room9/header.inc @@ -7,7 +7,7 @@ SeafloorCavern_Room9:: @ 8307160 .2byte 157 .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 - .byte 6 + .byte WEATHER_FOG_1 .byte 4 .2byte 0 .byte 1 diff --git a/data/maps/SealedChamber_InnerRoom/header.inc b/data/maps/SealedChamber_InnerRoom/header.inc index 70bdac83d..540fdc24c 100644 --- a/data/maps/SealedChamber_InnerRoom/header.inc +++ b/data/maps/SealedChamber_InnerRoom/header.inc @@ -7,7 +7,7 @@ SealedChamber_InnerRoom:: @ 8307550 .2byte 305 .byte MAPSEC_SEALED_CHAMBER .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 1 diff --git a/data/maps/SealedChamber_OuterRoom/header.inc b/data/maps/SealedChamber_OuterRoom/header.inc index 52c512435..c7b0e4dd5 100644 --- a/data/maps/SealedChamber_OuterRoom/header.inc +++ b/data/maps/SealedChamber_OuterRoom/header.inc @@ -7,7 +7,7 @@ SealedChamber_OuterRoom:: @ 8307534 .2byte 285 .byte MAPSEC_SEALED_CHAMBER .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 1 diff --git a/data/maps/SecretBase_BlueCave1/header.inc b/data/maps/SecretBase_BlueCave1/header.inc index f6394943b..c37b41b1e 100644 --- a/data/maps/SecretBase_BlueCave1/header.inc +++ b/data/maps/SecretBase_BlueCave1/header.inc @@ -7,7 +7,7 @@ SecretBase_BlueCave1:: @ 8307710 .2byte 200 .byte MAPSEC_SECRET_BASE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 9 .2byte 0 .byte 1 diff --git a/data/maps/SecretBase_BlueCave2/header.inc b/data/maps/SecretBase_BlueCave2/header.inc index c9c12aaeb..759c16247 100644 --- a/data/maps/SecretBase_BlueCave2/header.inc +++ b/data/maps/SecretBase_BlueCave2/header.inc @@ -7,7 +7,7 @@ SecretBase_BlueCave2:: @ 83077B8 .2byte 206 .byte MAPSEC_SECRET_BASE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 9 .2byte 0 .byte 1 diff --git a/data/maps/SecretBase_BlueCave3/header.inc b/data/maps/SecretBase_BlueCave3/header.inc index b8595d2d2..1d6d65078 100644 --- a/data/maps/SecretBase_BlueCave3/header.inc +++ b/data/maps/SecretBase_BlueCave3/header.inc @@ -7,7 +7,7 @@ SecretBase_BlueCave3:: @ 8307860 .2byte 212 .byte MAPSEC_SECRET_BASE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 9 .2byte 0 .byte 1 diff --git a/data/maps/SecretBase_BlueCave4/header.inc b/data/maps/SecretBase_BlueCave4/header.inc index a14dc57db..0eae6d791 100644 --- a/data/maps/SecretBase_BlueCave4/header.inc +++ b/data/maps/SecretBase_BlueCave4/header.inc @@ -7,7 +7,7 @@ SecretBase_BlueCave4:: @ 8307908 .2byte 218 .byte MAPSEC_SECRET_BASE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 9 .2byte 0 .byte 1 diff --git a/data/maps/SecretBase_BrownCave1/header.inc b/data/maps/SecretBase_BrownCave1/header.inc index baf7cf883..2554d358e 100644 --- a/data/maps/SecretBase_BrownCave1/header.inc +++ b/data/maps/SecretBase_BrownCave1/header.inc @@ -7,7 +7,7 @@ SecretBase_BrownCave1:: @ 83076F4 .2byte 199 .byte MAPSEC_SECRET_BASE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 9 .2byte 0 .byte 1 diff --git a/data/maps/SecretBase_BrownCave2/header.inc b/data/maps/SecretBase_BrownCave2/header.inc index 7b1d7426e..070800a35 100644 --- a/data/maps/SecretBase_BrownCave2/header.inc +++ b/data/maps/SecretBase_BrownCave2/header.inc @@ -7,7 +7,7 @@ SecretBase_BrownCave2:: @ 830779C .2byte 205 .byte MAPSEC_SECRET_BASE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 9 .2byte 0 .byte 1 diff --git a/data/maps/SecretBase_BrownCave3/header.inc b/data/maps/SecretBase_BrownCave3/header.inc index 4fabbe72e..52d6b6520 100644 --- a/data/maps/SecretBase_BrownCave3/header.inc +++ b/data/maps/SecretBase_BrownCave3/header.inc @@ -7,7 +7,7 @@ SecretBase_BrownCave3:: @ 8307844 .2byte 211 .byte MAPSEC_SECRET_BASE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 9 .2byte 0 .byte 1 diff --git a/data/maps/SecretBase_BrownCave4/header.inc b/data/maps/SecretBase_BrownCave4/header.inc index 84bddecc5..c8687802e 100644 --- a/data/maps/SecretBase_BrownCave4/header.inc +++ b/data/maps/SecretBase_BrownCave4/header.inc @@ -7,7 +7,7 @@ SecretBase_BrownCave4:: @ 83078EC .2byte 217 .byte MAPSEC_SECRET_BASE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 9 .2byte 0 .byte 1 diff --git a/data/maps/SecretBase_RedCave1/header.inc b/data/maps/SecretBase_RedCave1/header.inc index 556c9f570..e3a8d5435 100644 --- a/data/maps/SecretBase_RedCave1/header.inc +++ b/data/maps/SecretBase_RedCave1/header.inc @@ -7,7 +7,7 @@ SecretBase_RedCave1:: @ 83076D8 .2byte 198 .byte MAPSEC_SECRET_BASE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 9 .2byte 0 .byte 1 diff --git a/data/maps/SecretBase_RedCave2/header.inc b/data/maps/SecretBase_RedCave2/header.inc index 9a2cc0779..9d4ae63b3 100644 --- a/data/maps/SecretBase_RedCave2/header.inc +++ b/data/maps/SecretBase_RedCave2/header.inc @@ -7,7 +7,7 @@ SecretBase_RedCave2:: @ 8307780 .2byte 204 .byte MAPSEC_SECRET_BASE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 9 .2byte 0 .byte 1 diff --git a/data/maps/SecretBase_RedCave3/header.inc b/data/maps/SecretBase_RedCave3/header.inc index 9f35ae51f..035210198 100644 --- a/data/maps/SecretBase_RedCave3/header.inc +++ b/data/maps/SecretBase_RedCave3/header.inc @@ -7,7 +7,7 @@ SecretBase_RedCave3:: @ 8307828 .2byte 210 .byte MAPSEC_SECRET_BASE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 9 .2byte 0 .byte 1 diff --git a/data/maps/SecretBase_RedCave4/header.inc b/data/maps/SecretBase_RedCave4/header.inc index fa8fd1873..dbf6961b7 100644 --- a/data/maps/SecretBase_RedCave4/header.inc +++ b/data/maps/SecretBase_RedCave4/header.inc @@ -7,7 +7,7 @@ SecretBase_RedCave4:: @ 83078D0 .2byte 216 .byte MAPSEC_SECRET_BASE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 9 .2byte 0 .byte 1 diff --git a/data/maps/SecretBase_Shrub1/header.inc b/data/maps/SecretBase_Shrub1/header.inc index c533388d6..a06331e0c 100644 --- a/data/maps/SecretBase_Shrub1/header.inc +++ b/data/maps/SecretBase_Shrub1/header.inc @@ -7,7 +7,7 @@ SecretBase_Shrub1:: @ 8307764 .2byte 203 .byte MAPSEC_SECRET_BASE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 9 .2byte 0 .byte 1 diff --git a/data/maps/SecretBase_Shrub2/header.inc b/data/maps/SecretBase_Shrub2/header.inc index 1eabc4746..d3acc11aa 100644 --- a/data/maps/SecretBase_Shrub2/header.inc +++ b/data/maps/SecretBase_Shrub2/header.inc @@ -7,7 +7,7 @@ SecretBase_Shrub2:: @ 830780C .2byte 209 .byte MAPSEC_SECRET_BASE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 9 .2byte 0 .byte 1 diff --git a/data/maps/SecretBase_Shrub3/header.inc b/data/maps/SecretBase_Shrub3/header.inc index 28f64c790..7b5a24771 100644 --- a/data/maps/SecretBase_Shrub3/header.inc +++ b/data/maps/SecretBase_Shrub3/header.inc @@ -7,7 +7,7 @@ SecretBase_Shrub3:: @ 83078B4 .2byte 215 .byte MAPSEC_SECRET_BASE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 9 .2byte 0 .byte 1 diff --git a/data/maps/SecretBase_Shrub4/header.inc b/data/maps/SecretBase_Shrub4/header.inc index 1cd544da9..5555137bc 100644 --- a/data/maps/SecretBase_Shrub4/header.inc +++ b/data/maps/SecretBase_Shrub4/header.inc @@ -7,7 +7,7 @@ SecretBase_Shrub4:: @ 830795C .2byte 221 .byte MAPSEC_SECRET_BASE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 9 .2byte 0 .byte 1 diff --git a/data/maps/SecretBase_Tree1/header.inc b/data/maps/SecretBase_Tree1/header.inc index 05d689a97..a39b150cd 100644 --- a/data/maps/SecretBase_Tree1/header.inc +++ b/data/maps/SecretBase_Tree1/header.inc @@ -7,7 +7,7 @@ SecretBase_Tree1:: @ 8307748 .2byte 202 .byte MAPSEC_SECRET_BASE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 9 .2byte 0 .byte 1 diff --git a/data/maps/SecretBase_Tree2/header.inc b/data/maps/SecretBase_Tree2/header.inc index 302beabbc..0ac8aa572 100644 --- a/data/maps/SecretBase_Tree2/header.inc +++ b/data/maps/SecretBase_Tree2/header.inc @@ -7,7 +7,7 @@ SecretBase_Tree2:: @ 83077F0 .2byte 208 .byte MAPSEC_SECRET_BASE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 9 .2byte 0 .byte 1 diff --git a/data/maps/SecretBase_Tree3/header.inc b/data/maps/SecretBase_Tree3/header.inc index 0064346c7..378aefaa8 100644 --- a/data/maps/SecretBase_Tree3/header.inc +++ b/data/maps/SecretBase_Tree3/header.inc @@ -7,7 +7,7 @@ SecretBase_Tree3:: @ 8307898 .2byte 214 .byte MAPSEC_SECRET_BASE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 9 .2byte 0 .byte 1 diff --git a/data/maps/SecretBase_Tree4/header.inc b/data/maps/SecretBase_Tree4/header.inc index 802125e65..58c7b3ce7 100644 --- a/data/maps/SecretBase_Tree4/header.inc +++ b/data/maps/SecretBase_Tree4/header.inc @@ -7,7 +7,7 @@ SecretBase_Tree4:: @ 8307940 .2byte 220 .byte MAPSEC_SECRET_BASE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 9 .2byte 0 .byte 1 diff --git a/data/maps/SecretBase_YellowCave1/header.inc b/data/maps/SecretBase_YellowCave1/header.inc index 3d56690c5..788638a91 100644 --- a/data/maps/SecretBase_YellowCave1/header.inc +++ b/data/maps/SecretBase_YellowCave1/header.inc @@ -7,7 +7,7 @@ SecretBase_YellowCave1:: @ 830772C .2byte 201 .byte MAPSEC_SECRET_BASE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 9 .2byte 0 .byte 1 diff --git a/data/maps/SecretBase_YellowCave2/header.inc b/data/maps/SecretBase_YellowCave2/header.inc index 62a4c15b3..4c62fade3 100644 --- a/data/maps/SecretBase_YellowCave2/header.inc +++ b/data/maps/SecretBase_YellowCave2/header.inc @@ -7,7 +7,7 @@ SecretBase_YellowCave2:: @ 83077D4 .2byte 207 .byte MAPSEC_SECRET_BASE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 9 .2byte 0 .byte 1 diff --git a/data/maps/SecretBase_YellowCave3/header.inc b/data/maps/SecretBase_YellowCave3/header.inc index 64b67fa80..2d0c8fa9d 100644 --- a/data/maps/SecretBase_YellowCave3/header.inc +++ b/data/maps/SecretBase_YellowCave3/header.inc @@ -7,7 +7,7 @@ SecretBase_YellowCave3:: @ 830787C .2byte 213 .byte MAPSEC_SECRET_BASE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 9 .2byte 0 .byte 1 diff --git a/data/maps/SecretBase_YellowCave4/header.inc b/data/maps/SecretBase_YellowCave4/header.inc index 31e96a7a4..7f5af843f 100644 --- a/data/maps/SecretBase_YellowCave4/header.inc +++ b/data/maps/SecretBase_YellowCave4/header.inc @@ -7,7 +7,7 @@ SecretBase_YellowCave4:: @ 8307924 .2byte 219 .byte MAPSEC_SECRET_BASE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 9 .2byte 0 .byte 1 diff --git a/data/maps/ShoalCave_HighTideEntranceRoom/header.inc b/data/maps/ShoalCave_HighTideEntranceRoom/header.inc index c835cf25b..6b8f0637d 100644 --- a/data/maps/ShoalCave_HighTideEntranceRoom/header.inc +++ b/data/maps/ShoalCave_HighTideEntranceRoom/header.inc @@ -7,7 +7,7 @@ ShoalCave_HighTideEntranceRoom:: @ 83072E8 .2byte 169 .byte MAPSEC_SHOAL_CAVE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 1 diff --git a/data/maps/ShoalCave_HighTideInnerRoom/header.inc b/data/maps/ShoalCave_HighTideInnerRoom/header.inc index 19f7c3a5c..7fdb587c9 100644 --- a/data/maps/ShoalCave_HighTideInnerRoom/header.inc +++ b/data/maps/ShoalCave_HighTideInnerRoom/header.inc @@ -7,7 +7,7 @@ ShoalCave_HighTideInnerRoom:: @ 8307304 .2byte 170 .byte MAPSEC_SHOAL_CAVE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 1 diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/header.inc b/data/maps/ShoalCave_LowTideEntranceRoom/header.inc index 81e4ac4c9..ced8bb210 100644 --- a/data/maps/ShoalCave_LowTideEntranceRoom/header.inc +++ b/data/maps/ShoalCave_LowTideEntranceRoom/header.inc @@ -7,7 +7,7 @@ ShoalCave_LowTideEntranceRoom:: @ 8307278 .2byte 165 .byte MAPSEC_SHOAL_CAVE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 1 diff --git a/data/maps/ShoalCave_LowTideIceRoom/header.inc b/data/maps/ShoalCave_LowTideIceRoom/header.inc index 3a2b4d823..7d7189c2b 100644 --- a/data/maps/ShoalCave_LowTideIceRoom/header.inc +++ b/data/maps/ShoalCave_LowTideIceRoom/header.inc @@ -7,7 +7,7 @@ ShoalCave_LowTideIceRoom:: @ 8307684 .2byte 329 .byte MAPSEC_SHOAL_CAVE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 1 diff --git a/data/maps/ShoalCave_LowTideInnerRoom/header.inc b/data/maps/ShoalCave_LowTideInnerRoom/header.inc index 5f519df30..2b837b8f9 100644 --- a/data/maps/ShoalCave_LowTideInnerRoom/header.inc +++ b/data/maps/ShoalCave_LowTideInnerRoom/header.inc @@ -7,7 +7,7 @@ ShoalCave_LowTideInnerRoom:: @ 8307294 .2byte 166 .byte MAPSEC_SHOAL_CAVE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 1 diff --git a/data/maps/ShoalCave_LowTideLowerRoom/header.inc b/data/maps/ShoalCave_LowTideLowerRoom/header.inc index b2c727d43..8e10fd6a6 100644 --- a/data/maps/ShoalCave_LowTideLowerRoom/header.inc +++ b/data/maps/ShoalCave_LowTideLowerRoom/header.inc @@ -7,7 +7,7 @@ ShoalCave_LowTideLowerRoom:: @ 83072CC .2byte 168 .byte MAPSEC_SHOAL_CAVE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 1 diff --git a/data/maps/ShoalCave_LowTideStairsRoom/header.inc b/data/maps/ShoalCave_LowTideStairsRoom/header.inc index bf0cb0e99..c757f8a36 100644 --- a/data/maps/ShoalCave_LowTideStairsRoom/header.inc +++ b/data/maps/ShoalCave_LowTideStairsRoom/header.inc @@ -7,7 +7,7 @@ ShoalCave_LowTideStairsRoom:: @ 83072B0 .2byte 167 .byte MAPSEC_SHOAL_CAVE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 1 diff --git a/data/maps/SingleBattleColosseum/header.inc b/data/maps/SingleBattleColosseum/header.inc index 66aec206f..a6b7f487b 100644 --- a/data/maps/SingleBattleColosseum/header.inc +++ b/data/maps/SingleBattleColosseum/header.inc @@ -7,7 +7,7 @@ SingleBattleColosseum:: @ 8307978 .2byte 222 .byte MAPSEC_DYNAMIC .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/SkyPillar_1F/header.inc b/data/maps/SkyPillar_1F/header.inc index 2df988714..d37645b47 100644 --- a/data/maps/SkyPillar_1F/header.inc +++ b/data/maps/SkyPillar_1F/header.inc @@ -7,7 +7,7 @@ SkyPillar_1F:: @ 8307614 .2byte 323 .byte MAPSEC_SKY_PILLAR .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 1 diff --git a/data/maps/SkyPillar_2F/header.inc b/data/maps/SkyPillar_2F/header.inc index 934d1b34b..f3b6c4c66 100644 --- a/data/maps/SkyPillar_2F/header.inc +++ b/data/maps/SkyPillar_2F/header.inc @@ -7,7 +7,7 @@ SkyPillar_2F:: @ 8307630 .2byte 324 .byte MAPSEC_SKY_PILLAR .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 1 diff --git a/data/maps/SkyPillar_3F/header.inc b/data/maps/SkyPillar_3F/header.inc index 5dc93b962..cfb84b3a4 100644 --- a/data/maps/SkyPillar_3F/header.inc +++ b/data/maps/SkyPillar_3F/header.inc @@ -7,7 +7,7 @@ SkyPillar_3F:: @ 830764C .2byte 325 .byte MAPSEC_SKY_PILLAR .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 1 diff --git a/data/maps/SkyPillar_4F/header.inc b/data/maps/SkyPillar_4F/header.inc index bfbaa0ff6..b35218337 100644 --- a/data/maps/SkyPillar_4F/header.inc +++ b/data/maps/SkyPillar_4F/header.inc @@ -7,7 +7,7 @@ SkyPillar_4F:: @ 8307668 .2byte 326 .byte MAPSEC_SKY_PILLAR .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 1 diff --git a/data/maps/SkyPillar_5F/header.inc b/data/maps/SkyPillar_5F/header.inc index 3f31f0dbf..1582e7d1f 100644 --- a/data/maps/SkyPillar_5F/header.inc +++ b/data/maps/SkyPillar_5F/header.inc @@ -7,7 +7,7 @@ SkyPillar_5F:: @ 83076A0 .2byte 331 .byte MAPSEC_SKY_PILLAR .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 1 diff --git a/data/maps/SkyPillar_Entrance/header.inc b/data/maps/SkyPillar_Entrance/header.inc index 144431800..75e7f3c3b 100644 --- a/data/maps/SkyPillar_Entrance/header.inc +++ b/data/maps/SkyPillar_Entrance/header.inc @@ -7,7 +7,7 @@ SkyPillar_Entrance:: @ 83075DC .2byte 321 .byte MAPSEC_SKY_PILLAR .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 1 diff --git a/data/maps/SkyPillar_Outside/header.inc b/data/maps/SkyPillar_Outside/header.inc index 02812eca8..8af620469 100644 --- a/data/maps/SkyPillar_Outside/header.inc +++ b/data/maps/SkyPillar_Outside/header.inc @@ -7,7 +7,7 @@ SkyPillar_Outside:: @ 83075F8 .2byte 322 .byte MAPSEC_SKY_PILLAR .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 3 .2byte 0 .byte 1 diff --git a/data/maps/SkyPillar_Top/header.inc b/data/maps/SkyPillar_Top/header.inc index 106b3284e..1cc0877b3 100644 --- a/data/maps/SkyPillar_Top/header.inc +++ b/data/maps/SkyPillar_Top/header.inc @@ -7,7 +7,7 @@ SkyPillar_Top:: @ 83076BC .2byte 332 .byte MAPSEC_SKY_PILLAR .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 3 .2byte 0 .byte 1 diff --git a/data/maps/SlateportCity/header.inc b/data/maps/SlateportCity/header.inc index 07a0ee53b..c9ba2d7ae 100644 --- a/data/maps/SlateportCity/header.inc +++ b/data/maps/SlateportCity/header.inc @@ -7,7 +7,7 @@ SlateportCity:: @ 8305464 .2byte 2 .byte MAPSEC_SLATEPORT_CITY .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 2 .2byte 0 .byte 1 diff --git a/data/maps/SlateportCity_ContestHall/header.inc b/data/maps/SlateportCity_ContestHall/header.inc index 2e17d0f9c..19e3b3209 100644 --- a/data/maps/SlateportCity_ContestHall/header.inc +++ b/data/maps/SlateportCity_ContestHall/header.inc @@ -7,7 +7,7 @@ SlateportCity_ContestHall:: @ 8306034 .2byte 73 .byte MAPSEC_SLATEPORT_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/SlateportCity_ContestLobby/header.inc b/data/maps/SlateportCity_ContestLobby/header.inc index a040be082..3aad36973 100644 --- a/data/maps/SlateportCity_ContestLobby/header.inc +++ b/data/maps/SlateportCity_ContestLobby/header.inc @@ -7,7 +7,7 @@ SlateportCity_ContestLobby:: @ 8306018 .2byte 72 .byte MAPSEC_SLATEPORT_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/SlateportCity_Harbor/header.inc b/data/maps/SlateportCity_Harbor/header.inc index 05c2ef2c8..029761fa9 100644 --- a/data/maps/SlateportCity_Harbor/header.inc +++ b/data/maps/SlateportCity_Harbor/header.inc @@ -7,7 +7,7 @@ SlateportCity_Harbor:: @ 83060C0 .2byte 88 .byte MAPSEC_SLATEPORT_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/SlateportCity_House1/header.inc b/data/maps/SlateportCity_House1/header.inc index 04f67d4bb..a78f96ed2 100644 --- a/data/maps/SlateportCity_House1/header.inc +++ b/data/maps/SlateportCity_House1/header.inc @@ -7,7 +7,7 @@ SlateportCity_House1:: @ 8306050 .2byte 80 .byte MAPSEC_SLATEPORT_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/SlateportCity_House2/header.inc b/data/maps/SlateportCity_House2/header.inc index 191ff10fb..e56231708 100644 --- a/data/maps/SlateportCity_House2/header.inc +++ b/data/maps/SlateportCity_House2/header.inc @@ -7,7 +7,7 @@ SlateportCity_House2:: @ 83060DC .2byte 60 .byte MAPSEC_SLATEPORT_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/SlateportCity_Mart/header.inc b/data/maps/SlateportCity_Mart/header.inc index ee7297450..fe58052f5 100644 --- a/data/maps/SlateportCity_Mart/header.inc +++ b/data/maps/SlateportCity_Mart/header.inc @@ -7,7 +7,7 @@ SlateportCity_Mart:: @ 8306130 .2byte 63 .byte MAPSEC_SLATEPORT_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/header.inc b/data/maps/SlateportCity_OceanicMuseum_1F/header.inc index 6374023f6..bcd9e3dcd 100644 --- a/data/maps/SlateportCity_OceanicMuseum_1F/header.inc +++ b/data/maps/SlateportCity_OceanicMuseum_1F/header.inc @@ -7,7 +7,7 @@ SlateportCity_OceanicMuseum_1F:: @ 8306088 .2byte 86 .byte MAPSEC_SLATEPORT_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/header.inc b/data/maps/SlateportCity_OceanicMuseum_2F/header.inc index 2e0446fb2..ddd200725 100644 --- a/data/maps/SlateportCity_OceanicMuseum_2F/header.inc +++ b/data/maps/SlateportCity_OceanicMuseum_2F/header.inc @@ -7,7 +7,7 @@ SlateportCity_OceanicMuseum_2F:: @ 83060A4 .2byte 87 .byte MAPSEC_SLATEPORT_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/SlateportCity_PokemonCenter_1F/header.inc b/data/maps/SlateportCity_PokemonCenter_1F/header.inc index cb52dece1..8061b9468 100644 --- a/data/maps/SlateportCity_PokemonCenter_1F/header.inc +++ b/data/maps/SlateportCity_PokemonCenter_1F/header.inc @@ -7,7 +7,7 @@ SlateportCity_PokemonCenter_1F:: @ 83060F8 .2byte 61 .byte MAPSEC_SLATEPORT_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/SlateportCity_PokemonCenter_2F/header.inc b/data/maps/SlateportCity_PokemonCenter_2F/header.inc index 6129dda83..b04bf1901 100644 --- a/data/maps/SlateportCity_PokemonCenter_2F/header.inc +++ b/data/maps/SlateportCity_PokemonCenter_2F/header.inc @@ -7,7 +7,7 @@ SlateportCity_PokemonCenter_2F:: @ 8306114 .2byte 62 .byte MAPSEC_SLATEPORT_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/SlateportCity_PokemonFanClub/header.inc b/data/maps/SlateportCity_PokemonFanClub/header.inc index 2a48b1895..af654837f 100644 --- a/data/maps/SlateportCity_PokemonFanClub/header.inc +++ b/data/maps/SlateportCity_PokemonFanClub/header.inc @@ -7,7 +7,7 @@ SlateportCity_PokemonFanClub:: @ 830606C .2byte 85 .byte MAPSEC_SLATEPORT_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/SlateportCity_SternsShipyard_1F/header.inc b/data/maps/SlateportCity_SternsShipyard_1F/header.inc index 76b3f037f..89e348681 100644 --- a/data/maps/SlateportCity_SternsShipyard_1F/header.inc +++ b/data/maps/SlateportCity_SternsShipyard_1F/header.inc @@ -7,7 +7,7 @@ SlateportCity_SternsShipyard_1F:: @ 8305FE0 .2byte 81 .byte MAPSEC_SLATEPORT_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/SlateportCity_SternsShipyard_2F/header.inc b/data/maps/SlateportCity_SternsShipyard_2F/header.inc index 56f613dcf..b3f381a45 100644 --- a/data/maps/SlateportCity_SternsShipyard_2F/header.inc +++ b/data/maps/SlateportCity_SternsShipyard_2F/header.inc @@ -7,7 +7,7 @@ SlateportCity_SternsShipyard_2F:: @ 8305FFC .2byte 82 .byte MAPSEC_SLATEPORT_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/SootopolisCity/header.inc b/data/maps/SootopolisCity/header.inc index 9c169ab6d..b42a46ef6 100644 --- a/data/maps/SootopolisCity/header.inc +++ b/data/maps/SootopolisCity/header.inc @@ -7,7 +7,7 @@ SootopolisCity:: @ 830550C .2byte 8 .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 2 .2byte 0 .byte 1 diff --git a/data/maps/SootopolisCity_Gym_1F/header.inc b/data/maps/SootopolisCity_Gym_1F/header.inc index 1e1e16868..fd5e53dbd 100644 --- a/data/maps/SootopolisCity_Gym_1F/header.inc +++ b/data/maps/SootopolisCity_Gym_1F/header.inc @@ -7,7 +7,7 @@ SootopolisCity_Gym_1F:: @ 830692C .2byte 110 .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/SootopolisCity_Gym_B1F/header.inc b/data/maps/SootopolisCity_Gym_B1F/header.inc index c9745ae62..2a5c973c5 100644 --- a/data/maps/SootopolisCity_Gym_B1F/header.inc +++ b/data/maps/SootopolisCity_Gym_B1F/header.inc @@ -7,7 +7,7 @@ SootopolisCity_Gym_B1F:: @ 8306948 .2byte 111 .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/SootopolisCity_House1/header.inc b/data/maps/SootopolisCity_House1/header.inc index 612e3f71e..f12f6368b 100644 --- a/data/maps/SootopolisCity_House1/header.inc +++ b/data/maps/SootopolisCity_House1/header.inc @@ -7,7 +7,7 @@ SootopolisCity_House1:: @ 83069B8 .2byte 308 .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/SootopolisCity_House2/header.inc b/data/maps/SootopolisCity_House2/header.inc index 63fb280c6..c6137c048 100644 --- a/data/maps/SootopolisCity_House2/header.inc +++ b/data/maps/SootopolisCity_House2/header.inc @@ -7,7 +7,7 @@ SootopolisCity_House2:: @ 83069D4 .2byte 309 .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/SootopolisCity_House3/header.inc b/data/maps/SootopolisCity_House3/header.inc index b59e13c13..1ba3a435a 100644 --- a/data/maps/SootopolisCity_House3/header.inc +++ b/data/maps/SootopolisCity_House3/header.inc @@ -7,7 +7,7 @@ SootopolisCity_House3:: @ 83069F0 .2byte 310 .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/SootopolisCity_House4/header.inc b/data/maps/SootopolisCity_House4/header.inc index f6fe5781e..fee4fc065 100644 --- a/data/maps/SootopolisCity_House4/header.inc +++ b/data/maps/SootopolisCity_House4/header.inc @@ -7,7 +7,7 @@ SootopolisCity_House4:: @ 8306A0C .2byte 308 .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/SootopolisCity_House5/header.inc b/data/maps/SootopolisCity_House5/header.inc index 0b3f89d67..10732a09f 100644 --- a/data/maps/SootopolisCity_House5/header.inc +++ b/data/maps/SootopolisCity_House5/header.inc @@ -7,7 +7,7 @@ SootopolisCity_House5:: @ 8306A28 .2byte 309 .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/SootopolisCity_House6/header.inc b/data/maps/SootopolisCity_House6/header.inc index 34df34e66..7a22cb836 100644 --- a/data/maps/SootopolisCity_House6/header.inc +++ b/data/maps/SootopolisCity_House6/header.inc @@ -7,7 +7,7 @@ SootopolisCity_House6:: @ 8306A44 .2byte 310 .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/SootopolisCity_House7/header.inc b/data/maps/SootopolisCity_House7/header.inc index 26501506c..b833f255a 100644 --- a/data/maps/SootopolisCity_House7/header.inc +++ b/data/maps/SootopolisCity_House7/header.inc @@ -7,7 +7,7 @@ SootopolisCity_House7:: @ 8306A60 .2byte 308 .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/SootopolisCity_House8/header.inc b/data/maps/SootopolisCity_House8/header.inc index c9710a4b5..20564785d 100644 --- a/data/maps/SootopolisCity_House8/header.inc +++ b/data/maps/SootopolisCity_House8/header.inc @@ -7,7 +7,7 @@ SootopolisCity_House8:: @ 8306A7C .2byte 298 .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/SootopolisCity_Mart/header.inc b/data/maps/SootopolisCity_Mart/header.inc index 2f40d838e..09af97233 100644 --- a/data/maps/SootopolisCity_Mart/header.inc +++ b/data/maps/SootopolisCity_Mart/header.inc @@ -7,7 +7,7 @@ SootopolisCity_Mart:: @ 830699C .2byte 63 .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/SootopolisCity_PokemonCenter_1F/header.inc b/data/maps/SootopolisCity_PokemonCenter_1F/header.inc index e73cff2cc..b93aa58b2 100644 --- a/data/maps/SootopolisCity_PokemonCenter_1F/header.inc +++ b/data/maps/SootopolisCity_PokemonCenter_1F/header.inc @@ -7,7 +7,7 @@ SootopolisCity_PokemonCenter_1F:: @ 8306964 .2byte 61 .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/SootopolisCity_PokemonCenter_2F/header.inc b/data/maps/SootopolisCity_PokemonCenter_2F/header.inc index bffe4d8fc..743d08d4b 100644 --- a/data/maps/SootopolisCity_PokemonCenter_2F/header.inc +++ b/data/maps/SootopolisCity_PokemonCenter_2F/header.inc @@ -7,7 +7,7 @@ SootopolisCity_PokemonCenter_2F:: @ 8306980 .2byte 62 .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/SouthernIsland_Exterior/header.inc b/data/maps/SouthernIsland_Exterior/header.inc index 9552a0238..160722472 100644 --- a/data/maps/SouthernIsland_Exterior/header.inc +++ b/data/maps/SouthernIsland_Exterior/header.inc @@ -7,7 +7,7 @@ SouthernIsland_Exterior:: @ 8307CA4 .2byte 291 .byte MAPSEC_SOUTHERN_ISLAND .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 3 .2byte 0 .byte 1 diff --git a/data/maps/SouthernIsland_Interior/header.inc b/data/maps/SouthernIsland_Interior/header.inc index 83a5d4deb..61a3461d6 100644 --- a/data/maps/SouthernIsland_Interior/header.inc +++ b/data/maps/SouthernIsland_Interior/header.inc @@ -7,7 +7,7 @@ SouthernIsland_Interior:: @ 8307CC0 .2byte 292 .byte MAPSEC_SOUTHERN_ISLAND .byte 0 - .byte 11 + .byte WEATHER_SHADE .byte 3 .2byte 0 .byte 1 diff --git a/data/maps/TradeCenter/header.inc b/data/maps/TradeCenter/header.inc index 9a8ed09ca..8d6b70be7 100644 --- a/data/maps/TradeCenter/header.inc +++ b/data/maps/TradeCenter/header.inc @@ -7,7 +7,7 @@ TradeCenter:: @ 8307994 .2byte 223 .byte MAPSEC_DYNAMIC .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/Underwater1/header.inc b/data/maps/Underwater1/header.inc index e932d4d8e..8335e0505 100644 --- a/data/maps/Underwater1/header.inc +++ b/data/maps/Underwater1/header.inc @@ -7,7 +7,7 @@ Underwater1:: @ 83059C0 .2byte 275 .byte MAPSEC_UNDERWATER_124 .byte 0 - .byte 14 + .byte WEATHER_BUBBLES .byte 5 .2byte 0 .byte 1 diff --git a/data/maps/Underwater2/header.inc b/data/maps/Underwater2/header.inc index e8da93769..0eed7b084 100644 --- a/data/maps/Underwater2/header.inc +++ b/data/maps/Underwater2/header.inc @@ -7,7 +7,7 @@ Underwater2:: @ 83059DC .2byte 51 .byte MAPSEC_UNDERWATER_125 .byte 0 - .byte 14 + .byte WEATHER_BUBBLES .byte 5 .2byte 0 .byte 1 diff --git a/data/maps/Underwater3/header.inc b/data/maps/Underwater3/header.inc index ade3cc87d..7e800027e 100644 --- a/data/maps/Underwater3/header.inc +++ b/data/maps/Underwater3/header.inc @@ -7,7 +7,7 @@ Underwater3:: @ 83059F8 .2byte 52 .byte MAPSEC_UNDERWATER_126 .byte 0 - .byte 14 + .byte WEATHER_BUBBLES .byte 5 .2byte 0 .byte 1 diff --git a/data/maps/Underwater4/header.inc b/data/maps/Underwater4/header.inc index eaec11402..bba0b83ae 100644 --- a/data/maps/Underwater4/header.inc +++ b/data/maps/Underwater4/header.inc @@ -7,7 +7,7 @@ Underwater4:: @ 8305A14 .2byte 53 .byte MAPSEC_UNDERWATER_127 .byte 0 - .byte 14 + .byte WEATHER_BUBBLES .byte 5 .2byte 0 .byte 1 diff --git a/data/maps/Underwater_Route134/header.inc b/data/maps/Underwater_Route134/header.inc index 7a80a7562..b88d2bd4d 100644 --- a/data/maps/Underwater_Route134/header.inc +++ b/data/maps/Underwater_Route134/header.inc @@ -7,7 +7,7 @@ Underwater_Route134:: @ 83074FC .2byte 283 .byte MAPSEC_UNDERWATER_SEALED_CHAMBER .byte 0 - .byte 14 + .byte WEATHER_BUBBLES .byte 5 .2byte 0 .byte 1 diff --git a/data/maps/Underwater_SeafloorCavern/header.inc b/data/maps/Underwater_SeafloorCavern/header.inc index 08dbac56e..c11dd164a 100644 --- a/data/maps/Underwater_SeafloorCavern/header.inc +++ b/data/maps/Underwater_SeafloorCavern/header.inc @@ -7,7 +7,7 @@ Underwater_SeafloorCavern:: @ 8307048 .2byte 147 .byte MAPSEC_UNDERWATER_128 .byte 0 - .byte 14 + .byte WEATHER_BUBBLES .byte 5 .2byte 0 .byte 1 diff --git a/data/maps/Underwater_SealedChamber/header.inc b/data/maps/Underwater_SealedChamber/header.inc index dcdf4e82f..19b01fdc7 100644 --- a/data/maps/Underwater_SealedChamber/header.inc +++ b/data/maps/Underwater_SealedChamber/header.inc @@ -7,7 +7,7 @@ Underwater_SealedChamber:: @ 8307518 .2byte 284 .byte MAPSEC_UNDERWATER_SEALED_CHAMBER .byte 0 - .byte 14 + .byte WEATHER_BUBBLES .byte 5 .2byte 0 .byte 1 diff --git a/data/maps/Underwater_SootopolisCity/header.inc b/data/maps/Underwater_SootopolisCity/header.inc index 9c42e65e9..866b45a1f 100644 --- a/data/maps/Underwater_SootopolisCity/header.inc +++ b/data/maps/Underwater_SootopolisCity/header.inc @@ -7,7 +7,7 @@ Underwater_SootopolisCity:: @ 8306DFC .2byte 131 .byte MAPSEC_UNDERWATER_SOOTOPOLIS .byte 0 - .byte 14 + .byte WEATHER_BUBBLES .byte 5 .2byte 0 .byte 1 diff --git a/data/maps/UnknownMap_25_29/header.inc b/data/maps/UnknownMap_25_29/header.inc index 2d0894c97..ed72b6209 100644 --- a/data/maps/UnknownMap_25_29/header.inc +++ b/data/maps/UnknownMap_25_29/header.inc @@ -7,7 +7,7 @@ UnknownMap_25_29:: @ 8307A04 .2byte 227 .byte MAPSEC_DYNAMIC .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/UnknownMap_25_30/header.inc b/data/maps/UnknownMap_25_30/header.inc index 5227b240d..010d4853e 100644 --- a/data/maps/UnknownMap_25_30/header.inc +++ b/data/maps/UnknownMap_25_30/header.inc @@ -7,7 +7,7 @@ UnknownMap_25_30:: @ 8307A20 .2byte 228 .byte MAPSEC_DYNAMIC .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/UnknownMap_25_31/header.inc b/data/maps/UnknownMap_25_31/header.inc index 46ff55e2a..6b7cbfbda 100644 --- a/data/maps/UnknownMap_25_31/header.inc +++ b/data/maps/UnknownMap_25_31/header.inc @@ -7,7 +7,7 @@ UnknownMap_25_31:: @ 8307A3C .2byte 229 .byte MAPSEC_DYNAMIC .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/UnknownMap_25_32/header.inc b/data/maps/UnknownMap_25_32/header.inc index c54f50c7e..e8ac58478 100644 --- a/data/maps/UnknownMap_25_32/header.inc +++ b/data/maps/UnknownMap_25_32/header.inc @@ -7,7 +7,7 @@ UnknownMap_25_32:: @ 8307A58 .2byte 230 .byte MAPSEC_DYNAMIC .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/UnknownMap_25_33/header.inc b/data/maps/UnknownMap_25_33/header.inc index 3c8177616..1291fa5a6 100644 --- a/data/maps/UnknownMap_25_33/header.inc +++ b/data/maps/UnknownMap_25_33/header.inc @@ -7,7 +7,7 @@ UnknownMap_25_33:: @ 8307A74 .2byte 231 .byte MAPSEC_DYNAMIC .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/UnknownMap_25_34/header.inc b/data/maps/UnknownMap_25_34/header.inc index 7eaf0d349..c45afd47e 100644 --- a/data/maps/UnknownMap_25_34/header.inc +++ b/data/maps/UnknownMap_25_34/header.inc @@ -7,7 +7,7 @@ UnknownMap_25_34:: @ 8307A90 .2byte 232 .byte MAPSEC_DYNAMIC .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/VerdanturfTown/header.inc b/data/maps/VerdanturfTown/header.inc index bbf9f1634..94c6c09c9 100644 --- a/data/maps/VerdanturfTown/header.inc +++ b/data/maps/VerdanturfTown/header.inc @@ -7,7 +7,7 @@ VerdanturfTown:: @ 83055D0 .2byte 15 .byte MAPSEC_VERDANTURF_TOWN .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 1 .2byte 0 .byte 1 diff --git a/data/maps/VerdanturfTown_ContestHall/header.inc b/data/maps/VerdanturfTown_ContestHall/header.inc index 24e8ad4a6..3ec1402a4 100644 --- a/data/maps/VerdanturfTown_ContestHall/header.inc +++ b/data/maps/VerdanturfTown_ContestHall/header.inc @@ -7,7 +7,7 @@ VerdanturfTown_ContestHall:: @ 8305D94 .2byte 73 .byte MAPSEC_VERDANTURF_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/VerdanturfTown_ContestLobby/header.inc b/data/maps/VerdanturfTown_ContestLobby/header.inc index 89093874f..332369ace 100644 --- a/data/maps/VerdanturfTown_ContestLobby/header.inc +++ b/data/maps/VerdanturfTown_ContestLobby/header.inc @@ -7,7 +7,7 @@ VerdanturfTown_ContestLobby:: @ 8305D78 .2byte 72 .byte MAPSEC_VERDANTURF_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc b/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc index 8d7bbb286..739bf5cb8 100644 --- a/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc +++ b/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc @@ -7,7 +7,7 @@ VerdanturfTown_FriendshipRatersHouse:: @ 8305E20 .2byte 60 .byte MAPSEC_VERDANTURF_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/VerdanturfTown_House/header.inc b/data/maps/VerdanturfTown_House/header.inc index 311688d18..01e797186 100644 --- a/data/maps/VerdanturfTown_House/header.inc +++ b/data/maps/VerdanturfTown_House/header.inc @@ -7,7 +7,7 @@ VerdanturfTown_House:: @ 8305E3C .2byte 59 .byte MAPSEC_VERDANTURF_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/VerdanturfTown_Mart/header.inc b/data/maps/VerdanturfTown_Mart/header.inc index 5b2334b53..ddf6e9f02 100644 --- a/data/maps/VerdanturfTown_Mart/header.inc +++ b/data/maps/VerdanturfTown_Mart/header.inc @@ -7,7 +7,7 @@ VerdanturfTown_Mart:: @ 8305DB0 .2byte 63 .byte MAPSEC_VERDANTURF_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc b/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc index eb8415d15..de9a5e73f 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc +++ b/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc @@ -7,7 +7,7 @@ VerdanturfTown_PokemonCenter_1F:: @ 8305DCC .2byte 61 .byte MAPSEC_VERDANTURF_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc b/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc index a2dbaf237..9245e50a2 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc +++ b/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc @@ -7,7 +7,7 @@ VerdanturfTown_PokemonCenter_2F:: @ 8305DE8 .2byte 62 .byte MAPSEC_VERDANTURF_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/VerdanturfTown_WandasHouse/header.inc b/data/maps/VerdanturfTown_WandasHouse/header.inc index 11752a9d1..6f7c607b7 100644 --- a/data/maps/VerdanturfTown_WandasHouse/header.inc +++ b/data/maps/VerdanturfTown_WandasHouse/header.inc @@ -7,7 +7,7 @@ VerdanturfTown_WandasHouse:: @ 8305E04 .2byte 76 .byte MAPSEC_VERDANTURF_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/VictoryRoad_1F/header.inc b/data/maps/VictoryRoad_1F/header.inc index 20fe01115..d9092f38a 100644 --- a/data/maps/VictoryRoad_1F/header.inc +++ b/data/maps/VictoryRoad_1F/header.inc @@ -7,7 +7,7 @@ VictoryRoad_1F:: @ 8307224 .2byte 164 .byte MAPSEC_VICTORY_ROAD .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 1 diff --git a/data/maps/VictoryRoad_B1F/header.inc b/data/maps/VictoryRoad_B1F/header.inc index 3ba564a4b..6dfaaf100 100644 --- a/data/maps/VictoryRoad_B1F/header.inc +++ b/data/maps/VictoryRoad_B1F/header.inc @@ -7,7 +7,7 @@ VictoryRoad_B1F:: @ 8307240 .2byte 286 .byte MAPSEC_VICTORY_ROAD .byte 1 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 1 diff --git a/data/maps/VictoryRoad_B2F/header.inc b/data/maps/VictoryRoad_B2F/header.inc index 17eb818ba..e1e51ede5 100644 --- a/data/maps/VictoryRoad_B2F/header.inc +++ b/data/maps/VictoryRoad_B2F/header.inc @@ -7,7 +7,7 @@ VictoryRoad_B2F:: @ 830725C .2byte 287 .byte MAPSEC_VICTORY_ROAD .byte 1 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 1 -- cgit v1.2.3 From fce542610429f6ff18f406fe5f9ef8b09fc97962 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Thu, 12 Jul 2018 22:35:20 -0500 Subject: Use map type constants in map headers --- data/maps.s | 1 + data/maps/AbandonedShip_CaptainsOffice/header.inc | 2 +- data/maps/AbandonedShip_Corridors_1F/header.inc | 2 +- data/maps/AbandonedShip_Corridors_B1F/header.inc | 2 +- data/maps/AbandonedShip_Deck/header.inc | 2 +- .../AbandonedShip_HiddenFloorCorridors/header.inc | 2 +- .../maps/AbandonedShip_HiddenFloorRooms/header.inc | 2 +- data/maps/AbandonedShip_Room_B1F/header.inc | 2 +- data/maps/AbandonedShip_Rooms2_1F/header.inc | 2 +- data/maps/AbandonedShip_Rooms2_B1F/header.inc | 2 +- data/maps/AbandonedShip_Rooms_1F/header.inc | 2 +- data/maps/AbandonedShip_Rooms_B1F/header.inc | 2 +- data/maps/AbandonedShip_Underwater1/header.inc | 2 +- data/maps/AbandonedShip_Underwater2/header.inc | 2 +- data/maps/AncientTomb/header.inc | 2 +- data/maps/AquaHideout_1F/header.inc | 2 +- data/maps/AquaHideout_B1F/header.inc | 2 +- data/maps/AquaHideout_B2F/header.inc | 2 +- data/maps/BattleTower_BattleRoom/header.inc | 2 +- data/maps/BattleTower_Corridor/header.inc | 2 +- data/maps/BattleTower_Elevator/header.inc | 2 +- data/maps/BattleTower_Lobby/header.inc | 2 +- data/maps/BattleTower_Outside/header.inc | 2 +- data/maps/CaveOfOrigin_1F/header.inc | 2 +- data/maps/CaveOfOrigin_B1F/header.inc | 2 +- data/maps/CaveOfOrigin_B2F/header.inc | 2 +- data/maps/CaveOfOrigin_B3F/header.inc | 2 +- data/maps/CaveOfOrigin_B4F/header.inc | 2 +- data/maps/CaveOfOrigin_Entrance/header.inc | 2 +- data/maps/DesertRuins/header.inc | 2 +- data/maps/DewfordTown/header.inc | 2 +- data/maps/DewfordTown_Gym/header.inc | 2 +- data/maps/DewfordTown_Hall/header.inc | 2 +- data/maps/DewfordTown_House1/header.inc | 2 +- data/maps/DewfordTown_House2/header.inc | 2 +- data/maps/DewfordTown_PokemonCenter_1F/header.inc | 2 +- data/maps/DewfordTown_PokemonCenter_2F/header.inc | 2 +- data/maps/DoubleBattleColosseum/header.inc | 2 +- data/maps/EverGrandeCity/header.inc | 2 +- data/maps/EverGrandeCity_ChampionsRoom/header.inc | 2 +- data/maps/EverGrandeCity_Corridor1/header.inc | 2 +- data/maps/EverGrandeCity_Corridor2/header.inc | 2 +- data/maps/EverGrandeCity_Corridor3/header.inc | 2 +- data/maps/EverGrandeCity_Corridor4/header.inc | 2 +- data/maps/EverGrandeCity_Corridor5/header.inc | 2 +- data/maps/EverGrandeCity_DrakesRoom/header.inc | 2 +- data/maps/EverGrandeCity_GlaciasRoom/header.inc | 2 +- data/maps/EverGrandeCity_HallOfFame/header.inc | 2 +- data/maps/EverGrandeCity_PhoebesRoom/header.inc | 2 +- .../EverGrandeCity_PokemonCenter_1F/header.inc | 2 +- .../EverGrandeCity_PokemonCenter_2F/header.inc | 2 +- data/maps/EverGrandeCity_PokemonLeague/header.inc | 2 +- data/maps/EverGrandeCity_SidneysRoom/header.inc | 2 +- data/maps/FallarborTown/header.inc | 2 +- data/maps/FallarborTown_ContestHall/header.inc | 2 +- data/maps/FallarborTown_ContestLobby/header.inc | 2 +- data/maps/FallarborTown_House1/header.inc | 2 +- data/maps/FallarborTown_House2/header.inc | 2 +- data/maps/FallarborTown_Mart/header.inc | 2 +- .../maps/FallarborTown_PokemonCenter_1F/header.inc | 2 +- .../maps/FallarborTown_PokemonCenter_2F/header.inc | 2 +- data/maps/FieryPath/header.inc | 2 +- data/maps/FortreeCity/header.inc | 2 +- data/maps/FortreeCity_DecorationShop/header.inc | 2 +- data/maps/FortreeCity_Gym/header.inc | 2 +- data/maps/FortreeCity_House1/header.inc | 2 +- data/maps/FortreeCity_House2/header.inc | 2 +- data/maps/FortreeCity_House3/header.inc | 2 +- data/maps/FortreeCity_House4/header.inc | 2 +- data/maps/FortreeCity_House5/header.inc | 2 +- data/maps/FortreeCity_Mart/header.inc | 2 +- data/maps/FortreeCity_PokemonCenter_1F/header.inc | 2 +- data/maps/FortreeCity_PokemonCenter_2F/header.inc | 2 +- data/maps/GraniteCave_1F/header.inc | 2 +- data/maps/GraniteCave_B1F/header.inc | 2 +- data/maps/GraniteCave_B2F/header.inc | 2 +- data/maps/GraniteCave_StevensRoom/header.inc | 2 +- data/maps/InsideOfTruck/header.inc | 2 +- data/maps/IslandCave/header.inc | 2 +- data/maps/JaggedPass/header.inc | 2 +- data/maps/LavaridgeTown/header.inc | 2 +- data/maps/LavaridgeTown_Gym_1F/header.inc | 2 +- data/maps/LavaridgeTown_Gym_B1F/header.inc | 2 +- data/maps/LavaridgeTown_HerbShop/header.inc | 2 +- data/maps/LavaridgeTown_House/header.inc | 2 +- data/maps/LavaridgeTown_Mart/header.inc | 2 +- .../maps/LavaridgeTown_PokemonCenter_1F/header.inc | 2 +- .../maps/LavaridgeTown_PokemonCenter_2F/header.inc | 2 +- data/maps/LilycoveCity/header.inc | 2 +- data/maps/LilycoveCity_ContestHall/header.inc | 2 +- data/maps/LilycoveCity_ContestLobby/header.inc | 2 +- data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc | 2 +- data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc | 2 +- .../header.inc | 2 +- .../LilycoveCity_DepartmentStoreRooftop/header.inc | 2 +- .../LilycoveCity_DepartmentStore_1F/header.inc | 2 +- .../LilycoveCity_DepartmentStore_2F/header.inc | 2 +- .../LilycoveCity_DepartmentStore_3F/header.inc | 2 +- .../LilycoveCity_DepartmentStore_4F/header.inc | 2 +- .../LilycoveCity_DepartmentStore_5F/header.inc | 2 +- data/maps/LilycoveCity_EmptyMap/header.inc | 2 +- data/maps/LilycoveCity_Harbor/header.inc | 2 +- data/maps/LilycoveCity_House1/header.inc | 2 +- data/maps/LilycoveCity_House2/header.inc | 2 +- data/maps/LilycoveCity_House3/header.inc | 2 +- data/maps/LilycoveCity_House4/header.inc | 2 +- .../maps/LilycoveCity_LilycoveMuseum_1F/header.inc | 2 +- .../maps/LilycoveCity_LilycoveMuseum_2F/header.inc | 2 +- .../maps/LilycoveCity_MoveDeletersHouse/header.inc | 2 +- data/maps/LilycoveCity_PokemonCenter_1F/header.inc | 2 +- data/maps/LilycoveCity_PokemonCenter_2F/header.inc | 2 +- .../LilycoveCity_PokemonTrainerFanClub/header.inc | 2 +- data/maps/LilycoveCity_UnusedMart/header.inc | 2 +- data/maps/LinkContestRoom1/header.inc | 2 +- data/maps/LinkContestRoom2/header.inc | 2 +- data/maps/LinkContestRoom3/header.inc | 2 +- data/maps/LinkContestRoom4/header.inc | 2 +- data/maps/LinkContestRoom5/header.inc | 2 +- data/maps/LinkContestRoom6/header.inc | 2 +- data/maps/LittlerootTown/header.inc | 2 +- .../LittlerootTown_BrendansHouse_1F/header.inc | 2 +- .../LittlerootTown_BrendansHouse_2F/header.inc | 2 +- data/maps/LittlerootTown_MaysHouse_1F/header.inc | 2 +- data/maps/LittlerootTown_MaysHouse_2F/header.inc | 2 +- .../LittlerootTown_ProfessorBirchsLab/header.inc | 2 +- data/maps/MagmaHideout_1F/header.inc | 2 +- data/maps/MagmaHideout_B1F/header.inc | 2 +- data/maps/MagmaHideout_B2F/header.inc | 2 +- data/maps/MauvilleCity/header.inc | 2 +- data/maps/MauvilleCity_BikeShop/header.inc | 2 +- data/maps/MauvilleCity_GameCorner/header.inc | 2 +- data/maps/MauvilleCity_Gym/header.inc | 2 +- data/maps/MauvilleCity_House1/header.inc | 2 +- data/maps/MauvilleCity_House2/header.inc | 2 +- data/maps/MauvilleCity_Mart/header.inc | 2 +- data/maps/MauvilleCity_PokemonCenter_1F/header.inc | 2 +- data/maps/MauvilleCity_PokemonCenter_2F/header.inc | 2 +- data/maps/MeteorFalls_1F_1R/header.inc | 2 +- data/maps/MeteorFalls_1F_2R/header.inc | 2 +- data/maps/MeteorFalls_B1F_1R/header.inc | 2 +- data/maps/MeteorFalls_B1F_2R/header.inc | 2 +- data/maps/MossdeepCity/header.inc | 2 +- data/maps/MossdeepCity_GameCorner_1F/header.inc | 2 +- data/maps/MossdeepCity_GameCorner_B1F/header.inc | 2 +- data/maps/MossdeepCity_Gym/header.inc | 2 +- data/maps/MossdeepCity_House1/header.inc | 2 +- data/maps/MossdeepCity_House2/header.inc | 2 +- data/maps/MossdeepCity_House3/header.inc | 2 +- data/maps/MossdeepCity_House4/header.inc | 2 +- data/maps/MossdeepCity_Mart/header.inc | 2 +- data/maps/MossdeepCity_PokemonCenter_1F/header.inc | 2 +- data/maps/MossdeepCity_PokemonCenter_2F/header.inc | 2 +- data/maps/MossdeepCity_SpaceCenter_1F/header.inc | 2 +- data/maps/MossdeepCity_SpaceCenter_2F/header.inc | 2 +- data/maps/MossdeepCity_StevensHouse/header.inc | 2 +- data/maps/MtChimney/header.inc | 2 +- data/maps/MtChimney_CableCarStation/header.inc | 2 +- data/maps/MtPyre_1F/header.inc | 2 +- data/maps/MtPyre_2F/header.inc | 2 +- data/maps/MtPyre_3F/header.inc | 2 +- data/maps/MtPyre_4F/header.inc | 2 +- data/maps/MtPyre_5F/header.inc | 2 +- data/maps/MtPyre_6F/header.inc | 2 +- data/maps/MtPyre_Exterior/header.inc | 2 +- data/maps/MtPyre_Summit/header.inc | 2 +- data/maps/NewMauville_Entrance/header.inc | 2 +- data/maps/NewMauville_Inside/header.inc | 2 +- data/maps/OldaleTown/header.inc | 2 +- data/maps/OldaleTown_House1/header.inc | 2 +- data/maps/OldaleTown_House2/header.inc | 2 +- data/maps/OldaleTown_Mart/header.inc | 2 +- data/maps/OldaleTown_PokemonCenter_1F/header.inc | 2 +- data/maps/OldaleTown_PokemonCenter_2F/header.inc | 2 +- data/maps/PacifidlogTown/header.inc | 2 +- data/maps/PacifidlogTown_House1/header.inc | 2 +- data/maps/PacifidlogTown_House2/header.inc | 2 +- data/maps/PacifidlogTown_House3/header.inc | 2 +- data/maps/PacifidlogTown_House4/header.inc | 2 +- data/maps/PacifidlogTown_House5/header.inc | 2 +- .../PacifidlogTown_PokemonCenter_1F/header.inc | 2 +- .../PacifidlogTown_PokemonCenter_2F/header.inc | 2 +- data/maps/PetalburgCity/header.inc | 2 +- data/maps/PetalburgCity_Gym/header.inc | 2 +- data/maps/PetalburgCity_House1/header.inc | 2 +- data/maps/PetalburgCity_House2/header.inc | 2 +- data/maps/PetalburgCity_Mart/header.inc | 2 +- .../maps/PetalburgCity_PokemonCenter_1F/header.inc | 2 +- .../maps/PetalburgCity_PokemonCenter_2F/header.inc | 2 +- data/maps/PetalburgCity_WallysHouse/header.inc | 2 +- data/maps/PetalburgWoods/header.inc | 2 +- data/maps/RecordCorner/header.inc | 2 +- data/maps/Route101/header.inc | 2 +- data/maps/Route102/header.inc | 2 +- data/maps/Route103/header.inc | 2 +- data/maps/Route104/header.inc | 2 +- data/maps/Route104_MrBrineysHouse/header.inc | 2 +- .../maps/Route104_PrettyPetalFlowerShop/header.inc | 2 +- data/maps/Route104_Prototype/header.inc | 2 +- .../header.inc | 2 +- data/maps/Route105/header.inc | 2 +- data/maps/Route106/header.inc | 2 +- data/maps/Route107/header.inc | 2 +- data/maps/Route108/header.inc | 2 +- data/maps/Route109/header.inc | 2 +- data/maps/Route109_SeashoreHouse/header.inc | 2 +- data/maps/Route110/header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- data/maps/Route110_TrickHouseCorridor/header.inc | 2 +- data/maps/Route110_TrickHouseEnd/header.inc | 2 +- data/maps/Route110_TrickHouseEntrance/header.inc | 2 +- data/maps/Route110_TrickHousePuzzle1/header.inc | 2 +- data/maps/Route110_TrickHousePuzzle2/header.inc | 2 +- data/maps/Route110_TrickHousePuzzle3/header.inc | 2 +- data/maps/Route110_TrickHousePuzzle4/header.inc | 2 +- data/maps/Route110_TrickHousePuzzle5/header.inc | 2 +- data/maps/Route110_TrickHousePuzzle6/header.inc | 2 +- data/maps/Route110_TrickHousePuzzle7/header.inc | 2 +- data/maps/Route110_TrickHousePuzzle8/header.inc | 2 +- data/maps/Route111/header.inc | 2 +- data/maps/Route111_OldLadysRestStop/header.inc | 2 +- .../maps/Route111_WinstrateFamilysHouse/header.inc | 2 +- data/maps/Route112/header.inc | 2 +- data/maps/Route112_CableCarStation/header.inc | 2 +- data/maps/Route113/header.inc | 2 +- data/maps/Route113_GlassWorkshop/header.inc | 2 +- data/maps/Route114/header.inc | 2 +- data/maps/Route114_FossilManiacsHouse/header.inc | 2 +- data/maps/Route114_FossilManiacsTunnel/header.inc | 2 +- data/maps/Route114_LanettesHouse/header.inc | 2 +- data/maps/Route115/header.inc | 2 +- data/maps/Route116/header.inc | 2 +- data/maps/Route116_TunnelersRestHouse/header.inc | 2 +- data/maps/Route117/header.inc | 2 +- data/maps/Route117_PokemonDayCare/header.inc | 2 +- data/maps/Route118/header.inc | 2 +- data/maps/Route119/header.inc | 2 +- data/maps/Route119_House/header.inc | 2 +- data/maps/Route119_WeatherInstitute_1F/header.inc | 2 +- data/maps/Route119_WeatherInstitute_2F/header.inc | 2 +- data/maps/Route120/header.inc | 2 +- data/maps/Route121/header.inc | 2 +- data/maps/Route121_SafariZoneEntrance/header.inc | 2 +- data/maps/Route122/header.inc | 2 +- data/maps/Route123/header.inc | 2 +- data/maps/Route123_BerryMastersHouse/header.inc | 2 +- data/maps/Route124/header.inc | 2 +- .../Route124_DivingTreasureHuntersHouse/header.inc | 2 +- data/maps/Route125/header.inc | 2 +- data/maps/Route126/header.inc | 2 +- data/maps/Route127/header.inc | 2 +- data/maps/Route128/header.inc | 2 +- data/maps/Route129/header.inc | 2 +- data/maps/Route130/header.inc | 2 +- data/maps/Route131/header.inc | 2 +- data/maps/Route132/header.inc | 2 +- data/maps/Route133/header.inc | 2 +- data/maps/Route134/header.inc | 2 +- data/maps/RustboroCity/header.inc | 2 +- data/maps/RustboroCity_CuttersHouse/header.inc | 2 +- data/maps/RustboroCity_DevonCorp_1F/header.inc | 2 +- data/maps/RustboroCity_DevonCorp_2F/header.inc | 2 +- data/maps/RustboroCity_DevonCorp_3F/header.inc | 2 +- data/maps/RustboroCity_Flat1_1F/header.inc | 2 +- data/maps/RustboroCity_Flat1_2F/header.inc | 2 +- data/maps/RustboroCity_Flat2_1F/header.inc | 2 +- data/maps/RustboroCity_Flat2_2F/header.inc | 2 +- data/maps/RustboroCity_Flat2_3F/header.inc | 2 +- data/maps/RustboroCity_Gym/header.inc | 2 +- data/maps/RustboroCity_House1/header.inc | 2 +- data/maps/RustboroCity_House2/header.inc | 2 +- data/maps/RustboroCity_House3/header.inc | 2 +- data/maps/RustboroCity_Mart/header.inc | 2 +- data/maps/RustboroCity_PokemonCenter_1F/header.inc | 2 +- data/maps/RustboroCity_PokemonCenter_2F/header.inc | 2 +- data/maps/RustboroCity_PokemonSchool/header.inc | 2 +- data/maps/RusturfTunnel/header.inc | 2 +- data/maps/SSTidalCorridor/header.inc | 2 +- data/maps/SSTidalLowerDeck/header.inc | 2 +- data/maps/SSTidalRooms/header.inc | 2 +- data/maps/SafariZone_Northeast/header.inc | 2 +- data/maps/SafariZone_Northwest/header.inc | 2 +- data/maps/SafariZone_RestHouse/header.inc | 2 +- data/maps/SafariZone_Southeast/header.inc | 2 +- data/maps/SafariZone_Southwest/header.inc | 2 +- data/maps/ScorchedSlab/header.inc | 2 +- data/maps/SeafloorCavern_Entrance/header.inc | 2 +- data/maps/SeafloorCavern_Room1/header.inc | 2 +- data/maps/SeafloorCavern_Room2/header.inc | 2 +- data/maps/SeafloorCavern_Room3/header.inc | 2 +- data/maps/SeafloorCavern_Room4/header.inc | 2 +- data/maps/SeafloorCavern_Room5/header.inc | 2 +- data/maps/SeafloorCavern_Room6/header.inc | 2 +- data/maps/SeafloorCavern_Room7/header.inc | 2 +- data/maps/SeafloorCavern_Room8/header.inc | 2 +- data/maps/SeafloorCavern_Room9/header.inc | 2 +- data/maps/SealedChamber_InnerRoom/header.inc | 2 +- data/maps/SealedChamber_OuterRoom/header.inc | 2 +- data/maps/SecretBase_BlueCave1/header.inc | 2 +- data/maps/SecretBase_BlueCave2/header.inc | 2 +- data/maps/SecretBase_BlueCave3/header.inc | 2 +- data/maps/SecretBase_BlueCave4/header.inc | 2 +- data/maps/SecretBase_BrownCave1/header.inc | 2 +- data/maps/SecretBase_BrownCave2/header.inc | 2 +- data/maps/SecretBase_BrownCave3/header.inc | 2 +- data/maps/SecretBase_BrownCave4/header.inc | 2 +- data/maps/SecretBase_RedCave1/header.inc | 2 +- data/maps/SecretBase_RedCave2/header.inc | 2 +- data/maps/SecretBase_RedCave3/header.inc | 2 +- data/maps/SecretBase_RedCave4/header.inc | 2 +- data/maps/SecretBase_Shrub1/header.inc | 2 +- data/maps/SecretBase_Shrub2/header.inc | 2 +- data/maps/SecretBase_Shrub3/header.inc | 2 +- data/maps/SecretBase_Shrub4/header.inc | 2 +- data/maps/SecretBase_Tree1/header.inc | 2 +- data/maps/SecretBase_Tree2/header.inc | 2 +- data/maps/SecretBase_Tree3/header.inc | 2 +- data/maps/SecretBase_Tree4/header.inc | 2 +- data/maps/SecretBase_YellowCave1/header.inc | 2 +- data/maps/SecretBase_YellowCave2/header.inc | 2 +- data/maps/SecretBase_YellowCave3/header.inc | 2 +- data/maps/SecretBase_YellowCave4/header.inc | 2 +- .../maps/ShoalCave_HighTideEntranceRoom/header.inc | 2 +- data/maps/ShoalCave_HighTideInnerRoom/header.inc | 2 +- data/maps/ShoalCave_LowTideEntranceRoom/header.inc | 2 +- data/maps/ShoalCave_LowTideIceRoom/header.inc | 2 +- data/maps/ShoalCave_LowTideInnerRoom/header.inc | 2 +- data/maps/ShoalCave_LowTideLowerRoom/header.inc | 2 +- data/maps/ShoalCave_LowTideStairsRoom/header.inc | 2 +- data/maps/SingleBattleColosseum/header.inc | 2 +- data/maps/SkyPillar_1F/header.inc | 2 +- data/maps/SkyPillar_2F/header.inc | 2 +- data/maps/SkyPillar_3F/header.inc | 2 +- data/maps/SkyPillar_4F/header.inc | 2 +- data/maps/SkyPillar_5F/header.inc | 2 +- data/maps/SkyPillar_Entrance/header.inc | 2 +- data/maps/SkyPillar_Outside/header.inc | 2 +- data/maps/SkyPillar_Top/header.inc | 2 +- data/maps/SlateportCity/header.inc | 2 +- data/maps/SlateportCity_ContestHall/header.inc | 2 +- data/maps/SlateportCity_ContestLobby/header.inc | 2 +- data/maps/SlateportCity_Harbor/header.inc | 2 +- data/maps/SlateportCity_House1/header.inc | 2 +- data/maps/SlateportCity_House2/header.inc | 2 +- data/maps/SlateportCity_Mart/header.inc | 2 +- .../maps/SlateportCity_OceanicMuseum_1F/header.inc | 2 +- .../maps/SlateportCity_OceanicMuseum_2F/header.inc | 2 +- .../maps/SlateportCity_PokemonCenter_1F/header.inc | 2 +- .../maps/SlateportCity_PokemonCenter_2F/header.inc | 2 +- data/maps/SlateportCity_PokemonFanClub/header.inc | 2 +- .../SlateportCity_SternsShipyard_1F/header.inc | 2 +- .../SlateportCity_SternsShipyard_2F/header.inc | 2 +- data/maps/SootopolisCity/header.inc | 2 +- data/maps/SootopolisCity_Gym_1F/header.inc | 2 +- data/maps/SootopolisCity_Gym_B1F/header.inc | 2 +- data/maps/SootopolisCity_House1/header.inc | 2 +- data/maps/SootopolisCity_House2/header.inc | 2 +- data/maps/SootopolisCity_House3/header.inc | 2 +- data/maps/SootopolisCity_House4/header.inc | 2 +- data/maps/SootopolisCity_House5/header.inc | 2 +- data/maps/SootopolisCity_House6/header.inc | 2 +- data/maps/SootopolisCity_House7/header.inc | 2 +- data/maps/SootopolisCity_House8/header.inc | 2 +- data/maps/SootopolisCity_Mart/header.inc | 2 +- .../SootopolisCity_PokemonCenter_1F/header.inc | 2 +- .../SootopolisCity_PokemonCenter_2F/header.inc | 2 +- data/maps/SouthernIsland_Exterior/header.inc | 2 +- data/maps/SouthernIsland_Interior/header.inc | 2 +- data/maps/TradeCenter/header.inc | 2 +- data/maps/Underwater1/header.inc | 2 +- data/maps/Underwater2/header.inc | 2 +- data/maps/Underwater3/header.inc | 2 +- data/maps/Underwater4/header.inc | 2 +- data/maps/Underwater_Route134/header.inc | 2 +- data/maps/Underwater_SeafloorCavern/header.inc | 2 +- data/maps/Underwater_SealedChamber/header.inc | 2 +- data/maps/Underwater_SootopolisCity/header.inc | 2 +- data/maps/UnknownMap_25_29/header.inc | 2 +- data/maps/UnknownMap_25_30/header.inc | 2 +- data/maps/UnknownMap_25_31/header.inc | 2 +- data/maps/UnknownMap_25_32/header.inc | 2 +- data/maps/UnknownMap_25_33/header.inc | 2 +- data/maps/UnknownMap_25_34/header.inc | 2 +- data/maps/VerdanturfTown/header.inc | 2 +- data/maps/VerdanturfTown_ContestHall/header.inc | 2 +- data/maps/VerdanturfTown_ContestLobby/header.inc | 2 +- .../header.inc | 2 +- data/maps/VerdanturfTown_House/header.inc | 2 +- data/maps/VerdanturfTown_Mart/header.inc | 2 +- .../VerdanturfTown_PokemonCenter_1F/header.inc | 2 +- .../VerdanturfTown_PokemonCenter_2F/header.inc | 2 +- data/maps/VerdanturfTown_WandasHouse/header.inc | 2 +- data/maps/VictoryRoad_1F/header.inc | 2 +- data/maps/VictoryRoad_B1F/header.inc | 2 +- data/maps/VictoryRoad_B2F/header.inc | 2 +- include/constants/map_types.h | 25 +++++++++++++++++++ include/global.fieldmap.h | 29 ---------------------- src/battle/battle_bg.c | 3 ++- src/battle/battle_setup.c | 9 ++++--- src/bike.c | 3 ++- src/field_control_avatar.c | 1 + src/fldeff_flash.c | 3 ++- src/item_use.c | 1 + src/overworld.c | 7 +++--- src/rom6.c | 1 + src/secret_base.c | 1 + 406 files changed, 439 insertions(+), 433 deletions(-) create mode 100755 include/constants/map_types.h diff --git a/data/maps.s b/data/maps.s index ed1a6bed6..883e44f5d 100644 --- a/data/maps.s +++ b/data/maps.s @@ -1,3 +1,4 @@ +#include "constants/map_types.h" #include "constants/maps.h" #include "constants/region_map_sections.h" #include "constants/songs.h" diff --git a/data/maps/AbandonedShip_CaptainsOffice/header.inc b/data/maps/AbandonedShip_CaptainsOffice/header.inc index 8cec689af..007ccb4c4 100644 --- a/data/maps/AbandonedShip_CaptainsOffice/header.inc +++ b/data/maps/AbandonedShip_CaptainsOffice/header.inc @@ -8,7 +8,7 @@ AbandonedShip_CaptainsOffice:: @ 8307454 .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte WEATHER_SHADE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/AbandonedShip_Corridors_1F/header.inc b/data/maps/AbandonedShip_Corridors_1F/header.inc index 54e660513..9c49a6e12 100644 --- a/data/maps/AbandonedShip_Corridors_1F/header.inc +++ b/data/maps/AbandonedShip_Corridors_1F/header.inc @@ -8,7 +8,7 @@ AbandonedShip_Corridors_1F:: @ 8307374 .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte WEATHER_SHADE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/AbandonedShip_Corridors_B1F/header.inc b/data/maps/AbandonedShip_Corridors_B1F/header.inc index 87c3b7f7b..692c5922c 100644 --- a/data/maps/AbandonedShip_Corridors_B1F/header.inc +++ b/data/maps/AbandonedShip_Corridors_B1F/header.inc @@ -8,7 +8,7 @@ AbandonedShip_Corridors_B1F:: @ 83073AC .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte WEATHER_SHADE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/AbandonedShip_Deck/header.inc b/data/maps/AbandonedShip_Deck/header.inc index b4a526392..f48ab2130 100644 --- a/data/maps/AbandonedShip_Deck/header.inc +++ b/data/maps/AbandonedShip_Deck/header.inc @@ -8,7 +8,7 @@ AbandonedShip_Deck:: @ 8307358 .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc b/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc index 4a79ed9d1..fcd5a4706 100644 --- a/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc +++ b/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc @@ -8,7 +8,7 @@ AbandonedShip_HiddenFloorCorridors:: @ 830748C .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte WEATHER_SHADE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/header.inc b/data/maps/AbandonedShip_HiddenFloorRooms/header.inc index d00d48363..4b357b3f6 100644 --- a/data/maps/AbandonedShip_HiddenFloorRooms/header.inc +++ b/data/maps/AbandonedShip_HiddenFloorRooms/header.inc @@ -8,7 +8,7 @@ AbandonedShip_HiddenFloorRooms:: @ 83074A8 .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte WEATHER_SHADE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/AbandonedShip_Room_B1F/header.inc b/data/maps/AbandonedShip_Room_B1F/header.inc index efea716b2..527e8e5bc 100644 --- a/data/maps/AbandonedShip_Room_B1F/header.inc +++ b/data/maps/AbandonedShip_Room_B1F/header.inc @@ -8,7 +8,7 @@ AbandonedShip_Room_B1F:: @ 830741C .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte WEATHER_SHADE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/AbandonedShip_Rooms2_1F/header.inc b/data/maps/AbandonedShip_Rooms2_1F/header.inc index 13362610f..c22d6d10d 100644 --- a/data/maps/AbandonedShip_Rooms2_1F/header.inc +++ b/data/maps/AbandonedShip_Rooms2_1F/header.inc @@ -8,7 +8,7 @@ AbandonedShip_Rooms2_1F:: @ 8307438 .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte WEATHER_SHADE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/AbandonedShip_Rooms2_B1F/header.inc b/data/maps/AbandonedShip_Rooms2_B1F/header.inc index 2bb3d1c35..81665db27 100644 --- a/data/maps/AbandonedShip_Rooms2_B1F/header.inc +++ b/data/maps/AbandonedShip_Rooms2_B1F/header.inc @@ -8,7 +8,7 @@ AbandonedShip_Rooms2_B1F:: @ 83073E4 .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte WEATHER_SHADE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/AbandonedShip_Rooms_1F/header.inc b/data/maps/AbandonedShip_Rooms_1F/header.inc index 818e1bf37..529077f67 100644 --- a/data/maps/AbandonedShip_Rooms_1F/header.inc +++ b/data/maps/AbandonedShip_Rooms_1F/header.inc @@ -8,7 +8,7 @@ AbandonedShip_Rooms_1F:: @ 8307390 .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte WEATHER_SHADE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/AbandonedShip_Rooms_B1F/header.inc b/data/maps/AbandonedShip_Rooms_B1F/header.inc index a5e23f06d..018f4b2f4 100644 --- a/data/maps/AbandonedShip_Rooms_B1F/header.inc +++ b/data/maps/AbandonedShip_Rooms_B1F/header.inc @@ -8,7 +8,7 @@ AbandonedShip_Rooms_B1F:: @ 83073C8 .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte WEATHER_SHADE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/AbandonedShip_Underwater1/header.inc b/data/maps/AbandonedShip_Underwater1/header.inc index 9c20b5253..e40484143 100644 --- a/data/maps/AbandonedShip_Underwater1/header.inc +++ b/data/maps/AbandonedShip_Underwater1/header.inc @@ -8,7 +8,7 @@ AbandonedShip_Underwater1:: @ 8307400 .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte WEATHER_BUBBLES - .byte 5 + .byte MAP_TYPE_UNDERWATER .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/AbandonedShip_Underwater2/header.inc b/data/maps/AbandonedShip_Underwater2/header.inc index 6238607c2..ac549db4c 100644 --- a/data/maps/AbandonedShip_Underwater2/header.inc +++ b/data/maps/AbandonedShip_Underwater2/header.inc @@ -8,7 +8,7 @@ AbandonedShip_Underwater2:: @ 8307470 .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte WEATHER_BUBBLES - .byte 5 + .byte MAP_TYPE_UNDERWATER .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/AncientTomb/header.inc b/data/maps/AncientTomb/header.inc index 7281a0ed2..a28a7a77a 100644 --- a/data/maps/AncientTomb/header.inc +++ b/data/maps/AncientTomb/header.inc @@ -8,7 +8,7 @@ AncientTomb:: @ 83074E0 .byte MAPSEC_ANCIENT_TOMB .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/AquaHideout_1F/header.inc b/data/maps/AquaHideout_1F/header.inc index 3eb77788b..436466f98 100644 --- a/data/maps/AquaHideout_1F/header.inc +++ b/data/maps/AquaHideout_1F/header.inc @@ -8,7 +8,7 @@ AquaHideout_1F:: @ 8306FF4 .byte MAPSEC_EVIL_TEAM_HIDEOUT .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 1 .byte 3 diff --git a/data/maps/AquaHideout_B1F/header.inc b/data/maps/AquaHideout_B1F/header.inc index 97b0c3d41..be77d5630 100644 --- a/data/maps/AquaHideout_B1F/header.inc +++ b/data/maps/AquaHideout_B1F/header.inc @@ -8,7 +8,7 @@ AquaHideout_B1F:: @ 8307010 .byte MAPSEC_EVIL_TEAM_HIDEOUT .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 1 .byte 3 diff --git a/data/maps/AquaHideout_B2F/header.inc b/data/maps/AquaHideout_B2F/header.inc index bed8c39c7..d575c2c90 100644 --- a/data/maps/AquaHideout_B2F/header.inc +++ b/data/maps/AquaHideout_B2F/header.inc @@ -8,7 +8,7 @@ AquaHideout_B2F:: @ 830702C .byte MAPSEC_EVIL_TEAM_HIDEOUT .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 1 .byte 3 diff --git a/data/maps/BattleTower_BattleRoom/header.inc b/data/maps/BattleTower_BattleRoom/header.inc index dd0d0a715..2043f0146 100644 --- a/data/maps/BattleTower_BattleRoom/header.inc +++ b/data/maps/BattleTower_BattleRoom/header.inc @@ -8,7 +8,7 @@ BattleTower_BattleRoom:: @ 8307C88 .byte MAPSEC_BATTLE_TOWER .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleTower_Corridor/header.inc b/data/maps/BattleTower_Corridor/header.inc index 34304ab0f..cc72d42a7 100644 --- a/data/maps/BattleTower_Corridor/header.inc +++ b/data/maps/BattleTower_Corridor/header.inc @@ -8,7 +8,7 @@ BattleTower_Corridor:: @ 8307C6C .byte MAPSEC_BATTLE_TOWER .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/BattleTower_Elevator/header.inc b/data/maps/BattleTower_Elevator/header.inc index d455c8d2d..3cab9f057 100644 --- a/data/maps/BattleTower_Elevator/header.inc +++ b/data/maps/BattleTower_Elevator/header.inc @@ -8,7 +8,7 @@ BattleTower_Elevator:: @ 8307C50 .byte MAPSEC_BATTLE_TOWER .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/BattleTower_Lobby/header.inc b/data/maps/BattleTower_Lobby/header.inc index 9595fc740..c4e8426d3 100644 --- a/data/maps/BattleTower_Lobby/header.inc +++ b/data/maps/BattleTower_Lobby/header.inc @@ -8,7 +8,7 @@ BattleTower_Lobby:: @ 8307C34 .byte MAPSEC_BATTLE_TOWER .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/BattleTower_Outside/header.inc b/data/maps/BattleTower_Outside/header.inc index 7963d80a1..5725a020d 100644 --- a/data/maps/BattleTower_Outside/header.inc +++ b/data/maps/BattleTower_Outside/header.inc @@ -8,7 +8,7 @@ BattleTower_Outside:: @ 8307C18 .byte MAPSEC_BATTLE_TOWER .byte 0 .byte WEATHER_NONE - .byte 3 + .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/CaveOfOrigin_1F/header.inc b/data/maps/CaveOfOrigin_1F/header.inc index 8a956b330..6c0c0282b 100644 --- a/data/maps/CaveOfOrigin_1F/header.inc +++ b/data/maps/CaveOfOrigin_1F/header.inc @@ -8,7 +8,7 @@ CaveOfOrigin_1F:: @ 8307198 .byte MAPSEC_CAVE_OF_ORIGIN .byte 1 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/CaveOfOrigin_B1F/header.inc b/data/maps/CaveOfOrigin_B1F/header.inc index 1c53aee5a..2ca7210bf 100644 --- a/data/maps/CaveOfOrigin_B1F/header.inc +++ b/data/maps/CaveOfOrigin_B1F/header.inc @@ -8,7 +8,7 @@ CaveOfOrigin_B1F:: @ 83071B4 .byte MAPSEC_CAVE_OF_ORIGIN .byte 1 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/CaveOfOrigin_B2F/header.inc b/data/maps/CaveOfOrigin_B2F/header.inc index 5cfe0b079..d44586310 100644 --- a/data/maps/CaveOfOrigin_B2F/header.inc +++ b/data/maps/CaveOfOrigin_B2F/header.inc @@ -8,7 +8,7 @@ CaveOfOrigin_B2F:: @ 83071D0 .byte MAPSEC_CAVE_OF_ORIGIN .byte 1 .byte WEATHER_FOG_1 - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/CaveOfOrigin_B3F/header.inc b/data/maps/CaveOfOrigin_B3F/header.inc index 272595dd8..a609cc046 100644 --- a/data/maps/CaveOfOrigin_B3F/header.inc +++ b/data/maps/CaveOfOrigin_B3F/header.inc @@ -8,7 +8,7 @@ CaveOfOrigin_B3F:: @ 83071EC .byte MAPSEC_CAVE_OF_ORIGIN .byte 1 .byte WEATHER_FOG_1 - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/CaveOfOrigin_B4F/header.inc b/data/maps/CaveOfOrigin_B4F/header.inc index c12476d63..ae32a3fbd 100644 --- a/data/maps/CaveOfOrigin_B4F/header.inc +++ b/data/maps/CaveOfOrigin_B4F/header.inc @@ -8,7 +8,7 @@ CaveOfOrigin_B4F:: @ 8307208 .byte MAPSEC_CAVE_OF_ORIGIN .byte 0 .byte WEATHER_FOG_1 - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/CaveOfOrigin_Entrance/header.inc b/data/maps/CaveOfOrigin_Entrance/header.inc index 877948756..2d94c3cb8 100644 --- a/data/maps/CaveOfOrigin_Entrance/header.inc +++ b/data/maps/CaveOfOrigin_Entrance/header.inc @@ -8,7 +8,7 @@ CaveOfOrigin_Entrance:: @ 830717C .byte MAPSEC_CAVE_OF_ORIGIN .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/DesertRuins/header.inc b/data/maps/DesertRuins/header.inc index 55feda880..51a58c901 100644 --- a/data/maps/DesertRuins/header.inc +++ b/data/maps/DesertRuins/header.inc @@ -8,7 +8,7 @@ DesertRuins:: @ 8306E18 .byte MAPSEC_DESERT_RUINS .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/DewfordTown/header.inc b/data/maps/DewfordTown/header.inc index 1bbfba597..2e50fc942 100644 --- a/data/maps/DewfordTown/header.inc +++ b/data/maps/DewfordTown/header.inc @@ -8,7 +8,7 @@ DewfordTown:: @ 830557C .byte MAPSEC_DEWFORD_TOWN .byte 0 .byte WEATHER_SUNNY - .byte 1 + .byte MAP_TYPE_TOWN .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/DewfordTown_Gym/header.inc b/data/maps/DewfordTown_Gym/header.inc index e001c5346..d14be9081 100644 --- a/data/maps/DewfordTown_Gym/header.inc +++ b/data/maps/DewfordTown_Gym/header.inc @@ -8,7 +8,7 @@ DewfordTown_Gym:: @ 8305B9C .byte MAPSEC_DEWFORD_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 1 diff --git a/data/maps/DewfordTown_Hall/header.inc b/data/maps/DewfordTown_Hall/header.inc index 516039595..693aad8dd 100644 --- a/data/maps/DewfordTown_Hall/header.inc +++ b/data/maps/DewfordTown_Hall/header.inc @@ -8,7 +8,7 @@ DewfordTown_Hall:: @ 8305BB8 .byte MAPSEC_DEWFORD_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/DewfordTown_House1/header.inc b/data/maps/DewfordTown_House1/header.inc index efd85c949..b23156bcf 100644 --- a/data/maps/DewfordTown_House1/header.inc +++ b/data/maps/DewfordTown_House1/header.inc @@ -8,7 +8,7 @@ DewfordTown_House1:: @ 8305B48 .byte MAPSEC_DEWFORD_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/DewfordTown_House2/header.inc b/data/maps/DewfordTown_House2/header.inc index 625c4cce8..576cd92b4 100644 --- a/data/maps/DewfordTown_House2/header.inc +++ b/data/maps/DewfordTown_House2/header.inc @@ -8,7 +8,7 @@ DewfordTown_House2:: @ 8305BD4 .byte MAPSEC_DEWFORD_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/DewfordTown_PokemonCenter_1F/header.inc b/data/maps/DewfordTown_PokemonCenter_1F/header.inc index 48032deca..e1e80ce69 100644 --- a/data/maps/DewfordTown_PokemonCenter_1F/header.inc +++ b/data/maps/DewfordTown_PokemonCenter_1F/header.inc @@ -8,7 +8,7 @@ DewfordTown_PokemonCenter_1F:: @ 8305B64 .byte MAPSEC_DEWFORD_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/DewfordTown_PokemonCenter_2F/header.inc b/data/maps/DewfordTown_PokemonCenter_2F/header.inc index 6f65eba2c..07cbd0d21 100644 --- a/data/maps/DewfordTown_PokemonCenter_2F/header.inc +++ b/data/maps/DewfordTown_PokemonCenter_2F/header.inc @@ -8,7 +8,7 @@ DewfordTown_PokemonCenter_2F:: @ 8305B80 .byte MAPSEC_DEWFORD_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/DoubleBattleColosseum/header.inc b/data/maps/DoubleBattleColosseum/header.inc index 1bcd8ff52..77e74f68e 100644 --- a/data/maps/DoubleBattleColosseum/header.inc +++ b/data/maps/DoubleBattleColosseum/header.inc @@ -8,7 +8,7 @@ DoubleBattleColosseum:: @ 83079CC .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 8 diff --git a/data/maps/EverGrandeCity/header.inc b/data/maps/EverGrandeCity/header.inc index e2698bca6..0ea3e5895 100644 --- a/data/maps/EverGrandeCity/header.inc +++ b/data/maps/EverGrandeCity/header.inc @@ -8,7 +8,7 @@ EverGrandeCity:: @ 8305528 .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte WEATHER_SUNNY - .byte 2 + .byte MAP_TYPE_CITY .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/EverGrandeCity_ChampionsRoom/header.inc b/data/maps/EverGrandeCity_ChampionsRoom/header.inc index fbf4a207d..2120bbd5c 100644 --- a/data/maps/EverGrandeCity_ChampionsRoom/header.inc +++ b/data/maps/EverGrandeCity_ChampionsRoom/header.inc @@ -8,7 +8,7 @@ EverGrandeCity_ChampionsRoom:: @ 8306B08 .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/EverGrandeCity_Corridor1/header.inc b/data/maps/EverGrandeCity_Corridor1/header.inc index 5f0094f42..f8685ae71 100644 --- a/data/maps/EverGrandeCity_Corridor1/header.inc +++ b/data/maps/EverGrandeCity_Corridor1/header.inc @@ -8,7 +8,7 @@ EverGrandeCity_Corridor1:: @ 8306B24 .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/EverGrandeCity_Corridor2/header.inc b/data/maps/EverGrandeCity_Corridor2/header.inc index 3ef9c7ecf..870cbdaf0 100644 --- a/data/maps/EverGrandeCity_Corridor2/header.inc +++ b/data/maps/EverGrandeCity_Corridor2/header.inc @@ -8,7 +8,7 @@ EverGrandeCity_Corridor2:: @ 8306B40 .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/EverGrandeCity_Corridor3/header.inc b/data/maps/EverGrandeCity_Corridor3/header.inc index b20ca5309..f9b05ab51 100644 --- a/data/maps/EverGrandeCity_Corridor3/header.inc +++ b/data/maps/EverGrandeCity_Corridor3/header.inc @@ -8,7 +8,7 @@ EverGrandeCity_Corridor3:: @ 8306B5C .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/EverGrandeCity_Corridor4/header.inc b/data/maps/EverGrandeCity_Corridor4/header.inc index 1f4249601..104fe4cc0 100644 --- a/data/maps/EverGrandeCity_Corridor4/header.inc +++ b/data/maps/EverGrandeCity_Corridor4/header.inc @@ -8,7 +8,7 @@ EverGrandeCity_Corridor4:: @ 8306B78 .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/EverGrandeCity_Corridor5/header.inc b/data/maps/EverGrandeCity_Corridor5/header.inc index bab472a2e..59efd9330 100644 --- a/data/maps/EverGrandeCity_Corridor5/header.inc +++ b/data/maps/EverGrandeCity_Corridor5/header.inc @@ -8,7 +8,7 @@ EverGrandeCity_Corridor5:: @ 8306B94 .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/EverGrandeCity_DrakesRoom/header.inc b/data/maps/EverGrandeCity_DrakesRoom/header.inc index 9d636477b..ab814f3ce 100644 --- a/data/maps/EverGrandeCity_DrakesRoom/header.inc +++ b/data/maps/EverGrandeCity_DrakesRoom/header.inc @@ -8,7 +8,7 @@ EverGrandeCity_DrakesRoom:: @ 8306AEC .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 7 diff --git a/data/maps/EverGrandeCity_GlaciasRoom/header.inc b/data/maps/EverGrandeCity_GlaciasRoom/header.inc index 379f5c6ad..437b8e46a 100644 --- a/data/maps/EverGrandeCity_GlaciasRoom/header.inc +++ b/data/maps/EverGrandeCity_GlaciasRoom/header.inc @@ -8,7 +8,7 @@ EverGrandeCity_GlaciasRoom:: @ 8306AD0 .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 6 diff --git a/data/maps/EverGrandeCity_HallOfFame/header.inc b/data/maps/EverGrandeCity_HallOfFame/header.inc index e80e06438..ab899d0b6 100644 --- a/data/maps/EverGrandeCity_HallOfFame/header.inc +++ b/data/maps/EverGrandeCity_HallOfFame/header.inc @@ -8,7 +8,7 @@ EverGrandeCity_HallOfFame:: @ 8306BCC .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/EverGrandeCity_PhoebesRoom/header.inc b/data/maps/EverGrandeCity_PhoebesRoom/header.inc index ef989ba1d..ca317f6c6 100644 --- a/data/maps/EverGrandeCity_PhoebesRoom/header.inc +++ b/data/maps/EverGrandeCity_PhoebesRoom/header.inc @@ -8,7 +8,7 @@ EverGrandeCity_PhoebesRoom:: @ 8306AB4 .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 5 diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc index c1132827d..3f499e878 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc +++ b/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc @@ -8,7 +8,7 @@ EverGrandeCity_PokemonCenter_1F:: @ 8306BE8 .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc b/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc index 7d9025d64..8bc65391d 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc +++ b/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc @@ -8,7 +8,7 @@ EverGrandeCity_PokemonCenter_2F:: @ 8306C04 .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/EverGrandeCity_PokemonLeague/header.inc b/data/maps/EverGrandeCity_PokemonLeague/header.inc index ed461a017..e3e6c7508 100644 --- a/data/maps/EverGrandeCity_PokemonLeague/header.inc +++ b/data/maps/EverGrandeCity_PokemonLeague/header.inc @@ -8,7 +8,7 @@ EverGrandeCity_PokemonLeague:: @ 8306BB0 .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/EverGrandeCity_SidneysRoom/header.inc b/data/maps/EverGrandeCity_SidneysRoom/header.inc index 780b231a0..5ba789a31 100644 --- a/data/maps/EverGrandeCity_SidneysRoom/header.inc +++ b/data/maps/EverGrandeCity_SidneysRoom/header.inc @@ -8,7 +8,7 @@ EverGrandeCity_SidneysRoom:: @ 8306A98 .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 4 diff --git a/data/maps/FallarborTown/header.inc b/data/maps/FallarborTown/header.inc index c369416e9..a074373b4 100644 --- a/data/maps/FallarborTown/header.inc +++ b/data/maps/FallarborTown/header.inc @@ -8,7 +8,7 @@ FallarborTown:: @ 83055B4 .byte MAPSEC_FALLARBOR_TOWN .byte 0 .byte WEATHER_SUNNY - .byte 1 + .byte MAP_TYPE_TOWN .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/FallarborTown_ContestHall/header.inc b/data/maps/FallarborTown_ContestHall/header.inc index 38ebb2471..c8e79a55d 100644 --- a/data/maps/FallarborTown_ContestHall/header.inc +++ b/data/maps/FallarborTown_ContestHall/header.inc @@ -8,7 +8,7 @@ FallarborTown_ContestHall:: @ 8305CEC .byte MAPSEC_FALLARBOR_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/FallarborTown_ContestLobby/header.inc b/data/maps/FallarborTown_ContestLobby/header.inc index 8ade4110f..e10261315 100644 --- a/data/maps/FallarborTown_ContestLobby/header.inc +++ b/data/maps/FallarborTown_ContestLobby/header.inc @@ -8,7 +8,7 @@ FallarborTown_ContestLobby:: @ 8305CD0 .byte MAPSEC_FALLARBOR_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/FallarborTown_House1/header.inc b/data/maps/FallarborTown_House1/header.inc index b62e28430..2d1c63681 100644 --- a/data/maps/FallarborTown_House1/header.inc +++ b/data/maps/FallarborTown_House1/header.inc @@ -8,7 +8,7 @@ FallarborTown_House1:: @ 8305D40 .byte MAPSEC_FALLARBOR_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/FallarborTown_House2/header.inc b/data/maps/FallarborTown_House2/header.inc index f2d509782..474f18cb3 100644 --- a/data/maps/FallarborTown_House2/header.inc +++ b/data/maps/FallarborTown_House2/header.inc @@ -8,7 +8,7 @@ FallarborTown_House2:: @ 8305D5C .byte MAPSEC_FALLARBOR_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/FallarborTown_Mart/header.inc b/data/maps/FallarborTown_Mart/header.inc index ca22edf3e..038efb590 100644 --- a/data/maps/FallarborTown_Mart/header.inc +++ b/data/maps/FallarborTown_Mart/header.inc @@ -8,7 +8,7 @@ FallarborTown_Mart:: @ 8305CB4 .byte MAPSEC_FALLARBOR_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/FallarborTown_PokemonCenter_1F/header.inc b/data/maps/FallarborTown_PokemonCenter_1F/header.inc index 4908d9fd0..d90786ee1 100644 --- a/data/maps/FallarborTown_PokemonCenter_1F/header.inc +++ b/data/maps/FallarborTown_PokemonCenter_1F/header.inc @@ -8,7 +8,7 @@ FallarborTown_PokemonCenter_1F:: @ 8305D08 .byte MAPSEC_FALLARBOR_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/FallarborTown_PokemonCenter_2F/header.inc b/data/maps/FallarborTown_PokemonCenter_2F/header.inc index 832987fb0..f2a2d0c6c 100644 --- a/data/maps/FallarborTown_PokemonCenter_2F/header.inc +++ b/data/maps/FallarborTown_PokemonCenter_2F/header.inc @@ -8,7 +8,7 @@ FallarborTown_PokemonCenter_2F:: @ 8305D24 .byte MAPSEC_FALLARBOR_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/FieryPath/header.inc b/data/maps/FieryPath/header.inc index 05437213c..681673a28 100644 --- a/data/maps/FieryPath/header.inc +++ b/data/maps/FieryPath/header.inc @@ -8,7 +8,7 @@ FieryPath:: @ 8306EF8 .byte MAPSEC_FIERY_PATH .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/FortreeCity/header.inc b/data/maps/FortreeCity/header.inc index fe916ca3c..72088ca05 100644 --- a/data/maps/FortreeCity/header.inc +++ b/data/maps/FortreeCity/header.inc @@ -8,7 +8,7 @@ FortreeCity:: @ 83054B8 .byte MAPSEC_FORTREE_CITY .byte 0 .byte WEATHER_SUNNY - .byte 2 + .byte MAP_TYPE_CITY .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/FortreeCity_DecorationShop/header.inc b/data/maps/FortreeCity_DecorationShop/header.inc index 31271754b..abc43114f 100644 --- a/data/maps/FortreeCity_DecorationShop/header.inc +++ b/data/maps/FortreeCity_DecorationShop/header.inc @@ -8,7 +8,7 @@ FortreeCity_DecorationShop:: @ 8306504 .byte MAPSEC_FORTREE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/FortreeCity_Gym/header.inc b/data/maps/FortreeCity_Gym/header.inc index 5a2c428ea..80c1cb9ed 100644 --- a/data/maps/FortreeCity_Gym/header.inc +++ b/data/maps/FortreeCity_Gym/header.inc @@ -8,7 +8,7 @@ FortreeCity_Gym:: @ 8306424 .byte MAPSEC_FORTREE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 1 diff --git a/data/maps/FortreeCity_House1/header.inc b/data/maps/FortreeCity_House1/header.inc index 96d70e9ae..6844c97a6 100644 --- a/data/maps/FortreeCity_House1/header.inc +++ b/data/maps/FortreeCity_House1/header.inc @@ -8,7 +8,7 @@ FortreeCity_House1:: @ 8306408 .byte MAPSEC_FORTREE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/FortreeCity_House2/header.inc b/data/maps/FortreeCity_House2/header.inc index fadf57dd9..71ede81de 100644 --- a/data/maps/FortreeCity_House2/header.inc +++ b/data/maps/FortreeCity_House2/header.inc @@ -8,7 +8,7 @@ FortreeCity_House2:: @ 8306494 .byte MAPSEC_FORTREE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/FortreeCity_House3/header.inc b/data/maps/FortreeCity_House3/header.inc index 30997ef40..246277627 100644 --- a/data/maps/FortreeCity_House3/header.inc +++ b/data/maps/FortreeCity_House3/header.inc @@ -8,7 +8,7 @@ FortreeCity_House3:: @ 83064B0 .byte MAPSEC_FORTREE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/FortreeCity_House4/header.inc b/data/maps/FortreeCity_House4/header.inc index 306914ca1..ba0aa16b6 100644 --- a/data/maps/FortreeCity_House4/header.inc +++ b/data/maps/FortreeCity_House4/header.inc @@ -8,7 +8,7 @@ FortreeCity_House4:: @ 83064CC .byte MAPSEC_FORTREE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/FortreeCity_House5/header.inc b/data/maps/FortreeCity_House5/header.inc index 0dca5438d..ffc77a3e3 100644 --- a/data/maps/FortreeCity_House5/header.inc +++ b/data/maps/FortreeCity_House5/header.inc @@ -8,7 +8,7 @@ FortreeCity_House5:: @ 83064E8 .byte MAPSEC_FORTREE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/FortreeCity_Mart/header.inc b/data/maps/FortreeCity_Mart/header.inc index 3c82dbab1..d26b0e769 100644 --- a/data/maps/FortreeCity_Mart/header.inc +++ b/data/maps/FortreeCity_Mart/header.inc @@ -8,7 +8,7 @@ FortreeCity_Mart:: @ 8306478 .byte MAPSEC_FORTREE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/FortreeCity_PokemonCenter_1F/header.inc b/data/maps/FortreeCity_PokemonCenter_1F/header.inc index 229410991..ba1da616f 100644 --- a/data/maps/FortreeCity_PokemonCenter_1F/header.inc +++ b/data/maps/FortreeCity_PokemonCenter_1F/header.inc @@ -8,7 +8,7 @@ FortreeCity_PokemonCenter_1F:: @ 8306440 .byte MAPSEC_FORTREE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/FortreeCity_PokemonCenter_2F/header.inc b/data/maps/FortreeCity_PokemonCenter_2F/header.inc index ca8700a84..ee2c1bca4 100644 --- a/data/maps/FortreeCity_PokemonCenter_2F/header.inc +++ b/data/maps/FortreeCity_PokemonCenter_2F/header.inc @@ -8,7 +8,7 @@ FortreeCity_PokemonCenter_2F:: @ 830645C .byte MAPSEC_FORTREE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/GraniteCave_1F/header.inc b/data/maps/GraniteCave_1F/header.inc index bb37b2323..c8572d09b 100644 --- a/data/maps/GraniteCave_1F/header.inc +++ b/data/maps/GraniteCave_1F/header.inc @@ -8,7 +8,7 @@ GraniteCave_1F:: @ 8306E34 .byte MAPSEC_GRANITE_CAVE .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/GraniteCave_B1F/header.inc b/data/maps/GraniteCave_B1F/header.inc index 6cf10e555..68c0f3c7f 100644 --- a/data/maps/GraniteCave_B1F/header.inc +++ b/data/maps/GraniteCave_B1F/header.inc @@ -8,7 +8,7 @@ GraniteCave_B1F:: @ 8306E50 .byte MAPSEC_GRANITE_CAVE .byte 1 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/GraniteCave_B2F/header.inc b/data/maps/GraniteCave_B2F/header.inc index 39347ab71..738980088 100644 --- a/data/maps/GraniteCave_B2F/header.inc +++ b/data/maps/GraniteCave_B2F/header.inc @@ -8,7 +8,7 @@ GraniteCave_B2F:: @ 8306E6C .byte MAPSEC_GRANITE_CAVE .byte 1 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/GraniteCave_StevensRoom/header.inc b/data/maps/GraniteCave_StevensRoom/header.inc index f599bd9ce..7b6ea5820 100644 --- a/data/maps/GraniteCave_StevensRoom/header.inc +++ b/data/maps/GraniteCave_StevensRoom/header.inc @@ -8,7 +8,7 @@ GraniteCave_StevensRoom:: @ 8306E88 .byte MAPSEC_GRANITE_CAVE .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/InsideOfTruck/header.inc b/data/maps/InsideOfTruck/header.inc index 0a7d172b2..466658ca6 100644 --- a/data/maps/InsideOfTruck/header.inc +++ b/data/maps/InsideOfTruck/header.inc @@ -8,7 +8,7 @@ InsideOfTruck:: @ 8307B38 .byte MAPSEC_INSIDE_OF_TRUCK .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/IslandCave/header.inc b/data/maps/IslandCave/header.inc index a225616e6..205627e8b 100644 --- a/data/maps/IslandCave/header.inc +++ b/data/maps/IslandCave/header.inc @@ -8,7 +8,7 @@ IslandCave:: @ 83074C4 .byte MAPSEC_ISLAND_CAVE .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/JaggedPass/header.inc b/data/maps/JaggedPass/header.inc index 4229556bc..c8dc563df 100644 --- a/data/maps/JaggedPass/header.inc +++ b/data/maps/JaggedPass/header.inc @@ -8,7 +8,7 @@ JaggedPass:: @ 8306EDC .byte MAPSEC_JAGGED_PASS .byte 0 .byte WEATHER_NONE - .byte 3 + .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/LavaridgeTown/header.inc b/data/maps/LavaridgeTown/header.inc index ff1247e0c..29c3dfcf8 100644 --- a/data/maps/LavaridgeTown/header.inc +++ b/data/maps/LavaridgeTown/header.inc @@ -8,7 +8,7 @@ LavaridgeTown:: @ 8305598 .byte MAPSEC_LAVARIDGE_TOWN .byte 0 .byte WEATHER_SUNNY - .byte 1 + .byte MAP_TYPE_TOWN .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/LavaridgeTown_Gym_1F/header.inc b/data/maps/LavaridgeTown_Gym_1F/header.inc index cc7b6a041..543d73a72 100644 --- a/data/maps/LavaridgeTown_Gym_1F/header.inc +++ b/data/maps/LavaridgeTown_Gym_1F/header.inc @@ -8,7 +8,7 @@ LavaridgeTown_Gym_1F:: @ 8305C0C .byte MAPSEC_LAVARIDGE_TOWN .byte 0 .byte WEATHER_FOG_1 - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 1 diff --git a/data/maps/LavaridgeTown_Gym_B1F/header.inc b/data/maps/LavaridgeTown_Gym_B1F/header.inc index 28a526f9d..4fc005285 100644 --- a/data/maps/LavaridgeTown_Gym_B1F/header.inc +++ b/data/maps/LavaridgeTown_Gym_B1F/header.inc @@ -8,7 +8,7 @@ LavaridgeTown_Gym_B1F:: @ 8305C28 .byte MAPSEC_LAVARIDGE_TOWN .byte 0 .byte WEATHER_FOG_1 - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 1 diff --git a/data/maps/LavaridgeTown_HerbShop/header.inc b/data/maps/LavaridgeTown_HerbShop/header.inc index fc647bca7..09c78bafa 100644 --- a/data/maps/LavaridgeTown_HerbShop/header.inc +++ b/data/maps/LavaridgeTown_HerbShop/header.inc @@ -8,7 +8,7 @@ LavaridgeTown_HerbShop:: @ 8305BF0 .byte MAPSEC_LAVARIDGE_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/LavaridgeTown_House/header.inc b/data/maps/LavaridgeTown_House/header.inc index 01c1c07ed..49c155a39 100644 --- a/data/maps/LavaridgeTown_House/header.inc +++ b/data/maps/LavaridgeTown_House/header.inc @@ -8,7 +8,7 @@ LavaridgeTown_House:: @ 8305C44 .byte MAPSEC_LAVARIDGE_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/LavaridgeTown_Mart/header.inc b/data/maps/LavaridgeTown_Mart/header.inc index e110eb8d1..4f8779188 100644 --- a/data/maps/LavaridgeTown_Mart/header.inc +++ b/data/maps/LavaridgeTown_Mart/header.inc @@ -8,7 +8,7 @@ LavaridgeTown_Mart:: @ 8305C60 .byte MAPSEC_LAVARIDGE_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc b/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc index 63fff42ab..e0bee1062 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc +++ b/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc @@ -8,7 +8,7 @@ LavaridgeTown_PokemonCenter_1F:: @ 8305C7C .byte MAPSEC_LAVARIDGE_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc b/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc index c8c4d647d..1a17d7b4d 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc +++ b/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc @@ -8,7 +8,7 @@ LavaridgeTown_PokemonCenter_2F:: @ 8305C98 .byte MAPSEC_LAVARIDGE_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/LilycoveCity/header.inc b/data/maps/LilycoveCity/header.inc index 894507849..be9cdb8f8 100644 --- a/data/maps/LilycoveCity/header.inc +++ b/data/maps/LilycoveCity/header.inc @@ -8,7 +8,7 @@ LilycoveCity:: @ 83054D4 .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_SUNNY - .byte 2 + .byte MAP_TYPE_CITY .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/LilycoveCity_ContestHall/header.inc b/data/maps/LilycoveCity_ContestHall/header.inc index e2c30ab32..503db1b0a 100644 --- a/data/maps/LilycoveCity_ContestHall/header.inc +++ b/data/maps/LilycoveCity_ContestHall/header.inc @@ -8,7 +8,7 @@ LilycoveCity_ContestHall:: @ 83065AC .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_ContestLobby/header.inc b/data/maps/LilycoveCity_ContestLobby/header.inc index df2d526d2..b1bd0bf8f 100644 --- a/data/maps/LilycoveCity_ContestLobby/header.inc +++ b/data/maps/LilycoveCity_ContestLobby/header.inc @@ -8,7 +8,7 @@ LilycoveCity_ContestLobby:: @ 8306590 .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc b/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc index 39b5e3601..21f74e491 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc +++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc @@ -8,7 +8,7 @@ LilycoveCity_CoveLilyMotel_1F:: @ 8306520 .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc b/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc index 660c3f4b7..4f3b48379 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc +++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc @@ -8,7 +8,7 @@ LilycoveCity_CoveLilyMotel_2F:: @ 830653C .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc b/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc index ebf5ca0b6..9bb512a84 100644 --- a/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc +++ b/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc @@ -8,7 +8,7 @@ LilycoveCity_DepartmentStoreElevator:: @ 83067A4 .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc index 7497fcdbd..87212df01 100644 --- a/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc +++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc @@ -8,7 +8,7 @@ LilycoveCity_DepartmentStoreRooftop:: @ 8306788 .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/header.inc b/data/maps/LilycoveCity_DepartmentStore_1F/header.inc index 9d08da924..b717b1dd3 100644 --- a/data/maps/LilycoveCity_DepartmentStore_1F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_1F/header.inc @@ -8,7 +8,7 @@ LilycoveCity_DepartmentStore_1F:: @ 83066FC .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_DepartmentStore_2F/header.inc b/data/maps/LilycoveCity_DepartmentStore_2F/header.inc index 27403ca84..1297e8839 100644 --- a/data/maps/LilycoveCity_DepartmentStore_2F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_2F/header.inc @@ -8,7 +8,7 @@ LilycoveCity_DepartmentStore_2F:: @ 8306718 .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_DepartmentStore_3F/header.inc b/data/maps/LilycoveCity_DepartmentStore_3F/header.inc index 574f3bc8b..8fa6f4fa2 100644 --- a/data/maps/LilycoveCity_DepartmentStore_3F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_3F/header.inc @@ -8,7 +8,7 @@ LilycoveCity_DepartmentStore_3F:: @ 8306734 .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_DepartmentStore_4F/header.inc b/data/maps/LilycoveCity_DepartmentStore_4F/header.inc index f395a6c07..c67c412f5 100644 --- a/data/maps/LilycoveCity_DepartmentStore_4F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_4F/header.inc @@ -8,7 +8,7 @@ LilycoveCity_DepartmentStore_4F:: @ 8306750 .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/header.inc b/data/maps/LilycoveCity_DepartmentStore_5F/header.inc index bf6e8463d..ec78aa1f9 100644 --- a/data/maps/LilycoveCity_DepartmentStore_5F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_5F/header.inc @@ -8,7 +8,7 @@ LilycoveCity_DepartmentStore_5F:: @ 830676C .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_EmptyMap/header.inc b/data/maps/LilycoveCity_EmptyMap/header.inc index 463ffe1c4..79c1c2a0f 100644 --- a/data/maps/LilycoveCity_EmptyMap/header.inc +++ b/data/maps/LilycoveCity_EmptyMap/header.inc @@ -8,7 +8,7 @@ LilycoveCity_EmptyMap:: @ 8306654 .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_Harbor/header.inc b/data/maps/LilycoveCity_Harbor/header.inc index b673fc6c6..47a4de691 100644 --- a/data/maps/LilycoveCity_Harbor/header.inc +++ b/data/maps/LilycoveCity_Harbor/header.inc @@ -8,7 +8,7 @@ LilycoveCity_Harbor:: @ 8306638 .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_House1/header.inc b/data/maps/LilycoveCity_House1/header.inc index 79f604787..d67fd50ad 100644 --- a/data/maps/LilycoveCity_House1/header.inc +++ b/data/maps/LilycoveCity_House1/header.inc @@ -8,7 +8,7 @@ LilycoveCity_House1:: @ 830668C .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_House2/header.inc b/data/maps/LilycoveCity_House2/header.inc index fe11ad801..aeef9e507 100644 --- a/data/maps/LilycoveCity_House2/header.inc +++ b/data/maps/LilycoveCity_House2/header.inc @@ -8,7 +8,7 @@ LilycoveCity_House2:: @ 83066A8 .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_House3/header.inc b/data/maps/LilycoveCity_House3/header.inc index 4b068d0cd..b56cdf9bf 100644 --- a/data/maps/LilycoveCity_House3/header.inc +++ b/data/maps/LilycoveCity_House3/header.inc @@ -8,7 +8,7 @@ LilycoveCity_House3:: @ 83066C4 .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_House4/header.inc b/data/maps/LilycoveCity_House4/header.inc index a814cf979..bf2850606 100644 --- a/data/maps/LilycoveCity_House4/header.inc +++ b/data/maps/LilycoveCity_House4/header.inc @@ -8,7 +8,7 @@ LilycoveCity_House4:: @ 83066E0 .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc b/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc index ace7e9249..c19473dab 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc @@ -8,7 +8,7 @@ LilycoveCity_LilycoveMuseum_1F:: @ 8306558 .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc index e39663e7a..de5f7ddad 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc @@ -8,7 +8,7 @@ LilycoveCity_LilycoveMuseum_2F:: @ 8306574 .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_MoveDeletersHouse/header.inc b/data/maps/LilycoveCity_MoveDeletersHouse/header.inc index ec4d01087..12c650b26 100644 --- a/data/maps/LilycoveCity_MoveDeletersHouse/header.inc +++ b/data/maps/LilycoveCity_MoveDeletersHouse/header.inc @@ -8,7 +8,7 @@ LilycoveCity_MoveDeletersHouse:: @ 8306670 .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_PokemonCenter_1F/header.inc b/data/maps/LilycoveCity_PokemonCenter_1F/header.inc index 174043d19..5a94e080e 100644 --- a/data/maps/LilycoveCity_PokemonCenter_1F/header.inc +++ b/data/maps/LilycoveCity_PokemonCenter_1F/header.inc @@ -8,7 +8,7 @@ LilycoveCity_PokemonCenter_1F:: @ 83065C8 .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_PokemonCenter_2F/header.inc b/data/maps/LilycoveCity_PokemonCenter_2F/header.inc index 1b01f3f10..2ed2bb057 100644 --- a/data/maps/LilycoveCity_PokemonCenter_2F/header.inc +++ b/data/maps/LilycoveCity_PokemonCenter_2F/header.inc @@ -8,7 +8,7 @@ LilycoveCity_PokemonCenter_2F:: @ 83065E4 .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc index 00892a27e..e12bca1f1 100644 --- a/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc +++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc @@ -8,7 +8,7 @@ LilycoveCity_PokemonTrainerFanClub:: @ 830661C .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_UnusedMart/header.inc b/data/maps/LilycoveCity_UnusedMart/header.inc index 246dc32be..0b49616ff 100644 --- a/data/maps/LilycoveCity_UnusedMart/header.inc +++ b/data/maps/LilycoveCity_UnusedMart/header.inc @@ -8,7 +8,7 @@ LilycoveCity_UnusedMart:: @ 8306600 .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/LinkContestRoom1/header.inc b/data/maps/LinkContestRoom1/header.inc index 86468e12a..2e4570a1e 100644 --- a/data/maps/LinkContestRoom1/header.inc +++ b/data/maps/LinkContestRoom1/header.inc @@ -8,7 +8,7 @@ LinkContestRoom1:: @ 83079E8 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/LinkContestRoom2/header.inc b/data/maps/LinkContestRoom2/header.inc index b692a095a..d0603beca 100644 --- a/data/maps/LinkContestRoom2/header.inc +++ b/data/maps/LinkContestRoom2/header.inc @@ -8,7 +8,7 @@ LinkContestRoom2:: @ 8307AAC .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/LinkContestRoom3/header.inc b/data/maps/LinkContestRoom3/header.inc index 0e6dc2892..f2b54e921 100644 --- a/data/maps/LinkContestRoom3/header.inc +++ b/data/maps/LinkContestRoom3/header.inc @@ -8,7 +8,7 @@ LinkContestRoom3:: @ 8307AC8 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/LinkContestRoom4/header.inc b/data/maps/LinkContestRoom4/header.inc index 81eef5228..2d5accdbd 100644 --- a/data/maps/LinkContestRoom4/header.inc +++ b/data/maps/LinkContestRoom4/header.inc @@ -8,7 +8,7 @@ LinkContestRoom4:: @ 8307AE4 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/LinkContestRoom5/header.inc b/data/maps/LinkContestRoom5/header.inc index 8cfccbefd..7871634dd 100644 --- a/data/maps/LinkContestRoom5/header.inc +++ b/data/maps/LinkContestRoom5/header.inc @@ -8,7 +8,7 @@ LinkContestRoom5:: @ 8307B00 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/LinkContestRoom6/header.inc b/data/maps/LinkContestRoom6/header.inc index b192f855f..61ddc155d 100644 --- a/data/maps/LinkContestRoom6/header.inc +++ b/data/maps/LinkContestRoom6/header.inc @@ -8,7 +8,7 @@ LinkContestRoom6:: @ 8307B1C .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/LittlerootTown/header.inc b/data/maps/LittlerootTown/header.inc index 22cafceda..148df6639 100644 --- a/data/maps/LittlerootTown/header.inc +++ b/data/maps/LittlerootTown/header.inc @@ -8,7 +8,7 @@ LittlerootTown:: @ 8305544 .byte MAPSEC_LITTLEROOT_TOWN .byte 0 .byte WEATHER_SUNNY - .byte 1 + .byte MAP_TYPE_TOWN .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/header.inc b/data/maps/LittlerootTown_BrendansHouse_1F/header.inc index b52e72f56..f4b850f85 100644 --- a/data/maps/LittlerootTown_BrendansHouse_1F/header.inc +++ b/data/maps/LittlerootTown_BrendansHouse_1F/header.inc @@ -8,7 +8,7 @@ LittlerootTown_BrendansHouse_1F:: @ 8305A30 .byte MAPSEC_LITTLEROOT_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/header.inc b/data/maps/LittlerootTown_BrendansHouse_2F/header.inc index 30fa363a5..66b7958db 100644 --- a/data/maps/LittlerootTown_BrendansHouse_2F/header.inc +++ b/data/maps/LittlerootTown_BrendansHouse_2F/header.inc @@ -8,7 +8,7 @@ LittlerootTown_BrendansHouse_2F:: @ 8305A4C .byte MAPSEC_LITTLEROOT_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/LittlerootTown_MaysHouse_1F/header.inc b/data/maps/LittlerootTown_MaysHouse_1F/header.inc index 841b4292d..5689d53fb 100644 --- a/data/maps/LittlerootTown_MaysHouse_1F/header.inc +++ b/data/maps/LittlerootTown_MaysHouse_1F/header.inc @@ -8,7 +8,7 @@ LittlerootTown_MaysHouse_1F:: @ 8305A68 .byte MAPSEC_LITTLEROOT_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/LittlerootTown_MaysHouse_2F/header.inc b/data/maps/LittlerootTown_MaysHouse_2F/header.inc index 82f9e51da..fff38cdfe 100644 --- a/data/maps/LittlerootTown_MaysHouse_2F/header.inc +++ b/data/maps/LittlerootTown_MaysHouse_2F/header.inc @@ -8,7 +8,7 @@ LittlerootTown_MaysHouse_2F:: @ 8305A84 .byte MAPSEC_LITTLEROOT_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc index fbcd67c94..324fa3bb7 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc @@ -8,7 +8,7 @@ LittlerootTown_ProfessorBirchsLab:: @ 8305AA0 .byte MAPSEC_LITTLEROOT_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/MagmaHideout_1F/header.inc b/data/maps/MagmaHideout_1F/header.inc index 30e74f114..ad6630fd7 100644 --- a/data/maps/MagmaHideout_1F/header.inc +++ b/data/maps/MagmaHideout_1F/header.inc @@ -8,7 +8,7 @@ MagmaHideout_1F:: @ 8307588 .byte MAPSEC_EVIL_TEAM_HIDEOUT .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 1 .byte 2 diff --git a/data/maps/MagmaHideout_B1F/header.inc b/data/maps/MagmaHideout_B1F/header.inc index 9d62ae97e..f13e4c11d 100644 --- a/data/maps/MagmaHideout_B1F/header.inc +++ b/data/maps/MagmaHideout_B1F/header.inc @@ -8,7 +8,7 @@ MagmaHideout_B1F:: @ 83075A4 .byte MAPSEC_EVIL_TEAM_HIDEOUT .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 1 .byte 2 diff --git a/data/maps/MagmaHideout_B2F/header.inc b/data/maps/MagmaHideout_B2F/header.inc index aaf19142c..ed031c644 100644 --- a/data/maps/MagmaHideout_B2F/header.inc +++ b/data/maps/MagmaHideout_B2F/header.inc @@ -8,7 +8,7 @@ MagmaHideout_B2F:: @ 83075C0 .byte MAPSEC_EVIL_TEAM_HIDEOUT .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 1 .byte 2 diff --git a/data/maps/MauvilleCity/header.inc b/data/maps/MauvilleCity/header.inc index ce31e4c56..5bdb4ac26 100644 --- a/data/maps/MauvilleCity/header.inc +++ b/data/maps/MauvilleCity/header.inc @@ -8,7 +8,7 @@ MauvilleCity:: @ 8305480 .byte MAPSEC_MAUVILLE_CITY .byte 0 .byte WEATHER_SUNNY - .byte 2 + .byte MAP_TYPE_CITY .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/MauvilleCity_BikeShop/header.inc b/data/maps/MauvilleCity_BikeShop/header.inc index 88c493a1f..fd2750c0c 100644 --- a/data/maps/MauvilleCity_BikeShop/header.inc +++ b/data/maps/MauvilleCity_BikeShop/header.inc @@ -8,7 +8,7 @@ MauvilleCity_BikeShop:: @ 8306168 .byte MAPSEC_MAUVILLE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/MauvilleCity_GameCorner/header.inc b/data/maps/MauvilleCity_GameCorner/header.inc index 4ff122c70..c5ded2c14 100644 --- a/data/maps/MauvilleCity_GameCorner/header.inc +++ b/data/maps/MauvilleCity_GameCorner/header.inc @@ -8,7 +8,7 @@ MauvilleCity_GameCorner:: @ 83061A0 .byte MAPSEC_MAUVILLE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/MauvilleCity_Gym/header.inc b/data/maps/MauvilleCity_Gym/header.inc index 7ac3e60db..bbb862021 100644 --- a/data/maps/MauvilleCity_Gym/header.inc +++ b/data/maps/MauvilleCity_Gym/header.inc @@ -8,7 +8,7 @@ MauvilleCity_Gym:: @ 830614C .byte MAPSEC_MAUVILLE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 1 diff --git a/data/maps/MauvilleCity_House1/header.inc b/data/maps/MauvilleCity_House1/header.inc index ce170e2ea..809d45406 100644 --- a/data/maps/MauvilleCity_House1/header.inc +++ b/data/maps/MauvilleCity_House1/header.inc @@ -8,7 +8,7 @@ MauvilleCity_House1:: @ 8306184 .byte MAPSEC_MAUVILLE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/MauvilleCity_House2/header.inc b/data/maps/MauvilleCity_House2/header.inc index 114991fb2..31269c3cc 100644 --- a/data/maps/MauvilleCity_House2/header.inc +++ b/data/maps/MauvilleCity_House2/header.inc @@ -8,7 +8,7 @@ MauvilleCity_House2:: @ 83061BC .byte MAPSEC_MAUVILLE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/MauvilleCity_Mart/header.inc b/data/maps/MauvilleCity_Mart/header.inc index b8b5543e7..e7e6eeeaa 100644 --- a/data/maps/MauvilleCity_Mart/header.inc +++ b/data/maps/MauvilleCity_Mart/header.inc @@ -8,7 +8,7 @@ MauvilleCity_Mart:: @ 8306210 .byte MAPSEC_MAUVILLE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/MauvilleCity_PokemonCenter_1F/header.inc b/data/maps/MauvilleCity_PokemonCenter_1F/header.inc index a040b8302..2245b114d 100644 --- a/data/maps/MauvilleCity_PokemonCenter_1F/header.inc +++ b/data/maps/MauvilleCity_PokemonCenter_1F/header.inc @@ -8,7 +8,7 @@ MauvilleCity_PokemonCenter_1F:: @ 83061D8 .byte MAPSEC_MAUVILLE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/MauvilleCity_PokemonCenter_2F/header.inc b/data/maps/MauvilleCity_PokemonCenter_2F/header.inc index 1558e9805..a4d3f4ff3 100644 --- a/data/maps/MauvilleCity_PokemonCenter_2F/header.inc +++ b/data/maps/MauvilleCity_PokemonCenter_2F/header.inc @@ -8,7 +8,7 @@ MauvilleCity_PokemonCenter_2F:: @ 83061F4 .byte MAPSEC_MAUVILLE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/MeteorFalls_1F_1R/header.inc b/data/maps/MeteorFalls_1F_1R/header.inc index a37240eb3..f9b93ee19 100644 --- a/data/maps/MeteorFalls_1F_1R/header.inc +++ b/data/maps/MeteorFalls_1F_1R/header.inc @@ -8,7 +8,7 @@ MeteorFalls_1F_1R:: @ 8306D70 .byte MAPSEC_METEOR_FALLS .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/MeteorFalls_1F_2R/header.inc b/data/maps/MeteorFalls_1F_2R/header.inc index f8ae25204..dea9dbfd0 100644 --- a/data/maps/MeteorFalls_1F_2R/header.inc +++ b/data/maps/MeteorFalls_1F_2R/header.inc @@ -8,7 +8,7 @@ MeteorFalls_1F_2R:: @ 8306D8C .byte MAPSEC_METEOR_FALLS .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/MeteorFalls_B1F_1R/header.inc b/data/maps/MeteorFalls_B1F_1R/header.inc index b18035650..a64b5c369 100644 --- a/data/maps/MeteorFalls_B1F_1R/header.inc +++ b/data/maps/MeteorFalls_B1F_1R/header.inc @@ -8,7 +8,7 @@ MeteorFalls_B1F_1R:: @ 8306DA8 .byte MAPSEC_METEOR_FALLS .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/MeteorFalls_B1F_2R/header.inc b/data/maps/MeteorFalls_B1F_2R/header.inc index 88a145b9a..85b8d69c7 100644 --- a/data/maps/MeteorFalls_B1F_2R/header.inc +++ b/data/maps/MeteorFalls_B1F_2R/header.inc @@ -8,7 +8,7 @@ MeteorFalls_B1F_2R:: @ 8306DC4 .byte MAPSEC_METEOR_FALLS .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/MossdeepCity/header.inc b/data/maps/MossdeepCity/header.inc index 6602cc4c0..a7f41311c 100644 --- a/data/maps/MossdeepCity/header.inc +++ b/data/maps/MossdeepCity/header.inc @@ -8,7 +8,7 @@ MossdeepCity:: @ 83054F0 .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte WEATHER_SUNNY - .byte 2 + .byte MAP_TYPE_CITY .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/MossdeepCity_GameCorner_1F/header.inc b/data/maps/MossdeepCity_GameCorner_1F/header.inc index 0aec2853a..596816e9b 100644 --- a/data/maps/MossdeepCity_GameCorner_1F/header.inc +++ b/data/maps/MossdeepCity_GameCorner_1F/header.inc @@ -8,7 +8,7 @@ MossdeepCity_GameCorner_1F:: @ 83068F4 .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/MossdeepCity_GameCorner_B1F/header.inc b/data/maps/MossdeepCity_GameCorner_B1F/header.inc index afa7bde80..1a5b81fba 100644 --- a/data/maps/MossdeepCity_GameCorner_B1F/header.inc +++ b/data/maps/MossdeepCity_GameCorner_B1F/header.inc @@ -8,7 +8,7 @@ MossdeepCity_GameCorner_B1F:: @ 8306910 .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/MossdeepCity_Gym/header.inc b/data/maps/MossdeepCity_Gym/header.inc index 5968775c0..560ee4e9d 100644 --- a/data/maps/MossdeepCity_Gym/header.inc +++ b/data/maps/MossdeepCity_Gym/header.inc @@ -8,7 +8,7 @@ MossdeepCity_Gym:: @ 83067C0 .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 1 diff --git a/data/maps/MossdeepCity_House1/header.inc b/data/maps/MossdeepCity_House1/header.inc index ca0150822..f5d413d81 100644 --- a/data/maps/MossdeepCity_House1/header.inc +++ b/data/maps/MossdeepCity_House1/header.inc @@ -8,7 +8,7 @@ MossdeepCity_House1:: @ 83067DC .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/MossdeepCity_House2/header.inc b/data/maps/MossdeepCity_House2/header.inc index 4a41ce5b0..ff1ab5379 100644 --- a/data/maps/MossdeepCity_House2/header.inc +++ b/data/maps/MossdeepCity_House2/header.inc @@ -8,7 +8,7 @@ MossdeepCity_House2:: @ 83067F8 .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/MossdeepCity_House3/header.inc b/data/maps/MossdeepCity_House3/header.inc index 52b897474..76a0fffb6 100644 --- a/data/maps/MossdeepCity_House3/header.inc +++ b/data/maps/MossdeepCity_House3/header.inc @@ -8,7 +8,7 @@ MossdeepCity_House3:: @ 8306868 .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/MossdeepCity_House4/header.inc b/data/maps/MossdeepCity_House4/header.inc index e7471fd62..7d4f16f20 100644 --- a/data/maps/MossdeepCity_House4/header.inc +++ b/data/maps/MossdeepCity_House4/header.inc @@ -8,7 +8,7 @@ MossdeepCity_House4:: @ 83068A0 .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/MossdeepCity_Mart/header.inc b/data/maps/MossdeepCity_Mart/header.inc index fce4c42df..7e8a4c9a4 100644 --- a/data/maps/MossdeepCity_Mart/header.inc +++ b/data/maps/MossdeepCity_Mart/header.inc @@ -8,7 +8,7 @@ MossdeepCity_Mart:: @ 830684C .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/MossdeepCity_PokemonCenter_1F/header.inc b/data/maps/MossdeepCity_PokemonCenter_1F/header.inc index 55b2b5ff0..d061f4b0d 100644 --- a/data/maps/MossdeepCity_PokemonCenter_1F/header.inc +++ b/data/maps/MossdeepCity_PokemonCenter_1F/header.inc @@ -8,7 +8,7 @@ MossdeepCity_PokemonCenter_1F:: @ 8306814 .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/MossdeepCity_PokemonCenter_2F/header.inc b/data/maps/MossdeepCity_PokemonCenter_2F/header.inc index cd1506e76..5b0bedaf4 100644 --- a/data/maps/MossdeepCity_PokemonCenter_2F/header.inc +++ b/data/maps/MossdeepCity_PokemonCenter_2F/header.inc @@ -8,7 +8,7 @@ MossdeepCity_PokemonCenter_2F:: @ 8306830 .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/header.inc b/data/maps/MossdeepCity_SpaceCenter_1F/header.inc index 1ffe38a89..c9167bede 100644 --- a/data/maps/MossdeepCity_SpaceCenter_1F/header.inc +++ b/data/maps/MossdeepCity_SpaceCenter_1F/header.inc @@ -8,7 +8,7 @@ MossdeepCity_SpaceCenter_1F:: @ 83068BC .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/header.inc b/data/maps/MossdeepCity_SpaceCenter_2F/header.inc index adfefc039..262b57f82 100644 --- a/data/maps/MossdeepCity_SpaceCenter_2F/header.inc +++ b/data/maps/MossdeepCity_SpaceCenter_2F/header.inc @@ -8,7 +8,7 @@ MossdeepCity_SpaceCenter_2F:: @ 83068D8 .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/MossdeepCity_StevensHouse/header.inc b/data/maps/MossdeepCity_StevensHouse/header.inc index fb1c1e84b..f02432216 100644 --- a/data/maps/MossdeepCity_StevensHouse/header.inc +++ b/data/maps/MossdeepCity_StevensHouse/header.inc @@ -8,7 +8,7 @@ MossdeepCity_StevensHouse:: @ 8306884 .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/MtChimney/header.inc b/data/maps/MtChimney/header.inc index 84871bbce..3660719ec 100644 --- a/data/maps/MtChimney/header.inc +++ b/data/maps/MtChimney/header.inc @@ -8,7 +8,7 @@ MtChimney:: @ 8306EC0 .byte MAPSEC_MT_CHIMNEY .byte 0 .byte WEATHER_ASH - .byte 3 + .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/MtChimney_CableCarStation/header.inc b/data/maps/MtChimney_CableCarStation/header.inc index 0e1f7e70d..1cc4f5b68 100644 --- a/data/maps/MtChimney_CableCarStation/header.inc +++ b/data/maps/MtChimney_CableCarStation/header.inc @@ -8,7 +8,7 @@ MtChimney_CableCarStation:: @ 8306CAC .byte MAPSEC_MT_CHIMNEY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/MtPyre_1F/header.inc b/data/maps/MtPyre_1F/header.inc index fbfe0ce06..8ac59ab5f 100644 --- a/data/maps/MtPyre_1F/header.inc +++ b/data/maps/MtPyre_1F/header.inc @@ -8,7 +8,7 @@ MtPyre_1F:: @ 8306F14 .byte MAPSEC_MT_PYRE .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/MtPyre_2F/header.inc b/data/maps/MtPyre_2F/header.inc index 726d0b074..d0485cea1 100644 --- a/data/maps/MtPyre_2F/header.inc +++ b/data/maps/MtPyre_2F/header.inc @@ -8,7 +8,7 @@ MtPyre_2F:: @ 8306F30 .byte MAPSEC_MT_PYRE .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/MtPyre_3F/header.inc b/data/maps/MtPyre_3F/header.inc index cef743b5b..2a99e77f0 100644 --- a/data/maps/MtPyre_3F/header.inc +++ b/data/maps/MtPyre_3F/header.inc @@ -8,7 +8,7 @@ MtPyre_3F:: @ 8306F4C .byte MAPSEC_MT_PYRE .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/MtPyre_4F/header.inc b/data/maps/MtPyre_4F/header.inc index 85e3b82fc..8e4ce5931 100644 --- a/data/maps/MtPyre_4F/header.inc +++ b/data/maps/MtPyre_4F/header.inc @@ -8,7 +8,7 @@ MtPyre_4F:: @ 8306F68 .byte MAPSEC_MT_PYRE .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/MtPyre_5F/header.inc b/data/maps/MtPyre_5F/header.inc index c2793a829..756adc96d 100644 --- a/data/maps/MtPyre_5F/header.inc +++ b/data/maps/MtPyre_5F/header.inc @@ -8,7 +8,7 @@ MtPyre_5F:: @ 8306F84 .byte MAPSEC_MT_PYRE .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/MtPyre_6F/header.inc b/data/maps/MtPyre_6F/header.inc index 091951b0f..734f14e26 100644 --- a/data/maps/MtPyre_6F/header.inc +++ b/data/maps/MtPyre_6F/header.inc @@ -8,7 +8,7 @@ MtPyre_6F:: @ 8306FA0 .byte MAPSEC_MT_PYRE .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/MtPyre_Exterior/header.inc b/data/maps/MtPyre_Exterior/header.inc index f2978daf7..e058ed4d5 100644 --- a/data/maps/MtPyre_Exterior/header.inc +++ b/data/maps/MtPyre_Exterior/header.inc @@ -8,7 +8,7 @@ MtPyre_Exterior:: @ 8306FBC .byte MAPSEC_MT_PYRE .byte 0 .byte WEATHER_NONE - .byte 3 + .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/MtPyre_Summit/header.inc b/data/maps/MtPyre_Summit/header.inc index 32d205526..6cc6f5e73 100644 --- a/data/maps/MtPyre_Summit/header.inc +++ b/data/maps/MtPyre_Summit/header.inc @@ -8,7 +8,7 @@ MtPyre_Summit:: @ 8306FD8 .byte MAPSEC_MT_PYRE .byte 0 .byte WEATHER_FOG_1 - .byte 3 + .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/NewMauville_Entrance/header.inc b/data/maps/NewMauville_Entrance/header.inc index a90bb8d98..53bd09029 100644 --- a/data/maps/NewMauville_Entrance/header.inc +++ b/data/maps/NewMauville_Entrance/header.inc @@ -8,7 +8,7 @@ NewMauville_Entrance:: @ 8307320 .byte MAPSEC_NEW_MAUVILLE .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/NewMauville_Inside/header.inc b/data/maps/NewMauville_Inside/header.inc index 9b5d04a42..8d7d27e44 100644 --- a/data/maps/NewMauville_Inside/header.inc +++ b/data/maps/NewMauville_Inside/header.inc @@ -8,7 +8,7 @@ NewMauville_Inside:: @ 830733C .byte MAPSEC_NEW_MAUVILLE .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/OldaleTown/header.inc b/data/maps/OldaleTown/header.inc index 822507c96..092372be7 100644 --- a/data/maps/OldaleTown/header.inc +++ b/data/maps/OldaleTown/header.inc @@ -8,7 +8,7 @@ OldaleTown:: @ 8305560 .byte MAPSEC_OLDALE_TOWN .byte 0 .byte WEATHER_SUNNY - .byte 1 + .byte MAP_TYPE_TOWN .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/OldaleTown_House1/header.inc b/data/maps/OldaleTown_House1/header.inc index 05d20a2c3..632e40dec 100644 --- a/data/maps/OldaleTown_House1/header.inc +++ b/data/maps/OldaleTown_House1/header.inc @@ -8,7 +8,7 @@ OldaleTown_House1:: @ 8305ABC .byte MAPSEC_OLDALE_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/OldaleTown_House2/header.inc b/data/maps/OldaleTown_House2/header.inc index e62c95dfb..b59f56f1a 100644 --- a/data/maps/OldaleTown_House2/header.inc +++ b/data/maps/OldaleTown_House2/header.inc @@ -8,7 +8,7 @@ OldaleTown_House2:: @ 8305AD8 .byte MAPSEC_OLDALE_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/OldaleTown_Mart/header.inc b/data/maps/OldaleTown_Mart/header.inc index bfc8b43fa..58e8aba90 100644 --- a/data/maps/OldaleTown_Mart/header.inc +++ b/data/maps/OldaleTown_Mart/header.inc @@ -8,7 +8,7 @@ OldaleTown_Mart:: @ 8305B2C .byte MAPSEC_OLDALE_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/OldaleTown_PokemonCenter_1F/header.inc b/data/maps/OldaleTown_PokemonCenter_1F/header.inc index 53305c00d..b2d5af33a 100644 --- a/data/maps/OldaleTown_PokemonCenter_1F/header.inc +++ b/data/maps/OldaleTown_PokemonCenter_1F/header.inc @@ -8,7 +8,7 @@ OldaleTown_PokemonCenter_1F:: @ 8305AF4 .byte MAPSEC_OLDALE_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/OldaleTown_PokemonCenter_2F/header.inc b/data/maps/OldaleTown_PokemonCenter_2F/header.inc index 74a468d80..5065e1aa6 100644 --- a/data/maps/OldaleTown_PokemonCenter_2F/header.inc +++ b/data/maps/OldaleTown_PokemonCenter_2F/header.inc @@ -8,7 +8,7 @@ OldaleTown_PokemonCenter_2F:: @ 8305B10 .byte MAPSEC_OLDALE_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/PacifidlogTown/header.inc b/data/maps/PacifidlogTown/header.inc index 1ed15c94b..3e65ddaad 100644 --- a/data/maps/PacifidlogTown/header.inc +++ b/data/maps/PacifidlogTown/header.inc @@ -8,7 +8,7 @@ PacifidlogTown:: @ 83055EC .byte MAPSEC_PACIFIDLOG_TOWN .byte 0 .byte WEATHER_SUNNY - .byte 1 + .byte MAP_TYPE_TOWN .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/PacifidlogTown_House1/header.inc b/data/maps/PacifidlogTown_House1/header.inc index f1f377547..170b80287 100644 --- a/data/maps/PacifidlogTown_House1/header.inc +++ b/data/maps/PacifidlogTown_House1/header.inc @@ -8,7 +8,7 @@ PacifidlogTown_House1:: @ 8305E90 .byte MAPSEC_PACIFIDLOG_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/PacifidlogTown_House2/header.inc b/data/maps/PacifidlogTown_House2/header.inc index 5d586fb3e..575d19c5d 100644 --- a/data/maps/PacifidlogTown_House2/header.inc +++ b/data/maps/PacifidlogTown_House2/header.inc @@ -8,7 +8,7 @@ PacifidlogTown_House2:: @ 8305EAC .byte MAPSEC_PACIFIDLOG_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/PacifidlogTown_House3/header.inc b/data/maps/PacifidlogTown_House3/header.inc index f889259ce..bbb0e4711 100644 --- a/data/maps/PacifidlogTown_House3/header.inc +++ b/data/maps/PacifidlogTown_House3/header.inc @@ -8,7 +8,7 @@ PacifidlogTown_House3:: @ 8305EC8 .byte MAPSEC_PACIFIDLOG_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/PacifidlogTown_House4/header.inc b/data/maps/PacifidlogTown_House4/header.inc index bd5ab6270..61e6e515b 100644 --- a/data/maps/PacifidlogTown_House4/header.inc +++ b/data/maps/PacifidlogTown_House4/header.inc @@ -8,7 +8,7 @@ PacifidlogTown_House4:: @ 8305EE4 .byte MAPSEC_PACIFIDLOG_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/PacifidlogTown_House5/header.inc b/data/maps/PacifidlogTown_House5/header.inc index 90515cc79..55dfda7ec 100644 --- a/data/maps/PacifidlogTown_House5/header.inc +++ b/data/maps/PacifidlogTown_House5/header.inc @@ -8,7 +8,7 @@ PacifidlogTown_House5:: @ 8305F00 .byte MAPSEC_PACIFIDLOG_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc b/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc index 332274802..3168da669 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc +++ b/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc @@ -8,7 +8,7 @@ PacifidlogTown_PokemonCenter_1F:: @ 8305E58 .byte MAPSEC_PACIFIDLOG_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc b/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc index 2f71ff564..eb19b655d 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc +++ b/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc @@ -8,7 +8,7 @@ PacifidlogTown_PokemonCenter_2F:: @ 8305E74 .byte MAPSEC_PACIFIDLOG_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/PetalburgCity/header.inc b/data/maps/PetalburgCity/header.inc index db85c511a..1c5ed76ef 100644 --- a/data/maps/PetalburgCity/header.inc +++ b/data/maps/PetalburgCity/header.inc @@ -8,7 +8,7 @@ PetalburgCity:: @ 8305448 .byte MAPSEC_PETALBURG_CITY .byte 0 .byte WEATHER_SUNNY - .byte 2 + .byte MAP_TYPE_CITY .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/PetalburgCity_Gym/header.inc b/data/maps/PetalburgCity_Gym/header.inc index 4d225221c..86d17dd19 100644 --- a/data/maps/PetalburgCity_Gym/header.inc +++ b/data/maps/PetalburgCity_Gym/header.inc @@ -8,7 +8,7 @@ PetalburgCity_Gym:: @ 8305F38 .byte MAPSEC_PETALBURG_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 1 diff --git a/data/maps/PetalburgCity_House1/header.inc b/data/maps/PetalburgCity_House1/header.inc index d4ca14c65..7610d9d81 100644 --- a/data/maps/PetalburgCity_House1/header.inc +++ b/data/maps/PetalburgCity_House1/header.inc @@ -8,7 +8,7 @@ PetalburgCity_House1:: @ 8305F54 .byte MAPSEC_PETALBURG_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/PetalburgCity_House2/header.inc b/data/maps/PetalburgCity_House2/header.inc index 5637a2bef..956064137 100644 --- a/data/maps/PetalburgCity_House2/header.inc +++ b/data/maps/PetalburgCity_House2/header.inc @@ -8,7 +8,7 @@ PetalburgCity_House2:: @ 8305F70 .byte MAPSEC_PETALBURG_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/PetalburgCity_Mart/header.inc b/data/maps/PetalburgCity_Mart/header.inc index aef1d717b..ddbfb54b7 100644 --- a/data/maps/PetalburgCity_Mart/header.inc +++ b/data/maps/PetalburgCity_Mart/header.inc @@ -8,7 +8,7 @@ PetalburgCity_Mart:: @ 8305FC4 .byte MAPSEC_PETALBURG_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/PetalburgCity_PokemonCenter_1F/header.inc b/data/maps/PetalburgCity_PokemonCenter_1F/header.inc index 281733cce..5a56f2d4a 100644 --- a/data/maps/PetalburgCity_PokemonCenter_1F/header.inc +++ b/data/maps/PetalburgCity_PokemonCenter_1F/header.inc @@ -8,7 +8,7 @@ PetalburgCity_PokemonCenter_1F:: @ 8305F8C .byte MAPSEC_PETALBURG_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/PetalburgCity_PokemonCenter_2F/header.inc b/data/maps/PetalburgCity_PokemonCenter_2F/header.inc index 3da47f4a7..dc5e57b82 100644 --- a/data/maps/PetalburgCity_PokemonCenter_2F/header.inc +++ b/data/maps/PetalburgCity_PokemonCenter_2F/header.inc @@ -8,7 +8,7 @@ PetalburgCity_PokemonCenter_2F:: @ 8305FA8 .byte MAPSEC_PETALBURG_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/PetalburgCity_WallysHouse/header.inc b/data/maps/PetalburgCity_WallysHouse/header.inc index d6f106ce2..2549ee8ff 100644 --- a/data/maps/PetalburgCity_WallysHouse/header.inc +++ b/data/maps/PetalburgCity_WallysHouse/header.inc @@ -8,7 +8,7 @@ PetalburgCity_WallysHouse:: @ 8305F1C .byte MAPSEC_PETALBURG_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/PetalburgWoods/header.inc b/data/maps/PetalburgWoods/header.inc index 31b8491b6..07ac7c810 100644 --- a/data/maps/PetalburgWoods/header.inc +++ b/data/maps/PetalburgWoods/header.inc @@ -8,7 +8,7 @@ PetalburgWoods:: @ 8306EA4 .byte MAPSEC_PETALBURG_WOODS .byte 0 .byte WEATHER_SHADE - .byte 3 + .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/RecordCorner/header.inc b/data/maps/RecordCorner/header.inc index 983654e2d..e0c9767db 100644 --- a/data/maps/RecordCorner/header.inc +++ b/data/maps/RecordCorner/header.inc @@ -8,7 +8,7 @@ RecordCorner:: @ 83079B0 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/Route101/header.inc b/data/maps/Route101/header.inc index fc21038b4..5ecbb7e61 100644 --- a/data/maps/Route101/header.inc +++ b/data/maps/Route101/header.inc @@ -8,7 +8,7 @@ Route101:: @ 8305608 .byte MAPSEC_ROUTE_101 .byte 0 .byte WEATHER_SUNNY - .byte 3 + .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/Route102/header.inc b/data/maps/Route102/header.inc index 874d665f0..b7af31bb0 100644 --- a/data/maps/Route102/header.inc +++ b/data/maps/Route102/header.inc @@ -8,7 +8,7 @@ Route102:: @ 8305624 .byte MAPSEC_ROUTE_102 .byte 0 .byte WEATHER_SUNNY - .byte 3 + .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/Route103/header.inc b/data/maps/Route103/header.inc index 0c3cc1803..9d37b2bc1 100644 --- a/data/maps/Route103/header.inc +++ b/data/maps/Route103/header.inc @@ -8,7 +8,7 @@ Route103:: @ 8305640 .byte MAPSEC_ROUTE_103 .byte 0 .byte WEATHER_SUNNY - .byte 3 + .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/Route104/header.inc b/data/maps/Route104/header.inc index c90a091c9..9827355ba 100644 --- a/data/maps/Route104/header.inc +++ b/data/maps/Route104/header.inc @@ -8,7 +8,7 @@ Route104:: @ 830565C .byte MAPSEC_ROUTE_104 .byte 0 .byte WEATHER_SUNNY - .byte 3 + .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/Route104_MrBrineysHouse/header.inc b/data/maps/Route104_MrBrineysHouse/header.inc index 05632e3b0..1bcc33bf5 100644 --- a/data/maps/Route104_MrBrineysHouse/header.inc +++ b/data/maps/Route104_MrBrineysHouse/header.inc @@ -8,7 +8,7 @@ Route104_MrBrineysHouse:: @ 8306C20 .byte MAPSEC_ROUTE_104 .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/Route104_PrettyPetalFlowerShop/header.inc b/data/maps/Route104_PrettyPetalFlowerShop/header.inc index 3ff72f780..8a66e5c7f 100644 --- a/data/maps/Route104_PrettyPetalFlowerShop/header.inc +++ b/data/maps/Route104_PrettyPetalFlowerShop/header.inc @@ -8,7 +8,7 @@ Route104_PrettyPetalFlowerShop:: @ 8306C3C .byte MAPSEC_ROUTE_104 .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/Route104_Prototype/header.inc b/data/maps/Route104_Prototype/header.inc index ba6601509..4b9c5d509 100644 --- a/data/maps/Route104_Prototype/header.inc +++ b/data/maps/Route104_Prototype/header.inc @@ -8,7 +8,7 @@ Route104_Prototype:: @ 8307CF8 .byte MAPSEC_ROUTE_104 .byte 0 .byte WEATHER_SUNNY - .byte 3 + .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc b/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc index cc2c17416..25ff26199 100644 --- a/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc +++ b/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc @@ -8,7 +8,7 @@ Route104_PrototypePrettyPetalFlowerShop:: @ 8307D14 .byte MAPSEC_ROUTE_104 .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/Route105/header.inc b/data/maps/Route105/header.inc index 29480a593..74367713c 100644 --- a/data/maps/Route105/header.inc +++ b/data/maps/Route105/header.inc @@ -8,7 +8,7 @@ Route105:: @ 8305678 .byte MAPSEC_ROUTE_105 .byte 0 .byte WEATHER_SUNNY - .byte 3 + .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/Route106/header.inc b/data/maps/Route106/header.inc index 06100a263..fa564fe9e 100644 --- a/data/maps/Route106/header.inc +++ b/data/maps/Route106/header.inc @@ -8,7 +8,7 @@ Route106:: @ 8305694 .byte MAPSEC_ROUTE_106 .byte 0 .byte WEATHER_SUNNY - .byte 3 + .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/Route107/header.inc b/data/maps/Route107/header.inc index 164b31f41..f014b95c7 100644 --- a/data/maps/Route107/header.inc +++ b/data/maps/Route107/header.inc @@ -8,7 +8,7 @@ Route107:: @ 83056B0 .byte MAPSEC_ROUTE_107 .byte 0 .byte WEATHER_SUNNY - .byte 3 + .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/Route108/header.inc b/data/maps/Route108/header.inc index e0bf0a4cf..b0107dc1d 100644 --- a/data/maps/Route108/header.inc +++ b/data/maps/Route108/header.inc @@ -8,7 +8,7 @@ Route108:: @ 83056CC .byte MAPSEC_ROUTE_108 .byte 0 .byte WEATHER_SUNNY - .byte 3 + .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/Route109/header.inc b/data/maps/Route109/header.inc index d89810726..7481c924c 100644 --- a/data/maps/Route109/header.inc +++ b/data/maps/Route109/header.inc @@ -8,7 +8,7 @@ Route109:: @ 83056E8 .byte MAPSEC_ROUTE_109 .byte 0 .byte WEATHER_SUNNY - .byte 3 + .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/Route109_SeashoreHouse/header.inc b/data/maps/Route109_SeashoreHouse/header.inc index 2bcef541a..a12faddd2 100644 --- a/data/maps/Route109_SeashoreHouse/header.inc +++ b/data/maps/Route109_SeashoreHouse/header.inc @@ -8,7 +8,7 @@ Route109_SeashoreHouse:: @ 8307D30 .byte MAPSEC_ROUTE_109 .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/Route110/header.inc b/data/maps/Route110/header.inc index dc8c879e2..c6e72efba 100644 --- a/data/maps/Route110/header.inc +++ b/data/maps/Route110/header.inc @@ -8,7 +8,7 @@ Route110:: @ 8305704 .byte MAPSEC_ROUTE_110 .byte 0 .byte WEATHER_SUNNY - .byte 3 + .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc index a58634ce9..f6b6aa1c9 100644 --- a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc +++ b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc @@ -8,7 +8,7 @@ Route110_SeasideCyclingRoadNorthEntrance:: @ 8307E9C .byte MAPSEC_ROUTE_110 .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc index 648eb731a..187c13781 100644 --- a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc +++ b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc @@ -8,7 +8,7 @@ Route110_SeasideCyclingRoadSouthEntrance:: @ 8307E80 .byte MAPSEC_ROUTE_110 .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/Route110_TrickHouseCorridor/header.inc b/data/maps/Route110_TrickHouseCorridor/header.inc index b443725c7..c70e483f1 100644 --- a/data/maps/Route110_TrickHouseCorridor/header.inc +++ b/data/maps/Route110_TrickHouseCorridor/header.inc @@ -8,7 +8,7 @@ Route110_TrickHouseCorridor:: @ 8307D84 .byte MAPSEC_ROUTE_110 .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/Route110_TrickHouseEnd/header.inc b/data/maps/Route110_TrickHouseEnd/header.inc index c93534396..37260e661 100644 --- a/data/maps/Route110_TrickHouseEnd/header.inc +++ b/data/maps/Route110_TrickHouseEnd/header.inc @@ -8,7 +8,7 @@ Route110_TrickHouseEnd:: @ 8307D68 .byte MAPSEC_ROUTE_110 .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/Route110_TrickHouseEntrance/header.inc b/data/maps/Route110_TrickHouseEntrance/header.inc index 6a292f3be..e2ee33d65 100644 --- a/data/maps/Route110_TrickHouseEntrance/header.inc +++ b/data/maps/Route110_TrickHouseEntrance/header.inc @@ -8,7 +8,7 @@ Route110_TrickHouseEntrance:: @ 8307D4C .byte MAPSEC_ROUTE_110 .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/Route110_TrickHousePuzzle1/header.inc b/data/maps/Route110_TrickHousePuzzle1/header.inc index 25c8ac058..0cdf6e55b 100644 --- a/data/maps/Route110_TrickHousePuzzle1/header.inc +++ b/data/maps/Route110_TrickHousePuzzle1/header.inc @@ -8,7 +8,7 @@ Route110_TrickHousePuzzle1:: @ 8307DA0 .byte MAPSEC_ROUTE_110 .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/Route110_TrickHousePuzzle2/header.inc b/data/maps/Route110_TrickHousePuzzle2/header.inc index 6bc98e718..03b220e96 100644 --- a/data/maps/Route110_TrickHousePuzzle2/header.inc +++ b/data/maps/Route110_TrickHousePuzzle2/header.inc @@ -8,7 +8,7 @@ Route110_TrickHousePuzzle2:: @ 8307DBC .byte MAPSEC_ROUTE_110 .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/Route110_TrickHousePuzzle3/header.inc b/data/maps/Route110_TrickHousePuzzle3/header.inc index e4da788a6..8ac021d4d 100644 --- a/data/maps/Route110_TrickHousePuzzle3/header.inc +++ b/data/maps/Route110_TrickHousePuzzle3/header.inc @@ -8,7 +8,7 @@ Route110_TrickHousePuzzle3:: @ 8307DD8 .byte MAPSEC_ROUTE_110 .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/Route110_TrickHousePuzzle4/header.inc b/data/maps/Route110_TrickHousePuzzle4/header.inc index 9648e360b..11eaffbb4 100644 --- a/data/maps/Route110_TrickHousePuzzle4/header.inc +++ b/data/maps/Route110_TrickHousePuzzle4/header.inc @@ -8,7 +8,7 @@ Route110_TrickHousePuzzle4:: @ 8307DF4 .byte MAPSEC_ROUTE_110 .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/Route110_TrickHousePuzzle5/header.inc b/data/maps/Route110_TrickHousePuzzle5/header.inc index 5188630fd..40bc9f4b7 100644 --- a/data/maps/Route110_TrickHousePuzzle5/header.inc +++ b/data/maps/Route110_TrickHousePuzzle5/header.inc @@ -8,7 +8,7 @@ Route110_TrickHousePuzzle5:: @ 8307E10 .byte MAPSEC_ROUTE_110 .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/Route110_TrickHousePuzzle6/header.inc b/data/maps/Route110_TrickHousePuzzle6/header.inc index 214460bf8..b527fad03 100644 --- a/data/maps/Route110_TrickHousePuzzle6/header.inc +++ b/data/maps/Route110_TrickHousePuzzle6/header.inc @@ -8,7 +8,7 @@ Route110_TrickHousePuzzle6:: @ 8307E2C .byte MAPSEC_ROUTE_110 .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/Route110_TrickHousePuzzle7/header.inc b/data/maps/Route110_TrickHousePuzzle7/header.inc index 6e9a22746..e9fe01965 100644 --- a/data/maps/Route110_TrickHousePuzzle7/header.inc +++ b/data/maps/Route110_TrickHousePuzzle7/header.inc @@ -8,7 +8,7 @@ Route110_TrickHousePuzzle7:: @ 8307E48 .byte MAPSEC_ROUTE_110 .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/Route110_TrickHousePuzzle8/header.inc b/data/maps/Route110_TrickHousePuzzle8/header.inc index 6e7683b8c..48f064cb5 100644 --- a/data/maps/Route110_TrickHousePuzzle8/header.inc +++ b/data/maps/Route110_TrickHousePuzzle8/header.inc @@ -8,7 +8,7 @@ Route110_TrickHousePuzzle8:: @ 8307E64 .byte MAPSEC_ROUTE_110 .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/Route111/header.inc b/data/maps/Route111/header.inc index 973e43ad3..b52dbce16 100644 --- a/data/maps/Route111/header.inc +++ b/data/maps/Route111/header.inc @@ -8,7 +8,7 @@ Route111:: @ 8305720 .byte MAPSEC_ROUTE_111 .byte 0 .byte WEATHER_SUNNY - .byte 3 + .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/Route111_OldLadysRestStop/header.inc b/data/maps/Route111_OldLadysRestStop/header.inc index af1b5d7f0..46ea8ce53 100644 --- a/data/maps/Route111_OldLadysRestStop/header.inc +++ b/data/maps/Route111_OldLadysRestStop/header.inc @@ -8,7 +8,7 @@ Route111_OldLadysRestStop:: @ 8306C74 .byte MAPSEC_ROUTE_111 .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/Route111_WinstrateFamilysHouse/header.inc b/data/maps/Route111_WinstrateFamilysHouse/header.inc index 100cd4b8a..f00b7de29 100644 --- a/data/maps/Route111_WinstrateFamilysHouse/header.inc +++ b/data/maps/Route111_WinstrateFamilysHouse/header.inc @@ -8,7 +8,7 @@ Route111_WinstrateFamilysHouse:: @ 8306C58 .byte MAPSEC_ROUTE_111 .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/Route112/header.inc b/data/maps/Route112/header.inc index 845b656d9..2159d8bd6 100644 --- a/data/maps/Route112/header.inc +++ b/data/maps/Route112/header.inc @@ -8,7 +8,7 @@ Route112:: @ 830573C .byte MAPSEC_ROUTE_112 .byte 0 .byte WEATHER_SUNNY - .byte 3 + .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/Route112_CableCarStation/header.inc b/data/maps/Route112_CableCarStation/header.inc index c04ae3a85..8c2cdd9fe 100644 --- a/data/maps/Route112_CableCarStation/header.inc +++ b/data/maps/Route112_CableCarStation/header.inc @@ -8,7 +8,7 @@ Route112_CableCarStation:: @ 8306C90 .byte MAPSEC_ROUTE_112 .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/Route113/header.inc b/data/maps/Route113/header.inc index bcad63fca..33f63b8d5 100644 --- a/data/maps/Route113/header.inc +++ b/data/maps/Route113/header.inc @@ -8,7 +8,7 @@ Route113:: @ 8305758 .byte MAPSEC_ROUTE_113 .byte 0 .byte WEATHER_SUNNY - .byte 3 + .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/Route113_GlassWorkshop/header.inc b/data/maps/Route113_GlassWorkshop/header.inc index 66bfc8b21..4030fbe93 100644 --- a/data/maps/Route113_GlassWorkshop/header.inc +++ b/data/maps/Route113_GlassWorkshop/header.inc @@ -8,7 +8,7 @@ Route113_GlassWorkshop:: @ 8307EB8 .byte MAPSEC_ROUTE_113 .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/Route114/header.inc b/data/maps/Route114/header.inc index d51ee825e..ba2b1eb3a 100644 --- a/data/maps/Route114/header.inc +++ b/data/maps/Route114/header.inc @@ -8,7 +8,7 @@ Route114:: @ 8305774 .byte MAPSEC_ROUTE_114 .byte 0 .byte WEATHER_SUNNY - .byte 3 + .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/Route114_FossilManiacsHouse/header.inc b/data/maps/Route114_FossilManiacsHouse/header.inc index 8d22a1314..71d084466 100644 --- a/data/maps/Route114_FossilManiacsHouse/header.inc +++ b/data/maps/Route114_FossilManiacsHouse/header.inc @@ -8,7 +8,7 @@ Route114_FossilManiacsHouse:: @ 8306CC8 .byte MAPSEC_ROUTE_114 .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/Route114_FossilManiacsTunnel/header.inc b/data/maps/Route114_FossilManiacsTunnel/header.inc index f5f2c877c..c47de21a6 100644 --- a/data/maps/Route114_FossilManiacsTunnel/header.inc +++ b/data/maps/Route114_FossilManiacsTunnel/header.inc @@ -8,7 +8,7 @@ Route114_FossilManiacsTunnel:: @ 8306CE4 .byte MAPSEC_ROUTE_114 .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/Route114_LanettesHouse/header.inc b/data/maps/Route114_LanettesHouse/header.inc index 44f4d47bc..27f3c0e46 100644 --- a/data/maps/Route114_LanettesHouse/header.inc +++ b/data/maps/Route114_LanettesHouse/header.inc @@ -8,7 +8,7 @@ Route114_LanettesHouse:: @ 8306D00 .byte MAPSEC_ROUTE_114 .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/Route115/header.inc b/data/maps/Route115/header.inc index 640735ac3..c64340a27 100644 --- a/data/maps/Route115/header.inc +++ b/data/maps/Route115/header.inc @@ -8,7 +8,7 @@ Route115:: @ 8305790 .byte MAPSEC_ROUTE_115 .byte 0 .byte WEATHER_SUNNY - .byte 3 + .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/Route116/header.inc b/data/maps/Route116/header.inc index 2ba0a7ade..496723efc 100644 --- a/data/maps/Route116/header.inc +++ b/data/maps/Route116/header.inc @@ -8,7 +8,7 @@ Route116:: @ 83057AC .byte MAPSEC_ROUTE_116 .byte 0 .byte WEATHER_SUNNY - .byte 3 + .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/Route116_TunnelersRestHouse/header.inc b/data/maps/Route116_TunnelersRestHouse/header.inc index 802c04403..431119c68 100644 --- a/data/maps/Route116_TunnelersRestHouse/header.inc +++ b/data/maps/Route116_TunnelersRestHouse/header.inc @@ -8,7 +8,7 @@ Route116_TunnelersRestHouse:: @ 8306D1C .byte MAPSEC_ROUTE_116 .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/Route117/header.inc b/data/maps/Route117/header.inc index c19c87950..3543079b0 100644 --- a/data/maps/Route117/header.inc +++ b/data/maps/Route117/header.inc @@ -8,7 +8,7 @@ Route117:: @ 83057C8 .byte MAPSEC_ROUTE_117 .byte 0 .byte WEATHER_SUNNY - .byte 3 + .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/Route117_PokemonDayCare/header.inc b/data/maps/Route117_PokemonDayCare/header.inc index 46923947b..2f301578e 100644 --- a/data/maps/Route117_PokemonDayCare/header.inc +++ b/data/maps/Route117_PokemonDayCare/header.inc @@ -8,7 +8,7 @@ Route117_PokemonDayCare:: @ 8306D38 .byte MAPSEC_ROUTE_117 .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/Route118/header.inc b/data/maps/Route118/header.inc index 944a9695d..6e7a41ec2 100644 --- a/data/maps/Route118/header.inc +++ b/data/maps/Route118/header.inc @@ -8,7 +8,7 @@ Route118:: @ 83057E4 .byte MAPSEC_ROUTE_118 .byte 0 .byte WEATHER_SUNNY - .byte 3 + .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/Route119/header.inc b/data/maps/Route119/header.inc index b8a2d42bc..16efb467d 100644 --- a/data/maps/Route119/header.inc +++ b/data/maps/Route119/header.inc @@ -8,7 +8,7 @@ Route119:: @ 8305800 .byte MAPSEC_ROUTE_119 .byte 0 .byte WEATHER_SUNNY - .byte 3 + .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/Route119_House/header.inc b/data/maps/Route119_House/header.inc index 4ff380fed..e822387b8 100644 --- a/data/maps/Route119_House/header.inc +++ b/data/maps/Route119_House/header.inc @@ -8,7 +8,7 @@ Route119_House:: @ 8307F28 .byte MAPSEC_ROUTE_119 .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/Route119_WeatherInstitute_1F/header.inc b/data/maps/Route119_WeatherInstitute_1F/header.inc index 26ff382a1..a55e96cdc 100644 --- a/data/maps/Route119_WeatherInstitute_1F/header.inc +++ b/data/maps/Route119_WeatherInstitute_1F/header.inc @@ -8,7 +8,7 @@ Route119_WeatherInstitute_1F:: @ 8307EF0 .byte MAPSEC_ROUTE_119 .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/Route119_WeatherInstitute_2F/header.inc b/data/maps/Route119_WeatherInstitute_2F/header.inc index 27aa20836..0a0431b19 100644 --- a/data/maps/Route119_WeatherInstitute_2F/header.inc +++ b/data/maps/Route119_WeatherInstitute_2F/header.inc @@ -8,7 +8,7 @@ Route119_WeatherInstitute_2F:: @ 8307F0C .byte MAPSEC_ROUTE_119 .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/Route120/header.inc b/data/maps/Route120/header.inc index 6c1f1cde3..68a6de88f 100644 --- a/data/maps/Route120/header.inc +++ b/data/maps/Route120/header.inc @@ -8,7 +8,7 @@ Route120:: @ 830581C .byte MAPSEC_ROUTE_120 .byte 0 .byte WEATHER_SUNNY - .byte 3 + .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/Route121/header.inc b/data/maps/Route121/header.inc index fb8fc3838..84cd2c273 100644 --- a/data/maps/Route121/header.inc +++ b/data/maps/Route121/header.inc @@ -8,7 +8,7 @@ Route121:: @ 8305838 .byte MAPSEC_ROUTE_121 .byte 0 .byte WEATHER_SUNNY - .byte 3 + .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/Route121_SafariZoneEntrance/header.inc b/data/maps/Route121_SafariZoneEntrance/header.inc index f00791155..ca171c39e 100644 --- a/data/maps/Route121_SafariZoneEntrance/header.inc +++ b/data/maps/Route121_SafariZoneEntrance/header.inc @@ -8,7 +8,7 @@ Route121_SafariZoneEntrance:: @ 8306D54 .byte MAPSEC_ROUTE_121 .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/Route122/header.inc b/data/maps/Route122/header.inc index 8154c3934..5830203cf 100644 --- a/data/maps/Route122/header.inc +++ b/data/maps/Route122/header.inc @@ -8,7 +8,7 @@ Route122:: @ 8305854 .byte MAPSEC_ROUTE_122 .byte 0 .byte WEATHER_SUNNY - .byte 3 + .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/Route123/header.inc b/data/maps/Route123/header.inc index fdd481274..dcb08c4bc 100644 --- a/data/maps/Route123/header.inc +++ b/data/maps/Route123/header.inc @@ -8,7 +8,7 @@ Route123:: @ 8305870 .byte MAPSEC_ROUTE_123 .byte 0 .byte WEATHER_SUNNY - .byte 3 + .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/Route123_BerryMastersHouse/header.inc b/data/maps/Route123_BerryMastersHouse/header.inc index 2942daf3b..2c65fb5e3 100644 --- a/data/maps/Route123_BerryMastersHouse/header.inc +++ b/data/maps/Route123_BerryMastersHouse/header.inc @@ -8,7 +8,7 @@ Route123_BerryMastersHouse:: @ 8307ED4 .byte MAPSEC_ROUTE_123 .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/Route124/header.inc b/data/maps/Route124/header.inc index 4e08e972b..45163691a 100644 --- a/data/maps/Route124/header.inc +++ b/data/maps/Route124/header.inc @@ -8,7 +8,7 @@ Route124:: @ 830588C .byte MAPSEC_ROUTE_124 .byte 0 .byte WEATHER_SUNNY - .byte 6 + .byte MAP_TYPE_6 .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/header.inc b/data/maps/Route124_DivingTreasureHuntersHouse/header.inc index 474d3ec5d..4954a683e 100644 --- a/data/maps/Route124_DivingTreasureHuntersHouse/header.inc +++ b/data/maps/Route124_DivingTreasureHuntersHouse/header.inc @@ -8,7 +8,7 @@ Route124_DivingTreasureHuntersHouse:: @ 8307F44 .byte MAPSEC_ROUTE_124 .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/Route125/header.inc b/data/maps/Route125/header.inc index 1fb334b25..bcc72f444 100644 --- a/data/maps/Route125/header.inc +++ b/data/maps/Route125/header.inc @@ -8,7 +8,7 @@ Route125:: @ 83058A8 .byte MAPSEC_ROUTE_125 .byte 0 .byte WEATHER_SUNNY - .byte 6 + .byte MAP_TYPE_6 .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/Route126/header.inc b/data/maps/Route126/header.inc index 92fdbf714..8a7a39f08 100644 --- a/data/maps/Route126/header.inc +++ b/data/maps/Route126/header.inc @@ -8,7 +8,7 @@ Route126:: @ 83058C4 .byte MAPSEC_ROUTE_126 .byte 0 .byte WEATHER_SUNNY - .byte 6 + .byte MAP_TYPE_6 .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/Route127/header.inc b/data/maps/Route127/header.inc index 7d9cf6d0f..92fbe4caf 100644 --- a/data/maps/Route127/header.inc +++ b/data/maps/Route127/header.inc @@ -8,7 +8,7 @@ Route127:: @ 83058E0 .byte MAPSEC_ROUTE_127 .byte 0 .byte WEATHER_SUNNY - .byte 6 + .byte MAP_TYPE_6 .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/Route128/header.inc b/data/maps/Route128/header.inc index b0b4e1cee..0f7f4acc6 100644 --- a/data/maps/Route128/header.inc +++ b/data/maps/Route128/header.inc @@ -8,7 +8,7 @@ Route128:: @ 83058FC .byte MAPSEC_ROUTE_128 .byte 0 .byte WEATHER_SUNNY - .byte 6 + .byte MAP_TYPE_6 .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/Route129/header.inc b/data/maps/Route129/header.inc index a6f5bf6c7..301c65557 100644 --- a/data/maps/Route129/header.inc +++ b/data/maps/Route129/header.inc @@ -8,7 +8,7 @@ Route129:: @ 8305918 .byte MAPSEC_ROUTE_129 .byte 0 .byte WEATHER_SUNNY - .byte 6 + .byte MAP_TYPE_6 .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/Route130/header.inc b/data/maps/Route130/header.inc index db1c520e8..1a7fbc77a 100644 --- a/data/maps/Route130/header.inc +++ b/data/maps/Route130/header.inc @@ -8,7 +8,7 @@ Route130:: @ 8305934 .byte MAPSEC_ROUTE_130 .byte 0 .byte WEATHER_SUNNY - .byte 6 + .byte MAP_TYPE_6 .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/Route131/header.inc b/data/maps/Route131/header.inc index 4e5a506f8..182bcf1e8 100644 --- a/data/maps/Route131/header.inc +++ b/data/maps/Route131/header.inc @@ -8,7 +8,7 @@ Route131:: @ 8305950 .byte MAPSEC_ROUTE_131 .byte 0 .byte WEATHER_SUNNY - .byte 6 + .byte MAP_TYPE_6 .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/Route132/header.inc b/data/maps/Route132/header.inc index 5cd03df69..dbd2ddfe7 100644 --- a/data/maps/Route132/header.inc +++ b/data/maps/Route132/header.inc @@ -8,7 +8,7 @@ Route132:: @ 830596C .byte MAPSEC_ROUTE_132 .byte 0 .byte WEATHER_SUNNY - .byte 6 + .byte MAP_TYPE_6 .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/Route133/header.inc b/data/maps/Route133/header.inc index 5f96d2fcd..b6a2c5963 100644 --- a/data/maps/Route133/header.inc +++ b/data/maps/Route133/header.inc @@ -8,7 +8,7 @@ Route133:: @ 8305988 .byte MAPSEC_ROUTE_133 .byte 0 .byte WEATHER_SUNNY - .byte 6 + .byte MAP_TYPE_6 .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/Route134/header.inc b/data/maps/Route134/header.inc index 69cfa8900..cc4360ef9 100644 --- a/data/maps/Route134/header.inc +++ b/data/maps/Route134/header.inc @@ -8,7 +8,7 @@ Route134:: @ 83059A4 .byte MAPSEC_ROUTE_134 .byte 0 .byte WEATHER_SUNNY - .byte 6 + .byte MAP_TYPE_6 .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/RustboroCity/header.inc b/data/maps/RustboroCity/header.inc index 4e766abdc..375d378a6 100644 --- a/data/maps/RustboroCity/header.inc +++ b/data/maps/RustboroCity/header.inc @@ -8,7 +8,7 @@ RustboroCity:: @ 830549C .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte WEATHER_SUNNY - .byte 2 + .byte MAP_TYPE_CITY .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/RustboroCity_CuttersHouse/header.inc b/data/maps/RustboroCity_CuttersHouse/header.inc index 24f14733b..e7b90812e 100644 --- a/data/maps/RustboroCity_CuttersHouse/header.inc +++ b/data/maps/RustboroCity_CuttersHouse/header.inc @@ -8,7 +8,7 @@ RustboroCity_CuttersHouse:: @ 8306360 .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/RustboroCity_DevonCorp_1F/header.inc b/data/maps/RustboroCity_DevonCorp_1F/header.inc index fe6db5565..2d78bb675 100644 --- a/data/maps/RustboroCity_DevonCorp_1F/header.inc +++ b/data/maps/RustboroCity_DevonCorp_1F/header.inc @@ -8,7 +8,7 @@ RustboroCity_DevonCorp_1F:: @ 830622C .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/RustboroCity_DevonCorp_2F/header.inc b/data/maps/RustboroCity_DevonCorp_2F/header.inc index 65f4831a1..acb411dbb 100644 --- a/data/maps/RustboroCity_DevonCorp_2F/header.inc +++ b/data/maps/RustboroCity_DevonCorp_2F/header.inc @@ -8,7 +8,7 @@ RustboroCity_DevonCorp_2F:: @ 8306248 .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/RustboroCity_DevonCorp_3F/header.inc b/data/maps/RustboroCity_DevonCorp_3F/header.inc index 06f287b0b..5f2f4c039 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/header.inc +++ b/data/maps/RustboroCity_DevonCorp_3F/header.inc @@ -8,7 +8,7 @@ RustboroCity_DevonCorp_3F:: @ 8306264 .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/RustboroCity_Flat1_1F/header.inc b/data/maps/RustboroCity_Flat1_1F/header.inc index db75752ef..855f43ef8 100644 --- a/data/maps/RustboroCity_Flat1_1F/header.inc +++ b/data/maps/RustboroCity_Flat1_1F/header.inc @@ -8,7 +8,7 @@ RustboroCity_Flat1_1F:: @ 830630C .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/RustboroCity_Flat1_2F/header.inc b/data/maps/RustboroCity_Flat1_2F/header.inc index 6db4c4517..75e2fb114 100644 --- a/data/maps/RustboroCity_Flat1_2F/header.inc +++ b/data/maps/RustboroCity_Flat1_2F/header.inc @@ -8,7 +8,7 @@ RustboroCity_Flat1_2F:: @ 8306328 .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/RustboroCity_Flat2_1F/header.inc b/data/maps/RustboroCity_Flat2_1F/header.inc index 98c12c63f..3a56357f7 100644 --- a/data/maps/RustboroCity_Flat2_1F/header.inc +++ b/data/maps/RustboroCity_Flat2_1F/header.inc @@ -8,7 +8,7 @@ RustboroCity_Flat2_1F:: @ 8306398 .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/RustboroCity_Flat2_2F/header.inc b/data/maps/RustboroCity_Flat2_2F/header.inc index 8ada38a32..48afa8234 100644 --- a/data/maps/RustboroCity_Flat2_2F/header.inc +++ b/data/maps/RustboroCity_Flat2_2F/header.inc @@ -8,7 +8,7 @@ RustboroCity_Flat2_2F:: @ 83063B4 .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/RustboroCity_Flat2_3F/header.inc b/data/maps/RustboroCity_Flat2_3F/header.inc index af691c218..13a8157d1 100644 --- a/data/maps/RustboroCity_Flat2_3F/header.inc +++ b/data/maps/RustboroCity_Flat2_3F/header.inc @@ -8,7 +8,7 @@ RustboroCity_Flat2_3F:: @ 83063D0 .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/RustboroCity_Gym/header.inc b/data/maps/RustboroCity_Gym/header.inc index 9b7d28c1f..79ef9f54c 100644 --- a/data/maps/RustboroCity_Gym/header.inc +++ b/data/maps/RustboroCity_Gym/header.inc @@ -8,7 +8,7 @@ RustboroCity_Gym:: @ 8306280 .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 1 diff --git a/data/maps/RustboroCity_House1/header.inc b/data/maps/RustboroCity_House1/header.inc index b118dded3..b389ac45a 100644 --- a/data/maps/RustboroCity_House1/header.inc +++ b/data/maps/RustboroCity_House1/header.inc @@ -8,7 +8,7 @@ RustboroCity_House1:: @ 8306344 .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/RustboroCity_House2/header.inc b/data/maps/RustboroCity_House2/header.inc index b78218af5..617f458a0 100644 --- a/data/maps/RustboroCity_House2/header.inc +++ b/data/maps/RustboroCity_House2/header.inc @@ -8,7 +8,7 @@ RustboroCity_House2:: @ 830637C .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/RustboroCity_House3/header.inc b/data/maps/RustboroCity_House3/header.inc index 8ad464628..e120a1fd3 100644 --- a/data/maps/RustboroCity_House3/header.inc +++ b/data/maps/RustboroCity_House3/header.inc @@ -8,7 +8,7 @@ RustboroCity_House3:: @ 83063EC .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/RustboroCity_Mart/header.inc b/data/maps/RustboroCity_Mart/header.inc index e702ddeb4..7b1d739ed 100644 --- a/data/maps/RustboroCity_Mart/header.inc +++ b/data/maps/RustboroCity_Mart/header.inc @@ -8,7 +8,7 @@ RustboroCity_Mart:: @ 83062F0 .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/RustboroCity_PokemonCenter_1F/header.inc b/data/maps/RustboroCity_PokemonCenter_1F/header.inc index e2be65513..f57900235 100644 --- a/data/maps/RustboroCity_PokemonCenter_1F/header.inc +++ b/data/maps/RustboroCity_PokemonCenter_1F/header.inc @@ -8,7 +8,7 @@ RustboroCity_PokemonCenter_1F:: @ 83062B8 .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/RustboroCity_PokemonCenter_2F/header.inc b/data/maps/RustboroCity_PokemonCenter_2F/header.inc index 7ec96a5f1..ce1d315c7 100644 --- a/data/maps/RustboroCity_PokemonCenter_2F/header.inc +++ b/data/maps/RustboroCity_PokemonCenter_2F/header.inc @@ -8,7 +8,7 @@ RustboroCity_PokemonCenter_2F:: @ 83062D4 .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/RustboroCity_PokemonSchool/header.inc b/data/maps/RustboroCity_PokemonSchool/header.inc index d561151f6..af51ce0d3 100644 --- a/data/maps/RustboroCity_PokemonSchool/header.inc +++ b/data/maps/RustboroCity_PokemonSchool/header.inc @@ -8,7 +8,7 @@ RustboroCity_PokemonSchool:: @ 830629C .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/RusturfTunnel/header.inc b/data/maps/RusturfTunnel/header.inc index 849bb8b26..f6d6376f9 100644 --- a/data/maps/RusturfTunnel/header.inc +++ b/data/maps/RusturfTunnel/header.inc @@ -8,7 +8,7 @@ RusturfTunnel:: @ 8306DE0 .byte MAPSEC_RUSTURF_TUNNEL .byte 0 .byte WEATHER_FOG_1 - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/SSTidalCorridor/header.inc b/data/maps/SSTidalCorridor/header.inc index e0f4a7272..4e9eb4814 100644 --- a/data/maps/SSTidalCorridor/header.inc +++ b/data/maps/SSTidalCorridor/header.inc @@ -8,7 +8,7 @@ SSTidalCorridor:: @ 8307B54 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/SSTidalLowerDeck/header.inc b/data/maps/SSTidalLowerDeck/header.inc index 9cb467b69..14c9bf3b1 100644 --- a/data/maps/SSTidalLowerDeck/header.inc +++ b/data/maps/SSTidalLowerDeck/header.inc @@ -8,7 +8,7 @@ SSTidalLowerDeck:: @ 8307B70 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/SSTidalRooms/header.inc b/data/maps/SSTidalRooms/header.inc index b109ebfdf..f744d00f9 100644 --- a/data/maps/SSTidalRooms/header.inc +++ b/data/maps/SSTidalRooms/header.inc @@ -8,7 +8,7 @@ SSTidalRooms:: @ 8307B8C .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/SafariZone_Northeast/header.inc b/data/maps/SafariZone_Northeast/header.inc index 52f9ef066..7100cac69 100644 --- a/data/maps/SafariZone_Northeast/header.inc +++ b/data/maps/SafariZone_Northeast/header.inc @@ -8,7 +8,7 @@ SafariZone_Northeast:: @ 8307BC4 .byte MAPSEC_SAFARI_ZONE .byte 0 .byte WEATHER_NONE - .byte 3 + .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/SafariZone_Northwest/header.inc b/data/maps/SafariZone_Northwest/header.inc index c5237f87e..51a3877a0 100644 --- a/data/maps/SafariZone_Northwest/header.inc +++ b/data/maps/SafariZone_Northwest/header.inc @@ -8,7 +8,7 @@ SafariZone_Northwest:: @ 8307BA8 .byte MAPSEC_SAFARI_ZONE .byte 0 .byte WEATHER_NONE - .byte 3 + .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/SafariZone_RestHouse/header.inc b/data/maps/SafariZone_RestHouse/header.inc index 1bd2bdfe0..c9e83714c 100644 --- a/data/maps/SafariZone_RestHouse/header.inc +++ b/data/maps/SafariZone_RestHouse/header.inc @@ -8,7 +8,7 @@ SafariZone_RestHouse:: @ 8307CDC .byte MAPSEC_SAFARI_ZONE .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/SafariZone_Southeast/header.inc b/data/maps/SafariZone_Southeast/header.inc index 6d73c00a0..05f0738ab 100644 --- a/data/maps/SafariZone_Southeast/header.inc +++ b/data/maps/SafariZone_Southeast/header.inc @@ -8,7 +8,7 @@ SafariZone_Southeast:: @ 8307BFC .byte MAPSEC_SAFARI_ZONE .byte 0 .byte WEATHER_NONE - .byte 3 + .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/SafariZone_Southwest/header.inc b/data/maps/SafariZone_Southwest/header.inc index a1072acdd..3eb939d1f 100644 --- a/data/maps/SafariZone_Southwest/header.inc +++ b/data/maps/SafariZone_Southwest/header.inc @@ -8,7 +8,7 @@ SafariZone_Southwest:: @ 8307BE0 .byte MAPSEC_SAFARI_ZONE .byte 0 .byte WEATHER_NONE - .byte 3 + .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/ScorchedSlab/header.inc b/data/maps/ScorchedSlab/header.inc index 2ba712fb1..a600190c3 100644 --- a/data/maps/ScorchedSlab/header.inc +++ b/data/maps/ScorchedSlab/header.inc @@ -8,7 +8,7 @@ ScorchedSlab:: @ 830756C .byte MAPSEC_SCORCHED_SLAB .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/SeafloorCavern_Entrance/header.inc b/data/maps/SeafloorCavern_Entrance/header.inc index e87d6da67..e6e6a195e 100644 --- a/data/maps/SeafloorCavern_Entrance/header.inc +++ b/data/maps/SeafloorCavern_Entrance/header.inc @@ -8,7 +8,7 @@ SeafloorCavern_Entrance:: @ 8307064 .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/SeafloorCavern_Room1/header.inc b/data/maps/SeafloorCavern_Room1/header.inc index 6cb956807..c9fd33da2 100644 --- a/data/maps/SeafloorCavern_Room1/header.inc +++ b/data/maps/SeafloorCavern_Room1/header.inc @@ -8,7 +8,7 @@ SeafloorCavern_Room1:: @ 8307080 .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/SeafloorCavern_Room2/header.inc b/data/maps/SeafloorCavern_Room2/header.inc index b0091d99c..dd4a9fc65 100644 --- a/data/maps/SeafloorCavern_Room2/header.inc +++ b/data/maps/SeafloorCavern_Room2/header.inc @@ -8,7 +8,7 @@ SeafloorCavern_Room2:: @ 830709C .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/SeafloorCavern_Room3/header.inc b/data/maps/SeafloorCavern_Room3/header.inc index 5bcbdc4b2..815f8ec8d 100644 --- a/data/maps/SeafloorCavern_Room3/header.inc +++ b/data/maps/SeafloorCavern_Room3/header.inc @@ -8,7 +8,7 @@ SeafloorCavern_Room3:: @ 83070B8 .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/SeafloorCavern_Room4/header.inc b/data/maps/SeafloorCavern_Room4/header.inc index 113aad4cb..d07c3a6df 100644 --- a/data/maps/SeafloorCavern_Room4/header.inc +++ b/data/maps/SeafloorCavern_Room4/header.inc @@ -8,7 +8,7 @@ SeafloorCavern_Room4:: @ 83070D4 .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/SeafloorCavern_Room5/header.inc b/data/maps/SeafloorCavern_Room5/header.inc index e65505a88..8991e9d2c 100644 --- a/data/maps/SeafloorCavern_Room5/header.inc +++ b/data/maps/SeafloorCavern_Room5/header.inc @@ -8,7 +8,7 @@ SeafloorCavern_Room5:: @ 83070F0 .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/SeafloorCavern_Room6/header.inc b/data/maps/SeafloorCavern_Room6/header.inc index 3f6b78090..ad7ca11b9 100644 --- a/data/maps/SeafloorCavern_Room6/header.inc +++ b/data/maps/SeafloorCavern_Room6/header.inc @@ -8,7 +8,7 @@ SeafloorCavern_Room6:: @ 830710C .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/SeafloorCavern_Room7/header.inc b/data/maps/SeafloorCavern_Room7/header.inc index e1c507457..053537095 100644 --- a/data/maps/SeafloorCavern_Room7/header.inc +++ b/data/maps/SeafloorCavern_Room7/header.inc @@ -8,7 +8,7 @@ SeafloorCavern_Room7:: @ 8307128 .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/SeafloorCavern_Room8/header.inc b/data/maps/SeafloorCavern_Room8/header.inc index 5e777fdf9..bc76830a8 100644 --- a/data/maps/SeafloorCavern_Room8/header.inc +++ b/data/maps/SeafloorCavern_Room8/header.inc @@ -8,7 +8,7 @@ SeafloorCavern_Room8:: @ 8307144 .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/SeafloorCavern_Room9/header.inc b/data/maps/SeafloorCavern_Room9/header.inc index 8b723673a..a6636e985 100644 --- a/data/maps/SeafloorCavern_Room9/header.inc +++ b/data/maps/SeafloorCavern_Room9/header.inc @@ -8,7 +8,7 @@ SeafloorCavern_Room9:: @ 8307160 .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 .byte WEATHER_FOG_1 - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/SealedChamber_InnerRoom/header.inc b/data/maps/SealedChamber_InnerRoom/header.inc index 540fdc24c..899686f51 100644 --- a/data/maps/SealedChamber_InnerRoom/header.inc +++ b/data/maps/SealedChamber_InnerRoom/header.inc @@ -8,7 +8,7 @@ SealedChamber_InnerRoom:: @ 8307550 .byte MAPSEC_SEALED_CHAMBER .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/SealedChamber_OuterRoom/header.inc b/data/maps/SealedChamber_OuterRoom/header.inc index c7b0e4dd5..6919baa5b 100644 --- a/data/maps/SealedChamber_OuterRoom/header.inc +++ b/data/maps/SealedChamber_OuterRoom/header.inc @@ -8,7 +8,7 @@ SealedChamber_OuterRoom:: @ 8307534 .byte MAPSEC_SEALED_CHAMBER .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/SecretBase_BlueCave1/header.inc b/data/maps/SecretBase_BlueCave1/header.inc index c37b41b1e..8785a7728 100644 --- a/data/maps/SecretBase_BlueCave1/header.inc +++ b/data/maps/SecretBase_BlueCave1/header.inc @@ -8,7 +8,7 @@ SecretBase_BlueCave1:: @ 8307710 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE - .byte 9 + .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 1 .byte 8 diff --git a/data/maps/SecretBase_BlueCave2/header.inc b/data/maps/SecretBase_BlueCave2/header.inc index 759c16247..da39bdd06 100644 --- a/data/maps/SecretBase_BlueCave2/header.inc +++ b/data/maps/SecretBase_BlueCave2/header.inc @@ -8,7 +8,7 @@ SecretBase_BlueCave2:: @ 83077B8 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE - .byte 9 + .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 1 .byte 8 diff --git a/data/maps/SecretBase_BlueCave3/header.inc b/data/maps/SecretBase_BlueCave3/header.inc index 1d6d65078..4077c8bd0 100644 --- a/data/maps/SecretBase_BlueCave3/header.inc +++ b/data/maps/SecretBase_BlueCave3/header.inc @@ -8,7 +8,7 @@ SecretBase_BlueCave3:: @ 8307860 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE - .byte 9 + .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 1 .byte 8 diff --git a/data/maps/SecretBase_BlueCave4/header.inc b/data/maps/SecretBase_BlueCave4/header.inc index 0eae6d791..663c65a77 100644 --- a/data/maps/SecretBase_BlueCave4/header.inc +++ b/data/maps/SecretBase_BlueCave4/header.inc @@ -8,7 +8,7 @@ SecretBase_BlueCave4:: @ 8307908 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE - .byte 9 + .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 1 .byte 8 diff --git a/data/maps/SecretBase_BrownCave1/header.inc b/data/maps/SecretBase_BrownCave1/header.inc index 2554d358e..00d5d0166 100644 --- a/data/maps/SecretBase_BrownCave1/header.inc +++ b/data/maps/SecretBase_BrownCave1/header.inc @@ -8,7 +8,7 @@ SecretBase_BrownCave1:: @ 83076F4 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE - .byte 9 + .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 1 .byte 8 diff --git a/data/maps/SecretBase_BrownCave2/header.inc b/data/maps/SecretBase_BrownCave2/header.inc index 070800a35..37230d81b 100644 --- a/data/maps/SecretBase_BrownCave2/header.inc +++ b/data/maps/SecretBase_BrownCave2/header.inc @@ -8,7 +8,7 @@ SecretBase_BrownCave2:: @ 830779C .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE - .byte 9 + .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 1 .byte 8 diff --git a/data/maps/SecretBase_BrownCave3/header.inc b/data/maps/SecretBase_BrownCave3/header.inc index 52d6b6520..ce551a6ec 100644 --- a/data/maps/SecretBase_BrownCave3/header.inc +++ b/data/maps/SecretBase_BrownCave3/header.inc @@ -8,7 +8,7 @@ SecretBase_BrownCave3:: @ 8307844 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE - .byte 9 + .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 1 .byte 8 diff --git a/data/maps/SecretBase_BrownCave4/header.inc b/data/maps/SecretBase_BrownCave4/header.inc index c8687802e..29806867f 100644 --- a/data/maps/SecretBase_BrownCave4/header.inc +++ b/data/maps/SecretBase_BrownCave4/header.inc @@ -8,7 +8,7 @@ SecretBase_BrownCave4:: @ 83078EC .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE - .byte 9 + .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 1 .byte 8 diff --git a/data/maps/SecretBase_RedCave1/header.inc b/data/maps/SecretBase_RedCave1/header.inc index e3a8d5435..33f68514e 100644 --- a/data/maps/SecretBase_RedCave1/header.inc +++ b/data/maps/SecretBase_RedCave1/header.inc @@ -8,7 +8,7 @@ SecretBase_RedCave1:: @ 83076D8 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE - .byte 9 + .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 1 .byte 8 diff --git a/data/maps/SecretBase_RedCave2/header.inc b/data/maps/SecretBase_RedCave2/header.inc index 9d4ae63b3..4bc4b673c 100644 --- a/data/maps/SecretBase_RedCave2/header.inc +++ b/data/maps/SecretBase_RedCave2/header.inc @@ -8,7 +8,7 @@ SecretBase_RedCave2:: @ 8307780 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE - .byte 9 + .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 1 .byte 8 diff --git a/data/maps/SecretBase_RedCave3/header.inc b/data/maps/SecretBase_RedCave3/header.inc index 035210198..330592a0b 100644 --- a/data/maps/SecretBase_RedCave3/header.inc +++ b/data/maps/SecretBase_RedCave3/header.inc @@ -8,7 +8,7 @@ SecretBase_RedCave3:: @ 8307828 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE - .byte 9 + .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 1 .byte 8 diff --git a/data/maps/SecretBase_RedCave4/header.inc b/data/maps/SecretBase_RedCave4/header.inc index dbf6961b7..0bddcb964 100644 --- a/data/maps/SecretBase_RedCave4/header.inc +++ b/data/maps/SecretBase_RedCave4/header.inc @@ -8,7 +8,7 @@ SecretBase_RedCave4:: @ 83078D0 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE - .byte 9 + .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 1 .byte 8 diff --git a/data/maps/SecretBase_Shrub1/header.inc b/data/maps/SecretBase_Shrub1/header.inc index a06331e0c..27c464fde 100644 --- a/data/maps/SecretBase_Shrub1/header.inc +++ b/data/maps/SecretBase_Shrub1/header.inc @@ -8,7 +8,7 @@ SecretBase_Shrub1:: @ 8307764 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE - .byte 9 + .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 1 .byte 8 diff --git a/data/maps/SecretBase_Shrub2/header.inc b/data/maps/SecretBase_Shrub2/header.inc index d3acc11aa..70bbc94d8 100644 --- a/data/maps/SecretBase_Shrub2/header.inc +++ b/data/maps/SecretBase_Shrub2/header.inc @@ -8,7 +8,7 @@ SecretBase_Shrub2:: @ 830780C .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE - .byte 9 + .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 1 .byte 8 diff --git a/data/maps/SecretBase_Shrub3/header.inc b/data/maps/SecretBase_Shrub3/header.inc index 7b5a24771..ee2297f17 100644 --- a/data/maps/SecretBase_Shrub3/header.inc +++ b/data/maps/SecretBase_Shrub3/header.inc @@ -8,7 +8,7 @@ SecretBase_Shrub3:: @ 83078B4 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE - .byte 9 + .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 1 .byte 8 diff --git a/data/maps/SecretBase_Shrub4/header.inc b/data/maps/SecretBase_Shrub4/header.inc index 5555137bc..610767784 100644 --- a/data/maps/SecretBase_Shrub4/header.inc +++ b/data/maps/SecretBase_Shrub4/header.inc @@ -8,7 +8,7 @@ SecretBase_Shrub4:: @ 830795C .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE - .byte 9 + .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 1 .byte 8 diff --git a/data/maps/SecretBase_Tree1/header.inc b/data/maps/SecretBase_Tree1/header.inc index a39b150cd..f0e7ee20a 100644 --- a/data/maps/SecretBase_Tree1/header.inc +++ b/data/maps/SecretBase_Tree1/header.inc @@ -8,7 +8,7 @@ SecretBase_Tree1:: @ 8307748 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE - .byte 9 + .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 1 .byte 8 diff --git a/data/maps/SecretBase_Tree2/header.inc b/data/maps/SecretBase_Tree2/header.inc index 0ac8aa572..2267b1781 100644 --- a/data/maps/SecretBase_Tree2/header.inc +++ b/data/maps/SecretBase_Tree2/header.inc @@ -8,7 +8,7 @@ SecretBase_Tree2:: @ 83077F0 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE - .byte 9 + .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 1 .byte 8 diff --git a/data/maps/SecretBase_Tree3/header.inc b/data/maps/SecretBase_Tree3/header.inc index 378aefaa8..21faa4f01 100644 --- a/data/maps/SecretBase_Tree3/header.inc +++ b/data/maps/SecretBase_Tree3/header.inc @@ -8,7 +8,7 @@ SecretBase_Tree3:: @ 8307898 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE - .byte 9 + .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 1 .byte 8 diff --git a/data/maps/SecretBase_Tree4/header.inc b/data/maps/SecretBase_Tree4/header.inc index 58c7b3ce7..a226fcf4e 100644 --- a/data/maps/SecretBase_Tree4/header.inc +++ b/data/maps/SecretBase_Tree4/header.inc @@ -8,7 +8,7 @@ SecretBase_Tree4:: @ 8307940 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE - .byte 9 + .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 1 .byte 8 diff --git a/data/maps/SecretBase_YellowCave1/header.inc b/data/maps/SecretBase_YellowCave1/header.inc index 788638a91..bc9915684 100644 --- a/data/maps/SecretBase_YellowCave1/header.inc +++ b/data/maps/SecretBase_YellowCave1/header.inc @@ -8,7 +8,7 @@ SecretBase_YellowCave1:: @ 830772C .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE - .byte 9 + .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 1 .byte 8 diff --git a/data/maps/SecretBase_YellowCave2/header.inc b/data/maps/SecretBase_YellowCave2/header.inc index 4c62fade3..4103bbc98 100644 --- a/data/maps/SecretBase_YellowCave2/header.inc +++ b/data/maps/SecretBase_YellowCave2/header.inc @@ -8,7 +8,7 @@ SecretBase_YellowCave2:: @ 83077D4 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE - .byte 9 + .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 1 .byte 8 diff --git a/data/maps/SecretBase_YellowCave3/header.inc b/data/maps/SecretBase_YellowCave3/header.inc index 2d0c8fa9d..b4b034c26 100644 --- a/data/maps/SecretBase_YellowCave3/header.inc +++ b/data/maps/SecretBase_YellowCave3/header.inc @@ -8,7 +8,7 @@ SecretBase_YellowCave3:: @ 830787C .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE - .byte 9 + .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 1 .byte 8 diff --git a/data/maps/SecretBase_YellowCave4/header.inc b/data/maps/SecretBase_YellowCave4/header.inc index 7f5af843f..2011ce06e 100644 --- a/data/maps/SecretBase_YellowCave4/header.inc +++ b/data/maps/SecretBase_YellowCave4/header.inc @@ -8,7 +8,7 @@ SecretBase_YellowCave4:: @ 8307924 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE - .byte 9 + .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 1 .byte 8 diff --git a/data/maps/ShoalCave_HighTideEntranceRoom/header.inc b/data/maps/ShoalCave_HighTideEntranceRoom/header.inc index 6b8f0637d..5c7b34fc3 100644 --- a/data/maps/ShoalCave_HighTideEntranceRoom/header.inc +++ b/data/maps/ShoalCave_HighTideEntranceRoom/header.inc @@ -8,7 +8,7 @@ ShoalCave_HighTideEntranceRoom:: @ 83072E8 .byte MAPSEC_SHOAL_CAVE .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/ShoalCave_HighTideInnerRoom/header.inc b/data/maps/ShoalCave_HighTideInnerRoom/header.inc index 7fdb587c9..69736dbbf 100644 --- a/data/maps/ShoalCave_HighTideInnerRoom/header.inc +++ b/data/maps/ShoalCave_HighTideInnerRoom/header.inc @@ -8,7 +8,7 @@ ShoalCave_HighTideInnerRoom:: @ 8307304 .byte MAPSEC_SHOAL_CAVE .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/header.inc b/data/maps/ShoalCave_LowTideEntranceRoom/header.inc index ced8bb210..b9402bc1f 100644 --- a/data/maps/ShoalCave_LowTideEntranceRoom/header.inc +++ b/data/maps/ShoalCave_LowTideEntranceRoom/header.inc @@ -8,7 +8,7 @@ ShoalCave_LowTideEntranceRoom:: @ 8307278 .byte MAPSEC_SHOAL_CAVE .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/ShoalCave_LowTideIceRoom/header.inc b/data/maps/ShoalCave_LowTideIceRoom/header.inc index 7d7189c2b..caddfe2d3 100644 --- a/data/maps/ShoalCave_LowTideIceRoom/header.inc +++ b/data/maps/ShoalCave_LowTideIceRoom/header.inc @@ -8,7 +8,7 @@ ShoalCave_LowTideIceRoom:: @ 8307684 .byte MAPSEC_SHOAL_CAVE .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/ShoalCave_LowTideInnerRoom/header.inc b/data/maps/ShoalCave_LowTideInnerRoom/header.inc index 2b837b8f9..f53475b1d 100644 --- a/data/maps/ShoalCave_LowTideInnerRoom/header.inc +++ b/data/maps/ShoalCave_LowTideInnerRoom/header.inc @@ -8,7 +8,7 @@ ShoalCave_LowTideInnerRoom:: @ 8307294 .byte MAPSEC_SHOAL_CAVE .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/ShoalCave_LowTideLowerRoom/header.inc b/data/maps/ShoalCave_LowTideLowerRoom/header.inc index 8e10fd6a6..04b028774 100644 --- a/data/maps/ShoalCave_LowTideLowerRoom/header.inc +++ b/data/maps/ShoalCave_LowTideLowerRoom/header.inc @@ -8,7 +8,7 @@ ShoalCave_LowTideLowerRoom:: @ 83072CC .byte MAPSEC_SHOAL_CAVE .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/ShoalCave_LowTideStairsRoom/header.inc b/data/maps/ShoalCave_LowTideStairsRoom/header.inc index c757f8a36..76681ba57 100644 --- a/data/maps/ShoalCave_LowTideStairsRoom/header.inc +++ b/data/maps/ShoalCave_LowTideStairsRoom/header.inc @@ -8,7 +8,7 @@ ShoalCave_LowTideStairsRoom:: @ 83072B0 .byte MAPSEC_SHOAL_CAVE .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/SingleBattleColosseum/header.inc b/data/maps/SingleBattleColosseum/header.inc index a6b7f487b..e416ffa85 100644 --- a/data/maps/SingleBattleColosseum/header.inc +++ b/data/maps/SingleBattleColosseum/header.inc @@ -8,7 +8,7 @@ SingleBattleColosseum:: @ 8307978 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 8 diff --git a/data/maps/SkyPillar_1F/header.inc b/data/maps/SkyPillar_1F/header.inc index d37645b47..eee96bfd0 100644 --- a/data/maps/SkyPillar_1F/header.inc +++ b/data/maps/SkyPillar_1F/header.inc @@ -8,7 +8,7 @@ SkyPillar_1F:: @ 8307614 .byte MAPSEC_SKY_PILLAR .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/SkyPillar_2F/header.inc b/data/maps/SkyPillar_2F/header.inc index f3b6c4c66..2d0d3cb6c 100644 --- a/data/maps/SkyPillar_2F/header.inc +++ b/data/maps/SkyPillar_2F/header.inc @@ -8,7 +8,7 @@ SkyPillar_2F:: @ 8307630 .byte MAPSEC_SKY_PILLAR .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/SkyPillar_3F/header.inc b/data/maps/SkyPillar_3F/header.inc index cfb84b3a4..a6f4fad16 100644 --- a/data/maps/SkyPillar_3F/header.inc +++ b/data/maps/SkyPillar_3F/header.inc @@ -8,7 +8,7 @@ SkyPillar_3F:: @ 830764C .byte MAPSEC_SKY_PILLAR .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/SkyPillar_4F/header.inc b/data/maps/SkyPillar_4F/header.inc index b35218337..b053d5890 100644 --- a/data/maps/SkyPillar_4F/header.inc +++ b/data/maps/SkyPillar_4F/header.inc @@ -8,7 +8,7 @@ SkyPillar_4F:: @ 8307668 .byte MAPSEC_SKY_PILLAR .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/SkyPillar_5F/header.inc b/data/maps/SkyPillar_5F/header.inc index 1582e7d1f..4b8b13339 100644 --- a/data/maps/SkyPillar_5F/header.inc +++ b/data/maps/SkyPillar_5F/header.inc @@ -8,7 +8,7 @@ SkyPillar_5F:: @ 83076A0 .byte MAPSEC_SKY_PILLAR .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/SkyPillar_Entrance/header.inc b/data/maps/SkyPillar_Entrance/header.inc index 75e7f3c3b..5e1693504 100644 --- a/data/maps/SkyPillar_Entrance/header.inc +++ b/data/maps/SkyPillar_Entrance/header.inc @@ -8,7 +8,7 @@ SkyPillar_Entrance:: @ 83075DC .byte MAPSEC_SKY_PILLAR .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/SkyPillar_Outside/header.inc b/data/maps/SkyPillar_Outside/header.inc index 8af620469..9a5052d82 100644 --- a/data/maps/SkyPillar_Outside/header.inc +++ b/data/maps/SkyPillar_Outside/header.inc @@ -8,7 +8,7 @@ SkyPillar_Outside:: @ 83075F8 .byte MAPSEC_SKY_PILLAR .byte 0 .byte WEATHER_NONE - .byte 3 + .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/SkyPillar_Top/header.inc b/data/maps/SkyPillar_Top/header.inc index 1cc0877b3..008b3c188 100644 --- a/data/maps/SkyPillar_Top/header.inc +++ b/data/maps/SkyPillar_Top/header.inc @@ -8,7 +8,7 @@ SkyPillar_Top:: @ 83076BC .byte MAPSEC_SKY_PILLAR .byte 0 .byte WEATHER_NONE - .byte 3 + .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/SlateportCity/header.inc b/data/maps/SlateportCity/header.inc index c9ba2d7ae..07be1cf67 100644 --- a/data/maps/SlateportCity/header.inc +++ b/data/maps/SlateportCity/header.inc @@ -8,7 +8,7 @@ SlateportCity:: @ 8305464 .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte WEATHER_SUNNY - .byte 2 + .byte MAP_TYPE_CITY .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/SlateportCity_ContestHall/header.inc b/data/maps/SlateportCity_ContestHall/header.inc index 19e3b3209..b74c81097 100644 --- a/data/maps/SlateportCity_ContestHall/header.inc +++ b/data/maps/SlateportCity_ContestHall/header.inc @@ -8,7 +8,7 @@ SlateportCity_ContestHall:: @ 8306034 .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/SlateportCity_ContestLobby/header.inc b/data/maps/SlateportCity_ContestLobby/header.inc index 3aad36973..7d85f9a3d 100644 --- a/data/maps/SlateportCity_ContestLobby/header.inc +++ b/data/maps/SlateportCity_ContestLobby/header.inc @@ -8,7 +8,7 @@ SlateportCity_ContestLobby:: @ 8306018 .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/SlateportCity_Harbor/header.inc b/data/maps/SlateportCity_Harbor/header.inc index 029761fa9..c2b41541a 100644 --- a/data/maps/SlateportCity_Harbor/header.inc +++ b/data/maps/SlateportCity_Harbor/header.inc @@ -8,7 +8,7 @@ SlateportCity_Harbor:: @ 83060C0 .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/SlateportCity_House1/header.inc b/data/maps/SlateportCity_House1/header.inc index a78f96ed2..61bbbcce4 100644 --- a/data/maps/SlateportCity_House1/header.inc +++ b/data/maps/SlateportCity_House1/header.inc @@ -8,7 +8,7 @@ SlateportCity_House1:: @ 8306050 .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/SlateportCity_House2/header.inc b/data/maps/SlateportCity_House2/header.inc index e56231708..edfce41e9 100644 --- a/data/maps/SlateportCity_House2/header.inc +++ b/data/maps/SlateportCity_House2/header.inc @@ -8,7 +8,7 @@ SlateportCity_House2:: @ 83060DC .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/SlateportCity_Mart/header.inc b/data/maps/SlateportCity_Mart/header.inc index fe58052f5..86fbd5a0b 100644 --- a/data/maps/SlateportCity_Mart/header.inc +++ b/data/maps/SlateportCity_Mart/header.inc @@ -8,7 +8,7 @@ SlateportCity_Mart:: @ 8306130 .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/header.inc b/data/maps/SlateportCity_OceanicMuseum_1F/header.inc index bcd9e3dcd..1bbe8972c 100644 --- a/data/maps/SlateportCity_OceanicMuseum_1F/header.inc +++ b/data/maps/SlateportCity_OceanicMuseum_1F/header.inc @@ -8,7 +8,7 @@ SlateportCity_OceanicMuseum_1F:: @ 8306088 .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/header.inc b/data/maps/SlateportCity_OceanicMuseum_2F/header.inc index ddd200725..4a0b436dc 100644 --- a/data/maps/SlateportCity_OceanicMuseum_2F/header.inc +++ b/data/maps/SlateportCity_OceanicMuseum_2F/header.inc @@ -8,7 +8,7 @@ SlateportCity_OceanicMuseum_2F:: @ 83060A4 .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/SlateportCity_PokemonCenter_1F/header.inc b/data/maps/SlateportCity_PokemonCenter_1F/header.inc index 8061b9468..875c2b19e 100644 --- a/data/maps/SlateportCity_PokemonCenter_1F/header.inc +++ b/data/maps/SlateportCity_PokemonCenter_1F/header.inc @@ -8,7 +8,7 @@ SlateportCity_PokemonCenter_1F:: @ 83060F8 .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/SlateportCity_PokemonCenter_2F/header.inc b/data/maps/SlateportCity_PokemonCenter_2F/header.inc index b04bf1901..6f00cd6f6 100644 --- a/data/maps/SlateportCity_PokemonCenter_2F/header.inc +++ b/data/maps/SlateportCity_PokemonCenter_2F/header.inc @@ -8,7 +8,7 @@ SlateportCity_PokemonCenter_2F:: @ 8306114 .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/SlateportCity_PokemonFanClub/header.inc b/data/maps/SlateportCity_PokemonFanClub/header.inc index af654837f..732e56c5e 100644 --- a/data/maps/SlateportCity_PokemonFanClub/header.inc +++ b/data/maps/SlateportCity_PokemonFanClub/header.inc @@ -8,7 +8,7 @@ SlateportCity_PokemonFanClub:: @ 830606C .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/SlateportCity_SternsShipyard_1F/header.inc b/data/maps/SlateportCity_SternsShipyard_1F/header.inc index 89e348681..95feada82 100644 --- a/data/maps/SlateportCity_SternsShipyard_1F/header.inc +++ b/data/maps/SlateportCity_SternsShipyard_1F/header.inc @@ -8,7 +8,7 @@ SlateportCity_SternsShipyard_1F:: @ 8305FE0 .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/SlateportCity_SternsShipyard_2F/header.inc b/data/maps/SlateportCity_SternsShipyard_2F/header.inc index b3f381a45..6fcc658ec 100644 --- a/data/maps/SlateportCity_SternsShipyard_2F/header.inc +++ b/data/maps/SlateportCity_SternsShipyard_2F/header.inc @@ -8,7 +8,7 @@ SlateportCity_SternsShipyard_2F:: @ 8305FFC .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/SootopolisCity/header.inc b/data/maps/SootopolisCity/header.inc index b42a46ef6..90c0c056a 100644 --- a/data/maps/SootopolisCity/header.inc +++ b/data/maps/SootopolisCity/header.inc @@ -8,7 +8,7 @@ SootopolisCity:: @ 830550C .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte WEATHER_SUNNY - .byte 2 + .byte MAP_TYPE_CITY .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/SootopolisCity_Gym_1F/header.inc b/data/maps/SootopolisCity_Gym_1F/header.inc index fd5e53dbd..ce0a1c296 100644 --- a/data/maps/SootopolisCity_Gym_1F/header.inc +++ b/data/maps/SootopolisCity_Gym_1F/header.inc @@ -8,7 +8,7 @@ SootopolisCity_Gym_1F:: @ 830692C .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 1 diff --git a/data/maps/SootopolisCity_Gym_B1F/header.inc b/data/maps/SootopolisCity_Gym_B1F/header.inc index 2a5c973c5..07f659c1a 100644 --- a/data/maps/SootopolisCity_Gym_B1F/header.inc +++ b/data/maps/SootopolisCity_Gym_B1F/header.inc @@ -8,7 +8,7 @@ SootopolisCity_Gym_B1F:: @ 8306948 .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 1 diff --git a/data/maps/SootopolisCity_House1/header.inc b/data/maps/SootopolisCity_House1/header.inc index f12f6368b..81970aeef 100644 --- a/data/maps/SootopolisCity_House1/header.inc +++ b/data/maps/SootopolisCity_House1/header.inc @@ -8,7 +8,7 @@ SootopolisCity_House1:: @ 83069B8 .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/SootopolisCity_House2/header.inc b/data/maps/SootopolisCity_House2/header.inc index c6137c048..ba613b636 100644 --- a/data/maps/SootopolisCity_House2/header.inc +++ b/data/maps/SootopolisCity_House2/header.inc @@ -8,7 +8,7 @@ SootopolisCity_House2:: @ 83069D4 .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/SootopolisCity_House3/header.inc b/data/maps/SootopolisCity_House3/header.inc index 1ba3a435a..782f71389 100644 --- a/data/maps/SootopolisCity_House3/header.inc +++ b/data/maps/SootopolisCity_House3/header.inc @@ -8,7 +8,7 @@ SootopolisCity_House3:: @ 83069F0 .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/SootopolisCity_House4/header.inc b/data/maps/SootopolisCity_House4/header.inc index fee4fc065..8a2552c71 100644 --- a/data/maps/SootopolisCity_House4/header.inc +++ b/data/maps/SootopolisCity_House4/header.inc @@ -8,7 +8,7 @@ SootopolisCity_House4:: @ 8306A0C .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/SootopolisCity_House5/header.inc b/data/maps/SootopolisCity_House5/header.inc index 10732a09f..e7c7305e2 100644 --- a/data/maps/SootopolisCity_House5/header.inc +++ b/data/maps/SootopolisCity_House5/header.inc @@ -8,7 +8,7 @@ SootopolisCity_House5:: @ 8306A28 .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/SootopolisCity_House6/header.inc b/data/maps/SootopolisCity_House6/header.inc index 7a22cb836..65111731c 100644 --- a/data/maps/SootopolisCity_House6/header.inc +++ b/data/maps/SootopolisCity_House6/header.inc @@ -8,7 +8,7 @@ SootopolisCity_House6:: @ 8306A44 .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/SootopolisCity_House7/header.inc b/data/maps/SootopolisCity_House7/header.inc index b833f255a..c64500a38 100644 --- a/data/maps/SootopolisCity_House7/header.inc +++ b/data/maps/SootopolisCity_House7/header.inc @@ -8,7 +8,7 @@ SootopolisCity_House7:: @ 8306A60 .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/SootopolisCity_House8/header.inc b/data/maps/SootopolisCity_House8/header.inc index 20564785d..4a5d0b098 100644 --- a/data/maps/SootopolisCity_House8/header.inc +++ b/data/maps/SootopolisCity_House8/header.inc @@ -8,7 +8,7 @@ SootopolisCity_House8:: @ 8306A7C .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/SootopolisCity_Mart/header.inc b/data/maps/SootopolisCity_Mart/header.inc index 09af97233..17c871122 100644 --- a/data/maps/SootopolisCity_Mart/header.inc +++ b/data/maps/SootopolisCity_Mart/header.inc @@ -8,7 +8,7 @@ SootopolisCity_Mart:: @ 830699C .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/SootopolisCity_PokemonCenter_1F/header.inc b/data/maps/SootopolisCity_PokemonCenter_1F/header.inc index b93aa58b2..07fb05d37 100644 --- a/data/maps/SootopolisCity_PokemonCenter_1F/header.inc +++ b/data/maps/SootopolisCity_PokemonCenter_1F/header.inc @@ -8,7 +8,7 @@ SootopolisCity_PokemonCenter_1F:: @ 8306964 .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/SootopolisCity_PokemonCenter_2F/header.inc b/data/maps/SootopolisCity_PokemonCenter_2F/header.inc index 743d08d4b..07c43669c 100644 --- a/data/maps/SootopolisCity_PokemonCenter_2F/header.inc +++ b/data/maps/SootopolisCity_PokemonCenter_2F/header.inc @@ -8,7 +8,7 @@ SootopolisCity_PokemonCenter_2F:: @ 8306980 .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/SouthernIsland_Exterior/header.inc b/data/maps/SouthernIsland_Exterior/header.inc index 160722472..100ae8d67 100644 --- a/data/maps/SouthernIsland_Exterior/header.inc +++ b/data/maps/SouthernIsland_Exterior/header.inc @@ -8,7 +8,7 @@ SouthernIsland_Exterior:: @ 8307CA4 .byte MAPSEC_SOUTHERN_ISLAND .byte 0 .byte WEATHER_NONE - .byte 3 + .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/SouthernIsland_Interior/header.inc b/data/maps/SouthernIsland_Interior/header.inc index 61a3461d6..de07a40f9 100644 --- a/data/maps/SouthernIsland_Interior/header.inc +++ b/data/maps/SouthernIsland_Interior/header.inc @@ -8,7 +8,7 @@ SouthernIsland_Interior:: @ 8307CC0 .byte MAPSEC_SOUTHERN_ISLAND .byte 0 .byte WEATHER_SHADE - .byte 3 + .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/TradeCenter/header.inc b/data/maps/TradeCenter/header.inc index 8d6b70be7..4637e72bc 100644 --- a/data/maps/TradeCenter/header.inc +++ b/data/maps/TradeCenter/header.inc @@ -8,7 +8,7 @@ TradeCenter:: @ 8307994 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/Underwater1/header.inc b/data/maps/Underwater1/header.inc index 8335e0505..2ed1ddbf8 100644 --- a/data/maps/Underwater1/header.inc +++ b/data/maps/Underwater1/header.inc @@ -8,7 +8,7 @@ Underwater1:: @ 83059C0 .byte MAPSEC_UNDERWATER_124 .byte 0 .byte WEATHER_BUBBLES - .byte 5 + .byte MAP_TYPE_UNDERWATER .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/Underwater2/header.inc b/data/maps/Underwater2/header.inc index 0eed7b084..063b894ab 100644 --- a/data/maps/Underwater2/header.inc +++ b/data/maps/Underwater2/header.inc @@ -8,7 +8,7 @@ Underwater2:: @ 83059DC .byte MAPSEC_UNDERWATER_125 .byte 0 .byte WEATHER_BUBBLES - .byte 5 + .byte MAP_TYPE_UNDERWATER .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/Underwater3/header.inc b/data/maps/Underwater3/header.inc index 7e800027e..4c5f4a30d 100644 --- a/data/maps/Underwater3/header.inc +++ b/data/maps/Underwater3/header.inc @@ -8,7 +8,7 @@ Underwater3:: @ 83059F8 .byte MAPSEC_UNDERWATER_126 .byte 0 .byte WEATHER_BUBBLES - .byte 5 + .byte MAP_TYPE_UNDERWATER .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/Underwater4/header.inc b/data/maps/Underwater4/header.inc index bba0b83ae..09ef0835c 100644 --- a/data/maps/Underwater4/header.inc +++ b/data/maps/Underwater4/header.inc @@ -8,7 +8,7 @@ Underwater4:: @ 8305A14 .byte MAPSEC_UNDERWATER_127 .byte 0 .byte WEATHER_BUBBLES - .byte 5 + .byte MAP_TYPE_UNDERWATER .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/Underwater_Route134/header.inc b/data/maps/Underwater_Route134/header.inc index b88d2bd4d..491f9518f 100644 --- a/data/maps/Underwater_Route134/header.inc +++ b/data/maps/Underwater_Route134/header.inc @@ -8,7 +8,7 @@ Underwater_Route134:: @ 83074FC .byte MAPSEC_UNDERWATER_SEALED_CHAMBER .byte 0 .byte WEATHER_BUBBLES - .byte 5 + .byte MAP_TYPE_UNDERWATER .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/Underwater_SeafloorCavern/header.inc b/data/maps/Underwater_SeafloorCavern/header.inc index c11dd164a..e5c0268a4 100644 --- a/data/maps/Underwater_SeafloorCavern/header.inc +++ b/data/maps/Underwater_SeafloorCavern/header.inc @@ -8,7 +8,7 @@ Underwater_SeafloorCavern:: @ 8307048 .byte MAPSEC_UNDERWATER_128 .byte 0 .byte WEATHER_BUBBLES - .byte 5 + .byte MAP_TYPE_UNDERWATER .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/Underwater_SealedChamber/header.inc b/data/maps/Underwater_SealedChamber/header.inc index 19b01fdc7..178841380 100644 --- a/data/maps/Underwater_SealedChamber/header.inc +++ b/data/maps/Underwater_SealedChamber/header.inc @@ -8,7 +8,7 @@ Underwater_SealedChamber:: @ 8307518 .byte MAPSEC_UNDERWATER_SEALED_CHAMBER .byte 0 .byte WEATHER_BUBBLES - .byte 5 + .byte MAP_TYPE_UNDERWATER .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/Underwater_SootopolisCity/header.inc b/data/maps/Underwater_SootopolisCity/header.inc index 866b45a1f..d993d15d5 100644 --- a/data/maps/Underwater_SootopolisCity/header.inc +++ b/data/maps/Underwater_SootopolisCity/header.inc @@ -8,7 +8,7 @@ Underwater_SootopolisCity:: @ 8306DFC .byte MAPSEC_UNDERWATER_SOOTOPOLIS .byte 0 .byte WEATHER_BUBBLES - .byte 5 + .byte MAP_TYPE_UNDERWATER .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/UnknownMap_25_29/header.inc b/data/maps/UnknownMap_25_29/header.inc index ed72b6209..18ad74604 100644 --- a/data/maps/UnknownMap_25_29/header.inc +++ b/data/maps/UnknownMap_25_29/header.inc @@ -8,7 +8,7 @@ UnknownMap_25_29:: @ 8307A04 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/UnknownMap_25_30/header.inc b/data/maps/UnknownMap_25_30/header.inc index 010d4853e..86e5dc384 100644 --- a/data/maps/UnknownMap_25_30/header.inc +++ b/data/maps/UnknownMap_25_30/header.inc @@ -8,7 +8,7 @@ UnknownMap_25_30:: @ 8307A20 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/UnknownMap_25_31/header.inc b/data/maps/UnknownMap_25_31/header.inc index 6b7cbfbda..469ecbc57 100644 --- a/data/maps/UnknownMap_25_31/header.inc +++ b/data/maps/UnknownMap_25_31/header.inc @@ -8,7 +8,7 @@ UnknownMap_25_31:: @ 8307A3C .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/UnknownMap_25_32/header.inc b/data/maps/UnknownMap_25_32/header.inc index e8ac58478..d114d28f4 100644 --- a/data/maps/UnknownMap_25_32/header.inc +++ b/data/maps/UnknownMap_25_32/header.inc @@ -8,7 +8,7 @@ UnknownMap_25_32:: @ 8307A58 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/UnknownMap_25_33/header.inc b/data/maps/UnknownMap_25_33/header.inc index 1291fa5a6..946fb76ad 100644 --- a/data/maps/UnknownMap_25_33/header.inc +++ b/data/maps/UnknownMap_25_33/header.inc @@ -8,7 +8,7 @@ UnknownMap_25_33:: @ 8307A74 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/UnknownMap_25_34/header.inc b/data/maps/UnknownMap_25_34/header.inc index c45afd47e..53daccbef 100644 --- a/data/maps/UnknownMap_25_34/header.inc +++ b/data/maps/UnknownMap_25_34/header.inc @@ -8,7 +8,7 @@ UnknownMap_25_34:: @ 8307A90 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/VerdanturfTown/header.inc b/data/maps/VerdanturfTown/header.inc index 94c6c09c9..344717573 100644 --- a/data/maps/VerdanturfTown/header.inc +++ b/data/maps/VerdanturfTown/header.inc @@ -8,7 +8,7 @@ VerdanturfTown:: @ 83055D0 .byte MAPSEC_VERDANTURF_TOWN .byte 0 .byte WEATHER_SUNNY - .byte 1 + .byte MAP_TYPE_TOWN .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/VerdanturfTown_ContestHall/header.inc b/data/maps/VerdanturfTown_ContestHall/header.inc index 3ec1402a4..cc946ecd7 100644 --- a/data/maps/VerdanturfTown_ContestHall/header.inc +++ b/data/maps/VerdanturfTown_ContestHall/header.inc @@ -8,7 +8,7 @@ VerdanturfTown_ContestHall:: @ 8305D94 .byte MAPSEC_VERDANTURF_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/VerdanturfTown_ContestLobby/header.inc b/data/maps/VerdanturfTown_ContestLobby/header.inc index 332369ace..b72fe4018 100644 --- a/data/maps/VerdanturfTown_ContestLobby/header.inc +++ b/data/maps/VerdanturfTown_ContestLobby/header.inc @@ -8,7 +8,7 @@ VerdanturfTown_ContestLobby:: @ 8305D78 .byte MAPSEC_VERDANTURF_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc b/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc index 739bf5cb8..8c4b41c83 100644 --- a/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc +++ b/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc @@ -8,7 +8,7 @@ VerdanturfTown_FriendshipRatersHouse:: @ 8305E20 .byte MAPSEC_VERDANTURF_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/VerdanturfTown_House/header.inc b/data/maps/VerdanturfTown_House/header.inc index 01e797186..d3c18ee94 100644 --- a/data/maps/VerdanturfTown_House/header.inc +++ b/data/maps/VerdanturfTown_House/header.inc @@ -8,7 +8,7 @@ VerdanturfTown_House:: @ 8305E3C .byte MAPSEC_VERDANTURF_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/VerdanturfTown_Mart/header.inc b/data/maps/VerdanturfTown_Mart/header.inc index ddf6e9f02..f8f12f7fe 100644 --- a/data/maps/VerdanturfTown_Mart/header.inc +++ b/data/maps/VerdanturfTown_Mart/header.inc @@ -8,7 +8,7 @@ VerdanturfTown_Mart:: @ 8305DB0 .byte MAPSEC_VERDANTURF_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc b/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc index de9a5e73f..25491bb01 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc +++ b/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc @@ -8,7 +8,7 @@ VerdanturfTown_PokemonCenter_1F:: @ 8305DCC .byte MAPSEC_VERDANTURF_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc b/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc index 9245e50a2..68e894b08 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc +++ b/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc @@ -8,7 +8,7 @@ VerdanturfTown_PokemonCenter_2F:: @ 8305DE8 .byte MAPSEC_VERDANTURF_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/VerdanturfTown_WandasHouse/header.inc b/data/maps/VerdanturfTown_WandasHouse/header.inc index 6f7c607b7..d88ecf820 100644 --- a/data/maps/VerdanturfTown_WandasHouse/header.inc +++ b/data/maps/VerdanturfTown_WandasHouse/header.inc @@ -8,7 +8,7 @@ VerdanturfTown_WandasHouse:: @ 8305E04 .byte MAPSEC_VERDANTURF_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/VictoryRoad_1F/header.inc b/data/maps/VictoryRoad_1F/header.inc index d9092f38a..efff8011d 100644 --- a/data/maps/VictoryRoad_1F/header.inc +++ b/data/maps/VictoryRoad_1F/header.inc @@ -8,7 +8,7 @@ VictoryRoad_1F:: @ 8307224 .byte MAPSEC_VICTORY_ROAD .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/VictoryRoad_B1F/header.inc b/data/maps/VictoryRoad_B1F/header.inc index 6dfaaf100..6f789eecd 100644 --- a/data/maps/VictoryRoad_B1F/header.inc +++ b/data/maps/VictoryRoad_B1F/header.inc @@ -8,7 +8,7 @@ VictoryRoad_B1F:: @ 8307240 .byte MAPSEC_VICTORY_ROAD .byte 1 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/VictoryRoad_B2F/header.inc b/data/maps/VictoryRoad_B2F/header.inc index e1e51ede5..cd128d38a 100644 --- a/data/maps/VictoryRoad_B2F/header.inc +++ b/data/maps/VictoryRoad_B2F/header.inc @@ -8,7 +8,7 @@ VictoryRoad_B2F:: @ 830725C .byte MAPSEC_VICTORY_ROAD .byte 1 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 .byte 0 diff --git a/include/constants/map_types.h b/include/constants/map_types.h new file mode 100755 index 000000000..cc9ecf8a3 --- /dev/null +++ b/include/constants/map_types.h @@ -0,0 +1,25 @@ +#ifndef GUARD_CONSTANTS_MAP_TYPES_H +#define GUARD_CONSTANTS_MAP_TYPES_H + +#define MAP_TYPE_0 0 +#define MAP_TYPE_TOWN 1 +#define MAP_TYPE_CITY 2 +#define MAP_TYPE_ROUTE 3 +#define MAP_TYPE_UNDERGROUND 4 +#define MAP_TYPE_UNDERWATER 5 +#define MAP_TYPE_6 6 +#define MAP_TYPE_7 7 +#define MAP_TYPE_INDOOR 8 +#define MAP_TYPE_SECRET_BASE 9 + +#define MAP_BATTLE_SCENE_NORMAL 0 +#define MAP_BATTLE_SCENE_GYM 1 +#define MAP_BATTLE_SCENE_MAGMA 2 +#define MAP_BATTLE_SCENE_AQUA 3 +#define MAP_BATTLE_SCENE_SIDNEY 4 +#define MAP_BATTLE_SCENE_PHOEBE 5 +#define MAP_BATTLE_SCENE_GLACIA 6 +#define MAP_BATTLE_SCENE_DRAKE 7 +#define MAP_BATTLE_SCENE_BATTLE_TOWER 8 + +#endif // GUARD_CONSTANTS_MAP_TYPES_H diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h index 15766a350..aa13a9ac0 100644 --- a/include/global.fieldmap.h +++ b/include/global.fieldmap.h @@ -11,35 +11,6 @@ enum CONNECTION_EMERGE }; -// map types -enum -{ - MAP_TYPE_0, // 0 - MAP_TYPE_TOWN, // 1 - MAP_TYPE_CITY, // 2 - MAP_TYPE_ROUTE, // 3 - MAP_TYPE_UNDERGROUND, // 4 - MAP_TYPE_UNDERWATER, // 5 - MAP_TYPE_6, // 6 - MAP_TYPE_7, // 7 - MAP_TYPE_INDOOR, // 8 - MAP_TYPE_SECRET_BASE // 9 -}; - -// map battle scenes -enum -{ - MAP_BATTLE_SCENE_NORMAL, // 0 - MAP_BATTLE_SCENE_GYM, // 1 - MAP_BATTLE_SCENE_MAGMA, // 2 - MAP_BATTLE_SCENE_AQUA, // 3 - MAP_BATTLE_SCENE_SIDNEY, // 4 - MAP_BATTLE_SCENE_PHOEBE, // 5 - MAP_BATTLE_SCENE_GLACIA, // 6 - MAP_BATTLE_SCENE_DRAKE, // 7 - MAP_BATTLE_SCENE_BATTLE_TOWER, // 8 -}; - typedef void (*TilesetCB)(void); struct Tileset diff --git a/src/battle/battle_bg.c b/src/battle/battle_bg.c index 5a2a1efa3..4928708e0 100644 --- a/src/battle/battle_bg.c +++ b/src/battle/battle_bg.c @@ -1,6 +1,5 @@ #include "global.h" #include "battle.h" -#include "constants/songs.h" #include "decompress.h" #include "ewram.h" #include "graphics.h" @@ -13,6 +12,8 @@ #include "trainer.h" #include "trig.h" #include "sound.h" +#include "constants/map_types.h" +#include "constants/songs.h" extern u16 gBattleTypeFlags; diff --git a/src/battle/battle_setup.c b/src/battle/battle_setup.c index 8c5f68902..e8a3ef451 100644 --- a/src/battle/battle_setup.c +++ b/src/battle/battle_setup.c @@ -12,9 +12,7 @@ #include "fieldmap.h" #include "fldeff_poison.h" #include "main.h" -#include "constants/maps.h" #include "metatile_behavior.h" -#include "constants/opponents.h" #include "palette.h" #include "random.h" #include "overworld.h" @@ -22,15 +20,18 @@ #include "script.h" #include "script_pokemon_80C4.h" #include "secret_base.h" -#include "constants/songs.h" #include "sound.h" -#include "constants/species.h" #include "starter_choose.h" #include "string_util.h" #include "strings.h" #include "task.h" #include "text.h" #include "trainer.h" +#include "constants/map_types.h" +#include "constants/maps.h" +#include "constants/opponents.h" +#include "constants/songs.h" +#include "constants/species.h" extern u16 gSpecialVar_Result; diff --git a/src/bike.c b/src/bike.c index 41090a375..bf61d2aed 100644 --- a/src/bike.c +++ b/src/bike.c @@ -7,8 +7,9 @@ #include "global.fieldmap.h" #include "metatile_behavior.h" #include "overworld.h" -#include "constants/songs.h" #include "sound.h" +#include "constants/map_types.h" +#include "constants/songs.h" extern bool8 gBikeCyclingChallenge; extern u8 gBikeCollisions; diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c index 296d9ef63..7a438e100 100644 --- a/src/field_control_avatar.c +++ b/src/field_control_avatar.c @@ -25,6 +25,7 @@ #include "constants/vars.h" #include "wild_encounter.h" #include "constants/bg_event_constants.h" +#include "constants/map_types.h" struct Coords32 { diff --git a/src/fldeff_flash.c b/src/fldeff_flash.c index 5a04f7061..22da8e501 100644 --- a/src/fldeff_flash.c +++ b/src/fldeff_flash.c @@ -7,10 +7,11 @@ #include "overworld.h" #include "rom6.h" #include "script.h" -#include "constants/songs.h" #include "sound.h" #include "sprite.h" #include "task.h" +#include "constants/map_types.h" +#include "constants/songs.h" struct MapTypeFadePairs { diff --git a/src/item_use.c b/src/item_use.c index 91c17399f..1f33144b2 100644 --- a/src/item_use.c +++ b/src/item_use.c @@ -35,6 +35,7 @@ #include "strings.h" #include "task.h" #include "constants/bg_event_constants.h" +#include "constants/map_types.h" #include "constants/species.h" #include "constants/vars.h" diff --git a/src/overworld.c b/src/overworld.c index f6dea1271..a7a203ca2 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -24,7 +24,6 @@ #include "load_save.h" #include "main.h" #include "m4a.h" -#include "constants/maps.h" #include "map_name_popup.h" #include "menu.h" #include "metatile_behavior.h" @@ -38,9 +37,7 @@ #include "script.h" #include "script_pokemon_80C4.h" #include "secret_base.h" -#include "constants/songs.h" #include "sound.h" -#include "constants/species.h" #include "start_menu.h" #include "task.h" #include "tileset_anim.h" @@ -48,6 +45,10 @@ #include "tv.h" #include "scanline_effect.h" #include "wild_encounter.h" +#include "constants/map_types.h" +#include "constants/maps.h" +#include "constants/songs.h" +#include "constants/species.h" #ifdef SAPPHIRE #define LEGENDARY_MUSIC MUS_OOAME // Heavy Rain diff --git a/src/rom6.c b/src/rom6.c index 556a81293..6efb1802e 100644 --- a/src/rom6.c +++ b/src/rom6.c @@ -15,6 +15,7 @@ #include "task.h" #include "constants/event_object_movement_constants.h" #include "constants/field_effects.h" +#include "constants/map_types.h" extern u16 gSpecialVar_LastTalked; extern void (*gFieldCallback)(void); diff --git a/src/secret_base.c b/src/secret_base.c index d155bda0c..ca5f0c31f 100644 --- a/src/secret_base.c +++ b/src/secret_base.c @@ -32,6 +32,7 @@ #include "constants/bg_event_constants.h" #include "constants/decorations.h" #include "constants/items.h" +#include "constants/map_types.h" #include "constants/moves.h" #include "constants/species.h" #include "constants/vars.h" -- cgit v1.2.3 From 7dffb108b834afdee807998af24e1ddc4c85d4f9 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Thu, 12 Jul 2018 22:43:50 -0500 Subject: Use map battle scene constants in map headers --- data/maps/AbandonedShip_CaptainsOffice/header.inc | 2 +- data/maps/AbandonedShip_Corridors_1F/header.inc | 2 +- data/maps/AbandonedShip_Corridors_B1F/header.inc | 2 +- data/maps/AbandonedShip_Deck/header.inc | 2 +- data/maps/AbandonedShip_HiddenFloorCorridors/header.inc | 2 +- data/maps/AbandonedShip_HiddenFloorRooms/header.inc | 2 +- data/maps/AbandonedShip_Room_B1F/header.inc | 2 +- data/maps/AbandonedShip_Rooms2_1F/header.inc | 2 +- data/maps/AbandonedShip_Rooms2_B1F/header.inc | 2 +- data/maps/AbandonedShip_Rooms_1F/header.inc | 2 +- data/maps/AbandonedShip_Rooms_B1F/header.inc | 2 +- data/maps/AbandonedShip_Underwater1/header.inc | 2 +- data/maps/AbandonedShip_Underwater2/header.inc | 2 +- data/maps/AncientTomb/header.inc | 2 +- data/maps/AquaHideout_1F/header.inc | 2 +- data/maps/AquaHideout_B1F/header.inc | 2 +- data/maps/AquaHideout_B2F/header.inc | 2 +- data/maps/BattleTower_BattleRoom/header.inc | 2 +- data/maps/BattleTower_Corridor/header.inc | 2 +- data/maps/BattleTower_Elevator/header.inc | 2 +- data/maps/BattleTower_Lobby/header.inc | 2 +- data/maps/BattleTower_Outside/header.inc | 2 +- data/maps/CaveOfOrigin_1F/header.inc | 2 +- data/maps/CaveOfOrigin_B1F/header.inc | 2 +- data/maps/CaveOfOrigin_B2F/header.inc | 2 +- data/maps/CaveOfOrigin_B3F/header.inc | 2 +- data/maps/CaveOfOrigin_B4F/header.inc | 2 +- data/maps/CaveOfOrigin_Entrance/header.inc | 2 +- data/maps/DesertRuins/header.inc | 2 +- data/maps/DewfordTown/header.inc | 2 +- data/maps/DewfordTown_Gym/header.inc | 2 +- data/maps/DewfordTown_Hall/header.inc | 2 +- data/maps/DewfordTown_House1/header.inc | 2 +- data/maps/DewfordTown_House2/header.inc | 2 +- data/maps/DewfordTown_PokemonCenter_1F/header.inc | 2 +- data/maps/DewfordTown_PokemonCenter_2F/header.inc | 2 +- data/maps/DoubleBattleColosseum/header.inc | 2 +- data/maps/EverGrandeCity/header.inc | 2 +- data/maps/EverGrandeCity_ChampionsRoom/header.inc | 2 +- data/maps/EverGrandeCity_Corridor1/header.inc | 2 +- data/maps/EverGrandeCity_Corridor2/header.inc | 2 +- data/maps/EverGrandeCity_Corridor3/header.inc | 2 +- data/maps/EverGrandeCity_Corridor4/header.inc | 2 +- data/maps/EverGrandeCity_Corridor5/header.inc | 2 +- data/maps/EverGrandeCity_DrakesRoom/header.inc | 2 +- data/maps/EverGrandeCity_GlaciasRoom/header.inc | 2 +- data/maps/EverGrandeCity_HallOfFame/header.inc | 2 +- data/maps/EverGrandeCity_PhoebesRoom/header.inc | 2 +- data/maps/EverGrandeCity_PokemonCenter_1F/header.inc | 2 +- data/maps/EverGrandeCity_PokemonCenter_2F/header.inc | 2 +- data/maps/EverGrandeCity_PokemonLeague/header.inc | 2 +- data/maps/EverGrandeCity_SidneysRoom/header.inc | 2 +- data/maps/FallarborTown/header.inc | 2 +- data/maps/FallarborTown_ContestHall/header.inc | 2 +- data/maps/FallarborTown_ContestLobby/header.inc | 2 +- data/maps/FallarborTown_House1/header.inc | 2 +- data/maps/FallarborTown_House2/header.inc | 2 +- data/maps/FallarborTown_Mart/header.inc | 2 +- data/maps/FallarborTown_PokemonCenter_1F/header.inc | 2 +- data/maps/FallarborTown_PokemonCenter_2F/header.inc | 2 +- data/maps/FieryPath/header.inc | 2 +- data/maps/FortreeCity/header.inc | 2 +- data/maps/FortreeCity_DecorationShop/header.inc | 2 +- data/maps/FortreeCity_Gym/header.inc | 2 +- data/maps/FortreeCity_House1/header.inc | 2 +- data/maps/FortreeCity_House2/header.inc | 2 +- data/maps/FortreeCity_House3/header.inc | 2 +- data/maps/FortreeCity_House4/header.inc | 2 +- data/maps/FortreeCity_House5/header.inc | 2 +- data/maps/FortreeCity_Mart/header.inc | 2 +- data/maps/FortreeCity_PokemonCenter_1F/header.inc | 2 +- data/maps/FortreeCity_PokemonCenter_2F/header.inc | 2 +- data/maps/GraniteCave_1F/header.inc | 2 +- data/maps/GraniteCave_B1F/header.inc | 2 +- data/maps/GraniteCave_B2F/header.inc | 2 +- data/maps/GraniteCave_StevensRoom/header.inc | 2 +- data/maps/InsideOfTruck/header.inc | 2 +- data/maps/IslandCave/header.inc | 2 +- data/maps/JaggedPass/header.inc | 2 +- data/maps/LavaridgeTown/header.inc | 2 +- data/maps/LavaridgeTown_Gym_1F/header.inc | 2 +- data/maps/LavaridgeTown_Gym_B1F/header.inc | 2 +- data/maps/LavaridgeTown_HerbShop/header.inc | 2 +- data/maps/LavaridgeTown_House/header.inc | 2 +- data/maps/LavaridgeTown_Mart/header.inc | 2 +- data/maps/LavaridgeTown_PokemonCenter_1F/header.inc | 2 +- data/maps/LavaridgeTown_PokemonCenter_2F/header.inc | 2 +- data/maps/LilycoveCity/header.inc | 2 +- data/maps/LilycoveCity_ContestHall/header.inc | 2 +- data/maps/LilycoveCity_ContestLobby/header.inc | 2 +- data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc | 2 +- data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc | 2 +- data/maps/LilycoveCity_DepartmentStoreElevator/header.inc | 2 +- data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc | 2 +- data/maps/LilycoveCity_DepartmentStore_1F/header.inc | 2 +- data/maps/LilycoveCity_DepartmentStore_2F/header.inc | 2 +- data/maps/LilycoveCity_DepartmentStore_3F/header.inc | 2 +- data/maps/LilycoveCity_DepartmentStore_4F/header.inc | 2 +- data/maps/LilycoveCity_DepartmentStore_5F/header.inc | 2 +- data/maps/LilycoveCity_EmptyMap/header.inc | 2 +- data/maps/LilycoveCity_Harbor/header.inc | 2 +- data/maps/LilycoveCity_House1/header.inc | 2 +- data/maps/LilycoveCity_House2/header.inc | 2 +- data/maps/LilycoveCity_House3/header.inc | 2 +- data/maps/LilycoveCity_House4/header.inc | 2 +- data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc | 2 +- data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc | 2 +- data/maps/LilycoveCity_MoveDeletersHouse/header.inc | 2 +- data/maps/LilycoveCity_PokemonCenter_1F/header.inc | 2 +- data/maps/LilycoveCity_PokemonCenter_2F/header.inc | 2 +- data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc | 2 +- data/maps/LilycoveCity_UnusedMart/header.inc | 2 +- data/maps/LinkContestRoom1/header.inc | 2 +- data/maps/LinkContestRoom2/header.inc | 2 +- data/maps/LinkContestRoom3/header.inc | 2 +- data/maps/LinkContestRoom4/header.inc | 2 +- data/maps/LinkContestRoom5/header.inc | 2 +- data/maps/LinkContestRoom6/header.inc | 2 +- data/maps/LittlerootTown/header.inc | 2 +- data/maps/LittlerootTown_BrendansHouse_1F/header.inc | 2 +- data/maps/LittlerootTown_BrendansHouse_2F/header.inc | 2 +- data/maps/LittlerootTown_MaysHouse_1F/header.inc | 2 +- data/maps/LittlerootTown_MaysHouse_2F/header.inc | 2 +- data/maps/LittlerootTown_ProfessorBirchsLab/header.inc | 2 +- data/maps/MagmaHideout_1F/header.inc | 2 +- data/maps/MagmaHideout_B1F/header.inc | 2 +- data/maps/MagmaHideout_B2F/header.inc | 2 +- data/maps/MauvilleCity/header.inc | 2 +- data/maps/MauvilleCity_BikeShop/header.inc | 2 +- data/maps/MauvilleCity_GameCorner/header.inc | 2 +- data/maps/MauvilleCity_Gym/header.inc | 2 +- data/maps/MauvilleCity_House1/header.inc | 2 +- data/maps/MauvilleCity_House2/header.inc | 2 +- data/maps/MauvilleCity_Mart/header.inc | 2 +- data/maps/MauvilleCity_PokemonCenter_1F/header.inc | 2 +- data/maps/MauvilleCity_PokemonCenter_2F/header.inc | 2 +- data/maps/MeteorFalls_1F_1R/header.inc | 2 +- data/maps/MeteorFalls_1F_2R/header.inc | 2 +- data/maps/MeteorFalls_B1F_1R/header.inc | 2 +- data/maps/MeteorFalls_B1F_2R/header.inc | 2 +- data/maps/MossdeepCity/header.inc | 2 +- data/maps/MossdeepCity_GameCorner_1F/header.inc | 2 +- data/maps/MossdeepCity_GameCorner_B1F/header.inc | 2 +- data/maps/MossdeepCity_Gym/header.inc | 2 +- data/maps/MossdeepCity_House1/header.inc | 2 +- data/maps/MossdeepCity_House2/header.inc | 2 +- data/maps/MossdeepCity_House3/header.inc | 2 +- data/maps/MossdeepCity_House4/header.inc | 2 +- data/maps/MossdeepCity_Mart/header.inc | 2 +- data/maps/MossdeepCity_PokemonCenter_1F/header.inc | 2 +- data/maps/MossdeepCity_PokemonCenter_2F/header.inc | 2 +- data/maps/MossdeepCity_SpaceCenter_1F/header.inc | 2 +- data/maps/MossdeepCity_SpaceCenter_2F/header.inc | 2 +- data/maps/MossdeepCity_StevensHouse/header.inc | 2 +- data/maps/MtChimney/header.inc | 2 +- data/maps/MtChimney_CableCarStation/header.inc | 2 +- data/maps/MtPyre_1F/header.inc | 2 +- data/maps/MtPyre_2F/header.inc | 2 +- data/maps/MtPyre_3F/header.inc | 2 +- data/maps/MtPyre_4F/header.inc | 2 +- data/maps/MtPyre_5F/header.inc | 2 +- data/maps/MtPyre_6F/header.inc | 2 +- data/maps/MtPyre_Exterior/header.inc | 2 +- data/maps/MtPyre_Summit/header.inc | 2 +- data/maps/NewMauville_Entrance/header.inc | 2 +- data/maps/NewMauville_Inside/header.inc | 2 +- data/maps/OldaleTown/header.inc | 2 +- data/maps/OldaleTown_House1/header.inc | 2 +- data/maps/OldaleTown_House2/header.inc | 2 +- data/maps/OldaleTown_Mart/header.inc | 2 +- data/maps/OldaleTown_PokemonCenter_1F/header.inc | 2 +- data/maps/OldaleTown_PokemonCenter_2F/header.inc | 2 +- data/maps/PacifidlogTown/header.inc | 2 +- data/maps/PacifidlogTown_House1/header.inc | 2 +- data/maps/PacifidlogTown_House2/header.inc | 2 +- data/maps/PacifidlogTown_House3/header.inc | 2 +- data/maps/PacifidlogTown_House4/header.inc | 2 +- data/maps/PacifidlogTown_House5/header.inc | 2 +- data/maps/PacifidlogTown_PokemonCenter_1F/header.inc | 2 +- data/maps/PacifidlogTown_PokemonCenter_2F/header.inc | 2 +- data/maps/PetalburgCity/header.inc | 2 +- data/maps/PetalburgCity_Gym/header.inc | 2 +- data/maps/PetalburgCity_House1/header.inc | 2 +- data/maps/PetalburgCity_House2/header.inc | 2 +- data/maps/PetalburgCity_Mart/header.inc | 2 +- data/maps/PetalburgCity_PokemonCenter_1F/header.inc | 2 +- data/maps/PetalburgCity_PokemonCenter_2F/header.inc | 2 +- data/maps/PetalburgCity_WallysHouse/header.inc | 2 +- data/maps/PetalburgWoods/header.inc | 2 +- data/maps/RecordCorner/header.inc | 2 +- data/maps/Route101/header.inc | 2 +- data/maps/Route102/header.inc | 2 +- data/maps/Route103/header.inc | 2 +- data/maps/Route104/header.inc | 2 +- data/maps/Route104_MrBrineysHouse/header.inc | 2 +- data/maps/Route104_PrettyPetalFlowerShop/header.inc | 2 +- data/maps/Route104_Prototype/header.inc | 2 +- data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc | 2 +- data/maps/Route105/header.inc | 2 +- data/maps/Route106/header.inc | 2 +- data/maps/Route107/header.inc | 2 +- data/maps/Route108/header.inc | 2 +- data/maps/Route109/header.inc | 2 +- data/maps/Route109_SeashoreHouse/header.inc | 2 +- data/maps/Route110/header.inc | 2 +- data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc | 2 +- data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc | 2 +- data/maps/Route110_TrickHouseCorridor/header.inc | 2 +- data/maps/Route110_TrickHouseEnd/header.inc | 2 +- data/maps/Route110_TrickHouseEntrance/header.inc | 2 +- data/maps/Route110_TrickHousePuzzle1/header.inc | 2 +- data/maps/Route110_TrickHousePuzzle2/header.inc | 2 +- data/maps/Route110_TrickHousePuzzle3/header.inc | 2 +- data/maps/Route110_TrickHousePuzzle4/header.inc | 2 +- data/maps/Route110_TrickHousePuzzle5/header.inc | 2 +- data/maps/Route110_TrickHousePuzzle6/header.inc | 2 +- data/maps/Route110_TrickHousePuzzle7/header.inc | 2 +- data/maps/Route110_TrickHousePuzzle8/header.inc | 2 +- data/maps/Route111/header.inc | 2 +- data/maps/Route111_OldLadysRestStop/header.inc | 2 +- data/maps/Route111_WinstrateFamilysHouse/header.inc | 2 +- data/maps/Route112/header.inc | 2 +- data/maps/Route112_CableCarStation/header.inc | 2 +- data/maps/Route113/header.inc | 2 +- data/maps/Route113_GlassWorkshop/header.inc | 2 +- data/maps/Route114/header.inc | 2 +- data/maps/Route114_FossilManiacsHouse/header.inc | 2 +- data/maps/Route114_FossilManiacsTunnel/header.inc | 2 +- data/maps/Route114_LanettesHouse/header.inc | 2 +- data/maps/Route115/header.inc | 2 +- data/maps/Route116/header.inc | 2 +- data/maps/Route116_TunnelersRestHouse/header.inc | 2 +- data/maps/Route117/header.inc | 2 +- data/maps/Route117_PokemonDayCare/header.inc | 2 +- data/maps/Route118/header.inc | 2 +- data/maps/Route119/header.inc | 2 +- data/maps/Route119_House/header.inc | 2 +- data/maps/Route119_WeatherInstitute_1F/header.inc | 2 +- data/maps/Route119_WeatherInstitute_2F/header.inc | 2 +- data/maps/Route120/header.inc | 2 +- data/maps/Route121/header.inc | 2 +- data/maps/Route121_SafariZoneEntrance/header.inc | 2 +- data/maps/Route122/header.inc | 2 +- data/maps/Route123/header.inc | 2 +- data/maps/Route123_BerryMastersHouse/header.inc | 2 +- data/maps/Route124/header.inc | 2 +- data/maps/Route124_DivingTreasureHuntersHouse/header.inc | 2 +- data/maps/Route125/header.inc | 2 +- data/maps/Route126/header.inc | 2 +- data/maps/Route127/header.inc | 2 +- data/maps/Route128/header.inc | 2 +- data/maps/Route129/header.inc | 2 +- data/maps/Route130/header.inc | 2 +- data/maps/Route131/header.inc | 2 +- data/maps/Route132/header.inc | 2 +- data/maps/Route133/header.inc | 2 +- data/maps/Route134/header.inc | 2 +- data/maps/RustboroCity/header.inc | 2 +- data/maps/RustboroCity_CuttersHouse/header.inc | 2 +- data/maps/RustboroCity_DevonCorp_1F/header.inc | 2 +- data/maps/RustboroCity_DevonCorp_2F/header.inc | 2 +- data/maps/RustboroCity_DevonCorp_3F/header.inc | 2 +- data/maps/RustboroCity_Flat1_1F/header.inc | 2 +- data/maps/RustboroCity_Flat1_2F/header.inc | 2 +- data/maps/RustboroCity_Flat2_1F/header.inc | 2 +- data/maps/RustboroCity_Flat2_2F/header.inc | 2 +- data/maps/RustboroCity_Flat2_3F/header.inc | 2 +- data/maps/RustboroCity_Gym/header.inc | 2 +- data/maps/RustboroCity_House1/header.inc | 2 +- data/maps/RustboroCity_House2/header.inc | 2 +- data/maps/RustboroCity_House3/header.inc | 2 +- data/maps/RustboroCity_Mart/header.inc | 2 +- data/maps/RustboroCity_PokemonCenter_1F/header.inc | 2 +- data/maps/RustboroCity_PokemonCenter_2F/header.inc | 2 +- data/maps/RustboroCity_PokemonSchool/header.inc | 2 +- data/maps/RusturfTunnel/header.inc | 2 +- data/maps/SSTidalCorridor/header.inc | 2 +- data/maps/SSTidalLowerDeck/header.inc | 2 +- data/maps/SSTidalRooms/header.inc | 2 +- data/maps/SafariZone_Northeast/header.inc | 2 +- data/maps/SafariZone_Northwest/header.inc | 2 +- data/maps/SafariZone_RestHouse/header.inc | 2 +- data/maps/SafariZone_Southeast/header.inc | 2 +- data/maps/SafariZone_Southwest/header.inc | 2 +- data/maps/ScorchedSlab/header.inc | 2 +- data/maps/SeafloorCavern_Entrance/header.inc | 2 +- data/maps/SeafloorCavern_Room1/header.inc | 2 +- data/maps/SeafloorCavern_Room2/header.inc | 2 +- data/maps/SeafloorCavern_Room3/header.inc | 2 +- data/maps/SeafloorCavern_Room4/header.inc | 2 +- data/maps/SeafloorCavern_Room5/header.inc | 2 +- data/maps/SeafloorCavern_Room6/header.inc | 2 +- data/maps/SeafloorCavern_Room7/header.inc | 2 +- data/maps/SeafloorCavern_Room8/header.inc | 2 +- data/maps/SeafloorCavern_Room9/header.inc | 2 +- data/maps/SealedChamber_InnerRoom/header.inc | 2 +- data/maps/SealedChamber_OuterRoom/header.inc | 2 +- data/maps/SecretBase_BlueCave1/header.inc | 2 +- data/maps/SecretBase_BlueCave2/header.inc | 2 +- data/maps/SecretBase_BlueCave3/header.inc | 2 +- data/maps/SecretBase_BlueCave4/header.inc | 2 +- data/maps/SecretBase_BrownCave1/header.inc | 2 +- data/maps/SecretBase_BrownCave2/header.inc | 2 +- data/maps/SecretBase_BrownCave3/header.inc | 2 +- data/maps/SecretBase_BrownCave4/header.inc | 2 +- data/maps/SecretBase_RedCave1/header.inc | 2 +- data/maps/SecretBase_RedCave2/header.inc | 2 +- data/maps/SecretBase_RedCave3/header.inc | 2 +- data/maps/SecretBase_RedCave4/header.inc | 2 +- data/maps/SecretBase_Shrub1/header.inc | 2 +- data/maps/SecretBase_Shrub2/header.inc | 2 +- data/maps/SecretBase_Shrub3/header.inc | 2 +- data/maps/SecretBase_Shrub4/header.inc | 2 +- data/maps/SecretBase_Tree1/header.inc | 2 +- data/maps/SecretBase_Tree2/header.inc | 2 +- data/maps/SecretBase_Tree3/header.inc | 2 +- data/maps/SecretBase_Tree4/header.inc | 2 +- data/maps/SecretBase_YellowCave1/header.inc | 2 +- data/maps/SecretBase_YellowCave2/header.inc | 2 +- data/maps/SecretBase_YellowCave3/header.inc | 2 +- data/maps/SecretBase_YellowCave4/header.inc | 2 +- data/maps/ShoalCave_HighTideEntranceRoom/header.inc | 2 +- data/maps/ShoalCave_HighTideInnerRoom/header.inc | 2 +- data/maps/ShoalCave_LowTideEntranceRoom/header.inc | 2 +- data/maps/ShoalCave_LowTideIceRoom/header.inc | 2 +- data/maps/ShoalCave_LowTideInnerRoom/header.inc | 2 +- data/maps/ShoalCave_LowTideLowerRoom/header.inc | 2 +- data/maps/ShoalCave_LowTideStairsRoom/header.inc | 2 +- data/maps/SingleBattleColosseum/header.inc | 2 +- data/maps/SkyPillar_1F/header.inc | 2 +- data/maps/SkyPillar_2F/header.inc | 2 +- data/maps/SkyPillar_3F/header.inc | 2 +- data/maps/SkyPillar_4F/header.inc | 2 +- data/maps/SkyPillar_5F/header.inc | 2 +- data/maps/SkyPillar_Entrance/header.inc | 2 +- data/maps/SkyPillar_Outside/header.inc | 2 +- data/maps/SkyPillar_Top/header.inc | 2 +- data/maps/SlateportCity/header.inc | 2 +- data/maps/SlateportCity_ContestHall/header.inc | 2 +- data/maps/SlateportCity_ContestLobby/header.inc | 2 +- data/maps/SlateportCity_Harbor/header.inc | 2 +- data/maps/SlateportCity_House1/header.inc | 2 +- data/maps/SlateportCity_House2/header.inc | 2 +- data/maps/SlateportCity_Mart/header.inc | 2 +- data/maps/SlateportCity_OceanicMuseum_1F/header.inc | 2 +- data/maps/SlateportCity_OceanicMuseum_2F/header.inc | 2 +- data/maps/SlateportCity_PokemonCenter_1F/header.inc | 2 +- data/maps/SlateportCity_PokemonCenter_2F/header.inc | 2 +- data/maps/SlateportCity_PokemonFanClub/header.inc | 2 +- data/maps/SlateportCity_SternsShipyard_1F/header.inc | 2 +- data/maps/SlateportCity_SternsShipyard_2F/header.inc | 2 +- data/maps/SootopolisCity/header.inc | 2 +- data/maps/SootopolisCity_Gym_1F/header.inc | 2 +- data/maps/SootopolisCity_Gym_B1F/header.inc | 2 +- data/maps/SootopolisCity_House1/header.inc | 2 +- data/maps/SootopolisCity_House2/header.inc | 2 +- data/maps/SootopolisCity_House3/header.inc | 2 +- data/maps/SootopolisCity_House4/header.inc | 2 +- data/maps/SootopolisCity_House5/header.inc | 2 +- data/maps/SootopolisCity_House6/header.inc | 2 +- data/maps/SootopolisCity_House7/header.inc | 2 +- data/maps/SootopolisCity_House8/header.inc | 2 +- data/maps/SootopolisCity_Mart/header.inc | 2 +- data/maps/SootopolisCity_PokemonCenter_1F/header.inc | 2 +- data/maps/SootopolisCity_PokemonCenter_2F/header.inc | 2 +- data/maps/SouthernIsland_Exterior/header.inc | 2 +- data/maps/SouthernIsland_Interior/header.inc | 2 +- data/maps/TradeCenter/header.inc | 2 +- data/maps/Underwater1/header.inc | 2 +- data/maps/Underwater2/header.inc | 2 +- data/maps/Underwater3/header.inc | 2 +- data/maps/Underwater4/header.inc | 2 +- data/maps/Underwater_Route134/header.inc | 2 +- data/maps/Underwater_SeafloorCavern/header.inc | 2 +- data/maps/Underwater_SealedChamber/header.inc | 2 +- data/maps/Underwater_SootopolisCity/header.inc | 2 +- data/maps/UnknownMap_25_29/header.inc | 2 +- data/maps/UnknownMap_25_30/header.inc | 2 +- data/maps/UnknownMap_25_31/header.inc | 2 +- data/maps/UnknownMap_25_32/header.inc | 2 +- data/maps/UnknownMap_25_33/header.inc | 2 +- data/maps/UnknownMap_25_34/header.inc | 2 +- data/maps/VerdanturfTown/header.inc | 2 +- data/maps/VerdanturfTown_ContestHall/header.inc | 2 +- data/maps/VerdanturfTown_ContestLobby/header.inc | 2 +- data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc | 2 +- data/maps/VerdanturfTown_House/header.inc | 2 +- data/maps/VerdanturfTown_Mart/header.inc | 2 +- data/maps/VerdanturfTown_PokemonCenter_1F/header.inc | 2 +- data/maps/VerdanturfTown_PokemonCenter_2F/header.inc | 2 +- data/maps/VerdanturfTown_WandasHouse/header.inc | 2 +- data/maps/VictoryRoad_1F/header.inc | 2 +- data/maps/VictoryRoad_B1F/header.inc | 2 +- data/maps/VictoryRoad_B2F/header.inc | 2 +- 394 files changed, 394 insertions(+), 394 deletions(-) diff --git a/data/maps/AbandonedShip_CaptainsOffice/header.inc b/data/maps/AbandonedShip_CaptainsOffice/header.inc index 007ccb4c4..178d527b2 100644 --- a/data/maps/AbandonedShip_CaptainsOffice/header.inc +++ b/data/maps/AbandonedShip_CaptainsOffice/header.inc @@ -11,4 +11,4 @@ AbandonedShip_CaptainsOffice:: @ 8307454 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/AbandonedShip_Corridors_1F/header.inc b/data/maps/AbandonedShip_Corridors_1F/header.inc index 9c49a6e12..6e437485a 100644 --- a/data/maps/AbandonedShip_Corridors_1F/header.inc +++ b/data/maps/AbandonedShip_Corridors_1F/header.inc @@ -11,4 +11,4 @@ AbandonedShip_Corridors_1F:: @ 8307374 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/AbandonedShip_Corridors_B1F/header.inc b/data/maps/AbandonedShip_Corridors_B1F/header.inc index 692c5922c..884c1cc0d 100644 --- a/data/maps/AbandonedShip_Corridors_B1F/header.inc +++ b/data/maps/AbandonedShip_Corridors_B1F/header.inc @@ -11,4 +11,4 @@ AbandonedShip_Corridors_B1F:: @ 83073AC .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/AbandonedShip_Deck/header.inc b/data/maps/AbandonedShip_Deck/header.inc index f48ab2130..3454cac63 100644 --- a/data/maps/AbandonedShip_Deck/header.inc +++ b/data/maps/AbandonedShip_Deck/header.inc @@ -11,4 +11,4 @@ AbandonedShip_Deck:: @ 8307358 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc b/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc index fcd5a4706..9894918c6 100644 --- a/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc +++ b/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc @@ -11,4 +11,4 @@ AbandonedShip_HiddenFloorCorridors:: @ 830748C .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/header.inc b/data/maps/AbandonedShip_HiddenFloorRooms/header.inc index 4b357b3f6..d1b89c313 100644 --- a/data/maps/AbandonedShip_HiddenFloorRooms/header.inc +++ b/data/maps/AbandonedShip_HiddenFloorRooms/header.inc @@ -11,4 +11,4 @@ AbandonedShip_HiddenFloorRooms:: @ 83074A8 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/AbandonedShip_Room_B1F/header.inc b/data/maps/AbandonedShip_Room_B1F/header.inc index 527e8e5bc..fcfc746c1 100644 --- a/data/maps/AbandonedShip_Room_B1F/header.inc +++ b/data/maps/AbandonedShip_Room_B1F/header.inc @@ -11,4 +11,4 @@ AbandonedShip_Room_B1F:: @ 830741C .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/AbandonedShip_Rooms2_1F/header.inc b/data/maps/AbandonedShip_Rooms2_1F/header.inc index c22d6d10d..e76a52fd7 100644 --- a/data/maps/AbandonedShip_Rooms2_1F/header.inc +++ b/data/maps/AbandonedShip_Rooms2_1F/header.inc @@ -11,4 +11,4 @@ AbandonedShip_Rooms2_1F:: @ 8307438 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/AbandonedShip_Rooms2_B1F/header.inc b/data/maps/AbandonedShip_Rooms2_B1F/header.inc index 81665db27..042b61164 100644 --- a/data/maps/AbandonedShip_Rooms2_B1F/header.inc +++ b/data/maps/AbandonedShip_Rooms2_B1F/header.inc @@ -11,4 +11,4 @@ AbandonedShip_Rooms2_B1F:: @ 83073E4 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/AbandonedShip_Rooms_1F/header.inc b/data/maps/AbandonedShip_Rooms_1F/header.inc index 529077f67..c660f4a33 100644 --- a/data/maps/AbandonedShip_Rooms_1F/header.inc +++ b/data/maps/AbandonedShip_Rooms_1F/header.inc @@ -11,4 +11,4 @@ AbandonedShip_Rooms_1F:: @ 8307390 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/AbandonedShip_Rooms_B1F/header.inc b/data/maps/AbandonedShip_Rooms_B1F/header.inc index 018f4b2f4..360864803 100644 --- a/data/maps/AbandonedShip_Rooms_B1F/header.inc +++ b/data/maps/AbandonedShip_Rooms_B1F/header.inc @@ -11,4 +11,4 @@ AbandonedShip_Rooms_B1F:: @ 83073C8 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/AbandonedShip_Underwater1/header.inc b/data/maps/AbandonedShip_Underwater1/header.inc index e40484143..12f2c380b 100644 --- a/data/maps/AbandonedShip_Underwater1/header.inc +++ b/data/maps/AbandonedShip_Underwater1/header.inc @@ -11,4 +11,4 @@ AbandonedShip_Underwater1:: @ 8307400 .byte MAP_TYPE_UNDERWATER .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/AbandonedShip_Underwater2/header.inc b/data/maps/AbandonedShip_Underwater2/header.inc index ac549db4c..435ee67a3 100644 --- a/data/maps/AbandonedShip_Underwater2/header.inc +++ b/data/maps/AbandonedShip_Underwater2/header.inc @@ -11,4 +11,4 @@ AbandonedShip_Underwater2:: @ 8307470 .byte MAP_TYPE_UNDERWATER .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/AncientTomb/header.inc b/data/maps/AncientTomb/header.inc index a28a7a77a..30487ab6b 100644 --- a/data/maps/AncientTomb/header.inc +++ b/data/maps/AncientTomb/header.inc @@ -11,4 +11,4 @@ AncientTomb:: @ 83074E0 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/AquaHideout_1F/header.inc b/data/maps/AquaHideout_1F/header.inc index 436466f98..68c4b3a67 100644 --- a/data/maps/AquaHideout_1F/header.inc +++ b/data/maps/AquaHideout_1F/header.inc @@ -11,4 +11,4 @@ AquaHideout_1F:: @ 8306FF4 .byte MAP_TYPE_INDOOR .2byte 0 .byte 1 - .byte 3 + .byte MAP_BATTLE_SCENE_AQUA diff --git a/data/maps/AquaHideout_B1F/header.inc b/data/maps/AquaHideout_B1F/header.inc index be77d5630..d7ed443d2 100644 --- a/data/maps/AquaHideout_B1F/header.inc +++ b/data/maps/AquaHideout_B1F/header.inc @@ -11,4 +11,4 @@ AquaHideout_B1F:: @ 8307010 .byte MAP_TYPE_INDOOR .2byte 0 .byte 1 - .byte 3 + .byte MAP_BATTLE_SCENE_AQUA diff --git a/data/maps/AquaHideout_B2F/header.inc b/data/maps/AquaHideout_B2F/header.inc index d575c2c90..22e30f598 100644 --- a/data/maps/AquaHideout_B2F/header.inc +++ b/data/maps/AquaHideout_B2F/header.inc @@ -11,4 +11,4 @@ AquaHideout_B2F:: @ 830702C .byte MAP_TYPE_INDOOR .2byte 0 .byte 1 - .byte 3 + .byte MAP_BATTLE_SCENE_AQUA diff --git a/data/maps/BattleTower_BattleRoom/header.inc b/data/maps/BattleTower_BattleRoom/header.inc index 2043f0146..f21ded0e5 100644 --- a/data/maps/BattleTower_BattleRoom/header.inc +++ b/data/maps/BattleTower_BattleRoom/header.inc @@ -11,4 +11,4 @@ BattleTower_BattleRoom:: @ 8307C88 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 8 + .byte MAP_BATTLE_SCENE_BATTLE_TOWER diff --git a/data/maps/BattleTower_Corridor/header.inc b/data/maps/BattleTower_Corridor/header.inc index cc72d42a7..8d5b0719f 100644 --- a/data/maps/BattleTower_Corridor/header.inc +++ b/data/maps/BattleTower_Corridor/header.inc @@ -11,4 +11,4 @@ BattleTower_Corridor:: @ 8307C6C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleTower_Elevator/header.inc b/data/maps/BattleTower_Elevator/header.inc index 3cab9f057..05cb41342 100644 --- a/data/maps/BattleTower_Elevator/header.inc +++ b/data/maps/BattleTower_Elevator/header.inc @@ -11,4 +11,4 @@ BattleTower_Elevator:: @ 8307C50 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleTower_Lobby/header.inc b/data/maps/BattleTower_Lobby/header.inc index c4e8426d3..2a4caadcb 100644 --- a/data/maps/BattleTower_Lobby/header.inc +++ b/data/maps/BattleTower_Lobby/header.inc @@ -11,4 +11,4 @@ BattleTower_Lobby:: @ 8307C34 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleTower_Outside/header.inc b/data/maps/BattleTower_Outside/header.inc index 5725a020d..ed95d9358 100644 --- a/data/maps/BattleTower_Outside/header.inc +++ b/data/maps/BattleTower_Outside/header.inc @@ -11,4 +11,4 @@ BattleTower_Outside:: @ 8307C18 .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/CaveOfOrigin_1F/header.inc b/data/maps/CaveOfOrigin_1F/header.inc index 6c0c0282b..20c0aa739 100644 --- a/data/maps/CaveOfOrigin_1F/header.inc +++ b/data/maps/CaveOfOrigin_1F/header.inc @@ -11,4 +11,4 @@ CaveOfOrigin_1F:: @ 8307198 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/CaveOfOrigin_B1F/header.inc b/data/maps/CaveOfOrigin_B1F/header.inc index 2ca7210bf..45300c02d 100644 --- a/data/maps/CaveOfOrigin_B1F/header.inc +++ b/data/maps/CaveOfOrigin_B1F/header.inc @@ -11,4 +11,4 @@ CaveOfOrigin_B1F:: @ 83071B4 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/CaveOfOrigin_B2F/header.inc b/data/maps/CaveOfOrigin_B2F/header.inc index d44586310..fb1bf9e45 100644 --- a/data/maps/CaveOfOrigin_B2F/header.inc +++ b/data/maps/CaveOfOrigin_B2F/header.inc @@ -11,4 +11,4 @@ CaveOfOrigin_B2F:: @ 83071D0 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/CaveOfOrigin_B3F/header.inc b/data/maps/CaveOfOrigin_B3F/header.inc index a609cc046..5e6359852 100644 --- a/data/maps/CaveOfOrigin_B3F/header.inc +++ b/data/maps/CaveOfOrigin_B3F/header.inc @@ -11,4 +11,4 @@ CaveOfOrigin_B3F:: @ 83071EC .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/CaveOfOrigin_B4F/header.inc b/data/maps/CaveOfOrigin_B4F/header.inc index ae32a3fbd..00e51495e 100644 --- a/data/maps/CaveOfOrigin_B4F/header.inc +++ b/data/maps/CaveOfOrigin_B4F/header.inc @@ -11,4 +11,4 @@ CaveOfOrigin_B4F:: @ 8307208 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/CaveOfOrigin_Entrance/header.inc b/data/maps/CaveOfOrigin_Entrance/header.inc index 2d94c3cb8..29c356a24 100644 --- a/data/maps/CaveOfOrigin_Entrance/header.inc +++ b/data/maps/CaveOfOrigin_Entrance/header.inc @@ -11,4 +11,4 @@ CaveOfOrigin_Entrance:: @ 830717C .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/DesertRuins/header.inc b/data/maps/DesertRuins/header.inc index 51a58c901..5e42b6c1a 100644 --- a/data/maps/DesertRuins/header.inc +++ b/data/maps/DesertRuins/header.inc @@ -11,4 +11,4 @@ DesertRuins:: @ 8306E18 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/DewfordTown/header.inc b/data/maps/DewfordTown/header.inc index 2e50fc942..f66ffc56b 100644 --- a/data/maps/DewfordTown/header.inc +++ b/data/maps/DewfordTown/header.inc @@ -11,4 +11,4 @@ DewfordTown:: @ 830557C .byte MAP_TYPE_TOWN .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/DewfordTown_Gym/header.inc b/data/maps/DewfordTown_Gym/header.inc index d14be9081..cbc2c1504 100644 --- a/data/maps/DewfordTown_Gym/header.inc +++ b/data/maps/DewfordTown_Gym/header.inc @@ -11,4 +11,4 @@ DewfordTown_Gym:: @ 8305B9C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 1 + .byte MAP_BATTLE_SCENE_GYM diff --git a/data/maps/DewfordTown_Hall/header.inc b/data/maps/DewfordTown_Hall/header.inc index 693aad8dd..540fc602c 100644 --- a/data/maps/DewfordTown_Hall/header.inc +++ b/data/maps/DewfordTown_Hall/header.inc @@ -11,4 +11,4 @@ DewfordTown_Hall:: @ 8305BB8 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/DewfordTown_House1/header.inc b/data/maps/DewfordTown_House1/header.inc index b23156bcf..067ac76f4 100644 --- a/data/maps/DewfordTown_House1/header.inc +++ b/data/maps/DewfordTown_House1/header.inc @@ -11,4 +11,4 @@ DewfordTown_House1:: @ 8305B48 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/DewfordTown_House2/header.inc b/data/maps/DewfordTown_House2/header.inc index 576cd92b4..75af834ff 100644 --- a/data/maps/DewfordTown_House2/header.inc +++ b/data/maps/DewfordTown_House2/header.inc @@ -11,4 +11,4 @@ DewfordTown_House2:: @ 8305BD4 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/DewfordTown_PokemonCenter_1F/header.inc b/data/maps/DewfordTown_PokemonCenter_1F/header.inc index e1e80ce69..84cf5a83e 100644 --- a/data/maps/DewfordTown_PokemonCenter_1F/header.inc +++ b/data/maps/DewfordTown_PokemonCenter_1F/header.inc @@ -11,4 +11,4 @@ DewfordTown_PokemonCenter_1F:: @ 8305B64 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/DewfordTown_PokemonCenter_2F/header.inc b/data/maps/DewfordTown_PokemonCenter_2F/header.inc index 07cbd0d21..90ccaa9d1 100644 --- a/data/maps/DewfordTown_PokemonCenter_2F/header.inc +++ b/data/maps/DewfordTown_PokemonCenter_2F/header.inc @@ -11,4 +11,4 @@ DewfordTown_PokemonCenter_2F:: @ 8305B80 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/DoubleBattleColosseum/header.inc b/data/maps/DoubleBattleColosseum/header.inc index 77e74f68e..d9bc47e23 100644 --- a/data/maps/DoubleBattleColosseum/header.inc +++ b/data/maps/DoubleBattleColosseum/header.inc @@ -11,4 +11,4 @@ DoubleBattleColosseum:: @ 83079CC .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 8 + .byte MAP_BATTLE_SCENE_BATTLE_TOWER diff --git a/data/maps/EverGrandeCity/header.inc b/data/maps/EverGrandeCity/header.inc index 0ea3e5895..b80385735 100644 --- a/data/maps/EverGrandeCity/header.inc +++ b/data/maps/EverGrandeCity/header.inc @@ -11,4 +11,4 @@ EverGrandeCity:: @ 8305528 .byte MAP_TYPE_CITY .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/EverGrandeCity_ChampionsRoom/header.inc b/data/maps/EverGrandeCity_ChampionsRoom/header.inc index 2120bbd5c..74fc87562 100644 --- a/data/maps/EverGrandeCity_ChampionsRoom/header.inc +++ b/data/maps/EverGrandeCity_ChampionsRoom/header.inc @@ -11,4 +11,4 @@ EverGrandeCity_ChampionsRoom:: @ 8306B08 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/EverGrandeCity_Corridor1/header.inc b/data/maps/EverGrandeCity_Corridor1/header.inc index f8685ae71..abb715579 100644 --- a/data/maps/EverGrandeCity_Corridor1/header.inc +++ b/data/maps/EverGrandeCity_Corridor1/header.inc @@ -11,4 +11,4 @@ EverGrandeCity_Corridor1:: @ 8306B24 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/EverGrandeCity_Corridor2/header.inc b/data/maps/EverGrandeCity_Corridor2/header.inc index 870cbdaf0..84e681fd7 100644 --- a/data/maps/EverGrandeCity_Corridor2/header.inc +++ b/data/maps/EverGrandeCity_Corridor2/header.inc @@ -11,4 +11,4 @@ EverGrandeCity_Corridor2:: @ 8306B40 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/EverGrandeCity_Corridor3/header.inc b/data/maps/EverGrandeCity_Corridor3/header.inc index f9b05ab51..240d65727 100644 --- a/data/maps/EverGrandeCity_Corridor3/header.inc +++ b/data/maps/EverGrandeCity_Corridor3/header.inc @@ -11,4 +11,4 @@ EverGrandeCity_Corridor3:: @ 8306B5C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/EverGrandeCity_Corridor4/header.inc b/data/maps/EverGrandeCity_Corridor4/header.inc index 104fe4cc0..3fad2e361 100644 --- a/data/maps/EverGrandeCity_Corridor4/header.inc +++ b/data/maps/EverGrandeCity_Corridor4/header.inc @@ -11,4 +11,4 @@ EverGrandeCity_Corridor4:: @ 8306B78 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/EverGrandeCity_Corridor5/header.inc b/data/maps/EverGrandeCity_Corridor5/header.inc index 59efd9330..3496c95be 100644 --- a/data/maps/EverGrandeCity_Corridor5/header.inc +++ b/data/maps/EverGrandeCity_Corridor5/header.inc @@ -11,4 +11,4 @@ EverGrandeCity_Corridor5:: @ 8306B94 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/EverGrandeCity_DrakesRoom/header.inc b/data/maps/EverGrandeCity_DrakesRoom/header.inc index ab814f3ce..265aac21d 100644 --- a/data/maps/EverGrandeCity_DrakesRoom/header.inc +++ b/data/maps/EverGrandeCity_DrakesRoom/header.inc @@ -11,4 +11,4 @@ EverGrandeCity_DrakesRoom:: @ 8306AEC .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 7 + .byte MAP_BATTLE_SCENE_DRAKE diff --git a/data/maps/EverGrandeCity_GlaciasRoom/header.inc b/data/maps/EverGrandeCity_GlaciasRoom/header.inc index 437b8e46a..6338d9c79 100644 --- a/data/maps/EverGrandeCity_GlaciasRoom/header.inc +++ b/data/maps/EverGrandeCity_GlaciasRoom/header.inc @@ -11,4 +11,4 @@ EverGrandeCity_GlaciasRoom:: @ 8306AD0 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 6 + .byte MAP_BATTLE_SCENE_GLACIA diff --git a/data/maps/EverGrandeCity_HallOfFame/header.inc b/data/maps/EverGrandeCity_HallOfFame/header.inc index ab899d0b6..7c960229e 100644 --- a/data/maps/EverGrandeCity_HallOfFame/header.inc +++ b/data/maps/EverGrandeCity_HallOfFame/header.inc @@ -11,4 +11,4 @@ EverGrandeCity_HallOfFame:: @ 8306BCC .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/EverGrandeCity_PhoebesRoom/header.inc b/data/maps/EverGrandeCity_PhoebesRoom/header.inc index ca317f6c6..754757686 100644 --- a/data/maps/EverGrandeCity_PhoebesRoom/header.inc +++ b/data/maps/EverGrandeCity_PhoebesRoom/header.inc @@ -11,4 +11,4 @@ EverGrandeCity_PhoebesRoom:: @ 8306AB4 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 5 + .byte MAP_BATTLE_SCENE_PHOEBE diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc index 3f499e878..f52bbdaaf 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc +++ b/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc @@ -11,4 +11,4 @@ EverGrandeCity_PokemonCenter_1F:: @ 8306BE8 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc b/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc index 8bc65391d..18f3152a6 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc +++ b/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc @@ -11,4 +11,4 @@ EverGrandeCity_PokemonCenter_2F:: @ 8306C04 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/EverGrandeCity_PokemonLeague/header.inc b/data/maps/EverGrandeCity_PokemonLeague/header.inc index e3e6c7508..03d3fe2c8 100644 --- a/data/maps/EverGrandeCity_PokemonLeague/header.inc +++ b/data/maps/EverGrandeCity_PokemonLeague/header.inc @@ -11,4 +11,4 @@ EverGrandeCity_PokemonLeague:: @ 8306BB0 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/EverGrandeCity_SidneysRoom/header.inc b/data/maps/EverGrandeCity_SidneysRoom/header.inc index 5ba789a31..271b85dc2 100644 --- a/data/maps/EverGrandeCity_SidneysRoom/header.inc +++ b/data/maps/EverGrandeCity_SidneysRoom/header.inc @@ -11,4 +11,4 @@ EverGrandeCity_SidneysRoom:: @ 8306A98 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 4 + .byte MAP_BATTLE_SCENE_SIDNEY diff --git a/data/maps/FallarborTown/header.inc b/data/maps/FallarborTown/header.inc index a074373b4..3d825ccb9 100644 --- a/data/maps/FallarborTown/header.inc +++ b/data/maps/FallarborTown/header.inc @@ -11,4 +11,4 @@ FallarborTown:: @ 83055B4 .byte MAP_TYPE_TOWN .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/FallarborTown_ContestHall/header.inc b/data/maps/FallarborTown_ContestHall/header.inc index c8e79a55d..d7e0889e3 100644 --- a/data/maps/FallarborTown_ContestHall/header.inc +++ b/data/maps/FallarborTown_ContestHall/header.inc @@ -11,4 +11,4 @@ FallarborTown_ContestHall:: @ 8305CEC .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/FallarborTown_ContestLobby/header.inc b/data/maps/FallarborTown_ContestLobby/header.inc index e10261315..b96b373c3 100644 --- a/data/maps/FallarborTown_ContestLobby/header.inc +++ b/data/maps/FallarborTown_ContestLobby/header.inc @@ -11,4 +11,4 @@ FallarborTown_ContestLobby:: @ 8305CD0 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/FallarborTown_House1/header.inc b/data/maps/FallarborTown_House1/header.inc index 2d1c63681..8e1881474 100644 --- a/data/maps/FallarborTown_House1/header.inc +++ b/data/maps/FallarborTown_House1/header.inc @@ -11,4 +11,4 @@ FallarborTown_House1:: @ 8305D40 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/FallarborTown_House2/header.inc b/data/maps/FallarborTown_House2/header.inc index 474f18cb3..7bc6cfb20 100644 --- a/data/maps/FallarborTown_House2/header.inc +++ b/data/maps/FallarborTown_House2/header.inc @@ -11,4 +11,4 @@ FallarborTown_House2:: @ 8305D5C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/FallarborTown_Mart/header.inc b/data/maps/FallarborTown_Mart/header.inc index 038efb590..6403e78e3 100644 --- a/data/maps/FallarborTown_Mart/header.inc +++ b/data/maps/FallarborTown_Mart/header.inc @@ -11,4 +11,4 @@ FallarborTown_Mart:: @ 8305CB4 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/FallarborTown_PokemonCenter_1F/header.inc b/data/maps/FallarborTown_PokemonCenter_1F/header.inc index d90786ee1..25a18fc1a 100644 --- a/data/maps/FallarborTown_PokemonCenter_1F/header.inc +++ b/data/maps/FallarborTown_PokemonCenter_1F/header.inc @@ -11,4 +11,4 @@ FallarborTown_PokemonCenter_1F:: @ 8305D08 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/FallarborTown_PokemonCenter_2F/header.inc b/data/maps/FallarborTown_PokemonCenter_2F/header.inc index f2a2d0c6c..14c591d65 100644 --- a/data/maps/FallarborTown_PokemonCenter_2F/header.inc +++ b/data/maps/FallarborTown_PokemonCenter_2F/header.inc @@ -11,4 +11,4 @@ FallarborTown_PokemonCenter_2F:: @ 8305D24 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/FieryPath/header.inc b/data/maps/FieryPath/header.inc index 681673a28..2411a9b19 100644 --- a/data/maps/FieryPath/header.inc +++ b/data/maps/FieryPath/header.inc @@ -11,4 +11,4 @@ FieryPath:: @ 8306EF8 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/FortreeCity/header.inc b/data/maps/FortreeCity/header.inc index 72088ca05..9a4c6b64c 100644 --- a/data/maps/FortreeCity/header.inc +++ b/data/maps/FortreeCity/header.inc @@ -11,4 +11,4 @@ FortreeCity:: @ 83054B8 .byte MAP_TYPE_CITY .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/FortreeCity_DecorationShop/header.inc b/data/maps/FortreeCity_DecorationShop/header.inc index abc43114f..0f965f12f 100644 --- a/data/maps/FortreeCity_DecorationShop/header.inc +++ b/data/maps/FortreeCity_DecorationShop/header.inc @@ -11,4 +11,4 @@ FortreeCity_DecorationShop:: @ 8306504 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/FortreeCity_Gym/header.inc b/data/maps/FortreeCity_Gym/header.inc index 80c1cb9ed..58fd694ba 100644 --- a/data/maps/FortreeCity_Gym/header.inc +++ b/data/maps/FortreeCity_Gym/header.inc @@ -11,4 +11,4 @@ FortreeCity_Gym:: @ 8306424 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 1 + .byte MAP_BATTLE_SCENE_GYM diff --git a/data/maps/FortreeCity_House1/header.inc b/data/maps/FortreeCity_House1/header.inc index 6844c97a6..7c2adaebb 100644 --- a/data/maps/FortreeCity_House1/header.inc +++ b/data/maps/FortreeCity_House1/header.inc @@ -11,4 +11,4 @@ FortreeCity_House1:: @ 8306408 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/FortreeCity_House2/header.inc b/data/maps/FortreeCity_House2/header.inc index 71ede81de..df45e02e2 100644 --- a/data/maps/FortreeCity_House2/header.inc +++ b/data/maps/FortreeCity_House2/header.inc @@ -11,4 +11,4 @@ FortreeCity_House2:: @ 8306494 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/FortreeCity_House3/header.inc b/data/maps/FortreeCity_House3/header.inc index 246277627..c41ac93ef 100644 --- a/data/maps/FortreeCity_House3/header.inc +++ b/data/maps/FortreeCity_House3/header.inc @@ -11,4 +11,4 @@ FortreeCity_House3:: @ 83064B0 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/FortreeCity_House4/header.inc b/data/maps/FortreeCity_House4/header.inc index ba0aa16b6..7277a3a50 100644 --- a/data/maps/FortreeCity_House4/header.inc +++ b/data/maps/FortreeCity_House4/header.inc @@ -11,4 +11,4 @@ FortreeCity_House4:: @ 83064CC .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/FortreeCity_House5/header.inc b/data/maps/FortreeCity_House5/header.inc index ffc77a3e3..aaebd16f8 100644 --- a/data/maps/FortreeCity_House5/header.inc +++ b/data/maps/FortreeCity_House5/header.inc @@ -11,4 +11,4 @@ FortreeCity_House5:: @ 83064E8 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/FortreeCity_Mart/header.inc b/data/maps/FortreeCity_Mart/header.inc index d26b0e769..844355731 100644 --- a/data/maps/FortreeCity_Mart/header.inc +++ b/data/maps/FortreeCity_Mart/header.inc @@ -11,4 +11,4 @@ FortreeCity_Mart:: @ 8306478 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/FortreeCity_PokemonCenter_1F/header.inc b/data/maps/FortreeCity_PokemonCenter_1F/header.inc index ba1da616f..35b871240 100644 --- a/data/maps/FortreeCity_PokemonCenter_1F/header.inc +++ b/data/maps/FortreeCity_PokemonCenter_1F/header.inc @@ -11,4 +11,4 @@ FortreeCity_PokemonCenter_1F:: @ 8306440 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/FortreeCity_PokemonCenter_2F/header.inc b/data/maps/FortreeCity_PokemonCenter_2F/header.inc index ee2c1bca4..4b7a601ed 100644 --- a/data/maps/FortreeCity_PokemonCenter_2F/header.inc +++ b/data/maps/FortreeCity_PokemonCenter_2F/header.inc @@ -11,4 +11,4 @@ FortreeCity_PokemonCenter_2F:: @ 830645C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/GraniteCave_1F/header.inc b/data/maps/GraniteCave_1F/header.inc index c8572d09b..b94051123 100644 --- a/data/maps/GraniteCave_1F/header.inc +++ b/data/maps/GraniteCave_1F/header.inc @@ -11,4 +11,4 @@ GraniteCave_1F:: @ 8306E34 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/GraniteCave_B1F/header.inc b/data/maps/GraniteCave_B1F/header.inc index 68c0f3c7f..5673b1fdc 100644 --- a/data/maps/GraniteCave_B1F/header.inc +++ b/data/maps/GraniteCave_B1F/header.inc @@ -11,4 +11,4 @@ GraniteCave_B1F:: @ 8306E50 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/GraniteCave_B2F/header.inc b/data/maps/GraniteCave_B2F/header.inc index 738980088..240ff2dc0 100644 --- a/data/maps/GraniteCave_B2F/header.inc +++ b/data/maps/GraniteCave_B2F/header.inc @@ -11,4 +11,4 @@ GraniteCave_B2F:: @ 8306E6C .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/GraniteCave_StevensRoom/header.inc b/data/maps/GraniteCave_StevensRoom/header.inc index 7b6ea5820..66fcf26af 100644 --- a/data/maps/GraniteCave_StevensRoom/header.inc +++ b/data/maps/GraniteCave_StevensRoom/header.inc @@ -11,4 +11,4 @@ GraniteCave_StevensRoom:: @ 8306E88 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/InsideOfTruck/header.inc b/data/maps/InsideOfTruck/header.inc index 466658ca6..2c2135be5 100644 --- a/data/maps/InsideOfTruck/header.inc +++ b/data/maps/InsideOfTruck/header.inc @@ -11,4 +11,4 @@ InsideOfTruck:: @ 8307B38 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/IslandCave/header.inc b/data/maps/IslandCave/header.inc index 205627e8b..4630a79aa 100644 --- a/data/maps/IslandCave/header.inc +++ b/data/maps/IslandCave/header.inc @@ -11,4 +11,4 @@ IslandCave:: @ 83074C4 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/JaggedPass/header.inc b/data/maps/JaggedPass/header.inc index c8dc563df..8f4d866ce 100644 --- a/data/maps/JaggedPass/header.inc +++ b/data/maps/JaggedPass/header.inc @@ -11,4 +11,4 @@ JaggedPass:: @ 8306EDC .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LavaridgeTown/header.inc b/data/maps/LavaridgeTown/header.inc index 29c3dfcf8..4b798b26f 100644 --- a/data/maps/LavaridgeTown/header.inc +++ b/data/maps/LavaridgeTown/header.inc @@ -11,4 +11,4 @@ LavaridgeTown:: @ 8305598 .byte MAP_TYPE_TOWN .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LavaridgeTown_Gym_1F/header.inc b/data/maps/LavaridgeTown_Gym_1F/header.inc index 543d73a72..609808f0f 100644 --- a/data/maps/LavaridgeTown_Gym_1F/header.inc +++ b/data/maps/LavaridgeTown_Gym_1F/header.inc @@ -11,4 +11,4 @@ LavaridgeTown_Gym_1F:: @ 8305C0C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 1 + .byte MAP_BATTLE_SCENE_GYM diff --git a/data/maps/LavaridgeTown_Gym_B1F/header.inc b/data/maps/LavaridgeTown_Gym_B1F/header.inc index 4fc005285..df8d98e11 100644 --- a/data/maps/LavaridgeTown_Gym_B1F/header.inc +++ b/data/maps/LavaridgeTown_Gym_B1F/header.inc @@ -11,4 +11,4 @@ LavaridgeTown_Gym_B1F:: @ 8305C28 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 1 + .byte MAP_BATTLE_SCENE_GYM diff --git a/data/maps/LavaridgeTown_HerbShop/header.inc b/data/maps/LavaridgeTown_HerbShop/header.inc index 09c78bafa..a65cc4358 100644 --- a/data/maps/LavaridgeTown_HerbShop/header.inc +++ b/data/maps/LavaridgeTown_HerbShop/header.inc @@ -11,4 +11,4 @@ LavaridgeTown_HerbShop:: @ 8305BF0 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LavaridgeTown_House/header.inc b/data/maps/LavaridgeTown_House/header.inc index 49c155a39..15dd76303 100644 --- a/data/maps/LavaridgeTown_House/header.inc +++ b/data/maps/LavaridgeTown_House/header.inc @@ -11,4 +11,4 @@ LavaridgeTown_House:: @ 8305C44 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LavaridgeTown_Mart/header.inc b/data/maps/LavaridgeTown_Mart/header.inc index 4f8779188..fa7d4c92a 100644 --- a/data/maps/LavaridgeTown_Mart/header.inc +++ b/data/maps/LavaridgeTown_Mart/header.inc @@ -11,4 +11,4 @@ LavaridgeTown_Mart:: @ 8305C60 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc b/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc index e0bee1062..921a7d90a 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc +++ b/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc @@ -11,4 +11,4 @@ LavaridgeTown_PokemonCenter_1F:: @ 8305C7C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc b/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc index 1a17d7b4d..34bfd1a08 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc +++ b/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc @@ -11,4 +11,4 @@ LavaridgeTown_PokemonCenter_2F:: @ 8305C98 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity/header.inc b/data/maps/LilycoveCity/header.inc index be9cdb8f8..3eca23cdf 100644 --- a/data/maps/LilycoveCity/header.inc +++ b/data/maps/LilycoveCity/header.inc @@ -11,4 +11,4 @@ LilycoveCity:: @ 83054D4 .byte MAP_TYPE_CITY .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_ContestHall/header.inc b/data/maps/LilycoveCity_ContestHall/header.inc index 503db1b0a..ade66a18f 100644 --- a/data/maps/LilycoveCity_ContestHall/header.inc +++ b/data/maps/LilycoveCity_ContestHall/header.inc @@ -11,4 +11,4 @@ LilycoveCity_ContestHall:: @ 83065AC .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_ContestLobby/header.inc b/data/maps/LilycoveCity_ContestLobby/header.inc index b1bd0bf8f..62507b9a0 100644 --- a/data/maps/LilycoveCity_ContestLobby/header.inc +++ b/data/maps/LilycoveCity_ContestLobby/header.inc @@ -11,4 +11,4 @@ LilycoveCity_ContestLobby:: @ 8306590 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc b/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc index 21f74e491..e60b3ce64 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc +++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc @@ -11,4 +11,4 @@ LilycoveCity_CoveLilyMotel_1F:: @ 8306520 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc b/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc index 4f3b48379..47e8960d4 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc +++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc @@ -11,4 +11,4 @@ LilycoveCity_CoveLilyMotel_2F:: @ 830653C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc b/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc index 9bb512a84..8571ea102 100644 --- a/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc +++ b/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc @@ -11,4 +11,4 @@ LilycoveCity_DepartmentStoreElevator:: @ 83067A4 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc index 87212df01..f42e93df8 100644 --- a/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc +++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc @@ -11,4 +11,4 @@ LilycoveCity_DepartmentStoreRooftop:: @ 8306788 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/header.inc b/data/maps/LilycoveCity_DepartmentStore_1F/header.inc index b717b1dd3..93799798b 100644 --- a/data/maps/LilycoveCity_DepartmentStore_1F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_1F/header.inc @@ -11,4 +11,4 @@ LilycoveCity_DepartmentStore_1F:: @ 83066FC .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_DepartmentStore_2F/header.inc b/data/maps/LilycoveCity_DepartmentStore_2F/header.inc index 1297e8839..1ebab31dc 100644 --- a/data/maps/LilycoveCity_DepartmentStore_2F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_2F/header.inc @@ -11,4 +11,4 @@ LilycoveCity_DepartmentStore_2F:: @ 8306718 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_DepartmentStore_3F/header.inc b/data/maps/LilycoveCity_DepartmentStore_3F/header.inc index 8fa6f4fa2..50d1e9585 100644 --- a/data/maps/LilycoveCity_DepartmentStore_3F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_3F/header.inc @@ -11,4 +11,4 @@ LilycoveCity_DepartmentStore_3F:: @ 8306734 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_DepartmentStore_4F/header.inc b/data/maps/LilycoveCity_DepartmentStore_4F/header.inc index c67c412f5..025b9c83e 100644 --- a/data/maps/LilycoveCity_DepartmentStore_4F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_4F/header.inc @@ -11,4 +11,4 @@ LilycoveCity_DepartmentStore_4F:: @ 8306750 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/header.inc b/data/maps/LilycoveCity_DepartmentStore_5F/header.inc index ec78aa1f9..7cc9e86f8 100644 --- a/data/maps/LilycoveCity_DepartmentStore_5F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_5F/header.inc @@ -11,4 +11,4 @@ LilycoveCity_DepartmentStore_5F:: @ 830676C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_EmptyMap/header.inc b/data/maps/LilycoveCity_EmptyMap/header.inc index 79c1c2a0f..e5c3db22e 100644 --- a/data/maps/LilycoveCity_EmptyMap/header.inc +++ b/data/maps/LilycoveCity_EmptyMap/header.inc @@ -11,4 +11,4 @@ LilycoveCity_EmptyMap:: @ 8306654 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_Harbor/header.inc b/data/maps/LilycoveCity_Harbor/header.inc index 47a4de691..5d0508895 100644 --- a/data/maps/LilycoveCity_Harbor/header.inc +++ b/data/maps/LilycoveCity_Harbor/header.inc @@ -11,4 +11,4 @@ LilycoveCity_Harbor:: @ 8306638 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_House1/header.inc b/data/maps/LilycoveCity_House1/header.inc index d67fd50ad..a4cede932 100644 --- a/data/maps/LilycoveCity_House1/header.inc +++ b/data/maps/LilycoveCity_House1/header.inc @@ -11,4 +11,4 @@ LilycoveCity_House1:: @ 830668C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_House2/header.inc b/data/maps/LilycoveCity_House2/header.inc index aeef9e507..eb9b120e3 100644 --- a/data/maps/LilycoveCity_House2/header.inc +++ b/data/maps/LilycoveCity_House2/header.inc @@ -11,4 +11,4 @@ LilycoveCity_House2:: @ 83066A8 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_House3/header.inc b/data/maps/LilycoveCity_House3/header.inc index b56cdf9bf..4bd0a4509 100644 --- a/data/maps/LilycoveCity_House3/header.inc +++ b/data/maps/LilycoveCity_House3/header.inc @@ -11,4 +11,4 @@ LilycoveCity_House3:: @ 83066C4 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_House4/header.inc b/data/maps/LilycoveCity_House4/header.inc index bf2850606..c85aa04aa 100644 --- a/data/maps/LilycoveCity_House4/header.inc +++ b/data/maps/LilycoveCity_House4/header.inc @@ -11,4 +11,4 @@ LilycoveCity_House4:: @ 83066E0 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc b/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc index c19473dab..696e823b3 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc @@ -11,4 +11,4 @@ LilycoveCity_LilycoveMuseum_1F:: @ 8306558 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc index de5f7ddad..8fe60bc17 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc @@ -11,4 +11,4 @@ LilycoveCity_LilycoveMuseum_2F:: @ 8306574 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_MoveDeletersHouse/header.inc b/data/maps/LilycoveCity_MoveDeletersHouse/header.inc index 12c650b26..d2483b4e5 100644 --- a/data/maps/LilycoveCity_MoveDeletersHouse/header.inc +++ b/data/maps/LilycoveCity_MoveDeletersHouse/header.inc @@ -11,4 +11,4 @@ LilycoveCity_MoveDeletersHouse:: @ 8306670 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_PokemonCenter_1F/header.inc b/data/maps/LilycoveCity_PokemonCenter_1F/header.inc index 5a94e080e..ec56cfc5d 100644 --- a/data/maps/LilycoveCity_PokemonCenter_1F/header.inc +++ b/data/maps/LilycoveCity_PokemonCenter_1F/header.inc @@ -11,4 +11,4 @@ LilycoveCity_PokemonCenter_1F:: @ 83065C8 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_PokemonCenter_2F/header.inc b/data/maps/LilycoveCity_PokemonCenter_2F/header.inc index 2ed2bb057..a46e9e291 100644 --- a/data/maps/LilycoveCity_PokemonCenter_2F/header.inc +++ b/data/maps/LilycoveCity_PokemonCenter_2F/header.inc @@ -11,4 +11,4 @@ LilycoveCity_PokemonCenter_2F:: @ 83065E4 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc index e12bca1f1..e5eb0eaa7 100644 --- a/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc +++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc @@ -11,4 +11,4 @@ LilycoveCity_PokemonTrainerFanClub:: @ 830661C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_UnusedMart/header.inc b/data/maps/LilycoveCity_UnusedMart/header.inc index 0b49616ff..78e14b53b 100644 --- a/data/maps/LilycoveCity_UnusedMart/header.inc +++ b/data/maps/LilycoveCity_UnusedMart/header.inc @@ -11,4 +11,4 @@ LilycoveCity_UnusedMart:: @ 8306600 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LinkContestRoom1/header.inc b/data/maps/LinkContestRoom1/header.inc index 2e4570a1e..3ca7d6ed9 100644 --- a/data/maps/LinkContestRoom1/header.inc +++ b/data/maps/LinkContestRoom1/header.inc @@ -11,4 +11,4 @@ LinkContestRoom1:: @ 83079E8 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LinkContestRoom2/header.inc b/data/maps/LinkContestRoom2/header.inc index d0603beca..e368f56a2 100644 --- a/data/maps/LinkContestRoom2/header.inc +++ b/data/maps/LinkContestRoom2/header.inc @@ -11,4 +11,4 @@ LinkContestRoom2:: @ 8307AAC .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LinkContestRoom3/header.inc b/data/maps/LinkContestRoom3/header.inc index f2b54e921..368f7a8c5 100644 --- a/data/maps/LinkContestRoom3/header.inc +++ b/data/maps/LinkContestRoom3/header.inc @@ -11,4 +11,4 @@ LinkContestRoom3:: @ 8307AC8 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LinkContestRoom4/header.inc b/data/maps/LinkContestRoom4/header.inc index 2d5accdbd..caf0848a4 100644 --- a/data/maps/LinkContestRoom4/header.inc +++ b/data/maps/LinkContestRoom4/header.inc @@ -11,4 +11,4 @@ LinkContestRoom4:: @ 8307AE4 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LinkContestRoom5/header.inc b/data/maps/LinkContestRoom5/header.inc index 7871634dd..5ea615ef4 100644 --- a/data/maps/LinkContestRoom5/header.inc +++ b/data/maps/LinkContestRoom5/header.inc @@ -11,4 +11,4 @@ LinkContestRoom5:: @ 8307B00 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LinkContestRoom6/header.inc b/data/maps/LinkContestRoom6/header.inc index 61ddc155d..7edebef67 100644 --- a/data/maps/LinkContestRoom6/header.inc +++ b/data/maps/LinkContestRoom6/header.inc @@ -11,4 +11,4 @@ LinkContestRoom6:: @ 8307B1C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LittlerootTown/header.inc b/data/maps/LittlerootTown/header.inc index 148df6639..216583a90 100644 --- a/data/maps/LittlerootTown/header.inc +++ b/data/maps/LittlerootTown/header.inc @@ -11,4 +11,4 @@ LittlerootTown:: @ 8305544 .byte MAP_TYPE_TOWN .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/header.inc b/data/maps/LittlerootTown_BrendansHouse_1F/header.inc index f4b850f85..e9e62d25a 100644 --- a/data/maps/LittlerootTown_BrendansHouse_1F/header.inc +++ b/data/maps/LittlerootTown_BrendansHouse_1F/header.inc @@ -11,4 +11,4 @@ LittlerootTown_BrendansHouse_1F:: @ 8305A30 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/header.inc b/data/maps/LittlerootTown_BrendansHouse_2F/header.inc index 66b7958db..504504c57 100644 --- a/data/maps/LittlerootTown_BrendansHouse_2F/header.inc +++ b/data/maps/LittlerootTown_BrendansHouse_2F/header.inc @@ -11,4 +11,4 @@ LittlerootTown_BrendansHouse_2F:: @ 8305A4C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LittlerootTown_MaysHouse_1F/header.inc b/data/maps/LittlerootTown_MaysHouse_1F/header.inc index 5689d53fb..cbf0cc22b 100644 --- a/data/maps/LittlerootTown_MaysHouse_1F/header.inc +++ b/data/maps/LittlerootTown_MaysHouse_1F/header.inc @@ -11,4 +11,4 @@ LittlerootTown_MaysHouse_1F:: @ 8305A68 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LittlerootTown_MaysHouse_2F/header.inc b/data/maps/LittlerootTown_MaysHouse_2F/header.inc index fff38cdfe..c67985a20 100644 --- a/data/maps/LittlerootTown_MaysHouse_2F/header.inc +++ b/data/maps/LittlerootTown_MaysHouse_2F/header.inc @@ -11,4 +11,4 @@ LittlerootTown_MaysHouse_2F:: @ 8305A84 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc index 324fa3bb7..d07616c83 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc @@ -11,4 +11,4 @@ LittlerootTown_ProfessorBirchsLab:: @ 8305AA0 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MagmaHideout_1F/header.inc b/data/maps/MagmaHideout_1F/header.inc index ad6630fd7..b2235e2e5 100644 --- a/data/maps/MagmaHideout_1F/header.inc +++ b/data/maps/MagmaHideout_1F/header.inc @@ -11,4 +11,4 @@ MagmaHideout_1F:: @ 8307588 .byte MAP_TYPE_INDOOR .2byte 0 .byte 1 - .byte 2 + .byte MAP_BATTLE_SCENE_MAGMA diff --git a/data/maps/MagmaHideout_B1F/header.inc b/data/maps/MagmaHideout_B1F/header.inc index f13e4c11d..2a64f4324 100644 --- a/data/maps/MagmaHideout_B1F/header.inc +++ b/data/maps/MagmaHideout_B1F/header.inc @@ -11,4 +11,4 @@ MagmaHideout_B1F:: @ 83075A4 .byte MAP_TYPE_INDOOR .2byte 0 .byte 1 - .byte 2 + .byte MAP_BATTLE_SCENE_MAGMA diff --git a/data/maps/MagmaHideout_B2F/header.inc b/data/maps/MagmaHideout_B2F/header.inc index ed031c644..adfd83008 100644 --- a/data/maps/MagmaHideout_B2F/header.inc +++ b/data/maps/MagmaHideout_B2F/header.inc @@ -11,4 +11,4 @@ MagmaHideout_B2F:: @ 83075C0 .byte MAP_TYPE_INDOOR .2byte 0 .byte 1 - .byte 2 + .byte MAP_BATTLE_SCENE_MAGMA diff --git a/data/maps/MauvilleCity/header.inc b/data/maps/MauvilleCity/header.inc index 5bdb4ac26..73d8c1330 100644 --- a/data/maps/MauvilleCity/header.inc +++ b/data/maps/MauvilleCity/header.inc @@ -11,4 +11,4 @@ MauvilleCity:: @ 8305480 .byte MAP_TYPE_CITY .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MauvilleCity_BikeShop/header.inc b/data/maps/MauvilleCity_BikeShop/header.inc index fd2750c0c..5d27cb8e7 100644 --- a/data/maps/MauvilleCity_BikeShop/header.inc +++ b/data/maps/MauvilleCity_BikeShop/header.inc @@ -11,4 +11,4 @@ MauvilleCity_BikeShop:: @ 8306168 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MauvilleCity_GameCorner/header.inc b/data/maps/MauvilleCity_GameCorner/header.inc index c5ded2c14..436a96c9c 100644 --- a/data/maps/MauvilleCity_GameCorner/header.inc +++ b/data/maps/MauvilleCity_GameCorner/header.inc @@ -11,4 +11,4 @@ MauvilleCity_GameCorner:: @ 83061A0 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MauvilleCity_Gym/header.inc b/data/maps/MauvilleCity_Gym/header.inc index bbb862021..3dca4129a 100644 --- a/data/maps/MauvilleCity_Gym/header.inc +++ b/data/maps/MauvilleCity_Gym/header.inc @@ -11,4 +11,4 @@ MauvilleCity_Gym:: @ 830614C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 1 + .byte MAP_BATTLE_SCENE_GYM diff --git a/data/maps/MauvilleCity_House1/header.inc b/data/maps/MauvilleCity_House1/header.inc index 809d45406..d9e54375d 100644 --- a/data/maps/MauvilleCity_House1/header.inc +++ b/data/maps/MauvilleCity_House1/header.inc @@ -11,4 +11,4 @@ MauvilleCity_House1:: @ 8306184 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MauvilleCity_House2/header.inc b/data/maps/MauvilleCity_House2/header.inc index 31269c3cc..395e22561 100644 --- a/data/maps/MauvilleCity_House2/header.inc +++ b/data/maps/MauvilleCity_House2/header.inc @@ -11,4 +11,4 @@ MauvilleCity_House2:: @ 83061BC .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MauvilleCity_Mart/header.inc b/data/maps/MauvilleCity_Mart/header.inc index e7e6eeeaa..3f81ded38 100644 --- a/data/maps/MauvilleCity_Mart/header.inc +++ b/data/maps/MauvilleCity_Mart/header.inc @@ -11,4 +11,4 @@ MauvilleCity_Mart:: @ 8306210 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MauvilleCity_PokemonCenter_1F/header.inc b/data/maps/MauvilleCity_PokemonCenter_1F/header.inc index 2245b114d..3e3c3f730 100644 --- a/data/maps/MauvilleCity_PokemonCenter_1F/header.inc +++ b/data/maps/MauvilleCity_PokemonCenter_1F/header.inc @@ -11,4 +11,4 @@ MauvilleCity_PokemonCenter_1F:: @ 83061D8 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MauvilleCity_PokemonCenter_2F/header.inc b/data/maps/MauvilleCity_PokemonCenter_2F/header.inc index a4d3f4ff3..48659f5c8 100644 --- a/data/maps/MauvilleCity_PokemonCenter_2F/header.inc +++ b/data/maps/MauvilleCity_PokemonCenter_2F/header.inc @@ -11,4 +11,4 @@ MauvilleCity_PokemonCenter_2F:: @ 83061F4 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MeteorFalls_1F_1R/header.inc b/data/maps/MeteorFalls_1F_1R/header.inc index f9b93ee19..d86635764 100644 --- a/data/maps/MeteorFalls_1F_1R/header.inc +++ b/data/maps/MeteorFalls_1F_1R/header.inc @@ -11,4 +11,4 @@ MeteorFalls_1F_1R:: @ 8306D70 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MeteorFalls_1F_2R/header.inc b/data/maps/MeteorFalls_1F_2R/header.inc index dea9dbfd0..959c46b25 100644 --- a/data/maps/MeteorFalls_1F_2R/header.inc +++ b/data/maps/MeteorFalls_1F_2R/header.inc @@ -11,4 +11,4 @@ MeteorFalls_1F_2R:: @ 8306D8C .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MeteorFalls_B1F_1R/header.inc b/data/maps/MeteorFalls_B1F_1R/header.inc index a64b5c369..aeeb6dcfa 100644 --- a/data/maps/MeteorFalls_B1F_1R/header.inc +++ b/data/maps/MeteorFalls_B1F_1R/header.inc @@ -11,4 +11,4 @@ MeteorFalls_B1F_1R:: @ 8306DA8 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MeteorFalls_B1F_2R/header.inc b/data/maps/MeteorFalls_B1F_2R/header.inc index 85b8d69c7..878187bcd 100644 --- a/data/maps/MeteorFalls_B1F_2R/header.inc +++ b/data/maps/MeteorFalls_B1F_2R/header.inc @@ -11,4 +11,4 @@ MeteorFalls_B1F_2R:: @ 8306DC4 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MossdeepCity/header.inc b/data/maps/MossdeepCity/header.inc index a7f41311c..36615e936 100644 --- a/data/maps/MossdeepCity/header.inc +++ b/data/maps/MossdeepCity/header.inc @@ -11,4 +11,4 @@ MossdeepCity:: @ 83054F0 .byte MAP_TYPE_CITY .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MossdeepCity_GameCorner_1F/header.inc b/data/maps/MossdeepCity_GameCorner_1F/header.inc index 596816e9b..fd57180d1 100644 --- a/data/maps/MossdeepCity_GameCorner_1F/header.inc +++ b/data/maps/MossdeepCity_GameCorner_1F/header.inc @@ -11,4 +11,4 @@ MossdeepCity_GameCorner_1F:: @ 83068F4 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MossdeepCity_GameCorner_B1F/header.inc b/data/maps/MossdeepCity_GameCorner_B1F/header.inc index 1a5b81fba..f6436c975 100644 --- a/data/maps/MossdeepCity_GameCorner_B1F/header.inc +++ b/data/maps/MossdeepCity_GameCorner_B1F/header.inc @@ -11,4 +11,4 @@ MossdeepCity_GameCorner_B1F:: @ 8306910 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MossdeepCity_Gym/header.inc b/data/maps/MossdeepCity_Gym/header.inc index 560ee4e9d..1070a37cd 100644 --- a/data/maps/MossdeepCity_Gym/header.inc +++ b/data/maps/MossdeepCity_Gym/header.inc @@ -11,4 +11,4 @@ MossdeepCity_Gym:: @ 83067C0 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 1 + .byte MAP_BATTLE_SCENE_GYM diff --git a/data/maps/MossdeepCity_House1/header.inc b/data/maps/MossdeepCity_House1/header.inc index f5d413d81..4c7c76534 100644 --- a/data/maps/MossdeepCity_House1/header.inc +++ b/data/maps/MossdeepCity_House1/header.inc @@ -11,4 +11,4 @@ MossdeepCity_House1:: @ 83067DC .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MossdeepCity_House2/header.inc b/data/maps/MossdeepCity_House2/header.inc index ff1ab5379..a5107efe1 100644 --- a/data/maps/MossdeepCity_House2/header.inc +++ b/data/maps/MossdeepCity_House2/header.inc @@ -11,4 +11,4 @@ MossdeepCity_House2:: @ 83067F8 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MossdeepCity_House3/header.inc b/data/maps/MossdeepCity_House3/header.inc index 76a0fffb6..a77e48e40 100644 --- a/data/maps/MossdeepCity_House3/header.inc +++ b/data/maps/MossdeepCity_House3/header.inc @@ -11,4 +11,4 @@ MossdeepCity_House3:: @ 8306868 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MossdeepCity_House4/header.inc b/data/maps/MossdeepCity_House4/header.inc index 7d4f16f20..91ef8305c 100644 --- a/data/maps/MossdeepCity_House4/header.inc +++ b/data/maps/MossdeepCity_House4/header.inc @@ -11,4 +11,4 @@ MossdeepCity_House4:: @ 83068A0 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MossdeepCity_Mart/header.inc b/data/maps/MossdeepCity_Mart/header.inc index 7e8a4c9a4..dc9f8832a 100644 --- a/data/maps/MossdeepCity_Mart/header.inc +++ b/data/maps/MossdeepCity_Mart/header.inc @@ -11,4 +11,4 @@ MossdeepCity_Mart:: @ 830684C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MossdeepCity_PokemonCenter_1F/header.inc b/data/maps/MossdeepCity_PokemonCenter_1F/header.inc index d061f4b0d..1f9a18c11 100644 --- a/data/maps/MossdeepCity_PokemonCenter_1F/header.inc +++ b/data/maps/MossdeepCity_PokemonCenter_1F/header.inc @@ -11,4 +11,4 @@ MossdeepCity_PokemonCenter_1F:: @ 8306814 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MossdeepCity_PokemonCenter_2F/header.inc b/data/maps/MossdeepCity_PokemonCenter_2F/header.inc index 5b0bedaf4..d3ac47ccb 100644 --- a/data/maps/MossdeepCity_PokemonCenter_2F/header.inc +++ b/data/maps/MossdeepCity_PokemonCenter_2F/header.inc @@ -11,4 +11,4 @@ MossdeepCity_PokemonCenter_2F:: @ 8306830 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/header.inc b/data/maps/MossdeepCity_SpaceCenter_1F/header.inc index c9167bede..3092932b8 100644 --- a/data/maps/MossdeepCity_SpaceCenter_1F/header.inc +++ b/data/maps/MossdeepCity_SpaceCenter_1F/header.inc @@ -11,4 +11,4 @@ MossdeepCity_SpaceCenter_1F:: @ 83068BC .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/header.inc b/data/maps/MossdeepCity_SpaceCenter_2F/header.inc index 262b57f82..00aebba1b 100644 --- a/data/maps/MossdeepCity_SpaceCenter_2F/header.inc +++ b/data/maps/MossdeepCity_SpaceCenter_2F/header.inc @@ -11,4 +11,4 @@ MossdeepCity_SpaceCenter_2F:: @ 83068D8 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MossdeepCity_StevensHouse/header.inc b/data/maps/MossdeepCity_StevensHouse/header.inc index f02432216..5988c50b4 100644 --- a/data/maps/MossdeepCity_StevensHouse/header.inc +++ b/data/maps/MossdeepCity_StevensHouse/header.inc @@ -11,4 +11,4 @@ MossdeepCity_StevensHouse:: @ 8306884 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MtChimney/header.inc b/data/maps/MtChimney/header.inc index 3660719ec..2312d9c92 100644 --- a/data/maps/MtChimney/header.inc +++ b/data/maps/MtChimney/header.inc @@ -11,4 +11,4 @@ MtChimney:: @ 8306EC0 .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MtChimney_CableCarStation/header.inc b/data/maps/MtChimney_CableCarStation/header.inc index 1cc4f5b68..15d59a97f 100644 --- a/data/maps/MtChimney_CableCarStation/header.inc +++ b/data/maps/MtChimney_CableCarStation/header.inc @@ -11,4 +11,4 @@ MtChimney_CableCarStation:: @ 8306CAC .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MtPyre_1F/header.inc b/data/maps/MtPyre_1F/header.inc index 8ac59ab5f..bbd8c0370 100644 --- a/data/maps/MtPyre_1F/header.inc +++ b/data/maps/MtPyre_1F/header.inc @@ -11,4 +11,4 @@ MtPyre_1F:: @ 8306F14 .byte MAP_TYPE_INDOOR .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MtPyre_2F/header.inc b/data/maps/MtPyre_2F/header.inc index d0485cea1..c123d076a 100644 --- a/data/maps/MtPyre_2F/header.inc +++ b/data/maps/MtPyre_2F/header.inc @@ -11,4 +11,4 @@ MtPyre_2F:: @ 8306F30 .byte MAP_TYPE_INDOOR .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MtPyre_3F/header.inc b/data/maps/MtPyre_3F/header.inc index 2a99e77f0..c201e9377 100644 --- a/data/maps/MtPyre_3F/header.inc +++ b/data/maps/MtPyre_3F/header.inc @@ -11,4 +11,4 @@ MtPyre_3F:: @ 8306F4C .byte MAP_TYPE_INDOOR .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MtPyre_4F/header.inc b/data/maps/MtPyre_4F/header.inc index 8e4ce5931..24f3f7d9f 100644 --- a/data/maps/MtPyre_4F/header.inc +++ b/data/maps/MtPyre_4F/header.inc @@ -11,4 +11,4 @@ MtPyre_4F:: @ 8306F68 .byte MAP_TYPE_INDOOR .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MtPyre_5F/header.inc b/data/maps/MtPyre_5F/header.inc index 756adc96d..75fae8c1a 100644 --- a/data/maps/MtPyre_5F/header.inc +++ b/data/maps/MtPyre_5F/header.inc @@ -11,4 +11,4 @@ MtPyre_5F:: @ 8306F84 .byte MAP_TYPE_INDOOR .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MtPyre_6F/header.inc b/data/maps/MtPyre_6F/header.inc index 734f14e26..7156e17a2 100644 --- a/data/maps/MtPyre_6F/header.inc +++ b/data/maps/MtPyre_6F/header.inc @@ -11,4 +11,4 @@ MtPyre_6F:: @ 8306FA0 .byte MAP_TYPE_INDOOR .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MtPyre_Exterior/header.inc b/data/maps/MtPyre_Exterior/header.inc index e058ed4d5..5aacc218a 100644 --- a/data/maps/MtPyre_Exterior/header.inc +++ b/data/maps/MtPyre_Exterior/header.inc @@ -11,4 +11,4 @@ MtPyre_Exterior:: @ 8306FBC .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MtPyre_Summit/header.inc b/data/maps/MtPyre_Summit/header.inc index 6cc6f5e73..fbefd9aff 100644 --- a/data/maps/MtPyre_Summit/header.inc +++ b/data/maps/MtPyre_Summit/header.inc @@ -11,4 +11,4 @@ MtPyre_Summit:: @ 8306FD8 .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/NewMauville_Entrance/header.inc b/data/maps/NewMauville_Entrance/header.inc index 53bd09029..26c9096ee 100644 --- a/data/maps/NewMauville_Entrance/header.inc +++ b/data/maps/NewMauville_Entrance/header.inc @@ -11,4 +11,4 @@ NewMauville_Entrance:: @ 8307320 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/NewMauville_Inside/header.inc b/data/maps/NewMauville_Inside/header.inc index 8d7d27e44..4e9878630 100644 --- a/data/maps/NewMauville_Inside/header.inc +++ b/data/maps/NewMauville_Inside/header.inc @@ -11,4 +11,4 @@ NewMauville_Inside:: @ 830733C .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/OldaleTown/header.inc b/data/maps/OldaleTown/header.inc index 092372be7..6e54fe9f2 100644 --- a/data/maps/OldaleTown/header.inc +++ b/data/maps/OldaleTown/header.inc @@ -11,4 +11,4 @@ OldaleTown:: @ 8305560 .byte MAP_TYPE_TOWN .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/OldaleTown_House1/header.inc b/data/maps/OldaleTown_House1/header.inc index 632e40dec..bc402caf7 100644 --- a/data/maps/OldaleTown_House1/header.inc +++ b/data/maps/OldaleTown_House1/header.inc @@ -11,4 +11,4 @@ OldaleTown_House1:: @ 8305ABC .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/OldaleTown_House2/header.inc b/data/maps/OldaleTown_House2/header.inc index b59f56f1a..0e4c8dea7 100644 --- a/data/maps/OldaleTown_House2/header.inc +++ b/data/maps/OldaleTown_House2/header.inc @@ -11,4 +11,4 @@ OldaleTown_House2:: @ 8305AD8 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/OldaleTown_Mart/header.inc b/data/maps/OldaleTown_Mart/header.inc index 58e8aba90..ab067341e 100644 --- a/data/maps/OldaleTown_Mart/header.inc +++ b/data/maps/OldaleTown_Mart/header.inc @@ -11,4 +11,4 @@ OldaleTown_Mart:: @ 8305B2C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/OldaleTown_PokemonCenter_1F/header.inc b/data/maps/OldaleTown_PokemonCenter_1F/header.inc index b2d5af33a..791353439 100644 --- a/data/maps/OldaleTown_PokemonCenter_1F/header.inc +++ b/data/maps/OldaleTown_PokemonCenter_1F/header.inc @@ -11,4 +11,4 @@ OldaleTown_PokemonCenter_1F:: @ 8305AF4 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/OldaleTown_PokemonCenter_2F/header.inc b/data/maps/OldaleTown_PokemonCenter_2F/header.inc index 5065e1aa6..7f2eae09e 100644 --- a/data/maps/OldaleTown_PokemonCenter_2F/header.inc +++ b/data/maps/OldaleTown_PokemonCenter_2F/header.inc @@ -11,4 +11,4 @@ OldaleTown_PokemonCenter_2F:: @ 8305B10 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/PacifidlogTown/header.inc b/data/maps/PacifidlogTown/header.inc index 3e65ddaad..ddc0e85ef 100644 --- a/data/maps/PacifidlogTown/header.inc +++ b/data/maps/PacifidlogTown/header.inc @@ -11,4 +11,4 @@ PacifidlogTown:: @ 83055EC .byte MAP_TYPE_TOWN .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/PacifidlogTown_House1/header.inc b/data/maps/PacifidlogTown_House1/header.inc index 170b80287..fc1c7d068 100644 --- a/data/maps/PacifidlogTown_House1/header.inc +++ b/data/maps/PacifidlogTown_House1/header.inc @@ -11,4 +11,4 @@ PacifidlogTown_House1:: @ 8305E90 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/PacifidlogTown_House2/header.inc b/data/maps/PacifidlogTown_House2/header.inc index 575d19c5d..686f43654 100644 --- a/data/maps/PacifidlogTown_House2/header.inc +++ b/data/maps/PacifidlogTown_House2/header.inc @@ -11,4 +11,4 @@ PacifidlogTown_House2:: @ 8305EAC .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/PacifidlogTown_House3/header.inc b/data/maps/PacifidlogTown_House3/header.inc index bbb0e4711..42c167037 100644 --- a/data/maps/PacifidlogTown_House3/header.inc +++ b/data/maps/PacifidlogTown_House3/header.inc @@ -11,4 +11,4 @@ PacifidlogTown_House3:: @ 8305EC8 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/PacifidlogTown_House4/header.inc b/data/maps/PacifidlogTown_House4/header.inc index 61e6e515b..292dee756 100644 --- a/data/maps/PacifidlogTown_House4/header.inc +++ b/data/maps/PacifidlogTown_House4/header.inc @@ -11,4 +11,4 @@ PacifidlogTown_House4:: @ 8305EE4 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/PacifidlogTown_House5/header.inc b/data/maps/PacifidlogTown_House5/header.inc index 55dfda7ec..c23aae265 100644 --- a/data/maps/PacifidlogTown_House5/header.inc +++ b/data/maps/PacifidlogTown_House5/header.inc @@ -11,4 +11,4 @@ PacifidlogTown_House5:: @ 8305F00 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc b/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc index 3168da669..d14920f48 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc +++ b/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc @@ -11,4 +11,4 @@ PacifidlogTown_PokemonCenter_1F:: @ 8305E58 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc b/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc index eb19b655d..31a7ad30b 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc +++ b/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc @@ -11,4 +11,4 @@ PacifidlogTown_PokemonCenter_2F:: @ 8305E74 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/PetalburgCity/header.inc b/data/maps/PetalburgCity/header.inc index 1c5ed76ef..04dad7375 100644 --- a/data/maps/PetalburgCity/header.inc +++ b/data/maps/PetalburgCity/header.inc @@ -11,4 +11,4 @@ PetalburgCity:: @ 8305448 .byte MAP_TYPE_CITY .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/PetalburgCity_Gym/header.inc b/data/maps/PetalburgCity_Gym/header.inc index 86d17dd19..ecd2919c2 100644 --- a/data/maps/PetalburgCity_Gym/header.inc +++ b/data/maps/PetalburgCity_Gym/header.inc @@ -11,4 +11,4 @@ PetalburgCity_Gym:: @ 8305F38 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 1 + .byte MAP_BATTLE_SCENE_GYM diff --git a/data/maps/PetalburgCity_House1/header.inc b/data/maps/PetalburgCity_House1/header.inc index 7610d9d81..660d6955e 100644 --- a/data/maps/PetalburgCity_House1/header.inc +++ b/data/maps/PetalburgCity_House1/header.inc @@ -11,4 +11,4 @@ PetalburgCity_House1:: @ 8305F54 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/PetalburgCity_House2/header.inc b/data/maps/PetalburgCity_House2/header.inc index 956064137..5271d69b0 100644 --- a/data/maps/PetalburgCity_House2/header.inc +++ b/data/maps/PetalburgCity_House2/header.inc @@ -11,4 +11,4 @@ PetalburgCity_House2:: @ 8305F70 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/PetalburgCity_Mart/header.inc b/data/maps/PetalburgCity_Mart/header.inc index ddbfb54b7..eb8f29262 100644 --- a/data/maps/PetalburgCity_Mart/header.inc +++ b/data/maps/PetalburgCity_Mart/header.inc @@ -11,4 +11,4 @@ PetalburgCity_Mart:: @ 8305FC4 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/PetalburgCity_PokemonCenter_1F/header.inc b/data/maps/PetalburgCity_PokemonCenter_1F/header.inc index 5a56f2d4a..42ad35b9d 100644 --- a/data/maps/PetalburgCity_PokemonCenter_1F/header.inc +++ b/data/maps/PetalburgCity_PokemonCenter_1F/header.inc @@ -11,4 +11,4 @@ PetalburgCity_PokemonCenter_1F:: @ 8305F8C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/PetalburgCity_PokemonCenter_2F/header.inc b/data/maps/PetalburgCity_PokemonCenter_2F/header.inc index dc5e57b82..49c74824b 100644 --- a/data/maps/PetalburgCity_PokemonCenter_2F/header.inc +++ b/data/maps/PetalburgCity_PokemonCenter_2F/header.inc @@ -11,4 +11,4 @@ PetalburgCity_PokemonCenter_2F:: @ 8305FA8 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/PetalburgCity_WallysHouse/header.inc b/data/maps/PetalburgCity_WallysHouse/header.inc index 2549ee8ff..d733ffbf8 100644 --- a/data/maps/PetalburgCity_WallysHouse/header.inc +++ b/data/maps/PetalburgCity_WallysHouse/header.inc @@ -11,4 +11,4 @@ PetalburgCity_WallysHouse:: @ 8305F1C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/PetalburgWoods/header.inc b/data/maps/PetalburgWoods/header.inc index 07ac7c810..3c0014255 100644 --- a/data/maps/PetalburgWoods/header.inc +++ b/data/maps/PetalburgWoods/header.inc @@ -11,4 +11,4 @@ PetalburgWoods:: @ 8306EA4 .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/RecordCorner/header.inc b/data/maps/RecordCorner/header.inc index e0c9767db..c5cf670ec 100644 --- a/data/maps/RecordCorner/header.inc +++ b/data/maps/RecordCorner/header.inc @@ -11,4 +11,4 @@ RecordCorner:: @ 83079B0 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route101/header.inc b/data/maps/Route101/header.inc index 5ecbb7e61..3817bb9ac 100644 --- a/data/maps/Route101/header.inc +++ b/data/maps/Route101/header.inc @@ -11,4 +11,4 @@ Route101:: @ 8305608 .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route102/header.inc b/data/maps/Route102/header.inc index b7af31bb0..008c88849 100644 --- a/data/maps/Route102/header.inc +++ b/data/maps/Route102/header.inc @@ -11,4 +11,4 @@ Route102:: @ 8305624 .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route103/header.inc b/data/maps/Route103/header.inc index 9d37b2bc1..7cf973ccf 100644 --- a/data/maps/Route103/header.inc +++ b/data/maps/Route103/header.inc @@ -11,4 +11,4 @@ Route103:: @ 8305640 .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route104/header.inc b/data/maps/Route104/header.inc index 9827355ba..a31075c83 100644 --- a/data/maps/Route104/header.inc +++ b/data/maps/Route104/header.inc @@ -11,4 +11,4 @@ Route104:: @ 830565C .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route104_MrBrineysHouse/header.inc b/data/maps/Route104_MrBrineysHouse/header.inc index 1bcc33bf5..96dd9dc25 100644 --- a/data/maps/Route104_MrBrineysHouse/header.inc +++ b/data/maps/Route104_MrBrineysHouse/header.inc @@ -11,4 +11,4 @@ Route104_MrBrineysHouse:: @ 8306C20 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route104_PrettyPetalFlowerShop/header.inc b/data/maps/Route104_PrettyPetalFlowerShop/header.inc index 8a66e5c7f..ffcb35f23 100644 --- a/data/maps/Route104_PrettyPetalFlowerShop/header.inc +++ b/data/maps/Route104_PrettyPetalFlowerShop/header.inc @@ -11,4 +11,4 @@ Route104_PrettyPetalFlowerShop:: @ 8306C3C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route104_Prototype/header.inc b/data/maps/Route104_Prototype/header.inc index 4b9c5d509..66dbd5222 100644 --- a/data/maps/Route104_Prototype/header.inc +++ b/data/maps/Route104_Prototype/header.inc @@ -11,4 +11,4 @@ Route104_Prototype:: @ 8307CF8 .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc b/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc index 25ff26199..8542522bc 100644 --- a/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc +++ b/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc @@ -11,4 +11,4 @@ Route104_PrototypePrettyPetalFlowerShop:: @ 8307D14 .byte MAP_TYPE_INDOOR .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route105/header.inc b/data/maps/Route105/header.inc index 74367713c..61177480e 100644 --- a/data/maps/Route105/header.inc +++ b/data/maps/Route105/header.inc @@ -11,4 +11,4 @@ Route105:: @ 8305678 .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route106/header.inc b/data/maps/Route106/header.inc index fa564fe9e..1d787957b 100644 --- a/data/maps/Route106/header.inc +++ b/data/maps/Route106/header.inc @@ -11,4 +11,4 @@ Route106:: @ 8305694 .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route107/header.inc b/data/maps/Route107/header.inc index f014b95c7..ed5263877 100644 --- a/data/maps/Route107/header.inc +++ b/data/maps/Route107/header.inc @@ -11,4 +11,4 @@ Route107:: @ 83056B0 .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route108/header.inc b/data/maps/Route108/header.inc index b0107dc1d..6df68bcc5 100644 --- a/data/maps/Route108/header.inc +++ b/data/maps/Route108/header.inc @@ -11,4 +11,4 @@ Route108:: @ 83056CC .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route109/header.inc b/data/maps/Route109/header.inc index 7481c924c..9a18273b6 100644 --- a/data/maps/Route109/header.inc +++ b/data/maps/Route109/header.inc @@ -11,4 +11,4 @@ Route109:: @ 83056E8 .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route109_SeashoreHouse/header.inc b/data/maps/Route109_SeashoreHouse/header.inc index a12faddd2..0f199bb4c 100644 --- a/data/maps/Route109_SeashoreHouse/header.inc +++ b/data/maps/Route109_SeashoreHouse/header.inc @@ -11,4 +11,4 @@ Route109_SeashoreHouse:: @ 8307D30 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route110/header.inc b/data/maps/Route110/header.inc index c6e72efba..112b177ff 100644 --- a/data/maps/Route110/header.inc +++ b/data/maps/Route110/header.inc @@ -11,4 +11,4 @@ Route110:: @ 8305704 .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc index f6b6aa1c9..c8093ca03 100644 --- a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc +++ b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc @@ -11,4 +11,4 @@ Route110_SeasideCyclingRoadNorthEntrance:: @ 8307E9C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc index 187c13781..3c7464315 100644 --- a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc +++ b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc @@ -11,4 +11,4 @@ Route110_SeasideCyclingRoadSouthEntrance:: @ 8307E80 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route110_TrickHouseCorridor/header.inc b/data/maps/Route110_TrickHouseCorridor/header.inc index c70e483f1..da8c48b0b 100644 --- a/data/maps/Route110_TrickHouseCorridor/header.inc +++ b/data/maps/Route110_TrickHouseCorridor/header.inc @@ -11,4 +11,4 @@ Route110_TrickHouseCorridor:: @ 8307D84 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route110_TrickHouseEnd/header.inc b/data/maps/Route110_TrickHouseEnd/header.inc index 37260e661..933182d35 100644 --- a/data/maps/Route110_TrickHouseEnd/header.inc +++ b/data/maps/Route110_TrickHouseEnd/header.inc @@ -11,4 +11,4 @@ Route110_TrickHouseEnd:: @ 8307D68 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route110_TrickHouseEntrance/header.inc b/data/maps/Route110_TrickHouseEntrance/header.inc index e2ee33d65..01cbcc037 100644 --- a/data/maps/Route110_TrickHouseEntrance/header.inc +++ b/data/maps/Route110_TrickHouseEntrance/header.inc @@ -11,4 +11,4 @@ Route110_TrickHouseEntrance:: @ 8307D4C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route110_TrickHousePuzzle1/header.inc b/data/maps/Route110_TrickHousePuzzle1/header.inc index 0cdf6e55b..74738ea44 100644 --- a/data/maps/Route110_TrickHousePuzzle1/header.inc +++ b/data/maps/Route110_TrickHousePuzzle1/header.inc @@ -11,4 +11,4 @@ Route110_TrickHousePuzzle1:: @ 8307DA0 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route110_TrickHousePuzzle2/header.inc b/data/maps/Route110_TrickHousePuzzle2/header.inc index 03b220e96..eebb3bb25 100644 --- a/data/maps/Route110_TrickHousePuzzle2/header.inc +++ b/data/maps/Route110_TrickHousePuzzle2/header.inc @@ -11,4 +11,4 @@ Route110_TrickHousePuzzle2:: @ 8307DBC .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route110_TrickHousePuzzle3/header.inc b/data/maps/Route110_TrickHousePuzzle3/header.inc index 8ac021d4d..83ebe469c 100644 --- a/data/maps/Route110_TrickHousePuzzle3/header.inc +++ b/data/maps/Route110_TrickHousePuzzle3/header.inc @@ -11,4 +11,4 @@ Route110_TrickHousePuzzle3:: @ 8307DD8 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route110_TrickHousePuzzle4/header.inc b/data/maps/Route110_TrickHousePuzzle4/header.inc index 11eaffbb4..d96d89745 100644 --- a/data/maps/Route110_TrickHousePuzzle4/header.inc +++ b/data/maps/Route110_TrickHousePuzzle4/header.inc @@ -11,4 +11,4 @@ Route110_TrickHousePuzzle4:: @ 8307DF4 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route110_TrickHousePuzzle5/header.inc b/data/maps/Route110_TrickHousePuzzle5/header.inc index 40bc9f4b7..b6cc187b6 100644 --- a/data/maps/Route110_TrickHousePuzzle5/header.inc +++ b/data/maps/Route110_TrickHousePuzzle5/header.inc @@ -11,4 +11,4 @@ Route110_TrickHousePuzzle5:: @ 8307E10 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route110_TrickHousePuzzle6/header.inc b/data/maps/Route110_TrickHousePuzzle6/header.inc index b527fad03..436cc1d1b 100644 --- a/data/maps/Route110_TrickHousePuzzle6/header.inc +++ b/data/maps/Route110_TrickHousePuzzle6/header.inc @@ -11,4 +11,4 @@ Route110_TrickHousePuzzle6:: @ 8307E2C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route110_TrickHousePuzzle7/header.inc b/data/maps/Route110_TrickHousePuzzle7/header.inc index e9fe01965..32e0f1676 100644 --- a/data/maps/Route110_TrickHousePuzzle7/header.inc +++ b/data/maps/Route110_TrickHousePuzzle7/header.inc @@ -11,4 +11,4 @@ Route110_TrickHousePuzzle7:: @ 8307E48 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route110_TrickHousePuzzle8/header.inc b/data/maps/Route110_TrickHousePuzzle8/header.inc index 48f064cb5..8aef9307f 100644 --- a/data/maps/Route110_TrickHousePuzzle8/header.inc +++ b/data/maps/Route110_TrickHousePuzzle8/header.inc @@ -11,4 +11,4 @@ Route110_TrickHousePuzzle8:: @ 8307E64 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route111/header.inc b/data/maps/Route111/header.inc index b52dbce16..106adf413 100644 --- a/data/maps/Route111/header.inc +++ b/data/maps/Route111/header.inc @@ -11,4 +11,4 @@ Route111:: @ 8305720 .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route111_OldLadysRestStop/header.inc b/data/maps/Route111_OldLadysRestStop/header.inc index 46ea8ce53..ed8da2358 100644 --- a/data/maps/Route111_OldLadysRestStop/header.inc +++ b/data/maps/Route111_OldLadysRestStop/header.inc @@ -11,4 +11,4 @@ Route111_OldLadysRestStop:: @ 8306C74 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route111_WinstrateFamilysHouse/header.inc b/data/maps/Route111_WinstrateFamilysHouse/header.inc index f00b7de29..5e68c7992 100644 --- a/data/maps/Route111_WinstrateFamilysHouse/header.inc +++ b/data/maps/Route111_WinstrateFamilysHouse/header.inc @@ -11,4 +11,4 @@ Route111_WinstrateFamilysHouse:: @ 8306C58 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route112/header.inc b/data/maps/Route112/header.inc index 2159d8bd6..f5e3f3133 100644 --- a/data/maps/Route112/header.inc +++ b/data/maps/Route112/header.inc @@ -11,4 +11,4 @@ Route112:: @ 830573C .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route112_CableCarStation/header.inc b/data/maps/Route112_CableCarStation/header.inc index 8c2cdd9fe..0a657b920 100644 --- a/data/maps/Route112_CableCarStation/header.inc +++ b/data/maps/Route112_CableCarStation/header.inc @@ -11,4 +11,4 @@ Route112_CableCarStation:: @ 8306C90 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route113/header.inc b/data/maps/Route113/header.inc index 33f63b8d5..9208e03a1 100644 --- a/data/maps/Route113/header.inc +++ b/data/maps/Route113/header.inc @@ -11,4 +11,4 @@ Route113:: @ 8305758 .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route113_GlassWorkshop/header.inc b/data/maps/Route113_GlassWorkshop/header.inc index 4030fbe93..eb75ddfb6 100644 --- a/data/maps/Route113_GlassWorkshop/header.inc +++ b/data/maps/Route113_GlassWorkshop/header.inc @@ -11,4 +11,4 @@ Route113_GlassWorkshop:: @ 8307EB8 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route114/header.inc b/data/maps/Route114/header.inc index ba2b1eb3a..fc57d86aa 100644 --- a/data/maps/Route114/header.inc +++ b/data/maps/Route114/header.inc @@ -11,4 +11,4 @@ Route114:: @ 8305774 .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route114_FossilManiacsHouse/header.inc b/data/maps/Route114_FossilManiacsHouse/header.inc index 71d084466..658bb33d9 100644 --- a/data/maps/Route114_FossilManiacsHouse/header.inc +++ b/data/maps/Route114_FossilManiacsHouse/header.inc @@ -11,4 +11,4 @@ Route114_FossilManiacsHouse:: @ 8306CC8 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route114_FossilManiacsTunnel/header.inc b/data/maps/Route114_FossilManiacsTunnel/header.inc index c47de21a6..c8fa950f4 100644 --- a/data/maps/Route114_FossilManiacsTunnel/header.inc +++ b/data/maps/Route114_FossilManiacsTunnel/header.inc @@ -11,4 +11,4 @@ Route114_FossilManiacsTunnel:: @ 8306CE4 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route114_LanettesHouse/header.inc b/data/maps/Route114_LanettesHouse/header.inc index 27f3c0e46..3b49ab59a 100644 --- a/data/maps/Route114_LanettesHouse/header.inc +++ b/data/maps/Route114_LanettesHouse/header.inc @@ -11,4 +11,4 @@ Route114_LanettesHouse:: @ 8306D00 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route115/header.inc b/data/maps/Route115/header.inc index c64340a27..9967224a8 100644 --- a/data/maps/Route115/header.inc +++ b/data/maps/Route115/header.inc @@ -11,4 +11,4 @@ Route115:: @ 8305790 .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route116/header.inc b/data/maps/Route116/header.inc index 496723efc..0351d0cf7 100644 --- a/data/maps/Route116/header.inc +++ b/data/maps/Route116/header.inc @@ -11,4 +11,4 @@ Route116:: @ 83057AC .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route116_TunnelersRestHouse/header.inc b/data/maps/Route116_TunnelersRestHouse/header.inc index 431119c68..d17ce63b5 100644 --- a/data/maps/Route116_TunnelersRestHouse/header.inc +++ b/data/maps/Route116_TunnelersRestHouse/header.inc @@ -11,4 +11,4 @@ Route116_TunnelersRestHouse:: @ 8306D1C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route117/header.inc b/data/maps/Route117/header.inc index 3543079b0..8ef982ca4 100644 --- a/data/maps/Route117/header.inc +++ b/data/maps/Route117/header.inc @@ -11,4 +11,4 @@ Route117:: @ 83057C8 .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route117_PokemonDayCare/header.inc b/data/maps/Route117_PokemonDayCare/header.inc index 2f301578e..ac75acc8a 100644 --- a/data/maps/Route117_PokemonDayCare/header.inc +++ b/data/maps/Route117_PokemonDayCare/header.inc @@ -11,4 +11,4 @@ Route117_PokemonDayCare:: @ 8306D38 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route118/header.inc b/data/maps/Route118/header.inc index 6e7a41ec2..8daad3bc8 100644 --- a/data/maps/Route118/header.inc +++ b/data/maps/Route118/header.inc @@ -11,4 +11,4 @@ Route118:: @ 83057E4 .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route119/header.inc b/data/maps/Route119/header.inc index 16efb467d..9a0a12f87 100644 --- a/data/maps/Route119/header.inc +++ b/data/maps/Route119/header.inc @@ -11,4 +11,4 @@ Route119:: @ 8305800 .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route119_House/header.inc b/data/maps/Route119_House/header.inc index e822387b8..e4d1c2d0a 100644 --- a/data/maps/Route119_House/header.inc +++ b/data/maps/Route119_House/header.inc @@ -11,4 +11,4 @@ Route119_House:: @ 8307F28 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route119_WeatherInstitute_1F/header.inc b/data/maps/Route119_WeatherInstitute_1F/header.inc index a55e96cdc..85db67fad 100644 --- a/data/maps/Route119_WeatherInstitute_1F/header.inc +++ b/data/maps/Route119_WeatherInstitute_1F/header.inc @@ -11,4 +11,4 @@ Route119_WeatherInstitute_1F:: @ 8307EF0 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route119_WeatherInstitute_2F/header.inc b/data/maps/Route119_WeatherInstitute_2F/header.inc index 0a0431b19..ffda37907 100644 --- a/data/maps/Route119_WeatherInstitute_2F/header.inc +++ b/data/maps/Route119_WeatherInstitute_2F/header.inc @@ -11,4 +11,4 @@ Route119_WeatherInstitute_2F:: @ 8307F0C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route120/header.inc b/data/maps/Route120/header.inc index 68a6de88f..921c3fde4 100644 --- a/data/maps/Route120/header.inc +++ b/data/maps/Route120/header.inc @@ -11,4 +11,4 @@ Route120:: @ 830581C .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route121/header.inc b/data/maps/Route121/header.inc index 84cd2c273..e75d8d21f 100644 --- a/data/maps/Route121/header.inc +++ b/data/maps/Route121/header.inc @@ -11,4 +11,4 @@ Route121:: @ 8305838 .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route121_SafariZoneEntrance/header.inc b/data/maps/Route121_SafariZoneEntrance/header.inc index ca171c39e..5dc27e7fe 100644 --- a/data/maps/Route121_SafariZoneEntrance/header.inc +++ b/data/maps/Route121_SafariZoneEntrance/header.inc @@ -11,4 +11,4 @@ Route121_SafariZoneEntrance:: @ 8306D54 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route122/header.inc b/data/maps/Route122/header.inc index 5830203cf..44cc87aa9 100644 --- a/data/maps/Route122/header.inc +++ b/data/maps/Route122/header.inc @@ -11,4 +11,4 @@ Route122:: @ 8305854 .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route123/header.inc b/data/maps/Route123/header.inc index dcb08c4bc..49e6631a9 100644 --- a/data/maps/Route123/header.inc +++ b/data/maps/Route123/header.inc @@ -11,4 +11,4 @@ Route123:: @ 8305870 .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route123_BerryMastersHouse/header.inc b/data/maps/Route123_BerryMastersHouse/header.inc index 2c65fb5e3..ec4a4aab1 100644 --- a/data/maps/Route123_BerryMastersHouse/header.inc +++ b/data/maps/Route123_BerryMastersHouse/header.inc @@ -11,4 +11,4 @@ Route123_BerryMastersHouse:: @ 8307ED4 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route124/header.inc b/data/maps/Route124/header.inc index 45163691a..fccd2efee 100644 --- a/data/maps/Route124/header.inc +++ b/data/maps/Route124/header.inc @@ -11,4 +11,4 @@ Route124:: @ 830588C .byte MAP_TYPE_6 .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/header.inc b/data/maps/Route124_DivingTreasureHuntersHouse/header.inc index 4954a683e..34bd5e673 100644 --- a/data/maps/Route124_DivingTreasureHuntersHouse/header.inc +++ b/data/maps/Route124_DivingTreasureHuntersHouse/header.inc @@ -11,4 +11,4 @@ Route124_DivingTreasureHuntersHouse:: @ 8307F44 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route125/header.inc b/data/maps/Route125/header.inc index bcc72f444..b24645c3d 100644 --- a/data/maps/Route125/header.inc +++ b/data/maps/Route125/header.inc @@ -11,4 +11,4 @@ Route125:: @ 83058A8 .byte MAP_TYPE_6 .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route126/header.inc b/data/maps/Route126/header.inc index 8a7a39f08..81af74622 100644 --- a/data/maps/Route126/header.inc +++ b/data/maps/Route126/header.inc @@ -11,4 +11,4 @@ Route126:: @ 83058C4 .byte MAP_TYPE_6 .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route127/header.inc b/data/maps/Route127/header.inc index 92fbe4caf..ca05331d0 100644 --- a/data/maps/Route127/header.inc +++ b/data/maps/Route127/header.inc @@ -11,4 +11,4 @@ Route127:: @ 83058E0 .byte MAP_TYPE_6 .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route128/header.inc b/data/maps/Route128/header.inc index 0f7f4acc6..135d86d79 100644 --- a/data/maps/Route128/header.inc +++ b/data/maps/Route128/header.inc @@ -11,4 +11,4 @@ Route128:: @ 83058FC .byte MAP_TYPE_6 .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route129/header.inc b/data/maps/Route129/header.inc index 301c65557..fe0ca1652 100644 --- a/data/maps/Route129/header.inc +++ b/data/maps/Route129/header.inc @@ -11,4 +11,4 @@ Route129:: @ 8305918 .byte MAP_TYPE_6 .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route130/header.inc b/data/maps/Route130/header.inc index 1a7fbc77a..e3f7e75a3 100644 --- a/data/maps/Route130/header.inc +++ b/data/maps/Route130/header.inc @@ -11,4 +11,4 @@ Route130:: @ 8305934 .byte MAP_TYPE_6 .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route131/header.inc b/data/maps/Route131/header.inc index 182bcf1e8..92538ee6e 100644 --- a/data/maps/Route131/header.inc +++ b/data/maps/Route131/header.inc @@ -11,4 +11,4 @@ Route131:: @ 8305950 .byte MAP_TYPE_6 .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route132/header.inc b/data/maps/Route132/header.inc index dbd2ddfe7..7f73ebbc7 100644 --- a/data/maps/Route132/header.inc +++ b/data/maps/Route132/header.inc @@ -11,4 +11,4 @@ Route132:: @ 830596C .byte MAP_TYPE_6 .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route133/header.inc b/data/maps/Route133/header.inc index b6a2c5963..87aa3c84b 100644 --- a/data/maps/Route133/header.inc +++ b/data/maps/Route133/header.inc @@ -11,4 +11,4 @@ Route133:: @ 8305988 .byte MAP_TYPE_6 .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route134/header.inc b/data/maps/Route134/header.inc index cc4360ef9..f7f6e64fd 100644 --- a/data/maps/Route134/header.inc +++ b/data/maps/Route134/header.inc @@ -11,4 +11,4 @@ Route134:: @ 83059A4 .byte MAP_TYPE_6 .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/RustboroCity/header.inc b/data/maps/RustboroCity/header.inc index 375d378a6..7b63f0119 100644 --- a/data/maps/RustboroCity/header.inc +++ b/data/maps/RustboroCity/header.inc @@ -11,4 +11,4 @@ RustboroCity:: @ 830549C .byte MAP_TYPE_CITY .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/RustboroCity_CuttersHouse/header.inc b/data/maps/RustboroCity_CuttersHouse/header.inc index e7b90812e..0dce55062 100644 --- a/data/maps/RustboroCity_CuttersHouse/header.inc +++ b/data/maps/RustboroCity_CuttersHouse/header.inc @@ -11,4 +11,4 @@ RustboroCity_CuttersHouse:: @ 8306360 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/RustboroCity_DevonCorp_1F/header.inc b/data/maps/RustboroCity_DevonCorp_1F/header.inc index 2d78bb675..b32d57093 100644 --- a/data/maps/RustboroCity_DevonCorp_1F/header.inc +++ b/data/maps/RustboroCity_DevonCorp_1F/header.inc @@ -11,4 +11,4 @@ RustboroCity_DevonCorp_1F:: @ 830622C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/RustboroCity_DevonCorp_2F/header.inc b/data/maps/RustboroCity_DevonCorp_2F/header.inc index acb411dbb..a6c8da14f 100644 --- a/data/maps/RustboroCity_DevonCorp_2F/header.inc +++ b/data/maps/RustboroCity_DevonCorp_2F/header.inc @@ -11,4 +11,4 @@ RustboroCity_DevonCorp_2F:: @ 8306248 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/RustboroCity_DevonCorp_3F/header.inc b/data/maps/RustboroCity_DevonCorp_3F/header.inc index 5f2f4c039..c38db5048 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/header.inc +++ b/data/maps/RustboroCity_DevonCorp_3F/header.inc @@ -11,4 +11,4 @@ RustboroCity_DevonCorp_3F:: @ 8306264 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/RustboroCity_Flat1_1F/header.inc b/data/maps/RustboroCity_Flat1_1F/header.inc index 855f43ef8..1565c7d46 100644 --- a/data/maps/RustboroCity_Flat1_1F/header.inc +++ b/data/maps/RustboroCity_Flat1_1F/header.inc @@ -11,4 +11,4 @@ RustboroCity_Flat1_1F:: @ 830630C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/RustboroCity_Flat1_2F/header.inc b/data/maps/RustboroCity_Flat1_2F/header.inc index 75e2fb114..61c97d1ae 100644 --- a/data/maps/RustboroCity_Flat1_2F/header.inc +++ b/data/maps/RustboroCity_Flat1_2F/header.inc @@ -11,4 +11,4 @@ RustboroCity_Flat1_2F:: @ 8306328 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/RustboroCity_Flat2_1F/header.inc b/data/maps/RustboroCity_Flat2_1F/header.inc index 3a56357f7..9a8a1f848 100644 --- a/data/maps/RustboroCity_Flat2_1F/header.inc +++ b/data/maps/RustboroCity_Flat2_1F/header.inc @@ -11,4 +11,4 @@ RustboroCity_Flat2_1F:: @ 8306398 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/RustboroCity_Flat2_2F/header.inc b/data/maps/RustboroCity_Flat2_2F/header.inc index 48afa8234..e39257bfe 100644 --- a/data/maps/RustboroCity_Flat2_2F/header.inc +++ b/data/maps/RustboroCity_Flat2_2F/header.inc @@ -11,4 +11,4 @@ RustboroCity_Flat2_2F:: @ 83063B4 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/RustboroCity_Flat2_3F/header.inc b/data/maps/RustboroCity_Flat2_3F/header.inc index 13a8157d1..2e0d442c7 100644 --- a/data/maps/RustboroCity_Flat2_3F/header.inc +++ b/data/maps/RustboroCity_Flat2_3F/header.inc @@ -11,4 +11,4 @@ RustboroCity_Flat2_3F:: @ 83063D0 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/RustboroCity_Gym/header.inc b/data/maps/RustboroCity_Gym/header.inc index 79ef9f54c..bc214630b 100644 --- a/data/maps/RustboroCity_Gym/header.inc +++ b/data/maps/RustboroCity_Gym/header.inc @@ -11,4 +11,4 @@ RustboroCity_Gym:: @ 8306280 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 1 + .byte MAP_BATTLE_SCENE_GYM diff --git a/data/maps/RustboroCity_House1/header.inc b/data/maps/RustboroCity_House1/header.inc index b389ac45a..af3a17a46 100644 --- a/data/maps/RustboroCity_House1/header.inc +++ b/data/maps/RustboroCity_House1/header.inc @@ -11,4 +11,4 @@ RustboroCity_House1:: @ 8306344 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/RustboroCity_House2/header.inc b/data/maps/RustboroCity_House2/header.inc index 617f458a0..66e194304 100644 --- a/data/maps/RustboroCity_House2/header.inc +++ b/data/maps/RustboroCity_House2/header.inc @@ -11,4 +11,4 @@ RustboroCity_House2:: @ 830637C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/RustboroCity_House3/header.inc b/data/maps/RustboroCity_House3/header.inc index e120a1fd3..d5398d3a0 100644 --- a/data/maps/RustboroCity_House3/header.inc +++ b/data/maps/RustboroCity_House3/header.inc @@ -11,4 +11,4 @@ RustboroCity_House3:: @ 83063EC .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/RustboroCity_Mart/header.inc b/data/maps/RustboroCity_Mart/header.inc index 7b1d739ed..f2d69e238 100644 --- a/data/maps/RustboroCity_Mart/header.inc +++ b/data/maps/RustboroCity_Mart/header.inc @@ -11,4 +11,4 @@ RustboroCity_Mart:: @ 83062F0 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/RustboroCity_PokemonCenter_1F/header.inc b/data/maps/RustboroCity_PokemonCenter_1F/header.inc index f57900235..dd1d976fe 100644 --- a/data/maps/RustboroCity_PokemonCenter_1F/header.inc +++ b/data/maps/RustboroCity_PokemonCenter_1F/header.inc @@ -11,4 +11,4 @@ RustboroCity_PokemonCenter_1F:: @ 83062B8 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/RustboroCity_PokemonCenter_2F/header.inc b/data/maps/RustboroCity_PokemonCenter_2F/header.inc index ce1d315c7..c34cd3dd7 100644 --- a/data/maps/RustboroCity_PokemonCenter_2F/header.inc +++ b/data/maps/RustboroCity_PokemonCenter_2F/header.inc @@ -11,4 +11,4 @@ RustboroCity_PokemonCenter_2F:: @ 83062D4 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/RustboroCity_PokemonSchool/header.inc b/data/maps/RustboroCity_PokemonSchool/header.inc index af51ce0d3..af4dc670a 100644 --- a/data/maps/RustboroCity_PokemonSchool/header.inc +++ b/data/maps/RustboroCity_PokemonSchool/header.inc @@ -11,4 +11,4 @@ RustboroCity_PokemonSchool:: @ 830629C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/RusturfTunnel/header.inc b/data/maps/RusturfTunnel/header.inc index f6d6376f9..b2a9be922 100644 --- a/data/maps/RusturfTunnel/header.inc +++ b/data/maps/RusturfTunnel/header.inc @@ -11,4 +11,4 @@ RusturfTunnel:: @ 8306DE0 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SSTidalCorridor/header.inc b/data/maps/SSTidalCorridor/header.inc index 4e9eb4814..50648d5d8 100644 --- a/data/maps/SSTidalCorridor/header.inc +++ b/data/maps/SSTidalCorridor/header.inc @@ -11,4 +11,4 @@ SSTidalCorridor:: @ 8307B54 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SSTidalLowerDeck/header.inc b/data/maps/SSTidalLowerDeck/header.inc index 14c9bf3b1..6d099c8bb 100644 --- a/data/maps/SSTidalLowerDeck/header.inc +++ b/data/maps/SSTidalLowerDeck/header.inc @@ -11,4 +11,4 @@ SSTidalLowerDeck:: @ 8307B70 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SSTidalRooms/header.inc b/data/maps/SSTidalRooms/header.inc index f744d00f9..ccf887a67 100644 --- a/data/maps/SSTidalRooms/header.inc +++ b/data/maps/SSTidalRooms/header.inc @@ -11,4 +11,4 @@ SSTidalRooms:: @ 8307B8C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SafariZone_Northeast/header.inc b/data/maps/SafariZone_Northeast/header.inc index 7100cac69..11d8af01a 100644 --- a/data/maps/SafariZone_Northeast/header.inc +++ b/data/maps/SafariZone_Northeast/header.inc @@ -11,4 +11,4 @@ SafariZone_Northeast:: @ 8307BC4 .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SafariZone_Northwest/header.inc b/data/maps/SafariZone_Northwest/header.inc index 51a3877a0..f1d3ba373 100644 --- a/data/maps/SafariZone_Northwest/header.inc +++ b/data/maps/SafariZone_Northwest/header.inc @@ -11,4 +11,4 @@ SafariZone_Northwest:: @ 8307BA8 .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SafariZone_RestHouse/header.inc b/data/maps/SafariZone_RestHouse/header.inc index c9e83714c..0c02110fd 100644 --- a/data/maps/SafariZone_RestHouse/header.inc +++ b/data/maps/SafariZone_RestHouse/header.inc @@ -11,4 +11,4 @@ SafariZone_RestHouse:: @ 8307CDC .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SafariZone_Southeast/header.inc b/data/maps/SafariZone_Southeast/header.inc index 05f0738ab..9248fb679 100644 --- a/data/maps/SafariZone_Southeast/header.inc +++ b/data/maps/SafariZone_Southeast/header.inc @@ -11,4 +11,4 @@ SafariZone_Southeast:: @ 8307BFC .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SafariZone_Southwest/header.inc b/data/maps/SafariZone_Southwest/header.inc index 3eb939d1f..0af533fe7 100644 --- a/data/maps/SafariZone_Southwest/header.inc +++ b/data/maps/SafariZone_Southwest/header.inc @@ -11,4 +11,4 @@ SafariZone_Southwest:: @ 8307BE0 .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/ScorchedSlab/header.inc b/data/maps/ScorchedSlab/header.inc index a600190c3..bf9ae56b0 100644 --- a/data/maps/ScorchedSlab/header.inc +++ b/data/maps/ScorchedSlab/header.inc @@ -11,4 +11,4 @@ ScorchedSlab:: @ 830756C .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SeafloorCavern_Entrance/header.inc b/data/maps/SeafloorCavern_Entrance/header.inc index e6e6a195e..d1546c99f 100644 --- a/data/maps/SeafloorCavern_Entrance/header.inc +++ b/data/maps/SeafloorCavern_Entrance/header.inc @@ -11,4 +11,4 @@ SeafloorCavern_Entrance:: @ 8307064 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SeafloorCavern_Room1/header.inc b/data/maps/SeafloorCavern_Room1/header.inc index c9fd33da2..d7ded7e26 100644 --- a/data/maps/SeafloorCavern_Room1/header.inc +++ b/data/maps/SeafloorCavern_Room1/header.inc @@ -11,4 +11,4 @@ SeafloorCavern_Room1:: @ 8307080 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SeafloorCavern_Room2/header.inc b/data/maps/SeafloorCavern_Room2/header.inc index dd4a9fc65..9ca4ef096 100644 --- a/data/maps/SeafloorCavern_Room2/header.inc +++ b/data/maps/SeafloorCavern_Room2/header.inc @@ -11,4 +11,4 @@ SeafloorCavern_Room2:: @ 830709C .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SeafloorCavern_Room3/header.inc b/data/maps/SeafloorCavern_Room3/header.inc index 815f8ec8d..b17c3014d 100644 --- a/data/maps/SeafloorCavern_Room3/header.inc +++ b/data/maps/SeafloorCavern_Room3/header.inc @@ -11,4 +11,4 @@ SeafloorCavern_Room3:: @ 83070B8 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SeafloorCavern_Room4/header.inc b/data/maps/SeafloorCavern_Room4/header.inc index d07c3a6df..6c74fd3cc 100644 --- a/data/maps/SeafloorCavern_Room4/header.inc +++ b/data/maps/SeafloorCavern_Room4/header.inc @@ -11,4 +11,4 @@ SeafloorCavern_Room4:: @ 83070D4 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SeafloorCavern_Room5/header.inc b/data/maps/SeafloorCavern_Room5/header.inc index 8991e9d2c..9fd274f4f 100644 --- a/data/maps/SeafloorCavern_Room5/header.inc +++ b/data/maps/SeafloorCavern_Room5/header.inc @@ -11,4 +11,4 @@ SeafloorCavern_Room5:: @ 83070F0 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SeafloorCavern_Room6/header.inc b/data/maps/SeafloorCavern_Room6/header.inc index ad7ca11b9..e44ba4e24 100644 --- a/data/maps/SeafloorCavern_Room6/header.inc +++ b/data/maps/SeafloorCavern_Room6/header.inc @@ -11,4 +11,4 @@ SeafloorCavern_Room6:: @ 830710C .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SeafloorCavern_Room7/header.inc b/data/maps/SeafloorCavern_Room7/header.inc index 053537095..dbf39c935 100644 --- a/data/maps/SeafloorCavern_Room7/header.inc +++ b/data/maps/SeafloorCavern_Room7/header.inc @@ -11,4 +11,4 @@ SeafloorCavern_Room7:: @ 8307128 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SeafloorCavern_Room8/header.inc b/data/maps/SeafloorCavern_Room8/header.inc index bc76830a8..6ffb91ee2 100644 --- a/data/maps/SeafloorCavern_Room8/header.inc +++ b/data/maps/SeafloorCavern_Room8/header.inc @@ -11,4 +11,4 @@ SeafloorCavern_Room8:: @ 8307144 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SeafloorCavern_Room9/header.inc b/data/maps/SeafloorCavern_Room9/header.inc index a6636e985..1ff4e0783 100644 --- a/data/maps/SeafloorCavern_Room9/header.inc +++ b/data/maps/SeafloorCavern_Room9/header.inc @@ -11,4 +11,4 @@ SeafloorCavern_Room9:: @ 8307160 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SealedChamber_InnerRoom/header.inc b/data/maps/SealedChamber_InnerRoom/header.inc index 899686f51..b54bec825 100644 --- a/data/maps/SealedChamber_InnerRoom/header.inc +++ b/data/maps/SealedChamber_InnerRoom/header.inc @@ -11,4 +11,4 @@ SealedChamber_InnerRoom:: @ 8307550 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SealedChamber_OuterRoom/header.inc b/data/maps/SealedChamber_OuterRoom/header.inc index 6919baa5b..61c2a0da6 100644 --- a/data/maps/SealedChamber_OuterRoom/header.inc +++ b/data/maps/SealedChamber_OuterRoom/header.inc @@ -11,4 +11,4 @@ SealedChamber_OuterRoom:: @ 8307534 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SecretBase_BlueCave1/header.inc b/data/maps/SecretBase_BlueCave1/header.inc index 8785a7728..f71c4beb5 100644 --- a/data/maps/SecretBase_BlueCave1/header.inc +++ b/data/maps/SecretBase_BlueCave1/header.inc @@ -11,4 +11,4 @@ SecretBase_BlueCave1:: @ 8307710 .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 1 - .byte 8 + .byte MAP_BATTLE_SCENE_BATTLE_TOWER diff --git a/data/maps/SecretBase_BlueCave2/header.inc b/data/maps/SecretBase_BlueCave2/header.inc index da39bdd06..158567787 100644 --- a/data/maps/SecretBase_BlueCave2/header.inc +++ b/data/maps/SecretBase_BlueCave2/header.inc @@ -11,4 +11,4 @@ SecretBase_BlueCave2:: @ 83077B8 .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 1 - .byte 8 + .byte MAP_BATTLE_SCENE_BATTLE_TOWER diff --git a/data/maps/SecretBase_BlueCave3/header.inc b/data/maps/SecretBase_BlueCave3/header.inc index 4077c8bd0..5b7b644f4 100644 --- a/data/maps/SecretBase_BlueCave3/header.inc +++ b/data/maps/SecretBase_BlueCave3/header.inc @@ -11,4 +11,4 @@ SecretBase_BlueCave3:: @ 8307860 .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 1 - .byte 8 + .byte MAP_BATTLE_SCENE_BATTLE_TOWER diff --git a/data/maps/SecretBase_BlueCave4/header.inc b/data/maps/SecretBase_BlueCave4/header.inc index 663c65a77..eb49d9372 100644 --- a/data/maps/SecretBase_BlueCave4/header.inc +++ b/data/maps/SecretBase_BlueCave4/header.inc @@ -11,4 +11,4 @@ SecretBase_BlueCave4:: @ 8307908 .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 1 - .byte 8 + .byte MAP_BATTLE_SCENE_BATTLE_TOWER diff --git a/data/maps/SecretBase_BrownCave1/header.inc b/data/maps/SecretBase_BrownCave1/header.inc index 00d5d0166..44a2a8f2a 100644 --- a/data/maps/SecretBase_BrownCave1/header.inc +++ b/data/maps/SecretBase_BrownCave1/header.inc @@ -11,4 +11,4 @@ SecretBase_BrownCave1:: @ 83076F4 .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 1 - .byte 8 + .byte MAP_BATTLE_SCENE_BATTLE_TOWER diff --git a/data/maps/SecretBase_BrownCave2/header.inc b/data/maps/SecretBase_BrownCave2/header.inc index 37230d81b..5f9c5285e 100644 --- a/data/maps/SecretBase_BrownCave2/header.inc +++ b/data/maps/SecretBase_BrownCave2/header.inc @@ -11,4 +11,4 @@ SecretBase_BrownCave2:: @ 830779C .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 1 - .byte 8 + .byte MAP_BATTLE_SCENE_BATTLE_TOWER diff --git a/data/maps/SecretBase_BrownCave3/header.inc b/data/maps/SecretBase_BrownCave3/header.inc index ce551a6ec..f46cac8fb 100644 --- a/data/maps/SecretBase_BrownCave3/header.inc +++ b/data/maps/SecretBase_BrownCave3/header.inc @@ -11,4 +11,4 @@ SecretBase_BrownCave3:: @ 8307844 .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 1 - .byte 8 + .byte MAP_BATTLE_SCENE_BATTLE_TOWER diff --git a/data/maps/SecretBase_BrownCave4/header.inc b/data/maps/SecretBase_BrownCave4/header.inc index 29806867f..5fafbccbc 100644 --- a/data/maps/SecretBase_BrownCave4/header.inc +++ b/data/maps/SecretBase_BrownCave4/header.inc @@ -11,4 +11,4 @@ SecretBase_BrownCave4:: @ 83078EC .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 1 - .byte 8 + .byte MAP_BATTLE_SCENE_BATTLE_TOWER diff --git a/data/maps/SecretBase_RedCave1/header.inc b/data/maps/SecretBase_RedCave1/header.inc index 33f68514e..3fc42eea8 100644 --- a/data/maps/SecretBase_RedCave1/header.inc +++ b/data/maps/SecretBase_RedCave1/header.inc @@ -11,4 +11,4 @@ SecretBase_RedCave1:: @ 83076D8 .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 1 - .byte 8 + .byte MAP_BATTLE_SCENE_BATTLE_TOWER diff --git a/data/maps/SecretBase_RedCave2/header.inc b/data/maps/SecretBase_RedCave2/header.inc index 4bc4b673c..ed8addd52 100644 --- a/data/maps/SecretBase_RedCave2/header.inc +++ b/data/maps/SecretBase_RedCave2/header.inc @@ -11,4 +11,4 @@ SecretBase_RedCave2:: @ 8307780 .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 1 - .byte 8 + .byte MAP_BATTLE_SCENE_BATTLE_TOWER diff --git a/data/maps/SecretBase_RedCave3/header.inc b/data/maps/SecretBase_RedCave3/header.inc index 330592a0b..027067c47 100644 --- a/data/maps/SecretBase_RedCave3/header.inc +++ b/data/maps/SecretBase_RedCave3/header.inc @@ -11,4 +11,4 @@ SecretBase_RedCave3:: @ 8307828 .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 1 - .byte 8 + .byte MAP_BATTLE_SCENE_BATTLE_TOWER diff --git a/data/maps/SecretBase_RedCave4/header.inc b/data/maps/SecretBase_RedCave4/header.inc index 0bddcb964..b44756fba 100644 --- a/data/maps/SecretBase_RedCave4/header.inc +++ b/data/maps/SecretBase_RedCave4/header.inc @@ -11,4 +11,4 @@ SecretBase_RedCave4:: @ 83078D0 .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 1 - .byte 8 + .byte MAP_BATTLE_SCENE_BATTLE_TOWER diff --git a/data/maps/SecretBase_Shrub1/header.inc b/data/maps/SecretBase_Shrub1/header.inc index 27c464fde..e882abdf5 100644 --- a/data/maps/SecretBase_Shrub1/header.inc +++ b/data/maps/SecretBase_Shrub1/header.inc @@ -11,4 +11,4 @@ SecretBase_Shrub1:: @ 8307764 .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 1 - .byte 8 + .byte MAP_BATTLE_SCENE_BATTLE_TOWER diff --git a/data/maps/SecretBase_Shrub2/header.inc b/data/maps/SecretBase_Shrub2/header.inc index 70bbc94d8..4f456a00e 100644 --- a/data/maps/SecretBase_Shrub2/header.inc +++ b/data/maps/SecretBase_Shrub2/header.inc @@ -11,4 +11,4 @@ SecretBase_Shrub2:: @ 830780C .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 1 - .byte 8 + .byte MAP_BATTLE_SCENE_BATTLE_TOWER diff --git a/data/maps/SecretBase_Shrub3/header.inc b/data/maps/SecretBase_Shrub3/header.inc index ee2297f17..042dfcd24 100644 --- a/data/maps/SecretBase_Shrub3/header.inc +++ b/data/maps/SecretBase_Shrub3/header.inc @@ -11,4 +11,4 @@ SecretBase_Shrub3:: @ 83078B4 .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 1 - .byte 8 + .byte MAP_BATTLE_SCENE_BATTLE_TOWER diff --git a/data/maps/SecretBase_Shrub4/header.inc b/data/maps/SecretBase_Shrub4/header.inc index 610767784..9c3759686 100644 --- a/data/maps/SecretBase_Shrub4/header.inc +++ b/data/maps/SecretBase_Shrub4/header.inc @@ -11,4 +11,4 @@ SecretBase_Shrub4:: @ 830795C .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 1 - .byte 8 + .byte MAP_BATTLE_SCENE_BATTLE_TOWER diff --git a/data/maps/SecretBase_Tree1/header.inc b/data/maps/SecretBase_Tree1/header.inc index f0e7ee20a..48feee2e2 100644 --- a/data/maps/SecretBase_Tree1/header.inc +++ b/data/maps/SecretBase_Tree1/header.inc @@ -11,4 +11,4 @@ SecretBase_Tree1:: @ 8307748 .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 1 - .byte 8 + .byte MAP_BATTLE_SCENE_BATTLE_TOWER diff --git a/data/maps/SecretBase_Tree2/header.inc b/data/maps/SecretBase_Tree2/header.inc index 2267b1781..6ba123707 100644 --- a/data/maps/SecretBase_Tree2/header.inc +++ b/data/maps/SecretBase_Tree2/header.inc @@ -11,4 +11,4 @@ SecretBase_Tree2:: @ 83077F0 .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 1 - .byte 8 + .byte MAP_BATTLE_SCENE_BATTLE_TOWER diff --git a/data/maps/SecretBase_Tree3/header.inc b/data/maps/SecretBase_Tree3/header.inc index 21faa4f01..a3d1c4adc 100644 --- a/data/maps/SecretBase_Tree3/header.inc +++ b/data/maps/SecretBase_Tree3/header.inc @@ -11,4 +11,4 @@ SecretBase_Tree3:: @ 8307898 .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 1 - .byte 8 + .byte MAP_BATTLE_SCENE_BATTLE_TOWER diff --git a/data/maps/SecretBase_Tree4/header.inc b/data/maps/SecretBase_Tree4/header.inc index a226fcf4e..b592d8f7c 100644 --- a/data/maps/SecretBase_Tree4/header.inc +++ b/data/maps/SecretBase_Tree4/header.inc @@ -11,4 +11,4 @@ SecretBase_Tree4:: @ 8307940 .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 1 - .byte 8 + .byte MAP_BATTLE_SCENE_BATTLE_TOWER diff --git a/data/maps/SecretBase_YellowCave1/header.inc b/data/maps/SecretBase_YellowCave1/header.inc index bc9915684..ea7d42c54 100644 --- a/data/maps/SecretBase_YellowCave1/header.inc +++ b/data/maps/SecretBase_YellowCave1/header.inc @@ -11,4 +11,4 @@ SecretBase_YellowCave1:: @ 830772C .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 1 - .byte 8 + .byte MAP_BATTLE_SCENE_BATTLE_TOWER diff --git a/data/maps/SecretBase_YellowCave2/header.inc b/data/maps/SecretBase_YellowCave2/header.inc index 4103bbc98..9171e74d2 100644 --- a/data/maps/SecretBase_YellowCave2/header.inc +++ b/data/maps/SecretBase_YellowCave2/header.inc @@ -11,4 +11,4 @@ SecretBase_YellowCave2:: @ 83077D4 .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 1 - .byte 8 + .byte MAP_BATTLE_SCENE_BATTLE_TOWER diff --git a/data/maps/SecretBase_YellowCave3/header.inc b/data/maps/SecretBase_YellowCave3/header.inc index b4b034c26..a688172b5 100644 --- a/data/maps/SecretBase_YellowCave3/header.inc +++ b/data/maps/SecretBase_YellowCave3/header.inc @@ -11,4 +11,4 @@ SecretBase_YellowCave3:: @ 830787C .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 1 - .byte 8 + .byte MAP_BATTLE_SCENE_BATTLE_TOWER diff --git a/data/maps/SecretBase_YellowCave4/header.inc b/data/maps/SecretBase_YellowCave4/header.inc index 2011ce06e..0d10b3062 100644 --- a/data/maps/SecretBase_YellowCave4/header.inc +++ b/data/maps/SecretBase_YellowCave4/header.inc @@ -11,4 +11,4 @@ SecretBase_YellowCave4:: @ 8307924 .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 1 - .byte 8 + .byte MAP_BATTLE_SCENE_BATTLE_TOWER diff --git a/data/maps/ShoalCave_HighTideEntranceRoom/header.inc b/data/maps/ShoalCave_HighTideEntranceRoom/header.inc index 5c7b34fc3..975453341 100644 --- a/data/maps/ShoalCave_HighTideEntranceRoom/header.inc +++ b/data/maps/ShoalCave_HighTideEntranceRoom/header.inc @@ -11,4 +11,4 @@ ShoalCave_HighTideEntranceRoom:: @ 83072E8 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/ShoalCave_HighTideInnerRoom/header.inc b/data/maps/ShoalCave_HighTideInnerRoom/header.inc index 69736dbbf..56e5d229f 100644 --- a/data/maps/ShoalCave_HighTideInnerRoom/header.inc +++ b/data/maps/ShoalCave_HighTideInnerRoom/header.inc @@ -11,4 +11,4 @@ ShoalCave_HighTideInnerRoom:: @ 8307304 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/header.inc b/data/maps/ShoalCave_LowTideEntranceRoom/header.inc index b9402bc1f..f95032396 100644 --- a/data/maps/ShoalCave_LowTideEntranceRoom/header.inc +++ b/data/maps/ShoalCave_LowTideEntranceRoom/header.inc @@ -11,4 +11,4 @@ ShoalCave_LowTideEntranceRoom:: @ 8307278 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/ShoalCave_LowTideIceRoom/header.inc b/data/maps/ShoalCave_LowTideIceRoom/header.inc index caddfe2d3..eaa49b671 100644 --- a/data/maps/ShoalCave_LowTideIceRoom/header.inc +++ b/data/maps/ShoalCave_LowTideIceRoom/header.inc @@ -11,4 +11,4 @@ ShoalCave_LowTideIceRoom:: @ 8307684 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/ShoalCave_LowTideInnerRoom/header.inc b/data/maps/ShoalCave_LowTideInnerRoom/header.inc index f53475b1d..a7c0c4209 100644 --- a/data/maps/ShoalCave_LowTideInnerRoom/header.inc +++ b/data/maps/ShoalCave_LowTideInnerRoom/header.inc @@ -11,4 +11,4 @@ ShoalCave_LowTideInnerRoom:: @ 8307294 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/ShoalCave_LowTideLowerRoom/header.inc b/data/maps/ShoalCave_LowTideLowerRoom/header.inc index 04b028774..90cbc8ac0 100644 --- a/data/maps/ShoalCave_LowTideLowerRoom/header.inc +++ b/data/maps/ShoalCave_LowTideLowerRoom/header.inc @@ -11,4 +11,4 @@ ShoalCave_LowTideLowerRoom:: @ 83072CC .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/ShoalCave_LowTideStairsRoom/header.inc b/data/maps/ShoalCave_LowTideStairsRoom/header.inc index 76681ba57..7c1c7f433 100644 --- a/data/maps/ShoalCave_LowTideStairsRoom/header.inc +++ b/data/maps/ShoalCave_LowTideStairsRoom/header.inc @@ -11,4 +11,4 @@ ShoalCave_LowTideStairsRoom:: @ 83072B0 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SingleBattleColosseum/header.inc b/data/maps/SingleBattleColosseum/header.inc index e416ffa85..ded368bb5 100644 --- a/data/maps/SingleBattleColosseum/header.inc +++ b/data/maps/SingleBattleColosseum/header.inc @@ -11,4 +11,4 @@ SingleBattleColosseum:: @ 8307978 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 8 + .byte MAP_BATTLE_SCENE_BATTLE_TOWER diff --git a/data/maps/SkyPillar_1F/header.inc b/data/maps/SkyPillar_1F/header.inc index eee96bfd0..36c0099bf 100644 --- a/data/maps/SkyPillar_1F/header.inc +++ b/data/maps/SkyPillar_1F/header.inc @@ -11,4 +11,4 @@ SkyPillar_1F:: @ 8307614 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SkyPillar_2F/header.inc b/data/maps/SkyPillar_2F/header.inc index 2d0d3cb6c..3c72b0fd4 100644 --- a/data/maps/SkyPillar_2F/header.inc +++ b/data/maps/SkyPillar_2F/header.inc @@ -11,4 +11,4 @@ SkyPillar_2F:: @ 8307630 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SkyPillar_3F/header.inc b/data/maps/SkyPillar_3F/header.inc index a6f4fad16..4b6b828f9 100644 --- a/data/maps/SkyPillar_3F/header.inc +++ b/data/maps/SkyPillar_3F/header.inc @@ -11,4 +11,4 @@ SkyPillar_3F:: @ 830764C .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SkyPillar_4F/header.inc b/data/maps/SkyPillar_4F/header.inc index b053d5890..634ab68b4 100644 --- a/data/maps/SkyPillar_4F/header.inc +++ b/data/maps/SkyPillar_4F/header.inc @@ -11,4 +11,4 @@ SkyPillar_4F:: @ 8307668 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SkyPillar_5F/header.inc b/data/maps/SkyPillar_5F/header.inc index 4b8b13339..949dac2a6 100644 --- a/data/maps/SkyPillar_5F/header.inc +++ b/data/maps/SkyPillar_5F/header.inc @@ -11,4 +11,4 @@ SkyPillar_5F:: @ 83076A0 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SkyPillar_Entrance/header.inc b/data/maps/SkyPillar_Entrance/header.inc index 5e1693504..8b1f7bede 100644 --- a/data/maps/SkyPillar_Entrance/header.inc +++ b/data/maps/SkyPillar_Entrance/header.inc @@ -11,4 +11,4 @@ SkyPillar_Entrance:: @ 83075DC .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SkyPillar_Outside/header.inc b/data/maps/SkyPillar_Outside/header.inc index 9a5052d82..2e2695489 100644 --- a/data/maps/SkyPillar_Outside/header.inc +++ b/data/maps/SkyPillar_Outside/header.inc @@ -11,4 +11,4 @@ SkyPillar_Outside:: @ 83075F8 .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SkyPillar_Top/header.inc b/data/maps/SkyPillar_Top/header.inc index 008b3c188..01e4c49b8 100644 --- a/data/maps/SkyPillar_Top/header.inc +++ b/data/maps/SkyPillar_Top/header.inc @@ -11,4 +11,4 @@ SkyPillar_Top:: @ 83076BC .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SlateportCity/header.inc b/data/maps/SlateportCity/header.inc index 07be1cf67..0407148bb 100644 --- a/data/maps/SlateportCity/header.inc +++ b/data/maps/SlateportCity/header.inc @@ -11,4 +11,4 @@ SlateportCity:: @ 8305464 .byte MAP_TYPE_CITY .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SlateportCity_ContestHall/header.inc b/data/maps/SlateportCity_ContestHall/header.inc index b74c81097..751ce5ca6 100644 --- a/data/maps/SlateportCity_ContestHall/header.inc +++ b/data/maps/SlateportCity_ContestHall/header.inc @@ -11,4 +11,4 @@ SlateportCity_ContestHall:: @ 8306034 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SlateportCity_ContestLobby/header.inc b/data/maps/SlateportCity_ContestLobby/header.inc index 7d85f9a3d..35cc213e9 100644 --- a/data/maps/SlateportCity_ContestLobby/header.inc +++ b/data/maps/SlateportCity_ContestLobby/header.inc @@ -11,4 +11,4 @@ SlateportCity_ContestLobby:: @ 8306018 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SlateportCity_Harbor/header.inc b/data/maps/SlateportCity_Harbor/header.inc index c2b41541a..166638e38 100644 --- a/data/maps/SlateportCity_Harbor/header.inc +++ b/data/maps/SlateportCity_Harbor/header.inc @@ -11,4 +11,4 @@ SlateportCity_Harbor:: @ 83060C0 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SlateportCity_House1/header.inc b/data/maps/SlateportCity_House1/header.inc index 61bbbcce4..61e6c3437 100644 --- a/data/maps/SlateportCity_House1/header.inc +++ b/data/maps/SlateportCity_House1/header.inc @@ -11,4 +11,4 @@ SlateportCity_House1:: @ 8306050 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SlateportCity_House2/header.inc b/data/maps/SlateportCity_House2/header.inc index edfce41e9..a9a2a6c51 100644 --- a/data/maps/SlateportCity_House2/header.inc +++ b/data/maps/SlateportCity_House2/header.inc @@ -11,4 +11,4 @@ SlateportCity_House2:: @ 83060DC .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SlateportCity_Mart/header.inc b/data/maps/SlateportCity_Mart/header.inc index 86fbd5a0b..6855a45ed 100644 --- a/data/maps/SlateportCity_Mart/header.inc +++ b/data/maps/SlateportCity_Mart/header.inc @@ -11,4 +11,4 @@ SlateportCity_Mart:: @ 8306130 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/header.inc b/data/maps/SlateportCity_OceanicMuseum_1F/header.inc index 1bbe8972c..348013adf 100644 --- a/data/maps/SlateportCity_OceanicMuseum_1F/header.inc +++ b/data/maps/SlateportCity_OceanicMuseum_1F/header.inc @@ -11,4 +11,4 @@ SlateportCity_OceanicMuseum_1F:: @ 8306088 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/header.inc b/data/maps/SlateportCity_OceanicMuseum_2F/header.inc index 4a0b436dc..95c73ffcc 100644 --- a/data/maps/SlateportCity_OceanicMuseum_2F/header.inc +++ b/data/maps/SlateportCity_OceanicMuseum_2F/header.inc @@ -11,4 +11,4 @@ SlateportCity_OceanicMuseum_2F:: @ 83060A4 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SlateportCity_PokemonCenter_1F/header.inc b/data/maps/SlateportCity_PokemonCenter_1F/header.inc index 875c2b19e..815b484cd 100644 --- a/data/maps/SlateportCity_PokemonCenter_1F/header.inc +++ b/data/maps/SlateportCity_PokemonCenter_1F/header.inc @@ -11,4 +11,4 @@ SlateportCity_PokemonCenter_1F:: @ 83060F8 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SlateportCity_PokemonCenter_2F/header.inc b/data/maps/SlateportCity_PokemonCenter_2F/header.inc index 6f00cd6f6..e14479e1c 100644 --- a/data/maps/SlateportCity_PokemonCenter_2F/header.inc +++ b/data/maps/SlateportCity_PokemonCenter_2F/header.inc @@ -11,4 +11,4 @@ SlateportCity_PokemonCenter_2F:: @ 8306114 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SlateportCity_PokemonFanClub/header.inc b/data/maps/SlateportCity_PokemonFanClub/header.inc index 732e56c5e..253355674 100644 --- a/data/maps/SlateportCity_PokemonFanClub/header.inc +++ b/data/maps/SlateportCity_PokemonFanClub/header.inc @@ -11,4 +11,4 @@ SlateportCity_PokemonFanClub:: @ 830606C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SlateportCity_SternsShipyard_1F/header.inc b/data/maps/SlateportCity_SternsShipyard_1F/header.inc index 95feada82..b38bd8fa5 100644 --- a/data/maps/SlateportCity_SternsShipyard_1F/header.inc +++ b/data/maps/SlateportCity_SternsShipyard_1F/header.inc @@ -11,4 +11,4 @@ SlateportCity_SternsShipyard_1F:: @ 8305FE0 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SlateportCity_SternsShipyard_2F/header.inc b/data/maps/SlateportCity_SternsShipyard_2F/header.inc index 6fcc658ec..9c12526ce 100644 --- a/data/maps/SlateportCity_SternsShipyard_2F/header.inc +++ b/data/maps/SlateportCity_SternsShipyard_2F/header.inc @@ -11,4 +11,4 @@ SlateportCity_SternsShipyard_2F:: @ 8305FFC .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SootopolisCity/header.inc b/data/maps/SootopolisCity/header.inc index 90c0c056a..b87323ffc 100644 --- a/data/maps/SootopolisCity/header.inc +++ b/data/maps/SootopolisCity/header.inc @@ -11,4 +11,4 @@ SootopolisCity:: @ 830550C .byte MAP_TYPE_CITY .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SootopolisCity_Gym_1F/header.inc b/data/maps/SootopolisCity_Gym_1F/header.inc index ce0a1c296..df1b1d17f 100644 --- a/data/maps/SootopolisCity_Gym_1F/header.inc +++ b/data/maps/SootopolisCity_Gym_1F/header.inc @@ -11,4 +11,4 @@ SootopolisCity_Gym_1F:: @ 830692C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 1 + .byte MAP_BATTLE_SCENE_GYM diff --git a/data/maps/SootopolisCity_Gym_B1F/header.inc b/data/maps/SootopolisCity_Gym_B1F/header.inc index 07f659c1a..54ac62ce1 100644 --- a/data/maps/SootopolisCity_Gym_B1F/header.inc +++ b/data/maps/SootopolisCity_Gym_B1F/header.inc @@ -11,4 +11,4 @@ SootopolisCity_Gym_B1F:: @ 8306948 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 1 + .byte MAP_BATTLE_SCENE_GYM diff --git a/data/maps/SootopolisCity_House1/header.inc b/data/maps/SootopolisCity_House1/header.inc index 81970aeef..261895970 100644 --- a/data/maps/SootopolisCity_House1/header.inc +++ b/data/maps/SootopolisCity_House1/header.inc @@ -11,4 +11,4 @@ SootopolisCity_House1:: @ 83069B8 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SootopolisCity_House2/header.inc b/data/maps/SootopolisCity_House2/header.inc index ba613b636..7e49a0333 100644 --- a/data/maps/SootopolisCity_House2/header.inc +++ b/data/maps/SootopolisCity_House2/header.inc @@ -11,4 +11,4 @@ SootopolisCity_House2:: @ 83069D4 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SootopolisCity_House3/header.inc b/data/maps/SootopolisCity_House3/header.inc index 782f71389..19d25ea53 100644 --- a/data/maps/SootopolisCity_House3/header.inc +++ b/data/maps/SootopolisCity_House3/header.inc @@ -11,4 +11,4 @@ SootopolisCity_House3:: @ 83069F0 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SootopolisCity_House4/header.inc b/data/maps/SootopolisCity_House4/header.inc index 8a2552c71..89f13124f 100644 --- a/data/maps/SootopolisCity_House4/header.inc +++ b/data/maps/SootopolisCity_House4/header.inc @@ -11,4 +11,4 @@ SootopolisCity_House4:: @ 8306A0C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SootopolisCity_House5/header.inc b/data/maps/SootopolisCity_House5/header.inc index e7c7305e2..cfe70c9da 100644 --- a/data/maps/SootopolisCity_House5/header.inc +++ b/data/maps/SootopolisCity_House5/header.inc @@ -11,4 +11,4 @@ SootopolisCity_House5:: @ 8306A28 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SootopolisCity_House6/header.inc b/data/maps/SootopolisCity_House6/header.inc index 65111731c..6b3dbce40 100644 --- a/data/maps/SootopolisCity_House6/header.inc +++ b/data/maps/SootopolisCity_House6/header.inc @@ -11,4 +11,4 @@ SootopolisCity_House6:: @ 8306A44 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SootopolisCity_House7/header.inc b/data/maps/SootopolisCity_House7/header.inc index c64500a38..378c638ae 100644 --- a/data/maps/SootopolisCity_House7/header.inc +++ b/data/maps/SootopolisCity_House7/header.inc @@ -11,4 +11,4 @@ SootopolisCity_House7:: @ 8306A60 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SootopolisCity_House8/header.inc b/data/maps/SootopolisCity_House8/header.inc index 4a5d0b098..80734140d 100644 --- a/data/maps/SootopolisCity_House8/header.inc +++ b/data/maps/SootopolisCity_House8/header.inc @@ -11,4 +11,4 @@ SootopolisCity_House8:: @ 8306A7C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SootopolisCity_Mart/header.inc b/data/maps/SootopolisCity_Mart/header.inc index 17c871122..bb13d1016 100644 --- a/data/maps/SootopolisCity_Mart/header.inc +++ b/data/maps/SootopolisCity_Mart/header.inc @@ -11,4 +11,4 @@ SootopolisCity_Mart:: @ 830699C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SootopolisCity_PokemonCenter_1F/header.inc b/data/maps/SootopolisCity_PokemonCenter_1F/header.inc index 07fb05d37..8739812a2 100644 --- a/data/maps/SootopolisCity_PokemonCenter_1F/header.inc +++ b/data/maps/SootopolisCity_PokemonCenter_1F/header.inc @@ -11,4 +11,4 @@ SootopolisCity_PokemonCenter_1F:: @ 8306964 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SootopolisCity_PokemonCenter_2F/header.inc b/data/maps/SootopolisCity_PokemonCenter_2F/header.inc index 07c43669c..fb3f2f8c4 100644 --- a/data/maps/SootopolisCity_PokemonCenter_2F/header.inc +++ b/data/maps/SootopolisCity_PokemonCenter_2F/header.inc @@ -11,4 +11,4 @@ SootopolisCity_PokemonCenter_2F:: @ 8306980 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SouthernIsland_Exterior/header.inc b/data/maps/SouthernIsland_Exterior/header.inc index 100ae8d67..a35ed72a7 100644 --- a/data/maps/SouthernIsland_Exterior/header.inc +++ b/data/maps/SouthernIsland_Exterior/header.inc @@ -11,4 +11,4 @@ SouthernIsland_Exterior:: @ 8307CA4 .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SouthernIsland_Interior/header.inc b/data/maps/SouthernIsland_Interior/header.inc index de07a40f9..5bef25e13 100644 --- a/data/maps/SouthernIsland_Interior/header.inc +++ b/data/maps/SouthernIsland_Interior/header.inc @@ -11,4 +11,4 @@ SouthernIsland_Interior:: @ 8307CC0 .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/TradeCenter/header.inc b/data/maps/TradeCenter/header.inc index 4637e72bc..d7bdaaac4 100644 --- a/data/maps/TradeCenter/header.inc +++ b/data/maps/TradeCenter/header.inc @@ -11,4 +11,4 @@ TradeCenter:: @ 8307994 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Underwater1/header.inc b/data/maps/Underwater1/header.inc index 2ed1ddbf8..52c15d1b0 100644 --- a/data/maps/Underwater1/header.inc +++ b/data/maps/Underwater1/header.inc @@ -11,4 +11,4 @@ Underwater1:: @ 83059C0 .byte MAP_TYPE_UNDERWATER .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Underwater2/header.inc b/data/maps/Underwater2/header.inc index 063b894ab..f0e15d9c3 100644 --- a/data/maps/Underwater2/header.inc +++ b/data/maps/Underwater2/header.inc @@ -11,4 +11,4 @@ Underwater2:: @ 83059DC .byte MAP_TYPE_UNDERWATER .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Underwater3/header.inc b/data/maps/Underwater3/header.inc index 4c5f4a30d..46244962f 100644 --- a/data/maps/Underwater3/header.inc +++ b/data/maps/Underwater3/header.inc @@ -11,4 +11,4 @@ Underwater3:: @ 83059F8 .byte MAP_TYPE_UNDERWATER .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Underwater4/header.inc b/data/maps/Underwater4/header.inc index 09ef0835c..060ff9b3a 100644 --- a/data/maps/Underwater4/header.inc +++ b/data/maps/Underwater4/header.inc @@ -11,4 +11,4 @@ Underwater4:: @ 8305A14 .byte MAP_TYPE_UNDERWATER .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Underwater_Route134/header.inc b/data/maps/Underwater_Route134/header.inc index 491f9518f..dc0bfd8e1 100644 --- a/data/maps/Underwater_Route134/header.inc +++ b/data/maps/Underwater_Route134/header.inc @@ -11,4 +11,4 @@ Underwater_Route134:: @ 83074FC .byte MAP_TYPE_UNDERWATER .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Underwater_SeafloorCavern/header.inc b/data/maps/Underwater_SeafloorCavern/header.inc index e5c0268a4..604f1acba 100644 --- a/data/maps/Underwater_SeafloorCavern/header.inc +++ b/data/maps/Underwater_SeafloorCavern/header.inc @@ -11,4 +11,4 @@ Underwater_SeafloorCavern:: @ 8307048 .byte MAP_TYPE_UNDERWATER .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Underwater_SealedChamber/header.inc b/data/maps/Underwater_SealedChamber/header.inc index 178841380..dd1c92d47 100644 --- a/data/maps/Underwater_SealedChamber/header.inc +++ b/data/maps/Underwater_SealedChamber/header.inc @@ -11,4 +11,4 @@ Underwater_SealedChamber:: @ 8307518 .byte MAP_TYPE_UNDERWATER .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Underwater_SootopolisCity/header.inc b/data/maps/Underwater_SootopolisCity/header.inc index d993d15d5..7e1228388 100644 --- a/data/maps/Underwater_SootopolisCity/header.inc +++ b/data/maps/Underwater_SootopolisCity/header.inc @@ -11,4 +11,4 @@ Underwater_SootopolisCity:: @ 8306DFC .byte MAP_TYPE_UNDERWATER .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/UnknownMap_25_29/header.inc b/data/maps/UnknownMap_25_29/header.inc index 18ad74604..8db6a3794 100644 --- a/data/maps/UnknownMap_25_29/header.inc +++ b/data/maps/UnknownMap_25_29/header.inc @@ -11,4 +11,4 @@ UnknownMap_25_29:: @ 8307A04 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/UnknownMap_25_30/header.inc b/data/maps/UnknownMap_25_30/header.inc index 86e5dc384..5db313070 100644 --- a/data/maps/UnknownMap_25_30/header.inc +++ b/data/maps/UnknownMap_25_30/header.inc @@ -11,4 +11,4 @@ UnknownMap_25_30:: @ 8307A20 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/UnknownMap_25_31/header.inc b/data/maps/UnknownMap_25_31/header.inc index 469ecbc57..917a5acea 100644 --- a/data/maps/UnknownMap_25_31/header.inc +++ b/data/maps/UnknownMap_25_31/header.inc @@ -11,4 +11,4 @@ UnknownMap_25_31:: @ 8307A3C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/UnknownMap_25_32/header.inc b/data/maps/UnknownMap_25_32/header.inc index d114d28f4..db6f36bf1 100644 --- a/data/maps/UnknownMap_25_32/header.inc +++ b/data/maps/UnknownMap_25_32/header.inc @@ -11,4 +11,4 @@ UnknownMap_25_32:: @ 8307A58 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/UnknownMap_25_33/header.inc b/data/maps/UnknownMap_25_33/header.inc index 946fb76ad..d1dd75a38 100644 --- a/data/maps/UnknownMap_25_33/header.inc +++ b/data/maps/UnknownMap_25_33/header.inc @@ -11,4 +11,4 @@ UnknownMap_25_33:: @ 8307A74 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/UnknownMap_25_34/header.inc b/data/maps/UnknownMap_25_34/header.inc index 53daccbef..e2b15dc37 100644 --- a/data/maps/UnknownMap_25_34/header.inc +++ b/data/maps/UnknownMap_25_34/header.inc @@ -11,4 +11,4 @@ UnknownMap_25_34:: @ 8307A90 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/VerdanturfTown/header.inc b/data/maps/VerdanturfTown/header.inc index 344717573..6c012f392 100644 --- a/data/maps/VerdanturfTown/header.inc +++ b/data/maps/VerdanturfTown/header.inc @@ -11,4 +11,4 @@ VerdanturfTown:: @ 83055D0 .byte MAP_TYPE_TOWN .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/VerdanturfTown_ContestHall/header.inc b/data/maps/VerdanturfTown_ContestHall/header.inc index cc946ecd7..cacdf5f20 100644 --- a/data/maps/VerdanturfTown_ContestHall/header.inc +++ b/data/maps/VerdanturfTown_ContestHall/header.inc @@ -11,4 +11,4 @@ VerdanturfTown_ContestHall:: @ 8305D94 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/VerdanturfTown_ContestLobby/header.inc b/data/maps/VerdanturfTown_ContestLobby/header.inc index b72fe4018..d8ec51ef3 100644 --- a/data/maps/VerdanturfTown_ContestLobby/header.inc +++ b/data/maps/VerdanturfTown_ContestLobby/header.inc @@ -11,4 +11,4 @@ VerdanturfTown_ContestLobby:: @ 8305D78 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc b/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc index 8c4b41c83..fd47e6b5b 100644 --- a/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc +++ b/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc @@ -11,4 +11,4 @@ VerdanturfTown_FriendshipRatersHouse:: @ 8305E20 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/VerdanturfTown_House/header.inc b/data/maps/VerdanturfTown_House/header.inc index d3c18ee94..b99ebf511 100644 --- a/data/maps/VerdanturfTown_House/header.inc +++ b/data/maps/VerdanturfTown_House/header.inc @@ -11,4 +11,4 @@ VerdanturfTown_House:: @ 8305E3C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/VerdanturfTown_Mart/header.inc b/data/maps/VerdanturfTown_Mart/header.inc index f8f12f7fe..d5d47fc72 100644 --- a/data/maps/VerdanturfTown_Mart/header.inc +++ b/data/maps/VerdanturfTown_Mart/header.inc @@ -11,4 +11,4 @@ VerdanturfTown_Mart:: @ 8305DB0 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc b/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc index 25491bb01..2238e0e72 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc +++ b/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc @@ -11,4 +11,4 @@ VerdanturfTown_PokemonCenter_1F:: @ 8305DCC .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc b/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc index 68e894b08..bd6369091 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc +++ b/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc @@ -11,4 +11,4 @@ VerdanturfTown_PokemonCenter_2F:: @ 8305DE8 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/VerdanturfTown_WandasHouse/header.inc b/data/maps/VerdanturfTown_WandasHouse/header.inc index d88ecf820..01bfcbde5 100644 --- a/data/maps/VerdanturfTown_WandasHouse/header.inc +++ b/data/maps/VerdanturfTown_WandasHouse/header.inc @@ -11,4 +11,4 @@ VerdanturfTown_WandasHouse:: @ 8305E04 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/VictoryRoad_1F/header.inc b/data/maps/VictoryRoad_1F/header.inc index efff8011d..0a9f56e9b 100644 --- a/data/maps/VictoryRoad_1F/header.inc +++ b/data/maps/VictoryRoad_1F/header.inc @@ -11,4 +11,4 @@ VictoryRoad_1F:: @ 8307224 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/VictoryRoad_B1F/header.inc b/data/maps/VictoryRoad_B1F/header.inc index 6f789eecd..b7a3455ca 100644 --- a/data/maps/VictoryRoad_B1F/header.inc +++ b/data/maps/VictoryRoad_B1F/header.inc @@ -11,4 +11,4 @@ VictoryRoad_B1F:: @ 8307240 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/VictoryRoad_B2F/header.inc b/data/maps/VictoryRoad_B2F/header.inc index cd128d38a..2cad4acec 100644 --- a/data/maps/VictoryRoad_B2F/header.inc +++ b/data/maps/VictoryRoad_B2F/header.inc @@ -11,4 +11,4 @@ VictoryRoad_B2F:: @ 830725C .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL -- cgit v1.2.3 From 657da1d9e467e71dd465e26939ac068281b475ec Mon Sep 17 00:00:00 2001 From: Tetrable Date: Thu, 19 Jul 2018 18:21:14 +0100 Subject: Cleanup pokedex arrays Pokedex arrays now use HOENN_DEX and NATIONAL_DEX defines --- src/pokemon_1.c | 1247 ++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 1244 insertions(+), 3 deletions(-) diff --git a/src/pokemon_1.c b/src/pokemon_1.c index 4f5094024..f2ab3830c 100644 --- a/src/pokemon_1.c +++ b/src/pokemon_1.c @@ -24,9 +24,1250 @@ struct Pokemon gPlayerParty[6]; u8 gEnemyPartyCount; struct Pokemon gEnemyParty[6]; -const u16 gSpeciesToHoennPokedexNum[] = {203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, 156, 157, 112, 113, 227, 228, 229, 230, 231, 232, 233, 234, 153, 154, 138, 139, 63, 64, 88, 89, 90, 235, 236, 237, 238, 239, 240, 241, 242, 158, 159, 243, 244, 245, 246, 247, 248, 249, 39, 40, 41, 73, 74, 75, 250, 251, 252, 66, 67, 57, 58, 59, 253, 254, 255, 256, 82, 83, 257, 92, 93, 258, 259, 106, 107, 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, 84, 85, 270, 271, 272, 273, 274, 275, 276, 108, 109, 169, 170, 277, 278, 279, 184, 185, 50, 51, 143, 144, 280, 281, 282, 283, 284, 167, 285, 52, 53, 286, 287, 288, 289, 290, 291, 292, 293, 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, 304, 305, 306, 307, 308, 309, 310, 311, 312, 313, 314, 315, 316, 317, 318, 319, 320, 321, 322, 323, 65, 181, 182, 155, 324, 137, 325, 326, 162, 163, 327, 328, 329, 91, 55, 56, 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, 341, 342, 343, 344, 345, 346, 161, 164, 347, 348, 349, 350, 351, 352, 353, 354, 355, 356, 168, 357, 358, 359, 103, 104, 360, 361, 180, 362, 363, 364, 365, 115, 366, 367, 186, 165, 166, 368, 369, 370, 371, 372, 373, 374, 375, 376, 377, 378, 379, 380, 381, 382, 383, 384, 385, 386, 387, 388, 389, 390, 391, 392, 393, 394, 395, 396, 397, 398, 399, 400, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 42, 43, 44, 25, 26, 34, 35, 114, 27, 28, 32, 33, 99, 100, 61, 62, 145, 131, 132, 60, 105, 68, 127, 128, 183, 129, 130, 140, 141, 97, 98, 116, 117, 118, 48, 49, 78, 79, 101, 102, 173, 174, 175, 119, 120, 171, 172, 125, 126, 54, 110, 111, 80, 81, 69, 76, 77, 121, 122, 160, 148, 149, 94, 36, 37, 38, 95, 96, 150, 45, 46, 47, 176, 177, 178, 152, 146, 147, 124, 123, 179, 70, 71, 72, 142, 86, 87, 133, 134, 135, 136, 29, 30, 31, 187, 188, 189, 190, 191, 192, 193, 194, 195, 198, 199, 200, 196, 197, 201, 202, 151}; -const u16 gSpeciesToNationalPokedexNum[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 387, 388, 389, 390, 391, 392, 393, 394, 395, 396, 397, 398, 399, 400, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 252, 253, 254, 255, 256, 257, 258, 259, 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, 275, 290, 291, 292, 276, 277, 285, 286, 327, 278, 279, 283, 284, 320, 321, 300, 301, 352, 343, 344, 299, 324, 302, 339, 340, 370, 341, 342, 349, 350, 318, 319, 328, 329, 330, 296, 297, 309, 310, 322, 323, 363, 364, 365, 331, 332, 361, 362, 337, 338, 298, 325, 326, 311, 312, 303, 307, 308, 333, 334, 360, 355, 356, 315, 287, 288, 289, 316, 317, 357, 293, 294, 295, 366, 367, 368, 359, 353, 354, 336, 335, 369, 304, 305, 306, 351, 313, 314, 345, 346, 347, 348, 280, 281, 282, 371, 372, 373, 374, 375, 376, 377, 378, 379, 382, 383, 384, 380, 381, 385, 386, 358}; -const u16 gHoennToNationalOrder[] = {252, 253, 254, 255, 256, 257, 258, 259, 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, 285, 286, 287, 288, 289, 63, 64, 65, 290, 291, 292, 293, 294, 295, 296, 297, 118, 119, 129, 130, 298, 183, 184, 74, 75, 76, 299, 300, 301, 41, 42, 169, 72, 73, 302, 303, 304, 305, 306, 66, 67, 68, 307, 308, 309, 310, 311, 312, 81, 82, 100, 101, 313, 314, 43, 44, 45, 182, 84, 85, 315, 316, 317, 318, 319, 320, 321, 322, 323, 218, 219, 324, 88, 89, 109, 110, 325, 326, 27, 28, 327, 227, 328, 329, 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, 341, 342, 343, 344, 345, 346, 347, 348, 174, 39, 40, 349, 350, 351, 120, 121, 352, 353, 354, 355, 356, 357, 358, 359, 37, 38, 172, 25, 26, 54, 55, 360, 202, 177, 178, 203, 231, 232, 127, 214, 111, 112, 361, 362, 363, 364, 365, 366, 367, 368, 369, 222, 170, 171, 370, 116, 117, 230, 371, 372, 373, 374, 375, 376, 377, 378, 379, 380, 381, 382, 383, 384, 385, 386, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 29, 30, 31, 32, 33, 34, 35, 36, 46, 47, 48, 49, 50, 51, 52, 53, 56, 57, 58, 59, 60, 61, 62, 69, 70, 71, 77, 78, 79, 80, 83, 86, 87, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 102, 103, 104, 105, 106, 107, 108, 113, 114, 115, 122, 123, 124, 125, 126, 128, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, 173, 175, 176, 179, 180, 181, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 215, 216, 217, 220, 221, 223, 224, 225, 226, 228, 229, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 387, 388, 389, 390, 391, 392, 393, 394, 395, 396, 397, 398, 399, 400, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411}; +const u16 gSpeciesToHoennPokedexNum[] = // Assigns all species to the Hoenn Dex Index +{ + HOENN_DEX_BULBASAUR, // Bulbasaur + HOENN_DEX_IVYSAUR, // Ivysaur + HOENN_DEX_VENUSAUR, // Venusaur + HOENN_DEX_CHARMANDER, // Charmander + HOENN_DEX_CHARMELEON, // Charmeleon + HOENN_DEX_CHARIZARD, // Charizard + HOENN_DEX_SQUIRTLE, // Squirtle + HOENN_DEX_WARTORTLE, // Wartortle + HOENN_DEX_BLASTOISE, // Blastoise + HOENN_DEX_CATERPIE, // Caterpie + HOENN_DEX_METAPOD, // Metapod + HOENN_DEX_BUTTERFREE, // Butterfree + HOENN_DEX_WEEDLE, // Weedle + HOENN_DEX_KAKUNA, // Kakuna + HOENN_DEX_BEEDRILL, // Beedrill + HOENN_DEX_PIDGEY, // Pidgey + HOENN_DEX_PIDGEOTTO, // Pidgeotto + HOENN_DEX_PIDGEOT, // Pidgeot + HOENN_DEX_RATTATA, // Rattata + HOENN_DEX_RATICATE, // Raticate + HOENN_DEX_SPEAROW, // Spearow + HOENN_DEX_FEAROW, // Fearow + HOENN_DEX_EKANS, // Ekans + HOENN_DEX_ARBOK, // Arbok + HOENN_DEX_PIKACHU, // Pikachu + HOENN_DEX_RAICHU, // Raichu + HOENN_DEX_SANDSHREW, // Sandshrew + HOENN_DEX_SANDSLASH, // Sandslash + HOENN_DEX_NIDORAN_F, // Nidoran♀ + HOENN_DEX_NIDORINA, // Nidorina + HOENN_DEX_NIDOQUEEN, // Nidoqueen + HOENN_DEX_NIDORAN_M, // Nidoran♂ + HOENN_DEX_NIDORINO, // Nidorino + HOENN_DEX_NIDOKING, // Nidoking + HOENN_DEX_CLEFAIRY, // Clefairy + HOENN_DEX_CLEFABLE, // Clefable + HOENN_DEX_VULPIX, // Vulpix + HOENN_DEX_NINETALES, // Ninetales + HOENN_DEX_JIGGLYPUFF, // Jigglypuff + HOENN_DEX_WIGGLYTUFF, // Wigglytuff + HOENN_DEX_ZUBAT, // Zubat + HOENN_DEX_GOLBAT, // Golbat + HOENN_DEX_ODDISH, // Oddish + HOENN_DEX_GLOOM, // Gloom + HOENN_DEX_VILEPLUME, // Vileplume + HOENN_DEX_PARAS, // Paras + HOENN_DEX_PARASECT, // Parasect + HOENN_DEX_VENONAT, // Venonat + HOENN_DEX_VENOMOTH, // Venomoth + HOENN_DEX_DIGLETT, // Diglett + HOENN_DEX_DUGTRIO, // Dugtrio + HOENN_DEX_MEOWTH, // Meowth + HOENN_DEX_PERSIAN, // Persian + HOENN_DEX_PSYDUCK, // Psyduck + HOENN_DEX_GOLDUCK, // Golduck + HOENN_DEX_MANKEY, // Mankey + HOENN_DEX_PRIMEAPE, // Primeape + HOENN_DEX_GROWLITHE, // Growlithe + HOENN_DEX_ARCANINE, // Arcanine + HOENN_DEX_POLIWAG, // Poliwag + HOENN_DEX_POLIWHIRL, // Poliwhirl + HOENN_DEX_POLIWRATH, // Poliwrath + HOENN_DEX_ABRA, // Abra + HOENN_DEX_KADABRA, // Kadabra + HOENN_DEX_ALAKAZAM, // Alakazam + HOENN_DEX_MACHOP, // Machop + HOENN_DEX_MACHOKE, // Machoke + HOENN_DEX_MACHAMP, // Machamp + HOENN_DEX_BELLSPROUT, // Bellsprout + HOENN_DEX_WEEPINBELL, // Weepinbell + HOENN_DEX_VICTREEBEL, // Victreebel + HOENN_DEX_TENTACOOL, // Tentacool + HOENN_DEX_TENTACRUEL, // Tentacruel + HOENN_DEX_GEODUDE, // Geodude + HOENN_DEX_GRAVELER, // Graveler + HOENN_DEX_GOLEM, // Golem + HOENN_DEX_PONYTA, // Ponyta + HOENN_DEX_RAPIDASH, // Rapidash + HOENN_DEX_SLOWPOKE, // Slowpoke + HOENN_DEX_SLOWBRO, // Slowbro + HOENN_DEX_MAGNEMITE, // Magnemite + HOENN_DEX_MAGNETON, // Magneton + HOENN_DEX_FARFETCHD, // Farfetch'd + HOENN_DEX_DODUO, // Doduo + HOENN_DEX_DODRIO, // Dodrio + HOENN_DEX_SEEL, // Seel + HOENN_DEX_DEWGONG, // Dewgong + HOENN_DEX_GRIMER, // Grimer + HOENN_DEX_MUK, // Muk + HOENN_DEX_SHELLDER, // Shellder + HOENN_DEX_CLOYSTER, // Cloyster + HOENN_DEX_GASTLY, // Gastly + HOENN_DEX_HAUNTER, // Haunter + HOENN_DEX_GENGAR, // Gengar + HOENN_DEX_ONIX, // Onix + HOENN_DEX_DROWZEE, // Drowzee + HOENN_DEX_HYPNO, // Hypno + HOENN_DEX_KRABBY, // Krabby + HOENN_DEX_KINGLER, // Kingler + HOENN_DEX_VOLTORB, // Voltorb + HOENN_DEX_ELECTRODE, // Electrode + HOENN_DEX_EXEGGCUTE, // Exeggcute + HOENN_DEX_EXEGGUTOR, // Exeggutor + HOENN_DEX_CUBONE, // Cubone + HOENN_DEX_MAROWAK, // Marowak + HOENN_DEX_HITMONLEE, // Hitmonlee + HOENN_DEX_HITMONCHAN, // Hitmonchan + HOENN_DEX_LICKITUNG, // Lickitung + HOENN_DEX_KOFFING, // Koffing + HOENN_DEX_WEEZING, // Weezing + HOENN_DEX_RHYHORN, // Rhyhorn + HOENN_DEX_RHYDON, // Rhydon + HOENN_DEX_CHANSEY, // Chansey + HOENN_DEX_TANGELA, // Tangela + HOENN_DEX_KANGASKHAN, // Kangaskhan + HOENN_DEX_HORSEA, // Horsea + HOENN_DEX_SEADRA, // Seadra + HOENN_DEX_GOLDEEN, // Goldeen + HOENN_DEX_SEAKING, // Seaking + HOENN_DEX_STARYU, // Staryu + HOENN_DEX_STARMIE, // Starmie + HOENN_DEX_MR_MIME, // Mr. Mime + HOENN_DEX_SCYTHER, // Scyther + HOENN_DEX_JYNX, // Jynx + HOENN_DEX_ELECTABUZZ, // Electabuzz + HOENN_DEX_MAGMAR, // Magmar + HOENN_DEX_PINSIR, // Pinsir + HOENN_DEX_TAUROS, // Tauros + HOENN_DEX_MAGIKARP, // Magikarp + HOENN_DEX_GYARADOS, // Gyarados + HOENN_DEX_LAPRAS, // Lapras + HOENN_DEX_DITTO, // Ditto + HOENN_DEX_EEVEE, // Eevee + HOENN_DEX_VAPOREON, // Vaporeon + HOENN_DEX_JOLTEON, // Jolteon + HOENN_DEX_FLAREON, // Flareon + HOENN_DEX_PORYGON, // Porygon + HOENN_DEX_OMANYTE, // Omanyte + HOENN_DEX_OMASTAR, // Omastar + HOENN_DEX_KABUTO, // Kabuto + HOENN_DEX_KABUTOPS, // Kabutops + HOENN_DEX_AERODACTYL, // Aerodactyl + HOENN_DEX_SNORLAX, // Snorlax + HOENN_DEX_ARTICUNO, // Articuno + HOENN_DEX_ZAPDOS, // Zapdos + HOENN_DEX_MOLTRES, // Moltres + HOENN_DEX_DRATINI, // Dratini + HOENN_DEX_DRAGONAIR, // Dragonair + HOENN_DEX_DRAGONITE, // Dragonite + HOENN_DEX_MEWTWO, // Mewtwo + HOENN_DEX_MEW, // Mew + HOENN_DEX_CHIKORITA, // Chikorita + HOENN_DEX_BAYLEEF, // Bayleef + HOENN_DEX_MEGANIUM, // Meganium + HOENN_DEX_CYNDAQUIL, // Cyndaquil + HOENN_DEX_QUILAVA, // Quilava + HOENN_DEX_TYPHLOSION, // Typhlosion + HOENN_DEX_TOTODILE, // Totodile + HOENN_DEX_CROCONAW, // Croconaw + HOENN_DEX_FERALIGATR, // Feraligatr + HOENN_DEX_SENTRET, // Sentret + HOENN_DEX_FURRET, // Furret + HOENN_DEX_HOOTHOOT, // Hoothoot + HOENN_DEX_NOCTOWL, // Noctowl + HOENN_DEX_LEDYBA, // Ledyba + HOENN_DEX_LEDIAN, // Ledian + HOENN_DEX_SPINARAK, // Spinarak + HOENN_DEX_ARIADOS, // Ariados + HOENN_DEX_CROBAT, // Crobat + HOENN_DEX_CHINCHOU, // Chinchou + HOENN_DEX_LANTURN, // Lanturn + HOENN_DEX_PICHU, // Pichu + HOENN_DEX_CLEFFA, // Cleffa + HOENN_DEX_IGGLYBUFF, // Igglybuff + HOENN_DEX_TOGEPI, // Togepi + HOENN_DEX_TOGETIC, // Togetic + HOENN_DEX_NATU, // Natu + HOENN_DEX_XATU, // Xatu + HOENN_DEX_MAREEP, // Mareep + HOENN_DEX_FLAAFFY, // Flaaffy + HOENN_DEX_AMPHAROS, // Ampharos + HOENN_DEX_BELLOSSOM, // Bellossom + HOENN_DEX_MARILL, // Marill + HOENN_DEX_AZUMARILL, // Azumarill + HOENN_DEX_SUDOWOODO, // Sudowoodo + HOENN_DEX_POLITOED, // Politoed + HOENN_DEX_HOPPIP, // Hoppip + HOENN_DEX_SKIPLOOM, // Skiploom + HOENN_DEX_JUMPLUFF, // Jumpluff + HOENN_DEX_AIPOM, // Aipom + HOENN_DEX_SUNKERN, // Sunkern + HOENN_DEX_SUNFLORA, // Sunflora + HOENN_DEX_YANMA, // Yanma + HOENN_DEX_WOOPER, // Wooper + HOENN_DEX_QUAGSIRE, // Quagsire + HOENN_DEX_ESPEON, // Espeon + HOENN_DEX_UMBREON, // Umbreon + HOENN_DEX_MURKROW, // Murkrow + HOENN_DEX_SLOWKING, // Slowking + HOENN_DEX_MISDREAVUS, // Misdreavus + HOENN_DEX_UNOWN, // Unown A + HOENN_DEX_WOBBUFFET, // Wobbuffet + HOENN_DEX_GIRAFARIG, // Girafarig + HOENN_DEX_PINECO, // Pineco + HOENN_DEX_FORRETRESS, // Forretress + HOENN_DEX_DUNSPARCE, // Dunsparce + HOENN_DEX_GLIGAR, // Gligar + HOENN_DEX_STEELIX, // Steelix + HOENN_DEX_SNUBBULL, // Snubbull + HOENN_DEX_GRANBULL, // Granbull + HOENN_DEX_QWILFISH, // Qwilfish + HOENN_DEX_SCIZOR, // Scizor + HOENN_DEX_SHUCKLE, // Shuckle + HOENN_DEX_HERACROSS, // Heracross + HOENN_DEX_SNEASEL, // Sneasel + HOENN_DEX_TEDDIURSA, // Teddiursa + HOENN_DEX_URSARING, // Ursaring + HOENN_DEX_SLUGMA, // Slugma + HOENN_DEX_MAGCARGO, // Magcargo + HOENN_DEX_SWINUB, // Swinub + HOENN_DEX_PILOSWINE, // Piloswine + HOENN_DEX_CORSOLA, // Corsola + HOENN_DEX_REMORAID, // Remoraid + HOENN_DEX_OCTILLERY, // Octillery + HOENN_DEX_DELIBIRD, // Delibird + HOENN_DEX_MANTINE, // Mantine + HOENN_DEX_SKARMORY, // Skarmory + HOENN_DEX_HOUNDOUR, // Houndour + HOENN_DEX_HOUNDOOM, // Houndoom + HOENN_DEX_KINGDRA, // Kingdra + HOENN_DEX_PHANPY, // Phanpy + HOENN_DEX_DONPHAN, // Donphan + HOENN_DEX_PORYGON2, // Porygon2 + HOENN_DEX_STANTLER, // Stantler + HOENN_DEX_SMEARGLE, // Smeargle + HOENN_DEX_TYROGUE, // Tyrogue + HOENN_DEX_HITMONTOP, // Hitmontop + HOENN_DEX_SMOOCHUM, // Smoochum + HOENN_DEX_ELEKID, // Elekid + HOENN_DEX_MAGBY, // Magby + HOENN_DEX_MILTANK, // Miltank + HOENN_DEX_BLISSEY, // Blissey + HOENN_DEX_RAIKOU, // Raikou + HOENN_DEX_ENTEI, // Entei + HOENN_DEX_SUICUNE, // Suicune + HOENN_DEX_LARVITAR, // Larvitar + HOENN_DEX_PUPITAR, // Pupitar + HOENN_DEX_TYRANITAR, // Tyranitar + HOENN_DEX_LUGIA, // Lugia + HOENN_DEX_HO_OH, // Ho-Oh + HOENN_DEX_CELEBI, // Celebi + HOENN_DEX_OLD_UNOWN_B, // Unown B (Old) + HOENN_DEX_OLD_UNOWN_C, // Unown C (Old) + HOENN_DEX_OLD_UNOWN_D, // Unown D (Old) + HOENN_DEX_OLD_UNOWN_E, // Unown E (Old) + HOENN_DEX_OLD_UNOWN_F, // Unown F (Old) + HOENN_DEX_OLD_UNOWN_G, // Unown G (Old) + HOENN_DEX_OLD_UNOWN_H, // Unown H (Old) + HOENN_DEX_OLD_UNOWN_I, // Unown I (Old) + HOENN_DEX_OLD_UNOWN_J, // Unown J (Old) + HOENN_DEX_OLD_UNOWN_K, // Unown K (Old) + HOENN_DEX_OLD_UNOWN_L, // Unown L (Old) + HOENN_DEX_OLD_UNOWN_M, // Unown M (Old) + HOENN_DEX_OLD_UNOWN_N, // Unown N (Old) + HOENN_DEX_OLD_UNOWN_O, // Unown O (Old) + HOENN_DEX_OLD_UNOWN_P, // Unown P (Old) + HOENN_DEX_OLD_UNOWN_Q, // Unown Q (Old) + HOENN_DEX_OLD_UNOWN_R, // Unown R (Old) + HOENN_DEX_OLD_UNOWN_S, // Unown S (Old) + HOENN_DEX_OLD_UNOWN_T, // Unown T (Old) + HOENN_DEX_OLD_UNOWN_U, // Unown U (Old) + HOENN_DEX_OLD_UNOWN_V, // Unown V (Old) + HOENN_DEX_OLD_UNOWN_W, // Unown W (Old) + HOENN_DEX_OLD_UNOWN_X, // Unown X (Old) + HOENN_DEX_OLD_UNOWN_Y, // Unown Y (Old) + HOENN_DEX_OLD_UNOWN_Z, // Unown Z (Old) + HOENN_DEX_TREECKO, // Treecko + HOENN_DEX_GROVYLE, // Grovyle + HOENN_DEX_SCEPTILE, // Sceptile + HOENN_DEX_TORCHIC, // Torchic + HOENN_DEX_COMBUSKEN, // Combusken + HOENN_DEX_BLAZIKEN, // Blaziken + HOENN_DEX_MUDKIP, // Mudkip + HOENN_DEX_MARSHTOMP, // Marshtomp + HOENN_DEX_SWAMPERT, // Swampert + HOENN_DEX_POOCHYENA, // Poochyena + HOENN_DEX_MIGHTYENA, // Mightyena + HOENN_DEX_ZIGZAGOON, // Zigzagoon + HOENN_DEX_LINOONE, // Linoone + HOENN_DEX_WURMPLE, // Wurmple + HOENN_DEX_SILCOON, // Silcoon + HOENN_DEX_BEAUTIFLY, // Beautifly + HOENN_DEX_CASCOON, // Cascoon + HOENN_DEX_DUSTOX, // Dustox + HOENN_DEX_LOTAD, // Lotad + HOENN_DEX_LOMBRE, // Lombre + HOENN_DEX_LUDICOLO, // Ludicolo + HOENN_DEX_SEEDOT, // Seedot + HOENN_DEX_NUZLEAF, // Nuzleaf + HOENN_DEX_SHIFTRY, // Shiftry + HOENN_DEX_NINCADA, // Nincada + HOENN_DEX_NINJASK, // Ninjask + HOENN_DEX_SHEDINJA, // Shedinja + HOENN_DEX_TAILLOW, // Taillow + HOENN_DEX_SWELLOW, // Swellow + HOENN_DEX_SHROOMISH, // Shroomish + HOENN_DEX_BRELOOM, // Breloom + HOENN_DEX_SPINDA, // Spinda + HOENN_DEX_WINGULL, // Wingull + HOENN_DEX_PELIPPER, // Pelipper + HOENN_DEX_SURSKIT, // Surskit + HOENN_DEX_MASQUERAIN, // Masquerain + HOENN_DEX_WAILMER, // Wailmer + HOENN_DEX_WAILORD, // Wailord + HOENN_DEX_SKITTY, // Skitty + HOENN_DEX_DELCATTY, // Delcatty + HOENN_DEX_KECLEON, // Kecleon + HOENN_DEX_BALTOY, // Baltoy + HOENN_DEX_CLAYDOL, // Claydol + HOENN_DEX_NOSEPASS, // Nosepass + HOENN_DEX_TORKOAL, // Torkoal + HOENN_DEX_SABLEYE, // Sableye + HOENN_DEX_BARBOACH, // Barboach + HOENN_DEX_WHISCASH, // Whiscash + HOENN_DEX_LUVDISC, // Luvdisc + HOENN_DEX_CORPHISH, // Corphish + HOENN_DEX_CRAWDAUNT, // Crawdaunt + HOENN_DEX_FEEBAS, // Feebas + HOENN_DEX_MILOTIC, // Milotic + HOENN_DEX_CARVANHA, // Carvanha + HOENN_DEX_SHARPEDO, // Sharpedo + HOENN_DEX_TRAPINCH, // Trapinch + HOENN_DEX_VIBRAVA, // Vibrava + HOENN_DEX_FLYGON, // Flygon + HOENN_DEX_MAKUHITA, // Makuhita + HOENN_DEX_HARIYAMA, // Hariyama + HOENN_DEX_ELECTRIKE, // Electrike + HOENN_DEX_MANECTRIC, // Manectric + HOENN_DEX_NUMEL, // Numel + HOENN_DEX_CAMERUPT, // Camerupt + HOENN_DEX_SPHEAL, // Spheal + HOENN_DEX_SEALEO, // Sealeo + HOENN_DEX_WALREIN, // Walrein + HOENN_DEX_CACNEA, // Cacnea + HOENN_DEX_CACTURNE, // Cacturne + HOENN_DEX_SNORUNT, // Snorunt + HOENN_DEX_GLALIE, // Glalie + HOENN_DEX_LUNATONE, // Lunatone + HOENN_DEX_SOLROCK, // Solrock + HOENN_DEX_AZURILL, // Azurill + HOENN_DEX_SPOINK, // Spoink + HOENN_DEX_GRUMPIG, // Grumpig + HOENN_DEX_PLUSLE, // Plusle + HOENN_DEX_MINUN, // Minun + HOENN_DEX_MAWILE, // Mawile + HOENN_DEX_MEDITITE, // Meditite + HOENN_DEX_MEDICHAM, // Medicham + HOENN_DEX_SWABLU, // Swablu + HOENN_DEX_ALTARIA, // Altaria + HOENN_DEX_WYNAUT, // Wynaut + HOENN_DEX_DUSKULL, // Duskull + HOENN_DEX_DUSCLOPS, // Dusclops + HOENN_DEX_ROSELIA, // Roselia + HOENN_DEX_SLAKOTH, // Slakoth + HOENN_DEX_VIGOROTH, // Vigoroth + HOENN_DEX_SLAKING, // Slaking + HOENN_DEX_GULPIN, // Gulpin + HOENN_DEX_SWALOT, // Swalot + HOENN_DEX_TROPIUS, // Tropius + HOENN_DEX_WHISMUR, // Whismur + HOENN_DEX_LOUDRED, // Loudred + HOENN_DEX_EXPLOUD, // Exploud + HOENN_DEX_CLAMPERL, // Clamperl + HOENN_DEX_HUNTAIL, // Huntail + HOENN_DEX_GOREBYSS, // Gorebyss + HOENN_DEX_ABSOL, // Absol + HOENN_DEX_SHUPPET, // Shuppet + HOENN_DEX_BANETTE, // Banette + HOENN_DEX_SEVIPER, // Seviper + HOENN_DEX_ZANGOOSE, // Zangoose + HOENN_DEX_RELICANTH, // Relicanth + HOENN_DEX_ARON, // Aron + HOENN_DEX_LAIRON, // Lairon + HOENN_DEX_AGGRON, // Aggron + HOENN_DEX_CASTFORM, // Castform + HOENN_DEX_VOLBEAT, // Volbeat + HOENN_DEX_ILLUMISE, // Illumise + HOENN_DEX_LILEEP, // Lileep + HOENN_DEX_CRADILY, // Cradily + HOENN_DEX_ANORITH, // Anorith + HOENN_DEX_ARMALDO, // Armaldo + HOENN_DEX_RALTS, // Ralts + HOENN_DEX_KIRLIA, // Kirlia + HOENN_DEX_GARDEVOIR, // Gardevoir + HOENN_DEX_BAGON, // Bagon + HOENN_DEX_SHELGON, // Shelgon + HOENN_DEX_SALAMENCE, // Salamence + HOENN_DEX_BELDUM, // Beldum + HOENN_DEX_METANG, // Metang + HOENN_DEX_METAGROSS, // Metagross + HOENN_DEX_REGIROCK, // Regirock + HOENN_DEX_REGICE, // Regice + HOENN_DEX_REGISTEEL, // Registeel + HOENN_DEX_KYOGRE, // Kyogre + HOENN_DEX_GROUDON, // Groudon + HOENN_DEX_RAYQUAZA, // Rayquaza + HOENN_DEX_LATIAS, // Latias + HOENN_DEX_LATIOS, // Latios + HOENN_DEX_JIRACHI, // Jirachi + HOENN_DEX_DEOXYS, // Deoxys + HOENN_DEX_CHIMECHO // Chimecho +}; + +const u16 gSpeciesToNationalPokedexNum[] = // Assigns all species to the National Dex Index +{ + NATIONAL_DEX_BULBASAUR, // Bulbasaur + NATIONAL_DEX_IVYSAUR, // Ivysaur + NATIONAL_DEX_VENUSAUR, // Venusaur + NATIONAL_DEX_CHARMANDER, // Charmander + NATIONAL_DEX_CHARMELEON, // Charmeleon + NATIONAL_DEX_CHARIZARD, // Charizard + NATIONAL_DEX_SQUIRTLE, // Squirtle + NATIONAL_DEX_WARTORTLE, // Wartortle + NATIONAL_DEX_BLASTOISE, // Blastoise + NATIONAL_DEX_CATERPIE, // Caterpie + NATIONAL_DEX_METAPOD, // Metapod + NATIONAL_DEX_BUTTERFREE, // Butterfree + NATIONAL_DEX_WEEDLE, // Weedle + NATIONAL_DEX_KAKUNA, // Kakuna + NATIONAL_DEX_BEEDRILL, // Beedrill + NATIONAL_DEX_PIDGEY, // Pidgey + NATIONAL_DEX_PIDGEOTTO, // Pidgeotto + NATIONAL_DEX_PIDGEOT, // Pidgeot + NATIONAL_DEX_RATTATA, // Rattata + NATIONAL_DEX_RATICATE, // Raticate + NATIONAL_DEX_SPEAROW, // Spearow + NATIONAL_DEX_FEAROW, // Fearow + NATIONAL_DEX_EKANS, // Ekans + NATIONAL_DEX_ARBOK, // Arbok + NATIONAL_DEX_PIKACHU, // Pikachu + NATIONAL_DEX_RAICHU, // Raichu + NATIONAL_DEX_SANDSHREW, // Sandshrew + NATIONAL_DEX_SANDSLASH, // Sandslash + NATIONAL_DEX_NIDORAN_F, // Nidoran♀ + NATIONAL_DEX_NIDORINA, // Nidorina + NATIONAL_DEX_NIDOQUEEN, // Nidoqueen + NATIONAL_DEX_NIDORAN_M, // Nidoran♂ + NATIONAL_DEX_NIDORINO, // Nidorino + NATIONAL_DEX_NIDOKING, // Nidoking + NATIONAL_DEX_CLEFAIRY, // Clefairy + NATIONAL_DEX_CLEFABLE, // Clefable + NATIONAL_DEX_VULPIX, // Vulpix + NATIONAL_DEX_NINETALES, // Ninetales + NATIONAL_DEX_JIGGLYPUFF, // Jigglypuff + NATIONAL_DEX_WIGGLYTUFF, // Wigglytuff + NATIONAL_DEX_ZUBAT, // Zubat + NATIONAL_DEX_GOLBAT, // Golbat + NATIONAL_DEX_ODDISH, // Oddish + NATIONAL_DEX_GLOOM, // Gloom + NATIONAL_DEX_VILEPLUME, // Vileplume + NATIONAL_DEX_PARAS, // Paras + NATIONAL_DEX_PARASECT, // Parasect + NATIONAL_DEX_VENONAT, // Venonat + NATIONAL_DEX_VENOMOTH, // Venomoth + NATIONAL_DEX_DIGLETT, // Diglett + NATIONAL_DEX_DUGTRIO, // Dugtrio + NATIONAL_DEX_MEOWTH, // Meowth + NATIONAL_DEX_PERSIAN, // Persian + NATIONAL_DEX_PSYDUCK, // Psyduck + NATIONAL_DEX_GOLDUCK, // Golduck + NATIONAL_DEX_MANKEY, // Mankey + NATIONAL_DEX_PRIMEAPE, // Primeape + NATIONAL_DEX_GROWLITHE, // Growlithe + NATIONAL_DEX_ARCANINE, // Arcanine + NATIONAL_DEX_POLIWAG, // Poliwag + NATIONAL_DEX_POLIWHIRL, // Poliwhirl + NATIONAL_DEX_POLIWRATH, // Poliwrath + NATIONAL_DEX_ABRA, // Abra + NATIONAL_DEX_KADABRA, // Kadabra + NATIONAL_DEX_ALAKAZAM, // Alakazam + NATIONAL_DEX_MACHOP, // Machop + NATIONAL_DEX_MACHOKE, // Machoke + NATIONAL_DEX_MACHAMP, // Machamp + NATIONAL_DEX_BELLSPROUT, // Bellsprout + NATIONAL_DEX_WEEPINBELL, // Weepinbell + NATIONAL_DEX_VICTREEBEL, // Victreebel + NATIONAL_DEX_TENTACOOL, // Tentacool + NATIONAL_DEX_TENTACRUEL, // Tentacruel + NATIONAL_DEX_GEODUDE, // Geodude + NATIONAL_DEX_GRAVELER, // Graveler + NATIONAL_DEX_GOLEM, // Golem + NATIONAL_DEX_PONYTA, // Ponyta + NATIONAL_DEX_RAPIDASH, // Rapidash + NATIONAL_DEX_SLOWPOKE, // Slowpoke + NATIONAL_DEX_SLOWBRO, // Slowbro + NATIONAL_DEX_MAGNEMITE, // Magnemite + NATIONAL_DEX_MAGNETON, // Magneton + NATIONAL_DEX_FARFETCHD, // Farfetch'd + NATIONAL_DEX_DODUO, // Doduo + NATIONAL_DEX_DODRIO, // Dodrio + NATIONAL_DEX_SEEL, // Seel + NATIONAL_DEX_DEWGONG, // Dewgong + NATIONAL_DEX_GRIMER, // Grimer + NATIONAL_DEX_MUK, // Muk + NATIONAL_DEX_SHELLDER, // Shellder + NATIONAL_DEX_CLOYSTER, // Cloyster + NATIONAL_DEX_GASTLY, // Gastly + NATIONAL_DEX_HAUNTER, // Haunter + NATIONAL_DEX_GENGAR, // Gengar + NATIONAL_DEX_ONIX, // Onix + NATIONAL_DEX_DROWZEE, // Drowzee + NATIONAL_DEX_HYPNO, // Hypno + NATIONAL_DEX_KRABBY, // Krabby + NATIONAL_DEX_KINGLER, // Kingler + NATIONAL_DEX_VOLTORB, // Voltorb + NATIONAL_DEX_ELECTRODE, // Electrode + NATIONAL_DEX_EXEGGCUTE, // Exeggcute + NATIONAL_DEX_EXEGGUTOR, // Exeggutor + NATIONAL_DEX_CUBONE, // Cubone + NATIONAL_DEX_MAROWAK, // Marowak + NATIONAL_DEX_HITMONLEE, // Hitmonlee + NATIONAL_DEX_HITMONCHAN, // Hitmonchan + NATIONAL_DEX_LICKITUNG, // Lickitung + NATIONAL_DEX_KOFFING, // Koffing + NATIONAL_DEX_WEEZING, // Weezing + NATIONAL_DEX_RHYHORN, // Rhyhorn + NATIONAL_DEX_RHYDON, // Rhydon + NATIONAL_DEX_CHANSEY, // Chansey + NATIONAL_DEX_TANGELA, // Tangela + NATIONAL_DEX_KANGASKHAN, // Kangaskhan + NATIONAL_DEX_HORSEA, // Horsea + NATIONAL_DEX_SEADRA, // Seadra + NATIONAL_DEX_GOLDEEN, // Goldeen + NATIONAL_DEX_SEAKING, // Seaking + NATIONAL_DEX_STARYU, // Staryu + NATIONAL_DEX_STARMIE, // Starmie + NATIONAL_DEX_MR_MIME, // Mr. Mime + NATIONAL_DEX_SCYTHER, // Scyther + NATIONAL_DEX_JYNX, // Jynx + NATIONAL_DEX_ELECTABUZZ, // Electabuzz + NATIONAL_DEX_MAGMAR, // Magmar + NATIONAL_DEX_PINSIR, // Pinsir + NATIONAL_DEX_TAUROS, // Tauros + NATIONAL_DEX_MAGIKARP, // Magikarp + NATIONAL_DEX_GYARADOS, // Gyarados + NATIONAL_DEX_LAPRAS, // Lapras + NATIONAL_DEX_DITTO, // Ditto + NATIONAL_DEX_EEVEE, // Eevee + NATIONAL_DEX_VAPOREON, // Vaporeon + NATIONAL_DEX_JOLTEON, // Jolteon + NATIONAL_DEX_FLAREON, // Flareon + NATIONAL_DEX_PORYGON, // Porygon + NATIONAL_DEX_OMANYTE, // Omanyte + NATIONAL_DEX_OMASTAR, // Omastar + NATIONAL_DEX_KABUTO, // Kabuto + NATIONAL_DEX_KABUTOPS, // Kabutops + NATIONAL_DEX_AERODACTYL, // Aerodactyl + NATIONAL_DEX_SNORLAX, // Snorlax + NATIONAL_DEX_ARTICUNO, // Articuno + NATIONAL_DEX_ZAPDOS, // Zapdos + NATIONAL_DEX_MOLTRES, // Moltres + NATIONAL_DEX_DRATINI, // Dratini + NATIONAL_DEX_DRAGONAIR, // Dragonair + NATIONAL_DEX_DRAGONITE, // Dragonite + NATIONAL_DEX_MEWTWO, // Mewtwo + NATIONAL_DEX_MEW, // Mew + NATIONAL_DEX_CHIKORITA, // Chikorita + NATIONAL_DEX_BAYLEEF, // Bayleef + NATIONAL_DEX_MEGANIUM, // Meganium + NATIONAL_DEX_CYNDAQUIL, // Cyndaquil + NATIONAL_DEX_QUILAVA, // Quilava + NATIONAL_DEX_TYPHLOSION, // Typhlosion + NATIONAL_DEX_TOTODILE, // Totodile + NATIONAL_DEX_CROCONAW, // Croconaw + NATIONAL_DEX_FERALIGATR, // Feraligatr + NATIONAL_DEX_SENTRET, // Sentret + NATIONAL_DEX_FURRET, // Furret + NATIONAL_DEX_HOOTHOOT, // Hoothoot + NATIONAL_DEX_NOCTOWL, // Noctowl + NATIONAL_DEX_LEDYBA, // Ledyba + NATIONAL_DEX_LEDIAN, // Ledian + NATIONAL_DEX_SPINARAK, // Spinarak + NATIONAL_DEX_ARIADOS, // Ariados + NATIONAL_DEX_CROBAT, // Crobat + NATIONAL_DEX_CHINCHOU, // Chinchou + NATIONAL_DEX_LANTURN, // Lanturn + NATIONAL_DEX_PICHU, // Pichu + NATIONAL_DEX_CLEFFA, // Cleffa + NATIONAL_DEX_IGGLYBUFF, // Igglybuff + NATIONAL_DEX_TOGEPI, // Togepi + NATIONAL_DEX_TOGETIC, // Togetic + NATIONAL_DEX_NATU, // Natu + NATIONAL_DEX_XATU, // Xatu + NATIONAL_DEX_MAREEP, // Mareep + NATIONAL_DEX_FLAAFFY, // Flaaffy + NATIONAL_DEX_AMPHAROS, // Ampharos + NATIONAL_DEX_BELLOSSOM, // Bellossom + NATIONAL_DEX_MARILL, // Marill + NATIONAL_DEX_AZUMARILL, // Azumarill + NATIONAL_DEX_SUDOWOODO, // Sudowoodo + NATIONAL_DEX_POLITOED, // Politoed + NATIONAL_DEX_HOPPIP, // Hoppip + NATIONAL_DEX_SKIPLOOM, // Skiploom + NATIONAL_DEX_JUMPLUFF, // Jumpluff + NATIONAL_DEX_AIPOM, // Aipom + NATIONAL_DEX_SUNKERN, // Sunkern + NATIONAL_DEX_SUNFLORA, // Sunflora + NATIONAL_DEX_YANMA, // Yanma + NATIONAL_DEX_WOOPER, // Wooper + NATIONAL_DEX_QUAGSIRE, // Quagsire + NATIONAL_DEX_ESPEON, // Espeon + NATIONAL_DEX_UMBREON, // Umbreon + NATIONAL_DEX_MURKROW, // Murkrow + NATIONAL_DEX_SLOWKING, // Slowking + NATIONAL_DEX_MISDREAVUS, // Misdreavus + NATIONAL_DEX_UNOWN, // Unown A + NATIONAL_DEX_WOBBUFFET, // Wobbuffet + NATIONAL_DEX_GIRAFARIG, // Girafarig + NATIONAL_DEX_PINECO, // Pineco + NATIONAL_DEX_FORRETRESS, // Forretress + NATIONAL_DEX_DUNSPARCE, // Dunsparce + NATIONAL_DEX_GLIGAR, // Gligar + NATIONAL_DEX_STEELIX, // Steelix + NATIONAL_DEX_SNUBBULL, // Snubbull + NATIONAL_DEX_GRANBULL, // Granbull + NATIONAL_DEX_QWILFISH, // Qwilfish + NATIONAL_DEX_SCIZOR, // Scizor + NATIONAL_DEX_SHUCKLE, // Shuckle + NATIONAL_DEX_HERACROSS, // Heracross + NATIONAL_DEX_SNEASEL, // Sneasel + NATIONAL_DEX_TEDDIURSA, // Teddiursa + NATIONAL_DEX_URSARING, // Ursaring + NATIONAL_DEX_SLUGMA, // Slugma + NATIONAL_DEX_MAGCARGO, // Magcargo + NATIONAL_DEX_SWINUB, // Swinub + NATIONAL_DEX_PILOSWINE, // Piloswine + NATIONAL_DEX_CORSOLA, // Corsola + NATIONAL_DEX_REMORAID, // Remoraid + NATIONAL_DEX_OCTILLERY, // Octillery + NATIONAL_DEX_DELIBIRD, // Delibird + NATIONAL_DEX_MANTINE, // Mantine + NATIONAL_DEX_SKARMORY, // Skarmory + NATIONAL_DEX_HOUNDOUR, // Houndour + NATIONAL_DEX_HOUNDOOM, // Houndoom + NATIONAL_DEX_KINGDRA, // Kingdra + NATIONAL_DEX_PHANPY, // Phanpy + NATIONAL_DEX_DONPHAN, // Donphan + NATIONAL_DEX_PORYGON2, // Porygon2 + NATIONAL_DEX_STANTLER, // Stantler + NATIONAL_DEX_SMEARGLE, // Smeargle + NATIONAL_DEX_TYROGUE, // Tyrogue + NATIONAL_DEX_HITMONTOP, // Hitmontop + NATIONAL_DEX_SMOOCHUM, // Smoochum + NATIONAL_DEX_ELEKID, // Elekid + NATIONAL_DEX_MAGBY, // Magby + NATIONAL_DEX_MILTANK, // Miltank + NATIONAL_DEX_BLISSEY, // Blissey + NATIONAL_DEX_RAIKOU, // Raikou + NATIONAL_DEX_ENTEI, // Entei + NATIONAL_DEX_SUICUNE, // Suicune + NATIONAL_DEX_LARVITAR, // Larvitar + NATIONAL_DEX_PUPITAR, // Pupitar + NATIONAL_DEX_TYRANITAR, // Tyranitar + NATIONAL_DEX_LUGIA, // Lugia + NATIONAL_DEX_HO_OH, // Ho-Oh + NATIONAL_DEX_CELEBI, // Celebi + NATIONAL_DEX_OLD_UNOWN_B, // Unown B (Old) + NATIONAL_DEX_OLD_UNOWN_C, // Unown C (Old) + NATIONAL_DEX_OLD_UNOWN_D, // Unown D (Old) + NATIONAL_DEX_OLD_UNOWN_E, // Unown E (Old) + NATIONAL_DEX_OLD_UNOWN_F, // Unown F (Old) + NATIONAL_DEX_OLD_UNOWN_G, // Unown G (Old) + NATIONAL_DEX_OLD_UNOWN_H, // Unown H (Old) + NATIONAL_DEX_OLD_UNOWN_I, // Unown I (Old) + NATIONAL_DEX_OLD_UNOWN_J, // Unown J (Old) + NATIONAL_DEX_OLD_UNOWN_K, // Unown K (Old) + NATIONAL_DEX_OLD_UNOWN_L, // Unown L (Old) + NATIONAL_DEX_OLD_UNOWN_M, // Unown M (Old) + NATIONAL_DEX_OLD_UNOWN_N, // Unown N (Old) + NATIONAL_DEX_OLD_UNOWN_O, // Unown O (Old) + NATIONAL_DEX_OLD_UNOWN_P, // Unown P (Old) + NATIONAL_DEX_OLD_UNOWN_Q, // Unown Q (Old) + NATIONAL_DEX_OLD_UNOWN_R, // Unown R (Old) + NATIONAL_DEX_OLD_UNOWN_S, // Unown S (Old) + NATIONAL_DEX_OLD_UNOWN_T, // Unown T (Old) + NATIONAL_DEX_OLD_UNOWN_U, // Unown U (Old) + NATIONAL_DEX_OLD_UNOWN_V, // Unown V (Old) + NATIONAL_DEX_OLD_UNOWN_W, // Unown W (Old) + NATIONAL_DEX_OLD_UNOWN_X, // Unown X (Old) + NATIONAL_DEX_OLD_UNOWN_Y, // Unown Y (Old) + NATIONAL_DEX_OLD_UNOWN_Z, // Unown Z (Old) + NATIONAL_DEX_TREECKO, // Treecko + NATIONAL_DEX_GROVYLE, // Grovyle + NATIONAL_DEX_SCEPTILE, // Sceptile + NATIONAL_DEX_TORCHIC, // Torchic + NATIONAL_DEX_COMBUSKEN, // Combusken + NATIONAL_DEX_BLAZIKEN, // Blaziken + NATIONAL_DEX_MUDKIP, // Mudkip + NATIONAL_DEX_MARSHTOMP, // Marshtomp + NATIONAL_DEX_SWAMPERT, // Swampert + NATIONAL_DEX_POOCHYENA, // Poochyena + NATIONAL_DEX_MIGHTYENA, // Mightyena + NATIONAL_DEX_ZIGZAGOON, // Zigzagoon + NATIONAL_DEX_LINOONE, // Linoone + NATIONAL_DEX_WURMPLE, // Wurmple + NATIONAL_DEX_SILCOON, // Silcoon + NATIONAL_DEX_BEAUTIFLY, // Beautifly + NATIONAL_DEX_CASCOON, // Cascoon + NATIONAL_DEX_DUSTOX, // Dustox + NATIONAL_DEX_LOTAD, // Lotad + NATIONAL_DEX_LOMBRE, // Lombre + NATIONAL_DEX_LUDICOLO, // Ludicolo + NATIONAL_DEX_SEEDOT, // Seedot + NATIONAL_DEX_NUZLEAF, // Nuzleaf + NATIONAL_DEX_SHIFTRY, // Shiftry + NATIONAL_DEX_NINCADA, // Nincada + NATIONAL_DEX_NINJASK, // Ninjask + NATIONAL_DEX_SHEDINJA, // Shedinja + NATIONAL_DEX_TAILLOW, // Taillow + NATIONAL_DEX_SWELLOW, // Swellow + NATIONAL_DEX_SHROOMISH, // Shroomish + NATIONAL_DEX_BRELOOM, // Breloom + NATIONAL_DEX_SPINDA, // Spinda + NATIONAL_DEX_WINGULL, // Wingull + NATIONAL_DEX_PELIPPER, // Pelipper + NATIONAL_DEX_SURSKIT, // Surskit + NATIONAL_DEX_MASQUERAIN, // Masquerain + NATIONAL_DEX_WAILMER, // Wailmer + NATIONAL_DEX_WAILORD, // Wailord + NATIONAL_DEX_SKITTY, // Skitty + NATIONAL_DEX_DELCATTY, // Delcatty + NATIONAL_DEX_KECLEON, // Kecleon + NATIONAL_DEX_BALTOY, // Baltoy + NATIONAL_DEX_CLAYDOL, // Claydol + NATIONAL_DEX_NOSEPASS, // Nosepass + NATIONAL_DEX_TORKOAL, // Torkoal + NATIONAL_DEX_SABLEYE, // Sableye + NATIONAL_DEX_BARBOACH, // Barboach + NATIONAL_DEX_WHISCASH, // Whiscash + NATIONAL_DEX_LUVDISC, // Luvdisc + NATIONAL_DEX_CORPHISH, // Corphish + NATIONAL_DEX_CRAWDAUNT, // Crawdaunt + NATIONAL_DEX_FEEBAS, // Feebas + NATIONAL_DEX_MILOTIC, // Milotic + NATIONAL_DEX_CARVANHA, // Carvanha + NATIONAL_DEX_SHARPEDO, // Sharpedo + NATIONAL_DEX_TRAPINCH, // Trapinch + NATIONAL_DEX_VIBRAVA, // Vibrava + NATIONAL_DEX_FLYGON, // Flygon + NATIONAL_DEX_MAKUHITA, // Makuhita + NATIONAL_DEX_HARIYAMA, // Hariyama + NATIONAL_DEX_ELECTRIKE, // Electrike + NATIONAL_DEX_MANECTRIC, // Manectric + NATIONAL_DEX_NUMEL, // Numel + NATIONAL_DEX_CAMERUPT, // Camerupt + NATIONAL_DEX_SPHEAL, // Spheal + NATIONAL_DEX_SEALEO, // Sealeo + NATIONAL_DEX_WALREIN, // Walrein + NATIONAL_DEX_CACNEA, // Cacnea + NATIONAL_DEX_CACTURNE, // Cacturne + NATIONAL_DEX_SNORUNT, // Snorunt + NATIONAL_DEX_GLALIE, // Glalie + NATIONAL_DEX_LUNATONE, // Lunatone + NATIONAL_DEX_SOLROCK, // Solrock + NATIONAL_DEX_AZURILL, // Azurill + NATIONAL_DEX_SPOINK, // Spoink + NATIONAL_DEX_GRUMPIG, // Grumpig + NATIONAL_DEX_PLUSLE, // Plusle + NATIONAL_DEX_MINUN, // Minun + NATIONAL_DEX_MAWILE, // Mawile + NATIONAL_DEX_MEDITITE, // Meditite + NATIONAL_DEX_MEDICHAM, // Medicham + NATIONAL_DEX_SWABLU, // Swablu + NATIONAL_DEX_ALTARIA, // Altaria + NATIONAL_DEX_WYNAUT, // Wynaut + NATIONAL_DEX_DUSKULL, // Duskull + NATIONAL_DEX_DUSCLOPS, // Dusclops + NATIONAL_DEX_ROSELIA, // Roselia + NATIONAL_DEX_SLAKOTH, // Slakoth + NATIONAL_DEX_VIGOROTH, // Vigoroth + NATIONAL_DEX_SLAKING, // Slaking + NATIONAL_DEX_GULPIN, // Gulpin + NATIONAL_DEX_SWALOT, // Swalot + NATIONAL_DEX_TROPIUS, // Tropius + NATIONAL_DEX_WHISMUR, // Whismur + NATIONAL_DEX_LOUDRED, // Loudred + NATIONAL_DEX_EXPLOUD, // Exploud + NATIONAL_DEX_CLAMPERL, // Clamperl + NATIONAL_DEX_HUNTAIL, // Huntail + NATIONAL_DEX_GOREBYSS, // Gorebyss + NATIONAL_DEX_ABSOL, // Absol + NATIONAL_DEX_SHUPPET, // Shuppet + NATIONAL_DEX_BANETTE, // Banette + NATIONAL_DEX_SEVIPER, // Seviper + NATIONAL_DEX_ZANGOOSE, // Zangoose + NATIONAL_DEX_RELICANTH, // Relicanth + NATIONAL_DEX_ARON, // Aron + NATIONAL_DEX_LAIRON, // Lairon + NATIONAL_DEX_AGGRON, // Aggron + NATIONAL_DEX_CASTFORM, // Castform + NATIONAL_DEX_VOLBEAT, // Volbeat + NATIONAL_DEX_ILLUMISE, // Illumise + NATIONAL_DEX_LILEEP, // Lileep + NATIONAL_DEX_CRADILY, // Cradily + NATIONAL_DEX_ANORITH, // Anorith + NATIONAL_DEX_ARMALDO, // Armaldo + NATIONAL_DEX_RALTS, // Ralts + NATIONAL_DEX_KIRLIA, // Kirlia + NATIONAL_DEX_GARDEVOIR, // Gardevoir + NATIONAL_DEX_BAGON, // Bagon + NATIONAL_DEX_SHELGON, // Shelgon + NATIONAL_DEX_SALAMENCE, // Salamence + NATIONAL_DEX_BELDUM, // Beldum + NATIONAL_DEX_METANG, // Metang + NATIONAL_DEX_METAGROSS, // Metagross + NATIONAL_DEX_REGIROCK, // Regirock + NATIONAL_DEX_REGICE, // Regice + NATIONAL_DEX_REGISTEEL, // Registeel + NATIONAL_DEX_KYOGRE, // Kyogre + NATIONAL_DEX_GROUDON, // Groudon + NATIONAL_DEX_RAYQUAZA, // Rayquaza + NATIONAL_DEX_LATIAS, // Latias + NATIONAL_DEX_LATIOS, // Latios + NATIONAL_DEX_JIRACHI, // Jirachi + NATIONAL_DEX_DEOXYS, // Deoxys + NATIONAL_DEX_CHIMECHO // Chimecho +}; + +const u16 gHoennToNationalOrder[] = // Assigns Hoenn Dex Pokémon (Using National Dex Index) +{ + NATIONAL_DEX_TREECKO, // Treecko + NATIONAL_DEX_GROVYLE, // Grovyle + NATIONAL_DEX_SCEPTILE, // Sceptile + NATIONAL_DEX_TORCHIC, // Torchic + NATIONAL_DEX_COMBUSKEN, // Combusken + NATIONAL_DEX_BLAZIKEN, // Blaziken + NATIONAL_DEX_MUDKIP, // Mudkip + NATIONAL_DEX_MARSHTOMP, // Marshtomp + NATIONAL_DEX_SWAMPERT, // Swampert + NATIONAL_DEX_POOCHYENA, // Poochyena + NATIONAL_DEX_MIGHTYENA, // Mightyena + NATIONAL_DEX_ZIGZAGOON, // Zigzagoon + NATIONAL_DEX_LINOONE, // Linoone + NATIONAL_DEX_WURMPLE, // Wurmple + NATIONAL_DEX_SILCOON, // Silcoon + NATIONAL_DEX_BEAUTIFLY, // Beautifly + NATIONAL_DEX_CASCOON, // Cascoon + NATIONAL_DEX_DUSTOX, // Dustox + NATIONAL_DEX_LOTAD, // Lotad + NATIONAL_DEX_LOMBRE, // Lombre + NATIONAL_DEX_LUDICOLO, // Ludicolo + NATIONAL_DEX_SEEDOT, // Seedot + NATIONAL_DEX_NUZLEAF, // Nuzleaf + NATIONAL_DEX_SHIFTRY, // Shiftry + NATIONAL_DEX_TAILLOW, // Taillow + NATIONAL_DEX_SWELLOW, // Swellow + NATIONAL_DEX_WINGULL, // Wingull + NATIONAL_DEX_PELIPPER, // Pelipper + NATIONAL_DEX_RALTS, // Ralts + NATIONAL_DEX_KIRLIA, // Kirlia + NATIONAL_DEX_GARDEVOIR, // Gardevoir + NATIONAL_DEX_SURSKIT, // Surskit + NATIONAL_DEX_MASQUERAIN, // Masquerain + NATIONAL_DEX_SHROOMISH, // Shroomish + NATIONAL_DEX_BRELOOM, // Breloom + NATIONAL_DEX_SLAKOTH, // Slakoth + NATIONAL_DEX_VIGOROTH, // Vigoroth + NATIONAL_DEX_SLAKING, // Slaking + NATIONAL_DEX_ABRA, // Abra + NATIONAL_DEX_KADABRA, // Kadabra + NATIONAL_DEX_ALAKAZAM, // Alakazam + NATIONAL_DEX_NINCADA, // Nincada + NATIONAL_DEX_NINJASK, // Ninjask + NATIONAL_DEX_SHEDINJA, // Shedinja + NATIONAL_DEX_WHISMUR, // Whismur + NATIONAL_DEX_LOUDRED, // Loudred + NATIONAL_DEX_EXPLOUD, // Exploud + NATIONAL_DEX_MAKUHITA, // Makuhita + NATIONAL_DEX_HARIYAMA, // Hariyama + NATIONAL_DEX_GOLDEEN, // Goldeen + NATIONAL_DEX_SEAKING, // Seaking + NATIONAL_DEX_MAGIKARP, // Magikarp + NATIONAL_DEX_GYARADOS, // Gyarados + NATIONAL_DEX_AZURILL, // Azurill + NATIONAL_DEX_MARILL, // Marill + NATIONAL_DEX_AZUMARILL, // Azumarill + NATIONAL_DEX_GEODUDE, // Geodude + NATIONAL_DEX_GRAVELER, // Graveler + NATIONAL_DEX_GOLEM, // Golem + NATIONAL_DEX_NOSEPASS, // Nosepass + NATIONAL_DEX_SKITTY, // Skitty + NATIONAL_DEX_DELCATTY, // Delcatty + NATIONAL_DEX_ZUBAT, // Zubat + NATIONAL_DEX_GOLBAT, // Golbat + NATIONAL_DEX_CROBAT, // Crobat + NATIONAL_DEX_TENTACOOL, // Tentacool + NATIONAL_DEX_TENTACRUEL, // Tentacruel + NATIONAL_DEX_SABLEYE, // Sableye + NATIONAL_DEX_MAWILE, // Mawile + NATIONAL_DEX_ARON, // Aron + NATIONAL_DEX_LAIRON, // Lairon + NATIONAL_DEX_AGGRON, // Aggron + NATIONAL_DEX_MACHOP, // Machop + NATIONAL_DEX_MACHOKE, // Machoke + NATIONAL_DEX_MACHAMP, // Machamp + NATIONAL_DEX_MEDITITE, // Meditite + NATIONAL_DEX_MEDICHAM, // Medicham + NATIONAL_DEX_ELECTRIKE, // Electrike + NATIONAL_DEX_MANECTRIC, // Manectric + NATIONAL_DEX_PLUSLE, // Plusle + NATIONAL_DEX_MINUN, // Minun + NATIONAL_DEX_MAGNEMITE, // Magnemite + NATIONAL_DEX_MAGNETON, // Magneton + NATIONAL_DEX_VOLTORB, // Voltorb + NATIONAL_DEX_ELECTRODE, // Electrode + NATIONAL_DEX_VOLBEAT, // Volbeat + NATIONAL_DEX_ILLUMISE, // Illumise + NATIONAL_DEX_ODDISH, // Oddish + NATIONAL_DEX_GLOOM, // Gloom + NATIONAL_DEX_VILEPLUME, // Vileplume + NATIONAL_DEX_BELLOSSOM, // Bellossom + NATIONAL_DEX_DODUO, // Doduo + NATIONAL_DEX_DODRIO, // Dodrio + NATIONAL_DEX_ROSELIA, // Roselia + NATIONAL_DEX_GULPIN, // Gulpin + NATIONAL_DEX_SWALOT, // Swalot + NATIONAL_DEX_CARVANHA, // Carvanha + NATIONAL_DEX_SHARPEDO, // Sharpedo + NATIONAL_DEX_WAILMER, // Wailmer + NATIONAL_DEX_WAILORD, // Wailord + NATIONAL_DEX_NUMEL, // Numel + NATIONAL_DEX_CAMERUPT, // Camerupt + NATIONAL_DEX_SLUGMA, // Slugma + NATIONAL_DEX_MAGCARGO, // Magcargo + NATIONAL_DEX_TORKOAL, // Torkoal + NATIONAL_DEX_GRIMER, // Grimer + NATIONAL_DEX_MUK, // Muk + NATIONAL_DEX_KOFFING, // Koffing + NATIONAL_DEX_WEEZING, // Weezing + NATIONAL_DEX_SPOINK, // Spoink + NATIONAL_DEX_GRUMPIG, // Grumpig + NATIONAL_DEX_SANDSHREW, // Sandshrew + NATIONAL_DEX_SANDSLASH, // Sandslash + NATIONAL_DEX_SPINDA, // Spinda + NATIONAL_DEX_SKARMORY, // Skarmory + NATIONAL_DEX_TRAPINCH, // Trapinch + NATIONAL_DEX_VIBRAVA, // Vibrava + NATIONAL_DEX_FLYGON, // Flygon + NATIONAL_DEX_CACNEA, // Cacnea + NATIONAL_DEX_CACTURNE, // Cacturne + NATIONAL_DEX_SWABLU, // Swablu + NATIONAL_DEX_ALTARIA, // Altaria + NATIONAL_DEX_ZANGOOSE, // Zangoose + NATIONAL_DEX_SEVIPER, // Seviper + NATIONAL_DEX_LUNATONE, // Lunatone + NATIONAL_DEX_SOLROCK, // Solrock + NATIONAL_DEX_BARBOACH, // Barboach + NATIONAL_DEX_WHISCASH, // Whiscash + NATIONAL_DEX_CORPHISH, // Corphish + NATIONAL_DEX_CRAWDAUNT, // Crawdaunt + NATIONAL_DEX_BALTOY, // Baltoy + NATIONAL_DEX_CLAYDOL, // Claydol + NATIONAL_DEX_LILEEP, // Lileep + NATIONAL_DEX_CRADILY, // Cradily + NATIONAL_DEX_ANORITH, // Anorith + NATIONAL_DEX_ARMALDO, // Armaldo + NATIONAL_DEX_IGGLYBUFF, // Igglybuff + NATIONAL_DEX_JIGGLYPUFF, // Jigglypuff + NATIONAL_DEX_WIGGLYTUFF, // Wigglytuff + NATIONAL_DEX_FEEBAS, // Feebas + NATIONAL_DEX_MILOTIC, // Milotic + NATIONAL_DEX_CASTFORM, // Castform + NATIONAL_DEX_STARYU, // Staryu + NATIONAL_DEX_STARMIE, // Starmie + NATIONAL_DEX_KECLEON, // Kecleon + NATIONAL_DEX_SHUPPET, // Shuppet + NATIONAL_DEX_BANETTE, // Banette + NATIONAL_DEX_DUSKULL, // Duskull + NATIONAL_DEX_DUSCLOPS, // Dusclops + NATIONAL_DEX_TROPIUS, // Tropius + NATIONAL_DEX_CHIMECHO, // Chimecho + NATIONAL_DEX_ABSOL, // Absol + NATIONAL_DEX_VULPIX, // Vulpix + NATIONAL_DEX_NINETALES, // Ninetales + NATIONAL_DEX_PICHU, // Pichu + NATIONAL_DEX_PIKACHU, // Pikachu + NATIONAL_DEX_RAICHU, // Raichu + NATIONAL_DEX_PSYDUCK, // Psyduck + NATIONAL_DEX_GOLDUCK, // Golduck + NATIONAL_DEX_WYNAUT, // Wynaut + NATIONAL_DEX_WOBBUFFET, // Wobbuffet + NATIONAL_DEX_NATU, // Natu + NATIONAL_DEX_XATU, // Xatu + NATIONAL_DEX_GIRAFARIG, // Girafarig + NATIONAL_DEX_PHANPY, // Phanpy + NATIONAL_DEX_DONPHAN, // Donphan + NATIONAL_DEX_PINSIR, // Pinsir + NATIONAL_DEX_HERACROSS, // Heracross + NATIONAL_DEX_RHYHORN, // Rhyhorn + NATIONAL_DEX_RHYDON, // Rhydon + NATIONAL_DEX_SNORUNT, // Snorunt + NATIONAL_DEX_GLALIE, // Glalie + NATIONAL_DEX_SPHEAL, // Spheal + NATIONAL_DEX_SEALEO, // Sealeo + NATIONAL_DEX_WALREIN, // Walrein + NATIONAL_DEX_CLAMPERL, // Clamperl + NATIONAL_DEX_HUNTAIL, // Huntail + NATIONAL_DEX_GOREBYSS, // Gorebyss + NATIONAL_DEX_RELICANTH, // Relicanth + NATIONAL_DEX_CORSOLA, // Relicanth + NATIONAL_DEX_CHINCHOU, // Chinchou + NATIONAL_DEX_LANTURN, // Lanturn + NATIONAL_DEX_LUVDISC, // Luvdisc + NATIONAL_DEX_HORSEA, // Horsea + NATIONAL_DEX_SEADRA, // Seadra + NATIONAL_DEX_KINGDRA, // Kingdra + NATIONAL_DEX_BAGON, // Bagon + NATIONAL_DEX_SHELGON, // Shelgon + NATIONAL_DEX_SALAMENCE, // Salamence + NATIONAL_DEX_BELDUM, // Beldum + NATIONAL_DEX_METANG, // Metang + NATIONAL_DEX_METAGROSS, // Metagross + NATIONAL_DEX_REGIROCK, // Regirock + NATIONAL_DEX_REGICE, // Regice + NATIONAL_DEX_REGISTEEL, // Registeel + NATIONAL_DEX_LATIAS, // Latias + NATIONAL_DEX_LATIOS, // Latios + NATIONAL_DEX_KYOGRE, // Kyogre + NATIONAL_DEX_GROUDON, // Groudon + NATIONAL_DEX_RAYQUAZA, // Rayquaza + NATIONAL_DEX_JIRACHI, // Jirachi + NATIONAL_DEX_DEOXYS, // Deoxys + NATIONAL_DEX_BULBASAUR, // Bulbasaur - Pokémon from here onwards are UNSEEN in the Hoenn Dex. + NATIONAL_DEX_IVYSAUR, // Ivysaur + NATIONAL_DEX_VENUSAUR, // Venusaur + NATIONAL_DEX_CHARMANDER, // Charmander + NATIONAL_DEX_CHARMELEON, // Charmeleon + NATIONAL_DEX_CHARIZARD, // Charizard + NATIONAL_DEX_SQUIRTLE, // Squirtle + NATIONAL_DEX_WARTORTLE, // Wartortle + NATIONAL_DEX_BLASTOISE, // Blastoise + NATIONAL_DEX_CATERPIE, // Caterpie + NATIONAL_DEX_METAPOD, // Metapod + NATIONAL_DEX_BUTTERFREE, // Butterfree + NATIONAL_DEX_WEEDLE, // Weedle + NATIONAL_DEX_KAKUNA, // Kakuna + NATIONAL_DEX_BEEDRILL, // Beedrill + NATIONAL_DEX_PIDGEY, // Pidgey + NATIONAL_DEX_PIDGEOTTO, // Pidgeotto + NATIONAL_DEX_PIDGEOT, // Pidgeot + NATIONAL_DEX_RATTATA, // Rattata + NATIONAL_DEX_RATICATE, // Raticate + NATIONAL_DEX_SPEAROW, // Spearow + NATIONAL_DEX_FEAROW, // Fearow + NATIONAL_DEX_EKANS, // Ekans + NATIONAL_DEX_ARBOK, // Arbok + NATIONAL_DEX_NIDORAN_F, // Nidoran♀ + NATIONAL_DEX_NIDORINA, // Nidorina + NATIONAL_DEX_NIDOQUEEN, // Nidoqueen + NATIONAL_DEX_NIDORAN_M, // Nidoran♂ + NATIONAL_DEX_NIDORINO, // Nidorino + NATIONAL_DEX_NIDOKING, // Nidoking + NATIONAL_DEX_CLEFAIRY, // Clefairy + NATIONAL_DEX_CLEFABLE, // Clefable + NATIONAL_DEX_PARAS, // Paras + NATIONAL_DEX_PARASECT, // Parasect + NATIONAL_DEX_VENONAT, // Venonat + NATIONAL_DEX_VENOMOTH, // Venomoth + NATIONAL_DEX_DIGLETT, // Diglett + NATIONAL_DEX_DUGTRIO, // Dugtrio + NATIONAL_DEX_MEOWTH, // Meowth + NATIONAL_DEX_PERSIAN, // Persian + NATIONAL_DEX_MANKEY, // Mankey + NATIONAL_DEX_PRIMEAPE, // Primeape + NATIONAL_DEX_GROWLITHE, // Growlithe + NATIONAL_DEX_ARCANINE, // Arcanine + NATIONAL_DEX_POLIWAG, // Poliwag + NATIONAL_DEX_POLIWHIRL, // Poliwhirl + NATIONAL_DEX_POLIWRATH, // Poliwrath + NATIONAL_DEX_BELLSPROUT, // Bellsprout + NATIONAL_DEX_WEEPINBELL, // Weepinbell + NATIONAL_DEX_VICTREEBEL, // Victreebel + NATIONAL_DEX_PONYTA, // Ponyta + NATIONAL_DEX_RAPIDASH, // Rapidash + NATIONAL_DEX_SLOWPOKE, // Slowpoke + NATIONAL_DEX_SLOWBRO, // Slowbro + NATIONAL_DEX_FARFETCHD, // Farfetch'd + NATIONAL_DEX_SEEL, // Seel + NATIONAL_DEX_DEWGONG, // Dewgong + NATIONAL_DEX_SHELLDER, // Shellder + NATIONAL_DEX_CLOYSTER, // Cloyster + NATIONAL_DEX_GASTLY, // Gastly + NATIONAL_DEX_HAUNTER, // Haunter + NATIONAL_DEX_GENGAR, // Gengar + NATIONAL_DEX_ONIX, // Onix + NATIONAL_DEX_DROWZEE, // Drowzee + NATIONAL_DEX_HYPNO, // Hypno + NATIONAL_DEX_KRABBY, // Krabby + NATIONAL_DEX_KINGLER, // Kingler + NATIONAL_DEX_EXEGGCUTE, // Exeggcute + NATIONAL_DEX_EXEGGUTOR, // Exeggutor + NATIONAL_DEX_CUBONE, // Cubone + NATIONAL_DEX_MAROWAK, // Marowak + NATIONAL_DEX_HITMONLEE, // Hitmonlee + NATIONAL_DEX_HITMONCHAN, // Hitmonchan + NATIONAL_DEX_LICKITUNG, // Lickitung + NATIONAL_DEX_CHANSEY, // Chansey + NATIONAL_DEX_TANGELA, // Tangela + NATIONAL_DEX_KANGASKHAN, // Kangaskhan + NATIONAL_DEX_MR_MIME, // Mr. Mime + NATIONAL_DEX_SCYTHER, // Scyther + NATIONAL_DEX_JYNX, // Jynx + NATIONAL_DEX_ELECTABUZZ, // Electabuzz + NATIONAL_DEX_MAGMAR, // Magmar + NATIONAL_DEX_TAUROS, // Tauros + NATIONAL_DEX_LAPRAS, // Lapras + NATIONAL_DEX_DITTO, // Ditto + NATIONAL_DEX_EEVEE, // Eevee + NATIONAL_DEX_VAPOREON, // Vaporeon + NATIONAL_DEX_JOLTEON, // Jolteon + NATIONAL_DEX_FLAREON, // Flareon + NATIONAL_DEX_PORYGON, // Porygon + NATIONAL_DEX_OMANYTE, // Omanyte + NATIONAL_DEX_OMASTAR, // Omastar + NATIONAL_DEX_KABUTO, // Kabuto + NATIONAL_DEX_KABUTOPS, // Kabutops + NATIONAL_DEX_AERODACTYL, // Aerodactyl + NATIONAL_DEX_SNORLAX, // Snorlax + NATIONAL_DEX_ARTICUNO, // Articuno + NATIONAL_DEX_ZAPDOS, // Zapdos + NATIONAL_DEX_MOLTRES, // Moltres + NATIONAL_DEX_DRATINI, // Dratini + NATIONAL_DEX_DRAGONAIR, // Dragonair + NATIONAL_DEX_DRAGONITE, // Dragonite + NATIONAL_DEX_MEWTWO, // Mewtwo + NATIONAL_DEX_MEW, // Mew + NATIONAL_DEX_CHIKORITA, // Chikorita + NATIONAL_DEX_BAYLEEF, // Bayleef + NATIONAL_DEX_MEGANIUM, // Meganium + NATIONAL_DEX_CYNDAQUIL, // Cyndaquil + NATIONAL_DEX_QUILAVA, // Quilava + NATIONAL_DEX_TYPHLOSION, // Typhlosion + NATIONAL_DEX_TOTODILE, // Totodile + NATIONAL_DEX_CROCONAW, // Croconaw + NATIONAL_DEX_FERALIGATR, // Feraligatr + NATIONAL_DEX_SENTRET, // Sentret + NATIONAL_DEX_FURRET, // Furret + NATIONAL_DEX_HOOTHOOT, // Hoothoot + NATIONAL_DEX_NOCTOWL, // Noctowl + NATIONAL_DEX_LEDYBA, // Ledyba + NATIONAL_DEX_LEDIAN, // Ledian + NATIONAL_DEX_SPINARAK, // Spinarak + NATIONAL_DEX_ARIADOS, // Ariados + NATIONAL_DEX_CLEFFA, // Cleffa + NATIONAL_DEX_TOGEPI, // Togepi + NATIONAL_DEX_TOGETIC, // Togetic + NATIONAL_DEX_MAREEP, // Mareep + NATIONAL_DEX_FLAAFFY, // Flaaffy + NATIONAL_DEX_AMPHAROS, // Ampharos + NATIONAL_DEX_SUDOWOODO, // Sudowoodo + NATIONAL_DEX_POLITOED, // Politoed + NATIONAL_DEX_HOPPIP, // Hoppip + NATIONAL_DEX_SKIPLOOM, // Skiploom + NATIONAL_DEX_JUMPLUFF, // Jumpluff + NATIONAL_DEX_AIPOM, // Aipom + NATIONAL_DEX_SUNKERN, // Sunkern + NATIONAL_DEX_SUNFLORA, // Sunflora + NATIONAL_DEX_YANMA, // Yanma + NATIONAL_DEX_WOOPER, // Wooper + NATIONAL_DEX_QUAGSIRE, // Quagsire + NATIONAL_DEX_ESPEON, // Espeon + NATIONAL_DEX_UMBREON, // Umbreon + NATIONAL_DEX_MURKROW, // Murkrow + NATIONAL_DEX_SLOWKING, // Slowking + NATIONAL_DEX_MISDREAVUS, // Misdreavus + NATIONAL_DEX_UNOWN, // Unown A + NATIONAL_DEX_PINECO, // Pineco + NATIONAL_DEX_FORRETRESS, // Forretress + NATIONAL_DEX_DUNSPARCE, // Dunsparce + NATIONAL_DEX_GLIGAR, // Gligar + NATIONAL_DEX_STEELIX, // Steelix + NATIONAL_DEX_SNUBBULL, // Snubbull + NATIONAL_DEX_GRANBULL, // Granbull + NATIONAL_DEX_QWILFISH, // Qwilfish + NATIONAL_DEX_SCIZOR, // Scizor + NATIONAL_DEX_SHUCKLE, // Shuckle + NATIONAL_DEX_SNEASEL, // Sneasel + NATIONAL_DEX_TEDDIURSA, // Teddiursa + NATIONAL_DEX_URSARING, // Ursaring + NATIONAL_DEX_SWINUB, // Swinub + NATIONAL_DEX_PILOSWINE, // Piloswine + NATIONAL_DEX_REMORAID, // Remoraid + NATIONAL_DEX_OCTILLERY, // Octillery + NATIONAL_DEX_DELIBIRD, // Delibird + NATIONAL_DEX_MANTINE, // Mantine + NATIONAL_DEX_HOUNDOUR, // Houndour + NATIONAL_DEX_HOUNDOOM, // Houndoom + NATIONAL_DEX_PORYGON2, // Porygon2 + NATIONAL_DEX_STANTLER, // Stantler + NATIONAL_DEX_SMEARGLE, // Smeargle + NATIONAL_DEX_TYROGUE, // Tyrogue + NATIONAL_DEX_HITMONTOP, // Hitmontop + NATIONAL_DEX_SMOOCHUM, // Smoochum + NATIONAL_DEX_ELEKID, // Elekid + NATIONAL_DEX_MAGBY, // Magby + NATIONAL_DEX_MILTANK, // Miltank + NATIONAL_DEX_BLISSEY, // Blissey + NATIONAL_DEX_RAIKOU, // Raikou + NATIONAL_DEX_ENTEI, // Entei + NATIONAL_DEX_SUICUNE, // Suicune + NATIONAL_DEX_LARVITAR, // Larvitar + NATIONAL_DEX_PUPITAR, // Pupitar + NATIONAL_DEX_TYRANITAR, // Tyranitar + NATIONAL_DEX_LUGIA, // Lugia + NATIONAL_DEX_HO_OH, // Ho-Oh + NATIONAL_DEX_CELEBI, // Celebi + NATIONAL_DEX_OLD_UNOWN_B, // Unown B (Old) + NATIONAL_DEX_OLD_UNOWN_C, // Unown C (Old) + NATIONAL_DEX_OLD_UNOWN_D, // Unown D (Old) + NATIONAL_DEX_OLD_UNOWN_E, // Unown E (Old) + NATIONAL_DEX_OLD_UNOWN_F, // Unown F (Old) + NATIONAL_DEX_OLD_UNOWN_G, // Unown G (Old) + NATIONAL_DEX_OLD_UNOWN_H, // Unown H (Old) + NATIONAL_DEX_OLD_UNOWN_I, // Unown I (Old) + NATIONAL_DEX_OLD_UNOWN_J, // Unown J (Old) + NATIONAL_DEX_OLD_UNOWN_K, // Unown K (Old) + NATIONAL_DEX_OLD_UNOWN_L, // Unown L (Old) + NATIONAL_DEX_OLD_UNOWN_M, // Unown M (Old) + NATIONAL_DEX_OLD_UNOWN_N, // Unown N (Old) + NATIONAL_DEX_OLD_UNOWN_O, // Unown O (Old) + NATIONAL_DEX_OLD_UNOWN_P, // Unown P (Old) + NATIONAL_DEX_OLD_UNOWN_Q, // Unown Q (Old) + NATIONAL_DEX_OLD_UNOWN_R, // Unown R (Old) + NATIONAL_DEX_OLD_UNOWN_S, // Unown S (Old) + NATIONAL_DEX_OLD_UNOWN_T, // Unown T (Old) + NATIONAL_DEX_OLD_UNOWN_U, // Unown U (Old) + NATIONAL_DEX_OLD_UNOWN_V, // Unown V (Old) + NATIONAL_DEX_OLD_UNOWN_W, // Unown W (Old) + NATIONAL_DEX_OLD_UNOWN_X, // Unown X (Old) + NATIONAL_DEX_OLD_UNOWN_Y, // Unown Y (Old) + NATIONAL_DEX_OLD_UNOWN_Z, // Unown Z (Old) +}; const struct SpindaSpot gSpindaSpotGraphics[] = { -- cgit v1.2.3 From 8e2db87791fd43b96227fefb3798bb4fc47514aa Mon Sep 17 00:00:00 2001 From: Tetrable Date: Thu, 19 Jul 2018 18:22:37 +0100 Subject: Add HOENN_DEX + NATIONAL_DEX defines Added HOENN_DEX and NATIONAL_DEX defines for the pokedex arrays in pokemon_1.c --- include/constants/species.h | 832 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 832 insertions(+) diff --git a/include/constants/species.h b/include/constants/species.h index dc9856081..80c90381e 100644 --- a/include/constants/species.h +++ b/include/constants/species.h @@ -447,6 +447,838 @@ #define NUM_SPECIES SPECIES_EGG +// National Dex Index Defines + +#define NATIONAL_DEX_BULBASAUR 1 +#define NATIONAL_DEX_IVYSAUR 2 +#define NATIONAL_DEX_VENUSAUR 3 +#define NATIONAL_DEX_CHARMANDER 4 +#define NATIONAL_DEX_CHARMELEON 5 +#define NATIONAL_DEX_CHARIZARD 6 +#define NATIONAL_DEX_SQUIRTLE 7 +#define NATIONAL_DEX_WARTORTLE 8 +#define NATIONAL_DEX_BLASTOISE 9 +#define NATIONAL_DEX_CATERPIE 10 +#define NATIONAL_DEX_METAPOD 11 +#define NATIONAL_DEX_BUTTERFREE 12 +#define NATIONAL_DEX_WEEDLE 13 +#define NATIONAL_DEX_KAKUNA 14 +#define NATIONAL_DEX_BEEDRILL 15 +#define NATIONAL_DEX_PIDGEY 16 +#define NATIONAL_DEX_PIDGEOTTO 17 +#define NATIONAL_DEX_PIDGEOT 18 +#define NATIONAL_DEX_RATTATA 19 +#define NATIONAL_DEX_RATICATE 20 +#define NATIONAL_DEX_SPEAROW 21 +#define NATIONAL_DEX_FEAROW 22 +#define NATIONAL_DEX_EKANS 23 +#define NATIONAL_DEX_ARBOK 24 +#define NATIONAL_DEX_PIKACHU 25 +#define NATIONAL_DEX_RAICHU 26 +#define NATIONAL_DEX_SANDSHREW 27 +#define NATIONAL_DEX_SANDSLASH 28 +#define NATIONAL_DEX_NIDORAN_F 29 +#define NATIONAL_DEX_NIDORINA 30 +#define NATIONAL_DEX_NIDOQUEEN 31 +#define NATIONAL_DEX_NIDORAN_M 32 +#define NATIONAL_DEX_NIDORINO 33 +#define NATIONAL_DEX_NIDOKING 34 +#define NATIONAL_DEX_CLEFAIRY 35 +#define NATIONAL_DEX_CLEFABLE 36 +#define NATIONAL_DEX_VULPIX 37 +#define NATIONAL_DEX_NINETALES 38 +#define NATIONAL_DEX_JIGGLYPUFF 39 +#define NATIONAL_DEX_WIGGLYTUFF 40 +#define NATIONAL_DEX_ZUBAT 41 +#define NATIONAL_DEX_GOLBAT 42 +#define NATIONAL_DEX_ODDISH 43 +#define NATIONAL_DEX_GLOOM 44 +#define NATIONAL_DEX_VILEPLUME 45 +#define NATIONAL_DEX_PARAS 46 +#define NATIONAL_DEX_PARASECT 47 +#define NATIONAL_DEX_VENONAT 48 +#define NATIONAL_DEX_VENOMOTH 49 +#define NATIONAL_DEX_DIGLETT 50 +#define NATIONAL_DEX_DUGTRIO 51 +#define NATIONAL_DEX_MEOWTH 52 +#define NATIONAL_DEX_PERSIAN 53 +#define NATIONAL_DEX_PSYDUCK 54 +#define NATIONAL_DEX_GOLDUCK 55 +#define NATIONAL_DEX_MANKEY 56 +#define NATIONAL_DEX_PRIMEAPE 57 +#define NATIONAL_DEX_GROWLITHE 58 +#define NATIONAL_DEX_ARCANINE 59 +#define NATIONAL_DEX_POLIWAG 60 +#define NATIONAL_DEX_POLIWHIRL 61 +#define NATIONAL_DEX_POLIWRATH 62 +#define NATIONAL_DEX_ABRA 63 +#define NATIONAL_DEX_KADABRA 64 +#define NATIONAL_DEX_ALAKAZAM 65 +#define NATIONAL_DEX_MACHOP 66 +#define NATIONAL_DEX_MACHOKE 67 +#define NATIONAL_DEX_MACHAMP 68 +#define NATIONAL_DEX_BELLSPROUT 69 +#define NATIONAL_DEX_WEEPINBELL 70 +#define NATIONAL_DEX_VICTREEBEL 71 +#define NATIONAL_DEX_TENTACOOL 72 +#define NATIONAL_DEX_TENTACRUEL 73 +#define NATIONAL_DEX_GEODUDE 74 +#define NATIONAL_DEX_GRAVELER 75 +#define NATIONAL_DEX_GOLEM 76 +#define NATIONAL_DEX_PONYTA 77 +#define NATIONAL_DEX_RAPIDASH 78 +#define NATIONAL_DEX_SLOWPOKE 79 +#define NATIONAL_DEX_SLOWBRO 80 +#define NATIONAL_DEX_MAGNEMITE 81 +#define NATIONAL_DEX_MAGNETON 82 +#define NATIONAL_DEX_FARFETCHD 83 +#define NATIONAL_DEX_DODUO 84 +#define NATIONAL_DEX_DODRIO 85 +#define NATIONAL_DEX_SEEL 86 +#define NATIONAL_DEX_DEWGONG 87 +#define NATIONAL_DEX_GRIMER 88 +#define NATIONAL_DEX_MUK 89 +#define NATIONAL_DEX_SHELLDER 90 +#define NATIONAL_DEX_CLOYSTER 91 +#define NATIONAL_DEX_GASTLY 92 +#define NATIONAL_DEX_HAUNTER 93 +#define NATIONAL_DEX_GENGAR 94 +#define NATIONAL_DEX_ONIX 95 +#define NATIONAL_DEX_DROWZEE 96 +#define NATIONAL_DEX_HYPNO 97 +#define NATIONAL_DEX_KRABBY 98 +#define NATIONAL_DEX_KINGLER 99 +#define NATIONAL_DEX_VOLTORB 100 +#define NATIONAL_DEX_ELECTRODE 101 +#define NATIONAL_DEX_EXEGGCUTE 102 +#define NATIONAL_DEX_EXEGGUTOR 103 +#define NATIONAL_DEX_CUBONE 104 +#define NATIONAL_DEX_MAROWAK 105 +#define NATIONAL_DEX_HITMONLEE 106 +#define NATIONAL_DEX_HITMONCHAN 107 +#define NATIONAL_DEX_LICKITUNG 108 +#define NATIONAL_DEX_KOFFING 109 +#define NATIONAL_DEX_WEEZING 110 +#define NATIONAL_DEX_RHYHORN 111 +#define NATIONAL_DEX_RHYDON 112 +#define NATIONAL_DEX_CHANSEY 113 +#define NATIONAL_DEX_TANGELA 114 +#define NATIONAL_DEX_KANGASKHAN 115 +#define NATIONAL_DEX_HORSEA 116 +#define NATIONAL_DEX_SEADRA 117 +#define NATIONAL_DEX_GOLDEEN 118 +#define NATIONAL_DEX_SEAKING 119 +#define NATIONAL_DEX_STARYU 120 +#define NATIONAL_DEX_STARMIE 121 +#define NATIONAL_DEX_MR_MIME 122 +#define NATIONAL_DEX_SCYTHER 123 +#define NATIONAL_DEX_JYNX 124 +#define NATIONAL_DEX_ELECTABUZZ 125 +#define NATIONAL_DEX_MAGMAR 126 +#define NATIONAL_DEX_PINSIR 127 +#define NATIONAL_DEX_TAUROS 128 +#define NATIONAL_DEX_MAGIKARP 129 +#define NATIONAL_DEX_GYARADOS 130 +#define NATIONAL_DEX_LAPRAS 131 +#define NATIONAL_DEX_DITTO 132 +#define NATIONAL_DEX_EEVEE 133 +#define NATIONAL_DEX_VAPOREON 134 +#define NATIONAL_DEX_JOLTEON 135 +#define NATIONAL_DEX_FLAREON 136 +#define NATIONAL_DEX_PORYGON 137 +#define NATIONAL_DEX_OMANYTE 138 +#define NATIONAL_DEX_OMASTAR 139 +#define NATIONAL_DEX_KABUTO 140 +#define NATIONAL_DEX_KABUTOPS 141 +#define NATIONAL_DEX_AERODACTYL 142 +#define NATIONAL_DEX_SNORLAX 143 +#define NATIONAL_DEX_ARTICUNO 144 +#define NATIONAL_DEX_ZAPDOS 145 +#define NATIONAL_DEX_MOLTRES 146 +#define NATIONAL_DEX_DRATINI 147 +#define NATIONAL_DEX_DRAGONAIR 148 +#define NATIONAL_DEX_DRAGONITE 149 +#define NATIONAL_DEX_MEWTWO 150 +#define NATIONAL_DEX_MEW 151 +#define NATIONAL_DEX_CHIKORITA 152 +#define NATIONAL_DEX_BAYLEEF 153 +#define NATIONAL_DEX_MEGANIUM 154 +#define NATIONAL_DEX_CYNDAQUIL 155 +#define NATIONAL_DEX_QUILAVA 156 +#define NATIONAL_DEX_TYPHLOSION 157 +#define NATIONAL_DEX_TOTODILE 158 +#define NATIONAL_DEX_CROCONAW 159 +#define NATIONAL_DEX_FERALIGATR 160 +#define NATIONAL_DEX_SENTRET 161 +#define NATIONAL_DEX_FURRET 162 +#define NATIONAL_DEX_HOOTHOOT 163 +#define NATIONAL_DEX_NOCTOWL 164 +#define NATIONAL_DEX_LEDYBA 165 +#define NATIONAL_DEX_LEDIAN 166 +#define NATIONAL_DEX_SPINARAK 167 +#define NATIONAL_DEX_ARIADOS 168 +#define NATIONAL_DEX_CROBAT 169 +#define NATIONAL_DEX_CHINCHOU 170 +#define NATIONAL_DEX_LANTURN 171 +#define NATIONAL_DEX_PICHU 172 +#define NATIONAL_DEX_CLEFFA 173 +#define NATIONAL_DEX_IGGLYBUFF 174 +#define NATIONAL_DEX_TOGEPI 175 +#define NATIONAL_DEX_TOGETIC 176 +#define NATIONAL_DEX_NATU 177 +#define NATIONAL_DEX_XATU 178 +#define NATIONAL_DEX_MAREEP 179 +#define NATIONAL_DEX_FLAAFFY 180 +#define NATIONAL_DEX_AMPHAROS 181 +#define NATIONAL_DEX_BELLOSSOM 182 +#define NATIONAL_DEX_MARILL 183 +#define NATIONAL_DEX_AZUMARILL 184 +#define NATIONAL_DEX_SUDOWOODO 185 +#define NATIONAL_DEX_POLITOED 186 +#define NATIONAL_DEX_HOPPIP 187 +#define NATIONAL_DEX_SKIPLOOM 188 +#define NATIONAL_DEX_JUMPLUFF 189 +#define NATIONAL_DEX_AIPOM 190 +#define NATIONAL_DEX_SUNKERN 191 +#define NATIONAL_DEX_SUNFLORA 192 +#define NATIONAL_DEX_YANMA 193 +#define NATIONAL_DEX_WOOPER 194 +#define NATIONAL_DEX_QUAGSIRE 195 +#define NATIONAL_DEX_ESPEON 196 +#define NATIONAL_DEX_UMBREON 197 +#define NATIONAL_DEX_MURKROW 198 +#define NATIONAL_DEX_SLOWKING 199 +#define NATIONAL_DEX_MISDREAVUS 200 +#define NATIONAL_DEX_UNOWN 201 +#define NATIONAL_DEX_WOBBUFFET 202 +#define NATIONAL_DEX_GIRAFARIG 203 +#define NATIONAL_DEX_PINECO 204 +#define NATIONAL_DEX_FORRETRESS 205 +#define NATIONAL_DEX_DUNSPARCE 206 +#define NATIONAL_DEX_GLIGAR 207 +#define NATIONAL_DEX_STEELIX 208 +#define NATIONAL_DEX_SNUBBULL 209 +#define NATIONAL_DEX_GRANBULL 210 +#define NATIONAL_DEX_QWILFISH 211 +#define NATIONAL_DEX_SCIZOR 212 +#define NATIONAL_DEX_SHUCKLE 213 +#define NATIONAL_DEX_HERACROSS 214 +#define NATIONAL_DEX_SNEASEL 215 +#define NATIONAL_DEX_TEDDIURSA 216 +#define NATIONAL_DEX_URSARING 217 +#define NATIONAL_DEX_SLUGMA 218 +#define NATIONAL_DEX_MAGCARGO 219 +#define NATIONAL_DEX_SWINUB 220 +#define NATIONAL_DEX_PILOSWINE 221 +#define NATIONAL_DEX_CORSOLA 222 +#define NATIONAL_DEX_REMORAID 223 +#define NATIONAL_DEX_OCTILLERY 224 +#define NATIONAL_DEX_DELIBIRD 225 +#define NATIONAL_DEX_MANTINE 226 +#define NATIONAL_DEX_SKARMORY 227 +#define NATIONAL_DEX_HOUNDOUR 228 +#define NATIONAL_DEX_HOUNDOOM 229 +#define NATIONAL_DEX_KINGDRA 230 +#define NATIONAL_DEX_PHANPY 231 +#define NATIONAL_DEX_DONPHAN 232 +#define NATIONAL_DEX_PORYGON2 233 +#define NATIONAL_DEX_STANTLER 234 +#define NATIONAL_DEX_SMEARGLE 235 +#define NATIONAL_DEX_TYROGUE 236 +#define NATIONAL_DEX_HITMONTOP 237 +#define NATIONAL_DEX_SMOOCHUM 238 +#define NATIONAL_DEX_ELEKID 239 +#define NATIONAL_DEX_MAGBY 240 +#define NATIONAL_DEX_MILTANK 241 +#define NATIONAL_DEX_BLISSEY 242 +#define NATIONAL_DEX_RAIKOU 243 +#define NATIONAL_DEX_ENTEI 244 +#define NATIONAL_DEX_SUICUNE 245 +#define NATIONAL_DEX_LARVITAR 246 +#define NATIONAL_DEX_PUPITAR 247 +#define NATIONAL_DEX_TYRANITAR 248 +#define NATIONAL_DEX_LUGIA 249 +#define NATIONAL_DEX_HO_OH 250 +#define NATIONAL_DEX_CELEBI 251 + +#define NATIONAL_DEX_OLD_UNOWN_B 387 +#define NATIONAL_DEX_OLD_UNOWN_C 388 +#define NATIONAL_DEX_OLD_UNOWN_D 389 +#define NATIONAL_DEX_OLD_UNOWN_E 390 +#define NATIONAL_DEX_OLD_UNOWN_F 391 +#define NATIONAL_DEX_OLD_UNOWN_G 392 +#define NATIONAL_DEX_OLD_UNOWN_H 393 +#define NATIONAL_DEX_OLD_UNOWN_I 394 +#define NATIONAL_DEX_OLD_UNOWN_J 395 +#define NATIONAL_DEX_OLD_UNOWN_K 396 +#define NATIONAL_DEX_OLD_UNOWN_L 397 +#define NATIONAL_DEX_OLD_UNOWN_M 398 +#define NATIONAL_DEX_OLD_UNOWN_N 399 +#define NATIONAL_DEX_OLD_UNOWN_O 400 +#define NATIONAL_DEX_OLD_UNOWN_P 401 +#define NATIONAL_DEX_OLD_UNOWN_Q 402 +#define NATIONAL_DEX_OLD_UNOWN_R 403 +#define NATIONAL_DEX_OLD_UNOWN_S 404 +#define NATIONAL_DEX_OLD_UNOWN_T 405 +#define NATIONAL_DEX_OLD_UNOWN_U 406 +#define NATIONAL_DEX_OLD_UNOWN_V 407 +#define NATIONAL_DEX_OLD_UNOWN_W 408 +#define NATIONAL_DEX_OLD_UNOWN_X 409 +#define NATIONAL_DEX_OLD_UNOWN_Y 410 +#define NATIONAL_DEX_OLD_UNOWN_Z 411 + +#define NATIONAL_DEX_TREECKO 252 +#define NATIONAL_DEX_GROVYLE 253 +#define NATIONAL_DEX_SCEPTILE 254 +#define NATIONAL_DEX_TORCHIC 255 +#define NATIONAL_DEX_COMBUSKEN 256 +#define NATIONAL_DEX_BLAZIKEN 257 +#define NATIONAL_DEX_MUDKIP 258 +#define NATIONAL_DEX_MARSHTOMP 259 +#define NATIONAL_DEX_SWAMPERT 260 +#define NATIONAL_DEX_POOCHYENA 261 +#define NATIONAL_DEX_MIGHTYENA 262 +#define NATIONAL_DEX_ZIGZAGOON 263 +#define NATIONAL_DEX_LINOONE 264 +#define NATIONAL_DEX_WURMPLE 265 +#define NATIONAL_DEX_SILCOON 266 +#define NATIONAL_DEX_BEAUTIFLY 267 +#define NATIONAL_DEX_CASCOON 268 +#define NATIONAL_DEX_DUSTOX 269 +#define NATIONAL_DEX_LOTAD 270 +#define NATIONAL_DEX_LOMBRE 271 +#define NATIONAL_DEX_LUDICOLO 272 +#define NATIONAL_DEX_SEEDOT 273 +#define NATIONAL_DEX_NUZLEAF 274 +#define NATIONAL_DEX_SHIFTRY 275 +#define NATIONAL_DEX_NINCADA 290 +#define NATIONAL_DEX_NINJASK 291 +#define NATIONAL_DEX_SHEDINJA 292 +#define NATIONAL_DEX_TAILLOW 276 +#define NATIONAL_DEX_SWELLOW 277 +#define NATIONAL_DEX_SHROOMISH 285 +#define NATIONAL_DEX_BRELOOM 286 +#define NATIONAL_DEX_SPINDA 327 +#define NATIONAL_DEX_WINGULL 278 +#define NATIONAL_DEX_PELIPPER 279 +#define NATIONAL_DEX_SURSKIT 283 +#define NATIONAL_DEX_MASQUERAIN 284 +#define NATIONAL_DEX_WAILMER 320 +#define NATIONAL_DEX_WAILORD 321 +#define NATIONAL_DEX_SKITTY 300 +#define NATIONAL_DEX_DELCATTY 301 +#define NATIONAL_DEX_KECLEON 352 +#define NATIONAL_DEX_BALTOY 343 +#define NATIONAL_DEX_CLAYDOL 344 +#define NATIONAL_DEX_NOSEPASS 299 +#define NATIONAL_DEX_TORKOAL 324 +#define NATIONAL_DEX_SABLEYE 302 +#define NATIONAL_DEX_BARBOACH 339 +#define NATIONAL_DEX_WHISCASH 340 +#define NATIONAL_DEX_LUVDISC 370 +#define NATIONAL_DEX_CORPHISH 341 +#define NATIONAL_DEX_CRAWDAUNT 342 +#define NATIONAL_DEX_FEEBAS 349 +#define NATIONAL_DEX_MILOTIC 350 +#define NATIONAL_DEX_CARVANHA 318 +#define NATIONAL_DEX_SHARPEDO 319 +#define NATIONAL_DEX_TRAPINCH 328 +#define NATIONAL_DEX_VIBRAVA 329 +#define NATIONAL_DEX_FLYGON 330 +#define NATIONAL_DEX_MAKUHITA 296 +#define NATIONAL_DEX_HARIYAMA 297 +#define NATIONAL_DEX_ELECTRIKE 309 +#define NATIONAL_DEX_MANECTRIC 310 +#define NATIONAL_DEX_NUMEL 322 +#define NATIONAL_DEX_CAMERUPT 323 +#define NATIONAL_DEX_SPHEAL 363 +#define NATIONAL_DEX_SEALEO 364 +#define NATIONAL_DEX_WALREIN 365 +#define NATIONAL_DEX_CACNEA 331 +#define NATIONAL_DEX_CACTURNE 332 +#define NATIONAL_DEX_SNORUNT 361 +#define NATIONAL_DEX_GLALIE 362 +#define NATIONAL_DEX_LUNATONE 337 +#define NATIONAL_DEX_SOLROCK 338 +#define NATIONAL_DEX_AZURILL 298 +#define NATIONAL_DEX_SPOINK 325 +#define NATIONAL_DEX_GRUMPIG 326 +#define NATIONAL_DEX_PLUSLE 311 +#define NATIONAL_DEX_MINUN 312 +#define NATIONAL_DEX_MAWILE 303 +#define NATIONAL_DEX_MEDITITE 307 +#define NATIONAL_DEX_MEDICHAM 308 +#define NATIONAL_DEX_SWABLU 333 +#define NATIONAL_DEX_ALTARIA 334 +#define NATIONAL_DEX_WYNAUT 360 +#define NATIONAL_DEX_DUSKULL 355 +#define NATIONAL_DEX_DUSCLOPS 356 +#define NATIONAL_DEX_ROSELIA 315 +#define NATIONAL_DEX_SLAKOTH 287 +#define NATIONAL_DEX_VIGOROTH 288 +#define NATIONAL_DEX_SLAKING 289 +#define NATIONAL_DEX_GULPIN 316 +#define NATIONAL_DEX_SWALOT 317 +#define NATIONAL_DEX_TROPIUS 357 +#define NATIONAL_DEX_WHISMUR 293 +#define NATIONAL_DEX_LOUDRED 294 +#define NATIONAL_DEX_EXPLOUD 295 +#define NATIONAL_DEX_CLAMPERL 366 +#define NATIONAL_DEX_HUNTAIL 367 +#define NATIONAL_DEX_GOREBYSS 368 +#define NATIONAL_DEX_ABSOL 359 +#define NATIONAL_DEX_SHUPPET 353 +#define NATIONAL_DEX_BANETTE 354 +#define NATIONAL_DEX_SEVIPER 336 +#define NATIONAL_DEX_ZANGOOSE 335 +#define NATIONAL_DEX_RELICANTH 369 +#define NATIONAL_DEX_ARON 304 +#define NATIONAL_DEX_LAIRON 305 +#define NATIONAL_DEX_AGGRON 306 +#define NATIONAL_DEX_CASTFORM 351 +#define NATIONAL_DEX_VOLBEAT 313 +#define NATIONAL_DEX_ILLUMISE 314 +#define NATIONAL_DEX_LILEEP 345 +#define NATIONAL_DEX_CRADILY 346 +#define NATIONAL_DEX_ANORITH 347 +#define NATIONAL_DEX_ARMALDO 348 +#define NATIONAL_DEX_RALTS 280 +#define NATIONAL_DEX_KIRLIA 281 +#define NATIONAL_DEX_GARDEVOIR 282 +#define NATIONAL_DEX_BAGON 371 +#define NATIONAL_DEX_SHELGON 372 +#define NATIONAL_DEX_SALAMENCE 373 +#define NATIONAL_DEX_BELDUM 374 +#define NATIONAL_DEX_METANG 375 +#define NATIONAL_DEX_METAGROSS 376 +#define NATIONAL_DEX_REGIROCK 377 +#define NATIONAL_DEX_REGICE 378 +#define NATIONAL_DEX_REGISTEEL 379 +#define NATIONAL_DEX_KYOGRE 382 +#define NATIONAL_DEX_GROUDON 383 +#define NATIONAL_DEX_RAYQUAZA 384 +#define NATIONAL_DEX_LATIAS 380 +#define NATIONAL_DEX_LATIOS 381 +#define NATIONAL_DEX_JIRACHI 385 +#define NATIONAL_DEX_DEOXYS 386 +#define NATIONAL_DEX_CHIMECHO 358 + +// Hoenn Dex Index Defines + +#define HOENN_DEX_BULBASAUR 203 +#define HOENN_DEX_IVYSAUR 204 +#define HOENN_DEX_VENUSAUR 205 +#define HOENN_DEX_CHARMANDER 206 +#define HOENN_DEX_CHARMELEON 207 +#define HOENN_DEX_CHARIZARD 208 +#define HOENN_DEX_SQUIRTLE 209 +#define HOENN_DEX_WARTORTLE 210 +#define HOENN_DEX_BLASTOISE 211 +#define HOENN_DEX_CATERPIE 212 +#define HOENN_DEX_METAPOD 213 +#define HOENN_DEX_BUTTERFREE 214 +#define HOENN_DEX_WEEDLE 215 +#define HOENN_DEX_KAKUNA 216 +#define HOENN_DEX_BEEDRILL 217 +#define HOENN_DEX_PIDGEY 218 +#define HOENN_DEX_PIDGEOTTO 219 +#define HOENN_DEX_PIDGEOT 220 +#define HOENN_DEX_RATTATA 221 +#define HOENN_DEX_RATICATE 222 +#define HOENN_DEX_SPEAROW 223 +#define HOENN_DEX_FEAROW 224 +#define HOENN_DEX_EKANS 225 +#define HOENN_DEX_ARBOK 226 +#define HOENN_DEX_PIKACHU 156 +#define HOENN_DEX_RAICHU 157 +#define HOENN_DEX_SANDSHREW 112 +#define HOENN_DEX_SANDSLASH 113 +#define HOENN_DEX_NIDORAN_F 227 +#define HOENN_DEX_NIDORINA 228 +#define HOENN_DEX_NIDOQUEEN 229 +#define HOENN_DEX_NIDORAN_M 230 +#define HOENN_DEX_NIDORINO 231 +#define HOENN_DEX_NIDOKING 232 +#define HOENN_DEX_CLEFAIRY 233 +#define HOENN_DEX_CLEFABLE 234 +#define HOENN_DEX_VULPIX 153 +#define HOENN_DEX_NINETALES 154 +#define HOENN_DEX_JIGGLYPUFF 138 +#define HOENN_DEX_WIGGLYTUFF 139 +#define HOENN_DEX_ZUBAT 63 +#define HOENN_DEX_GOLBAT 64 +#define HOENN_DEX_ODDISH 88 +#define HOENN_DEX_GLOOM 89 +#define HOENN_DEX_VILEPLUME 90 +#define HOENN_DEX_PARAS 235 +#define HOENN_DEX_PARASECT 236 +#define HOENN_DEX_VENONAT 237 +#define HOENN_DEX_VENOMOTH 238 +#define HOENN_DEX_DIGLETT 239 +#define HOENN_DEX_DUGTRIO 240 +#define HOENN_DEX_MEOWTH 241 +#define HOENN_DEX_PERSIAN 242 +#define HOENN_DEX_PSYDUCK 158 +#define HOENN_DEX_GOLDUCK 159 +#define HOENN_DEX_MANKEY 243 +#define HOENN_DEX_PRIMEAPE 244 +#define HOENN_DEX_GROWLITHE 245 +#define HOENN_DEX_ARCANINE 246 +#define HOENN_DEX_POLIWAG 247 +#define HOENN_DEX_POLIWHIRL 248 +#define HOENN_DEX_POLIWRATH 249 +#define HOENN_DEX_ABRA 39 +#define HOENN_DEX_KADABRA 40 +#define HOENN_DEX_ALAKAZAM 41 +#define HOENN_DEX_MACHOP 73 +#define HOENN_DEX_MACHOKE 74 +#define HOENN_DEX_MACHAMP 75 +#define HOENN_DEX_BELLSPROUT 250 +#define HOENN_DEX_WEEPINBELL 251 +#define HOENN_DEX_VICTREEBEL 252 +#define HOENN_DEX_TENTACOOL 66 +#define HOENN_DEX_TENTACRUEL 67 +#define HOENN_DEX_GEODUDE 57 +#define HOENN_DEX_GRAVELER 58 +#define HOENN_DEX_GOLEM 59 +#define HOENN_DEX_PONYTA 253 +#define HOENN_DEX_RAPIDASH 254 +#define HOENN_DEX_SLOWPOKE 255 +#define HOENN_DEX_SLOWBRO 256 +#define HOENN_DEX_MAGNEMITE 82 +#define HOENN_DEX_MAGNETON 83 +#define HOENN_DEX_FARFETCHD 257 +#define HOENN_DEX_DODUO 92 +#define HOENN_DEX_DODRIO 93 +#define HOENN_DEX_SEEL 258 +#define HOENN_DEX_DEWGONG 259 +#define HOENN_DEX_GRIMER 106 +#define HOENN_DEX_MUK 107 +#define HOENN_DEX_SHELLDER 260 +#define HOENN_DEX_CLOYSTER 261 +#define HOENN_DEX_GASTLY 262 +#define HOENN_DEX_HAUNTER 263 +#define HOENN_DEX_GENGAR 264 +#define HOENN_DEX_ONIX 265 +#define HOENN_DEX_DROWZEE 266 +#define HOENN_DEX_HYPNO 267 +#define HOENN_DEX_KRABBY 268 +#define HOENN_DEX_KINGLER 269 +#define HOENN_DEX_VOLTORB 84 +#define HOENN_DEX_ELECTRODE 85 +#define HOENN_DEX_EXEGGCUTE 270 +#define HOENN_DEX_EXEGGUTOR 271 +#define HOENN_DEX_CUBONE 272 +#define HOENN_DEX_MAROWAK 273 +#define HOENN_DEX_HITMONLEE 274 +#define HOENN_DEX_HITMONCHAN 275 +#define HOENN_DEX_LICKITUNG 276 +#define HOENN_DEX_KOFFING 108 +#define HOENN_DEX_WEEZING 109 +#define HOENN_DEX_RHYHORN 169 +#define HOENN_DEX_RHYDON 170 +#define HOENN_DEX_CHANSEY 277 +#define HOENN_DEX_TANGELA 278 +#define HOENN_DEX_KANGASKHAN 279 +#define HOENN_DEX_HORSEA 184 +#define HOENN_DEX_SEADRA 185 +#define HOENN_DEX_GOLDEEN 50 +#define HOENN_DEX_SEAKING 51 +#define HOENN_DEX_STARYU 143 +#define HOENN_DEX_STARMIE 144 +#define HOENN_DEX_MR_MIME 280 +#define HOENN_DEX_SCYTHER 281 +#define HOENN_DEX_JYNX 282 +#define HOENN_DEX_ELECTABUZZ 283 +#define HOENN_DEX_MAGMAR 284 +#define HOENN_DEX_PINSIR 167 +#define HOENN_DEX_TAUROS 285 +#define HOENN_DEX_MAGIKARP 52 +#define HOENN_DEX_GYARADOS 53 +#define HOENN_DEX_LAPRAS 286 +#define HOENN_DEX_DITTO 287 +#define HOENN_DEX_EEVEE 288 +#define HOENN_DEX_VAPOREON 289 +#define HOENN_DEX_JOLTEON 290 +#define HOENN_DEX_FLAREON 291 +#define HOENN_DEX_PORYGON 292 +#define HOENN_DEX_OMANYTE 293 +#define HOENN_DEX_OMASTAR 294 +#define HOENN_DEX_KABUTO 295 +#define HOENN_DEX_KABUTOPS 296 +#define HOENN_DEX_AERODACTYL 297 +#define HOENN_DEX_SNORLAX 298 +#define HOENN_DEX_ARTICUNO 299 +#define HOENN_DEX_ZAPDOS 300 +#define HOENN_DEX_MOLTRES 301 +#define HOENN_DEX_DRATINI 302 +#define HOENN_DEX_DRAGONAIR 303 +#define HOENN_DEX_DRAGONITE 304 +#define HOENN_DEX_MEWTWO 305 +#define HOENN_DEX_MEW 306 +#define HOENN_DEX_CHIKORITA 307 +#define HOENN_DEX_BAYLEEF 308 +#define HOENN_DEX_MEGANIUM 309 +#define HOENN_DEX_CYNDAQUIL 310 +#define HOENN_DEX_QUILAVA 311 +#define HOENN_DEX_TYPHLOSION 312 +#define HOENN_DEX_TOTODILE 313 +#define HOENN_DEX_CROCONAW 314 +#define HOENN_DEX_FERALIGATR 315 +#define HOENN_DEX_SENTRET 316 +#define HOENN_DEX_FURRET 317 +#define HOENN_DEX_HOOTHOOT 318 +#define HOENN_DEX_NOCTOWL 319 +#define HOENN_DEX_LEDYBA 320 +#define HOENN_DEX_LEDIAN 321 +#define HOENN_DEX_SPINARAK 322 +#define HOENN_DEX_ARIADOS 323 +#define HOENN_DEX_CROBAT 65 +#define HOENN_DEX_CHINCHOU 181 +#define HOENN_DEX_LANTURN 182 +#define HOENN_DEX_PICHU 155 +#define HOENN_DEX_CLEFFA 324 +#define HOENN_DEX_IGGLYBUFF 137 +#define HOENN_DEX_TOGEPI 325 +#define HOENN_DEX_TOGETIC 326 +#define HOENN_DEX_NATU 162 +#define HOENN_DEX_XATU 163 +#define HOENN_DEX_MAREEP 327 +#define HOENN_DEX_FLAAFFY 328 +#define HOENN_DEX_AMPHAROS 329 +#define HOENN_DEX_BELLOSSOM 91 +#define HOENN_DEX_MARILL 55 +#define HOENN_DEX_AZUMARILL 56 +#define HOENN_DEX_SUDOWOODO 330 +#define HOENN_DEX_POLITOED 331 +#define HOENN_DEX_HOPPIP 332 +#define HOENN_DEX_SKIPLOOM 333 +#define HOENN_DEX_JUMPLUFF 334 +#define HOENN_DEX_AIPOM 335 +#define HOENN_DEX_SUNKERN 336 +#define HOENN_DEX_SUNFLORA 337 +#define HOENN_DEX_YANMA 338 +#define HOENN_DEX_WOOPER 339 +#define HOENN_DEX_QUAGSIRE 340 +#define HOENN_DEX_ESPEON 341 +#define HOENN_DEX_UMBREON 342 +#define HOENN_DEX_MURKROW 343 +#define HOENN_DEX_SLOWKING 344 +#define HOENN_DEX_MISDREAVUS 345 +#define HOENN_DEX_UNOWN 346 +#define HOENN_DEX_WOBBUFFET 161 +#define HOENN_DEX_GIRAFARIG 164 +#define HOENN_DEX_PINECO 347 +#define HOENN_DEX_FORRETRESS 348 +#define HOENN_DEX_DUNSPARCE 349 +#define HOENN_DEX_GLIGAR 350 +#define HOENN_DEX_STEELIX 351 +#define HOENN_DEX_SNUBBULL 352 +#define HOENN_DEX_GRANBULL 353 +#define HOENN_DEX_QWILFISH 354 +#define HOENN_DEX_SCIZOR 355 +#define HOENN_DEX_SHUCKLE 356 +#define HOENN_DEX_HERACROSS 168 +#define HOENN_DEX_SNEASEL 357 +#define HOENN_DEX_TEDDIURSA 358 +#define HOENN_DEX_URSARING 359 +#define HOENN_DEX_SLUGMA 103 +#define HOENN_DEX_MAGCARGO 104 +#define HOENN_DEX_SWINUB 360 +#define HOENN_DEX_PILOSWINE 361 +#define HOENN_DEX_CORSOLA 180 +#define HOENN_DEX_REMORAID 362 +#define HOENN_DEX_OCTILLERY 363 +#define HOENN_DEX_DELIBIRD 364 +#define HOENN_DEX_MANTINE 365 +#define HOENN_DEX_SKARMORY 115 +#define HOENN_DEX_HOUNDOUR 366 +#define HOENN_DEX_HOUNDOOM 367 +#define HOENN_DEX_KINGDRA 186 +#define HOENN_DEX_PHANPY 165 +#define HOENN_DEX_DONPHAN 166 +#define HOENN_DEX_PORYGON2 368 +#define HOENN_DEX_STANTLER 369 +#define HOENN_DEX_SMEARGLE 370 +#define HOENN_DEX_TYROGUE 371 +#define HOENN_DEX_HITMONTOP 372 +#define HOENN_DEX_SMOOCHUM 373 +#define HOENN_DEX_ELEKID 374 +#define HOENN_DEX_MAGBY 375 +#define HOENN_DEX_MILTANK 376 +#define HOENN_DEX_BLISSEY 377 +#define HOENN_DEX_RAIKOU 378 +#define HOENN_DEX_ENTEI 379 +#define HOENN_DEX_SUICUNE 380 +#define HOENN_DEX_LARVITAR 381 +#define HOENN_DEX_PUPITAR 382 +#define HOENN_DEX_TYRANITAR 383 +#define HOENN_DEX_LUGIA 384 +#define HOENN_DEX_HO_OH 385 +#define HOENN_DEX_CELEBI 386 + +#define HOENN_DEX_OLD_UNOWN_B 387 +#define HOENN_DEX_OLD_UNOWN_C 388 +#define HOENN_DEX_OLD_UNOWN_D 389 +#define HOENN_DEX_OLD_UNOWN_E 390 +#define HOENN_DEX_OLD_UNOWN_F 391 +#define HOENN_DEX_OLD_UNOWN_G 392 +#define HOENN_DEX_OLD_UNOWN_H 393 +#define HOENN_DEX_OLD_UNOWN_I 394 +#define HOENN_DEX_OLD_UNOWN_J 395 +#define HOENN_DEX_OLD_UNOWN_K 396 +#define HOENN_DEX_OLD_UNOWN_L 397 +#define HOENN_DEX_OLD_UNOWN_M 398 +#define HOENN_DEX_OLD_UNOWN_N 399 +#define HOENN_DEX_OLD_UNOWN_O 400 +#define HOENN_DEX_OLD_UNOWN_P 401 +#define HOENN_DEX_OLD_UNOWN_Q 402 +#define HOENN_DEX_OLD_UNOWN_R 403 +#define HOENN_DEX_OLD_UNOWN_S 404 +#define HOENN_DEX_OLD_UNOWN_T 405 +#define HOENN_DEX_OLD_UNOWN_U 406 +#define HOENN_DEX_OLD_UNOWN_V 407 +#define HOENN_DEX_OLD_UNOWN_W 408 +#define HOENN_DEX_OLD_UNOWN_X 409 +#define HOENN_DEX_OLD_UNOWN_Y 410 +#define HOENN_DEX_OLD_UNOWN_Z 411 + +#define HOENN_DEX_TREECKO 1 +#define HOENN_DEX_GROVYLE 2 +#define HOENN_DEX_SCEPTILE 3 +#define HOENN_DEX_TORCHIC 4 +#define HOENN_DEX_COMBUSKEN 5 +#define HOENN_DEX_BLAZIKEN 6 +#define HOENN_DEX_MUDKIP 7 +#define HOENN_DEX_MARSHTOMP 8 +#define HOENN_DEX_SWAMPERT 9 +#define HOENN_DEX_POOCHYENA 10 +#define HOENN_DEX_MIGHTYENA 11 +#define HOENN_DEX_ZIGZAGOON 12 +#define HOENN_DEX_LINOONE 13 +#define HOENN_DEX_WURMPLE 14 +#define HOENN_DEX_SILCOON 15 +#define HOENN_DEX_BEAUTIFLY 16 +#define HOENN_DEX_CASCOON 17 +#define HOENN_DEX_DUSTOX 18 +#define HOENN_DEX_LOTAD 19 +#define HOENN_DEX_LOMBRE 20 +#define HOENN_DEX_LUDICOLO 21 +#define HOENN_DEX_SEEDOT 22 +#define HOENN_DEX_NUZLEAF 23 +#define HOENN_DEX_SHIFTRY 24 +#define HOENN_DEX_NINCADA 42 +#define HOENN_DEX_NINJASK 43 +#define HOENN_DEX_SHEDINJA 44 +#define HOENN_DEX_TAILLOW 25 +#define HOENN_DEX_SWELLOW 26 +#define HOENN_DEX_SHROOMISH 34 +#define HOENN_DEX_BRELOOM 35 +#define HOENN_DEX_SPINDA 114 +#define HOENN_DEX_WINGULL 27 +#define HOENN_DEX_PELIPPER 28 +#define HOENN_DEX_SURSKIT 32 +#define HOENN_DEX_MASQUERAIN 33 +#define HOENN_DEX_WAILMER 99 +#define HOENN_DEX_WAILORD 100 +#define HOENN_DEX_SKITTY 61 +#define HOENN_DEX_DELCATTY 62 +#define HOENN_DEX_KECLEON 145 +#define HOENN_DEX_BALTOY 131 +#define HOENN_DEX_CLAYDOL 132 +#define HOENN_DEX_NOSEPASS 60 +#define HOENN_DEX_TORKOAL 105 +#define HOENN_DEX_SABLEYE 68 +#define HOENN_DEX_BARBOACH 127 +#define HOENN_DEX_WHISCASH 128 +#define HOENN_DEX_LUVDISC 183 +#define HOENN_DEX_CORPHISH 129 +#define HOENN_DEX_CRAWDAUNT 130 +#define HOENN_DEX_FEEBAS 140 +#define HOENN_DEX_MILOTIC 141 +#define HOENN_DEX_CARVANHA 97 +#define HOENN_DEX_SHARPEDO 98 +#define HOENN_DEX_TRAPINCH 116 +#define HOENN_DEX_VIBRAVA 117 +#define HOENN_DEX_FLYGON 118 +#define HOENN_DEX_MAKUHITA 48 +#define HOENN_DEX_HARIYAMA 49 +#define HOENN_DEX_ELECTRIKE 78 +#define HOENN_DEX_MANECTRIC 79 +#define HOENN_DEX_NUMEL 101 +#define HOENN_DEX_CAMERUPT 102 +#define HOENN_DEX_SPHEAL 173 +#define HOENN_DEX_SEALEO 174 +#define HOENN_DEX_WALREIN 175 +#define HOENN_DEX_CACNEA 119 +#define HOENN_DEX_CACTURNE 120 +#define HOENN_DEX_SNORUNT 171 +#define HOENN_DEX_GLALIE 172 +#define HOENN_DEX_LUNATONE 125 +#define HOENN_DEX_SOLROCK 126 +#define HOENN_DEX_AZURILL 54 +#define HOENN_DEX_SPOINK 110 +#define HOENN_DEX_GRUMPIG 111 +#define HOENN_DEX_PLUSLE 80 +#define HOENN_DEX_MINUN 81 +#define HOENN_DEX_MAWILE 69 +#define HOENN_DEX_MEDITITE 76 +#define HOENN_DEX_MEDICHAM 77 +#define HOENN_DEX_SWABLU 121 +#define HOENN_DEX_ALTARIA 122 +#define HOENN_DEX_WYNAUT 160 +#define HOENN_DEX_DUSKULL 148 +#define HOENN_DEX_DUSCLOPS 149 +#define HOENN_DEX_ROSELIA 94 +#define HOENN_DEX_SLAKOTH 36 +#define HOENN_DEX_VIGOROTH 37 +#define HOENN_DEX_SLAKING 38 +#define HOENN_DEX_GULPIN 95 +#define HOENN_DEX_SWALOT 96 +#define HOENN_DEX_TROPIUS 150 +#define HOENN_DEX_WHISMUR 45 +#define HOENN_DEX_LOUDRED 46 +#define HOENN_DEX_EXPLOUD 47 +#define HOENN_DEX_CLAMPERL 176 +#define HOENN_DEX_HUNTAIL 177 +#define HOENN_DEX_GOREBYSS 178 +#define HOENN_DEX_ABSOL 152 +#define HOENN_DEX_SHUPPET 146 +#define HOENN_DEX_BANETTE 147 +#define HOENN_DEX_SEVIPER 124 +#define HOENN_DEX_ZANGOOSE 123 +#define HOENN_DEX_RELICANTH 179 +#define HOENN_DEX_ARON 70 +#define HOENN_DEX_LAIRON 71 +#define HOENN_DEX_AGGRON 72 +#define HOENN_DEX_CASTFORM 142 +#define HOENN_DEX_VOLBEAT 86 +#define HOENN_DEX_ILLUMISE 87 +#define HOENN_DEX_LILEEP 133 +#define HOENN_DEX_CRADILY 134 +#define HOENN_DEX_ANORITH 135 +#define HOENN_DEX_ARMALDO 136 +#define HOENN_DEX_RALTS 29 +#define HOENN_DEX_KIRLIA 30 +#define HOENN_DEX_GARDEVOIR 31 +#define HOENN_DEX_BAGON 187 +#define HOENN_DEX_SHELGON 188 +#define HOENN_DEX_SALAMENCE 189 +#define HOENN_DEX_BELDUM 190 +#define HOENN_DEX_METANG 191 +#define HOENN_DEX_METAGROSS 192 +#define HOENN_DEX_REGIROCK 193 +#define HOENN_DEX_REGICE 194 +#define HOENN_DEX_REGISTEEL 195 +#define HOENN_DEX_KYOGRE 198 +#define HOENN_DEX_GROUDON 199 +#define HOENN_DEX_RAYQUAZA 200 +#define HOENN_DEX_LATIAS 196 +#define HOENN_DEX_LATIOS 197 +#define HOENN_DEX_JIRACHI 201 +#define HOENN_DEX_DEOXYS 202 +#define HOENN_DEX_CHIMECHO 151 + #ifdef SAPPHIRE #define ROAMER_SPECIES SPECIES_LATIAS #else -- cgit v1.2.3 From 64ffab22a38b9e87bfe261d17243711888878286 Mon Sep 17 00:00:00 2001 From: Tetrable Date: Thu, 19 Jul 2018 18:38:05 +0100 Subject: made indents consistent --- src/pokemon_1.c | 828 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 414 insertions(+), 414 deletions(-) diff --git a/src/pokemon_1.c b/src/pokemon_1.c index f2ab3830c..ac83933cc 100644 --- a/src/pokemon_1.c +++ b/src/pokemon_1.c @@ -26,417 +26,417 @@ struct Pokemon gEnemyParty[6]; const u16 gSpeciesToHoennPokedexNum[] = // Assigns all species to the Hoenn Dex Index { - HOENN_DEX_BULBASAUR, // Bulbasaur - HOENN_DEX_IVYSAUR, // Ivysaur - HOENN_DEX_VENUSAUR, // Venusaur - HOENN_DEX_CHARMANDER, // Charmander - HOENN_DEX_CHARMELEON, // Charmeleon - HOENN_DEX_CHARIZARD, // Charizard - HOENN_DEX_SQUIRTLE, // Squirtle - HOENN_DEX_WARTORTLE, // Wartortle - HOENN_DEX_BLASTOISE, // Blastoise - HOENN_DEX_CATERPIE, // Caterpie - HOENN_DEX_METAPOD, // Metapod - HOENN_DEX_BUTTERFREE, // Butterfree - HOENN_DEX_WEEDLE, // Weedle - HOENN_DEX_KAKUNA, // Kakuna - HOENN_DEX_BEEDRILL, // Beedrill - HOENN_DEX_PIDGEY, // Pidgey - HOENN_DEX_PIDGEOTTO, // Pidgeotto - HOENN_DEX_PIDGEOT, // Pidgeot - HOENN_DEX_RATTATA, // Rattata - HOENN_DEX_RATICATE, // Raticate - HOENN_DEX_SPEAROW, // Spearow - HOENN_DEX_FEAROW, // Fearow - HOENN_DEX_EKANS, // Ekans - HOENN_DEX_ARBOK, // Arbok - HOENN_DEX_PIKACHU, // Pikachu - HOENN_DEX_RAICHU, // Raichu - HOENN_DEX_SANDSHREW, // Sandshrew - HOENN_DEX_SANDSLASH, // Sandslash - HOENN_DEX_NIDORAN_F, // Nidoran♀ - HOENN_DEX_NIDORINA, // Nidorina - HOENN_DEX_NIDOQUEEN, // Nidoqueen - HOENN_DEX_NIDORAN_M, // Nidoran♂ - HOENN_DEX_NIDORINO, // Nidorino - HOENN_DEX_NIDOKING, // Nidoking - HOENN_DEX_CLEFAIRY, // Clefairy - HOENN_DEX_CLEFABLE, // Clefable - HOENN_DEX_VULPIX, // Vulpix - HOENN_DEX_NINETALES, // Ninetales - HOENN_DEX_JIGGLYPUFF, // Jigglypuff - HOENN_DEX_WIGGLYTUFF, // Wigglytuff - HOENN_DEX_ZUBAT, // Zubat - HOENN_DEX_GOLBAT, // Golbat - HOENN_DEX_ODDISH, // Oddish - HOENN_DEX_GLOOM, // Gloom - HOENN_DEX_VILEPLUME, // Vileplume - HOENN_DEX_PARAS, // Paras - HOENN_DEX_PARASECT, // Parasect - HOENN_DEX_VENONAT, // Venonat - HOENN_DEX_VENOMOTH, // Venomoth - HOENN_DEX_DIGLETT, // Diglett - HOENN_DEX_DUGTRIO, // Dugtrio - HOENN_DEX_MEOWTH, // Meowth - HOENN_DEX_PERSIAN, // Persian - HOENN_DEX_PSYDUCK, // Psyduck - HOENN_DEX_GOLDUCK, // Golduck - HOENN_DEX_MANKEY, // Mankey - HOENN_DEX_PRIMEAPE, // Primeape - HOENN_DEX_GROWLITHE, // Growlithe - HOENN_DEX_ARCANINE, // Arcanine - HOENN_DEX_POLIWAG, // Poliwag - HOENN_DEX_POLIWHIRL, // Poliwhirl - HOENN_DEX_POLIWRATH, // Poliwrath - HOENN_DEX_ABRA, // Abra - HOENN_DEX_KADABRA, // Kadabra - HOENN_DEX_ALAKAZAM, // Alakazam - HOENN_DEX_MACHOP, // Machop - HOENN_DEX_MACHOKE, // Machoke - HOENN_DEX_MACHAMP, // Machamp - HOENN_DEX_BELLSPROUT, // Bellsprout - HOENN_DEX_WEEPINBELL, // Weepinbell - HOENN_DEX_VICTREEBEL, // Victreebel - HOENN_DEX_TENTACOOL, // Tentacool - HOENN_DEX_TENTACRUEL, // Tentacruel - HOENN_DEX_GEODUDE, // Geodude - HOENN_DEX_GRAVELER, // Graveler - HOENN_DEX_GOLEM, // Golem - HOENN_DEX_PONYTA, // Ponyta - HOENN_DEX_RAPIDASH, // Rapidash - HOENN_DEX_SLOWPOKE, // Slowpoke - HOENN_DEX_SLOWBRO, // Slowbro - HOENN_DEX_MAGNEMITE, // Magnemite - HOENN_DEX_MAGNETON, // Magneton - HOENN_DEX_FARFETCHD, // Farfetch'd - HOENN_DEX_DODUO, // Doduo - HOENN_DEX_DODRIO, // Dodrio - HOENN_DEX_SEEL, // Seel - HOENN_DEX_DEWGONG, // Dewgong - HOENN_DEX_GRIMER, // Grimer - HOENN_DEX_MUK, // Muk - HOENN_DEX_SHELLDER, // Shellder - HOENN_DEX_CLOYSTER, // Cloyster - HOENN_DEX_GASTLY, // Gastly - HOENN_DEX_HAUNTER, // Haunter - HOENN_DEX_GENGAR, // Gengar - HOENN_DEX_ONIX, // Onix - HOENN_DEX_DROWZEE, // Drowzee - HOENN_DEX_HYPNO, // Hypno - HOENN_DEX_KRABBY, // Krabby - HOENN_DEX_KINGLER, // Kingler - HOENN_DEX_VOLTORB, // Voltorb - HOENN_DEX_ELECTRODE, // Electrode - HOENN_DEX_EXEGGCUTE, // Exeggcute - HOENN_DEX_EXEGGUTOR, // Exeggutor - HOENN_DEX_CUBONE, // Cubone - HOENN_DEX_MAROWAK, // Marowak - HOENN_DEX_HITMONLEE, // Hitmonlee - HOENN_DEX_HITMONCHAN, // Hitmonchan - HOENN_DEX_LICKITUNG, // Lickitung - HOENN_DEX_KOFFING, // Koffing - HOENN_DEX_WEEZING, // Weezing - HOENN_DEX_RHYHORN, // Rhyhorn - HOENN_DEX_RHYDON, // Rhydon - HOENN_DEX_CHANSEY, // Chansey - HOENN_DEX_TANGELA, // Tangela - HOENN_DEX_KANGASKHAN, // Kangaskhan - HOENN_DEX_HORSEA, // Horsea - HOENN_DEX_SEADRA, // Seadra - HOENN_DEX_GOLDEEN, // Goldeen - HOENN_DEX_SEAKING, // Seaking - HOENN_DEX_STARYU, // Staryu - HOENN_DEX_STARMIE, // Starmie - HOENN_DEX_MR_MIME, // Mr. Mime - HOENN_DEX_SCYTHER, // Scyther - HOENN_DEX_JYNX, // Jynx - HOENN_DEX_ELECTABUZZ, // Electabuzz - HOENN_DEX_MAGMAR, // Magmar - HOENN_DEX_PINSIR, // Pinsir - HOENN_DEX_TAUROS, // Tauros - HOENN_DEX_MAGIKARP, // Magikarp - HOENN_DEX_GYARADOS, // Gyarados - HOENN_DEX_LAPRAS, // Lapras - HOENN_DEX_DITTO, // Ditto - HOENN_DEX_EEVEE, // Eevee - HOENN_DEX_VAPOREON, // Vaporeon - HOENN_DEX_JOLTEON, // Jolteon - HOENN_DEX_FLAREON, // Flareon - HOENN_DEX_PORYGON, // Porygon - HOENN_DEX_OMANYTE, // Omanyte - HOENN_DEX_OMASTAR, // Omastar - HOENN_DEX_KABUTO, // Kabuto - HOENN_DEX_KABUTOPS, // Kabutops - HOENN_DEX_AERODACTYL, // Aerodactyl - HOENN_DEX_SNORLAX, // Snorlax - HOENN_DEX_ARTICUNO, // Articuno - HOENN_DEX_ZAPDOS, // Zapdos - HOENN_DEX_MOLTRES, // Moltres - HOENN_DEX_DRATINI, // Dratini - HOENN_DEX_DRAGONAIR, // Dragonair - HOENN_DEX_DRAGONITE, // Dragonite - HOENN_DEX_MEWTWO, // Mewtwo - HOENN_DEX_MEW, // Mew - HOENN_DEX_CHIKORITA, // Chikorita - HOENN_DEX_BAYLEEF, // Bayleef - HOENN_DEX_MEGANIUM, // Meganium - HOENN_DEX_CYNDAQUIL, // Cyndaquil - HOENN_DEX_QUILAVA, // Quilava - HOENN_DEX_TYPHLOSION, // Typhlosion - HOENN_DEX_TOTODILE, // Totodile - HOENN_DEX_CROCONAW, // Croconaw - HOENN_DEX_FERALIGATR, // Feraligatr - HOENN_DEX_SENTRET, // Sentret - HOENN_DEX_FURRET, // Furret - HOENN_DEX_HOOTHOOT, // Hoothoot - HOENN_DEX_NOCTOWL, // Noctowl - HOENN_DEX_LEDYBA, // Ledyba - HOENN_DEX_LEDIAN, // Ledian - HOENN_DEX_SPINARAK, // Spinarak - HOENN_DEX_ARIADOS, // Ariados - HOENN_DEX_CROBAT, // Crobat - HOENN_DEX_CHINCHOU, // Chinchou - HOENN_DEX_LANTURN, // Lanturn - HOENN_DEX_PICHU, // Pichu - HOENN_DEX_CLEFFA, // Cleffa - HOENN_DEX_IGGLYBUFF, // Igglybuff - HOENN_DEX_TOGEPI, // Togepi - HOENN_DEX_TOGETIC, // Togetic - HOENN_DEX_NATU, // Natu - HOENN_DEX_XATU, // Xatu - HOENN_DEX_MAREEP, // Mareep - HOENN_DEX_FLAAFFY, // Flaaffy - HOENN_DEX_AMPHAROS, // Ampharos - HOENN_DEX_BELLOSSOM, // Bellossom - HOENN_DEX_MARILL, // Marill - HOENN_DEX_AZUMARILL, // Azumarill - HOENN_DEX_SUDOWOODO, // Sudowoodo - HOENN_DEX_POLITOED, // Politoed - HOENN_DEX_HOPPIP, // Hoppip - HOENN_DEX_SKIPLOOM, // Skiploom - HOENN_DEX_JUMPLUFF, // Jumpluff - HOENN_DEX_AIPOM, // Aipom - HOENN_DEX_SUNKERN, // Sunkern - HOENN_DEX_SUNFLORA, // Sunflora - HOENN_DEX_YANMA, // Yanma - HOENN_DEX_WOOPER, // Wooper - HOENN_DEX_QUAGSIRE, // Quagsire - HOENN_DEX_ESPEON, // Espeon - HOENN_DEX_UMBREON, // Umbreon - HOENN_DEX_MURKROW, // Murkrow - HOENN_DEX_SLOWKING, // Slowking - HOENN_DEX_MISDREAVUS, // Misdreavus - HOENN_DEX_UNOWN, // Unown A - HOENN_DEX_WOBBUFFET, // Wobbuffet - HOENN_DEX_GIRAFARIG, // Girafarig - HOENN_DEX_PINECO, // Pineco - HOENN_DEX_FORRETRESS, // Forretress - HOENN_DEX_DUNSPARCE, // Dunsparce - HOENN_DEX_GLIGAR, // Gligar - HOENN_DEX_STEELIX, // Steelix - HOENN_DEX_SNUBBULL, // Snubbull - HOENN_DEX_GRANBULL, // Granbull - HOENN_DEX_QWILFISH, // Qwilfish - HOENN_DEX_SCIZOR, // Scizor - HOENN_DEX_SHUCKLE, // Shuckle - HOENN_DEX_HERACROSS, // Heracross - HOENN_DEX_SNEASEL, // Sneasel - HOENN_DEX_TEDDIURSA, // Teddiursa - HOENN_DEX_URSARING, // Ursaring - HOENN_DEX_SLUGMA, // Slugma - HOENN_DEX_MAGCARGO, // Magcargo - HOENN_DEX_SWINUB, // Swinub - HOENN_DEX_PILOSWINE, // Piloswine - HOENN_DEX_CORSOLA, // Corsola - HOENN_DEX_REMORAID, // Remoraid - HOENN_DEX_OCTILLERY, // Octillery - HOENN_DEX_DELIBIRD, // Delibird - HOENN_DEX_MANTINE, // Mantine - HOENN_DEX_SKARMORY, // Skarmory - HOENN_DEX_HOUNDOUR, // Houndour - HOENN_DEX_HOUNDOOM, // Houndoom - HOENN_DEX_KINGDRA, // Kingdra - HOENN_DEX_PHANPY, // Phanpy - HOENN_DEX_DONPHAN, // Donphan - HOENN_DEX_PORYGON2, // Porygon2 - HOENN_DEX_STANTLER, // Stantler - HOENN_DEX_SMEARGLE, // Smeargle - HOENN_DEX_TYROGUE, // Tyrogue - HOENN_DEX_HITMONTOP, // Hitmontop - HOENN_DEX_SMOOCHUM, // Smoochum - HOENN_DEX_ELEKID, // Elekid - HOENN_DEX_MAGBY, // Magby - HOENN_DEX_MILTANK, // Miltank - HOENN_DEX_BLISSEY, // Blissey - HOENN_DEX_RAIKOU, // Raikou - HOENN_DEX_ENTEI, // Entei - HOENN_DEX_SUICUNE, // Suicune - HOENN_DEX_LARVITAR, // Larvitar - HOENN_DEX_PUPITAR, // Pupitar - HOENN_DEX_TYRANITAR, // Tyranitar - HOENN_DEX_LUGIA, // Lugia - HOENN_DEX_HO_OH, // Ho-Oh - HOENN_DEX_CELEBI, // Celebi - HOENN_DEX_OLD_UNOWN_B, // Unown B (Old) - HOENN_DEX_OLD_UNOWN_C, // Unown C (Old) - HOENN_DEX_OLD_UNOWN_D, // Unown D (Old) - HOENN_DEX_OLD_UNOWN_E, // Unown E (Old) - HOENN_DEX_OLD_UNOWN_F, // Unown F (Old) - HOENN_DEX_OLD_UNOWN_G, // Unown G (Old) - HOENN_DEX_OLD_UNOWN_H, // Unown H (Old) - HOENN_DEX_OLD_UNOWN_I, // Unown I (Old) - HOENN_DEX_OLD_UNOWN_J, // Unown J (Old) - HOENN_DEX_OLD_UNOWN_K, // Unown K (Old) - HOENN_DEX_OLD_UNOWN_L, // Unown L (Old) - HOENN_DEX_OLD_UNOWN_M, // Unown M (Old) - HOENN_DEX_OLD_UNOWN_N, // Unown N (Old) - HOENN_DEX_OLD_UNOWN_O, // Unown O (Old) - HOENN_DEX_OLD_UNOWN_P, // Unown P (Old) - HOENN_DEX_OLD_UNOWN_Q, // Unown Q (Old) - HOENN_DEX_OLD_UNOWN_R, // Unown R (Old) - HOENN_DEX_OLD_UNOWN_S, // Unown S (Old) - HOENN_DEX_OLD_UNOWN_T, // Unown T (Old) - HOENN_DEX_OLD_UNOWN_U, // Unown U (Old) - HOENN_DEX_OLD_UNOWN_V, // Unown V (Old) - HOENN_DEX_OLD_UNOWN_W, // Unown W (Old) - HOENN_DEX_OLD_UNOWN_X, // Unown X (Old) - HOENN_DEX_OLD_UNOWN_Y, // Unown Y (Old) - HOENN_DEX_OLD_UNOWN_Z, // Unown Z (Old) - HOENN_DEX_TREECKO, // Treecko - HOENN_DEX_GROVYLE, // Grovyle - HOENN_DEX_SCEPTILE, // Sceptile - HOENN_DEX_TORCHIC, // Torchic - HOENN_DEX_COMBUSKEN, // Combusken - HOENN_DEX_BLAZIKEN, // Blaziken - HOENN_DEX_MUDKIP, // Mudkip - HOENN_DEX_MARSHTOMP, // Marshtomp - HOENN_DEX_SWAMPERT, // Swampert - HOENN_DEX_POOCHYENA, // Poochyena - HOENN_DEX_MIGHTYENA, // Mightyena - HOENN_DEX_ZIGZAGOON, // Zigzagoon - HOENN_DEX_LINOONE, // Linoone - HOENN_DEX_WURMPLE, // Wurmple - HOENN_DEX_SILCOON, // Silcoon - HOENN_DEX_BEAUTIFLY, // Beautifly - HOENN_DEX_CASCOON, // Cascoon - HOENN_DEX_DUSTOX, // Dustox - HOENN_DEX_LOTAD, // Lotad - HOENN_DEX_LOMBRE, // Lombre - HOENN_DEX_LUDICOLO, // Ludicolo - HOENN_DEX_SEEDOT, // Seedot - HOENN_DEX_NUZLEAF, // Nuzleaf - HOENN_DEX_SHIFTRY, // Shiftry - HOENN_DEX_NINCADA, // Nincada - HOENN_DEX_NINJASK, // Ninjask - HOENN_DEX_SHEDINJA, // Shedinja - HOENN_DEX_TAILLOW, // Taillow - HOENN_DEX_SWELLOW, // Swellow - HOENN_DEX_SHROOMISH, // Shroomish - HOENN_DEX_BRELOOM, // Breloom - HOENN_DEX_SPINDA, // Spinda - HOENN_DEX_WINGULL, // Wingull - HOENN_DEX_PELIPPER, // Pelipper - HOENN_DEX_SURSKIT, // Surskit - HOENN_DEX_MASQUERAIN, // Masquerain - HOENN_DEX_WAILMER, // Wailmer - HOENN_DEX_WAILORD, // Wailord - HOENN_DEX_SKITTY, // Skitty - HOENN_DEX_DELCATTY, // Delcatty - HOENN_DEX_KECLEON, // Kecleon - HOENN_DEX_BALTOY, // Baltoy - HOENN_DEX_CLAYDOL, // Claydol - HOENN_DEX_NOSEPASS, // Nosepass - HOENN_DEX_TORKOAL, // Torkoal - HOENN_DEX_SABLEYE, // Sableye - HOENN_DEX_BARBOACH, // Barboach - HOENN_DEX_WHISCASH, // Whiscash - HOENN_DEX_LUVDISC, // Luvdisc - HOENN_DEX_CORPHISH, // Corphish - HOENN_DEX_CRAWDAUNT, // Crawdaunt - HOENN_DEX_FEEBAS, // Feebas - HOENN_DEX_MILOTIC, // Milotic - HOENN_DEX_CARVANHA, // Carvanha - HOENN_DEX_SHARPEDO, // Sharpedo - HOENN_DEX_TRAPINCH, // Trapinch - HOENN_DEX_VIBRAVA, // Vibrava - HOENN_DEX_FLYGON, // Flygon - HOENN_DEX_MAKUHITA, // Makuhita - HOENN_DEX_HARIYAMA, // Hariyama - HOENN_DEX_ELECTRIKE, // Electrike - HOENN_DEX_MANECTRIC, // Manectric - HOENN_DEX_NUMEL, // Numel - HOENN_DEX_CAMERUPT, // Camerupt - HOENN_DEX_SPHEAL, // Spheal - HOENN_DEX_SEALEO, // Sealeo - HOENN_DEX_WALREIN, // Walrein - HOENN_DEX_CACNEA, // Cacnea - HOENN_DEX_CACTURNE, // Cacturne - HOENN_DEX_SNORUNT, // Snorunt - HOENN_DEX_GLALIE, // Glalie - HOENN_DEX_LUNATONE, // Lunatone - HOENN_DEX_SOLROCK, // Solrock - HOENN_DEX_AZURILL, // Azurill - HOENN_DEX_SPOINK, // Spoink - HOENN_DEX_GRUMPIG, // Grumpig - HOENN_DEX_PLUSLE, // Plusle - HOENN_DEX_MINUN, // Minun - HOENN_DEX_MAWILE, // Mawile - HOENN_DEX_MEDITITE, // Meditite - HOENN_DEX_MEDICHAM, // Medicham - HOENN_DEX_SWABLU, // Swablu - HOENN_DEX_ALTARIA, // Altaria - HOENN_DEX_WYNAUT, // Wynaut - HOENN_DEX_DUSKULL, // Duskull - HOENN_DEX_DUSCLOPS, // Dusclops - HOENN_DEX_ROSELIA, // Roselia - HOENN_DEX_SLAKOTH, // Slakoth - HOENN_DEX_VIGOROTH, // Vigoroth - HOENN_DEX_SLAKING, // Slaking - HOENN_DEX_GULPIN, // Gulpin - HOENN_DEX_SWALOT, // Swalot - HOENN_DEX_TROPIUS, // Tropius - HOENN_DEX_WHISMUR, // Whismur - HOENN_DEX_LOUDRED, // Loudred - HOENN_DEX_EXPLOUD, // Exploud - HOENN_DEX_CLAMPERL, // Clamperl - HOENN_DEX_HUNTAIL, // Huntail - HOENN_DEX_GOREBYSS, // Gorebyss - HOENN_DEX_ABSOL, // Absol - HOENN_DEX_SHUPPET, // Shuppet - HOENN_DEX_BANETTE, // Banette - HOENN_DEX_SEVIPER, // Seviper - HOENN_DEX_ZANGOOSE, // Zangoose - HOENN_DEX_RELICANTH, // Relicanth - HOENN_DEX_ARON, // Aron - HOENN_DEX_LAIRON, // Lairon - HOENN_DEX_AGGRON, // Aggron - HOENN_DEX_CASTFORM, // Castform - HOENN_DEX_VOLBEAT, // Volbeat - HOENN_DEX_ILLUMISE, // Illumise - HOENN_DEX_LILEEP, // Lileep - HOENN_DEX_CRADILY, // Cradily - HOENN_DEX_ANORITH, // Anorith - HOENN_DEX_ARMALDO, // Armaldo - HOENN_DEX_RALTS, // Ralts - HOENN_DEX_KIRLIA, // Kirlia - HOENN_DEX_GARDEVOIR, // Gardevoir - HOENN_DEX_BAGON, // Bagon - HOENN_DEX_SHELGON, // Shelgon - HOENN_DEX_SALAMENCE, // Salamence - HOENN_DEX_BELDUM, // Beldum - HOENN_DEX_METANG, // Metang - HOENN_DEX_METAGROSS, // Metagross - HOENN_DEX_REGIROCK, // Regirock - HOENN_DEX_REGICE, // Regice - HOENN_DEX_REGISTEEL, // Registeel - HOENN_DEX_KYOGRE, // Kyogre - HOENN_DEX_GROUDON, // Groudon - HOENN_DEX_RAYQUAZA, // Rayquaza - HOENN_DEX_LATIAS, // Latias - HOENN_DEX_LATIOS, // Latios - HOENN_DEX_JIRACHI, // Jirachi - HOENN_DEX_DEOXYS, // Deoxys - HOENN_DEX_CHIMECHO // Chimecho + HOENN_DEX_BULBASAUR, // Bulbasaur + HOENN_DEX_IVYSAUR, // Ivysaur + HOENN_DEX_VENUSAUR, // Venusaur + HOENN_DEX_CHARMANDER, // Charmander + HOENN_DEX_CHARMELEON, // Charmeleon + HOENN_DEX_CHARIZARD, // Charizard + HOENN_DEX_SQUIRTLE, // Squirtle + HOENN_DEX_WARTORTLE, // Wartortle + HOENN_DEX_BLASTOISE, // Blastoise + HOENN_DEX_CATERPIE, // Caterpie + HOENN_DEX_METAPOD, // Metapod + HOENN_DEX_BUTTERFREE, // Butterfree + HOENN_DEX_WEEDLE, // Weedle + HOENN_DEX_KAKUNA, // Kakuna + HOENN_DEX_BEEDRILL, // Beedrill + HOENN_DEX_PIDGEY, // Pidgey + HOENN_DEX_PIDGEOTTO, // Pidgeotto + HOENN_DEX_PIDGEOT, // Pidgeot + HOENN_DEX_RATTATA, // Rattata + HOENN_DEX_RATICATE, // Raticate + HOENN_DEX_SPEAROW, // Spearow + HOENN_DEX_FEAROW, // Fearow + HOENN_DEX_EKANS, // Ekans + HOENN_DEX_ARBOK, // Arbok + HOENN_DEX_PIKACHU, // Pikachu + HOENN_DEX_RAICHU, // Raichu + HOENN_DEX_SANDSHREW, // Sandshrew + HOENN_DEX_SANDSLASH, // Sandslash + HOENN_DEX_NIDORAN_F, // Nidoran♀ + HOENN_DEX_NIDORINA, // Nidorina + HOENN_DEX_NIDOQUEEN, // Nidoqueen + HOENN_DEX_NIDORAN_M, // Nidoran♂ + HOENN_DEX_NIDORINO, // Nidorino + HOENN_DEX_NIDOKING, // Nidoking + HOENN_DEX_CLEFAIRY, // Clefairy + HOENN_DEX_CLEFABLE, // Clefable + HOENN_DEX_VULPIX, // Vulpix + HOENN_DEX_NINETALES, // Ninetales + HOENN_DEX_JIGGLYPUFF, // Jigglypuff + HOENN_DEX_WIGGLYTUFF, // Wigglytuff + HOENN_DEX_ZUBAT, // Zubat + HOENN_DEX_GOLBAT, // Golbat + HOENN_DEX_ODDISH, // Oddish + HOENN_DEX_GLOOM, // Gloom + HOENN_DEX_VILEPLUME, // Vileplume + HOENN_DEX_PARAS, // Paras + HOENN_DEX_PARASECT, // Parasect + HOENN_DEX_VENONAT, // Venonat + HOENN_DEX_VENOMOTH, // Venomoth + HOENN_DEX_DIGLETT, // Diglett + HOENN_DEX_DUGTRIO, // Dugtrio + HOENN_DEX_MEOWTH, // Meowth + HOENN_DEX_PERSIAN, // Persian + HOENN_DEX_PSYDUCK, // Psyduck + HOENN_DEX_GOLDUCK, // Golduck + HOENN_DEX_MANKEY, // Mankey + HOENN_DEX_PRIMEAPE, // Primeape + HOENN_DEX_GROWLITHE, // Growlithe + HOENN_DEX_ARCANINE, // Arcanine + HOENN_DEX_POLIWAG, // Poliwag + HOENN_DEX_POLIWHIRL, // Poliwhirl + HOENN_DEX_POLIWRATH, // Poliwrath + HOENN_DEX_ABRA, // Abra + HOENN_DEX_KADABRA, // Kadabra + HOENN_DEX_ALAKAZAM, // Alakazam + HOENN_DEX_MACHOP, // Machop + HOENN_DEX_MACHOKE, // Machoke + HOENN_DEX_MACHAMP, // Machamp + HOENN_DEX_BELLSPROUT, // Bellsprout + HOENN_DEX_WEEPINBELL, // Weepinbell + HOENN_DEX_VICTREEBEL, // Victreebel + HOENN_DEX_TENTACOOL, // Tentacool + HOENN_DEX_TENTACRUEL, // Tentacruel + HOENN_DEX_GEODUDE, // Geodude + HOENN_DEX_GRAVELER, // Graveler + HOENN_DEX_GOLEM, // Golem + HOENN_DEX_PONYTA, // Ponyta + HOENN_DEX_RAPIDASH, // Rapidash + HOENN_DEX_SLOWPOKE, // Slowpoke + HOENN_DEX_SLOWBRO, // Slowbro + HOENN_DEX_MAGNEMITE, // Magnemite + HOENN_DEX_MAGNETON, // Magneton + HOENN_DEX_FARFETCHD, // Farfetch'd + HOENN_DEX_DODUO, // Doduo + HOENN_DEX_DODRIO, // Dodrio + HOENN_DEX_SEEL, // Seel + HOENN_DEX_DEWGONG, // Dewgong + HOENN_DEX_GRIMER, // Grimer + HOENN_DEX_MUK, // Muk + HOENN_DEX_SHELLDER, // Shellder + HOENN_DEX_CLOYSTER, // Cloyster + HOENN_DEX_GASTLY, // Gastly + HOENN_DEX_HAUNTER, // Haunter + HOENN_DEX_GENGAR, // Gengar + HOENN_DEX_ONIX, // Onix + HOENN_DEX_DROWZEE, // Drowzee + HOENN_DEX_HYPNO, // Hypno + HOENN_DEX_KRABBY, // Krabby + HOENN_DEX_KINGLER, // Kingler + HOENN_DEX_VOLTORB, // Voltorb + HOENN_DEX_ELECTRODE, // Electrode + HOENN_DEX_EXEGGCUTE, // Exeggcute + HOENN_DEX_EXEGGUTOR, // Exeggutor + HOENN_DEX_CUBONE, // Cubone + HOENN_DEX_MAROWAK, // Marowak + HOENN_DEX_HITMONLEE, // Hitmonlee + HOENN_DEX_HITMONCHAN, // Hitmonchan + HOENN_DEX_LICKITUNG, // Lickitung + HOENN_DEX_KOFFING, // Koffing + HOENN_DEX_WEEZING, // Weezing + HOENN_DEX_RHYHORN, // Rhyhorn + HOENN_DEX_RHYDON, // Rhydon + HOENN_DEX_CHANSEY, // Chansey + HOENN_DEX_TANGELA, // Tangela + HOENN_DEX_KANGASKHAN, // Kangaskhan + HOENN_DEX_HORSEA, // Horsea + HOENN_DEX_SEADRA, // Seadra + HOENN_DEX_GOLDEEN, // Goldeen + HOENN_DEX_SEAKING, // Seaking + HOENN_DEX_STARYU, // Staryu + HOENN_DEX_STARMIE, // Starmie + HOENN_DEX_MR_MIME, // Mr. Mime + HOENN_DEX_SCYTHER, // Scyther + HOENN_DEX_JYNX, // Jynx + HOENN_DEX_ELECTABUZZ, // Electabuzz + HOENN_DEX_MAGMAR, // Magmar + HOENN_DEX_PINSIR, // Pinsir + HOENN_DEX_TAUROS, // Tauros + HOENN_DEX_MAGIKARP, // Magikarp + HOENN_DEX_GYARADOS, // Gyarados + HOENN_DEX_LAPRAS, // Lapras + HOENN_DEX_DITTO, // Ditto + HOENN_DEX_EEVEE, // Eevee + HOENN_DEX_VAPOREON, // Vaporeon + HOENN_DEX_JOLTEON, // Jolteon + HOENN_DEX_FLAREON, // Flareon + HOENN_DEX_PORYGON, // Porygon + HOENN_DEX_OMANYTE, // Omanyte + HOENN_DEX_OMASTAR, // Omastar + HOENN_DEX_KABUTO, // Kabuto + HOENN_DEX_KABUTOPS, // Kabutops + HOENN_DEX_AERODACTYL, // Aerodactyl + HOENN_DEX_SNORLAX, // Snorlax + HOENN_DEX_ARTICUNO, // Articuno + HOENN_DEX_ZAPDOS, // Zapdos + HOENN_DEX_MOLTRES, // Moltres + HOENN_DEX_DRATINI, // Dratini + HOENN_DEX_DRAGONAIR, // Dragonair + HOENN_DEX_DRAGONITE, // Dragonite + HOENN_DEX_MEWTWO, // Mewtwo + HOENN_DEX_MEW, // Mew + HOENN_DEX_CHIKORITA, // Chikorita + HOENN_DEX_BAYLEEF, // Bayleef + HOENN_DEX_MEGANIUM, // Meganium + HOENN_DEX_CYNDAQUIL, // Cyndaquil + HOENN_DEX_QUILAVA, // Quilava + HOENN_DEX_TYPHLOSION, // Typhlosion + HOENN_DEX_TOTODILE, // Totodile + HOENN_DEX_CROCONAW, // Croconaw + HOENN_DEX_FERALIGATR, // Feraligatr + HOENN_DEX_SENTRET, // Sentret + HOENN_DEX_FURRET, // Furret + HOENN_DEX_HOOTHOOT, // Hoothoot + HOENN_DEX_NOCTOWL, // Noctowl + HOENN_DEX_LEDYBA, // Ledyba + HOENN_DEX_LEDIAN, // Ledian + HOENN_DEX_SPINARAK, // Spinarak + HOENN_DEX_ARIADOS, // Ariados + HOENN_DEX_CROBAT, // Crobat + HOENN_DEX_CHINCHOU, // Chinchou + HOENN_DEX_LANTURN, // Lanturn + HOENN_DEX_PICHU, // Pichu + HOENN_DEX_CLEFFA, // Cleffa + HOENN_DEX_IGGLYBUFF, // Igglybuff + HOENN_DEX_TOGEPI, // Togepi + HOENN_DEX_TOGETIC, // Togetic + HOENN_DEX_NATU, // Natu + HOENN_DEX_XATU, // Xatu + HOENN_DEX_MAREEP, // Mareep + HOENN_DEX_FLAAFFY, // Flaaffy + HOENN_DEX_AMPHAROS, // Ampharos + HOENN_DEX_BELLOSSOM, // Bellossom + HOENN_DEX_MARILL, // Marill + HOENN_DEX_AZUMARILL, // Azumarill + HOENN_DEX_SUDOWOODO, // Sudowoodo + HOENN_DEX_POLITOED, // Politoed + HOENN_DEX_HOPPIP, // Hoppip + HOENN_DEX_SKIPLOOM, // Skiploom + HOENN_DEX_JUMPLUFF, // Jumpluff + HOENN_DEX_AIPOM, // Aipom + HOENN_DEX_SUNKERN, // Sunkern + HOENN_DEX_SUNFLORA, // Sunflora + HOENN_DEX_YANMA, // Yanma + HOENN_DEX_WOOPER, // Wooper + HOENN_DEX_QUAGSIRE, // Quagsire + HOENN_DEX_ESPEON, // Espeon + HOENN_DEX_UMBREON, // Umbreon + HOENN_DEX_MURKROW, // Murkrow + HOENN_DEX_SLOWKING, // Slowking + HOENN_DEX_MISDREAVUS, // Misdreavus + HOENN_DEX_UNOWN, // Unown A + HOENN_DEX_WOBBUFFET, // Wobbuffet + HOENN_DEX_GIRAFARIG, // Girafarig + HOENN_DEX_PINECO, // Pineco + HOENN_DEX_FORRETRESS, // Forretress + HOENN_DEX_DUNSPARCE, // Dunsparce + HOENN_DEX_GLIGAR, // Gligar + HOENN_DEX_STEELIX, // Steelix + HOENN_DEX_SNUBBULL, // Snubbull + HOENN_DEX_GRANBULL, // Granbull + HOENN_DEX_QWILFISH, // Qwilfish + HOENN_DEX_SCIZOR, // Scizor + HOENN_DEX_SHUCKLE, // Shuckle + HOENN_DEX_HERACROSS, // Heracross + HOENN_DEX_SNEASEL, // Sneasel + HOENN_DEX_TEDDIURSA, // Teddiursa + HOENN_DEX_URSARING, // Ursaring + HOENN_DEX_SLUGMA, // Slugma + HOENN_DEX_MAGCARGO, // Magcargo + HOENN_DEX_SWINUB, // Swinub + HOENN_DEX_PILOSWINE, // Piloswine + HOENN_DEX_CORSOLA, // Corsola + HOENN_DEX_REMORAID, // Remoraid + HOENN_DEX_OCTILLERY, // Octillery + HOENN_DEX_DELIBIRD, // Delibird + HOENN_DEX_MANTINE, // Mantine + HOENN_DEX_SKARMORY, // Skarmory + HOENN_DEX_HOUNDOUR, // Houndour + HOENN_DEX_HOUNDOOM, // Houndoom + HOENN_DEX_KINGDRA, // Kingdra + HOENN_DEX_PHANPY, // Phanpy + HOENN_DEX_DONPHAN, // Donphan + HOENN_DEX_PORYGON2, // Porygon2 + HOENN_DEX_STANTLER, // Stantler + HOENN_DEX_SMEARGLE, // Smeargle + HOENN_DEX_TYROGUE, // Tyrogue + HOENN_DEX_HITMONTOP, // Hitmontop + HOENN_DEX_SMOOCHUM, // Smoochum + HOENN_DEX_ELEKID, // Elekid + HOENN_DEX_MAGBY, // Magby + HOENN_DEX_MILTANK, // Miltank + HOENN_DEX_BLISSEY, // Blissey + HOENN_DEX_RAIKOU, // Raikou + HOENN_DEX_ENTEI, // Entei + HOENN_DEX_SUICUNE, // Suicune + HOENN_DEX_LARVITAR, // Larvitar + HOENN_DEX_PUPITAR, // Pupitar + HOENN_DEX_TYRANITAR, // Tyranitar + HOENN_DEX_LUGIA, // Lugia + HOENN_DEX_HO_OH, // Ho-Oh + HOENN_DEX_CELEBI, // Celebi + HOENN_DEX_OLD_UNOWN_B, // Unown B (Old) + HOENN_DEX_OLD_UNOWN_C, // Unown C (Old) + HOENN_DEX_OLD_UNOWN_D, // Unown D (Old) + HOENN_DEX_OLD_UNOWN_E, // Unown E (Old) + HOENN_DEX_OLD_UNOWN_F, // Unown F (Old) + HOENN_DEX_OLD_UNOWN_G, // Unown G (Old) + HOENN_DEX_OLD_UNOWN_H, // Unown H (Old) + HOENN_DEX_OLD_UNOWN_I, // Unown I (Old) + HOENN_DEX_OLD_UNOWN_J, // Unown J (Old) + HOENN_DEX_OLD_UNOWN_K, // Unown K (Old) + HOENN_DEX_OLD_UNOWN_L, // Unown L (Old) + HOENN_DEX_OLD_UNOWN_M, // Unown M (Old) + HOENN_DEX_OLD_UNOWN_N, // Unown N (Old) + HOENN_DEX_OLD_UNOWN_O, // Unown O (Old) + HOENN_DEX_OLD_UNOWN_P, // Unown P (Old) + HOENN_DEX_OLD_UNOWN_Q, // Unown Q (Old) + HOENN_DEX_OLD_UNOWN_R, // Unown R (Old) + HOENN_DEX_OLD_UNOWN_S, // Unown S (Old) + HOENN_DEX_OLD_UNOWN_T, // Unown T (Old) + HOENN_DEX_OLD_UNOWN_U, // Unown U (Old) + HOENN_DEX_OLD_UNOWN_V, // Unown V (Old) + HOENN_DEX_OLD_UNOWN_W, // Unown W (Old) + HOENN_DEX_OLD_UNOWN_X, // Unown X (Old) + HOENN_DEX_OLD_UNOWN_Y, // Unown Y (Old) + HOENN_DEX_OLD_UNOWN_Z, // Unown Z (Old) + HOENN_DEX_TREECKO, // Treecko + HOENN_DEX_GROVYLE, // Grovyle + HOENN_DEX_SCEPTILE, // Sceptile + HOENN_DEX_TORCHIC, // Torchic + HOENN_DEX_COMBUSKEN, // Combusken + HOENN_DEX_BLAZIKEN, // Blaziken + HOENN_DEX_MUDKIP, // Mudkip + HOENN_DEX_MARSHTOMP, // Marshtomp + HOENN_DEX_SWAMPERT, // Swampert + HOENN_DEX_POOCHYENA, // Poochyena + HOENN_DEX_MIGHTYENA, // Mightyena + HOENN_DEX_ZIGZAGOON, // Zigzagoon + HOENN_DEX_LINOONE, // Linoone + HOENN_DEX_WURMPLE, // Wurmple + HOENN_DEX_SILCOON, // Silcoon + HOENN_DEX_BEAUTIFLY, // Beautifly + HOENN_DEX_CASCOON, // Cascoon + HOENN_DEX_DUSTOX, // Dustox + HOENN_DEX_LOTAD, // Lotad + HOENN_DEX_LOMBRE, // Lombre + HOENN_DEX_LUDICOLO, // Ludicolo + HOENN_DEX_SEEDOT, // Seedot + HOENN_DEX_NUZLEAF, // Nuzleaf + HOENN_DEX_SHIFTRY, // Shiftry + HOENN_DEX_NINCADA, // Nincada + HOENN_DEX_NINJASK, // Ninjask + HOENN_DEX_SHEDINJA, // Shedinja + HOENN_DEX_TAILLOW, // Taillow + HOENN_DEX_SWELLOW, // Swellow + HOENN_DEX_SHROOMISH, // Shroomish + HOENN_DEX_BRELOOM, // Breloom + HOENN_DEX_SPINDA, // Spinda + HOENN_DEX_WINGULL, // Wingull + HOENN_DEX_PELIPPER, // Pelipper + HOENN_DEX_SURSKIT, // Surskit + HOENN_DEX_MASQUERAIN, // Masquerain + HOENN_DEX_WAILMER, // Wailmer + HOENN_DEX_WAILORD, // Wailord + HOENN_DEX_SKITTY, // Skitty + HOENN_DEX_DELCATTY, // Delcatty + HOENN_DEX_KECLEON, // Kecleon + HOENN_DEX_BALTOY, // Baltoy + HOENN_DEX_CLAYDOL, // Claydol + HOENN_DEX_NOSEPASS, // Nosepass + HOENN_DEX_TORKOAL, // Torkoal + HOENN_DEX_SABLEYE, // Sableye + HOENN_DEX_BARBOACH, // Barboach + HOENN_DEX_WHISCASH, // Whiscash + HOENN_DEX_LUVDISC, // Luvdisc + HOENN_DEX_CORPHISH, // Corphish + HOENN_DEX_CRAWDAUNT, // Crawdaunt + HOENN_DEX_FEEBAS, // Feebas + HOENN_DEX_MILOTIC, // Milotic + HOENN_DEX_CARVANHA, // Carvanha + HOENN_DEX_SHARPEDO, // Sharpedo + HOENN_DEX_TRAPINCH, // Trapinch + HOENN_DEX_VIBRAVA, // Vibrava + HOENN_DEX_FLYGON, // Flygon + HOENN_DEX_MAKUHITA, // Makuhita + HOENN_DEX_HARIYAMA, // Hariyama + HOENN_DEX_ELECTRIKE, // Electrike + HOENN_DEX_MANECTRIC, // Manectric + HOENN_DEX_NUMEL, // Numel + HOENN_DEX_CAMERUPT, // Camerupt + HOENN_DEX_SPHEAL, // Spheal + HOENN_DEX_SEALEO, // Sealeo + HOENN_DEX_WALREIN, // Walrein + HOENN_DEX_CACNEA, // Cacnea + HOENN_DEX_CACTURNE, // Cacturne + HOENN_DEX_SNORUNT, // Snorunt + HOENN_DEX_GLALIE, // Glalie + HOENN_DEX_LUNATONE, // Lunatone + HOENN_DEX_SOLROCK, // Solrock + HOENN_DEX_AZURILL, // Azurill + HOENN_DEX_SPOINK, // Spoink + HOENN_DEX_GRUMPIG, // Grumpig + HOENN_DEX_PLUSLE, // Plusle + HOENN_DEX_MINUN, // Minun + HOENN_DEX_MAWILE, // Mawile + HOENN_DEX_MEDITITE, // Meditite + HOENN_DEX_MEDICHAM, // Medicham + HOENN_DEX_SWABLU, // Swablu + HOENN_DEX_ALTARIA, // Altaria + HOENN_DEX_WYNAUT, // Wynaut + HOENN_DEX_DUSKULL, // Duskull + HOENN_DEX_DUSCLOPS, // Dusclops + HOENN_DEX_ROSELIA, // Roselia + HOENN_DEX_SLAKOTH, // Slakoth + HOENN_DEX_VIGOROTH, // Vigoroth + HOENN_DEX_SLAKING, // Slaking + HOENN_DEX_GULPIN, // Gulpin + HOENN_DEX_SWALOT, // Swalot + HOENN_DEX_TROPIUS, // Tropius + HOENN_DEX_WHISMUR, // Whismur + HOENN_DEX_LOUDRED, // Loudred + HOENN_DEX_EXPLOUD, // Exploud + HOENN_DEX_CLAMPERL, // Clamperl + HOENN_DEX_HUNTAIL, // Huntail + HOENN_DEX_GOREBYSS, // Gorebyss + HOENN_DEX_ABSOL, // Absol + HOENN_DEX_SHUPPET, // Shuppet + HOENN_DEX_BANETTE, // Banette + HOENN_DEX_SEVIPER, // Seviper + HOENN_DEX_ZANGOOSE, // Zangoose + HOENN_DEX_RELICANTH, // Relicanth + HOENN_DEX_ARON, // Aron + HOENN_DEX_LAIRON, // Lairon + HOENN_DEX_AGGRON, // Aggron + HOENN_DEX_CASTFORM, // Castform + HOENN_DEX_VOLBEAT, // Volbeat + HOENN_DEX_ILLUMISE, // Illumise + HOENN_DEX_LILEEP, // Lileep + HOENN_DEX_CRADILY, // Cradily + HOENN_DEX_ANORITH, // Anorith + HOENN_DEX_ARMALDO, // Armaldo + HOENN_DEX_RALTS, // Ralts + HOENN_DEX_KIRLIA, // Kirlia + HOENN_DEX_GARDEVOIR, // Gardevoir + HOENN_DEX_BAGON, // Bagon + HOENN_DEX_SHELGON, // Shelgon + HOENN_DEX_SALAMENCE, // Salamence + HOENN_DEX_BELDUM, // Beldum + HOENN_DEX_METANG, // Metang + HOENN_DEX_METAGROSS, // Metagross + HOENN_DEX_REGIROCK, // Regirock + HOENN_DEX_REGICE, // Regice + HOENN_DEX_REGISTEEL, // Registeel + HOENN_DEX_KYOGRE, // Kyogre + HOENN_DEX_GROUDON, // Groudon + HOENN_DEX_RAYQUAZA, // Rayquaza + HOENN_DEX_LATIAS, // Latias + HOENN_DEX_LATIOS, // Latios + HOENN_DEX_JIRACHI, // Jirachi + HOENN_DEX_DEOXYS, // Deoxys + HOENN_DEX_CHIMECHO // Chimecho }; const u16 gSpeciesToNationalPokedexNum[] = // Assigns all species to the National Dex Index @@ -1035,12 +1035,12 @@ const u16 gHoennToNationalOrder[] = // Assigns Hoenn Dex Pokémon (Using Nationa NATIONAL_DEX_HUNTAIL, // Huntail NATIONAL_DEX_GOREBYSS, // Gorebyss NATIONAL_DEX_RELICANTH, // Relicanth - NATIONAL_DEX_CORSOLA, // Relicanth + NATIONAL_DEX_CORSOLA, // Corsola NATIONAL_DEX_CHINCHOU, // Chinchou NATIONAL_DEX_LANTURN, // Lanturn NATIONAL_DEX_LUVDISC, // Luvdisc - NATIONAL_DEX_HORSEA, // Horsea - NATIONAL_DEX_SEADRA, // Seadra + NATIONAL_DEX_HORSEA, // Horsea + NATIONAL_DEX_SEADRA, // Seadra NATIONAL_DEX_KINGDRA, // Kingdra NATIONAL_DEX_BAGON, // Bagon NATIONAL_DEX_SHELGON, // Shelgon -- cgit v1.2.3 From 6e45eeee3f27603ef000ba3523aee8441cbc1cd4 Mon Sep 17 00:00:00 2001 From: Tetrable Date: Thu, 19 Jul 2018 19:38:41 +0100 Subject: improved commenting --- src/pokemon_1.c | 2473 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 1238 insertions(+), 1235 deletions(-) diff --git a/src/pokemon_1.c b/src/pokemon_1.c index ac83933cc..8bba7a708 100644 --- a/src/pokemon_1.c +++ b/src/pokemon_1.c @@ -24,1249 +24,1252 @@ struct Pokemon gPlayerParty[6]; u8 gEnemyPartyCount; struct Pokemon gEnemyParty[6]; -const u16 gSpeciesToHoennPokedexNum[] = // Assigns all species to the Hoenn Dex Index +const u16 gSpeciesToHoennPokedexNum[] = // Assigns all species to the Hoenn Dex Index (Summary No. for Hoenn Dex) { - HOENN_DEX_BULBASAUR, // Bulbasaur - HOENN_DEX_IVYSAUR, // Ivysaur - HOENN_DEX_VENUSAUR, // Venusaur - HOENN_DEX_CHARMANDER, // Charmander - HOENN_DEX_CHARMELEON, // Charmeleon - HOENN_DEX_CHARIZARD, // Charizard - HOENN_DEX_SQUIRTLE, // Squirtle - HOENN_DEX_WARTORTLE, // Wartortle - HOENN_DEX_BLASTOISE, // Blastoise - HOENN_DEX_CATERPIE, // Caterpie - HOENN_DEX_METAPOD, // Metapod - HOENN_DEX_BUTTERFREE, // Butterfree - HOENN_DEX_WEEDLE, // Weedle - HOENN_DEX_KAKUNA, // Kakuna - HOENN_DEX_BEEDRILL, // Beedrill - HOENN_DEX_PIDGEY, // Pidgey - HOENN_DEX_PIDGEOTTO, // Pidgeotto - HOENN_DEX_PIDGEOT, // Pidgeot - HOENN_DEX_RATTATA, // Rattata - HOENN_DEX_RATICATE, // Raticate - HOENN_DEX_SPEAROW, // Spearow - HOENN_DEX_FEAROW, // Fearow - HOENN_DEX_EKANS, // Ekans - HOENN_DEX_ARBOK, // Arbok - HOENN_DEX_PIKACHU, // Pikachu - HOENN_DEX_RAICHU, // Raichu - HOENN_DEX_SANDSHREW, // Sandshrew - HOENN_DEX_SANDSLASH, // Sandslash - HOENN_DEX_NIDORAN_F, // Nidoran♀ - HOENN_DEX_NIDORINA, // Nidorina - HOENN_DEX_NIDOQUEEN, // Nidoqueen - HOENN_DEX_NIDORAN_M, // Nidoran♂ - HOENN_DEX_NIDORINO, // Nidorino - HOENN_DEX_NIDOKING, // Nidoking - HOENN_DEX_CLEFAIRY, // Clefairy - HOENN_DEX_CLEFABLE, // Clefable - HOENN_DEX_VULPIX, // Vulpix - HOENN_DEX_NINETALES, // Ninetales - HOENN_DEX_JIGGLYPUFF, // Jigglypuff - HOENN_DEX_WIGGLYTUFF, // Wigglytuff - HOENN_DEX_ZUBAT, // Zubat - HOENN_DEX_GOLBAT, // Golbat - HOENN_DEX_ODDISH, // Oddish - HOENN_DEX_GLOOM, // Gloom - HOENN_DEX_VILEPLUME, // Vileplume - HOENN_DEX_PARAS, // Paras - HOENN_DEX_PARASECT, // Parasect - HOENN_DEX_VENONAT, // Venonat - HOENN_DEX_VENOMOTH, // Venomoth - HOENN_DEX_DIGLETT, // Diglett - HOENN_DEX_DUGTRIO, // Dugtrio - HOENN_DEX_MEOWTH, // Meowth - HOENN_DEX_PERSIAN, // Persian - HOENN_DEX_PSYDUCK, // Psyduck - HOENN_DEX_GOLDUCK, // Golduck - HOENN_DEX_MANKEY, // Mankey - HOENN_DEX_PRIMEAPE, // Primeape - HOENN_DEX_GROWLITHE, // Growlithe - HOENN_DEX_ARCANINE, // Arcanine - HOENN_DEX_POLIWAG, // Poliwag - HOENN_DEX_POLIWHIRL, // Poliwhirl - HOENN_DEX_POLIWRATH, // Poliwrath - HOENN_DEX_ABRA, // Abra - HOENN_DEX_KADABRA, // Kadabra - HOENN_DEX_ALAKAZAM, // Alakazam - HOENN_DEX_MACHOP, // Machop - HOENN_DEX_MACHOKE, // Machoke - HOENN_DEX_MACHAMP, // Machamp - HOENN_DEX_BELLSPROUT, // Bellsprout - HOENN_DEX_WEEPINBELL, // Weepinbell - HOENN_DEX_VICTREEBEL, // Victreebel - HOENN_DEX_TENTACOOL, // Tentacool - HOENN_DEX_TENTACRUEL, // Tentacruel - HOENN_DEX_GEODUDE, // Geodude - HOENN_DEX_GRAVELER, // Graveler - HOENN_DEX_GOLEM, // Golem - HOENN_DEX_PONYTA, // Ponyta - HOENN_DEX_RAPIDASH, // Rapidash - HOENN_DEX_SLOWPOKE, // Slowpoke - HOENN_DEX_SLOWBRO, // Slowbro - HOENN_DEX_MAGNEMITE, // Magnemite - HOENN_DEX_MAGNETON, // Magneton - HOENN_DEX_FARFETCHD, // Farfetch'd - HOENN_DEX_DODUO, // Doduo - HOENN_DEX_DODRIO, // Dodrio - HOENN_DEX_SEEL, // Seel - HOENN_DEX_DEWGONG, // Dewgong - HOENN_DEX_GRIMER, // Grimer - HOENN_DEX_MUK, // Muk - HOENN_DEX_SHELLDER, // Shellder - HOENN_DEX_CLOYSTER, // Cloyster - HOENN_DEX_GASTLY, // Gastly - HOENN_DEX_HAUNTER, // Haunter - HOENN_DEX_GENGAR, // Gengar - HOENN_DEX_ONIX, // Onix - HOENN_DEX_DROWZEE, // Drowzee - HOENN_DEX_HYPNO, // Hypno - HOENN_DEX_KRABBY, // Krabby - HOENN_DEX_KINGLER, // Kingler - HOENN_DEX_VOLTORB, // Voltorb - HOENN_DEX_ELECTRODE, // Electrode - HOENN_DEX_EXEGGCUTE, // Exeggcute - HOENN_DEX_EXEGGUTOR, // Exeggutor - HOENN_DEX_CUBONE, // Cubone - HOENN_DEX_MAROWAK, // Marowak - HOENN_DEX_HITMONLEE, // Hitmonlee - HOENN_DEX_HITMONCHAN, // Hitmonchan - HOENN_DEX_LICKITUNG, // Lickitung - HOENN_DEX_KOFFING, // Koffing - HOENN_DEX_WEEZING, // Weezing - HOENN_DEX_RHYHORN, // Rhyhorn - HOENN_DEX_RHYDON, // Rhydon - HOENN_DEX_CHANSEY, // Chansey - HOENN_DEX_TANGELA, // Tangela - HOENN_DEX_KANGASKHAN, // Kangaskhan - HOENN_DEX_HORSEA, // Horsea - HOENN_DEX_SEADRA, // Seadra - HOENN_DEX_GOLDEEN, // Goldeen - HOENN_DEX_SEAKING, // Seaking - HOENN_DEX_STARYU, // Staryu - HOENN_DEX_STARMIE, // Starmie - HOENN_DEX_MR_MIME, // Mr. Mime - HOENN_DEX_SCYTHER, // Scyther - HOENN_DEX_JYNX, // Jynx - HOENN_DEX_ELECTABUZZ, // Electabuzz - HOENN_DEX_MAGMAR, // Magmar - HOENN_DEX_PINSIR, // Pinsir - HOENN_DEX_TAUROS, // Tauros - HOENN_DEX_MAGIKARP, // Magikarp - HOENN_DEX_GYARADOS, // Gyarados - HOENN_DEX_LAPRAS, // Lapras - HOENN_DEX_DITTO, // Ditto - HOENN_DEX_EEVEE, // Eevee - HOENN_DEX_VAPOREON, // Vaporeon - HOENN_DEX_JOLTEON, // Jolteon - HOENN_DEX_FLAREON, // Flareon - HOENN_DEX_PORYGON, // Porygon - HOENN_DEX_OMANYTE, // Omanyte - HOENN_DEX_OMASTAR, // Omastar - HOENN_DEX_KABUTO, // Kabuto - HOENN_DEX_KABUTOPS, // Kabutops - HOENN_DEX_AERODACTYL, // Aerodactyl - HOENN_DEX_SNORLAX, // Snorlax - HOENN_DEX_ARTICUNO, // Articuno - HOENN_DEX_ZAPDOS, // Zapdos - HOENN_DEX_MOLTRES, // Moltres - HOENN_DEX_DRATINI, // Dratini - HOENN_DEX_DRAGONAIR, // Dragonair - HOENN_DEX_DRAGONITE, // Dragonite - HOENN_DEX_MEWTWO, // Mewtwo - HOENN_DEX_MEW, // Mew - HOENN_DEX_CHIKORITA, // Chikorita - HOENN_DEX_BAYLEEF, // Bayleef - HOENN_DEX_MEGANIUM, // Meganium - HOENN_DEX_CYNDAQUIL, // Cyndaquil - HOENN_DEX_QUILAVA, // Quilava - HOENN_DEX_TYPHLOSION, // Typhlosion - HOENN_DEX_TOTODILE, // Totodile - HOENN_DEX_CROCONAW, // Croconaw - HOENN_DEX_FERALIGATR, // Feraligatr - HOENN_DEX_SENTRET, // Sentret - HOENN_DEX_FURRET, // Furret - HOENN_DEX_HOOTHOOT, // Hoothoot - HOENN_DEX_NOCTOWL, // Noctowl - HOENN_DEX_LEDYBA, // Ledyba - HOENN_DEX_LEDIAN, // Ledian - HOENN_DEX_SPINARAK, // Spinarak - HOENN_DEX_ARIADOS, // Ariados - HOENN_DEX_CROBAT, // Crobat - HOENN_DEX_CHINCHOU, // Chinchou - HOENN_DEX_LANTURN, // Lanturn - HOENN_DEX_PICHU, // Pichu - HOENN_DEX_CLEFFA, // Cleffa - HOENN_DEX_IGGLYBUFF, // Igglybuff - HOENN_DEX_TOGEPI, // Togepi - HOENN_DEX_TOGETIC, // Togetic - HOENN_DEX_NATU, // Natu - HOENN_DEX_XATU, // Xatu - HOENN_DEX_MAREEP, // Mareep - HOENN_DEX_FLAAFFY, // Flaaffy - HOENN_DEX_AMPHAROS, // Ampharos - HOENN_DEX_BELLOSSOM, // Bellossom - HOENN_DEX_MARILL, // Marill - HOENN_DEX_AZUMARILL, // Azumarill - HOENN_DEX_SUDOWOODO, // Sudowoodo - HOENN_DEX_POLITOED, // Politoed - HOENN_DEX_HOPPIP, // Hoppip - HOENN_DEX_SKIPLOOM, // Skiploom - HOENN_DEX_JUMPLUFF, // Jumpluff - HOENN_DEX_AIPOM, // Aipom - HOENN_DEX_SUNKERN, // Sunkern - HOENN_DEX_SUNFLORA, // Sunflora - HOENN_DEX_YANMA, // Yanma - HOENN_DEX_WOOPER, // Wooper - HOENN_DEX_QUAGSIRE, // Quagsire - HOENN_DEX_ESPEON, // Espeon - HOENN_DEX_UMBREON, // Umbreon - HOENN_DEX_MURKROW, // Murkrow - HOENN_DEX_SLOWKING, // Slowking - HOENN_DEX_MISDREAVUS, // Misdreavus - HOENN_DEX_UNOWN, // Unown A - HOENN_DEX_WOBBUFFET, // Wobbuffet - HOENN_DEX_GIRAFARIG, // Girafarig - HOENN_DEX_PINECO, // Pineco - HOENN_DEX_FORRETRESS, // Forretress - HOENN_DEX_DUNSPARCE, // Dunsparce - HOENN_DEX_GLIGAR, // Gligar - HOENN_DEX_STEELIX, // Steelix - HOENN_DEX_SNUBBULL, // Snubbull - HOENN_DEX_GRANBULL, // Granbull - HOENN_DEX_QWILFISH, // Qwilfish - HOENN_DEX_SCIZOR, // Scizor - HOENN_DEX_SHUCKLE, // Shuckle - HOENN_DEX_HERACROSS, // Heracross - HOENN_DEX_SNEASEL, // Sneasel - HOENN_DEX_TEDDIURSA, // Teddiursa - HOENN_DEX_URSARING, // Ursaring - HOENN_DEX_SLUGMA, // Slugma - HOENN_DEX_MAGCARGO, // Magcargo - HOENN_DEX_SWINUB, // Swinub - HOENN_DEX_PILOSWINE, // Piloswine - HOENN_DEX_CORSOLA, // Corsola - HOENN_DEX_REMORAID, // Remoraid - HOENN_DEX_OCTILLERY, // Octillery - HOENN_DEX_DELIBIRD, // Delibird - HOENN_DEX_MANTINE, // Mantine - HOENN_DEX_SKARMORY, // Skarmory - HOENN_DEX_HOUNDOUR, // Houndour - HOENN_DEX_HOUNDOOM, // Houndoom - HOENN_DEX_KINGDRA, // Kingdra - HOENN_DEX_PHANPY, // Phanpy - HOENN_DEX_DONPHAN, // Donphan - HOENN_DEX_PORYGON2, // Porygon2 - HOENN_DEX_STANTLER, // Stantler - HOENN_DEX_SMEARGLE, // Smeargle - HOENN_DEX_TYROGUE, // Tyrogue - HOENN_DEX_HITMONTOP, // Hitmontop - HOENN_DEX_SMOOCHUM, // Smoochum - HOENN_DEX_ELEKID, // Elekid - HOENN_DEX_MAGBY, // Magby - HOENN_DEX_MILTANK, // Miltank - HOENN_DEX_BLISSEY, // Blissey - HOENN_DEX_RAIKOU, // Raikou - HOENN_DEX_ENTEI, // Entei - HOENN_DEX_SUICUNE, // Suicune - HOENN_DEX_LARVITAR, // Larvitar - HOENN_DEX_PUPITAR, // Pupitar - HOENN_DEX_TYRANITAR, // Tyranitar - HOENN_DEX_LUGIA, // Lugia - HOENN_DEX_HO_OH, // Ho-Oh - HOENN_DEX_CELEBI, // Celebi - HOENN_DEX_OLD_UNOWN_B, // Unown B (Old) - HOENN_DEX_OLD_UNOWN_C, // Unown C (Old) - HOENN_DEX_OLD_UNOWN_D, // Unown D (Old) - HOENN_DEX_OLD_UNOWN_E, // Unown E (Old) - HOENN_DEX_OLD_UNOWN_F, // Unown F (Old) - HOENN_DEX_OLD_UNOWN_G, // Unown G (Old) - HOENN_DEX_OLD_UNOWN_H, // Unown H (Old) - HOENN_DEX_OLD_UNOWN_I, // Unown I (Old) - HOENN_DEX_OLD_UNOWN_J, // Unown J (Old) - HOENN_DEX_OLD_UNOWN_K, // Unown K (Old) - HOENN_DEX_OLD_UNOWN_L, // Unown L (Old) - HOENN_DEX_OLD_UNOWN_M, // Unown M (Old) - HOENN_DEX_OLD_UNOWN_N, // Unown N (Old) - HOENN_DEX_OLD_UNOWN_O, // Unown O (Old) - HOENN_DEX_OLD_UNOWN_P, // Unown P (Old) - HOENN_DEX_OLD_UNOWN_Q, // Unown Q (Old) - HOENN_DEX_OLD_UNOWN_R, // Unown R (Old) - HOENN_DEX_OLD_UNOWN_S, // Unown S (Old) - HOENN_DEX_OLD_UNOWN_T, // Unown T (Old) - HOENN_DEX_OLD_UNOWN_U, // Unown U (Old) - HOENN_DEX_OLD_UNOWN_V, // Unown V (Old) - HOENN_DEX_OLD_UNOWN_W, // Unown W (Old) - HOENN_DEX_OLD_UNOWN_X, // Unown X (Old) - HOENN_DEX_OLD_UNOWN_Y, // Unown Y (Old) - HOENN_DEX_OLD_UNOWN_Z, // Unown Z (Old) - HOENN_DEX_TREECKO, // Treecko - HOENN_DEX_GROVYLE, // Grovyle - HOENN_DEX_SCEPTILE, // Sceptile - HOENN_DEX_TORCHIC, // Torchic - HOENN_DEX_COMBUSKEN, // Combusken - HOENN_DEX_BLAZIKEN, // Blaziken - HOENN_DEX_MUDKIP, // Mudkip - HOENN_DEX_MARSHTOMP, // Marshtomp - HOENN_DEX_SWAMPERT, // Swampert - HOENN_DEX_POOCHYENA, // Poochyena - HOENN_DEX_MIGHTYENA, // Mightyena - HOENN_DEX_ZIGZAGOON, // Zigzagoon - HOENN_DEX_LINOONE, // Linoone - HOENN_DEX_WURMPLE, // Wurmple - HOENN_DEX_SILCOON, // Silcoon - HOENN_DEX_BEAUTIFLY, // Beautifly - HOENN_DEX_CASCOON, // Cascoon - HOENN_DEX_DUSTOX, // Dustox - HOENN_DEX_LOTAD, // Lotad - HOENN_DEX_LOMBRE, // Lombre - HOENN_DEX_LUDICOLO, // Ludicolo - HOENN_DEX_SEEDOT, // Seedot - HOENN_DEX_NUZLEAF, // Nuzleaf - HOENN_DEX_SHIFTRY, // Shiftry - HOENN_DEX_NINCADA, // Nincada - HOENN_DEX_NINJASK, // Ninjask - HOENN_DEX_SHEDINJA, // Shedinja - HOENN_DEX_TAILLOW, // Taillow - HOENN_DEX_SWELLOW, // Swellow - HOENN_DEX_SHROOMISH, // Shroomish - HOENN_DEX_BRELOOM, // Breloom - HOENN_DEX_SPINDA, // Spinda - HOENN_DEX_WINGULL, // Wingull - HOENN_DEX_PELIPPER, // Pelipper - HOENN_DEX_SURSKIT, // Surskit - HOENN_DEX_MASQUERAIN, // Masquerain - HOENN_DEX_WAILMER, // Wailmer - HOENN_DEX_WAILORD, // Wailord - HOENN_DEX_SKITTY, // Skitty - HOENN_DEX_DELCATTY, // Delcatty - HOENN_DEX_KECLEON, // Kecleon - HOENN_DEX_BALTOY, // Baltoy - HOENN_DEX_CLAYDOL, // Claydol - HOENN_DEX_NOSEPASS, // Nosepass - HOENN_DEX_TORKOAL, // Torkoal - HOENN_DEX_SABLEYE, // Sableye - HOENN_DEX_BARBOACH, // Barboach - HOENN_DEX_WHISCASH, // Whiscash - HOENN_DEX_LUVDISC, // Luvdisc - HOENN_DEX_CORPHISH, // Corphish - HOENN_DEX_CRAWDAUNT, // Crawdaunt - HOENN_DEX_FEEBAS, // Feebas - HOENN_DEX_MILOTIC, // Milotic - HOENN_DEX_CARVANHA, // Carvanha - HOENN_DEX_SHARPEDO, // Sharpedo - HOENN_DEX_TRAPINCH, // Trapinch - HOENN_DEX_VIBRAVA, // Vibrava - HOENN_DEX_FLYGON, // Flygon - HOENN_DEX_MAKUHITA, // Makuhita - HOENN_DEX_HARIYAMA, // Hariyama - HOENN_DEX_ELECTRIKE, // Electrike - HOENN_DEX_MANECTRIC, // Manectric - HOENN_DEX_NUMEL, // Numel - HOENN_DEX_CAMERUPT, // Camerupt - HOENN_DEX_SPHEAL, // Spheal - HOENN_DEX_SEALEO, // Sealeo - HOENN_DEX_WALREIN, // Walrein - HOENN_DEX_CACNEA, // Cacnea - HOENN_DEX_CACTURNE, // Cacturne - HOENN_DEX_SNORUNT, // Snorunt - HOENN_DEX_GLALIE, // Glalie - HOENN_DEX_LUNATONE, // Lunatone - HOENN_DEX_SOLROCK, // Solrock - HOENN_DEX_AZURILL, // Azurill - HOENN_DEX_SPOINK, // Spoink - HOENN_DEX_GRUMPIG, // Grumpig - HOENN_DEX_PLUSLE, // Plusle - HOENN_DEX_MINUN, // Minun - HOENN_DEX_MAWILE, // Mawile - HOENN_DEX_MEDITITE, // Meditite - HOENN_DEX_MEDICHAM, // Medicham - HOENN_DEX_SWABLU, // Swablu - HOENN_DEX_ALTARIA, // Altaria - HOENN_DEX_WYNAUT, // Wynaut - HOENN_DEX_DUSKULL, // Duskull - HOENN_DEX_DUSCLOPS, // Dusclops - HOENN_DEX_ROSELIA, // Roselia - HOENN_DEX_SLAKOTH, // Slakoth - HOENN_DEX_VIGOROTH, // Vigoroth - HOENN_DEX_SLAKING, // Slaking - HOENN_DEX_GULPIN, // Gulpin - HOENN_DEX_SWALOT, // Swalot - HOENN_DEX_TROPIUS, // Tropius - HOENN_DEX_WHISMUR, // Whismur - HOENN_DEX_LOUDRED, // Loudred - HOENN_DEX_EXPLOUD, // Exploud - HOENN_DEX_CLAMPERL, // Clamperl - HOENN_DEX_HUNTAIL, // Huntail - HOENN_DEX_GOREBYSS, // Gorebyss - HOENN_DEX_ABSOL, // Absol - HOENN_DEX_SHUPPET, // Shuppet - HOENN_DEX_BANETTE, // Banette - HOENN_DEX_SEVIPER, // Seviper - HOENN_DEX_ZANGOOSE, // Zangoose - HOENN_DEX_RELICANTH, // Relicanth - HOENN_DEX_ARON, // Aron - HOENN_DEX_LAIRON, // Lairon - HOENN_DEX_AGGRON, // Aggron - HOENN_DEX_CASTFORM, // Castform - HOENN_DEX_VOLBEAT, // Volbeat - HOENN_DEX_ILLUMISE, // Illumise - HOENN_DEX_LILEEP, // Lileep - HOENN_DEX_CRADILY, // Cradily - HOENN_DEX_ANORITH, // Anorith - HOENN_DEX_ARMALDO, // Armaldo - HOENN_DEX_RALTS, // Ralts - HOENN_DEX_KIRLIA, // Kirlia - HOENN_DEX_GARDEVOIR, // Gardevoir - HOENN_DEX_BAGON, // Bagon - HOENN_DEX_SHELGON, // Shelgon - HOENN_DEX_SALAMENCE, // Salamence - HOENN_DEX_BELDUM, // Beldum - HOENN_DEX_METANG, // Metang - HOENN_DEX_METAGROSS, // Metagross - HOENN_DEX_REGIROCK, // Regirock - HOENN_DEX_REGICE, // Regice - HOENN_DEX_REGISTEEL, // Registeel - HOENN_DEX_KYOGRE, // Kyogre - HOENN_DEX_GROUDON, // Groudon - HOENN_DEX_RAYQUAZA, // Rayquaza - HOENN_DEX_LATIAS, // Latias - HOENN_DEX_LATIOS, // Latios - HOENN_DEX_JIRACHI, // Jirachi - HOENN_DEX_DEOXYS, // Deoxys - HOENN_DEX_CHIMECHO // Chimecho + // SPECIES_NONE + HOENN_DEX_BULBASAUR, // SPECIES_BULBASAUR + HOENN_DEX_IVYSAUR, // SPECIES_IVYSAUR + HOENN_DEX_VENUSAUR, // SPECIES_VENUSAUR + HOENN_DEX_CHARMANDER, // SPECIES_CHARMANDER + HOENN_DEX_CHARMELEON, // SPECIES_CHARMELEON + HOENN_DEX_CHARIZARD, // SPECIES_CHARIZARD + HOENN_DEX_SQUIRTLE, // SPECIES_SQUIRTLE + HOENN_DEX_WARTORTLE, // SPECIES_WARTORTLE + HOENN_DEX_BLASTOISE, // SPECIES_BLASTOISE + HOENN_DEX_CATERPIE, // SPECIES_CATERPIE + HOENN_DEX_METAPOD, // SPECIES_METAPOD + HOENN_DEX_BUTTERFREE, // SPECIES_BUTTERFREE + HOENN_DEX_WEEDLE, // SPECIES_WEEDLE + HOENN_DEX_KAKUNA, // SPECIES_KAKUNA + HOENN_DEX_BEEDRILL, // SPECIES_BEEDRILL + HOENN_DEX_PIDGEY, // SPECIES_PIDGEY + HOENN_DEX_PIDGEOTTO, // SPECIES_PIDGEOTTO + HOENN_DEX_PIDGEOT, // SPECIES_PIDGEOT + HOENN_DEX_RATTATA, // SPECIES_RATTATA + HOENN_DEX_RATICATE, // SPECIES_RATICATE + HOENN_DEX_SPEAROW, // SPECIES_SPEAROW + HOENN_DEX_FEAROW, // SPECIES_FEAROW + HOENN_DEX_EKANS, // SPECIES_EKANS + HOENN_DEX_ARBOK, // SPECIES_ARBOK + HOENN_DEX_PIKACHU, // SPECIES_PIKACHU + HOENN_DEX_RAICHU, // SPECIES_RAICHU + HOENN_DEX_SANDSHREW, // SPECIES_SANDSHREW + HOENN_DEX_SANDSLASH, // SPECIES_SANDSLASH + HOENN_DEX_NIDORAN_F, // SPECIES_NIDORAN_F + HOENN_DEX_NIDORINA, // SPECIES_NIDORINA + HOENN_DEX_NIDOQUEEN, // SPECIES_NIDOQUEEN + HOENN_DEX_NIDORAN_M, // SPECIES_NIDORAN_M + HOENN_DEX_NIDORINO, // SPECIES_NIDORINO + HOENN_DEX_NIDOKING, // SPECIES_NIDOKING + HOENN_DEX_CLEFAIRY, // SPECIES_CLEFAIRY + HOENN_DEX_CLEFABLE, // SPECIES_CLEFABLE + HOENN_DEX_VULPIX, // SPECIES_VULPIX + HOENN_DEX_NINETALES, // SPECIES_NINETALES + HOENN_DEX_JIGGLYPUFF, // SPECIES_JIGGLYPUFF + HOENN_DEX_WIGGLYTUFF, // SPECIES_WIGGLYTUFF + HOENN_DEX_ZUBAT, // SPECIES_ZUBAT + HOENN_DEX_GOLBAT, // SPECIES_GOLBAT + HOENN_DEX_ODDISH, // SPECIES_ODDISH + HOENN_DEX_GLOOM, // SPECIES_GLOOM + HOENN_DEX_VILEPLUME, // SPECIES_VILEPLUME + HOENN_DEX_PARAS, // SPECIES_PARAS + HOENN_DEX_PARASECT, // SPECIES_PARASECT + HOENN_DEX_VENONAT, // SPECIES_VENONAT + HOENN_DEX_VENOMOTH, // SPECIES_VENOMOTH + HOENN_DEX_DIGLETT, // SPECIES_DIGLETT + HOENN_DEX_DUGTRIO, // SPECIES_DUGTRIO + HOENN_DEX_MEOWTH, // SPECIES_MEOWTH + HOENN_DEX_PERSIAN, // SPECIES_PERSIAN + HOENN_DEX_PSYDUCK, // SPECIES_PSYDUCK + HOENN_DEX_GOLDUCK, // SPECIES_GOLDUCK + HOENN_DEX_MANKEY, // SPECIES_MANKEY + HOENN_DEX_PRIMEAPE, // SPECIES_PRIMEAPE + HOENN_DEX_GROWLITHE, // SPECIES_GROWLITHE + HOENN_DEX_ARCANINE, // SPECIES_ARCANINE + HOENN_DEX_POLIWAG, // SPECIES_POLIWAG + HOENN_DEX_POLIWHIRL, // SPECIES_POLIWHIRL + HOENN_DEX_POLIWRATH, // SPECIES_POLIWRATH + HOENN_DEX_ABRA, // SPECIES_ABRA + HOENN_DEX_KADABRA, // SPECIES_KADABRA + HOENN_DEX_ALAKAZAM, // SPECIES_ALAKAZAM + HOENN_DEX_MACHOP, // SPECIES_MACHOP + HOENN_DEX_MACHOKE, // SPECIES_MACHOKE + HOENN_DEX_MACHAMP, // SPECIES_MACHAMP + HOENN_DEX_BELLSPROUT, // SPECIES_BELLSPROUT + HOENN_DEX_WEEPINBELL, // SPECIES_WEEPINBELL + HOENN_DEX_VICTREEBEL, // SPECIES_VICTREEBEL + HOENN_DEX_TENTACOOL, // SPECIES_TENTACOOL + HOENN_DEX_TENTACRUEL, // SPECIES_TENTACRUEL + HOENN_DEX_GEODUDE, // SPECIES_GEODUDE + HOENN_DEX_GRAVELER, // SPECIES_GRAVELER + HOENN_DEX_GOLEM, // SPECIES_GOLEM + HOENN_DEX_PONYTA, // SPECIES_PONYTA + HOENN_DEX_RAPIDASH, // SPECIES_RAPIDASH + HOENN_DEX_SLOWPOKE, // SPECIES_SLOWPOKE + HOENN_DEX_SLOWBRO, // SPECIES_SLOWBRO + HOENN_DEX_MAGNEMITE, // SPECIES_MAGNEMITE + HOENN_DEX_MAGNETON, // SPECIES_MAGNETON + HOENN_DEX_FARFETCHD, // SPECIES_FARFETCHD + HOENN_DEX_DODUO, // SPECIES_DODUO + HOENN_DEX_DODRIO, // SPECIES_DODRIO + HOENN_DEX_SEEL, // SPECIES_SEEL + HOENN_DEX_DEWGONG, // SPECIES_DEWGONG + HOENN_DEX_GRIMER, // SPECIES_GRIMER + HOENN_DEX_MUK, // SPECIES_MUK + HOENN_DEX_SHELLDER, // SPECIES_SHELLDER + HOENN_DEX_CLOYSTER, // SPECIES_CLOYSTER + HOENN_DEX_GASTLY, // SPECIES_GASTLY + HOENN_DEX_HAUNTER, // SPECIES_HAUNTER + HOENN_DEX_GENGAR, // SPECIES_GENGAR + HOENN_DEX_ONIX, // SPECIES_ONIX + HOENN_DEX_DROWZEE, // SPECIES_DROWZEE + HOENN_DEX_HYPNO, // SPECIES_HYPNO + HOENN_DEX_KRABBY, // SPECIES_KRABBY + HOENN_DEX_KINGLER, // SPECIES_KINGLER + HOENN_DEX_VOLTORB, // SPECIES_VOLTORB + HOENN_DEX_ELECTRODE, // SPECIES_ELECTRODE + HOENN_DEX_EXEGGCUTE, // SPECIES_EXEGGCUTE + HOENN_DEX_EXEGGUTOR, // SPECIES_EXEGGUTOR + HOENN_DEX_CUBONE, // SPECIES_CUBONE + HOENN_DEX_MAROWAK, // SPECIES_MAROWAK + HOENN_DEX_HITMONLEE, // SPECIES_HITMONLEE + HOENN_DEX_HITMONCHAN, // SPECIES_HITMONCHAN + HOENN_DEX_LICKITUNG, // SPECIES_LICKITUNG + HOENN_DEX_KOFFING, // SPECIES_KOFFING + HOENN_DEX_WEEZING, // SPECIES_WEEZING + HOENN_DEX_RHYHORN, // SPECIES_RHYHORN + HOENN_DEX_RHYDON, // SPECIES_RHYDON + HOENN_DEX_CHANSEY, // SPECIES_CHANSEY + HOENN_DEX_TANGELA, // SPECIES_TANGELA + HOENN_DEX_KANGASKHAN, // SPECIES_KANGASKHAN + HOENN_DEX_HORSEA, // SPECIES_HORSEA + HOENN_DEX_SEADRA, // SPECIES_SEADRA + HOENN_DEX_GOLDEEN, // SPECIES_GOLDEEN + HOENN_DEX_SEAKING, // SPECIES_SEAKING + HOENN_DEX_STARYU, // SPECIES_STARYU + HOENN_DEX_STARMIE, // SPECIES_STARMIE + HOENN_DEX_MR_MIME, // SPECIES_MR_MIME + HOENN_DEX_SCYTHER, // SPECIES_SCYTHER + HOENN_DEX_JYNX, // SPECIES_JYNX + HOENN_DEX_ELECTABUZZ, // SPECIES_ELECTABUZZ + HOENN_DEX_MAGMAR, // SPECIES_MAGMAR + HOENN_DEX_PINSIR, // SPECIES_PINSIR + HOENN_DEX_TAUROS, // SPECIES_TAUROS + HOENN_DEX_MAGIKARP, // SPECIES_MAGIKARP + HOENN_DEX_GYARADOS, // SPECIES_GYARADOS + HOENN_DEX_LAPRAS, // SPECIES_LAPRAS + HOENN_DEX_DITTO, // SPECIES_DITTO + HOENN_DEX_EEVEE, // SPECIES_EEVEE + HOENN_DEX_VAPOREON, // SPECIES_VAPOREON + HOENN_DEX_JOLTEON, // SPECIES_JOLTEON + HOENN_DEX_FLAREON, // SPECIES_FLAREON + HOENN_DEX_PORYGON, // SPECIES_PORYGON + HOENN_DEX_OMANYTE, // SPECIES_OMANYTE + HOENN_DEX_OMASTAR, // SPECIES_OMASTAR + HOENN_DEX_KABUTO, // SPECIES_KABUTO + HOENN_DEX_KABUTOPS, // SPECIES_KABUTOPS + HOENN_DEX_AERODACTYL, // SPECIES_AERODACTYL + HOENN_DEX_SNORLAX, // SPECIES_SNORLAX + HOENN_DEX_ARTICUNO, // SPECIES_ARTICUNO + HOENN_DEX_ZAPDOS, // SPECIES_ZAPDOS + HOENN_DEX_MOLTRES, // SPECIES_MOLTRES + HOENN_DEX_DRATINI, // SPECIES_DRATINI + HOENN_DEX_DRAGONAIR, // SPECIES_DRAGONAIR + HOENN_DEX_DRAGONITE, // SPECIES_DRAGONITE + HOENN_DEX_MEWTWO, // SPECIES_MEWTWO + HOENN_DEX_MEW, // SPECIES_MEW + HOENN_DEX_CHIKORITA, // SPECIES_CHIKORITA + HOENN_DEX_BAYLEEF, // SPECIES_BAYLEEF + HOENN_DEX_MEGANIUM, // SPECIES_MEGANIUM + HOENN_DEX_CYNDAQUIL, // SPECIES_CYNDAQUIL + HOENN_DEX_QUILAVA, // SPECIES_QUILAVA + HOENN_DEX_TYPHLOSION, // SPECIES_TYPHLOSION + HOENN_DEX_TOTODILE, // SPECIES_TOTODILE + HOENN_DEX_CROCONAW, // SPECIES_CROCONAW + HOENN_DEX_FERALIGATR, // SPECIES_FERALIGATR + HOENN_DEX_SENTRET, // SPECIES_SENTRET + HOENN_DEX_FURRET, // SPECIES_FURRET + HOENN_DEX_HOOTHOOT, // SPECIES_HOOTHOOT + HOENN_DEX_NOCTOWL, // SPECIES_NOCTOWL + HOENN_DEX_LEDYBA, // SPECIES_LEDYBA + HOENN_DEX_LEDIAN, // SPECIES_LEDIAN + HOENN_DEX_SPINARAK, // SPECIES_SPINARAK + HOENN_DEX_ARIADOS, // SPECIES_ARIADOS + HOENN_DEX_CROBAT, // SPECIES_CROBAT + HOENN_DEX_CHINCHOU, // SPECIES_CHINCHOU + HOENN_DEX_LANTURN, // SPECIES_LANTURN + HOENN_DEX_PICHU, // SPECIES_PICHU + HOENN_DEX_CLEFFA, // SPECIES_CLEFFA + HOENN_DEX_IGGLYBUFF, // SPECIES_IGGLYBUFF + HOENN_DEX_TOGEPI, // SPECIES_TOGEPI + HOENN_DEX_TOGETIC, // SPECIES_TOGETIC + HOENN_DEX_NATU, // SPECIES_NATU + HOENN_DEX_XATU, // SPECIES_XATU + HOENN_DEX_MAREEP, // SPECIES_MAREEP + HOENN_DEX_FLAAFFY, // SPECIES_FLAAFFY + HOENN_DEX_AMPHAROS, // SPECIES_AMPHAROS + HOENN_DEX_BELLOSSOM, // SPECIES_BELLOSSOM + HOENN_DEX_MARILL, // SPECIES_MARILL + HOENN_DEX_AZUMARILL, // SPECIES_AZUMARILL + HOENN_DEX_SUDOWOODO, // SPECIES_SUDOWOODO + HOENN_DEX_POLITOED, // SPECIES_POLITOED + HOENN_DEX_HOPPIP, // SPECIES_HOPPIP + HOENN_DEX_SKIPLOOM, // SPECIES_SKIPLOOM + HOENN_DEX_JUMPLUFF, // SPECIES_JUMPLUFF + HOENN_DEX_AIPOM, // SPECIES_AIPOM + HOENN_DEX_SUNKERN, // SPECIES_SUNKERN + HOENN_DEX_SUNFLORA, // SPECIES_SUNFLORA + HOENN_DEX_YANMA, // SPECIES_YANMA + HOENN_DEX_WOOPER, // SPECIES_WOOPER + HOENN_DEX_QUAGSIRE, // SPECIES_QUAGSIRE + HOENN_DEX_ESPEON, // SPECIES_ESPEON + HOENN_DEX_UMBREON, // SPECIES_UMBREON + HOENN_DEX_MURKROW, // SPECIES_MURKROW + HOENN_DEX_SLOWKING, // SPECIES_SLOWKING + HOENN_DEX_MISDREAVUS, // SPECIES_MISDREAVUS + HOENN_DEX_UNOWN, // SPECIES_UNOWN + HOENN_DEX_WOBBUFFET, // SPECIES_WOBBUFFET + HOENN_DEX_GIRAFARIG, // SPECIES_GIRAFARIG + HOENN_DEX_PINECO, // SPECIES_PINECO + HOENN_DEX_FORRETRESS, // SPECIES_FORRETRESS + HOENN_DEX_DUNSPARCE, // SPECIES_DUNSPARCE + HOENN_DEX_GLIGAR, // SPECIES_GLIGAR + HOENN_DEX_STEELIX, // SPECIES_STEELIX + HOENN_DEX_SNUBBULL, // SPECIES_SNUBBULL + HOENN_DEX_GRANBULL, // SPECIES_GRANBULL + HOENN_DEX_QWILFISH, // SPECIES_QWILFISH + HOENN_DEX_SCIZOR, // SPECIES_SCIZOR + HOENN_DEX_SHUCKLE, // SPECIES_SHUCKLE + HOENN_DEX_HERACROSS, // SPECIES_HERACROSS + HOENN_DEX_SNEASEL, // SPECIES_SNEASEL + HOENN_DEX_TEDDIURSA, // SPECIES_TEDDIURSA + HOENN_DEX_URSARING, // SPECIES_URSARING + HOENN_DEX_SLUGMA, // SPECIES_SLUGMA + HOENN_DEX_MAGCARGO, // SPECIES_MAGCARGO + HOENN_DEX_SWINUB, // SPECIES_SWINUB + HOENN_DEX_PILOSWINE, // SPECIES_PILOSWINE + HOENN_DEX_CORSOLA, // SPECIES_CORSOLA + HOENN_DEX_REMORAID, // SPECIES_REMORAID + HOENN_DEX_OCTILLERY, // SPECIES_OCTILLERY + HOENN_DEX_DELIBIRD, // SPECIES_DELIBIRD + HOENN_DEX_MANTINE, // SPECIES_MANTINE + HOENN_DEX_SKARMORY, // SPECIES_SKARMORY + HOENN_DEX_HOUNDOUR, // SPECIES_HOUNDOUR + HOENN_DEX_HOUNDOOM, // SPECIES_HOUNDOOM + HOENN_DEX_KINGDRA, // SPECIES_KINGDRA + HOENN_DEX_PHANPY, // SPECIES_PHANPY + HOENN_DEX_DONPHAN, // SPECIES_DONPHAN + HOENN_DEX_PORYGON2, // SPECIES_PORYGON2 + HOENN_DEX_STANTLER, // SPECIES_STANTLER + HOENN_DEX_SMEARGLE, // SPECIES_SMEARGLE + HOENN_DEX_TYROGUE, // SPECIES_TYROGUE + HOENN_DEX_HITMONTOP, // SPECIES_HITMONTOP + HOENN_DEX_SMOOCHUM, // SPECIES_SMOOCHUM + HOENN_DEX_ELEKID, // SPECIES_ELEKID + HOENN_DEX_MAGBY, // SPECIES_MAGBY + HOENN_DEX_MILTANK, // SPECIES_MILTANK + HOENN_DEX_BLISSEY, // SPECIES_BLISSEY + HOENN_DEX_RAIKOU, // SPECIES_RAIKOU + HOENN_DEX_ENTEI, // SPECIES_ENTEI + HOENN_DEX_SUICUNE, // SPECIES_SUICUNE + HOENN_DEX_LARVITAR, // SPECIES_LARVITAR + HOENN_DEX_PUPITAR, // SPECIES_PUPITAR + HOENN_DEX_TYRANITAR, // SPECIES_TYRANITAR + HOENN_DEX_LUGIA, // SPECIES_LUGIA + HOENN_DEX_HO_OH, // SPECIES_HO-OH + HOENN_DEX_CELEBI, // SPECIES_CELEBI + HOENN_DEX_OLD_UNOWN_B, // SPECIES_OLD_UNOWN_B + HOENN_DEX_OLD_UNOWN_C, // SPECIES_OLD_UNOWN_C + HOENN_DEX_OLD_UNOWN_D, // SPECIES_OLD_UNOWN_D + HOENN_DEX_OLD_UNOWN_E, // SPECIES_OLD_UNOWN_E + HOENN_DEX_OLD_UNOWN_F, // SPECIES_OLD_UNOWN_F + HOENN_DEX_OLD_UNOWN_G, // SPECIES_OLD_UNOWN_G + HOENN_DEX_OLD_UNOWN_H, // SPECIES_OLD_UNOWN_H + HOENN_DEX_OLD_UNOWN_I, // SPECIES_OLD_UNOWN_I + HOENN_DEX_OLD_UNOWN_J, // SPECIES_OLD_UNOWN_J + HOENN_DEX_OLD_UNOWN_K, // SPECIES_OLD_UNOWN_K + HOENN_DEX_OLD_UNOWN_L, // SPECIES_OLD_UNOWN_L + HOENN_DEX_OLD_UNOWN_M, // SPECIES_OLD_UNOWN_M + HOENN_DEX_OLD_UNOWN_N, // SPECIES_OLD_UNOWN_N + HOENN_DEX_OLD_UNOWN_O, // SPECIES_OLD_UNOWN_O + HOENN_DEX_OLD_UNOWN_P, // SPECIES_OLD_UNOWN_P + HOENN_DEX_OLD_UNOWN_Q, // SPECIES_OLD_UNOWN_Q + HOENN_DEX_OLD_UNOWN_R, // SPECIES_OLD_UNOWN_R + HOENN_DEX_OLD_UNOWN_S, // SPECIES_OLD_UNOWN_S + HOENN_DEX_OLD_UNOWN_T, // SPECIES_OLD_UNOWN_T + HOENN_DEX_OLD_UNOWN_U, // SPECIES_OLD_UNOWN_U + HOENN_DEX_OLD_UNOWN_V, // SPECIES_OLD_UNOWN_V + HOENN_DEX_OLD_UNOWN_W, // SPECIES_OLD_UNOWN_W + HOENN_DEX_OLD_UNOWN_X, // SPECIES_OLD_UNOWN_X + HOENN_DEX_OLD_UNOWN_Y, // SPECIES_OLD_UNOWN_Y + HOENN_DEX_OLD_UNOWN_Z, // SPECIES_OLD_UNOWN_Z + HOENN_DEX_TREECKO, // SPECIES_TREECKO + HOENN_DEX_GROVYLE, // SPECIES_GROVYLE + HOENN_DEX_SCEPTILE, // SPECIES_SCEPTILE + HOENN_DEX_TORCHIC, // SPECIES_TORCHIC + HOENN_DEX_COMBUSKEN, // SPECIES_COMBUSKEN + HOENN_DEX_BLAZIKEN, // SPECIES_BLAZIKEN + HOENN_DEX_MUDKIP, // SPECIES_MUDKIP + HOENN_DEX_MARSHTOMP, // SPECIES_MARSHTOMP + HOENN_DEX_SWAMPERT, // SPECIES_SWAMPERT + HOENN_DEX_POOCHYENA, // SPECIES_POOCHYENA + HOENN_DEX_MIGHTYENA, // SPECIES_MIGHTYENA + HOENN_DEX_ZIGZAGOON, // SPECIES_ZIGZAGOON + HOENN_DEX_LINOONE, // SPECIES_LINOONE + HOENN_DEX_WURMPLE, // SPECIES_WURMPLE + HOENN_DEX_SILCOON, // SPECIES_SILCOON + HOENN_DEX_BEAUTIFLY, // SPECIES_BEAUTIFLY + HOENN_DEX_CASCOON, // SPECIES_CASCOON + HOENN_DEX_DUSTOX, // SPECIES_DUSTOX + HOENN_DEX_LOTAD, // SPECIES_LOTAD + HOENN_DEX_LOMBRE, // SPECIES_LOMBRE + HOENN_DEX_LUDICOLO, // SPECIES_LUDICOLO + HOENN_DEX_SEEDOT, // SPECIES_SEEDOT + HOENN_DEX_NUZLEAF, // SPECIES_NUZLEAF + HOENN_DEX_SHIFTRY, // SPECIES_SHIFTRY + HOENN_DEX_NINCADA, // SPECIES_NINCADA + HOENN_DEX_NINJASK, // SPECIES_NINJASK + HOENN_DEX_SHEDINJA, // SPECIES_SHEDINJA + HOENN_DEX_TAILLOW, // SPECIES_TAILLOW + HOENN_DEX_SWELLOW, // SPECIES_SWELLOW + HOENN_DEX_SHROOMISH, // SPECIES_SHROOMISH + HOENN_DEX_BRELOOM, // SPECIES_BRELOOM + HOENN_DEX_SPINDA, // SPECIES_SPINDA + HOENN_DEX_WINGULL, // SPECIES_WINGULL + HOENN_DEX_PELIPPER, // SPECIES_PELIPPER + HOENN_DEX_SURSKIT, // SPECIES_SURSKIT + HOENN_DEX_MASQUERAIN, // SPECIES_MASQUERAIN + HOENN_DEX_WAILMER, // SPECIES_WAILMER + HOENN_DEX_WAILORD, // SPECIES_WAILORD + HOENN_DEX_SKITTY, // SPECIES_SKITTY + HOENN_DEX_DELCATTY, // SPECIES_DELCATTY + HOENN_DEX_KECLEON, // SPECIES_KECLEON + HOENN_DEX_BALTOY, // SPECIES_BALTOY + HOENN_DEX_CLAYDOL, // SPECIES_CLAYDOL + HOENN_DEX_NOSEPASS, // SPECIES_NOSEPASS + HOENN_DEX_TORKOAL, // SPECIES_TORKOAL + HOENN_DEX_SABLEYE, // SPECIES_SABLEYE + HOENN_DEX_BARBOACH, // SPECIES_BARBOACH + HOENN_DEX_WHISCASH, // SPECIES_WHISCASH + HOENN_DEX_LUVDISC, // SPECIES_LUVDISC + HOENN_DEX_CORPHISH, // SPECIES_CORPHISH + HOENN_DEX_CRAWDAUNT, // SPECIES_CRAWDAUNT + HOENN_DEX_FEEBAS, // SPECIES_FEEBAS + HOENN_DEX_MILOTIC, // SPECIES_MILOTIC + HOENN_DEX_CARVANHA, // SPECIES_CARVANHA + HOENN_DEX_SHARPEDO, // SPECIES_SHARPEDO + HOENN_DEX_TRAPINCH, // SPECIES_TRAPINCH + HOENN_DEX_VIBRAVA, // SPECIES_VIBRAVA + HOENN_DEX_FLYGON, // SPECIES_FLYGON + HOENN_DEX_MAKUHITA, // SPECIES_MAKUHITA + HOENN_DEX_HARIYAMA, // SPECIES_HARIYAMA + HOENN_DEX_ELECTRIKE, // SPECIES_ELECTRIKE + HOENN_DEX_MANECTRIC, // SPECIES_MANECTRIC + HOENN_DEX_NUMEL, // SPECIES_NUMEL + HOENN_DEX_CAMERUPT, // SPECIES_CAMERUPT + HOENN_DEX_SPHEAL, // SPECIES_SPHEAL + HOENN_DEX_SEALEO, // SPECIES_SEALEO + HOENN_DEX_WALREIN, // SPECIES_WALREIN + HOENN_DEX_CACNEA, // SPECIES_CACNEA + HOENN_DEX_CACTURNE, // SPECIES_CACTURNE + HOENN_DEX_SNORUNT, // SPECIES_SNORUNT + HOENN_DEX_GLALIE, // SPECIES_GLALIE + HOENN_DEX_LUNATONE, // SPECIES_LUNATONE + HOENN_DEX_SOLROCK, // SPECIES_SOLROCK + HOENN_DEX_AZURILL, // SPECIES_AZURILL + HOENN_DEX_SPOINK, // SPECIES_SPOINK + HOENN_DEX_GRUMPIG, // SPECIES_GRUMPIG + HOENN_DEX_PLUSLE, // SPECIES_PLUSLE + HOENN_DEX_MINUN, // SPECIES_MINUN + HOENN_DEX_MAWILE, // SPECIES_MAWILE + HOENN_DEX_MEDITITE, // SPECIES_MEDITITE + HOENN_DEX_MEDICHAM, // SPECIES_MEDICHAM + HOENN_DEX_SWABLU, // SPECIES_SWABLU + HOENN_DEX_ALTARIA, // SPECIES_ALTARIA + HOENN_DEX_WYNAUT, // SPECIES_WYNAUT + HOENN_DEX_DUSKULL, // SPECIES_DUSKULL + HOENN_DEX_DUSCLOPS, // SPECIES_DUSCLOPS + HOENN_DEX_ROSELIA, // SPECIES_ROSELIA + HOENN_DEX_SLAKOTH, // SPECIES_SLAKOTH + HOENN_DEX_VIGOROTH, // SPECIES_VIGOROTH + HOENN_DEX_SLAKING, // SPECIES_SLAKING + HOENN_DEX_GULPIN, // SPECIES_GULPIN + HOENN_DEX_SWALOT, // SPECIES_SWALOT + HOENN_DEX_TROPIUS, // SPECIES_TROPIUS + HOENN_DEX_WHISMUR, // SPECIES_WHISMUR + HOENN_DEX_LOUDRED, // SPECIES_LOUDRED + HOENN_DEX_EXPLOUD, // SPECIES_EXPLOUD + HOENN_DEX_CLAMPERL, // SPECIES_CLAMPERL + HOENN_DEX_HUNTAIL, // SPECIES_HUNTAIL + HOENN_DEX_GOREBYSS, // SPECIES_GOREBYSS + HOENN_DEX_ABSOL, // SPECIES_ABSOL + HOENN_DEX_SHUPPET, // SPECIES_SHUPPET + HOENN_DEX_BANETTE, // SPECIES_BANETTE + HOENN_DEX_SEVIPER, // SPECIES_SEVIPER + HOENN_DEX_ZANGOOSE, // SPECIES_ZANGOOSE + HOENN_DEX_RELICANTH, // SPECIES_RELICANTH + HOENN_DEX_ARON, // SPECIES_ARON + HOENN_DEX_LAIRON, // SPECIES_LAIRON + HOENN_DEX_AGGRON, // SPECIES_AGGRON + HOENN_DEX_CASTFORM, // SPECIES_CASTFORM + HOENN_DEX_VOLBEAT, // SPECIES_VOLBEAT + HOENN_DEX_ILLUMISE, // SPECIES_ILLUMISE + HOENN_DEX_LILEEP, // SPECIES_LILEEP + HOENN_DEX_CRADILY, // SPECIES_CRADILY + HOENN_DEX_ANORITH, // SPECIES_ANORITH + HOENN_DEX_ARMALDO, // SPECIES_ARMALDO + HOENN_DEX_RALTS, // SPECIES_RALTS + HOENN_DEX_KIRLIA, // SPECIES_KIRLIA + HOENN_DEX_GARDEVOIR, // SPECIES_GARDEVOIR + HOENN_DEX_BAGON, // SPECIES_BAGON + HOENN_DEX_SHELGON, // SPECIES_SHELGON + HOENN_DEX_SALAMENCE, // SPECIES_SALAMENCE + HOENN_DEX_BELDUM, // SPECIES_BELDUM + HOENN_DEX_METANG, // SPECIES_METANG + HOENN_DEX_METAGROSS, // SPECIES_METAGROSS + HOENN_DEX_REGIROCK, // SPECIES_REGIROCK + HOENN_DEX_REGICE, // SPECIES_REGICE + HOENN_DEX_REGISTEEL, // SPECIES_REGISTEEL + HOENN_DEX_KYOGRE, // SPECIES_KYOGRE + HOENN_DEX_GROUDON, // SPECIES_GROUDON + HOENN_DEX_RAYQUAZA, // SPECIES_RAYQUAZA + HOENN_DEX_LATIAS, // SPECIES_LATIAS + HOENN_DEX_LATIOS, // SPECIES_LATIOS + HOENN_DEX_JIRACHI, // SPECIES_JIRACHI + HOENN_DEX_DEOXYS, // SPECIES_DEOXYS + HOENN_DEX_CHIMECHO // SPECIES_CHIMECHO }; -const u16 gSpeciesToNationalPokedexNum[] = // Assigns all species to the National Dex Index +const u16 gSpeciesToNationalPokedexNum[] = // Assigns all species to the National Dex Index (Summary No. for National Dex) { - NATIONAL_DEX_BULBASAUR, // Bulbasaur - NATIONAL_DEX_IVYSAUR, // Ivysaur - NATIONAL_DEX_VENUSAUR, // Venusaur - NATIONAL_DEX_CHARMANDER, // Charmander - NATIONAL_DEX_CHARMELEON, // Charmeleon - NATIONAL_DEX_CHARIZARD, // Charizard - NATIONAL_DEX_SQUIRTLE, // Squirtle - NATIONAL_DEX_WARTORTLE, // Wartortle - NATIONAL_DEX_BLASTOISE, // Blastoise - NATIONAL_DEX_CATERPIE, // Caterpie - NATIONAL_DEX_METAPOD, // Metapod - NATIONAL_DEX_BUTTERFREE, // Butterfree - NATIONAL_DEX_WEEDLE, // Weedle - NATIONAL_DEX_KAKUNA, // Kakuna - NATIONAL_DEX_BEEDRILL, // Beedrill - NATIONAL_DEX_PIDGEY, // Pidgey - NATIONAL_DEX_PIDGEOTTO, // Pidgeotto - NATIONAL_DEX_PIDGEOT, // Pidgeot - NATIONAL_DEX_RATTATA, // Rattata - NATIONAL_DEX_RATICATE, // Raticate - NATIONAL_DEX_SPEAROW, // Spearow - NATIONAL_DEX_FEAROW, // Fearow - NATIONAL_DEX_EKANS, // Ekans - NATIONAL_DEX_ARBOK, // Arbok - NATIONAL_DEX_PIKACHU, // Pikachu - NATIONAL_DEX_RAICHU, // Raichu - NATIONAL_DEX_SANDSHREW, // Sandshrew - NATIONAL_DEX_SANDSLASH, // Sandslash - NATIONAL_DEX_NIDORAN_F, // Nidoran♀ - NATIONAL_DEX_NIDORINA, // Nidorina - NATIONAL_DEX_NIDOQUEEN, // Nidoqueen - NATIONAL_DEX_NIDORAN_M, // Nidoran♂ - NATIONAL_DEX_NIDORINO, // Nidorino - NATIONAL_DEX_NIDOKING, // Nidoking - NATIONAL_DEX_CLEFAIRY, // Clefairy - NATIONAL_DEX_CLEFABLE, // Clefable - NATIONAL_DEX_VULPIX, // Vulpix - NATIONAL_DEX_NINETALES, // Ninetales - NATIONAL_DEX_JIGGLYPUFF, // Jigglypuff - NATIONAL_DEX_WIGGLYTUFF, // Wigglytuff - NATIONAL_DEX_ZUBAT, // Zubat - NATIONAL_DEX_GOLBAT, // Golbat - NATIONAL_DEX_ODDISH, // Oddish - NATIONAL_DEX_GLOOM, // Gloom - NATIONAL_DEX_VILEPLUME, // Vileplume - NATIONAL_DEX_PARAS, // Paras - NATIONAL_DEX_PARASECT, // Parasect - NATIONAL_DEX_VENONAT, // Venonat - NATIONAL_DEX_VENOMOTH, // Venomoth - NATIONAL_DEX_DIGLETT, // Diglett - NATIONAL_DEX_DUGTRIO, // Dugtrio - NATIONAL_DEX_MEOWTH, // Meowth - NATIONAL_DEX_PERSIAN, // Persian - NATIONAL_DEX_PSYDUCK, // Psyduck - NATIONAL_DEX_GOLDUCK, // Golduck - NATIONAL_DEX_MANKEY, // Mankey - NATIONAL_DEX_PRIMEAPE, // Primeape - NATIONAL_DEX_GROWLITHE, // Growlithe - NATIONAL_DEX_ARCANINE, // Arcanine - NATIONAL_DEX_POLIWAG, // Poliwag - NATIONAL_DEX_POLIWHIRL, // Poliwhirl - NATIONAL_DEX_POLIWRATH, // Poliwrath - NATIONAL_DEX_ABRA, // Abra - NATIONAL_DEX_KADABRA, // Kadabra - NATIONAL_DEX_ALAKAZAM, // Alakazam - NATIONAL_DEX_MACHOP, // Machop - NATIONAL_DEX_MACHOKE, // Machoke - NATIONAL_DEX_MACHAMP, // Machamp - NATIONAL_DEX_BELLSPROUT, // Bellsprout - NATIONAL_DEX_WEEPINBELL, // Weepinbell - NATIONAL_DEX_VICTREEBEL, // Victreebel - NATIONAL_DEX_TENTACOOL, // Tentacool - NATIONAL_DEX_TENTACRUEL, // Tentacruel - NATIONAL_DEX_GEODUDE, // Geodude - NATIONAL_DEX_GRAVELER, // Graveler - NATIONAL_DEX_GOLEM, // Golem - NATIONAL_DEX_PONYTA, // Ponyta - NATIONAL_DEX_RAPIDASH, // Rapidash - NATIONAL_DEX_SLOWPOKE, // Slowpoke - NATIONAL_DEX_SLOWBRO, // Slowbro - NATIONAL_DEX_MAGNEMITE, // Magnemite - NATIONAL_DEX_MAGNETON, // Magneton - NATIONAL_DEX_FARFETCHD, // Farfetch'd - NATIONAL_DEX_DODUO, // Doduo - NATIONAL_DEX_DODRIO, // Dodrio - NATIONAL_DEX_SEEL, // Seel - NATIONAL_DEX_DEWGONG, // Dewgong - NATIONAL_DEX_GRIMER, // Grimer - NATIONAL_DEX_MUK, // Muk - NATIONAL_DEX_SHELLDER, // Shellder - NATIONAL_DEX_CLOYSTER, // Cloyster - NATIONAL_DEX_GASTLY, // Gastly - NATIONAL_DEX_HAUNTER, // Haunter - NATIONAL_DEX_GENGAR, // Gengar - NATIONAL_DEX_ONIX, // Onix - NATIONAL_DEX_DROWZEE, // Drowzee - NATIONAL_DEX_HYPNO, // Hypno - NATIONAL_DEX_KRABBY, // Krabby - NATIONAL_DEX_KINGLER, // Kingler - NATIONAL_DEX_VOLTORB, // Voltorb - NATIONAL_DEX_ELECTRODE, // Electrode - NATIONAL_DEX_EXEGGCUTE, // Exeggcute - NATIONAL_DEX_EXEGGUTOR, // Exeggutor - NATIONAL_DEX_CUBONE, // Cubone - NATIONAL_DEX_MAROWAK, // Marowak - NATIONAL_DEX_HITMONLEE, // Hitmonlee - NATIONAL_DEX_HITMONCHAN, // Hitmonchan - NATIONAL_DEX_LICKITUNG, // Lickitung - NATIONAL_DEX_KOFFING, // Koffing - NATIONAL_DEX_WEEZING, // Weezing - NATIONAL_DEX_RHYHORN, // Rhyhorn - NATIONAL_DEX_RHYDON, // Rhydon - NATIONAL_DEX_CHANSEY, // Chansey - NATIONAL_DEX_TANGELA, // Tangela - NATIONAL_DEX_KANGASKHAN, // Kangaskhan - NATIONAL_DEX_HORSEA, // Horsea - NATIONAL_DEX_SEADRA, // Seadra - NATIONAL_DEX_GOLDEEN, // Goldeen - NATIONAL_DEX_SEAKING, // Seaking - NATIONAL_DEX_STARYU, // Staryu - NATIONAL_DEX_STARMIE, // Starmie - NATIONAL_DEX_MR_MIME, // Mr. Mime - NATIONAL_DEX_SCYTHER, // Scyther - NATIONAL_DEX_JYNX, // Jynx - NATIONAL_DEX_ELECTABUZZ, // Electabuzz - NATIONAL_DEX_MAGMAR, // Magmar - NATIONAL_DEX_PINSIR, // Pinsir - NATIONAL_DEX_TAUROS, // Tauros - NATIONAL_DEX_MAGIKARP, // Magikarp - NATIONAL_DEX_GYARADOS, // Gyarados - NATIONAL_DEX_LAPRAS, // Lapras - NATIONAL_DEX_DITTO, // Ditto - NATIONAL_DEX_EEVEE, // Eevee - NATIONAL_DEX_VAPOREON, // Vaporeon - NATIONAL_DEX_JOLTEON, // Jolteon - NATIONAL_DEX_FLAREON, // Flareon - NATIONAL_DEX_PORYGON, // Porygon - NATIONAL_DEX_OMANYTE, // Omanyte - NATIONAL_DEX_OMASTAR, // Omastar - NATIONAL_DEX_KABUTO, // Kabuto - NATIONAL_DEX_KABUTOPS, // Kabutops - NATIONAL_DEX_AERODACTYL, // Aerodactyl - NATIONAL_DEX_SNORLAX, // Snorlax - NATIONAL_DEX_ARTICUNO, // Articuno - NATIONAL_DEX_ZAPDOS, // Zapdos - NATIONAL_DEX_MOLTRES, // Moltres - NATIONAL_DEX_DRATINI, // Dratini - NATIONAL_DEX_DRAGONAIR, // Dragonair - NATIONAL_DEX_DRAGONITE, // Dragonite - NATIONAL_DEX_MEWTWO, // Mewtwo - NATIONAL_DEX_MEW, // Mew - NATIONAL_DEX_CHIKORITA, // Chikorita - NATIONAL_DEX_BAYLEEF, // Bayleef - NATIONAL_DEX_MEGANIUM, // Meganium - NATIONAL_DEX_CYNDAQUIL, // Cyndaquil - NATIONAL_DEX_QUILAVA, // Quilava - NATIONAL_DEX_TYPHLOSION, // Typhlosion - NATIONAL_DEX_TOTODILE, // Totodile - NATIONAL_DEX_CROCONAW, // Croconaw - NATIONAL_DEX_FERALIGATR, // Feraligatr - NATIONAL_DEX_SENTRET, // Sentret - NATIONAL_DEX_FURRET, // Furret - NATIONAL_DEX_HOOTHOOT, // Hoothoot - NATIONAL_DEX_NOCTOWL, // Noctowl - NATIONAL_DEX_LEDYBA, // Ledyba - NATIONAL_DEX_LEDIAN, // Ledian - NATIONAL_DEX_SPINARAK, // Spinarak - NATIONAL_DEX_ARIADOS, // Ariados - NATIONAL_DEX_CROBAT, // Crobat - NATIONAL_DEX_CHINCHOU, // Chinchou - NATIONAL_DEX_LANTURN, // Lanturn - NATIONAL_DEX_PICHU, // Pichu - NATIONAL_DEX_CLEFFA, // Cleffa - NATIONAL_DEX_IGGLYBUFF, // Igglybuff - NATIONAL_DEX_TOGEPI, // Togepi - NATIONAL_DEX_TOGETIC, // Togetic - NATIONAL_DEX_NATU, // Natu - NATIONAL_DEX_XATU, // Xatu - NATIONAL_DEX_MAREEP, // Mareep - NATIONAL_DEX_FLAAFFY, // Flaaffy - NATIONAL_DEX_AMPHAROS, // Ampharos - NATIONAL_DEX_BELLOSSOM, // Bellossom - NATIONAL_DEX_MARILL, // Marill - NATIONAL_DEX_AZUMARILL, // Azumarill - NATIONAL_DEX_SUDOWOODO, // Sudowoodo - NATIONAL_DEX_POLITOED, // Politoed - NATIONAL_DEX_HOPPIP, // Hoppip - NATIONAL_DEX_SKIPLOOM, // Skiploom - NATIONAL_DEX_JUMPLUFF, // Jumpluff - NATIONAL_DEX_AIPOM, // Aipom - NATIONAL_DEX_SUNKERN, // Sunkern - NATIONAL_DEX_SUNFLORA, // Sunflora - NATIONAL_DEX_YANMA, // Yanma - NATIONAL_DEX_WOOPER, // Wooper - NATIONAL_DEX_QUAGSIRE, // Quagsire - NATIONAL_DEX_ESPEON, // Espeon - NATIONAL_DEX_UMBREON, // Umbreon - NATIONAL_DEX_MURKROW, // Murkrow - NATIONAL_DEX_SLOWKING, // Slowking - NATIONAL_DEX_MISDREAVUS, // Misdreavus - NATIONAL_DEX_UNOWN, // Unown A - NATIONAL_DEX_WOBBUFFET, // Wobbuffet - NATIONAL_DEX_GIRAFARIG, // Girafarig - NATIONAL_DEX_PINECO, // Pineco - NATIONAL_DEX_FORRETRESS, // Forretress - NATIONAL_DEX_DUNSPARCE, // Dunsparce - NATIONAL_DEX_GLIGAR, // Gligar - NATIONAL_DEX_STEELIX, // Steelix - NATIONAL_DEX_SNUBBULL, // Snubbull - NATIONAL_DEX_GRANBULL, // Granbull - NATIONAL_DEX_QWILFISH, // Qwilfish - NATIONAL_DEX_SCIZOR, // Scizor - NATIONAL_DEX_SHUCKLE, // Shuckle - NATIONAL_DEX_HERACROSS, // Heracross - NATIONAL_DEX_SNEASEL, // Sneasel - NATIONAL_DEX_TEDDIURSA, // Teddiursa - NATIONAL_DEX_URSARING, // Ursaring - NATIONAL_DEX_SLUGMA, // Slugma - NATIONAL_DEX_MAGCARGO, // Magcargo - NATIONAL_DEX_SWINUB, // Swinub - NATIONAL_DEX_PILOSWINE, // Piloswine - NATIONAL_DEX_CORSOLA, // Corsola - NATIONAL_DEX_REMORAID, // Remoraid - NATIONAL_DEX_OCTILLERY, // Octillery - NATIONAL_DEX_DELIBIRD, // Delibird - NATIONAL_DEX_MANTINE, // Mantine - NATIONAL_DEX_SKARMORY, // Skarmory - NATIONAL_DEX_HOUNDOUR, // Houndour - NATIONAL_DEX_HOUNDOOM, // Houndoom - NATIONAL_DEX_KINGDRA, // Kingdra - NATIONAL_DEX_PHANPY, // Phanpy - NATIONAL_DEX_DONPHAN, // Donphan - NATIONAL_DEX_PORYGON2, // Porygon2 - NATIONAL_DEX_STANTLER, // Stantler - NATIONAL_DEX_SMEARGLE, // Smeargle - NATIONAL_DEX_TYROGUE, // Tyrogue - NATIONAL_DEX_HITMONTOP, // Hitmontop - NATIONAL_DEX_SMOOCHUM, // Smoochum - NATIONAL_DEX_ELEKID, // Elekid - NATIONAL_DEX_MAGBY, // Magby - NATIONAL_DEX_MILTANK, // Miltank - NATIONAL_DEX_BLISSEY, // Blissey - NATIONAL_DEX_RAIKOU, // Raikou - NATIONAL_DEX_ENTEI, // Entei - NATIONAL_DEX_SUICUNE, // Suicune - NATIONAL_DEX_LARVITAR, // Larvitar - NATIONAL_DEX_PUPITAR, // Pupitar - NATIONAL_DEX_TYRANITAR, // Tyranitar - NATIONAL_DEX_LUGIA, // Lugia - NATIONAL_DEX_HO_OH, // Ho-Oh - NATIONAL_DEX_CELEBI, // Celebi - NATIONAL_DEX_OLD_UNOWN_B, // Unown B (Old) - NATIONAL_DEX_OLD_UNOWN_C, // Unown C (Old) - NATIONAL_DEX_OLD_UNOWN_D, // Unown D (Old) - NATIONAL_DEX_OLD_UNOWN_E, // Unown E (Old) - NATIONAL_DEX_OLD_UNOWN_F, // Unown F (Old) - NATIONAL_DEX_OLD_UNOWN_G, // Unown G (Old) - NATIONAL_DEX_OLD_UNOWN_H, // Unown H (Old) - NATIONAL_DEX_OLD_UNOWN_I, // Unown I (Old) - NATIONAL_DEX_OLD_UNOWN_J, // Unown J (Old) - NATIONAL_DEX_OLD_UNOWN_K, // Unown K (Old) - NATIONAL_DEX_OLD_UNOWN_L, // Unown L (Old) - NATIONAL_DEX_OLD_UNOWN_M, // Unown M (Old) - NATIONAL_DEX_OLD_UNOWN_N, // Unown N (Old) - NATIONAL_DEX_OLD_UNOWN_O, // Unown O (Old) - NATIONAL_DEX_OLD_UNOWN_P, // Unown P (Old) - NATIONAL_DEX_OLD_UNOWN_Q, // Unown Q (Old) - NATIONAL_DEX_OLD_UNOWN_R, // Unown R (Old) - NATIONAL_DEX_OLD_UNOWN_S, // Unown S (Old) - NATIONAL_DEX_OLD_UNOWN_T, // Unown T (Old) - NATIONAL_DEX_OLD_UNOWN_U, // Unown U (Old) - NATIONAL_DEX_OLD_UNOWN_V, // Unown V (Old) - NATIONAL_DEX_OLD_UNOWN_W, // Unown W (Old) - NATIONAL_DEX_OLD_UNOWN_X, // Unown X (Old) - NATIONAL_DEX_OLD_UNOWN_Y, // Unown Y (Old) - NATIONAL_DEX_OLD_UNOWN_Z, // Unown Z (Old) - NATIONAL_DEX_TREECKO, // Treecko - NATIONAL_DEX_GROVYLE, // Grovyle - NATIONAL_DEX_SCEPTILE, // Sceptile - NATIONAL_DEX_TORCHIC, // Torchic - NATIONAL_DEX_COMBUSKEN, // Combusken - NATIONAL_DEX_BLAZIKEN, // Blaziken - NATIONAL_DEX_MUDKIP, // Mudkip - NATIONAL_DEX_MARSHTOMP, // Marshtomp - NATIONAL_DEX_SWAMPERT, // Swampert - NATIONAL_DEX_POOCHYENA, // Poochyena - NATIONAL_DEX_MIGHTYENA, // Mightyena - NATIONAL_DEX_ZIGZAGOON, // Zigzagoon - NATIONAL_DEX_LINOONE, // Linoone - NATIONAL_DEX_WURMPLE, // Wurmple - NATIONAL_DEX_SILCOON, // Silcoon - NATIONAL_DEX_BEAUTIFLY, // Beautifly - NATIONAL_DEX_CASCOON, // Cascoon - NATIONAL_DEX_DUSTOX, // Dustox - NATIONAL_DEX_LOTAD, // Lotad - NATIONAL_DEX_LOMBRE, // Lombre - NATIONAL_DEX_LUDICOLO, // Ludicolo - NATIONAL_DEX_SEEDOT, // Seedot - NATIONAL_DEX_NUZLEAF, // Nuzleaf - NATIONAL_DEX_SHIFTRY, // Shiftry - NATIONAL_DEX_NINCADA, // Nincada - NATIONAL_DEX_NINJASK, // Ninjask - NATIONAL_DEX_SHEDINJA, // Shedinja - NATIONAL_DEX_TAILLOW, // Taillow - NATIONAL_DEX_SWELLOW, // Swellow - NATIONAL_DEX_SHROOMISH, // Shroomish - NATIONAL_DEX_BRELOOM, // Breloom - NATIONAL_DEX_SPINDA, // Spinda - NATIONAL_DEX_WINGULL, // Wingull - NATIONAL_DEX_PELIPPER, // Pelipper - NATIONAL_DEX_SURSKIT, // Surskit - NATIONAL_DEX_MASQUERAIN, // Masquerain - NATIONAL_DEX_WAILMER, // Wailmer - NATIONAL_DEX_WAILORD, // Wailord - NATIONAL_DEX_SKITTY, // Skitty - NATIONAL_DEX_DELCATTY, // Delcatty - NATIONAL_DEX_KECLEON, // Kecleon - NATIONAL_DEX_BALTOY, // Baltoy - NATIONAL_DEX_CLAYDOL, // Claydol - NATIONAL_DEX_NOSEPASS, // Nosepass - NATIONAL_DEX_TORKOAL, // Torkoal - NATIONAL_DEX_SABLEYE, // Sableye - NATIONAL_DEX_BARBOACH, // Barboach - NATIONAL_DEX_WHISCASH, // Whiscash - NATIONAL_DEX_LUVDISC, // Luvdisc - NATIONAL_DEX_CORPHISH, // Corphish - NATIONAL_DEX_CRAWDAUNT, // Crawdaunt - NATIONAL_DEX_FEEBAS, // Feebas - NATIONAL_DEX_MILOTIC, // Milotic - NATIONAL_DEX_CARVANHA, // Carvanha - NATIONAL_DEX_SHARPEDO, // Sharpedo - NATIONAL_DEX_TRAPINCH, // Trapinch - NATIONAL_DEX_VIBRAVA, // Vibrava - NATIONAL_DEX_FLYGON, // Flygon - NATIONAL_DEX_MAKUHITA, // Makuhita - NATIONAL_DEX_HARIYAMA, // Hariyama - NATIONAL_DEX_ELECTRIKE, // Electrike - NATIONAL_DEX_MANECTRIC, // Manectric - NATIONAL_DEX_NUMEL, // Numel - NATIONAL_DEX_CAMERUPT, // Camerupt - NATIONAL_DEX_SPHEAL, // Spheal - NATIONAL_DEX_SEALEO, // Sealeo - NATIONAL_DEX_WALREIN, // Walrein - NATIONAL_DEX_CACNEA, // Cacnea - NATIONAL_DEX_CACTURNE, // Cacturne - NATIONAL_DEX_SNORUNT, // Snorunt - NATIONAL_DEX_GLALIE, // Glalie - NATIONAL_DEX_LUNATONE, // Lunatone - NATIONAL_DEX_SOLROCK, // Solrock - NATIONAL_DEX_AZURILL, // Azurill - NATIONAL_DEX_SPOINK, // Spoink - NATIONAL_DEX_GRUMPIG, // Grumpig - NATIONAL_DEX_PLUSLE, // Plusle - NATIONAL_DEX_MINUN, // Minun - NATIONAL_DEX_MAWILE, // Mawile - NATIONAL_DEX_MEDITITE, // Meditite - NATIONAL_DEX_MEDICHAM, // Medicham - NATIONAL_DEX_SWABLU, // Swablu - NATIONAL_DEX_ALTARIA, // Altaria - NATIONAL_DEX_WYNAUT, // Wynaut - NATIONAL_DEX_DUSKULL, // Duskull - NATIONAL_DEX_DUSCLOPS, // Dusclops - NATIONAL_DEX_ROSELIA, // Roselia - NATIONAL_DEX_SLAKOTH, // Slakoth - NATIONAL_DEX_VIGOROTH, // Vigoroth - NATIONAL_DEX_SLAKING, // Slaking - NATIONAL_DEX_GULPIN, // Gulpin - NATIONAL_DEX_SWALOT, // Swalot - NATIONAL_DEX_TROPIUS, // Tropius - NATIONAL_DEX_WHISMUR, // Whismur - NATIONAL_DEX_LOUDRED, // Loudred - NATIONAL_DEX_EXPLOUD, // Exploud - NATIONAL_DEX_CLAMPERL, // Clamperl - NATIONAL_DEX_HUNTAIL, // Huntail - NATIONAL_DEX_GOREBYSS, // Gorebyss - NATIONAL_DEX_ABSOL, // Absol - NATIONAL_DEX_SHUPPET, // Shuppet - NATIONAL_DEX_BANETTE, // Banette - NATIONAL_DEX_SEVIPER, // Seviper - NATIONAL_DEX_ZANGOOSE, // Zangoose - NATIONAL_DEX_RELICANTH, // Relicanth - NATIONAL_DEX_ARON, // Aron - NATIONAL_DEX_LAIRON, // Lairon - NATIONAL_DEX_AGGRON, // Aggron - NATIONAL_DEX_CASTFORM, // Castform - NATIONAL_DEX_VOLBEAT, // Volbeat - NATIONAL_DEX_ILLUMISE, // Illumise - NATIONAL_DEX_LILEEP, // Lileep - NATIONAL_DEX_CRADILY, // Cradily - NATIONAL_DEX_ANORITH, // Anorith - NATIONAL_DEX_ARMALDO, // Armaldo - NATIONAL_DEX_RALTS, // Ralts - NATIONAL_DEX_KIRLIA, // Kirlia - NATIONAL_DEX_GARDEVOIR, // Gardevoir - NATIONAL_DEX_BAGON, // Bagon - NATIONAL_DEX_SHELGON, // Shelgon - NATIONAL_DEX_SALAMENCE, // Salamence - NATIONAL_DEX_BELDUM, // Beldum - NATIONAL_DEX_METANG, // Metang - NATIONAL_DEX_METAGROSS, // Metagross - NATIONAL_DEX_REGIROCK, // Regirock - NATIONAL_DEX_REGICE, // Regice - NATIONAL_DEX_REGISTEEL, // Registeel - NATIONAL_DEX_KYOGRE, // Kyogre - NATIONAL_DEX_GROUDON, // Groudon - NATIONAL_DEX_RAYQUAZA, // Rayquaza - NATIONAL_DEX_LATIAS, // Latias - NATIONAL_DEX_LATIOS, // Latios - NATIONAL_DEX_JIRACHI, // Jirachi - NATIONAL_DEX_DEOXYS, // Deoxys - NATIONAL_DEX_CHIMECHO // Chimecho + // SPECIES_NONE + NATIONAL_DEX_BULBASAUR, // SPECIES_BULBASAUR + NATIONAL_DEX_IVYSAUR, // SPECIES_IVYSAUR + NATIONAL_DEX_VENUSAUR, // SPECIES_VENUSAUR + NATIONAL_DEX_CHARMANDER, // SPECIES_CHARMANDER + NATIONAL_DEX_CHARMELEON, // SPECIES_CHARMELEON + NATIONAL_DEX_CHARIZARD, // SPECIES_CHARIZARD + NATIONAL_DEX_SQUIRTLE, // SPECIES_SQUIRTLE + NATIONAL_DEX_WARTORTLE, // SPECIES_WARTORTLE + NATIONAL_DEX_BLASTOISE, // SPECIES_BLASTOISE + NATIONAL_DEX_CATERPIE, // SPECIES_CATERPIE + NATIONAL_DEX_METAPOD, // SPECIES_METAPOD + NATIONAL_DEX_BUTTERFREE, // SPECIES_BUTTERFREE + NATIONAL_DEX_WEEDLE, // SPECIES_WEEDLE + NATIONAL_DEX_KAKUNA, // SPECIES_KAKUNA + NATIONAL_DEX_BEEDRILL, // SPECIES_BEEDRILL + NATIONAL_DEX_PIDGEY, // SPECIES_PIDGEY + NATIONAL_DEX_PIDGEOTTO, // SPECIES_PIDGEOTTO + NATIONAL_DEX_PIDGEOT, // SPECIES_PIDGEOT + NATIONAL_DEX_RATTATA, // SPECIES_RATTATA + NATIONAL_DEX_RATICATE, // SPECIES_RATICATE + NATIONAL_DEX_SPEAROW, // SPECIES_SPEAROW + NATIONAL_DEX_FEAROW, // SPECIES_FEAROW + NATIONAL_DEX_EKANS, // SPECIES_EKANS + NATIONAL_DEX_ARBOK, // SPECIES_ARBOK + NATIONAL_DEX_PIKACHU, // SPECIES_PIKACHU + NATIONAL_DEX_RAICHU, // SPECIES_RAICHU + NATIONAL_DEX_SANDSHREW, // SPECIES_SANDSHREW + NATIONAL_DEX_SANDSLASH, // SPECIES_SANDSLASH + NATIONAL_DEX_NIDORAN_F, // SPECIES_NIDORAN_F + NATIONAL_DEX_NIDORINA, // SPECIES_NIDORINA + NATIONAL_DEX_NIDOQUEEN, // SPECIES_NIDOQUEEN + NATIONAL_DEX_NIDORAN_M, // SPECIES_NIDORAN_M + NATIONAL_DEX_NIDORINO, // SPECIES_NIDORINO + NATIONAL_DEX_NIDOKING, // SPECIES_NIDOKING + NATIONAL_DEX_CLEFAIRY, // SPECIES_CLEFAIRY + NATIONAL_DEX_CLEFABLE, // SPECIES_CLEFABLE + NATIONAL_DEX_VULPIX, // SPECIES_VULPIX + NATIONAL_DEX_NINETALES, // SPECIES_NINETALES + NATIONAL_DEX_JIGGLYPUFF, // SPECIES_JIGGLYPUFF + NATIONAL_DEX_WIGGLYTUFF, // SPECIES_WIGGLYTUFF + NATIONAL_DEX_ZUBAT, // SPECIES_ZUBAT + NATIONAL_DEX_GOLBAT, // SPECIES_GOLBAT + NATIONAL_DEX_ODDISH, // SPECIES_ODDISH + NATIONAL_DEX_GLOOM, // SPECIES_GLOOM + NATIONAL_DEX_VILEPLUME, // SPECIES_VILEPLUME + NATIONAL_DEX_PARAS, // SPECIES_PARAS + NATIONAL_DEX_PARASECT, // SPECIES_PARASECT + NATIONAL_DEX_VENONAT, // SPECIES_VENONAT + NATIONAL_DEX_VENOMOTH, // SPECIES_VENOMOTH + NATIONAL_DEX_DIGLETT, // SPECIES_DIGLETT + NATIONAL_DEX_DUGTRIO, // SPECIES_DUGTRIO + NATIONAL_DEX_MEOWTH, // SPECIES_MEOWTH + NATIONAL_DEX_PERSIAN, // SPECIES_PERSIAN + NATIONAL_DEX_PSYDUCK, // SPECIES_PSYDUCK + NATIONAL_DEX_GOLDUCK, // SPECIES_GOLDUCK + NATIONAL_DEX_MANKEY, // SPECIES_MANKEY + NATIONAL_DEX_PRIMEAPE, // SPECIES_PRIMEAPE + NATIONAL_DEX_GROWLITHE, // SPECIES_GROWLITHE + NATIONAL_DEX_ARCANINE, // SPECIES_ARCANINE + NATIONAL_DEX_POLIWAG, // SPECIES_POLIWAG + NATIONAL_DEX_POLIWHIRL, // SPECIES_POLIWHIRL + NATIONAL_DEX_POLIWRATH, // SPECIES_POLIWRATH + NATIONAL_DEX_ABRA, // SPECIES_ABRA + NATIONAL_DEX_KADABRA, // SPECIES_KADABRA + NATIONAL_DEX_ALAKAZAM, // SPECIES_ALAKAZAM + NATIONAL_DEX_MACHOP, // SPECIES_MACHOP + NATIONAL_DEX_MACHOKE, // SPECIES_MACHOKE + NATIONAL_DEX_MACHAMP, // SPECIES_MACHAMP + NATIONAL_DEX_BELLSPROUT, // SPECIES_BELLSPROUT + NATIONAL_DEX_WEEPINBELL, // SPECIES_WEEPINBELL + NATIONAL_DEX_VICTREEBEL, // SPECIES_VICTREEBEL + NATIONAL_DEX_TENTACOOL, // SPECIES_TENTACOOL + NATIONAL_DEX_TENTACRUEL, // SPECIES_TENTACRUEL + NATIONAL_DEX_GEODUDE, // SPECIES_GEODUDE + NATIONAL_DEX_GRAVELER, // SPECIES_GRAVELER + NATIONAL_DEX_GOLEM, // SPECIES_GOLEM + NATIONAL_DEX_PONYTA, // SPECIES_PONYTA + NATIONAL_DEX_RAPIDASH, // SPECIES_RAPIDASH + NATIONAL_DEX_SLOWPOKE, // SPECIES_SLOWPOKE + NATIONAL_DEX_SLOWBRO, // SPECIES_SLOWBRO + NATIONAL_DEX_MAGNEMITE, // SPECIES_MAGNEMITE + NATIONAL_DEX_MAGNETON, // SPECIES_MAGNETON + NATIONAL_DEX_FARFETCHD, // SPECIES_FARFETCHD + NATIONAL_DEX_DODUO, // SPECIES_DODUO + NATIONAL_DEX_DODRIO, // SPECIES_DODRIO + NATIONAL_DEX_SEEL, // SPECIES_SEEL + NATIONAL_DEX_DEWGONG, // SPECIES_DEWGONG + NATIONAL_DEX_GRIMER, // SPECIES_GRIMER + NATIONAL_DEX_MUK, // SPECIES_MUK + NATIONAL_DEX_SHELLDER, // SPECIES_SHELLDER + NATIONAL_DEX_CLOYSTER, // SPECIES_CLOYSTER + NATIONAL_DEX_GASTLY, // SPECIES_GASTLY + NATIONAL_DEX_HAUNTER, // SPECIES_HAUNTER + NATIONAL_DEX_GENGAR, // SPECIES_GENGAR + NATIONAL_DEX_ONIX, // SPECIES_ONIX + NATIONAL_DEX_DROWZEE, // SPECIES_DROWZEE + NATIONAL_DEX_HYPNO, // SPECIES_HYPNO + NATIONAL_DEX_KRABBY, // SPECIES_KRABBY + NATIONAL_DEX_KINGLER, // SPECIES_KINGLER + NATIONAL_DEX_VOLTORB, // SPECIES_VOLTORB + NATIONAL_DEX_ELECTRODE, // SPECIES_ELECTRODE + NATIONAL_DEX_EXEGGCUTE, // SPECIES_EXEGGCUTE + NATIONAL_DEX_EXEGGUTOR, // SPECIES_EXEGGUTOR + NATIONAL_DEX_CUBONE, // SPECIES_CUBONE + NATIONAL_DEX_MAROWAK, // SPECIES_MAROWAK + NATIONAL_DEX_HITMONLEE, // SPECIES_HITMONLEE + NATIONAL_DEX_HITMONCHAN, // SPECIES_HITMONCHAN + NATIONAL_DEX_LICKITUNG, // SPECIES_LICKITUNG + NATIONAL_DEX_KOFFING, // SPECIES_KOFFING + NATIONAL_DEX_WEEZING, // SPECIES_WEEZING + NATIONAL_DEX_RHYHORN, // SPECIES_RHYHORN + NATIONAL_DEX_RHYDON, // SPECIES_RHYDON + NATIONAL_DEX_CHANSEY, // SPECIES_CHANSEY + NATIONAL_DEX_TANGELA, // SPECIES_TANGELA + NATIONAL_DEX_KANGASKHAN, // SPECIES_KANGASKHAN + NATIONAL_DEX_HORSEA, // SPECIES_HORSEA + NATIONAL_DEX_SEADRA, // SPECIES_SEADRA + NATIONAL_DEX_GOLDEEN, // SPECIES_GOLDEEN + NATIONAL_DEX_SEAKING, // SPECIES_SEAKING + NATIONAL_DEX_STARYU, // SPECIES_STARYU + NATIONAL_DEX_STARMIE, // SPECIES_STARMIE + NATIONAL_DEX_MR_MIME, // SPECIES_MR_MIME + NATIONAL_DEX_SCYTHER, // SPECIES_SCYTHER + NATIONAL_DEX_JYNX, // SPECIES_JYNX + NATIONAL_DEX_ELECTABUZZ, // SPECIES_ELECTABUZZ + NATIONAL_DEX_MAGMAR, // SPECIES_MAGMAR + NATIONAL_DEX_PINSIR, // SPECIES_PINSIR + NATIONAL_DEX_TAUROS, // SPECIES_TAUROS + NATIONAL_DEX_MAGIKARP, // SPECIES_MAGIKARP + NATIONAL_DEX_GYARADOS, // SPECIES_GYARADOS + NATIONAL_DEX_LAPRAS, // SPECIES_LAPRAS + NATIONAL_DEX_DITTO, // SPECIES_DITTO + NATIONAL_DEX_EEVEE, // SPECIES_EEVEE + NATIONAL_DEX_VAPOREON, // SPECIES_VAPOREON + NATIONAL_DEX_JOLTEON, // SPECIES_JOLTEON + NATIONAL_DEX_FLAREON, // SPECIES_FLAREON + NATIONAL_DEX_PORYGON, // SPECIES_PORYGON + NATIONAL_DEX_OMANYTE, // SPECIES_OMANYTE + NATIONAL_DEX_OMASTAR, // SPECIES_OMASTAR + NATIONAL_DEX_KABUTO, // SPECIES_KABUTO + NATIONAL_DEX_KABUTOPS, // SPECIES_KABUTOPS + NATIONAL_DEX_AERODACTYL, // SPECIES_AERODACTYL + NATIONAL_DEX_SNORLAX, // SPECIES_SNORLAX + NATIONAL_DEX_ARTICUNO, // SPECIES_ARTICUNO + NATIONAL_DEX_ZAPDOS, // SPECIES_ZAPDOS + NATIONAL_DEX_MOLTRES, // SPECIES_MOLTRES + NATIONAL_DEX_DRATINI, // SPECIES_DRATINI + NATIONAL_DEX_DRAGONAIR, // SPECIES_DRAGONAIR + NATIONAL_DEX_DRAGONITE, // SPECIES_DRAGONITE + NATIONAL_DEX_MEWTWO, // SPECIES_MEWTWO + NATIONAL_DEX_MEW, // SPECIES_MEW + NATIONAL_DEX_CHIKORITA, // SPECIES_CHIKORITA + NATIONAL_DEX_BAYLEEF, // SPECIES_BAYLEEF + NATIONAL_DEX_MEGANIUM, // SPECIES_MEGANIUM + NATIONAL_DEX_CYNDAQUIL, // SPECIES_CYNDAQUIL + NATIONAL_DEX_QUILAVA, // SPECIES_QUILAVA + NATIONAL_DEX_TYPHLOSION, // SPECIES_TYPHLOSION + NATIONAL_DEX_TOTODILE, // SPECIES_TOTODILE + NATIONAL_DEX_CROCONAW, // SPECIES_CROCONAW + NATIONAL_DEX_FERALIGATR, // SPECIES_FERALIGATR + NATIONAL_DEX_SENTRET, // SPECIES_SENTRET + NATIONAL_DEX_FURRET, // SPECIES_FURRET + NATIONAL_DEX_HOOTHOOT, // SPECIES_HOOTHOOT + NATIONAL_DEX_NOCTOWL, // SPECIES_NOCTOWL + NATIONAL_DEX_LEDYBA, // SPECIES_LEDYBA + NATIONAL_DEX_LEDIAN, // SPECIES_LEDIAN + NATIONAL_DEX_SPINARAK, // SPECIES_SPINARAK + NATIONAL_DEX_ARIADOS, // SPECIES_ARIADOS + NATIONAL_DEX_CROBAT, // SPECIES_CROBAT + NATIONAL_DEX_CHINCHOU, // SPECIES_CHINCHOU + NATIONAL_DEX_LANTURN, // SPECIES_LANTURN + NATIONAL_DEX_PICHU, // SPECIES_PICHU + NATIONAL_DEX_CLEFFA, // SPECIES_CLEFFA + NATIONAL_DEX_IGGLYBUFF, // SPECIES_IGGLYBUFF + NATIONAL_DEX_TOGEPI, // SPECIES_TOGEPI + NATIONAL_DEX_TOGETIC, // SPECIES_TOGETIC + NATIONAL_DEX_NATU, // SPECIES_NATU + NATIONAL_DEX_XATU, // SPECIES_XATU + NATIONAL_DEX_MAREEP, // SPECIES_MAREEP + NATIONAL_DEX_FLAAFFY, // SPECIES_FLAAFFY + NATIONAL_DEX_AMPHAROS, // SPECIES_AMPHAROS + NATIONAL_DEX_BELLOSSOM, // SPECIES_BELLOSSOM + NATIONAL_DEX_MARILL, // SPECIES_MARILL + NATIONAL_DEX_AZUMARILL, // SPECIES_AZUMARILL + NATIONAL_DEX_SUDOWOODO, // SPECIES_SUDOWOODO + NATIONAL_DEX_POLITOED, // SPECIES_POLITOED + NATIONAL_DEX_HOPPIP, // SPECIES_HOPPIP + NATIONAL_DEX_SKIPLOOM, // SPECIES_SKIPLOOM + NATIONAL_DEX_JUMPLUFF, // SPECIES_JUMPLUFF + NATIONAL_DEX_AIPOM, // SPECIES_AIPOM + NATIONAL_DEX_SUNKERN, // SPECIES_SUNKERN + NATIONAL_DEX_SUNFLORA, // SPECIES_SUNFLORA + NATIONAL_DEX_YANMA, // SPECIES_YANMA + NATIONAL_DEX_WOOPER, // SPECIES_WOOPER + NATIONAL_DEX_QUAGSIRE, // SPECIES_QUAGSIRE + NATIONAL_DEX_ESPEON, // SPECIES_ESPEON + NATIONAL_DEX_UMBREON, // SPECIES_UMBREON + NATIONAL_DEX_MURKROW, // SPECIES_MURKROW + NATIONAL_DEX_SLOWKING, // SPECIES_SLOWKING + NATIONAL_DEX_MISDREAVUS, // SPECIES_MISDREAVUS + NATIONAL_DEX_UNOWN, // SPECIES_UNOWN + NATIONAL_DEX_WOBBUFFET, // SPECIES_WOBBUFFET + NATIONAL_DEX_GIRAFARIG, // SPECIES_GIRAFARIG + NATIONAL_DEX_PINECO, // SPECIES_PINECO + NATIONAL_DEX_FORRETRESS, // SPECIES_FORRETRESS + NATIONAL_DEX_DUNSPARCE, // SPECIES_DUNSPARCE + NATIONAL_DEX_GLIGAR, // SPECIES_GLIGAR + NATIONAL_DEX_STEELIX, // SPECIES_STEELIX + NATIONAL_DEX_SNUBBULL, // SPECIES_SNUBBULL + NATIONAL_DEX_GRANBULL, // SPECIES_GRANBULL + NATIONAL_DEX_QWILFISH, // SPECIES_QWILFISH + NATIONAL_DEX_SCIZOR, // SPECIES_SCIZOR + NATIONAL_DEX_SHUCKLE, // SPECIES_SHUCKLE + NATIONAL_DEX_HERACROSS, // SPECIES_HERACROSS + NATIONAL_DEX_SNEASEL, // SPECIES_SNEASEL + NATIONAL_DEX_TEDDIURSA, // SPECIES_TEDDIURSA + NATIONAL_DEX_URSARING, // SPECIES_URSARING + NATIONAL_DEX_SLUGMA, // SPECIES_SLUGMA + NATIONAL_DEX_MAGCARGO, // SPECIES_MAGCARGO + NATIONAL_DEX_SWINUB, // SPECIES_SWINUB + NATIONAL_DEX_PILOSWINE, // SPECIES_PILOSWINE + NATIONAL_DEX_CORSOLA, // SPECIES_CORSOLA + NATIONAL_DEX_REMORAID, // SPECIES_REMORAID + NATIONAL_DEX_OCTILLERY, // SPECIES_OCTILLERY + NATIONAL_DEX_DELIBIRD, // SPECIES_DELIBIRD + NATIONAL_DEX_MANTINE, // SPECIES_MANTINE + NATIONAL_DEX_SKARMORY, // SPECIES_SKARMORY + NATIONAL_DEX_HOUNDOUR, // SPECIES_HOUNDOUR + NATIONAL_DEX_HOUNDOOM, // SPECIES_HOUNDOOM + NATIONAL_DEX_KINGDRA, // SPECIES_KINGDRA + NATIONAL_DEX_PHANPY, // SPECIES_PHANPY + NATIONAL_DEX_DONPHAN, // SPECIES_DONPHAN + NATIONAL_DEX_PORYGON2, // SPECIES_PORYGON2 + NATIONAL_DEX_STANTLER, // SPECIES_STANTLER + NATIONAL_DEX_SMEARGLE, // SPECIES_SMEARGLE + NATIONAL_DEX_TYROGUE, // SPECIES_TYROGUE + NATIONAL_DEX_HITMONTOP, // SPECIES_HITMONTOP + NATIONAL_DEX_SMOOCHUM, // SPECIES_SMOOCHUM + NATIONAL_DEX_ELEKID, // SPECIES_ELEKID + NATIONAL_DEX_MAGBY, // SPECIES_MAGBY + NATIONAL_DEX_MILTANK, // SPECIES_MILTANK + NATIONAL_DEX_BLISSEY, // SPECIES_BLISSEY + NATIONAL_DEX_RAIKOU, // SPECIES_RAIKOU + NATIONAL_DEX_ENTEI, // SPECIES_ENTEI + NATIONAL_DEX_SUICUNE, // SPECIES_SUICUNE + NATIONAL_DEX_LARVITAR, // SPECIES_LARVITAR + NATIONAL_DEX_PUPITAR, // SPECIES_PUPITAR + NATIONAL_DEX_TYRANITAR, // SPECIES_TYRANITAR + NATIONAL_DEX_LUGIA, // SPECIES_LUGIA + NATIONAL_DEX_HO_OH, // SPECIES_HO-OH + NATIONAL_DEX_CELEBI, // SPECIES_CELEBI + NATIONAL_DEX_OLD_UNOWN_B, // SPECIES_OLD_UNOWN_B + NATIONAL_DEX_OLD_UNOWN_C, // SPECIES_OLD_UNOWN_C + NATIONAL_DEX_OLD_UNOWN_D, // SPECIES_OLD_UNOWN_D + NATIONAL_DEX_OLD_UNOWN_E, // SPECIES_OLD_UNOWN_E + NATIONAL_DEX_OLD_UNOWN_F, // SPECIES_OLD_UNOWN_F + NATIONAL_DEX_OLD_UNOWN_G, // SPECIES_OLD_UNOWN_G + NATIONAL_DEX_OLD_UNOWN_H, // SPECIES_OLD_UNOWN_H + NATIONAL_DEX_OLD_UNOWN_I, // SPECIES_OLD_UNOWN_I + NATIONAL_DEX_OLD_UNOWN_J, // SPECIES_OLD_UNOWN_J + NATIONAL_DEX_OLD_UNOWN_K, // SPECIES_OLD_UNOWN_K + NATIONAL_DEX_OLD_UNOWN_L, // SPECIES_OLD_UNOWN_L + NATIONAL_DEX_OLD_UNOWN_M, // SPECIES_OLD_UNOWN_M + NATIONAL_DEX_OLD_UNOWN_N, // SPECIES_OLD_UNOWN_N + NATIONAL_DEX_OLD_UNOWN_O, // SPECIES_OLD_UNOWN_O + NATIONAL_DEX_OLD_UNOWN_P, // SPECIES_OLD_UNOWN_P + NATIONAL_DEX_OLD_UNOWN_Q, // SPECIES_OLD_UNOWN_Q + NATIONAL_DEX_OLD_UNOWN_R, // SPECIES_OLD_UNOWN_R + NATIONAL_DEX_OLD_UNOWN_S, // SPECIES_OLD_UNOWN_S + NATIONAL_DEX_OLD_UNOWN_T, // SPECIES_OLD_UNOWN_T + NATIONAL_DEX_OLD_UNOWN_U, // SPECIES_OLD_UNOWN_U + NATIONAL_DEX_OLD_UNOWN_V, // SPECIES_OLD_UNOWN_V + NATIONAL_DEX_OLD_UNOWN_W, // SPECIES_OLD_UNOWN_W + NATIONAL_DEX_OLD_UNOWN_X, // SPECIES_OLD_UNOWN_X + NATIONAL_DEX_OLD_UNOWN_Y, // SPECIES_OLD_UNOWN_Y + NATIONAL_DEX_OLD_UNOWN_Z, // SPECIES_OLD_UNOWN_Z + NATIONAL_DEX_TREECKO, // SPECIES_TREECKO + NATIONAL_DEX_GROVYLE, // SPECIES_GROVYLE + NATIONAL_DEX_SCEPTILE, // SPECIES_SCEPTILE + NATIONAL_DEX_TORCHIC, // SPECIES_TORCHIC + NATIONAL_DEX_COMBUSKEN, // SPECIES_COMBUSKEN + NATIONAL_DEX_BLAZIKEN, // SPECIES_BLAZIKEN + NATIONAL_DEX_MUDKIP, // SPECIES_MUDKIP + NATIONAL_DEX_MARSHTOMP, // SPECIES_MARSHTOMP + NATIONAL_DEX_SWAMPERT, // SPECIES_SWAMPERT + NATIONAL_DEX_POOCHYENA, // SPECIES_POOCHYENA + NATIONAL_DEX_MIGHTYENA, // SPECIES_MIGHTYENA + NATIONAL_DEX_ZIGZAGOON, // SPECIES_ZIGZAGOON + NATIONAL_DEX_LINOONE, // SPECIES_LINOONE + NATIONAL_DEX_WURMPLE, // SPECIES_WURMPLE + NATIONAL_DEX_SILCOON, // SPECIES_SILCOON + NATIONAL_DEX_BEAUTIFLY, // SPECIES_BEAUTIFLY + NATIONAL_DEX_CASCOON, // SPECIES_CASCOON + NATIONAL_DEX_DUSTOX, // SPECIES_DUSTOX + NATIONAL_DEX_LOTAD, // SPECIES_LOTAD + NATIONAL_DEX_LOMBRE, // SPECIES_LOMBRE + NATIONAL_DEX_LUDICOLO, // SPECIES_LUDICOLO + NATIONAL_DEX_SEEDOT, // SPECIES_SEEDOT + NATIONAL_DEX_NUZLEAF, // SPECIES_NUZLEAF + NATIONAL_DEX_SHIFTRY, // SPECIES_SHIFTRY + NATIONAL_DEX_NINCADA, // SPECIES_NINCADA + NATIONAL_DEX_NINJASK, // SPECIES_NINJASK + NATIONAL_DEX_SHEDINJA, // SPECIES_SHEDINJA + NATIONAL_DEX_TAILLOW, // SPECIES_TAILLOW + NATIONAL_DEX_SWELLOW, // SPECIES_SWELLOW + NATIONAL_DEX_SHROOMISH, // SPECIES_SHROOMISH + NATIONAL_DEX_BRELOOM, // SPECIES_BRELOOM + NATIONAL_DEX_SPINDA, // SPECIES_SPINDA + NATIONAL_DEX_WINGULL, // SPECIES_WINGULL + NATIONAL_DEX_PELIPPER, // SPECIES_PELIPPER + NATIONAL_DEX_SURSKIT, // SPECIES_SURSKIT + NATIONAL_DEX_MASQUERAIN, // SPECIES_MASQUERAIN + NATIONAL_DEX_WAILMER, // SPECIES_WAILMER + NATIONAL_DEX_WAILORD, // SPECIES_WAILORD + NATIONAL_DEX_SKITTY, // SPECIES_SKITTY + NATIONAL_DEX_DELCATTY, // SPECIES_DELCATTY + NATIONAL_DEX_KECLEON, // SPECIES_KECLEON + NATIONAL_DEX_BALTOY, // SPECIES_BALTOY + NATIONAL_DEX_CLAYDOL, // SPECIES_CLAYDOL + NATIONAL_DEX_NOSEPASS, // SPECIES_NOSEPASS + NATIONAL_DEX_TORKOAL, // SPECIES_TORKOAL + NATIONAL_DEX_SABLEYE, // SPECIES_SABLEYE + NATIONAL_DEX_BARBOACH, // SPECIES_BARBOACH + NATIONAL_DEX_WHISCASH, // SPECIES_WHISCASH + NATIONAL_DEX_LUVDISC, // SPECIES_LUVDISC + NATIONAL_DEX_CORPHISH, // SPECIES_CORPHISH + NATIONAL_DEX_CRAWDAUNT, // SPECIES_CRAWDAUNT + NATIONAL_DEX_FEEBAS, // SPECIES_FEEBAS + NATIONAL_DEX_MILOTIC, // SPECIES_MILOTIC + NATIONAL_DEX_CARVANHA, // SPECIES_CARVANHA + NATIONAL_DEX_SHARPEDO, // SPECIES_SHARPEDO + NATIONAL_DEX_TRAPINCH, // SPECIES_TRAPINCH + NATIONAL_DEX_VIBRAVA, // SPECIES_VIBRAVA + NATIONAL_DEX_FLYGON, // SPECIES_FLYGON + NATIONAL_DEX_MAKUHITA, // SPECIES_MAKUHITA + NATIONAL_DEX_HARIYAMA, // SPECIES_HARIYAMA + NATIONAL_DEX_ELECTRIKE, // SPECIES_ELECTRIKE + NATIONAL_DEX_MANECTRIC, // SPECIES_MANECTRIC + NATIONAL_DEX_NUMEL, // SPECIES_NUMEL + NATIONAL_DEX_CAMERUPT, // SPECIES_CAMERUPT + NATIONAL_DEX_SPHEAL, // SPECIES_SPHEAL + NATIONAL_DEX_SEALEO, // SPECIES_SEALEO + NATIONAL_DEX_WALREIN, // SPECIES_WALREIN + NATIONAL_DEX_CACNEA, // SPECIES_CACNEA + NATIONAL_DEX_CACTURNE, // SPECIES_CACTURNE + NATIONAL_DEX_SNORUNT, // SPECIES_SNORUNT + NATIONAL_DEX_GLALIE, // SPECIES_GLALIE + NATIONAL_DEX_LUNATONE, // SPECIES_LUNATONE + NATIONAL_DEX_SOLROCK, // SPECIES_SOLROCK + NATIONAL_DEX_AZURILL, // SPECIES_AZURILL + NATIONAL_DEX_SPOINK, // SPECIES_SPOINK + NATIONAL_DEX_GRUMPIG, // SPECIES_GRUMPIG + NATIONAL_DEX_PLUSLE, // SPECIES_PLUSLE + NATIONAL_DEX_MINUN, // SPECIES_MINUN + NATIONAL_DEX_MAWILE, // SPECIES_MAWILE + NATIONAL_DEX_MEDITITE, // SPECIES_MEDITITE + NATIONAL_DEX_MEDICHAM, // SPECIES_MEDICHAM + NATIONAL_DEX_SWABLU, // SPECIES_SWABLU + NATIONAL_DEX_ALTARIA, // SPECIES_ALTARIA + NATIONAL_DEX_WYNAUT, // SPECIES_WYNAUT + NATIONAL_DEX_DUSKULL, // SPECIES_DUSKULL + NATIONAL_DEX_DUSCLOPS, // SPECIES_DUSCLOPS + NATIONAL_DEX_ROSELIA, // SPECIES_ROSELIA + NATIONAL_DEX_SLAKOTH, // SPECIES_SLAKOTH + NATIONAL_DEX_VIGOROTH, // SPECIES_VIGOROTH + NATIONAL_DEX_SLAKING, // SPECIES_SLAKING + NATIONAL_DEX_GULPIN, // SPECIES_GULPIN + NATIONAL_DEX_SWALOT, // SPECIES_SWALOT + NATIONAL_DEX_TROPIUS, // SPECIES_TROPIUS + NATIONAL_DEX_WHISMUR, // SPECIES_WHISMUR + NATIONAL_DEX_LOUDRED, // SPECIES_LOUDRED + NATIONAL_DEX_EXPLOUD, // SPECIES_EXPLOUD + NATIONAL_DEX_CLAMPERL, // SPECIES_CLAMPERL + NATIONAL_DEX_HUNTAIL, // SPECIES_HUNTAIL + NATIONAL_DEX_GOREBYSS, // SPECIES_GOREBYSS + NATIONAL_DEX_ABSOL, // SPECIES_ABSOL + NATIONAL_DEX_SHUPPET, // SPECIES_SHUPPET + NATIONAL_DEX_BANETTE, // SPECIES_BANETTE + NATIONAL_DEX_SEVIPER, // SPECIES_SEVIPER + NATIONAL_DEX_ZANGOOSE, // SPECIES_ZANGOOSE + NATIONAL_DEX_RELICANTH, // SPECIES_RELICANTH + NATIONAL_DEX_ARON, // SPECIES_ARON + NATIONAL_DEX_LAIRON, // SPECIES_LAIRON + NATIONAL_DEX_AGGRON, // SPECIES_AGGRON + NATIONAL_DEX_CASTFORM, // SPECIES_CASTFORM + NATIONAL_DEX_VOLBEAT, // SPECIES_VOLBEAT + NATIONAL_DEX_ILLUMISE, // SPECIES_ILLUMISE + NATIONAL_DEX_LILEEP, // SPECIES_LILEEP + NATIONAL_DEX_CRADILY, // SPECIES_CRADILY + NATIONAL_DEX_ANORITH, // SPECIES_ANORITH + NATIONAL_DEX_ARMALDO, // SPECIES_ARMALDO + NATIONAL_DEX_RALTS, // SPECIES_RALTS + NATIONAL_DEX_KIRLIA, // SPECIES_KIRLIA + NATIONAL_DEX_GARDEVOIR, // SPECIES_GARDEVOIR + NATIONAL_DEX_BAGON, // SPECIES_BAGON + NATIONAL_DEX_SHELGON, // SPECIES_SHELGON + NATIONAL_DEX_SALAMENCE, // SPECIES_SALAMENCE + NATIONAL_DEX_BELDUM, // SPECIES_BELDUM + NATIONAL_DEX_METANG, // SPECIES_METANG + NATIONAL_DEX_METAGROSS, // SPECIES_METAGROSS + NATIONAL_DEX_REGIROCK, // SPECIES_REGIROCK + NATIONAL_DEX_REGICE, // SPECIES_REGICE + NATIONAL_DEX_REGISTEEL, // SPECIES_REGISTEEL + NATIONAL_DEX_KYOGRE, // SPECIES_KYOGRE + NATIONAL_DEX_GROUDON, // SPECIES_GROUDON + NATIONAL_DEX_RAYQUAZA, // SPECIES_RAYQUAZA + NATIONAL_DEX_LATIAS, // SPECIES_LATIAS + NATIONAL_DEX_LATIOS, // SPECIES_LATIOS + NATIONAL_DEX_JIRACHI, // SPECIES_JIRACHI + NATIONAL_DEX_DEOXYS, // SPECIES_DEOXYS + NATIONAL_DEX_CHIMECHO // SPECIES_CHIMECHO }; const u16 gHoennToNationalOrder[] = // Assigns Hoenn Dex Pokémon (Using National Dex Index) { - NATIONAL_DEX_TREECKO, // Treecko - NATIONAL_DEX_GROVYLE, // Grovyle - NATIONAL_DEX_SCEPTILE, // Sceptile - NATIONAL_DEX_TORCHIC, // Torchic - NATIONAL_DEX_COMBUSKEN, // Combusken - NATIONAL_DEX_BLAZIKEN, // Blaziken - NATIONAL_DEX_MUDKIP, // Mudkip - NATIONAL_DEX_MARSHTOMP, // Marshtomp - NATIONAL_DEX_SWAMPERT, // Swampert - NATIONAL_DEX_POOCHYENA, // Poochyena - NATIONAL_DEX_MIGHTYENA, // Mightyena - NATIONAL_DEX_ZIGZAGOON, // Zigzagoon - NATIONAL_DEX_LINOONE, // Linoone - NATIONAL_DEX_WURMPLE, // Wurmple - NATIONAL_DEX_SILCOON, // Silcoon - NATIONAL_DEX_BEAUTIFLY, // Beautifly - NATIONAL_DEX_CASCOON, // Cascoon - NATIONAL_DEX_DUSTOX, // Dustox - NATIONAL_DEX_LOTAD, // Lotad - NATIONAL_DEX_LOMBRE, // Lombre - NATIONAL_DEX_LUDICOLO, // Ludicolo - NATIONAL_DEX_SEEDOT, // Seedot - NATIONAL_DEX_NUZLEAF, // Nuzleaf - NATIONAL_DEX_SHIFTRY, // Shiftry - NATIONAL_DEX_TAILLOW, // Taillow - NATIONAL_DEX_SWELLOW, // Swellow - NATIONAL_DEX_WINGULL, // Wingull - NATIONAL_DEX_PELIPPER, // Pelipper - NATIONAL_DEX_RALTS, // Ralts - NATIONAL_DEX_KIRLIA, // Kirlia - NATIONAL_DEX_GARDEVOIR, // Gardevoir - NATIONAL_DEX_SURSKIT, // Surskit - NATIONAL_DEX_MASQUERAIN, // Masquerain - NATIONAL_DEX_SHROOMISH, // Shroomish - NATIONAL_DEX_BRELOOM, // Breloom - NATIONAL_DEX_SLAKOTH, // Slakoth - NATIONAL_DEX_VIGOROTH, // Vigoroth - NATIONAL_DEX_SLAKING, // Slaking - NATIONAL_DEX_ABRA, // Abra - NATIONAL_DEX_KADABRA, // Kadabra - NATIONAL_DEX_ALAKAZAM, // Alakazam - NATIONAL_DEX_NINCADA, // Nincada - NATIONAL_DEX_NINJASK, // Ninjask - NATIONAL_DEX_SHEDINJA, // Shedinja - NATIONAL_DEX_WHISMUR, // Whismur - NATIONAL_DEX_LOUDRED, // Loudred - NATIONAL_DEX_EXPLOUD, // Exploud - NATIONAL_DEX_MAKUHITA, // Makuhita - NATIONAL_DEX_HARIYAMA, // Hariyama - NATIONAL_DEX_GOLDEEN, // Goldeen - NATIONAL_DEX_SEAKING, // Seaking - NATIONAL_DEX_MAGIKARP, // Magikarp - NATIONAL_DEX_GYARADOS, // Gyarados - NATIONAL_DEX_AZURILL, // Azurill - NATIONAL_DEX_MARILL, // Marill - NATIONAL_DEX_AZUMARILL, // Azumarill - NATIONAL_DEX_GEODUDE, // Geodude - NATIONAL_DEX_GRAVELER, // Graveler - NATIONAL_DEX_GOLEM, // Golem - NATIONAL_DEX_NOSEPASS, // Nosepass - NATIONAL_DEX_SKITTY, // Skitty - NATIONAL_DEX_DELCATTY, // Delcatty - NATIONAL_DEX_ZUBAT, // Zubat - NATIONAL_DEX_GOLBAT, // Golbat - NATIONAL_DEX_CROBAT, // Crobat - NATIONAL_DEX_TENTACOOL, // Tentacool - NATIONAL_DEX_TENTACRUEL, // Tentacruel - NATIONAL_DEX_SABLEYE, // Sableye - NATIONAL_DEX_MAWILE, // Mawile - NATIONAL_DEX_ARON, // Aron - NATIONAL_DEX_LAIRON, // Lairon - NATIONAL_DEX_AGGRON, // Aggron - NATIONAL_DEX_MACHOP, // Machop - NATIONAL_DEX_MACHOKE, // Machoke - NATIONAL_DEX_MACHAMP, // Machamp - NATIONAL_DEX_MEDITITE, // Meditite - NATIONAL_DEX_MEDICHAM, // Medicham - NATIONAL_DEX_ELECTRIKE, // Electrike - NATIONAL_DEX_MANECTRIC, // Manectric - NATIONAL_DEX_PLUSLE, // Plusle - NATIONAL_DEX_MINUN, // Minun - NATIONAL_DEX_MAGNEMITE, // Magnemite - NATIONAL_DEX_MAGNETON, // Magneton - NATIONAL_DEX_VOLTORB, // Voltorb - NATIONAL_DEX_ELECTRODE, // Electrode - NATIONAL_DEX_VOLBEAT, // Volbeat - NATIONAL_DEX_ILLUMISE, // Illumise - NATIONAL_DEX_ODDISH, // Oddish - NATIONAL_DEX_GLOOM, // Gloom - NATIONAL_DEX_VILEPLUME, // Vileplume - NATIONAL_DEX_BELLOSSOM, // Bellossom - NATIONAL_DEX_DODUO, // Doduo - NATIONAL_DEX_DODRIO, // Dodrio - NATIONAL_DEX_ROSELIA, // Roselia - NATIONAL_DEX_GULPIN, // Gulpin - NATIONAL_DEX_SWALOT, // Swalot - NATIONAL_DEX_CARVANHA, // Carvanha - NATIONAL_DEX_SHARPEDO, // Sharpedo - NATIONAL_DEX_WAILMER, // Wailmer - NATIONAL_DEX_WAILORD, // Wailord - NATIONAL_DEX_NUMEL, // Numel - NATIONAL_DEX_CAMERUPT, // Camerupt - NATIONAL_DEX_SLUGMA, // Slugma - NATIONAL_DEX_MAGCARGO, // Magcargo - NATIONAL_DEX_TORKOAL, // Torkoal - NATIONAL_DEX_GRIMER, // Grimer - NATIONAL_DEX_MUK, // Muk - NATIONAL_DEX_KOFFING, // Koffing - NATIONAL_DEX_WEEZING, // Weezing - NATIONAL_DEX_SPOINK, // Spoink - NATIONAL_DEX_GRUMPIG, // Grumpig - NATIONAL_DEX_SANDSHREW, // Sandshrew - NATIONAL_DEX_SANDSLASH, // Sandslash - NATIONAL_DEX_SPINDA, // Spinda - NATIONAL_DEX_SKARMORY, // Skarmory - NATIONAL_DEX_TRAPINCH, // Trapinch - NATIONAL_DEX_VIBRAVA, // Vibrava - NATIONAL_DEX_FLYGON, // Flygon - NATIONAL_DEX_CACNEA, // Cacnea - NATIONAL_DEX_CACTURNE, // Cacturne - NATIONAL_DEX_SWABLU, // Swablu - NATIONAL_DEX_ALTARIA, // Altaria - NATIONAL_DEX_ZANGOOSE, // Zangoose - NATIONAL_DEX_SEVIPER, // Seviper - NATIONAL_DEX_LUNATONE, // Lunatone - NATIONAL_DEX_SOLROCK, // Solrock - NATIONAL_DEX_BARBOACH, // Barboach - NATIONAL_DEX_WHISCASH, // Whiscash - NATIONAL_DEX_CORPHISH, // Corphish - NATIONAL_DEX_CRAWDAUNT, // Crawdaunt - NATIONAL_DEX_BALTOY, // Baltoy - NATIONAL_DEX_CLAYDOL, // Claydol - NATIONAL_DEX_LILEEP, // Lileep - NATIONAL_DEX_CRADILY, // Cradily - NATIONAL_DEX_ANORITH, // Anorith - NATIONAL_DEX_ARMALDO, // Armaldo - NATIONAL_DEX_IGGLYBUFF, // Igglybuff - NATIONAL_DEX_JIGGLYPUFF, // Jigglypuff - NATIONAL_DEX_WIGGLYTUFF, // Wigglytuff - NATIONAL_DEX_FEEBAS, // Feebas - NATIONAL_DEX_MILOTIC, // Milotic - NATIONAL_DEX_CASTFORM, // Castform - NATIONAL_DEX_STARYU, // Staryu - NATIONAL_DEX_STARMIE, // Starmie - NATIONAL_DEX_KECLEON, // Kecleon - NATIONAL_DEX_SHUPPET, // Shuppet - NATIONAL_DEX_BANETTE, // Banette - NATIONAL_DEX_DUSKULL, // Duskull - NATIONAL_DEX_DUSCLOPS, // Dusclops - NATIONAL_DEX_TROPIUS, // Tropius - NATIONAL_DEX_CHIMECHO, // Chimecho - NATIONAL_DEX_ABSOL, // Absol - NATIONAL_DEX_VULPIX, // Vulpix - NATIONAL_DEX_NINETALES, // Ninetales - NATIONAL_DEX_PICHU, // Pichu - NATIONAL_DEX_PIKACHU, // Pikachu - NATIONAL_DEX_RAICHU, // Raichu - NATIONAL_DEX_PSYDUCK, // Psyduck - NATIONAL_DEX_GOLDUCK, // Golduck - NATIONAL_DEX_WYNAUT, // Wynaut - NATIONAL_DEX_WOBBUFFET, // Wobbuffet - NATIONAL_DEX_NATU, // Natu - NATIONAL_DEX_XATU, // Xatu - NATIONAL_DEX_GIRAFARIG, // Girafarig - NATIONAL_DEX_PHANPY, // Phanpy - NATIONAL_DEX_DONPHAN, // Donphan - NATIONAL_DEX_PINSIR, // Pinsir - NATIONAL_DEX_HERACROSS, // Heracross - NATIONAL_DEX_RHYHORN, // Rhyhorn - NATIONAL_DEX_RHYDON, // Rhydon - NATIONAL_DEX_SNORUNT, // Snorunt - NATIONAL_DEX_GLALIE, // Glalie - NATIONAL_DEX_SPHEAL, // Spheal - NATIONAL_DEX_SEALEO, // Sealeo - NATIONAL_DEX_WALREIN, // Walrein - NATIONAL_DEX_CLAMPERL, // Clamperl - NATIONAL_DEX_HUNTAIL, // Huntail - NATIONAL_DEX_GOREBYSS, // Gorebyss - NATIONAL_DEX_RELICANTH, // Relicanth - NATIONAL_DEX_CORSOLA, // Corsola - NATIONAL_DEX_CHINCHOU, // Chinchou - NATIONAL_DEX_LANTURN, // Lanturn - NATIONAL_DEX_LUVDISC, // Luvdisc - NATIONAL_DEX_HORSEA, // Horsea - NATIONAL_DEX_SEADRA, // Seadra - NATIONAL_DEX_KINGDRA, // Kingdra - NATIONAL_DEX_BAGON, // Bagon - NATIONAL_DEX_SHELGON, // Shelgon - NATIONAL_DEX_SALAMENCE, // Salamence - NATIONAL_DEX_BELDUM, // Beldum - NATIONAL_DEX_METANG, // Metang - NATIONAL_DEX_METAGROSS, // Metagross - NATIONAL_DEX_REGIROCK, // Regirock - NATIONAL_DEX_REGICE, // Regice - NATIONAL_DEX_REGISTEEL, // Registeel - NATIONAL_DEX_LATIAS, // Latias - NATIONAL_DEX_LATIOS, // Latios - NATIONAL_DEX_KYOGRE, // Kyogre - NATIONAL_DEX_GROUDON, // Groudon - NATIONAL_DEX_RAYQUAZA, // Rayquaza - NATIONAL_DEX_JIRACHI, // Jirachi - NATIONAL_DEX_DEOXYS, // Deoxys - NATIONAL_DEX_BULBASAUR, // Bulbasaur - Pokémon from here onwards are UNSEEN in the Hoenn Dex. - NATIONAL_DEX_IVYSAUR, // Ivysaur - NATIONAL_DEX_VENUSAUR, // Venusaur - NATIONAL_DEX_CHARMANDER, // Charmander - NATIONAL_DEX_CHARMELEON, // Charmeleon - NATIONAL_DEX_CHARIZARD, // Charizard - NATIONAL_DEX_SQUIRTLE, // Squirtle - NATIONAL_DEX_WARTORTLE, // Wartortle - NATIONAL_DEX_BLASTOISE, // Blastoise - NATIONAL_DEX_CATERPIE, // Caterpie - NATIONAL_DEX_METAPOD, // Metapod - NATIONAL_DEX_BUTTERFREE, // Butterfree - NATIONAL_DEX_WEEDLE, // Weedle - NATIONAL_DEX_KAKUNA, // Kakuna - NATIONAL_DEX_BEEDRILL, // Beedrill - NATIONAL_DEX_PIDGEY, // Pidgey - NATIONAL_DEX_PIDGEOTTO, // Pidgeotto - NATIONAL_DEX_PIDGEOT, // Pidgeot - NATIONAL_DEX_RATTATA, // Rattata - NATIONAL_DEX_RATICATE, // Raticate - NATIONAL_DEX_SPEAROW, // Spearow - NATIONAL_DEX_FEAROW, // Fearow - NATIONAL_DEX_EKANS, // Ekans - NATIONAL_DEX_ARBOK, // Arbok - NATIONAL_DEX_NIDORAN_F, // Nidoran♀ - NATIONAL_DEX_NIDORINA, // Nidorina - NATIONAL_DEX_NIDOQUEEN, // Nidoqueen - NATIONAL_DEX_NIDORAN_M, // Nidoran♂ - NATIONAL_DEX_NIDORINO, // Nidorino - NATIONAL_DEX_NIDOKING, // Nidoking - NATIONAL_DEX_CLEFAIRY, // Clefairy - NATIONAL_DEX_CLEFABLE, // Clefable - NATIONAL_DEX_PARAS, // Paras - NATIONAL_DEX_PARASECT, // Parasect - NATIONAL_DEX_VENONAT, // Venonat - NATIONAL_DEX_VENOMOTH, // Venomoth - NATIONAL_DEX_DIGLETT, // Diglett - NATIONAL_DEX_DUGTRIO, // Dugtrio - NATIONAL_DEX_MEOWTH, // Meowth - NATIONAL_DEX_PERSIAN, // Persian - NATIONAL_DEX_MANKEY, // Mankey - NATIONAL_DEX_PRIMEAPE, // Primeape - NATIONAL_DEX_GROWLITHE, // Growlithe - NATIONAL_DEX_ARCANINE, // Arcanine - NATIONAL_DEX_POLIWAG, // Poliwag - NATIONAL_DEX_POLIWHIRL, // Poliwhirl - NATIONAL_DEX_POLIWRATH, // Poliwrath - NATIONAL_DEX_BELLSPROUT, // Bellsprout - NATIONAL_DEX_WEEPINBELL, // Weepinbell - NATIONAL_DEX_VICTREEBEL, // Victreebel - NATIONAL_DEX_PONYTA, // Ponyta - NATIONAL_DEX_RAPIDASH, // Rapidash - NATIONAL_DEX_SLOWPOKE, // Slowpoke - NATIONAL_DEX_SLOWBRO, // Slowbro - NATIONAL_DEX_FARFETCHD, // Farfetch'd - NATIONAL_DEX_SEEL, // Seel - NATIONAL_DEX_DEWGONG, // Dewgong - NATIONAL_DEX_SHELLDER, // Shellder - NATIONAL_DEX_CLOYSTER, // Cloyster - NATIONAL_DEX_GASTLY, // Gastly - NATIONAL_DEX_HAUNTER, // Haunter - NATIONAL_DEX_GENGAR, // Gengar - NATIONAL_DEX_ONIX, // Onix - NATIONAL_DEX_DROWZEE, // Drowzee - NATIONAL_DEX_HYPNO, // Hypno - NATIONAL_DEX_KRABBY, // Krabby - NATIONAL_DEX_KINGLER, // Kingler - NATIONAL_DEX_EXEGGCUTE, // Exeggcute - NATIONAL_DEX_EXEGGUTOR, // Exeggutor - NATIONAL_DEX_CUBONE, // Cubone - NATIONAL_DEX_MAROWAK, // Marowak - NATIONAL_DEX_HITMONLEE, // Hitmonlee - NATIONAL_DEX_HITMONCHAN, // Hitmonchan - NATIONAL_DEX_LICKITUNG, // Lickitung - NATIONAL_DEX_CHANSEY, // Chansey - NATIONAL_DEX_TANGELA, // Tangela - NATIONAL_DEX_KANGASKHAN, // Kangaskhan - NATIONAL_DEX_MR_MIME, // Mr. Mime - NATIONAL_DEX_SCYTHER, // Scyther - NATIONAL_DEX_JYNX, // Jynx - NATIONAL_DEX_ELECTABUZZ, // Electabuzz - NATIONAL_DEX_MAGMAR, // Magmar - NATIONAL_DEX_TAUROS, // Tauros - NATIONAL_DEX_LAPRAS, // Lapras - NATIONAL_DEX_DITTO, // Ditto - NATIONAL_DEX_EEVEE, // Eevee - NATIONAL_DEX_VAPOREON, // Vaporeon - NATIONAL_DEX_JOLTEON, // Jolteon - NATIONAL_DEX_FLAREON, // Flareon - NATIONAL_DEX_PORYGON, // Porygon - NATIONAL_DEX_OMANYTE, // Omanyte - NATIONAL_DEX_OMASTAR, // Omastar - NATIONAL_DEX_KABUTO, // Kabuto - NATIONAL_DEX_KABUTOPS, // Kabutops - NATIONAL_DEX_AERODACTYL, // Aerodactyl - NATIONAL_DEX_SNORLAX, // Snorlax - NATIONAL_DEX_ARTICUNO, // Articuno - NATIONAL_DEX_ZAPDOS, // Zapdos - NATIONAL_DEX_MOLTRES, // Moltres - NATIONAL_DEX_DRATINI, // Dratini - NATIONAL_DEX_DRAGONAIR, // Dragonair - NATIONAL_DEX_DRAGONITE, // Dragonite - NATIONAL_DEX_MEWTWO, // Mewtwo - NATIONAL_DEX_MEW, // Mew - NATIONAL_DEX_CHIKORITA, // Chikorita - NATIONAL_DEX_BAYLEEF, // Bayleef - NATIONAL_DEX_MEGANIUM, // Meganium - NATIONAL_DEX_CYNDAQUIL, // Cyndaquil - NATIONAL_DEX_QUILAVA, // Quilava - NATIONAL_DEX_TYPHLOSION, // Typhlosion - NATIONAL_DEX_TOTODILE, // Totodile - NATIONAL_DEX_CROCONAW, // Croconaw - NATIONAL_DEX_FERALIGATR, // Feraligatr - NATIONAL_DEX_SENTRET, // Sentret - NATIONAL_DEX_FURRET, // Furret - NATIONAL_DEX_HOOTHOOT, // Hoothoot - NATIONAL_DEX_NOCTOWL, // Noctowl - NATIONAL_DEX_LEDYBA, // Ledyba - NATIONAL_DEX_LEDIAN, // Ledian - NATIONAL_DEX_SPINARAK, // Spinarak - NATIONAL_DEX_ARIADOS, // Ariados - NATIONAL_DEX_CLEFFA, // Cleffa - NATIONAL_DEX_TOGEPI, // Togepi - NATIONAL_DEX_TOGETIC, // Togetic - NATIONAL_DEX_MAREEP, // Mareep - NATIONAL_DEX_FLAAFFY, // Flaaffy - NATIONAL_DEX_AMPHAROS, // Ampharos - NATIONAL_DEX_SUDOWOODO, // Sudowoodo - NATIONAL_DEX_POLITOED, // Politoed - NATIONAL_DEX_HOPPIP, // Hoppip - NATIONAL_DEX_SKIPLOOM, // Skiploom - NATIONAL_DEX_JUMPLUFF, // Jumpluff - NATIONAL_DEX_AIPOM, // Aipom - NATIONAL_DEX_SUNKERN, // Sunkern - NATIONAL_DEX_SUNFLORA, // Sunflora - NATIONAL_DEX_YANMA, // Yanma - NATIONAL_DEX_WOOPER, // Wooper - NATIONAL_DEX_QUAGSIRE, // Quagsire - NATIONAL_DEX_ESPEON, // Espeon - NATIONAL_DEX_UMBREON, // Umbreon - NATIONAL_DEX_MURKROW, // Murkrow - NATIONAL_DEX_SLOWKING, // Slowking - NATIONAL_DEX_MISDREAVUS, // Misdreavus - NATIONAL_DEX_UNOWN, // Unown A - NATIONAL_DEX_PINECO, // Pineco - NATIONAL_DEX_FORRETRESS, // Forretress - NATIONAL_DEX_DUNSPARCE, // Dunsparce - NATIONAL_DEX_GLIGAR, // Gligar - NATIONAL_DEX_STEELIX, // Steelix - NATIONAL_DEX_SNUBBULL, // Snubbull - NATIONAL_DEX_GRANBULL, // Granbull - NATIONAL_DEX_QWILFISH, // Qwilfish - NATIONAL_DEX_SCIZOR, // Scizor - NATIONAL_DEX_SHUCKLE, // Shuckle - NATIONAL_DEX_SNEASEL, // Sneasel - NATIONAL_DEX_TEDDIURSA, // Teddiursa - NATIONAL_DEX_URSARING, // Ursaring - NATIONAL_DEX_SWINUB, // Swinub - NATIONAL_DEX_PILOSWINE, // Piloswine - NATIONAL_DEX_REMORAID, // Remoraid - NATIONAL_DEX_OCTILLERY, // Octillery - NATIONAL_DEX_DELIBIRD, // Delibird - NATIONAL_DEX_MANTINE, // Mantine - NATIONAL_DEX_HOUNDOUR, // Houndour - NATIONAL_DEX_HOUNDOOM, // Houndoom - NATIONAL_DEX_PORYGON2, // Porygon2 - NATIONAL_DEX_STANTLER, // Stantler - NATIONAL_DEX_SMEARGLE, // Smeargle - NATIONAL_DEX_TYROGUE, // Tyrogue - NATIONAL_DEX_HITMONTOP, // Hitmontop - NATIONAL_DEX_SMOOCHUM, // Smoochum - NATIONAL_DEX_ELEKID, // Elekid - NATIONAL_DEX_MAGBY, // Magby - NATIONAL_DEX_MILTANK, // Miltank - NATIONAL_DEX_BLISSEY, // Blissey - NATIONAL_DEX_RAIKOU, // Raikou - NATIONAL_DEX_ENTEI, // Entei - NATIONAL_DEX_SUICUNE, // Suicune - NATIONAL_DEX_LARVITAR, // Larvitar - NATIONAL_DEX_PUPITAR, // Pupitar - NATIONAL_DEX_TYRANITAR, // Tyranitar - NATIONAL_DEX_LUGIA, // Lugia - NATIONAL_DEX_HO_OH, // Ho-Oh - NATIONAL_DEX_CELEBI, // Celebi - NATIONAL_DEX_OLD_UNOWN_B, // Unown B (Old) - NATIONAL_DEX_OLD_UNOWN_C, // Unown C (Old) - NATIONAL_DEX_OLD_UNOWN_D, // Unown D (Old) - NATIONAL_DEX_OLD_UNOWN_E, // Unown E (Old) - NATIONAL_DEX_OLD_UNOWN_F, // Unown F (Old) - NATIONAL_DEX_OLD_UNOWN_G, // Unown G (Old) - NATIONAL_DEX_OLD_UNOWN_H, // Unown H (Old) - NATIONAL_DEX_OLD_UNOWN_I, // Unown I (Old) - NATIONAL_DEX_OLD_UNOWN_J, // Unown J (Old) - NATIONAL_DEX_OLD_UNOWN_K, // Unown K (Old) - NATIONAL_DEX_OLD_UNOWN_L, // Unown L (Old) - NATIONAL_DEX_OLD_UNOWN_M, // Unown M (Old) - NATIONAL_DEX_OLD_UNOWN_N, // Unown N (Old) - NATIONAL_DEX_OLD_UNOWN_O, // Unown O (Old) - NATIONAL_DEX_OLD_UNOWN_P, // Unown P (Old) - NATIONAL_DEX_OLD_UNOWN_Q, // Unown Q (Old) - NATIONAL_DEX_OLD_UNOWN_R, // Unown R (Old) - NATIONAL_DEX_OLD_UNOWN_S, // Unown S (Old) - NATIONAL_DEX_OLD_UNOWN_T, // Unown T (Old) - NATIONAL_DEX_OLD_UNOWN_U, // Unown U (Old) - NATIONAL_DEX_OLD_UNOWN_V, // Unown V (Old) - NATIONAL_DEX_OLD_UNOWN_W, // Unown W (Old) - NATIONAL_DEX_OLD_UNOWN_X, // Unown X (Old) - NATIONAL_DEX_OLD_UNOWN_Y, // Unown Y (Old) - NATIONAL_DEX_OLD_UNOWN_Z, // Unown Z (Old) + // SPECIES_NONE + NATIONAL_DEX_TREECKO, // HOENN_DEX_TREECKO + NATIONAL_DEX_GROVYLE, // HOENN_DEX_GROVYLE + NATIONAL_DEX_SCEPTILE, // HOENN_DEX_SCEPTILE + NATIONAL_DEX_TORCHIC, // HOENN_DEX_TORCHIC + NATIONAL_DEX_COMBUSKEN, // HOENN_DEX_COMBUSKEN + NATIONAL_DEX_BLAZIKEN, // HOENN_DEX_BLAZIKEN + NATIONAL_DEX_MUDKIP, // HOENN_DEX_MUDKIP + NATIONAL_DEX_MARSHTOMP, // HOENN_DEX_MARSHTOMP + NATIONAL_DEX_SWAMPERT, // HOENN_DEX_SWAMPERT + NATIONAL_DEX_POOCHYENA, // HOENN_DEX_POOCHYENA + NATIONAL_DEX_MIGHTYENA, // HOENN_DEX_MIGHTYENA + NATIONAL_DEX_ZIGZAGOON, // HOENN_DEX_ZIGZAGOON + NATIONAL_DEX_LINOONE, // HOENN_DEX_LINOONE + NATIONAL_DEX_WURMPLE, // HOENN_DEX_WURMPLE + NATIONAL_DEX_SILCOON, // HOENN_DEX_SILCOON + NATIONAL_DEX_BEAUTIFLY, // HOENN_DEX_BEAUTIFLY + NATIONAL_DEX_CASCOON, // HOENN_DEX_CASCOON + NATIONAL_DEX_DUSTOX, // HOENN_DEX_DUSTOX + NATIONAL_DEX_LOTAD, // HOENN_DEX_LOTAD + NATIONAL_DEX_LOMBRE, // HOENN_DEX_LOMBRE + NATIONAL_DEX_LUDICOLO, // HOENN_DEX_LUDICOLO + NATIONAL_DEX_SEEDOT, // HOENN_DEX_SEEDOT + NATIONAL_DEX_NUZLEAF, // HOENN_DEX_NUZLEAF + NATIONAL_DEX_SHIFTRY, // HOENN_DEX_SHIFTRY + NATIONAL_DEX_TAILLOW, // HOENN_DEX_TAILLOW + NATIONAL_DEX_SWELLOW, // HOENN_DEX_SWELLOW + NATIONAL_DEX_WINGULL, // HOENN_DEX_WINGULL + NATIONAL_DEX_PELIPPER, // HOENN_DEX_PELIPPER + NATIONAL_DEX_RALTS, // HOENN_DEX_RALTS + NATIONAL_DEX_KIRLIA, // HOENN_DEX_KIRLIA + NATIONAL_DEX_GARDEVOIR, // HOENN_DEX_GARDEVOIR + NATIONAL_DEX_SURSKIT, // HOENN_DEX_SURSKIT + NATIONAL_DEX_MASQUERAIN, // HOENN_DEX_MASQUERAIN + NATIONAL_DEX_SHROOMISH, // HOENN_DEX_SHROOMISH + NATIONAL_DEX_BRELOOM, // HOENN_DEX_BRELOOM + NATIONAL_DEX_SLAKOTH, // HOENN_DEX_SLAKOTH + NATIONAL_DEX_VIGOROTH, // HOENN_DEX_VIGOROTH + NATIONAL_DEX_SLAKING, // HOENN_DEX_SLAKING + NATIONAL_DEX_ABRA, // HOENN_DEX_ABRA + NATIONAL_DEX_KADABRA, // HOENN_DEX_KADABRA + NATIONAL_DEX_ALAKAZAM, // HOENN_DEX_ALAKAZAM + NATIONAL_DEX_NINCADA, // HOENN_DEX_NINCADA + NATIONAL_DEX_NINJASK, // HOENN_DEX_NINJASK + NATIONAL_DEX_SHEDINJA, // HOENN_DEX_SHEDINJA + NATIONAL_DEX_WHISMUR, // HOENN_DEX_WHISMUR + NATIONAL_DEX_LOUDRED, // HOENN_DEX_LOUDRED + NATIONAL_DEX_EXPLOUD, // HOENN_DEX_EXPLOUD + NATIONAL_DEX_MAKUHITA, // HOENN_DEX_MAKUHITA + NATIONAL_DEX_HARIYAMA, // HOENN_DEX_HARIYAMA + NATIONAL_DEX_GOLDEEN, // HOENN_DEX_GOLDEEN + NATIONAL_DEX_SEAKING, // HOENN_DEX_SEAKING + NATIONAL_DEX_MAGIKARP, // HOENN_DEX_MAGIKARP + NATIONAL_DEX_GYARADOS, // HOENN_DEX_GYARADOS + NATIONAL_DEX_AZURILL, // HOENN_DEX_AZURILL + NATIONAL_DEX_MARILL, // HOENN_DEX_MARILL + NATIONAL_DEX_AZUMARILL, // HOENN_DEX_AZUMARILL + NATIONAL_DEX_GEODUDE, // HOENN_DEX_GEODUDE + NATIONAL_DEX_GRAVELER, // HOENN_DEX_GRAVELER + NATIONAL_DEX_GOLEM, // HOENN_DEX_GOLEM + NATIONAL_DEX_NOSEPASS, // HOENN_DEX_NOSEPASS + NATIONAL_DEX_SKITTY, // HOENN_DEX_SKITTY + NATIONAL_DEX_DELCATTY, // HOENN_DEX_DELCATTY + NATIONAL_DEX_ZUBAT, // HOENN_DEX_ZUBAT + NATIONAL_DEX_GOLBAT, // HOENN_DEX_GOLBAT + NATIONAL_DEX_CROBAT, // HOENN_DEX_CROBAT + NATIONAL_DEX_TENTACOOL, // HOENN_DEX_TENTACOOL + NATIONAL_DEX_TENTACRUEL, // HOENN_DEX_TENTACRUEL + NATIONAL_DEX_SABLEYE, // HOENN_DEX_SABLEYE + NATIONAL_DEX_MAWILE, // HOENN_DEX_MAWILE + NATIONAL_DEX_ARON, // HOENN_DEX_ARON + NATIONAL_DEX_LAIRON, // HOENN_DEX_LAIRON + NATIONAL_DEX_AGGRON, // HOENN_DEX_AGGRON + NATIONAL_DEX_MACHOP, // HOENN_DEX_MACHOP + NATIONAL_DEX_MACHOKE, // HOENN_DEX_MACHOKE + NATIONAL_DEX_MACHAMP, // HOENN_DEX_MACHAMP + NATIONAL_DEX_MEDITITE, // HOENN_DEX_MEDITITE + NATIONAL_DEX_MEDICHAM, // HOENN_DEX_MEDICHAM + NATIONAL_DEX_ELECTRIKE, // HOENN_DEX_ELECTRIKE + NATIONAL_DEX_MANECTRIC, // HOENN_DEX_MANECTRIC + NATIONAL_DEX_PLUSLE, // HOENN_DEX_PLUSLE + NATIONAL_DEX_MINUN, // HOENN_DEX_MINUN + NATIONAL_DEX_MAGNEMITE, // HOENN_DEX_MAGNEMITE + NATIONAL_DEX_MAGNETON, // HOENN_DEX_MAGNETON + NATIONAL_DEX_VOLTORB, // HOENN_DEX_VOLTORB + NATIONAL_DEX_ELECTRODE, // HOENN_DEX_ELECTRODE + NATIONAL_DEX_VOLBEAT, // HOENN_DEX_VOLBEAT + NATIONAL_DEX_ILLUMISE, // HOENN_DEX_ILLUMISE + NATIONAL_DEX_ODDISH, // HOENN_DEX_ODDISH + NATIONAL_DEX_GLOOM, // HOENN_DEX_GLOOM + NATIONAL_DEX_VILEPLUME, // HOENN_DEX_VILEPLUME + NATIONAL_DEX_BELLOSSOM, // HOENN_DEX_BELLOSSOM + NATIONAL_DEX_DODUO, // HOENN_DEX_DODUO + NATIONAL_DEX_DODRIO, // HOENN_DEX_DODRIO + NATIONAL_DEX_ROSELIA, // HOENN_DEX_ROSELIA + NATIONAL_DEX_GULPIN, // HOENN_DEX_GULPIN + NATIONAL_DEX_SWALOT, // HOENN_DEX_SWALOT + NATIONAL_DEX_CARVANHA, // HOENN_DEX_CARVANHA + NATIONAL_DEX_SHARPEDO, // HOENN_DEX_SHARPEDO + NATIONAL_DEX_WAILMER, // HOENN_DEX_WAILMER + NATIONAL_DEX_WAILORD, // HOENN_DEX_WAILORD + NATIONAL_DEX_NUMEL, // HOENN_DEX_NUMEL + NATIONAL_DEX_CAMERUPT, // HOENN_DEX_CAMERUPT + NATIONAL_DEX_SLUGMA, // HOENN_DEX_SLUGMA + NATIONAL_DEX_MAGCARGO, // HOENN_DEX_MAGCARGO + NATIONAL_DEX_TORKOAL, // HOENN_DEX_TORKOAL + NATIONAL_DEX_GRIMER, // HOENN_DEX_GRIMER + NATIONAL_DEX_MUK, // HOENN_DEX_MUK + NATIONAL_DEX_KOFFING, // HOENN_DEX_KOFFING + NATIONAL_DEX_WEEZING, // HOENN_DEX_WEEZING + NATIONAL_DEX_SPOINK, // HOENN_DEX_SPOINK + NATIONAL_DEX_GRUMPIG, // HOENN_DEX_GRUMPIG + NATIONAL_DEX_SANDSHREW, // HOENN_DEX_SANDSHREW + NATIONAL_DEX_SANDSLASH, // HOENN_DEX_SANDSLASH + NATIONAL_DEX_SPINDA, // HOENN_DEX_SPINDA + NATIONAL_DEX_SKARMORY, // HOENN_DEX_SKARMORY + NATIONAL_DEX_TRAPINCH, // HOENN_DEX_TRAPINCH + NATIONAL_DEX_VIBRAVA, // HOENN_DEX_VIBRAVA + NATIONAL_DEX_FLYGON, // HOENN_DEX_FLYGON + NATIONAL_DEX_CACNEA, // HOENN_DEX_CACNEA + NATIONAL_DEX_CACTURNE, // HOENN_DEX_CACTURNE + NATIONAL_DEX_SWABLU, // HOENN_DEX_SWABLU + NATIONAL_DEX_ALTARIA, // HOENN_DEX_ALTARIA + NATIONAL_DEX_ZANGOOSE, // HOENN_DEX_ZANGOOSE + NATIONAL_DEX_SEVIPER, // HOENN_DEX_SEVIPER + NATIONAL_DEX_LUNATONE, // HOENN_DEX_LUNATONE + NATIONAL_DEX_SOLROCK, // HOENN_DEX_SOLROCK + NATIONAL_DEX_BARBOACH, // HOENN_DEX_BARBOACH + NATIONAL_DEX_WHISCASH, // HOENN_DEX_WHISCASH + NATIONAL_DEX_CORPHISH, // HOENN_DEX_CORPHISH + NATIONAL_DEX_CRAWDAUNT, // HOENN_DEX_CRAWDAUNT + NATIONAL_DEX_BALTOY, // HOENN_DEX_BALTOY + NATIONAL_DEX_CLAYDOL, // HOENN_DEX_CLAYDOL + NATIONAL_DEX_LILEEP, // HOENN_DEX_LILEEP + NATIONAL_DEX_CRADILY, // HOENN_DEX_CRADILY + NATIONAL_DEX_ANORITH, // HOENN_DEX_ANORITH + NATIONAL_DEX_ARMALDO, // HOENN_DEX_ARMALDO + NATIONAL_DEX_IGGLYBUFF, // HOENN_DEX_IGGLYBUFF + NATIONAL_DEX_JIGGLYPUFF, // HOENN_DEX_JIGGLYPUFF + NATIONAL_DEX_WIGGLYTUFF, // HOENN_DEX_WIGGLYTUFF + NATIONAL_DEX_FEEBAS, // HOENN_DEX_FEEBAS + NATIONAL_DEX_MILOTIC, // HOENN_DEX_MILOTIC + NATIONAL_DEX_CASTFORM, // HOENN_DEX_CASTFORM + NATIONAL_DEX_STARYU, // HOENN_DEX_STARYU + NATIONAL_DEX_STARMIE, // HOENN_DEX_STARMIE + NATIONAL_DEX_KECLEON, // HOENN_DEX_KECLEON + NATIONAL_DEX_SHUPPET, // HOENN_DEX_SHUPPET + NATIONAL_DEX_BANETTE, // HOENN_DEX_BANETTE + NATIONAL_DEX_DUSKULL, // HOENN_DEX_DUSKULL + NATIONAL_DEX_DUSCLOPS, // HOENN_DEX_DUSCLOPS + NATIONAL_DEX_TROPIUS, // HOENN_DEX_TROPIUS + NATIONAL_DEX_CHIMECHO, // HOENN_DEX_CHIMECHO + NATIONAL_DEX_ABSOL, // HOENN_DEX_ABSOL + NATIONAL_DEX_VULPIX, // HOENN_DEX_VULPIX + NATIONAL_DEX_NINETALES, // HOENN_DEX_NINETALES + NATIONAL_DEX_PICHU, // HOENN_DEX_PICHU + NATIONAL_DEX_PIKACHU, // HOENN_DEX_PIKACHU + NATIONAL_DEX_RAICHU, // HOENN_DEX_RAICHU + NATIONAL_DEX_PSYDUCK, // HOENN_DEX_PSYDUCK + NATIONAL_DEX_GOLDUCK, // HOENN_DEX_GOLDUCK + NATIONAL_DEX_WYNAUT, // HOENN_DEX_WYNAUT + NATIONAL_DEX_WOBBUFFET, // HOENN_DEX_WOBBUFFET + NATIONAL_DEX_NATU, // HOENN_DEX_NATU + NATIONAL_DEX_XATU, // HOENN_DEX_XATU + NATIONAL_DEX_GIRAFARIG, // HOENN_DEX_GIRAFARIG + NATIONAL_DEX_PHANPY, // HOENN_DEX_PHANPY + NATIONAL_DEX_DONPHAN, // HOENN_DEX_DONPHAN + NATIONAL_DEX_PINSIR, // HOENN_DEX_PINSIR + NATIONAL_DEX_HERACROSS, // HOENN_DEX_HERACROSS + NATIONAL_DEX_RHYHORN, // HOENN_DEX_RHYHORN + NATIONAL_DEX_RHYDON, // HOENN_DEX_RHYDON + NATIONAL_DEX_SNORUNT, // HOENN_DEX_SNORUNT + NATIONAL_DEX_GLALIE, // HOENN_DEX_GLALIE + NATIONAL_DEX_SPHEAL, // HOENN_DEX_SPHEAL + NATIONAL_DEX_SEALEO, // HOENN_DEX_SEALEO + NATIONAL_DEX_WALREIN, // HOENN_DEX_WALREIN + NATIONAL_DEX_CLAMPERL, // HOENN_DEX_CLAMPERL + NATIONAL_DEX_HUNTAIL, // HOENN_DEX_HUNTAIL + NATIONAL_DEX_GOREBYSS, // HOENN_DEX_GOREBYSS + NATIONAL_DEX_RELICANTH, // HOENN_DEX_RELICANTH + NATIONAL_DEX_CORSOLA, // HOENN_DEX_CORSOLA + NATIONAL_DEX_CHINCHOU, // HOENN_DEX_CHINCHOU + NATIONAL_DEX_LANTURN, // HOENN_DEX_LANTURN + NATIONAL_DEX_LUVDISC, // HOENN_DEX_LUVDISC + NATIONAL_DEX_HORSEA, // HOENN_DEX_HORSEA + NATIONAL_DEX_SEADRA, // HOENN_DEX_SEADRA + NATIONAL_DEX_KINGDRA, // HOENN_DEX_KINGDRA + NATIONAL_DEX_BAGON, // HOENN_DEX_BAGON + NATIONAL_DEX_SHELGON, // HOENN_DEX_SHELGON + NATIONAL_DEX_SALAMENCE, // HOENN_DEX_SALAMENCE + NATIONAL_DEX_BELDUM, // HOENN_DEX_BELDUM + NATIONAL_DEX_METANG, // HOENN_DEX_METANG + NATIONAL_DEX_METAGROSS, // HOENN_DEX_METAGROSS + NATIONAL_DEX_REGIROCK, // HOENN_DEX_REGIROCK + NATIONAL_DEX_REGICE, // HOENN_DEX_REGICE + NATIONAL_DEX_REGISTEEL, // HOENN_DEX_REGISTEEL + NATIONAL_DEX_LATIAS, // HOENN_DEX_LATIAS + NATIONAL_DEX_LATIOS, // HOENN_DEX_LATIOS + NATIONAL_DEX_KYOGRE, // HOENN_DEX_KYOGRE + NATIONAL_DEX_GROUDON, // HOENN_DEX_GROUDON + NATIONAL_DEX_RAYQUAZA, // HOENN_DEX_RAYQUAZA + NATIONAL_DEX_JIRACHI, // HOENN_DEX_JIRACHI + NATIONAL_DEX_DEOXYS, // HOENN_DEX_DEOXYS + NATIONAL_DEX_BULBASAUR, // HOENN_DEX_BULBASAUR - Pokémon from here onwards are UNSEEN in the Hoenn Dex. + NATIONAL_DEX_IVYSAUR, // HOENN_DEX_IVYSAUR + NATIONAL_DEX_VENUSAUR, // HOENN_DEX_VENUSAUR + NATIONAL_DEX_CHARMANDER, // HOENN_DEX_CHARMANDER + NATIONAL_DEX_CHARMELEON, // HOENN_DEX_CHARMELEON + NATIONAL_DEX_CHARIZARD, // HOENN_DEX_CHARIZARD + NATIONAL_DEX_SQUIRTLE, // HOENN_DEX_SQUIRTLE + NATIONAL_DEX_WARTORTLE, // HOENN_DEX_WARTORTLE + NATIONAL_DEX_BLASTOISE, // HOENN_DEX_BLASTOISE + NATIONAL_DEX_CATERPIE, // HOENN_DEX_CATERPIE + NATIONAL_DEX_METAPOD, // HOENN_DEX_METAPOD + NATIONAL_DEX_BUTTERFREE, // HOENN_DEX_BUTTERFREE + NATIONAL_DEX_WEEDLE, // HOENN_DEX_WEEDLE + NATIONAL_DEX_KAKUNA, // HOENN_DEX_KAKUNA + NATIONAL_DEX_BEEDRILL, // HOENN_DEX_BEEDRILL + NATIONAL_DEX_PIDGEY, // HOENN_DEX_PIDGEY + NATIONAL_DEX_PIDGEOTTO, // HOENN_DEX_PIDGEOTTO + NATIONAL_DEX_PIDGEOT, // HOENN_DEX_PIDGEOT + NATIONAL_DEX_RATTATA, // HOENN_DEX_RATTATA + NATIONAL_DEX_RATICATE, // HOENN_DEX_RATICATE + NATIONAL_DEX_SPEAROW, // HOENN_DEX_SPEAROW + NATIONAL_DEX_FEAROW, // HOENN_DEX_FEAROW + NATIONAL_DEX_EKANS, // HOENN_DEX_EKANS + NATIONAL_DEX_ARBOK, // HOENN_DEX_ARBOK + NATIONAL_DEX_NIDORAN_F, // HOENN_DEX_NIDORAN♀ + NATIONAL_DEX_NIDORINA, // HOENN_DEX_NIDORINA + NATIONAL_DEX_NIDOQUEEN, // HOENN_DEX_NIDOQUEEN + NATIONAL_DEX_NIDORAN_M, // HOENN_DEX_NIDORAN♂ + NATIONAL_DEX_NIDORINO, // HOENN_DEX_NIDORINO + NATIONAL_DEX_NIDOKING, // HOENN_DEX_NIDOKING + NATIONAL_DEX_CLEFAIRY, // HOENN_DEX_CLEFAIRY + NATIONAL_DEX_CLEFABLE, // HOENN_DEX_CLEFABLE + NATIONAL_DEX_PARAS, // HOENN_DEX_PARAS + NATIONAL_DEX_PARASECT, // HOENN_DEX_PARASECT + NATIONAL_DEX_VENONAT, // HOENN_DEX_VENONAT + NATIONAL_DEX_VENOMOTH, // HOENN_DEX_VENOMOTH + NATIONAL_DEX_DIGLETT, // HOENN_DEX_DIGLETT + NATIONAL_DEX_DUGTRIO, // HOENN_DEX_DUGTRIO + NATIONAL_DEX_MEOWTH, // HOENN_DEX_MEOWTH + NATIONAL_DEX_PERSIAN, // HOENN_DEX_PERSIAN + NATIONAL_DEX_MANKEY, // HOENN_DEX_MANKEY + NATIONAL_DEX_PRIMEAPE, // HOENN_DEX_PRIMEAPE + NATIONAL_DEX_GROWLITHE, // HOENN_DEX_GROWLITHE + NATIONAL_DEX_ARCANINE, // HOENN_DEX_ARCANINE + NATIONAL_DEX_POLIWAG, // HOENN_DEX_POLIWAG + NATIONAL_DEX_POLIWHIRL, // HOENN_DEX_POLIWHIRL + NATIONAL_DEX_POLIWRATH, // HOENN_DEX_POLIWRATH + NATIONAL_DEX_BELLSPROUT, // HOENN_DEX_BELLSPROUT + NATIONAL_DEX_WEEPINBELL, // HOENN_DEX_WEEPINBELL + NATIONAL_DEX_VICTREEBEL, // HOENN_DEX_VICTREEBEL + NATIONAL_DEX_PONYTA, // HOENN_DEX_PONYTA + NATIONAL_DEX_RAPIDASH, // HOENN_DEX_RAPIDASH + NATIONAL_DEX_SLOWPOKE, // HOENN_DEX_SLOWPOKE + NATIONAL_DEX_SLOWBRO, // HOENN_DEX_SLOWBRO + NATIONAL_DEX_FARFETCHD, // HOENN_DEX_FARFETCH'D + NATIONAL_DEX_SEEL, // HOENN_DEX_SEEL + NATIONAL_DEX_DEWGONG, // HOENN_DEX_DEWGONG + NATIONAL_DEX_SHELLDER, // HOENN_DEX_SHELLDER + NATIONAL_DEX_CLOYSTER, // HOENN_DEX_CLOYSTER + NATIONAL_DEX_GASTLY, // HOENN_DEX_GASTLY + NATIONAL_DEX_HAUNTER, // HOENN_DEX_HAUNTER + NATIONAL_DEX_GENGAR, // HOENN_DEX_GENGAR + NATIONAL_DEX_ONIX, // HOENN_DEX_ONIX + NATIONAL_DEX_DROWZEE, // HOENN_DEX_DROWZEE + NATIONAL_DEX_HYPNO, // HOENN_DEX_HYPNO + NATIONAL_DEX_KRABBY, // HOENN_DEX_KRABBY + NATIONAL_DEX_KINGLER, // HOENN_DEX_KINGLER + NATIONAL_DEX_EXEGGCUTE, // HOENN_DEX_EXEGGCUTE + NATIONAL_DEX_EXEGGUTOR, // HOENN_DEX_EXEGGUTOR + NATIONAL_DEX_CUBONE, // HOENN_DEX_CUBONE + NATIONAL_DEX_MAROWAK, // HOENN_DEX_MAROWAK + NATIONAL_DEX_HITMONLEE, // HOENN_DEX_HITMONLEE + NATIONAL_DEX_HITMONCHAN, // HOENN_DEX_HITMONCHAN + NATIONAL_DEX_LICKITUNG, // HOENN_DEX_LICKITUNG + NATIONAL_DEX_CHANSEY, // HOENN_DEX_CHANSEY + NATIONAL_DEX_TANGELA, // HOENN_DEX_TANGELA + NATIONAL_DEX_KANGASKHAN, // HOENN_DEX_KANGASKHAN + NATIONAL_DEX_MR_MIME, // HOENN_DEX_MR. MIME + NATIONAL_DEX_SCYTHER, // HOENN_DEX_SCYTHER + NATIONAL_DEX_JYNX, // HOENN_DEX_JYNX + NATIONAL_DEX_ELECTABUZZ, // HOENN_DEX_ELECTABUZZ + NATIONAL_DEX_MAGMAR, // HOENN_DEX_MAGMAR + NATIONAL_DEX_TAUROS, // HOENN_DEX_TAUROS + NATIONAL_DEX_LAPRAS, // HOENN_DEX_LAPRAS + NATIONAL_DEX_DITTO, // HOENN_DEX_DITTO + NATIONAL_DEX_EEVEE, // HOENN_DEX_EEVEE + NATIONAL_DEX_VAPOREON, // HOENN_DEX_VAPOREON + NATIONAL_DEX_JOLTEON, // HOENN_DEX_JOLTEON + NATIONAL_DEX_FLAREON, // HOENN_DEX_FLAREON + NATIONAL_DEX_PORYGON, // HOENN_DEX_PORYGON + NATIONAL_DEX_OMANYTE, // HOENN_DEX_OMANYTE + NATIONAL_DEX_OMASTAR, // HOENN_DEX_OMASTAR + NATIONAL_DEX_KABUTO, // HOENN_DEX_KABUTO + NATIONAL_DEX_KABUTOPS, // HOENN_DEX_KABUTOPS + NATIONAL_DEX_AERODACTYL, // HOENN_DEX_AERODACTYL + NATIONAL_DEX_SNORLAX, // HOENN_DEX_SNORLAX + NATIONAL_DEX_ARTICUNO, // HOENN_DEX_ARTICUNO + NATIONAL_DEX_ZAPDOS, // HOENN_DEX_ZAPDOS + NATIONAL_DEX_MOLTRES, // HOENN_DEX_MOLTRES + NATIONAL_DEX_DRATINI, // HOENN_DEX_DRATINI + NATIONAL_DEX_DRAGONAIR, // HOENN_DEX_DRAGONAIR + NATIONAL_DEX_DRAGONITE, // HOENN_DEX_DRAGONITE + NATIONAL_DEX_MEWTWO, // HOENN_DEX_MEWTWO + NATIONAL_DEX_MEW, // HOENN_DEX_MEW + NATIONAL_DEX_CHIKORITA, // HOENN_DEX_CHIKORITA + NATIONAL_DEX_BAYLEEF, // HOENN_DEX_BAYLEEF + NATIONAL_DEX_MEGANIUM, // HOENN_DEX_MEGANIUM + NATIONAL_DEX_CYNDAQUIL, // HOENN_DEX_CYNDAQUIL + NATIONAL_DEX_QUILAVA, // HOENN_DEX_QUILAVA + NATIONAL_DEX_TYPHLOSION, // HOENN_DEX_TYPHLOSION + NATIONAL_DEX_TOTODILE, // HOENN_DEX_TOTODILE + NATIONAL_DEX_CROCONAW, // HOENN_DEX_CROCONAW + NATIONAL_DEX_FERALIGATR, // HOENN_DEX_FERALIGATR + NATIONAL_DEX_SENTRET, // HOENN_DEX_SENTRET + NATIONAL_DEX_FURRET, // HOENN_DEX_FURRET + NATIONAL_DEX_HOOTHOOT, // HOENN_DEX_HOOTHOOT + NATIONAL_DEX_NOCTOWL, // HOENN_DEX_NOCTOWL + NATIONAL_DEX_LEDYBA, // HOENN_DEX_LEDYBA + NATIONAL_DEX_LEDIAN, // HOENN_DEX_LEDIAN + NATIONAL_DEX_SPINARAK, // HOENN_DEX_SPINARAK + NATIONAL_DEX_ARIADOS, // HOENN_DEX_ARIADOS + NATIONAL_DEX_CLEFFA, // HOENN_DEX_CLEFFA + NATIONAL_DEX_TOGEPI, // HOENN_DEX_TOGEPI + NATIONAL_DEX_TOGETIC, // HOENN_DEX_TOGETIC + NATIONAL_DEX_MAREEP, // HOENN_DEX_MAREEP + NATIONAL_DEX_FLAAFFY, // HOENN_DEX_FLAAFFY + NATIONAL_DEX_AMPHAROS, // HOENN_DEX_AMPHAROS + NATIONAL_DEX_SUDOWOODO, // HOENN_DEX_SUDOWOODO + NATIONAL_DEX_POLITOED, // HOENN_DEX_POLITOED + NATIONAL_DEX_HOPPIP, // HOENN_DEX_HOPPIP + NATIONAL_DEX_SKIPLOOM, // HOENN_DEX_SKIPLOOM + NATIONAL_DEX_JUMPLUFF, // HOENN_DEX_JUMPLUFF + NATIONAL_DEX_AIPOM, // HOENN_DEX_AIPOM + NATIONAL_DEX_SUNKERN, // HOENN_DEX_SUNKERN + NATIONAL_DEX_SUNFLORA, // HOENN_DEX_SUNFLORA + NATIONAL_DEX_YANMA, // HOENN_DEX_YANMA + NATIONAL_DEX_WOOPER, // HOENN_DEX_WOOPER + NATIONAL_DEX_QUAGSIRE, // HOENN_DEX_QUAGSIRE + NATIONAL_DEX_ESPEON, // HOENN_DEX_ESPEON + NATIONAL_DEX_UMBREON, // HOENN_DEX_UMBREON + NATIONAL_DEX_MURKROW, // HOENN_DEX_MURKROW + NATIONAL_DEX_SLOWKING, // HOENN_DEX_SLOWKING + NATIONAL_DEX_MISDREAVUS, // HOENN_DEX_MISDREAVUS + NATIONAL_DEX_UNOWN, // HOENN_DEX_UNOWN + NATIONAL_DEX_PINECO, // HOENN_DEX_PINECO + NATIONAL_DEX_FORRETRESS, // HOENN_DEX_FORRETRESS + NATIONAL_DEX_DUNSPARCE, // HOENN_DEX_DUNSPARCE + NATIONAL_DEX_GLIGAR, // HOENN_DEX_GLIGAR + NATIONAL_DEX_STEELIX, // HOENN_DEX_STEELIX + NATIONAL_DEX_SNUBBULL, // HOENN_DEX_SNUBBULL + NATIONAL_DEX_GRANBULL, // HOENN_DEX_GRANBULL + NATIONAL_DEX_QWILFISH, // HOENN_DEX_QWILFISH + NATIONAL_DEX_SCIZOR, // HOENN_DEX_SCIZOR + NATIONAL_DEX_SHUCKLE, // HOENN_DEX_SHUCKLE + NATIONAL_DEX_SNEASEL, // HOENN_DEX_SNEASEL + NATIONAL_DEX_TEDDIURSA, // HOENN_DEX_TEDDIURSA + NATIONAL_DEX_URSARING, // HOENN_DEX_URSARING + NATIONAL_DEX_SWINUB, // HOENN_DEX_SWINUB + NATIONAL_DEX_PILOSWINE, // HOENN_DEX_PILOSWINE + NATIONAL_DEX_REMORAID, // HOENN_DEX_REMORAID + NATIONAL_DEX_OCTILLERY, // HOENN_DEX_OCTILLERY + NATIONAL_DEX_DELIBIRD, // HOENN_DEX_DELIBIRD + NATIONAL_DEX_MANTINE, // HOENN_DEX_MANTINE + NATIONAL_DEX_HOUNDOUR, // HOENN_DEX_HOUNDOUR + NATIONAL_DEX_HOUNDOOM, // HOENN_DEX_HOUNDOOM + NATIONAL_DEX_PORYGON2, // HOENN_DEX_PORYGON2 + NATIONAL_DEX_STANTLER, // HOENN_DEX_STANTLER + NATIONAL_DEX_SMEARGLE, // HOENN_DEX_SMEARGLE + NATIONAL_DEX_TYROGUE, // HOENN_DEX_TYROGUE + NATIONAL_DEX_HITMONTOP, // HOENN_DEX_HITMONTOP + NATIONAL_DEX_SMOOCHUM, // HOENN_DEX_SMOOCHUM + NATIONAL_DEX_ELEKID, // HOENN_DEX_ELEKID + NATIONAL_DEX_MAGBY, // HOENN_DEX_MAGBY + NATIONAL_DEX_MILTANK, // HOENN_DEX_MILTANK + NATIONAL_DEX_BLISSEY, // HOENN_DEX_BLISSEY + NATIONAL_DEX_RAIKOU, // HOENN_DEX_RAIKOU + NATIONAL_DEX_ENTEI, // HOENN_DEX_ENTEI + NATIONAL_DEX_SUICUNE, // HOENN_DEX_SUICUNE + NATIONAL_DEX_LARVITAR, // HOENN_DEX_LARVITAR + NATIONAL_DEX_PUPITAR, // HOENN_DEX_PUPITAR + NATIONAL_DEX_TYRANITAR, // HOENN_DEX_TYRANITAR + NATIONAL_DEX_LUGIA, // HOENN_DEX_LUGIA + NATIONAL_DEX_HO_OH, // HOENN_DEX_HO-OH + NATIONAL_DEX_CELEBI, // HOENN_DEX_CELEBI + NATIONAL_DEX_OLD_UNOWN_B, // HOENN_DEX_OLD_UNOWN_B + NATIONAL_DEX_OLD_UNOWN_C, // HOENN_DEX_OLD_UNOWN_C + NATIONAL_DEX_OLD_UNOWN_D, // HOENN_DEX_OLD_UNOWN_D + NATIONAL_DEX_OLD_UNOWN_E, // HOENN_DEX_OLD_UNOWN_E + NATIONAL_DEX_OLD_UNOWN_F, // HOENN_DEX_OLD_UNOWN_F + NATIONAL_DEX_OLD_UNOWN_G, // HOENN_DEX_OLD_UNOWN_G + NATIONAL_DEX_OLD_UNOWN_H, // HOENN_DEX_OLD_UNOWN_H + NATIONAL_DEX_OLD_UNOWN_I, // HOENN_DEX_OLD_UNOWN_I + NATIONAL_DEX_OLD_UNOWN_J, // HOENN_DEX_OLD_UNOWN_J + NATIONAL_DEX_OLD_UNOWN_K, // HOENN_DEX_OLD_UNOWN_K + NATIONAL_DEX_OLD_UNOWN_L, // HOENN_DEX_OLD_UNOWN_L + NATIONAL_DEX_OLD_UNOWN_M, // HOENN_DEX_OLD_UNOWN_M + NATIONAL_DEX_OLD_UNOWN_N, // HOENN_DEX_OLD_UNOWN_N + NATIONAL_DEX_OLD_UNOWN_O, // HOENN_DEX_OLD_UNOWN_O + NATIONAL_DEX_OLD_UNOWN_P, // HOENN_DEX_OLD_UNOWN_P + NATIONAL_DEX_OLD_UNOWN_Q, // HOENN_DEX_OLD_UNOWN_Q + NATIONAL_DEX_OLD_UNOWN_R, // HOENN_DEX_OLD_UNOWN_R + NATIONAL_DEX_OLD_UNOWN_S, // HOENN_DEX_OLD_UNOWN_S + NATIONAL_DEX_OLD_UNOWN_T, // HOENN_DEX_OLD_UNOWN_T + NATIONAL_DEX_OLD_UNOWN_U, // HOENN_DEX_OLD_UNOWN_U + NATIONAL_DEX_OLD_UNOWN_V, // HOENN_DEX_OLD_UNOWN_V + NATIONAL_DEX_OLD_UNOWN_W, // HOENN_DEX_OLD_UNOWN_W + NATIONAL_DEX_OLD_UNOWN_X, // HOENN_DEX_OLD_UNOWN_X + NATIONAL_DEX_OLD_UNOWN_Y, // HOENN_DEX_OLD_UNOWN_Y + NATIONAL_DEX_OLD_UNOWN_Z, // HOENN_DEX_OLD_UNOWN_Z }; const struct SpindaSpot gSpindaSpotGraphics[] = -- cgit v1.2.3 From 7c6f3803ba3bacb0a43ac61f04c0a46db2c18911 Mon Sep 17 00:00:00 2001 From: Tetrable Date: Thu, 19 Jul 2018 19:44:55 +0100 Subject: oops --- src/pokemon_1.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pokemon_1.c b/src/pokemon_1.c index 8bba7a708..1883c8754 100644 --- a/src/pokemon_1.c +++ b/src/pokemon_1.c @@ -858,7 +858,7 @@ const u16 gSpeciesToNationalPokedexNum[] = // Assigns all species to the Nationa const u16 gHoennToNationalOrder[] = // Assigns Hoenn Dex Pokémon (Using National Dex Index) { - // SPECIES_NONE + // 0 NATIONAL_DEX_TREECKO, // HOENN_DEX_TREECKO NATIONAL_DEX_GROVYLE, // HOENN_DEX_GROVYLE NATIONAL_DEX_SCEPTILE, // HOENN_DEX_SCEPTILE -- cgit v1.2.3 From 56746748402b691a6fa4fb45a2091dac31d92f7d Mon Sep 17 00:00:00 2001 From: vblm12 Date: Fri, 20 Jul 2018 21:32:31 -0500 Subject: Rename OPPONENT_ to TRAINER_ to match pokeemerald. --- constants/version.inc | 112 +- data/event_scripts.s | 78 +- data/maps/AbandonedShip_Corridors_1F/scripts.inc | 2 +- data/maps/AbandonedShip_Corridors_B1F/scripts.inc | 2 +- data/maps/AbandonedShip_Rooms2_1F/scripts.inc | 8 +- data/maps/AquaHideout_1F/scripts.inc | 2 +- data/maps/AquaHideout_B1F/scripts.inc | 6 +- data/maps/AquaHideout_B2F/scripts.inc | 6 +- data/maps/DewfordTown_Gym/scripts.inc | 16 +- data/maps/EverGrandeCity_ChampionsRoom/scripts.inc | 2 +- data/maps/EverGrandeCity_DrakesRoom/scripts.inc | 2 +- data/maps/EverGrandeCity_GlaciasRoom/scripts.inc | 2 +- data/maps/EverGrandeCity_PhoebesRoom/scripts.inc | 2 +- data/maps/EverGrandeCity_SidneysRoom/scripts.inc | 2 +- data/maps/FortreeCity_Gym/scripts.inc | 10 +- data/maps/JaggedPass/scripts.inc | 10 +- data/maps/LavaridgeTown_Gym_1F/scripts.inc | 32 +- data/maps/LilycoveCity/scripts.inc | 12 +- data/maps/MauvilleCity/scripts.inc | 2 +- data/maps/MauvilleCity_Gym/scripts.inc | 10 +- data/maps/MeteorFalls_1F_2R/scripts.inc | 12 +- data/maps/MossdeepCity_Gym/scripts.inc | 14 +- data/maps/MtChimney/scripts.inc | 18 +- data/maps/MtPyre_2F/scripts.inc | 6 +- data/maps/MtPyre_3F/scripts.inc | 4 +- data/maps/MtPyre_4F/scripts.inc | 2 +- data/maps/MtPyre_5F/scripts.inc | 2 +- data/maps/MtPyre_6F/scripts.inc | 4 +- data/maps/PetalburgCity_Gym/scripts.inc | 50 +- data/maps/PetalburgWoods/scripts.inc | 10 +- data/maps/Route102/scripts.inc | 10 +- data/maps/Route103/scripts.inc | 28 +- data/maps/Route104/scripts.inc | 20 +- data/maps/Route104_Prototype/scripts.inc | 36 +- data/maps/Route105/scripts.inc | 10 +- data/maps/Route106/scripts.inc | 10 +- data/maps/Route107/scripts.inc | 14 +- data/maps/Route108/scripts.inc | 8 +- data/maps/Route109/scripts.inc | 26 +- data/maps/Route109_SeashoreHouse/scripts.inc | 12 +- data/maps/Route110/scripts.inc | 42 +- data/maps/Route110_TrickHousePuzzle1/scripts.inc | 6 +- data/maps/Route110_TrickHousePuzzle2/scripts.inc | 6 +- data/maps/Route110_TrickHousePuzzle3/scripts.inc | 6 +- data/maps/Route110_TrickHousePuzzle4/scripts.inc | 6 +- data/maps/Route110_TrickHousePuzzle6/scripts.inc | 6 +- data/maps/Route110_TrickHousePuzzle7/scripts.inc | 6 +- data/maps/Route110_TrickHousePuzzle8/scripts.inc | 6 +- data/maps/Route111/scripts.inc | 42 +- data/maps/Route112/scripts.inc | 10 +- data/maps/Route113/scripts.inc | 18 +- data/maps/Route114/scripts.inc | 24 +- data/maps/Route115/scripts.inc | 18 +- data/maps/Route116/scripts.inc | 16 +- data/maps/Route117/scripts.inc | 26 +- data/maps/Route118/scripts.inc | 16 +- data/maps/Route119/scripts.inc | 44 +- data/maps/Route119_WeatherInstitute_1F/scripts.inc | 4 +- data/maps/Route119_WeatherInstitute_2F/scripts.inc | 6 +- data/maps/Route120/scripts.inc | 26 +- data/maps/Route121/scripts.inc | 16 +- data/maps/Route123/scripts.inc | 20 +- data/maps/Route124/scripts.inc | 20 +- data/maps/Route125/scripts.inc | 16 +- data/maps/Route126/scripts.inc | 8 +- data/maps/Route127/scripts.inc | 14 +- data/maps/Route128/scripts.inc | 14 +- data/maps/Route129/scripts.inc | 8 +- data/maps/Route130/scripts.inc | 4 +- data/maps/Route131/scripts.inc | 12 +- data/maps/Route132/scripts.inc | 8 +- data/maps/Route133/scripts.inc | 10 +- data/maps/Route134/scripts.inc | 10 +- data/maps/RustboroCity_Gym/scripts.inc | 6 +- data/maps/RusturfTunnel/scripts.inc | 4 +- data/maps/SSTidalCorridor/scripts.inc | 16 +- data/maps/SSTidalLowerDeck/scripts.inc | 4 +- data/maps/SSTidalRooms/scripts.inc | 14 +- data/maps/SeafloorCavern_Room1/scripts.inc | 4 +- data/maps/SeafloorCavern_Room3/scripts.inc | 2 +- data/maps/SeafloorCavern_Room4/scripts.inc | 2 +- data/maps/SeafloorCavern_Room9/scripts.inc | 4 +- .../SlateportCity_OceanicMuseum_2F/scripts.inc | 4 +- data/maps/SootopolisCity_Gym_1F/scripts.inc | 2 +- data/maps/SootopolisCity_Gym_B1F/scripts.inc | 16 +- data/maps/VictoryRoad_1F/scripts.inc | 12 +- data/maps/VictoryRoad_B1F/scripts.inc | 6 +- data/maps/VictoryRoad_B2F/scripts.inc | 8 +- data/scripts/gabby_and_ty.inc | 26 +- data/scripts/magma_chimney.inc | 4 +- data/scripts/magma_summit.inc | 12 +- include/constants/opponents.h | 1388 ++++++++++---------- src/battle/battle_setup.c | 120 +- src/data/trainers_de.h | 1388 ++++++++++---------- src/data/trainers_en.h | 1388 ++++++++++---------- 95 files changed, 2769 insertions(+), 2769 deletions(-) diff --git a/constants/version.inc b/constants/version.inc index 271b46dd3..09df3503c 100644 --- a/constants/version.inc +++ b/constants/version.inc @@ -31,61 +31,61 @@ .endif .ifdef SAPPHIRE - .set OPPONENT_PETALBURG_WOODS_GRUNT, OPPONENT_GRUNT_9 - .set OPPONENT_RUSTURF_TUNNEL_GRUNT, OPPONENT_GRUNT_15 - .set OPPONENT_MUSEUM_2F_GRUNT_1, OPPONENT_GRUNT_19 - .set OPPONENT_MUSEUM_2F_GRUNT_2, OPPONENT_GRUNT_20 - .set OPPONENT_514, OPPONENT_HECTOR_1 - .set OPPONENT_MT_CHIMNEY_GRUNT_1, OPPONENT_MATT_2 - .set OPPONENT_MT_CHIMNEY_GRUNT_2, OPPONENT_GRUNT_13 - .set OPPONENT_HIDEOUT_1F_GRUNT, OPPONENT_GRUNT_1 - .set OPPONENT_HIDEOUT_B1F_GRUNT_1, OPPONENT_GRUNT_2 - .set OPPONENT_HIDEOUT_B1F_GRUNT_2, OPPONENT_GRUNT_3 - .set OPPONENT_HIDEOUT_B1F_GRUNT_3, OPPONENT_GRUNT_26 - .set OPPONENT_HIDEOUT_B2F_GRUNT_1, OPPONENT_MATT_1 - .set OPPONENT_HIDEOUT_B2F_GRUNT_2, OPPONENT_GRUNT_4 - .set OPPONENT_HIDEOUT_B2F_GRUNT_3, OPPONENT_GRUNT_27 - .set OPPONENT_SEAFLOOR_CAVERN_GRUNT_1, OPPONENT_GRUNT_5 - .set OPPONENT_SEAFLOOR_CAVERN_GRUNT_2, OPPONENT_GRUNT_6 - .set OPPONENT_SEAFLOOR_CAVERN_GRUNT_3, OPPONENT_SHELLY_2 - .set OPPONENT_SEAFLOOR_CAVERN_GRUNT_4, OPPONENT_GRUNT_7 - .set OPPONENT_SEAFLOOR_CAVERN_GRUNT_5, OPPONENT_ARCHIE_2 - .set OPPONENT_MT_CHIMNEY_GRUNT_3, OPPONENT_ARCHIE_3 - .set OPPONENT_MT_PYRE_SUMMIT_GRUNT_1, OPPONENT_GRUNT_22 - .set OPPONENT_MT_PYRE_SUMMIT_GRUNT_2, OPPONENT_GRUNT_23 - .set OPPONENT_MT_PYRE_SUMMIT_GRUNT_3, OPPONENT_GRUNT_24 - .set OPPONENT_WEATHER_INSTITUTE_GRUNT_1, OPPONENT_GRUNT_16 - .set OPPONENT_WEATHER_INSTITUTE_GRUNT_2, OPPONENT_GRUNT_25 - .set OPPONENT_WEATHER_INSTITUTE_GRUNT_3, OPPONENT_GRUNT_17 - .set OPPONENT_WEATHER_INSTITUTE_GRUNT_4, OPPONENT_GRUNT_18 - .set OPPONENT_WEATHER_INSTITUTE_GRUNT_5, OPPONENT_SHELLY_1 + .set TRAINER_PETALBURG_WOODS_GRUNT, TRAINER_GRUNT_9 + .set TRAINER_RUSTURF_TUNNEL_GRUNT, TRAINER_GRUNT_15 + .set TRAINER_MUSEUM_2F_GRUNT_1, TRAINER_GRUNT_19 + .set TRAINER_MUSEUM_2F_GRUNT_2, TRAINER_GRUNT_20 + .set TRAINER_514, TRAINER_HECTOR_1 + .set TRAINER_MT_CHIMNEY_GRUNT_1, TRAINER_MATT_2 + .set TRAINER_MT_CHIMNEY_GRUNT_2, TRAINER_GRUNT_13 + .set TRAINER_HIDEOUT_1F_GRUNT, TRAINER_GRUNT_1 + .set TRAINER_HIDEOUT_B1F_GRUNT_1, TRAINER_GRUNT_2 + .set TRAINER_HIDEOUT_B1F_GRUNT_2, TRAINER_GRUNT_3 + .set TRAINER_HIDEOUT_B1F_GRUNT_3, TRAINER_GRUNT_26 + .set TRAINER_HIDEOUT_B2F_GRUNT_1, TRAINER_MATT_1 + .set TRAINER_HIDEOUT_B2F_GRUNT_2, TRAINER_GRUNT_4 + .set TRAINER_HIDEOUT_B2F_GRUNT_3, TRAINER_GRUNT_27 + .set TRAINER_SEAFLOOR_CAVERN_GRUNT_1, TRAINER_GRUNT_5 + .set TRAINER_SEAFLOOR_CAVERN_GRUNT_2, TRAINER_GRUNT_6 + .set TRAINER_SEAFLOOR_CAVERN_GRUNT_3, TRAINER_SHELLY_2 + .set TRAINER_SEAFLOOR_CAVERN_GRUNT_4, TRAINER_GRUNT_7 + .set TRAINER_SEAFLOOR_CAVERN_GRUNT_5, TRAINER_ARCHIE_2 + .set TRAINER_MT_CHIMNEY_GRUNT_3, TRAINER_ARCHIE_3 + .set TRAINER_MT_PYRE_SUMMIT_GRUNT_1, TRAINER_GRUNT_22 + .set TRAINER_MT_PYRE_SUMMIT_GRUNT_2, TRAINER_GRUNT_23 + .set TRAINER_MT_PYRE_SUMMIT_GRUNT_3, TRAINER_GRUNT_24 + .set TRAINER_WEATHER_INSTITUTE_GRUNT_1, TRAINER_GRUNT_16 + .set TRAINER_WEATHER_INSTITUTE_GRUNT_2, TRAINER_GRUNT_25 + .set TRAINER_WEATHER_INSTITUTE_GRUNT_3, TRAINER_GRUNT_17 + .set TRAINER_WEATHER_INSTITUTE_GRUNT_4, TRAINER_GRUNT_18 + .set TRAINER_WEATHER_INSTITUTE_GRUNT_5, TRAINER_SHELLY_1 .else - .set OPPONENT_PETALBURG_WOODS_GRUNT, OPPONENT_GRUNT_36 - .set OPPONENT_RUSTURF_TUNNEL_GRUNT, OPPONENT_GRUNT_42 - .set OPPONENT_MUSEUM_2F_GRUNT_1, OPPONENT_GRUNT_46 - .set OPPONENT_MUSEUM_2F_GRUNT_2, OPPONENT_GRUNT_47 - .set OPPONENT_514, OPPONENT_HECTOR_2 - .set OPPONENT_MT_CHIMNEY_GRUNT_1, OPPONENT_TABITHA_2 - .set OPPONENT_MT_CHIMNEY_GRUNT_2, OPPONENT_GRUNT_40 - .set OPPONENT_HIDEOUT_1F_GRUNT, OPPONENT_GRUNT_28 - .set OPPONENT_HIDEOUT_B1F_GRUNT_1, OPPONENT_GRUNT_29 - .set OPPONENT_HIDEOUT_B1F_GRUNT_2, OPPONENT_GRUNT_30 - .set OPPONENT_HIDEOUT_B1F_GRUNT_3, OPPONENT_GRUNT_53 - .set OPPONENT_HIDEOUT_B2F_GRUNT_1, OPPONENT_TABITHA_1 - .set OPPONENT_HIDEOUT_B2F_GRUNT_2, OPPONENT_GRUNT_31 - .set OPPONENT_HIDEOUT_B2F_GRUNT_3, OPPONENT_GRUNT_54 - .set OPPONENT_SEAFLOOR_CAVERN_GRUNT_1, OPPONENT_GRUNT_32 - .set OPPONENT_SEAFLOOR_CAVERN_GRUNT_2, OPPONENT_GRUNT_33 - .set OPPONENT_SEAFLOOR_CAVERN_GRUNT_3, OPPONENT_COURTNEY_2 - .set OPPONENT_SEAFLOOR_CAVERN_GRUNT_4, OPPONENT_GRUNT_34 - .set OPPONENT_SEAFLOOR_CAVERN_GRUNT_5, OPPONENT_MAXIE_2 - .set OPPONENT_MT_CHIMNEY_GRUNT_3, OPPONENT_MAXIE_3 - .set OPPONENT_MT_PYRE_SUMMIT_GRUNT_1, OPPONENT_GRUNT_49 - .set OPPONENT_MT_PYRE_SUMMIT_GRUNT_2, OPPONENT_GRUNT_50 - .set OPPONENT_MT_PYRE_SUMMIT_GRUNT_3, OPPONENT_GRUNT_51 - .set OPPONENT_WEATHER_INSTITUTE_GRUNT_1, OPPONENT_GRUNT_43 - .set OPPONENT_WEATHER_INSTITUTE_GRUNT_2, OPPONENT_GRUNT_52 - .set OPPONENT_WEATHER_INSTITUTE_GRUNT_3, OPPONENT_GRUNT_44 - .set OPPONENT_WEATHER_INSTITUTE_GRUNT_4, OPPONENT_GRUNT_45 - .set OPPONENT_WEATHER_INSTITUTE_GRUNT_5, OPPONENT_COURTNEY_1 + .set TRAINER_PETALBURG_WOODS_GRUNT, TRAINER_GRUNT_36 + .set TRAINER_RUSTURF_TUNNEL_GRUNT, TRAINER_GRUNT_42 + .set TRAINER_MUSEUM_2F_GRUNT_1, TRAINER_GRUNT_46 + .set TRAINER_MUSEUM_2F_GRUNT_2, TRAINER_GRUNT_47 + .set TRAINER_514, TRAINER_HECTOR_2 + .set TRAINER_MT_CHIMNEY_GRUNT_1, TRAINER_TABITHA_2 + .set TRAINER_MT_CHIMNEY_GRUNT_2, TRAINER_GRUNT_40 + .set TRAINER_HIDEOUT_1F_GRUNT, TRAINER_GRUNT_28 + .set TRAINER_HIDEOUT_B1F_GRUNT_1, TRAINER_GRUNT_29 + .set TRAINER_HIDEOUT_B1F_GRUNT_2, TRAINER_GRUNT_30 + .set TRAINER_HIDEOUT_B1F_GRUNT_3, TRAINER_GRUNT_53 + .set TRAINER_HIDEOUT_B2F_GRUNT_1, TRAINER_TABITHA_1 + .set TRAINER_HIDEOUT_B2F_GRUNT_2, TRAINER_GRUNT_31 + .set TRAINER_HIDEOUT_B2F_GRUNT_3, TRAINER_GRUNT_54 + .set TRAINER_SEAFLOOR_CAVERN_GRUNT_1, TRAINER_GRUNT_32 + .set TRAINER_SEAFLOOR_CAVERN_GRUNT_2, TRAINER_GRUNT_33 + .set TRAINER_SEAFLOOR_CAVERN_GRUNT_3, TRAINER_COURTNEY_2 + .set TRAINER_SEAFLOOR_CAVERN_GRUNT_4, TRAINER_GRUNT_34 + .set TRAINER_SEAFLOOR_CAVERN_GRUNT_5, TRAINER_MAXIE_2 + .set TRAINER_MT_CHIMNEY_GRUNT_3, TRAINER_MAXIE_3 + .set TRAINER_MT_PYRE_SUMMIT_GRUNT_1, TRAINER_GRUNT_49 + .set TRAINER_MT_PYRE_SUMMIT_GRUNT_2, TRAINER_GRUNT_50 + .set TRAINER_MT_PYRE_SUMMIT_GRUNT_3, TRAINER_GRUNT_51 + .set TRAINER_WEATHER_INSTITUTE_GRUNT_1, TRAINER_GRUNT_43 + .set TRAINER_WEATHER_INSTITUTE_GRUNT_2, TRAINER_GRUNT_52 + .set TRAINER_WEATHER_INSTITUTE_GRUNT_3, TRAINER_GRUNT_44 + .set TRAINER_WEATHER_INSTITUTE_GRUNT_4, TRAINER_GRUNT_45 + .set TRAINER_WEATHER_INSTITUTE_GRUNT_5, TRAINER_COURTNEY_1 .endif diff --git a/data/event_scripts.s b/data/event_scripts.s index 1f514321c..3ce319397 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1935,66 +1935,66 @@ SootopolisCity_Gym_1F_EventScript_1A01C0:: @ 81A01C0 end DewfordTown_Gym_EventScript_1A021E:: @ 81A021E - settrainerflag OPPONENT_JOSH - settrainerflag OPPONENT_TOMMY + settrainerflag TRAINER_JOSH + settrainerflag TRAINER_TOMMY return DewfordTown_Gym_EventScript_1A0225:: @ 81A0225 - settrainerflag OPPONENT_HIDEKI - settrainerflag OPPONENT_TESSA - settrainerflag OPPONENT_LAURA + settrainerflag TRAINER_HIDEKI + settrainerflag TRAINER_TESSA + settrainerflag TRAINER_LAURA return DewfordTown_Gym_EventScript_1A022F:: @ 81A022F - settrainerflag OPPONENT_KIRK - settrainerflag OPPONENT_SHAWN - settrainerflag OPPONENT_BEN - settrainerflag OPPONENT_VIVIAN + settrainerflag TRAINER_KIRK + settrainerflag TRAINER_SHAWN + settrainerflag TRAINER_BEN + settrainerflag TRAINER_VIVIAN return DewfordTown_Gym_EventScript_1A023C:: @ 81A023C - settrainerflag OPPONENT_COLE - settrainerflag OPPONENT_AXLE - settrainerflag OPPONENT_ANDY - settrainerflag OPPONENT_ZANE - settrainerflag OPPONENT_SADIE + settrainerflag TRAINER_COLE + settrainerflag TRAINER_AXLE + settrainerflag TRAINER_ANDY + settrainerflag TRAINER_ZANE + settrainerflag TRAINER_SADIE return DewfordTown_Gym_EventScript_1A024C:: @ 81A024C - settrainerflag OPPONENT_RANDALL - settrainerflag OPPONENT_PARKER - settrainerflag OPPONENT_GEORGE - settrainerflag OPPONENT_BERKE - settrainerflag OPPONENT_MARY - settrainerflag OPPONENT_LORI - settrainerflag OPPONENT_JODY + settrainerflag TRAINER_RANDALL + settrainerflag TRAINER_PARKER + settrainerflag TRAINER_GEORGE + settrainerflag TRAINER_BERKE + settrainerflag TRAINER_MARY + settrainerflag TRAINER_LORI + settrainerflag TRAINER_JODY return DewfordTown_Gym_EventScript_1A0262:: @ 81A0262 - settrainerflag OPPONENT_JARED - settrainerflag OPPONENT_TERRELL - settrainerflag OPPONENT_KYLEE - settrainerflag OPPONENT_WILL + settrainerflag TRAINER_JARED + settrainerflag TRAINER_TERRELL + settrainerflag TRAINER_KYLEE + settrainerflag TRAINER_WILL return DewfordTown_Gym_EventScript_1A026F:: @ 81A026F - settrainerflag OPPONENT_PRESTON - settrainerflag OPPONENT_VIRGIL - settrainerflag OPPONENT_FRITZ - settrainerflag OPPONENT_HANNAH - settrainerflag OPPONENT_SAMANTHA - settrainerflag OPPONENT_MAURA + settrainerflag TRAINER_PRESTON + settrainerflag TRAINER_VIRGIL + settrainerflag TRAINER_FRITZ + settrainerflag TRAINER_HANNAH + settrainerflag TRAINER_SAMANTHA + settrainerflag TRAINER_MAURA return DewfordTown_Gym_EventScript_1A0282:: @ 81A0282 - settrainerflag OPPONENT_ANDREA - settrainerflag OPPONENT_CRISSY - settrainerflag OPPONENT_BRIANNA_2 - settrainerflag OPPONENT_CONNIE - settrainerflag OPPONENT_BRIDGET - settrainerflag OPPONENT_OLIVIA - settrainerflag OPPONENT_TIFFANY - settrainerflag OPPONENT_MARISSA + settrainerflag TRAINER_ANDREA + settrainerflag TRAINER_CRISSY + settrainerflag TRAINER_BRIANNA_2 + settrainerflag TRAINER_CONNIE + settrainerflag TRAINER_BRIDGET + settrainerflag TRAINER_OLIVIA + settrainerflag TRAINER_TIFFANY + settrainerflag TRAINER_MARISSA return DewfordTown_Gym_EventScript_1A029B:: @ 81A029B diff --git a/data/maps/AbandonedShip_Corridors_1F/scripts.inc b/data/maps/AbandonedShip_Corridors_1F/scripts.inc index 0c7278f3b..f2636fd31 100644 --- a/data/maps/AbandonedShip_Corridors_1F/scripts.inc +++ b/data/maps/AbandonedShip_Corridors_1F/scripts.inc @@ -6,6 +6,6 @@ AbandonedShip_Corridors_1F_EventScript_15E965:: @ 815E965 end AbandonedShip_Corridors_1F_EventScript_15E96E:: @ 815E96E - trainerbattle 0, OPPONENT_CHARLIE, 0, AbandonedShip_Corridors_1F_Text_19843D, AbandonedShip_Corridors_1F_Text_198479 + trainerbattle 0, TRAINER_CHARLIE, 0, AbandonedShip_Corridors_1F_Text_19843D, AbandonedShip_Corridors_1F_Text_198479 msgbox AbandonedShip_Corridors_1F_Text_198493, 6 end diff --git a/data/maps/AbandonedShip_Corridors_B1F/scripts.inc b/data/maps/AbandonedShip_Corridors_B1F/scripts.inc index c34f2c28b..f1b7240db 100644 --- a/data/maps/AbandonedShip_Corridors_B1F/scripts.inc +++ b/data/maps/AbandonedShip_Corridors_B1F/scripts.inc @@ -50,6 +50,6 @@ AbandonedShip_Corridors_B1F_EventScript_15EA14:: @ 815EA14 end AbandonedShip_Corridors_B1F_EventScript_15EA1E:: @ 815EA1E - trainerbattle 0, OPPONENT_DUNCAN, 0, AbandonedShip_Corridors_B1F_Text_19856F, AbandonedShip_Corridors_B1F_Text_1985C5 + trainerbattle 0, TRAINER_DUNCAN, 0, AbandonedShip_Corridors_B1F_Text_19856F, AbandonedShip_Corridors_B1F_Text_1985C5 msgbox AbandonedShip_Corridors_B1F_Text_1985D7, 6 end diff --git a/data/maps/AbandonedShip_Rooms2_1F/scripts.inc b/data/maps/AbandonedShip_Rooms2_1F/scripts.inc index e1e903cc0..cd7c8fd9f 100644 --- a/data/maps/AbandonedShip_Rooms2_1F/scripts.inc +++ b/data/maps/AbandonedShip_Rooms2_1F/scripts.inc @@ -2,7 +2,7 @@ AbandonedShip_Rooms2_1F_MapScripts:: @ 815EA67 .byte 0 AbandonedShip_Rooms2_1F_EventScript_15EA68:: @ 815EA68 - trainerbattle 4, OPPONENT_LOIS_AND_HAL_1, 0, AbandonedShip_Rooms2_1F_Text_1987C1, AbandonedShip_Rooms2_1F_Text_1987FE, AbandonedShip_Rooms2_1F_Text_19887F + trainerbattle 4, TRAINER_LOIS_AND_HAL_1, 0, AbandonedShip_Rooms2_1F_Text_1987C1, AbandonedShip_Rooms2_1F_Text_1987FE, AbandonedShip_Rooms2_1F_Text_19887F specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq AbandonedShip_Rooms2_1F_EventScript_15EA93 @@ -10,12 +10,12 @@ AbandonedShip_Rooms2_1F_EventScript_15EA68:: @ 815EA68 end AbandonedShip_Rooms2_1F_EventScript_15EA93:: @ 815EA93 - trainerbattle 7, OPPONENT_LOIS_AND_HAL_1, 0, AbandonedShip_Rooms2_1F_Text_1989DF, AbandonedShip_Rooms2_1F_Text_198A53, AbandonedShip_Rooms2_1F_Text_198AEE + trainerbattle 7, TRAINER_LOIS_AND_HAL_1, 0, AbandonedShip_Rooms2_1F_Text_1989DF, AbandonedShip_Rooms2_1F_Text_198A53, AbandonedShip_Rooms2_1F_Text_198AEE msgbox AbandonedShip_Rooms2_1F_Text_198A70, 6 end AbandonedShip_Rooms2_1F_EventScript_15EAAE:: @ 815EAAE - trainerbattle 4, OPPONENT_LOIS_AND_HAL_1, 0, AbandonedShip_Rooms2_1F_Text_1988CC, AbandonedShip_Rooms2_1F_Text_198916, AbandonedShip_Rooms2_1F_Text_19899A + trainerbattle 4, TRAINER_LOIS_AND_HAL_1, 0, AbandonedShip_Rooms2_1F_Text_1988CC, AbandonedShip_Rooms2_1F_Text_198916, AbandonedShip_Rooms2_1F_Text_19899A specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq AbandonedShip_Rooms2_1F_EventScript_15EAD9 @@ -23,6 +23,6 @@ AbandonedShip_Rooms2_1F_EventScript_15EAAE:: @ 815EAAE end AbandonedShip_Rooms2_1F_EventScript_15EAD9:: @ 815EAD9 - trainerbattle 7, OPPONENT_LOIS_AND_HAL_1, 0, AbandonedShip_Rooms2_1F_Text_198B3B, AbandonedShip_Rooms2_1F_Text_198BCF, AbandonedShip_Rooms2_1F_Text_198C40 + trainerbattle 7, TRAINER_LOIS_AND_HAL_1, 0, AbandonedShip_Rooms2_1F_Text_198B3B, AbandonedShip_Rooms2_1F_Text_198BCF, AbandonedShip_Rooms2_1F_Text_198C40 msgbox AbandonedShip_Rooms2_1F_Text_198BEA, 6 end diff --git a/data/maps/AquaHideout_1F/scripts.inc b/data/maps/AquaHideout_1F/scripts.inc index ee49ba695..e92e83cc8 100644 --- a/data/maps/AquaHideout_1F/scripts.inc +++ b/data/maps/AquaHideout_1F/scripts.inc @@ -36,7 +36,7 @@ AquaHideout_1F_EventScript_15D802:: @ 815D802 AquaHideout_1F_EventScript_15D80C:: @ 815D80C MagmaHideout_1F_EventScript_15D80C:: @ 815D80C - trainerbattle 2, OPPONENT_HIDEOUT_1F_GRUNT, 0, AquaHideout_1F_Text_196E01, AquaHideout_1F_Text_196E28, AquaHideout_1F_EventScript_15D827 + trainerbattle 2, TRAINER_HIDEOUT_1F_GRUNT, 0, AquaHideout_1F_Text_196E01, AquaHideout_1F_Text_196E28, AquaHideout_1F_EventScript_15D827 msgbox AquaHideout_1F_Text_196E3D, 6 end diff --git a/data/maps/AquaHideout_B1F/scripts.inc b/data/maps/AquaHideout_B1F/scripts.inc index 3be8d487d..3b4c04273 100644 --- a/data/maps/AquaHideout_B1F/scripts.inc +++ b/data/maps/AquaHideout_B1F/scripts.inc @@ -17,7 +17,7 @@ AquaHideout_B1F_MapScript1_15D84A:: @ 815D84A AquaHideout_B1F_EventScript_15D850:: @ 815D850 MagmaHideout_B1F_EventScript_15D850:: @ 815D850 - trainerbattle 2, OPPONENT_HIDEOUT_B1F_GRUNT_1, 0, AquaHideout_B1F_Text_196E6F, AquaHideout_B1F_Text_196EB6, AquaHideout_B1F_EventScript_15D86B + trainerbattle 2, TRAINER_HIDEOUT_B1F_GRUNT_1, 0, AquaHideout_B1F_Text_196E6F, AquaHideout_B1F_Text_196EB6, AquaHideout_B1F_EventScript_15D86B msgbox AquaHideout_B1F_Text_196ECC, 6 end @@ -28,7 +28,7 @@ AquaHideout_B1F_EventScript_15D86B:: @ 815D86B AquaHideout_B1F_EventScript_15D875:: @ 815D875 MagmaHideout_B1F_EventScript_15D875:: @ 815D875 - trainerbattle 2, OPPONENT_HIDEOUT_B1F_GRUNT_2, 0, AquaHideout_B1F_Text_196F39, AquaHideout_B1F_Text_196F9B, AquaHideout_B1F_EventScript_15D890 + trainerbattle 2, TRAINER_HIDEOUT_B1F_GRUNT_2, 0, AquaHideout_B1F_Text_196F39, AquaHideout_B1F_Text_196F9B, AquaHideout_B1F_EventScript_15D890 msgbox AquaHideout_B1F_Text_196FB5, 6 end @@ -39,6 +39,6 @@ AquaHideout_B1F_EventScript_15D890:: @ 815D890 AquaHideout_B1F_EventScript_15D89A:: @ 815D89A MagmaHideout_B1F_EventScript_15D89A:: @ 815D89A - trainerbattle 0, OPPONENT_HIDEOUT_B1F_GRUNT_3, 0, AquaHideout_B1F_Text_196FFD, AquaHideout_B1F_Text_197040 + trainerbattle 0, TRAINER_HIDEOUT_B1F_GRUNT_3, 0, AquaHideout_B1F_Text_196FFD, AquaHideout_B1F_Text_197040 msgbox AquaHideout_B1F_Text_197056, 6 end diff --git a/data/maps/AquaHideout_B2F/scripts.inc b/data/maps/AquaHideout_B2F/scripts.inc index 37830a00e..103de2313 100644 --- a/data/maps/AquaHideout_B2F/scripts.inc +++ b/data/maps/AquaHideout_B2F/scripts.inc @@ -25,7 +25,7 @@ MagmaHideout_B2F_EventScript_15D8BD:: @ 815D8BD AquaHideout_B2F_EventScript_15D8E1:: @ 815D8E1 MagmaHideout_B2F_EventScript_15D8E1:: @ 815D8E1 - trainerbattle 2, OPPONENT_HIDEOUT_B2F_GRUNT_1, 0, AquaHideout_B2F_Text_197093, AquaHideout_B2F_Text_197145, AquaHideout_B2F_EventScript_15D8FD + trainerbattle 2, TRAINER_HIDEOUT_B2F_GRUNT_1, 0, AquaHideout_B2F_Text_197093, AquaHideout_B2F_Text_197145, AquaHideout_B2F_EventScript_15D8FD msgbox AquaHideout_B2F_Text_1971AE, 4 release end @@ -85,7 +85,7 @@ AquaHideout_B2F_Movement_15D95D:: @ 815D95D AquaHideout_B2F_EventScript_15D962:: @ 815D962 MagmaHideout_B2F_EventScript_15D962:: @ 815D962 - trainerbattle 2, OPPONENT_HIDEOUT_B2F_GRUNT_2, 0, AquaHideout_B2F_Text_197270, AquaHideout_B2F_Text_1972AC, AquaHideout_B2F_EventScript_15D97D + trainerbattle 2, TRAINER_HIDEOUT_B2F_GRUNT_2, 0, AquaHideout_B2F_Text_197270, AquaHideout_B2F_Text_1972AC, AquaHideout_B2F_EventScript_15D97D msgbox AquaHideout_B2F_Text_1972D2, 6 end @@ -96,6 +96,6 @@ AquaHideout_B2F_EventScript_15D97D:: @ 815D97D AquaHideout_B2F_EventScript_15D987:: @ 815D987 MagmaHideout_B2F_EventScript_15D987:: @ 815D987 - trainerbattle 0, OPPONENT_HIDEOUT_B2F_GRUNT_3, 0, AquaHideout_B2F_Text_1972EF, AquaHideout_B2F_Text_197390 + trainerbattle 0, TRAINER_HIDEOUT_B2F_GRUNT_3, 0, AquaHideout_B2F_Text_1972EF, AquaHideout_B2F_Text_197390 msgbox AquaHideout_B2F_Text_1973C0, 6 end diff --git a/data/maps/DewfordTown_Gym/scripts.inc b/data/maps/DewfordTown_Gym/scripts.inc index 596f2c77f..3e57e0fec 100644 --- a/data/maps/DewfordTown_Gym/scripts.inc +++ b/data/maps/DewfordTown_Gym/scripts.inc @@ -7,7 +7,7 @@ DewfordTown_Gym_MapScript1_15306B:: @ 815306B end DewfordTown_Gym_EventScript_153071:: @ 8153071 - goto_if_trainer_defeated OPPONENT_BRAWLY, DewfordTown_Gym_EventScript_1530AA + goto_if_trainer_defeated TRAINER_BRAWLY, DewfordTown_Gym_EventScript_1530AA call DewfordTown_Gym_EventScript_153122 copyvar VAR_SPECIAL_1, VAR_SPECIAL_0 compare VAR_SPECIAL_0, 0 @@ -80,22 +80,22 @@ DewfordTown_Gym_EventScript_153117:: @ 8153117 DewfordTown_Gym_EventScript_153122:: @ 8153122 setvar VAR_SPECIAL_0, 0 - goto_if_trainer_not_defeated OPPONENT_HIDEKI, DewfordTown_Gym_EventScript_153135 + goto_if_trainer_not_defeated TRAINER_HIDEKI, DewfordTown_Gym_EventScript_153135 addvar VAR_SPECIAL_0, 1 DewfordTown_Gym_EventScript_153135:: @ 8153135 - goto_if_trainer_not_defeated OPPONENT_TESSA, DewfordTown_Gym_EventScript_153143 + goto_if_trainer_not_defeated TRAINER_TESSA, DewfordTown_Gym_EventScript_153143 addvar VAR_SPECIAL_0, 1 DewfordTown_Gym_EventScript_153143:: @ 8153143 - goto_if_trainer_not_defeated OPPONENT_LAURA, DewfordTown_Gym_EventScript_153151 + goto_if_trainer_not_defeated TRAINER_LAURA, DewfordTown_Gym_EventScript_153151 addvar VAR_SPECIAL_0, 1 DewfordTown_Gym_EventScript_153151:: @ 8153151 return DewfordTown_Gym_EventScript_153152:: @ 8153152 - trainerbattle 1, OPPONENT_BRAWLY, 0, DewfordTown_Gym_Text_175182, DewfordTown_Gym_Text_175246, DewfordTown_Gym_EventScript_153177 + trainerbattle 1, TRAINER_BRAWLY, 0, DewfordTown_Gym_Text_175182, DewfordTown_Gym_Text_175246, DewfordTown_Gym_EventScript_153177 goto_if_unset FLAG_RECEIVED_TM08, DewfordTown_Gym_EventScript_1531B5 msgbox DewfordTown_Gym_Text_175412, 4 release @@ -127,7 +127,7 @@ DewfordTown_Gym_EventScript_1531B5:: @ 81531B5 end DewfordTown_Gym_EventScript_1531D9:: @ 81531D9 - trainerbattle 2, OPPONENT_HIDEKI, 0, DewfordTown_Gym_Text_174F61, DewfordTown_Gym_Text_174F7A, DewfordTown_Gym_EventScript_1531F4 + trainerbattle 2, TRAINER_HIDEKI, 0, DewfordTown_Gym_Text_174F61, DewfordTown_Gym_Text_174F7A, DewfordTown_Gym_EventScript_1531F4 msgbox DewfordTown_Gym_Text_174F8E, 6 end @@ -137,7 +137,7 @@ DewfordTown_Gym_EventScript_1531F4:: @ 81531F4 end DewfordTown_Gym_EventScript_1531FB:: @ 81531FB - trainerbattle 2, OPPONENT_TESSA, 0, DewfordTown_Gym_Text_174FCE, DewfordTown_Gym_Text_175009, DewfordTown_Gym_EventScript_153216 + trainerbattle 2, TRAINER_TESSA, 0, DewfordTown_Gym_Text_174FCE, DewfordTown_Gym_Text_175009, DewfordTown_Gym_EventScript_153216 msgbox DewfordTown_Gym_Text_175031, 6 end @@ -147,7 +147,7 @@ DewfordTown_Gym_EventScript_153216:: @ 8153216 end DewfordTown_Gym_EventScript_15321D:: @ 815321D - trainerbattle 2, OPPONENT_LAURA, 0, DewfordTown_Gym_Text_1750C9, DewfordTown_Gym_Text_175104, DewfordTown_Gym_EventScript_153238 + trainerbattle 2, TRAINER_LAURA, 0, DewfordTown_Gym_Text_1750C9, DewfordTown_Gym_Text_175104, DewfordTown_Gym_EventScript_153238 msgbox DewfordTown_Gym_Text_175117, 6 end diff --git a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc index 7e1f6e6cb..01b2cc970 100644 --- a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc +++ b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc @@ -40,7 +40,7 @@ EverGrandeCity_ChampionsRoom_Movement_15B802:: @ 815B802 EverGrandeCity_ChampionsRoom_EventScript_15B805:: @ 815B805 playbgm MUS_DAIGO, FALSE msgbox EverGrandeCity_ChampionsRoom_Text_190F9C, 4 - trainerbattle 3, OPPONENT_STEVEN, 0, EverGrandeCity_ChampionsRoom_Text_1910A0 + trainerbattle 3, TRAINER_STEVEN, 0, EverGrandeCity_ChampionsRoom_Text_1910A0 goto EverGrandeCity_ChampionsRoom_EventScript_15B821 end diff --git a/data/maps/EverGrandeCity_DrakesRoom/scripts.inc b/data/maps/EverGrandeCity_DrakesRoom/scripts.inc index 4dad28923..f00a809bd 100644 --- a/data/maps/EverGrandeCity_DrakesRoom/scripts.inc +++ b/data/maps/EverGrandeCity_DrakesRoom/scripts.inc @@ -43,7 +43,7 @@ EverGrandeCity_DrakesRoom_EventScript_15B764:: @ 815B764 goto_if_set FLAG_DEFEATED_ELITE_4_DRAKE, EverGrandeCity_DrakesRoom_EventScript_15B78B playbgm MUS_SITENNOU, FALSE msgbox EverGrandeCity_DrakesRoom_Text_190CEB, 4 - trainerbattle 3, OPPONENT_DRAKE, 0, EverGrandeCity_DrakesRoom_Text_190E42 + trainerbattle 3, TRAINER_DRAKE, 0, EverGrandeCity_DrakesRoom_Text_190E42 goto EverGrandeCity_DrakesRoom_EventScript_15B795 end diff --git a/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc b/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc index 17555f2f6..ede08e504 100644 --- a/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc +++ b/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc @@ -43,7 +43,7 @@ EverGrandeCity_GlaciasRoom_EventScript_15B6CA:: @ 815B6CA goto_if_set FLAG_DEFEATED_ELITE_4_GLACIA, EverGrandeCity_GlaciasRoom_EventScript_15B6F1 playbgm MUS_SITENNOU, FALSE msgbox EverGrandeCity_GlaciasRoom_Text_190AF9, 4 - trainerbattle 3, OPPONENT_GLACIA, 0, EverGrandeCity_GlaciasRoom_Text_190C01 + trainerbattle 3, TRAINER_GLACIA, 0, EverGrandeCity_GlaciasRoom_Text_190C01 goto EverGrandeCity_GlaciasRoom_EventScript_15B6FB end diff --git a/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc b/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc index 5575b99b3..db30bcfa7 100644 --- a/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc +++ b/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc @@ -43,7 +43,7 @@ EverGrandeCity_PhoebesRoom_EventScript_15B630:: @ 815B630 goto_if_set FLAG_DEFEATED_ELITE_4_PHOEBE, EverGrandeCity_PhoebesRoom_EventScript_15B657 playbgm MUS_SITENNOU, FALSE msgbox EverGrandeCity_PhoebesRoom_Text_1908F5, 4 - trainerbattle 3, OPPONENT_PHOEBE, 0, EverGrandeCity_PhoebesRoom_Text_190A0C + trainerbattle 3, TRAINER_PHOEBE, 0, EverGrandeCity_PhoebesRoom_Text_190A0C goto EverGrandeCity_PhoebesRoom_EventScript_15B661 end diff --git a/data/maps/EverGrandeCity_SidneysRoom/scripts.inc b/data/maps/EverGrandeCity_SidneysRoom/scripts.inc index 2b6cc0571..b2b731004 100644 --- a/data/maps/EverGrandeCity_SidneysRoom/scripts.inc +++ b/data/maps/EverGrandeCity_SidneysRoom/scripts.inc @@ -44,7 +44,7 @@ EverGrandeCity_SidneysRoom_EventScript_15B596:: @ 815B596 goto_if_set FLAG_DEFEATED_ELITE_4_SYDNEY, EverGrandeCity_SidneysRoom_EventScript_15B5BD playbgm MUS_SITENNOU, FALSE msgbox EverGrandeCity_SidneysRoom_Text_190728, 4 - trainerbattle 3, OPPONENT_SIDNEY, 0, EverGrandeCity_SidneysRoom_Text_190823 + trainerbattle 3, TRAINER_SIDNEY, 0, EverGrandeCity_SidneysRoom_Text_190823 goto EverGrandeCity_SidneysRoom_EventScript_15B5C7 end diff --git a/data/maps/FortreeCity_Gym/scripts.inc b/data/maps/FortreeCity_Gym/scripts.inc index c0de6bfee..3a814a4b7 100644 --- a/data/maps/FortreeCity_Gym/scripts.inc +++ b/data/maps/FortreeCity_Gym/scripts.inc @@ -16,7 +16,7 @@ FortreeCity_Gym_EventScript_157EEC:: @ 8157EEC end FortreeCity_Gym_EventScript_157EF0:: @ 8157EF0 - trainerbattle 1, OPPONENT_WINONA, 0, FortreeCity_Gym_Text_185CCB, FortreeCity_Gym_Text_185DBA, FortreeCity_Gym_EventScript_157F15 + trainerbattle 1, TRAINER_WINONA, 0, FortreeCity_Gym_Text_185CCB, FortreeCity_Gym_Text_185DBA, FortreeCity_Gym_EventScript_157F15 goto_if_unset FLAG_RECEIVED_TM40, FortreeCity_Gym_EventScript_157F3E msgbox FortreeCity_Gym_Text_185F98, 4 release @@ -44,22 +44,22 @@ FortreeCity_Gym_EventScript_157F3E:: @ 8157F3E end FortreeCity_Gym_EventScript_157F62:: @ 8157F62 - trainerbattle 0, OPPONENT_JARED, 0, FortreeCity_Gym_Text_1859B9, FortreeCity_Gym_Text_1859EA + trainerbattle 0, TRAINER_JARED, 0, FortreeCity_Gym_Text_1859B9, FortreeCity_Gym_Text_1859EA msgbox FortreeCity_Gym_Text_185A02, 6 end FortreeCity_Gym_EventScript_157F79:: @ 8157F79 - trainerbattle 0, OPPONENT_WILL, 0, FortreeCity_Gym_Text_185A7F, FortreeCity_Gym_Text_185AEC + trainerbattle 0, TRAINER_WILL, 0, FortreeCity_Gym_Text_185A7F, FortreeCity_Gym_Text_185AEC msgbox FortreeCity_Gym_Text_185B18, 6 end FortreeCity_Gym_EventScript_157F90:: @ 8157F90 - trainerbattle 0, OPPONENT_TERRELL, 0, FortreeCity_Gym_Text_185B8D, FortreeCity_Gym_Text_185BEB + trainerbattle 0, TRAINER_TERRELL, 0, FortreeCity_Gym_Text_185B8D, FortreeCity_Gym_Text_185BEB msgbox FortreeCity_Gym_Text_185C00, 6 end FortreeCity_Gym_EventScript_157FA7:: @ 8157FA7 - trainerbattle 0, OPPONENT_KYLEE, 0, FortreeCity_Gym_Text_185C45, FortreeCity_Gym_Text_185C7C + trainerbattle 0, TRAINER_KYLEE, 0, FortreeCity_Gym_Text_185C45, FortreeCity_Gym_Text_185C7C msgbox FortreeCity_Gym_Text_185C8C, 6 end diff --git a/data/maps/JaggedPass/scripts.inc b/data/maps/JaggedPass/scripts.inc index d75420e88..96ad4a0aa 100644 --- a/data/maps/JaggedPass/scripts.inc +++ b/data/maps/JaggedPass/scripts.inc @@ -18,12 +18,12 @@ JaggedPass_EventScript_15D280:: @ 815D280 return JaggedPass_EventScript_15D285:: @ 815D285 - trainerbattle 0, OPPONENT_ERIC, 0, JaggedPass_Text_195DAC, JaggedPass_Text_195E27 + trainerbattle 0, TRAINER_ERIC, 0, JaggedPass_Text_195DAC, JaggedPass_Text_195E27 msgbox JaggedPass_Text_195E3E, 6 end JaggedPass_EventScript_15D29C:: @ 815D29C - trainerbattle 0, OPPONENT_DIANA_1, 0, JaggedPass_Text_195E9E, JaggedPass_Text_195EDF + trainerbattle 0, TRAINER_DIANA_1, 0, JaggedPass_Text_195E9E, JaggedPass_Text_195EDF specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq JaggedPass_EventScript_15D2C3 @@ -31,12 +31,12 @@ JaggedPass_EventScript_15D29C:: @ 815D29C end JaggedPass_EventScript_15D2C3:: @ 815D2C3 - trainerbattle 5, OPPONENT_DIANA_1, 0, JaggedPass_Text_195F58, JaggedPass_Text_195F8C + trainerbattle 5, TRAINER_DIANA_1, 0, JaggedPass_Text_195F58, JaggedPass_Text_195F8C msgbox JaggedPass_Text_195FB9, 6 end JaggedPass_EventScript_15D2DA:: @ 815D2DA - trainerbattle 0, OPPONENT_ETHAN_1, 0, JaggedPass_Text_195FF2, JaggedPass_Text_196032 + trainerbattle 0, TRAINER_ETHAN_1, 0, JaggedPass_Text_195FF2, JaggedPass_Text_196032 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq JaggedPass_EventScript_15D301 @@ -44,6 +44,6 @@ JaggedPass_EventScript_15D2DA:: @ 815D2DA end JaggedPass_EventScript_15D301:: @ 815D301 - trainerbattle 5, OPPONENT_ETHAN_1, 0, JaggedPass_Text_1960AA, JaggedPass_Text_1960E2 + trainerbattle 5, TRAINER_ETHAN_1, 0, JaggedPass_Text_1960AA, JaggedPass_Text_1960E2 msgbox JaggedPass_Text_196118, 6 end diff --git a/data/maps/LavaridgeTown_Gym_1F/scripts.inc b/data/maps/LavaridgeTown_Gym_1F/scripts.inc index 27655127a..3f5f9a285 100644 --- a/data/maps/LavaridgeTown_Gym_1F/scripts.inc +++ b/data/maps/LavaridgeTown_Gym_1F/scripts.inc @@ -13,53 +13,53 @@ LavaridgeTown_Gym_1F_EventScript_15369F:: @ 815369F setvar VAR_TEMP_D, 0 setvar VAR_TEMP_E, 0 setvar VAR_TEMP_F, 0 - goto_if_trainer_defeated OPPONENT_COLE, LavaridgeTown_Gym_1F_EventScript_1536C6 + goto_if_trainer_defeated TRAINER_COLE, LavaridgeTown_Gym_1F_EventScript_1536C6 setvar VAR_TEMP_B, 1 LavaridgeTown_Gym_1F_EventScript_1536C6:: @ 81536C6 - goto_if_trainer_defeated OPPONENT_ZANE, LavaridgeTown_Gym_1F_EventScript_1536D4 + goto_if_trainer_defeated TRAINER_ZANE, LavaridgeTown_Gym_1F_EventScript_1536D4 setvar VAR_TEMP_C, 1 LavaridgeTown_Gym_1F_EventScript_1536D4:: @ 81536D4 - goto_if_trainer_defeated OPPONENT_AXLE, LavaridgeTown_Gym_1F_EventScript_1536E2 + goto_if_trainer_defeated TRAINER_AXLE, LavaridgeTown_Gym_1F_EventScript_1536E2 setvar VAR_TEMP_D, 1 LavaridgeTown_Gym_1F_EventScript_1536E2:: @ 81536E2 - goto_if_trainer_defeated OPPONENT_SADIE, LavaridgeTown_Gym_1F_EventScript_1536F0 + goto_if_trainer_defeated TRAINER_SADIE, LavaridgeTown_Gym_1F_EventScript_1536F0 setvar VAR_TEMP_E, 1 LavaridgeTown_Gym_1F_EventScript_1536F0:: @ 81536F0 - goto_if_trainer_defeated OPPONENT_ANDY, LavaridgeTown_Gym_1F_EventScript_1536FE + goto_if_trainer_defeated TRAINER_ANDY, LavaridgeTown_Gym_1F_EventScript_1536FE setvar VAR_TEMP_F, 1 LavaridgeTown_Gym_1F_EventScript_1536FE:: @ 81536FE return LavaridgeTown_Gym_1F_EventScript_1536FF:: @ 81536FF - goto_if_trainer_defeated OPPONENT_COLE, LavaridgeTown_Gym_1F_EventScript_15370C + goto_if_trainer_defeated TRAINER_COLE, LavaridgeTown_Gym_1F_EventScript_15370C setobjectmovementtype 2, 63 LavaridgeTown_Gym_1F_EventScript_15370C:: @ 815370C - goto_if_trainer_defeated OPPONENT_ZANE, LavaridgeTown_Gym_1F_EventScript_153719 + goto_if_trainer_defeated TRAINER_ZANE, LavaridgeTown_Gym_1F_EventScript_153719 setobjectmovementtype 3, 63 LavaridgeTown_Gym_1F_EventScript_153719:: @ 8153719 - goto_if_trainer_defeated OPPONENT_AXLE, LavaridgeTown_Gym_1F_EventScript_153726 + goto_if_trainer_defeated TRAINER_AXLE, LavaridgeTown_Gym_1F_EventScript_153726 setobjectmovementtype 4, 63 LavaridgeTown_Gym_1F_EventScript_153726:: @ 8153726 - goto_if_trainer_defeated OPPONENT_SADIE, LavaridgeTown_Gym_1F_EventScript_153733 + goto_if_trainer_defeated TRAINER_SADIE, LavaridgeTown_Gym_1F_EventScript_153733 setobjectmovementtype 5, 63 LavaridgeTown_Gym_1F_EventScript_153733:: @ 8153733 - goto_if_trainer_defeated OPPONENT_ANDY, LavaridgeTown_Gym_1F_EventScript_153740 + goto_if_trainer_defeated TRAINER_ANDY, LavaridgeTown_Gym_1F_EventScript_153740 setobjectmovementtype 7, 63 LavaridgeTown_Gym_1F_EventScript_153740:: @ 8153740 return LavaridgeTown_Gym_1F_EventScript_153741:: @ 8153741 - trainerbattle 1, OPPONENT_FLANNERY, 0, LavaridgeTown_Gym_1F_Text_176801, LavaridgeTown_Gym_1F_Text_176960, LavaridgeTown_Gym_1F_EventScript_153766 + trainerbattle 1, TRAINER_FLANNERY, 0, LavaridgeTown_Gym_1F_Text_176801, LavaridgeTown_Gym_1F_Text_176960, LavaridgeTown_Gym_1F_EventScript_153766 goto_if_unset FLAG_RECEIVED_TM50, LavaridgeTown_Gym_1F_EventScript_1537A7 msgbox LavaridgeTown_Gym_1F_Text_176C4A, 4 release @@ -92,7 +92,7 @@ LavaridgeTown_Gym_1F_EventScript_1537A7:: @ 81537A7 end LavaridgeTown_Gym_1F_EventScript_1537CB:: @ 81537CB - trainerbattle 2, OPPONENT_COLE, 2, LavaridgeTown_Gym_1F_Text_176432, LavaridgeTown_Gym_1F_Text_17644F, LavaridgeTown_Gym_1F_EventScript_1537E6 + trainerbattle 2, TRAINER_COLE, 2, LavaridgeTown_Gym_1F_Text_176432, LavaridgeTown_Gym_1F_Text_17644F, LavaridgeTown_Gym_1F_EventScript_1537E6 msgbox LavaridgeTown_Gym_1F_Text_176472, 6 end @@ -102,22 +102,22 @@ LavaridgeTown_Gym_1F_EventScript_1537E6:: @ 81537E6 end LavaridgeTown_Gym_1F_EventScript_1537ED:: @ 81537ED - trainerbattle 2, OPPONENT_AXLE, 4, LavaridgeTown_Gym_1F_Text_1764D1, LavaridgeTown_Gym_1F_Text_176516, LavaridgeTown_Gym_1F_EventScript_1537E6 + trainerbattle 2, TRAINER_AXLE, 4, LavaridgeTown_Gym_1F_Text_1764D1, LavaridgeTown_Gym_1F_Text_176516, LavaridgeTown_Gym_1F_EventScript_1537E6 msgbox LavaridgeTown_Gym_1F_Text_176537, 6 end LavaridgeTown_Gym_1F_EventScript_153808:: @ 8153808 - trainerbattle 2, OPPONENT_ANDY, 7, LavaridgeTown_Gym_1F_Text_17658D, LavaridgeTown_Gym_1F_Text_17663F, LavaridgeTown_Gym_1F_EventScript_1537E6 + trainerbattle 2, TRAINER_ANDY, 7, LavaridgeTown_Gym_1F_Text_17658D, LavaridgeTown_Gym_1F_Text_17663F, LavaridgeTown_Gym_1F_EventScript_1537E6 msgbox LavaridgeTown_Gym_1F_Text_176660, 6 end LavaridgeTown_Gym_1F_EventScript_153823:: @ 8153823 - trainerbattle 2, OPPONENT_SADIE, 5, LavaridgeTown_Gym_1F_Text_176784, LavaridgeTown_Gym_1F_Text_1767A6, LavaridgeTown_Gym_1F_EventScript_1537E6 + trainerbattle 2, TRAINER_SADIE, 5, LavaridgeTown_Gym_1F_Text_176784, LavaridgeTown_Gym_1F_Text_1767A6, LavaridgeTown_Gym_1F_EventScript_1537E6 msgbox LavaridgeTown_Gym_1F_Text_1767C1, 6 end LavaridgeTown_Gym_1F_EventScript_15383E:: @ 815383E - trainerbattle 2, OPPONENT_ZANE, 3, LavaridgeTown_Gym_1F_Text_1766D2, LavaridgeTown_Gym_1F_Text_1766FE, LavaridgeTown_Gym_1F_EventScript_1537E6 + trainerbattle 2, TRAINER_ZANE, 3, LavaridgeTown_Gym_1F_Text_1766D2, LavaridgeTown_Gym_1F_Text_1766FE, LavaridgeTown_Gym_1F_EventScript_1537E6 msgbox LavaridgeTown_Gym_1F_Text_17671D, 6 end diff --git a/data/maps/LilycoveCity/scripts.inc b/data/maps/LilycoveCity/scripts.inc index 081914bda..e32582b24 100644 --- a/data/maps/LilycoveCity/scripts.inc +++ b/data/maps/LilycoveCity/scripts.inc @@ -303,32 +303,32 @@ LilycoveCity_EventScript_14CE35:: @ 814CE35 end LilycoveCity_EventScript_14CE46:: @ 814CE46 - trainerbattle 3, OPPONENT_MAY_11, 0, LilycoveCity_Text_167BD5 + trainerbattle 3, TRAINER_MAY_11, 0, LilycoveCity_Text_167BD5 goto LilycoveCity_EventScript_14CEA6 end LilycoveCity_EventScript_14CE56:: @ 814CE56 - trainerbattle 3, OPPONENT_MAY_12, 0, LilycoveCity_Text_167BD5 + trainerbattle 3, TRAINER_MAY_12, 0, LilycoveCity_Text_167BD5 goto LilycoveCity_EventScript_14CEA6 end LilycoveCity_EventScript_14CE66:: @ 814CE66 - trainerbattle 3, OPPONENT_MAY_10, 0, LilycoveCity_Text_167BD5 + trainerbattle 3, TRAINER_MAY_10, 0, LilycoveCity_Text_167BD5 goto LilycoveCity_EventScript_14CEA6 end LilycoveCity_EventScript_14CE76:: @ 814CE76 - trainerbattle 3, OPPONENT_BRENDAN_11, 0, LilycoveCity_Text_1680E4 + trainerbattle 3, TRAINER_BRENDAN_11, 0, LilycoveCity_Text_1680E4 goto LilycoveCity_EventScript_14CF12 end LilycoveCity_EventScript_14CE86:: @ 814CE86 - trainerbattle 3, OPPONENT_BRENDAN_12, 0, LilycoveCity_Text_1680E4 + trainerbattle 3, TRAINER_BRENDAN_12, 0, LilycoveCity_Text_1680E4 goto LilycoveCity_EventScript_14CF12 end LilycoveCity_EventScript_14CE96:: @ 814CE96 - trainerbattle 3, OPPONENT_BRENDAN_10, 0, LilycoveCity_Text_1680E4 + trainerbattle 3, TRAINER_BRENDAN_10, 0, LilycoveCity_Text_1680E4 goto LilycoveCity_EventScript_14CF12 end diff --git a/data/maps/MauvilleCity/scripts.inc b/data/maps/MauvilleCity/scripts.inc index bd4f8ab3d..f5eb064e5 100644 --- a/data/maps/MauvilleCity/scripts.inc +++ b/data/maps/MauvilleCity/scripts.inc @@ -160,7 +160,7 @@ MauvilleCity_EventScript_14C22B:: @ 814C22B MauvilleCity_EventScript_14C23C:: @ 814C23C msgbox MauvilleCity_Text_165F0D, 4 - trainerbattle 3, OPPONENT_WALLY_2, 0, MauvilleCity_Text_165F38 + trainerbattle 3, TRAINER_WALLY_2, 0, MauvilleCity_Text_165F38 applymovement 6, MauvilleCity_Movement_1A0843 waitmovement 0 msgbox MauvilleCity_Text_165F85, 4 diff --git a/data/maps/MauvilleCity_Gym/scripts.inc b/data/maps/MauvilleCity_Gym/scripts.inc index d9b8aced7..ae10eadfd 100644 --- a/data/maps/MauvilleCity_Gym/scripts.inc +++ b/data/maps/MauvilleCity_Gym/scripts.inc @@ -66,7 +66,7 @@ MauvilleCity_Gym_EventScript_1565A7:: @ 81565A7 end MauvilleCity_Gym_EventScript_1565AB:: @ 81565AB - trainerbattle 1, OPPONENT_WATTSON, 0, MauvilleCity_Gym_Text_180C32, MauvilleCity_Gym_Text_180D64, MauvilleCity_Gym_EventScript_1565DB + trainerbattle 1, TRAINER_WATTSON, 0, MauvilleCity_Gym_Text_180C32, MauvilleCity_Gym_Text_180D64, MauvilleCity_Gym_EventScript_1565DB goto_if_unset FLAG_RECEIVED_TM34, MauvilleCity_Gym_EventScript_15661D compare VAR_NEW_MAUVILLE_STATE, 2 goto_if_eq MauvilleCity_Gym_EventScript_156641 @@ -161,22 +161,22 @@ MauvilleCity_Gym_EventScript_1566E1:: @ 81566E1 end MauvilleCity_Gym_EventScript_1566E6:: @ 81566E6 - trainerbattle 0, OPPONENT_KIRK, 0, MauvilleCity_Gym_Text_180956, MauvilleCity_Gym_Text_180997 + trainerbattle 0, TRAINER_KIRK, 0, MauvilleCity_Gym_Text_180956, MauvilleCity_Gym_Text_180997 msgbox MauvilleCity_Gym_Text_1809D1, 6 end MauvilleCity_Gym_EventScript_1566FD:: @ 81566FD - trainerbattle 0, OPPONENT_SHAWN, 0, MauvilleCity_Gym_Text_180A05, MauvilleCity_Gym_Text_180A42 + trainerbattle 0, TRAINER_SHAWN, 0, MauvilleCity_Gym_Text_180A05, MauvilleCity_Gym_Text_180A42 msgbox MauvilleCity_Gym_Text_180A5E, 6 end MauvilleCity_Gym_EventScript_156714:: @ 8156714 - trainerbattle 0, OPPONENT_BEN, 0, MauvilleCity_Gym_Text_180AE0, MauvilleCity_Gym_Text_180B06 + trainerbattle 0, TRAINER_BEN, 0, MauvilleCity_Gym_Text_180AE0, MauvilleCity_Gym_Text_180B06 msgbox MauvilleCity_Gym_Text_180B1D, 6 end MauvilleCity_Gym_EventScript_15672B:: @ 815672B - trainerbattle 0, OPPONENT_VIVIAN, 0, MauvilleCity_Gym_Text_180B5A, MauvilleCity_Gym_Text_180B93 + trainerbattle 0, TRAINER_VIVIAN, 0, MauvilleCity_Gym_Text_180B5A, MauvilleCity_Gym_Text_180B93 msgbox MauvilleCity_Gym_Text_180BAE, 6 end diff --git a/data/maps/MeteorFalls_1F_2R/scripts.inc b/data/maps/MeteorFalls_1F_2R/scripts.inc index 49d629294..92b9f4661 100644 --- a/data/maps/MeteorFalls_1F_2R/scripts.inc +++ b/data/maps/MeteorFalls_1F_2R/scripts.inc @@ -2,7 +2,7 @@ MeteorFalls_1F_2R_MapScripts:: @ 815C678 .byte 0 MeteorFalls_1F_2R_EventScript_15C679:: @ 815C679 - trainerbattle 0, OPPONENT_NICOLAS_1, 0, MeteorFalls_1F_2R_Text_1939C5, MeteorFalls_1F_2R_Text_193A35 + trainerbattle 0, TRAINER_NICOLAS_1, 0, MeteorFalls_1F_2R_Text_1939C5, MeteorFalls_1F_2R_Text_193A35 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq MeteorFalls_1F_2R_EventScript_15C6A0 @@ -10,12 +10,12 @@ MeteorFalls_1F_2R_EventScript_15C679:: @ 815C679 end MeteorFalls_1F_2R_EventScript_15C6A0:: @ 815C6A0 - trainerbattle 5, OPPONENT_NICOLAS_1, 0, MeteorFalls_1F_2R_Text_193AB3, MeteorFalls_1F_2R_Text_193B21 + trainerbattle 5, TRAINER_NICOLAS_1, 0, MeteorFalls_1F_2R_Text_193AB3, MeteorFalls_1F_2R_Text_193B21 msgbox MeteorFalls_1F_2R_Text_193B4C, 6 end MeteorFalls_1F_2R_EventScript_15C6B7:: @ 815C6B7 - trainerbattle 4, OPPONENT_JOHN_AND_JAY_1, 0, MeteorFalls_1F_2R_Text_193BB7, MeteorFalls_1F_2R_Text_193C10, MeteorFalls_1F_2R_Text_193C9F + trainerbattle 4, TRAINER_JOHN_AND_JAY_1, 0, MeteorFalls_1F_2R_Text_193BB7, MeteorFalls_1F_2R_Text_193C10, MeteorFalls_1F_2R_Text_193C9F specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq MeteorFalls_1F_2R_EventScript_15C6E2 @@ -23,12 +23,12 @@ MeteorFalls_1F_2R_EventScript_15C6B7:: @ 815C6B7 end MeteorFalls_1F_2R_EventScript_15C6E2:: @ 815C6E2 - trainerbattle 7, OPPONENT_JOHN_AND_JAY_1, 0, MeteorFalls_1F_2R_Text_193E75, MeteorFalls_1F_2R_Text_193ECE, MeteorFalls_1F_2R_Text_193F59 + trainerbattle 7, TRAINER_JOHN_AND_JAY_1, 0, MeteorFalls_1F_2R_Text_193E75, MeteorFalls_1F_2R_Text_193ECE, MeteorFalls_1F_2R_Text_193F59 msgbox MeteorFalls_1F_2R_Text_193EF3, 6 end MeteorFalls_1F_2R_EventScript_15C6FD:: @ 815C6FD - trainerbattle 4, OPPONENT_JOHN_AND_JAY_1, 0, MeteorFalls_1F_2R_Text_193D10, MeteorFalls_1F_2R_Text_193D6E, MeteorFalls_1F_2R_Text_193DFB + trainerbattle 4, TRAINER_JOHN_AND_JAY_1, 0, MeteorFalls_1F_2R_Text_193D10, MeteorFalls_1F_2R_Text_193D6E, MeteorFalls_1F_2R_Text_193DFB specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq MeteorFalls_1F_2R_EventScript_15C728 @@ -36,6 +36,6 @@ MeteorFalls_1F_2R_EventScript_15C6FD:: @ 815C6FD end MeteorFalls_1F_2R_EventScript_15C728:: @ 815C728 - trainerbattle 7, OPPONENT_JOHN_AND_JAY_1, 0, MeteorFalls_1F_2R_Text_193FCA, MeteorFalls_1F_2R_Text_19403A, MeteorFalls_1F_2R_Text_1940DF + trainerbattle 7, TRAINER_JOHN_AND_JAY_1, 0, MeteorFalls_1F_2R_Text_193FCA, MeteorFalls_1F_2R_Text_19403A, MeteorFalls_1F_2R_Text_1940DF msgbox MeteorFalls_1F_2R_Text_194066, 6 end diff --git a/data/maps/MossdeepCity_Gym/scripts.inc b/data/maps/MossdeepCity_Gym/scripts.inc index a17d09e10..0fa79a6ec 100644 --- a/data/maps/MossdeepCity_Gym/scripts.inc +++ b/data/maps/MossdeepCity_Gym/scripts.inc @@ -45,7 +45,7 @@ MossdeepCity_Gym_EventScript_15A558:: @ 815A558 end MossdeepCity_Gym_EventScript_15A56B:: @ 815A56B - trainerbattle 8, OPPONENT_TATE_AND_LIZA, 0, MossdeepCity_Gym_Text_18CF02, MossdeepCity_Gym_Text_18D077, MossdeepCity_Gym_Text_18D324, MossdeepCity_Gym_EventScript_15A594 + trainerbattle 8, TRAINER_TATE_AND_LIZA, 0, MossdeepCity_Gym_Text_18CF02, MossdeepCity_Gym_Text_18D077, MossdeepCity_Gym_Text_18D324, MossdeepCity_Gym_EventScript_15A594 goto_if_unset FLAG_RECEIVED_TM04, MossdeepCity_Gym_EventScript_15A5C6 msgbox MossdeepCity_Gym_Text_18D273, 4 release @@ -169,32 +169,32 @@ MossdeepCity_Gym_EventScript_15A742:: @ 815A742 end MossdeepCity_Gym_EventScript_15A74E:: @ 815A74E - trainerbattle 0, OPPONENT_PRESTON, 0, MossdeepCity_Gym_Text_18C96A, MossdeepCity_Gym_Text_18C9BA + trainerbattle 0, TRAINER_PRESTON, 0, MossdeepCity_Gym_Text_18C96A, MossdeepCity_Gym_Text_18C9BA msgbox MossdeepCity_Gym_Text_18C9E1, 6 end MossdeepCity_Gym_EventScript_15A765:: @ 815A765 - trainerbattle 0, OPPONENT_VIRGIL, 0, MossdeepCity_Gym_Text_18CA10, MossdeepCity_Gym_Text_18CA28 + trainerbattle 0, TRAINER_VIRGIL, 0, MossdeepCity_Gym_Text_18CA10, MossdeepCity_Gym_Text_18CA28 msgbox MossdeepCity_Gym_Text_18CA48, 6 end MossdeepCity_Gym_EventScript_15A77C:: @ 815A77C - trainerbattle 0, OPPONENT_FRITZ, 0, MossdeepCity_Gym_Text_18CAC0, MossdeepCity_Gym_Text_18CB46 + trainerbattle 0, TRAINER_FRITZ, 0, MossdeepCity_Gym_Text_18CAC0, MossdeepCity_Gym_Text_18CB46 msgbox MossdeepCity_Gym_Text_18CB77, 6 end MossdeepCity_Gym_EventScript_15A793:: @ 815A793 - trainerbattle 0, OPPONENT_HANNAH, 0, MossdeepCity_Gym_Text_18CC1E, MossdeepCity_Gym_Text_18CC83 + trainerbattle 0, TRAINER_HANNAH, 0, MossdeepCity_Gym_Text_18CC1E, MossdeepCity_Gym_Text_18CC83 msgbox MossdeepCity_Gym_Text_18CC9B, 6 end MossdeepCity_Gym_EventScript_15A7AA:: @ 815A7AA - trainerbattle 0, OPPONENT_SAMANTHA, 0, MossdeepCity_Gym_Text_18CD14, MossdeepCity_Gym_Text_18CD66 + trainerbattle 0, TRAINER_SAMANTHA, 0, MossdeepCity_Gym_Text_18CD14, MossdeepCity_Gym_Text_18CD66 msgbox MossdeepCity_Gym_Text_18CD73, 6 end MossdeepCity_Gym_EventScript_15A7C1:: @ 815A7C1 - trainerbattle 0, OPPONENT_MAURA, 0, MossdeepCity_Gym_Text_18CDE0, MossdeepCity_Gym_Text_18CE47 + trainerbattle 0, TRAINER_MAURA, 0, MossdeepCity_Gym_Text_18CDE0, MossdeepCity_Gym_Text_18CE47 msgbox MossdeepCity_Gym_Text_18CE6C, 6 end diff --git a/data/maps/MtChimney/scripts.inc b/data/maps/MtChimney/scripts.inc index f13850570..a3906af8c 100644 --- a/data/maps/MtChimney/scripts.inc +++ b/data/maps/MtChimney/scripts.inc @@ -330,20 +330,20 @@ MtChimney_EventScript_15D107:: @ 815D107 MtChimney_EventScript_15D110:: @ 815D110 .ifdef SAPPHIRE - trainerbattle 0, OPPONENT_MT_CHIMNEY_GRUNT_1, 0, MtChimney_Text_1B3168, MtChimney_Text_1B31EA + trainerbattle 0, TRAINER_MT_CHIMNEY_GRUNT_1, 0, MtChimney_Text_1B3168, MtChimney_Text_1B31EA msgbox MtChimney_Text_1B3239, 6 .else - trainerbattle 0, OPPONENT_MT_CHIMNEY_GRUNT_1, 0, MtChimney_Text_1B3B36, MtChimney_Text_1B3BB8 + trainerbattle 0, TRAINER_MT_CHIMNEY_GRUNT_1, 0, MtChimney_Text_1B3B36, MtChimney_Text_1B3BB8 msgbox MtChimney_Text_1B3C07, 6 .endif end MtChimney_EventScript_15D127:: @ 815D127 .ifdef SAPPHIRE - trainerbattle 0, OPPONENT_MT_CHIMNEY_GRUNT_2, 0, MtChimney_Text_1B32C8, MtChimney_Text_1B336E + trainerbattle 0, TRAINER_MT_CHIMNEY_GRUNT_2, 0, MtChimney_Text_1B32C8, MtChimney_Text_1B336E msgbox MtChimney_Text_1B338D, 6 .else - trainerbattle 0, OPPONENT_MT_CHIMNEY_GRUNT_2, 0, MtChimney_Text_1B3C96, MtChimney_Text_1B3D1E + trainerbattle 0, TRAINER_MT_CHIMNEY_GRUNT_2, 0, MtChimney_Text_1B3C96, MtChimney_Text_1B3D1E msgbox MtChimney_Text_1B3D3D, 6 .endif end @@ -437,7 +437,7 @@ MtChimney_EventScript_15D1DA:: @ 815D1DA end MtChimney_EventScript_15D1E3:: @ 815D1E3 - trainerbattle 0, OPPONENT_SHELBY_1, 0, MtChimney_Text_19597F, MtChimney_Text_1959D8 + trainerbattle 0, TRAINER_SHELBY_1, 0, MtChimney_Text_19597F, MtChimney_Text_1959D8 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq MtChimney_EventScript_15D20A @@ -445,21 +445,21 @@ MtChimney_EventScript_15D1E3:: @ 815D1E3 end MtChimney_EventScript_15D20A:: @ 815D20A - trainerbattle 5, OPPONENT_SHELBY_1, 0, MtChimney_Text_195A45, MtChimney_Text_195AAD + trainerbattle 5, TRAINER_SHELBY_1, 0, MtChimney_Text_195A45, MtChimney_Text_195AAD msgbox MtChimney_Text_195AD9, 6 end MtChimney_EventScript_15D221:: @ 815D221 - trainerbattle 0, OPPONENT_MELISSA, 0, MtChimney_Text_195B1C, MtChimney_Text_195B5F + trainerbattle 0, TRAINER_MELISSA, 0, MtChimney_Text_195B1C, MtChimney_Text_195B5F msgbox MtChimney_Text_195B84, 6 end MtChimney_EventScript_15D238:: @ 815D238 - trainerbattle 0, OPPONENT_SHEILA, 0, MtChimney_Text_195BB2, MtChimney_Text_195BF9 + trainerbattle 0, TRAINER_SHEILA, 0, MtChimney_Text_195BB2, MtChimney_Text_195BF9 msgbox MtChimney_Text_195C31, 6 end MtChimney_EventScript_15D24F:: @ 815D24F - trainerbattle 0, OPPONENT_SHIRLEY, 0, MtChimney_Text_195CD8, MtChimney_Text_195D2F + trainerbattle 0, TRAINER_SHIRLEY, 0, MtChimney_Text_195CD8, MtChimney_Text_195D2F msgbox MtChimney_Text_195D5C, 6 end diff --git a/data/maps/MtPyre_2F/scripts.inc b/data/maps/MtPyre_2F/scripts.inc index 1d2368597..d2ef2894e 100644 --- a/data/maps/MtPyre_2F/scripts.inc +++ b/data/maps/MtPyre_2F/scripts.inc @@ -18,16 +18,16 @@ MtPyre_2F_EventScript_15D392:: @ 815D392 end MtPyre_2F_EventScript_15D39B:: @ 815D39B - trainerbattle 0, OPPONENT_MARK, 0, MtPyre_2F_Text_196674, MtPyre_2F_Text_1966BE + trainerbattle 0, TRAINER_MARK, 0, MtPyre_2F_Text_196674, MtPyre_2F_Text_1966BE msgbox MtPyre_2F_Text_1966E7, 6 end MtPyre_2F_EventScript_15D3B2:: @ 815D3B2 - trainerbattle 4, OPPONENT_DEZ_AND_LUKE, 0, MtPyre_2F_Text_1962C6, MtPyre_2F_Text_196358, MtPyre_2F_Text_1963CB + trainerbattle 4, TRAINER_DEZ_AND_LUKE, 0, MtPyre_2F_Text_1962C6, MtPyre_2F_Text_196358, MtPyre_2F_Text_1963CB msgbox MtPyre_2F_Text_196368, 6 end MtPyre_2F_EventScript_15D3CD:: @ 815D3CD - trainerbattle 4, OPPONENT_DEZ_AND_LUKE, 0, MtPyre_2F_Text_196449, MtPyre_2F_Text_1964EB, MtPyre_2F_Text_196539 + trainerbattle 4, TRAINER_DEZ_AND_LUKE, 0, MtPyre_2F_Text_196449, MtPyre_2F_Text_1964EB, MtPyre_2F_Text_196539 msgbox MtPyre_2F_Text_196504, 6 end diff --git a/data/maps/MtPyre_3F/scripts.inc b/data/maps/MtPyre_3F/scripts.inc index ea8bda7b5..69a57df19 100644 --- a/data/maps/MtPyre_3F/scripts.inc +++ b/data/maps/MtPyre_3F/scripts.inc @@ -2,11 +2,11 @@ MtPyre_3F_MapScripts:: @ 815D3E8 .byte 0 MtPyre_3F_EventScript_15D3E9:: @ 815D3E9 - trainerbattle 0, OPPONENT_WILLIAM, 0, MtPyre_3F_Text_19672B, MtPyre_3F_Text_19679D + trainerbattle 0, TRAINER_WILLIAM, 0, MtPyre_3F_Text_19672B, MtPyre_3F_Text_19679D msgbox MtPyre_3F_Text_1967B5, 6 end MtPyre_3F_EventScript_15D400:: @ 815D400 - trainerbattle 0, OPPONENT_KAYLA, 0, MtPyre_3F_Text_1967EF, MtPyre_3F_Text_19682B + trainerbattle 0, TRAINER_KAYLA, 0, MtPyre_3F_Text_1967EF, MtPyre_3F_Text_19682B msgbox MtPyre_3F_Text_196842, 6 end diff --git a/data/maps/MtPyre_4F/scripts.inc b/data/maps/MtPyre_4F/scripts.inc index e1ebac7c1..3910d6f45 100644 --- a/data/maps/MtPyre_4F/scripts.inc +++ b/data/maps/MtPyre_4F/scripts.inc @@ -2,6 +2,6 @@ MtPyre_4F_MapScripts:: @ 815D417 .byte 0 MtPyre_4F_EventScript_15D418:: @ 815D418 - trainerbattle 0, OPPONENT_ATSUSHI, 0, MtPyre_4F_Text_1968A6, MtPyre_4F_Text_1968D0 + trainerbattle 0, TRAINER_ATSUSHI, 0, MtPyre_4F_Text_1968A6, MtPyre_4F_Text_1968D0 msgbox MtPyre_4F_Text_1968EE, 6 end diff --git a/data/maps/MtPyre_5F/scripts.inc b/data/maps/MtPyre_5F/scripts.inc index 9adb249f0..8cec3a32f 100644 --- a/data/maps/MtPyre_5F/scripts.inc +++ b/data/maps/MtPyre_5F/scripts.inc @@ -2,6 +2,6 @@ MtPyre_5F_MapScripts:: @ 815D42F .byte 0 MtPyre_5F_EventScript_15D430:: @ 815D430 - trainerbattle 0, OPPONENT_TASHA, 0, MtPyre_5F_Text_196939, MtPyre_5F_Text_196997 + trainerbattle 0, TRAINER_TASHA, 0, MtPyre_5F_Text_196939, MtPyre_5F_Text_196997 msgbox MtPyre_5F_Text_1969AC, 6 end diff --git a/data/maps/MtPyre_6F/scripts.inc b/data/maps/MtPyre_6F/scripts.inc index ae09300a3..92086949f 100644 --- a/data/maps/MtPyre_6F/scripts.inc +++ b/data/maps/MtPyre_6F/scripts.inc @@ -2,7 +2,7 @@ MtPyre_6F_MapScripts:: @ 815D447 .byte 0 MtPyre_6F_EventScript_15D448:: @ 815D448 - trainerbattle 0, OPPONENT_VALERIE_1, 0, MtPyre_6F_Text_1969FE, MtPyre_6F_Text_196A30 + trainerbattle 0, TRAINER_VALERIE_1, 0, MtPyre_6F_Text_1969FE, MtPyre_6F_Text_196A30 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq MtPyre_6F_EventScript_15D46F @@ -10,6 +10,6 @@ MtPyre_6F_EventScript_15D448:: @ 815D448 end MtPyre_6F_EventScript_15D46F:: @ 815D46F - trainerbattle 5, OPPONENT_VALERIE_1, 0, MtPyre_6F_Text_196A95, MtPyre_6F_Text_196AB1 + trainerbattle 5, TRAINER_VALERIE_1, 0, MtPyre_6F_Text_196A95, MtPyre_6F_Text_196AB1 msgbox MtPyre_6F_Text_196AC9, 6 end diff --git a/data/maps/PetalburgCity_Gym/scripts.inc b/data/maps/PetalburgCity_Gym/scripts.inc index a3fb5c494..44398e6d5 100644 --- a/data/maps/PetalburgCity_Gym/scripts.inc +++ b/data/maps/PetalburgCity_Gym/scripts.inc @@ -15,13 +15,13 @@ PetalburgCity_Gym_MapScript1_15448C:: @ 815448C PetalburgCity_Gym_EventScript_1544A3:: @ 81544A3 setvar VAR_SPECIAL_5, 1 call PetalburgCity_Gym_EventScript_154F9A - call_if_trainer_defeated OPPONENT_RANDALL, PetalburgCity_Gym_EventScript_154FBB - call_if_trainer_defeated OPPONENT_MARY, PetalburgCity_Gym_EventScript_154FDC - call_if_trainer_defeated OPPONENT_PARKER, PetalburgCity_Gym_EventScript_154FFD - call_if_trainer_defeated OPPONENT_LORI, PetalburgCity_Gym_EventScript_15501E - call_if_trainer_defeated OPPONENT_GEORGE, PetalburgCity_Gym_EventScript_15503F - call_if_trainer_defeated OPPONENT_JODY, PetalburgCity_Gym_EventScript_155060 - call_if_trainer_defeated OPPONENT_BERKE, PetalburgCity_Gym_EventScript_155081 + call_if_trainer_defeated TRAINER_RANDALL, PetalburgCity_Gym_EventScript_154FBB + call_if_trainer_defeated TRAINER_MARY, PetalburgCity_Gym_EventScript_154FDC + call_if_trainer_defeated TRAINER_PARKER, PetalburgCity_Gym_EventScript_154FFD + call_if_trainer_defeated TRAINER_LORI, PetalburgCity_Gym_EventScript_15501E + call_if_trainer_defeated TRAINER_GEORGE, PetalburgCity_Gym_EventScript_15503F + call_if_trainer_defeated TRAINER_JODY, PetalburgCity_Gym_EventScript_155060 + call_if_trainer_defeated TRAINER_BERKE, PetalburgCity_Gym_EventScript_155081 end PetalburgCity_Gym_EventScript_1544ED:: @ 81544ED @@ -382,7 +382,7 @@ PetalburgCity_Gym_EventScript_1549B8:: @ 81549B8 PetalburgCity_Gym_EventScript_1549D6:: @ 81549D6 msgbox PetalburgCity_Gym_Text_17A653, 4 - trainerbattle 3, OPPONENT_NORMAN, 0, PetalburgCity_Gym_Text_17A77A + trainerbattle 3, TRAINER_NORMAN, 0, PetalburgCity_Gym_Text_17A77A message PetalburgCity_Gym_Text_17A7DD waitmessage call PetalburgCity_Gym_EventScript_1A02C5 @@ -625,7 +625,7 @@ PetalburgCity_Gym_EventScript_154BC3:: @ 8154BC3 PetalburgCity_Gym_EventScript_154BF8:: @ 8154BF8 lockall - goto_if_trainer_not_defeated OPPONENT_RANDALL, PetalburgCity_Gym_EventScript_154BB9 + goto_if_trainer_not_defeated TRAINER_RANDALL, PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 7 setvar VAR_SPECIAL_9, 46 msgbox PetalburgCity_Gym_Text_17B90F, MSGBOX_YESNO @@ -637,7 +637,7 @@ PetalburgCity_Gym_EventScript_154BF8:: @ 8154BF8 PetalburgCity_Gym_EventScript_154C2B:: @ 8154C2B lockall - goto_if_trainer_not_defeated OPPONENT_RANDALL, PetalburgCity_Gym_EventScript_154BB9 + goto_if_trainer_not_defeated TRAINER_RANDALL, PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 1 setvar VAR_SPECIAL_9, 59 msgbox PetalburgCity_Gym_Text_17B950, MSGBOX_YESNO @@ -649,7 +649,7 @@ PetalburgCity_Gym_EventScript_154C2B:: @ 8154C2B PetalburgCity_Gym_EventScript_154C5E:: @ 8154C5E lockall - goto_if_trainer_not_defeated OPPONENT_MARY, PetalburgCity_Gym_EventScript_154BB9 + goto_if_trainer_not_defeated TRAINER_MARY, PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 7 setvar VAR_SPECIAL_9, 59 msgbox PetalburgCity_Gym_Text_17B950, MSGBOX_YESNO @@ -661,7 +661,7 @@ PetalburgCity_Gym_EventScript_154C5E:: @ 8154C5E PetalburgCity_Gym_EventScript_154C91:: @ 8154C91 lockall - goto_if_trainer_not_defeated OPPONENT_MARY, PetalburgCity_Gym_EventScript_154BB9 + goto_if_trainer_not_defeated TRAINER_MARY, PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 1 setvar VAR_SPECIAL_9, 72 msgbox PetalburgCity_Gym_Text_17B98A, MSGBOX_YESNO @@ -673,7 +673,7 @@ PetalburgCity_Gym_EventScript_154C91:: @ 8154C91 PetalburgCity_Gym_EventScript_154CC4:: @ 8154CC4 lockall - goto_if_trainer_not_defeated OPPONENT_PARKER, PetalburgCity_Gym_EventScript_154BB9 + goto_if_trainer_not_defeated TRAINER_PARKER, PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 1 setvar VAR_SPECIAL_9, 20 msgbox PetalburgCity_Gym_Text_17B9C5, MSGBOX_YESNO @@ -685,7 +685,7 @@ PetalburgCity_Gym_EventScript_154CC4:: @ 8154CC4 PetalburgCity_Gym_EventScript_154CF7:: @ 8154CF7 lockall - goto_if_trainer_not_defeated OPPONENT_LORI, PetalburgCity_Gym_EventScript_154BB9 + goto_if_trainer_not_defeated TRAINER_LORI, PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 7 setvar VAR_SPECIAL_9, 20 msgbox PetalburgCity_Gym_Text_17B9C5, MSGBOX_YESNO @@ -697,7 +697,7 @@ PetalburgCity_Gym_EventScript_154CF7:: @ 8154CF7 PetalburgCity_Gym_EventScript_154D2A:: @ 8154D2A lockall - goto_if_trainer_not_defeated OPPONENT_LORI, PetalburgCity_Gym_EventScript_154BB9 + goto_if_trainer_not_defeated TRAINER_LORI, PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 1 setvar VAR_SPECIAL_9, 33 msgbox PetalburgCity_Gym_Text_17BA00, MSGBOX_YESNO @@ -709,7 +709,7 @@ PetalburgCity_Gym_EventScript_154D2A:: @ 8154D2A PetalburgCity_Gym_EventScript_154D5D:: @ 8154D5D lockall - goto_if_trainer_not_defeated OPPONENT_GEORGE, PetalburgCity_Gym_EventScript_154BB9 + goto_if_trainer_not_defeated TRAINER_GEORGE, PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 7 setvar VAR_SPECIAL_9, 33 msgbox PetalburgCity_Gym_Text_17BA00, MSGBOX_YESNO @@ -721,7 +721,7 @@ PetalburgCity_Gym_EventScript_154D5D:: @ 8154D5D PetalburgCity_Gym_EventScript_154D90:: @ 8154D90 lockall - goto_if_trainer_not_defeated OPPONENT_JODY, PetalburgCity_Gym_EventScript_154BB9 + goto_if_trainer_not_defeated TRAINER_JODY, PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 1 setvar VAR_SPECIAL_9, 7 msgbox PetalburgCity_Gym_Text_17BA3D, MSGBOX_YESNO @@ -733,7 +733,7 @@ PetalburgCity_Gym_EventScript_154D90:: @ 8154D90 PetalburgCity_Gym_EventScript_154DC3:: @ 8154DC3 lockall - goto_if_trainer_not_defeated OPPONENT_BERKE, PetalburgCity_Gym_EventScript_154BB9 + goto_if_trainer_not_defeated TRAINER_BERKE, PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 7 setvar VAR_SPECIAL_9, 7 msgbox PetalburgCity_Gym_Text_17BA3D, MSGBOX_YESNO @@ -744,7 +744,7 @@ PetalburgCity_Gym_EventScript_154DC3:: @ 8154DC3 end PetalburgCity_Gym_EventScript_154DF6:: @ 8154DF6 - trainerbattle 2, OPPONENT_RANDALL, 0, PetalburgCity_Gym_Text_17ADA5, PetalburgCity_Gym_Text_17AE11, PetalburgCity_Gym_EventScript_154E1A + trainerbattle 2, TRAINER_RANDALL, 0, PetalburgCity_Gym_Text_17ADA5, PetalburgCity_Gym_Text_17AE11, PetalburgCity_Gym_EventScript_154E1A goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_154E29 msgbox PetalburgCity_Gym_Text_17AE30, 6 end @@ -761,7 +761,7 @@ PetalburgCity_Gym_EventScript_154E29:: @ 8154E29 end PetalburgCity_Gym_EventScript_154E32:: @ 8154E32 - trainerbattle 2, OPPONENT_PARKER, 0, PetalburgCity_Gym_Text_17AF5A, PetalburgCity_Gym_Text_17AF98, PetalburgCity_Gym_EventScript_154E56 + trainerbattle 2, TRAINER_PARKER, 0, PetalburgCity_Gym_Text_17AF5A, PetalburgCity_Gym_Text_17AF98, PetalburgCity_Gym_EventScript_154E56 goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_154E65 msgbox PetalburgCity_Gym_Text_17AFD3, 6 end @@ -778,7 +778,7 @@ PetalburgCity_Gym_EventScript_154E65:: @ 8154E65 end PetalburgCity_Gym_EventScript_154E6E:: @ 8154E6E - trainerbattle 2, OPPONENT_GEORGE, 0, PetalburgCity_Gym_Text_17B058, PetalburgCity_Gym_Text_17B0F7, PetalburgCity_Gym_EventScript_154E92 + trainerbattle 2, TRAINER_GEORGE, 0, PetalburgCity_Gym_Text_17B058, PetalburgCity_Gym_Text_17B0F7, PetalburgCity_Gym_EventScript_154E92 goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_154EA1 msgbox PetalburgCity_Gym_Text_17B12C, 6 end @@ -795,7 +795,7 @@ PetalburgCity_Gym_EventScript_154EA1:: @ 8154EA1 end PetalburgCity_Gym_EventScript_154EAA:: @ 8154EAA - trainerbattle 2, OPPONENT_BERKE, 0, PetalburgCity_Gym_Text_17B237, PetalburgCity_Gym_Text_17B2C0, PetalburgCity_Gym_EventScript_154ECE + trainerbattle 2, TRAINER_BERKE, 0, PetalburgCity_Gym_Text_17B237, PetalburgCity_Gym_Text_17B2C0, PetalburgCity_Gym_EventScript_154ECE goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_154EDD msgbox PetalburgCity_Gym_Text_17B2E4, 6 end @@ -812,7 +812,7 @@ PetalburgCity_Gym_EventScript_154EDD:: @ 8154EDD end PetalburgCity_Gym_EventScript_154EE6:: @ 8154EE6 - trainerbattle 2, OPPONENT_MARY, 0, PetalburgCity_Gym_Text_17B3F7, PetalburgCity_Gym_Text_17B454, PetalburgCity_Gym_EventScript_154F0A + trainerbattle 2, TRAINER_MARY, 0, PetalburgCity_Gym_Text_17B3F7, PetalburgCity_Gym_Text_17B454, PetalburgCity_Gym_EventScript_154F0A goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_154F19 msgbox PetalburgCity_Gym_Text_17B46F, 6 end @@ -829,7 +829,7 @@ PetalburgCity_Gym_EventScript_154F19:: @ 8154F19 end PetalburgCity_Gym_EventScript_154F22:: @ 8154F22 - trainerbattle 2, OPPONENT_LORI, 0, PetalburgCity_Gym_Text_17B58D, PetalburgCity_Gym_Text_17B5CB, PetalburgCity_Gym_EventScript_154F46 + trainerbattle 2, TRAINER_LORI, 0, PetalburgCity_Gym_Text_17B58D, PetalburgCity_Gym_Text_17B5CB, PetalburgCity_Gym_EventScript_154F46 goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_154F55 msgbox PetalburgCity_Gym_Text_17B5EA, 6 end @@ -846,7 +846,7 @@ PetalburgCity_Gym_EventScript_154F55:: @ 8154F55 end PetalburgCity_Gym_EventScript_154F5E:: @ 8154F5E - trainerbattle 2, OPPONENT_JODY, 0, PetalburgCity_Gym_Text_17B6D4, PetalburgCity_Gym_Text_17B732, PetalburgCity_Gym_EventScript_154F82 + trainerbattle 2, TRAINER_JODY, 0, PetalburgCity_Gym_Text_17B6D4, PetalburgCity_Gym_Text_17B732, PetalburgCity_Gym_EventScript_154F82 goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_154F91 msgbox PetalburgCity_Gym_Text_17B749, 6 end diff --git a/data/maps/PetalburgWoods/scripts.inc b/data/maps/PetalburgWoods/scripts.inc index 69b85d743..8d1651d3a 100644 --- a/data/maps/PetalburgWoods/scripts.inc +++ b/data/maps/PetalburgWoods/scripts.inc @@ -30,7 +30,7 @@ PetalburgWoods_EventScript_15CCA8:: @ 815CCA8 applymovement 3, PetalburgWoods_Movement_15CEC8 waitmovement 0 msgbox PetalburgWoods_Text_194EE8, 4 - trainerbattle 3, OPPONENT_PETALBURG_WOODS_GRUNT, 0, PetalburgWoods_Text_194F83 + trainerbattle 3, TRAINER_PETALBURG_WOODS_GRUNT, 0, PetalburgWoods_Text_194F83 applymovement 3, PetalburgWoods_Movement_15CEB3 waitmovement 0 call PetalburgWoods_EventScript_15CDFA @@ -65,7 +65,7 @@ PetalburgWoods_EventScript_15CD42:: @ 815CD42 applymovement 255, PetalburgWoods_Movement_1A0841 waitmovement 0 msgbox PetalburgWoods_Text_194EE8, 4 - trainerbattle 3, OPPONENT_PETALBURG_WOODS_GRUNT, 0, PetalburgWoods_Text_194F83 + trainerbattle 3, TRAINER_PETALBURG_WOODS_GRUNT, 0, PetalburgWoods_Text_194F83 applymovement 3, PetalburgWoods_Movement_15CEB3 waitmovement 0 call PetalburgWoods_EventScript_15CDFA @@ -264,12 +264,12 @@ PetalburgWoods_EventScript_15CF1E:: @ 815CF1E end PetalburgWoods_EventScript_15CF27:: @ 815CF27 - trainerbattle 0, OPPONENT_LYLE, 0, PetalburgWoods_Text_1951BE, PetalburgWoods_Text_195202 + trainerbattle 0, TRAINER_LYLE, 0, PetalburgWoods_Text_1951BE, PetalburgWoods_Text_195202 msgbox PetalburgWoods_Text_195232, 6 end PetalburgWoods_EventScript_15CF3E:: @ 815CF3E - trainerbattle 0, OPPONENT_JAMES_1, 0, PetalburgWoods_Text_19526A, PetalburgWoods_Text_1952AE + trainerbattle 0, TRAINER_JAMES_1, 0, PetalburgWoods_Text_19526A, PetalburgWoods_Text_1952AE specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq PetalburgWoods_EventScript_15CF65 @@ -277,6 +277,6 @@ PetalburgWoods_EventScript_15CF3E:: @ 815CF3E end PetalburgWoods_EventScript_15CF65:: @ 815CF65 - trainerbattle 5, OPPONENT_JAMES_1, 0, PetalburgWoods_Text_195306, PetalburgWoods_Text_195338 + trainerbattle 5, TRAINER_JAMES_1, 0, PetalburgWoods_Text_195306, PetalburgWoods_Text_195338 msgbox PetalburgWoods_Text_195356, 6 end diff --git a/data/maps/Route102/scripts.inc b/data/maps/Route102/scripts.inc index ad1571caa..758d05d45 100644 --- a/data/maps/Route102/scripts.inc +++ b/data/maps/Route102/scripts.inc @@ -18,7 +18,7 @@ Route102_EventScript_14EAF5:: @ 814EAF5 end Route102_EventScript_14EAFE:: @ 814EAFE - trainerbattle 0, OPPONENT_CALVIN_1, 0, Route102_Text_1B79C3, Route102_Text_1B7A2C + trainerbattle 0, TRAINER_CALVIN_1, 0, Route102_Text_1B79C3, Route102_Text_1B7A2C specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route102_EventScript_14EB25 @@ -26,21 +26,21 @@ Route102_EventScript_14EAFE:: @ 814EAFE end Route102_EventScript_14EB25:: @ 814EB25 - trainerbattle 5, OPPONENT_CALVIN_1, 0, Route102_Text_1B7A9F, Route102_Text_1B7AFD + trainerbattle 5, TRAINER_CALVIN_1, 0, Route102_Text_1B7A9F, Route102_Text_1B7AFD msgbox Route102_Text_1B7B2F, 6 end Route102_EventScript_14EB3C:: @ 814EB3C - trainerbattle 0, OPPONENT_RICK, 0, Route102_Text_1B7C05, Route102_Text_1B7C40 + trainerbattle 0, TRAINER_RICK, 0, Route102_Text_1B7C05, Route102_Text_1B7C40 msgbox Route102_Text_1B7C52, 6 end Route102_EventScript_14EB53:: @ 814EB53 - trainerbattle 0, OPPONENT_TIANA, 0, Route102_Text_1B7C97, Route102_Text_1B7CEC + trainerbattle 0, TRAINER_TIANA, 0, Route102_Text_1B7C97, Route102_Text_1B7CEC msgbox Route102_Text_1B7D11, 6 end Route102_EventScript_14EB6A:: @ 814EB6A - trainerbattle 0, OPPONENT_ALLEN, 0, Route102_Text_1B7B68, Route102_Text_1B7B9D + trainerbattle 0, TRAINER_ALLEN, 0, Route102_Text_1B7B68, Route102_Text_1B7B9D msgbox Route102_Text_1B7BD0, 6 end diff --git a/data/maps/Route103/scripts.inc b/data/maps/Route103/scripts.inc index 361dc78c3..625fc5271 100644 --- a/data/maps/Route103/scripts.inc +++ b/data/maps/Route103/scripts.inc @@ -49,32 +49,32 @@ Route103_EventScript_14EC04:: @ 814EC04 end Route103_EventScript_14EC5D:: @ 814EC5D - trainerbattle 3, OPPONENT_MAY_4, 0, Route103_Text_16D65B + trainerbattle 3, TRAINER_MAY_4, 0, Route103_Text_16D65B goto Route103_EventScript_14ECBD end Route103_EventScript_14EC6D:: @ 814EC6D - trainerbattle 3, OPPONENT_MAY_7, 0, Route103_Text_16D65B + trainerbattle 3, TRAINER_MAY_7, 0, Route103_Text_16D65B goto Route103_EventScript_14ECBD end Route103_EventScript_14EC7D:: @ 814EC7D - trainerbattle 3, OPPONENT_MAY_1, 0, Route103_Text_16D65B + trainerbattle 3, TRAINER_MAY_1, 0, Route103_Text_16D65B goto Route103_EventScript_14ECBD end Route103_EventScript_14EC8D:: @ 814EC8D - trainerbattle 3, OPPONENT_BRENDAN_4, 0, Route103_Text_16D836 + trainerbattle 3, TRAINER_BRENDAN_4, 0, Route103_Text_16D836 goto Route103_EventScript_14ECCB end Route103_EventScript_14EC9D:: @ 814EC9D - trainerbattle 3, OPPONENT_BRENDAN_7, 0, Route103_Text_16D836 + trainerbattle 3, TRAINER_BRENDAN_7, 0, Route103_Text_16D836 goto Route103_EventScript_14ECCB end Route103_EventScript_14ECAD:: @ 814ECAD - trainerbattle 3, OPPONENT_BRENDAN_1, 0, Route103_Text_16D836 + trainerbattle 3, TRAINER_BRENDAN_1, 0, Route103_Text_16D836 goto Route103_EventScript_14ECCB end @@ -167,12 +167,12 @@ Route103_EventScript_14ED8B:: @ 814ED8B end Route103_EventScript_14ED94:: @ 814ED94 - trainerbattle 0, OPPONENT_DAISY, 0, Route103_Text_1B7D55, Route103_Text_1B7D8B + trainerbattle 0, TRAINER_DAISY, 0, Route103_Text_1B7D55, Route103_Text_1B7D8B msgbox Route103_Text_1B7DB2, 6 end Route103_EventScript_14EDAB:: @ 814EDAB - trainerbattle 4, OPPONENT_AMY_AND_LIV_1, 0, Route103_Text_1B7DF7, Route103_Text_1B7E3B, Route103_Text_1B7EAC + trainerbattle 4, TRAINER_AMY_AND_LIV_1, 0, Route103_Text_1B7DF7, Route103_Text_1B7E3B, Route103_Text_1B7EAC specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route103_EventScript_14EDD6 @@ -180,12 +180,12 @@ Route103_EventScript_14EDAB:: @ 814EDAB end Route103_EventScript_14EDD6:: @ 814EDD6 - trainerbattle 7, OPPONENT_AMY_AND_LIV_1, 0, Route103_Text_1B7FE7, Route103_Text_1B802B, Route103_Text_1B80AF + trainerbattle 7, TRAINER_AMY_AND_LIV_1, 0, Route103_Text_1B7FE7, Route103_Text_1B802B, Route103_Text_1B80AF msgbox Route103_Text_1B8053, 6 end Route103_EventScript_14EDF1:: @ 814EDF1 - trainerbattle 4, OPPONENT_AMY_AND_LIV_1, 0, Route103_Text_1B7EFB, Route103_Text_1B7F20, Route103_Text_1B7F8E + trainerbattle 4, TRAINER_AMY_AND_LIV_1, 0, Route103_Text_1B7EFB, Route103_Text_1B7F20, Route103_Text_1B7F8E specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route103_EventScript_14EE1C @@ -193,17 +193,17 @@ Route103_EventScript_14EDF1:: @ 814EDF1 end Route103_EventScript_14EE1C:: @ 814EE1C - trainerbattle 7, OPPONENT_AMY_AND_LIV_1, 0, Route103_Text_1B80FE, Route103_Text_1B8123, Route103_Text_1B81A1 + trainerbattle 7, TRAINER_AMY_AND_LIV_1, 0, Route103_Text_1B80FE, Route103_Text_1B8123, Route103_Text_1B81A1 msgbox Route103_Text_1B814D, 6 end Route103_EventScript_14EE37:: @ 814EE37 - trainerbattle 0, OPPONENT_ANDREW, 0, Route103_Text_1B81FA, Route103_Text_1B8258 + trainerbattle 0, TRAINER_ANDREW, 0, Route103_Text_1B81FA, Route103_Text_1B8258 msgbox Route103_Text_1B8281, 6 end Route103_EventScript_14EE4E:: @ 814EE4E - trainerbattle 0, OPPONENT_MIGUEL_1, 0, Route103_Text_1B82A9, Route103_Text_1B82EC + trainerbattle 0, TRAINER_MIGUEL_1, 0, Route103_Text_1B82A9, Route103_Text_1B82EC specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route103_EventScript_14EE75 @@ -211,6 +211,6 @@ Route103_EventScript_14EE4E:: @ 814EE4E end Route103_EventScript_14EE75:: @ 814EE75 - trainerbattle 5, OPPONENT_MIGUEL_1, 0, Route103_Text_1B8349, Route103_Text_1B838C + trainerbattle 5, TRAINER_MIGUEL_1, 0, Route103_Text_1B8349, Route103_Text_1B838C msgbox Route103_Text_1B83A4, 6 end diff --git a/data/maps/Route104/scripts.inc b/data/maps/Route104/scripts.inc index 8fda04ea5..9b055f134 100644 --- a/data/maps/Route104/scripts.inc +++ b/data/maps/Route104/scripts.inc @@ -391,17 +391,17 @@ Route104_Movement_14F16F:: @ 814F16F end_movement Route104_EventScript_14F172:: @ 814F172 - trainerbattle 0, OPPONENT_IVAN, 0, Route104_Text_1B85EB, Route104_Text_1B8637 + trainerbattle 0, TRAINER_IVAN, 0, Route104_Text_1B85EB, Route104_Text_1B8637 msgbox Route104_Text_1B8680, 6 end Route104_EventScript_14F189:: @ 814F189 - trainerbattle 0, OPPONENT_BILLY, 0, Route104_Text_1B86BE, Route104_Text_1B86E8 + trainerbattle 0, TRAINER_BILLY, 0, Route104_Text_1B86BE, Route104_Text_1B86E8 msgbox Route104_Text_1B871C, 6 end Route104_EventScript_14F1A0:: @ 814F1A0 - trainerbattle 0, OPPONENT_HALEY_1, 0, Route104_Text_1B8770, Route104_Text_1B87A7 + trainerbattle 0, TRAINER_HALEY_1, 0, Route104_Text_1B8770, Route104_Text_1B87A7 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route104_EventScript_14F1C7 @@ -409,12 +409,12 @@ Route104_EventScript_14F1A0:: @ 814F1A0 end Route104_EventScript_14F1C7:: @ 814F1C7 - trainerbattle 5, OPPONENT_HALEY_1, 0, Route104_Text_1B8839, Route104_Text_1B8852 + trainerbattle 5, TRAINER_HALEY_1, 0, Route104_Text_1B8839, Route104_Text_1B8852 msgbox Route104_Text_1B8872, 6 end Route104_EventScript_14F1DE:: @ 814F1DE - trainerbattle 0, OPPONENT_WINSTON_1, 0, Route104_Text_1B88D4, Route104_Text_1B8911 + trainerbattle 0, TRAINER_WINSTON_1, 0, Route104_Text_1B88D4, Route104_Text_1B8911 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route104_EventScript_14F205 @@ -422,12 +422,12 @@ Route104_EventScript_14F1DE:: @ 814F1DE end Route104_EventScript_14F205:: @ 814F205 - trainerbattle 5, OPPONENT_WINSTON_1, 0, Route104_Text_1B895E, Route104_Text_1B899E + trainerbattle 5, TRAINER_WINSTON_1, 0, Route104_Text_1B895E, Route104_Text_1B899E msgbox Route104_Text_1B89C0, 6 end Route104_EventScript_14F21C:: @ 814F21C - trainerbattle 0, OPPONENT_CINDY_1, 0, Route104_Text_1B8A24, Route104_Text_1B8A61 + trainerbattle 0, TRAINER_CINDY_1, 0, Route104_Text_1B8A24, Route104_Text_1B8A61 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route104_EventScript_14F243 @@ -435,19 +435,19 @@ Route104_EventScript_14F21C:: @ 814F21C end Route104_EventScript_14F243:: @ 814F243 - trainerbattle 5, OPPONENT_CINDY_1, 0, Route104_Text_1B8AA7, Route104_Text_1B8AD9 + trainerbattle 5, TRAINER_CINDY_1, 0, Route104_Text_1B8AA7, Route104_Text_1B8AD9 msgbox Route104_Text_1B8B02, 6 end Route104_EventScript_14F25A:: @ 814F25A - trainerbattle 4, OPPONENT_GINA_AND_MIA_1, 0, Route104_Text_1B83E9, Route104_Text_1B8414, Route104_Text_1B845C + trainerbattle 4, TRAINER_GINA_AND_MIA_1, 0, Route104_Text_1B83E9, Route104_Text_1B8414, Route104_Text_1B845C special GetPlayerBigGuyGirlString msgbox Route104_Text_1B842C, 4 release end Route104_EventScript_14F279:: @ 814F279 - trainerbattle 4, OPPONENT_GINA_AND_MIA_1, 0, Route104_Text_1B84DB, Route104_Text_1B850D, Route104_Text_1B8577 + trainerbattle 4, TRAINER_GINA_AND_MIA_1, 0, Route104_Text_1B84DB, Route104_Text_1B850D, Route104_Text_1B8577 special GetPlayerBigGuyGirlString msgbox Route104_Text_1B853B, 4 release diff --git a/data/maps/Route104_Prototype/scripts.inc b/data/maps/Route104_Prototype/scripts.inc index e0aba01c9..1b8458e62 100644 --- a/data/maps/Route104_Prototype/scripts.inc +++ b/data/maps/Route104_Prototype/scripts.inc @@ -4,12 +4,12 @@ Route104_Prototype_MapScripts:: @ 8160C4A Route104_Prototype_EventScript_160C4B:: @ 8160C4B lock faceplayer - goto_if_trainer_not_defeated OPPONENT_BRIANNA_1, Route104_Prototype_EventScript_160C99 - goto_if_trainer_not_defeated OPPONENT_CINDY_2, Route104_Prototype_EventScript_160C99 - goto_if_trainer_not_defeated OPPONENT_AMY_AND_LIV_3, Route104_Prototype_EventScript_160C99 - goto_if_trainer_not_defeated OPPONENT_GINA_AND_MIA_2, Route104_Prototype_EventScript_160C99 - goto_if_trainer_not_defeated OPPONENT_LUCAS_2, Route104_Prototype_EventScript_160C99 - goto_if_trainer_not_defeated OPPONENT_MIKE_1, Route104_Prototype_EventScript_160C99 + goto_if_trainer_not_defeated TRAINER_BRIANNA_1, Route104_Prototype_EventScript_160C99 + goto_if_trainer_not_defeated TRAINER_CINDY_2, Route104_Prototype_EventScript_160C99 + goto_if_trainer_not_defeated TRAINER_AMY_AND_LIV_3, Route104_Prototype_EventScript_160C99 + goto_if_trainer_not_defeated TRAINER_GINA_AND_MIA_2, Route104_Prototype_EventScript_160C99 + goto_if_trainer_not_defeated TRAINER_LUCAS_2, Route104_Prototype_EventScript_160C99 + goto_if_trainer_not_defeated TRAINER_MIKE_1, Route104_Prototype_EventScript_160C99 setflag FLAG_ROUTE104_PROTOTYPE_COMPLETED_1 msgbox Route104_Prototype_Text_19B267, 4 goto_if_set FLAG_ROUTE104_PROTOTYPE_COMPLETED_2, Route104_Prototype_EventScript_160CFB @@ -24,12 +24,12 @@ Route104_Prototype_EventScript_160C99:: @ 8160C99 Route104_Prototype_EventScript_160CA3:: @ 8160CA3 lock faceplayer - goto_if_trainer_not_defeated OPPONENT_BRIANNA_1, Route104_Prototype_EventScript_160CF1 - goto_if_trainer_not_defeated OPPONENT_CINDY_2, Route104_Prototype_EventScript_160CF1 - goto_if_trainer_not_defeated OPPONENT_AMY_AND_LIV_3, Route104_Prototype_EventScript_160CF1 - goto_if_trainer_not_defeated OPPONENT_GINA_AND_MIA_2, Route104_Prototype_EventScript_160CF1 - goto_if_trainer_not_defeated OPPONENT_LUCAS_2, Route104_Prototype_EventScript_160CF1 - goto_if_trainer_not_defeated OPPONENT_MIKE_1, Route104_Prototype_EventScript_160CF1 + goto_if_trainer_not_defeated TRAINER_BRIANNA_1, Route104_Prototype_EventScript_160CF1 + goto_if_trainer_not_defeated TRAINER_CINDY_2, Route104_Prototype_EventScript_160CF1 + goto_if_trainer_not_defeated TRAINER_AMY_AND_LIV_3, Route104_Prototype_EventScript_160CF1 + goto_if_trainer_not_defeated TRAINER_GINA_AND_MIA_2, Route104_Prototype_EventScript_160CF1 + goto_if_trainer_not_defeated TRAINER_LUCAS_2, Route104_Prototype_EventScript_160CF1 + goto_if_trainer_not_defeated TRAINER_MIKE_1, Route104_Prototype_EventScript_160CF1 setflag FLAG_ROUTE104_PROTOTYPE_COMPLETED_2 msgbox Route104_Prototype_Text_19B2E9, 4 goto_if_set FLAG_ROUTE104_PROTOTYPE_COMPLETED_1, Route104_Prototype_EventScript_160CFB @@ -68,31 +68,31 @@ Route104_Prototype_EventScript_160D25:: @ 8160D25 end Route104_Prototype_EventScript_160D2E:: @ 8160D2E - trainerbattle 0, OPPONENT_CINDY_2, 0, Route104_Prototype_Text_19AD9B, Route104_Prototype_Text_19ADDA + trainerbattle 0, TRAINER_CINDY_2, 0, Route104_Prototype_Text_19AD9B, Route104_Prototype_Text_19ADDA msgbox Route104_Prototype_Text_19ADF7, 6 end Route104_Prototype_EventScript_160D45:: @ 8160D45 - trainerbattle 4, OPPONENT_AMY_AND_LIV_3, 0, Route104_Prototype_Text_19AE3E, Route104_Prototype_Text_19AE53, Route104_Prototype_Text_19AEA9 + trainerbattle 4, TRAINER_AMY_AND_LIV_3, 0, Route104_Prototype_Text_19AE3E, Route104_Prototype_Text_19AE53, Route104_Prototype_Text_19AEA9 msgbox Route104_Prototype_Text_19AE6A, 6 end Route104_Prototype_EventScript_160D60:: @ 8160D60 - trainerbattle 4, OPPONENT_GINA_AND_MIA_2, 0, Route104_Prototype_Text_19B148, Route104_Prototype_Text_19B17D, Route104_Prototype_Text_19B1DD + trainerbattle 4, TRAINER_GINA_AND_MIA_2, 0, Route104_Prototype_Text_19B148, Route104_Prototype_Text_19B17D, Route104_Prototype_Text_19B1DD msgbox Route104_Prototype_Text_19B18D, 6 end Route104_Prototype_EventScript_160D7B:: @ 8160D7B - trainerbattle 0, OPPONENT_MIKE_1, 0, Route104_Prototype_Text_19AEFB, Route104_Prototype_Text_19AF3E + trainerbattle 0, TRAINER_MIKE_1, 0, Route104_Prototype_Text_19AEFB, Route104_Prototype_Text_19AF3E msgbox Route104_Prototype_Text_19AF56, 6 end Route104_Prototype_EventScript_160D92:: @ 8160D92 - trainerbattle 0, OPPONENT_BRIANNA_1, 0, Route104_Prototype_Text_19AF8A, Route104_Prototype_Text_19AFDB + trainerbattle 0, TRAINER_BRIANNA_1, 0, Route104_Prototype_Text_19AF8A, Route104_Prototype_Text_19AFDB msgbox Route104_Prototype_Text_19B00D, 6 end Route104_Prototype_EventScript_160DA9:: @ 8160DA9 - trainerbattle 0, OPPONENT_LUCAS_2, 0, Route104_Prototype_Text_19B066, Route104_Prototype_Text_19B0D7 + trainerbattle 0, TRAINER_LUCAS_2, 0, Route104_Prototype_Text_19B066, Route104_Prototype_Text_19B0D7 msgbox Route104_Prototype_Text_19B0EF, 6 end diff --git a/data/maps/Route105/scripts.inc b/data/maps/Route105/scripts.inc index 305a2e9af..e628c4761 100644 --- a/data/maps/Route105/scripts.inc +++ b/data/maps/Route105/scripts.inc @@ -12,26 +12,26 @@ Route105_EventScript_14F2A8:: @ 814F2A8 return Route105_EventScript_14F2BB:: @ 814F2BB - trainerbattle 0, OPPONENT_FOSTER, 0, Route105_Text_1B8B40, Route105_Text_1B8B93 + trainerbattle 0, TRAINER_FOSTER, 0, Route105_Text_1B8B40, Route105_Text_1B8B93 msgbox Route105_Text_1B8BDE, 6 end Route105_EventScript_14F2D2:: @ 814F2D2 - trainerbattle 0, OPPONENT_LUIS, 0, Route105_Text_1B8C28, Route105_Text_1B8C99 + trainerbattle 0, TRAINER_LUIS, 0, Route105_Text_1B8C28, Route105_Text_1B8C99 msgbox Route105_Text_1B8CA9, 6 end Route105_EventScript_14F2E9:: @ 814F2E9 - trainerbattle 0, OPPONENT_AUSTIN, 0, Route105_Text_1B8CEE, Route105_Text_1B8D23 + trainerbattle 0, TRAINER_AUSTIN, 0, Route105_Text_1B8CEE, Route105_Text_1B8D23 msgbox Route105_Text_1B8D45, 6 end Route105_EventScript_14F300:: @ 814F300 - trainerbattle 0, OPPONENT_BEVERLY, 0, Route105_Text_1B8D99, Route105_Text_1B8DDD + trainerbattle 0, TRAINER_BEVERLY, 0, Route105_Text_1B8D99, Route105_Text_1B8DDD msgbox Route105_Text_1B8DED, 6 end Route105_EventScript_14F317:: @ 814F317 - trainerbattle 0, OPPONENT_DAWN, 0, Route105_Text_1B8E66, Route105_Text_1B8EA0 + trainerbattle 0, TRAINER_DAWN, 0, Route105_Text_1B8E66, Route105_Text_1B8EA0 msgbox Route105_Text_1B8EBD, 6 end diff --git a/data/maps/Route106/scripts.inc b/data/maps/Route106/scripts.inc index ae65c7013..16132e530 100644 --- a/data/maps/Route106/scripts.inc +++ b/data/maps/Route106/scripts.inc @@ -6,17 +6,17 @@ Route106_EventScript_14F32F:: @ 814F32F end Route106_EventScript_14F338:: @ 814F338 - trainerbattle 0, OPPONENT_DOUGLAS, 0, Route106_Text_1B913D, Route106_Text_1B917F + trainerbattle 0, TRAINER_DOUGLAS, 0, Route106_Text_1B913D, Route106_Text_1B917F msgbox Route106_Text_1B918A, 6 end Route106_EventScript_14F34F:: @ 814F34F - trainerbattle 0, OPPONENT_NICOLE, 0, Route106_Text_1B91AC, Route106_Text_1B91F8 + trainerbattle 0, TRAINER_NICOLE, 0, Route106_Text_1B91AC, Route106_Text_1B91F8 msgbox Route106_Text_1B9222, 6 end Route106_EventScript_14F366:: @ 814F366 - trainerbattle 0, OPPONENT_ELLIOT_1, 0, Route106_Text_1B8EF0, Route106_Text_1B8F25 + trainerbattle 0, TRAINER_ELLIOT_1, 0, Route106_Text_1B8EF0, Route106_Text_1B8F25 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route106_EventScript_14F38D @@ -24,11 +24,11 @@ Route106_EventScript_14F366:: @ 814F366 end Route106_EventScript_14F38D:: @ 814F38D - trainerbattle 5, OPPONENT_ELLIOT_1, 0, Route106_Text_1B8FAC, Route106_Text_1B8FF5 + trainerbattle 5, TRAINER_ELLIOT_1, 0, Route106_Text_1B8FAC, Route106_Text_1B8FF5 msgbox Route106_Text_1B9011, 6 end Route106_EventScript_14F3A4:: @ 814F3A4 - trainerbattle 0, OPPONENT_NED, 0, Route106_Text_1B9052, Route106_Text_1B90D3 + trainerbattle 0, TRAINER_NED, 0, Route106_Text_1B9052, Route106_Text_1B90D3 msgbox Route106_Text_1B910A, 6 end diff --git a/data/maps/Route107/scripts.inc b/data/maps/Route107/scripts.inc index ad2d293fc..3f8d2dc0f 100644 --- a/data/maps/Route107/scripts.inc +++ b/data/maps/Route107/scripts.inc @@ -2,12 +2,12 @@ Route107_MapScripts:: @ 814F3BB .byte 0 Route107_EventScript_14F3BC:: @ 814F3BC - trainerbattle 0, OPPONENT_DARRIN, 0, Route107_Text_1B926B, Route107_Text_1B92B7 + trainerbattle 0, TRAINER_DARRIN, 0, Route107_Text_1B926B, Route107_Text_1B92B7 msgbox Route107_Text_1B92E7, 6 end Route107_EventScript_14F3D3:: @ 814F3D3 - trainerbattle 0, OPPONENT_TONY_1, 0, Route107_Text_1B933A, Route107_Text_1B9365 + trainerbattle 0, TRAINER_TONY_1, 0, Route107_Text_1B933A, Route107_Text_1B9365 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route107_EventScript_14F3FA @@ -15,26 +15,26 @@ Route107_EventScript_14F3D3:: @ 814F3D3 end Route107_EventScript_14F3FA:: @ 814F3FA - trainerbattle 5, OPPONENT_TONY_1, 0, Route107_Text_1B93EB, Route107_Text_1B9429 + trainerbattle 5, TRAINER_TONY_1, 0, Route107_Text_1B93EB, Route107_Text_1B9429 msgbox Route107_Text_1B9477, 6 end Route107_EventScript_14F411:: @ 814F411 - trainerbattle 0, OPPONENT_DENISE, 0, Route107_Text_1B94C8, Route107_Text_1B94F2 + trainerbattle 0, TRAINER_DENISE, 0, Route107_Text_1B94C8, Route107_Text_1B94F2 msgbox Route107_Text_1B94FF, 6 end Route107_EventScript_14F428:: @ 814F428 - trainerbattle 0, OPPONENT_BETH, 0, Route107_Text_1B9538, Route107_Text_1B956B + trainerbattle 0, TRAINER_BETH, 0, Route107_Text_1B9538, Route107_Text_1B956B msgbox Route107_Text_1B9589, 6 end Route107_EventScript_14F43F:: @ 814F43F - trainerbattle 4, OPPONENT_LISA_AND_RAY, 0, Route107_Text_1B95CB, Route107_Text_1B95FB, Route107_Text_1B9672 + trainerbattle 4, TRAINER_LISA_AND_RAY, 0, Route107_Text_1B95CB, Route107_Text_1B95FB, Route107_Text_1B9672 msgbox Route107_Text_1B9630, 6 end Route107_EventScript_14F45A:: @ 814F45A - trainerbattle 4, OPPONENT_LISA_AND_RAY, 0, Route107_Text_1B96AB, Route107_Text_1B9707, Route107_Text_1B9788 + trainerbattle 4, TRAINER_LISA_AND_RAY, 0, Route107_Text_1B96AB, Route107_Text_1B9707, Route107_Text_1B9788 msgbox Route107_Text_1B9735, 6 end diff --git a/data/maps/Route108/scripts.inc b/data/maps/Route108/scripts.inc index 2e40c882d..498a52a51 100644 --- a/data/maps/Route108/scripts.inc +++ b/data/maps/Route108/scripts.inc @@ -2,21 +2,21 @@ Route108_MapScripts:: @ 814F475 .byte 0 Route108_EventScript_14F476:: @ 814F476 - trainerbattle 0, OPPONENT_JEROME, 0, Route108_Text_1B97C3, Route108_Text_1B97EF + trainerbattle 0, TRAINER_JEROME, 0, Route108_Text_1B97C3, Route108_Text_1B97EF msgbox Route108_Text_1B9823, 6 end Route108_EventScript_14F48D:: @ 814F48D - trainerbattle 0, OPPONENT_MATTHEW, 0, Route108_Text_1B9864, Route108_Text_1B989F + trainerbattle 0, TRAINER_MATTHEW, 0, Route108_Text_1B9864, Route108_Text_1B989F msgbox Route108_Text_1B98BC, 6 end Route108_EventScript_14F4A4:: @ 814F4A4 - trainerbattle 0, OPPONENT_TARA, 0, Route108_Text_1B98EC, Route108_Text_1B992C + trainerbattle 0, TRAINER_TARA, 0, Route108_Text_1B98EC, Route108_Text_1B992C msgbox Route108_Text_1B9935, 6 end Route108_EventScript_14F4BB:: @ 814F4BB - trainerbattle 0, OPPONENT_MISSY, 0, Route108_Text_1B9986, Route108_Text_1B99BB + trainerbattle 0, TRAINER_MISSY, 0, Route108_Text_1B9986, Route108_Text_1B99BB msgbox Route108_Text_1B99E9, 6 end diff --git a/data/maps/Route109/scripts.inc b/data/maps/Route109/scripts.inc index 6f24b2142..899952d1a 100644 --- a/data/maps/Route109/scripts.inc +++ b/data/maps/Route109/scripts.inc @@ -373,27 +373,27 @@ Route109_EventScript_14F7A4:: @ 814F7A4 end Route109_EventScript_14F7AD:: @ 814F7AD - trainerbattle 0, OPPONENT_DAVID, 0, Route109_Text_1B9A1C, Route109_Text_1B9A59 + trainerbattle 0, TRAINER_DAVID, 0, Route109_Text_1B9A1C, Route109_Text_1B9A59 msgbox Route109_Text_1B9A6D, 6 end Route109_EventScript_14F7C4:: @ 814F7C4 - trainerbattle 0, OPPONENT_ALICE, 0, Route109_Text_1B9AAD, Route109_Text_1B9AD9 + trainerbattle 0, TRAINER_ALICE, 0, Route109_Text_1B9AAD, Route109_Text_1B9AD9 msgbox Route109_Text_1B9AEB, 6 end Route109_EventScript_14F7DB:: @ 814F7DB - trainerbattle 0, OPPONENT_HUEY, 0, Route109_Text_1B9B11, Route109_Text_1B9B57 + trainerbattle 0, TRAINER_HUEY, 0, Route109_Text_1B9B11, Route109_Text_1B9B57 msgbox Route109_Text_1B9B68, 6 end Route109_EventScript_14F7F2:: @ 814F7F2 - trainerbattle 0, OPPONENT_EDMOND, 0, Route109_Text_1B9B91, Route109_Text_1B9BAE + trainerbattle 0, TRAINER_EDMOND, 0, Route109_Text_1B9B91, Route109_Text_1B9BAE msgbox Route109_Text_1B9BD3, 6 end Route109_EventScript_14F809:: @ 814F809 - trainerbattle 0, OPPONENT_RICKY_1, 0, Route109_Text_1B9C23, Route109_Text_1B9C65 + trainerbattle 0, TRAINER_RICKY_1, 0, Route109_Text_1B9C23, Route109_Text_1B9C65 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route109_EventScript_14F830 @@ -401,12 +401,12 @@ Route109_EventScript_14F809:: @ 814F809 end Route109_EventScript_14F830:: @ 814F830 - trainerbattle 5, OPPONENT_RICKY_1, 0, Route109_Text_1B9CB3, Route109_Text_1B9CEB + trainerbattle 5, TRAINER_RICKY_1, 0, Route109_Text_1B9CB3, Route109_Text_1B9CEB msgbox Route109_Text_1B9D10, 6 end Route109_EventScript_14F847:: @ 814F847 - trainerbattle 0, OPPONENT_LOLA_1, 0, Route109_Text_1B9D54, Route109_Text_1B9D87 + trainerbattle 0, TRAINER_LOLA_1, 0, Route109_Text_1B9D54, Route109_Text_1B9D87 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route109_EventScript_14F86E @@ -414,31 +414,31 @@ Route109_EventScript_14F847:: @ 814F847 end Route109_EventScript_14F86E:: @ 814F86E - trainerbattle 5, OPPONENT_LOLA_1, 0, Route109_Text_1B9DD8, Route109_Text_1B9E16 + trainerbattle 5, TRAINER_LOLA_1, 0, Route109_Text_1B9DD8, Route109_Text_1B9E16 msgbox Route109_Text_1B9E1D, 6 end Route109_EventScript_14F885:: @ 814F885 - trainerbattle 0, OPPONENT_CARMEN, 0, Route109_Text_1B9E60, Route109_Text_1B9EA1 + trainerbattle 0, TRAINER_CARMEN, 0, Route109_Text_1B9E60, Route109_Text_1B9EA1 msgbox Route109_Text_1B9ECA, 6 end Route109_EventScript_14F89C:: @ 814F89C - trainerbattle 0, OPPONENT_GWEN, 0, Route109_Text_1B9F07, Route109_Text_1B9F31 + trainerbattle 0, TRAINER_GWEN, 0, Route109_Text_1B9F07, Route109_Text_1B9F31 msgbox Route109_Text_1B9F44, 6 end Route109_EventScript_14F8B3:: @ 814F8B3 - trainerbattle 0, OPPONENT_CARTER, 0, Route109_Text_1B9F65, Route109_Text_1B9F9C + trainerbattle 0, TRAINER_CARTER, 0, Route109_Text_1B9F65, Route109_Text_1B9F9C msgbox Route109_Text_1B9FB7, 6 end Route109_EventScript_14F8CA:: @ 814F8CA - trainerbattle 4, OPPONENT_MEL_AND_PAUL, 0, Route109_Text_1B9FF6, Route109_Text_1BA052, Route109_Text_1BA0BF + trainerbattle 4, TRAINER_MEL_AND_PAUL, 0, Route109_Text_1B9FF6, Route109_Text_1BA052, Route109_Text_1BA0BF msgbox Route109_Text_1BA069, 6 end Route109_EventScript_14F8E5:: @ 814F8E5 - trainerbattle 4, OPPONENT_MEL_AND_PAUL, 0, Route109_Text_1BA114, Route109_Text_1BA15F, Route109_Text_1BA1D0 + trainerbattle 4, TRAINER_MEL_AND_PAUL, 0, Route109_Text_1BA114, Route109_Text_1BA15F, Route109_Text_1BA1D0 msgbox Route109_Text_1BA193, 6 end diff --git a/data/maps/Route109_SeashoreHouse/scripts.inc b/data/maps/Route109_SeashoreHouse/scripts.inc index 13d37e7bd..1506e18f9 100644 --- a/data/maps/Route109_SeashoreHouse/scripts.inc +++ b/data/maps/Route109_SeashoreHouse/scripts.inc @@ -76,24 +76,24 @@ Route109_SeashoreHouse_EventScript_160EAB:: @ 8160EAB end Route109_SeashoreHouse_EventScript_160EB8:: @ 8160EB8 - trainerbattle 2, OPPONENT_DWAYNE, 0, Route109_SeashoreHouse_Text_19B809, Route109_SeashoreHouse_Text_19B869, Route109_SeashoreHouse_EventScript_160F09 + trainerbattle 2, TRAINER_DWAYNE, 0, Route109_SeashoreHouse_Text_19B809, Route109_SeashoreHouse_Text_19B869, Route109_SeashoreHouse_EventScript_160F09 msgbox Route109_SeashoreHouse_Text_19B89F, 6 end Route109_SeashoreHouse_EventScript_160ED3:: @ 8160ED3 - trainerbattle 2, OPPONENT_JOHANNA, 0, Route109_SeashoreHouse_Text_19B8E5, Route109_SeashoreHouse_Text_19B949, Route109_SeashoreHouse_EventScript_160F09 + trainerbattle 2, TRAINER_JOHANNA, 0, Route109_SeashoreHouse_Text_19B8E5, Route109_SeashoreHouse_Text_19B949, Route109_SeashoreHouse_EventScript_160F09 msgbox Route109_SeashoreHouse_Text_19B955, 6 end Route109_SeashoreHouse_EventScript_160EEE:: @ 8160EEE - trainerbattle 2, OPPONENT_SIMON, 0, Route109_SeashoreHouse_Text_19B988, Route109_SeashoreHouse_Text_19B9C7, Route109_SeashoreHouse_EventScript_160F09 + trainerbattle 2, TRAINER_SIMON, 0, Route109_SeashoreHouse_Text_19B988, Route109_SeashoreHouse_Text_19B9C7, Route109_SeashoreHouse_EventScript_160F09 msgbox Route109_SeashoreHouse_Text_19B9E5, 6 end Route109_SeashoreHouse_EventScript_160F09:: @ 8160F09 - goto_if_trainer_not_defeated OPPONENT_DWAYNE, Route109_SeashoreHouse_EventScript_160F29 - goto_if_trainer_not_defeated OPPONENT_JOHANNA, Route109_SeashoreHouse_EventScript_160F29 - goto_if_trainer_not_defeated OPPONENT_SIMON, Route109_SeashoreHouse_EventScript_160F29 + goto_if_trainer_not_defeated TRAINER_DWAYNE, Route109_SeashoreHouse_EventScript_160F29 + goto_if_trainer_not_defeated TRAINER_JOHANNA, Route109_SeashoreHouse_EventScript_160F29 + goto_if_trainer_not_defeated TRAINER_SIMON, Route109_SeashoreHouse_EventScript_160F29 setflag FLAG_DEFEATED_SEASHORE_HOUSE_TRAINERS release end diff --git a/data/maps/Route110/scripts.inc b/data/maps/Route110/scripts.inc index 36e5cd7a2..93333ce56 100644 --- a/data/maps/Route110/scripts.inc +++ b/data/maps/Route110/scripts.inc @@ -166,17 +166,17 @@ Route110_EventScript_14FA84:: @ 814FA84 end Route110_EventScript_14FA8E:: @ 814FA8E - trainerbattle 0, OPPONENT_EDWARD, 0, Route110_Text_1BA699, Route110_Text_1BA6D2 + trainerbattle 0, TRAINER_EDWARD, 0, Route110_Text_1BA699, Route110_Text_1BA6D2 msgbox Route110_Text_1BA6F8, 6 end Route110_EventScript_14FAA5:: @ 814FAA5 - trainerbattle 0, OPPONENT_JACLYN, 0, Route110_Text_1BA72D, Route110_Text_1BA759 + trainerbattle 0, TRAINER_JACLYN, 0, Route110_Text_1BA72D, Route110_Text_1BA759 msgbox Route110_Text_1BA76C, 6 end Route110_EventScript_14FABC:: @ 814FABC - trainerbattle 0, OPPONENT_EDWIN_1, 0, Route110_Text_1BA7D2, Route110_Text_1BA803 + trainerbattle 0, TRAINER_EDWIN_1, 0, Route110_Text_1BA7D2, Route110_Text_1BA803 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route110_EventScript_14FAE3 @@ -184,27 +184,27 @@ Route110_EventScript_14FABC:: @ 814FABC end Route110_EventScript_14FAE3:: @ 814FAE3 - trainerbattle 5, OPPONENT_EDWIN_1, 0, Route110_Text_1BA877, Route110_Text_1BA8CD + trainerbattle 5, TRAINER_EDWIN_1, 0, Route110_Text_1BA877, Route110_Text_1BA8CD msgbox Route110_Text_1BA8E9, 6 end Route110_EventScript_14FAFA:: @ 814FAFA - trainerbattle 0, OPPONENT_DALE, 0, Route110_Text_1BA913, Route110_Text_1BA93C + trainerbattle 0, TRAINER_DALE, 0, Route110_Text_1BA913, Route110_Text_1BA93C msgbox Route110_Text_1BA94A, 6 end Route110_EventScript_14FB11:: @ 814FB11 - trainerbattle 0, OPPONENT_JACOB, 0, Route110_Text_1BA22C, Route110_Text_1BA264 + trainerbattle 0, TRAINER_JACOB, 0, Route110_Text_1BA22C, Route110_Text_1BA264 msgbox Route110_Text_1BA27C, 6 end Route110_EventScript_14FB28:: @ 814FB28 - trainerbattle 0, OPPONENT_ANTHONY, 0, Route110_Text_1BA2D4, Route110_Text_1BA2FC + trainerbattle 0, TRAINER_ANTHONY, 0, Route110_Text_1BA2D4, Route110_Text_1BA2FC msgbox Route110_Text_1BA30C, 6 end Route110_EventScript_14FB3F:: @ 814FB3F - trainerbattle 0, OPPONENT_BENJAMIN_1, 0, Route110_Text_1BA352, Route110_Text_1BA379 + trainerbattle 0, TRAINER_BENJAMIN_1, 0, Route110_Text_1BA352, Route110_Text_1BA379 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route110_EventScript_14FB66 @@ -212,17 +212,17 @@ Route110_EventScript_14FB3F:: @ 814FB3F end Route110_EventScript_14FB66:: @ 814FB66 - trainerbattle 5, OPPONENT_BENJAMIN_1, 0, Route110_Text_1BA3EF, Route110_Text_1BA432 + trainerbattle 5, TRAINER_BENJAMIN_1, 0, Route110_Text_1BA3EF, Route110_Text_1BA432 msgbox Route110_Text_1BA456, 6 end Route110_EventScript_14FB7D:: @ 814FB7D - trainerbattle 0, OPPONENT_JASMINE, 0, Route110_Text_1BA5FF, Route110_Text_1BA63C + trainerbattle 0, TRAINER_JASMINE, 0, Route110_Text_1BA5FF, Route110_Text_1BA63C msgbox Route110_Text_1BA65F, 6 end Route110_EventScript_14FB94:: @ 814FB94 - trainerbattle 0, OPPONENT_ABIGAIL_1, 0, Route110_Text_1BA4A0, Route110_Text_1BA50F + trainerbattle 0, TRAINER_ABIGAIL_1, 0, Route110_Text_1BA4A0, Route110_Text_1BA50F specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route110_EventScript_14FBBB @@ -230,12 +230,12 @@ Route110_EventScript_14FB94:: @ 814FB94 end Route110_EventScript_14FBBB:: @ 814FBBB - trainerbattle 5, OPPONENT_ABIGAIL_1, 0, Route110_Text_1BA573, Route110_Text_1BA5A1 + trainerbattle 5, TRAINER_ABIGAIL_1, 0, Route110_Text_1BA573, Route110_Text_1BA5A1 msgbox Route110_Text_1BA5C4, 6 end Route110_EventScript_14FBD2:: @ 814FBD2 - trainerbattle 0, OPPONENT_ISABEL_1, 0, Route110_Text_1BA990, Route110_Text_1BA9D0 + trainerbattle 0, TRAINER_ISABEL_1, 0, Route110_Text_1BA990, Route110_Text_1BA9D0 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route110_EventScript_14FBF9 @@ -243,12 +243,12 @@ Route110_EventScript_14FBD2:: @ 814FBD2 end Route110_EventScript_14FBF9:: @ 814FBF9 - trainerbattle 5, OPPONENT_ISABEL_1, 0, Route110_Text_1BAA2D, Route110_Text_1BAA76 + trainerbattle 5, TRAINER_ISABEL_1, 0, Route110_Text_1BAA2D, Route110_Text_1BAA76 msgbox Route110_Text_1BAA8F, 6 end Route110_EventScript_14FC10:: @ 814FC10 - trainerbattle 0, OPPONENT_TIMMY, 0, Route110_Text_1BAAC3, Route110_Text_1BAAF7 + trainerbattle 0, TRAINER_TIMMY, 0, Route110_Text_1BAAC3, Route110_Text_1BAAF7 msgbox Route110_Text_1BAB19, 6 end @@ -368,17 +368,17 @@ Route110_EventScript_14FDB1:: @ 814FDB1 end Route110_EventScript_14FDE0:: @ 814FDE0 - trainerbattle 3, OPPONENT_MAY_5, 0, Route110_Text_16E826 + trainerbattle 3, TRAINER_MAY_5, 0, Route110_Text_16E826 goto Route110_EventScript_14FE10 end Route110_EventScript_14FDF0:: @ 814FDF0 - trainerbattle 3, OPPONENT_MAY_8, 0, Route110_Text_16E826 + trainerbattle 3, TRAINER_MAY_8, 0, Route110_Text_16E826 goto Route110_EventScript_14FE10 end Route110_EventScript_14FE00:: @ 814FE00 - trainerbattle 3, OPPONENT_MAY_2, 0, Route110_Text_16E826 + trainerbattle 3, TRAINER_MAY_2, 0, Route110_Text_16E826 goto Route110_EventScript_14FE10 end @@ -398,17 +398,17 @@ Route110_EventScript_14FE2B:: @ 814FE2B end Route110_EventScript_14FE5A:: @ 814FE5A - trainerbattle 3, OPPONENT_BRENDAN_5, 0, Route110_Text_16EA0F + trainerbattle 3, TRAINER_BRENDAN_5, 0, Route110_Text_16EA0F goto Route110_EventScript_14FE8A end Route110_EventScript_14FE6A:: @ 814FE6A - trainerbattle 3, OPPONENT_BRENDAN_8, 0, Route110_Text_16EA0F + trainerbattle 3, TRAINER_BRENDAN_8, 0, Route110_Text_16EA0F goto Route110_EventScript_14FE8A end Route110_EventScript_14FE7A:: @ 814FE7A - trainerbattle 3, OPPONENT_BRENDAN_2, 0, Route110_Text_16EA0F + trainerbattle 3, TRAINER_BRENDAN_2, 0, Route110_Text_16EA0F goto Route110_EventScript_14FE8A end diff --git a/data/maps/Route110_TrickHousePuzzle1/scripts.inc b/data/maps/Route110_TrickHousePuzzle1/scripts.inc index df0484baf..547160a92 100644 --- a/data/maps/Route110_TrickHousePuzzle1/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle1/scripts.inc @@ -24,16 +24,16 @@ Route110_TrickHousePuzzle1_EventScript_161D26:: @ 8161D26 end Route110_TrickHousePuzzle1_EventScript_161D31:: @ 8161D31 - trainerbattle 0, OPPONENT_SALLY, 0, Route110_TrickHousePuzzle1_Text_19CB4F, Route110_TrickHousePuzzle1_Text_19CB93 + trainerbattle 0, TRAINER_SALLY, 0, Route110_TrickHousePuzzle1_Text_19CB4F, Route110_TrickHousePuzzle1_Text_19CB93 msgbox Route110_TrickHousePuzzle1_Text_19CBAB, 6 end Route110_TrickHousePuzzle1_EventScript_161D48:: @ 8161D48 - trainerbattle 0, OPPONENT_EDDIE, 0, Route110_TrickHousePuzzle1_Text_19CBD6, Route110_TrickHousePuzzle1_Text_19CC06 + trainerbattle 0, TRAINER_EDDIE, 0, Route110_TrickHousePuzzle1_Text_19CBD6, Route110_TrickHousePuzzle1_Text_19CC06 msgbox Route110_TrickHousePuzzle1_Text_19CC1B, 6 end Route110_TrickHousePuzzle1_EventScript_161D5F:: @ 8161D5F - trainerbattle 0, OPPONENT_ROBIN, 0, Route110_TrickHousePuzzle1_Text_19CC68, Route110_TrickHousePuzzle1_Text_19CC86 + trainerbattle 0, TRAINER_ROBIN, 0, Route110_TrickHousePuzzle1_Text_19CC68, Route110_TrickHousePuzzle1_Text_19CC86 msgbox Route110_TrickHousePuzzle1_Text_19CCAA, 6 end diff --git a/data/maps/Route110_TrickHousePuzzle2/scripts.inc b/data/maps/Route110_TrickHousePuzzle2/scripts.inc index cdde15d1a..b8e00f385 100644 --- a/data/maps/Route110_TrickHousePuzzle2/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle2/scripts.inc @@ -90,16 +90,16 @@ Route110_TrickHousePuzzle2_EventScript_161E65:: @ 8161E65 return Route110_TrickHousePuzzle2_EventScript_161E78:: @ 8161E78 - trainerbattle 0, OPPONENT_TED, 0, Route110_TrickHousePuzzle2_Text_19CD46, Route110_TrickHousePuzzle2_Text_19CD66 + trainerbattle 0, TRAINER_TED, 0, Route110_TrickHousePuzzle2_Text_19CD46, Route110_TrickHousePuzzle2_Text_19CD66 msgbox Route110_TrickHousePuzzle2_Text_19CD91, 6 end Route110_TrickHousePuzzle2_EventScript_161E8F:: @ 8161E8F - trainerbattle 0, OPPONENT_PAUL, 0, Route110_TrickHousePuzzle2_Text_19CDBF, Route110_TrickHousePuzzle2_Text_19CDF0 + trainerbattle 0, TRAINER_PAUL, 0, Route110_TrickHousePuzzle2_Text_19CDBF, Route110_TrickHousePuzzle2_Text_19CDF0 msgbox Route110_TrickHousePuzzle2_Text_19CE0D, 6 end Route110_TrickHousePuzzle2_EventScript_161EA6:: @ 8161EA6 - trainerbattle 0, OPPONENT_GEORGIA, 0, Route110_TrickHousePuzzle2_Text_19CE52, Route110_TrickHousePuzzle2_Text_19CE98 + trainerbattle 0, TRAINER_GEORGIA, 0, Route110_TrickHousePuzzle2_Text_19CE52, Route110_TrickHousePuzzle2_Text_19CE98 msgbox Route110_TrickHousePuzzle2_Text_19CEB8, 6 end diff --git a/data/maps/Route110_TrickHousePuzzle3/scripts.inc b/data/maps/Route110_TrickHousePuzzle3/scripts.inc index 14a021e8d..0bb582c5d 100644 --- a/data/maps/Route110_TrickHousePuzzle3/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle3/scripts.inc @@ -381,16 +381,16 @@ Route110_TrickHousePuzzle3_EventScript_1626FD:: @ 81626FD end Route110_TrickHousePuzzle3_EventScript_162708:: @ 8162708 - trainerbattle 0, OPPONENT_JUSTIN, 0, Route110_TrickHousePuzzle3_Text_19CF76, Route110_TrickHousePuzzle3_Text_19CF9D + trainerbattle 0, TRAINER_JUSTIN, 0, Route110_TrickHousePuzzle3_Text_19CF76, Route110_TrickHousePuzzle3_Text_19CF9D msgbox Route110_TrickHousePuzzle3_Text_19CFE6, 6 end Route110_TrickHousePuzzle3_EventScript_16271F:: @ 816271F - trainerbattle 0, OPPONENT_MARTHA, 0, Route110_TrickHousePuzzle3_Text_19D026, Route110_TrickHousePuzzle3_Text_19D065 + trainerbattle 0, TRAINER_MARTHA, 0, Route110_TrickHousePuzzle3_Text_19D026, Route110_TrickHousePuzzle3_Text_19D065 msgbox Route110_TrickHousePuzzle3_Text_19D07A, 6 end Route110_TrickHousePuzzle3_EventScript_162736:: @ 8162736 - trainerbattle 0, OPPONENT_ALAN, 0, Route110_TrickHousePuzzle3_Text_19D0AE, Route110_TrickHousePuzzle3_Text_19D0F0 + trainerbattle 0, TRAINER_ALAN, 0, Route110_TrickHousePuzzle3_Text_19D0AE, Route110_TrickHousePuzzle3_Text_19D0F0 msgbox Route110_TrickHousePuzzle3_Text_19D110, 6 end diff --git a/data/maps/Route110_TrickHousePuzzle4/scripts.inc b/data/maps/Route110_TrickHousePuzzle4/scripts.inc index 3808f1f2d..606697070 100644 --- a/data/maps/Route110_TrickHousePuzzle4/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle4/scripts.inc @@ -14,16 +14,16 @@ Route110_TrickHousePuzzle4_EventScript_162760:: @ 8162760 end Route110_TrickHousePuzzle4_EventScript_16276B:: @ 816276B - trainerbattle 0, OPPONENT_CORA, 0, Route110_TrickHousePuzzle4_Text_19D1DE, Route110_TrickHousePuzzle4_Text_19D21F + trainerbattle 0, TRAINER_CORA, 0, Route110_TrickHousePuzzle4_Text_19D1DE, Route110_TrickHousePuzzle4_Text_19D21F msgbox Route110_TrickHousePuzzle4_Text_19D253, 6 end Route110_TrickHousePuzzle4_EventScript_162782:: @ 8162782 - trainerbattle 0, OPPONENT_YUJI, 0, Route110_TrickHousePuzzle4_Text_19D295, Route110_TrickHousePuzzle4_Text_19D2D1 + trainerbattle 0, TRAINER_YUJI, 0, Route110_TrickHousePuzzle4_Text_19D295, Route110_TrickHousePuzzle4_Text_19D2D1 msgbox Route110_TrickHousePuzzle4_Text_19D306, 6 end Route110_TrickHousePuzzle4_EventScript_162799:: @ 8162799 - trainerbattle 0, OPPONENT_JILL, 0, Route110_TrickHousePuzzle4_Text_19D351, Route110_TrickHousePuzzle4_Text_19D380 + trainerbattle 0, TRAINER_JILL, 0, Route110_TrickHousePuzzle4_Text_19D351, Route110_TrickHousePuzzle4_Text_19D380 msgbox Route110_TrickHousePuzzle4_Text_19D386, 6 end diff --git a/data/maps/Route110_TrickHousePuzzle6/scripts.inc b/data/maps/Route110_TrickHousePuzzle6/scripts.inc index 971d2a275..3378dc50b 100644 --- a/data/maps/Route110_TrickHousePuzzle6/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle6/scripts.inc @@ -28,16 +28,16 @@ Route110_TrickHousePuzzle6_EventScript_1630FC:: @ 81630FC end Route110_TrickHousePuzzle6_EventScript_163107:: @ 8163107 - trainerbattle 0, OPPONENT_SOPHIA, 0, Route110_TrickHousePuzzle6_Text_19DC87, Route110_TrickHousePuzzle6_Text_19DCC6 + trainerbattle 0, TRAINER_SOPHIA, 0, Route110_TrickHousePuzzle6_Text_19DC87, Route110_TrickHousePuzzle6_Text_19DCC6 msgbox Route110_TrickHousePuzzle6_Text_19DCE7, 6 end Route110_TrickHousePuzzle6_EventScript_16311E:: @ 816311E - trainerbattle 0, OPPONENT_BENNY, 0, Route110_TrickHousePuzzle6_Text_19DD49, Route110_TrickHousePuzzle6_Text_19DD83 + trainerbattle 0, TRAINER_BENNY, 0, Route110_TrickHousePuzzle6_Text_19DD49, Route110_TrickHousePuzzle6_Text_19DD83 msgbox Route110_TrickHousePuzzle6_Text_19DD96, 6 end Route110_TrickHousePuzzle6_EventScript_163135:: @ 8163135 - trainerbattle 0, OPPONENT_SEBASTIAN, 0, Route110_TrickHousePuzzle6_Text_19DDCF, Route110_TrickHousePuzzle6_Text_19DDFE + trainerbattle 0, TRAINER_SEBASTIAN, 0, Route110_TrickHousePuzzle6_Text_19DDCF, Route110_TrickHousePuzzle6_Text_19DDFE msgbox Route110_TrickHousePuzzle6_Text_19DE44, 6 end diff --git a/data/maps/Route110_TrickHousePuzzle7/scripts.inc b/data/maps/Route110_TrickHousePuzzle7/scripts.inc index 1ee608166..43bce5ceb 100644 --- a/data/maps/Route110_TrickHousePuzzle7/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle7/scripts.inc @@ -219,16 +219,16 @@ Route110_TrickHousePuzzle7_EventScript_1633D1:: @ 81633D1 end Route110_TrickHousePuzzle7_EventScript_1633D6:: @ 81633D6 - trainerbattle 0, OPPONENT_JOSHUA, 0, Route110_TrickHousePuzzle7_Text_19DF0B, Route110_TrickHousePuzzle7_Text_19DF4B + trainerbattle 0, TRAINER_JOSHUA, 0, Route110_TrickHousePuzzle7_Text_19DF0B, Route110_TrickHousePuzzle7_Text_19DF4B msgbox Route110_TrickHousePuzzle7_Text_19DF7E, 6 end Route110_TrickHousePuzzle7_EventScript_1633ED:: @ 81633ED - trainerbattle 0, OPPONENT_PATRICIA, 0, Route110_TrickHousePuzzle7_Text_19DFBB, Route110_TrickHousePuzzle7_Text_19DFF2 + trainerbattle 0, TRAINER_PATRICIA, 0, Route110_TrickHousePuzzle7_Text_19DFBB, Route110_TrickHousePuzzle7_Text_19DFF2 msgbox Route110_TrickHousePuzzle7_Text_19E00F, 6 end Route110_TrickHousePuzzle7_EventScript_163404:: @ 8163404 - trainerbattle 0, OPPONENT_ALEXIS, 0, Route110_TrickHousePuzzle7_Text_19E054, Route110_TrickHousePuzzle7_Text_19E098 + trainerbattle 0, TRAINER_ALEXIS, 0, Route110_TrickHousePuzzle7_Text_19E054, Route110_TrickHousePuzzle7_Text_19E098 msgbox Route110_TrickHousePuzzle7_Text_19E0B2, 6 end diff --git a/data/maps/Route110_TrickHousePuzzle8/scripts.inc b/data/maps/Route110_TrickHousePuzzle8/scripts.inc index 2c55aae4c..182f3d68a 100644 --- a/data/maps/Route110_TrickHousePuzzle8/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle8/scripts.inc @@ -14,16 +14,16 @@ Route110_TrickHousePuzzle8_EventScript_16342E:: @ 816342E end Route110_TrickHousePuzzle8_EventScript_163439:: @ 8163439 - trainerbattle 0, OPPONENT_VINCENT, 0, Route110_TrickHousePuzzle8_Text_19E178, Route110_TrickHousePuzzle8_Text_19E1A1 + trainerbattle 0, TRAINER_VINCENT, 0, Route110_TrickHousePuzzle8_Text_19E178, Route110_TrickHousePuzzle8_Text_19E1A1 msgbox Route110_TrickHousePuzzle8_Text_19E1C5, 6 end Route110_TrickHousePuzzle8_EventScript_163450:: @ 8163450 - trainerbattle 0, OPPONENT_ELAINE, 0, Route110_TrickHousePuzzle8_Text_19E201, Route110_TrickHousePuzzle8_Text_19E22C + trainerbattle 0, TRAINER_ELAINE, 0, Route110_TrickHousePuzzle8_Text_19E201, Route110_TrickHousePuzzle8_Text_19E22C msgbox Route110_TrickHousePuzzle8_Text_19E24C, 6 end Route110_TrickHousePuzzle8_EventScript_163467:: @ 8163467 - trainerbattle 0, OPPONENT_LEROY, 0, Route110_TrickHousePuzzle8_Text_19E284, Route110_TrickHousePuzzle8_Text_19E2C1 + trainerbattle 0, TRAINER_LEROY, 0, Route110_TrickHousePuzzle8_Text_19E284, Route110_TrickHousePuzzle8_Text_19E2C1 msgbox Route110_TrickHousePuzzle8_Text_19E2EE, 6 end diff --git a/data/maps/Route111/scripts.inc b/data/maps/Route111/scripts.inc index e554de5f4..9aa8894f4 100644 --- a/data/maps/Route111/scripts.inc +++ b/data/maps/Route111/scripts.inc @@ -15,7 +15,7 @@ Route111_EventScript_14FFA6:: @ 814FFA6 Route111_MapScript1_14FFB9:: @ 814FFB9 call Route111_EventScript_14FFCD call Route111_EventScript_1AE313 - goto_if_trainer_not_defeated OPPONENT_VICKY, Route111_EventScript_15000D + goto_if_trainer_not_defeated TRAINER_VICKY, Route111_EventScript_15000D end Route111_EventScript_14FFCD:: @ 814FFCD @@ -42,9 +42,9 @@ Route111_EventScript_15000D:: @ 815000D setflag FLAG_HIDE_VICTORIA_WINSTRATE setflag FLAG_HIDE_VIVI_WINSTRATE setflag FLAG_HIDE_VICKI_WINSTRATE - cleartrainerflag OPPONENT_VICTOR - cleartrainerflag OPPONENT_VICTORIA - cleartrainerflag OPPONENT_VIVI + cleartrainerflag TRAINER_VICTOR + cleartrainerflag TRAINER_VICTORIA + cleartrainerflag TRAINER_VIVI end Route111_EventScript_150023:: @ 8150023 @@ -243,7 +243,7 @@ Route111_EventScript_1501D1:: @ 81501D1 Route111_EventScript_1501F3:: @ 81501F3 msgbox Route111_Text_16F7B3, 4 - trainerbattle 3, OPPONENT_VICTOR, 0, Route111_Text_16F7D2 + trainerbattle 3, TRAINER_VICTOR, 0, Route111_Text_16F7D2 applymovement 1, Route111_Movement_1A0841 waitmovement 0 call Route111_EventScript_150348 @@ -261,7 +261,7 @@ Route111_EventScript_1501F3:: @ 81501F3 waitmovement 0 call Route111_EventScript_15034F msgbox Route111_Text_16F82D, 4 - trainerbattle 3, OPPONENT_VICTORIA, 0, Route111_Text_16F8A6 + trainerbattle 3, TRAINER_VICTORIA, 0, Route111_Text_16F8A6 applymovement 2, Route111_Movement_1A0841 waitmovement 0 call Route111_EventScript_150348 @@ -279,7 +279,7 @@ Route111_EventScript_1501F3:: @ 81501F3 waitmovement 0 call Route111_EventScript_15034F msgbox Route111_Text_16F90E, 4 - trainerbattle 3, OPPONENT_VIVI, 0, Route111_Text_16F956 + trainerbattle 3, TRAINER_VIVI, 0, Route111_Text_16F956 applymovement 3, Route111_Movement_1A0841 waitmovement 0 call Route111_EventScript_150348 @@ -297,7 +297,7 @@ Route111_EventScript_1501F3:: @ 81501F3 waitmovement 0 call Route111_EventScript_15034F msgbox Route111_Text_16F991, 4 - trainerbattle 3, OPPONENT_VICKY, 0, Route111_Text_16F9EC + trainerbattle 3, TRAINER_VICKY, 0, Route111_Text_16F9EC msgbox Route111_Text_16FA22, 4 closemessage applymovement 4, Route111_Movement_1A0841 @@ -368,27 +368,27 @@ Route111_EventScript_15039E:: @ 815039E end Route111_EventScript_1503A7:: @ 81503A7 - trainerbattle 0, OPPONENT_DREW, 0, Route111_Text_1BAB4B, Route111_Text_1BABC7 + trainerbattle 0, TRAINER_DREW, 0, Route111_Text_1BAB4B, Route111_Text_1BABC7 msgbox Route111_Text_1BAC10, 6 end Route111_EventScript_1503BE:: @ 81503BE - trainerbattle 0, OPPONENT_HEIDI, 0, Route111_Text_1BAC60, Route111_Text_1BACC5 + trainerbattle 0, TRAINER_HEIDI, 0, Route111_Text_1BAC60, Route111_Text_1BACC5 msgbox Route111_Text_1BACD8, 6 end Route111_EventScript_1503D5:: @ 81503D5 - trainerbattle 0, OPPONENT_CLIFF, 0, Route111_Text_1BAD4B, Route111_Text_1BADA3 + trainerbattle 0, TRAINER_CLIFF, 0, Route111_Text_1BAD4B, Route111_Text_1BADA3 msgbox Route111_Text_1BADC2, 6 end Route111_EventScript_1503EC:: @ 81503EC - trainerbattle 0, OPPONENT_BECKY, 0, Route111_Text_1BAE24, Route111_Text_1BAE6E + trainerbattle 0, TRAINER_BECKY, 0, Route111_Text_1BAE24, Route111_Text_1BAE6E msgbox Route111_Text_1BAE81, 6 end Route111_EventScript_150403:: @ 8150403 - trainerbattle 0, OPPONENT_DUSTY_1, 0, Route111_Text_1BAEC9, Route111_Text_1BAF14 + trainerbattle 0, TRAINER_DUSTY_1, 0, Route111_Text_1BAEC9, Route111_Text_1BAF14 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route111_EventScript_15042A @@ -396,27 +396,27 @@ Route111_EventScript_150403:: @ 8150403 end Route111_EventScript_15042A:: @ 815042A - trainerbattle 5, OPPONENT_DUSTY_1, 0, Route111_Text_1BAFC1, Route111_Text_1BB034 + trainerbattle 5, TRAINER_DUSTY_1, 0, Route111_Text_1BAFC1, Route111_Text_1BB034 msgbox Route111_Text_1BB070, 6 end Route111_EventScript_150441:: @ 8150441 - trainerbattle 0, OPPONENT_TRAVIS, 0, Route111_Text_1BB111, Route111_Text_1BB140 + trainerbattle 0, TRAINER_TRAVIS, 0, Route111_Text_1BB111, Route111_Text_1BB140 msgbox Route111_Text_1BB15B, 6 end Route111_EventScript_150458:: @ 8150458 - trainerbattle 0, OPPONENT_IRENE, 0, Route111_Text_1BB199, Route111_Text_1BB1D8 + trainerbattle 0, TRAINER_IRENE, 0, Route111_Text_1BB199, Route111_Text_1BB1D8 msgbox Route111_Text_1BB1F6, 6 end Route111_EventScript_15046F:: @ 815046F - trainerbattle 0, OPPONENT_DAISUKE, 0, Route111_Text_1BB250, Route111_Text_1BB27E + trainerbattle 0, TRAINER_DAISUKE, 0, Route111_Text_1BB250, Route111_Text_1BB27E msgbox Route111_Text_1BB290, 6 end Route111_EventScript_150486:: @ 8150486 - trainerbattle 0, OPPONENT_WILTON_1, 0, Route111_Text_1BB2E3, Route111_Text_1BB313 + trainerbattle 0, TRAINER_WILTON_1, 0, Route111_Text_1BB2E3, Route111_Text_1BB313 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route111_EventScript_1504AD @@ -424,12 +424,12 @@ Route111_EventScript_150486:: @ 8150486 end Route111_EventScript_1504AD:: @ 81504AD - trainerbattle 5, OPPONENT_WILTON_1, 0, Route111_Text_1BB3A7, Route111_Text_1BB3FA + trainerbattle 5, TRAINER_WILTON_1, 0, Route111_Text_1BB3A7, Route111_Text_1BB3FA msgbox Route111_Text_1BB40E, 6 end Route111_EventScript_1504C4:: @ 81504C4 - trainerbattle 0, OPPONENT_BROOKE_1, 0, Route111_Text_1BB44F, Route111_Text_1BB49F + trainerbattle 0, TRAINER_BROOKE_1, 0, Route111_Text_1BB44F, Route111_Text_1BB49F specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route111_EventScript_1504EB @@ -437,6 +437,6 @@ Route111_EventScript_1504C4:: @ 81504C4 end Route111_EventScript_1504EB:: @ 81504EB - trainerbattle 5, OPPONENT_BROOKE_1, 0, Route111_Text_1BB529, Route111_Text_1BB5A2 + trainerbattle 5, TRAINER_BROOKE_1, 0, Route111_Text_1BB529, Route111_Text_1BB5A2 msgbox Route111_Text_1BB5C1, 6 end diff --git a/data/maps/Route112/scripts.inc b/data/maps/Route112/scripts.inc index 83d93f222..8e3f73fc0 100644 --- a/data/maps/Route112/scripts.inc +++ b/data/maps/Route112/scripts.inc @@ -32,12 +32,12 @@ Route112_EventScript_150540:: @ 8150540 end Route112_EventScript_150549:: @ 8150549 - trainerbattle 0, OPPONENT_BRICE, 0, Route112_Text_1BB619, Route112_Text_1BB655 + trainerbattle 0, TRAINER_BRICE, 0, Route112_Text_1BB619, Route112_Text_1BB655 msgbox Route112_Text_1BB667, 6 end Route112_EventScript_150560:: @ 8150560 - trainerbattle 0, OPPONENT_TRENT_1, 0, Route112_Text_1BB6A0, Route112_Text_1BB707 + trainerbattle 0, TRAINER_TRENT_1, 0, Route112_Text_1BB6A0, Route112_Text_1BB707 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route112_EventScript_150587 @@ -45,16 +45,16 @@ Route112_EventScript_150560:: @ 8150560 end Route112_EventScript_150587:: @ 8150587 - trainerbattle 5, OPPONENT_TRENT_1, 0, Route112_Text_1BB7C7, Route112_Text_1BB801 + trainerbattle 5, TRAINER_TRENT_1, 0, Route112_Text_1BB7C7, Route112_Text_1BB801 msgbox Route112_Text_1BB819, 6 end Route112_EventScript_15059E:: @ 815059E - trainerbattle 0, OPPONENT_LARRY, 0, Route112_Text_1BB893, Route112_Text_1BB8B6 + trainerbattle 0, TRAINER_LARRY, 0, Route112_Text_1BB893, Route112_Text_1BB8B6 msgbox Route112_Text_1BB8BE, 6 end Route112_EventScript_1505B5:: @ 81505B5 - trainerbattle 0, OPPONENT_CAROL, 0, Route112_Text_1BB8F0, Route112_Text_1BB942 + trainerbattle 0, TRAINER_CAROL, 0, Route112_Text_1BB8F0, Route112_Text_1BB942 msgbox Route112_Text_1BB958, 6 end diff --git a/data/maps/Route113/scripts.inc b/data/maps/Route113/scripts.inc index 41b289db0..5b44f2442 100644 --- a/data/maps/Route113/scripts.inc +++ b/data/maps/Route113/scripts.inc @@ -49,17 +49,17 @@ Route113_EventScript_150632:: @ 8150632 end Route113_EventScript_15063B:: @ 815063B - trainerbattle 0, OPPONENT_NEAL, 0, Route113_Text_1BB9BA, Route113_Text_1BB9E6 + trainerbattle 0, TRAINER_NEAL, 0, Route113_Text_1BB9BA, Route113_Text_1BB9E6 msgbox Route113_Text_1BB9FB, 6 end Route113_EventScript_150652:: @ 8150652 - trainerbattle 0, OPPONENT_DILLON, 0, Route113_Text_1BBA62, Route113_Text_1BBA9B + trainerbattle 0, TRAINER_DILLON, 0, Route113_Text_1BBA62, Route113_Text_1BBA9B msgbox Route113_Text_1BBAB7, 6 end Route113_EventScript_150669:: @ 8150669 - trainerbattle 0, OPPONENT_MADELINE_1, 0, Route113_Text_1BBB27, Route113_Text_1BBB7A + trainerbattle 0, TRAINER_MADELINE_1, 0, Route113_Text_1BBB27, Route113_Text_1BBB7A specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route113_EventScript_150690 @@ -67,12 +67,12 @@ Route113_EventScript_150669:: @ 8150669 end Route113_EventScript_150690:: @ 8150690 - trainerbattle 5, OPPONENT_MADELINE_1, 0, Route113_Text_1BBBCE, Route113_Text_1BBC0D + trainerbattle 5, TRAINER_MADELINE_1, 0, Route113_Text_1BBBCE, Route113_Text_1BBC0D msgbox Route113_Text_1BBC1C, 6 end Route113_EventScript_1506A7:: @ 81506A7 - trainerbattle 0, OPPONENT_LAO_1, 0, Route113_Text_1BBC59, Route113_Text_1BBC90 + trainerbattle 0, TRAINER_LAO_1, 0, Route113_Text_1BBC59, Route113_Text_1BBC90 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route113_EventScript_1506CE @@ -80,21 +80,21 @@ Route113_EventScript_1506A7:: @ 81506A7 end Route113_EventScript_1506CE:: @ 81506CE - trainerbattle 5, OPPONENT_LAO_1, 0, Route113_Text_1BBCE6, Route113_Text_1BBD1D + trainerbattle 5, TRAINER_LAO_1, 0, Route113_Text_1BBCE6, Route113_Text_1BBD1D msgbox Route113_Text_1BBD38, 6 end Route113_EventScript_1506E5:: @ 81506E5 - trainerbattle 0, OPPONENT_LUNG, 0, Route113_Text_1BBD92, Route113_Text_1BBDC6 + trainerbattle 0, TRAINER_LUNG, 0, Route113_Text_1BBD92, Route113_Text_1BBDC6 msgbox Route113_Text_1BBE1D, 6 end Route113_EventScript_1506FC:: @ 81506FC - trainerbattle 4, OPPONENT_TORI_AND_TIA, 0, Route113_Text_1BBE65, Route113_Text_1BBEA1, Route113_Text_1BBF25 + trainerbattle 4, TRAINER_TORI_AND_TIA, 0, Route113_Text_1BBE65, Route113_Text_1BBEA1, Route113_Text_1BBF25 msgbox Route113_Text_1BBEE4, 6 end Route113_EventScript_150717:: @ 8150717 - trainerbattle 4, OPPONENT_TORI_AND_TIA, 0, Route113_Text_1BBF62, Route113_Text_1BBF9D, Route113_Text_1BC021 + trainerbattle 4, TRAINER_TORI_AND_TIA, 0, Route113_Text_1BBF62, Route113_Text_1BBF9D, Route113_Text_1BC021 msgbox Route113_Text_1BBFE2, 6 end diff --git a/data/maps/Route114/scripts.inc b/data/maps/Route114/scripts.inc index 54a4ee59a..dd5ec1695 100644 --- a/data/maps/Route114/scripts.inc +++ b/data/maps/Route114/scripts.inc @@ -64,27 +64,27 @@ Route114_EventScript_1507E8:: @ 81507E8 end Route114_EventScript_1507F1:: @ 81507F1 - trainerbattle 0, OPPONENT_LENNY, 0, Route114_Text_1BC05B, Route114_Text_1BC0B5 + trainerbattle 0, TRAINER_LENNY, 0, Route114_Text_1BC05B, Route114_Text_1BC0B5 msgbox Route114_Text_1BC0C3, 6 end Route114_EventScript_150808:: @ 8150808 - trainerbattle 0, OPPONENT_LUCAS_1, 0, Route114_Text_1BC125, Route114_Text_1BC163 + trainerbattle 0, TRAINER_LUCAS_1, 0, Route114_Text_1BC125, Route114_Text_1BC163 msgbox Route114_Text_1BC184, 6 end Route114_EventScript_15081F:: @ 815081F - trainerbattle 0, OPPONENT_SHANE, 0, Route114_Text_1BC1C8, Route114_Text_1BC23F + trainerbattle 0, TRAINER_SHANE, 0, Route114_Text_1BC1C8, Route114_Text_1BC23F msgbox Route114_Text_1BC24F, 6 end Route114_EventScript_150836:: @ 8150836 - trainerbattle 0, OPPONENT_NANCY, 0, Route114_Text_1BC289, Route114_Text_1BC2BE + trainerbattle 0, TRAINER_NANCY, 0, Route114_Text_1BC289, Route114_Text_1BC2BE msgbox Route114_Text_1BC2C6, 6 end Route114_EventScript_15084D:: @ 815084D - trainerbattle 0, OPPONENT_STEVE_1, 0, Route114_Text_1BC2F5, Route114_Text_1BC327 + trainerbattle 0, TRAINER_STEVE_1, 0, Route114_Text_1BC2F5, Route114_Text_1BC327 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route114_EventScript_150874 @@ -92,12 +92,12 @@ Route114_EventScript_15084D:: @ 815084D end Route114_EventScript_150874:: @ 8150874 - trainerbattle 5, OPPONENT_STEVE_1, 0, Route114_Text_1BC3B3, Route114_Text_1BC3E0 + trainerbattle 5, TRAINER_STEVE_1, 0, Route114_Text_1BC3B3, Route114_Text_1BC3E0 msgbox Route114_Text_1BC40F, 6 end Route114_EventScript_15088B:: @ 815088B - trainerbattle 0, OPPONENT_BERNIE_1, 0, Route114_Text_1BC45A, Route114_Text_1BC499 + trainerbattle 0, TRAINER_BERNIE_1, 0, Route114_Text_1BC45A, Route114_Text_1BC499 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route114_EventScript_1508B2 @@ -105,26 +105,26 @@ Route114_EventScript_15088B:: @ 815088B end Route114_EventScript_1508B2:: @ 81508B2 - trainerbattle 5, OPPONENT_BERNIE_1, 0, Route114_Text_1BC525, Route114_Text_1BC559 + trainerbattle 5, TRAINER_BERNIE_1, 0, Route114_Text_1BC525, Route114_Text_1BC559 msgbox Route114_Text_1BC58C, 6 end Route114_EventScript_1508C9:: @ 81508C9 - trainerbattle 0, OPPONENT_CLAUDE, 0, Route114_Text_1BC5FC, Route114_Text_1BC653 + trainerbattle 0, TRAINER_CLAUDE, 0, Route114_Text_1BC5FC, Route114_Text_1BC653 msgbox Route114_Text_1BC679, 6 end Route114_EventScript_1508E0:: @ 81508E0 - trainerbattle 0, OPPONENT_NOLAN, 0, Route114_Text_1BC6EC, Route114_Text_1BC750 + trainerbattle 0, TRAINER_NOLAN, 0, Route114_Text_1BC6EC, Route114_Text_1BC750 msgbox Route114_Text_1BC78A, 6 end Route114_EventScript_1508F7:: @ 81508F7 - trainerbattle 4, OPPONENT_TYRA_AND_IVY, 0, Route114_Text_1BC7E3, Route114_Text_1BC834, Route114_Text_1BC88A + trainerbattle 4, TRAINER_TYRA_AND_IVY, 0, Route114_Text_1BC7E3, Route114_Text_1BC834, Route114_Text_1BC88A msgbox Route114_Text_1BC858, 6 end Route114_EventScript_150912:: @ 8150912 - trainerbattle 4, OPPONENT_TYRA_AND_IVY, 0, Route114_Text_1BC8D8, Route114_Text_1BC8FB, Route114_Text_1BC96A + trainerbattle 4, TRAINER_TYRA_AND_IVY, 0, Route114_Text_1BC8D8, Route114_Text_1BC8FB, Route114_Text_1BC96A msgbox Route114_Text_1BC91E, 6 end diff --git a/data/maps/Route115/scripts.inc b/data/maps/Route115/scripts.inc index f16c2088a..9cb3652f1 100644 --- a/data/maps/Route115/scripts.inc +++ b/data/maps/Route115/scripts.inc @@ -14,7 +14,7 @@ Route115_EventScript_150940:: @ 8150940 end Route115_EventScript_150949:: @ 8150949 - trainerbattle 0, OPPONENT_TIMOTHY_1, 0, Route115_Text_1BC9AC, Route115_Text_1BC9E6 + trainerbattle 0, TRAINER_TIMOTHY_1, 0, Route115_Text_1BC9AC, Route115_Text_1BC9E6 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route115_EventScript_150970 @@ -22,17 +22,17 @@ Route115_EventScript_150949:: @ 8150949 end Route115_EventScript_150970:: @ 8150970 - trainerbattle 5, OPPONENT_TIMOTHY_1, 0, Route115_Text_1BCA6B, Route115_Text_1BCAB3 + trainerbattle 5, TRAINER_TIMOTHY_1, 0, Route115_Text_1BCA6B, Route115_Text_1BCAB3 msgbox Route115_Text_1BCAC6, 6 end Route115_EventScript_150987:: @ 8150987 - trainerbattle 0, OPPONENT_KOICHI, 0, Route115_Text_1BCB0D, Route115_Text_1BCB2E + trainerbattle 0, TRAINER_KOICHI, 0, Route115_Text_1BCB0D, Route115_Text_1BCB2E msgbox Route115_Text_1BCB40, 6 end Route115_EventScript_15099E:: @ 815099E - trainerbattle 0, OPPONENT_NOB_1, 0, Route115_Text_1BCB8A, Route115_Text_1BCBC1 + trainerbattle 0, TRAINER_NOB_1, 0, Route115_Text_1BCB8A, Route115_Text_1BCBC1 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route115_EventScript_1509C5 @@ -40,12 +40,12 @@ Route115_EventScript_15099E:: @ 815099E end Route115_EventScript_1509C5:: @ 81509C5 - trainerbattle 5, OPPONENT_NOB_1, 0, Route115_Text_1BCC4C, Route115_Text_1BCCA2 + trainerbattle 5, TRAINER_NOB_1, 0, Route115_Text_1BCC4C, Route115_Text_1BCCA2 msgbox Route115_Text_1BCCBA, 6 end Route115_EventScript_1509DC:: @ 81509DC - trainerbattle 0, OPPONENT_CYNDY_1, 0, Route115_Text_1BCCF4, Route115_Text_1BCD32 + trainerbattle 0, TRAINER_CYNDY_1, 0, Route115_Text_1BCCF4, Route115_Text_1BCD32 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route115_EventScript_150A03 @@ -53,16 +53,16 @@ Route115_EventScript_1509DC:: @ 81509DC end Route115_EventScript_150A03:: @ 8150A03 - trainerbattle 5, OPPONENT_CYNDY_1, 0, Route115_Text_1BCDB0, Route115_Text_1BCDD0 + trainerbattle 5, TRAINER_CYNDY_1, 0, Route115_Text_1BCDB0, Route115_Text_1BCDD0 msgbox Route115_Text_1BCDEF, 6 end Route115_EventScript_150A1A:: @ 8150A1A .ifdef SAPPHIRE - trainerbattle 0, OPPONENT_514, 0, UnknownString_81BCE47, UnknownString_81BCE7D + trainerbattle 0, TRAINER_514, 0, UnknownString_81BCE47, UnknownString_81BCE7D msgbox UnknownString_81BCEA4, 6 .else - trainerbattle 0, OPPONENT_514, 0, Route115_Text_1BCEE0, Route115_Text_1BCF16 + trainerbattle 0, TRAINER_514, 0, Route115_Text_1BCEE0, Route115_Text_1BCF16 msgbox Route115_Text_1BCF3D, 6 .endc end diff --git a/data/maps/Route116/scripts.inc b/data/maps/Route116/scripts.inc index 77fbf57a4..284ce3363 100644 --- a/data/maps/Route116/scripts.inc +++ b/data/maps/Route116/scripts.inc @@ -225,17 +225,17 @@ Route116_Movement_150C57:: @ 8150C57 end_movement Route116_EventScript_150C62:: @ 8150C62 - trainerbattle 0, OPPONENT_JOEY, 0, Route116_Text_1BD02B, Route116_Text_1BD04C + trainerbattle 0, TRAINER_JOEY, 0, Route116_Text_1BD02B, Route116_Text_1BD04C msgbox Route116_Text_1BD078, 6 end Route116_EventScript_150C79:: @ 8150C79 - trainerbattle 0, OPPONENT_JOSE, 0, Route116_Text_1BD0AF, Route116_Text_1BD0D7 + trainerbattle 0, TRAINER_JOSE, 0, Route116_Text_1BD0AF, Route116_Text_1BD0D7 msgbox Route116_Text_1BD0F4, 6 end Route116_EventScript_150C90:: @ 8150C90 - trainerbattle 0, OPPONENT_JERRY_1, 0, Route116_Text_1BD1C0, Route116_Text_1BD21A + trainerbattle 0, TRAINER_JERRY_1, 0, Route116_Text_1BD1C0, Route116_Text_1BD21A specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route116_EventScript_150CB7 @@ -243,22 +243,22 @@ Route116_EventScript_150C90:: @ 8150C90 end Route116_EventScript_150CB7:: @ 8150CB7 - trainerbattle 5, OPPONENT_JERRY_1, 0, Route116_Text_1BD2A5, Route116_Text_1BD2FE + trainerbattle 5, TRAINER_JERRY_1, 0, Route116_Text_1BD2A5, Route116_Text_1BD2FE msgbox Route116_Text_1BD31A, 6 end Route116_EventScript_150CCE:: @ 8150CCE - trainerbattle 0, OPPONENT_CLARK, 0, Route116_Text_1BCF79, Route116_Text_1BCFBB + trainerbattle 0, TRAINER_CLARK, 0, Route116_Text_1BCF79, Route116_Text_1BCFBB msgbox Route116_Text_1BCFE3, 6 end Route116_EventScript_150CE5:: @ 8150CE5 - trainerbattle 0, OPPONENT_JANICE, 0, Route116_Text_1BD131, Route116_Text_1BD165 + trainerbattle 0, TRAINER_JANICE, 0, Route116_Text_1BD131, Route116_Text_1BD165 msgbox Route116_Text_1BD180, 6 end Route116_EventScript_150CFC:: @ 8150CFC - trainerbattle 0, OPPONENT_KAREN_1, 0, Route116_Text_1BD377, Route116_Text_1BD3AC + trainerbattle 0, TRAINER_KAREN_1, 0, Route116_Text_1BD377, Route116_Text_1BD3AC specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route116_EventScript_150D23 @@ -266,6 +266,6 @@ Route116_EventScript_150CFC:: @ 8150CFC end Route116_EventScript_150D23:: @ 8150D23 - trainerbattle 5, OPPONENT_KAREN_1, 0, Route116_Text_1BD405, Route116_Text_1BD44A + trainerbattle 5, TRAINER_KAREN_1, 0, Route116_Text_1BD405, Route116_Text_1BD44A msgbox Route116_Text_1BD466, 6 end diff --git a/data/maps/Route117/scripts.inc b/data/maps/Route117/scripts.inc index 9f42412ab..3c5bc8a66 100644 --- a/data/maps/Route117/scripts.inc +++ b/data/maps/Route117/scripts.inc @@ -38,7 +38,7 @@ Route117_EventScript_150D84:: @ 8150D84 end Route117_EventScript_150D8D:: @ 8150D8D - trainerbattle 0, OPPONENT_ISAAC_1, 0, Route117_Text_1BD49E, Route117_Text_1BD4D9 + trainerbattle 0, TRAINER_ISAAC_1, 0, Route117_Text_1BD49E, Route117_Text_1BD4D9 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route117_EventScript_150DB4 @@ -46,12 +46,12 @@ Route117_EventScript_150D8D:: @ 8150D8D end Route117_EventScript_150DB4:: @ 8150DB4 - trainerbattle 5, OPPONENT_ISAAC_1, 0, Route117_Text_1BD569, Route117_Text_1BD5AB + trainerbattle 5, TRAINER_ISAAC_1, 0, Route117_Text_1BD569, Route117_Text_1BD5AB msgbox Route117_Text_1BD5F2, 6 end Route117_EventScript_150DCB:: @ 8150DCB - trainerbattle 0, OPPONENT_LYDIA_1, 0, Route117_Text_1BD634, Route117_Text_1BD67B + trainerbattle 0, TRAINER_LYDIA_1, 0, Route117_Text_1BD634, Route117_Text_1BD67B specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route117_EventScript_150DF2 @@ -59,12 +59,12 @@ Route117_EventScript_150DCB:: @ 8150DCB end Route117_EventScript_150DF2:: @ 8150DF2 - trainerbattle 5, OPPONENT_LYDIA_1, 0, Route117_Text_1BD6F2, Route117_Text_1BD733 + trainerbattle 5, TRAINER_LYDIA_1, 0, Route117_Text_1BD6F2, Route117_Text_1BD733 msgbox Route117_Text_1BD74F, 6 end Route117_EventScript_150E09:: @ 8150E09 - trainerbattle 0, OPPONENT_DYLAN_1, 0, Route117_Text_1BD79A, Route117_Text_1BD7E0 + trainerbattle 0, TRAINER_DYLAN_1, 0, Route117_Text_1BD79A, Route117_Text_1BD7E0 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route117_EventScript_150E30 @@ -72,12 +72,12 @@ Route117_EventScript_150E09:: @ 8150E09 end Route117_EventScript_150E30:: @ 8150E30 - trainerbattle 5, OPPONENT_DYLAN_1, 0, Route117_Text_1BD83F, Route117_Text_1BD8A2 + trainerbattle 5, TRAINER_DYLAN_1, 0, Route117_Text_1BD83F, Route117_Text_1BD8A2 msgbox Route117_Text_1BD8BD, 6 end Route117_EventScript_150E47:: @ 8150E47 - trainerbattle 0, OPPONENT_MARIA_1, 0, Route117_Text_1BD914, Route117_Text_1BD965 + trainerbattle 0, TRAINER_MARIA_1, 0, Route117_Text_1BD914, Route117_Text_1BD965 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route117_EventScript_150E6E @@ -85,17 +85,17 @@ Route117_EventScript_150E47:: @ 8150E47 end Route117_EventScript_150E6E:: @ 8150E6E - trainerbattle 5, OPPONENT_MARIA_1, 0, Route117_Text_1BD9F1, Route117_Text_1BDA41 + trainerbattle 5, TRAINER_MARIA_1, 0, Route117_Text_1BD9F1, Route117_Text_1BDA41 msgbox Route117_Text_1BDA6B, 6 end Route117_EventScript_150E85:: @ 8150E85 - trainerbattle 0, OPPONENT_DEREK, 0, Route117_Text_1BDAA7, Route117_Text_1BDAFC + trainerbattle 0, TRAINER_DEREK, 0, Route117_Text_1BDAA7, Route117_Text_1BDAFC msgbox Route117_Text_1BDB24, 6 end Route117_EventScript_150E9C:: @ 8150E9C - trainerbattle 4, OPPONENT_ANNA_AND_MEG_1, 0, Route117_Text_1BDBC3, Route117_Text_1BDC07, Route117_Text_1BDC96 + trainerbattle 4, TRAINER_ANNA_AND_MEG_1, 0, Route117_Text_1BDBC3, Route117_Text_1BDC07, Route117_Text_1BDC96 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route117_EventScript_150EC7 @@ -103,12 +103,12 @@ Route117_EventScript_150E9C:: @ 8150E9C end Route117_EventScript_150EC7:: @ 8150EC7 - trainerbattle 7, OPPONENT_ANNA_AND_MEG_1, 0, Route117_Text_1BDDEF, Route117_Text_1BDE2F, Route117_Text_1BDEA7 + trainerbattle 7, TRAINER_ANNA_AND_MEG_1, 0, Route117_Text_1BDDEF, Route117_Text_1BDE2F, Route117_Text_1BDEA7 msgbox Route117_Text_1BDE55, 6 end Route117_EventScript_150EE2:: @ 8150EE2 - trainerbattle 4, OPPONENT_ANNA_AND_MEG_1, 0, Route117_Text_1BDCD2, Route117_Text_1BDD1E, Route117_Text_1BDD8B + trainerbattle 4, TRAINER_ANNA_AND_MEG_1, 0, Route117_Text_1BDCD2, Route117_Text_1BDD1E, Route117_Text_1BDD8B specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route117_EventScript_150F0D @@ -116,6 +116,6 @@ Route117_EventScript_150EE2:: @ 8150EE2 end Route117_EventScript_150F0D:: @ 8150F0D - trainerbattle 7, OPPONENT_ANNA_AND_MEG_1, 0, Route117_Text_1BDEE3, Route117_Text_1BDF26, Route117_Text_1BDF90 + trainerbattle 7, TRAINER_ANNA_AND_MEG_1, 0, Route117_Text_1BDEE3, Route117_Text_1BDF26, Route117_Text_1BDF90 msgbox Route117_Text_1BDF37, 6 end diff --git a/data/maps/Route118/scripts.inc b/data/maps/Route118/scripts.inc index b938d0cc2..850d9138d 100644 --- a/data/maps/Route118/scripts.inc +++ b/data/maps/Route118/scripts.inc @@ -159,7 +159,7 @@ Route118_Movement_151086:: @ 8151086 end_movement Route118_EventScript_15108F:: @ 815108F - trainerbattle 0, OPPONENT_ROSE_1, 0, Route118_Text_1BDFF4, Route118_Text_1BE03C + trainerbattle 0, TRAINER_ROSE_1, 0, Route118_Text_1BDFF4, Route118_Text_1BE03C specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route118_EventScript_1510B6 @@ -167,22 +167,22 @@ Route118_EventScript_15108F:: @ 815108F end Route118_EventScript_1510B6:: @ 81510B6 - trainerbattle 5, OPPONENT_ROSE_1, 0, Route118_Text_1BE0AB, Route118_Text_1BE0D3 + trainerbattle 5, TRAINER_ROSE_1, 0, Route118_Text_1BE0AB, Route118_Text_1BE0D3 msgbox Route118_Text_1BE104, 6 end Route118_EventScript_1510CD:: @ 81510CD - trainerbattle 0, OPPONENT_BARNY, 0, Route118_Text_1BE24A, Route118_Text_1BE291 + trainerbattle 0, TRAINER_BARNY, 0, Route118_Text_1BE24A, Route118_Text_1BE291 msgbox Route118_Text_1BE2BE, 6 end Route118_EventScript_1510E4:: @ 81510E4 - trainerbattle 0, OPPONENT_WADE, 0, Route118_Text_1BE318, Route118_Text_1BE385 + trainerbattle 0, TRAINER_WADE, 0, Route118_Text_1BE318, Route118_Text_1BE385 msgbox Route118_Text_1BE39C, 6 end Route118_EventScript_1510FB:: @ 81510FB - trainerbattle 0, OPPONENT_DALTON_1, 0, Route118_Text_1BE3E8, Route118_Text_1BE406 + trainerbattle 0, TRAINER_DALTON_1, 0, Route118_Text_1BE3E8, Route118_Text_1BE406 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route118_EventScript_151122 @@ -190,16 +190,16 @@ Route118_EventScript_1510FB:: @ 81510FB end Route118_EventScript_151122:: @ 8151122 - trainerbattle 5, OPPONENT_DALTON_1, 0, Route118_Text_1BE489, Route118_Text_1BE4CC + trainerbattle 5, TRAINER_DALTON_1, 0, Route118_Text_1BE489, Route118_Text_1BE4CC msgbox Route118_Text_1BE4D9, 6 end Route118_EventScript_151139:: @ 8151139 - trainerbattle 0, OPPONENT_PERRY, 0, Route118_Text_1BE148, Route118_Text_1BE188 + trainerbattle 0, TRAINER_PERRY, 0, Route118_Text_1BE148, Route118_Text_1BE188 msgbox Route118_Text_1BE19D, 6 end Route118_EventScript_151150:: @ 8151150 - trainerbattle 0, OPPONENT_CHESTER, 0, Route118_Text_1BE1D7, Route118_Text_1BE1F5 + trainerbattle 0, TRAINER_CHESTER, 0, Route118_Text_1BE1D7, Route118_Text_1BE1F5 msgbox Route118_Text_1BE20D, 6 end diff --git a/data/maps/Route119/scripts.inc b/data/maps/Route119/scripts.inc index fe1ef4e45..9874d3098 100644 --- a/data/maps/Route119/scripts.inc +++ b/data/maps/Route119/scripts.inc @@ -95,17 +95,17 @@ Route119_EventScript_15125E:: @ 815125E end Route119_EventScript_15128D:: @ 815128D - trainerbattle 3, OPPONENT_MAY_6, 0, Route119_Text_171156 + trainerbattle 3, TRAINER_MAY_6, 0, Route119_Text_171156 goto Route119_EventScript_1512BD end Route119_EventScript_15129D:: @ 815129D - trainerbattle 3, OPPONENT_MAY_9, 0, Route119_Text_171156 + trainerbattle 3, TRAINER_MAY_9, 0, Route119_Text_171156 goto Route119_EventScript_1512BD end Route119_EventScript_1512AD:: @ 81512AD - trainerbattle 3, OPPONENT_MAY_3, 0, Route119_Text_171156 + trainerbattle 3, TRAINER_MAY_3, 0, Route119_Text_171156 goto Route119_EventScript_1512BD end @@ -125,17 +125,17 @@ Route119_EventScript_1512D8:: @ 81512D8 end Route119_EventScript_151307:: @ 8151307 - trainerbattle 3, OPPONENT_BRENDAN_6, 0, Route119_Text_1713E2 + trainerbattle 3, TRAINER_BRENDAN_6, 0, Route119_Text_1713E2 goto Route119_EventScript_151337 end Route119_EventScript_151317:: @ 8151317 - trainerbattle 3, OPPONENT_BRENDAN_9, 0, Route119_Text_1713E2 + trainerbattle 3, TRAINER_BRENDAN_9, 0, Route119_Text_1713E2 goto Route119_EventScript_151337 end Route119_EventScript_151327:: @ 8151327 - trainerbattle 3, OPPONENT_BRENDAN_3, 0, Route119_Text_1713E2 + trainerbattle 3, TRAINER_BRENDAN_3, 0, Route119_Text_1713E2 goto Route119_EventScript_151337 end @@ -264,37 +264,37 @@ Route119_EventScript_15142C:: @ 815142C end Route119_EventScript_151435:: @ 8151435 - trainerbattle 0, OPPONENT_BRENT, 0, Route119_Text_1BE521, Route119_Text_1BE54F + trainerbattle 0, TRAINER_BRENT, 0, Route119_Text_1BE521, Route119_Text_1BE54F msgbox Route119_Text_1BE561, 6 end Route119_EventScript_15144C:: @ 815144C - trainerbattle 0, OPPONENT_DONALD, 0, Route119_Text_1BE5A4, Route119_Text_1BE5DF + trainerbattle 0, TRAINER_DONALD, 0, Route119_Text_1BE5A4, Route119_Text_1BE5DF msgbox Route119_Text_1BE5F8, 6 end Route119_EventScript_151463:: @ 8151463 - trainerbattle 0, OPPONENT_TAYLOR, 0, Route119_Text_1BE632, Route119_Text_1BE67B + trainerbattle 0, TRAINER_TAYLOR, 0, Route119_Text_1BE632, Route119_Text_1BE67B msgbox Route119_Text_1BE695, 6 end Route119_EventScript_15147A:: @ 815147A - trainerbattle 0, OPPONENT_DOUG, 0, Route119_Text_1BE6EA, Route119_Text_1BE729 + trainerbattle 0, TRAINER_DOUG, 0, Route119_Text_1BE6EA, Route119_Text_1BE729 msgbox Route119_Text_1BE748, 6 end Route119_EventScript_151491:: @ 8151491 - trainerbattle 0, OPPONENT_GREG, 0, Route119_Text_1BE784, Route119_Text_1BE7D3 + trainerbattle 0, TRAINER_GREG, 0, Route119_Text_1BE784, Route119_Text_1BE7D3 msgbox Route119_Text_1BE7E9, 6 end Route119_EventScript_1514A8:: @ 81514A8 - trainerbattle 0, OPPONENT_KENT, 0, Route119_Text_1BE82F, Route119_Text_1BE88D + trainerbattle 0, TRAINER_KENT, 0, Route119_Text_1BE82F, Route119_Text_1BE88D msgbox Route119_Text_1BE89A, 6 end Route119_EventScript_1514BF:: @ 81514BF - trainerbattle 0, OPPONENT_JACKSON_1, 0, Route119_Text_1BE8BB, Route119_Text_1BE90E + trainerbattle 0, TRAINER_JACKSON_1, 0, Route119_Text_1BE8BB, Route119_Text_1BE90E specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route119_EventScript_1514E6 @@ -302,12 +302,12 @@ Route119_EventScript_1514BF:: @ 81514BF end Route119_EventScript_1514E6:: @ 81514E6 - trainerbattle 5, OPPONENT_JACKSON_1, 0, Route119_Text_1BE98D, Route119_Text_1BE9D0 + trainerbattle 5, TRAINER_JACKSON_1, 0, Route119_Text_1BE98D, Route119_Text_1BE9D0 msgbox Route119_Text_1BE9E8, 6 end Route119_EventScript_1514FD:: @ 81514FD - trainerbattle 0, OPPONENT_CATHERINE_1, 0, Route119_Text_1BEA3A, Route119_Text_1BEA88 + trainerbattle 0, TRAINER_CATHERINE_1, 0, Route119_Text_1BEA3A, Route119_Text_1BEA88 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route119_EventScript_151524 @@ -315,37 +315,37 @@ Route119_EventScript_1514FD:: @ 81514FD end Route119_EventScript_151524:: @ 8151524 - trainerbattle 5, OPPONENT_CATHERINE_1, 0, Route119_Text_1BEB22, Route119_Text_1BEB49 + trainerbattle 5, TRAINER_CATHERINE_1, 0, Route119_Text_1BEB22, Route119_Text_1BEB49 msgbox Route119_Text_1BEB68, 6 end Route119_EventScript_15153B:: @ 815153B - trainerbattle 0, OPPONENT_HUGH, 0, Route119_Text_1BEBC0, Route119_Text_1BEC1C + trainerbattle 0, TRAINER_HUGH, 0, Route119_Text_1BEBC0, Route119_Text_1BEC1C msgbox Route119_Text_1BEC2A, 6 end Route119_EventScript_151552:: @ 8151552 - trainerbattle 0, OPPONENT_PHIL, 0, Route119_Text_1BEC5E, Route119_Text_1BEC9A + trainerbattle 0, TRAINER_PHIL, 0, Route119_Text_1BEC5E, Route119_Text_1BEC9A msgbox Route119_Text_1BECB1, 6 end Route119_EventScript_151569:: @ 8151569 - trainerbattle 0, OPPONENT_YASU, 0, Route119_Text_1BECF1, Route119_Text_1BED4C + trainerbattle 0, TRAINER_YASU, 0, Route119_Text_1BECF1, Route119_Text_1BED4C msgbox Route119_Text_1BED5C, 6 end Route119_EventScript_151580:: @ 8151580 - trainerbattle 0, OPPONENT_TAKASHI, 0, Route119_Text_1BEDB6, Route119_Text_1BEDEC + trainerbattle 0, TRAINER_TAKASHI, 0, Route119_Text_1BEDB6, Route119_Text_1BEDEC msgbox Route119_Text_1BEE06, 6 end Route119_EventScript_151597:: @ 8151597 - trainerbattle 0, OPPONENT_HIDEO_2, 0, Route119_Text_1BEE2D, Route119_Text_1BEE4B + trainerbattle 0, TRAINER_HIDEO_2, 0, Route119_Text_1BEE2D, Route119_Text_1BEE4B msgbox Route119_Text_1BEE66, 6 end Route119_EventScript_1515AE:: @ 81515AE - trainerbattle 0, OPPONENT_EUGENE, 0, Route119_Text_1BEED0, Route119_Text_1BEF37 + trainerbattle 0, TRAINER_EUGENE, 0, Route119_Text_1BEED0, Route119_Text_1BEF37 msgbox Route119_Text_1BEF67, 6 end diff --git a/data/maps/Route119_WeatherInstitute_1F/scripts.inc b/data/maps/Route119_WeatherInstitute_1F/scripts.inc index e5ca6550b..547241940 100644 --- a/data/maps/Route119_WeatherInstitute_1F/scripts.inc +++ b/data/maps/Route119_WeatherInstitute_1F/scripts.inc @@ -45,11 +45,11 @@ Route119_WeatherInstitute_1F_EventScript_163C83:: @ 8163C83 end Route119_WeatherInstitute_1F_EventScript_163C94:: @ 8163C94 - trainerbattle 0, OPPONENT_WEATHER_INSTITUTE_GRUNT_1, 0, Route119_WeatherInstitute_1F_Text_19EB8A, Route119_WeatherInstitute_1F_Text_19EBEE + trainerbattle 0, TRAINER_WEATHER_INSTITUTE_GRUNT_1, 0, Route119_WeatherInstitute_1F_Text_19EB8A, Route119_WeatherInstitute_1F_Text_19EBEE msgbox Route119_WeatherInstitute_1F_Text_19EC0E, 6 end Route119_WeatherInstitute_1F_EventScript_163CAB:: @ 8163CAB - trainerbattle 0, OPPONENT_WEATHER_INSTITUTE_GRUNT_2, 0, Route119_WeatherInstitute_1F_Text_19EC6B, Route119_WeatherInstitute_1F_Text_19EC89 + trainerbattle 0, TRAINER_WEATHER_INSTITUTE_GRUNT_2, 0, Route119_WeatherInstitute_1F_Text_19EC6B, Route119_WeatherInstitute_1F_Text_19EC89 msgbox Route119_WeatherInstitute_1F_Text_19EC97, 6 end diff --git a/data/maps/Route119_WeatherInstitute_2F/scripts.inc b/data/maps/Route119_WeatherInstitute_2F/scripts.inc index 0a1a51562..8a8737dad 100644 --- a/data/maps/Route119_WeatherInstitute_2F/scripts.inc +++ b/data/maps/Route119_WeatherInstitute_2F/scripts.inc @@ -21,17 +21,17 @@ Route119_WeatherInstitute_2F_EventScript_163CF0:: @ 8163CF0 return Route119_WeatherInstitute_2F_EventScript_163CFC:: @ 8163CFC - trainerbattle 0, OPPONENT_WEATHER_INSTITUTE_GRUNT_3, 0, Route119_WeatherInstitute_2F_Text_19EEAF, Route119_WeatherInstitute_2F_Text_19EF1B + trainerbattle 0, TRAINER_WEATHER_INSTITUTE_GRUNT_3, 0, Route119_WeatherInstitute_2F_Text_19EEAF, Route119_WeatherInstitute_2F_Text_19EF1B msgbox Route119_WeatherInstitute_2F_Text_19EF3E, 6 end Route119_WeatherInstitute_2F_EventScript_163D13:: @ 8163D13 - trainerbattle 0, OPPONENT_WEATHER_INSTITUTE_GRUNT_4, 0, Route119_WeatherInstitute_2F_Text_19EFA3, Route119_WeatherInstitute_2F_Text_19EFDD + trainerbattle 0, TRAINER_WEATHER_INSTITUTE_GRUNT_4, 0, Route119_WeatherInstitute_2F_Text_19EFA3, Route119_WeatherInstitute_2F_Text_19EFDD msgbox Route119_WeatherInstitute_2F_Text_19EFE9, 6 end Route119_WeatherInstitute_2F_EventScript_163D2A:: @ 8163D2A - trainerbattle 2, OPPONENT_WEATHER_INSTITUTE_GRUNT_5, 0, Route119_WeatherInstitute_2F_Text_19F042, Route119_WeatherInstitute_2F_Text_19F0F4, Route119_WeatherInstitute_2F_EventScript_163D45 + trainerbattle 2, TRAINER_WEATHER_INSTITUTE_GRUNT_5, 0, Route119_WeatherInstitute_2F_Text_19F042, Route119_WeatherInstitute_2F_Text_19F0F4, Route119_WeatherInstitute_2F_EventScript_163D45 msgbox Route119_WeatherInstitute_2F_Text_19F11B, 6 end diff --git a/data/maps/Route120/scripts.inc b/data/maps/Route120/scripts.inc index 6f561391f..f3081fc8c 100644 --- a/data/maps/Route120/scripts.inc +++ b/data/maps/Route120/scripts.inc @@ -280,12 +280,12 @@ Route120_EventScript_1519AA:: @ 81519AA end Route120_EventScript_1519B3:: @ 81519B3 - trainerbattle 0, OPPONENT_COLIN, 0, Route120_Text_1BEFC8, Route120_Text_1BF000 + trainerbattle 0, TRAINER_COLIN, 0, Route120_Text_1BEFC8, Route120_Text_1BF000 msgbox Route120_Text_1BF015, 6 end Route120_EventScript_1519CA:: @ 81519CA - trainerbattle 0, OPPONENT_ROBERT_1, 0, Route120_Text_1BF07E, Route120_Text_1BF0A5 + trainerbattle 0, TRAINER_ROBERT_1, 0, Route120_Text_1BF07E, Route120_Text_1BF0A5 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route120_EventScript_1519F1 @@ -293,22 +293,22 @@ Route120_EventScript_1519CA:: @ 81519CA end Route120_EventScript_1519F1:: @ 81519F1 - trainerbattle 5, OPPONENT_ROBERT_1, 0, Route120_Text_1BF0FA, Route120_Text_1BF131 + trainerbattle 5, TRAINER_ROBERT_1, 0, Route120_Text_1BF0FA, Route120_Text_1BF131 msgbox Route120_Text_1BF154, 6 end Route120_EventScript_151A08:: @ 8151A08 - trainerbattle 0, OPPONENT_CARLOS, 0, Route120_Text_1BF193, Route120_Text_1BF1D4 + trainerbattle 0, TRAINER_CARLOS, 0, Route120_Text_1BF193, Route120_Text_1BF1D4 msgbox Route120_Text_1BF215, 6 end Route120_EventScript_151A1F:: @ 8151A1F - trainerbattle 0, OPPONENT_JENNA, 0, Route120_Text_1BF26E, Route120_Text_1BF2D2 + trainerbattle 0, TRAINER_JENNA, 0, Route120_Text_1BF26E, Route120_Text_1BF2D2 msgbox Route120_Text_1BF2EA, 6 end Route120_EventScript_151A36:: @ 8151A36 - trainerbattle 0, OPPONENT_BRANDON_1, 0, Route120_Text_1BF32B, Route120_Text_1BF36B + trainerbattle 0, TRAINER_BRANDON_1, 0, Route120_Text_1BF32B, Route120_Text_1BF36B specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route120_EventScript_151A5D @@ -316,36 +316,36 @@ Route120_EventScript_151A36:: @ 8151A36 end Route120_EventScript_151A5D:: @ 8151A5D - trainerbattle 5, OPPONENT_BRANDON_1, 0, Route120_Text_1BF3D0, Route120_Text_1BF416 + trainerbattle 5, TRAINER_BRANDON_1, 0, Route120_Text_1BF3D0, Route120_Text_1BF416 msgbox Route120_Text_1BF43E, 6 end Route120_EventScript_151A74:: @ 8151A74 - trainerbattle 0, OPPONENT_JENNIFER, 0, Route120_Text_1BF4A0, Route120_Text_1BF504 + trainerbattle 0, TRAINER_JENNIFER, 0, Route120_Text_1BF4A0, Route120_Text_1BF504 msgbox Route120_Text_1BF51F, 6 end Route120_EventScript_151A8B:: @ 8151A8B - trainerbattle 0, OPPONENT_CHIP, 0, Route120_Text_1BF560, Route120_Text_1BF5D6 + trainerbattle 0, TRAINER_CHIP, 0, Route120_Text_1BF560, Route120_Text_1BF5D6 msgbox Route120_Text_1BF5F4, 6 end Route120_EventScript_151AA2:: @ 8151AA2 - trainerbattle 0, OPPONENT_CLARISSA, 0, Route120_Text_1BF65B, Route120_Text_1BF6A4 + trainerbattle 0, TRAINER_CLARISSA, 0, Route120_Text_1BF65B, Route120_Text_1BF6A4 msgbox Route120_Text_1BF6D0, 6 end Route120_EventScript_151AB9:: @ 8151AB9 - trainerbattle 0, OPPONENT_ANGELICA, 0, Route120_Text_1BF728, Route120_Text_1BF78C + trainerbattle 0, TRAINER_ANGELICA, 0, Route120_Text_1BF728, Route120_Text_1BF78C msgbox Route120_Text_1BF7B2, 6 end Route120_EventScript_151AD0:: @ 8151AD0 - trainerbattle 0, OPPONENT_KEIGO, 0, Route120_Text_1BF80B, Route120_Text_1BF852 + trainerbattle 0, TRAINER_KEIGO, 0, Route120_Text_1BF80B, Route120_Text_1BF852 msgbox Route120_Text_1BF891, 6 end Route120_EventScript_151AE7:: @ 8151AE7 - trainerbattle 0, OPPONENT_TSUNAO, 0, Route120_Text_1BF8C5, Route120_Text_1BF920 + trainerbattle 0, TRAINER_TSUNAO, 0, Route120_Text_1BF8C5, Route120_Text_1BF920 msgbox Route120_Text_1BF946, 6 end diff --git a/data/maps/Route121/scripts.inc b/data/maps/Route121/scripts.inc index 5fe7f6330..d154d3f6b 100644 --- a/data/maps/Route121/scripts.inc +++ b/data/maps/Route121/scripts.inc @@ -67,12 +67,12 @@ Route121_Movement_151B69:: @ 8151B69 end_movement Route121_EventScript_151B72:: @ 8151B72 - trainerbattle 0, OPPONENT_VANESSA, 0, Route121_Text_1BF96E, Route121_Text_1BF9A1 + trainerbattle 0, TRAINER_VANESSA, 0, Route121_Text_1BF96E, Route121_Text_1BF9A1 msgbox Route121_Text_1BF9BA, 6 end Route121_EventScript_151B89:: @ 8151B89 - trainerbattle 0, OPPONENT_WALTER_1, 0, Route121_Text_1BFA1B, Route121_Text_1BFA8C + trainerbattle 0, TRAINER_WALTER_1, 0, Route121_Text_1BFA1B, Route121_Text_1BFA8C specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route121_EventScript_151BB0 @@ -80,27 +80,27 @@ Route121_EventScript_151B89:: @ 8151B89 end Route121_EventScript_151BB0:: @ 8151BB0 - trainerbattle 5, OPPONENT_WALTER_1, 0, Route121_Text_1BFADA, Route121_Text_1BFB4B + trainerbattle 5, TRAINER_WALTER_1, 0, Route121_Text_1BFADA, Route121_Text_1BFB4B msgbox Route121_Text_1BFB5C, 6 end Route121_EventScript_151BC7:: @ 8151BC7 - trainerbattle 0, OPPONENT_TAMMY, 0, Route121_Text_1BFBB4, Route121_Text_1BFBEE + trainerbattle 0, TRAINER_TAMMY, 0, Route121_Text_1BFBB4, Route121_Text_1BFBEE msgbox Route121_Text_1BFBFD, 6 end Route121_EventScript_151BDE:: @ 8151BDE - trainerbattle 4, OPPONENT_KATE_AND_JOY, 0, Route121_Text_1BFC36, Route121_Text_1BFC7A, Route121_Text_1BFD08 + trainerbattle 4, TRAINER_KATE_AND_JOY, 0, Route121_Text_1BFC36, Route121_Text_1BFC7A, Route121_Text_1BFD08 msgbox Route121_Text_1BFCB3, 6 end Route121_EventScript_151BF9:: @ 8151BF9 - trainerbattle 4, OPPONENT_KATE_AND_JOY, 0, Route121_Text_1BFD60, Route121_Text_1BFDA3, Route121_Text_1BFE0D + trainerbattle 4, TRAINER_KATE_AND_JOY, 0, Route121_Text_1BFD60, Route121_Text_1BFDA3, Route121_Text_1BFE0D msgbox Route121_Text_1BFDC1, 6 end Route121_EventScript_151C14:: @ 8151C14 - trainerbattle 0, OPPONENT_JESSICA_1, 0, Route121_Text_1BFE51, Route121_Text_1BFE80 + trainerbattle 0, TRAINER_JESSICA_1, 0, Route121_Text_1BFE51, Route121_Text_1BFE80 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route121_EventScript_151C3B @@ -108,6 +108,6 @@ Route121_EventScript_151C14:: @ 8151C14 end Route121_EventScript_151C3B:: @ 8151C3B - trainerbattle 5, OPPONENT_JESSICA_1, 0, Route121_Text_1BFEDE, Route121_Text_1BFF0A + trainerbattle 5, TRAINER_JESSICA_1, 0, Route121_Text_1BFEDE, Route121_Text_1BFF0A msgbox Route121_Text_1BFF3A, 6 end diff --git a/data/maps/Route123/scripts.inc b/data/maps/Route123/scripts.inc index d954bec1a..4dda69997 100644 --- a/data/maps/Route123/scripts.inc +++ b/data/maps/Route123/scripts.inc @@ -45,22 +45,22 @@ Route123_EventScript_151CC8:: @ 8151CC8 end Route123_EventScript_151CD1:: @ 8151CD1 - trainerbattle 0, OPPONENT_WENDY, 0, Route123_Text_1BFF6A, Route123_Text_1BFFA2 + trainerbattle 0, TRAINER_WENDY, 0, Route123_Text_1BFF6A, Route123_Text_1BFFA2 msgbox Route123_Text_1BFFC1, 6 end Route123_EventScript_151CE8:: @ 8151CE8 - trainerbattle 0, OPPONENT_CLYDE, 0, Route123_Text_1BFFF0, Route123_Text_1C0057 + trainerbattle 0, TRAINER_CLYDE, 0, Route123_Text_1BFFF0, Route123_Text_1C0057 msgbox Route123_Text_1C0075, 6 end Route123_EventScript_151CFF:: @ 8151CFF - trainerbattle 0, OPPONENT_VIOLET, 0, Route123_Text_1C009E, Route123_Text_1C00D4 + trainerbattle 0, TRAINER_VIOLET, 0, Route123_Text_1C009E, Route123_Text_1C00D4 msgbox Route123_Text_1C0100, 6 end Route123_EventScript_151D16:: @ 8151D16 - trainerbattle 0, OPPONENT_CAMERON_1, 0, Route123_Text_1C013F, Route123_Text_1C01A3 + trainerbattle 0, TRAINER_CAMERON_1, 0, Route123_Text_1C013F, Route123_Text_1C01A3 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route123_EventScript_151D3D @@ -68,12 +68,12 @@ Route123_EventScript_151D16:: @ 8151D16 end Route123_EventScript_151D3D:: @ 8151D3D - trainerbattle 5, OPPONENT_CAMERON_1, 0, Route123_Text_1C01F9, Route123_Text_1C0240 + trainerbattle 5, TRAINER_CAMERON_1, 0, Route123_Text_1C01F9, Route123_Text_1C0240 msgbox Route123_Text_1C024E, 6 end Route123_EventScript_151D54:: @ 8151D54 - trainerbattle 0, OPPONENT_JACKI_1, 0, Route123_Text_1C028C, Route123_Text_1C0303 + trainerbattle 0, TRAINER_JACKI_1, 0, Route123_Text_1C028C, Route123_Text_1C0303 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route123_EventScript_151D7B @@ -81,21 +81,21 @@ Route123_EventScript_151D54:: @ 8151D54 end Route123_EventScript_151D7B:: @ 8151D7B - trainerbattle 5, OPPONENT_JACKI_1, 0, Route123_Text_1C0351, Route123_Text_1C0380 + trainerbattle 5, TRAINER_JACKI_1, 0, Route123_Text_1C0351, Route123_Text_1C0380 msgbox Route123_Text_1C038C, 6 end Route123_EventScript_151D92:: @ 8151D92 - trainerbattle 4, OPPONENT_MIU_AND_YUKI, 0, Route123_Text_1C03CB, Route123_Text_1C040E, Route123_Text_1C0462 + trainerbattle 4, TRAINER_MIU_AND_YUKI, 0, Route123_Text_1C03CB, Route123_Text_1C040E, Route123_Text_1C0462 msgbox Route123_Text_1C0423, 6 end Route123_EventScript_151DAD:: @ 8151DAD - trainerbattle 4, OPPONENT_MIU_AND_YUKI, 0, Route123_Text_1C049C, Route123_Text_1C04CD, Route123_Text_1C0519 + trainerbattle 4, TRAINER_MIU_AND_YUKI, 0, Route123_Text_1C049C, Route123_Text_1C04CD, Route123_Text_1C0519 msgbox Route123_Text_1C04E3, 6 end Route123_EventScript_151DC8:: @ 8151DC8 - trainerbattle 0, OPPONENT_KINDRA, 0, Route123_Text_1C0554, Route123_Text_1C059F + trainerbattle 0, TRAINER_KINDRA, 0, Route123_Text_1C0554, Route123_Text_1C059F msgbox Route123_Text_1C05BC, 6 end diff --git a/data/maps/Route124/scripts.inc b/data/maps/Route124/scripts.inc index 3f02fc6e3..cb42e1944 100644 --- a/data/maps/Route124/scripts.inc +++ b/data/maps/Route124/scripts.inc @@ -11,17 +11,17 @@ Route124_EventScript_151DEF:: @ 8151DEF end Route124_EventScript_151DF8:: @ 8151DF8 - trainerbattle 0, OPPONENT_SPENCER, 0, Route124_Text_1C0624, Route124_Text_1C0675 + trainerbattle 0, TRAINER_SPENCER, 0, Route124_Text_1C0624, Route124_Text_1C0675 msgbox Route124_Text_1C0693, 6 end Route124_EventScript_151E0F:: @ 8151E0F - trainerbattle 0, OPPONENT_ROLAND, 0, Route124_Text_1C06F7, Route124_Text_1C0741 + trainerbattle 0, TRAINER_ROLAND, 0, Route124_Text_1C06F7, Route124_Text_1C0741 msgbox Route124_Text_1C0750, 6 end Route124_EventScript_151E26:: @ 8151E26 - trainerbattle 0, OPPONENT_JENNY_1, 0, Route124_Text_1C07B4, Route124_Text_1C07F9 + trainerbattle 0, TRAINER_JENNY_1, 0, Route124_Text_1C07B4, Route124_Text_1C07F9 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route124_EventScript_151E4D @@ -29,22 +29,22 @@ Route124_EventScript_151E26:: @ 8151E26 end Route124_EventScript_151E4D:: @ 8151E4D - trainerbattle 5, OPPONENT_JENNY_1, 0, Route124_Text_1C0888, Route124_Text_1C08C8 + trainerbattle 5, TRAINER_JENNY_1, 0, Route124_Text_1C0888, Route124_Text_1C08C8 msgbox Route124_Text_1C08EA, 6 end Route124_EventScript_151E64:: @ 8151E64 - trainerbattle 0, OPPONENT_GRACE, 0, Route124_Text_1C0936, Route124_Text_1C096B + trainerbattle 0, TRAINER_GRACE, 0, Route124_Text_1C0936, Route124_Text_1C096B msgbox Route124_Text_1C0994, 6 end Route124_EventScript_151E7B:: @ 8151E7B - trainerbattle 0, OPPONENT_CHAD, 0, Route124_Text_1C09CE, Route124_Text_1C0A2F + trainerbattle 0, TRAINER_CHAD, 0, Route124_Text_1C09CE, Route124_Text_1C0A2F msgbox Route124_Text_1C0A52, 6 end Route124_EventScript_151E92:: @ 8151E92 - trainerbattle 4, OPPONENT_RITA_AND_SAM_1, 0, Route124_Text_1C0ABD, Route124_Text_1C0B36, Route124_Text_1C0BC8 + trainerbattle 4, TRAINER_RITA_AND_SAM_1, 0, Route124_Text_1C0ABD, Route124_Text_1C0B36, Route124_Text_1C0BC8 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route124_EventScript_151EBD @@ -52,12 +52,12 @@ Route124_EventScript_151E92:: @ 8151E92 end Route124_EventScript_151EBD:: @ 8151EBD - trainerbattle 7, OPPONENT_RITA_AND_SAM_1, 0, Route124_Text_1C0D1F, Route124_Text_1C0DB5, Route124_Text_1C0E5C + trainerbattle 7, TRAINER_RITA_AND_SAM_1, 0, Route124_Text_1C0D1F, Route124_Text_1C0DB5, Route124_Text_1C0E5C msgbox Route124_Text_1C0E06, 6 end Route124_EventScript_151ED8:: @ 8151ED8 - trainerbattle 4, OPPONENT_RITA_AND_SAM_1, 0, Route124_Text_1C0C0E, Route124_Text_1C0C4F, Route124_Text_1C0CE0 + trainerbattle 4, TRAINER_RITA_AND_SAM_1, 0, Route124_Text_1C0C0E, Route124_Text_1C0C4F, Route124_Text_1C0CE0 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route124_EventScript_151F03 @@ -65,6 +65,6 @@ Route124_EventScript_151ED8:: @ 8151ED8 end Route124_EventScript_151F03:: @ 8151F03 - trainerbattle 7, OPPONENT_RITA_AND_SAM_1, 0, Route124_Text_1C0EA2, Route124_Text_1C0EE5, Route124_Text_1C0F90 + trainerbattle 7, TRAINER_RITA_AND_SAM_1, 0, Route124_Text_1C0EA2, Route124_Text_1C0EE5, Route124_Text_1C0F90 msgbox Route124_Text_1C0F19, 6 end diff --git a/data/maps/Route125/scripts.inc b/data/maps/Route125/scripts.inc index a1495ac83..4ff30f363 100644 --- a/data/maps/Route125/scripts.inc +++ b/data/maps/Route125/scripts.inc @@ -7,27 +7,27 @@ Route125_MapScript1_151F24:: @ 8151F24 end Route125_EventScript_151F2E:: @ 8151F2E - trainerbattle 0, OPPONENT_CODY, 0, Route125_Text_1C0FCF, Route125_Text_1C1002 + trainerbattle 0, TRAINER_CODY, 0, Route125_Text_1C0FCF, Route125_Text_1C1002 msgbox Route125_Text_1C1013, 6 end Route125_EventScript_151F45:: @ 8151F45 - trainerbattle 0, OPPONENT_STAN, 0, Route125_Text_1C104B, Route125_Text_1C1073 + trainerbattle 0, TRAINER_STAN, 0, Route125_Text_1C104B, Route125_Text_1C1073 msgbox Route125_Text_1C1083, 6 end Route125_EventScript_151F5C:: @ 8151F5C - trainerbattle 0, OPPONENT_TANYA, 0, Route125_Text_1C10C3, Route125_Text_1C10FB + trainerbattle 0, TRAINER_TANYA, 0, Route125_Text_1C10C3, Route125_Text_1C10FB msgbox Route125_Text_1C110C, 6 end Route125_EventScript_151F73:: @ 8151F73 - trainerbattle 0, OPPONENT_SHARON, 0, Route125_Text_1C1136, Route125_Text_1C1175 + trainerbattle 0, TRAINER_SHARON, 0, Route125_Text_1C1136, Route125_Text_1C1175 msgbox Route125_Text_1C117F, 6 end Route125_EventScript_151F8A:: @ 8151F8A - trainerbattle 0, OPPONENT_ERNEST_1, 0, Route125_Text_1C11AF, Route125_Text_1C11ED + trainerbattle 0, TRAINER_ERNEST_1, 0, Route125_Text_1C11AF, Route125_Text_1C11ED specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route125_EventScript_151FB1 @@ -35,16 +35,16 @@ Route125_EventScript_151F8A:: @ 8151F8A end Route125_EventScript_151FB1:: @ 8151FB1 - trainerbattle 5, OPPONENT_ERNEST_1, 0, Route125_Text_1C1282, Route125_Text_1C12C5 + trainerbattle 5, TRAINER_ERNEST_1, 0, Route125_Text_1C1282, Route125_Text_1C12C5 msgbox Route125_Text_1C12EE, 6 end Route125_EventScript_151FC8:: @ 8151FC8 - trainerbattle 4, OPPONENT_KIM_AND_IRIS, 0, Route125_Text_1C13A1, Route125_Text_1C13FF, Route125_Text_1C146E + trainerbattle 4, TRAINER_KIM_AND_IRIS, 0, Route125_Text_1C13A1, Route125_Text_1C13FF, Route125_Text_1C146E msgbox Route125_Text_1C141C, 6 end Route125_EventScript_151FE3:: @ 8151FE3 - trainerbattle 4, OPPONENT_KIM_AND_IRIS, 0, Route125_Text_1C14AB, Route125_Text_1C14E7, Route125_Text_1C154F + trainerbattle 4, TRAINER_KIM_AND_IRIS, 0, Route125_Text_1C14AB, Route125_Text_1C14E7, Route125_Text_1C154F msgbox Route125_Text_1C1508, 6 end diff --git a/data/maps/Route126/scripts.inc b/data/maps/Route126/scripts.inc index 4a28abfb7..3eb68a1d1 100644 --- a/data/maps/Route126/scripts.inc +++ b/data/maps/Route126/scripts.inc @@ -7,21 +7,21 @@ Route126_MapScript1_152004:: @ 8152004 end Route126_EventScript_15200E:: @ 815200E - trainerbattle 0, OPPONENT_BARRY, 0, Route126_Text_1C1590, Route126_Text_1C15C3 + trainerbattle 0, TRAINER_BARRY, 0, Route126_Text_1C1590, Route126_Text_1C15C3 msgbox Route126_Text_1C15D8, 6 end Route126_EventScript_152025:: @ 8152025 - trainerbattle 0, OPPONENT_DEAN, 0, Route126_Text_1C1627, Route126_Text_1C1660 + trainerbattle 0, TRAINER_DEAN, 0, Route126_Text_1C1627, Route126_Text_1C1660 msgbox Route126_Text_1C166F, 6 end Route126_EventScript_15203C:: @ 815203C - trainerbattle 0, OPPONENT_NIKKI, 0, Route126_Text_1C16AB, Route126_Text_1C16C5 + trainerbattle 0, TRAINER_NIKKI, 0, Route126_Text_1C16AB, Route126_Text_1C16C5 msgbox Route126_Text_1C1702, 6 end Route126_EventScript_152053:: @ 8152053 - trainerbattle 0, OPPONENT_BRENDA, 0, Route126_Text_1C1741, Route126_Text_1C1766 + trainerbattle 0, TRAINER_BRENDA, 0, Route126_Text_1C1741, Route126_Text_1C1766 msgbox Route126_Text_1C1773, 6 end diff --git a/data/maps/Route127/scripts.inc b/data/maps/Route127/scripts.inc index 7552f7c5d..51ff52501 100644 --- a/data/maps/Route127/scripts.inc +++ b/data/maps/Route127/scripts.inc @@ -7,36 +7,36 @@ Route127_MapScript1_152070:: @ 8152070 end Route127_EventScript_15207A:: @ 815207A - trainerbattle 0, OPPONENT_CALEB, 0, Route127_Text_1C17A8, Route127_Text_1C17DD + trainerbattle 0, TRAINER_CALEB, 0, Route127_Text_1C17A8, Route127_Text_1C17DD msgbox Route127_Text_1C17EC, 6 end Route127_EventScript_152091:: @ 8152091 - trainerbattle 0, OPPONENT_CONNOR, 0, Route127_Text_1C1828, Route127_Text_1C1860 + trainerbattle 0, TRAINER_CONNOR, 0, Route127_Text_1C1828, Route127_Text_1C1860 msgbox Route127_Text_1C1877, 6 end Route127_EventScript_1520A8:: @ 81520A8 - trainerbattle 0, OPPONENT_JONAH, 0, Route127_Text_1C18CC, Route127_Text_1C1930 + trainerbattle 0, TRAINER_JONAH, 0, Route127_Text_1C18CC, Route127_Text_1C1930 msgbox Route127_Text_1C195D, 6 end Route127_EventScript_1520BF:: @ 81520BF - trainerbattle 0, OPPONENT_HENRY, 0, Route127_Text_1C19A3, Route127_Text_1C19D6 + trainerbattle 0, TRAINER_HENRY, 0, Route127_Text_1C19A3, Route127_Text_1C19D6 msgbox Route127_Text_1C19E7, 6 end Route127_EventScript_1520D6:: @ 81520D6 - trainerbattle 0, OPPONENT_ROGER, 0, Route127_Text_1C1A2E, Route127_Text_1C1A73 + trainerbattle 0, TRAINER_ROGER, 0, Route127_Text_1C1A2E, Route127_Text_1C1A73 msgbox Route127_Text_1C1AA0, 6 end Route127_EventScript_1520ED:: @ 81520ED - trainerbattle 0, OPPONENT_KOJI, 0, Route127_Text_1C1AE2, Route127_Text_1C1B2A + trainerbattle 0, TRAINER_KOJI, 0, Route127_Text_1C1AE2, Route127_Text_1C1B2A msgbox Route127_Text_1C1B39, 6 end Route127_EventScript_152104:: @ 8152104 - trainerbattle 0, OPPONENT_BYRON, 0, Route127_Text_1C1B92, Route127_Text_1C1BD9 + trainerbattle 0, TRAINER_BYRON, 0, Route127_Text_1C1B92, Route127_Text_1C1BD9 msgbox Route127_Text_1C1BEC, 6 end diff --git a/data/maps/Route128/scripts.inc b/data/maps/Route128/scripts.inc index ec4fb954e..12d9bace5 100644 --- a/data/maps/Route128/scripts.inc +++ b/data/maps/Route128/scripts.inc @@ -180,7 +180,7 @@ Route128_Movement_1522A1:: @ 81522A1 end_movement Route128_EventScript_1522A4:: @ 81522A4 - trainerbattle 0, OPPONENT_ISAIAH_1, 0, Route128_Text_1C1C67, Route128_Text_1C1C95 + trainerbattle 0, TRAINER_ISAIAH_1, 0, Route128_Text_1C1C67, Route128_Text_1C1C95 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route128_EventScript_1522CB @@ -188,12 +188,12 @@ Route128_EventScript_1522A4:: @ 81522A4 end Route128_EventScript_1522CB:: @ 81522CB - trainerbattle 5, OPPONENT_ISAIAH_1, 0, Route128_Text_1C1D02, Route128_Text_1C1D45 + trainerbattle 5, TRAINER_ISAIAH_1, 0, Route128_Text_1C1D02, Route128_Text_1C1D45 msgbox Route128_Text_1C1D6B, 6 end Route128_EventScript_1522E2:: @ 81522E2 - trainerbattle 0, OPPONENT_KATELYN_1, 0, Route128_Text_1C1DB0, Route128_Text_1C1E25 + trainerbattle 0, TRAINER_KATELYN_1, 0, Route128_Text_1C1DB0, Route128_Text_1C1E25 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route128_EventScript_152309 @@ -201,21 +201,21 @@ Route128_EventScript_1522E2:: @ 81522E2 end Route128_EventScript_152309:: @ 8152309 - trainerbattle 5, OPPONENT_KATELYN_1, 0, Route128_Text_1C1E90, Route128_Text_1C1EFA + trainerbattle 5, TRAINER_KATELYN_1, 0, Route128_Text_1C1E90, Route128_Text_1C1EFA msgbox Route128_Text_1C1F2E, 6 end Route128_EventScript_152320:: @ 8152320 - trainerbattle 0, OPPONENT_ALEXA, 0, Route128_Text_1C1F6D, Route128_Text_1C1FCC + trainerbattle 0, TRAINER_ALEXA, 0, Route128_Text_1C1F6D, Route128_Text_1C1FCC msgbox Route128_Text_1C1FE8, 6 end Route128_EventScript_152337:: @ 8152337 - trainerbattle 0, OPPONENT_RUBEN, 0, Route128_Text_1C202C, Route128_Text_1C2051 + trainerbattle 0, TRAINER_RUBEN, 0, Route128_Text_1C202C, Route128_Text_1C2051 msgbox Route128_Text_1C2060, 6 end Route128_EventScript_15234E:: @ 815234E - trainerbattle 0, OPPONENT_WAYNE, 0, Route128_Text_1C2090, Route128_Text_1C20FC + trainerbattle 0, TRAINER_WAYNE, 0, Route128_Text_1C2090, Route128_Text_1C20FC msgbox Route128_Text_1C210D, 6 end diff --git a/data/maps/Route129/scripts.inc b/data/maps/Route129/scripts.inc index ea43c5eab..360c67e02 100644 --- a/data/maps/Route129/scripts.inc +++ b/data/maps/Route129/scripts.inc @@ -2,21 +2,21 @@ Route129_MapScripts:: @ 8152365 .byte 0 Route129_EventScript_152366:: @ 8152366 - trainerbattle 0, OPPONENT_CHASE, 0, Route129_Text_1C2161, Route129_Text_1C2198 + trainerbattle 0, TRAINER_CHASE, 0, Route129_Text_1C2161, Route129_Text_1C2198 msgbox Route129_Text_1C21B4, 6 end Route129_EventScript_15237D:: @ 815237D - trainerbattle 0, OPPONENT_ALLISON, 0, Route129_Text_1C21ED, Route129_Text_1C222F + trainerbattle 0, TRAINER_ALLISON, 0, Route129_Text_1C21ED, Route129_Text_1C222F msgbox Route129_Text_1C2243, 6 end Route129_EventScript_152394:: @ 8152394 - trainerbattle 0, OPPONENT_REED, 0, Route129_Text_1C22C8, Route129_Text_1C22EC + trainerbattle 0, TRAINER_REED, 0, Route129_Text_1C22C8, Route129_Text_1C22EC msgbox Route129_Text_1C230F, 6 end Route129_EventScript_1523AB:: @ 81523AB - trainerbattle 0, OPPONENT_TISHA, 0, Route129_Text_1C2349, Route129_Text_1C2378 + trainerbattle 0, TRAINER_TISHA, 0, Route129_Text_1C2349, Route129_Text_1C2378 msgbox Route129_Text_1C23A3, 6 end diff --git a/data/maps/Route130/scripts.inc b/data/maps/Route130/scripts.inc index b0381969d..70eace112 100644 --- a/data/maps/Route130/scripts.inc +++ b/data/maps/Route130/scripts.inc @@ -30,11 +30,11 @@ Route130_EventScript_15240C:: @ 815240C end Route130_EventScript_152410:: @ 8152410 - trainerbattle 0, OPPONENT_RODNEY, 0, Route130_Text_1C2401, Route130_Text_1C245D + trainerbattle 0, TRAINER_RODNEY, 0, Route130_Text_1C2401, Route130_Text_1C245D msgbox Route130_Text_1C2479, 6 end Route130_EventScript_152427:: @ 8152427 - trainerbattle 0, OPPONENT_KATIE, 0, Route130_Text_1C24DC, Route130_Text_1C2525 + trainerbattle 0, TRAINER_KATIE, 0, Route130_Text_1C24DC, Route130_Text_1C2525 msgbox Route130_Text_1C256E, 6 end diff --git a/data/maps/Route131/scripts.inc b/data/maps/Route131/scripts.inc index ffd204bb9..6aa6868f3 100644 --- a/data/maps/Route131/scripts.inc +++ b/data/maps/Route131/scripts.inc @@ -11,31 +11,31 @@ Route131_EventScript_15244E:: @ 815244E return Route131_EventScript_152452:: @ 8152452 - trainerbattle 0, OPPONENT_RICHARD, 0, Route131_Text_1C25B3, Route131_Text_1C25F8 + trainerbattle 0, TRAINER_RICHARD, 0, Route131_Text_1C25B3, Route131_Text_1C25F8 msgbox Route131_Text_1C262A, 6 end Route131_EventScript_152469:: @ 8152469 - trainerbattle 0, OPPONENT_HERMAN, 0, Route131_Text_1C26B9, Route131_Text_1C271F + trainerbattle 0, TRAINER_HERMAN, 0, Route131_Text_1C26B9, Route131_Text_1C271F msgbox Route131_Text_1C2726, 6 end Route131_EventScript_152480:: @ 8152480 - trainerbattle 0, OPPONENT_SUSIE, 0, Route131_Text_1C2774, Route131_Text_1C27A4 + trainerbattle 0, TRAINER_SUSIE, 0, Route131_Text_1C2774, Route131_Text_1C27A4 msgbox Route131_Text_1C27CF, 6 end Route131_EventScript_152497:: @ 8152497 - trainerbattle 0, OPPONENT_KARA, 0, Route131_Text_1C284A, Route131_Text_1C2883 + trainerbattle 0, TRAINER_KARA, 0, Route131_Text_1C284A, Route131_Text_1C2883 msgbox Route131_Text_1C2898, 6 end Route131_EventScript_1524AE:: @ 81524AE - trainerbattle 4, OPPONENT_RELI_AND_IAN, 0, Route131_Text_1C28E2, Route131_Text_1C2918, Route131_Text_1C29B2 + trainerbattle 4, TRAINER_RELI_AND_IAN, 0, Route131_Text_1C28E2, Route131_Text_1C2918, Route131_Text_1C29B2 msgbox Route131_Text_1C2950, 6 end Route131_EventScript_1524C9:: @ 81524C9 - trainerbattle 4, OPPONENT_RELI_AND_IAN, 0, Route131_Text_1C29F3, Route131_Text_1C2A20, Route131_Text_1C2ACA + trainerbattle 4, TRAINER_RELI_AND_IAN, 0, Route131_Text_1C29F3, Route131_Text_1C2A20, Route131_Text_1C2ACA msgbox Route131_Text_1C2A5D, 6 end diff --git a/data/maps/Route132/scripts.inc b/data/maps/Route132/scripts.inc index 642330fd4..6d964aacf 100644 --- a/data/maps/Route132/scripts.inc +++ b/data/maps/Route132/scripts.inc @@ -2,21 +2,21 @@ Route132_MapScripts:: @ 81524E4 .byte 0 Route132_EventScript_1524E5:: @ 81524E5 - trainerbattle 0, OPPONENT_GILBERT, 0, Route132_Text_1C2AFB, Route132_Text_1C2B5B + trainerbattle 0, TRAINER_GILBERT, 0, Route132_Text_1C2AFB, Route132_Text_1C2B5B msgbox Route132_Text_1C2B71, 6 end Route132_EventScript_1524FC:: @ 81524FC - trainerbattle 0, OPPONENT_DANA, 0, Route132_Text_1C2BB5, Route132_Text_1C2BEA + trainerbattle 0, TRAINER_DANA, 0, Route132_Text_1C2BB5, Route132_Text_1C2BEA msgbox Route132_Text_1C2BFA, 6 end Route132_EventScript_152513:: @ 8152513 - trainerbattle 0, OPPONENT_RONALD, 0, Route132_Text_1C2C32, Route132_Text_1C2C60 + trainerbattle 0, TRAINER_RONALD, 0, Route132_Text_1C2C32, Route132_Text_1C2C60 msgbox Route132_Text_1C2C78, 6 end Route132_EventScript_15252A:: @ 815252A - trainerbattle 0, OPPONENT_KIYO, 0, Route132_Text_1C2CD9, Route132_Text_1C2D1F + trainerbattle 0, TRAINER_KIYO, 0, Route132_Text_1C2CD9, Route132_Text_1C2D1F msgbox Route132_Text_1C2D3E, 6 end diff --git a/data/maps/Route133/scripts.inc b/data/maps/Route133/scripts.inc index 78bec4141..213be5562 100644 --- a/data/maps/Route133/scripts.inc +++ b/data/maps/Route133/scripts.inc @@ -2,26 +2,26 @@ Route133_MapScripts:: @ 8152541 .byte 0 Route133_EventScript_152542:: @ 8152542 - trainerbattle 0, OPPONENT_FRANKLIN, 0, Route133_Text_1C2DA5, Route133_Text_1C2DF4 + trainerbattle 0, TRAINER_FRANKLIN, 0, Route133_Text_1C2DA5, Route133_Text_1C2DF4 msgbox Route133_Text_1C2E09, 6 end Route133_EventScript_152559:: @ 8152559 - trainerbattle 0, OPPONENT_DEBRA, 0, Route133_Text_1C2E61, Route133_Text_1C2EBD + trainerbattle 0, TRAINER_DEBRA, 0, Route133_Text_1C2E61, Route133_Text_1C2EBD msgbox Route133_Text_1C2ECD, 6 end Route133_EventScript_152570:: @ 8152570 - trainerbattle 0, OPPONENT_LINDA, 0, Route133_Text_1C2EF7, Route133_Text_1C2F19 + trainerbattle 0, TRAINER_LINDA, 0, Route133_Text_1C2EF7, Route133_Text_1C2F19 msgbox Route133_Text_1C2F25, 6 end Route133_EventScript_152587:: @ 8152587 - trainerbattle 0, OPPONENT_WARREN, 0, Route133_Text_1C2F53, Route133_Text_1C2FA3 + trainerbattle 0, TRAINER_WARREN, 0, Route133_Text_1C2F53, Route133_Text_1C2FA3 msgbox Route133_Text_1C2FC7, 6 end Route133_EventScript_15259E:: @ 815259E - trainerbattle 0, OPPONENT_BECK, 0, Route133_Text_1C302D, Route133_Text_1C305F + trainerbattle 0, TRAINER_BECK, 0, Route133_Text_1C302D, Route133_Text_1C305F msgbox Route133_Text_1C307E, 6 end diff --git a/data/maps/Route134/scripts.inc b/data/maps/Route134/scripts.inc index 06b53ce31..e5c106899 100644 --- a/data/maps/Route134/scripts.inc +++ b/data/maps/Route134/scripts.inc @@ -7,26 +7,26 @@ Route134_MapScript1_1525BB:: @ 81525BB end Route134_EventScript_1525C4:: @ 81525C4 - trainerbattle 0, OPPONENT_JACK, 0, Route134_Text_1C30C6, Route134_Text_1C3110 + trainerbattle 0, TRAINER_JACK, 0, Route134_Text_1C30C6, Route134_Text_1C3110 msgbox Route134_Text_1C311A, 6 end Route134_EventScript_1525DB:: @ 81525DB - trainerbattle 0, OPPONENT_LAUREL, 0, Route134_Text_1C315E, Route134_Text_1C3198 + trainerbattle 0, TRAINER_LAUREL, 0, Route134_Text_1C315E, Route134_Text_1C3198 msgbox Route134_Text_1C31A0, 6 end Route134_EventScript_1525F2:: @ 81525F2 - trainerbattle 0, OPPONENT_ALEX, 0, Route134_Text_1C31D7, Route134_Text_1C3213 + trainerbattle 0, TRAINER_ALEX, 0, Route134_Text_1C31D7, Route134_Text_1C3213 msgbox Route134_Text_1C3229, 6 end Route134_EventScript_152609:: @ 8152609 - trainerbattle 0, OPPONENT_AARON, 0, Route134_Text_1C3319, Route134_Text_1C335C + trainerbattle 0, TRAINER_AARON, 0, Route134_Text_1C3319, Route134_Text_1C335C msgbox Route134_Text_1C336E, 6 end Route134_EventScript_152620:: @ 8152620 - trainerbattle 0, OPPONENT_HITOSHI, 0, Route134_Text_1C3262, Route134_Text_1C329E + trainerbattle 0, TRAINER_HITOSHI, 0, Route134_Text_1C3262, Route134_Text_1C329E msgbox Route134_Text_1C32D6, 6 end diff --git a/data/maps/RustboroCity_Gym/scripts.inc b/data/maps/RustboroCity_Gym/scripts.inc index 307617e50..9c379107f 100644 --- a/data/maps/RustboroCity_Gym/scripts.inc +++ b/data/maps/RustboroCity_Gym/scripts.inc @@ -2,7 +2,7 @@ RustboroCity_Gym_MapScripts:: @ 81578D8 .byte 0 RustboroCity_Gym_EventScript_1578D9:: @ 81578D9 - trainerbattle 1, OPPONENT_ROXANNE, 0, RustboroCity_Gym_Text_183EE5, RustboroCity_Gym_Text_183FC4, RustboroCity_Gym_EventScript_1578FE + trainerbattle 1, TRAINER_ROXANNE, 0, RustboroCity_Gym_Text_183EE5, RustboroCity_Gym_Text_183FC4, RustboroCity_Gym_EventScript_1578FE goto_if_unset FLAG_RECEIVED_TM39, RustboroCity_Gym_EventScript_15793C msgbox RustboroCity_Gym_Text_184252, 4 release @@ -34,12 +34,12 @@ RustboroCity_Gym_EventScript_15793C:: @ 815793C end RustboroCity_Gym_EventScript_157960:: @ 8157960 - trainerbattle 0, OPPONENT_JOSH, 0, RustboroCity_Gym_Text_183D99, RustboroCity_Gym_Text_183DDD + trainerbattle 0, TRAINER_JOSH, 0, RustboroCity_Gym_Text_183D99, RustboroCity_Gym_Text_183DDD msgbox RustboroCity_Gym_Text_183DF9, 6 end RustboroCity_Gym_EventScript_157977:: @ 8157977 - trainerbattle 0, OPPONENT_TOMMY, 0, RustboroCity_Gym_Text_183E38, RustboroCity_Gym_Text_183E78 + trainerbattle 0, TRAINER_TOMMY, 0, RustboroCity_Gym_Text_183E38, RustboroCity_Gym_Text_183E78 msgbox RustboroCity_Gym_Text_183E98, 6 end diff --git a/data/maps/RusturfTunnel/scripts.inc b/data/maps/RusturfTunnel/scripts.inc index 13fb80043..6c3f759cc 100644 --- a/data/maps/RusturfTunnel/scripts.inc +++ b/data/maps/RusturfTunnel/scripts.inc @@ -310,7 +310,7 @@ RusturfTunnel_EventScript_15C9EA:: @ 815C9EA faceplayer playbgm MUS_EVIL_TEAM, FALSE msgbox RusturfTunnel_Text_19419B, 4 - trainerbattle 3, OPPONENT_RUSTURF_TUNNEL_GRUNT, 0, RusturfTunnel_Text_194243 + trainerbattle 3, TRAINER_RUSTURF_TUNNEL_GRUNT, 0, RusturfTunnel_Text_194243 msgbox RusturfTunnel_Text_194274, 4 giveitem_std ITEM_DEVON_GOODS closemessage @@ -415,6 +415,6 @@ RusturfTunnel_Movement_15CAC3:: @ 815CAC3 end_movement RusturfTunnel_EventScript_15CACD:: @ 815CACD - trainerbattle 0, OPPONENT_MIKE_2, 0, RusturfTunnel_Text_194814, RusturfTunnel_Text_1948A2 + trainerbattle 0, TRAINER_MIKE_2, 0, RusturfTunnel_Text_194814, RusturfTunnel_Text_1948A2 msgbox RusturfTunnel_Text_1948C4, 6 end diff --git a/data/maps/SSTidalCorridor/scripts.inc b/data/maps/SSTidalCorridor/scripts.inc index 7bc5a7fdd..57872a66a 100644 --- a/data/maps/SSTidalCorridor/scripts.inc +++ b/data/maps/SSTidalCorridor/scripts.inc @@ -173,14 +173,14 @@ SSTidalCorridor_EventScript_15FE7A:: @ 815FE7A end SSTidalCorridor_EventScript_15FE84:: @ 815FE84 - goto_if_trainer_not_defeated OPPONENT_PHILLIP, SSTidalCorridor_EventScript_15FED5 - goto_if_trainer_not_defeated OPPONENT_LEONARD, SSTidalCorridor_EventScript_15FED5 - goto_if_trainer_not_defeated OPPONENT_COLTON, SSTidalCorridor_EventScript_15FED5 - goto_if_trainer_not_defeated OPPONENT_TUCKER, SSTidalCorridor_EventScript_15FED5 - goto_if_trainer_not_defeated OPPONENT_THOMAS, SSTidalCorridor_EventScript_15FED5 - goto_if_trainer_not_defeated OPPONENT_LEA_AND_JED, SSTidalCorridor_EventScript_15FED5 - goto_if_trainer_not_defeated OPPONENT_GARRET, SSTidalCorridor_EventScript_15FED5 - goto_if_trainer_not_defeated OPPONENT_ANETTE, SSTidalCorridor_EventScript_15FED5 + goto_if_trainer_not_defeated TRAINER_PHILLIP, SSTidalCorridor_EventScript_15FED5 + goto_if_trainer_not_defeated TRAINER_LEONARD, SSTidalCorridor_EventScript_15FED5 + goto_if_trainer_not_defeated TRAINER_COLTON, SSTidalCorridor_EventScript_15FED5 + goto_if_trainer_not_defeated TRAINER_TUCKER, SSTidalCorridor_EventScript_15FED5 + goto_if_trainer_not_defeated TRAINER_THOMAS, SSTidalCorridor_EventScript_15FED5 + goto_if_trainer_not_defeated TRAINER_LEA_AND_JED, SSTidalCorridor_EventScript_15FED5 + goto_if_trainer_not_defeated TRAINER_GARRET, SSTidalCorridor_EventScript_15FED5 + goto_if_trainer_not_defeated TRAINER_ANETTE, SSTidalCorridor_EventScript_15FED5 setflag FLAG_DEFEATED_SS_TIDAL_TRAINERS goto SSTidalCorridor_EventScript_15FE7A return diff --git a/data/maps/SSTidalLowerDeck/scripts.inc b/data/maps/SSTidalLowerDeck/scripts.inc index e91c20625..9b19a2f3a 100644 --- a/data/maps/SSTidalLowerDeck/scripts.inc +++ b/data/maps/SSTidalLowerDeck/scripts.inc @@ -2,11 +2,11 @@ SSTidalLowerDeck_MapScripts:: @ 815FED6 .byte 0 SSTidalLowerDeck_EventScript_15FED7:: @ 815FED7 - trainerbattle 0, OPPONENT_PHILLIP, 0, SSTidalLowerDeck_Text_1993C1, SSTidalLowerDeck_Text_19941A + trainerbattle 0, TRAINER_PHILLIP, 0, SSTidalLowerDeck_Text_1993C1, SSTidalLowerDeck_Text_19941A msgbox SSTidalLowerDeck_Text_19942E, 6 end SSTidalLowerDeck_EventScript_15FEEE:: @ 815FEEE - trainerbattle 0, OPPONENT_LEONARD, 0, SSTidalLowerDeck_Text_199491, SSTidalLowerDeck_Text_1994F7 + trainerbattle 0, TRAINER_LEONARD, 0, SSTidalLowerDeck_Text_199491, SSTidalLowerDeck_Text_1994F7 msgbox SSTidalLowerDeck_Text_199508, 6 end diff --git a/data/maps/SSTidalRooms/scripts.inc b/data/maps/SSTidalRooms/scripts.inc index 89372bd84..52927d54e 100644 --- a/data/maps/SSTidalRooms/scripts.inc +++ b/data/maps/SSTidalRooms/scripts.inc @@ -29,36 +29,36 @@ SSTidalRooms_EventScript_15FF47:: @ 815FF47 end SSTidalRooms_EventScript_15FF5D:: @ 815FF5D - trainerbattle 0, OPPONENT_COLTON, 0, SSTidalRooms_Text_19958A, SSTidalRooms_Text_199613 + trainerbattle 0, TRAINER_COLTON, 0, SSTidalRooms_Text_19958A, SSTidalRooms_Text_199613 msgbox SSTidalRooms_Text_199630, 6 end SSTidalRooms_EventScript_15FF74:: @ 815FF74 - trainerbattle 0, OPPONENT_TUCKER, 0, SSTidalRooms_Text_1996A6, SSTidalRooms_Text_1996BF + trainerbattle 0, TRAINER_TUCKER, 0, SSTidalRooms_Text_1996A6, SSTidalRooms_Text_1996BF msgbox SSTidalRooms_Text_1996E1, 6 end SSTidalRooms_EventScript_15FF8B:: @ 815FF8B - trainerbattle 0, OPPONENT_THOMAS, 0, SSTidalRooms_Text_199723, SSTidalRooms_Text_199747 + trainerbattle 0, TRAINER_THOMAS, 0, SSTidalRooms_Text_199723, SSTidalRooms_Text_199747 msgbox SSTidalRooms_Text_199778, 6 end SSTidalRooms_EventScript_15FFA2:: @ 815FFA2 - trainerbattle 4, OPPONENT_LEA_AND_JED, 0, SSTidalRooms_Text_1997C1, SSTidalRooms_Text_199813, SSTidalRooms_Text_199887 + trainerbattle 4, TRAINER_LEA_AND_JED, 0, SSTidalRooms_Text_1997C1, SSTidalRooms_Text_199813, SSTidalRooms_Text_199887 msgbox SSTidalRooms_Text_199820, 6 end SSTidalRooms_EventScript_15FFBD:: @ 815FFBD - trainerbattle 4, OPPONENT_LEA_AND_JED, 0, SSTidalRooms_Text_1998C5, SSTidalRooms_Text_19990E, SSTidalRooms_Text_199975 + trainerbattle 4, TRAINER_LEA_AND_JED, 0, SSTidalRooms_Text_1998C5, SSTidalRooms_Text_19990E, SSTidalRooms_Text_199975 msgbox SSTidalRooms_Text_19991C, 6 end SSTidalRooms_EventScript_15FFD8:: @ 815FFD8 - trainerbattle 0, OPPONENT_GARRET, 0, SSTidalRooms_Text_1999B7, SSTidalRooms_Text_1999FF + trainerbattle 0, TRAINER_GARRET, 0, SSTidalRooms_Text_1999B7, SSTidalRooms_Text_1999FF msgbox SSTidalRooms_Text_199A10, 6 end SSTidalRooms_EventScript_15FFEF:: @ 815FFEF - trainerbattle 0, OPPONENT_ANETTE, 0, SSTidalRooms_Text_199A62, SSTidalRooms_Text_199ABF + trainerbattle 0, TRAINER_ANETTE, 0, SSTidalRooms_Text_199A62, SSTidalRooms_Text_199ABF msgbox SSTidalRooms_Text_199ADE, 6 end diff --git a/data/maps/SeafloorCavern_Room1/scripts.inc b/data/maps/SeafloorCavern_Room1/scripts.inc index 6478efac1..cd1513ec1 100644 --- a/data/maps/SeafloorCavern_Room1/scripts.inc +++ b/data/maps/SeafloorCavern_Room1/scripts.inc @@ -7,11 +7,11 @@ SeafloorCavern_Room1_MapScript1_15DA67:: @ 815DA67 end SeafloorCavern_Room1_EventScript_15DA6D:: @ 815DA6D - trainerbattle 0, OPPONENT_SEAFLOOR_CAVERN_GRUNT_1, 0, SeafloorCavern_Room1_Text_1974BA, SeafloorCavern_Room1_Text_1974EA + trainerbattle 0, TRAINER_SEAFLOOR_CAVERN_GRUNT_1, 0, SeafloorCavern_Room1_Text_1974BA, SeafloorCavern_Room1_Text_1974EA msgbox SeafloorCavern_Room1_Text_1974FF, 6 end SeafloorCavern_Room1_EventScript_15DA84:: @ 815DA84 - trainerbattle 0, OPPONENT_SEAFLOOR_CAVERN_GRUNT_2, 0, SeafloorCavern_Room1_Text_19753C, SeafloorCavern_Room1_Text_197573 + trainerbattle 0, TRAINER_SEAFLOOR_CAVERN_GRUNT_2, 0, SeafloorCavern_Room1_Text_19753C, SeafloorCavern_Room1_Text_197573 msgbox SeafloorCavern_Room1_Text_197589, 6 end diff --git a/data/maps/SeafloorCavern_Room3/scripts.inc b/data/maps/SeafloorCavern_Room3/scripts.inc index 2ff8c4b26..57f2bc20a 100644 --- a/data/maps/SeafloorCavern_Room3/scripts.inc +++ b/data/maps/SeafloorCavern_Room3/scripts.inc @@ -7,6 +7,6 @@ SeafloorCavern_Room3_MapScript1_15DAA2:: @ 815DAA2 end SeafloorCavern_Room3_EventScript_15DAA8:: @ 815DAA8 - trainerbattle 0, OPPONENT_SEAFLOOR_CAVERN_GRUNT_3, 0, SeafloorCavern_Room3_Text_1975DC, SeafloorCavern_Room3_Text_1976F3 + trainerbattle 0, TRAINER_SEAFLOOR_CAVERN_GRUNT_3, 0, SeafloorCavern_Room3_Text_1975DC, SeafloorCavern_Room3_Text_1976F3 msgbox SeafloorCavern_Room3_Text_197704, 6 end diff --git a/data/maps/SeafloorCavern_Room4/scripts.inc b/data/maps/SeafloorCavern_Room4/scripts.inc index cbed797c0..8f53d948c 100644 --- a/data/maps/SeafloorCavern_Room4/scripts.inc +++ b/data/maps/SeafloorCavern_Room4/scripts.inc @@ -7,6 +7,6 @@ SeafloorCavern_Room4_MapScript1_15DAC5:: @ 815DAC5 end SeafloorCavern_Room4_EventScript_15DACB:: @ 815DACB - trainerbattle 0, OPPONENT_SEAFLOOR_CAVERN_GRUNT_4, 0, SeafloorCavern_Room4_Text_1977B9, SeafloorCavern_Room4_Text_1977E2 + trainerbattle 0, TRAINER_SEAFLOOR_CAVERN_GRUNT_4, 0, SeafloorCavern_Room4_Text_1977B9, SeafloorCavern_Room4_Text_1977E2 msgbox SeafloorCavern_Room4_Text_1977ED, 6 end diff --git a/data/maps/SeafloorCavern_Room9/scripts.inc b/data/maps/SeafloorCavern_Room9/scripts.inc index 74d624141..d50a591f7 100644 --- a/data/maps/SeafloorCavern_Room9/scripts.inc +++ b/data/maps/SeafloorCavern_Room9/scripts.inc @@ -53,9 +53,9 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA msgbox SeafloorCavern_Room9_Text_1B491F, 4 .endif .ifdef SAPPHIRE - trainerbattle 3, OPPONENT_SEAFLOOR_CAVERN_GRUNT_5, 0, UnknownString_81B4319 + trainerbattle 3, TRAINER_SEAFLOOR_CAVERN_GRUNT_5, 0, UnknownString_81B4319 .else - trainerbattle 3, OPPONENT_SEAFLOOR_CAVERN_GRUNT_5, 0, SeafloorCavern_Room9_Text_1B49AE + trainerbattle 3, TRAINER_SEAFLOOR_CAVERN_GRUNT_5, 0, SeafloorCavern_Room9_Text_1B49AE .endif .ifdef SAPPHIRE msgbox UnknownString_81B432C, 4 diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc index ce0bc855f..58e4ba240 100644 --- a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc +++ b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc @@ -37,7 +37,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6 call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_155E78 compare FACING, 3 call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_155E83 - trainerbattle 3, OPPONENT_MUSEUM_2F_GRUNT_1, 0, SlateportCity_OceanicMuseum_2F_Text_17EE4E + trainerbattle 3, TRAINER_MUSEUM_2F_GRUNT_1, 0, SlateportCity_OceanicMuseum_2F_Text_17EE4E msgbox SlateportCity_OceanicMuseum_2F_Text_17EE66, 4 closemessage applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_155EBF @@ -46,7 +46,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6 waitmovement 0 msgbox SlateportCity_OceanicMuseum_2F_Text_17EEA5, 4 savebgm 0 - trainerbattle 3, OPPONENT_MUSEUM_2F_GRUNT_2, 0, SlateportCity_OceanicMuseum_2F_Text_17EED6 + trainerbattle 3, TRAINER_MUSEUM_2F_GRUNT_2, 0, SlateportCity_OceanicMuseum_2F_Text_17EED6 applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_155EBF waitmovement 0 applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_1A0845 diff --git a/data/maps/SootopolisCity_Gym_1F/scripts.inc b/data/maps/SootopolisCity_Gym_1F/scripts.inc index a404013e0..a918c0568 100644 --- a/data/maps/SootopolisCity_Gym_1F/scripts.inc +++ b/data/maps/SootopolisCity_Gym_1F/scripts.inc @@ -86,7 +86,7 @@ SootopolisCity_Gym_1F_Movement_15AFFD:: @ 815AFFD end_movement SootopolisCity_Gym_1F_EventScript_15AFFF:: @ 815AFFF - trainerbattle 1, OPPONENT_WALLACE, 0, SootopolisCity_Gym_1F_Text_18F0CA, SootopolisCity_Gym_1F_Text_18F282, SootopolisCity_Gym_1F_EventScript_15B02D + trainerbattle 1, TRAINER_WALLACE, 0, SootopolisCity_Gym_1F_Text_18F0CA, SootopolisCity_Gym_1F_Text_18F282, SootopolisCity_Gym_1F_EventScript_15B02D goto_if_unset FLAG_RECEIVED_TM03, SootopolisCity_Gym_1F_EventScript_15B056 goto_if_unset FLAG_BADGE06_GET, SootopolisCity_Gym_1F_EventScript_15B07A msgbox SootopolisCity_Gym_1F_Text_18F4D7, 4 diff --git a/data/maps/SootopolisCity_Gym_B1F/scripts.inc b/data/maps/SootopolisCity_Gym_B1F/scripts.inc index e54970701..06c7d33a3 100644 --- a/data/maps/SootopolisCity_Gym_B1F/scripts.inc +++ b/data/maps/SootopolisCity_Gym_B1F/scripts.inc @@ -2,41 +2,41 @@ SootopolisCity_Gym_B1F_MapScripts:: @ 815B0D7 .byte 0 SootopolisCity_Gym_B1F_EventScript_15B0D8:: @ 815B0D8 - trainerbattle 0, OPPONENT_ANDREA, 0, SootopolisCity_Gym_B1F_Text_18EA87, SootopolisCity_Gym_B1F_Text_18EACF + trainerbattle 0, TRAINER_ANDREA, 0, SootopolisCity_Gym_B1F_Text_18EA87, SootopolisCity_Gym_B1F_Text_18EACF msgbox SootopolisCity_Gym_B1F_Text_18EAED, 6 end SootopolisCity_Gym_B1F_EventScript_15B0EF:: @ 815B0EF - trainerbattle 0, OPPONENT_CRISSY, 0, SootopolisCity_Gym_B1F_Text_18EB22, SootopolisCity_Gym_B1F_Text_18EB81 + trainerbattle 0, TRAINER_CRISSY, 0, SootopolisCity_Gym_B1F_Text_18EB22, SootopolisCity_Gym_B1F_Text_18EB81 msgbox SootopolisCity_Gym_B1F_Text_18EBB1, 6 end SootopolisCity_Gym_B1F_EventScript_15B106:: @ 815B106 - trainerbattle 0, OPPONENT_BRIANNA_2, 0, SootopolisCity_Gym_B1F_Text_18EBFA, SootopolisCity_Gym_B1F_Text_18EC5E + trainerbattle 0, TRAINER_BRIANNA_2, 0, SootopolisCity_Gym_B1F_Text_18EBFA, SootopolisCity_Gym_B1F_Text_18EC5E msgbox SootopolisCity_Gym_B1F_Text_18EC92, 6 end SootopolisCity_Gym_B1F_EventScript_15B11D:: @ 815B11D - trainerbattle 0, OPPONENT_CONNIE, 0, SootopolisCity_Gym_B1F_Text_18ECEB, SootopolisCity_Gym_B1F_Text_18ED18 + trainerbattle 0, TRAINER_CONNIE, 0, SootopolisCity_Gym_B1F_Text_18ECEB, SootopolisCity_Gym_B1F_Text_18ED18 msgbox SootopolisCity_Gym_B1F_Text_18ED2B, 6 end SootopolisCity_Gym_B1F_EventScript_15B134:: @ 815B134 - trainerbattle 0, OPPONENT_BRIDGET, 0, SootopolisCity_Gym_B1F_Text_18ED91, SootopolisCity_Gym_B1F_Text_18EDE8 + trainerbattle 0, TRAINER_BRIDGET, 0, SootopolisCity_Gym_B1F_Text_18ED91, SootopolisCity_Gym_B1F_Text_18EDE8 msgbox SootopolisCity_Gym_B1F_Text_18EE03, 6 end SootopolisCity_Gym_B1F_EventScript_15B14B:: @ 815B14B - trainerbattle 0, OPPONENT_OLIVIA, 0, SootopolisCity_Gym_B1F_Text_18EE96, SootopolisCity_Gym_B1F_Text_18EEDC + trainerbattle 0, TRAINER_OLIVIA, 0, SootopolisCity_Gym_B1F_Text_18EE96, SootopolisCity_Gym_B1F_Text_18EEDC msgbox SootopolisCity_Gym_B1F_Text_18EEF7, 6 end SootopolisCity_Gym_B1F_EventScript_15B162:: @ 815B162 - trainerbattle 0, OPPONENT_TIFFANY, 0, SootopolisCity_Gym_B1F_Text_18EF39, SootopolisCity_Gym_B1F_Text_18EFB8 + trainerbattle 0, TRAINER_TIFFANY, 0, SootopolisCity_Gym_B1F_Text_18EF39, SootopolisCity_Gym_B1F_Text_18EFB8 msgbox SootopolisCity_Gym_B1F_Text_18EFCA, 6 end SootopolisCity_Gym_B1F_EventScript_15B179:: @ 815B179 - trainerbattle 0, OPPONENT_MARISSA, 0, SootopolisCity_Gym_B1F_Text_18F037, SootopolisCity_Gym_B1F_Text_18F07F + trainerbattle 0, TRAINER_MARISSA, 0, SootopolisCity_Gym_B1F_Text_18F037, SootopolisCity_Gym_B1F_Text_18F07F msgbox SootopolisCity_Gym_B1F_Text_18F085, 6 end diff --git a/data/maps/VictoryRoad_1F/scripts.inc b/data/maps/VictoryRoad_1F/scripts.inc index 045189759..b4931325a 100644 --- a/data/maps/VictoryRoad_1F/scripts.inc +++ b/data/maps/VictoryRoad_1F/scripts.inc @@ -38,7 +38,7 @@ VictoryRoad_1F_EventScript_15DED3:: @ 815DED3 applymovement 255, VictoryRoad_1F_Movement_1A083F waitmovement 0 msgbox VictoryRoad_1F_Text_19782B, 4 - trainerbattle 3, OPPONENT_WALLY_1, 0, VictoryRoad_1F_Text_197943 + trainerbattle 3, TRAINER_WALLY_1, 0, VictoryRoad_1F_Text_197943 msgbox VictoryRoad_1F_Text_197967, 4 clearflag FLAG_HIDE_WALLY_BATTLE_VICTORY_ROAD moveobjectoffscreen 4 @@ -91,7 +91,7 @@ VictoryRoad_1F_EventScript_15DF28:: @ 815DF28 end VictoryRoad_1F_EventScript_15DF31:: @ 815DF31 - trainerbattle 0, OPPONENT_WALLY_3, 0, VictoryRoad_1F_Text_1979BA, VictoryRoad_1F_Text_197A23 + trainerbattle 0, TRAINER_WALLY_3, 0, VictoryRoad_1F_Text_1979BA, VictoryRoad_1F_Text_197A23 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq VictoryRoad_1F_EventScript_15DF58 @@ -99,21 +99,21 @@ VictoryRoad_1F_EventScript_15DF31:: @ 815DF31 end VictoryRoad_1F_EventScript_15DF58:: @ 815DF58 - trainerbattle 5, OPPONENT_WALLY_3, 0, VictoryRoad_1F_Text_1979BA, VictoryRoad_1F_Text_197A23 + trainerbattle 5, TRAINER_WALLY_3, 0, VictoryRoad_1F_Text_1979BA, VictoryRoad_1F_Text_197A23 msgbox VictoryRoad_1F_Text_197A47, 6 end VictoryRoad_1F_EventScript_15DF6F:: @ 815DF6F - trainerbattle 0, OPPONENT_EDGAR, 0, VictoryRoad_1F_Text_197AD1, VictoryRoad_1F_Text_197B1A + trainerbattle 0, TRAINER_EDGAR, 0, VictoryRoad_1F_Text_197AD1, VictoryRoad_1F_Text_197B1A msgbox VictoryRoad_1F_Text_197B36, 6 end VictoryRoad_1F_EventScript_15DF86:: @ 815DF86 - trainerbattle 0, OPPONENT_ALBERT, 0, VictoryRoad_1F_Text_197B99, VictoryRoad_1F_Text_197BE1 + trainerbattle 0, TRAINER_ALBERT, 0, VictoryRoad_1F_Text_197B99, VictoryRoad_1F_Text_197BE1 msgbox VictoryRoad_1F_Text_197BF7, 6 end VictoryRoad_1F_EventScript_15DF9D:: @ 815DF9D - trainerbattle 0, OPPONENT_HOPE, 0, VictoryRoad_1F_Text_197C45, VictoryRoad_1F_Text_197C8D + trainerbattle 0, TRAINER_HOPE, 0, VictoryRoad_1F_Text_197C45, VictoryRoad_1F_Text_197C8D msgbox VictoryRoad_1F_Text_197CAF, 6 end diff --git a/data/maps/VictoryRoad_B1F/scripts.inc b/data/maps/VictoryRoad_B1F/scripts.inc index e07cd4286..5667866d7 100644 --- a/data/maps/VictoryRoad_B1F/scripts.inc +++ b/data/maps/VictoryRoad_B1F/scripts.inc @@ -2,16 +2,16 @@ VictoryRoad_B1F_MapScripts:: @ 815DFB4 .byte 0 VictoryRoad_B1F_EventScript_15DFB5:: @ 815DFB5 - trainerbattle 0, OPPONENT_SAMUEL, 0, VictoryRoad_B1F_Text_197CE9, VictoryRoad_B1F_Text_197D42 + trainerbattle 0, TRAINER_SAMUEL, 0, VictoryRoad_B1F_Text_197CE9, VictoryRoad_B1F_Text_197D42 msgbox VictoryRoad_B1F_Text_197D5B, 6 end VictoryRoad_B1F_EventScript_15DFCC:: @ 815DFCC - trainerbattle 0, OPPONENT_SHANNON, 0, VictoryRoad_B1F_Text_197D98, VictoryRoad_B1F_Text_197DE8 + trainerbattle 0, TRAINER_SHANNON, 0, VictoryRoad_B1F_Text_197D98, VictoryRoad_B1F_Text_197DE8 msgbox VictoryRoad_B1F_Text_197E13, 6 end VictoryRoad_B1F_EventScript_15DFE3:: @ 815DFE3 - trainerbattle 0, OPPONENT_MICHELLE, 0, VictoryRoad_B1F_Text_197E5D, VictoryRoad_B1F_Text_197EA6 + trainerbattle 0, TRAINER_MICHELLE, 0, VictoryRoad_B1F_Text_197E5D, VictoryRoad_B1F_Text_197EA6 msgbox VictoryRoad_B1F_Text_197EB6, 6 end diff --git a/data/maps/VictoryRoad_B2F/scripts.inc b/data/maps/VictoryRoad_B2F/scripts.inc index 6b8fe2569..929af39e8 100644 --- a/data/maps/VictoryRoad_B2F/scripts.inc +++ b/data/maps/VictoryRoad_B2F/scripts.inc @@ -2,21 +2,21 @@ VictoryRoad_B2F_MapScripts:: @ 815DFFA .byte 0 VictoryRoad_B2F_EventScript_15DFFB:: @ 815DFFB - trainerbattle 0, OPPONENT_VITO, 0, VictoryRoad_B2F_Text_197EF2, VictoryRoad_B2F_Text_197F46 + trainerbattle 0, TRAINER_VITO, 0, VictoryRoad_B2F_Text_197EF2, VictoryRoad_B2F_Text_197F46 msgbox VictoryRoad_B2F_Text_197F71, 6 end VictoryRoad_B2F_EventScript_15E012:: @ 815E012 - trainerbattle 0, OPPONENT_OWEN, 0, VictoryRoad_B2F_Text_197FE5, VictoryRoad_B2F_Text_19802B + trainerbattle 0, TRAINER_OWEN, 0, VictoryRoad_B2F_Text_197FE5, VictoryRoad_B2F_Text_19802B msgbox VictoryRoad_B2F_Text_198047, 6 end VictoryRoad_B2F_EventScript_15E029:: @ 815E029 - trainerbattle 0, OPPONENT_CAROLINE, 0, VictoryRoad_B2F_Text_198089, VictoryRoad_B2F_Text_1980AD + trainerbattle 0, TRAINER_CAROLINE, 0, VictoryRoad_B2F_Text_198089, VictoryRoad_B2F_Text_1980AD msgbox VictoryRoad_B2F_Text_1980C8, 6 end VictoryRoad_B2F_EventScript_15E040:: @ 815E040 - trainerbattle 0, OPPONENT_JULIE, 0, VictoryRoad_B2F_Text_198121, VictoryRoad_B2F_Text_1981A3 + trainerbattle 0, TRAINER_JULIE, 0, VictoryRoad_B2F_Text_198121, VictoryRoad_B2F_Text_1981A3 msgbox VictoryRoad_B2F_Text_1981BA, 6 end diff --git a/data/scripts/gabby_and_ty.inc b/data/scripts/gabby_and_ty.inc index 957d56609..b1c47fa62 100644 --- a/data/scripts/gabby_and_ty.inc +++ b/data/scripts/gabby_and_ty.inc @@ -1,7 +1,7 @@ Route111_EventScript_1AE313:: @ 81AE313 Route118_EventScript_1AE313:: @ 81AE313 Route120_EventScript_1AE313:: @ 81AE313 - cleartrainerflag OPPONENT_GABBY_AND_TY_6 + cleartrainerflag TRAINER_GABBY_AND_TY_6 specialvar RESULT, GabbyAndTyGetBattleNum switch RESULT case 0, Route111_EventScript_1AE384 @@ -124,61 +124,61 @@ Route111_EventScript_1AE41E:: @ 81AE41E return Route111_EventScript_1AE422:: @ 81AE422 - trainerbattle 6, OPPONENT_GABBY_AND_TY_1, 0, Route111_Text_1ABED8, Route111_Text_1ABFD3, Route111_Text_1AC5CA, Route111_EventScript_1AE5A2 + trainerbattle 6, TRAINER_GABBY_AND_TY_1, 0, Route111_Text_1ABED8, Route111_Text_1ABFD3, Route111_Text_1AC5CA, Route111_EventScript_1AE5A2 msgbox Route111_Text_1AC59E, 4 release end Route111_EventScript_1AE442:: @ 81AE442 - trainerbattle 6, OPPONENT_GABBY_AND_TY_1, 0, Route111_Text_1AC73B, Route111_Text_1AC892, Route111_Text_1AC820, Route111_EventScript_1AE5A2 + trainerbattle 6, TRAINER_GABBY_AND_TY_1, 0, Route111_Text_1AC73B, Route111_Text_1AC892, Route111_Text_1AC820, Route111_EventScript_1AE5A2 msgbox Route111_Text_1AC7E4, 4 release end Route118_EventScript_1AE462:: @ 81AE462 - trainerbattle 6, OPPONENT_GABBY_AND_TY_2, 0, Route118_Text_1ABF50, Route118_Text_1AC6F8, Route118_Text_1AC5CA, Route118_EventScript_1AE60F + trainerbattle 6, TRAINER_GABBY_AND_TY_2, 0, Route118_Text_1ABF50, Route118_Text_1AC6F8, Route118_Text_1AC5CA, Route118_EventScript_1AE60F msgbox Route118_Text_1AC59E, 4 release end Route118_EventScript_1AE482:: @ 81AE482 - trainerbattle 6, OPPONENT_GABBY_AND_TY_2, 0, Route118_Text_1AC790, Route118_Text_1AC8D7, Route118_Text_1AC820, Route118_EventScript_1AE60F + trainerbattle 6, TRAINER_GABBY_AND_TY_2, 0, Route118_Text_1AC790, Route118_Text_1AC8D7, Route118_Text_1AC820, Route118_EventScript_1AE60F msgbox Route118_Text_1AC7E4, 4 release end Route120_EventScript_1AE4A2:: @ 81AE4A2 - trainerbattle 6, OPPONENT_GABBY_AND_TY_3, 0, Route120_Text_1ABF50, Route120_Text_1AC6F8, Route120_Text_1AC5CA, Route120_EventScript_1AE60F + trainerbattle 6, TRAINER_GABBY_AND_TY_3, 0, Route120_Text_1ABF50, Route120_Text_1AC6F8, Route120_Text_1AC5CA, Route120_EventScript_1AE60F msgbox Route120_Text_1AC59E, 4 release end Route120_EventScript_1AE4C2:: @ 81AE4C2 - trainerbattle 6, OPPONENT_GABBY_AND_TY_3, 0, Route120_Text_1AC790, Route120_Text_1AC8D7, Route120_Text_1AC820, Route120_EventScript_1AE60F + trainerbattle 6, TRAINER_GABBY_AND_TY_3, 0, Route120_Text_1AC790, Route120_Text_1AC8D7, Route120_Text_1AC820, Route120_EventScript_1AE60F msgbox Route120_Text_1AC7E4, 4 release end Route111_EventScript_1AE4E2:: @ 81AE4E2 - trainerbattle 6, OPPONENT_GABBY_AND_TY_4, 0, Route111_Text_1ABF50, Route111_Text_1AC6F8, Route111_Text_1AC5CA, Route111_EventScript_1AE60F + trainerbattle 6, TRAINER_GABBY_AND_TY_4, 0, Route111_Text_1ABF50, Route111_Text_1AC6F8, Route111_Text_1AC5CA, Route111_EventScript_1AE60F msgbox Route111_Text_1AC59E, 4 release end Route111_EventScript_1AE502:: @ 81AE502 - trainerbattle 6, OPPONENT_GABBY_AND_TY_4, 0, Route111_Text_1AC790, Route111_Text_1AC8D7, Route111_Text_1AC820, Route111_EventScript_1AE60F + trainerbattle 6, TRAINER_GABBY_AND_TY_4, 0, Route111_Text_1AC790, Route111_Text_1AC8D7, Route111_Text_1AC820, Route111_EventScript_1AE60F msgbox Route111_Text_1AC7E4, 4 release end Route118_EventScript_1AE522:: @ 81AE522 - trainerbattle 6, OPPONENT_GABBY_AND_TY_5, 0, Route118_Text_1ABF50, Route118_Text_1AC6F8, Route118_Text_1AC5CA, Route118_EventScript_1AE60F + trainerbattle 6, TRAINER_GABBY_AND_TY_5, 0, Route118_Text_1ABF50, Route118_Text_1AC6F8, Route118_Text_1AC5CA, Route118_EventScript_1AE60F msgbox Route118_Text_1AC59E, 4 release end Route118_EventScript_1AE542:: @ 81AE542 - trainerbattle 6, OPPONENT_GABBY_AND_TY_5, 0, Route118_Text_1AC790, Route118_Text_1AC8D7, Route118_Text_1AC820, Route118_EventScript_1AE60F + trainerbattle 6, TRAINER_GABBY_AND_TY_5, 0, Route118_Text_1AC790, Route118_Text_1AC8D7, Route118_Text_1AC820, Route118_EventScript_1AE60F msgbox Route118_Text_1AC7E4, 4 release end @@ -186,7 +186,7 @@ Route118_EventScript_1AE542:: @ 81AE542 Route111_EventScript_1AE562:: @ 81AE562 Route118_EventScript_1AE562:: @ 81AE562 Route120_EventScript_1AE562:: @ 81AE562 - trainerbattle 6, OPPONENT_GABBY_AND_TY_6, 0, Route111_Text_1ABF50, Route111_Text_1AC6F8, Route111_Text_1AC5CA, Route111_EventScript_1AE60F + trainerbattle 6, TRAINER_GABBY_AND_TY_6, 0, Route111_Text_1ABF50, Route111_Text_1AC6F8, Route111_Text_1AC5CA, Route111_EventScript_1AE60F msgbox Route111_Text_1AC59E, 4 release end @@ -194,7 +194,7 @@ Route120_EventScript_1AE562:: @ 81AE562 Route111_EventScript_1AE582:: @ 81AE582 Route118_EventScript_1AE582:: @ 81AE582 Route120_EventScript_1AE582:: @ 81AE582 - trainerbattle 6, OPPONENT_GABBY_AND_TY_6, 0, Route111_Text_1AC790, Route111_Text_1AC8D7, Route111_Text_1AC820, Route111_EventScript_1AE60F + trainerbattle 6, TRAINER_GABBY_AND_TY_6, 0, Route111_Text_1AC790, Route111_Text_1AC8D7, Route111_Text_1AC820, Route111_EventScript_1AE60F msgbox Route111_Text_1AC7E4, 4 release end diff --git a/data/scripts/magma_chimney.inc b/data/scripts/magma_chimney.inc index ed81e6628..daa8c96db 100644 --- a/data/scripts/magma_chimney.inc +++ b/data/scripts/magma_chimney.inc @@ -46,9 +46,9 @@ MtChimney_EventScript_1B2CCB:: @ 81B2CCB msgbox MtChimney_Text_1B38B3, 4 .endif .ifdef SAPPHIRE - trainerbattle 3, OPPONENT_MT_CHIMNEY_GRUNT_3, 0, MtChimney_Text_1B3099 + trainerbattle 3, TRAINER_MT_CHIMNEY_GRUNT_3, 0, MtChimney_Text_1B3099 .else - trainerbattle 3, OPPONENT_MT_CHIMNEY_GRUNT_3, 0, MtChimney_Text_1B3A68 + trainerbattle 3, TRAINER_MT_CHIMNEY_GRUNT_3, 0, MtChimney_Text_1B3A68 .endif .ifdef SAPPHIRE msgbox MtChimney_Text_1B30C2, 4 diff --git a/data/scripts/magma_summit.inc b/data/scripts/magma_summit.inc index ac71b038f..0992a62c0 100644 --- a/data/scripts/magma_summit.inc +++ b/data/scripts/magma_summit.inc @@ -1,29 +1,29 @@ MtPyre_Summit_EventScript_1B2DA9:: @ 81B2DA9 .ifdef SAPPHIRE - trainerbattle 0, OPPONENT_MT_PYRE_SUMMIT_GRUNT_1, 0, UnknownString_81B50C3, UnknownString_81B50F5 + trainerbattle 0, TRAINER_MT_PYRE_SUMMIT_GRUNT_1, 0, UnknownString_81B50C3, UnknownString_81B50F5 msgbox UnknownString_81B5131, 6 .else - trainerbattle 0, OPPONENT_MT_PYRE_SUMMIT_GRUNT_1, 0, MtPyre_Summit_Text_1B5CFD, MtPyre_Summit_Text_1B5D30 + trainerbattle 0, TRAINER_MT_PYRE_SUMMIT_GRUNT_1, 0, MtPyre_Summit_Text_1B5CFD, MtPyre_Summit_Text_1B5D30 msgbox MtPyre_Summit_Text_1B5D6D, 6 .endif end MtPyre_Summit_EventScript_1B2DC0:: @ 81B2DC0 .ifdef SAPPHIRE - trainerbattle 0, OPPONENT_MT_PYRE_SUMMIT_GRUNT_2, 0, UnknownString_81B5166, UnknownString_81B519F + trainerbattle 0, TRAINER_MT_PYRE_SUMMIT_GRUNT_2, 0, UnknownString_81B5166, UnknownString_81B519F msgbox UnknownString_81B51B5, 6 .else - trainerbattle 0, OPPONENT_MT_PYRE_SUMMIT_GRUNT_2, 0, MtPyre_Summit_Text_1B5DA2, MtPyre_Summit_Text_1B5DDB + trainerbattle 0, TRAINER_MT_PYRE_SUMMIT_GRUNT_2, 0, MtPyre_Summit_Text_1B5DA2, MtPyre_Summit_Text_1B5DDB msgbox MtPyre_Summit_Text_1B5DF1, 6 .endif end MtPyre_Summit_EventScript_1B2DD7:: @ 81B2DD7 .ifdef SAPPHIRE - trainerbattle 0, OPPONENT_MT_PYRE_SUMMIT_GRUNT_3, 0, UnknownString_81B51EB, UnknownString_81B5224 + trainerbattle 0, TRAINER_MT_PYRE_SUMMIT_GRUNT_3, 0, UnknownString_81B51EB, UnknownString_81B5224 msgbox UnknownString_81B5248, 6 .else - trainerbattle 0, OPPONENT_MT_PYRE_SUMMIT_GRUNT_3, 0, MtPyre_Summit_Text_1B5E27, MtPyre_Summit_Text_1B5E60 + trainerbattle 0, TRAINER_MT_PYRE_SUMMIT_GRUNT_3, 0, MtPyre_Summit_Text_1B5E27, MtPyre_Summit_Text_1B5E60 msgbox MtPyre_Summit_Text_1B5E84, 6 .endif end diff --git a/include/constants/opponents.h b/include/constants/opponents.h index d907153bd..11dd87ec4 100644 --- a/include/constants/opponents.h +++ b/include/constants/opponents.h @@ -1,699 +1,699 @@ #ifndef GUARD_CONSTANTS_OPPONENTS_H #define GUARD_CONSTANTS_OPPONENTS_H -#define OPPONENT_NONE 0 -#define OPPONENT_ARCHIE_1 1 -#define OPPONENT_GRUNT_1 2 -#define OPPONENT_GRUNT_2 3 -#define OPPONENT_GRUNT_3 4 -#define OPPONENT_GRUNT_4 5 -#define OPPONENT_GRUNT_5 6 -#define OPPONENT_GRUNT_6 7 -#define OPPONENT_GRUNT_7 8 -#define OPPONENT_GRUNT_8 9 -#define OPPONENT_GRUNT_9 10 -#define OPPONENT_GRUNT_10 11 -#define OPPONENT_GRUNT_11 12 -#define OPPONENT_GRUNT_12 13 -#define OPPONENT_GRUNT_13 14 -#define OPPONENT_GRUNT_14 15 -#define OPPONENT_GRUNT_15 16 -#define OPPONENT_GRUNT_16 17 -#define OPPONENT_GRUNT_17 18 -#define OPPONENT_GRUNT_18 19 -#define OPPONENT_GRUNT_19 20 -#define OPPONENT_GRUNT_20 21 -#define OPPONENT_GRUNT_21 22 -#define OPPONENT_GRUNT_22 23 -#define OPPONENT_GRUNT_23 24 -#define OPPONENT_GRUNT_24 25 -#define OPPONENT_GRUNT_25 26 -#define OPPONENT_GRUNT_26 27 -#define OPPONENT_GRUNT_27 28 -#define OPPONENT_ANONYMOUS_1 29 -#define OPPONENT_MATT_1 30 -#define OPPONENT_MATT_2 31 -#define OPPONENT_SHELLY_1 32 -#define OPPONENT_SHELLY_2 33 -#define OPPONENT_ARCHIE_2 34 -#define OPPONENT_ARCHIE_3 35 -#define OPPONENT_DAISY 36 -#define OPPONENT_ROSE_1 37 -#define OPPONENT_LILY 38 -#define OPPONENT_VIOLET 39 -#define OPPONENT_ROSE_2 40 -#define OPPONENT_ROSE_3 41 -#define OPPONENT_ROSE_4 42 -#define OPPONENT_ROSE_5 43 -#define OPPONENT_DUSTY_1 44 -#define OPPONENT_CHIP 45 -#define OPPONENT_FOSTER 46 -#define OPPONENT_DUSTY_2 47 -#define OPPONENT_DUSTY_3 48 -#define OPPONENT_DUSTY_4 49 -#define OPPONENT_DUSTY_5 50 -#define OPPONENT_GABBY_AND_TY_1 51 -#define OPPONENT_GABBY_AND_TY_2 52 -#define OPPONENT_GABBY_AND_TY_3 53 -#define OPPONENT_GABBY_AND_TY_4 54 -#define OPPONENT_GABBY_AND_TY_5 55 -#define OPPONENT_GABBY_AND_TY_6 56 -#define OPPONENT_LOLA_1 57 -#define OPPONENT_CARMEN 58 -#define OPPONENT_GWEN 59 -#define OPPONENT_LOLA_2 60 -#define OPPONENT_LOLA_3 61 -#define OPPONENT_LOLA_4 62 -#define OPPONENT_LOLA_5 63 -#define OPPONENT_RICKY_1 64 -#define OPPONENT_SIMON 65 -#define OPPONENT_CHARLIE 66 -#define OPPONENT_RICKY_2 67 -#define OPPONENT_RICKY_3 68 -#define OPPONENT_RICKY_4 69 -#define OPPONENT_RICKY_5 70 -#define OPPONENT_RANDALL 71 -#define OPPONENT_PARKER 72 -#define OPPONENT_GEORGE 73 -#define OPPONENT_BERKE 74 -#define OPPONENT_CLYDE 75 -#define OPPONENT_VINCENT 76 -#define OPPONENT_LEROY 77 -#define OPPONENT_WILTON_1 78 -#define OPPONENT_EDGAR 79 -#define OPPONENT_ALBERT 80 -#define OPPONENT_SAMUEL 81 -#define OPPONENT_VITO 82 -#define OPPONENT_OWEN 83 -#define OPPONENT_WILTON_2 84 -#define OPPONENT_WILTON_3 85 -#define OPPONENT_WILTON_4 86 -#define OPPONENT_WILTON_5 87 -#define OPPONENT_WARREN 88 -#define OPPONENT_MARY 89 -#define OPPONENT_LORI 90 -#define OPPONENT_JODY 91 -#define OPPONENT_WENDY 92 -#define OPPONENT_ELAINE 93 -#define OPPONENT_BROOKE_1 94 -#define OPPONENT_JENNIFER 95 -#define OPPONENT_HOPE 96 -#define OPPONENT_SHANNON 97 -#define OPPONENT_MICHELLE 98 -#define OPPONENT_CAROLINE 99 -#define OPPONENT_JULIE 100 -#define OPPONENT_BROOKE_2 101 -#define OPPONENT_BROOKE_3 102 -#define OPPONENT_BROOKE_4 103 -#define OPPONENT_BROOKE_5 104 -#define OPPONENT_PATRICIA 105 -#define OPPONENT_KINDRA 106 -#define OPPONENT_TAMMY 107 -#define OPPONENT_VALERIE_1 108 -#define OPPONENT_TASHA 109 -#define OPPONENT_VALERIE_2 110 -#define OPPONENT_VALERIE_3 111 -#define OPPONENT_VALERIE_4 112 -#define OPPONENT_VALERIE_5 113 -#define OPPONENT_CINDY_1 114 -#define OPPONENT_ANONYMOUS_2 115 -#define OPPONENT_BRIANNA_1 116 -#define OPPONENT_CINDY_2 117 -#define OPPONENT_BRIANNA_2 118 -#define OPPONENT_ANETTE 119 -#define OPPONENT_CINDY_3 120 -#define OPPONENT_CINDY_4 121 -#define OPPONENT_CINDY_5 122 -#define OPPONENT_CINDY_6 123 -#define OPPONENT_MELISSA 124 -#define OPPONENT_SHEILA 125 -#define OPPONENT_SHIRLEY 126 -#define OPPONENT_JESSICA_1 127 -#define OPPONENT_CONNIE 128 -#define OPPONENT_BRIDGET 129 -#define OPPONENT_OLIVIA 130 -#define OPPONENT_TIFFANY 131 -#define OPPONENT_JESSICA_2 132 -#define OPPONENT_JESSICA_3 133 -#define OPPONENT_JESSICA_4 134 -#define OPPONENT_JESSICA_5 135 -#define OPPONENT_WINSTON_1 136 -#define OPPONENT_ANONYMOUS_3 137 -#define OPPONENT_GARRET 138 -#define OPPONENT_WINSTON_2 139 -#define OPPONENT_WINSTON_3 140 -#define OPPONENT_WINSTON_4 141 -#define OPPONENT_WINSTON_5 142 -#define OPPONENT_STEVE_1 143 -#define OPPONENT_CHRIS 144 -#define OPPONENT_MARK 145 -#define OPPONENT_KENN 146 -#define OPPONENT_STEVE_2 147 -#define OPPONENT_STEVE_3 148 -#define OPPONENT_STEVE_4 149 -#define OPPONENT_STEVE_5 150 -#define OPPONENT_LUIS 151 -#define OPPONENT_AUSTIN 152 -#define OPPONENT_DOUGLAS 153 -#define OPPONENT_DARRIN 154 -#define OPPONENT_TONY_1 155 -#define OPPONENT_JEROME 156 -#define OPPONENT_MATTHEW 157 -#define OPPONENT_DAVID 158 -#define OPPONENT_SPENCER 159 -#define OPPONENT_ROLAND 160 -#define OPPONENT_CODY 161 -#define OPPONENT_STAN 162 -#define OPPONENT_BARRY 163 -#define OPPONENT_DEAN 164 -#define OPPONENT_RODNEY 165 -#define OPPONENT_RICHARD 166 -#define OPPONENT_HERMAN 167 -#define OPPONENT_ANONYMOUS_4 168 -#define OPPONENT_GILBERT 169 -#define OPPONENT_FRANKLIN 170 -#define OPPONENT_DANNY 171 -#define OPPONENT_JACK 172 -#define OPPONENT_DUDLEY 173 -#define OPPONENT_CHAD 174 -#define OPPONENT_TONY_2 175 -#define OPPONENT_TONY_3 176 -#define OPPONENT_TONY_4 177 -#define OPPONENT_TONY_5 178 -#define OPPONENT_HIDEKI 179 -#define OPPONENT_HITOSHI 180 -#define OPPONENT_KIYO 181 -#define OPPONENT_KOICHI 182 -#define OPPONENT_NOB_1 183 -#define OPPONENT_NOB_2 184 -#define OPPONENT_NOB_3 185 -#define OPPONENT_NOB_4 186 -#define OPPONENT_NOB_5 187 -#define OPPONENT_YUJI 188 -#define OPPONENT_DAISUKE 189 -#define OPPONENT_ATSUSHI 190 -#define OPPONENT_KIRK 191 -#define OPPONENT_SCOTT 192 -#define OPPONENT_HARVEY 193 -#define OPPONENT_SHAWN 194 -#define OPPONENT_RANDY 195 -#define OPPONENT_DALTON_1 196 -#define OPPONENT_DALTON_2 197 -#define OPPONENT_DALTON_3 198 -#define OPPONENT_DALTON_4 199 -#define OPPONENT_DALTON_5 200 -#define OPPONENT_COLE 201 -#define OPPONENT_FLINT 202 -#define OPPONENT_AXLE 203 -#define OPPONENT_JAKE 204 -#define OPPONENT_ANDY 205 -#define OPPONENT_BERNIE_1 206 -#define OPPONENT_BERNIE_2 207 -#define OPPONENT_BERNIE_3 208 -#define OPPONENT_BERNIE_4 209 -#define OPPONENT_BERNIE_5 210 -#define OPPONENT_DREW 211 -#define OPPONENT_CLIFF 212 -#define OPPONENT_LARRY 213 -#define OPPONENT_SHANE 214 -#define OPPONENT_JUSTIN 215 -#define OPPONENT_ETHAN_1 216 -#define OPPONENT_JEFF 217 -#define OPPONENT_TRAVIS 218 -#define OPPONENT_ETHAN_2 219 -#define OPPONENT_ETHAN_3 220 -#define OPPONENT_ETHAN_4 221 -#define OPPONENT_ETHAN_5 222 -#define OPPONENT_BRENT 223 -#define OPPONENT_DONALD 224 -#define OPPONENT_TAYLOR 225 -#define OPPONENT_BRANDON_1 226 -#define OPPONENT_DEREK 227 -#define OPPONENT_BRANDON_2 228 -#define OPPONENT_BRANDON_3 229 -#define OPPONENT_BRANDON_4 230 -#define OPPONENT_BRANDON_5 231 -#define OPPONENT_EDWARD 232 -#define OPPONENT_PRESTON 233 -#define OPPONENT_VIRGIL 234 -#define OPPONENT_FRITZ 235 -#define OPPONENT_WILLIAM 236 -#define OPPONENT_JOSHUA 237 -#define OPPONENT_CAMERON_1 238 -#define OPPONENT_CAMERON_2 239 -#define OPPONENT_CAMERON_3 240 -#define OPPONENT_CAMERON_4 241 -#define OPPONENT_CAMERON_5 242 -#define OPPONENT_JACLYN 243 -#define OPPONENT_HANNAH 244 -#define OPPONENT_SAMANTHA 245 -#define OPPONENT_MAURA 246 -#define OPPONENT_KAYLA 247 -#define OPPONENT_ALEXIS 248 -#define OPPONENT_JACKI_1 249 -#define OPPONENT_JACKI_2 250 -#define OPPONENT_JACKI_3 251 -#define OPPONENT_JACKI_4 252 -#define OPPONENT_JACKI_5 253 -#define OPPONENT_WALTER_1 254 -#define OPPONENT_TUCKER 255 -#define OPPONENT_THOMAS 256 -#define OPPONENT_WALTER_2 257 -#define OPPONENT_WALTER_3 258 -#define OPPONENT_WALTER_4 259 -#define OPPONENT_WALTER_5 260 -#define OPPONENT_SIDNEY 261 -#define OPPONENT_PHOEBE 262 -#define OPPONENT_GLACIA 263 -#define OPPONENT_DRAKE 264 -#define OPPONENT_ROXANNE 265 -#define OPPONENT_BRAWLY 266 -#define OPPONENT_WATTSON 267 -#define OPPONENT_FLANNERY 268 -#define OPPONENT_NORMAN 269 -#define OPPONENT_WINONA 270 -#define OPPONENT_TATE_AND_LIZA 271 -#define OPPONENT_WALLACE 272 -#define OPPONENT_JERRY_1 273 -#define OPPONENT_TED 274 -#define OPPONENT_PAUL 275 -#define OPPONENT_JERRY_2 276 -#define OPPONENT_JERRY_3 277 -#define OPPONENT_JERRY_4 278 -#define OPPONENT_JERRY_5 279 -#define OPPONENT_KAREN_1 280 -#define OPPONENT_GEORGIA 281 -#define OPPONENT_KAREN_2 282 -#define OPPONENT_KAREN_3 283 -#define OPPONENT_KAREN_4 284 -#define OPPONENT_KAREN_5 285 -#define OPPONENT_KATE_AND_JOY 286 -#define OPPONENT_ANNA_AND_MEG_1 287 -#define OPPONENT_ANNA_AND_MEG_2 288 -#define OPPONENT_ANNA_AND_MEG_3 289 -#define OPPONENT_ANNA_AND_MEG_4 290 -#define OPPONENT_ANNA_AND_MEG_5 291 -#define OPPONENT_VICTOR 292 -#define OPPONENT_MIGUEL_1 293 -#define OPPONENT_COLTON 294 -#define OPPONENT_MIGUEL_2 295 -#define OPPONENT_MIGUEL_3 296 -#define OPPONENT_MIGUEL_4 297 -#define OPPONENT_MIGUEL_5 298 -#define OPPONENT_VICTORIA 299 -#define OPPONENT_VANESSA 300 -#define OPPONENT_MARISSA 301 -#define OPPONENT_ISABEL_1 302 -#define OPPONENT_ISABEL_2 303 -#define OPPONENT_ISABEL_3 304 -#define OPPONENT_ISABEL_4 305 -#define OPPONENT_ISABEL_5 306 -#define OPPONENT_TIMOTHY_1 307 -#define OPPONENT_TIMOTHY_2 308 -#define OPPONENT_TIMOTHY_3 309 -#define OPPONENT_TIMOTHY_4 310 -#define OPPONENT_TIMOTHY_5 311 -#define OPPONENT_VICKY 312 -#define OPPONENT_SHELBY_1 313 -#define OPPONENT_SHELBY_2 314 -#define OPPONENT_SHELBY_3 315 -#define OPPONENT_SHELBY_4 316 -#define OPPONENT_SHELBY_5 317 -#define OPPONENT_CALVIN_1 318 -#define OPPONENT_BILLY 319 -#define OPPONENT_JOSH 320 -#define OPPONENT_TOMMY 321 -#define OPPONENT_JOEY 322 -#define OPPONENT_BEN 323 -#define OPPONENT_ANONYMOUS_5 324 -#define OPPONENT_KEVIN 325 -#define OPPONENT_NEAL 326 -#define OPPONENT_DILLON 327 -#define OPPONENT_CALVIN_2 328 -#define OPPONENT_CALVIN_3 329 -#define OPPONENT_CALVIN_4 330 -#define OPPONENT_CALVIN_5 331 -#define OPPONENT_EDDIE 332 -#define OPPONENT_ALLEN 333 -#define OPPONENT_TIMMY 334 -#define OPPONENT_STEVEN 335 -#define OPPONENT_ANDREW 336 -#define OPPONENT_IVAN 337 -#define OPPONENT_CLAUDE 338 -#define OPPONENT_ELLIOT_1 339 -#define OPPONENT_NED 340 -#define OPPONENT_DALE 341 -#define OPPONENT_NOLAN 342 -#define OPPONENT_BARNY 343 -#define OPPONENT_WADE 344 -#define OPPONENT_CARTER 345 -#define OPPONENT_ELLIOT_2 346 -#define OPPONENT_ELLIOT_3 347 -#define OPPONENT_ELLIOT_4 348 -#define OPPONENT_ELLIOT_5 349 -#define OPPONENT_RONALD 350 -#define OPPONENT_JACOB 351 -#define OPPONENT_ANTHONY 352 -#define OPPONENT_BENJAMIN_1 353 -#define OPPONENT_BENJAMIN_2 354 -#define OPPONENT_BENJAMIN_3 355 -#define OPPONENT_BENJAMIN_4 356 -#define OPPONENT_BENJAMIN_5 357 -#define OPPONENT_ABIGAIL_1 358 -#define OPPONENT_JASMINE 359 -#define OPPONENT_ABIGAIL_2 360 -#define OPPONENT_ABIGAIL_3 361 -#define OPPONENT_ABIGAIL_4 362 -#define OPPONENT_ABIGAIL_5 363 -#define OPPONENT_DYLAN_1 364 -#define OPPONENT_DYLAN_2 365 -#define OPPONENT_DYLAN_3 366 -#define OPPONENT_DYLAN_4 367 -#define OPPONENT_DYLAN_5 368 -#define OPPONENT_MARIA_1 369 -#define OPPONENT_MARIA_2 370 -#define OPPONENT_MARIA_3 371 -#define OPPONENT_MARIA_4 372 -#define OPPONENT_MARIA_5 373 -#define OPPONENT_CALEB 374 -#define OPPONENT_ANONYMOUS_6 375 -#define OPPONENT_ISAIAH_1 376 -#define OPPONENT_ANONYMOUS_7 377 -#define OPPONENT_CHASE 378 -#define OPPONENT_ISAIAH_2 379 -#define OPPONENT_ISAIAH_3 380 -#define OPPONENT_ISAIAH_4 381 -#define OPPONENT_ISAIAH_5 382 -#define OPPONENT_ANONYMOUS_8 383 -#define OPPONENT_CONNOR 384 -#define OPPONENT_ANONYMOUS_9 385 -#define OPPONENT_KATELYN_1 386 -#define OPPONENT_ALLISON 387 -#define OPPONENT_KATELYN_2 388 -#define OPPONENT_KATELYN_3 389 -#define OPPONENT_KATELYN_4 390 -#define OPPONENT_KATELYN_5 391 -#define OPPONENT_NICOLAS_1 392 -#define OPPONENT_NICOLAS_2 393 -#define OPPONENT_NICOLAS_3 394 -#define OPPONENT_NICOLAS_4 395 -#define OPPONENT_NICOLAS_5 396 -#define OPPONENT_AARON 397 -#define OPPONENT_PERRY 398 -#define OPPONENT_HUGH 399 -#define OPPONENT_PHIL 400 -#define OPPONENT_JARED 401 -#define OPPONENT_ANONYMOUS_10 402 -#define OPPONENT_TANNER 403 -#define OPPONENT_WILL 404 -#define OPPONENT_COLIN 405 -#define OPPONENT_ROBERT_1 406 -#define OPPONENT_BENNY 407 -#define OPPONENT_CHESTER 408 -#define OPPONENT_ROBERT_2 409 -#define OPPONENT_ROBERT_3 410 -#define OPPONENT_ROBERT_4 411 -#define OPPONENT_ROBERT_5 412 -#define OPPONENT_ALEX 413 -#define OPPONENT_BECK 414 -#define OPPONENT_YASU 415 -#define OPPONENT_TAKASHI 416 -#define OPPONENT_MAKOTO 417 -#define OPPONENT_HIDEO_1 418 -#define OPPONENT_LAO_1 419 -#define OPPONENT_LUNG 420 -#define OPPONENT_LAO_2 421 -#define OPPONENT_LAO_3 422 -#define OPPONENT_LAO_4 423 -#define OPPONENT_LAO_5 424 -#define OPPONENT_TESSA 425 -#define OPPONENT_LAURA 426 -#define OPPONENT_CYNDY_1 427 -#define OPPONENT_CORA 428 -#define OPPONENT_JILL 429 -#define OPPONENT_CYNDY_2 430 -#define OPPONENT_CYNDY_3 431 -#define OPPONENT_CYNDY_4 432 -#define OPPONENT_CYNDY_5 433 -#define OPPONENT_MADELINE_1 434 -#define OPPONENT_CLARISSA 435 -#define OPPONENT_ANGELICA 436 -#define OPPONENT_MADELINE_2 437 -#define OPPONENT_MADELINE_3 438 -#define OPPONENT_MADELINE_4 439 -#define OPPONENT_MADELINE_5 440 -#define OPPONENT_BEVERLY 441 -#define OPPONENT_DAWN 442 -#define OPPONENT_NICOLE 443 -#define OPPONENT_DENISE 444 -#define OPPONENT_BETH 445 -#define OPPONENT_TARA 446 -#define OPPONENT_MISSY 447 -#define OPPONENT_ALICE 448 -#define OPPONENT_JENNY_1 449 -#define OPPONENT_GRACE 450 -#define OPPONENT_TANYA 451 -#define OPPONENT_SHARON 452 -#define OPPONENT_NIKKI 453 -#define OPPONENT_BRENDA 454 -#define OPPONENT_KATIE 455 -#define OPPONENT_SUSIE 456 -#define OPPONENT_KARA 457 -#define OPPONENT_DANA 458 -#define OPPONENT_ERIN 459 -#define OPPONENT_DEBRA 460 -#define OPPONENT_LINDA 461 -#define OPPONENT_KAYLEE 462 -#define OPPONENT_LAUREL 463 -#define OPPONENT_DARCY 464 -#define OPPONENT_JENNY_2 465 -#define OPPONENT_JENNY_3 466 -#define OPPONENT_JENNY_4 467 -#define OPPONENT_JENNY_5 468 -#define OPPONENT_HEIDI 469 -#define OPPONENT_BECKY 470 -#define OPPONENT_CAROL 471 -#define OPPONENT_NANCY 472 -#define OPPONENT_MARTHA 473 -#define OPPONENT_DIANA_1 474 -#define OPPONENT_NINA 475 -#define OPPONENT_IRENE 476 -#define OPPONENT_DIANA_2 477 -#define OPPONENT_DIANA_3 478 -#define OPPONENT_DIANA_4 479 -#define OPPONENT_DIANA_5 480 -#define OPPONENT_AMY_AND_LIV_1 481 -#define OPPONENT_AMY_AND_LIV_2 482 -#define OPPONENT_GINA_AND_MIA_1 483 -#define OPPONENT_MIU_AND_YUKI 484 -#define OPPONENT_AMY_AND_LIV_3 485 -#define OPPONENT_GINA_AND_MIA_2 486 -#define OPPONENT_AMY_AND_LIV_4 487 -#define OPPONENT_AMY_AND_LIV_5 488 -#define OPPONENT_AMY_AND_LIV_6 489 -#define OPPONENT_HUEY 490 -#define OPPONENT_EDMOND 491 -#define OPPONENT_ERNEST_1 492 -#define OPPONENT_DWAYNE 493 -#define OPPONENT_PHILLIP 494 -#define OPPONENT_LEONARD 495 -#define OPPONENT_DUNCAN 496 -#define OPPONENT_ERNEST_2 497 -#define OPPONENT_ERNEST_3 498 -#define OPPONENT_ERNEST_4 499 -#define OPPONENT_ERNEST_5 500 -#define OPPONENT_ANONYMOUS_11 501 -#define OPPONENT_ANONYMOUS_12 502 -#define OPPONENT_ANONYMOUS_13 503 -#define OPPONENT_SONNY 504 -#define OPPONENT_DONOVAN 505 -#define OPPONENT_GERALD 506 -#define OPPONENT_KELVIN 507 -#define OPPONENT_KODY 508 -#define OPPONENT_TEVIN 509 -#define OPPONENT_DAMON 510 -#define OPPONENT_PABLO 511 -#define OPPONENT_EDWIN_1 512 -#define OPPONENT_HECTOR_1 513 -#define OPPONENT_HECTOR_2 514 -#define OPPONENT_EDWIN_2 515 -#define OPPONENT_EDWIN_3 516 -#define OPPONENT_EDWIN_4 517 -#define OPPONENT_EDWIN_5 518 -#define OPPONENT_WALLY_1 519 -#define OPPONENT_BRENDAN_1 520 -#define OPPONENT_BRENDAN_2 521 -#define OPPONENT_BRENDAN_3 522 -#define OPPONENT_BRENDAN_4 523 -#define OPPONENT_BRENDAN_5 524 -#define OPPONENT_BRENDAN_6 525 -#define OPPONENT_BRENDAN_7 526 -#define OPPONENT_BRENDAN_8 527 -#define OPPONENT_BRENDAN_9 528 -#define OPPONENT_MAY_1 529 -#define OPPONENT_MAY_2 530 -#define OPPONENT_MAY_3 531 -#define OPPONENT_MAY_4 532 -#define OPPONENT_MAY_5 533 -#define OPPONENT_MAY_6 534 -#define OPPONENT_MAY_7 535 -#define OPPONENT_MAY_8 536 -#define OPPONENT_MAY_9 537 -#define OPPONENT_ISAAC_1 538 -#define OPPONENT_RILEY 539 -#define OPPONENT_AIDAN 540 -#define OPPONENT_ISAAC_2 541 -#define OPPONENT_ISAAC_3 542 -#define OPPONENT_ISAAC_4 543 -#define OPPONENT_ISAAC_5 544 -#define OPPONENT_LYDIA_1 545 -#define OPPONENT_ALEXIA 546 -#define OPPONENT_DANIELLE 547 -#define OPPONENT_LYDIA_2 548 -#define OPPONENT_LYDIA_3 549 -#define OPPONENT_LYDIA_4 550 -#define OPPONENT_LYDIA_5 551 -#define OPPONENT_JACKSON_1 552 -#define OPPONENT_CARLOS 553 -#define OPPONENT_SEBASTIAN 554 -#define OPPONENT_JACKSON_2 555 -#define OPPONENT_JACKSON_3 556 -#define OPPONENT_JACKSON_4 557 -#define OPPONENT_JACKSON_5 558 -#define OPPONENT_CATHERINE_1 559 -#define OPPONENT_JENNA 560 -#define OPPONENT_SOPHIA 561 -#define OPPONENT_CATHERINE_2 562 -#define OPPONENT_CATHERINE_3 563 -#define OPPONENT_CATHERINE_4 564 -#define OPPONENT_CATHERINE_5 565 -#define OPPONENT_MAXIE_1 566 -#define OPPONENT_GRUNT_28 567 -#define OPPONENT_GRUNT_29 568 -#define OPPONENT_GRUNT_30 569 -#define OPPONENT_GRUNT_31 570 -#define OPPONENT_GRUNT_32 571 -#define OPPONENT_GRUNT_33 572 -#define OPPONENT_GRUNT_34 573 -#define OPPONENT_GRUNT_35 574 -#define OPPONENT_GRUNT_36 575 -#define OPPONENT_GRUNT_37 576 -#define OPPONENT_GRUNT_38 577 -#define OPPONENT_GRUNT_39 578 -#define OPPONENT_GRUNT_40 579 -#define OPPONENT_GRUNT_41 580 -#define OPPONENT_GRUNT_42 581 -#define OPPONENT_GRUNT_43 582 -#define OPPONENT_GRUNT_44 583 -#define OPPONENT_GRUNT_45 584 -#define OPPONENT_GRUNT_46 585 -#define OPPONENT_GRUNT_47 586 -#define OPPONENT_GRUNT_48 587 -#define OPPONENT_GRUNT_49 588 -#define OPPONENT_GRUNT_50 589 -#define OPPONENT_GRUNT_51 590 -#define OPPONENT_GRUNT_52 591 -#define OPPONENT_GRUNT_53 592 -#define OPPONENT_GRUNT_54 593 -#define OPPONENT_ANONYMOUS_14 594 -#define OPPONENT_ANONYMOUS_15 595 -#define OPPONENT_TABITHA_1 596 -#define OPPONENT_TABITHA_2 597 -#define OPPONENT_ANONYMOUS_16 598 -#define OPPONENT_COURTNEY_1 599 -#define OPPONENT_COURTNEY_2 600 -#define OPPONENT_MAXIE_2 601 -#define OPPONENT_MAXIE_3 602 -#define OPPONENT_TIANA 603 -#define OPPONENT_HALEY_1 604 -#define OPPONENT_JANICE 605 -#define OPPONENT_VIVI 606 -#define OPPONENT_HALEY_2 607 -#define OPPONENT_HALEY_3 608 -#define OPPONENT_HALEY_4 609 -#define OPPONENT_HALEY_5 610 -#define OPPONENT_SALLY 611 -#define OPPONENT_ROBIN 612 -#define OPPONENT_ANDREA 613 -#define OPPONENT_CRISSY 614 -#define OPPONENT_RICK 615 -#define OPPONENT_LYLE 616 -#define OPPONENT_JOSE 617 -#define OPPONENT_DOUG 618 -#define OPPONENT_GREG 619 -#define OPPONENT_KENT 620 -#define OPPONENT_JAMES_1 621 -#define OPPONENT_JAMES_2 622 -#define OPPONENT_JAMES_3 623 -#define OPPONENT_JAMES_4 624 -#define OPPONENT_JAMES_5 625 -#define OPPONENT_BRICE 626 -#define OPPONENT_TRENT_1 627 -#define OPPONENT_LENNY 628 -#define OPPONENT_LUCAS_1 629 -#define OPPONENT_ALAN 630 -#define OPPONENT_CLARK 631 -#define OPPONENT_ERIC 632 -#define OPPONENT_LUCAS_2 633 -#define OPPONENT_MIKE_1 634 -#define OPPONENT_MIKE_2 635 -#define OPPONENT_TRENT_2 636 -#define OPPONENT_TRENT_3 637 -#define OPPONENT_TRENT_4 638 -#define OPPONENT_TRENT_5 639 -#define OPPONENT_DEZ_AND_LUKE 640 -#define OPPONENT_LEA_AND_JED 641 -#define OPPONENT_LOIS_AND_HAL_1 642 -#define OPPONENT_LOIS_AND_HAL_2 643 -#define OPPONENT_LOIS_AND_HAL_3 644 -#define OPPONENT_LOIS_AND_HAL_4 645 -#define OPPONENT_LOIS_AND_HAL_5 646 -#define OPPONENT_JOHANNA 647 -#define OPPONENT_ZANE 648 -#define OPPONENT_VIVIAN 649 -#define OPPONENT_SADIE 650 -#define OPPONENT_HIDEO_2 651 -#define OPPONENT_KEIGO 652 -#define OPPONENT_TSUNAO 653 -#define OPPONENT_TERRELL 654 -#define OPPONENT_KYLEE 655 -#define OPPONENT_WALLY_2 656 -#define OPPONENT_WALLY_3 657 -#define OPPONENT_WALLY_4 658 -#define OPPONENT_WALLY_5 659 -#define OPPONENT_WALLY_6 660 -#define OPPONENT_BRENDAN_10 661 -#define OPPONENT_BRENDAN_11 662 -#define OPPONENT_BRENDAN_12 663 -#define OPPONENT_MAY_10 664 -#define OPPONENT_MAY_11 665 -#define OPPONENT_MAY_12 666 -#define OPPONENT_JONAH 667 -#define OPPONENT_HENRY 668 -#define OPPONENT_ROGER 669 -#define OPPONENT_ALEXA 670 -#define OPPONENT_RUBEN 671 -#define OPPONENT_KOJI 672 -#define OPPONENT_WAYNE 673 -#define OPPONENT_BYRON 674 -#define OPPONENT_REED 675 -#define OPPONENT_TISHA 676 -#define OPPONENT_TORI_AND_TIA 677 -#define OPPONENT_KIM_AND_IRIS 678 -#define OPPONENT_TYRA_AND_IVY 679 -#define OPPONENT_MEL_AND_PAUL 680 -#define OPPONENT_JOHN_AND_JAY_1 681 -#define OPPONENT_JOHN_AND_JAY_2 682 -#define OPPONENT_JOHN_AND_JAY_3 683 -#define OPPONENT_JOHN_AND_JAY_4 684 -#define OPPONENT_JOHN_AND_JAY_5 685 -#define OPPONENT_RELI_AND_IAN 686 -#define OPPONENT_RITA_AND_SAM_1 687 -#define OPPONENT_RITA_AND_SAM_2 688 -#define OPPONENT_RITA_AND_SAM_3 689 -#define OPPONENT_RITA_AND_SAM_4 690 -#define OPPONENT_RITA_AND_SAM_5 691 -#define OPPONENT_LISA_AND_RAY 692 -#define OPPONENT_EUGENE 693 +#define TRAINER_NONE 0 +#define TRAINER_ARCHIE_1 1 +#define TRAINER_GRUNT_1 2 +#define TRAINER_GRUNT_2 3 +#define TRAINER_GRUNT_3 4 +#define TRAINER_GRUNT_4 5 +#define TRAINER_GRUNT_5 6 +#define TRAINER_GRUNT_6 7 +#define TRAINER_GRUNT_7 8 +#define TRAINER_GRUNT_8 9 +#define TRAINER_GRUNT_9 10 +#define TRAINER_GRUNT_10 11 +#define TRAINER_GRUNT_11 12 +#define TRAINER_GRUNT_12 13 +#define TRAINER_GRUNT_13 14 +#define TRAINER_GRUNT_14 15 +#define TRAINER_GRUNT_15 16 +#define TRAINER_GRUNT_16 17 +#define TRAINER_GRUNT_17 18 +#define TRAINER_GRUNT_18 19 +#define TRAINER_GRUNT_19 20 +#define TRAINER_GRUNT_20 21 +#define TRAINER_GRUNT_21 22 +#define TRAINER_GRUNT_22 23 +#define TRAINER_GRUNT_23 24 +#define TRAINER_GRUNT_24 25 +#define TRAINER_GRUNT_25 26 +#define TRAINER_GRUNT_26 27 +#define TRAINER_GRUNT_27 28 +#define TRAINER_ANONYMOUS_1 29 +#define TRAINER_MATT_1 30 +#define TRAINER_MATT_2 31 +#define TRAINER_SHELLY_1 32 +#define TRAINER_SHELLY_2 33 +#define TRAINER_ARCHIE_2 34 +#define TRAINER_ARCHIE_3 35 +#define TRAINER_DAISY 36 +#define TRAINER_ROSE_1 37 +#define TRAINER_LILY 38 +#define TRAINER_VIOLET 39 +#define TRAINER_ROSE_2 40 +#define TRAINER_ROSE_3 41 +#define TRAINER_ROSE_4 42 +#define TRAINER_ROSE_5 43 +#define TRAINER_DUSTY_1 44 +#define TRAINER_CHIP 45 +#define TRAINER_FOSTER 46 +#define TRAINER_DUSTY_2 47 +#define TRAINER_DUSTY_3 48 +#define TRAINER_DUSTY_4 49 +#define TRAINER_DUSTY_5 50 +#define TRAINER_GABBY_AND_TY_1 51 +#define TRAINER_GABBY_AND_TY_2 52 +#define TRAINER_GABBY_AND_TY_3 53 +#define TRAINER_GABBY_AND_TY_4 54 +#define TRAINER_GABBY_AND_TY_5 55 +#define TRAINER_GABBY_AND_TY_6 56 +#define TRAINER_LOLA_1 57 +#define TRAINER_CARMEN 58 +#define TRAINER_GWEN 59 +#define TRAINER_LOLA_2 60 +#define TRAINER_LOLA_3 61 +#define TRAINER_LOLA_4 62 +#define TRAINER_LOLA_5 63 +#define TRAINER_RICKY_1 64 +#define TRAINER_SIMON 65 +#define TRAINER_CHARLIE 66 +#define TRAINER_RICKY_2 67 +#define TRAINER_RICKY_3 68 +#define TRAINER_RICKY_4 69 +#define TRAINER_RICKY_5 70 +#define TRAINER_RANDALL 71 +#define TRAINER_PARKER 72 +#define TRAINER_GEORGE 73 +#define TRAINER_BERKE 74 +#define TRAINER_CLYDE 75 +#define TRAINER_VINCENT 76 +#define TRAINER_LEROY 77 +#define TRAINER_WILTON_1 78 +#define TRAINER_EDGAR 79 +#define TRAINER_ALBERT 80 +#define TRAINER_SAMUEL 81 +#define TRAINER_VITO 82 +#define TRAINER_OWEN 83 +#define TRAINER_WILTON_2 84 +#define TRAINER_WILTON_3 85 +#define TRAINER_WILTON_4 86 +#define TRAINER_WILTON_5 87 +#define TRAINER_WARREN 88 +#define TRAINER_MARY 89 +#define TRAINER_LORI 90 +#define TRAINER_JODY 91 +#define TRAINER_WENDY 92 +#define TRAINER_ELAINE 93 +#define TRAINER_BROOKE_1 94 +#define TRAINER_JENNIFER 95 +#define TRAINER_HOPE 96 +#define TRAINER_SHANNON 97 +#define TRAINER_MICHELLE 98 +#define TRAINER_CAROLINE 99 +#define TRAINER_JULIE 100 +#define TRAINER_BROOKE_2 101 +#define TRAINER_BROOKE_3 102 +#define TRAINER_BROOKE_4 103 +#define TRAINER_BROOKE_5 104 +#define TRAINER_PATRICIA 105 +#define TRAINER_KINDRA 106 +#define TRAINER_TAMMY 107 +#define TRAINER_VALERIE_1 108 +#define TRAINER_TASHA 109 +#define TRAINER_VALERIE_2 110 +#define TRAINER_VALERIE_3 111 +#define TRAINER_VALERIE_4 112 +#define TRAINER_VALERIE_5 113 +#define TRAINER_CINDY_1 114 +#define TRAINER_ANONYMOUS_2 115 +#define TRAINER_BRIANNA_1 116 +#define TRAINER_CINDY_2 117 +#define TRAINER_BRIANNA_2 118 +#define TRAINER_ANETTE 119 +#define TRAINER_CINDY_3 120 +#define TRAINER_CINDY_4 121 +#define TRAINER_CINDY_5 122 +#define TRAINER_CINDY_6 123 +#define TRAINER_MELISSA 124 +#define TRAINER_SHEILA 125 +#define TRAINER_SHIRLEY 126 +#define TRAINER_JESSICA_1 127 +#define TRAINER_CONNIE 128 +#define TRAINER_BRIDGET 129 +#define TRAINER_OLIVIA 130 +#define TRAINER_TIFFANY 131 +#define TRAINER_JESSICA_2 132 +#define TRAINER_JESSICA_3 133 +#define TRAINER_JESSICA_4 134 +#define TRAINER_JESSICA_5 135 +#define TRAINER_WINSTON_1 136 +#define TRAINER_ANONYMOUS_3 137 +#define TRAINER_GARRET 138 +#define TRAINER_WINSTON_2 139 +#define TRAINER_WINSTON_3 140 +#define TRAINER_WINSTON_4 141 +#define TRAINER_WINSTON_5 142 +#define TRAINER_STEVE_1 143 +#define TRAINER_CHRIS 144 +#define TRAINER_MARK 145 +#define TRAINER_KENN 146 +#define TRAINER_STEVE_2 147 +#define TRAINER_STEVE_3 148 +#define TRAINER_STEVE_4 149 +#define TRAINER_STEVE_5 150 +#define TRAINER_LUIS 151 +#define TRAINER_AUSTIN 152 +#define TRAINER_DOUGLAS 153 +#define TRAINER_DARRIN 154 +#define TRAINER_TONY_1 155 +#define TRAINER_JEROME 156 +#define TRAINER_MATTHEW 157 +#define TRAINER_DAVID 158 +#define TRAINER_SPENCER 159 +#define TRAINER_ROLAND 160 +#define TRAINER_CODY 161 +#define TRAINER_STAN 162 +#define TRAINER_BARRY 163 +#define TRAINER_DEAN 164 +#define TRAINER_RODNEY 165 +#define TRAINER_RICHARD 166 +#define TRAINER_HERMAN 167 +#define TRAINER_ANONYMOUS_4 168 +#define TRAINER_GILBERT 169 +#define TRAINER_FRANKLIN 170 +#define TRAINER_DANNY 171 +#define TRAINER_JACK 172 +#define TRAINER_DUDLEY 173 +#define TRAINER_CHAD 174 +#define TRAINER_TONY_2 175 +#define TRAINER_TONY_3 176 +#define TRAINER_TONY_4 177 +#define TRAINER_TONY_5 178 +#define TRAINER_HIDEKI 179 +#define TRAINER_HITOSHI 180 +#define TRAINER_KIYO 181 +#define TRAINER_KOICHI 182 +#define TRAINER_NOB_1 183 +#define TRAINER_NOB_2 184 +#define TRAINER_NOB_3 185 +#define TRAINER_NOB_4 186 +#define TRAINER_NOB_5 187 +#define TRAINER_YUJI 188 +#define TRAINER_DAISUKE 189 +#define TRAINER_ATSUSHI 190 +#define TRAINER_KIRK 191 +#define TRAINER_SCOTT 192 +#define TRAINER_HARVEY 193 +#define TRAINER_SHAWN 194 +#define TRAINER_RANDY 195 +#define TRAINER_DALTON_1 196 +#define TRAINER_DALTON_2 197 +#define TRAINER_DALTON_3 198 +#define TRAINER_DALTON_4 199 +#define TRAINER_DALTON_5 200 +#define TRAINER_COLE 201 +#define TRAINER_FLINT 202 +#define TRAINER_AXLE 203 +#define TRAINER_JAKE 204 +#define TRAINER_ANDY 205 +#define TRAINER_BERNIE_1 206 +#define TRAINER_BERNIE_2 207 +#define TRAINER_BERNIE_3 208 +#define TRAINER_BERNIE_4 209 +#define TRAINER_BERNIE_5 210 +#define TRAINER_DREW 211 +#define TRAINER_CLIFF 212 +#define TRAINER_LARRY 213 +#define TRAINER_SHANE 214 +#define TRAINER_JUSTIN 215 +#define TRAINER_ETHAN_1 216 +#define TRAINER_JEFF 217 +#define TRAINER_TRAVIS 218 +#define TRAINER_ETHAN_2 219 +#define TRAINER_ETHAN_3 220 +#define TRAINER_ETHAN_4 221 +#define TRAINER_ETHAN_5 222 +#define TRAINER_BRENT 223 +#define TRAINER_DONALD 224 +#define TRAINER_TAYLOR 225 +#define TRAINER_BRANDON_1 226 +#define TRAINER_DEREK 227 +#define TRAINER_BRANDON_2 228 +#define TRAINER_BRANDON_3 229 +#define TRAINER_BRANDON_4 230 +#define TRAINER_BRANDON_5 231 +#define TRAINER_EDWARD 232 +#define TRAINER_PRESTON 233 +#define TRAINER_VIRGIL 234 +#define TRAINER_FRITZ 235 +#define TRAINER_WILLIAM 236 +#define TRAINER_JOSHUA 237 +#define TRAINER_CAMERON_1 238 +#define TRAINER_CAMERON_2 239 +#define TRAINER_CAMERON_3 240 +#define TRAINER_CAMERON_4 241 +#define TRAINER_CAMERON_5 242 +#define TRAINER_JACLYN 243 +#define TRAINER_HANNAH 244 +#define TRAINER_SAMANTHA 245 +#define TRAINER_MAURA 246 +#define TRAINER_KAYLA 247 +#define TRAINER_ALEXIS 248 +#define TRAINER_JACKI_1 249 +#define TRAINER_JACKI_2 250 +#define TRAINER_JACKI_3 251 +#define TRAINER_JACKI_4 252 +#define TRAINER_JACKI_5 253 +#define TRAINER_WALTER_1 254 +#define TRAINER_TUCKER 255 +#define TRAINER_THOMAS 256 +#define TRAINER_WALTER_2 257 +#define TRAINER_WALTER_3 258 +#define TRAINER_WALTER_4 259 +#define TRAINER_WALTER_5 260 +#define TRAINER_SIDNEY 261 +#define TRAINER_PHOEBE 262 +#define TRAINER_GLACIA 263 +#define TRAINER_DRAKE 264 +#define TRAINER_ROXANNE 265 +#define TRAINER_BRAWLY 266 +#define TRAINER_WATTSON 267 +#define TRAINER_FLANNERY 268 +#define TRAINER_NORMAN 269 +#define TRAINER_WINONA 270 +#define TRAINER_TATE_AND_LIZA 271 +#define TRAINER_WALLACE 272 +#define TRAINER_JERRY_1 273 +#define TRAINER_TED 274 +#define TRAINER_PAUL 275 +#define TRAINER_JERRY_2 276 +#define TRAINER_JERRY_3 277 +#define TRAINER_JERRY_4 278 +#define TRAINER_JERRY_5 279 +#define TRAINER_KAREN_1 280 +#define TRAINER_GEORGIA 281 +#define TRAINER_KAREN_2 282 +#define TRAINER_KAREN_3 283 +#define TRAINER_KAREN_4 284 +#define TRAINER_KAREN_5 285 +#define TRAINER_KATE_AND_JOY 286 +#define TRAINER_ANNA_AND_MEG_1 287 +#define TRAINER_ANNA_AND_MEG_2 288 +#define TRAINER_ANNA_AND_MEG_3 289 +#define TRAINER_ANNA_AND_MEG_4 290 +#define TRAINER_ANNA_AND_MEG_5 291 +#define TRAINER_VICTOR 292 +#define TRAINER_MIGUEL_1 293 +#define TRAINER_COLTON 294 +#define TRAINER_MIGUEL_2 295 +#define TRAINER_MIGUEL_3 296 +#define TRAINER_MIGUEL_4 297 +#define TRAINER_MIGUEL_5 298 +#define TRAINER_VICTORIA 299 +#define TRAINER_VANESSA 300 +#define TRAINER_MARISSA 301 +#define TRAINER_ISABEL_1 302 +#define TRAINER_ISABEL_2 303 +#define TRAINER_ISABEL_3 304 +#define TRAINER_ISABEL_4 305 +#define TRAINER_ISABEL_5 306 +#define TRAINER_TIMOTHY_1 307 +#define TRAINER_TIMOTHY_2 308 +#define TRAINER_TIMOTHY_3 309 +#define TRAINER_TIMOTHY_4 310 +#define TRAINER_TIMOTHY_5 311 +#define TRAINER_VICKY 312 +#define TRAINER_SHELBY_1 313 +#define TRAINER_SHELBY_2 314 +#define TRAINER_SHELBY_3 315 +#define TRAINER_SHELBY_4 316 +#define TRAINER_SHELBY_5 317 +#define TRAINER_CALVIN_1 318 +#define TRAINER_BILLY 319 +#define TRAINER_JOSH 320 +#define TRAINER_TOMMY 321 +#define TRAINER_JOEY 322 +#define TRAINER_BEN 323 +#define TRAINER_ANONYMOUS_5 324 +#define TRAINER_KEVIN 325 +#define TRAINER_NEAL 326 +#define TRAINER_DILLON 327 +#define TRAINER_CALVIN_2 328 +#define TRAINER_CALVIN_3 329 +#define TRAINER_CALVIN_4 330 +#define TRAINER_CALVIN_5 331 +#define TRAINER_EDDIE 332 +#define TRAINER_ALLEN 333 +#define TRAINER_TIMMY 334 +#define TRAINER_STEVEN 335 +#define TRAINER_ANDREW 336 +#define TRAINER_IVAN 337 +#define TRAINER_CLAUDE 338 +#define TRAINER_ELLIOT_1 339 +#define TRAINER_NED 340 +#define TRAINER_DALE 341 +#define TRAINER_NOLAN 342 +#define TRAINER_BARNY 343 +#define TRAINER_WADE 344 +#define TRAINER_CARTER 345 +#define TRAINER_ELLIOT_2 346 +#define TRAINER_ELLIOT_3 347 +#define TRAINER_ELLIOT_4 348 +#define TRAINER_ELLIOT_5 349 +#define TRAINER_RONALD 350 +#define TRAINER_JACOB 351 +#define TRAINER_ANTHONY 352 +#define TRAINER_BENJAMIN_1 353 +#define TRAINER_BENJAMIN_2 354 +#define TRAINER_BENJAMIN_3 355 +#define TRAINER_BENJAMIN_4 356 +#define TRAINER_BENJAMIN_5 357 +#define TRAINER_ABIGAIL_1 358 +#define TRAINER_JASMINE 359 +#define TRAINER_ABIGAIL_2 360 +#define TRAINER_ABIGAIL_3 361 +#define TRAINER_ABIGAIL_4 362 +#define TRAINER_ABIGAIL_5 363 +#define TRAINER_DYLAN_1 364 +#define TRAINER_DYLAN_2 365 +#define TRAINER_DYLAN_3 366 +#define TRAINER_DYLAN_4 367 +#define TRAINER_DYLAN_5 368 +#define TRAINER_MARIA_1 369 +#define TRAINER_MARIA_2 370 +#define TRAINER_MARIA_3 371 +#define TRAINER_MARIA_4 372 +#define TRAINER_MARIA_5 373 +#define TRAINER_CALEB 374 +#define TRAINER_ANONYMOUS_6 375 +#define TRAINER_ISAIAH_1 376 +#define TRAINER_ANONYMOUS_7 377 +#define TRAINER_CHASE 378 +#define TRAINER_ISAIAH_2 379 +#define TRAINER_ISAIAH_3 380 +#define TRAINER_ISAIAH_4 381 +#define TRAINER_ISAIAH_5 382 +#define TRAINER_ANONYMOUS_8 383 +#define TRAINER_CONNOR 384 +#define TRAINER_ANONYMOUS_9 385 +#define TRAINER_KATELYN_1 386 +#define TRAINER_ALLISON 387 +#define TRAINER_KATELYN_2 388 +#define TRAINER_KATELYN_3 389 +#define TRAINER_KATELYN_4 390 +#define TRAINER_KATELYN_5 391 +#define TRAINER_NICOLAS_1 392 +#define TRAINER_NICOLAS_2 393 +#define TRAINER_NICOLAS_3 394 +#define TRAINER_NICOLAS_4 395 +#define TRAINER_NICOLAS_5 396 +#define TRAINER_AARON 397 +#define TRAINER_PERRY 398 +#define TRAINER_HUGH 399 +#define TRAINER_PHIL 400 +#define TRAINER_JARED 401 +#define TRAINER_ANONYMOUS_10 402 +#define TRAINER_TANNER 403 +#define TRAINER_WILL 404 +#define TRAINER_COLIN 405 +#define TRAINER_ROBERT_1 406 +#define TRAINER_BENNY 407 +#define TRAINER_CHESTER 408 +#define TRAINER_ROBERT_2 409 +#define TRAINER_ROBERT_3 410 +#define TRAINER_ROBERT_4 411 +#define TRAINER_ROBERT_5 412 +#define TRAINER_ALEX 413 +#define TRAINER_BECK 414 +#define TRAINER_YASU 415 +#define TRAINER_TAKASHI 416 +#define TRAINER_MAKOTO 417 +#define TRAINER_HIDEO_1 418 +#define TRAINER_LAO_1 419 +#define TRAINER_LUNG 420 +#define TRAINER_LAO_2 421 +#define TRAINER_LAO_3 422 +#define TRAINER_LAO_4 423 +#define TRAINER_LAO_5 424 +#define TRAINER_TESSA 425 +#define TRAINER_LAURA 426 +#define TRAINER_CYNDY_1 427 +#define TRAINER_CORA 428 +#define TRAINER_JILL 429 +#define TRAINER_CYNDY_2 430 +#define TRAINER_CYNDY_3 431 +#define TRAINER_CYNDY_4 432 +#define TRAINER_CYNDY_5 433 +#define TRAINER_MADELINE_1 434 +#define TRAINER_CLARISSA 435 +#define TRAINER_ANGELICA 436 +#define TRAINER_MADELINE_2 437 +#define TRAINER_MADELINE_3 438 +#define TRAINER_MADELINE_4 439 +#define TRAINER_MADELINE_5 440 +#define TRAINER_BEVERLY 441 +#define TRAINER_DAWN 442 +#define TRAINER_NICOLE 443 +#define TRAINER_DENISE 444 +#define TRAINER_BETH 445 +#define TRAINER_TARA 446 +#define TRAINER_MISSY 447 +#define TRAINER_ALICE 448 +#define TRAINER_JENNY_1 449 +#define TRAINER_GRACE 450 +#define TRAINER_TANYA 451 +#define TRAINER_SHARON 452 +#define TRAINER_NIKKI 453 +#define TRAINER_BRENDA 454 +#define TRAINER_KATIE 455 +#define TRAINER_SUSIE 456 +#define TRAINER_KARA 457 +#define TRAINER_DANA 458 +#define TRAINER_ERIN 459 +#define TRAINER_DEBRA 460 +#define TRAINER_LINDA 461 +#define TRAINER_KAYLEE 462 +#define TRAINER_LAUREL 463 +#define TRAINER_DARCY 464 +#define TRAINER_JENNY_2 465 +#define TRAINER_JENNY_3 466 +#define TRAINER_JENNY_4 467 +#define TRAINER_JENNY_5 468 +#define TRAINER_HEIDI 469 +#define TRAINER_BECKY 470 +#define TRAINER_CAROL 471 +#define TRAINER_NANCY 472 +#define TRAINER_MARTHA 473 +#define TRAINER_DIANA_1 474 +#define TRAINER_NINA 475 +#define TRAINER_IRENE 476 +#define TRAINER_DIANA_2 477 +#define TRAINER_DIANA_3 478 +#define TRAINER_DIANA_4 479 +#define TRAINER_DIANA_5 480 +#define TRAINER_AMY_AND_LIV_1 481 +#define TRAINER_AMY_AND_LIV_2 482 +#define TRAINER_GINA_AND_MIA_1 483 +#define TRAINER_MIU_AND_YUKI 484 +#define TRAINER_AMY_AND_LIV_3 485 +#define TRAINER_GINA_AND_MIA_2 486 +#define TRAINER_AMY_AND_LIV_4 487 +#define TRAINER_AMY_AND_LIV_5 488 +#define TRAINER_AMY_AND_LIV_6 489 +#define TRAINER_HUEY 490 +#define TRAINER_EDMOND 491 +#define TRAINER_ERNEST_1 492 +#define TRAINER_DWAYNE 493 +#define TRAINER_PHILLIP 494 +#define TRAINER_LEONARD 495 +#define TRAINER_DUNCAN 496 +#define TRAINER_ERNEST_2 497 +#define TRAINER_ERNEST_3 498 +#define TRAINER_ERNEST_4 499 +#define TRAINER_ERNEST_5 500 +#define TRAINER_ANONYMOUS_11 501 +#define TRAINER_ANONYMOUS_12 502 +#define TRAINER_ANONYMOUS_13 503 +#define TRAINER_SONNY 504 +#define TRAINER_DONOVAN 505 +#define TRAINER_GERALD 506 +#define TRAINER_KELVIN 507 +#define TRAINER_KODY 508 +#define TRAINER_TEVIN 509 +#define TRAINER_DAMON 510 +#define TRAINER_PABLO 511 +#define TRAINER_EDWIN_1 512 +#define TRAINER_HECTOR_1 513 +#define TRAINER_HECTOR_2 514 +#define TRAINER_EDWIN_2 515 +#define TRAINER_EDWIN_3 516 +#define TRAINER_EDWIN_4 517 +#define TRAINER_EDWIN_5 518 +#define TRAINER_WALLY_1 519 +#define TRAINER_BRENDAN_1 520 +#define TRAINER_BRENDAN_2 521 +#define TRAINER_BRENDAN_3 522 +#define TRAINER_BRENDAN_4 523 +#define TRAINER_BRENDAN_5 524 +#define TRAINER_BRENDAN_6 525 +#define TRAINER_BRENDAN_7 526 +#define TRAINER_BRENDAN_8 527 +#define TRAINER_BRENDAN_9 528 +#define TRAINER_MAY_1 529 +#define TRAINER_MAY_2 530 +#define TRAINER_MAY_3 531 +#define TRAINER_MAY_4 532 +#define TRAINER_MAY_5 533 +#define TRAINER_MAY_6 534 +#define TRAINER_MAY_7 535 +#define TRAINER_MAY_8 536 +#define TRAINER_MAY_9 537 +#define TRAINER_ISAAC_1 538 +#define TRAINER_RILEY 539 +#define TRAINER_AIDAN 540 +#define TRAINER_ISAAC_2 541 +#define TRAINER_ISAAC_3 542 +#define TRAINER_ISAAC_4 543 +#define TRAINER_ISAAC_5 544 +#define TRAINER_LYDIA_1 545 +#define TRAINER_ALEXIA 546 +#define TRAINER_DANIELLE 547 +#define TRAINER_LYDIA_2 548 +#define TRAINER_LYDIA_3 549 +#define TRAINER_LYDIA_4 550 +#define TRAINER_LYDIA_5 551 +#define TRAINER_JACKSON_1 552 +#define TRAINER_CARLOS 553 +#define TRAINER_SEBASTIAN 554 +#define TRAINER_JACKSON_2 555 +#define TRAINER_JACKSON_3 556 +#define TRAINER_JACKSON_4 557 +#define TRAINER_JACKSON_5 558 +#define TRAINER_CATHERINE_1 559 +#define TRAINER_JENNA 560 +#define TRAINER_SOPHIA 561 +#define TRAINER_CATHERINE_2 562 +#define TRAINER_CATHERINE_3 563 +#define TRAINER_CATHERINE_4 564 +#define TRAINER_CATHERINE_5 565 +#define TRAINER_MAXIE_1 566 +#define TRAINER_GRUNT_28 567 +#define TRAINER_GRUNT_29 568 +#define TRAINER_GRUNT_30 569 +#define TRAINER_GRUNT_31 570 +#define TRAINER_GRUNT_32 571 +#define TRAINER_GRUNT_33 572 +#define TRAINER_GRUNT_34 573 +#define TRAINER_GRUNT_35 574 +#define TRAINER_GRUNT_36 575 +#define TRAINER_GRUNT_37 576 +#define TRAINER_GRUNT_38 577 +#define TRAINER_GRUNT_39 578 +#define TRAINER_GRUNT_40 579 +#define TRAINER_GRUNT_41 580 +#define TRAINER_GRUNT_42 581 +#define TRAINER_GRUNT_43 582 +#define TRAINER_GRUNT_44 583 +#define TRAINER_GRUNT_45 584 +#define TRAINER_GRUNT_46 585 +#define TRAINER_GRUNT_47 586 +#define TRAINER_GRUNT_48 587 +#define TRAINER_GRUNT_49 588 +#define TRAINER_GRUNT_50 589 +#define TRAINER_GRUNT_51 590 +#define TRAINER_GRUNT_52 591 +#define TRAINER_GRUNT_53 592 +#define TRAINER_GRUNT_54 593 +#define TRAINER_ANONYMOUS_14 594 +#define TRAINER_ANONYMOUS_15 595 +#define TRAINER_TABITHA_1 596 +#define TRAINER_TABITHA_2 597 +#define TRAINER_ANONYMOUS_16 598 +#define TRAINER_COURTNEY_1 599 +#define TRAINER_COURTNEY_2 600 +#define TRAINER_MAXIE_2 601 +#define TRAINER_MAXIE_3 602 +#define TRAINER_TIANA 603 +#define TRAINER_HALEY_1 604 +#define TRAINER_JANICE 605 +#define TRAINER_VIVI 606 +#define TRAINER_HALEY_2 607 +#define TRAINER_HALEY_3 608 +#define TRAINER_HALEY_4 609 +#define TRAINER_HALEY_5 610 +#define TRAINER_SALLY 611 +#define TRAINER_ROBIN 612 +#define TRAINER_ANDREA 613 +#define TRAINER_CRISSY 614 +#define TRAINER_RICK 615 +#define TRAINER_LYLE 616 +#define TRAINER_JOSE 617 +#define TRAINER_DOUG 618 +#define TRAINER_GREG 619 +#define TRAINER_KENT 620 +#define TRAINER_JAMES_1 621 +#define TRAINER_JAMES_2 622 +#define TRAINER_JAMES_3 623 +#define TRAINER_JAMES_4 624 +#define TRAINER_JAMES_5 625 +#define TRAINER_BRICE 626 +#define TRAINER_TRENT_1 627 +#define TRAINER_LENNY 628 +#define TRAINER_LUCAS_1 629 +#define TRAINER_ALAN 630 +#define TRAINER_CLARK 631 +#define TRAINER_ERIC 632 +#define TRAINER_LUCAS_2 633 +#define TRAINER_MIKE_1 634 +#define TRAINER_MIKE_2 635 +#define TRAINER_TRENT_2 636 +#define TRAINER_TRENT_3 637 +#define TRAINER_TRENT_4 638 +#define TRAINER_TRENT_5 639 +#define TRAINER_DEZ_AND_LUKE 640 +#define TRAINER_LEA_AND_JED 641 +#define TRAINER_LOIS_AND_HAL_1 642 +#define TRAINER_LOIS_AND_HAL_2 643 +#define TRAINER_LOIS_AND_HAL_3 644 +#define TRAINER_LOIS_AND_HAL_4 645 +#define TRAINER_LOIS_AND_HAL_5 646 +#define TRAINER_JOHANNA 647 +#define TRAINER_ZANE 648 +#define TRAINER_VIVIAN 649 +#define TRAINER_SADIE 650 +#define TRAINER_HIDEO_2 651 +#define TRAINER_KEIGO 652 +#define TRAINER_TSUNAO 653 +#define TRAINER_TERRELL 654 +#define TRAINER_KYLEE 655 +#define TRAINER_WALLY_2 656 +#define TRAINER_WALLY_3 657 +#define TRAINER_WALLY_4 658 +#define TRAINER_WALLY_5 659 +#define TRAINER_WALLY_6 660 +#define TRAINER_BRENDAN_10 661 +#define TRAINER_BRENDAN_11 662 +#define TRAINER_BRENDAN_12 663 +#define TRAINER_MAY_10 664 +#define TRAINER_MAY_11 665 +#define TRAINER_MAY_12 666 +#define TRAINER_JONAH 667 +#define TRAINER_HENRY 668 +#define TRAINER_ROGER 669 +#define TRAINER_ALEXA 670 +#define TRAINER_RUBEN 671 +#define TRAINER_KOJI 672 +#define TRAINER_WAYNE 673 +#define TRAINER_BYRON 674 +#define TRAINER_REED 675 +#define TRAINER_TISHA 676 +#define TRAINER_TORI_AND_TIA 677 +#define TRAINER_KIM_AND_IRIS 678 +#define TRAINER_TYRA_AND_IVY 679 +#define TRAINER_MEL_AND_PAUL 680 +#define TRAINER_JOHN_AND_JAY_1 681 +#define TRAINER_JOHN_AND_JAY_2 682 +#define TRAINER_JOHN_AND_JAY_3 683 +#define TRAINER_JOHN_AND_JAY_4 684 +#define TRAINER_JOHN_AND_JAY_5 685 +#define TRAINER_RELI_AND_IAN 686 +#define TRAINER_RITA_AND_SAM_1 687 +#define TRAINER_RITA_AND_SAM_2 688 +#define TRAINER_RITA_AND_SAM_3 689 +#define TRAINER_RITA_AND_SAM_4 690 +#define TRAINER_RITA_AND_SAM_5 691 +#define TRAINER_LISA_AND_RAY 692 +#define TRAINER_EUGENE 693 #endif // GUARD_CONSTANTS_OPPONENTS_H diff --git a/src/battle/battle_setup.c b/src/battle/battle_setup.c index e8a3ef451..c1d486bd1 100644 --- a/src/battle/battle_setup.c +++ b/src/battle/battle_setup.c @@ -160,282 +160,282 @@ static const struct TrainerBattleParameter gTrainerBattleSpecs_4[] = const struct TrainerEyeTrainer gTrainerEyeTrainers[] = { { - {OPPONENT_ROSE_1, OPPONENT_ROSE_2, OPPONENT_ROSE_3, OPPONENT_ROSE_4, OPPONENT_ROSE_5}, + {TRAINER_ROSE_1, TRAINER_ROSE_2, TRAINER_ROSE_3, TRAINER_ROSE_4, TRAINER_ROSE_5}, MAP_GROUP(ROUTE118), MAP_NUM(ROUTE118), }, { - {OPPONENT_DUSTY_1, OPPONENT_DUSTY_2, OPPONENT_DUSTY_3, OPPONENT_DUSTY_4, OPPONENT_DUSTY_5}, + {TRAINER_DUSTY_1, TRAINER_DUSTY_2, TRAINER_DUSTY_3, TRAINER_DUSTY_4, TRAINER_DUSTY_5}, MAP_GROUP(ROUTE111), MAP_NUM(ROUTE111), }, { - {OPPONENT_LOLA_1, OPPONENT_LOLA_2, OPPONENT_LOLA_3, OPPONENT_LOLA_4, OPPONENT_LOLA_5}, + {TRAINER_LOLA_1, TRAINER_LOLA_2, TRAINER_LOLA_3, TRAINER_LOLA_4, TRAINER_LOLA_5}, MAP_GROUP(ROUTE109), MAP_NUM(ROUTE109), }, { - {OPPONENT_RICKY_1, OPPONENT_RICKY_2, OPPONENT_RICKY_3, OPPONENT_RICKY_4, OPPONENT_RICKY_5}, + {TRAINER_RICKY_1, TRAINER_RICKY_2, TRAINER_RICKY_3, TRAINER_RICKY_4, TRAINER_RICKY_5}, MAP_GROUP(ROUTE109), MAP_NUM(ROUTE109), }, { - {OPPONENT_RITA_AND_SAM_1, OPPONENT_RITA_AND_SAM_2, OPPONENT_RITA_AND_SAM_3, OPPONENT_RITA_AND_SAM_4, OPPONENT_RITA_AND_SAM_5}, + {TRAINER_RITA_AND_SAM_1, TRAINER_RITA_AND_SAM_2, TRAINER_RITA_AND_SAM_3, TRAINER_RITA_AND_SAM_4, TRAINER_RITA_AND_SAM_5}, MAP_GROUP(ROUTE124), MAP_NUM(ROUTE124), }, { - {OPPONENT_BROOKE_1, OPPONENT_BROOKE_2, OPPONENT_BROOKE_3, OPPONENT_BROOKE_4, OPPONENT_BROOKE_5}, + {TRAINER_BROOKE_1, TRAINER_BROOKE_2, TRAINER_BROOKE_3, TRAINER_BROOKE_4, TRAINER_BROOKE_5}, MAP_GROUP(ROUTE111), MAP_NUM(ROUTE111), }, { - {OPPONENT_WILTON_1, OPPONENT_WILTON_2, OPPONENT_WILTON_3, OPPONENT_WILTON_4, OPPONENT_WILTON_5}, + {TRAINER_WILTON_1, TRAINER_WILTON_2, TRAINER_WILTON_3, TRAINER_WILTON_4, TRAINER_WILTON_5}, MAP_GROUP(ROUTE111), MAP_NUM(ROUTE111), }, { - {OPPONENT_VALERIE_1, OPPONENT_VALERIE_2, OPPONENT_VALERIE_3, OPPONENT_VALERIE_4, OPPONENT_VALERIE_5}, + {TRAINER_VALERIE_1, TRAINER_VALERIE_2, TRAINER_VALERIE_3, TRAINER_VALERIE_4, TRAINER_VALERIE_5}, MAP_GROUP(MT_PYRE_6F), MAP_NUM(MT_PYRE_6F), }, { - {OPPONENT_CINDY_1, OPPONENT_CINDY_3, OPPONENT_CINDY_4, OPPONENT_CINDY_5, OPPONENT_CINDY_6}, + {TRAINER_CINDY_1, TRAINER_CINDY_3, TRAINER_CINDY_4, TRAINER_CINDY_5, TRAINER_CINDY_6}, MAP_GROUP(ROUTE104), MAP_NUM(ROUTE104), }, { - {OPPONENT_JESSICA_1, OPPONENT_JESSICA_2, OPPONENT_JESSICA_3, OPPONENT_JESSICA_4, OPPONENT_JESSICA_5}, + {TRAINER_JESSICA_1, TRAINER_JESSICA_2, TRAINER_JESSICA_3, TRAINER_JESSICA_4, TRAINER_JESSICA_5}, MAP_GROUP(ROUTE121), MAP_NUM(ROUTE121), }, { - {OPPONENT_WINSTON_1, OPPONENT_WINSTON_2, OPPONENT_WINSTON_3, OPPONENT_WINSTON_4, OPPONENT_WINSTON_5}, + {TRAINER_WINSTON_1, TRAINER_WINSTON_2, TRAINER_WINSTON_3, TRAINER_WINSTON_4, TRAINER_WINSTON_5}, MAP_GROUP(ROUTE104), MAP_NUM(ROUTE104), }, { - {OPPONENT_STEVE_1, OPPONENT_STEVE_2, OPPONENT_STEVE_3, OPPONENT_STEVE_4, OPPONENT_STEVE_5}, + {TRAINER_STEVE_1, TRAINER_STEVE_2, TRAINER_STEVE_3, TRAINER_STEVE_4, TRAINER_STEVE_5}, MAP_GROUP(ROUTE114), MAP_NUM(ROUTE114), }, { - {OPPONENT_TONY_1, OPPONENT_TONY_2, OPPONENT_TONY_3, OPPONENT_TONY_4, OPPONENT_TONY_5}, + {TRAINER_TONY_1, TRAINER_TONY_2, TRAINER_TONY_3, TRAINER_TONY_4, TRAINER_TONY_5}, MAP_GROUP(ROUTE107), MAP_NUM(ROUTE107), }, { - {OPPONENT_NOB_1, OPPONENT_NOB_2, OPPONENT_NOB_3, OPPONENT_NOB_4, OPPONENT_NOB_5}, + {TRAINER_NOB_1, TRAINER_NOB_2, TRAINER_NOB_3, TRAINER_NOB_4, TRAINER_NOB_5}, MAP_GROUP(ROUTE115), MAP_NUM(ROUTE115), }, { - {OPPONENT_DALTON_1, OPPONENT_DALTON_2, OPPONENT_DALTON_3, OPPONENT_DALTON_4, OPPONENT_DALTON_5}, + {TRAINER_DALTON_1, TRAINER_DALTON_2, TRAINER_DALTON_3, TRAINER_DALTON_4, TRAINER_DALTON_5}, MAP_GROUP(ROUTE118), MAP_NUM(ROUTE118), }, { - {OPPONENT_BERNIE_1, OPPONENT_BERNIE_2, OPPONENT_BERNIE_3, OPPONENT_BERNIE_4, OPPONENT_BERNIE_5}, + {TRAINER_BERNIE_1, TRAINER_BERNIE_2, TRAINER_BERNIE_3, TRAINER_BERNIE_4, TRAINER_BERNIE_5}, MAP_GROUP(ROUTE114), MAP_NUM(ROUTE114), }, { - {OPPONENT_ETHAN_1, OPPONENT_ETHAN_2, OPPONENT_ETHAN_3, OPPONENT_ETHAN_4, OPPONENT_ETHAN_5}, + {TRAINER_ETHAN_1, TRAINER_ETHAN_2, TRAINER_ETHAN_3, TRAINER_ETHAN_4, TRAINER_ETHAN_5}, MAP_GROUP(JAGGED_PASS), MAP_NUM(JAGGED_PASS), }, { - {OPPONENT_JOHN_AND_JAY_1, OPPONENT_JOHN_AND_JAY_2, OPPONENT_JOHN_AND_JAY_3, OPPONENT_JOHN_AND_JAY_4, OPPONENT_JOHN_AND_JAY_5}, + {TRAINER_JOHN_AND_JAY_1, TRAINER_JOHN_AND_JAY_2, TRAINER_JOHN_AND_JAY_3, TRAINER_JOHN_AND_JAY_4, TRAINER_JOHN_AND_JAY_5}, MAP_GROUP(METEOR_FALLS_1F_2R), MAP_NUM(METEOR_FALLS_1F_2R), }, { - {OPPONENT_BRANDON_1, OPPONENT_BRANDON_2, OPPONENT_BRANDON_3, OPPONENT_BRANDON_4, OPPONENT_BRANDON_5}, + {TRAINER_BRANDON_1, TRAINER_BRANDON_2, TRAINER_BRANDON_3, TRAINER_BRANDON_4, TRAINER_BRANDON_5}, MAP_GROUP(ROUTE120), MAP_NUM(ROUTE120), }, { - {OPPONENT_CAMERON_1, OPPONENT_CAMERON_2, OPPONENT_CAMERON_3, OPPONENT_CAMERON_4, OPPONENT_CAMERON_5}, + {TRAINER_CAMERON_1, TRAINER_CAMERON_2, TRAINER_CAMERON_3, TRAINER_CAMERON_4, TRAINER_CAMERON_5}, MAP_GROUP(ROUTE123), MAP_NUM(ROUTE123), }, { - {OPPONENT_JACKI_1, OPPONENT_JACKI_2, OPPONENT_JACKI_3, OPPONENT_JACKI_4, OPPONENT_JACKI_5}, + {TRAINER_JACKI_1, TRAINER_JACKI_2, TRAINER_JACKI_3, TRAINER_JACKI_4, TRAINER_JACKI_5}, MAP_GROUP(ROUTE123), MAP_NUM(ROUTE123), }, { - {OPPONENT_WALTER_1, OPPONENT_WALTER_2, OPPONENT_WALTER_3, OPPONENT_WALTER_4, OPPONENT_WALTER_5}, + {TRAINER_WALTER_1, TRAINER_WALTER_2, TRAINER_WALTER_3, TRAINER_WALTER_4, TRAINER_WALTER_5}, MAP_GROUP(ROUTE121), MAP_NUM(ROUTE121), }, { - {OPPONENT_KAREN_1, OPPONENT_KAREN_2, OPPONENT_KAREN_3, OPPONENT_KAREN_4, OPPONENT_KAREN_5}, + {TRAINER_KAREN_1, TRAINER_KAREN_2, TRAINER_KAREN_3, TRAINER_KAREN_4, TRAINER_KAREN_5}, MAP_GROUP(ROUTE116), MAP_NUM(ROUTE116), }, { - {OPPONENT_JERRY_1, OPPONENT_JERRY_2, OPPONENT_JERRY_3, OPPONENT_JERRY_4, OPPONENT_JERRY_5}, + {TRAINER_JERRY_1, TRAINER_JERRY_2, TRAINER_JERRY_3, TRAINER_JERRY_4, TRAINER_JERRY_5}, MAP_GROUP(ROUTE116), MAP_NUM(ROUTE116), }, { - {OPPONENT_ANNA_AND_MEG_1, OPPONENT_ANNA_AND_MEG_2, OPPONENT_ANNA_AND_MEG_3, OPPONENT_ANNA_AND_MEG_4, OPPONENT_ANNA_AND_MEG_5}, + {TRAINER_ANNA_AND_MEG_1, TRAINER_ANNA_AND_MEG_2, TRAINER_ANNA_AND_MEG_3, TRAINER_ANNA_AND_MEG_4, TRAINER_ANNA_AND_MEG_5}, MAP_GROUP(ROUTE117), MAP_NUM(ROUTE117), }, { - {OPPONENT_ISABEL_1, OPPONENT_ISABEL_2, OPPONENT_ISABEL_3, OPPONENT_ISABEL_4, OPPONENT_ISABEL_5}, + {TRAINER_ISABEL_1, TRAINER_ISABEL_2, TRAINER_ISABEL_3, TRAINER_ISABEL_4, TRAINER_ISABEL_5}, MAP_GROUP(ROUTE110), MAP_NUM(ROUTE110), }, { - {OPPONENT_MIGUEL_1, OPPONENT_MIGUEL_2, OPPONENT_MIGUEL_3, OPPONENT_MIGUEL_4, OPPONENT_MIGUEL_5}, + {TRAINER_MIGUEL_1, TRAINER_MIGUEL_2, TRAINER_MIGUEL_3, TRAINER_MIGUEL_4, TRAINER_MIGUEL_5}, MAP_GROUP(ROUTE103), MAP_NUM(ROUTE103), }, { - {OPPONENT_TIMOTHY_1, OPPONENT_TIMOTHY_2, OPPONENT_TIMOTHY_3, OPPONENT_TIMOTHY_4, OPPONENT_TIMOTHY_5}, + {TRAINER_TIMOTHY_1, TRAINER_TIMOTHY_2, TRAINER_TIMOTHY_3, TRAINER_TIMOTHY_4, TRAINER_TIMOTHY_5}, MAP_GROUP(ROUTE115), MAP_NUM(ROUTE115), }, { - {OPPONENT_SHELBY_1, OPPONENT_SHELBY_2, OPPONENT_SHELBY_3, OPPONENT_SHELBY_4, OPPONENT_SHELBY_5}, + {TRAINER_SHELBY_1, TRAINER_SHELBY_2, TRAINER_SHELBY_3, TRAINER_SHELBY_4, TRAINER_SHELBY_5}, MAP_GROUP(MT_CHIMNEY), MAP_NUM(MT_CHIMNEY), }, { - {OPPONENT_CALVIN_1, OPPONENT_CALVIN_2, OPPONENT_CALVIN_3, OPPONENT_CALVIN_4, OPPONENT_CALVIN_5}, + {TRAINER_CALVIN_1, TRAINER_CALVIN_2, TRAINER_CALVIN_3, TRAINER_CALVIN_4, TRAINER_CALVIN_5}, MAP_GROUP(ROUTE102), MAP_NUM(ROUTE102), }, { - {OPPONENT_ELLIOT_1, OPPONENT_ELLIOT_2, OPPONENT_ELLIOT_3, OPPONENT_ELLIOT_4, OPPONENT_ELLIOT_5}, + {TRAINER_ELLIOT_1, TRAINER_ELLIOT_2, TRAINER_ELLIOT_3, TRAINER_ELLIOT_4, TRAINER_ELLIOT_5}, MAP_GROUP(ROUTE106), MAP_NUM(ROUTE106), }, { - {OPPONENT_ABIGAIL_1, OPPONENT_ABIGAIL_2, OPPONENT_ABIGAIL_3, OPPONENT_ABIGAIL_4, OPPONENT_ABIGAIL_5}, + {TRAINER_ABIGAIL_1, TRAINER_ABIGAIL_2, TRAINER_ABIGAIL_3, TRAINER_ABIGAIL_4, TRAINER_ABIGAIL_5}, MAP_GROUP(ROUTE110), MAP_NUM(ROUTE110), }, { - {OPPONENT_BENJAMIN_1, OPPONENT_BENJAMIN_2, OPPONENT_BENJAMIN_3, OPPONENT_BENJAMIN_4, OPPONENT_BENJAMIN_5}, + {TRAINER_BENJAMIN_1, TRAINER_BENJAMIN_2, TRAINER_BENJAMIN_3, TRAINER_BENJAMIN_4, TRAINER_BENJAMIN_5}, MAP_GROUP(ROUTE110), MAP_NUM(ROUTE110), }, { - {OPPONENT_ISAIAH_1, OPPONENT_ISAIAH_2, OPPONENT_ISAIAH_3, OPPONENT_ISAIAH_4, OPPONENT_ISAIAH_5}, + {TRAINER_ISAIAH_1, TRAINER_ISAIAH_2, TRAINER_ISAIAH_3, TRAINER_ISAIAH_4, TRAINER_ISAIAH_5}, MAP_GROUP(ROUTE128), MAP_NUM(ROUTE128), }, { - {OPPONENT_KATELYN_1, OPPONENT_KATELYN_2, OPPONENT_KATELYN_3, OPPONENT_KATELYN_4, OPPONENT_KATELYN_5}, + {TRAINER_KATELYN_1, TRAINER_KATELYN_2, TRAINER_KATELYN_3, TRAINER_KATELYN_4, TRAINER_KATELYN_5}, MAP_GROUP(ROUTE128), MAP_NUM(ROUTE128), }, { - {OPPONENT_MARIA_1, OPPONENT_MARIA_2, OPPONENT_MARIA_3, OPPONENT_MARIA_4, OPPONENT_MARIA_5}, + {TRAINER_MARIA_1, TRAINER_MARIA_2, TRAINER_MARIA_3, TRAINER_MARIA_4, TRAINER_MARIA_5}, MAP_GROUP(ROUTE117), MAP_NUM(ROUTE117), }, { - {OPPONENT_DYLAN_1, OPPONENT_DYLAN_2, OPPONENT_DYLAN_3, OPPONENT_DYLAN_4, OPPONENT_DYLAN_5}, + {TRAINER_DYLAN_1, TRAINER_DYLAN_2, TRAINER_DYLAN_3, TRAINER_DYLAN_4, TRAINER_DYLAN_5}, MAP_GROUP(ROUTE117), MAP_NUM(ROUTE117), }, { - {OPPONENT_NICOLAS_1, OPPONENT_NICOLAS_2, OPPONENT_NICOLAS_3, OPPONENT_NICOLAS_4, OPPONENT_NICOLAS_5}, + {TRAINER_NICOLAS_1, TRAINER_NICOLAS_2, TRAINER_NICOLAS_3, TRAINER_NICOLAS_4, TRAINER_NICOLAS_5}, MAP_GROUP(METEOR_FALLS_1F_2R), MAP_NUM(METEOR_FALLS_1F_2R), }, { - {OPPONENT_ROBERT_1, OPPONENT_ROBERT_2, OPPONENT_ROBERT_3, OPPONENT_ROBERT_4, OPPONENT_ROBERT_5}, + {TRAINER_ROBERT_1, TRAINER_ROBERT_2, TRAINER_ROBERT_3, TRAINER_ROBERT_4, TRAINER_ROBERT_5}, MAP_GROUP(ROUTE120), MAP_NUM(ROUTE120), }, { - {OPPONENT_LAO_1, OPPONENT_LAO_2, OPPONENT_LAO_3, OPPONENT_LAO_4, OPPONENT_LAO_5}, + {TRAINER_LAO_1, TRAINER_LAO_2, TRAINER_LAO_3, TRAINER_LAO_4, TRAINER_LAO_5}, MAP_GROUP(ROUTE113), MAP_NUM(ROUTE113), }, { - {OPPONENT_CYNDY_1, OPPONENT_CYNDY_2, OPPONENT_CYNDY_3, OPPONENT_CYNDY_4, OPPONENT_CYNDY_5}, + {TRAINER_CYNDY_1, TRAINER_CYNDY_2, TRAINER_CYNDY_3, TRAINER_CYNDY_4, TRAINER_CYNDY_5}, MAP_GROUP(ROUTE115), MAP_NUM(ROUTE115), }, { - {OPPONENT_MADELINE_1, OPPONENT_MADELINE_2, OPPONENT_MADELINE_3, OPPONENT_MADELINE_4, OPPONENT_MADELINE_5}, + {TRAINER_MADELINE_1, TRAINER_MADELINE_2, TRAINER_MADELINE_3, TRAINER_MADELINE_4, TRAINER_MADELINE_5}, MAP_GROUP(ROUTE113), MAP_NUM(ROUTE113), }, { - {OPPONENT_JENNY_1, OPPONENT_JENNY_2, OPPONENT_JENNY_3, OPPONENT_JENNY_4, OPPONENT_JENNY_5}, + {TRAINER_JENNY_1, TRAINER_JENNY_2, TRAINER_JENNY_3, TRAINER_JENNY_4, TRAINER_JENNY_5}, MAP_GROUP(ROUTE124), MAP_NUM(ROUTE124), }, { - {OPPONENT_DIANA_1, OPPONENT_DIANA_2, OPPONENT_DIANA_3, OPPONENT_DIANA_4, OPPONENT_DIANA_5}, + {TRAINER_DIANA_1, TRAINER_DIANA_2, TRAINER_DIANA_3, TRAINER_DIANA_4, TRAINER_DIANA_5}, MAP_GROUP(JAGGED_PASS), MAP_NUM(JAGGED_PASS), }, { - {OPPONENT_AMY_AND_LIV_1, OPPONENT_AMY_AND_LIV_2, OPPONENT_AMY_AND_LIV_4, OPPONENT_AMY_AND_LIV_5, OPPONENT_AMY_AND_LIV_6}, + {TRAINER_AMY_AND_LIV_1, TRAINER_AMY_AND_LIV_2, TRAINER_AMY_AND_LIV_4, TRAINER_AMY_AND_LIV_5, TRAINER_AMY_AND_LIV_6}, MAP_GROUP(ROUTE103), MAP_NUM(ROUTE103), }, { - {OPPONENT_ERNEST_1, OPPONENT_ERNEST_2, OPPONENT_ERNEST_3, OPPONENT_ERNEST_4, OPPONENT_ERNEST_5}, + {TRAINER_ERNEST_1, TRAINER_ERNEST_2, TRAINER_ERNEST_3, TRAINER_ERNEST_4, TRAINER_ERNEST_5}, MAP_GROUP(ROUTE125), MAP_NUM(ROUTE125), }, { - {OPPONENT_EDWIN_1, OPPONENT_EDWIN_2, OPPONENT_EDWIN_3, OPPONENT_EDWIN_4, OPPONENT_EDWIN_5}, + {TRAINER_EDWIN_1, TRAINER_EDWIN_2, TRAINER_EDWIN_3, TRAINER_EDWIN_4, TRAINER_EDWIN_5}, MAP_GROUP(ROUTE110), MAP_NUM(ROUTE110), }, { - {OPPONENT_LYDIA_1, OPPONENT_LYDIA_2, OPPONENT_LYDIA_3, OPPONENT_LYDIA_4, OPPONENT_LYDIA_5}, + {TRAINER_LYDIA_1, TRAINER_LYDIA_2, TRAINER_LYDIA_3, TRAINER_LYDIA_4, TRAINER_LYDIA_5}, MAP_GROUP(ROUTE117), MAP_NUM(ROUTE117), }, { - {OPPONENT_ISAAC_1, OPPONENT_ISAAC_2, OPPONENT_ISAAC_3, OPPONENT_ISAAC_4, OPPONENT_ISAAC_5}, + {TRAINER_ISAAC_1, TRAINER_ISAAC_2, TRAINER_ISAAC_3, TRAINER_ISAAC_4, TRAINER_ISAAC_5}, MAP_GROUP(ROUTE117), MAP_NUM(ROUTE117), }, { - {OPPONENT_CATHERINE_1, OPPONENT_CATHERINE_2, OPPONENT_CATHERINE_3, OPPONENT_CATHERINE_4, OPPONENT_CATHERINE_5}, + {TRAINER_CATHERINE_1, TRAINER_CATHERINE_2, TRAINER_CATHERINE_3, TRAINER_CATHERINE_4, TRAINER_CATHERINE_5}, MAP_GROUP(ROUTE119), MAP_NUM(ROUTE119), }, { - {OPPONENT_JACKSON_1, OPPONENT_JACKSON_2, OPPONENT_JACKSON_3, OPPONENT_JACKSON_4, OPPONENT_JACKSON_5}, + {TRAINER_JACKSON_1, TRAINER_JACKSON_2, TRAINER_JACKSON_3, TRAINER_JACKSON_4, TRAINER_JACKSON_5}, MAP_GROUP(ROUTE119), MAP_NUM(ROUTE119), }, { - {OPPONENT_HALEY_1, OPPONENT_HALEY_2, OPPONENT_HALEY_3, OPPONENT_HALEY_4, OPPONENT_HALEY_5}, + {TRAINER_HALEY_1, TRAINER_HALEY_2, TRAINER_HALEY_3, TRAINER_HALEY_4, TRAINER_HALEY_5}, MAP_GROUP(ROUTE104), MAP_NUM(ROUTE104), }, { - {OPPONENT_JAMES_1, OPPONENT_JAMES_2, OPPONENT_JAMES_3, OPPONENT_JAMES_4, OPPONENT_JAMES_5}, + {TRAINER_JAMES_1, TRAINER_JAMES_2, TRAINER_JAMES_3, TRAINER_JAMES_4, TRAINER_JAMES_5}, MAP_GROUP(PETALBURG_WOODS), MAP_NUM(PETALBURG_WOODS), }, { - {OPPONENT_TRENT_1, OPPONENT_TRENT_2, OPPONENT_TRENT_3, OPPONENT_TRENT_4, OPPONENT_TRENT_5}, + {TRAINER_TRENT_1, TRAINER_TRENT_2, TRAINER_TRENT_3, TRAINER_TRENT_4, TRAINER_TRENT_5}, MAP_GROUP(ROUTE112), MAP_NUM(ROUTE112), }, { - {OPPONENT_LOIS_AND_HAL_1, OPPONENT_LOIS_AND_HAL_2, OPPONENT_LOIS_AND_HAL_3, OPPONENT_LOIS_AND_HAL_4, OPPONENT_LOIS_AND_HAL_5}, + {TRAINER_LOIS_AND_HAL_1, TRAINER_LOIS_AND_HAL_2, TRAINER_LOIS_AND_HAL_3, TRAINER_LOIS_AND_HAL_4, TRAINER_LOIS_AND_HAL_5}, MAP_GROUP(ABANDONED_SHIP_ROOMS2_1F), MAP_NUM(ABANDONED_SHIP_ROOMS2_1F), }, { - {OPPONENT_WALLY_3, OPPONENT_WALLY_4, OPPONENT_WALLY_5, OPPONENT_WALLY_6, OPPONENT_NONE}, + {TRAINER_WALLY_3, TRAINER_WALLY_4, TRAINER_WALLY_5, TRAINER_WALLY_6, TRAINER_NONE}, MAP_GROUP(VICTORY_ROAD_1F), MAP_NUM(VICTORY_ROAD_1F), }, @@ -809,13 +809,13 @@ static u8 GetTrainerBattleTransition(void) if (trainer[gTrainerBattleOpponent].trainerClass == TRAINER_CLASS_ELITE_FOUR) { - if (gTrainerBattleOpponent == OPPONENT_SIDNEY) + if (gTrainerBattleOpponent == TRAINER_SIDNEY) return B_TRANSITION_SYDNEY; - if (gTrainerBattleOpponent == OPPONENT_PHOEBE) + if (gTrainerBattleOpponent == TRAINER_PHOEBE) return B_TRANSITION_PHOEBE; - if (gTrainerBattleOpponent == OPPONENT_GLACIA) + if (gTrainerBattleOpponent == TRAINER_GLACIA) return B_TRANSITION_GLACIA; - if (gTrainerBattleOpponent == OPPONENT_DRAKE) + if (gTrainerBattleOpponent == TRAINER_DRAKE) return B_TRANSITION_DRAKE; return B_TRANSITION_STEVEN; } diff --git a/src/data/trainers_de.h b/src/data/trainers_de.h index c7a0e7744..7344347e1 100644 --- a/src/data/trainers_de.h +++ b/src/data/trainers_de.h @@ -1,5 +1,5 @@ const struct Trainer gTrainers[] = { - [OPPONENT_NONE] = + [TRAINER_NONE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_1, @@ -13,7 +13,7 @@ const struct Trainer gTrainers[] = { .party = NULL }, - [OPPONENT_ARCHIE_1] = + [TRAINER_ARCHIE_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_AQUA_LEADER, @@ -27,7 +27,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Archie1 }, - [OPPONENT_GRUNT_1] = + [TRAINER_GRUNT_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -41,7 +41,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt1 }, - [OPPONENT_GRUNT_2] = + [TRAINER_GRUNT_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -55,7 +55,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt2 }, - [OPPONENT_GRUNT_3] = + [TRAINER_GRUNT_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -69,7 +69,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt3 }, - [OPPONENT_GRUNT_4] = + [TRAINER_GRUNT_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -83,7 +83,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt4 }, - [OPPONENT_GRUNT_5] = + [TRAINER_GRUNT_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -97,7 +97,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt5 }, - [OPPONENT_GRUNT_6] = + [TRAINER_GRUNT_6] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -111,7 +111,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt6 }, - [OPPONENT_GRUNT_7] = + [TRAINER_GRUNT_7] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -125,7 +125,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt7 }, - [OPPONENT_GRUNT_8] = + [TRAINER_GRUNT_8] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -139,7 +139,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt8 }, - [OPPONENT_GRUNT_9] = + [TRAINER_GRUNT_9] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -153,7 +153,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt9 }, - [OPPONENT_GRUNT_10] = + [TRAINER_GRUNT_10] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -167,7 +167,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt10 }, - [OPPONENT_GRUNT_11] = + [TRAINER_GRUNT_11] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -181,7 +181,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt11 }, - [OPPONENT_GRUNT_12] = + [TRAINER_GRUNT_12] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -195,7 +195,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt12 }, - [OPPONENT_GRUNT_13] = + [TRAINER_GRUNT_13] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -209,7 +209,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt13 }, - [OPPONENT_GRUNT_14] = + [TRAINER_GRUNT_14] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -223,7 +223,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt14 }, - [OPPONENT_GRUNT_15] = + [TRAINER_GRUNT_15] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -237,7 +237,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt15 }, - [OPPONENT_GRUNT_16] = + [TRAINER_GRUNT_16] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -251,7 +251,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt16 }, - [OPPONENT_GRUNT_17] = + [TRAINER_GRUNT_17] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -265,7 +265,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt17 }, - [OPPONENT_GRUNT_18] = + [TRAINER_GRUNT_18] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -279,7 +279,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt18 }, - [OPPONENT_GRUNT_19] = + [TRAINER_GRUNT_19] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -293,7 +293,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt19 }, - [OPPONENT_GRUNT_20] = + [TRAINER_GRUNT_20] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -307,7 +307,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt20 }, - [OPPONENT_GRUNT_21] = + [TRAINER_GRUNT_21] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -321,7 +321,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt21 }, - [OPPONENT_GRUNT_22] = + [TRAINER_GRUNT_22] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -335,7 +335,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt22 }, - [OPPONENT_GRUNT_23] = + [TRAINER_GRUNT_23] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -349,7 +349,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt23 }, - [OPPONENT_GRUNT_24] = + [TRAINER_GRUNT_24] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -363,7 +363,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt24 }, - [OPPONENT_GRUNT_25] = + [TRAINER_GRUNT_25] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -377,7 +377,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt25 }, - [OPPONENT_GRUNT_26] = + [TRAINER_GRUNT_26] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -391,7 +391,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt26 }, - [OPPONENT_GRUNT_27] = + [TRAINER_GRUNT_27] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -405,7 +405,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt27 }, - [OPPONENT_ANONYMOUS_1] = + [TRAINER_ANONYMOUS_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_AQUA_ADMIN, @@ -419,7 +419,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Anonymous1 }, - [OPPONENT_MATT_1] = + [TRAINER_MATT_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_AQUA_ADMIN, @@ -433,7 +433,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Matt1 }, - [OPPONENT_MATT_2] = + [TRAINER_MATT_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_AQUA_ADMIN, @@ -447,7 +447,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Matt2 }, - [OPPONENT_SHELLY_1] = + [TRAINER_SHELLY_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_AQUA_ADMIN, @@ -461,7 +461,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Shelly1 }, - [OPPONENT_SHELLY_2] = + [TRAINER_SHELLY_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_AQUA_ADMIN, @@ -475,7 +475,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Shelly2 }, - [OPPONENT_ARCHIE_2] = + [TRAINER_ARCHIE_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_AQUA_LEADER, @@ -489,7 +489,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Archie2 }, - [OPPONENT_ARCHIE_3] = + [TRAINER_ARCHIE_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_AQUA_LEADER, @@ -503,7 +503,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Archie3 }, - [OPPONENT_DAISY] = + [TRAINER_DAISY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_AROMA_LADY, @@ -517,7 +517,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Daisy }, - [OPPONENT_ROSE_1] = + [TRAINER_ROSE_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_AROMA_LADY, @@ -531,7 +531,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Rose1 }, - [OPPONENT_LILY] = + [TRAINER_LILY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_AROMA_LADY, @@ -545,7 +545,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Lily }, - [OPPONENT_VIOLET] = + [TRAINER_VIOLET] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_AROMA_LADY, @@ -559,7 +559,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Violet }, - [OPPONENT_ROSE_2] = + [TRAINER_ROSE_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_AROMA_LADY, @@ -573,7 +573,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Rose2 }, - [OPPONENT_ROSE_3] = + [TRAINER_ROSE_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_AROMA_LADY, @@ -587,7 +587,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Rose3 }, - [OPPONENT_ROSE_4] = + [TRAINER_ROSE_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_AROMA_LADY, @@ -601,7 +601,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Rose4 }, - [OPPONENT_ROSE_5] = + [TRAINER_ROSE_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_AROMA_LADY, @@ -615,7 +615,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Rose5 }, - [OPPONENT_DUSTY_1] = + [TRAINER_DUSTY_1] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_RUIN_MANIAC, @@ -629,7 +629,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Dusty1 }, - [OPPONENT_CHIP] = + [TRAINER_CHIP] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_RUIN_MANIAC, @@ -643,7 +643,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Chip }, - [OPPONENT_FOSTER] = + [TRAINER_FOSTER] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_RUIN_MANIAC, @@ -657,7 +657,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Foster }, - [OPPONENT_DUSTY_2] = + [TRAINER_DUSTY_2] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_RUIN_MANIAC, @@ -671,7 +671,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Dusty2 }, - [OPPONENT_DUSTY_3] = + [TRAINER_DUSTY_3] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_RUIN_MANIAC, @@ -685,7 +685,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Dusty3 }, - [OPPONENT_DUSTY_4] = + [TRAINER_DUSTY_4] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_RUIN_MANIAC, @@ -699,7 +699,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Dusty4 }, - [OPPONENT_DUSTY_5] = + [TRAINER_DUSTY_5] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_RUIN_MANIAC, @@ -713,7 +713,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Dusty5 }, - [OPPONENT_GABBY_AND_TY_1] = + [TRAINER_GABBY_AND_TY_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_INTERVIEWER, @@ -727,7 +727,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_GabbyAndTy1 }, - [OPPONENT_GABBY_AND_TY_2] = + [TRAINER_GABBY_AND_TY_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_INTERVIEWER, @@ -741,7 +741,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_GabbyAndTy2 }, - [OPPONENT_GABBY_AND_TY_3] = + [TRAINER_GABBY_AND_TY_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_INTERVIEWER, @@ -755,7 +755,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_GabbyAndTy3 }, - [OPPONENT_GABBY_AND_TY_4] = + [TRAINER_GABBY_AND_TY_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_INTERVIEWER, @@ -769,7 +769,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_GabbyAndTy4 }, - [OPPONENT_GABBY_AND_TY_5] = + [TRAINER_GABBY_AND_TY_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_INTERVIEWER, @@ -783,7 +783,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_GabbyAndTy5 }, - [OPPONENT_GABBY_AND_TY_6] = + [TRAINER_GABBY_AND_TY_6] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_INTERVIEWER, @@ -797,7 +797,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_GabbyAndTy6 }, - [OPPONENT_LOLA_1] = + [TRAINER_LOLA_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TUBER_F, @@ -811,7 +811,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Lola1 }, - [OPPONENT_CARMEN] = + [TRAINER_CARMEN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TUBER_F, @@ -825,7 +825,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Carmen }, - [OPPONENT_GWEN] = + [TRAINER_GWEN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TUBER_F, @@ -839,7 +839,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Gwen }, - [OPPONENT_LOLA_2] = + [TRAINER_LOLA_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TUBER_F, @@ -853,7 +853,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Lola2 }, - [OPPONENT_LOLA_3] = + [TRAINER_LOLA_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TUBER_F, @@ -867,7 +867,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Lola3 }, - [OPPONENT_LOLA_4] = + [TRAINER_LOLA_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TUBER_F, @@ -881,7 +881,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Lola4 }, - [OPPONENT_LOLA_5] = + [TRAINER_LOLA_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TUBER_F, @@ -895,7 +895,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Lola5 }, - [OPPONENT_RICKY_1] = + [TRAINER_RICKY_1] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_TUBER_M, @@ -909,7 +909,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Ricky1 }, - [OPPONENT_SIMON] = + [TRAINER_SIMON] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TUBER_M, @@ -923,7 +923,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Simon }, - [OPPONENT_CHARLIE] = + [TRAINER_CHARLIE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TUBER_M, @@ -937,7 +937,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Charlie }, - [OPPONENT_RICKY_2] = + [TRAINER_RICKY_2] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_TUBER_M, @@ -951,7 +951,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Ricky2 }, - [OPPONENT_RICKY_3] = + [TRAINER_RICKY_3] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_TUBER_M, @@ -965,7 +965,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Ricky3 }, - [OPPONENT_RICKY_4] = + [TRAINER_RICKY_4] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_TUBER_M, @@ -979,7 +979,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Ricky4 }, - [OPPONENT_RICKY_5] = + [TRAINER_RICKY_5] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_TUBER_M, @@ -993,7 +993,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Ricky5 }, - [OPPONENT_RANDALL] = + [TRAINER_RANDALL] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1007,7 +1007,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Randall }, - [OPPONENT_PARKER] = + [TRAINER_PARKER] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1021,7 +1021,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Parker }, - [OPPONENT_GEORGE] = + [TRAINER_GEORGE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1035,7 +1035,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_George }, - [OPPONENT_BERKE] = + [TRAINER_BERKE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1049,7 +1049,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Berke }, - [OPPONENT_CLYDE] = + [TRAINER_CLYDE] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1063,7 +1063,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Clyde }, - [OPPONENT_VINCENT] = + [TRAINER_VINCENT] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1077,7 +1077,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Vincent }, - [OPPONENT_LEROY] = + [TRAINER_LEROY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1091,7 +1091,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Leroy }, - [OPPONENT_WILTON_1] = + [TRAINER_WILTON_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1105,7 +1105,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Wilton1 }, - [OPPONENT_EDGAR] = + [TRAINER_EDGAR] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1119,7 +1119,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Edgar }, - [OPPONENT_ALBERT] = + [TRAINER_ALBERT] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1133,7 +1133,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Albert }, - [OPPONENT_SAMUEL] = + [TRAINER_SAMUEL] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1147,7 +1147,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Samuel }, - [OPPONENT_VITO] = + [TRAINER_VITO] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1161,7 +1161,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Vito }, - [OPPONENT_OWEN] = + [TRAINER_OWEN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1175,7 +1175,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Owen }, - [OPPONENT_WILTON_2] = + [TRAINER_WILTON_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1189,7 +1189,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Wilton2 }, - [OPPONENT_WILTON_3] = + [TRAINER_WILTON_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1203,7 +1203,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Wilton3 }, - [OPPONENT_WILTON_4] = + [TRAINER_WILTON_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1217,7 +1217,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Wilton4 }, - [OPPONENT_WILTON_5] = + [TRAINER_WILTON_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1231,7 +1231,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Wilton5 }, - [OPPONENT_WARREN] = + [TRAINER_WARREN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1245,7 +1245,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Warren }, - [OPPONENT_MARY] = + [TRAINER_MARY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1259,7 +1259,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Mary }, - [OPPONENT_LORI] = + [TRAINER_LORI] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1273,7 +1273,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Lori }, - [OPPONENT_JODY] = + [TRAINER_JODY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1287,7 +1287,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jody }, - [OPPONENT_WENDY] = + [TRAINER_WENDY] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1301,7 +1301,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Wendy }, - [OPPONENT_ELAINE] = + [TRAINER_ELAINE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1315,7 +1315,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Elaine }, - [OPPONENT_BROOKE_1] = + [TRAINER_BROOKE_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1329,7 +1329,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Brooke1 }, - [OPPONENT_JENNIFER] = + [TRAINER_JENNIFER] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1343,7 +1343,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jennifer }, - [OPPONENT_HOPE] = + [TRAINER_HOPE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1357,7 +1357,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Hope }, - [OPPONENT_SHANNON] = + [TRAINER_SHANNON] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1371,7 +1371,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Shannon }, - [OPPONENT_MICHELLE] = + [TRAINER_MICHELLE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1385,7 +1385,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Michelle }, - [OPPONENT_CAROLINE] = + [TRAINER_CAROLINE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1399,7 +1399,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Caroline }, - [OPPONENT_JULIE] = + [TRAINER_JULIE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1413,7 +1413,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Julie }, - [OPPONENT_BROOKE_2] = + [TRAINER_BROOKE_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1427,7 +1427,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Brooke2 }, - [OPPONENT_BROOKE_3] = + [TRAINER_BROOKE_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1441,7 +1441,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Brooke3 }, - [OPPONENT_BROOKE_4] = + [TRAINER_BROOKE_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1455,7 +1455,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Brooke4 }, - [OPPONENT_BROOKE_5] = + [TRAINER_BROOKE_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1469,7 +1469,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Brooke5 }, - [OPPONENT_PATRICIA] = + [TRAINER_PATRICIA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HEX_MANIAC, @@ -1483,7 +1483,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Patricia }, - [OPPONENT_KINDRA] = + [TRAINER_KINDRA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HEX_MANIAC, @@ -1497,7 +1497,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Kindra }, - [OPPONENT_TAMMY] = + [TRAINER_TAMMY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HEX_MANIAC, @@ -1511,7 +1511,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Tammy }, - [OPPONENT_VALERIE_1] = + [TRAINER_VALERIE_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HEX_MANIAC, @@ -1525,7 +1525,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Valerie1 }, - [OPPONENT_TASHA] = + [TRAINER_TASHA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HEX_MANIAC, @@ -1539,7 +1539,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Tasha }, - [OPPONENT_VALERIE_2] = + [TRAINER_VALERIE_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HEX_MANIAC, @@ -1553,7 +1553,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Valerie2 }, - [OPPONENT_VALERIE_3] = + [TRAINER_VALERIE_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HEX_MANIAC, @@ -1567,7 +1567,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Valerie3 }, - [OPPONENT_VALERIE_4] = + [TRAINER_VALERIE_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HEX_MANIAC, @@ -1581,7 +1581,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Valerie4 }, - [OPPONENT_VALERIE_5] = + [TRAINER_VALERIE_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HEX_MANIAC, @@ -1595,7 +1595,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Valerie5 }, - [OPPONENT_CINDY_1] = + [TRAINER_CINDY_1] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_LADY, @@ -1609,7 +1609,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Cindy1 }, - [OPPONENT_ANONYMOUS_2] = + [TRAINER_ANONYMOUS_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_LADY, @@ -1623,7 +1623,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Anonymous2 }, - [OPPONENT_BRIANNA_1] = + [TRAINER_BRIANNA_1] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_LADY, @@ -1637,7 +1637,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Brianna1 }, - [OPPONENT_CINDY_2] = + [TRAINER_CINDY_2] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_LADY, @@ -1651,7 +1651,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Cindy2 }, - [OPPONENT_BRIANNA_2] = + [TRAINER_BRIANNA_2] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_LADY, @@ -1665,7 +1665,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Brianna2 }, - [OPPONENT_ANETTE] = + [TRAINER_ANETTE] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_LADY, @@ -1679,7 +1679,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Anette }, - [OPPONENT_CINDY_3] = + [TRAINER_CINDY_3] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_LADY, @@ -1693,7 +1693,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Cindy3 }, - [OPPONENT_CINDY_4] = + [TRAINER_CINDY_4] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_LADY, @@ -1707,7 +1707,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Cindy4 }, - [OPPONENT_CINDY_5] = + [TRAINER_CINDY_5] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_LADY, @@ -1721,7 +1721,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Cindy5 }, - [OPPONENT_CINDY_6] = + [TRAINER_CINDY_6] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_LADY, @@ -1735,7 +1735,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Cindy6 }, - [OPPONENT_MELISSA] = + [TRAINER_MELISSA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BEAUTY, @@ -1749,7 +1749,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Melissa }, - [OPPONENT_SHEILA] = + [TRAINER_SHEILA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BEAUTY, @@ -1763,7 +1763,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Sheila }, - [OPPONENT_SHIRLEY] = + [TRAINER_SHIRLEY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BEAUTY, @@ -1777,7 +1777,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Shirley }, - [OPPONENT_JESSICA_1] = + [TRAINER_JESSICA_1] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_BEAUTY, @@ -1791,7 +1791,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jessica1 }, - [OPPONENT_CONNIE] = + [TRAINER_CONNIE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BEAUTY, @@ -1805,7 +1805,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Connie }, - [OPPONENT_BRIDGET] = + [TRAINER_BRIDGET] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BEAUTY, @@ -1819,7 +1819,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Bridget }, - [OPPONENT_OLIVIA] = + [TRAINER_OLIVIA] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_BEAUTY, @@ -1833,7 +1833,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Olivia }, - [OPPONENT_TIFFANY] = + [TRAINER_TIFFANY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BEAUTY, @@ -1847,7 +1847,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Tiffany }, - [OPPONENT_JESSICA_2] = + [TRAINER_JESSICA_2] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_BEAUTY, @@ -1861,7 +1861,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jessica2 }, - [OPPONENT_JESSICA_3] = + [TRAINER_JESSICA_3] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_BEAUTY, @@ -1875,7 +1875,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jessica3 }, - [OPPONENT_JESSICA_4] = + [TRAINER_JESSICA_4] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_BEAUTY, @@ -1889,7 +1889,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jessica4 }, - [OPPONENT_JESSICA_5] = + [TRAINER_JESSICA_5] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_BEAUTY, @@ -1903,7 +1903,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jessica5 }, - [OPPONENT_WINSTON_1] = + [TRAINER_WINSTON_1] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_RICH_BOY, @@ -1917,7 +1917,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Winston1 }, - [OPPONENT_ANONYMOUS_3] = + [TRAINER_ANONYMOUS_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_RICH_BOY, @@ -1931,7 +1931,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Anonymous3 }, - [OPPONENT_GARRET] = + [TRAINER_GARRET] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_RICH_BOY, @@ -1945,7 +1945,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Garret }, - [OPPONENT_WINSTON_2] = + [TRAINER_WINSTON_2] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_RICH_BOY, @@ -1959,7 +1959,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Winston2 }, - [OPPONENT_WINSTON_3] = + [TRAINER_WINSTON_3] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_RICH_BOY, @@ -1973,7 +1973,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Winston3 }, - [OPPONENT_WINSTON_4] = + [TRAINER_WINSTON_4] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_RICH_BOY, @@ -1987,7 +1987,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Winston4 }, - [OPPONENT_WINSTON_5] = + [TRAINER_WINSTON_5] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_RICH_BOY, @@ -2001,7 +2001,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Winston5 }, - [OPPONENT_STEVE_1] = + [TRAINER_STEVE_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMANIAC, @@ -2015,7 +2015,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Steve1 }, - [OPPONENT_CHRIS] = + [TRAINER_CHRIS] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMANIAC, @@ -2029,7 +2029,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Chris }, - [OPPONENT_MARK] = + [TRAINER_MARK] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMANIAC, @@ -2043,7 +2043,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Mark }, - [OPPONENT_KENN] = + [TRAINER_KENN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMANIAC, @@ -2057,7 +2057,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Kenn }, - [OPPONENT_STEVE_2] = + [TRAINER_STEVE_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMANIAC, @@ -2071,7 +2071,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Steve2 }, - [OPPONENT_STEVE_3] = + [TRAINER_STEVE_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMANIAC, @@ -2085,7 +2085,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Steve3 }, - [OPPONENT_STEVE_4] = + [TRAINER_STEVE_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMANIAC, @@ -2099,7 +2099,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Steve4 }, - [OPPONENT_STEVE_5] = + [TRAINER_STEVE_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMANIAC, @@ -2113,7 +2113,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Steve5 }, - [OPPONENT_LUIS] = + [TRAINER_LUIS] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2127,7 +2127,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Luis }, - [OPPONENT_AUSTIN] = + [TRAINER_AUSTIN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2141,7 +2141,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Austin }, - [OPPONENT_DOUGLAS] = + [TRAINER_DOUGLAS] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2155,7 +2155,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Douglas }, - [OPPONENT_DARRIN] = + [TRAINER_DARRIN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2169,7 +2169,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Darrin }, - [OPPONENT_TONY_1] = + [TRAINER_TONY_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2183,7 +2183,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Tony1 }, - [OPPONENT_JEROME] = + [TRAINER_JEROME] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2197,7 +2197,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jerome }, - [OPPONENT_MATTHEW] = + [TRAINER_MATTHEW] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2211,7 +2211,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Matthew }, - [OPPONENT_DAVID] = + [TRAINER_DAVID] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2225,7 +2225,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_David }, - [OPPONENT_SPENCER] = + [TRAINER_SPENCER] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2239,7 +2239,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Spencer }, - [OPPONENT_ROLAND] = + [TRAINER_ROLAND] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2253,7 +2253,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Roland }, - [OPPONENT_CODY] = + [TRAINER_CODY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2267,7 +2267,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Cody }, - [OPPONENT_STAN] = + [TRAINER_STAN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2281,7 +2281,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Stan }, - [OPPONENT_BARRY] = + [TRAINER_BARRY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2295,7 +2295,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Barry }, - [OPPONENT_DEAN] = + [TRAINER_DEAN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2309,7 +2309,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Dean }, - [OPPONENT_RODNEY] = + [TRAINER_RODNEY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2323,7 +2323,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Rodney }, - [OPPONENT_RICHARD] = + [TRAINER_RICHARD] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2337,7 +2337,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Richard }, - [OPPONENT_HERMAN] = + [TRAINER_HERMAN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2351,7 +2351,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Herman }, - [OPPONENT_ANONYMOUS_4] = + [TRAINER_ANONYMOUS_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2365,7 +2365,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Anonymous4 }, - [OPPONENT_GILBERT] = + [TRAINER_GILBERT] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2379,7 +2379,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Gilbert }, - [OPPONENT_FRANKLIN] = + [TRAINER_FRANKLIN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2393,7 +2393,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Franklin }, - [OPPONENT_DANNY] = + [TRAINER_DANNY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2407,7 +2407,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Danny }, - [OPPONENT_JACK] = + [TRAINER_JACK] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2421,7 +2421,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jack }, - [OPPONENT_DUDLEY] = + [TRAINER_DUDLEY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2435,7 +2435,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Dudley }, - [OPPONENT_CHAD] = + [TRAINER_CHAD] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2449,7 +2449,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Chad }, - [OPPONENT_TONY_2] = + [TRAINER_TONY_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2463,7 +2463,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Tony2 }, - [OPPONENT_TONY_3] = + [TRAINER_TONY_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2477,7 +2477,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Tony3 }, - [OPPONENT_TONY_4] = + [TRAINER_TONY_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2491,7 +2491,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Tony4 }, - [OPPONENT_TONY_5] = + [TRAINER_TONY_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2505,7 +2505,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Tony5 }, - [OPPONENT_HIDEKI] = + [TRAINER_HIDEKI] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BLACK_BELT, @@ -2519,7 +2519,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Hideki }, - [OPPONENT_HITOSHI] = + [TRAINER_HITOSHI] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BLACK_BELT, @@ -2533,7 +2533,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Hitoshi }, - [OPPONENT_KIYO] = + [TRAINER_KIYO] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BLACK_BELT, @@ -2547,7 +2547,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Kiyo }, - [OPPONENT_KOICHI] = + [TRAINER_KOICHI] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BLACK_BELT, @@ -2561,7 +2561,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Koichi }, - [OPPONENT_NOB_1] = + [TRAINER_NOB_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BLACK_BELT, @@ -2575,7 +2575,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Nob1 }, - [OPPONENT_NOB_2] = + [TRAINER_NOB_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BLACK_BELT, @@ -2589,7 +2589,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Nob2 }, - [OPPONENT_NOB_3] = + [TRAINER_NOB_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BLACK_BELT, @@ -2603,7 +2603,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Nob3 }, - [OPPONENT_NOB_4] = + [TRAINER_NOB_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BLACK_BELT, @@ -2617,7 +2617,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Nob4 }, - [OPPONENT_NOB_5] = + [TRAINER_NOB_5] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_BLACK_BELT, @@ -2631,7 +2631,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Nob5 }, - [OPPONENT_YUJI] = + [TRAINER_YUJI] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BLACK_BELT, @@ -2645,7 +2645,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Yuji }, - [OPPONENT_DAISUKE] = + [TRAINER_DAISUKE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BLACK_BELT, @@ -2659,7 +2659,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Daisuke }, - [OPPONENT_ATSUSHI] = + [TRAINER_ATSUSHI] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BLACK_BELT, @@ -2673,7 +2673,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Atsushi }, - [OPPONENT_KIRK] = + [TRAINER_KIRK] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_GUITARIST, @@ -2687,7 +2687,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Kirk }, - [OPPONENT_SCOTT] = + [TRAINER_SCOTT] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_GUITARIST, @@ -2701,7 +2701,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Scott }, - [OPPONENT_HARVEY] = + [TRAINER_HARVEY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_GUITARIST, @@ -2715,7 +2715,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Harvey }, - [OPPONENT_SHAWN] = + [TRAINER_SHAWN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_GUITARIST, @@ -2729,7 +2729,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Shawn }, - [OPPONENT_RANDY] = + [TRAINER_RANDY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_GUITARIST, @@ -2743,7 +2743,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Randy }, - [OPPONENT_DALTON_1] = + [TRAINER_DALTON_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_GUITARIST, @@ -2757,7 +2757,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Dalton1 }, - [OPPONENT_DALTON_2] = + [TRAINER_DALTON_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_GUITARIST, @@ -2771,7 +2771,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Dalton2 }, - [OPPONENT_DALTON_3] = + [TRAINER_DALTON_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_GUITARIST, @@ -2785,7 +2785,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Dalton3 }, - [OPPONENT_DALTON_4] = + [TRAINER_DALTON_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_GUITARIST, @@ -2799,7 +2799,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Dalton4 }, - [OPPONENT_DALTON_5] = + [TRAINER_DALTON_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_GUITARIST, @@ -2813,7 +2813,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Dalton5 }, - [OPPONENT_COLE] = + [TRAINER_COLE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_KINDLER, @@ -2827,7 +2827,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Cole }, - [OPPONENT_FLINT] = + [TRAINER_FLINT] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_KINDLER, @@ -2841,7 +2841,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Flint }, - [OPPONENT_AXLE] = + [TRAINER_AXLE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_KINDLER, @@ -2855,7 +2855,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Axle }, - [OPPONENT_JAKE] = + [TRAINER_JAKE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_KINDLER, @@ -2869,7 +2869,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jake }, - [OPPONENT_ANDY] = + [TRAINER_ANDY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_KINDLER, @@ -2883,7 +2883,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Andy }, - [OPPONENT_BERNIE_1] = + [TRAINER_BERNIE_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_KINDLER, @@ -2897,7 +2897,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Bernie1 }, - [OPPONENT_BERNIE_2] = + [TRAINER_BERNIE_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_KINDLER, @@ -2911,7 +2911,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Bernie2 }, - [OPPONENT_BERNIE_3] = + [TRAINER_BERNIE_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_KINDLER, @@ -2925,7 +2925,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Bernie3 }, - [OPPONENT_BERNIE_4] = + [TRAINER_BERNIE_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_KINDLER, @@ -2939,7 +2939,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Bernie4 }, - [OPPONENT_BERNIE_5] = + [TRAINER_BERNIE_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_KINDLER, @@ -2953,7 +2953,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Bernie5 }, - [OPPONENT_DREW] = + [TRAINER_DREW] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_CAMPER, @@ -2967,7 +2967,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Drew }, - [OPPONENT_CLIFF] = + [TRAINER_CLIFF] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_CAMPER, @@ -2981,7 +2981,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Cliff }, - [OPPONENT_LARRY] = + [TRAINER_LARRY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_CAMPER, @@ -2995,7 +2995,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Larry }, - [OPPONENT_SHANE] = + [TRAINER_SHANE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_CAMPER, @@ -3009,7 +3009,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Shane }, - [OPPONENT_JUSTIN] = + [TRAINER_JUSTIN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_CAMPER, @@ -3023,7 +3023,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Justin }, - [OPPONENT_ETHAN_1] = + [TRAINER_ETHAN_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_CAMPER, @@ -3037,7 +3037,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Ethan1 }, - [OPPONENT_JEFF] = + [TRAINER_JEFF] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_CAMPER, @@ -3051,7 +3051,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jeff }, - [OPPONENT_TRAVIS] = + [TRAINER_TRAVIS] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_CAMPER, @@ -3065,7 +3065,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Travis }, - [OPPONENT_ETHAN_2] = + [TRAINER_ETHAN_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_CAMPER, @@ -3079,7 +3079,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Ethan2 }, - [OPPONENT_ETHAN_3] = + [TRAINER_ETHAN_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_CAMPER, @@ -3093,7 +3093,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Ethan3 }, - [OPPONENT_ETHAN_4] = + [TRAINER_ETHAN_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_CAMPER, @@ -3107,7 +3107,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Ethan4 }, - [OPPONENT_ETHAN_5] = + [TRAINER_ETHAN_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_CAMPER, @@ -3121,7 +3121,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Ethan5 }, - [OPPONENT_BRENT] = + [TRAINER_BRENT] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BUG_MANIAC, @@ -3135,7 +3135,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Brent }, - [OPPONENT_DONALD] = + [TRAINER_DONALD] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BUG_MANIAC, @@ -3149,7 +3149,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Donald }, - [OPPONENT_TAYLOR] = + [TRAINER_TAYLOR] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BUG_MANIAC, @@ -3163,7 +3163,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Taylor }, - [OPPONENT_BRANDON_1] = + [TRAINER_BRANDON_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BUG_MANIAC, @@ -3177,7 +3177,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Brandon1 }, - [OPPONENT_DEREK] = + [TRAINER_DEREK] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BUG_MANIAC, @@ -3191,7 +3191,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Derek }, - [OPPONENT_BRANDON_2] = + [TRAINER_BRANDON_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BUG_MANIAC, @@ -3205,7 +3205,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Brandon2 }, - [OPPONENT_BRANDON_3] = + [TRAINER_BRANDON_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BUG_MANIAC, @@ -3219,7 +3219,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Brandon3 }, - [OPPONENT_BRANDON_4] = + [TRAINER_BRANDON_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BUG_MANIAC, @@ -3233,7 +3233,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Brandon4 }, - [OPPONENT_BRANDON_5] = + [TRAINER_BRANDON_5] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_BUG_MANIAC, @@ -3247,7 +3247,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Brandon5 }, - [OPPONENT_EDWARD] = + [TRAINER_EDWARD] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3261,7 +3261,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Edward }, - [OPPONENT_PRESTON] = + [TRAINER_PRESTON] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3275,7 +3275,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Preston }, - [OPPONENT_VIRGIL] = + [TRAINER_VIRGIL] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3289,7 +3289,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Virgil }, - [OPPONENT_FRITZ] = + [TRAINER_FRITZ] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3303,7 +3303,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Fritz }, - [OPPONENT_WILLIAM] = + [TRAINER_WILLIAM] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3317,7 +3317,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_William }, - [OPPONENT_JOSHUA] = + [TRAINER_JOSHUA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3331,7 +3331,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Joshua }, - [OPPONENT_CAMERON_1] = + [TRAINER_CAMERON_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3345,7 +3345,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Cameron1 }, - [OPPONENT_CAMERON_2] = + [TRAINER_CAMERON_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3359,7 +3359,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Cameron2 }, - [OPPONENT_CAMERON_3] = + [TRAINER_CAMERON_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3373,7 +3373,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Cameron3 }, - [OPPONENT_CAMERON_4] = + [TRAINER_CAMERON_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3387,7 +3387,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Cameron4 }, - [OPPONENT_CAMERON_5] = + [TRAINER_CAMERON_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3401,7 +3401,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Cameron5 }, - [OPPONENT_JACLYN] = + [TRAINER_JACLYN] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3415,7 +3415,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jaclyn }, - [OPPONENT_HANNAH] = + [TRAINER_HANNAH] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3429,7 +3429,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Hannah }, - [OPPONENT_SAMANTHA] = + [TRAINER_SAMANTHA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3443,7 +3443,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Samantha }, - [OPPONENT_MAURA] = + [TRAINER_MAURA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3457,7 +3457,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Maura }, - [OPPONENT_KAYLA] = + [TRAINER_KAYLA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3471,7 +3471,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Kayla }, - [OPPONENT_ALEXIS] = + [TRAINER_ALEXIS] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3485,7 +3485,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Alexis }, - [OPPONENT_JACKI_1] = + [TRAINER_JACKI_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3499,7 +3499,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jacki1 }, - [OPPONENT_JACKI_2] = + [TRAINER_JACKI_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3513,7 +3513,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jacki2 }, - [OPPONENT_JACKI_3] = + [TRAINER_JACKI_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3527,7 +3527,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jacki3 }, - [OPPONENT_JACKI_4] = + [TRAINER_JACKI_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3541,7 +3541,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jacki4 }, - [OPPONENT_JACKI_5] = + [TRAINER_JACKI_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3555,7 +3555,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jacki5 }, - [OPPONENT_WALTER_1] = + [TRAINER_WALTER_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_GENTLEMAN, @@ -3569,7 +3569,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Walter1 }, - [OPPONENT_TUCKER] = + [TRAINER_TUCKER] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_GENTLEMAN, @@ -3583,7 +3583,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Tucker }, - [OPPONENT_THOMAS] = + [TRAINER_THOMAS] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_GENTLEMAN, @@ -3597,7 +3597,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Thomas }, - [OPPONENT_WALTER_2] = + [TRAINER_WALTER_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_GENTLEMAN, @@ -3611,7 +3611,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Walter2 }, - [OPPONENT_WALTER_3] = + [TRAINER_WALTER_3] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_GENTLEMAN, @@ -3625,7 +3625,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Walter3 }, - [OPPONENT_WALTER_4] = + [TRAINER_WALTER_4] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_GENTLEMAN, @@ -3639,7 +3639,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Walter4 }, - [OPPONENT_WALTER_5] = + [TRAINER_WALTER_5] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_GENTLEMAN, @@ -3653,7 +3653,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Walter5 }, - [OPPONENT_SIDNEY] = + [TRAINER_SIDNEY] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_ELITE_FOUR, @@ -3667,7 +3667,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Sidney }, - [OPPONENT_PHOEBE] = + [TRAINER_PHOEBE] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_ELITE_FOUR, @@ -3681,7 +3681,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Phoebe }, - [OPPONENT_GLACIA] = + [TRAINER_GLACIA] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_ELITE_FOUR, @@ -3695,7 +3695,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Glacia }, - [OPPONENT_DRAKE] = + [TRAINER_DRAKE] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_ELITE_FOUR, @@ -3709,7 +3709,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Drake }, - [OPPONENT_ROXANNE] = + [TRAINER_ROXANNE] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_LEADER, @@ -3723,7 +3723,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Roxanne }, - [OPPONENT_BRAWLY] = + [TRAINER_BRAWLY] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_LEADER, @@ -3737,7 +3737,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Brawly }, - [OPPONENT_WATTSON] = + [TRAINER_WATTSON] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_LEADER, @@ -3751,7 +3751,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Wattson }, - [OPPONENT_FLANNERY] = + [TRAINER_FLANNERY] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_LEADER, @@ -3765,7 +3765,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Flannery }, - [OPPONENT_NORMAN] = + [TRAINER_NORMAN] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_LEADER, @@ -3779,7 +3779,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Norman }, - [OPPONENT_WINONA] = + [TRAINER_WINONA] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_LEADER, @@ -3793,7 +3793,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Winona }, - [OPPONENT_TATE_AND_LIZA] = + [TRAINER_TATE_AND_LIZA] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_LEADER, @@ -3807,7 +3807,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_TateAndLiza }, - [OPPONENT_WALLACE] = + [TRAINER_WALLACE] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_LEADER, @@ -3821,7 +3821,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Wallace }, - [OPPONENT_JERRY_1] = + [TRAINER_JERRY_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SCHOOL_KID, @@ -3835,7 +3835,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jerry1 }, - [OPPONENT_TED] = + [TRAINER_TED] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SCHOOL_KID, @@ -3849,7 +3849,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Ted }, - [OPPONENT_PAUL] = + [TRAINER_PAUL] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SCHOOL_KID, @@ -3863,7 +3863,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Paul }, - [OPPONENT_JERRY_2] = + [TRAINER_JERRY_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SCHOOL_KID, @@ -3877,7 +3877,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jerry2 }, - [OPPONENT_JERRY_3] = + [TRAINER_JERRY_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SCHOOL_KID, @@ -3891,7 +3891,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jerry3 }, - [OPPONENT_JERRY_4] = + [TRAINER_JERRY_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SCHOOL_KID, @@ -3905,7 +3905,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jerry4 }, - [OPPONENT_JERRY_5] = + [TRAINER_JERRY_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SCHOOL_KID, @@ -3919,7 +3919,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jerry5 }, - [OPPONENT_KAREN_1] = + [TRAINER_KAREN_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SCHOOL_KID, @@ -3933,7 +3933,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Karen1 }, - [OPPONENT_GEORGIA] = + [TRAINER_GEORGIA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SCHOOL_KID, @@ -3947,7 +3947,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Georgia }, - [OPPONENT_KAREN_2] = + [TRAINER_KAREN_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SCHOOL_KID, @@ -3961,7 +3961,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Karen2 }, - [OPPONENT_KAREN_3] = + [TRAINER_KAREN_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SCHOOL_KID, @@ -3975,7 +3975,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Karen3 }, - [OPPONENT_KAREN_4] = + [TRAINER_KAREN_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SCHOOL_KID, @@ -3989,7 +3989,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Karen4 }, - [OPPONENT_KAREN_5] = + [TRAINER_KAREN_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SCHOOL_KID, @@ -4003,7 +4003,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Karen5 }, - [OPPONENT_KATE_AND_JOY] = + [TRAINER_KATE_AND_JOY] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_SR_AND_JR, @@ -4017,7 +4017,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_KateAndJoy }, - [OPPONENT_ANNA_AND_MEG_1] = + [TRAINER_ANNA_AND_MEG_1] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_SR_AND_JR, @@ -4031,7 +4031,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_AnnaAndMeg1 }, - [OPPONENT_ANNA_AND_MEG_2] = + [TRAINER_ANNA_AND_MEG_2] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_SR_AND_JR, @@ -4045,7 +4045,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_AnnaAndMeg2 }, - [OPPONENT_ANNA_AND_MEG_3] = + [TRAINER_ANNA_AND_MEG_3] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_SR_AND_JR, @@ -4059,7 +4059,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_AnnaAndMeg3 }, - [OPPONENT_ANNA_AND_MEG_4] = + [TRAINER_ANNA_AND_MEG_4] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_SR_AND_JR, @@ -4073,7 +4073,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_AnnaAndMeg4 }, - [OPPONENT_ANNA_AND_MEG_5] = + [TRAINER_ANNA_AND_MEG_5] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_SR_AND_JR, @@ -4087,7 +4087,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_AnnaAndMeg5 }, - [OPPONENT_VICTOR] = + [TRAINER_VICTOR] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_WINSTRATE, @@ -4101,7 +4101,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Victor }, - [OPPONENT_MIGUEL_1] = + [TRAINER_MIGUEL_1] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_POKEFAN, @@ -4115,7 +4115,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Miguel1 }, - [OPPONENT_COLTON] = + [TRAINER_COLTON] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_POKEFAN, @@ -4129,7 +4129,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Colton }, - [OPPONENT_MIGUEL_2] = + [TRAINER_MIGUEL_2] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_POKEFAN, @@ -4143,7 +4143,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Miguel2 }, - [OPPONENT_MIGUEL_3] = + [TRAINER_MIGUEL_3] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_POKEFAN, @@ -4157,7 +4157,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Miguel3 }, - [OPPONENT_MIGUEL_4] = + [TRAINER_MIGUEL_4] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_POKEFAN, @@ -4171,7 +4171,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Miguel4 }, - [OPPONENT_MIGUEL_5] = + [TRAINER_MIGUEL_5] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_POKEFAN, @@ -4185,7 +4185,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Miguel5 }, - [OPPONENT_VICTORIA] = + [TRAINER_VICTORIA] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_WINSTRATE, @@ -4199,7 +4199,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Victoria }, - [OPPONENT_VANESSA] = + [TRAINER_VANESSA] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_POKEFAN, @@ -4213,7 +4213,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Vanessa }, - [OPPONENT_MARISSA] = + [TRAINER_MARISSA] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_POKEFAN, @@ -4227,7 +4227,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Marissa }, - [OPPONENT_ISABEL_1] = + [TRAINER_ISABEL_1] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_POKEFAN, @@ -4241,7 +4241,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Isabel1 }, - [OPPONENT_ISABEL_2] = + [TRAINER_ISABEL_2] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_POKEFAN, @@ -4255,7 +4255,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Isabel2 }, - [OPPONENT_ISABEL_3] = + [TRAINER_ISABEL_3] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_POKEFAN, @@ -4269,7 +4269,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Isabel3 }, - [OPPONENT_ISABEL_4] = + [TRAINER_ISABEL_4] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_POKEFAN, @@ -4283,7 +4283,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Isabel4 }, - [OPPONENT_ISABEL_5] = + [TRAINER_ISABEL_5] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_POKEFAN, @@ -4297,7 +4297,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Isabel5 }, - [OPPONENT_TIMOTHY_1] = + [TRAINER_TIMOTHY_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_EXPERT, @@ -4311,7 +4311,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Timothy1 }, - [OPPONENT_TIMOTHY_2] = + [TRAINER_TIMOTHY_2] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_EXPERT, @@ -4325,7 +4325,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Timothy2 }, - [OPPONENT_TIMOTHY_3] = + [TRAINER_TIMOTHY_3] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_EXPERT, @@ -4339,7 +4339,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Timothy3 }, - [OPPONENT_TIMOTHY_4] = + [TRAINER_TIMOTHY_4] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_EXPERT, @@ -4353,7 +4353,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Timothy4 }, - [OPPONENT_TIMOTHY_5] = + [TRAINER_TIMOTHY_5] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_EXPERT, @@ -4367,7 +4367,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Timothy5 }, - [OPPONENT_VICKY] = + [TRAINER_VICKY] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_WINSTRATE, @@ -4381,7 +4381,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Vicky }, - [OPPONENT_SHELBY_1] = + [TRAINER_SHELBY_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_EXPERT, @@ -4395,7 +4395,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Shelby1 }, - [OPPONENT_SHELBY_2] = + [TRAINER_SHELBY_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_EXPERT, @@ -4409,7 +4409,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Shelby2 }, - [OPPONENT_SHELBY_3] = + [TRAINER_SHELBY_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_EXPERT, @@ -4423,7 +4423,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Shelby3 }, - [OPPONENT_SHELBY_4] = + [TRAINER_SHELBY_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_EXPERT, @@ -4437,7 +4437,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Shelby4 }, - [OPPONENT_SHELBY_5] = + [TRAINER_SHELBY_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_EXPERT, @@ -4451,7 +4451,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Shelby5 }, - [OPPONENT_CALVIN_1] = + [TRAINER_CALVIN_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNGSTER, @@ -4465,7 +4465,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Calvin1 }, - [OPPONENT_BILLY] = + [TRAINER_BILLY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNGSTER, @@ -4479,7 +4479,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Billy }, - [OPPONENT_JOSH] = + [TRAINER_JOSH] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_YOUNGSTER, @@ -4493,7 +4493,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Josh }, - [OPPONENT_TOMMY] = + [TRAINER_TOMMY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNGSTER, @@ -4507,7 +4507,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Tommy }, - [OPPONENT_JOEY] = + [TRAINER_JOEY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNGSTER, @@ -4521,7 +4521,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Joey }, - [OPPONENT_BEN] = + [TRAINER_BEN] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_YOUNGSTER, @@ -4535,7 +4535,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Ben }, - [OPPONENT_ANONYMOUS_5] = + [TRAINER_ANONYMOUS_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNGSTER, @@ -4549,7 +4549,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Anonymous5 }, - [OPPONENT_KEVIN] = + [TRAINER_KEVIN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNGSTER, @@ -4563,7 +4563,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Kevin }, - [OPPONENT_NEAL] = + [TRAINER_NEAL] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNGSTER, @@ -4577,7 +4577,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Neal }, - [OPPONENT_DILLON] = + [TRAINER_DILLON] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNGSTER, @@ -4591,7 +4591,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Dillon }, - [OPPONENT_CALVIN_2] = + [TRAINER_CALVIN_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNGSTER, @@ -4605,7 +4605,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Calvin2 }, - [OPPONENT_CALVIN_3] = + [TRAINER_CALVIN_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNGSTER, @@ -4619,7 +4619,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Calvin3 }, - [OPPONENT_CALVIN_4] = + [TRAINER_CALVIN_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNGSTER, @@ -4633,7 +4633,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Calvin4 }, - [OPPONENT_CALVIN_5] = + [TRAINER_CALVIN_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNGSTER, @@ -4647,7 +4647,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Calvin5 }, - [OPPONENT_EDDIE] = + [TRAINER_EDDIE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNGSTER, @@ -4661,7 +4661,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Eddie }, - [OPPONENT_ALLEN] = + [TRAINER_ALLEN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNGSTER, @@ -4675,7 +4675,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Allen }, - [OPPONENT_TIMMY] = + [TRAINER_TIMMY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNGSTER, @@ -4689,7 +4689,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Timmy }, - [OPPONENT_STEVEN] = + [TRAINER_STEVEN] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_CHAMPION, @@ -4703,7 +4703,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Steven }, - [OPPONENT_ANDREW] = + [TRAINER_ANDREW] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_FISHERMAN, @@ -4717,7 +4717,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Andrew }, - [OPPONENT_IVAN] = + [TRAINER_IVAN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_FISHERMAN, @@ -4731,7 +4731,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Ivan }, - [OPPONENT_CLAUDE] = + [TRAINER_CLAUDE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_FISHERMAN, @@ -4745,7 +4745,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Claude }, - [OPPONENT_ELLIOT_1] = + [TRAINER_ELLIOT_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_FISHERMAN, @@ -4759,7 +4759,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Elliot1 }, - [OPPONENT_NED] = + [TRAINER_NED] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_FISHERMAN, @@ -4773,7 +4773,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Ned }, - [OPPONENT_DALE] = + [TRAINER_DALE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_FISHERMAN, @@ -4787,7 +4787,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Dale }, - [OPPONENT_NOLAN] = + [TRAINER_NOLAN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_FISHERMAN, @@ -4801,7 +4801,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Nolan }, - [OPPONENT_BARNY] = + [TRAINER_BARNY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_FISHERMAN, @@ -4815,7 +4815,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Barny }, - [OPPONENT_WADE] = + [TRAINER_WADE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_FISHERMAN, @@ -4829,7 +4829,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Wade }, - [OPPONENT_CARTER] = + [TRAINER_CARTER] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_FISHERMAN, @@ -4843,7 +4843,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Carter }, - [OPPONENT_ELLIOT_2] = + [TRAINER_ELLIOT_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_FISHERMAN, @@ -4857,7 +4857,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Elliot2 }, - [OPPONENT_ELLIOT_3] = + [TRAINER_ELLIOT_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_FISHERMAN, @@ -4871,7 +4871,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Elliot3 }, - [OPPONENT_ELLIOT_4] = + [TRAINER_ELLIOT_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_FISHERMAN, @@ -4885,7 +4885,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Elliot4 }, - [OPPONENT_ELLIOT_5] = + [TRAINER_ELLIOT_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_FISHERMAN, @@ -4899,7 +4899,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Elliot5 }, - [OPPONENT_RONALD] = + [TRAINER_RONALD] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_FISHERMAN, @@ -4913,7 +4913,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Ronald }, - [OPPONENT_JACOB] = + [TRAINER_JACOB] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -4927,7 +4927,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jacob }, - [OPPONENT_ANTHONY] = + [TRAINER_ANTHONY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -4941,7 +4941,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Anthony }, - [OPPONENT_BENJAMIN_1] = + [TRAINER_BENJAMIN_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -4955,7 +4955,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Benjamin1 }, - [OPPONENT_BENJAMIN_2] = + [TRAINER_BENJAMIN_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -4969,7 +4969,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Benjamin2 }, - [OPPONENT_BENJAMIN_3] = + [TRAINER_BENJAMIN_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -4983,7 +4983,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Benjamin3 }, - [OPPONENT_BENJAMIN_4] = + [TRAINER_BENJAMIN_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -4997,7 +4997,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Benjamin4 }, - [OPPONENT_BENJAMIN_5] = + [TRAINER_BENJAMIN_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5011,7 +5011,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Benjamin5 }, - [OPPONENT_ABIGAIL_1] = + [TRAINER_ABIGAIL_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5025,7 +5025,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Abigail1 }, - [OPPONENT_JASMINE] = + [TRAINER_JASMINE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5039,7 +5039,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jasmine }, - [OPPONENT_ABIGAIL_2] = + [TRAINER_ABIGAIL_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5053,7 +5053,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Abigail2 }, - [OPPONENT_ABIGAIL_3] = + [TRAINER_ABIGAIL_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5067,7 +5067,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Abigail3 }, - [OPPONENT_ABIGAIL_4] = + [TRAINER_ABIGAIL_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5081,7 +5081,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Abigail4 }, - [OPPONENT_ABIGAIL_5] = + [TRAINER_ABIGAIL_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5095,7 +5095,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Abigail5 }, - [OPPONENT_DYLAN_1] = + [TRAINER_DYLAN_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5109,7 +5109,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Dylan1 }, - [OPPONENT_DYLAN_2] = + [TRAINER_DYLAN_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5123,7 +5123,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Dylan2 }, - [OPPONENT_DYLAN_3] = + [TRAINER_DYLAN_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5137,7 +5137,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Dylan3 }, - [OPPONENT_DYLAN_4] = + [TRAINER_DYLAN_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5151,7 +5151,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Dylan4 }, - [OPPONENT_DYLAN_5] = + [TRAINER_DYLAN_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5165,7 +5165,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Dylan5 }, - [OPPONENT_MARIA_1] = + [TRAINER_MARIA_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5179,7 +5179,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Maria1 }, - [OPPONENT_MARIA_2] = + [TRAINER_MARIA_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5193,7 +5193,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Maria2 }, - [OPPONENT_MARIA_3] = + [TRAINER_MARIA_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5207,7 +5207,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Maria3 }, - [OPPONENT_MARIA_4] = + [TRAINER_MARIA_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5221,7 +5221,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Maria4 }, - [OPPONENT_MARIA_5] = + [TRAINER_MARIA_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5235,7 +5235,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Maria5 }, - [OPPONENT_CALEB] = + [TRAINER_CALEB] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5249,7 +5249,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Caleb }, - [OPPONENT_ANONYMOUS_6] = + [TRAINER_ANONYMOUS_6] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5263,7 +5263,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Anonymous6 }, - [OPPONENT_ISAIAH_1] = + [TRAINER_ISAIAH_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5277,7 +5277,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Isaiah1 }, - [OPPONENT_ANONYMOUS_7] = + [TRAINER_ANONYMOUS_7] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5291,7 +5291,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Anonymous7 }, - [OPPONENT_CHASE] = + [TRAINER_CHASE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5305,7 +5305,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Chase }, - [OPPONENT_ISAIAH_2] = + [TRAINER_ISAIAH_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5319,7 +5319,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Isaiah2 }, - [OPPONENT_ISAIAH_3] = + [TRAINER_ISAIAH_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5333,7 +5333,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Isaiah3 }, - [OPPONENT_ISAIAH_4] = + [TRAINER_ISAIAH_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5347,7 +5347,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Isaiah4 }, - [OPPONENT_ISAIAH_5] = + [TRAINER_ISAIAH_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5361,7 +5361,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Isaiah5 }, - [OPPONENT_ANONYMOUS_8] = + [TRAINER_ANONYMOUS_8] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5375,7 +5375,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Anonymous8 }, - [OPPONENT_CONNOR] = + [TRAINER_CONNOR] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5389,7 +5389,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Connor }, - [OPPONENT_ANONYMOUS_9] = + [TRAINER_ANONYMOUS_9] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5403,7 +5403,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Anonymous9 }, - [OPPONENT_KATELYN_1] = + [TRAINER_KATELYN_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5417,7 +5417,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Katelyn1 }, - [OPPONENT_ALLISON] = + [TRAINER_ALLISON] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5431,7 +5431,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Allison }, - [OPPONENT_KATELYN_2] = + [TRAINER_KATELYN_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5445,7 +5445,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Katelyn2 }, - [OPPONENT_KATELYN_3] = + [TRAINER_KATELYN_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5459,7 +5459,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Katelyn3 }, - [OPPONENT_KATELYN_4] = + [TRAINER_KATELYN_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5473,7 +5473,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Katelyn4 }, - [OPPONENT_KATELYN_5] = + [TRAINER_KATELYN_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5487,7 +5487,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Katelyn5 }, - [OPPONENT_NICOLAS_1] = + [TRAINER_NICOLAS_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_DRAGON_TAMER, @@ -5501,7 +5501,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Nicolas1 }, - [OPPONENT_NICOLAS_2] = + [TRAINER_NICOLAS_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_DRAGON_TAMER, @@ -5515,7 +5515,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Nicolas2 }, - [OPPONENT_NICOLAS_3] = + [TRAINER_NICOLAS_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_DRAGON_TAMER, @@ -5529,7 +5529,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Nicolas3 }, - [OPPONENT_NICOLAS_4] = + [TRAINER_NICOLAS_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_DRAGON_TAMER, @@ -5543,7 +5543,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Nicolas4 }, - [OPPONENT_NICOLAS_5] = + [TRAINER_NICOLAS_5] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_DRAGON_TAMER, @@ -5557,7 +5557,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Nicolas5 }, - [OPPONENT_AARON] = + [TRAINER_AARON] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_DRAGON_TAMER, @@ -5571,7 +5571,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Aaron }, - [OPPONENT_PERRY] = + [TRAINER_PERRY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BIRD_KEEPER, @@ -5585,7 +5585,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Perry }, - [OPPONENT_HUGH] = + [TRAINER_HUGH] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BIRD_KEEPER, @@ -5599,7 +5599,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Hugh }, - [OPPONENT_PHIL] = + [TRAINER_PHIL] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BIRD_KEEPER, @@ -5613,7 +5613,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Phil }, - [OPPONENT_JARED] = + [TRAINER_JARED] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BIRD_KEEPER, @@ -5627,7 +5627,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jared }, - [OPPONENT_ANONYMOUS_10] = + [TRAINER_ANONYMOUS_10] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BIRD_KEEPER, @@ -5641,7 +5641,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Anonymous10 }, - [OPPONENT_TANNER] = + [TRAINER_TANNER] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BIRD_KEEPER, @@ -5655,7 +5655,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Tanner }, - [OPPONENT_WILL] = + [TRAINER_WILL] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BIRD_KEEPER, @@ -5669,7 +5669,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Will }, - [OPPONENT_COLIN] = + [TRAINER_COLIN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BIRD_KEEPER, @@ -5683,7 +5683,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Colin }, - [OPPONENT_ROBERT_1] = + [TRAINER_ROBERT_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BIRD_KEEPER, @@ -5697,7 +5697,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Robert1 }, - [OPPONENT_BENNY] = + [TRAINER_BENNY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BIRD_KEEPER, @@ -5711,7 +5711,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Benny }, - [OPPONENT_CHESTER] = + [TRAINER_CHESTER] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BIRD_KEEPER, @@ -5725,7 +5725,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Chester }, - [OPPONENT_ROBERT_2] = + [TRAINER_ROBERT_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BIRD_KEEPER, @@ -5739,7 +5739,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Robert2 }, - [OPPONENT_ROBERT_3] = + [TRAINER_ROBERT_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BIRD_KEEPER, @@ -5753,7 +5753,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Robert3 }, - [OPPONENT_ROBERT_4] = + [TRAINER_ROBERT_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BIRD_KEEPER, @@ -5767,7 +5767,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Robert4 }, - [OPPONENT_ROBERT_5] = + [TRAINER_ROBERT_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BIRD_KEEPER, @@ -5781,7 +5781,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Robert5 }, - [OPPONENT_ALEX] = + [TRAINER_ALEX] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BIRD_KEEPER, @@ -5795,7 +5795,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Alex }, - [OPPONENT_BECK] = + [TRAINER_BECK] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BIRD_KEEPER, @@ -5809,7 +5809,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Beck }, - [OPPONENT_YASU] = + [TRAINER_YASU] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_NINJA_BOY, @@ -5823,7 +5823,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Yasu }, - [OPPONENT_TAKASHI] = + [TRAINER_TAKASHI] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_NINJA_BOY, @@ -5837,7 +5837,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Takashi }, - [OPPONENT_MAKOTO] = + [TRAINER_MAKOTO] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_NINJA_BOY, @@ -5851,7 +5851,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Makoto }, - [OPPONENT_HIDEO_1] = + [TRAINER_HIDEO_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_NINJA_BOY, @@ -5865,7 +5865,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Hideo1 }, - [OPPONENT_LAO_1] = + [TRAINER_LAO_1] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_NINJA_BOY, @@ -5879,7 +5879,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Lao1 }, - [OPPONENT_LUNG] = + [TRAINER_LUNG] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_NINJA_BOY, @@ -5893,7 +5893,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Lung }, - [OPPONENT_LAO_2] = + [TRAINER_LAO_2] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_NINJA_BOY, @@ -5907,7 +5907,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Lao2 }, - [OPPONENT_LAO_3] = + [TRAINER_LAO_3] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_NINJA_BOY, @@ -5921,7 +5921,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Lao3 }, - [OPPONENT_LAO_4] = + [TRAINER_LAO_4] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_NINJA_BOY, @@ -5935,7 +5935,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Lao4 }, - [OPPONENT_LAO_5] = + [TRAINER_LAO_5] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_NINJA_BOY, @@ -5949,7 +5949,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Lao5 }, - [OPPONENT_TESSA] = + [TRAINER_TESSA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BATTLE_GIRL, @@ -5963,7 +5963,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Tessa }, - [OPPONENT_LAURA] = + [TRAINER_LAURA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BATTLE_GIRL, @@ -5977,7 +5977,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Laura }, - [OPPONENT_CYNDY_1] = + [TRAINER_CYNDY_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BATTLE_GIRL, @@ -5991,7 +5991,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Cyndy1 }, - [OPPONENT_CORA] = + [TRAINER_CORA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BATTLE_GIRL, @@ -6005,7 +6005,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Cora }, - [OPPONENT_JILL] = + [TRAINER_JILL] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BATTLE_GIRL, @@ -6019,7 +6019,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jill }, - [OPPONENT_CYNDY_2] = + [TRAINER_CYNDY_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BATTLE_GIRL, @@ -6033,7 +6033,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Cyndy2 }, - [OPPONENT_CYNDY_3] = + [TRAINER_CYNDY_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BATTLE_GIRL, @@ -6047,7 +6047,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Cyndy3 }, - [OPPONENT_CYNDY_4] = + [TRAINER_CYNDY_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BATTLE_GIRL, @@ -6061,7 +6061,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Cyndy4 }, - [OPPONENT_CYNDY_5] = + [TRAINER_CYNDY_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BATTLE_GIRL, @@ -6075,7 +6075,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Cyndy5 }, - [OPPONENT_MADELINE_1] = + [TRAINER_MADELINE_1] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_PARASOL_LADY, @@ -6089,7 +6089,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Madeline1 }, - [OPPONENT_CLARISSA] = + [TRAINER_CLARISSA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PARASOL_LADY, @@ -6103,7 +6103,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Clarissa }, - [OPPONENT_ANGELICA] = + [TRAINER_ANGELICA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PARASOL_LADY, @@ -6117,7 +6117,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Angelica }, - [OPPONENT_MADELINE_2] = + [TRAINER_MADELINE_2] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_PARASOL_LADY, @@ -6131,7 +6131,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Madeline2 }, - [OPPONENT_MADELINE_3] = + [TRAINER_MADELINE_3] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_PARASOL_LADY, @@ -6145,7 +6145,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Madeline3 }, - [OPPONENT_MADELINE_4] = + [TRAINER_MADELINE_4] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_PARASOL_LADY, @@ -6159,7 +6159,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Madeline4 }, - [OPPONENT_MADELINE_5] = + [TRAINER_MADELINE_5] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_PARASOL_LADY, @@ -6173,7 +6173,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Madeline5 }, - [OPPONENT_BEVERLY] = + [TRAINER_BEVERLY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6187,7 +6187,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Beverly }, - [OPPONENT_DAWN] = + [TRAINER_DAWN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6201,7 +6201,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Dawn }, - [OPPONENT_NICOLE] = + [TRAINER_NICOLE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6215,7 +6215,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Nicole }, - [OPPONENT_DENISE] = + [TRAINER_DENISE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6229,7 +6229,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Denise }, - [OPPONENT_BETH] = + [TRAINER_BETH] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6243,7 +6243,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Beth }, - [OPPONENT_TARA] = + [TRAINER_TARA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6257,7 +6257,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Tara }, - [OPPONENT_MISSY] = + [TRAINER_MISSY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6271,7 +6271,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Missy }, - [OPPONENT_ALICE] = + [TRAINER_ALICE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6285,7 +6285,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Alice }, - [OPPONENT_JENNY_1] = + [TRAINER_JENNY_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6299,7 +6299,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jenny1 }, - [OPPONENT_GRACE] = + [TRAINER_GRACE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6313,7 +6313,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grace }, - [OPPONENT_TANYA] = + [TRAINER_TANYA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6327,7 +6327,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Tanya }, - [OPPONENT_SHARON] = + [TRAINER_SHARON] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6341,7 +6341,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Sharon }, - [OPPONENT_NIKKI] = + [TRAINER_NIKKI] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6355,7 +6355,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Nikki }, - [OPPONENT_BRENDA] = + [TRAINER_BRENDA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6369,7 +6369,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Brenda }, - [OPPONENT_KATIE] = + [TRAINER_KATIE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6383,7 +6383,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Katie }, - [OPPONENT_SUSIE] = + [TRAINER_SUSIE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6397,7 +6397,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Susie }, - [OPPONENT_KARA] = + [TRAINER_KARA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6411,7 +6411,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Kara }, - [OPPONENT_DANA] = + [TRAINER_DANA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6425,7 +6425,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Dana }, - [OPPONENT_ERIN] = + [TRAINER_ERIN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6439,7 +6439,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Erin }, - [OPPONENT_DEBRA] = + [TRAINER_DEBRA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6453,7 +6453,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Debra }, - [OPPONENT_LINDA] = + [TRAINER_LINDA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6467,7 +6467,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Linda }, - [OPPONENT_KAYLEE] = + [TRAINER_KAYLEE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6481,7 +6481,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Kaylee }, - [OPPONENT_LAUREL] = + [TRAINER_LAUREL] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6495,7 +6495,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Laurel }, - [OPPONENT_DARCY] = + [TRAINER_DARCY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6509,7 +6509,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Darcy }, - [OPPONENT_JENNY_2] = + [TRAINER_JENNY_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6523,7 +6523,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jenny2 }, - [OPPONENT_JENNY_3] = + [TRAINER_JENNY_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6537,7 +6537,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jenny3 }, - [OPPONENT_JENNY_4] = + [TRAINER_JENNY_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6551,7 +6551,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jenny4 }, - [OPPONENT_JENNY_5] = + [TRAINER_JENNY_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6565,7 +6565,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jenny5 }, - [OPPONENT_HEIDI] = + [TRAINER_HEIDI] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_PICNICKER, @@ -6579,7 +6579,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Heidi }, - [OPPONENT_BECKY] = + [TRAINER_BECKY] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_PICNICKER, @@ -6593,7 +6593,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Becky }, - [OPPONENT_CAROL] = + [TRAINER_CAROL] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PICNICKER, @@ -6607,7 +6607,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Carol }, - [OPPONENT_NANCY] = + [TRAINER_NANCY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PICNICKER, @@ -6621,7 +6621,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Nancy }, - [OPPONENT_MARTHA] = + [TRAINER_MARTHA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PICNICKER, @@ -6635,7 +6635,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Martha }, - [OPPONENT_DIANA_1] = + [TRAINER_DIANA_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PICNICKER, @@ -6649,7 +6649,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Diana1 }, - [OPPONENT_NINA] = + [TRAINER_NINA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PICNICKER, @@ -6663,7 +6663,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Nina }, - [OPPONENT_IRENE] = + [TRAINER_IRENE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PICNICKER, @@ -6677,7 +6677,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Irene }, - [OPPONENT_DIANA_2] = + [TRAINER_DIANA_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PICNICKER, @@ -6691,7 +6691,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Diana2 }, - [OPPONENT_DIANA_3] = + [TRAINER_DIANA_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PICNICKER, @@ -6705,7 +6705,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Diana3 }, - [OPPONENT_DIANA_4] = + [TRAINER_DIANA_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PICNICKER, @@ -6719,7 +6719,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Diana4 }, - [OPPONENT_DIANA_5] = + [TRAINER_DIANA_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PICNICKER, @@ -6733,7 +6733,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Diana5 }, - [OPPONENT_AMY_AND_LIV_1] = + [TRAINER_AMY_AND_LIV_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TWINS, @@ -6747,7 +6747,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_AmyAndLiv1 }, - [OPPONENT_AMY_AND_LIV_2] = + [TRAINER_AMY_AND_LIV_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TWINS, @@ -6761,7 +6761,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_AmyAndLiv2 }, - [OPPONENT_GINA_AND_MIA_1] = + [TRAINER_GINA_AND_MIA_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TWINS, @@ -6775,7 +6775,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_GinaAndMia1 }, - [OPPONENT_MIU_AND_YUKI] = + [TRAINER_MIU_AND_YUKI] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TWINS, @@ -6789,7 +6789,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_MiuAndYuki }, - [OPPONENT_AMY_AND_LIV_3] = + [TRAINER_AMY_AND_LIV_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TWINS, @@ -6803,7 +6803,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_AmyAndLiv3 }, - [OPPONENT_GINA_AND_MIA_2] = + [TRAINER_GINA_AND_MIA_2] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_TWINS, @@ -6817,7 +6817,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_GinaAndMia2 }, - [OPPONENT_AMY_AND_LIV_4] = + [TRAINER_AMY_AND_LIV_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TWINS, @@ -6831,7 +6831,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_AmyAndLiv4 }, - [OPPONENT_AMY_AND_LIV_5] = + [TRAINER_AMY_AND_LIV_5] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_TWINS, @@ -6845,7 +6845,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_AmyAndLiv5 }, - [OPPONENT_AMY_AND_LIV_6] = + [TRAINER_AMY_AND_LIV_6] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_TWINS, @@ -6859,7 +6859,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_AmyAndLiv6 }, - [OPPONENT_HUEY] = + [TRAINER_HUEY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SAILOR, @@ -6873,7 +6873,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Huey }, - [OPPONENT_EDMOND] = + [TRAINER_EDMOND] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SAILOR, @@ -6887,7 +6887,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Edmond }, - [OPPONENT_ERNEST_1] = + [TRAINER_ERNEST_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SAILOR, @@ -6901,7 +6901,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Ernest1 }, - [OPPONENT_DWAYNE] = + [TRAINER_DWAYNE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SAILOR, @@ -6915,7 +6915,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Dwayne }, - [OPPONENT_PHILLIP] = + [TRAINER_PHILLIP] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SAILOR, @@ -6929,7 +6929,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Phillip }, - [OPPONENT_LEONARD] = + [TRAINER_LEONARD] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SAILOR, @@ -6943,7 +6943,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Leonard }, - [OPPONENT_DUNCAN] = + [TRAINER_DUNCAN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SAILOR, @@ -6957,7 +6957,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Duncan }, - [OPPONENT_ERNEST_2] = + [TRAINER_ERNEST_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SAILOR, @@ -6971,7 +6971,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Ernest2 }, - [OPPONENT_ERNEST_3] = + [TRAINER_ERNEST_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SAILOR, @@ -6985,7 +6985,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Ernest3 }, - [OPPONENT_ERNEST_4] = + [TRAINER_ERNEST_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SAILOR, @@ -6999,7 +6999,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Ernest4 }, - [OPPONENT_ERNEST_5] = + [TRAINER_ERNEST_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SAILOR, @@ -7013,7 +7013,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Ernest5 }, - [OPPONENT_ANONYMOUS_11] = + [TRAINER_ANONYMOUS_11] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BOARDER, @@ -7027,7 +7027,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Anonymous11 }, - [OPPONENT_ANONYMOUS_12] = + [TRAINER_ANONYMOUS_12] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BOARDER, @@ -7041,7 +7041,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Anonymous12 }, - [OPPONENT_ANONYMOUS_13] = + [TRAINER_ANONYMOUS_13] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BOARDER, @@ -7055,7 +7055,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Anonymous13 }, - [OPPONENT_SONNY] = + [TRAINER_SONNY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BOARDER, @@ -7069,7 +7069,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Sonny }, - [OPPONENT_DONOVAN] = + [TRAINER_DONOVAN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BOARDER, @@ -7083,7 +7083,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Donovan }, - [OPPONENT_GERALD] = + [TRAINER_GERALD] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BOARDER, @@ -7097,7 +7097,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Gerald }, - [OPPONENT_KELVIN] = + [TRAINER_KELVIN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BOARDER, @@ -7111,7 +7111,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Kelvin }, - [OPPONENT_KODY] = + [TRAINER_KODY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BOARDER, @@ -7125,7 +7125,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Kody }, - [OPPONENT_TEVIN] = + [TRAINER_TEVIN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BOARDER, @@ -7139,7 +7139,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Tevin }, - [OPPONENT_DAMON] = + [TRAINER_DAMON] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BOARDER, @@ -7153,7 +7153,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Damon }, - [OPPONENT_PABLO] = + [TRAINER_PABLO] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BOARDER, @@ -7167,7 +7167,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Pablo }, - [OPPONENT_EDWIN_1] = + [TRAINER_EDWIN_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COLLECTOR, @@ -7181,7 +7181,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Edwin1 }, - [OPPONENT_HECTOR_1] = + [TRAINER_HECTOR_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COLLECTOR, @@ -7195,7 +7195,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Hector1 }, - [OPPONENT_HECTOR_2] = + [TRAINER_HECTOR_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COLLECTOR, @@ -7209,7 +7209,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Hector2 }, - [OPPONENT_EDWIN_2] = + [TRAINER_EDWIN_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COLLECTOR, @@ -7223,7 +7223,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Edwin2 }, - [OPPONENT_EDWIN_3] = + [TRAINER_EDWIN_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COLLECTOR, @@ -7237,7 +7237,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Edwin3 }, - [OPPONENT_EDWIN_4] = + [TRAINER_EDWIN_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COLLECTOR, @@ -7251,7 +7251,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Edwin4 }, - [OPPONENT_EDWIN_5] = + [TRAINER_EDWIN_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COLLECTOR, @@ -7265,7 +7265,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Edwin5 }, - [OPPONENT_WALLY_1] = + [TRAINER_WALLY_1] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -7279,7 +7279,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Wally1 }, - [OPPONENT_BRENDAN_1] = + [TRAINER_BRENDAN_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -7293,7 +7293,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Brendan1 }, - [OPPONENT_BRENDAN_2] = + [TRAINER_BRENDAN_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -7307,7 +7307,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Brendan2 }, - [OPPONENT_BRENDAN_3] = + [TRAINER_BRENDAN_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -7321,7 +7321,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Brendan3 }, - [OPPONENT_BRENDAN_4] = + [TRAINER_BRENDAN_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -7335,7 +7335,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Brendan4 }, - [OPPONENT_BRENDAN_5] = + [TRAINER_BRENDAN_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -7349,7 +7349,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Brendan5 }, - [OPPONENT_BRENDAN_6] = + [TRAINER_BRENDAN_6] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -7363,7 +7363,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Brendan6 }, - [OPPONENT_BRENDAN_7] = + [TRAINER_BRENDAN_7] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -7377,7 +7377,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Brendan7 }, - [OPPONENT_BRENDAN_8] = + [TRAINER_BRENDAN_8] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -7391,7 +7391,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Brendan8 }, - [OPPONENT_BRENDAN_9] = + [TRAINER_BRENDAN_9] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -7405,7 +7405,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Brendan9 }, - [OPPONENT_MAY_1] = + [TRAINER_MAY_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -7419,7 +7419,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_May1 }, - [OPPONENT_MAY_2] = + [TRAINER_MAY_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -7433,7 +7433,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_May2 }, - [OPPONENT_MAY_3] = + [TRAINER_MAY_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -7447,7 +7447,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_May3 }, - [OPPONENT_MAY_4] = + [TRAINER_MAY_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -7461,7 +7461,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_May4 }, - [OPPONENT_MAY_5] = + [TRAINER_MAY_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -7475,7 +7475,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_May5 }, - [OPPONENT_MAY_6] = + [TRAINER_MAY_6] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -7489,7 +7489,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_May6 }, - [OPPONENT_MAY_7] = + [TRAINER_MAY_7] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -7503,7 +7503,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_May7 }, - [OPPONENT_MAY_8] = + [TRAINER_MAY_8] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -7517,7 +7517,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_May8 }, - [OPPONENT_MAY_9] = + [TRAINER_MAY_9] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -7531,7 +7531,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_May9 }, - [OPPONENT_ISAAC_1] = + [TRAINER_ISAAC_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_BREEDER, @@ -7545,7 +7545,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Isaac1 }, - [OPPONENT_RILEY] = + [TRAINER_RILEY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_BREEDER, @@ -7559,7 +7559,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Riley }, - [OPPONENT_AIDAN] = + [TRAINER_AIDAN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_BREEDER, @@ -7573,7 +7573,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Aidan }, - [OPPONENT_ISAAC_2] = + [TRAINER_ISAAC_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_BREEDER, @@ -7587,7 +7587,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Isaac2 }, - [OPPONENT_ISAAC_3] = + [TRAINER_ISAAC_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_BREEDER, @@ -7601,7 +7601,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Isaac3 }, - [OPPONENT_ISAAC_4] = + [TRAINER_ISAAC_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_BREEDER, @@ -7615,7 +7615,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Isaac4 }, - [OPPONENT_ISAAC_5] = + [TRAINER_ISAAC_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_BREEDER, @@ -7629,7 +7629,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Isaac5 }, - [OPPONENT_LYDIA_1] = + [TRAINER_LYDIA_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_BREEDER, @@ -7643,7 +7643,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Lydia1 }, - [OPPONENT_ALEXIA] = + [TRAINER_ALEXIA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_BREEDER, @@ -7657,7 +7657,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Alexia }, - [OPPONENT_DANIELLE] = + [TRAINER_DANIELLE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_BREEDER, @@ -7671,7 +7671,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Danielle }, - [OPPONENT_LYDIA_2] = + [TRAINER_LYDIA_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_BREEDER, @@ -7685,7 +7685,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Lydia2 }, - [OPPONENT_LYDIA_3] = + [TRAINER_LYDIA_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_BREEDER, @@ -7699,7 +7699,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Lydia3 }, - [OPPONENT_LYDIA_4] = + [TRAINER_LYDIA_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_BREEDER, @@ -7713,7 +7713,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Lydia4 }, - [OPPONENT_LYDIA_5] = + [TRAINER_LYDIA_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_BREEDER, @@ -7727,7 +7727,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Lydia5 }, - [OPPONENT_JACKSON_1] = + [TRAINER_JACKSON_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_RANGER, @@ -7741,7 +7741,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jackson1 }, - [OPPONENT_CARLOS] = + [TRAINER_CARLOS] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_RANGER, @@ -7755,7 +7755,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Carlos }, - [OPPONENT_SEBASTIAN] = + [TRAINER_SEBASTIAN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_RANGER, @@ -7769,7 +7769,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Sebastian }, - [OPPONENT_JACKSON_2] = + [TRAINER_JACKSON_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_RANGER, @@ -7783,7 +7783,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jackson2 }, - [OPPONENT_JACKSON_3] = + [TRAINER_JACKSON_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_RANGER, @@ -7797,7 +7797,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jackson3 }, - [OPPONENT_JACKSON_4] = + [TRAINER_JACKSON_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_RANGER, @@ -7811,7 +7811,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jackson4 }, - [OPPONENT_JACKSON_5] = + [TRAINER_JACKSON_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_RANGER, @@ -7825,7 +7825,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jackson5 }, - [OPPONENT_CATHERINE_1] = + [TRAINER_CATHERINE_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_RANGER, @@ -7839,7 +7839,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Catherine1 }, - [OPPONENT_JENNA] = + [TRAINER_JENNA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_RANGER, @@ -7853,7 +7853,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jenna }, - [OPPONENT_SOPHIA] = + [TRAINER_SOPHIA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_RANGER, @@ -7867,7 +7867,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Sophia }, - [OPPONENT_CATHERINE_2] = + [TRAINER_CATHERINE_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_RANGER, @@ -7881,7 +7881,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Catherine2 }, - [OPPONENT_CATHERINE_3] = + [TRAINER_CATHERINE_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_RANGER, @@ -7895,7 +7895,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Catherine3 }, - [OPPONENT_CATHERINE_4] = + [TRAINER_CATHERINE_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_RANGER, @@ -7909,7 +7909,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Catherine4 }, - [OPPONENT_CATHERINE_5] = + [TRAINER_CATHERINE_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_RANGER, @@ -7923,7 +7923,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Catherine5 }, - [OPPONENT_MAXIE_1] = + [TRAINER_MAXIE_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_MAGMA_LEADER, @@ -7937,7 +7937,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Maxie1 }, - [OPPONENT_GRUNT_28] = + [TRAINER_GRUNT_28] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -7951,7 +7951,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt28 }, - [OPPONENT_GRUNT_29] = + [TRAINER_GRUNT_29] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -7965,7 +7965,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt29 }, - [OPPONENT_GRUNT_30] = + [TRAINER_GRUNT_30] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -7979,7 +7979,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt30 }, - [OPPONENT_GRUNT_31] = + [TRAINER_GRUNT_31] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -7993,7 +7993,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt31 }, - [OPPONENT_GRUNT_32] = + [TRAINER_GRUNT_32] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8007,7 +8007,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt32 }, - [OPPONENT_GRUNT_33] = + [TRAINER_GRUNT_33] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8021,7 +8021,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt33 }, - [OPPONENT_GRUNT_34] = + [TRAINER_GRUNT_34] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8035,7 +8035,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt34 }, - [OPPONENT_GRUNT_35] = + [TRAINER_GRUNT_35] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8049,7 +8049,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt35 }, - [OPPONENT_GRUNT_36] = + [TRAINER_GRUNT_36] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8063,7 +8063,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt36 }, - [OPPONENT_GRUNT_37] = + [TRAINER_GRUNT_37] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8077,7 +8077,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt37 }, - [OPPONENT_GRUNT_38] = + [TRAINER_GRUNT_38] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8091,7 +8091,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt38 }, - [OPPONENT_GRUNT_39] = + [TRAINER_GRUNT_39] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8105,7 +8105,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt39 }, - [OPPONENT_GRUNT_40] = + [TRAINER_GRUNT_40] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8119,7 +8119,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt40 }, - [OPPONENT_GRUNT_41] = + [TRAINER_GRUNT_41] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8133,7 +8133,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt41 }, - [OPPONENT_GRUNT_42] = + [TRAINER_GRUNT_42] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8147,7 +8147,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt42 }, - [OPPONENT_GRUNT_43] = + [TRAINER_GRUNT_43] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8161,7 +8161,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt43 }, - [OPPONENT_GRUNT_44] = + [TRAINER_GRUNT_44] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8175,7 +8175,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt44 }, - [OPPONENT_GRUNT_45] = + [TRAINER_GRUNT_45] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8189,7 +8189,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt45 }, - [OPPONENT_GRUNT_46] = + [TRAINER_GRUNT_46] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8203,7 +8203,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt46 }, - [OPPONENT_GRUNT_47] = + [TRAINER_GRUNT_47] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8217,7 +8217,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt47 }, - [OPPONENT_GRUNT_48] = + [TRAINER_GRUNT_48] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8231,7 +8231,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt48 }, - [OPPONENT_GRUNT_49] = + [TRAINER_GRUNT_49] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8245,7 +8245,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt49 }, - [OPPONENT_GRUNT_50] = + [TRAINER_GRUNT_50] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8259,7 +8259,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt50 }, - [OPPONENT_GRUNT_51] = + [TRAINER_GRUNT_51] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8273,7 +8273,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt51 }, - [OPPONENT_GRUNT_52] = + [TRAINER_GRUNT_52] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8287,7 +8287,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt52 }, - [OPPONENT_GRUNT_53] = + [TRAINER_GRUNT_53] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8301,7 +8301,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt53 }, - [OPPONENT_GRUNT_54] = + [TRAINER_GRUNT_54] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8315,7 +8315,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt54 }, - [OPPONENT_ANONYMOUS_14] = + [TRAINER_ANONYMOUS_14] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_MAGMA_ADMIN, @@ -8329,7 +8329,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Anonymous14 }, - [OPPONENT_ANONYMOUS_15] = + [TRAINER_ANONYMOUS_15] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_MAGMA_ADMIN, @@ -8343,7 +8343,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Anonymous15 }, - [OPPONENT_TABITHA_1] = + [TRAINER_TABITHA_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_MAGMA_ADMIN, @@ -8357,7 +8357,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Tabitha1 }, - [OPPONENT_TABITHA_2] = + [TRAINER_TABITHA_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_MAGMA_ADMIN, @@ -8371,7 +8371,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Tabitha2 }, - [OPPONENT_ANONYMOUS_16] = + [TRAINER_ANONYMOUS_16] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_MAGMA_ADMIN, @@ -8385,7 +8385,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Anonymous16 }, - [OPPONENT_COURTNEY_1] = + [TRAINER_COURTNEY_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_MAGMA_ADMIN, @@ -8399,7 +8399,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Courtney1 }, - [OPPONENT_COURTNEY_2] = + [TRAINER_COURTNEY_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_MAGMA_ADMIN, @@ -8413,7 +8413,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Courtney2 }, - [OPPONENT_MAXIE_2] = + [TRAINER_MAXIE_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_MAGMA_LEADER, @@ -8427,7 +8427,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Maxie2 }, - [OPPONENT_MAXIE_3] = + [TRAINER_MAXIE_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_MAGMA_LEADER, @@ -8441,7 +8441,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Maxie3 }, - [OPPONENT_TIANA] = + [TRAINER_TIANA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_LASS, @@ -8455,7 +8455,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Tiana }, - [OPPONENT_HALEY_1] = + [TRAINER_HALEY_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_LASS, @@ -8469,7 +8469,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Haley1 }, - [OPPONENT_JANICE] = + [TRAINER_JANICE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_LASS, @@ -8483,7 +8483,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Janice }, - [OPPONENT_VIVI] = + [TRAINER_VIVI] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_WINSTRATE, @@ -8497,7 +8497,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Vivi }, - [OPPONENT_HALEY_2] = + [TRAINER_HALEY_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_LASS, @@ -8511,7 +8511,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Haley2 }, - [OPPONENT_HALEY_3] = + [TRAINER_HALEY_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_LASS, @@ -8525,7 +8525,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Haley3 }, - [OPPONENT_HALEY_4] = + [TRAINER_HALEY_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_LASS, @@ -8539,7 +8539,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Haley4 }, - [OPPONENT_HALEY_5] = + [TRAINER_HALEY_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_LASS, @@ -8553,7 +8553,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Haley5 }, - [OPPONENT_SALLY] = + [TRAINER_SALLY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_LASS, @@ -8567,7 +8567,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Sally }, - [OPPONENT_ROBIN] = + [TRAINER_ROBIN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_LASS, @@ -8581,7 +8581,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Robin }, - [OPPONENT_ANDREA] = + [TRAINER_ANDREA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_LASS, @@ -8595,7 +8595,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Andrea }, - [OPPONENT_CRISSY] = + [TRAINER_CRISSY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_LASS, @@ -8609,7 +8609,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Crissy }, - [OPPONENT_RICK] = + [TRAINER_RICK] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BUG_CATCHER, @@ -8623,7 +8623,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Rick }, - [OPPONENT_LYLE] = + [TRAINER_LYLE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BUG_CATCHER, @@ -8637,7 +8637,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Lyle }, - [OPPONENT_JOSE] = + [TRAINER_JOSE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BUG_CATCHER, @@ -8651,7 +8651,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jose }, - [OPPONENT_DOUG] = + [TRAINER_DOUG] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BUG_CATCHER, @@ -8665,7 +8665,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Doug }, - [OPPONENT_GREG] = + [TRAINER_GREG] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BUG_CATCHER, @@ -8679,7 +8679,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Greg }, - [OPPONENT_KENT] = + [TRAINER_KENT] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BUG_CATCHER, @@ -8693,7 +8693,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Kent }, - [OPPONENT_JAMES_1] = + [TRAINER_JAMES_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BUG_CATCHER, @@ -8707,7 +8707,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_James1 }, - [OPPONENT_JAMES_2] = + [TRAINER_JAMES_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BUG_CATCHER, @@ -8721,7 +8721,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_James2 }, - [OPPONENT_JAMES_3] = + [TRAINER_JAMES_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BUG_CATCHER, @@ -8735,7 +8735,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_James3 }, - [OPPONENT_JAMES_4] = + [TRAINER_JAMES_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BUG_CATCHER, @@ -8749,7 +8749,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_James4 }, - [OPPONENT_JAMES_5] = + [TRAINER_JAMES_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BUG_CATCHER, @@ -8763,7 +8763,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_James5 }, - [OPPONENT_BRICE] = + [TRAINER_BRICE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HIKER, @@ -8777,7 +8777,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Brice }, - [OPPONENT_TRENT_1] = + [TRAINER_TRENT_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HIKER, @@ -8791,7 +8791,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Trent1 }, - [OPPONENT_LENNY] = + [TRAINER_LENNY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HIKER, @@ -8805,7 +8805,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Lenny }, - [OPPONENT_LUCAS_1] = + [TRAINER_LUCAS_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HIKER, @@ -8819,7 +8819,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Lucas1 }, - [OPPONENT_ALAN] = + [TRAINER_ALAN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HIKER, @@ -8833,7 +8833,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Alan }, - [OPPONENT_CLARK] = + [TRAINER_CLARK] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HIKER, @@ -8847,7 +8847,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Clark }, - [OPPONENT_ERIC] = + [TRAINER_ERIC] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HIKER, @@ -8861,7 +8861,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Eric }, - [OPPONENT_LUCAS_2] = + [TRAINER_LUCAS_2] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_HIKER, @@ -8875,7 +8875,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Lucas2 }, - [OPPONENT_MIKE_1] = + [TRAINER_MIKE_1] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_HIKER, @@ -8889,7 +8889,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Mike1 }, - [OPPONENT_MIKE_2] = + [TRAINER_MIKE_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HIKER, @@ -8903,7 +8903,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Mike2 }, - [OPPONENT_TRENT_2] = + [TRAINER_TRENT_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HIKER, @@ -8917,7 +8917,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Trent2 }, - [OPPONENT_TRENT_3] = + [TRAINER_TRENT_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HIKER, @@ -8931,7 +8931,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Trent3 }, - [OPPONENT_TRENT_4] = + [TRAINER_TRENT_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HIKER, @@ -8945,7 +8945,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Trent4 }, - [OPPONENT_TRENT_5] = + [TRAINER_TRENT_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HIKER, @@ -8959,7 +8959,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Trent5 }, - [OPPONENT_DEZ_AND_LUKE] = + [TRAINER_DEZ_AND_LUKE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNG_COUPLE, @@ -8973,7 +8973,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_DezAndLuke }, - [OPPONENT_LEA_AND_JED] = + [TRAINER_LEA_AND_JED] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNG_COUPLE, @@ -8987,7 +8987,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_LeaAndJed }, - [OPPONENT_LOIS_AND_HAL_1] = + [TRAINER_LOIS_AND_HAL_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNG_COUPLE, @@ -9001,7 +9001,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_LoisAndHal1 }, - [OPPONENT_LOIS_AND_HAL_2] = + [TRAINER_LOIS_AND_HAL_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNG_COUPLE, @@ -9015,7 +9015,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_LoisAndHal2 }, - [OPPONENT_LOIS_AND_HAL_3] = + [TRAINER_LOIS_AND_HAL_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNG_COUPLE, @@ -9029,7 +9029,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_LoisAndHal3 }, - [OPPONENT_LOIS_AND_HAL_4] = + [TRAINER_LOIS_AND_HAL_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNG_COUPLE, @@ -9043,7 +9043,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_LoisAndHal4 }, - [OPPONENT_LOIS_AND_HAL_5] = + [TRAINER_LOIS_AND_HAL_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNG_COUPLE, @@ -9057,7 +9057,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_LoisAndHal5 }, - [OPPONENT_JOHANNA] = + [TRAINER_JOHANNA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BEAUTY, @@ -9071,7 +9071,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Johanna }, - [OPPONENT_ZANE] = + [TRAINER_ZANE] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -9085,7 +9085,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Zane }, - [OPPONENT_VIVIAN] = + [TRAINER_VIVIAN] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_BATTLE_GIRL, @@ -9099,7 +9099,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Vivian }, - [OPPONENT_SADIE] = + [TRAINER_SADIE] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_BATTLE_GIRL, @@ -9113,7 +9113,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Sadie }, - [OPPONENT_HIDEO_2] = + [TRAINER_HIDEO_2] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_NINJA_BOY, @@ -9127,7 +9127,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Hideo2 }, - [OPPONENT_KEIGO] = + [TRAINER_KEIGO] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_NINJA_BOY, @@ -9141,7 +9141,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Keigo }, - [OPPONENT_TSUNAO] = + [TRAINER_TSUNAO] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_NINJA_BOY, @@ -9155,7 +9155,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Tsunao }, - [OPPONENT_TERRELL] = + [TRAINER_TERRELL] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_CAMPER, @@ -9169,7 +9169,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Terrell }, - [OPPONENT_KYLEE] = + [TRAINER_KYLEE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PICNICKER, @@ -9183,7 +9183,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Kylee }, - [OPPONENT_WALLY_2] = + [TRAINER_WALLY_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -9197,7 +9197,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Wally2 }, - [OPPONENT_WALLY_3] = + [TRAINER_WALLY_3] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -9211,7 +9211,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Wally3 }, - [OPPONENT_WALLY_4] = + [TRAINER_WALLY_4] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -9225,7 +9225,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Wally4 }, - [OPPONENT_WALLY_5] = + [TRAINER_WALLY_5] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -9239,7 +9239,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Wally5 }, - [OPPONENT_WALLY_6] = + [TRAINER_WALLY_6] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -9253,7 +9253,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Wally6 }, - [OPPONENT_BRENDAN_10] = + [TRAINER_BRENDAN_10] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -9267,7 +9267,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Brendan10 }, - [OPPONENT_BRENDAN_11] = + [TRAINER_BRENDAN_11] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -9281,7 +9281,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Brendan11 }, - [OPPONENT_BRENDAN_12] = + [TRAINER_BRENDAN_12] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -9295,7 +9295,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Brendan12 }, - [OPPONENT_MAY_10] = + [TRAINER_MAY_10] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -9309,7 +9309,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_May10 }, - [OPPONENT_MAY_11] = + [TRAINER_MAY_11] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -9323,7 +9323,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_May11 }, - [OPPONENT_MAY_12] = + [TRAINER_MAY_12] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -9337,7 +9337,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_May12 }, - [OPPONENT_JONAH] = + [TRAINER_JONAH] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_FISHERMAN, @@ -9351,7 +9351,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jonah }, - [OPPONENT_HENRY] = + [TRAINER_HENRY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_FISHERMAN, @@ -9365,7 +9365,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Henry }, - [OPPONENT_ROGER] = + [TRAINER_ROGER] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_FISHERMAN, @@ -9379,7 +9379,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Roger }, - [OPPONENT_ALEXA] = + [TRAINER_ALEXA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -9393,7 +9393,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Alexa }, - [OPPONENT_RUBEN] = + [TRAINER_RUBEN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -9407,7 +9407,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Ruben }, - [OPPONENT_KOJI] = + [TRAINER_KOJI] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BLACK_BELT, @@ -9421,7 +9421,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Koji }, - [OPPONENT_WAYNE] = + [TRAINER_WAYNE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_FISHERMAN, @@ -9435,7 +9435,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Wayne }, - [OPPONENT_BYRON] = + [TRAINER_BYRON] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BIRD_KEEPER, @@ -9449,7 +9449,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Byron }, - [OPPONENT_REED] = + [TRAINER_REED] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -9463,7 +9463,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Reed }, - [OPPONENT_TISHA] = + [TRAINER_TISHA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -9477,7 +9477,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Tisha }, - [OPPONENT_TORI_AND_TIA] = + [TRAINER_TORI_AND_TIA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TWINS, @@ -9491,7 +9491,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_ToriAndTia }, - [OPPONENT_KIM_AND_IRIS] = + [TRAINER_KIM_AND_IRIS] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_SR_AND_JR, @@ -9505,7 +9505,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_KimAndIris }, - [OPPONENT_TYRA_AND_IVY] = + [TRAINER_TYRA_AND_IVY] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_SR_AND_JR, @@ -9519,7 +9519,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_TyraAndIvy }, - [OPPONENT_MEL_AND_PAUL] = + [TRAINER_MEL_AND_PAUL] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_YOUNG_COUPLE, @@ -9533,7 +9533,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_MelAndPaul }, - [OPPONENT_JOHN_AND_JAY_1] = + [TRAINER_JOHN_AND_JAY_1] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_OLD_COUPLE, @@ -9547,7 +9547,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_JohnAndJay1 }, - [OPPONENT_JOHN_AND_JAY_2] = + [TRAINER_JOHN_AND_JAY_2] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_OLD_COUPLE, @@ -9561,7 +9561,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_JohnAndJay2 }, - [OPPONENT_JOHN_AND_JAY_3] = + [TRAINER_JOHN_AND_JAY_3] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_OLD_COUPLE, @@ -9575,7 +9575,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_JohnAndJay3 }, - [OPPONENT_JOHN_AND_JAY_4] = + [TRAINER_JOHN_AND_JAY_4] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_OLD_COUPLE, @@ -9589,7 +9589,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_JohnAndJay4 }, - [OPPONENT_JOHN_AND_JAY_5] = + [TRAINER_JOHN_AND_JAY_5] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_OLD_COUPLE, @@ -9603,7 +9603,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_JohnAndJay5 }, - [OPPONENT_RELI_AND_IAN] = + [TRAINER_RELI_AND_IAN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SIS_AND_BRO, @@ -9617,7 +9617,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_ReliAndIan }, - [OPPONENT_RITA_AND_SAM_1] = + [TRAINER_RITA_AND_SAM_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SIS_AND_BRO, @@ -9631,7 +9631,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_RitaAndSam1 }, - [OPPONENT_RITA_AND_SAM_2] = + [TRAINER_RITA_AND_SAM_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SIS_AND_BRO, @@ -9645,7 +9645,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_RitaAndSam2 }, - [OPPONENT_RITA_AND_SAM_3] = + [TRAINER_RITA_AND_SAM_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SIS_AND_BRO, @@ -9659,7 +9659,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_RitaAndSam3 }, - [OPPONENT_RITA_AND_SAM_4] = + [TRAINER_RITA_AND_SAM_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SIS_AND_BRO, @@ -9673,7 +9673,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_RitaAndSam4 }, - [OPPONENT_RITA_AND_SAM_5] = + [TRAINER_RITA_AND_SAM_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SIS_AND_BRO, @@ -9687,7 +9687,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_RitaAndSam5 }, - [OPPONENT_LISA_AND_RAY] = + [TRAINER_LISA_AND_RAY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SIS_AND_BRO, @@ -9701,7 +9701,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_LisaAndRay }, - [OPPONENT_EUGENE] = + [TRAINER_EUGENE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_FISHERMAN, diff --git a/src/data/trainers_en.h b/src/data/trainers_en.h index fbcdd5a4e..7f522dd93 100644 --- a/src/data/trainers_en.h +++ b/src/data/trainers_en.h @@ -1,5 +1,5 @@ const struct Trainer gTrainers[] = { - [OPPONENT_NONE] = + [TRAINER_NONE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_1, @@ -13,7 +13,7 @@ const struct Trainer gTrainers[] = { .party = NULL }, - [OPPONENT_ARCHIE_1] = + [TRAINER_ARCHIE_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_AQUA_LEADER, @@ -27,7 +27,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Archie1 }, - [OPPONENT_GRUNT_1] = + [TRAINER_GRUNT_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -41,7 +41,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt1 }, - [OPPONENT_GRUNT_2] = + [TRAINER_GRUNT_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -55,7 +55,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt2 }, - [OPPONENT_GRUNT_3] = + [TRAINER_GRUNT_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -69,7 +69,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt3 }, - [OPPONENT_GRUNT_4] = + [TRAINER_GRUNT_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -83,7 +83,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt4 }, - [OPPONENT_GRUNT_5] = + [TRAINER_GRUNT_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -97,7 +97,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt5 }, - [OPPONENT_GRUNT_6] = + [TRAINER_GRUNT_6] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -111,7 +111,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt6 }, - [OPPONENT_GRUNT_7] = + [TRAINER_GRUNT_7] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -125,7 +125,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt7 }, - [OPPONENT_GRUNT_8] = + [TRAINER_GRUNT_8] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -139,7 +139,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt8 }, - [OPPONENT_GRUNT_9] = + [TRAINER_GRUNT_9] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -153,7 +153,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt9 }, - [OPPONENT_GRUNT_10] = + [TRAINER_GRUNT_10] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -167,7 +167,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt10 }, - [OPPONENT_GRUNT_11] = + [TRAINER_GRUNT_11] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -181,7 +181,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt11 }, - [OPPONENT_GRUNT_12] = + [TRAINER_GRUNT_12] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -195,7 +195,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt12 }, - [OPPONENT_GRUNT_13] = + [TRAINER_GRUNT_13] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -209,7 +209,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt13 }, - [OPPONENT_GRUNT_14] = + [TRAINER_GRUNT_14] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -223,7 +223,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt14 }, - [OPPONENT_GRUNT_15] = + [TRAINER_GRUNT_15] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -237,7 +237,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt15 }, - [OPPONENT_GRUNT_16] = + [TRAINER_GRUNT_16] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -251,7 +251,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt16 }, - [OPPONENT_GRUNT_17] = + [TRAINER_GRUNT_17] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -265,7 +265,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt17 }, - [OPPONENT_GRUNT_18] = + [TRAINER_GRUNT_18] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -279,7 +279,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt18 }, - [OPPONENT_GRUNT_19] = + [TRAINER_GRUNT_19] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -293,7 +293,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt19 }, - [OPPONENT_GRUNT_20] = + [TRAINER_GRUNT_20] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -307,7 +307,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt20 }, - [OPPONENT_GRUNT_21] = + [TRAINER_GRUNT_21] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -321,7 +321,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt21 }, - [OPPONENT_GRUNT_22] = + [TRAINER_GRUNT_22] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -335,7 +335,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt22 }, - [OPPONENT_GRUNT_23] = + [TRAINER_GRUNT_23] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -349,7 +349,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt23 }, - [OPPONENT_GRUNT_24] = + [TRAINER_GRUNT_24] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -363,7 +363,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt24 }, - [OPPONENT_GRUNT_25] = + [TRAINER_GRUNT_25] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -377,7 +377,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt25 }, - [OPPONENT_GRUNT_26] = + [TRAINER_GRUNT_26] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -391,7 +391,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt26 }, - [OPPONENT_GRUNT_27] = + [TRAINER_GRUNT_27] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -405,7 +405,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt27 }, - [OPPONENT_ANONYMOUS_1] = + [TRAINER_ANONYMOUS_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_AQUA_ADMIN, @@ -419,7 +419,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Anonymous1 }, - [OPPONENT_MATT_1] = + [TRAINER_MATT_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_AQUA_ADMIN, @@ -433,7 +433,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Matt1 }, - [OPPONENT_MATT_2] = + [TRAINER_MATT_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_AQUA_ADMIN, @@ -447,7 +447,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Matt2 }, - [OPPONENT_SHELLY_1] = + [TRAINER_SHELLY_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_AQUA_ADMIN, @@ -461,7 +461,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Shelly1 }, - [OPPONENT_SHELLY_2] = + [TRAINER_SHELLY_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_AQUA_ADMIN, @@ -475,7 +475,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Shelly2 }, - [OPPONENT_ARCHIE_2] = + [TRAINER_ARCHIE_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_AQUA_LEADER, @@ -489,7 +489,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Archie2 }, - [OPPONENT_ARCHIE_3] = + [TRAINER_ARCHIE_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_AQUA_LEADER, @@ -503,7 +503,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Archie3 }, - [OPPONENT_DAISY] = + [TRAINER_DAISY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_AROMA_LADY, @@ -517,7 +517,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Daisy }, - [OPPONENT_ROSE_1] = + [TRAINER_ROSE_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_AROMA_LADY, @@ -531,7 +531,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Rose1 }, - [OPPONENT_LILY] = + [TRAINER_LILY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_AROMA_LADY, @@ -545,7 +545,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Lily }, - [OPPONENT_VIOLET] = + [TRAINER_VIOLET] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_AROMA_LADY, @@ -559,7 +559,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Violet }, - [OPPONENT_ROSE_2] = + [TRAINER_ROSE_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_AROMA_LADY, @@ -573,7 +573,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Rose2 }, - [OPPONENT_ROSE_3] = + [TRAINER_ROSE_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_AROMA_LADY, @@ -587,7 +587,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Rose3 }, - [OPPONENT_ROSE_4] = + [TRAINER_ROSE_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_AROMA_LADY, @@ -601,7 +601,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Rose4 }, - [OPPONENT_ROSE_5] = + [TRAINER_ROSE_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_AROMA_LADY, @@ -615,7 +615,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Rose5 }, - [OPPONENT_DUSTY_1] = + [TRAINER_DUSTY_1] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_RUIN_MANIAC, @@ -629,7 +629,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Dusty1 }, - [OPPONENT_CHIP] = + [TRAINER_CHIP] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_RUIN_MANIAC, @@ -643,7 +643,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Chip }, - [OPPONENT_FOSTER] = + [TRAINER_FOSTER] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_RUIN_MANIAC, @@ -657,7 +657,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Foster }, - [OPPONENT_DUSTY_2] = + [TRAINER_DUSTY_2] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_RUIN_MANIAC, @@ -671,7 +671,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Dusty2 }, - [OPPONENT_DUSTY_3] = + [TRAINER_DUSTY_3] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_RUIN_MANIAC, @@ -685,7 +685,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Dusty3 }, - [OPPONENT_DUSTY_4] = + [TRAINER_DUSTY_4] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_RUIN_MANIAC, @@ -699,7 +699,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Dusty4 }, - [OPPONENT_DUSTY_5] = + [TRAINER_DUSTY_5] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_RUIN_MANIAC, @@ -713,7 +713,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Dusty5 }, - [OPPONENT_GABBY_AND_TY_1] = + [TRAINER_GABBY_AND_TY_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_INTERVIEWER, @@ -727,7 +727,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_GabbyAndTy1 }, - [OPPONENT_GABBY_AND_TY_2] = + [TRAINER_GABBY_AND_TY_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_INTERVIEWER, @@ -741,7 +741,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_GabbyAndTy2 }, - [OPPONENT_GABBY_AND_TY_3] = + [TRAINER_GABBY_AND_TY_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_INTERVIEWER, @@ -755,7 +755,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_GabbyAndTy3 }, - [OPPONENT_GABBY_AND_TY_4] = + [TRAINER_GABBY_AND_TY_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_INTERVIEWER, @@ -769,7 +769,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_GabbyAndTy4 }, - [OPPONENT_GABBY_AND_TY_5] = + [TRAINER_GABBY_AND_TY_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_INTERVIEWER, @@ -783,7 +783,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_GabbyAndTy5 }, - [OPPONENT_GABBY_AND_TY_6] = + [TRAINER_GABBY_AND_TY_6] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_INTERVIEWER, @@ -797,7 +797,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_GabbyAndTy6 }, - [OPPONENT_LOLA_1] = + [TRAINER_LOLA_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TUBER_F, @@ -811,7 +811,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Lola1 }, - [OPPONENT_CARMEN] = + [TRAINER_CARMEN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TUBER_F, @@ -825,7 +825,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Carmen }, - [OPPONENT_GWEN] = + [TRAINER_GWEN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TUBER_F, @@ -839,7 +839,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Gwen }, - [OPPONENT_LOLA_2] = + [TRAINER_LOLA_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TUBER_F, @@ -853,7 +853,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Lola2 }, - [OPPONENT_LOLA_3] = + [TRAINER_LOLA_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TUBER_F, @@ -867,7 +867,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Lola3 }, - [OPPONENT_LOLA_4] = + [TRAINER_LOLA_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TUBER_F, @@ -881,7 +881,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Lola4 }, - [OPPONENT_LOLA_5] = + [TRAINER_LOLA_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TUBER_F, @@ -895,7 +895,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Lola5 }, - [OPPONENT_RICKY_1] = + [TRAINER_RICKY_1] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_TUBER_M, @@ -909,7 +909,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Ricky1 }, - [OPPONENT_SIMON] = + [TRAINER_SIMON] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TUBER_M, @@ -923,7 +923,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Simon }, - [OPPONENT_CHARLIE] = + [TRAINER_CHARLIE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TUBER_M, @@ -937,7 +937,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Charlie }, - [OPPONENT_RICKY_2] = + [TRAINER_RICKY_2] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_TUBER_M, @@ -951,7 +951,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Ricky2 }, - [OPPONENT_RICKY_3] = + [TRAINER_RICKY_3] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_TUBER_M, @@ -965,7 +965,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Ricky3 }, - [OPPONENT_RICKY_4] = + [TRAINER_RICKY_4] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_TUBER_M, @@ -979,7 +979,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Ricky4 }, - [OPPONENT_RICKY_5] = + [TRAINER_RICKY_5] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_TUBER_M, @@ -993,7 +993,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Ricky5 }, - [OPPONENT_RANDALL] = + [TRAINER_RANDALL] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1007,7 +1007,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Randall }, - [OPPONENT_PARKER] = + [TRAINER_PARKER] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1021,7 +1021,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Parker }, - [OPPONENT_GEORGE] = + [TRAINER_GEORGE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1035,7 +1035,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_George }, - [OPPONENT_BERKE] = + [TRAINER_BERKE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1049,7 +1049,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Berke }, - [OPPONENT_CLYDE] = + [TRAINER_CLYDE] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1063,7 +1063,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Clyde }, - [OPPONENT_VINCENT] = + [TRAINER_VINCENT] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1077,7 +1077,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Vincent }, - [OPPONENT_LEROY] = + [TRAINER_LEROY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1091,7 +1091,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Leroy }, - [OPPONENT_WILTON_1] = + [TRAINER_WILTON_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1105,7 +1105,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Wilton1 }, - [OPPONENT_EDGAR] = + [TRAINER_EDGAR] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1119,7 +1119,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Edgar }, - [OPPONENT_ALBERT] = + [TRAINER_ALBERT] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1133,7 +1133,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Albert }, - [OPPONENT_SAMUEL] = + [TRAINER_SAMUEL] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1147,7 +1147,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Samuel }, - [OPPONENT_VITO] = + [TRAINER_VITO] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1161,7 +1161,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Vito }, - [OPPONENT_OWEN] = + [TRAINER_OWEN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1175,7 +1175,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Owen }, - [OPPONENT_WILTON_2] = + [TRAINER_WILTON_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1189,7 +1189,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Wilton2 }, - [OPPONENT_WILTON_3] = + [TRAINER_WILTON_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1203,7 +1203,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Wilton3 }, - [OPPONENT_WILTON_4] = + [TRAINER_WILTON_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1217,7 +1217,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Wilton4 }, - [OPPONENT_WILTON_5] = + [TRAINER_WILTON_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1231,7 +1231,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Wilton5 }, - [OPPONENT_WARREN] = + [TRAINER_WARREN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1245,7 +1245,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Warren }, - [OPPONENT_MARY] = + [TRAINER_MARY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1259,7 +1259,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Mary }, - [OPPONENT_LORI] = + [TRAINER_LORI] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1273,7 +1273,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Lori }, - [OPPONENT_JODY] = + [TRAINER_JODY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1287,7 +1287,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jody }, - [OPPONENT_WENDY] = + [TRAINER_WENDY] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1301,7 +1301,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Wendy }, - [OPPONENT_ELAINE] = + [TRAINER_ELAINE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1315,7 +1315,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Elaine }, - [OPPONENT_BROOKE_1] = + [TRAINER_BROOKE_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1329,7 +1329,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Brooke1 }, - [OPPONENT_JENNIFER] = + [TRAINER_JENNIFER] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1343,7 +1343,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jennifer }, - [OPPONENT_HOPE] = + [TRAINER_HOPE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1357,7 +1357,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Hope }, - [OPPONENT_SHANNON] = + [TRAINER_SHANNON] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1371,7 +1371,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Shannon }, - [OPPONENT_MICHELLE] = + [TRAINER_MICHELLE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1385,7 +1385,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Michelle }, - [OPPONENT_CAROLINE] = + [TRAINER_CAROLINE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1399,7 +1399,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Caroline }, - [OPPONENT_JULIE] = + [TRAINER_JULIE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1413,7 +1413,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Julie }, - [OPPONENT_BROOKE_2] = + [TRAINER_BROOKE_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1427,7 +1427,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Brooke2 }, - [OPPONENT_BROOKE_3] = + [TRAINER_BROOKE_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1441,7 +1441,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Brooke3 }, - [OPPONENT_BROOKE_4] = + [TRAINER_BROOKE_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1455,7 +1455,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Brooke4 }, - [OPPONENT_BROOKE_5] = + [TRAINER_BROOKE_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1469,7 +1469,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Brooke5 }, - [OPPONENT_PATRICIA] = + [TRAINER_PATRICIA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HEX_MANIAC, @@ -1483,7 +1483,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Patricia }, - [OPPONENT_KINDRA] = + [TRAINER_KINDRA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HEX_MANIAC, @@ -1497,7 +1497,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Kindra }, - [OPPONENT_TAMMY] = + [TRAINER_TAMMY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HEX_MANIAC, @@ -1511,7 +1511,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Tammy }, - [OPPONENT_VALERIE_1] = + [TRAINER_VALERIE_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HEX_MANIAC, @@ -1525,7 +1525,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Valerie1 }, - [OPPONENT_TASHA] = + [TRAINER_TASHA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HEX_MANIAC, @@ -1539,7 +1539,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Tasha }, - [OPPONENT_VALERIE_2] = + [TRAINER_VALERIE_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HEX_MANIAC, @@ -1553,7 +1553,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Valerie2 }, - [OPPONENT_VALERIE_3] = + [TRAINER_VALERIE_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HEX_MANIAC, @@ -1567,7 +1567,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Valerie3 }, - [OPPONENT_VALERIE_4] = + [TRAINER_VALERIE_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HEX_MANIAC, @@ -1581,7 +1581,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Valerie4 }, - [OPPONENT_VALERIE_5] = + [TRAINER_VALERIE_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HEX_MANIAC, @@ -1595,7 +1595,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Valerie5 }, - [OPPONENT_CINDY_1] = + [TRAINER_CINDY_1] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_LADY, @@ -1609,7 +1609,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Cindy1 }, - [OPPONENT_ANONYMOUS_2] = + [TRAINER_ANONYMOUS_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_LADY, @@ -1623,7 +1623,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Anonymous2 }, - [OPPONENT_BRIANNA_1] = + [TRAINER_BRIANNA_1] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_LADY, @@ -1637,7 +1637,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Brianna1 }, - [OPPONENT_CINDY_2] = + [TRAINER_CINDY_2] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_LADY, @@ -1651,7 +1651,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Cindy2 }, - [OPPONENT_BRIANNA_2] = + [TRAINER_BRIANNA_2] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_LADY, @@ -1665,7 +1665,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Brianna2 }, - [OPPONENT_ANETTE] = + [TRAINER_ANETTE] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_LADY, @@ -1679,7 +1679,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Anette }, - [OPPONENT_CINDY_3] = + [TRAINER_CINDY_3] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_LADY, @@ -1693,7 +1693,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Cindy3 }, - [OPPONENT_CINDY_4] = + [TRAINER_CINDY_4] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_LADY, @@ -1707,7 +1707,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Cindy4 }, - [OPPONENT_CINDY_5] = + [TRAINER_CINDY_5] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_LADY, @@ -1721,7 +1721,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Cindy5 }, - [OPPONENT_CINDY_6] = + [TRAINER_CINDY_6] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_LADY, @@ -1735,7 +1735,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Cindy6 }, - [OPPONENT_MELISSA] = + [TRAINER_MELISSA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BEAUTY, @@ -1749,7 +1749,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Melissa }, - [OPPONENT_SHEILA] = + [TRAINER_SHEILA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BEAUTY, @@ -1763,7 +1763,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Sheila }, - [OPPONENT_SHIRLEY] = + [TRAINER_SHIRLEY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BEAUTY, @@ -1777,7 +1777,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Shirley }, - [OPPONENT_JESSICA_1] = + [TRAINER_JESSICA_1] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_BEAUTY, @@ -1791,7 +1791,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jessica1 }, - [OPPONENT_CONNIE] = + [TRAINER_CONNIE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BEAUTY, @@ -1805,7 +1805,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Connie }, - [OPPONENT_BRIDGET] = + [TRAINER_BRIDGET] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BEAUTY, @@ -1819,7 +1819,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Bridget }, - [OPPONENT_OLIVIA] = + [TRAINER_OLIVIA] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_BEAUTY, @@ -1833,7 +1833,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Olivia }, - [OPPONENT_TIFFANY] = + [TRAINER_TIFFANY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BEAUTY, @@ -1847,7 +1847,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Tiffany }, - [OPPONENT_JESSICA_2] = + [TRAINER_JESSICA_2] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_BEAUTY, @@ -1861,7 +1861,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jessica2 }, - [OPPONENT_JESSICA_3] = + [TRAINER_JESSICA_3] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_BEAUTY, @@ -1875,7 +1875,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jessica3 }, - [OPPONENT_JESSICA_4] = + [TRAINER_JESSICA_4] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_BEAUTY, @@ -1889,7 +1889,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jessica4 }, - [OPPONENT_JESSICA_5] = + [TRAINER_JESSICA_5] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_BEAUTY, @@ -1903,7 +1903,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jessica5 }, - [OPPONENT_WINSTON_1] = + [TRAINER_WINSTON_1] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_RICH_BOY, @@ -1917,7 +1917,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Winston1 }, - [OPPONENT_ANONYMOUS_3] = + [TRAINER_ANONYMOUS_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_RICH_BOY, @@ -1931,7 +1931,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Anonymous3 }, - [OPPONENT_GARRET] = + [TRAINER_GARRET] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_RICH_BOY, @@ -1945,7 +1945,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Garret }, - [OPPONENT_WINSTON_2] = + [TRAINER_WINSTON_2] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_RICH_BOY, @@ -1959,7 +1959,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Winston2 }, - [OPPONENT_WINSTON_3] = + [TRAINER_WINSTON_3] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_RICH_BOY, @@ -1973,7 +1973,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Winston3 }, - [OPPONENT_WINSTON_4] = + [TRAINER_WINSTON_4] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_RICH_BOY, @@ -1987,7 +1987,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Winston4 }, - [OPPONENT_WINSTON_5] = + [TRAINER_WINSTON_5] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_RICH_BOY, @@ -2001,7 +2001,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Winston5 }, - [OPPONENT_STEVE_1] = + [TRAINER_STEVE_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMANIAC, @@ -2015,7 +2015,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Steve1 }, - [OPPONENT_CHRIS] = + [TRAINER_CHRIS] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMANIAC, @@ -2029,7 +2029,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Chris }, - [OPPONENT_MARK] = + [TRAINER_MARK] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMANIAC, @@ -2043,7 +2043,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Mark }, - [OPPONENT_KENN] = + [TRAINER_KENN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMANIAC, @@ -2057,7 +2057,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Kenn }, - [OPPONENT_STEVE_2] = + [TRAINER_STEVE_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMANIAC, @@ -2071,7 +2071,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Steve2 }, - [OPPONENT_STEVE_3] = + [TRAINER_STEVE_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMANIAC, @@ -2085,7 +2085,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Steve3 }, - [OPPONENT_STEVE_4] = + [TRAINER_STEVE_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMANIAC, @@ -2099,7 +2099,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Steve4 }, - [OPPONENT_STEVE_5] = + [TRAINER_STEVE_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMANIAC, @@ -2113,7 +2113,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Steve5 }, - [OPPONENT_LUIS] = + [TRAINER_LUIS] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2127,7 +2127,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Luis }, - [OPPONENT_AUSTIN] = + [TRAINER_AUSTIN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2141,7 +2141,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Austin }, - [OPPONENT_DOUGLAS] = + [TRAINER_DOUGLAS] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2155,7 +2155,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Douglas }, - [OPPONENT_DARRIN] = + [TRAINER_DARRIN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2169,7 +2169,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Darrin }, - [OPPONENT_TONY_1] = + [TRAINER_TONY_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2183,7 +2183,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Tony1 }, - [OPPONENT_JEROME] = + [TRAINER_JEROME] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2197,7 +2197,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jerome }, - [OPPONENT_MATTHEW] = + [TRAINER_MATTHEW] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2211,7 +2211,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Matthew }, - [OPPONENT_DAVID] = + [TRAINER_DAVID] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2225,7 +2225,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_David }, - [OPPONENT_SPENCER] = + [TRAINER_SPENCER] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2239,7 +2239,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Spencer }, - [OPPONENT_ROLAND] = + [TRAINER_ROLAND] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2253,7 +2253,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Roland }, - [OPPONENT_CODY] = + [TRAINER_CODY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2267,7 +2267,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Cody }, - [OPPONENT_STAN] = + [TRAINER_STAN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2281,7 +2281,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Stan }, - [OPPONENT_BARRY] = + [TRAINER_BARRY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2295,7 +2295,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Barry }, - [OPPONENT_DEAN] = + [TRAINER_DEAN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2309,7 +2309,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Dean }, - [OPPONENT_RODNEY] = + [TRAINER_RODNEY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2323,7 +2323,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Rodney }, - [OPPONENT_RICHARD] = + [TRAINER_RICHARD] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2337,7 +2337,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Richard }, - [OPPONENT_HERMAN] = + [TRAINER_HERMAN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2351,7 +2351,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Herman }, - [OPPONENT_ANONYMOUS_4] = + [TRAINER_ANONYMOUS_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2365,7 +2365,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Anonymous4 }, - [OPPONENT_GILBERT] = + [TRAINER_GILBERT] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2379,7 +2379,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Gilbert }, - [OPPONENT_FRANKLIN] = + [TRAINER_FRANKLIN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2393,7 +2393,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Franklin }, - [OPPONENT_DANNY] = + [TRAINER_DANNY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2407,7 +2407,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Danny }, - [OPPONENT_JACK] = + [TRAINER_JACK] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2421,7 +2421,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jack }, - [OPPONENT_DUDLEY] = + [TRAINER_DUDLEY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2435,7 +2435,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Dudley }, - [OPPONENT_CHAD] = + [TRAINER_CHAD] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2449,7 +2449,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Chad }, - [OPPONENT_TONY_2] = + [TRAINER_TONY_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2463,7 +2463,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Tony2 }, - [OPPONENT_TONY_3] = + [TRAINER_TONY_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2477,7 +2477,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Tony3 }, - [OPPONENT_TONY_4] = + [TRAINER_TONY_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2491,7 +2491,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Tony4 }, - [OPPONENT_TONY_5] = + [TRAINER_TONY_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2505,7 +2505,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Tony5 }, - [OPPONENT_HIDEKI] = + [TRAINER_HIDEKI] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BLACK_BELT, @@ -2519,7 +2519,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Hideki }, - [OPPONENT_HITOSHI] = + [TRAINER_HITOSHI] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BLACK_BELT, @@ -2533,7 +2533,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Hitoshi }, - [OPPONENT_KIYO] = + [TRAINER_KIYO] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BLACK_BELT, @@ -2547,7 +2547,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Kiyo }, - [OPPONENT_KOICHI] = + [TRAINER_KOICHI] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BLACK_BELT, @@ -2561,7 +2561,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Koichi }, - [OPPONENT_NOB_1] = + [TRAINER_NOB_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BLACK_BELT, @@ -2575,7 +2575,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Nob1 }, - [OPPONENT_NOB_2] = + [TRAINER_NOB_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BLACK_BELT, @@ -2589,7 +2589,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Nob2 }, - [OPPONENT_NOB_3] = + [TRAINER_NOB_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BLACK_BELT, @@ -2603,7 +2603,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Nob3 }, - [OPPONENT_NOB_4] = + [TRAINER_NOB_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BLACK_BELT, @@ -2617,7 +2617,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Nob4 }, - [OPPONENT_NOB_5] = + [TRAINER_NOB_5] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_BLACK_BELT, @@ -2631,7 +2631,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Nob5 }, - [OPPONENT_YUJI] = + [TRAINER_YUJI] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BLACK_BELT, @@ -2645,7 +2645,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Yuji }, - [OPPONENT_DAISUKE] = + [TRAINER_DAISUKE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BLACK_BELT, @@ -2659,7 +2659,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Daisuke }, - [OPPONENT_ATSUSHI] = + [TRAINER_ATSUSHI] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BLACK_BELT, @@ -2673,7 +2673,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Atsushi }, - [OPPONENT_KIRK] = + [TRAINER_KIRK] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_GUITARIST, @@ -2687,7 +2687,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Kirk }, - [OPPONENT_SCOTT] = + [TRAINER_SCOTT] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_GUITARIST, @@ -2701,7 +2701,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Scott }, - [OPPONENT_HARVEY] = + [TRAINER_HARVEY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_GUITARIST, @@ -2715,7 +2715,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Harvey }, - [OPPONENT_SHAWN] = + [TRAINER_SHAWN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_GUITARIST, @@ -2729,7 +2729,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Shawn }, - [OPPONENT_RANDY] = + [TRAINER_RANDY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_GUITARIST, @@ -2743,7 +2743,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Randy }, - [OPPONENT_DALTON_1] = + [TRAINER_DALTON_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_GUITARIST, @@ -2757,7 +2757,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Dalton1 }, - [OPPONENT_DALTON_2] = + [TRAINER_DALTON_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_GUITARIST, @@ -2771,7 +2771,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Dalton2 }, - [OPPONENT_DALTON_3] = + [TRAINER_DALTON_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_GUITARIST, @@ -2785,7 +2785,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Dalton3 }, - [OPPONENT_DALTON_4] = + [TRAINER_DALTON_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_GUITARIST, @@ -2799,7 +2799,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Dalton4 }, - [OPPONENT_DALTON_5] = + [TRAINER_DALTON_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_GUITARIST, @@ -2813,7 +2813,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Dalton5 }, - [OPPONENT_COLE] = + [TRAINER_COLE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_KINDLER, @@ -2827,7 +2827,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Cole }, - [OPPONENT_FLINT] = + [TRAINER_FLINT] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_KINDLER, @@ -2841,7 +2841,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Flint }, - [OPPONENT_AXLE] = + [TRAINER_AXLE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_KINDLER, @@ -2855,7 +2855,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Axle }, - [OPPONENT_JAKE] = + [TRAINER_JAKE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_KINDLER, @@ -2869,7 +2869,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jake }, - [OPPONENT_ANDY] = + [TRAINER_ANDY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_KINDLER, @@ -2883,7 +2883,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Andy }, - [OPPONENT_BERNIE_1] = + [TRAINER_BERNIE_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_KINDLER, @@ -2897,7 +2897,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Bernie1 }, - [OPPONENT_BERNIE_2] = + [TRAINER_BERNIE_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_KINDLER, @@ -2911,7 +2911,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Bernie2 }, - [OPPONENT_BERNIE_3] = + [TRAINER_BERNIE_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_KINDLER, @@ -2925,7 +2925,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Bernie3 }, - [OPPONENT_BERNIE_4] = + [TRAINER_BERNIE_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_KINDLER, @@ -2939,7 +2939,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Bernie4 }, - [OPPONENT_BERNIE_5] = + [TRAINER_BERNIE_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_KINDLER, @@ -2953,7 +2953,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Bernie5 }, - [OPPONENT_DREW] = + [TRAINER_DREW] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_CAMPER, @@ -2967,7 +2967,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Drew }, - [OPPONENT_CLIFF] = + [TRAINER_CLIFF] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_CAMPER, @@ -2981,7 +2981,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Cliff }, - [OPPONENT_LARRY] = + [TRAINER_LARRY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_CAMPER, @@ -2995,7 +2995,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Larry }, - [OPPONENT_SHANE] = + [TRAINER_SHANE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_CAMPER, @@ -3009,7 +3009,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Shane }, - [OPPONENT_JUSTIN] = + [TRAINER_JUSTIN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_CAMPER, @@ -3023,7 +3023,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Justin }, - [OPPONENT_ETHAN_1] = + [TRAINER_ETHAN_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_CAMPER, @@ -3037,7 +3037,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Ethan1 }, - [OPPONENT_JEFF] = + [TRAINER_JEFF] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_CAMPER, @@ -3051,7 +3051,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jeff }, - [OPPONENT_TRAVIS] = + [TRAINER_TRAVIS] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_CAMPER, @@ -3065,7 +3065,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Travis }, - [OPPONENT_ETHAN_2] = + [TRAINER_ETHAN_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_CAMPER, @@ -3079,7 +3079,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Ethan2 }, - [OPPONENT_ETHAN_3] = + [TRAINER_ETHAN_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_CAMPER, @@ -3093,7 +3093,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Ethan3 }, - [OPPONENT_ETHAN_4] = + [TRAINER_ETHAN_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_CAMPER, @@ -3107,7 +3107,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Ethan4 }, - [OPPONENT_ETHAN_5] = + [TRAINER_ETHAN_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_CAMPER, @@ -3121,7 +3121,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Ethan5 }, - [OPPONENT_BRENT] = + [TRAINER_BRENT] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BUG_MANIAC, @@ -3135,7 +3135,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Brent }, - [OPPONENT_DONALD] = + [TRAINER_DONALD] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BUG_MANIAC, @@ -3149,7 +3149,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Donald }, - [OPPONENT_TAYLOR] = + [TRAINER_TAYLOR] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BUG_MANIAC, @@ -3163,7 +3163,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Taylor }, - [OPPONENT_BRANDON_1] = + [TRAINER_BRANDON_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BUG_MANIAC, @@ -3177,7 +3177,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Brandon1 }, - [OPPONENT_DEREK] = + [TRAINER_DEREK] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BUG_MANIAC, @@ -3191,7 +3191,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Derek }, - [OPPONENT_BRANDON_2] = + [TRAINER_BRANDON_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BUG_MANIAC, @@ -3205,7 +3205,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Brandon2 }, - [OPPONENT_BRANDON_3] = + [TRAINER_BRANDON_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BUG_MANIAC, @@ -3219,7 +3219,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Brandon3 }, - [OPPONENT_BRANDON_4] = + [TRAINER_BRANDON_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BUG_MANIAC, @@ -3233,7 +3233,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Brandon4 }, - [OPPONENT_BRANDON_5] = + [TRAINER_BRANDON_5] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_BUG_MANIAC, @@ -3247,7 +3247,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Brandon5 }, - [OPPONENT_EDWARD] = + [TRAINER_EDWARD] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3261,7 +3261,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Edward }, - [OPPONENT_PRESTON] = + [TRAINER_PRESTON] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3275,7 +3275,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Preston }, - [OPPONENT_VIRGIL] = + [TRAINER_VIRGIL] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3289,7 +3289,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Virgil }, - [OPPONENT_FRITZ] = + [TRAINER_FRITZ] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3303,7 +3303,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Fritz }, - [OPPONENT_WILLIAM] = + [TRAINER_WILLIAM] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3317,7 +3317,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_William }, - [OPPONENT_JOSHUA] = + [TRAINER_JOSHUA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3331,7 +3331,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Joshua }, - [OPPONENT_CAMERON_1] = + [TRAINER_CAMERON_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3345,7 +3345,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Cameron1 }, - [OPPONENT_CAMERON_2] = + [TRAINER_CAMERON_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3359,7 +3359,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Cameron2 }, - [OPPONENT_CAMERON_3] = + [TRAINER_CAMERON_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3373,7 +3373,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Cameron3 }, - [OPPONENT_CAMERON_4] = + [TRAINER_CAMERON_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3387,7 +3387,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Cameron4 }, - [OPPONENT_CAMERON_5] = + [TRAINER_CAMERON_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3401,7 +3401,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Cameron5 }, - [OPPONENT_JACLYN] = + [TRAINER_JACLYN] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3415,7 +3415,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jaclyn }, - [OPPONENT_HANNAH] = + [TRAINER_HANNAH] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3429,7 +3429,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Hannah }, - [OPPONENT_SAMANTHA] = + [TRAINER_SAMANTHA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3443,7 +3443,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Samantha }, - [OPPONENT_MAURA] = + [TRAINER_MAURA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3457,7 +3457,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Maura }, - [OPPONENT_KAYLA] = + [TRAINER_KAYLA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3471,7 +3471,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Kayla }, - [OPPONENT_ALEXIS] = + [TRAINER_ALEXIS] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3485,7 +3485,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Alexis }, - [OPPONENT_JACKI_1] = + [TRAINER_JACKI_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3499,7 +3499,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jacki1 }, - [OPPONENT_JACKI_2] = + [TRAINER_JACKI_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3513,7 +3513,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jacki2 }, - [OPPONENT_JACKI_3] = + [TRAINER_JACKI_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3527,7 +3527,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jacki3 }, - [OPPONENT_JACKI_4] = + [TRAINER_JACKI_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3541,7 +3541,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jacki4 }, - [OPPONENT_JACKI_5] = + [TRAINER_JACKI_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3555,7 +3555,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jacki5 }, - [OPPONENT_WALTER_1] = + [TRAINER_WALTER_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_GENTLEMAN, @@ -3569,7 +3569,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Walter1 }, - [OPPONENT_TUCKER] = + [TRAINER_TUCKER] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_GENTLEMAN, @@ -3583,7 +3583,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Tucker }, - [OPPONENT_THOMAS] = + [TRAINER_THOMAS] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_GENTLEMAN, @@ -3597,7 +3597,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Thomas }, - [OPPONENT_WALTER_2] = + [TRAINER_WALTER_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_GENTLEMAN, @@ -3611,7 +3611,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Walter2 }, - [OPPONENT_WALTER_3] = + [TRAINER_WALTER_3] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_GENTLEMAN, @@ -3625,7 +3625,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Walter3 }, - [OPPONENT_WALTER_4] = + [TRAINER_WALTER_4] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_GENTLEMAN, @@ -3639,7 +3639,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Walter4 }, - [OPPONENT_WALTER_5] = + [TRAINER_WALTER_5] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_GENTLEMAN, @@ -3653,7 +3653,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Walter5 }, - [OPPONENT_SIDNEY] = + [TRAINER_SIDNEY] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_ELITE_FOUR, @@ -3667,7 +3667,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Sidney }, - [OPPONENT_PHOEBE] = + [TRAINER_PHOEBE] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_ELITE_FOUR, @@ -3681,7 +3681,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Phoebe }, - [OPPONENT_GLACIA] = + [TRAINER_GLACIA] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_ELITE_FOUR, @@ -3695,7 +3695,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Glacia }, - [OPPONENT_DRAKE] = + [TRAINER_DRAKE] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_ELITE_FOUR, @@ -3709,7 +3709,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Drake }, - [OPPONENT_ROXANNE] = + [TRAINER_ROXANNE] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_LEADER, @@ -3723,7 +3723,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Roxanne }, - [OPPONENT_BRAWLY] = + [TRAINER_BRAWLY] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_LEADER, @@ -3737,7 +3737,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Brawly }, - [OPPONENT_WATTSON] = + [TRAINER_WATTSON] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_LEADER, @@ -3751,7 +3751,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Wattson }, - [OPPONENT_FLANNERY] = + [TRAINER_FLANNERY] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_LEADER, @@ -3765,7 +3765,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Flannery }, - [OPPONENT_NORMAN] = + [TRAINER_NORMAN] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_LEADER, @@ -3779,7 +3779,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Norman }, - [OPPONENT_WINONA] = + [TRAINER_WINONA] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_LEADER, @@ -3793,7 +3793,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Winona }, - [OPPONENT_TATE_AND_LIZA] = + [TRAINER_TATE_AND_LIZA] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_LEADER, @@ -3807,7 +3807,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_TateAndLiza }, - [OPPONENT_WALLACE] = + [TRAINER_WALLACE] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_LEADER, @@ -3821,7 +3821,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Wallace }, - [OPPONENT_JERRY_1] = + [TRAINER_JERRY_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SCHOOL_KID, @@ -3835,7 +3835,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jerry1 }, - [OPPONENT_TED] = + [TRAINER_TED] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SCHOOL_KID, @@ -3849,7 +3849,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Ted }, - [OPPONENT_PAUL] = + [TRAINER_PAUL] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SCHOOL_KID, @@ -3863,7 +3863,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Paul }, - [OPPONENT_JERRY_2] = + [TRAINER_JERRY_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SCHOOL_KID, @@ -3877,7 +3877,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jerry2 }, - [OPPONENT_JERRY_3] = + [TRAINER_JERRY_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SCHOOL_KID, @@ -3891,7 +3891,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jerry3 }, - [OPPONENT_JERRY_4] = + [TRAINER_JERRY_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SCHOOL_KID, @@ -3905,7 +3905,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jerry4 }, - [OPPONENT_JERRY_5] = + [TRAINER_JERRY_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SCHOOL_KID, @@ -3919,7 +3919,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jerry5 }, - [OPPONENT_KAREN_1] = + [TRAINER_KAREN_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SCHOOL_KID, @@ -3933,7 +3933,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Karen1 }, - [OPPONENT_GEORGIA] = + [TRAINER_GEORGIA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SCHOOL_KID, @@ -3947,7 +3947,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Georgia }, - [OPPONENT_KAREN_2] = + [TRAINER_KAREN_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SCHOOL_KID, @@ -3961,7 +3961,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Karen2 }, - [OPPONENT_KAREN_3] = + [TRAINER_KAREN_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SCHOOL_KID, @@ -3975,7 +3975,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Karen3 }, - [OPPONENT_KAREN_4] = + [TRAINER_KAREN_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SCHOOL_KID, @@ -3989,7 +3989,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Karen4 }, - [OPPONENT_KAREN_5] = + [TRAINER_KAREN_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SCHOOL_KID, @@ -4003,7 +4003,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Karen5 }, - [OPPONENT_KATE_AND_JOY] = + [TRAINER_KATE_AND_JOY] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_SR_AND_JR, @@ -4017,7 +4017,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_KateAndJoy }, - [OPPONENT_ANNA_AND_MEG_1] = + [TRAINER_ANNA_AND_MEG_1] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_SR_AND_JR, @@ -4031,7 +4031,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_AnnaAndMeg1 }, - [OPPONENT_ANNA_AND_MEG_2] = + [TRAINER_ANNA_AND_MEG_2] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_SR_AND_JR, @@ -4045,7 +4045,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_AnnaAndMeg2 }, - [OPPONENT_ANNA_AND_MEG_3] = + [TRAINER_ANNA_AND_MEG_3] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_SR_AND_JR, @@ -4059,7 +4059,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_AnnaAndMeg3 }, - [OPPONENT_ANNA_AND_MEG_4] = + [TRAINER_ANNA_AND_MEG_4] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_SR_AND_JR, @@ -4073,7 +4073,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_AnnaAndMeg4 }, - [OPPONENT_ANNA_AND_MEG_5] = + [TRAINER_ANNA_AND_MEG_5] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_SR_AND_JR, @@ -4087,7 +4087,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_AnnaAndMeg5 }, - [OPPONENT_VICTOR] = + [TRAINER_VICTOR] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_WINSTRATE, @@ -4101,7 +4101,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Victor }, - [OPPONENT_MIGUEL_1] = + [TRAINER_MIGUEL_1] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_POKEFAN, @@ -4115,7 +4115,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Miguel1 }, - [OPPONENT_COLTON] = + [TRAINER_COLTON] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_POKEFAN, @@ -4129,7 +4129,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Colton }, - [OPPONENT_MIGUEL_2] = + [TRAINER_MIGUEL_2] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_POKEFAN, @@ -4143,7 +4143,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Miguel2 }, - [OPPONENT_MIGUEL_3] = + [TRAINER_MIGUEL_3] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_POKEFAN, @@ -4157,7 +4157,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Miguel3 }, - [OPPONENT_MIGUEL_4] = + [TRAINER_MIGUEL_4] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_POKEFAN, @@ -4171,7 +4171,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Miguel4 }, - [OPPONENT_MIGUEL_5] = + [TRAINER_MIGUEL_5] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_POKEFAN, @@ -4185,7 +4185,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Miguel5 }, - [OPPONENT_VICTORIA] = + [TRAINER_VICTORIA] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_WINSTRATE, @@ -4199,7 +4199,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Victoria }, - [OPPONENT_VANESSA] = + [TRAINER_VANESSA] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_POKEFAN, @@ -4213,7 +4213,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Vanessa }, - [OPPONENT_MARISSA] = + [TRAINER_MARISSA] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_POKEFAN, @@ -4227,7 +4227,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Marissa }, - [OPPONENT_ISABEL_1] = + [TRAINER_ISABEL_1] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_POKEFAN, @@ -4241,7 +4241,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Isabel1 }, - [OPPONENT_ISABEL_2] = + [TRAINER_ISABEL_2] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_POKEFAN, @@ -4255,7 +4255,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Isabel2 }, - [OPPONENT_ISABEL_3] = + [TRAINER_ISABEL_3] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_POKEFAN, @@ -4269,7 +4269,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Isabel3 }, - [OPPONENT_ISABEL_4] = + [TRAINER_ISABEL_4] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_POKEFAN, @@ -4283,7 +4283,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Isabel4 }, - [OPPONENT_ISABEL_5] = + [TRAINER_ISABEL_5] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_POKEFAN, @@ -4297,7 +4297,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Isabel5 }, - [OPPONENT_TIMOTHY_1] = + [TRAINER_TIMOTHY_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_EXPERT, @@ -4311,7 +4311,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Timothy1 }, - [OPPONENT_TIMOTHY_2] = + [TRAINER_TIMOTHY_2] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_EXPERT, @@ -4325,7 +4325,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Timothy2 }, - [OPPONENT_TIMOTHY_3] = + [TRAINER_TIMOTHY_3] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_EXPERT, @@ -4339,7 +4339,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Timothy3 }, - [OPPONENT_TIMOTHY_4] = + [TRAINER_TIMOTHY_4] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_EXPERT, @@ -4353,7 +4353,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Timothy4 }, - [OPPONENT_TIMOTHY_5] = + [TRAINER_TIMOTHY_5] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_EXPERT, @@ -4367,7 +4367,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Timothy5 }, - [OPPONENT_VICKY] = + [TRAINER_VICKY] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_WINSTRATE, @@ -4381,7 +4381,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Vicky }, - [OPPONENT_SHELBY_1] = + [TRAINER_SHELBY_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_EXPERT, @@ -4395,7 +4395,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Shelby1 }, - [OPPONENT_SHELBY_2] = + [TRAINER_SHELBY_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_EXPERT, @@ -4409,7 +4409,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Shelby2 }, - [OPPONENT_SHELBY_3] = + [TRAINER_SHELBY_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_EXPERT, @@ -4423,7 +4423,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Shelby3 }, - [OPPONENT_SHELBY_4] = + [TRAINER_SHELBY_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_EXPERT, @@ -4437,7 +4437,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Shelby4 }, - [OPPONENT_SHELBY_5] = + [TRAINER_SHELBY_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_EXPERT, @@ -4451,7 +4451,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Shelby5 }, - [OPPONENT_CALVIN_1] = + [TRAINER_CALVIN_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNGSTER, @@ -4465,7 +4465,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Calvin1 }, - [OPPONENT_BILLY] = + [TRAINER_BILLY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNGSTER, @@ -4479,7 +4479,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Billy }, - [OPPONENT_JOSH] = + [TRAINER_JOSH] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_YOUNGSTER, @@ -4493,7 +4493,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Josh }, - [OPPONENT_TOMMY] = + [TRAINER_TOMMY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNGSTER, @@ -4507,7 +4507,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Tommy }, - [OPPONENT_JOEY] = + [TRAINER_JOEY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNGSTER, @@ -4521,7 +4521,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Joey }, - [OPPONENT_BEN] = + [TRAINER_BEN] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_YOUNGSTER, @@ -4535,7 +4535,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Ben }, - [OPPONENT_ANONYMOUS_5] = + [TRAINER_ANONYMOUS_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNGSTER, @@ -4549,7 +4549,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Anonymous5 }, - [OPPONENT_KEVIN] = + [TRAINER_KEVIN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNGSTER, @@ -4563,7 +4563,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Kevin }, - [OPPONENT_NEAL] = + [TRAINER_NEAL] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNGSTER, @@ -4577,7 +4577,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Neal }, - [OPPONENT_DILLON] = + [TRAINER_DILLON] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNGSTER, @@ -4591,7 +4591,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Dillon }, - [OPPONENT_CALVIN_2] = + [TRAINER_CALVIN_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNGSTER, @@ -4605,7 +4605,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Calvin2 }, - [OPPONENT_CALVIN_3] = + [TRAINER_CALVIN_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNGSTER, @@ -4619,7 +4619,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Calvin3 }, - [OPPONENT_CALVIN_4] = + [TRAINER_CALVIN_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNGSTER, @@ -4633,7 +4633,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Calvin4 }, - [OPPONENT_CALVIN_5] = + [TRAINER_CALVIN_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNGSTER, @@ -4647,7 +4647,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Calvin5 }, - [OPPONENT_EDDIE] = + [TRAINER_EDDIE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNGSTER, @@ -4661,7 +4661,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Eddie }, - [OPPONENT_ALLEN] = + [TRAINER_ALLEN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNGSTER, @@ -4675,7 +4675,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Allen }, - [OPPONENT_TIMMY] = + [TRAINER_TIMMY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNGSTER, @@ -4689,7 +4689,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Timmy }, - [OPPONENT_STEVEN] = + [TRAINER_STEVEN] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_CHAMPION, @@ -4703,7 +4703,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Steven }, - [OPPONENT_ANDREW] = + [TRAINER_ANDREW] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_FISHERMAN, @@ -4717,7 +4717,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Andrew }, - [OPPONENT_IVAN] = + [TRAINER_IVAN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_FISHERMAN, @@ -4731,7 +4731,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Ivan }, - [OPPONENT_CLAUDE] = + [TRAINER_CLAUDE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_FISHERMAN, @@ -4745,7 +4745,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Claude }, - [OPPONENT_ELLIOT_1] = + [TRAINER_ELLIOT_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_FISHERMAN, @@ -4759,7 +4759,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Elliot1 }, - [OPPONENT_NED] = + [TRAINER_NED] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_FISHERMAN, @@ -4773,7 +4773,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Ned }, - [OPPONENT_DALE] = + [TRAINER_DALE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_FISHERMAN, @@ -4787,7 +4787,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Dale }, - [OPPONENT_NOLAN] = + [TRAINER_NOLAN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_FISHERMAN, @@ -4801,7 +4801,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Nolan }, - [OPPONENT_BARNY] = + [TRAINER_BARNY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_FISHERMAN, @@ -4815,7 +4815,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Barny }, - [OPPONENT_WADE] = + [TRAINER_WADE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_FISHERMAN, @@ -4829,7 +4829,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Wade }, - [OPPONENT_CARTER] = + [TRAINER_CARTER] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_FISHERMAN, @@ -4843,7 +4843,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Carter }, - [OPPONENT_ELLIOT_2] = + [TRAINER_ELLIOT_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_FISHERMAN, @@ -4857,7 +4857,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Elliot2 }, - [OPPONENT_ELLIOT_3] = + [TRAINER_ELLIOT_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_FISHERMAN, @@ -4871,7 +4871,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Elliot3 }, - [OPPONENT_ELLIOT_4] = + [TRAINER_ELLIOT_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_FISHERMAN, @@ -4885,7 +4885,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Elliot4 }, - [OPPONENT_ELLIOT_5] = + [TRAINER_ELLIOT_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_FISHERMAN, @@ -4899,7 +4899,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Elliot5 }, - [OPPONENT_RONALD] = + [TRAINER_RONALD] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_FISHERMAN, @@ -4913,7 +4913,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Ronald }, - [OPPONENT_JACOB] = + [TRAINER_JACOB] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -4927,7 +4927,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jacob }, - [OPPONENT_ANTHONY] = + [TRAINER_ANTHONY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -4941,7 +4941,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Anthony }, - [OPPONENT_BENJAMIN_1] = + [TRAINER_BENJAMIN_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -4955,7 +4955,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Benjamin1 }, - [OPPONENT_BENJAMIN_2] = + [TRAINER_BENJAMIN_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -4969,7 +4969,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Benjamin2 }, - [OPPONENT_BENJAMIN_3] = + [TRAINER_BENJAMIN_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -4983,7 +4983,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Benjamin3 }, - [OPPONENT_BENJAMIN_4] = + [TRAINER_BENJAMIN_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -4997,7 +4997,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Benjamin4 }, - [OPPONENT_BENJAMIN_5] = + [TRAINER_BENJAMIN_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5011,7 +5011,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Benjamin5 }, - [OPPONENT_ABIGAIL_1] = + [TRAINER_ABIGAIL_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5025,7 +5025,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Abigail1 }, - [OPPONENT_JASMINE] = + [TRAINER_JASMINE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5039,7 +5039,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jasmine }, - [OPPONENT_ABIGAIL_2] = + [TRAINER_ABIGAIL_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5053,7 +5053,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Abigail2 }, - [OPPONENT_ABIGAIL_3] = + [TRAINER_ABIGAIL_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5067,7 +5067,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Abigail3 }, - [OPPONENT_ABIGAIL_4] = + [TRAINER_ABIGAIL_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5081,7 +5081,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Abigail4 }, - [OPPONENT_ABIGAIL_5] = + [TRAINER_ABIGAIL_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5095,7 +5095,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Abigail5 }, - [OPPONENT_DYLAN_1] = + [TRAINER_DYLAN_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5109,7 +5109,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Dylan1 }, - [OPPONENT_DYLAN_2] = + [TRAINER_DYLAN_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5123,7 +5123,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Dylan2 }, - [OPPONENT_DYLAN_3] = + [TRAINER_DYLAN_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5137,7 +5137,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Dylan3 }, - [OPPONENT_DYLAN_4] = + [TRAINER_DYLAN_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5151,7 +5151,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Dylan4 }, - [OPPONENT_DYLAN_5] = + [TRAINER_DYLAN_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5165,7 +5165,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Dylan5 }, - [OPPONENT_MARIA_1] = + [TRAINER_MARIA_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5179,7 +5179,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Maria1 }, - [OPPONENT_MARIA_2] = + [TRAINER_MARIA_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5193,7 +5193,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Maria2 }, - [OPPONENT_MARIA_3] = + [TRAINER_MARIA_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5207,7 +5207,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Maria3 }, - [OPPONENT_MARIA_4] = + [TRAINER_MARIA_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5221,7 +5221,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Maria4 }, - [OPPONENT_MARIA_5] = + [TRAINER_MARIA_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5235,7 +5235,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Maria5 }, - [OPPONENT_CALEB] = + [TRAINER_CALEB] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5249,7 +5249,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Caleb }, - [OPPONENT_ANONYMOUS_6] = + [TRAINER_ANONYMOUS_6] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5263,7 +5263,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Anonymous6 }, - [OPPONENT_ISAIAH_1] = + [TRAINER_ISAIAH_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5277,7 +5277,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Isaiah1 }, - [OPPONENT_ANONYMOUS_7] = + [TRAINER_ANONYMOUS_7] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5291,7 +5291,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Anonymous7 }, - [OPPONENT_CHASE] = + [TRAINER_CHASE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5305,7 +5305,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Chase }, - [OPPONENT_ISAIAH_2] = + [TRAINER_ISAIAH_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5319,7 +5319,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Isaiah2 }, - [OPPONENT_ISAIAH_3] = + [TRAINER_ISAIAH_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5333,7 +5333,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Isaiah3 }, - [OPPONENT_ISAIAH_4] = + [TRAINER_ISAIAH_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5347,7 +5347,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Isaiah4 }, - [OPPONENT_ISAIAH_5] = + [TRAINER_ISAIAH_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5361,7 +5361,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Isaiah5 }, - [OPPONENT_ANONYMOUS_8] = + [TRAINER_ANONYMOUS_8] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5375,7 +5375,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Anonymous8 }, - [OPPONENT_CONNOR] = + [TRAINER_CONNOR] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5389,7 +5389,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Connor }, - [OPPONENT_ANONYMOUS_9] = + [TRAINER_ANONYMOUS_9] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5403,7 +5403,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Anonymous9 }, - [OPPONENT_KATELYN_1] = + [TRAINER_KATELYN_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5417,7 +5417,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Katelyn1 }, - [OPPONENT_ALLISON] = + [TRAINER_ALLISON] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5431,7 +5431,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Allison }, - [OPPONENT_KATELYN_2] = + [TRAINER_KATELYN_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5445,7 +5445,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Katelyn2 }, - [OPPONENT_KATELYN_3] = + [TRAINER_KATELYN_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5459,7 +5459,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Katelyn3 }, - [OPPONENT_KATELYN_4] = + [TRAINER_KATELYN_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5473,7 +5473,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Katelyn4 }, - [OPPONENT_KATELYN_5] = + [TRAINER_KATELYN_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5487,7 +5487,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Katelyn5 }, - [OPPONENT_NICOLAS_1] = + [TRAINER_NICOLAS_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_DRAGON_TAMER, @@ -5501,7 +5501,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Nicolas1 }, - [OPPONENT_NICOLAS_2] = + [TRAINER_NICOLAS_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_DRAGON_TAMER, @@ -5515,7 +5515,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Nicolas2 }, - [OPPONENT_NICOLAS_3] = + [TRAINER_NICOLAS_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_DRAGON_TAMER, @@ -5529,7 +5529,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Nicolas3 }, - [OPPONENT_NICOLAS_4] = + [TRAINER_NICOLAS_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_DRAGON_TAMER, @@ -5543,7 +5543,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Nicolas4 }, - [OPPONENT_NICOLAS_5] = + [TRAINER_NICOLAS_5] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_DRAGON_TAMER, @@ -5557,7 +5557,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Nicolas5 }, - [OPPONENT_AARON] = + [TRAINER_AARON] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_DRAGON_TAMER, @@ -5571,7 +5571,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Aaron }, - [OPPONENT_PERRY] = + [TRAINER_PERRY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BIRD_KEEPER, @@ -5585,7 +5585,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Perry }, - [OPPONENT_HUGH] = + [TRAINER_HUGH] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BIRD_KEEPER, @@ -5599,7 +5599,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Hugh }, - [OPPONENT_PHIL] = + [TRAINER_PHIL] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BIRD_KEEPER, @@ -5613,7 +5613,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Phil }, - [OPPONENT_JARED] = + [TRAINER_JARED] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BIRD_KEEPER, @@ -5627,7 +5627,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jared }, - [OPPONENT_ANONYMOUS_10] = + [TRAINER_ANONYMOUS_10] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BIRD_KEEPER, @@ -5641,7 +5641,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Anonymous10 }, - [OPPONENT_TANNER] = + [TRAINER_TANNER] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BIRD_KEEPER, @@ -5655,7 +5655,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Tanner }, - [OPPONENT_WILL] = + [TRAINER_WILL] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BIRD_KEEPER, @@ -5669,7 +5669,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Will }, - [OPPONENT_COLIN] = + [TRAINER_COLIN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BIRD_KEEPER, @@ -5683,7 +5683,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Colin }, - [OPPONENT_ROBERT_1] = + [TRAINER_ROBERT_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BIRD_KEEPER, @@ -5697,7 +5697,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Robert1 }, - [OPPONENT_BENNY] = + [TRAINER_BENNY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BIRD_KEEPER, @@ -5711,7 +5711,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Benny }, - [OPPONENT_CHESTER] = + [TRAINER_CHESTER] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BIRD_KEEPER, @@ -5725,7 +5725,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Chester }, - [OPPONENT_ROBERT_2] = + [TRAINER_ROBERT_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BIRD_KEEPER, @@ -5739,7 +5739,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Robert2 }, - [OPPONENT_ROBERT_3] = + [TRAINER_ROBERT_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BIRD_KEEPER, @@ -5753,7 +5753,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Robert3 }, - [OPPONENT_ROBERT_4] = + [TRAINER_ROBERT_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BIRD_KEEPER, @@ -5767,7 +5767,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Robert4 }, - [OPPONENT_ROBERT_5] = + [TRAINER_ROBERT_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BIRD_KEEPER, @@ -5781,7 +5781,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Robert5 }, - [OPPONENT_ALEX] = + [TRAINER_ALEX] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BIRD_KEEPER, @@ -5795,7 +5795,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Alex }, - [OPPONENT_BECK] = + [TRAINER_BECK] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BIRD_KEEPER, @@ -5809,7 +5809,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Beck }, - [OPPONENT_YASU] = + [TRAINER_YASU] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_NINJA_BOY, @@ -5823,7 +5823,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Yasu }, - [OPPONENT_TAKASHI] = + [TRAINER_TAKASHI] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_NINJA_BOY, @@ -5837,7 +5837,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Takashi }, - [OPPONENT_MAKOTO] = + [TRAINER_MAKOTO] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_NINJA_BOY, @@ -5851,7 +5851,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Makoto }, - [OPPONENT_HIDEO_1] = + [TRAINER_HIDEO_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_NINJA_BOY, @@ -5865,7 +5865,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Hideo1 }, - [OPPONENT_LAO_1] = + [TRAINER_LAO_1] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_NINJA_BOY, @@ -5879,7 +5879,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Lao1 }, - [OPPONENT_LUNG] = + [TRAINER_LUNG] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_NINJA_BOY, @@ -5893,7 +5893,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Lung }, - [OPPONENT_LAO_2] = + [TRAINER_LAO_2] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_NINJA_BOY, @@ -5907,7 +5907,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Lao2 }, - [OPPONENT_LAO_3] = + [TRAINER_LAO_3] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_NINJA_BOY, @@ -5921,7 +5921,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Lao3 }, - [OPPONENT_LAO_4] = + [TRAINER_LAO_4] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_NINJA_BOY, @@ -5935,7 +5935,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Lao4 }, - [OPPONENT_LAO_5] = + [TRAINER_LAO_5] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_NINJA_BOY, @@ -5949,7 +5949,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Lao5 }, - [OPPONENT_TESSA] = + [TRAINER_TESSA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BATTLE_GIRL, @@ -5963,7 +5963,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Tessa }, - [OPPONENT_LAURA] = + [TRAINER_LAURA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BATTLE_GIRL, @@ -5977,7 +5977,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Laura }, - [OPPONENT_CYNDY_1] = + [TRAINER_CYNDY_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BATTLE_GIRL, @@ -5991,7 +5991,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Cyndy1 }, - [OPPONENT_CORA] = + [TRAINER_CORA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BATTLE_GIRL, @@ -6005,7 +6005,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Cora }, - [OPPONENT_JILL] = + [TRAINER_JILL] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BATTLE_GIRL, @@ -6019,7 +6019,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jill }, - [OPPONENT_CYNDY_2] = + [TRAINER_CYNDY_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BATTLE_GIRL, @@ -6033,7 +6033,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Cyndy2 }, - [OPPONENT_CYNDY_3] = + [TRAINER_CYNDY_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BATTLE_GIRL, @@ -6047,7 +6047,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Cyndy3 }, - [OPPONENT_CYNDY_4] = + [TRAINER_CYNDY_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BATTLE_GIRL, @@ -6061,7 +6061,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Cyndy4 }, - [OPPONENT_CYNDY_5] = + [TRAINER_CYNDY_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BATTLE_GIRL, @@ -6075,7 +6075,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Cyndy5 }, - [OPPONENT_MADELINE_1] = + [TRAINER_MADELINE_1] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_PARASOL_LADY, @@ -6089,7 +6089,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Madeline1 }, - [OPPONENT_CLARISSA] = + [TRAINER_CLARISSA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PARASOL_LADY, @@ -6103,7 +6103,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Clarissa }, - [OPPONENT_ANGELICA] = + [TRAINER_ANGELICA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PARASOL_LADY, @@ -6117,7 +6117,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Angelica }, - [OPPONENT_MADELINE_2] = + [TRAINER_MADELINE_2] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_PARASOL_LADY, @@ -6131,7 +6131,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Madeline2 }, - [OPPONENT_MADELINE_3] = + [TRAINER_MADELINE_3] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_PARASOL_LADY, @@ -6145,7 +6145,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Madeline3 }, - [OPPONENT_MADELINE_4] = + [TRAINER_MADELINE_4] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_PARASOL_LADY, @@ -6159,7 +6159,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Madeline4 }, - [OPPONENT_MADELINE_5] = + [TRAINER_MADELINE_5] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_PARASOL_LADY, @@ -6173,7 +6173,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Madeline5 }, - [OPPONENT_BEVERLY] = + [TRAINER_BEVERLY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6187,7 +6187,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Beverly }, - [OPPONENT_DAWN] = + [TRAINER_DAWN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6201,7 +6201,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Dawn }, - [OPPONENT_NICOLE] = + [TRAINER_NICOLE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6215,7 +6215,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Nicole }, - [OPPONENT_DENISE] = + [TRAINER_DENISE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6229,7 +6229,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Denise }, - [OPPONENT_BETH] = + [TRAINER_BETH] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6243,7 +6243,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Beth }, - [OPPONENT_TARA] = + [TRAINER_TARA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6257,7 +6257,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Tara }, - [OPPONENT_MISSY] = + [TRAINER_MISSY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6271,7 +6271,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Missy }, - [OPPONENT_ALICE] = + [TRAINER_ALICE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6285,7 +6285,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Alice }, - [OPPONENT_JENNY_1] = + [TRAINER_JENNY_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6299,7 +6299,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jenny1 }, - [OPPONENT_GRACE] = + [TRAINER_GRACE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6313,7 +6313,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grace }, - [OPPONENT_TANYA] = + [TRAINER_TANYA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6327,7 +6327,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Tanya }, - [OPPONENT_SHARON] = + [TRAINER_SHARON] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6341,7 +6341,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Sharon }, - [OPPONENT_NIKKI] = + [TRAINER_NIKKI] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6355,7 +6355,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Nikki }, - [OPPONENT_BRENDA] = + [TRAINER_BRENDA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6369,7 +6369,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Brenda }, - [OPPONENT_KATIE] = + [TRAINER_KATIE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6383,7 +6383,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Katie }, - [OPPONENT_SUSIE] = + [TRAINER_SUSIE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6397,7 +6397,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Susie }, - [OPPONENT_KARA] = + [TRAINER_KARA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6411,7 +6411,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Kara }, - [OPPONENT_DANA] = + [TRAINER_DANA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6425,7 +6425,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Dana }, - [OPPONENT_ERIN] = + [TRAINER_ERIN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6439,7 +6439,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Erin }, - [OPPONENT_DEBRA] = + [TRAINER_DEBRA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6453,7 +6453,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Debra }, - [OPPONENT_LINDA] = + [TRAINER_LINDA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6467,7 +6467,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Linda }, - [OPPONENT_KAYLEE] = + [TRAINER_KAYLEE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6481,7 +6481,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Kaylee }, - [OPPONENT_LAUREL] = + [TRAINER_LAUREL] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6495,7 +6495,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Laurel }, - [OPPONENT_DARCY] = + [TRAINER_DARCY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6509,7 +6509,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Darcy }, - [OPPONENT_JENNY_2] = + [TRAINER_JENNY_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6523,7 +6523,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jenny2 }, - [OPPONENT_JENNY_3] = + [TRAINER_JENNY_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6537,7 +6537,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jenny3 }, - [OPPONENT_JENNY_4] = + [TRAINER_JENNY_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6551,7 +6551,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jenny4 }, - [OPPONENT_JENNY_5] = + [TRAINER_JENNY_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6565,7 +6565,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jenny5 }, - [OPPONENT_HEIDI] = + [TRAINER_HEIDI] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_PICNICKER, @@ -6579,7 +6579,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Heidi }, - [OPPONENT_BECKY] = + [TRAINER_BECKY] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_PICNICKER, @@ -6593,7 +6593,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Becky }, - [OPPONENT_CAROL] = + [TRAINER_CAROL] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PICNICKER, @@ -6607,7 +6607,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Carol }, - [OPPONENT_NANCY] = + [TRAINER_NANCY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PICNICKER, @@ -6621,7 +6621,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Nancy }, - [OPPONENT_MARTHA] = + [TRAINER_MARTHA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PICNICKER, @@ -6635,7 +6635,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Martha }, - [OPPONENT_DIANA_1] = + [TRAINER_DIANA_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PICNICKER, @@ -6649,7 +6649,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Diana1 }, - [OPPONENT_NINA] = + [TRAINER_NINA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PICNICKER, @@ -6663,7 +6663,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Nina }, - [OPPONENT_IRENE] = + [TRAINER_IRENE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PICNICKER, @@ -6677,7 +6677,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Irene }, - [OPPONENT_DIANA_2] = + [TRAINER_DIANA_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PICNICKER, @@ -6691,7 +6691,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Diana2 }, - [OPPONENT_DIANA_3] = + [TRAINER_DIANA_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PICNICKER, @@ -6705,7 +6705,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Diana3 }, - [OPPONENT_DIANA_4] = + [TRAINER_DIANA_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PICNICKER, @@ -6719,7 +6719,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Diana4 }, - [OPPONENT_DIANA_5] = + [TRAINER_DIANA_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PICNICKER, @@ -6733,7 +6733,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Diana5 }, - [OPPONENT_AMY_AND_LIV_1] = + [TRAINER_AMY_AND_LIV_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TWINS, @@ -6747,7 +6747,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_AmyAndLiv1 }, - [OPPONENT_AMY_AND_LIV_2] = + [TRAINER_AMY_AND_LIV_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TWINS, @@ -6761,7 +6761,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_AmyAndLiv2 }, - [OPPONENT_GINA_AND_MIA_1] = + [TRAINER_GINA_AND_MIA_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TWINS, @@ -6775,7 +6775,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_GinaAndMia1 }, - [OPPONENT_MIU_AND_YUKI] = + [TRAINER_MIU_AND_YUKI] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TWINS, @@ -6789,7 +6789,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_MiuAndYuki }, - [OPPONENT_AMY_AND_LIV_3] = + [TRAINER_AMY_AND_LIV_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TWINS, @@ -6803,7 +6803,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_AmyAndLiv3 }, - [OPPONENT_GINA_AND_MIA_2] = + [TRAINER_GINA_AND_MIA_2] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_TWINS, @@ -6817,7 +6817,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_GinaAndMia2 }, - [OPPONENT_AMY_AND_LIV_4] = + [TRAINER_AMY_AND_LIV_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TWINS, @@ -6831,7 +6831,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_AmyAndLiv4 }, - [OPPONENT_AMY_AND_LIV_5] = + [TRAINER_AMY_AND_LIV_5] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_TWINS, @@ -6845,7 +6845,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_AmyAndLiv5 }, - [OPPONENT_AMY_AND_LIV_6] = + [TRAINER_AMY_AND_LIV_6] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_TWINS, @@ -6859,7 +6859,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_AmyAndLiv6 }, - [OPPONENT_HUEY] = + [TRAINER_HUEY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SAILOR, @@ -6873,7 +6873,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Huey }, - [OPPONENT_EDMOND] = + [TRAINER_EDMOND] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SAILOR, @@ -6887,7 +6887,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Edmond }, - [OPPONENT_ERNEST_1] = + [TRAINER_ERNEST_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SAILOR, @@ -6901,7 +6901,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Ernest1 }, - [OPPONENT_DWAYNE] = + [TRAINER_DWAYNE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SAILOR, @@ -6915,7 +6915,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Dwayne }, - [OPPONENT_PHILLIP] = + [TRAINER_PHILLIP] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SAILOR, @@ -6929,7 +6929,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Phillip }, - [OPPONENT_LEONARD] = + [TRAINER_LEONARD] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SAILOR, @@ -6943,7 +6943,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Leonard }, - [OPPONENT_DUNCAN] = + [TRAINER_DUNCAN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SAILOR, @@ -6957,7 +6957,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Duncan }, - [OPPONENT_ERNEST_2] = + [TRAINER_ERNEST_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SAILOR, @@ -6971,7 +6971,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Ernest2 }, - [OPPONENT_ERNEST_3] = + [TRAINER_ERNEST_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SAILOR, @@ -6985,7 +6985,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Ernest3 }, - [OPPONENT_ERNEST_4] = + [TRAINER_ERNEST_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SAILOR, @@ -6999,7 +6999,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Ernest4 }, - [OPPONENT_ERNEST_5] = + [TRAINER_ERNEST_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SAILOR, @@ -7013,7 +7013,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Ernest5 }, - [OPPONENT_ANONYMOUS_11] = + [TRAINER_ANONYMOUS_11] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BOARDER, @@ -7027,7 +7027,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Anonymous11 }, - [OPPONENT_ANONYMOUS_12] = + [TRAINER_ANONYMOUS_12] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BOARDER, @@ -7041,7 +7041,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Anonymous12 }, - [OPPONENT_ANONYMOUS_13] = + [TRAINER_ANONYMOUS_13] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BOARDER, @@ -7055,7 +7055,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Anonymous13 }, - [OPPONENT_SONNY] = + [TRAINER_SONNY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BOARDER, @@ -7069,7 +7069,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Sonny }, - [OPPONENT_DONOVAN] = + [TRAINER_DONOVAN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BOARDER, @@ -7083,7 +7083,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Donovan }, - [OPPONENT_GERALD] = + [TRAINER_GERALD] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BOARDER, @@ -7097,7 +7097,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Gerald }, - [OPPONENT_KELVIN] = + [TRAINER_KELVIN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BOARDER, @@ -7111,7 +7111,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Kelvin }, - [OPPONENT_KODY] = + [TRAINER_KODY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BOARDER, @@ -7125,7 +7125,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Kody }, - [OPPONENT_TEVIN] = + [TRAINER_TEVIN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BOARDER, @@ -7139,7 +7139,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Tevin }, - [OPPONENT_DAMON] = + [TRAINER_DAMON] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BOARDER, @@ -7153,7 +7153,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Damon }, - [OPPONENT_PABLO] = + [TRAINER_PABLO] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BOARDER, @@ -7167,7 +7167,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Pablo }, - [OPPONENT_EDWIN_1] = + [TRAINER_EDWIN_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COLLECTOR, @@ -7181,7 +7181,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Edwin1 }, - [OPPONENT_HECTOR_1] = + [TRAINER_HECTOR_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COLLECTOR, @@ -7195,7 +7195,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Hector1 }, - [OPPONENT_HECTOR_2] = + [TRAINER_HECTOR_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COLLECTOR, @@ -7209,7 +7209,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Hector2 }, - [OPPONENT_EDWIN_2] = + [TRAINER_EDWIN_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COLLECTOR, @@ -7223,7 +7223,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Edwin2 }, - [OPPONENT_EDWIN_3] = + [TRAINER_EDWIN_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COLLECTOR, @@ -7237,7 +7237,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Edwin3 }, - [OPPONENT_EDWIN_4] = + [TRAINER_EDWIN_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COLLECTOR, @@ -7251,7 +7251,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Edwin4 }, - [OPPONENT_EDWIN_5] = + [TRAINER_EDWIN_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COLLECTOR, @@ -7265,7 +7265,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Edwin5 }, - [OPPONENT_WALLY_1] = + [TRAINER_WALLY_1] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -7279,7 +7279,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Wally1 }, - [OPPONENT_BRENDAN_1] = + [TRAINER_BRENDAN_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -7293,7 +7293,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Brendan1 }, - [OPPONENT_BRENDAN_2] = + [TRAINER_BRENDAN_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -7307,7 +7307,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Brendan2 }, - [OPPONENT_BRENDAN_3] = + [TRAINER_BRENDAN_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -7321,7 +7321,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Brendan3 }, - [OPPONENT_BRENDAN_4] = + [TRAINER_BRENDAN_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -7335,7 +7335,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Brendan4 }, - [OPPONENT_BRENDAN_5] = + [TRAINER_BRENDAN_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -7349,7 +7349,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Brendan5 }, - [OPPONENT_BRENDAN_6] = + [TRAINER_BRENDAN_6] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -7363,7 +7363,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Brendan6 }, - [OPPONENT_BRENDAN_7] = + [TRAINER_BRENDAN_7] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -7377,7 +7377,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Brendan7 }, - [OPPONENT_BRENDAN_8] = + [TRAINER_BRENDAN_8] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -7391,7 +7391,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Brendan8 }, - [OPPONENT_BRENDAN_9] = + [TRAINER_BRENDAN_9] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -7405,7 +7405,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Brendan9 }, - [OPPONENT_MAY_1] = + [TRAINER_MAY_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -7419,7 +7419,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_May1 }, - [OPPONENT_MAY_2] = + [TRAINER_MAY_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -7433,7 +7433,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_May2 }, - [OPPONENT_MAY_3] = + [TRAINER_MAY_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -7447,7 +7447,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_May3 }, - [OPPONENT_MAY_4] = + [TRAINER_MAY_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -7461,7 +7461,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_May4 }, - [OPPONENT_MAY_5] = + [TRAINER_MAY_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -7475,7 +7475,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_May5 }, - [OPPONENT_MAY_6] = + [TRAINER_MAY_6] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -7489,7 +7489,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_May6 }, - [OPPONENT_MAY_7] = + [TRAINER_MAY_7] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -7503,7 +7503,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_May7 }, - [OPPONENT_MAY_8] = + [TRAINER_MAY_8] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -7517,7 +7517,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_May8 }, - [OPPONENT_MAY_9] = + [TRAINER_MAY_9] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -7531,7 +7531,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_May9 }, - [OPPONENT_ISAAC_1] = + [TRAINER_ISAAC_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_BREEDER, @@ -7545,7 +7545,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Isaac1 }, - [OPPONENT_RILEY] = + [TRAINER_RILEY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_BREEDER, @@ -7559,7 +7559,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Riley }, - [OPPONENT_AIDAN] = + [TRAINER_AIDAN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_BREEDER, @@ -7573,7 +7573,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Aidan }, - [OPPONENT_ISAAC_2] = + [TRAINER_ISAAC_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_BREEDER, @@ -7587,7 +7587,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Isaac2 }, - [OPPONENT_ISAAC_3] = + [TRAINER_ISAAC_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_BREEDER, @@ -7601,7 +7601,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Isaac3 }, - [OPPONENT_ISAAC_4] = + [TRAINER_ISAAC_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_BREEDER, @@ -7615,7 +7615,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Isaac4 }, - [OPPONENT_ISAAC_5] = + [TRAINER_ISAAC_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_BREEDER, @@ -7629,7 +7629,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Isaac5 }, - [OPPONENT_LYDIA_1] = + [TRAINER_LYDIA_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_BREEDER, @@ -7643,7 +7643,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Lydia1 }, - [OPPONENT_ALEXIA] = + [TRAINER_ALEXIA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_BREEDER, @@ -7657,7 +7657,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Alexia }, - [OPPONENT_DANIELLE] = + [TRAINER_DANIELLE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_BREEDER, @@ -7671,7 +7671,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Danielle }, - [OPPONENT_LYDIA_2] = + [TRAINER_LYDIA_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_BREEDER, @@ -7685,7 +7685,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Lydia2 }, - [OPPONENT_LYDIA_3] = + [TRAINER_LYDIA_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_BREEDER, @@ -7699,7 +7699,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Lydia3 }, - [OPPONENT_LYDIA_4] = + [TRAINER_LYDIA_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_BREEDER, @@ -7713,7 +7713,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Lydia4 }, - [OPPONENT_LYDIA_5] = + [TRAINER_LYDIA_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_BREEDER, @@ -7727,7 +7727,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Lydia5 }, - [OPPONENT_JACKSON_1] = + [TRAINER_JACKSON_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_RANGER, @@ -7741,7 +7741,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jackson1 }, - [OPPONENT_CARLOS] = + [TRAINER_CARLOS] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_RANGER, @@ -7755,7 +7755,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Carlos }, - [OPPONENT_SEBASTIAN] = + [TRAINER_SEBASTIAN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_RANGER, @@ -7769,7 +7769,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Sebastian }, - [OPPONENT_JACKSON_2] = + [TRAINER_JACKSON_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_RANGER, @@ -7783,7 +7783,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jackson2 }, - [OPPONENT_JACKSON_3] = + [TRAINER_JACKSON_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_RANGER, @@ -7797,7 +7797,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jackson3 }, - [OPPONENT_JACKSON_4] = + [TRAINER_JACKSON_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_RANGER, @@ -7811,7 +7811,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jackson4 }, - [OPPONENT_JACKSON_5] = + [TRAINER_JACKSON_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_RANGER, @@ -7825,7 +7825,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jackson5 }, - [OPPONENT_CATHERINE_1] = + [TRAINER_CATHERINE_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_RANGER, @@ -7839,7 +7839,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Catherine1 }, - [OPPONENT_JENNA] = + [TRAINER_JENNA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_RANGER, @@ -7853,7 +7853,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jenna }, - [OPPONENT_SOPHIA] = + [TRAINER_SOPHIA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_RANGER, @@ -7867,7 +7867,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Sophia }, - [OPPONENT_CATHERINE_2] = + [TRAINER_CATHERINE_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_RANGER, @@ -7881,7 +7881,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Catherine2 }, - [OPPONENT_CATHERINE_3] = + [TRAINER_CATHERINE_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_RANGER, @@ -7895,7 +7895,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Catherine3 }, - [OPPONENT_CATHERINE_4] = + [TRAINER_CATHERINE_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_RANGER, @@ -7909,7 +7909,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Catherine4 }, - [OPPONENT_CATHERINE_5] = + [TRAINER_CATHERINE_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_RANGER, @@ -7923,7 +7923,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Catherine5 }, - [OPPONENT_MAXIE_1] = + [TRAINER_MAXIE_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_MAGMA_LEADER, @@ -7937,7 +7937,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Maxie1 }, - [OPPONENT_GRUNT_28] = + [TRAINER_GRUNT_28] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -7951,7 +7951,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt28 }, - [OPPONENT_GRUNT_29] = + [TRAINER_GRUNT_29] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -7965,7 +7965,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt29 }, - [OPPONENT_GRUNT_30] = + [TRAINER_GRUNT_30] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -7979,7 +7979,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt30 }, - [OPPONENT_GRUNT_31] = + [TRAINER_GRUNT_31] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -7993,7 +7993,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt31 }, - [OPPONENT_GRUNT_32] = + [TRAINER_GRUNT_32] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8007,7 +8007,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt32 }, - [OPPONENT_GRUNT_33] = + [TRAINER_GRUNT_33] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8021,7 +8021,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt33 }, - [OPPONENT_GRUNT_34] = + [TRAINER_GRUNT_34] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8035,7 +8035,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt34 }, - [OPPONENT_GRUNT_35] = + [TRAINER_GRUNT_35] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8049,7 +8049,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt35 }, - [OPPONENT_GRUNT_36] = + [TRAINER_GRUNT_36] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8063,7 +8063,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt36 }, - [OPPONENT_GRUNT_37] = + [TRAINER_GRUNT_37] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8077,7 +8077,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt37 }, - [OPPONENT_GRUNT_38] = + [TRAINER_GRUNT_38] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8091,7 +8091,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt38 }, - [OPPONENT_GRUNT_39] = + [TRAINER_GRUNT_39] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8105,7 +8105,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt39 }, - [OPPONENT_GRUNT_40] = + [TRAINER_GRUNT_40] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8119,7 +8119,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt40 }, - [OPPONENT_GRUNT_41] = + [TRAINER_GRUNT_41] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8133,7 +8133,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt41 }, - [OPPONENT_GRUNT_42] = + [TRAINER_GRUNT_42] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8147,7 +8147,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt42 }, - [OPPONENT_GRUNT_43] = + [TRAINER_GRUNT_43] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8161,7 +8161,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt43 }, - [OPPONENT_GRUNT_44] = + [TRAINER_GRUNT_44] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8175,7 +8175,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt44 }, - [OPPONENT_GRUNT_45] = + [TRAINER_GRUNT_45] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8189,7 +8189,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt45 }, - [OPPONENT_GRUNT_46] = + [TRAINER_GRUNT_46] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8203,7 +8203,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt46 }, - [OPPONENT_GRUNT_47] = + [TRAINER_GRUNT_47] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8217,7 +8217,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt47 }, - [OPPONENT_GRUNT_48] = + [TRAINER_GRUNT_48] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8231,7 +8231,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt48 }, - [OPPONENT_GRUNT_49] = + [TRAINER_GRUNT_49] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8245,7 +8245,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt49 }, - [OPPONENT_GRUNT_50] = + [TRAINER_GRUNT_50] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8259,7 +8259,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt50 }, - [OPPONENT_GRUNT_51] = + [TRAINER_GRUNT_51] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8273,7 +8273,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt51 }, - [OPPONENT_GRUNT_52] = + [TRAINER_GRUNT_52] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8287,7 +8287,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt52 }, - [OPPONENT_GRUNT_53] = + [TRAINER_GRUNT_53] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8301,7 +8301,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt53 }, - [OPPONENT_GRUNT_54] = + [TRAINER_GRUNT_54] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8315,7 +8315,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Grunt54 }, - [OPPONENT_ANONYMOUS_14] = + [TRAINER_ANONYMOUS_14] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_MAGMA_ADMIN, @@ -8329,7 +8329,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Anonymous14 }, - [OPPONENT_ANONYMOUS_15] = + [TRAINER_ANONYMOUS_15] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_MAGMA_ADMIN, @@ -8343,7 +8343,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Anonymous15 }, - [OPPONENT_TABITHA_1] = + [TRAINER_TABITHA_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_MAGMA_ADMIN, @@ -8357,7 +8357,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Tabitha1 }, - [OPPONENT_TABITHA_2] = + [TRAINER_TABITHA_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_MAGMA_ADMIN, @@ -8371,7 +8371,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Tabitha2 }, - [OPPONENT_ANONYMOUS_16] = + [TRAINER_ANONYMOUS_16] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_MAGMA_ADMIN, @@ -8385,7 +8385,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Anonymous16 }, - [OPPONENT_COURTNEY_1] = + [TRAINER_COURTNEY_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_MAGMA_ADMIN, @@ -8399,7 +8399,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Courtney1 }, - [OPPONENT_COURTNEY_2] = + [TRAINER_COURTNEY_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_MAGMA_ADMIN, @@ -8413,7 +8413,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Courtney2 }, - [OPPONENT_MAXIE_2] = + [TRAINER_MAXIE_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_MAGMA_LEADER, @@ -8427,7 +8427,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Maxie2 }, - [OPPONENT_MAXIE_3] = + [TRAINER_MAXIE_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_MAGMA_LEADER, @@ -8441,7 +8441,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Maxie3 }, - [OPPONENT_TIANA] = + [TRAINER_TIANA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_LASS, @@ -8455,7 +8455,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Tiana }, - [OPPONENT_HALEY_1] = + [TRAINER_HALEY_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_LASS, @@ -8469,7 +8469,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Haley1 }, - [OPPONENT_JANICE] = + [TRAINER_JANICE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_LASS, @@ -8483,7 +8483,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Janice }, - [OPPONENT_VIVI] = + [TRAINER_VIVI] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_WINSTRATE, @@ -8497,7 +8497,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Vivi }, - [OPPONENT_HALEY_2] = + [TRAINER_HALEY_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_LASS, @@ -8511,7 +8511,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Haley2 }, - [OPPONENT_HALEY_3] = + [TRAINER_HALEY_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_LASS, @@ -8525,7 +8525,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Haley3 }, - [OPPONENT_HALEY_4] = + [TRAINER_HALEY_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_LASS, @@ -8539,7 +8539,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Haley4 }, - [OPPONENT_HALEY_5] = + [TRAINER_HALEY_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_LASS, @@ -8553,7 +8553,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Haley5 }, - [OPPONENT_SALLY] = + [TRAINER_SALLY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_LASS, @@ -8567,7 +8567,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Sally }, - [OPPONENT_ROBIN] = + [TRAINER_ROBIN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_LASS, @@ -8581,7 +8581,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Robin }, - [OPPONENT_ANDREA] = + [TRAINER_ANDREA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_LASS, @@ -8595,7 +8595,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Andrea }, - [OPPONENT_CRISSY] = + [TRAINER_CRISSY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_LASS, @@ -8609,7 +8609,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Crissy }, - [OPPONENT_RICK] = + [TRAINER_RICK] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BUG_CATCHER, @@ -8623,7 +8623,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Rick }, - [OPPONENT_LYLE] = + [TRAINER_LYLE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BUG_CATCHER, @@ -8637,7 +8637,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Lyle }, - [OPPONENT_JOSE] = + [TRAINER_JOSE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BUG_CATCHER, @@ -8651,7 +8651,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jose }, - [OPPONENT_DOUG] = + [TRAINER_DOUG] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BUG_CATCHER, @@ -8665,7 +8665,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Doug }, - [OPPONENT_GREG] = + [TRAINER_GREG] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BUG_CATCHER, @@ -8679,7 +8679,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Greg }, - [OPPONENT_KENT] = + [TRAINER_KENT] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BUG_CATCHER, @@ -8693,7 +8693,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Kent }, - [OPPONENT_JAMES_1] = + [TRAINER_JAMES_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BUG_CATCHER, @@ -8707,7 +8707,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_James1 }, - [OPPONENT_JAMES_2] = + [TRAINER_JAMES_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BUG_CATCHER, @@ -8721,7 +8721,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_James2 }, - [OPPONENT_JAMES_3] = + [TRAINER_JAMES_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BUG_CATCHER, @@ -8735,7 +8735,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_James3 }, - [OPPONENT_JAMES_4] = + [TRAINER_JAMES_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BUG_CATCHER, @@ -8749,7 +8749,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_James4 }, - [OPPONENT_JAMES_5] = + [TRAINER_JAMES_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BUG_CATCHER, @@ -8763,7 +8763,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_James5 }, - [OPPONENT_BRICE] = + [TRAINER_BRICE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HIKER, @@ -8777,7 +8777,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Brice }, - [OPPONENT_TRENT_1] = + [TRAINER_TRENT_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HIKER, @@ -8791,7 +8791,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Trent1 }, - [OPPONENT_LENNY] = + [TRAINER_LENNY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HIKER, @@ -8805,7 +8805,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Lenny }, - [OPPONENT_LUCAS_1] = + [TRAINER_LUCAS_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HIKER, @@ -8819,7 +8819,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Lucas1 }, - [OPPONENT_ALAN] = + [TRAINER_ALAN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HIKER, @@ -8833,7 +8833,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Alan }, - [OPPONENT_CLARK] = + [TRAINER_CLARK] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HIKER, @@ -8847,7 +8847,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Clark }, - [OPPONENT_ERIC] = + [TRAINER_ERIC] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HIKER, @@ -8861,7 +8861,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Eric }, - [OPPONENT_LUCAS_2] = + [TRAINER_LUCAS_2] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_HIKER, @@ -8875,7 +8875,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Lucas2 }, - [OPPONENT_MIKE_1] = + [TRAINER_MIKE_1] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_HIKER, @@ -8889,7 +8889,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Mike1 }, - [OPPONENT_MIKE_2] = + [TRAINER_MIKE_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HIKER, @@ -8903,7 +8903,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Mike2 }, - [OPPONENT_TRENT_2] = + [TRAINER_TRENT_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HIKER, @@ -8917,7 +8917,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Trent2 }, - [OPPONENT_TRENT_3] = + [TRAINER_TRENT_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HIKER, @@ -8931,7 +8931,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Trent3 }, - [OPPONENT_TRENT_4] = + [TRAINER_TRENT_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HIKER, @@ -8945,7 +8945,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Trent4 }, - [OPPONENT_TRENT_5] = + [TRAINER_TRENT_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HIKER, @@ -8959,7 +8959,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Trent5 }, - [OPPONENT_DEZ_AND_LUKE] = + [TRAINER_DEZ_AND_LUKE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNG_COUPLE, @@ -8973,7 +8973,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_DezAndLuke }, - [OPPONENT_LEA_AND_JED] = + [TRAINER_LEA_AND_JED] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNG_COUPLE, @@ -8987,7 +8987,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_LeaAndJed }, - [OPPONENT_LOIS_AND_HAL_1] = + [TRAINER_LOIS_AND_HAL_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNG_COUPLE, @@ -9001,7 +9001,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_LoisAndHal1 }, - [OPPONENT_LOIS_AND_HAL_2] = + [TRAINER_LOIS_AND_HAL_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNG_COUPLE, @@ -9015,7 +9015,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_LoisAndHal2 }, - [OPPONENT_LOIS_AND_HAL_3] = + [TRAINER_LOIS_AND_HAL_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNG_COUPLE, @@ -9029,7 +9029,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_LoisAndHal3 }, - [OPPONENT_LOIS_AND_HAL_4] = + [TRAINER_LOIS_AND_HAL_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNG_COUPLE, @@ -9043,7 +9043,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_LoisAndHal4 }, - [OPPONENT_LOIS_AND_HAL_5] = + [TRAINER_LOIS_AND_HAL_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNG_COUPLE, @@ -9057,7 +9057,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_LoisAndHal5 }, - [OPPONENT_JOHANNA] = + [TRAINER_JOHANNA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BEAUTY, @@ -9071,7 +9071,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Johanna }, - [OPPONENT_ZANE] = + [TRAINER_ZANE] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -9085,7 +9085,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Zane }, - [OPPONENT_VIVIAN] = + [TRAINER_VIVIAN] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_BATTLE_GIRL, @@ -9099,7 +9099,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Vivian }, - [OPPONENT_SADIE] = + [TRAINER_SADIE] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_BATTLE_GIRL, @@ -9113,7 +9113,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Sadie }, - [OPPONENT_HIDEO_2] = + [TRAINER_HIDEO_2] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_NINJA_BOY, @@ -9127,7 +9127,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Hideo2 }, - [OPPONENT_KEIGO] = + [TRAINER_KEIGO] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_NINJA_BOY, @@ -9141,7 +9141,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Keigo }, - [OPPONENT_TSUNAO] = + [TRAINER_TSUNAO] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_NINJA_BOY, @@ -9155,7 +9155,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Tsunao }, - [OPPONENT_TERRELL] = + [TRAINER_TERRELL] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_CAMPER, @@ -9169,7 +9169,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Terrell }, - [OPPONENT_KYLEE] = + [TRAINER_KYLEE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PICNICKER, @@ -9183,7 +9183,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Kylee }, - [OPPONENT_WALLY_2] = + [TRAINER_WALLY_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -9197,7 +9197,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Wally2 }, - [OPPONENT_WALLY_3] = + [TRAINER_WALLY_3] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -9211,7 +9211,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Wally3 }, - [OPPONENT_WALLY_4] = + [TRAINER_WALLY_4] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -9225,7 +9225,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Wally4 }, - [OPPONENT_WALLY_5] = + [TRAINER_WALLY_5] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -9239,7 +9239,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Wally5 }, - [OPPONENT_WALLY_6] = + [TRAINER_WALLY_6] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -9253,7 +9253,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Wally6 }, - [OPPONENT_BRENDAN_10] = + [TRAINER_BRENDAN_10] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -9267,7 +9267,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Brendan10 }, - [OPPONENT_BRENDAN_11] = + [TRAINER_BRENDAN_11] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -9281,7 +9281,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Brendan11 }, - [OPPONENT_BRENDAN_12] = + [TRAINER_BRENDAN_12] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -9295,7 +9295,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Brendan12 }, - [OPPONENT_MAY_10] = + [TRAINER_MAY_10] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -9309,7 +9309,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_May10 }, - [OPPONENT_MAY_11] = + [TRAINER_MAY_11] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -9323,7 +9323,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_May11 }, - [OPPONENT_MAY_12] = + [TRAINER_MAY_12] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -9337,7 +9337,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_May12 }, - [OPPONENT_JONAH] = + [TRAINER_JONAH] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_FISHERMAN, @@ -9351,7 +9351,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Jonah }, - [OPPONENT_HENRY] = + [TRAINER_HENRY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_FISHERMAN, @@ -9365,7 +9365,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Henry }, - [OPPONENT_ROGER] = + [TRAINER_ROGER] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_FISHERMAN, @@ -9379,7 +9379,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Roger }, - [OPPONENT_ALEXA] = + [TRAINER_ALEXA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -9393,7 +9393,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Alexa }, - [OPPONENT_RUBEN] = + [TRAINER_RUBEN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -9407,7 +9407,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Ruben }, - [OPPONENT_KOJI] = + [TRAINER_KOJI] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BLACK_BELT, @@ -9421,7 +9421,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Koji }, - [OPPONENT_WAYNE] = + [TRAINER_WAYNE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_FISHERMAN, @@ -9435,7 +9435,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Wayne }, - [OPPONENT_BYRON] = + [TRAINER_BYRON] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BIRD_KEEPER, @@ -9449,7 +9449,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Byron }, - [OPPONENT_REED] = + [TRAINER_REED] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -9463,7 +9463,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Reed }, - [OPPONENT_TISHA] = + [TRAINER_TISHA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -9477,7 +9477,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_Tisha }, - [OPPONENT_TORI_AND_TIA] = + [TRAINER_TORI_AND_TIA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TWINS, @@ -9491,7 +9491,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_ToriAndTia }, - [OPPONENT_KIM_AND_IRIS] = + [TRAINER_KIM_AND_IRIS] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_SR_AND_JR, @@ -9505,7 +9505,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_KimAndIris }, - [OPPONENT_TYRA_AND_IVY] = + [TRAINER_TYRA_AND_IVY] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_SR_AND_JR, @@ -9519,7 +9519,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_TyraAndIvy }, - [OPPONENT_MEL_AND_PAUL] = + [TRAINER_MEL_AND_PAUL] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_YOUNG_COUPLE, @@ -9533,7 +9533,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_MelAndPaul }, - [OPPONENT_JOHN_AND_JAY_1] = + [TRAINER_JOHN_AND_JAY_1] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_OLD_COUPLE, @@ -9547,7 +9547,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_JohnAndJay1 }, - [OPPONENT_JOHN_AND_JAY_2] = + [TRAINER_JOHN_AND_JAY_2] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_OLD_COUPLE, @@ -9561,7 +9561,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_JohnAndJay2 }, - [OPPONENT_JOHN_AND_JAY_3] = + [TRAINER_JOHN_AND_JAY_3] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_OLD_COUPLE, @@ -9575,7 +9575,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_JohnAndJay3 }, - [OPPONENT_JOHN_AND_JAY_4] = + [TRAINER_JOHN_AND_JAY_4] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_OLD_COUPLE, @@ -9589,7 +9589,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_JohnAndJay4 }, - [OPPONENT_JOHN_AND_JAY_5] = + [TRAINER_JOHN_AND_JAY_5] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_OLD_COUPLE, @@ -9603,7 +9603,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_JohnAndJay5 }, - [OPPONENT_RELI_AND_IAN] = + [TRAINER_RELI_AND_IAN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SIS_AND_BRO, @@ -9617,7 +9617,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_ReliAndIan }, - [OPPONENT_RITA_AND_SAM_1] = + [TRAINER_RITA_AND_SAM_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SIS_AND_BRO, @@ -9631,7 +9631,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_RitaAndSam1 }, - [OPPONENT_RITA_AND_SAM_2] = + [TRAINER_RITA_AND_SAM_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SIS_AND_BRO, @@ -9645,7 +9645,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_RitaAndSam2 }, - [OPPONENT_RITA_AND_SAM_3] = + [TRAINER_RITA_AND_SAM_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SIS_AND_BRO, @@ -9659,7 +9659,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_RitaAndSam3 }, - [OPPONENT_RITA_AND_SAM_4] = + [TRAINER_RITA_AND_SAM_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SIS_AND_BRO, @@ -9673,7 +9673,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_RitaAndSam4 }, - [OPPONENT_RITA_AND_SAM_5] = + [TRAINER_RITA_AND_SAM_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SIS_AND_BRO, @@ -9687,7 +9687,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_RitaAndSam5 }, - [OPPONENT_LISA_AND_RAY] = + [TRAINER_LISA_AND_RAY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SIS_AND_BRO, @@ -9701,7 +9701,7 @@ const struct Trainer gTrainers[] = { .party = gTrainerParty_LisaAndRay }, - [OPPONENT_EUGENE] = + [TRAINER_EUGENE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_FISHERMAN, -- cgit v1.2.3 From faf554de7af7712f91ab117f957b691a052344bf Mon Sep 17 00:00:00 2001 From: vblm12 Date: Fri, 20 Jul 2018 21:46:31 -0500 Subject: Copy the Trainer struct from pokeemerald. Also regenerate trainers*.h --- include/battle.h | 11 +- include/battle_setup.h | 8 +- src/battle/battle_2.c | 14 +- src/battle/battle_setup.c | 43 +- src/data/trainer_parties.h | 1386 +++++++++++++++++++++---------------------- src/data/trainers_de.h | 1390 ++++++++++++++++++++++---------------------- src/data/trainers_en.h | 1388 +++++++++++++++++++++---------------------- 7 files changed, 2130 insertions(+), 2110 deletions(-) diff --git a/include/battle.h b/include/battle.h index 06a390cdf..ac95f6fff 100644 --- a/include/battle.h +++ b/include/battle.h @@ -3,6 +3,7 @@ #include "sprite.h" #include "constants/battle_constants.h" +#include "battle_setup.h" #define GET_BATTLER_POSITION(bank)((gBattlerPositions[bank])) #define GET_BATTLER_SIDE(bank)((GetBattlerPosition(bank) & BIT_SIDE)) @@ -60,6 +61,14 @@ enum BATTLE_TERRAIN_PLAIN, }; +union TrainerMonPtr +{ + const struct TrainerMonNoItemDefaultMoves *NoItemDefaultMoves; + const struct TrainerMonNoItemCustomMoves *NoItemCustomMoves; + const struct TrainerMonItemDefaultMoves *ItemDefaultMoves; + const struct TrainerMonItemCustomMoves *ItemCustomMoves; +}; + struct Trainer { /*0x00*/ u8 partyFlags; @@ -71,7 +80,7 @@ struct Trainer /*0x18*/ bool8 doubleBattle; /*0x1C*/ u32 aiFlags; /*0x20*/ u8 partySize; - /*0x24*/ const void *party; + /*0x24*/ union TrainerMonPtr party; }; struct BattleHistory diff --git a/include/battle_setup.h b/include/battle_setup.h index 88afcdf0a..fec5a249a 100644 --- a/include/battle_setup.h +++ b/include/battle_setup.h @@ -5,7 +5,7 @@ #define TRAINER_REMATCH_STEPS 255 // IV + LEVEL + SPECIES -struct TrainerPartyMember0 +struct TrainerMonNoItemDefaultMoves { u16 iv; u8 level; @@ -13,7 +13,7 @@ struct TrainerPartyMember0 }; // IV + LEVEL + SPECIES + MOVES -struct TrainerPartyMember1 +struct TrainerMonNoItemCustomMoves { u16 iv; u8 level; @@ -22,7 +22,7 @@ struct TrainerPartyMember1 }; // IV + LEVEL + SPECIES + ITEMS -struct TrainerPartyMember2 +struct TrainerMonItemDefaultMoves { u16 iv; u8 level; @@ -31,7 +31,7 @@ struct TrainerPartyMember2 }; // IV + LEVEL + SPECIES + ITEMS + MOVES -struct TrainerPartyMember3 +struct TrainerMonItemCustomMoves { u16 iv; u8 level; diff --git a/src/battle/battle_2.c b/src/battle/battle_2.c index 7b6004ce0..5a71733b8 100644 --- a/src/battle/battle_2.c +++ b/src/battle/battle_2.c @@ -1055,7 +1055,7 @@ u8 CreateNPCTrainerParty(struct Pokemon *party, u16 trainerNum) { case 0: { - const struct TrainerPartyMember0 *partyData = gTrainers[trainerNum].party; + const struct TrainerMonNoItemDefaultMoves *partyData = gTrainers[trainerNum].party.NoItemDefaultMoves; for (j = 0; gSpeciesNames[partyData[i].species][j] != 0xFF; j++) nameHash += gSpeciesNames[partyData[i].species][j]; @@ -1064,9 +1064,9 @@ u8 CreateNPCTrainerParty(struct Pokemon *party, u16 trainerNum) CreateMon(&party[i], partyData[i].species, partyData[i].level, fixedIV, TRUE, personalityValue, 2, 0); break; } - case 1: + case F_TRAINER_PARTY_CUSTOM_MOVESET: { - const struct TrainerPartyMember1 *partyData = gTrainers[trainerNum].party; + const struct TrainerMonNoItemCustomMoves *partyData = gTrainers[trainerNum].party.NoItemCustomMoves; for (j = 0; gSpeciesNames[partyData[i].species][j] != 0xFF; j++) nameHash += gSpeciesNames[partyData[i].species][j]; @@ -1081,9 +1081,9 @@ u8 CreateNPCTrainerParty(struct Pokemon *party, u16 trainerNum) } break; } - case 2: + case F_TRAINER_PARTY_HELD_ITEM: { - const struct TrainerPartyMember2 *partyData = gTrainers[trainerNum].party; + const struct TrainerMonItemDefaultMoves *partyData = gTrainers[trainerNum].party.ItemDefaultMoves; for (j = 0; gSpeciesNames[partyData[i].species][j] != 0xFF; j++) nameHash += gSpeciesNames[partyData[i].species][j]; @@ -1094,9 +1094,9 @@ u8 CreateNPCTrainerParty(struct Pokemon *party, u16 trainerNum) SetMonData(&party[i], MON_DATA_HELD_ITEM, &partyData[i].heldItem); break; } - case 3: + case F_TRAINER_PARTY_CUSTOM_MOVESET | F_TRAINER_PARTY_HELD_ITEM: { - const struct TrainerPartyMember3 *partyData = gTrainers[trainerNum].party; + const struct TrainerMonItemCustomMoves *partyData = gTrainers[trainerNum].party.ItemCustomMoves; for (j = 0; gSpeciesNames[partyData[i].species][j] != 0xFF; j++) nameHash += gSpeciesNames[partyData[i].species][j]; diff --git a/src/battle/battle_setup.c b/src/battle/battle_setup.c index c1d486bd1..fc929eb4d 100644 --- a/src/battle/battle_setup.c +++ b/src/battle/battle_setup.c @@ -748,7 +748,6 @@ static u8 GetSumOfEnemyPartyLevel(u16 opponentId, u8 numMons) u8 i; u8 sum; u32 count = numMons; - const void *party; if (gTrainers[opponentId].partySize < count) count = gTrainers[opponentId].partySize; @@ -758,24 +757,36 @@ static u8 GetSumOfEnemyPartyLevel(u16 opponentId, u8 numMons) switch (gTrainers[opponentId].partyFlags) { case 0: - party = gTrainers[opponentId].party; - for (i = 0; i < count; i++) - sum += ((struct TrainerPartyMember0 *)party)[i].level; + { + const struct TrainerMonNoItemDefaultMoves *party; + party = gTrainers[opponentId].party.NoItemDefaultMoves; + for (i = 0; i < count; i++) + sum += party[i].level; + } break; - case 1: - party = gTrainers[opponentId].party; - for (i = 0; i < count; i++) - sum += ((struct TrainerPartyMember1 *)party)[i].level; + case F_TRAINER_PARTY_CUSTOM_MOVESET: + { + const struct TrainerMonNoItemCustomMoves *party; + party = gTrainers[opponentId].party.NoItemCustomMoves; + for (i = 0; i < count; i++) + sum += party[i].level; + } break; - case 2: - party = gTrainers[opponentId].party; - for (i = 0; i < count; i++) - sum += ((struct TrainerPartyMember2 *)party)[i].level; + case F_TRAINER_PARTY_HELD_ITEM: + { + const struct TrainerMonItemDefaultMoves *party; + party = gTrainers[opponentId].party.ItemDefaultMoves; + for (i = 0; i < count; i++) + sum += party[i].level; + } break; - case 3: - party = gTrainers[opponentId].party; - for (i = 0; i < count; i++) - sum += ((struct TrainerPartyMember3 *)party)[i].level; + case F_TRAINER_PARTY_CUSTOM_MOVESET | F_TRAINER_PARTY_HELD_ITEM: + { + const struct TrainerMonItemCustomMoves *party; + party = gTrainers[opponentId].party.ItemCustomMoves; + for (i = 0; i < count; i++) + sum += party[i].level; + } break; } diff --git a/src/data/trainer_parties.h b/src/data/trainer_parties.h index ad6b052df..5bd2a0f99 100644 --- a/src/data/trainer_parties.h +++ b/src/data/trainer_parties.h @@ -1,4 +1,4 @@ -const struct TrainerPartyMember0 gTrainerParty_Archie1[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Archie1[] = { { .iv = 0, .level = 17, @@ -11,7 +11,7 @@ const struct TrainerPartyMember0 gTrainerParty_Archie1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Grunt1[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt1[] = { { .iv = 0, .level = 32, @@ -24,7 +24,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Grunt2[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt2[] = { { .iv = 0, .level = 30, @@ -47,7 +47,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt2[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Grunt3[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt3[] = { { .iv = 0, .level = 32, @@ -60,7 +60,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt3[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Grunt4[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt4[] = { { .iv = 0, .level = 33, @@ -68,7 +68,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt4[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Grunt5[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt5[] = { { .iv = 0, .level = 37, @@ -81,7 +81,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt5[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Grunt6[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt6[] = { { .iv = 0, .level = 38, @@ -89,7 +89,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt6[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Grunt7[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt7[] = { { .iv = 0, .level = 36, @@ -107,7 +107,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt7[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Grunt8[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt8[] = { { .iv = 0, .level = 17, @@ -115,7 +115,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt8[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Grunt9[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt9[] = { { .iv = 0, .level = 9, @@ -123,7 +123,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt9[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Grunt10[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt10[] = { { .iv = 0, .level = 9, @@ -136,7 +136,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt10[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Grunt11[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt11[] = { { .iv = 0, .level = 16, @@ -149,7 +149,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt11[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Grunt12[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt12[] = { { .iv = 0, .level = 16, @@ -162,7 +162,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt12[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Grunt13[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt13[] = { { .iv = 0, .level = 20, @@ -175,7 +175,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt13[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Grunt14[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt14[] = { { .iv = 0, .level = 17, @@ -188,7 +188,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt14[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Grunt15[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt15[] = { { .iv = 0, .level = 11, @@ -196,7 +196,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt15[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Grunt16[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt16[] = { { .iv = 0, .level = 27, @@ -209,7 +209,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt16[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Grunt17[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt17[] = { { .iv = 0, .level = 27, @@ -222,7 +222,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt17[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Grunt18[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt18[] = { { .iv = 0, .level = 26, @@ -240,7 +240,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt18[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Grunt19[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt19[] = { { .iv = 0, .level = 15, @@ -248,7 +248,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt19[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Grunt20[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt20[] = { { .iv = 0, .level = 14, @@ -261,7 +261,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt20[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Grunt21[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt21[] = { { .iv = 0, .level = 17, @@ -269,7 +269,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt21[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Grunt22[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt22[] = { { .iv = 0, .level = 30, @@ -287,7 +287,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt22[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Grunt23[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt23[] = { { .iv = 0, .level = 31, @@ -300,7 +300,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt23[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Grunt24[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt24[] = { { .iv = 0, .level = 31, @@ -313,7 +313,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt24[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Grunt25[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt25[] = { { .iv = 0, .level = 28, @@ -321,7 +321,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt25[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Grunt26[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt26[] = { { .iv = 0, .level = 31, @@ -339,7 +339,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt26[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Grunt27[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt27[] = { { .iv = 0, .level = 33, @@ -347,7 +347,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt27[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Anonymous1[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Anonymous1[] = { { .iv = 50, .level = 30, @@ -360,7 +360,7 @@ const struct TrainerPartyMember0 gTrainerParty_Anonymous1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Matt1[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Matt1[] = { { .iv = 50, .level = 32, @@ -378,7 +378,7 @@ const struct TrainerPartyMember0 gTrainerParty_Matt1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Matt2[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Matt2[] = { { .iv = 50, .level = 20, @@ -396,7 +396,7 @@ const struct TrainerPartyMember0 gTrainerParty_Matt2[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Shelly1[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Shelly1[] = { { .iv = 50, .level = 28, @@ -409,7 +409,7 @@ const struct TrainerPartyMember0 gTrainerParty_Shelly1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Shelly2[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Shelly2[] = { { .iv = 50, .level = 38, @@ -422,7 +422,7 @@ const struct TrainerPartyMember0 gTrainerParty_Shelly2[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Archie2[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Archie2[] = { { .iv = 150, .level = 41, @@ -440,7 +440,7 @@ const struct TrainerPartyMember0 gTrainerParty_Archie2[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Archie3[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Archie3[] = { { .iv = 150, .level = 24, @@ -458,7 +458,7 @@ const struct TrainerPartyMember0 gTrainerParty_Archie3[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Daisy[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Daisy[] = { { .iv = 0, .level = 16, @@ -466,7 +466,7 @@ const struct TrainerPartyMember0 gTrainerParty_Daisy[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Rose1[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Rose1[] = { { .iv = 0, .level = 16, @@ -479,7 +479,7 @@ const struct TrainerPartyMember0 gTrainerParty_Rose1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Lily[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lily[] = { { .iv = 0, .level = 17, @@ -492,7 +492,7 @@ const struct TrainerPartyMember0 gTrainerParty_Lily[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Violet[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Violet[] = { { .iv = 0, .level = 25, @@ -510,7 +510,7 @@ const struct TrainerPartyMember0 gTrainerParty_Violet[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Rose2[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Rose2[] = { { .iv = 10, .level = 26, @@ -523,7 +523,7 @@ const struct TrainerPartyMember0 gTrainerParty_Rose2[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Rose3[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Rose3[] = { { .iv = 20, .level = 28, @@ -541,7 +541,7 @@ const struct TrainerPartyMember0 gTrainerParty_Rose3[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Rose4[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Rose4[] = { { .iv = 30, .level = 31, @@ -559,7 +559,7 @@ const struct TrainerPartyMember0 gTrainerParty_Rose4[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Rose5[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Rose5[] = { { .iv = 40, .level = 34, @@ -577,7 +577,7 @@ const struct TrainerPartyMember0 gTrainerParty_Rose5[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Dusty1[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Dusty1[] = { { .iv = 50, .level = 24, @@ -586,7 +586,7 @@ const struct TrainerPartyMember1 gTrainerParty_Dusty1[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Chip[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Chip[] = { { .iv = 50, .level = 28, @@ -607,7 +607,7 @@ const struct TrainerPartyMember1 gTrainerParty_Chip[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Foster[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Foster[] = { { .iv = 50, .level = 26, @@ -622,7 +622,7 @@ const struct TrainerPartyMember1 gTrainerParty_Foster[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Dusty2[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Dusty2[] = { { .iv = 60, .level = 27, @@ -631,7 +631,7 @@ const struct TrainerPartyMember1 gTrainerParty_Dusty2[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Dusty3[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Dusty3[] = { { .iv = 70, .level = 30, @@ -640,7 +640,7 @@ const struct TrainerPartyMember1 gTrainerParty_Dusty3[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Dusty4[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Dusty4[] = { { .iv = 80, .level = 33, @@ -649,7 +649,7 @@ const struct TrainerPartyMember1 gTrainerParty_Dusty4[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Dusty5[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Dusty5[] = { { .iv = 90, .level = 36, @@ -658,7 +658,7 @@ const struct TrainerPartyMember1 gTrainerParty_Dusty5[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_GabbyAndTy1[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_GabbyAndTy1[] = { { .iv = 50, .level = 19, @@ -671,7 +671,7 @@ const struct TrainerPartyMember0 gTrainerParty_GabbyAndTy1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_GabbyAndTy2[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_GabbyAndTy2[] = { { .iv = 100, .level = 27, @@ -684,7 +684,7 @@ const struct TrainerPartyMember0 gTrainerParty_GabbyAndTy2[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_GabbyAndTy3[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_GabbyAndTy3[] = { { .iv = 150, .level = 30, @@ -697,7 +697,7 @@ const struct TrainerPartyMember0 gTrainerParty_GabbyAndTy3[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_GabbyAndTy4[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_GabbyAndTy4[] = { { .iv = 200, .level = 33, @@ -710,7 +710,7 @@ const struct TrainerPartyMember0 gTrainerParty_GabbyAndTy4[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_GabbyAndTy5[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_GabbyAndTy5[] = { { .iv = 250, .level = 36, @@ -723,7 +723,7 @@ const struct TrainerPartyMember0 gTrainerParty_GabbyAndTy5[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_GabbyAndTy6[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_GabbyAndTy6[] = { { .iv = 250, .level = 39, @@ -738,7 +738,7 @@ const struct TrainerPartyMember1 gTrainerParty_GabbyAndTy6[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Lola1[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lola1[] = { { .iv = 0, .level = 13, @@ -751,7 +751,7 @@ const struct TrainerPartyMember0 gTrainerParty_Lola1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Carmen[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Carmen[] = { { .iv = 0, .level = 27, @@ -759,7 +759,7 @@ const struct TrainerPartyMember0 gTrainerParty_Carmen[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Gwen[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Gwen[] = { { .iv = 0, .level = 27, @@ -767,7 +767,7 @@ const struct TrainerPartyMember0 gTrainerParty_Gwen[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Lola2[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lola2[] = { { .iv = 10, .level = 26, @@ -780,7 +780,7 @@ const struct TrainerPartyMember0 gTrainerParty_Lola2[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Lola3[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lola3[] = { { .iv = 20, .level = 29, @@ -793,7 +793,7 @@ const struct TrainerPartyMember0 gTrainerParty_Lola3[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Lola4[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lola4[] = { { .iv = 30, .level = 32, @@ -806,7 +806,7 @@ const struct TrainerPartyMember0 gTrainerParty_Lola4[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Lola5[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lola5[] = { { .iv = 40, .level = 35, @@ -819,7 +819,7 @@ const struct TrainerPartyMember0 gTrainerParty_Lola5[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Ricky1[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Ricky1[] = { { .iv = 0, .level = 14, @@ -828,7 +828,7 @@ const struct TrainerPartyMember1 gTrainerParty_Ricky1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Simon[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Simon[] = { { .iv = 0, .level = 12, @@ -841,7 +841,7 @@ const struct TrainerPartyMember0 gTrainerParty_Simon[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Charlie[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Charlie[] = { { .iv = 0, .level = 27, @@ -849,7 +849,7 @@ const struct TrainerPartyMember0 gTrainerParty_Charlie[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Ricky2[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Ricky2[] = { { .iv = 10, .level = 27, @@ -858,7 +858,7 @@ const struct TrainerPartyMember1 gTrainerParty_Ricky2[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Ricky3[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Ricky3[] = { { .iv = 20, .level = 30, @@ -867,7 +867,7 @@ const struct TrainerPartyMember1 gTrainerParty_Ricky3[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Ricky4[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Ricky4[] = { { .iv = 30, .level = 33, @@ -876,7 +876,7 @@ const struct TrainerPartyMember1 gTrainerParty_Ricky4[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Ricky5[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Ricky5[] = { { .iv = 40, .level = 36, @@ -885,7 +885,7 @@ const struct TrainerPartyMember1 gTrainerParty_Ricky5[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Randall[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Randall[] = { { .iv = 100, .level = 27, @@ -893,7 +893,7 @@ const struct TrainerPartyMember0 gTrainerParty_Randall[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Parker[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Parker[] = { { .iv = 100, .level = 27, @@ -901,7 +901,7 @@ const struct TrainerPartyMember0 gTrainerParty_Parker[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_George[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_George[] = { { .iv = 100, .level = 27, @@ -909,7 +909,7 @@ const struct TrainerPartyMember0 gTrainerParty_George[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Berke[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Berke[] = { { .iv = 100, .level = 27, @@ -917,7 +917,7 @@ const struct TrainerPartyMember0 gTrainerParty_Berke[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Clyde[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Clyde[] = { { .iv = 100, .level = 29, @@ -950,7 +950,7 @@ const struct TrainerPartyMember1 gTrainerParty_Clyde[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Vincent[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Vincent[] = { { .iv = 100, .level = 44, @@ -968,7 +968,7 @@ const struct TrainerPartyMember0 gTrainerParty_Vincent[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Leroy[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Leroy[] = { { .iv = 100, .level = 46, @@ -981,7 +981,7 @@ const struct TrainerPartyMember0 gTrainerParty_Leroy[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Wilton1[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Wilton1[] = { { .iv = 100, .level = 18, @@ -999,7 +999,7 @@ const struct TrainerPartyMember0 gTrainerParty_Wilton1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Edgar[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Edgar[] = { { .iv = 100, .level = 44, @@ -1007,7 +1007,7 @@ const struct TrainerPartyMember0 gTrainerParty_Edgar[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Albert[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Albert[] = { { .iv = 100, .level = 43, @@ -1020,7 +1020,7 @@ const struct TrainerPartyMember0 gTrainerParty_Albert[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Samuel[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Samuel[] = { { .iv = 100, .level = 42, @@ -1038,7 +1038,7 @@ const struct TrainerPartyMember0 gTrainerParty_Samuel[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Vito[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Vito[] = { { .iv = 100, .level = 42, @@ -1061,7 +1061,7 @@ const struct TrainerPartyMember0 gTrainerParty_Vito[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Owen[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Owen[] = { { .iv = 100, .level = 42, @@ -1079,7 +1079,7 @@ const struct TrainerPartyMember0 gTrainerParty_Owen[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Wilton2[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Wilton2[] = { { .iv = 110, .level = 26, @@ -1097,7 +1097,7 @@ const struct TrainerPartyMember0 gTrainerParty_Wilton2[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Wilton3[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Wilton3[] = { { .iv = 120, .level = 29, @@ -1115,7 +1115,7 @@ const struct TrainerPartyMember0 gTrainerParty_Wilton3[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Wilton4[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Wilton4[] = { { .iv = 130, .level = 32, @@ -1133,7 +1133,7 @@ const struct TrainerPartyMember0 gTrainerParty_Wilton4[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Wilton5[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Wilton5[] = { { .iv = 140, .level = 35, @@ -1151,7 +1151,7 @@ const struct TrainerPartyMember0 gTrainerParty_Wilton5[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Warren[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Warren[] = { { .iv = 100, .level = 34, @@ -1169,7 +1169,7 @@ const struct TrainerPartyMember0 gTrainerParty_Warren[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Mary[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Mary[] = { { .iv = 100, .level = 27, @@ -1177,7 +1177,7 @@ const struct TrainerPartyMember0 gTrainerParty_Mary[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Lori[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lori[] = { { .iv = 100, .level = 27, @@ -1185,7 +1185,7 @@ const struct TrainerPartyMember0 gTrainerParty_Lori[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Jody[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jody[] = { { .iv = 100, .level = 27, @@ -1193,7 +1193,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jody[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Wendy[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Wendy[] = { { .iv = 100, .level = 31, @@ -1214,7 +1214,7 @@ const struct TrainerPartyMember1 gTrainerParty_Wendy[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Elaine[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Elaine[] = { { .iv = 100, .level = 45, @@ -1227,7 +1227,7 @@ const struct TrainerPartyMember0 gTrainerParty_Elaine[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Brooke1[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brooke1[] = { { .iv = 100, .level = 18, @@ -1245,7 +1245,7 @@ const struct TrainerPartyMember0 gTrainerParty_Brooke1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Jennifer[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jennifer[] = { { .iv = 100, .level = 31, @@ -1253,7 +1253,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jennifer[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Hope[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Hope[] = { { .iv = 100, .level = 44, @@ -1261,7 +1261,7 @@ const struct TrainerPartyMember0 gTrainerParty_Hope[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Shannon[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Shannon[] = { { .iv = 100, .level = 44, @@ -1269,7 +1269,7 @@ const struct TrainerPartyMember0 gTrainerParty_Shannon[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Michelle[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Michelle[] = { { .iv = 100, .level = 42, @@ -1287,7 +1287,7 @@ const struct TrainerPartyMember0 gTrainerParty_Michelle[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Caroline[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Caroline[] = { { .iv = 100, .level = 43, @@ -1300,7 +1300,7 @@ const struct TrainerPartyMember0 gTrainerParty_Caroline[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Julie[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Julie[] = { { .iv = 100, .level = 43, @@ -1313,7 +1313,7 @@ const struct TrainerPartyMember0 gTrainerParty_Julie[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Brooke2[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brooke2[] = { { .iv = 110, .level = 26, @@ -1331,7 +1331,7 @@ const struct TrainerPartyMember0 gTrainerParty_Brooke2[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Brooke3[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brooke3[] = { { .iv = 120, .level = 29, @@ -1349,7 +1349,7 @@ const struct TrainerPartyMember0 gTrainerParty_Brooke3[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Brooke4[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brooke4[] = { { .iv = 130, .level = 32, @@ -1367,7 +1367,7 @@ const struct TrainerPartyMember0 gTrainerParty_Brooke4[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Brooke5[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brooke5[] = { { .iv = 140, .level = 34, @@ -1385,7 +1385,7 @@ const struct TrainerPartyMember0 gTrainerParty_Brooke5[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Patricia[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Patricia[] = { { .iv = 0, .level = 42, @@ -1393,7 +1393,7 @@ const struct TrainerPartyMember0 gTrainerParty_Patricia[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Kindra[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kindra[] = { { .iv = 0, .level = 31, @@ -1406,7 +1406,7 @@ const struct TrainerPartyMember0 gTrainerParty_Kindra[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Tammy[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tammy[] = { { .iv = 0, .level = 30, @@ -1419,7 +1419,7 @@ const struct TrainerPartyMember0 gTrainerParty_Tammy[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Valerie1[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Valerie1[] = { { .iv = 0, .level = 32, @@ -1427,7 +1427,7 @@ const struct TrainerPartyMember0 gTrainerParty_Valerie1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Tasha[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tasha[] = { { .iv = 0, .level = 31, @@ -1440,7 +1440,7 @@ const struct TrainerPartyMember0 gTrainerParty_Tasha[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Valerie2[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Valerie2[] = { { .iv = 10, .level = 35, @@ -1448,7 +1448,7 @@ const struct TrainerPartyMember0 gTrainerParty_Valerie2[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Valerie3[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Valerie3[] = { { .iv = 20, .level = 37, @@ -1461,7 +1461,7 @@ const struct TrainerPartyMember0 gTrainerParty_Valerie3[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Valerie4[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Valerie4[] = { { .iv = 30, .level = 40, @@ -1474,7 +1474,7 @@ const struct TrainerPartyMember0 gTrainerParty_Valerie4[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Valerie5[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Valerie5[] = { { .iv = 40, .level = 42, @@ -1492,7 +1492,7 @@ const struct TrainerPartyMember0 gTrainerParty_Valerie5[] = { } }; -const struct TrainerPartyMember2 gTrainerParty_Cindy1[] = { +const struct TrainerMonItemDefaultMoves gTrainerParty_Cindy1[] = { { .iv = 0, .level = 7, @@ -1501,7 +1501,7 @@ const struct TrainerPartyMember2 gTrainerParty_Cindy1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Anonymous2[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Anonymous2[] = { { .iv = 0, .level = 18, @@ -1509,7 +1509,7 @@ const struct TrainerPartyMember0 gTrainerParty_Anonymous2[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Brianna1[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Brianna1[] = { { .iv = 0, .level = 10, @@ -1524,7 +1524,7 @@ const struct TrainerPartyMember1 gTrainerParty_Brianna1[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Cindy2[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Cindy2[] = { { .iv = 0, .level = 11, @@ -1533,7 +1533,7 @@ const struct TrainerPartyMember1 gTrainerParty_Cindy2[] = { } }; -const struct TrainerPartyMember2 gTrainerParty_Brianna2[] = { +const struct TrainerMonItemDefaultMoves gTrainerParty_Brianna2[] = { { .iv = 100, .level = 41, @@ -1542,7 +1542,7 @@ const struct TrainerPartyMember2 gTrainerParty_Brianna2[] = { } }; -const struct TrainerPartyMember2 gTrainerParty_Anette[] = { +const struct TrainerMonItemDefaultMoves gTrainerParty_Anette[] = { { .iv = 100, .level = 45, @@ -1551,7 +1551,7 @@ const struct TrainerPartyMember2 gTrainerParty_Anette[] = { } }; -const struct TrainerPartyMember2 gTrainerParty_Cindy3[] = { +const struct TrainerMonItemDefaultMoves gTrainerParty_Cindy3[] = { { .iv = 10, .level = 27, @@ -1560,7 +1560,7 @@ const struct TrainerPartyMember2 gTrainerParty_Cindy3[] = { } }; -const struct TrainerPartyMember2 gTrainerParty_Cindy4[] = { +const struct TrainerMonItemDefaultMoves gTrainerParty_Cindy4[] = { { .iv = 20, .level = 30, @@ -1569,7 +1569,7 @@ const struct TrainerPartyMember2 gTrainerParty_Cindy4[] = { } }; -const struct TrainerPartyMember2 gTrainerParty_Cindy5[] = { +const struct TrainerMonItemDefaultMoves gTrainerParty_Cindy5[] = { { .iv = 30, .level = 33, @@ -1578,7 +1578,7 @@ const struct TrainerPartyMember2 gTrainerParty_Cindy5[] = { } }; -const struct TrainerPartyMember3 gTrainerParty_Cindy6[] = { +const struct TrainerMonItemCustomMoves gTrainerParty_Cindy6[] = { { .iv = 40, .level = 36, @@ -1588,7 +1588,7 @@ const struct TrainerPartyMember3 gTrainerParty_Cindy6[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Melissa[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Melissa[] = { { .iv = 0, .level = 22, @@ -1596,7 +1596,7 @@ const struct TrainerPartyMember0 gTrainerParty_Melissa[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Sheila[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Sheila[] = { { .iv = 0, .level = 22, @@ -1604,7 +1604,7 @@ const struct TrainerPartyMember0 gTrainerParty_Sheila[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Shirley[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Shirley[] = { { .iv = 0, .level = 22, @@ -1612,7 +1612,7 @@ const struct TrainerPartyMember0 gTrainerParty_Shirley[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Jessica1[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Jessica1[] = { { .iv = 0, .level = 30, @@ -1627,7 +1627,7 @@ const struct TrainerPartyMember1 gTrainerParty_Jessica1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Connie[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Connie[] = { { .iv = 100, .level = 40, @@ -1640,7 +1640,7 @@ const struct TrainerPartyMember0 gTrainerParty_Connie[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Bridget[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Bridget[] = { { .iv = 100, .level = 41, @@ -1648,7 +1648,7 @@ const struct TrainerPartyMember0 gTrainerParty_Bridget[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Olivia[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Olivia[] = { { .iv = 100, .level = 41, @@ -1657,7 +1657,7 @@ const struct TrainerPartyMember1 gTrainerParty_Olivia[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Tiffany[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tiffany[] = { { .iv = 100, .level = 39, @@ -1675,7 +1675,7 @@ const struct TrainerPartyMember0 gTrainerParty_Tiffany[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Jessica2[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Jessica2[] = { { .iv = 10, .level = 33, @@ -1690,7 +1690,7 @@ const struct TrainerPartyMember1 gTrainerParty_Jessica2[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Jessica3[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Jessica3[] = { { .iv = 20, .level = 36, @@ -1705,7 +1705,7 @@ const struct TrainerPartyMember1 gTrainerParty_Jessica3[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Jessica4[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Jessica4[] = { { .iv = 30, .level = 39, @@ -1720,7 +1720,7 @@ const struct TrainerPartyMember1 gTrainerParty_Jessica4[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Jessica5[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Jessica5[] = { { .iv = 40, .level = 42, @@ -1735,7 +1735,7 @@ const struct TrainerPartyMember1 gTrainerParty_Jessica5[] = { } }; -const struct TrainerPartyMember2 gTrainerParty_Winston1[] = { +const struct TrainerMonItemDefaultMoves gTrainerParty_Winston1[] = { { .iv = 0, .level = 7, @@ -1744,7 +1744,7 @@ const struct TrainerPartyMember2 gTrainerParty_Winston1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Anonymous3[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Anonymous3[] = { { .iv = 0, .level = 18, @@ -1752,7 +1752,7 @@ const struct TrainerPartyMember0 gTrainerParty_Anonymous3[] = { } }; -const struct TrainerPartyMember2 gTrainerParty_Garret[] = { +const struct TrainerMonItemDefaultMoves gTrainerParty_Garret[] = { { .iv = 0, .level = 45, @@ -1761,7 +1761,7 @@ const struct TrainerPartyMember2 gTrainerParty_Garret[] = { } }; -const struct TrainerPartyMember2 gTrainerParty_Winston2[] = { +const struct TrainerMonItemDefaultMoves gTrainerParty_Winston2[] = { { .iv = 0, .level = 27, @@ -1770,7 +1770,7 @@ const struct TrainerPartyMember2 gTrainerParty_Winston2[] = { } }; -const struct TrainerPartyMember2 gTrainerParty_Winston3[] = { +const struct TrainerMonItemDefaultMoves gTrainerParty_Winston3[] = { { .iv = 0, .level = 30, @@ -1779,7 +1779,7 @@ const struct TrainerPartyMember2 gTrainerParty_Winston3[] = { } }; -const struct TrainerPartyMember2 gTrainerParty_Winston4[] = { +const struct TrainerMonItemDefaultMoves gTrainerParty_Winston4[] = { { .iv = 0, .level = 33, @@ -1788,7 +1788,7 @@ const struct TrainerPartyMember2 gTrainerParty_Winston4[] = { } }; -const struct TrainerPartyMember3 gTrainerParty_Winston5[] = { +const struct TrainerMonItemCustomMoves gTrainerParty_Winston5[] = { { .iv = 0, .level = 36, @@ -1798,7 +1798,7 @@ const struct TrainerPartyMember3 gTrainerParty_Winston5[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Steve1[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Steve1[] = { { .iv = 0, .level = 20, @@ -1806,7 +1806,7 @@ const struct TrainerPartyMember0 gTrainerParty_Steve1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Chris[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Chris[] = { { .iv = 0, .level = 23, @@ -1814,7 +1814,7 @@ const struct TrainerPartyMember0 gTrainerParty_Chris[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Mark[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Mark[] = { { .iv = 0, .level = 32, @@ -1822,7 +1822,7 @@ const struct TrainerPartyMember0 gTrainerParty_Mark[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Kenn[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kenn[] = { { .iv = 0, .level = 25, @@ -1830,7 +1830,7 @@ const struct TrainerPartyMember0 gTrainerParty_Kenn[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Steve2[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Steve2[] = { { .iv = 10, .level = 27, @@ -1838,7 +1838,7 @@ const struct TrainerPartyMember0 gTrainerParty_Steve2[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Steve3[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Steve3[] = { { .iv = 20, .level = 29, @@ -1851,7 +1851,7 @@ const struct TrainerPartyMember0 gTrainerParty_Steve3[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Steve4[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Steve4[] = { { .iv = 30, .level = 32, @@ -1864,7 +1864,7 @@ const struct TrainerPartyMember0 gTrainerParty_Steve4[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Steve5[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Steve5[] = { { .iv = 40, .level = 35, @@ -1877,7 +1877,7 @@ const struct TrainerPartyMember0 gTrainerParty_Steve5[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Luis[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Luis[] = { { .iv = 0, .level = 27, @@ -1885,7 +1885,7 @@ const struct TrainerPartyMember0 gTrainerParty_Luis[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Austin[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Austin[] = { { .iv = 0, .level = 25, @@ -1903,7 +1903,7 @@ const struct TrainerPartyMember0 gTrainerParty_Austin[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Douglas[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Douglas[] = { { .iv = 0, .level = 26, @@ -1916,7 +1916,7 @@ const struct TrainerPartyMember0 gTrainerParty_Douglas[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Darrin[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Darrin[] = { { .iv = 0, .level = 27, @@ -1924,7 +1924,7 @@ const struct TrainerPartyMember0 gTrainerParty_Darrin[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Tony1[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tony1[] = { { .iv = 0, .level = 27, @@ -1932,7 +1932,7 @@ const struct TrainerPartyMember0 gTrainerParty_Tony1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Jerome[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jerome[] = { { .iv = 0, .level = 26, @@ -1945,7 +1945,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jerome[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Matthew[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Matthew[] = { { .iv = 0, .level = 27, @@ -1953,7 +1953,7 @@ const struct TrainerPartyMember0 gTrainerParty_Matthew[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_David[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_David[] = { { .iv = 0, .level = 26, @@ -1966,7 +1966,7 @@ const struct TrainerPartyMember0 gTrainerParty_David[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Spencer[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Spencer[] = { { .iv = 0, .level = 33, @@ -1984,7 +1984,7 @@ const struct TrainerPartyMember0 gTrainerParty_Spencer[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Roland[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Roland[] = { { .iv = 0, .level = 35, @@ -1992,7 +1992,7 @@ const struct TrainerPartyMember0 gTrainerParty_Roland[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Cody[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cody[] = { { .iv = 0, .level = 34, @@ -2005,7 +2005,7 @@ const struct TrainerPartyMember0 gTrainerParty_Cody[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Stan[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Stan[] = { { .iv = 0, .level = 35, @@ -2013,7 +2013,7 @@ const struct TrainerPartyMember0 gTrainerParty_Stan[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Barry[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Barry[] = { { .iv = 0, .level = 35, @@ -2021,7 +2021,7 @@ const struct TrainerPartyMember0 gTrainerParty_Barry[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Dean[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dean[] = { { .iv = 0, .level = 33, @@ -2039,7 +2039,7 @@ const struct TrainerPartyMember0 gTrainerParty_Dean[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Rodney[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Rodney[] = { { .iv = 0, .level = 34, @@ -2052,7 +2052,7 @@ const struct TrainerPartyMember0 gTrainerParty_Rodney[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Richard[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Richard[] = { { .iv = 0, .level = 35, @@ -2060,7 +2060,7 @@ const struct TrainerPartyMember0 gTrainerParty_Richard[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Herman[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Herman[] = { { .iv = 0, .level = 34, @@ -2073,7 +2073,7 @@ const struct TrainerPartyMember0 gTrainerParty_Herman[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Anonymous4[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Anonymous4[] = { { .iv = 0, .level = 38, @@ -2081,7 +2081,7 @@ const struct TrainerPartyMember0 gTrainerParty_Anonymous4[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Gilbert[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Gilbert[] = { { .iv = 0, .level = 35, @@ -2089,7 +2089,7 @@ const struct TrainerPartyMember0 gTrainerParty_Gilbert[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Franklin[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Franklin[] = { { .iv = 0, .level = 34, @@ -2102,7 +2102,7 @@ const struct TrainerPartyMember0 gTrainerParty_Franklin[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Danny[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Danny[] = { { .iv = 0, .level = 37, @@ -2115,7 +2115,7 @@ const struct TrainerPartyMember0 gTrainerParty_Danny[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Jack[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jack[] = { { .iv = 0, .level = 34, @@ -2128,7 +2128,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jack[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Dudley[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dudley[] = { { .iv = 0, .level = 33, @@ -2146,7 +2146,7 @@ const struct TrainerPartyMember0 gTrainerParty_Dudley[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Chad[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Chad[] = { { .iv = 0, .level = 34, @@ -2159,7 +2159,7 @@ const struct TrainerPartyMember0 gTrainerParty_Chad[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Tony2[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tony2[] = { { .iv = 10, .level = 30, @@ -2167,7 +2167,7 @@ const struct TrainerPartyMember0 gTrainerParty_Tony2[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Tony3[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tony3[] = { { .iv = 20, .level = 33, @@ -2175,7 +2175,7 @@ const struct TrainerPartyMember0 gTrainerParty_Tony3[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Tony4[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tony4[] = { { .iv = 30, .level = 34, @@ -2188,7 +2188,7 @@ const struct TrainerPartyMember0 gTrainerParty_Tony4[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Tony5[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tony5[] = { { .iv = 40, .level = 37, @@ -2201,7 +2201,7 @@ const struct TrainerPartyMember0 gTrainerParty_Tony5[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Hideki[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Hideki[] = { { .iv = 100, .level = 14, @@ -2209,7 +2209,7 @@ const struct TrainerPartyMember0 gTrainerParty_Hideki[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Hitoshi[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Hitoshi[] = { { .iv = 100, .level = 34, @@ -2222,7 +2222,7 @@ const struct TrainerPartyMember0 gTrainerParty_Hitoshi[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Kiyo[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kiyo[] = { { .iv = 100, .level = 33, @@ -2240,7 +2240,7 @@ const struct TrainerPartyMember0 gTrainerParty_Kiyo[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Koichi[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Koichi[] = { { .iv = 100, .level = 26, @@ -2253,7 +2253,7 @@ const struct TrainerPartyMember0 gTrainerParty_Koichi[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Nob1[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nob1[] = { { .iv = 100, .level = 20, @@ -2261,7 +2261,7 @@ const struct TrainerPartyMember0 gTrainerParty_Nob1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Nob2[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nob2[] = { { .iv = 110, .level = 27, @@ -2269,7 +2269,7 @@ const struct TrainerPartyMember0 gTrainerParty_Nob2[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Nob3[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nob3[] = { { .iv = 120, .level = 29, @@ -2282,7 +2282,7 @@ const struct TrainerPartyMember0 gTrainerParty_Nob3[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Nob4[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nob4[] = { { .iv = 130, .level = 31, @@ -2300,7 +2300,7 @@ const struct TrainerPartyMember0 gTrainerParty_Nob4[] = { } }; -const struct TrainerPartyMember2 gTrainerParty_Nob5[] = { +const struct TrainerMonItemDefaultMoves gTrainerParty_Nob5[] = { { .iv = 140, .level = 33, @@ -2327,7 +2327,7 @@ const struct TrainerPartyMember2 gTrainerParty_Nob5[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Yuji[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Yuji[] = { { .iv = 100, .level = 26, @@ -2340,7 +2340,7 @@ const struct TrainerPartyMember0 gTrainerParty_Yuji[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Daisuke[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Daisuke[] = { { .iv = 100, .level = 19, @@ -2348,7 +2348,7 @@ const struct TrainerPartyMember0 gTrainerParty_Daisuke[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Atsushi[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Atsushi[] = { { .iv = 100, .level = 30, @@ -2366,7 +2366,7 @@ const struct TrainerPartyMember0 gTrainerParty_Atsushi[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Kirk[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kirk[] = { { .iv = 100, .level = 18, @@ -2379,7 +2379,7 @@ const struct TrainerPartyMember0 gTrainerParty_Kirk[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Scott[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Scott[] = { { .iv = 100, .level = 19, @@ -2387,7 +2387,7 @@ const struct TrainerPartyMember0 gTrainerParty_Scott[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Harvey[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Harvey[] = { { .iv = 100, .level = 18, @@ -2400,7 +2400,7 @@ const struct TrainerPartyMember0 gTrainerParty_Harvey[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Shawn[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Shawn[] = { { .iv = 100, .level = 17, @@ -2418,7 +2418,7 @@ const struct TrainerPartyMember0 gTrainerParty_Shawn[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Randy[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Randy[] = { { .iv = 0, .level = 13, @@ -2436,7 +2436,7 @@ const struct TrainerPartyMember0 gTrainerParty_Randy[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Dalton1[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dalton1[] = { { .iv = 0, .level = 15, @@ -2454,7 +2454,7 @@ const struct TrainerPartyMember0 gTrainerParty_Dalton1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Dalton2[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dalton2[] = { { .iv = 10, .level = 25, @@ -2472,7 +2472,7 @@ const struct TrainerPartyMember0 gTrainerParty_Dalton2[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Dalton3[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dalton3[] = { { .iv = 20, .level = 28, @@ -2490,7 +2490,7 @@ const struct TrainerPartyMember0 gTrainerParty_Dalton3[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Dalton4[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dalton4[] = { { .iv = 30, .level = 31, @@ -2508,7 +2508,7 @@ const struct TrainerPartyMember0 gTrainerParty_Dalton4[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Dalton5[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dalton5[] = { { .iv = 40, .level = 34, @@ -2526,7 +2526,7 @@ const struct TrainerPartyMember0 gTrainerParty_Dalton5[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Cole[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cole[] = { { .iv = 100, .level = 22, @@ -2544,7 +2544,7 @@ const struct TrainerPartyMember0 gTrainerParty_Cole[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Flint[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Flint[] = { { .iv = 100, .level = 24, @@ -2552,7 +2552,7 @@ const struct TrainerPartyMember0 gTrainerParty_Flint[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Axle[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Axle[] = { { .iv = 100, .level = 23, @@ -2565,7 +2565,7 @@ const struct TrainerPartyMember0 gTrainerParty_Axle[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Jake[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jake[] = { { .iv = 100, .level = 24, @@ -2573,7 +2573,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jake[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Andy[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Andy[] = { { .iv = 100, .level = 23, @@ -2586,7 +2586,7 @@ const struct TrainerPartyMember0 gTrainerParty_Andy[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Bernie1[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Bernie1[] = { { .iv = 0, .level = 19, @@ -2599,7 +2599,7 @@ const struct TrainerPartyMember0 gTrainerParty_Bernie1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Bernie2[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Bernie2[] = { { .iv = 10, .level = 26, @@ -2612,7 +2612,7 @@ const struct TrainerPartyMember0 gTrainerParty_Bernie2[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Bernie3[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Bernie3[] = { { .iv = 20, .level = 29, @@ -2625,7 +2625,7 @@ const struct TrainerPartyMember0 gTrainerParty_Bernie3[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Bernie4[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Bernie4[] = { { .iv = 30, .level = 32, @@ -2638,7 +2638,7 @@ const struct TrainerPartyMember0 gTrainerParty_Bernie4[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Bernie5[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Bernie5[] = { { .iv = 40, .level = 35, @@ -2651,7 +2651,7 @@ const struct TrainerPartyMember0 gTrainerParty_Bernie5[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Drew[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Drew[] = { { .iv = 0, .level = 24, @@ -2660,7 +2660,7 @@ const struct TrainerPartyMember1 gTrainerParty_Drew[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Cliff[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Cliff[] = { { .iv = 0, .level = 22, @@ -2681,7 +2681,7 @@ const struct TrainerPartyMember1 gTrainerParty_Cliff[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Larry[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Larry[] = { { .iv = 0, .level = 18, @@ -2694,7 +2694,7 @@ const struct TrainerPartyMember0 gTrainerParty_Larry[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Shane[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Shane[] = { { .iv = 0, .level = 19, @@ -2707,7 +2707,7 @@ const struct TrainerPartyMember0 gTrainerParty_Shane[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Justin[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Justin[] = { { .iv = 0, .level = 24, @@ -2715,7 +2715,7 @@ const struct TrainerPartyMember0 gTrainerParty_Justin[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Ethan1[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ethan1[] = { { .iv = 0, .level = 21, @@ -2728,7 +2728,7 @@ const struct TrainerPartyMember0 gTrainerParty_Ethan1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Jeff[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jeff[] = { { .iv = 0, .level = 9, @@ -2741,7 +2741,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jeff[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Travis[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Travis[] = { { .iv = 0, .level = 19, @@ -2749,7 +2749,7 @@ const struct TrainerPartyMember0 gTrainerParty_Travis[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Ethan2[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ethan2[] = { { .iv = 10, .level = 26, @@ -2762,7 +2762,7 @@ const struct TrainerPartyMember0 gTrainerParty_Ethan2[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Ethan3[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ethan3[] = { { .iv = 20, .level = 29, @@ -2775,7 +2775,7 @@ const struct TrainerPartyMember0 gTrainerParty_Ethan3[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Ethan4[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ethan4[] = { { .iv = 30, .level = 31, @@ -2793,7 +2793,7 @@ const struct TrainerPartyMember0 gTrainerParty_Ethan4[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Ethan5[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ethan5[] = { { .iv = 40, .level = 34, @@ -2811,7 +2811,7 @@ const struct TrainerPartyMember0 gTrainerParty_Ethan5[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Brent[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brent[] = { { .iv = 100, .level = 27, @@ -2819,7 +2819,7 @@ const struct TrainerPartyMember0 gTrainerParty_Brent[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Donald[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Donald[] = { { .iv = 100, .level = 25, @@ -2837,7 +2837,7 @@ const struct TrainerPartyMember0 gTrainerParty_Donald[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Taylor[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Taylor[] = { { .iv = 100, .level = 25, @@ -2855,7 +2855,7 @@ const struct TrainerPartyMember0 gTrainerParty_Taylor[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Brandon1[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brandon1[] = { { .iv = 0, .level = 28, @@ -2873,7 +2873,7 @@ const struct TrainerPartyMember0 gTrainerParty_Brandon1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Derek[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Derek[] = { { .iv = 100, .level = 15, @@ -2891,7 +2891,7 @@ const struct TrainerPartyMember0 gTrainerParty_Derek[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Brandon2[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brandon2[] = { { .iv = 10, .level = 31, @@ -2909,7 +2909,7 @@ const struct TrainerPartyMember0 gTrainerParty_Brandon2[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Brandon3[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brandon3[] = { { .iv = 20, .level = 34, @@ -2927,7 +2927,7 @@ const struct TrainerPartyMember0 gTrainerParty_Brandon3[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Brandon4[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brandon4[] = { { .iv = 30, .level = 36, @@ -2950,7 +2950,7 @@ const struct TrainerPartyMember0 gTrainerParty_Brandon4[] = { } }; -const struct TrainerPartyMember2 gTrainerParty_Brandon5[] = { +const struct TrainerMonItemDefaultMoves gTrainerParty_Brandon5[] = { { .iv = 40, .level = 38, @@ -2983,7 +2983,7 @@ const struct TrainerPartyMember2 gTrainerParty_Brandon5[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Edward[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Edward[] = { { .iv = 0, .level = 16, @@ -2992,7 +2992,7 @@ const struct TrainerPartyMember1 gTrainerParty_Edward[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Preston[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Preston[] = { { .iv = 100, .level = 37, @@ -3000,7 +3000,7 @@ const struct TrainerPartyMember0 gTrainerParty_Preston[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Virgil[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Virgil[] = { { .iv = 100, .level = 36, @@ -3013,7 +3013,7 @@ const struct TrainerPartyMember0 gTrainerParty_Virgil[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Fritz[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Fritz[] = { { .iv = 100, .level = 35, @@ -3031,7 +3031,7 @@ const struct TrainerPartyMember0 gTrainerParty_Fritz[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_William[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_William[] = { { .iv = 0, .level = 31, @@ -3044,7 +3044,7 @@ const struct TrainerPartyMember0 gTrainerParty_William[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Joshua[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Joshua[] = { { .iv = 0, .level = 41, @@ -3057,7 +3057,7 @@ const struct TrainerPartyMember0 gTrainerParty_Joshua[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Cameron1[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cameron1[] = { { .iv = 0, .level = 31, @@ -3070,7 +3070,7 @@ const struct TrainerPartyMember0 gTrainerParty_Cameron1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Cameron2[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cameron2[] = { { .iv = 10, .level = 34, @@ -3083,7 +3083,7 @@ const struct TrainerPartyMember0 gTrainerParty_Cameron2[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Cameron3[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cameron3[] = { { .iv = 20, .level = 37, @@ -3096,7 +3096,7 @@ const struct TrainerPartyMember0 gTrainerParty_Cameron3[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Cameron4[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cameron4[] = { { .iv = 30, .level = 40, @@ -3109,7 +3109,7 @@ const struct TrainerPartyMember0 gTrainerParty_Cameron4[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Cameron5[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cameron5[] = { { .iv = 40, .level = 43, @@ -3122,7 +3122,7 @@ const struct TrainerPartyMember0 gTrainerParty_Cameron5[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Jaclyn[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Jaclyn[] = { { .iv = 0, .level = 16, @@ -3131,7 +3131,7 @@ const struct TrainerPartyMember1 gTrainerParty_Jaclyn[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Hannah[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Hannah[] = { { .iv = 100, .level = 36, @@ -3144,7 +3144,7 @@ const struct TrainerPartyMember0 gTrainerParty_Hannah[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Samantha[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Samantha[] = { { .iv = 100, .level = 37, @@ -3152,7 +3152,7 @@ const struct TrainerPartyMember0 gTrainerParty_Samantha[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Maura[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Maura[] = { { .iv = 100, .level = 36, @@ -3165,7 +3165,7 @@ const struct TrainerPartyMember0 gTrainerParty_Maura[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Kayla[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kayla[] = { { .iv = 0, .level = 32, @@ -3173,7 +3173,7 @@ const struct TrainerPartyMember0 gTrainerParty_Kayla[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Alexis[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Alexis[] = { { .iv = 0, .level = 40, @@ -3191,7 +3191,7 @@ const struct TrainerPartyMember0 gTrainerParty_Alexis[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Jacki1[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jacki1[] = { { .iv = 0, .level = 31, @@ -3204,7 +3204,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jacki1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Jacki2[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jacki2[] = { { .iv = 10, .level = 34, @@ -3217,7 +3217,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jacki2[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Jacki3[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jacki3[] = { { .iv = 20, .level = 37, @@ -3230,7 +3230,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jacki3[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Jacki4[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jacki4[] = { { .iv = 30, .level = 40, @@ -3243,7 +3243,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jacki4[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Jacki5[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jacki5[] = { { .iv = 40, .level = 43, @@ -3256,7 +3256,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jacki5[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Walter1[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Walter1[] = { { .iv = 0, .level = 31, @@ -3264,7 +3264,7 @@ const struct TrainerPartyMember0 gTrainerParty_Walter1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Tucker[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tucker[] = { { .iv = 0, .level = 44, @@ -3277,7 +3277,7 @@ const struct TrainerPartyMember0 gTrainerParty_Tucker[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Thomas[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Thomas[] = { { .iv = 0, .level = 45, @@ -3285,7 +3285,7 @@ const struct TrainerPartyMember0 gTrainerParty_Thomas[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Walter2[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Walter2[] = { { .iv = 10, .level = 34, @@ -3293,7 +3293,7 @@ const struct TrainerPartyMember0 gTrainerParty_Walter2[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Walter3[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Walter3[] = { { .iv = 20, .level = 36, @@ -3308,7 +3308,7 @@ const struct TrainerPartyMember1 gTrainerParty_Walter3[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Walter4[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Walter4[] = { { .iv = 30, .level = 39, @@ -3323,7 +3323,7 @@ const struct TrainerPartyMember1 gTrainerParty_Walter4[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Walter5[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Walter5[] = { { .iv = 40, .level = 41, @@ -3344,7 +3344,7 @@ const struct TrainerPartyMember1 gTrainerParty_Walter5[] = { } }; -const struct TrainerPartyMember3 gTrainerParty_Sidney[] = { +const struct TrainerMonItemCustomMoves gTrainerParty_Sidney[] = { { .iv = 250, .level = 46, @@ -3382,7 +3382,7 @@ const struct TrainerPartyMember3 gTrainerParty_Sidney[] = { } }; -const struct TrainerPartyMember3 gTrainerParty_Phoebe[] = { +const struct TrainerMonItemCustomMoves gTrainerParty_Phoebe[] = { { .iv = 250, .level = 48, @@ -3420,7 +3420,7 @@ const struct TrainerPartyMember3 gTrainerParty_Phoebe[] = { } }; -const struct TrainerPartyMember3 gTrainerParty_Glacia[] = { +const struct TrainerMonItemCustomMoves gTrainerParty_Glacia[] = { { .iv = 250, .level = 50, @@ -3458,7 +3458,7 @@ const struct TrainerPartyMember3 gTrainerParty_Glacia[] = { } }; -const struct TrainerPartyMember3 gTrainerParty_Drake[] = { +const struct TrainerMonItemCustomMoves gTrainerParty_Drake[] = { { .iv = 250, .level = 52, @@ -3496,7 +3496,7 @@ const struct TrainerPartyMember3 gTrainerParty_Drake[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Roxanne[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Roxanne[] = { { .iv = 150, .level = 14, @@ -3511,7 +3511,7 @@ const struct TrainerPartyMember1 gTrainerParty_Roxanne[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Brawly[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Brawly[] = { { .iv = 150, .level = 17, @@ -3526,7 +3526,7 @@ const struct TrainerPartyMember1 gTrainerParty_Brawly[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Wattson[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Wattson[] = { { .iv = 200, .level = 22, @@ -3547,7 +3547,7 @@ const struct TrainerPartyMember1 gTrainerParty_Wattson[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Flannery[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Flannery[] = { { .iv = 200, .level = 26, @@ -3568,7 +3568,7 @@ const struct TrainerPartyMember1 gTrainerParty_Flannery[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Norman[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Norman[] = { { .iv = 200, .level = 28, @@ -3589,7 +3589,7 @@ const struct TrainerPartyMember1 gTrainerParty_Norman[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Winona[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Winona[] = { { .iv = 200, .level = 31, @@ -3616,7 +3616,7 @@ const struct TrainerPartyMember1 gTrainerParty_Winona[] = { } }; -const struct TrainerPartyMember3 gTrainerParty_TateAndLiza[] = { +const struct TrainerMonItemCustomMoves gTrainerParty_TateAndLiza[] = { { .iv = 250, .level = 42, @@ -3633,7 +3633,7 @@ const struct TrainerPartyMember3 gTrainerParty_TateAndLiza[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Wallace[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Wallace[] = { { .iv = 200, .level = 40, @@ -3666,7 +3666,7 @@ const struct TrainerPartyMember1 gTrainerParty_Wallace[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Jerry1[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jerry1[] = { { .iv = 10, .level = 10, @@ -3674,7 +3674,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jerry1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Ted[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ted[] = { { .iv = 10, .level = 17, @@ -3682,7 +3682,7 @@ const struct TrainerPartyMember0 gTrainerParty_Ted[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Paul[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Paul[] = { { .iv = 10, .level = 15, @@ -3700,7 +3700,7 @@ const struct TrainerPartyMember0 gTrainerParty_Paul[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Jerry2[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jerry2[] = { { .iv = 20, .level = 26, @@ -3713,7 +3713,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jerry2[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Jerry3[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jerry3[] = { { .iv = 30, .level = 29, @@ -3726,7 +3726,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jerry3[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Jerry4[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jerry4[] = { { .iv = 40, .level = 32, @@ -3739,7 +3739,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jerry4[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Jerry5[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jerry5[] = { { .iv = 50, .level = 34, @@ -3757,7 +3757,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jerry5[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Karen1[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Karen1[] = { { .iv = 10, .level = 9, @@ -3770,7 +3770,7 @@ const struct TrainerPartyMember0 gTrainerParty_Karen1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Georgia[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Georgia[] = { { .iv = 10, .level = 16, @@ -3783,7 +3783,7 @@ const struct TrainerPartyMember0 gTrainerParty_Georgia[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Karen2[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Karen2[] = { { .iv = 20, .level = 26, @@ -3796,7 +3796,7 @@ const struct TrainerPartyMember0 gTrainerParty_Karen2[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Karen3[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Karen3[] = { { .iv = 30, .level = 29, @@ -3809,7 +3809,7 @@ const struct TrainerPartyMember0 gTrainerParty_Karen3[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Karen4[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Karen4[] = { { .iv = 40, .level = 32, @@ -3822,7 +3822,7 @@ const struct TrainerPartyMember0 gTrainerParty_Karen4[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Karen5[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Karen5[] = { { .iv = 50, .level = 35, @@ -3835,7 +3835,7 @@ const struct TrainerPartyMember0 gTrainerParty_Karen5[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_KateAndJoy[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_KateAndJoy[] = { { .iv = 0, .level = 30, @@ -3850,7 +3850,7 @@ const struct TrainerPartyMember1 gTrainerParty_KateAndJoy[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_AnnaAndMeg1[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_AnnaAndMeg1[] = { { .iv = 0, .level = 16, @@ -3865,7 +3865,7 @@ const struct TrainerPartyMember1 gTrainerParty_AnnaAndMeg1[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_AnnaAndMeg2[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_AnnaAndMeg2[] = { { .iv = 10, .level = 26, @@ -3880,7 +3880,7 @@ const struct TrainerPartyMember1 gTrainerParty_AnnaAndMeg2[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_AnnaAndMeg3[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_AnnaAndMeg3[] = { { .iv = 20, .level = 29, @@ -3895,7 +3895,7 @@ const struct TrainerPartyMember1 gTrainerParty_AnnaAndMeg3[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_AnnaAndMeg4[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_AnnaAndMeg4[] = { { .iv = 30, .level = 32, @@ -3910,7 +3910,7 @@ const struct TrainerPartyMember1 gTrainerParty_AnnaAndMeg4[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_AnnaAndMeg5[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_AnnaAndMeg5[] = { { .iv = 40, .level = 35, @@ -3925,7 +3925,7 @@ const struct TrainerPartyMember1 gTrainerParty_AnnaAndMeg5[] = { } }; -const struct TrainerPartyMember2 gTrainerParty_Victor[] = { +const struct TrainerMonItemDefaultMoves gTrainerParty_Victor[] = { { .iv = 25, .level = 16, @@ -3940,7 +3940,7 @@ const struct TrainerPartyMember2 gTrainerParty_Victor[] = { } }; -const struct TrainerPartyMember2 gTrainerParty_Miguel1[] = { +const struct TrainerMonItemDefaultMoves gTrainerParty_Miguel1[] = { { .iv = 0, .level = 16, @@ -3949,7 +3949,7 @@ const struct TrainerPartyMember2 gTrainerParty_Miguel1[] = { } }; -const struct TrainerPartyMember3 gTrainerParty_Colton[] = { +const struct TrainerMonItemCustomMoves gTrainerParty_Colton[] = { { .iv = 0, .level = 22, @@ -3994,7 +3994,7 @@ const struct TrainerPartyMember3 gTrainerParty_Colton[] = { } }; -const struct TrainerPartyMember2 gTrainerParty_Miguel2[] = { +const struct TrainerMonItemDefaultMoves gTrainerParty_Miguel2[] = { { .iv = 0, .level = 27, @@ -4003,7 +4003,7 @@ const struct TrainerPartyMember2 gTrainerParty_Miguel2[] = { } }; -const struct TrainerPartyMember2 gTrainerParty_Miguel3[] = { +const struct TrainerMonItemDefaultMoves gTrainerParty_Miguel3[] = { { .iv = 0, .level = 30, @@ -4012,7 +4012,7 @@ const struct TrainerPartyMember2 gTrainerParty_Miguel3[] = { } }; -const struct TrainerPartyMember2 gTrainerParty_Miguel4[] = { +const struct TrainerMonItemDefaultMoves gTrainerParty_Miguel4[] = { { .iv = 0, .level = 33, @@ -4021,7 +4021,7 @@ const struct TrainerPartyMember2 gTrainerParty_Miguel4[] = { } }; -const struct TrainerPartyMember2 gTrainerParty_Miguel5[] = { +const struct TrainerMonItemDefaultMoves gTrainerParty_Miguel5[] = { { .iv = 0, .level = 36, @@ -4030,7 +4030,7 @@ const struct TrainerPartyMember2 gTrainerParty_Miguel5[] = { } }; -const struct TrainerPartyMember2 gTrainerParty_Victoria[] = { +const struct TrainerMonItemDefaultMoves gTrainerParty_Victoria[] = { { .iv = 50, .level = 17, @@ -4039,7 +4039,7 @@ const struct TrainerPartyMember2 gTrainerParty_Victoria[] = { } }; -const struct TrainerPartyMember2 gTrainerParty_Vanessa[] = { +const struct TrainerMonItemDefaultMoves gTrainerParty_Vanessa[] = { { .iv = 0, .level = 31, @@ -4048,7 +4048,7 @@ const struct TrainerPartyMember2 gTrainerParty_Vanessa[] = { } }; -const struct TrainerPartyMember2 gTrainerParty_Marissa[] = { +const struct TrainerMonItemDefaultMoves gTrainerParty_Marissa[] = { { .iv = 100, .level = 36, @@ -4069,7 +4069,7 @@ const struct TrainerPartyMember2 gTrainerParty_Marissa[] = { } }; -const struct TrainerPartyMember2 gTrainerParty_Isabel1[] = { +const struct TrainerMonItemDefaultMoves gTrainerParty_Isabel1[] = { { .iv = 0, .level = 15, @@ -4084,7 +4084,7 @@ const struct TrainerPartyMember2 gTrainerParty_Isabel1[] = { } }; -const struct TrainerPartyMember2 gTrainerParty_Isabel2[] = { +const struct TrainerMonItemDefaultMoves gTrainerParty_Isabel2[] = { { .iv = 10, .level = 26, @@ -4099,7 +4099,7 @@ const struct TrainerPartyMember2 gTrainerParty_Isabel2[] = { } }; -const struct TrainerPartyMember2 gTrainerParty_Isabel3[] = { +const struct TrainerMonItemDefaultMoves gTrainerParty_Isabel3[] = { { .iv = 20, .level = 29, @@ -4114,7 +4114,7 @@ const struct TrainerPartyMember2 gTrainerParty_Isabel3[] = { } }; -const struct TrainerPartyMember2 gTrainerParty_Isabel4[] = { +const struct TrainerMonItemDefaultMoves gTrainerParty_Isabel4[] = { { .iv = 30, .level = 32, @@ -4129,7 +4129,7 @@ const struct TrainerPartyMember2 gTrainerParty_Isabel4[] = { } }; -const struct TrainerPartyMember2 gTrainerParty_Isabel5[] = { +const struct TrainerMonItemDefaultMoves gTrainerParty_Isabel5[] = { { .iv = 40, .level = 35, @@ -4144,7 +4144,7 @@ const struct TrainerPartyMember2 gTrainerParty_Isabel5[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Timothy1[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Timothy1[] = { { .iv = 200, .level = 28, @@ -4152,7 +4152,7 @@ const struct TrainerPartyMember0 gTrainerParty_Timothy1[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Timothy2[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Timothy2[] = { { .iv = 210, .level = 31, @@ -4161,7 +4161,7 @@ const struct TrainerPartyMember1 gTrainerParty_Timothy2[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Timothy3[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Timothy3[] = { { .iv = 220, .level = 34, @@ -4170,7 +4170,7 @@ const struct TrainerPartyMember1 gTrainerParty_Timothy3[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Timothy4[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Timothy4[] = { { .iv = 230, .level = 37, @@ -4179,7 +4179,7 @@ const struct TrainerPartyMember1 gTrainerParty_Timothy4[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Timothy5[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Timothy5[] = { { .iv = 240, .level = 40, @@ -4188,7 +4188,7 @@ const struct TrainerPartyMember1 gTrainerParty_Timothy5[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Vicky[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Vicky[] = { { .iv = 200, .level = 18, @@ -4197,7 +4197,7 @@ const struct TrainerPartyMember1 gTrainerParty_Vicky[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Shelby1[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Shelby1[] = { { .iv = 200, .level = 22, @@ -4210,7 +4210,7 @@ const struct TrainerPartyMember0 gTrainerParty_Shelby1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Shelby2[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Shelby2[] = { { .iv = 210, .level = 30, @@ -4223,7 +4223,7 @@ const struct TrainerPartyMember0 gTrainerParty_Shelby2[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Shelby3[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Shelby3[] = { { .iv = 220, .level = 33, @@ -4236,7 +4236,7 @@ const struct TrainerPartyMember0 gTrainerParty_Shelby3[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Shelby4[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Shelby4[] = { { .iv = 230, .level = 36, @@ -4249,7 +4249,7 @@ const struct TrainerPartyMember0 gTrainerParty_Shelby4[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Shelby5[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Shelby5[] = { { .iv = 240, .level = 39, @@ -4262,7 +4262,7 @@ const struct TrainerPartyMember0 gTrainerParty_Shelby5[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Calvin1[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Calvin1[] = { { .iv = 0, .level = 5, @@ -4270,7 +4270,7 @@ const struct TrainerPartyMember0 gTrainerParty_Calvin1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Billy[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Billy[] = { { .iv = 0, .level = 6, @@ -4283,7 +4283,7 @@ const struct TrainerPartyMember0 gTrainerParty_Billy[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Josh[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Josh[] = { { .iv = 100, .level = 10, @@ -4304,7 +4304,7 @@ const struct TrainerPartyMember1 gTrainerParty_Josh[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Tommy[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tommy[] = { { .iv = 100, .level = 11, @@ -4312,7 +4312,7 @@ const struct TrainerPartyMember0 gTrainerParty_Tommy[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Joey[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Joey[] = { { .iv = 0, .level = 8, @@ -4325,7 +4325,7 @@ const struct TrainerPartyMember0 gTrainerParty_Joey[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Ben[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Ben[] = { { .iv = 100, .level = 19, @@ -4334,7 +4334,7 @@ const struct TrainerPartyMember1 gTrainerParty_Ben[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Anonymous5[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Anonymous5[] = { { .iv = 0, .level = 9, @@ -4347,7 +4347,7 @@ const struct TrainerPartyMember0 gTrainerParty_Anonymous5[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Kevin[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kevin[] = { { .iv = 0, .level = 9, @@ -4360,7 +4360,7 @@ const struct TrainerPartyMember0 gTrainerParty_Kevin[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Neal[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Neal[] = { { .iv = 0, .level = 18, @@ -4373,7 +4373,7 @@ const struct TrainerPartyMember0 gTrainerParty_Neal[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Dillon[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dillon[] = { { .iv = 0, .level = 20, @@ -4381,7 +4381,7 @@ const struct TrainerPartyMember0 gTrainerParty_Dillon[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Calvin2[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Calvin2[] = { { .iv = 10, .level = 27, @@ -4389,7 +4389,7 @@ const struct TrainerPartyMember0 gTrainerParty_Calvin2[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Calvin3[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Calvin3[] = { { .iv = 20, .level = 28, @@ -4402,7 +4402,7 @@ const struct TrainerPartyMember0 gTrainerParty_Calvin3[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Calvin4[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Calvin4[] = { { .iv = 30, .level = 31, @@ -4415,7 +4415,7 @@ const struct TrainerPartyMember0 gTrainerParty_Calvin4[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Calvin5[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Calvin5[] = { { .iv = 40, .level = 34, @@ -4433,7 +4433,7 @@ const struct TrainerPartyMember0 gTrainerParty_Calvin5[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Eddie[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Eddie[] = { { .iv = 0, .level = 14, @@ -4446,7 +4446,7 @@ const struct TrainerPartyMember0 gTrainerParty_Eddie[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Allen[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Allen[] = { { .iv = 0, .level = 5, @@ -4459,7 +4459,7 @@ const struct TrainerPartyMember0 gTrainerParty_Allen[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Timmy[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Timmy[] = { { .iv = 0, .level = 12, @@ -4477,7 +4477,7 @@ const struct TrainerPartyMember0 gTrainerParty_Timmy[] = { } }; -const struct TrainerPartyMember3 gTrainerParty_Steven[] = { +const struct TrainerMonItemCustomMoves gTrainerParty_Steven[] = { { .iv = 255, .level = 57, @@ -4522,7 +4522,7 @@ const struct TrainerPartyMember3 gTrainerParty_Steven[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Andrew[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Andrew[] = { { .iv = 0, .level = 5, @@ -4540,7 +4540,7 @@ const struct TrainerPartyMember0 gTrainerParty_Andrew[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Ivan[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ivan[] = { { .iv = 0, .level = 6, @@ -4558,7 +4558,7 @@ const struct TrainerPartyMember0 gTrainerParty_Ivan[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Claude[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Claude[] = { { .iv = 0, .level = 16, @@ -4581,7 +4581,7 @@ const struct TrainerPartyMember0 gTrainerParty_Claude[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Elliot1[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Elliot1[] = { { .iv = 0, .level = 11, @@ -4599,7 +4599,7 @@ const struct TrainerPartyMember0 gTrainerParty_Elliot1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Ned[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ned[] = { { .iv = 0, .level = 12, @@ -4607,7 +4607,7 @@ const struct TrainerPartyMember0 gTrainerParty_Ned[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Dale[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dale[] = { { .iv = 0, .level = 12, @@ -4630,7 +4630,7 @@ const struct TrainerPartyMember0 gTrainerParty_Dale[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Nolan[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nolan[] = { { .iv = 0, .level = 20, @@ -4638,7 +4638,7 @@ const struct TrainerPartyMember0 gTrainerParty_Nolan[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Barny[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Barny[] = { { .iv = 0, .level = 26, @@ -4651,7 +4651,7 @@ const struct TrainerPartyMember0 gTrainerParty_Barny[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Wade[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Wade[] = { { .iv = 0, .level = 17, @@ -4659,7 +4659,7 @@ const struct TrainerPartyMember0 gTrainerParty_Wade[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Carter[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Carter[] = { { .iv = 0, .level = 23, @@ -4682,7 +4682,7 @@ const struct TrainerPartyMember0 gTrainerParty_Carter[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Elliot2[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Elliot2[] = { { .iv = 10, .level = 24, @@ -4700,7 +4700,7 @@ const struct TrainerPartyMember0 gTrainerParty_Elliot2[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Elliot3[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Elliot3[] = { { .iv = 20, .level = 29, @@ -4723,7 +4723,7 @@ const struct TrainerPartyMember0 gTrainerParty_Elliot3[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Elliot4[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Elliot4[] = { { .iv = 30, .level = 31, @@ -4746,7 +4746,7 @@ const struct TrainerPartyMember0 gTrainerParty_Elliot4[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Elliot5[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Elliot5[] = { { .iv = 40, .level = 33, @@ -4769,7 +4769,7 @@ const struct TrainerPartyMember0 gTrainerParty_Elliot5[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Ronald[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ronald[] = { { .iv = 0, .level = 34, @@ -4802,7 +4802,7 @@ const struct TrainerPartyMember0 gTrainerParty_Ronald[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Jacob[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jacob[] = { { .iv = 0, .level = 7, @@ -4820,7 +4820,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jacob[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Anthony[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Anthony[] = { { .iv = 0, .level = 16, @@ -4833,7 +4833,7 @@ const struct TrainerPartyMember0 gTrainerParty_Anthony[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Benjamin1[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Benjamin1[] = { { .iv = 0, .level = 17, @@ -4841,7 +4841,7 @@ const struct TrainerPartyMember0 gTrainerParty_Benjamin1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Benjamin2[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Benjamin2[] = { { .iv = 10, .level = 28, @@ -4849,7 +4849,7 @@ const struct TrainerPartyMember0 gTrainerParty_Benjamin2[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Benjamin3[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Benjamin3[] = { { .iv = 20, .level = 31, @@ -4857,7 +4857,7 @@ const struct TrainerPartyMember0 gTrainerParty_Benjamin3[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Benjamin4[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Benjamin4[] = { { .iv = 30, .level = 34, @@ -4865,7 +4865,7 @@ const struct TrainerPartyMember0 gTrainerParty_Benjamin4[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Benjamin5[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Benjamin5[] = { { .iv = 40, .level = 37, @@ -4873,7 +4873,7 @@ const struct TrainerPartyMember0 gTrainerParty_Benjamin5[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Abigail1[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Abigail1[] = { { .iv = 0, .level = 17, @@ -4881,7 +4881,7 @@ const struct TrainerPartyMember0 gTrainerParty_Abigail1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Jasmine[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jasmine[] = { { .iv = 80, .level = 15, @@ -4899,7 +4899,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jasmine[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Abigail2[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Abigail2[] = { { .iv = 10, .level = 28, @@ -4907,7 +4907,7 @@ const struct TrainerPartyMember0 gTrainerParty_Abigail2[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Abigail3[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Abigail3[] = { { .iv = 20, .level = 31, @@ -4915,7 +4915,7 @@ const struct TrainerPartyMember0 gTrainerParty_Abigail3[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Abigail4[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Abigail4[] = { { .iv = 30, .level = 34, @@ -4923,7 +4923,7 @@ const struct TrainerPartyMember0 gTrainerParty_Abigail4[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Abigail5[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Abigail5[] = { { .iv = 40, .level = 37, @@ -4931,7 +4931,7 @@ const struct TrainerPartyMember0 gTrainerParty_Abigail5[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Dylan1[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dylan1[] = { { .iv = 0, .level = 18, @@ -4939,7 +4939,7 @@ const struct TrainerPartyMember0 gTrainerParty_Dylan1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Dylan2[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dylan2[] = { { .iv = 10, .level = 28, @@ -4947,7 +4947,7 @@ const struct TrainerPartyMember0 gTrainerParty_Dylan2[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Dylan3[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dylan3[] = { { .iv = 20, .level = 31, @@ -4955,7 +4955,7 @@ const struct TrainerPartyMember0 gTrainerParty_Dylan3[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Dylan4[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dylan4[] = { { .iv = 30, .level = 34, @@ -4963,7 +4963,7 @@ const struct TrainerPartyMember0 gTrainerParty_Dylan4[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Dylan5[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dylan5[] = { { .iv = 40, .level = 37, @@ -4971,7 +4971,7 @@ const struct TrainerPartyMember0 gTrainerParty_Dylan5[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Maria1[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Maria1[] = { { .iv = 0, .level = 18, @@ -4979,7 +4979,7 @@ const struct TrainerPartyMember0 gTrainerParty_Maria1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Maria2[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Maria2[] = { { .iv = 10, .level = 28, @@ -4987,7 +4987,7 @@ const struct TrainerPartyMember0 gTrainerParty_Maria2[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Maria3[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Maria3[] = { { .iv = 20, .level = 31, @@ -4995,7 +4995,7 @@ const struct TrainerPartyMember0 gTrainerParty_Maria3[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Maria4[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Maria4[] = { { .iv = 30, .level = 34, @@ -5003,7 +5003,7 @@ const struct TrainerPartyMember0 gTrainerParty_Maria4[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Maria5[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Maria5[] = { { .iv = 40, .level = 37, @@ -5011,7 +5011,7 @@ const struct TrainerPartyMember0 gTrainerParty_Maria5[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Caleb[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Caleb[] = { { .iv = 0, .level = 33, @@ -5034,7 +5034,7 @@ const struct TrainerPartyMember0 gTrainerParty_Caleb[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Anonymous6[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Anonymous6[] = { { .iv = 0, .level = 36, @@ -5042,7 +5042,7 @@ const struct TrainerPartyMember0 gTrainerParty_Anonymous6[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Isaiah1[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Isaiah1[] = { { .iv = 0, .level = 36, @@ -5050,7 +5050,7 @@ const struct TrainerPartyMember0 gTrainerParty_Isaiah1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Anonymous7[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Anonymous7[] = { { .iv = 0, .level = 36, @@ -5058,7 +5058,7 @@ const struct TrainerPartyMember0 gTrainerParty_Anonymous7[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Chase[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Chase[] = { { .iv = 0, .level = 27, @@ -5071,7 +5071,7 @@ const struct TrainerPartyMember0 gTrainerParty_Chase[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Isaiah2[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Isaiah2[] = { { .iv = 10, .level = 39, @@ -5079,7 +5079,7 @@ const struct TrainerPartyMember0 gTrainerParty_Isaiah2[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Isaiah3[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Isaiah3[] = { { .iv = 20, .level = 42, @@ -5087,7 +5087,7 @@ const struct TrainerPartyMember0 gTrainerParty_Isaiah3[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Isaiah4[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Isaiah4[] = { { .iv = 30, .level = 45, @@ -5095,7 +5095,7 @@ const struct TrainerPartyMember0 gTrainerParty_Isaiah4[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Isaiah5[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Isaiah5[] = { { .iv = 40, .level = 48, @@ -5103,7 +5103,7 @@ const struct TrainerPartyMember0 gTrainerParty_Isaiah5[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Anonymous8[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Anonymous8[] = { { .iv = 0, .level = 26, @@ -5121,7 +5121,7 @@ const struct TrainerPartyMember0 gTrainerParty_Anonymous8[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Connor[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Connor[] = { { .iv = 0, .level = 25, @@ -5144,7 +5144,7 @@ const struct TrainerPartyMember0 gTrainerParty_Connor[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Anonymous9[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Anonymous9[] = { { .iv = 0, .level = 36, @@ -5152,7 +5152,7 @@ const struct TrainerPartyMember0 gTrainerParty_Anonymous9[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Katelyn1[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Katelyn1[] = { { .iv = 0, .level = 36, @@ -5160,7 +5160,7 @@ const struct TrainerPartyMember0 gTrainerParty_Katelyn1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Allison[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Allison[] = { { .iv = 0, .level = 25, @@ -5183,7 +5183,7 @@ const struct TrainerPartyMember0 gTrainerParty_Allison[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Katelyn2[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Katelyn2[] = { { .iv = 10, .level = 39, @@ -5191,7 +5191,7 @@ const struct TrainerPartyMember0 gTrainerParty_Katelyn2[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Katelyn3[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Katelyn3[] = { { .iv = 20, .level = 42, @@ -5199,7 +5199,7 @@ const struct TrainerPartyMember0 gTrainerParty_Katelyn3[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Katelyn4[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Katelyn4[] = { { .iv = 30, .level = 45, @@ -5207,7 +5207,7 @@ const struct TrainerPartyMember0 gTrainerParty_Katelyn4[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Katelyn5[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Katelyn5[] = { { .iv = 40, .level = 48, @@ -5215,7 +5215,7 @@ const struct TrainerPartyMember0 gTrainerParty_Katelyn5[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Nicolas1[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nicolas1[] = { { .iv = 100, .level = 38, @@ -5228,7 +5228,7 @@ const struct TrainerPartyMember0 gTrainerParty_Nicolas1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Nicolas2[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nicolas2[] = { { .iv = 110, .level = 41, @@ -5241,7 +5241,7 @@ const struct TrainerPartyMember0 gTrainerParty_Nicolas2[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Nicolas3[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nicolas3[] = { { .iv = 120, .level = 44, @@ -5254,7 +5254,7 @@ const struct TrainerPartyMember0 gTrainerParty_Nicolas3[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Nicolas4[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nicolas4[] = { { .iv = 130, .level = 46, @@ -5272,7 +5272,7 @@ const struct TrainerPartyMember0 gTrainerParty_Nicolas4[] = { } }; -const struct TrainerPartyMember2 gTrainerParty_Nicolas5[] = { +const struct TrainerMonItemDefaultMoves gTrainerParty_Nicolas5[] = { { .iv = 140, .level = 49, @@ -5293,7 +5293,7 @@ const struct TrainerPartyMember2 gTrainerParty_Nicolas5[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Aaron[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Aaron[] = { { .iv = 100, .level = 35, @@ -5301,7 +5301,7 @@ const struct TrainerPartyMember0 gTrainerParty_Aaron[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Perry[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Perry[] = { { .iv = 0, .level = 27, @@ -5309,7 +5309,7 @@ const struct TrainerPartyMember0 gTrainerParty_Perry[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Hugh[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Hugh[] = { { .iv = 0, .level = 27, @@ -5317,7 +5317,7 @@ const struct TrainerPartyMember0 gTrainerParty_Hugh[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Phil[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Phil[] = { { .iv = 0, .level = 25, @@ -5335,7 +5335,7 @@ const struct TrainerPartyMember0 gTrainerParty_Phil[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Jared[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jared[] = { { .iv = 100, .level = 30, @@ -5343,7 +5343,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jared[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Anonymous10[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Anonymous10[] = { { .iv = 100, .level = 29, @@ -5366,7 +5366,7 @@ const struct TrainerPartyMember0 gTrainerParty_Anonymous10[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Tanner[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tanner[] = { { .iv = 100, .level = 30, @@ -5384,7 +5384,7 @@ const struct TrainerPartyMember0 gTrainerParty_Tanner[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Will[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Will[] = { { .iv = 100, .level = 28, @@ -5402,7 +5402,7 @@ const struct TrainerPartyMember0 gTrainerParty_Will[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Colin[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Colin[] = { { .iv = 0, .level = 29, @@ -5415,7 +5415,7 @@ const struct TrainerPartyMember0 gTrainerParty_Colin[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Robert1[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Robert1[] = { { .iv = 0, .level = 30, @@ -5423,7 +5423,7 @@ const struct TrainerPartyMember0 gTrainerParty_Robert1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Benny[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Benny[] = { { .iv = 0, .level = 36, @@ -5441,7 +5441,7 @@ const struct TrainerPartyMember0 gTrainerParty_Benny[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Chester[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Chester[] = { { .iv = 0, .level = 26, @@ -5454,7 +5454,7 @@ const struct TrainerPartyMember0 gTrainerParty_Chester[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Robert2[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Robert2[] = { { .iv = 10, .level = 32, @@ -5467,7 +5467,7 @@ const struct TrainerPartyMember0 gTrainerParty_Robert2[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Robert3[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Robert3[] = { { .iv = 20, .level = 35, @@ -5480,7 +5480,7 @@ const struct TrainerPartyMember0 gTrainerParty_Robert3[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Robert4[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Robert4[] = { { .iv = 30, .level = 38, @@ -5493,7 +5493,7 @@ const struct TrainerPartyMember0 gTrainerParty_Robert4[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Robert5[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Robert5[] = { { .iv = 40, .level = 41, @@ -5506,7 +5506,7 @@ const struct TrainerPartyMember0 gTrainerParty_Robert5[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Alex[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Alex[] = { { .iv = 0, .level = 32, @@ -5529,7 +5529,7 @@ const struct TrainerPartyMember0 gTrainerParty_Alex[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Beck[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Beck[] = { { .iv = 0, .level = 34, @@ -5542,7 +5542,7 @@ const struct TrainerPartyMember0 gTrainerParty_Beck[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Yasu[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Yasu[] = { { .iv = 0, .level = 27, @@ -5550,7 +5550,7 @@ const struct TrainerPartyMember0 gTrainerParty_Yasu[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Takashi[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Takashi[] = { { .iv = 0, .level = 25, @@ -5568,7 +5568,7 @@ const struct TrainerPartyMember0 gTrainerParty_Takashi[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Makoto[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Makoto[] = { { .iv = 0, .level = 23, @@ -5576,7 +5576,7 @@ const struct TrainerPartyMember0 gTrainerParty_Makoto[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Hideo1[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Hideo1[] = { { .iv = 0, .level = 20, @@ -5599,7 +5599,7 @@ const struct TrainerPartyMember0 gTrainerParty_Hideo1[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Lao1[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Lao1[] = { { .iv = 0, .level = 17, @@ -5626,7 +5626,7 @@ const struct TrainerPartyMember1 gTrainerParty_Lao1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Lung[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lung[] = { { .iv = 0, .level = 19, @@ -5639,7 +5639,7 @@ const struct TrainerPartyMember0 gTrainerParty_Lung[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Lao2[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Lao2[] = { { .iv = 0, .level = 24, @@ -5666,7 +5666,7 @@ const struct TrainerPartyMember1 gTrainerParty_Lao2[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Lao3[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Lao3[] = { { .iv = 20, .level = 27, @@ -5693,7 +5693,7 @@ const struct TrainerPartyMember1 gTrainerParty_Lao3[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Lao4[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Lao4[] = { { .iv = 30, .level = 30, @@ -5720,7 +5720,7 @@ const struct TrainerPartyMember1 gTrainerParty_Lao4[] = { } }; -const struct TrainerPartyMember3 gTrainerParty_Lao5[] = { +const struct TrainerMonItemCustomMoves gTrainerParty_Lao5[] = { { .iv = 40, .level = 33, @@ -5751,7 +5751,7 @@ const struct TrainerPartyMember3 gTrainerParty_Lao5[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Tessa[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tessa[] = { { .iv = 100, .level = 12, @@ -5769,7 +5769,7 @@ const struct TrainerPartyMember0 gTrainerParty_Tessa[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Laura[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Laura[] = { { .iv = 100, .level = 14, @@ -5777,7 +5777,7 @@ const struct TrainerPartyMember0 gTrainerParty_Laura[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Cyndy1[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cyndy1[] = { { .iv = 100, .level = 19, @@ -5790,7 +5790,7 @@ const struct TrainerPartyMember0 gTrainerParty_Cyndy1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Cora[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cora[] = { { .iv = 100, .level = 27, @@ -5798,7 +5798,7 @@ const struct TrainerPartyMember0 gTrainerParty_Cora[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Jill[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jill[] = { { .iv = 100, .level = 27, @@ -5806,7 +5806,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jill[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Cyndy2[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cyndy2[] = { { .iv = 110, .level = 26, @@ -5819,7 +5819,7 @@ const struct TrainerPartyMember0 gTrainerParty_Cyndy2[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Cyndy3[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cyndy3[] = { { .iv = 120, .level = 29, @@ -5832,7 +5832,7 @@ const struct TrainerPartyMember0 gTrainerParty_Cyndy3[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Cyndy4[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cyndy4[] = { { .iv = 130, .level = 32, @@ -5845,7 +5845,7 @@ const struct TrainerPartyMember0 gTrainerParty_Cyndy4[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Cyndy5[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cyndy5[] = { { .iv = 140, .level = 35, @@ -5858,7 +5858,7 @@ const struct TrainerPartyMember0 gTrainerParty_Cyndy5[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Madeline1[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Madeline1[] = { { .iv = 0, .level = 20, @@ -5867,7 +5867,7 @@ const struct TrainerPartyMember1 gTrainerParty_Madeline1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Clarissa[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Clarissa[] = { { .iv = 0, .level = 29, @@ -5880,7 +5880,7 @@ const struct TrainerPartyMember0 gTrainerParty_Clarissa[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Angelica[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Angelica[] = { { .iv = 0, .level = 30, @@ -5888,7 +5888,7 @@ const struct TrainerPartyMember0 gTrainerParty_Angelica[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Madeline2[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Madeline2[] = { { .iv = 10, .level = 27, @@ -5897,7 +5897,7 @@ const struct TrainerPartyMember1 gTrainerParty_Madeline2[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Madeline3[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Madeline3[] = { { .iv = 20, .level = 30, @@ -5906,7 +5906,7 @@ const struct TrainerPartyMember1 gTrainerParty_Madeline3[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Madeline4[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Madeline4[] = { { .iv = 30, .level = 32, @@ -5921,7 +5921,7 @@ const struct TrainerPartyMember1 gTrainerParty_Madeline4[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Madeline5[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Madeline5[] = { { .iv = 40, .level = 35, @@ -5936,7 +5936,7 @@ const struct TrainerPartyMember1 gTrainerParty_Madeline5[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Beverly[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Beverly[] = { { .iv = 0, .level = 26, @@ -5949,7 +5949,7 @@ const struct TrainerPartyMember0 gTrainerParty_Beverly[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Dawn[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dawn[] = { { .iv = 0, .level = 27, @@ -5957,7 +5957,7 @@ const struct TrainerPartyMember0 gTrainerParty_Dawn[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Nicole[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nicole[] = { { .iv = 0, .level = 27, @@ -5965,7 +5965,7 @@ const struct TrainerPartyMember0 gTrainerParty_Nicole[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Denise[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Denise[] = { { .iv = 0, .level = 27, @@ -5973,7 +5973,7 @@ const struct TrainerPartyMember0 gTrainerParty_Denise[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Beth[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Beth[] = { { .iv = 0, .level = 25, @@ -5991,7 +5991,7 @@ const struct TrainerPartyMember0 gTrainerParty_Beth[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Tara[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tara[] = { { .iv = 0, .level = 26, @@ -6004,7 +6004,7 @@ const struct TrainerPartyMember0 gTrainerParty_Tara[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Missy[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Missy[] = { { .iv = 0, .level = 24, @@ -6027,7 +6027,7 @@ const struct TrainerPartyMember0 gTrainerParty_Missy[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Alice[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Alice[] = { { .iv = 0, .level = 25, @@ -6045,7 +6045,7 @@ const struct TrainerPartyMember0 gTrainerParty_Alice[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Jenny1[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jenny1[] = { { .iv = 0, .level = 35, @@ -6053,7 +6053,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jenny1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Grace[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grace[] = { { .iv = 0, .level = 33, @@ -6071,7 +6071,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grace[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Tanya[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tanya[] = { { .iv = 0, .level = 35, @@ -6079,7 +6079,7 @@ const struct TrainerPartyMember0 gTrainerParty_Tanya[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Sharon[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Sharon[] = { { .iv = 0, .level = 34, @@ -6092,7 +6092,7 @@ const struct TrainerPartyMember0 gTrainerParty_Sharon[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Nikki[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nikki[] = { { .iv = 0, .level = 32, @@ -6110,7 +6110,7 @@ const struct TrainerPartyMember0 gTrainerParty_Nikki[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Brenda[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brenda[] = { { .iv = 0, .level = 35, @@ -6118,7 +6118,7 @@ const struct TrainerPartyMember0 gTrainerParty_Brenda[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Katie[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Katie[] = { { .iv = 0, .level = 33, @@ -6136,7 +6136,7 @@ const struct TrainerPartyMember0 gTrainerParty_Katie[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Susie[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Susie[] = { { .iv = 0, .level = 33, @@ -6154,7 +6154,7 @@ const struct TrainerPartyMember0 gTrainerParty_Susie[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Kara[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kara[] = { { .iv = 0, .level = 35, @@ -6162,7 +6162,7 @@ const struct TrainerPartyMember0 gTrainerParty_Kara[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Dana[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dana[] = { { .iv = 0, .level = 33, @@ -6180,7 +6180,7 @@ const struct TrainerPartyMember0 gTrainerParty_Dana[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Erin[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Erin[] = { { .iv = 0, .level = 38, @@ -6188,7 +6188,7 @@ const struct TrainerPartyMember0 gTrainerParty_Erin[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Debra[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Debra[] = { { .iv = 0, .level = 34, @@ -6201,7 +6201,7 @@ const struct TrainerPartyMember0 gTrainerParty_Debra[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Linda[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Linda[] = { { .iv = 0, .level = 34, @@ -6214,7 +6214,7 @@ const struct TrainerPartyMember0 gTrainerParty_Linda[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Kaylee[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kaylee[] = { { .iv = 0, .level = 34, @@ -6227,7 +6227,7 @@ const struct TrainerPartyMember0 gTrainerParty_Kaylee[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Laurel[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Laurel[] = { { .iv = 0, .level = 33, @@ -6245,7 +6245,7 @@ const struct TrainerPartyMember0 gTrainerParty_Laurel[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Darcy[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Darcy[] = { { .iv = 0, .level = 13, @@ -6253,7 +6253,7 @@ const struct TrainerPartyMember0 gTrainerParty_Darcy[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Jenny2[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jenny2[] = { { .iv = 0, .level = 38, @@ -6261,7 +6261,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jenny2[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Jenny3[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jenny3[] = { { .iv = 0, .level = 41, @@ -6269,7 +6269,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jenny3[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Jenny4[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jenny4[] = { { .iv = 0, .level = 43, @@ -6282,7 +6282,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jenny4[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Jenny5[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jenny5[] = { { .iv = 0, .level = 45, @@ -6300,7 +6300,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jenny5[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Heidi[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Heidi[] = { { .iv = 0, .level = 23, @@ -6315,7 +6315,7 @@ const struct TrainerPartyMember1 gTrainerParty_Heidi[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Becky[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Becky[] = { { .iv = 0, .level = 24, @@ -6324,7 +6324,7 @@ const struct TrainerPartyMember1 gTrainerParty_Becky[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Carol[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Carol[] = { { .iv = 0, .level = 18, @@ -6337,7 +6337,7 @@ const struct TrainerPartyMember0 gTrainerParty_Carol[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Nancy[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nancy[] = { { .iv = 0, .level = 19, @@ -6350,7 +6350,7 @@ const struct TrainerPartyMember0 gTrainerParty_Nancy[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Martha[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Martha[] = { { .iv = 0, .level = 23, @@ -6363,7 +6363,7 @@ const struct TrainerPartyMember0 gTrainerParty_Martha[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Diana1[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Diana1[] = { { .iv = 0, .level = 20, @@ -6381,7 +6381,7 @@ const struct TrainerPartyMember0 gTrainerParty_Diana1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Nina[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nina[] = { { .iv = 0, .level = 9, @@ -6394,7 +6394,7 @@ const struct TrainerPartyMember0 gTrainerParty_Nina[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Irene[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Irene[] = { { .iv = 0, .level = 18, @@ -6407,7 +6407,7 @@ const struct TrainerPartyMember0 gTrainerParty_Irene[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Diana2[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Diana2[] = { { .iv = 10, .level = 25, @@ -6425,7 +6425,7 @@ const struct TrainerPartyMember0 gTrainerParty_Diana2[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Diana3[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Diana3[] = { { .iv = 20, .level = 28, @@ -6443,7 +6443,7 @@ const struct TrainerPartyMember0 gTrainerParty_Diana3[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Diana4[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Diana4[] = { { .iv = 30, .level = 31, @@ -6461,7 +6461,7 @@ const struct TrainerPartyMember0 gTrainerParty_Diana4[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Diana5[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Diana5[] = { { .iv = 40, .level = 40, @@ -6479,7 +6479,7 @@ const struct TrainerPartyMember0 gTrainerParty_Diana5[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_AmyAndLiv1[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_AmyAndLiv1[] = { { .iv = 0, .level = 16, @@ -6492,7 +6492,7 @@ const struct TrainerPartyMember0 gTrainerParty_AmyAndLiv1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_AmyAndLiv2[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_AmyAndLiv2[] = { { .iv = 10, .level = 27, @@ -6505,7 +6505,7 @@ const struct TrainerPartyMember0 gTrainerParty_AmyAndLiv2[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_GinaAndMia1[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_GinaAndMia1[] = { { .iv = 0, .level = 8, @@ -6518,7 +6518,7 @@ const struct TrainerPartyMember0 gTrainerParty_GinaAndMia1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_MiuAndYuki[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_MiuAndYuki[] = { { .iv = 0, .level = 27, @@ -6531,7 +6531,7 @@ const struct TrainerPartyMember0 gTrainerParty_MiuAndYuki[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_AmyAndLiv3[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_AmyAndLiv3[] = { { .iv = 0, .level = 9, @@ -6544,7 +6544,7 @@ const struct TrainerPartyMember0 gTrainerParty_AmyAndLiv3[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_GinaAndMia2[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_GinaAndMia2[] = { { .iv = 0, .level = 10, @@ -6559,7 +6559,7 @@ const struct TrainerPartyMember1 gTrainerParty_GinaAndMia2[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_AmyAndLiv4[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_AmyAndLiv4[] = { { .iv = 20, .level = 30, @@ -6572,7 +6572,7 @@ const struct TrainerPartyMember0 gTrainerParty_AmyAndLiv4[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_AmyAndLiv5[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_AmyAndLiv5[] = { { .iv = 30, .level = 33, @@ -6587,7 +6587,7 @@ const struct TrainerPartyMember1 gTrainerParty_AmyAndLiv5[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_AmyAndLiv6[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_AmyAndLiv6[] = { { .iv = 40, .level = 36, @@ -6602,7 +6602,7 @@ const struct TrainerPartyMember1 gTrainerParty_AmyAndLiv6[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Huey[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Huey[] = { { .iv = 0, .level = 14, @@ -6610,7 +6610,7 @@ const struct TrainerPartyMember0 gTrainerParty_Huey[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Edmond[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Edmond[] = { { .iv = 0, .level = 12, @@ -6628,7 +6628,7 @@ const struct TrainerPartyMember0 gTrainerParty_Edmond[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Ernest1[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ernest1[] = { { .iv = 0, .level = 33, @@ -6646,7 +6646,7 @@ const struct TrainerPartyMember0 gTrainerParty_Ernest1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Dwayne[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dwayne[] = { { .iv = 0, .level = 11, @@ -6664,7 +6664,7 @@ const struct TrainerPartyMember0 gTrainerParty_Dwayne[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Phillip[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Phillip[] = { { .iv = 0, .level = 44, @@ -6677,7 +6677,7 @@ const struct TrainerPartyMember0 gTrainerParty_Phillip[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Leonard[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Leonard[] = { { .iv = 0, .level = 43, @@ -6695,7 +6695,7 @@ const struct TrainerPartyMember0 gTrainerParty_Leonard[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Duncan[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Duncan[] = { { .iv = 0, .level = 26, @@ -6708,7 +6708,7 @@ const struct TrainerPartyMember0 gTrainerParty_Duncan[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Ernest2[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ernest2[] = { { .iv = 10, .level = 36, @@ -6726,7 +6726,7 @@ const struct TrainerPartyMember0 gTrainerParty_Ernest2[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Ernest3[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ernest3[] = { { .iv = 20, .level = 39, @@ -6744,7 +6744,7 @@ const struct TrainerPartyMember0 gTrainerParty_Ernest3[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Ernest4[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ernest4[] = { { .iv = 30, .level = 42, @@ -6762,7 +6762,7 @@ const struct TrainerPartyMember0 gTrainerParty_Ernest4[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Ernest5[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ernest5[] = { { .iv = 40, .level = 45, @@ -6780,7 +6780,7 @@ const struct TrainerPartyMember0 gTrainerParty_Ernest5[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Anonymous11[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Anonymous11[] = { { .iv = 0, .level = 22, @@ -6793,7 +6793,7 @@ const struct TrainerPartyMember0 gTrainerParty_Anonymous11[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Anonymous12[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Anonymous12[] = { { .iv = 0, .level = 21, @@ -6811,7 +6811,7 @@ const struct TrainerPartyMember0 gTrainerParty_Anonymous12[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Anonymous13[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Anonymous13[] = { { .iv = 0, .level = 23, @@ -6819,7 +6819,7 @@ const struct TrainerPartyMember0 gTrainerParty_Anonymous13[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Sonny[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Sonny[] = { { .iv = 0, .level = 35, @@ -6827,7 +6827,7 @@ const struct TrainerPartyMember0 gTrainerParty_Sonny[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Donovan[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Donovan[] = { { .iv = 0, .level = 34, @@ -6840,7 +6840,7 @@ const struct TrainerPartyMember0 gTrainerParty_Donovan[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Gerald[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Gerald[] = { { .iv = 0, .level = 33, @@ -6858,7 +6858,7 @@ const struct TrainerPartyMember0 gTrainerParty_Gerald[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Kelvin[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kelvin[] = { { .iv = 0, .level = 34, @@ -6871,7 +6871,7 @@ const struct TrainerPartyMember0 gTrainerParty_Kelvin[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Kody[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kody[] = { { .iv = 0, .level = 33, @@ -6889,7 +6889,7 @@ const struct TrainerPartyMember0 gTrainerParty_Kody[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Tevin[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tevin[] = { { .iv = 0, .level = 35, @@ -6897,7 +6897,7 @@ const struct TrainerPartyMember0 gTrainerParty_Tevin[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Damon[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Damon[] = { { .iv = 0, .level = 34, @@ -6910,7 +6910,7 @@ const struct TrainerPartyMember0 gTrainerParty_Damon[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Pablo[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Pablo[] = { { .iv = 0, .level = 35, @@ -6918,7 +6918,7 @@ const struct TrainerPartyMember0 gTrainerParty_Pablo[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Edwin1[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Edwin1[] = { { .iv = 0, .level = 14, @@ -6931,7 +6931,7 @@ const struct TrainerPartyMember0 gTrainerParty_Edwin1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Hector1[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Hector1[] = { { .iv = 0, .level = 20, @@ -6939,7 +6939,7 @@ const struct TrainerPartyMember0 gTrainerParty_Hector1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Hector2[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Hector2[] = { { .iv = 0, .level = 20, @@ -6947,7 +6947,7 @@ const struct TrainerPartyMember0 gTrainerParty_Hector2[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Edwin2[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Edwin2[] = { { .iv = 0, .level = 26, @@ -6960,7 +6960,7 @@ const struct TrainerPartyMember0 gTrainerParty_Edwin2[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Edwin3[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Edwin3[] = { { .iv = 0, .level = 29, @@ -6973,7 +6973,7 @@ const struct TrainerPartyMember0 gTrainerParty_Edwin3[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Edwin4[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Edwin4[] = { { .iv = 0, .level = 32, @@ -6986,7 +6986,7 @@ const struct TrainerPartyMember0 gTrainerParty_Edwin4[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Edwin5[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Edwin5[] = { { .iv = 0, .level = 35, @@ -6999,7 +6999,7 @@ const struct TrainerPartyMember0 gTrainerParty_Edwin5[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Wally1[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Wally1[] = { { .iv = 150, .level = 44, @@ -7032,7 +7032,7 @@ const struct TrainerPartyMember1 gTrainerParty_Wally1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Brendan1[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan1[] = { { .iv = 0, .level = 5, @@ -7040,7 +7040,7 @@ const struct TrainerPartyMember0 gTrainerParty_Brendan1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Brendan2[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan2[] = { { .iv = 50, .level = 18, @@ -7058,7 +7058,7 @@ const struct TrainerPartyMember0 gTrainerParty_Brendan2[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Brendan3[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan3[] = { { .iv = 100, .level = 29, @@ -7076,7 +7076,7 @@ const struct TrainerPartyMember0 gTrainerParty_Brendan3[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Brendan4[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan4[] = { { .iv = 0, .level = 5, @@ -7084,7 +7084,7 @@ const struct TrainerPartyMember0 gTrainerParty_Brendan4[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Brendan5[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan5[] = { { .iv = 50, .level = 18, @@ -7102,7 +7102,7 @@ const struct TrainerPartyMember0 gTrainerParty_Brendan5[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Brendan6[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan6[] = { { .iv = 100, .level = 29, @@ -7120,7 +7120,7 @@ const struct TrainerPartyMember0 gTrainerParty_Brendan6[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Brendan7[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan7[] = { { .iv = 0, .level = 5, @@ -7128,7 +7128,7 @@ const struct TrainerPartyMember0 gTrainerParty_Brendan7[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Brendan8[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan8[] = { { .iv = 50, .level = 18, @@ -7146,7 +7146,7 @@ const struct TrainerPartyMember0 gTrainerParty_Brendan8[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Brendan9[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan9[] = { { .iv = 100, .level = 29, @@ -7164,7 +7164,7 @@ const struct TrainerPartyMember0 gTrainerParty_Brendan9[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_May1[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_May1[] = { { .iv = 0, .level = 5, @@ -7172,7 +7172,7 @@ const struct TrainerPartyMember0 gTrainerParty_May1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_May2[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_May2[] = { { .iv = 50, .level = 18, @@ -7190,7 +7190,7 @@ const struct TrainerPartyMember0 gTrainerParty_May2[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_May3[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_May3[] = { { .iv = 100, .level = 29, @@ -7208,7 +7208,7 @@ const struct TrainerPartyMember0 gTrainerParty_May3[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_May4[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_May4[] = { { .iv = 0, .level = 5, @@ -7216,7 +7216,7 @@ const struct TrainerPartyMember0 gTrainerParty_May4[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_May5[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_May5[] = { { .iv = 50, .level = 18, @@ -7234,7 +7234,7 @@ const struct TrainerPartyMember0 gTrainerParty_May5[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_May6[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_May6[] = { { .iv = 100, .level = 29, @@ -7252,7 +7252,7 @@ const struct TrainerPartyMember0 gTrainerParty_May6[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_May7[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_May7[] = { { .iv = 0, .level = 5, @@ -7260,7 +7260,7 @@ const struct TrainerPartyMember0 gTrainerParty_May7[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_May8[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_May8[] = { { .iv = 50, .level = 18, @@ -7278,7 +7278,7 @@ const struct TrainerPartyMember0 gTrainerParty_May8[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_May9[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_May9[] = { { .iv = 100, .level = 29, @@ -7296,7 +7296,7 @@ const struct TrainerPartyMember0 gTrainerParty_May9[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Isaac1[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Isaac1[] = { { .iv = 0, .level = 12, @@ -7329,7 +7329,7 @@ const struct TrainerPartyMember0 gTrainerParty_Isaac1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Riley[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Riley[] = { { .iv = 0, .level = 15, @@ -7347,7 +7347,7 @@ const struct TrainerPartyMember0 gTrainerParty_Riley[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Aidan[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Aidan[] = { { .iv = 0, .level = 13, @@ -7360,7 +7360,7 @@ const struct TrainerPartyMember0 gTrainerParty_Aidan[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Isaac2[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Isaac2[] = { { .iv = 10, .level = 22, @@ -7393,7 +7393,7 @@ const struct TrainerPartyMember0 gTrainerParty_Isaac2[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Isaac3[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Isaac3[] = { { .iv = 20, .level = 25, @@ -7426,7 +7426,7 @@ const struct TrainerPartyMember0 gTrainerParty_Isaac3[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Isaac4[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Isaac4[] = { { .iv = 30, .level = 28, @@ -7459,7 +7459,7 @@ const struct TrainerPartyMember0 gTrainerParty_Isaac4[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Isaac5[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Isaac5[] = { { .iv = 40, .level = 31, @@ -7492,7 +7492,7 @@ const struct TrainerPartyMember0 gTrainerParty_Isaac5[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Lydia1[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lydia1[] = { { .iv = 0, .level = 12, @@ -7525,7 +7525,7 @@ const struct TrainerPartyMember0 gTrainerParty_Lydia1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Alexia[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Alexia[] = { { .iv = 0, .level = 13, @@ -7538,7 +7538,7 @@ const struct TrainerPartyMember0 gTrainerParty_Alexia[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Danielle[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Danielle[] = { { .iv = 0, .level = 24, @@ -7546,7 +7546,7 @@ const struct TrainerPartyMember0 gTrainerParty_Danielle[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Lydia2[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lydia2[] = { { .iv = 10, .level = 22, @@ -7579,7 +7579,7 @@ const struct TrainerPartyMember0 gTrainerParty_Lydia2[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Lydia3[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lydia3[] = { { .iv = 20, .level = 25, @@ -7612,7 +7612,7 @@ const struct TrainerPartyMember0 gTrainerParty_Lydia3[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Lydia4[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lydia4[] = { { .iv = 30, .level = 28, @@ -7645,7 +7645,7 @@ const struct TrainerPartyMember0 gTrainerParty_Lydia4[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Lydia5[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lydia5[] = { { .iv = 40, .level = 31, @@ -7678,7 +7678,7 @@ const struct TrainerPartyMember0 gTrainerParty_Lydia5[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Jackson1[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jackson1[] = { { .iv = 50, .level = 28, @@ -7686,7 +7686,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jackson1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Carlos[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Carlos[] = { { .iv = 50, .level = 29, @@ -7704,7 +7704,7 @@ const struct TrainerPartyMember0 gTrainerParty_Carlos[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Sebastian[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Sebastian[] = { { .iv = 50, .level = 39, @@ -7712,7 +7712,7 @@ const struct TrainerPartyMember0 gTrainerParty_Sebastian[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Jackson2[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jackson2[] = { { .iv = 60, .level = 31, @@ -7720,7 +7720,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jackson2[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Jackson3[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jackson3[] = { { .iv = 70, .level = 34, @@ -7728,7 +7728,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jackson3[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Jackson4[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jackson4[] = { { .iv = 80, .level = 37, @@ -7736,7 +7736,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jackson4[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Jackson5[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jackson5[] = { { .iv = 90, .level = 39, @@ -7749,7 +7749,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jackson5[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Catherine1[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Catherine1[] = { { .iv = 50, .level = 27, @@ -7762,7 +7762,7 @@ const struct TrainerPartyMember0 gTrainerParty_Catherine1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Jenna[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jenna[] = { { .iv = 50, .level = 29, @@ -7780,7 +7780,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jenna[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Sophia[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Sophia[] = { { .iv = 50, .level = 38, @@ -7793,7 +7793,7 @@ const struct TrainerPartyMember0 gTrainerParty_Sophia[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Catherine2[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Catherine2[] = { { .iv = 60, .level = 30, @@ -7806,7 +7806,7 @@ const struct TrainerPartyMember0 gTrainerParty_Catherine2[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Catherine3[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Catherine3[] = { { .iv = 70, .level = 33, @@ -7819,7 +7819,7 @@ const struct TrainerPartyMember0 gTrainerParty_Catherine3[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Catherine4[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Catherine4[] = { { .iv = 80, .level = 36, @@ -7832,7 +7832,7 @@ const struct TrainerPartyMember0 gTrainerParty_Catherine4[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Catherine5[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Catherine5[] = { { .iv = 90, .level = 39, @@ -7845,7 +7845,7 @@ const struct TrainerPartyMember0 gTrainerParty_Catherine5[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Maxie1[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Maxie1[] = { { .iv = 0, .level = 17, @@ -7858,7 +7858,7 @@ const struct TrainerPartyMember0 gTrainerParty_Maxie1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Grunt28[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt28[] = { { .iv = 0, .level = 32, @@ -7871,7 +7871,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt28[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Grunt29[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt29[] = { { .iv = 0, .level = 30, @@ -7894,7 +7894,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt29[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Grunt30[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt30[] = { { .iv = 0, .level = 32, @@ -7907,7 +7907,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt30[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Grunt31[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt31[] = { { .iv = 0, .level = 33, @@ -7915,7 +7915,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt31[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Grunt32[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt32[] = { { .iv = 0, .level = 37, @@ -7928,7 +7928,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt32[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Grunt33[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt33[] = { { .iv = 0, .level = 38, @@ -7936,7 +7936,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt33[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Grunt34[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt34[] = { { .iv = 0, .level = 36, @@ -7954,7 +7954,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt34[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Grunt35[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt35[] = { { .iv = 0, .level = 17, @@ -7962,7 +7962,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt35[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Grunt36[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt36[] = { { .iv = 0, .level = 9, @@ -7970,7 +7970,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt36[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Grunt37[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt37[] = { { .iv = 0, .level = 9, @@ -7983,7 +7983,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt37[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Grunt38[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt38[] = { { .iv = 0, .level = 16, @@ -7996,7 +7996,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt38[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Grunt39[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt39[] = { { .iv = 0, .level = 16, @@ -8009,7 +8009,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt39[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Grunt40[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt40[] = { { .iv = 0, .level = 20, @@ -8022,7 +8022,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt40[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Grunt41[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt41[] = { { .iv = 0, .level = 17, @@ -8035,7 +8035,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt41[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Grunt42[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt42[] = { { .iv = 0, .level = 11, @@ -8043,7 +8043,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt42[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Grunt43[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt43[] = { { .iv = 0, .level = 27, @@ -8056,7 +8056,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt43[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Grunt44[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt44[] = { { .iv = 0, .level = 27, @@ -8069,7 +8069,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt44[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Grunt45[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt45[] = { { .iv = 0, .level = 26, @@ -8087,7 +8087,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt45[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Grunt46[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt46[] = { { .iv = 0, .level = 15, @@ -8095,7 +8095,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt46[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Grunt47[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt47[] = { { .iv = 0, .level = 14, @@ -8108,7 +8108,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt47[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Grunt48[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt48[] = { { .iv = 0, .level = 17, @@ -8116,7 +8116,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt48[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Grunt49[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt49[] = { { .iv = 0, .level = 30, @@ -8134,7 +8134,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt49[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Grunt50[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt50[] = { { .iv = 0, .level = 31, @@ -8147,7 +8147,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt50[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Grunt51[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt51[] = { { .iv = 0, .level = 31, @@ -8160,7 +8160,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt51[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Grunt52[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt52[] = { { .iv = 0, .level = 28, @@ -8168,7 +8168,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt52[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Grunt53[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt53[] = { { .iv = 0, .level = 31, @@ -8186,7 +8186,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt53[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Grunt54[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt54[] = { { .iv = 0, .level = 33, @@ -8194,7 +8194,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt54[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Anonymous14[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Anonymous14[] = { { .iv = 50, .level = 30, @@ -8207,7 +8207,7 @@ const struct TrainerPartyMember0 gTrainerParty_Anonymous14[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Anonymous15[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Anonymous15[] = { { .iv = 50, .level = 30, @@ -8220,7 +8220,7 @@ const struct TrainerPartyMember0 gTrainerParty_Anonymous15[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Tabitha1[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tabitha1[] = { { .iv = 50, .level = 32, @@ -8238,7 +8238,7 @@ const struct TrainerPartyMember0 gTrainerParty_Tabitha1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Tabitha2[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tabitha2[] = { { .iv = 50, .level = 20, @@ -8256,7 +8256,7 @@ const struct TrainerPartyMember0 gTrainerParty_Tabitha2[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Anonymous16[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Anonymous16[] = { { .iv = 50, .level = 21, @@ -8269,7 +8269,7 @@ const struct TrainerPartyMember0 gTrainerParty_Anonymous16[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Courtney1[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Courtney1[] = { { .iv = 50, .level = 28, @@ -8282,7 +8282,7 @@ const struct TrainerPartyMember0 gTrainerParty_Courtney1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Courtney2[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Courtney2[] = { { .iv = 50, .level = 38, @@ -8295,7 +8295,7 @@ const struct TrainerPartyMember0 gTrainerParty_Courtney2[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Maxie2[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Maxie2[] = { { .iv = 150, .level = 41, @@ -8313,7 +8313,7 @@ const struct TrainerPartyMember0 gTrainerParty_Maxie2[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Maxie3[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Maxie3[] = { { .iv = 150, .level = 24, @@ -8331,7 +8331,7 @@ const struct TrainerPartyMember0 gTrainerParty_Maxie3[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Tiana[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tiana[] = { { .iv = 0, .level = 4, @@ -8344,7 +8344,7 @@ const struct TrainerPartyMember0 gTrainerParty_Tiana[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Haley1[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Haley1[] = { { .iv = 0, .level = 7, @@ -8357,7 +8357,7 @@ const struct TrainerPartyMember0 gTrainerParty_Haley1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Janice[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Janice[] = { { .iv = 0, .level = 10, @@ -8365,7 +8365,7 @@ const struct TrainerPartyMember0 gTrainerParty_Janice[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Vivi[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Vivi[] = { { .iv = 100, .level = 15, @@ -8383,7 +8383,7 @@ const struct TrainerPartyMember0 gTrainerParty_Vivi[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Haley2[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Haley2[] = { { .iv = 10, .level = 26, @@ -8396,7 +8396,7 @@ const struct TrainerPartyMember0 gTrainerParty_Haley2[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Haley3[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Haley3[] = { { .iv = 20, .level = 29, @@ -8409,7 +8409,7 @@ const struct TrainerPartyMember0 gTrainerParty_Haley3[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Haley4[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Haley4[] = { { .iv = 30, .level = 32, @@ -8422,7 +8422,7 @@ const struct TrainerPartyMember0 gTrainerParty_Haley4[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Haley5[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Haley5[] = { { .iv = 40, .level = 34, @@ -8440,7 +8440,7 @@ const struct TrainerPartyMember0 gTrainerParty_Haley5[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Sally[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Sally[] = { { .iv = 0, .level = 16, @@ -8448,7 +8448,7 @@ const struct TrainerPartyMember0 gTrainerParty_Sally[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Robin[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Robin[] = { { .iv = 0, .level = 14, @@ -8466,7 +8466,7 @@ const struct TrainerPartyMember0 gTrainerParty_Robin[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Andrea[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Andrea[] = { { .iv = 100, .level = 41, @@ -8474,7 +8474,7 @@ const struct TrainerPartyMember0 gTrainerParty_Andrea[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Crissy[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Crissy[] = { { .iv = 100, .level = 40, @@ -8487,7 +8487,7 @@ const struct TrainerPartyMember0 gTrainerParty_Crissy[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Rick[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Rick[] = { { .iv = 0, .level = 4, @@ -8500,7 +8500,7 @@ const struct TrainerPartyMember0 gTrainerParty_Rick[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Lyle[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lyle[] = { { .iv = 0, .level = 3, @@ -8533,7 +8533,7 @@ const struct TrainerPartyMember0 gTrainerParty_Lyle[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Jose[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jose[] = { { .iv = 50, .level = 8, @@ -8551,7 +8551,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jose[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Doug[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Doug[] = { { .iv = 0, .level = 26, @@ -8564,7 +8564,7 @@ const struct TrainerPartyMember0 gTrainerParty_Doug[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Greg[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Greg[] = { { .iv = 0, .level = 26, @@ -8577,7 +8577,7 @@ const struct TrainerPartyMember0 gTrainerParty_Greg[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Kent[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kent[] = { { .iv = 0, .level = 26, @@ -8585,7 +8585,7 @@ const struct TrainerPartyMember0 gTrainerParty_Kent[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_James1[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_James1[] = { { .iv = 0, .level = 8, @@ -8593,7 +8593,7 @@ const struct TrainerPartyMember0 gTrainerParty_James1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_James2[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_James2[] = { { .iv = 10, .level = 27, @@ -8601,7 +8601,7 @@ const struct TrainerPartyMember0 gTrainerParty_James2[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_James3[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_James3[] = { { .iv = 20, .level = 29, @@ -8614,7 +8614,7 @@ const struct TrainerPartyMember0 gTrainerParty_James3[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_James4[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_James4[] = { { .iv = 30, .level = 31, @@ -8632,7 +8632,7 @@ const struct TrainerPartyMember0 gTrainerParty_James4[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_James5[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_James5[] = { { .iv = 40, .level = 33, @@ -8655,7 +8655,7 @@ const struct TrainerPartyMember0 gTrainerParty_James5[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Brice[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brice[] = { { .iv = 0, .level = 18, @@ -8668,7 +8668,7 @@ const struct TrainerPartyMember0 gTrainerParty_Brice[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Trent1[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Trent1[] = { { .iv = 0, .level = 16, @@ -8691,7 +8691,7 @@ const struct TrainerPartyMember0 gTrainerParty_Trent1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Lenny[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lenny[] = { { .iv = 0, .level = 19, @@ -8704,7 +8704,7 @@ const struct TrainerPartyMember0 gTrainerParty_Lenny[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Lucas1[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lucas1[] = { { .iv = 0, .level = 18, @@ -8722,7 +8722,7 @@ const struct TrainerPartyMember0 gTrainerParty_Lucas1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Alan[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Alan[] = { { .iv = 0, .level = 22, @@ -8740,7 +8740,7 @@ const struct TrainerPartyMember0 gTrainerParty_Alan[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Clark[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Clark[] = { { .iv = 0, .level = 8, @@ -8758,7 +8758,7 @@ const struct TrainerPartyMember0 gTrainerParty_Clark[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Eric[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Eric[] = { { .iv = 0, .level = 21, @@ -8771,7 +8771,7 @@ const struct TrainerPartyMember0 gTrainerParty_Eric[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Lucas2[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Lucas2[] = { { .iv = 0, .level = 9, @@ -8780,7 +8780,7 @@ const struct TrainerPartyMember1 gTrainerParty_Lucas2[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Mike1[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Mike1[] = { { .iv = 0, .level = 10, @@ -8795,7 +8795,7 @@ const struct TrainerPartyMember1 gTrainerParty_Mike1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Mike2[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Mike2[] = { { .iv = 0, .level = 16, @@ -8813,7 +8813,7 @@ const struct TrainerPartyMember0 gTrainerParty_Mike2[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Trent2[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Trent2[] = { { .iv = 10, .level = 24, @@ -8836,7 +8836,7 @@ const struct TrainerPartyMember0 gTrainerParty_Trent2[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Trent3[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Trent3[] = { { .iv = 20, .level = 27, @@ -8859,7 +8859,7 @@ const struct TrainerPartyMember0 gTrainerParty_Trent3[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Trent4[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Trent4[] = { { .iv = 30, .level = 30, @@ -8882,7 +8882,7 @@ const struct TrainerPartyMember0 gTrainerParty_Trent4[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Trent5[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Trent5[] = { { .iv = 40, .level = 33, @@ -8905,7 +8905,7 @@ const struct TrainerPartyMember0 gTrainerParty_Trent5[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_DezAndLuke[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_DezAndLuke[] = { { .iv = 0, .level = 32, @@ -8918,7 +8918,7 @@ const struct TrainerPartyMember0 gTrainerParty_DezAndLuke[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_LeaAndJed[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_LeaAndJed[] = { { .iv = 0, .level = 45, @@ -8931,7 +8931,7 @@ const struct TrainerPartyMember0 gTrainerParty_LeaAndJed[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_LoisAndHal1[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_LoisAndHal1[] = { { .iv = 0, .level = 27, @@ -8944,7 +8944,7 @@ const struct TrainerPartyMember0 gTrainerParty_LoisAndHal1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_LoisAndHal2[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_LoisAndHal2[] = { { .iv = 10, .level = 30, @@ -8957,7 +8957,7 @@ const struct TrainerPartyMember0 gTrainerParty_LoisAndHal2[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_LoisAndHal3[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_LoisAndHal3[] = { { .iv = 20, .level = 33, @@ -8970,7 +8970,7 @@ const struct TrainerPartyMember0 gTrainerParty_LoisAndHal3[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_LoisAndHal4[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_LoisAndHal4[] = { { .iv = 30, .level = 36, @@ -8983,7 +8983,7 @@ const struct TrainerPartyMember0 gTrainerParty_LoisAndHal4[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_LoisAndHal5[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_LoisAndHal5[] = { { .iv = 40, .level = 39, @@ -8996,7 +8996,7 @@ const struct TrainerPartyMember0 gTrainerParty_LoisAndHal5[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Johanna[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Johanna[] = { { .iv = 0, .level = 13, @@ -9004,7 +9004,7 @@ const struct TrainerPartyMember0 gTrainerParty_Johanna[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Zane[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Zane[] = { { .iv = 100, .level = 24, @@ -9013,7 +9013,7 @@ const struct TrainerPartyMember1 gTrainerParty_Zane[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Vivian[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Vivian[] = { { .iv = 100, .level = 19, @@ -9022,7 +9022,7 @@ const struct TrainerPartyMember1 gTrainerParty_Vivian[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Sadie[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Sadie[] = { { .iv = 100, .level = 24, @@ -9031,7 +9031,7 @@ const struct TrainerPartyMember1 gTrainerParty_Sadie[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Hideo2[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Hideo2[] = { { .iv = 0, .level = 26, @@ -9046,7 +9046,7 @@ const struct TrainerPartyMember1 gTrainerParty_Hideo2[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Keigo[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Keigo[] = { { .iv = 0, .level = 29, @@ -9061,7 +9061,7 @@ const struct TrainerPartyMember1 gTrainerParty_Keigo[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Tsunao[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Tsunao[] = { { .iv = 0, .level = 28, @@ -9082,7 +9082,7 @@ const struct TrainerPartyMember1 gTrainerParty_Tsunao[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Terrell[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Terrell[] = { { .iv = 100, .level = 29, @@ -9095,7 +9095,7 @@ const struct TrainerPartyMember0 gTrainerParty_Terrell[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Kylee[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kylee[] = { { .iv = 100, .level = 30, @@ -9103,7 +9103,7 @@ const struct TrainerPartyMember0 gTrainerParty_Kylee[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Wally2[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Wally2[] = { { .iv = 30, .level = 16, @@ -9111,7 +9111,7 @@ const struct TrainerPartyMember0 gTrainerParty_Wally2[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Wally3[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Wally3[] = { { .iv = 150, .level = 47, @@ -9144,7 +9144,7 @@ const struct TrainerPartyMember1 gTrainerParty_Wally3[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Wally4[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Wally4[] = { { .iv = 150, .level = 50, @@ -9177,7 +9177,7 @@ const struct TrainerPartyMember1 gTrainerParty_Wally4[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Wally5[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Wally5[] = { { .iv = 150, .level = 53, @@ -9210,7 +9210,7 @@ const struct TrainerPartyMember1 gTrainerParty_Wally5[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Wally6[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Wally6[] = { { .iv = 150, .level = 56, @@ -9243,7 +9243,7 @@ const struct TrainerPartyMember1 gTrainerParty_Wally6[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Brendan10[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan10[] = { { .iv = 150, .level = 31, @@ -9266,7 +9266,7 @@ const struct TrainerPartyMember0 gTrainerParty_Brendan10[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Brendan11[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan11[] = { { .iv = 150, .level = 31, @@ -9289,7 +9289,7 @@ const struct TrainerPartyMember0 gTrainerParty_Brendan11[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Brendan12[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan12[] = { { .iv = 150, .level = 31, @@ -9312,7 +9312,7 @@ const struct TrainerPartyMember0 gTrainerParty_Brendan12[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_May10[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_May10[] = { { .iv = 150, .level = 31, @@ -9335,7 +9335,7 @@ const struct TrainerPartyMember0 gTrainerParty_May10[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_May11[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_May11[] = { { .iv = 150, .level = 31, @@ -9358,7 +9358,7 @@ const struct TrainerPartyMember0 gTrainerParty_May11[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_May12[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_May12[] = { { .iv = 150, .level = 31, @@ -9381,7 +9381,7 @@ const struct TrainerPartyMember0 gTrainerParty_May12[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Jonah[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jonah[] = { { .iv = 0, .level = 34, @@ -9404,7 +9404,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jonah[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Henry[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Henry[] = { { .iv = 0, .level = 31, @@ -9422,7 +9422,7 @@ const struct TrainerPartyMember0 gTrainerParty_Henry[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Roger[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Roger[] = { { .iv = 0, .level = 15, @@ -9445,7 +9445,7 @@ const struct TrainerPartyMember0 gTrainerParty_Roger[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Alexa[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Alexa[] = { { .iv = 100, .level = 35, @@ -9458,7 +9458,7 @@ const struct TrainerPartyMember0 gTrainerParty_Alexa[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Ruben[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ruben[] = { { .iv = 100, .level = 34, @@ -9476,7 +9476,7 @@ const struct TrainerPartyMember0 gTrainerParty_Ruben[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Koji[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Koji[] = { { .iv = 100, .level = 34, @@ -9489,7 +9489,7 @@ const struct TrainerPartyMember0 gTrainerParty_Koji[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Wayne[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Wayne[] = { { .iv = 0, .level = 30, @@ -9512,7 +9512,7 @@ const struct TrainerPartyMember0 gTrainerParty_Wayne[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Byron[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Byron[] = { { .iv = 0, .level = 34, @@ -9525,7 +9525,7 @@ const struct TrainerPartyMember0 gTrainerParty_Byron[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Reed[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Reed[] = { { .iv = 0, .level = 32, @@ -9548,7 +9548,7 @@ const struct TrainerPartyMember0 gTrainerParty_Reed[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Tisha[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tisha[] = { { .iv = 0, .level = 33, @@ -9566,7 +9566,7 @@ const struct TrainerPartyMember0 gTrainerParty_Tisha[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_ToriAndTia[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_ToriAndTia[] = { { .iv = 0, .level = 20, @@ -9579,7 +9579,7 @@ const struct TrainerPartyMember0 gTrainerParty_ToriAndTia[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_KimAndIris[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_KimAndIris[] = { { .iv = 0, .level = 34, @@ -9594,7 +9594,7 @@ const struct TrainerPartyMember1 gTrainerParty_KimAndIris[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_TyraAndIvy[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_TyraAndIvy[] = { { .iv = 0, .level = 19, @@ -9609,7 +9609,7 @@ const struct TrainerPartyMember1 gTrainerParty_TyraAndIvy[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_MelAndPaul[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_MelAndPaul[] = { { .iv = 0, .level = 27, @@ -9624,7 +9624,7 @@ const struct TrainerPartyMember1 gTrainerParty_MelAndPaul[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_JohnAndJay1[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_JohnAndJay1[] = { { .iv = 200, .level = 40, @@ -9639,7 +9639,7 @@ const struct TrainerPartyMember1 gTrainerParty_JohnAndJay1[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_JohnAndJay2[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_JohnAndJay2[] = { { .iv = 210, .level = 43, @@ -9654,7 +9654,7 @@ const struct TrainerPartyMember1 gTrainerParty_JohnAndJay2[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_JohnAndJay3[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_JohnAndJay3[] = { { .iv = 220, .level = 46, @@ -9669,7 +9669,7 @@ const struct TrainerPartyMember1 gTrainerParty_JohnAndJay3[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_JohnAndJay4[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_JohnAndJay4[] = { { .iv = 230, .level = 49, @@ -9684,7 +9684,7 @@ const struct TrainerPartyMember1 gTrainerParty_JohnAndJay4[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_JohnAndJay5[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_JohnAndJay5[] = { { .iv = 240, .level = 52, @@ -9699,7 +9699,7 @@ const struct TrainerPartyMember1 gTrainerParty_JohnAndJay5[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_ReliAndIan[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_ReliAndIan[] = { { .iv = 0, .level = 36, @@ -9712,7 +9712,7 @@ const struct TrainerPartyMember0 gTrainerParty_ReliAndIan[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_RitaAndSam1[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_RitaAndSam1[] = { { .iv = 0, .level = 36, @@ -9725,7 +9725,7 @@ const struct TrainerPartyMember0 gTrainerParty_RitaAndSam1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_RitaAndSam2[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_RitaAndSam2[] = { { .iv = 0, .level = 42, @@ -9738,7 +9738,7 @@ const struct TrainerPartyMember0 gTrainerParty_RitaAndSam2[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_RitaAndSam3[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_RitaAndSam3[] = { { .iv = 0, .level = 45, @@ -9751,7 +9751,7 @@ const struct TrainerPartyMember0 gTrainerParty_RitaAndSam3[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_RitaAndSam4[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_RitaAndSam4[] = { { .iv = 0, .level = 48, @@ -9764,7 +9764,7 @@ const struct TrainerPartyMember0 gTrainerParty_RitaAndSam4[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_RitaAndSam5[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_RitaAndSam5[] = { { .iv = 0, .level = 51, @@ -9777,7 +9777,7 @@ const struct TrainerPartyMember0 gTrainerParty_RitaAndSam5[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_LisaAndRay[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_LisaAndRay[] = { { .iv = 0, .level = 28, @@ -9790,7 +9790,7 @@ const struct TrainerPartyMember0 gTrainerParty_LisaAndRay[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Eugene[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Eugene[] = { { .iv = 0, .level = 30, diff --git a/src/data/trainers_de.h b/src/data/trainers_de.h index 7344347e1..46d64d8dc 100644 --- a/src/data/trainers_de.h +++ b/src/data/trainers_de.h @@ -10,7 +10,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x0, .partySize = 0, - .party = NULL + .party = {.NoItemDefaultMoves = NULL } }, [TRAINER_ARCHIE_1] = @@ -24,7 +24,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 2, - .party = gTrainerParty_Archie1 + .party = {.NoItemDefaultMoves = gTrainerParty_Archie1 } }, [TRAINER_GRUNT_1] = @@ -38,7 +38,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Grunt1 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt1 } }, [TRAINER_GRUNT_2] = @@ -52,7 +52,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 4, - .party = gTrainerParty_Grunt2 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt2 } }, [TRAINER_GRUNT_3] = @@ -66,7 +66,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Grunt3 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt3 } }, [TRAINER_GRUNT_4] = @@ -80,7 +80,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Grunt4 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt4 } }, [TRAINER_GRUNT_5] = @@ -94,7 +94,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Grunt5 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt5 } }, [TRAINER_GRUNT_6] = @@ -108,7 +108,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Grunt6 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt6 } }, [TRAINER_GRUNT_7] = @@ -122,7 +122,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Grunt7 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt7 } }, [TRAINER_GRUNT_8] = @@ -136,7 +136,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Grunt8 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt8 } }, [TRAINER_GRUNT_9] = @@ -150,7 +150,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Grunt9 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt9 } }, [TRAINER_GRUNT_10] = @@ -164,7 +164,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Grunt10 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt10 } }, [TRAINER_GRUNT_11] = @@ -178,7 +178,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Grunt11 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt11 } }, [TRAINER_GRUNT_12] = @@ -192,7 +192,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Grunt12 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt12 } }, [TRAINER_GRUNT_13] = @@ -206,7 +206,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Grunt13 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt13 } }, [TRAINER_GRUNT_14] = @@ -220,7 +220,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Grunt14 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt14 } }, [TRAINER_GRUNT_15] = @@ -234,7 +234,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Grunt15 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt15 } }, [TRAINER_GRUNT_16] = @@ -248,7 +248,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Grunt16 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt16 } }, [TRAINER_GRUNT_17] = @@ -262,7 +262,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Grunt17 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt17 } }, [TRAINER_GRUNT_18] = @@ -276,7 +276,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Grunt18 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt18 } }, [TRAINER_GRUNT_19] = @@ -290,7 +290,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Grunt19 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt19 } }, [TRAINER_GRUNT_20] = @@ -304,7 +304,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Grunt20 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt20 } }, [TRAINER_GRUNT_21] = @@ -318,7 +318,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Grunt21 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt21 } }, [TRAINER_GRUNT_22] = @@ -332,7 +332,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Grunt22 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt22 } }, [TRAINER_GRUNT_23] = @@ -346,7 +346,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Grunt23 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt23 } }, [TRAINER_GRUNT_24] = @@ -360,7 +360,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Grunt24 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt24 } }, [TRAINER_GRUNT_25] = @@ -374,7 +374,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Grunt25 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt25 } }, [TRAINER_GRUNT_26] = @@ -388,7 +388,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Grunt26 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt26 } }, [TRAINER_GRUNT_27] = @@ -402,7 +402,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Grunt27 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt27 } }, [TRAINER_ANONYMOUS_1] = @@ -416,7 +416,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 2, - .party = gTrainerParty_Anonymous1 + .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous1 } }, [TRAINER_MATT_1] = @@ -430,7 +430,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Matt1 + .party = {.NoItemDefaultMoves = gTrainerParty_Matt1 } }, [TRAINER_MATT_2] = @@ -444,7 +444,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0xb, .partySize = 3, - .party = gTrainerParty_Matt2 + .party = {.NoItemDefaultMoves = gTrainerParty_Matt2 } }, [TRAINER_SHELLY_1] = @@ -458,7 +458,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 2, - .party = gTrainerParty_Shelly1 + .party = {.NoItemDefaultMoves = gTrainerParty_Shelly1 } }, [TRAINER_SHELLY_2] = @@ -472,7 +472,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 2, - .party = gTrainerParty_Shelly2 + .party = {.NoItemDefaultMoves = gTrainerParty_Shelly2 } }, [TRAINER_ARCHIE_2] = @@ -486,7 +486,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Archie2 + .party = {.NoItemDefaultMoves = gTrainerParty_Archie2 } }, [TRAINER_ARCHIE_3] = @@ -500,7 +500,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Archie3 + .party = {.NoItemDefaultMoves = gTrainerParty_Archie3 } }, [TRAINER_DAISY] = @@ -514,7 +514,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Daisy + .party = {.NoItemDefaultMoves = gTrainerParty_Daisy } }, [TRAINER_ROSE_1] = @@ -528,7 +528,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Rose1 + .party = {.NoItemDefaultMoves = gTrainerParty_Rose1 } }, [TRAINER_LILY] = @@ -542,7 +542,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Lily + .party = {.NoItemDefaultMoves = gTrainerParty_Lily } }, [TRAINER_VIOLET] = @@ -556,7 +556,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Violet + .party = {.NoItemDefaultMoves = gTrainerParty_Violet } }, [TRAINER_ROSE_2] = @@ -570,7 +570,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Rose2 + .party = {.NoItemDefaultMoves = gTrainerParty_Rose2 } }, [TRAINER_ROSE_3] = @@ -584,7 +584,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Rose3 + .party = {.NoItemDefaultMoves = gTrainerParty_Rose3 } }, [TRAINER_ROSE_4] = @@ -598,7 +598,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Rose4 + .party = {.NoItemDefaultMoves = gTrainerParty_Rose4 } }, [TRAINER_ROSE_5] = @@ -612,7 +612,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Rose5 + .party = {.NoItemDefaultMoves = gTrainerParty_Rose5 } }, [TRAINER_DUSTY_1] = @@ -626,7 +626,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Dusty1 + .party = {.NoItemCustomMoves = gTrainerParty_Dusty1 } }, [TRAINER_CHIP] = @@ -640,7 +640,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Chip + .party = {.NoItemCustomMoves = gTrainerParty_Chip } }, [TRAINER_FOSTER] = @@ -654,7 +654,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Foster + .party = {.NoItemCustomMoves = gTrainerParty_Foster } }, [TRAINER_DUSTY_2] = @@ -668,7 +668,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Dusty2 + .party = {.NoItemCustomMoves = gTrainerParty_Dusty2 } }, [TRAINER_DUSTY_3] = @@ -682,7 +682,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Dusty3 + .party = {.NoItemCustomMoves = gTrainerParty_Dusty3 } }, [TRAINER_DUSTY_4] = @@ -696,7 +696,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Dusty4 + .party = {.NoItemCustomMoves = gTrainerParty_Dusty4 } }, [TRAINER_DUSTY_5] = @@ -710,7 +710,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Dusty5 + .party = {.NoItemCustomMoves = gTrainerParty_Dusty5 } }, [TRAINER_GABBY_AND_TY_1] = @@ -724,7 +724,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_GabbyAndTy1 + .party = {.NoItemDefaultMoves = gTrainerParty_GabbyAndTy1 } }, [TRAINER_GABBY_AND_TY_2] = @@ -738,7 +738,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_GabbyAndTy2 + .party = {.NoItemDefaultMoves = gTrainerParty_GabbyAndTy2 } }, [TRAINER_GABBY_AND_TY_3] = @@ -752,7 +752,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_GabbyAndTy3 + .party = {.NoItemDefaultMoves = gTrainerParty_GabbyAndTy3 } }, [TRAINER_GABBY_AND_TY_4] = @@ -766,7 +766,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_GabbyAndTy4 + .party = {.NoItemDefaultMoves = gTrainerParty_GabbyAndTy4 } }, [TRAINER_GABBY_AND_TY_5] = @@ -780,7 +780,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_GabbyAndTy5 + .party = {.NoItemDefaultMoves = gTrainerParty_GabbyAndTy5 } }, [TRAINER_GABBY_AND_TY_6] = @@ -794,7 +794,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_GabbyAndTy6 + .party = {.NoItemCustomMoves = gTrainerParty_GabbyAndTy6 } }, [TRAINER_LOLA_1] = @@ -808,7 +808,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Lola1 + .party = {.NoItemDefaultMoves = gTrainerParty_Lola1 } }, [TRAINER_CARMEN] = @@ -822,7 +822,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Carmen + .party = {.NoItemDefaultMoves = gTrainerParty_Carmen } }, [TRAINER_GWEN] = @@ -836,7 +836,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Gwen + .party = {.NoItemDefaultMoves = gTrainerParty_Gwen } }, [TRAINER_LOLA_2] = @@ -850,7 +850,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Lola2 + .party = {.NoItemDefaultMoves = gTrainerParty_Lola2 } }, [TRAINER_LOLA_3] = @@ -864,7 +864,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Lola3 + .party = {.NoItemDefaultMoves = gTrainerParty_Lola3 } }, [TRAINER_LOLA_4] = @@ -878,7 +878,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Lola4 + .party = {.NoItemDefaultMoves = gTrainerParty_Lola4 } }, [TRAINER_LOLA_5] = @@ -892,7 +892,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Lola5 + .party = {.NoItemDefaultMoves = gTrainerParty_Lola5 } }, [TRAINER_RICKY_1] = @@ -906,7 +906,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Ricky1 + .party = {.NoItemCustomMoves = gTrainerParty_Ricky1 } }, [TRAINER_SIMON] = @@ -920,7 +920,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Simon + .party = {.NoItemDefaultMoves = gTrainerParty_Simon } }, [TRAINER_CHARLIE] = @@ -934,7 +934,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Charlie + .party = {.NoItemDefaultMoves = gTrainerParty_Charlie } }, [TRAINER_RICKY_2] = @@ -948,7 +948,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Ricky2 + .party = {.NoItemCustomMoves = gTrainerParty_Ricky2 } }, [TRAINER_RICKY_3] = @@ -962,7 +962,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Ricky3 + .party = {.NoItemCustomMoves = gTrainerParty_Ricky3 } }, [TRAINER_RICKY_4] = @@ -976,7 +976,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Ricky4 + .party = {.NoItemCustomMoves = gTrainerParty_Ricky4 } }, [TRAINER_RICKY_5] = @@ -990,7 +990,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Ricky5 + .party = {.NoItemCustomMoves = gTrainerParty_Ricky5 } }, [TRAINER_RANDALL] = @@ -1004,7 +1004,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 1, - .party = gTrainerParty_Randall + .party = {.NoItemDefaultMoves = gTrainerParty_Randall } }, [TRAINER_PARKER] = @@ -1018,7 +1018,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 1, - .party = gTrainerParty_Parker + .party = {.NoItemDefaultMoves = gTrainerParty_Parker } }, [TRAINER_GEORGE] = @@ -1032,7 +1032,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 1, - .party = gTrainerParty_George + .party = {.NoItemDefaultMoves = gTrainerParty_George } }, [TRAINER_BERKE] = @@ -1046,7 +1046,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 1, - .party = gTrainerParty_Berke + .party = {.NoItemDefaultMoves = gTrainerParty_Berke } }, [TRAINER_CLYDE] = @@ -1060,7 +1060,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 5, - .party = gTrainerParty_Clyde + .party = {.NoItemCustomMoves = gTrainerParty_Clyde } }, [TRAINER_VINCENT] = @@ -1074,7 +1074,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Vincent + .party = {.NoItemDefaultMoves = gTrainerParty_Vincent } }, [TRAINER_LEROY] = @@ -1088,7 +1088,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 2, - .party = gTrainerParty_Leroy + .party = {.NoItemDefaultMoves = gTrainerParty_Leroy } }, [TRAINER_WILTON_1] = @@ -1102,7 +1102,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Wilton1 + .party = {.NoItemDefaultMoves = gTrainerParty_Wilton1 } }, [TRAINER_EDGAR] = @@ -1116,7 +1116,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 1, - .party = gTrainerParty_Edgar + .party = {.NoItemDefaultMoves = gTrainerParty_Edgar } }, [TRAINER_ALBERT] = @@ -1130,7 +1130,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 2, - .party = gTrainerParty_Albert + .party = {.NoItemDefaultMoves = gTrainerParty_Albert } }, [TRAINER_SAMUEL] = @@ -1144,7 +1144,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Samuel + .party = {.NoItemDefaultMoves = gTrainerParty_Samuel } }, [TRAINER_VITO] = @@ -1158,7 +1158,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 4, - .party = gTrainerParty_Vito + .party = {.NoItemDefaultMoves = gTrainerParty_Vito } }, [TRAINER_OWEN] = @@ -1172,7 +1172,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Owen + .party = {.NoItemDefaultMoves = gTrainerParty_Owen } }, [TRAINER_WILTON_2] = @@ -1186,7 +1186,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Wilton2 + .party = {.NoItemDefaultMoves = gTrainerParty_Wilton2 } }, [TRAINER_WILTON_3] = @@ -1200,7 +1200,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Wilton3 + .party = {.NoItemDefaultMoves = gTrainerParty_Wilton3 } }, [TRAINER_WILTON_4] = @@ -1214,7 +1214,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Wilton4 + .party = {.NoItemDefaultMoves = gTrainerParty_Wilton4 } }, [TRAINER_WILTON_5] = @@ -1228,7 +1228,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Wilton5 + .party = {.NoItemDefaultMoves = gTrainerParty_Wilton5 } }, [TRAINER_WARREN] = @@ -1242,7 +1242,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Warren + .party = {.NoItemDefaultMoves = gTrainerParty_Warren } }, [TRAINER_MARY] = @@ -1256,7 +1256,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 1, - .party = gTrainerParty_Mary + .party = {.NoItemDefaultMoves = gTrainerParty_Mary } }, [TRAINER_LORI] = @@ -1270,7 +1270,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 1, - .party = gTrainerParty_Lori + .party = {.NoItemDefaultMoves = gTrainerParty_Lori } }, [TRAINER_JODY] = @@ -1284,7 +1284,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0xb, .partySize = 1, - .party = gTrainerParty_Jody + .party = {.NoItemDefaultMoves = gTrainerParty_Jody } }, [TRAINER_WENDY] = @@ -1298,7 +1298,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0xb, .partySize = 3, - .party = gTrainerParty_Wendy + .party = {.NoItemCustomMoves = gTrainerParty_Wendy } }, [TRAINER_ELAINE] = @@ -1312,7 +1312,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0xb, .partySize = 2, - .party = gTrainerParty_Elaine + .party = {.NoItemDefaultMoves = gTrainerParty_Elaine } }, [TRAINER_BROOKE_1] = @@ -1326,7 +1326,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Brooke1 + .party = {.NoItemDefaultMoves = gTrainerParty_Brooke1 } }, [TRAINER_JENNIFER] = @@ -1340,7 +1340,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 1, - .party = gTrainerParty_Jennifer + .party = {.NoItemDefaultMoves = gTrainerParty_Jennifer } }, [TRAINER_HOPE] = @@ -1354,7 +1354,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 1, - .party = gTrainerParty_Hope + .party = {.NoItemDefaultMoves = gTrainerParty_Hope } }, [TRAINER_SHANNON] = @@ -1368,7 +1368,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 1, - .party = gTrainerParty_Shannon + .party = {.NoItemDefaultMoves = gTrainerParty_Shannon } }, [TRAINER_MICHELLE] = @@ -1382,7 +1382,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Michelle + .party = {.NoItemDefaultMoves = gTrainerParty_Michelle } }, [TRAINER_CAROLINE] = @@ -1396,7 +1396,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 2, - .party = gTrainerParty_Caroline + .party = {.NoItemDefaultMoves = gTrainerParty_Caroline } }, [TRAINER_JULIE] = @@ -1410,7 +1410,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 2, - .party = gTrainerParty_Julie + .party = {.NoItemDefaultMoves = gTrainerParty_Julie } }, [TRAINER_BROOKE_2] = @@ -1424,7 +1424,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Brooke2 + .party = {.NoItemDefaultMoves = gTrainerParty_Brooke2 } }, [TRAINER_BROOKE_3] = @@ -1438,7 +1438,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Brooke3 + .party = {.NoItemDefaultMoves = gTrainerParty_Brooke3 } }, [TRAINER_BROOKE_4] = @@ -1452,7 +1452,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Brooke4 + .party = {.NoItemDefaultMoves = gTrainerParty_Brooke4 } }, [TRAINER_BROOKE_5] = @@ -1466,7 +1466,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Brooke5 + .party = {.NoItemDefaultMoves = gTrainerParty_Brooke5 } }, [TRAINER_PATRICIA] = @@ -1480,7 +1480,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Patricia + .party = {.NoItemDefaultMoves = gTrainerParty_Patricia } }, [TRAINER_KINDRA] = @@ -1494,7 +1494,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Kindra + .party = {.NoItemDefaultMoves = gTrainerParty_Kindra } }, [TRAINER_TAMMY] = @@ -1508,7 +1508,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Tammy + .party = {.NoItemDefaultMoves = gTrainerParty_Tammy } }, [TRAINER_VALERIE_1] = @@ -1522,7 +1522,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Valerie1 + .party = {.NoItemDefaultMoves = gTrainerParty_Valerie1 } }, [TRAINER_TASHA] = @@ -1536,7 +1536,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Tasha + .party = {.NoItemDefaultMoves = gTrainerParty_Tasha } }, [TRAINER_VALERIE_2] = @@ -1550,7 +1550,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Valerie2 + .party = {.NoItemDefaultMoves = gTrainerParty_Valerie2 } }, [TRAINER_VALERIE_3] = @@ -1564,7 +1564,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Valerie3 + .party = {.NoItemDefaultMoves = gTrainerParty_Valerie3 } }, [TRAINER_VALERIE_4] = @@ -1578,7 +1578,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Valerie4 + .party = {.NoItemDefaultMoves = gTrainerParty_Valerie4 } }, [TRAINER_VALERIE_5] = @@ -1592,7 +1592,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Valerie5 + .party = {.NoItemDefaultMoves = gTrainerParty_Valerie5 } }, [TRAINER_CINDY_1] = @@ -1606,7 +1606,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Cindy1 + .party = {.ItemDefaultMoves = gTrainerParty_Cindy1 } }, [TRAINER_ANONYMOUS_2] = @@ -1620,7 +1620,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Anonymous2 + .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous2 } }, [TRAINER_BRIANNA_1] = @@ -1634,7 +1634,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Brianna1 + .party = {.NoItemCustomMoves = gTrainerParty_Brianna1 } }, [TRAINER_CINDY_2] = @@ -1648,7 +1648,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Cindy2 + .party = {.NoItemCustomMoves = gTrainerParty_Cindy2 } }, [TRAINER_BRIANNA_2] = @@ -1662,7 +1662,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Brianna2 + .party = {.ItemDefaultMoves = gTrainerParty_Brianna2 } }, [TRAINER_ANETTE] = @@ -1676,7 +1676,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Anette + .party = {.ItemDefaultMoves = gTrainerParty_Anette } }, [TRAINER_CINDY_3] = @@ -1690,7 +1690,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Cindy3 + .party = {.ItemDefaultMoves = gTrainerParty_Cindy3 } }, [TRAINER_CINDY_4] = @@ -1704,7 +1704,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Cindy4 + .party = {.ItemDefaultMoves = gTrainerParty_Cindy4 } }, [TRAINER_CINDY_5] = @@ -1718,7 +1718,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Cindy5 + .party = {.ItemDefaultMoves = gTrainerParty_Cindy5 } }, [TRAINER_CINDY_6] = @@ -1732,7 +1732,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Cindy6 + .party = {.ItemCustomMoves = gTrainerParty_Cindy6 } }, [TRAINER_MELISSA] = @@ -1746,7 +1746,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Melissa + .party = {.NoItemDefaultMoves = gTrainerParty_Melissa } }, [TRAINER_SHEILA] = @@ -1760,7 +1760,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Sheila + .party = {.NoItemDefaultMoves = gTrainerParty_Sheila } }, [TRAINER_SHIRLEY] = @@ -1774,7 +1774,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Shirley + .party = {.NoItemDefaultMoves = gTrainerParty_Shirley } }, [TRAINER_JESSICA_1] = @@ -1788,7 +1788,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Jessica1 + .party = {.NoItemCustomMoves = gTrainerParty_Jessica1 } }, [TRAINER_CONNIE] = @@ -1802,7 +1802,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Connie + .party = {.NoItemDefaultMoves = gTrainerParty_Connie } }, [TRAINER_BRIDGET] = @@ -1816,7 +1816,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Bridget + .party = {.NoItemDefaultMoves = gTrainerParty_Bridget } }, [TRAINER_OLIVIA] = @@ -1830,7 +1830,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Olivia + .party = {.NoItemCustomMoves = gTrainerParty_Olivia } }, [TRAINER_TIFFANY] = @@ -1844,7 +1844,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Tiffany + .party = {.NoItemDefaultMoves = gTrainerParty_Tiffany } }, [TRAINER_JESSICA_2] = @@ -1858,7 +1858,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Jessica2 + .party = {.NoItemCustomMoves = gTrainerParty_Jessica2 } }, [TRAINER_JESSICA_3] = @@ -1872,7 +1872,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Jessica3 + .party = {.NoItemCustomMoves = gTrainerParty_Jessica3 } }, [TRAINER_JESSICA_4] = @@ -1886,7 +1886,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Jessica4 + .party = {.NoItemCustomMoves = gTrainerParty_Jessica4 } }, [TRAINER_JESSICA_5] = @@ -1900,7 +1900,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Jessica5 + .party = {.NoItemCustomMoves = gTrainerParty_Jessica5 } }, [TRAINER_WINSTON_1] = @@ -1914,7 +1914,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Winston1 + .party = {.ItemDefaultMoves = gTrainerParty_Winston1 } }, [TRAINER_ANONYMOUS_3] = @@ -1928,7 +1928,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Anonymous3 + .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous3 } }, [TRAINER_GARRET] = @@ -1942,7 +1942,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Garret + .party = {.ItemDefaultMoves = gTrainerParty_Garret } }, [TRAINER_WINSTON_2] = @@ -1956,7 +1956,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Winston2 + .party = {.ItemDefaultMoves = gTrainerParty_Winston2 } }, [TRAINER_WINSTON_3] = @@ -1970,7 +1970,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Winston3 + .party = {.ItemDefaultMoves = gTrainerParty_Winston3 } }, [TRAINER_WINSTON_4] = @@ -1984,7 +1984,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Winston4 + .party = {.ItemDefaultMoves = gTrainerParty_Winston4 } }, [TRAINER_WINSTON_5] = @@ -1998,7 +1998,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Winston5 + .party = {.ItemCustomMoves = gTrainerParty_Winston5 } }, [TRAINER_STEVE_1] = @@ -2012,7 +2012,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Steve1 + .party = {.NoItemDefaultMoves = gTrainerParty_Steve1 } }, [TRAINER_CHRIS] = @@ -2026,7 +2026,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Chris + .party = {.NoItemDefaultMoves = gTrainerParty_Chris } }, [TRAINER_MARK] = @@ -2040,7 +2040,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Mark + .party = {.NoItemDefaultMoves = gTrainerParty_Mark } }, [TRAINER_KENN] = @@ -2054,7 +2054,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Kenn + .party = {.NoItemDefaultMoves = gTrainerParty_Kenn } }, [TRAINER_STEVE_2] = @@ -2068,7 +2068,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Steve2 + .party = {.NoItemDefaultMoves = gTrainerParty_Steve2 } }, [TRAINER_STEVE_3] = @@ -2082,7 +2082,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Steve3 + .party = {.NoItemDefaultMoves = gTrainerParty_Steve3 } }, [TRAINER_STEVE_4] = @@ -2096,7 +2096,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Steve4 + .party = {.NoItemDefaultMoves = gTrainerParty_Steve4 } }, [TRAINER_STEVE_5] = @@ -2110,7 +2110,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Steve5 + .party = {.NoItemDefaultMoves = gTrainerParty_Steve5 } }, [TRAINER_LUIS] = @@ -2124,7 +2124,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Luis + .party = {.NoItemDefaultMoves = gTrainerParty_Luis } }, [TRAINER_AUSTIN] = @@ -2138,7 +2138,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Austin + .party = {.NoItemDefaultMoves = gTrainerParty_Austin } }, [TRAINER_DOUGLAS] = @@ -2152,7 +2152,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Douglas + .party = {.NoItemDefaultMoves = gTrainerParty_Douglas } }, [TRAINER_DARRIN] = @@ -2166,7 +2166,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Darrin + .party = {.NoItemDefaultMoves = gTrainerParty_Darrin } }, [TRAINER_TONY_1] = @@ -2180,7 +2180,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Tony1 + .party = {.NoItemDefaultMoves = gTrainerParty_Tony1 } }, [TRAINER_JEROME] = @@ -2194,7 +2194,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Jerome + .party = {.NoItemDefaultMoves = gTrainerParty_Jerome } }, [TRAINER_MATTHEW] = @@ -2208,7 +2208,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Matthew + .party = {.NoItemDefaultMoves = gTrainerParty_Matthew } }, [TRAINER_DAVID] = @@ -2222,7 +2222,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_David + .party = {.NoItemDefaultMoves = gTrainerParty_David } }, [TRAINER_SPENCER] = @@ -2236,7 +2236,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Spencer + .party = {.NoItemDefaultMoves = gTrainerParty_Spencer } }, [TRAINER_ROLAND] = @@ -2250,7 +2250,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Roland + .party = {.NoItemDefaultMoves = gTrainerParty_Roland } }, [TRAINER_CODY] = @@ -2264,7 +2264,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Cody + .party = {.NoItemDefaultMoves = gTrainerParty_Cody } }, [TRAINER_STAN] = @@ -2278,7 +2278,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Stan + .party = {.NoItemDefaultMoves = gTrainerParty_Stan } }, [TRAINER_BARRY] = @@ -2292,7 +2292,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Barry + .party = {.NoItemDefaultMoves = gTrainerParty_Barry } }, [TRAINER_DEAN] = @@ -2306,7 +2306,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Dean + .party = {.NoItemDefaultMoves = gTrainerParty_Dean } }, [TRAINER_RODNEY] = @@ -2320,7 +2320,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Rodney + .party = {.NoItemDefaultMoves = gTrainerParty_Rodney } }, [TRAINER_RICHARD] = @@ -2334,7 +2334,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Richard + .party = {.NoItemDefaultMoves = gTrainerParty_Richard } }, [TRAINER_HERMAN] = @@ -2348,7 +2348,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Herman + .party = {.NoItemDefaultMoves = gTrainerParty_Herman } }, [TRAINER_ANONYMOUS_4] = @@ -2362,7 +2362,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Anonymous4 + .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous4 } }, [TRAINER_GILBERT] = @@ -2376,7 +2376,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Gilbert + .party = {.NoItemDefaultMoves = gTrainerParty_Gilbert } }, [TRAINER_FRANKLIN] = @@ -2390,7 +2390,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Franklin + .party = {.NoItemDefaultMoves = gTrainerParty_Franklin } }, [TRAINER_DANNY] = @@ -2404,7 +2404,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Danny + .party = {.NoItemDefaultMoves = gTrainerParty_Danny } }, [TRAINER_JACK] = @@ -2418,7 +2418,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Jack + .party = {.NoItemDefaultMoves = gTrainerParty_Jack } }, [TRAINER_DUDLEY] = @@ -2432,7 +2432,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Dudley + .party = {.NoItemDefaultMoves = gTrainerParty_Dudley } }, [TRAINER_CHAD] = @@ -2446,7 +2446,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Chad + .party = {.NoItemDefaultMoves = gTrainerParty_Chad } }, [TRAINER_TONY_2] = @@ -2460,7 +2460,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Tony2 + .party = {.NoItemDefaultMoves = gTrainerParty_Tony2 } }, [TRAINER_TONY_3] = @@ -2474,7 +2474,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Tony3 + .party = {.NoItemDefaultMoves = gTrainerParty_Tony3 } }, [TRAINER_TONY_4] = @@ -2488,7 +2488,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Tony4 + .party = {.NoItemDefaultMoves = gTrainerParty_Tony4 } }, [TRAINER_TONY_5] = @@ -2502,7 +2502,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Tony5 + .party = {.NoItemDefaultMoves = gTrainerParty_Tony5 } }, [TRAINER_HIDEKI] = @@ -2516,7 +2516,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Hideki + .party = {.NoItemDefaultMoves = gTrainerParty_Hideki } }, [TRAINER_HITOSHI] = @@ -2530,7 +2530,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Hitoshi + .party = {.NoItemDefaultMoves = gTrainerParty_Hitoshi } }, [TRAINER_KIYO] = @@ -2544,7 +2544,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Kiyo + .party = {.NoItemDefaultMoves = gTrainerParty_Kiyo } }, [TRAINER_KOICHI] = @@ -2558,7 +2558,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Koichi + .party = {.NoItemDefaultMoves = gTrainerParty_Koichi } }, [TRAINER_NOB_1] = @@ -2572,7 +2572,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Nob1 + .party = {.NoItemDefaultMoves = gTrainerParty_Nob1 } }, [TRAINER_NOB_2] = @@ -2586,7 +2586,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Nob2 + .party = {.NoItemDefaultMoves = gTrainerParty_Nob2 } }, [TRAINER_NOB_3] = @@ -2600,7 +2600,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Nob3 + .party = {.NoItemDefaultMoves = gTrainerParty_Nob3 } }, [TRAINER_NOB_4] = @@ -2614,7 +2614,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Nob4 + .party = {.NoItemDefaultMoves = gTrainerParty_Nob4 } }, [TRAINER_NOB_5] = @@ -2628,7 +2628,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 4, - .party = gTrainerParty_Nob5 + .party = {.ItemDefaultMoves = gTrainerParty_Nob5 } }, [TRAINER_YUJI] = @@ -2642,7 +2642,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Yuji + .party = {.NoItemDefaultMoves = gTrainerParty_Yuji } }, [TRAINER_DAISUKE] = @@ -2656,7 +2656,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Daisuke + .party = {.NoItemDefaultMoves = gTrainerParty_Daisuke } }, [TRAINER_ATSUSHI] = @@ -2670,7 +2670,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Atsushi + .party = {.NoItemDefaultMoves = gTrainerParty_Atsushi } }, [TRAINER_KIRK] = @@ -2684,7 +2684,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Kirk + .party = {.NoItemDefaultMoves = gTrainerParty_Kirk } }, [TRAINER_SCOTT] = @@ -2698,7 +2698,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Scott + .party = {.NoItemDefaultMoves = gTrainerParty_Scott } }, [TRAINER_HARVEY] = @@ -2712,7 +2712,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Harvey + .party = {.NoItemDefaultMoves = gTrainerParty_Harvey } }, [TRAINER_SHAWN] = @@ -2726,7 +2726,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Shawn + .party = {.NoItemDefaultMoves = gTrainerParty_Shawn } }, [TRAINER_RANDY] = @@ -2740,7 +2740,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Randy + .party = {.NoItemDefaultMoves = gTrainerParty_Randy } }, [TRAINER_DALTON_1] = @@ -2754,7 +2754,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Dalton1 + .party = {.NoItemDefaultMoves = gTrainerParty_Dalton1 } }, [TRAINER_DALTON_2] = @@ -2768,7 +2768,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Dalton2 + .party = {.NoItemDefaultMoves = gTrainerParty_Dalton2 } }, [TRAINER_DALTON_3] = @@ -2782,7 +2782,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Dalton3 + .party = {.NoItemDefaultMoves = gTrainerParty_Dalton3 } }, [TRAINER_DALTON_4] = @@ -2796,7 +2796,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Dalton4 + .party = {.NoItemDefaultMoves = gTrainerParty_Dalton4 } }, [TRAINER_DALTON_5] = @@ -2810,7 +2810,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Dalton5 + .party = {.NoItemDefaultMoves = gTrainerParty_Dalton5 } }, [TRAINER_COLE] = @@ -2824,7 +2824,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Cole + .party = {.NoItemDefaultMoves = gTrainerParty_Cole } }, [TRAINER_FLINT] = @@ -2838,7 +2838,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Flint + .party = {.NoItemDefaultMoves = gTrainerParty_Flint } }, [TRAINER_AXLE] = @@ -2852,7 +2852,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Axle + .party = {.NoItemDefaultMoves = gTrainerParty_Axle } }, [TRAINER_JAKE] = @@ -2866,7 +2866,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Jake + .party = {.NoItemDefaultMoves = gTrainerParty_Jake } }, [TRAINER_ANDY] = @@ -2880,7 +2880,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Andy + .party = {.NoItemDefaultMoves = gTrainerParty_Andy } }, [TRAINER_BERNIE_1] = @@ -2894,7 +2894,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Bernie1 + .party = {.NoItemDefaultMoves = gTrainerParty_Bernie1 } }, [TRAINER_BERNIE_2] = @@ -2908,7 +2908,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Bernie2 + .party = {.NoItemDefaultMoves = gTrainerParty_Bernie2 } }, [TRAINER_BERNIE_3] = @@ -2922,7 +2922,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Bernie3 + .party = {.NoItemDefaultMoves = gTrainerParty_Bernie3 } }, [TRAINER_BERNIE_4] = @@ -2936,7 +2936,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Bernie4 + .party = {.NoItemDefaultMoves = gTrainerParty_Bernie4 } }, [TRAINER_BERNIE_5] = @@ -2950,7 +2950,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Bernie5 + .party = {.NoItemDefaultMoves = gTrainerParty_Bernie5 } }, [TRAINER_DREW] = @@ -2964,7 +2964,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Drew + .party = {.NoItemCustomMoves = gTrainerParty_Drew } }, [TRAINER_CLIFF] = @@ -2978,7 +2978,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Cliff + .party = {.NoItemCustomMoves = gTrainerParty_Cliff } }, [TRAINER_LARRY] = @@ -2992,7 +2992,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Larry + .party = {.NoItemDefaultMoves = gTrainerParty_Larry } }, [TRAINER_SHANE] = @@ -3006,7 +3006,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Shane + .party = {.NoItemDefaultMoves = gTrainerParty_Shane } }, [TRAINER_JUSTIN] = @@ -3020,7 +3020,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Justin + .party = {.NoItemDefaultMoves = gTrainerParty_Justin } }, [TRAINER_ETHAN_1] = @@ -3034,7 +3034,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Ethan1 + .party = {.NoItemDefaultMoves = gTrainerParty_Ethan1 } }, [TRAINER_JEFF] = @@ -3048,7 +3048,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Jeff + .party = {.NoItemDefaultMoves = gTrainerParty_Jeff } }, [TRAINER_TRAVIS] = @@ -3062,7 +3062,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Travis + .party = {.NoItemDefaultMoves = gTrainerParty_Travis } }, [TRAINER_ETHAN_2] = @@ -3076,7 +3076,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Ethan2 + .party = {.NoItemDefaultMoves = gTrainerParty_Ethan2 } }, [TRAINER_ETHAN_3] = @@ -3090,7 +3090,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Ethan3 + .party = {.NoItemDefaultMoves = gTrainerParty_Ethan3 } }, [TRAINER_ETHAN_4] = @@ -3104,7 +3104,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Ethan4 + .party = {.NoItemDefaultMoves = gTrainerParty_Ethan4 } }, [TRAINER_ETHAN_5] = @@ -3118,7 +3118,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Ethan5 + .party = {.NoItemDefaultMoves = gTrainerParty_Ethan5 } }, [TRAINER_BRENT] = @@ -3132,7 +3132,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Brent + .party = {.NoItemDefaultMoves = gTrainerParty_Brent } }, [TRAINER_DONALD] = @@ -3146,7 +3146,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Donald + .party = {.NoItemDefaultMoves = gTrainerParty_Donald } }, [TRAINER_TAYLOR] = @@ -3160,7 +3160,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Taylor + .party = {.NoItemDefaultMoves = gTrainerParty_Taylor } }, [TRAINER_BRANDON_1] = @@ -3174,7 +3174,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Brandon1 + .party = {.NoItemDefaultMoves = gTrainerParty_Brandon1 } }, [TRAINER_DEREK] = @@ -3188,7 +3188,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Derek + .party = {.NoItemDefaultMoves = gTrainerParty_Derek } }, [TRAINER_BRANDON_2] = @@ -3202,7 +3202,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Brandon2 + .party = {.NoItemDefaultMoves = gTrainerParty_Brandon2 } }, [TRAINER_BRANDON_3] = @@ -3216,7 +3216,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Brandon3 + .party = {.NoItemDefaultMoves = gTrainerParty_Brandon3 } }, [TRAINER_BRANDON_4] = @@ -3230,7 +3230,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 4, - .party = gTrainerParty_Brandon4 + .party = {.NoItemDefaultMoves = gTrainerParty_Brandon4 } }, [TRAINER_BRANDON_5] = @@ -3244,7 +3244,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 5, - .party = gTrainerParty_Brandon5 + .party = {.ItemDefaultMoves = gTrainerParty_Brandon5 } }, [TRAINER_EDWARD] = @@ -3258,7 +3258,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Edward + .party = {.NoItemCustomMoves = gTrainerParty_Edward } }, [TRAINER_PRESTON] = @@ -3272,7 +3272,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Preston + .party = {.NoItemDefaultMoves = gTrainerParty_Preston } }, [TRAINER_VIRGIL] = @@ -3286,7 +3286,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Virgil + .party = {.NoItemDefaultMoves = gTrainerParty_Virgil } }, [TRAINER_FRITZ] = @@ -3300,7 +3300,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Fritz + .party = {.NoItemDefaultMoves = gTrainerParty_Fritz } }, [TRAINER_WILLIAM] = @@ -3314,7 +3314,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_William + .party = {.NoItemDefaultMoves = gTrainerParty_William } }, [TRAINER_JOSHUA] = @@ -3328,7 +3328,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Joshua + .party = {.NoItemDefaultMoves = gTrainerParty_Joshua } }, [TRAINER_CAMERON_1] = @@ -3342,7 +3342,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Cameron1 + .party = {.NoItemDefaultMoves = gTrainerParty_Cameron1 } }, [TRAINER_CAMERON_2] = @@ -3356,7 +3356,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Cameron2 + .party = {.NoItemDefaultMoves = gTrainerParty_Cameron2 } }, [TRAINER_CAMERON_3] = @@ -3370,7 +3370,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Cameron3 + .party = {.NoItemDefaultMoves = gTrainerParty_Cameron3 } }, [TRAINER_CAMERON_4] = @@ -3384,7 +3384,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Cameron4 + .party = {.NoItemDefaultMoves = gTrainerParty_Cameron4 } }, [TRAINER_CAMERON_5] = @@ -3398,7 +3398,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Cameron5 + .party = {.NoItemDefaultMoves = gTrainerParty_Cameron5 } }, [TRAINER_JACLYN] = @@ -3412,7 +3412,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Jaclyn + .party = {.NoItemCustomMoves = gTrainerParty_Jaclyn } }, [TRAINER_HANNAH] = @@ -3426,7 +3426,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Hannah + .party = {.NoItemDefaultMoves = gTrainerParty_Hannah } }, [TRAINER_SAMANTHA] = @@ -3440,7 +3440,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Samantha + .party = {.NoItemDefaultMoves = gTrainerParty_Samantha } }, [TRAINER_MAURA] = @@ -3454,7 +3454,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Maura + .party = {.NoItemDefaultMoves = gTrainerParty_Maura } }, [TRAINER_KAYLA] = @@ -3468,7 +3468,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Kayla + .party = {.NoItemDefaultMoves = gTrainerParty_Kayla } }, [TRAINER_ALEXIS] = @@ -3482,7 +3482,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Alexis + .party = {.NoItemDefaultMoves = gTrainerParty_Alexis } }, [TRAINER_JACKI_1] = @@ -3496,7 +3496,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Jacki1 + .party = {.NoItemDefaultMoves = gTrainerParty_Jacki1 } }, [TRAINER_JACKI_2] = @@ -3510,7 +3510,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Jacki2 + .party = {.NoItemDefaultMoves = gTrainerParty_Jacki2 } }, [TRAINER_JACKI_3] = @@ -3524,7 +3524,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Jacki3 + .party = {.NoItemDefaultMoves = gTrainerParty_Jacki3 } }, [TRAINER_JACKI_4] = @@ -3538,7 +3538,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Jacki4 + .party = {.NoItemDefaultMoves = gTrainerParty_Jacki4 } }, [TRAINER_JACKI_5] = @@ -3552,7 +3552,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Jacki5 + .party = {.NoItemDefaultMoves = gTrainerParty_Jacki5 } }, [TRAINER_WALTER_1] = @@ -3566,7 +3566,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Walter1 + .party = {.NoItemDefaultMoves = gTrainerParty_Walter1 } }, [TRAINER_TUCKER] = @@ -3580,7 +3580,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Tucker + .party = {.NoItemDefaultMoves = gTrainerParty_Tucker } }, [TRAINER_THOMAS] = @@ -3594,7 +3594,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Thomas + .party = {.NoItemDefaultMoves = gTrainerParty_Thomas } }, [TRAINER_WALTER_2] = @@ -3608,7 +3608,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Walter2 + .party = {.NoItemDefaultMoves = gTrainerParty_Walter2 } }, [TRAINER_WALTER_3] = @@ -3622,7 +3622,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Walter3 + .party = {.NoItemCustomMoves = gTrainerParty_Walter3 } }, [TRAINER_WALTER_4] = @@ -3636,7 +3636,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Walter4 + .party = {.NoItemCustomMoves = gTrainerParty_Walter4 } }, [TRAINER_WALTER_5] = @@ -3650,7 +3650,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Walter5 + .party = {.NoItemCustomMoves = gTrainerParty_Walter5 } }, [TRAINER_SIDNEY] = @@ -3664,7 +3664,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 5, - .party = gTrainerParty_Sidney + .party = {.ItemCustomMoves = gTrainerParty_Sidney } }, [TRAINER_PHOEBE] = @@ -3678,7 +3678,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 5, - .party = gTrainerParty_Phoebe + .party = {.ItemCustomMoves = gTrainerParty_Phoebe } }, [TRAINER_GLACIA] = @@ -3692,7 +3692,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 5, - .party = gTrainerParty_Glacia + .party = {.ItemCustomMoves = gTrainerParty_Glacia } }, [TRAINER_DRAKE] = @@ -3706,7 +3706,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 5, - .party = gTrainerParty_Drake + .party = {.ItemCustomMoves = gTrainerParty_Drake } }, [TRAINER_ROXANNE] = @@ -3720,7 +3720,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 2, - .party = gTrainerParty_Roxanne + .party = {.NoItemCustomMoves = gTrainerParty_Roxanne } }, [TRAINER_BRAWLY] = @@ -3734,7 +3734,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 2, - .party = gTrainerParty_Brawly + .party = {.NoItemCustomMoves = gTrainerParty_Brawly } }, [TRAINER_WATTSON] = @@ -3748,7 +3748,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Wattson + .party = {.NoItemCustomMoves = gTrainerParty_Wattson } }, [TRAINER_FLANNERY] = @@ -3762,7 +3762,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Flannery + .party = {.NoItemCustomMoves = gTrainerParty_Flannery } }, [TRAINER_NORMAN] = @@ -3776,7 +3776,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Norman + .party = {.NoItemCustomMoves = gTrainerParty_Norman } }, [TRAINER_WINONA] = @@ -3790,7 +3790,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 4, - .party = gTrainerParty_Winona + .party = {.NoItemCustomMoves = gTrainerParty_Winona } }, [TRAINER_TATE_AND_LIZA] = @@ -3804,7 +3804,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x7, .partySize = 2, - .party = gTrainerParty_TateAndLiza + .party = {.ItemCustomMoves = gTrainerParty_TateAndLiza } }, [TRAINER_WALLACE] = @@ -3818,7 +3818,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 5, - .party = gTrainerParty_Wallace + .party = {.NoItemCustomMoves = gTrainerParty_Wallace } }, [TRAINER_JERRY_1] = @@ -3832,7 +3832,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Jerry1 + .party = {.NoItemDefaultMoves = gTrainerParty_Jerry1 } }, [TRAINER_TED] = @@ -3846,7 +3846,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Ted + .party = {.NoItemDefaultMoves = gTrainerParty_Ted } }, [TRAINER_PAUL] = @@ -3860,7 +3860,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Paul + .party = {.NoItemDefaultMoves = gTrainerParty_Paul } }, [TRAINER_JERRY_2] = @@ -3874,7 +3874,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Jerry2 + .party = {.NoItemDefaultMoves = gTrainerParty_Jerry2 } }, [TRAINER_JERRY_3] = @@ -3888,7 +3888,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Jerry3 + .party = {.NoItemDefaultMoves = gTrainerParty_Jerry3 } }, [TRAINER_JERRY_4] = @@ -3902,7 +3902,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Jerry4 + .party = {.NoItemDefaultMoves = gTrainerParty_Jerry4 } }, [TRAINER_JERRY_5] = @@ -3916,7 +3916,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Jerry5 + .party = {.NoItemDefaultMoves = gTrainerParty_Jerry5 } }, [TRAINER_KAREN_1] = @@ -3930,7 +3930,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Karen1 + .party = {.NoItemDefaultMoves = gTrainerParty_Karen1 } }, [TRAINER_GEORGIA] = @@ -3944,7 +3944,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Georgia + .party = {.NoItemDefaultMoves = gTrainerParty_Georgia } }, [TRAINER_KAREN_2] = @@ -3958,7 +3958,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Karen2 + .party = {.NoItemDefaultMoves = gTrainerParty_Karen2 } }, [TRAINER_KAREN_3] = @@ -3972,7 +3972,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Karen3 + .party = {.NoItemDefaultMoves = gTrainerParty_Karen3 } }, [TRAINER_KAREN_4] = @@ -3986,7 +3986,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Karen4 + .party = {.NoItemDefaultMoves = gTrainerParty_Karen4 } }, [TRAINER_KAREN_5] = @@ -4000,7 +4000,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Karen5 + .party = {.NoItemDefaultMoves = gTrainerParty_Karen5 } }, [TRAINER_KATE_AND_JOY] = @@ -4014,7 +4014,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_KateAndJoy + .party = {.NoItemCustomMoves = gTrainerParty_KateAndJoy } }, [TRAINER_ANNA_AND_MEG_1] = @@ -4028,7 +4028,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_AnnaAndMeg1 + .party = {.NoItemCustomMoves = gTrainerParty_AnnaAndMeg1 } }, [TRAINER_ANNA_AND_MEG_2] = @@ -4042,7 +4042,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_AnnaAndMeg2 + .party = {.NoItemCustomMoves = gTrainerParty_AnnaAndMeg2 } }, [TRAINER_ANNA_AND_MEG_3] = @@ -4056,7 +4056,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_AnnaAndMeg3 + .party = {.NoItemCustomMoves = gTrainerParty_AnnaAndMeg3 } }, [TRAINER_ANNA_AND_MEG_4] = @@ -4070,7 +4070,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_AnnaAndMeg4 + .party = {.NoItemCustomMoves = gTrainerParty_AnnaAndMeg4 } }, [TRAINER_ANNA_AND_MEG_5] = @@ -4084,7 +4084,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_AnnaAndMeg5 + .party = {.NoItemCustomMoves = gTrainerParty_AnnaAndMeg5 } }, [TRAINER_VICTOR] = @@ -4098,7 +4098,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Victor + .party = {.ItemDefaultMoves = gTrainerParty_Victor } }, [TRAINER_MIGUEL_1] = @@ -4112,7 +4112,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Miguel1 + .party = {.ItemDefaultMoves = gTrainerParty_Miguel1 } }, [TRAINER_COLTON] = @@ -4126,7 +4126,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 6, - .party = gTrainerParty_Colton + .party = {.ItemCustomMoves = gTrainerParty_Colton } }, [TRAINER_MIGUEL_2] = @@ -4140,7 +4140,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Miguel2 + .party = {.ItemDefaultMoves = gTrainerParty_Miguel2 } }, [TRAINER_MIGUEL_3] = @@ -4154,7 +4154,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Miguel3 + .party = {.ItemDefaultMoves = gTrainerParty_Miguel3 } }, [TRAINER_MIGUEL_4] = @@ -4168,7 +4168,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Miguel4 + .party = {.ItemDefaultMoves = gTrainerParty_Miguel4 } }, [TRAINER_MIGUEL_5] = @@ -4182,7 +4182,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Miguel5 + .party = {.ItemDefaultMoves = gTrainerParty_Miguel5 } }, [TRAINER_VICTORIA] = @@ -4196,7 +4196,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x3, .partySize = 1, - .party = gTrainerParty_Victoria + .party = {.ItemDefaultMoves = gTrainerParty_Victoria } }, [TRAINER_VANESSA] = @@ -4210,7 +4210,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Vanessa + .party = {.ItemDefaultMoves = gTrainerParty_Vanessa } }, [TRAINER_MARISSA] = @@ -4224,7 +4224,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Marissa + .party = {.ItemDefaultMoves = gTrainerParty_Marissa } }, [TRAINER_ISABEL_1] = @@ -4238,7 +4238,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Isabel1 + .party = {.ItemDefaultMoves = gTrainerParty_Isabel1 } }, [TRAINER_ISABEL_2] = @@ -4252,7 +4252,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Isabel2 + .party = {.ItemDefaultMoves = gTrainerParty_Isabel2 } }, [TRAINER_ISABEL_3] = @@ -4266,7 +4266,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Isabel3 + .party = {.ItemDefaultMoves = gTrainerParty_Isabel3 } }, [TRAINER_ISABEL_4] = @@ -4280,7 +4280,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Isabel4 + .party = {.ItemDefaultMoves = gTrainerParty_Isabel4 } }, [TRAINER_ISABEL_5] = @@ -4294,7 +4294,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Isabel5 + .party = {.ItemDefaultMoves = gTrainerParty_Isabel5 } }, [TRAINER_TIMOTHY_1] = @@ -4308,7 +4308,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 1, - .party = gTrainerParty_Timothy1 + .party = {.NoItemDefaultMoves = gTrainerParty_Timothy1 } }, [TRAINER_TIMOTHY_2] = @@ -4322,7 +4322,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 1, - .party = gTrainerParty_Timothy2 + .party = {.NoItemCustomMoves = gTrainerParty_Timothy2 } }, [TRAINER_TIMOTHY_3] = @@ -4336,7 +4336,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 1, - .party = gTrainerParty_Timothy3 + .party = {.NoItemCustomMoves = gTrainerParty_Timothy3 } }, [TRAINER_TIMOTHY_4] = @@ -4350,7 +4350,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 1, - .party = gTrainerParty_Timothy4 + .party = {.NoItemCustomMoves = gTrainerParty_Timothy4 } }, [TRAINER_TIMOTHY_5] = @@ -4364,7 +4364,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 1, - .party = gTrainerParty_Timothy5 + .party = {.NoItemCustomMoves = gTrainerParty_Timothy5 } }, [TRAINER_VICKY] = @@ -4378,7 +4378,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 1, - .party = gTrainerParty_Vicky + .party = {.NoItemCustomMoves = gTrainerParty_Vicky } }, [TRAINER_SHELBY_1] = @@ -4392,7 +4392,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 2, - .party = gTrainerParty_Shelby1 + .party = {.NoItemDefaultMoves = gTrainerParty_Shelby1 } }, [TRAINER_SHELBY_2] = @@ -4406,7 +4406,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 2, - .party = gTrainerParty_Shelby2 + .party = {.NoItemDefaultMoves = gTrainerParty_Shelby2 } }, [TRAINER_SHELBY_3] = @@ -4420,7 +4420,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 2, - .party = gTrainerParty_Shelby3 + .party = {.NoItemDefaultMoves = gTrainerParty_Shelby3 } }, [TRAINER_SHELBY_4] = @@ -4434,7 +4434,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 2, - .party = gTrainerParty_Shelby4 + .party = {.NoItemDefaultMoves = gTrainerParty_Shelby4 } }, [TRAINER_SHELBY_5] = @@ -4448,7 +4448,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 2, - .party = gTrainerParty_Shelby5 + .party = {.NoItemDefaultMoves = gTrainerParty_Shelby5 } }, [TRAINER_CALVIN_1] = @@ -4462,7 +4462,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Calvin1 + .party = {.NoItemDefaultMoves = gTrainerParty_Calvin1 } }, [TRAINER_BILLY] = @@ -4476,7 +4476,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Billy + .party = {.NoItemDefaultMoves = gTrainerParty_Billy } }, [TRAINER_JOSH] = @@ -4490,7 +4490,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Josh + .party = {.NoItemCustomMoves = gTrainerParty_Josh } }, [TRAINER_TOMMY] = @@ -4504,7 +4504,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Tommy + .party = {.NoItemDefaultMoves = gTrainerParty_Tommy } }, [TRAINER_JOEY] = @@ -4518,7 +4518,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Joey + .party = {.NoItemDefaultMoves = gTrainerParty_Joey } }, [TRAINER_BEN] = @@ -4532,7 +4532,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Ben + .party = {.NoItemCustomMoves = gTrainerParty_Ben } }, [TRAINER_ANONYMOUS_5] = @@ -4546,7 +4546,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Anonymous5 + .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous5 } }, [TRAINER_KEVIN] = @@ -4560,7 +4560,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Kevin + .party = {.NoItemDefaultMoves = gTrainerParty_Kevin } }, [TRAINER_NEAL] = @@ -4574,7 +4574,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Neal + .party = {.NoItemDefaultMoves = gTrainerParty_Neal } }, [TRAINER_DILLON] = @@ -4588,7 +4588,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Dillon + .party = {.NoItemDefaultMoves = gTrainerParty_Dillon } }, [TRAINER_CALVIN_2] = @@ -4602,7 +4602,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Calvin2 + .party = {.NoItemDefaultMoves = gTrainerParty_Calvin2 } }, [TRAINER_CALVIN_3] = @@ -4616,7 +4616,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Calvin3 + .party = {.NoItemDefaultMoves = gTrainerParty_Calvin3 } }, [TRAINER_CALVIN_4] = @@ -4630,7 +4630,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Calvin4 + .party = {.NoItemDefaultMoves = gTrainerParty_Calvin4 } }, [TRAINER_CALVIN_5] = @@ -4644,7 +4644,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Calvin5 + .party = {.NoItemDefaultMoves = gTrainerParty_Calvin5 } }, [TRAINER_EDDIE] = @@ -4658,7 +4658,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Eddie + .party = {.NoItemDefaultMoves = gTrainerParty_Eddie } }, [TRAINER_ALLEN] = @@ -4672,7 +4672,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Allen + .party = {.NoItemDefaultMoves = gTrainerParty_Allen } }, [TRAINER_TIMMY] = @@ -4686,7 +4686,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Timmy + .party = {.NoItemDefaultMoves = gTrainerParty_Timmy } }, [TRAINER_STEVEN] = @@ -4700,7 +4700,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 6, - .party = gTrainerParty_Steven + .party = {.ItemCustomMoves = gTrainerParty_Steven } }, [TRAINER_ANDREW] = @@ -4714,7 +4714,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Andrew + .party = {.NoItemDefaultMoves = gTrainerParty_Andrew } }, [TRAINER_IVAN] = @@ -4728,7 +4728,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Ivan + .party = {.NoItemDefaultMoves = gTrainerParty_Ivan } }, [TRAINER_CLAUDE] = @@ -4742,7 +4742,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 4, - .party = gTrainerParty_Claude + .party = {.NoItemDefaultMoves = gTrainerParty_Claude } }, [TRAINER_ELLIOT_1] = @@ -4756,7 +4756,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Elliot1 + .party = {.NoItemDefaultMoves = gTrainerParty_Elliot1 } }, [TRAINER_NED] = @@ -4770,7 +4770,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Ned + .party = {.NoItemDefaultMoves = gTrainerParty_Ned } }, [TRAINER_DALE] = @@ -4784,7 +4784,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 4, - .party = gTrainerParty_Dale + .party = {.NoItemDefaultMoves = gTrainerParty_Dale } }, [TRAINER_NOLAN] = @@ -4798,7 +4798,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Nolan + .party = {.NoItemDefaultMoves = gTrainerParty_Nolan } }, [TRAINER_BARNY] = @@ -4812,7 +4812,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Barny + .party = {.NoItemDefaultMoves = gTrainerParty_Barny } }, [TRAINER_WADE] = @@ -4826,7 +4826,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Wade + .party = {.NoItemDefaultMoves = gTrainerParty_Wade } }, [TRAINER_CARTER] = @@ -4840,7 +4840,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 4, - .party = gTrainerParty_Carter + .party = {.NoItemDefaultMoves = gTrainerParty_Carter } }, [TRAINER_ELLIOT_2] = @@ -4854,7 +4854,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Elliot2 + .party = {.NoItemDefaultMoves = gTrainerParty_Elliot2 } }, [TRAINER_ELLIOT_3] = @@ -4868,7 +4868,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 4, - .party = gTrainerParty_Elliot3 + .party = {.NoItemDefaultMoves = gTrainerParty_Elliot3 } }, [TRAINER_ELLIOT_4] = @@ -4882,7 +4882,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 4, - .party = gTrainerParty_Elliot4 + .party = {.NoItemDefaultMoves = gTrainerParty_Elliot4 } }, [TRAINER_ELLIOT_5] = @@ -4896,7 +4896,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x3, .partySize = 4, - .party = gTrainerParty_Elliot5 + .party = {.NoItemDefaultMoves = gTrainerParty_Elliot5 } }, [TRAINER_RONALD] = @@ -4910,7 +4910,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 6, - .party = gTrainerParty_Ronald + .party = {.NoItemDefaultMoves = gTrainerParty_Ronald } }, [TRAINER_JACOB] = @@ -4924,7 +4924,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Jacob + .party = {.NoItemDefaultMoves = gTrainerParty_Jacob } }, [TRAINER_ANTHONY] = @@ -4938,7 +4938,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Anthony + .party = {.NoItemDefaultMoves = gTrainerParty_Anthony } }, [TRAINER_BENJAMIN_1] = @@ -4952,7 +4952,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Benjamin1 + .party = {.NoItemDefaultMoves = gTrainerParty_Benjamin1 } }, [TRAINER_BENJAMIN_2] = @@ -4966,7 +4966,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Benjamin2 + .party = {.NoItemDefaultMoves = gTrainerParty_Benjamin2 } }, [TRAINER_BENJAMIN_3] = @@ -4980,7 +4980,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Benjamin3 + .party = {.NoItemDefaultMoves = gTrainerParty_Benjamin3 } }, [TRAINER_BENJAMIN_4] = @@ -4994,7 +4994,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Benjamin4 + .party = {.NoItemDefaultMoves = gTrainerParty_Benjamin4 } }, [TRAINER_BENJAMIN_5] = @@ -5008,7 +5008,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Benjamin5 + .party = {.NoItemDefaultMoves = gTrainerParty_Benjamin5 } }, [TRAINER_ABIGAIL_1] = @@ -5022,7 +5022,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Abigail1 + .party = {.NoItemDefaultMoves = gTrainerParty_Abigail1 } }, [TRAINER_JASMINE] = @@ -5036,7 +5036,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Jasmine + .party = {.NoItemDefaultMoves = gTrainerParty_Jasmine } }, [TRAINER_ABIGAIL_2] = @@ -5050,7 +5050,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Abigail2 + .party = {.NoItemDefaultMoves = gTrainerParty_Abigail2 } }, [TRAINER_ABIGAIL_3] = @@ -5064,7 +5064,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Abigail3 + .party = {.NoItemDefaultMoves = gTrainerParty_Abigail3 } }, [TRAINER_ABIGAIL_4] = @@ -5078,7 +5078,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Abigail4 + .party = {.NoItemDefaultMoves = gTrainerParty_Abigail4 } }, [TRAINER_ABIGAIL_5] = @@ -5092,7 +5092,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Abigail5 + .party = {.NoItemDefaultMoves = gTrainerParty_Abigail5 } }, [TRAINER_DYLAN_1] = @@ -5106,7 +5106,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Dylan1 + .party = {.NoItemDefaultMoves = gTrainerParty_Dylan1 } }, [TRAINER_DYLAN_2] = @@ -5120,7 +5120,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Dylan2 + .party = {.NoItemDefaultMoves = gTrainerParty_Dylan2 } }, [TRAINER_DYLAN_3] = @@ -5134,7 +5134,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Dylan3 + .party = {.NoItemDefaultMoves = gTrainerParty_Dylan3 } }, [TRAINER_DYLAN_4] = @@ -5148,7 +5148,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Dylan4 + .party = {.NoItemDefaultMoves = gTrainerParty_Dylan4 } }, [TRAINER_DYLAN_5] = @@ -5162,7 +5162,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Dylan5 + .party = {.NoItemDefaultMoves = gTrainerParty_Dylan5 } }, [TRAINER_MARIA_1] = @@ -5176,7 +5176,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Maria1 + .party = {.NoItemDefaultMoves = gTrainerParty_Maria1 } }, [TRAINER_MARIA_2] = @@ -5190,7 +5190,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Maria2 + .party = {.NoItemDefaultMoves = gTrainerParty_Maria2 } }, [TRAINER_MARIA_3] = @@ -5204,7 +5204,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Maria3 + .party = {.NoItemDefaultMoves = gTrainerParty_Maria3 } }, [TRAINER_MARIA_4] = @@ -5218,7 +5218,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Maria4 + .party = {.NoItemDefaultMoves = gTrainerParty_Maria4 } }, [TRAINER_MARIA_5] = @@ -5232,7 +5232,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Maria5 + .party = {.NoItemDefaultMoves = gTrainerParty_Maria5 } }, [TRAINER_CALEB] = @@ -5246,7 +5246,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 4, - .party = gTrainerParty_Caleb + .party = {.NoItemDefaultMoves = gTrainerParty_Caleb } }, [TRAINER_ANONYMOUS_6] = @@ -5260,7 +5260,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Anonymous6 + .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous6 } }, [TRAINER_ISAIAH_1] = @@ -5274,7 +5274,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Isaiah1 + .party = {.NoItemDefaultMoves = gTrainerParty_Isaiah1 } }, [TRAINER_ANONYMOUS_7] = @@ -5288,7 +5288,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Anonymous7 + .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous7 } }, [TRAINER_CHASE] = @@ -5302,7 +5302,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Chase + .party = {.NoItemDefaultMoves = gTrainerParty_Chase } }, [TRAINER_ISAIAH_2] = @@ -5316,7 +5316,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Isaiah2 + .party = {.NoItemDefaultMoves = gTrainerParty_Isaiah2 } }, [TRAINER_ISAIAH_3] = @@ -5330,7 +5330,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Isaiah3 + .party = {.NoItemDefaultMoves = gTrainerParty_Isaiah3 } }, [TRAINER_ISAIAH_4] = @@ -5344,7 +5344,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Isaiah4 + .party = {.NoItemDefaultMoves = gTrainerParty_Isaiah4 } }, [TRAINER_ISAIAH_5] = @@ -5358,7 +5358,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Isaiah5 + .party = {.NoItemDefaultMoves = gTrainerParty_Isaiah5 } }, [TRAINER_ANONYMOUS_8] = @@ -5372,7 +5372,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Anonymous8 + .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous8 } }, [TRAINER_CONNOR] = @@ -5386,7 +5386,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 4, - .party = gTrainerParty_Connor + .party = {.NoItemDefaultMoves = gTrainerParty_Connor } }, [TRAINER_ANONYMOUS_9] = @@ -5400,7 +5400,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Anonymous9 + .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous9 } }, [TRAINER_KATELYN_1] = @@ -5414,7 +5414,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Katelyn1 + .party = {.NoItemDefaultMoves = gTrainerParty_Katelyn1 } }, [TRAINER_ALLISON] = @@ -5428,7 +5428,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 4, - .party = gTrainerParty_Allison + .party = {.NoItemDefaultMoves = gTrainerParty_Allison } }, [TRAINER_KATELYN_2] = @@ -5442,7 +5442,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Katelyn2 + .party = {.NoItemDefaultMoves = gTrainerParty_Katelyn2 } }, [TRAINER_KATELYN_3] = @@ -5456,7 +5456,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Katelyn3 + .party = {.NoItemDefaultMoves = gTrainerParty_Katelyn3 } }, [TRAINER_KATELYN_4] = @@ -5470,7 +5470,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Katelyn4 + .party = {.NoItemDefaultMoves = gTrainerParty_Katelyn4 } }, [TRAINER_KATELYN_5] = @@ -5484,7 +5484,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Katelyn5 + .party = {.NoItemDefaultMoves = gTrainerParty_Katelyn5 } }, [TRAINER_NICOLAS_1] = @@ -5498,7 +5498,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Nicolas1 + .party = {.NoItemDefaultMoves = gTrainerParty_Nicolas1 } }, [TRAINER_NICOLAS_2] = @@ -5512,7 +5512,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Nicolas2 + .party = {.NoItemDefaultMoves = gTrainerParty_Nicolas2 } }, [TRAINER_NICOLAS_3] = @@ -5526,7 +5526,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Nicolas3 + .party = {.NoItemDefaultMoves = gTrainerParty_Nicolas3 } }, [TRAINER_NICOLAS_4] = @@ -5540,7 +5540,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Nicolas4 + .party = {.NoItemDefaultMoves = gTrainerParty_Nicolas4 } }, [TRAINER_NICOLAS_5] = @@ -5554,7 +5554,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Nicolas5 + .party = {.ItemDefaultMoves = gTrainerParty_Nicolas5 } }, [TRAINER_AARON] = @@ -5568,7 +5568,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Aaron + .party = {.NoItemDefaultMoves = gTrainerParty_Aaron } }, [TRAINER_PERRY] = @@ -5582,7 +5582,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Perry + .party = {.NoItemDefaultMoves = gTrainerParty_Perry } }, [TRAINER_HUGH] = @@ -5596,7 +5596,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Hugh + .party = {.NoItemDefaultMoves = gTrainerParty_Hugh } }, [TRAINER_PHIL] = @@ -5610,7 +5610,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Phil + .party = {.NoItemDefaultMoves = gTrainerParty_Phil } }, [TRAINER_JARED] = @@ -5624,7 +5624,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Jared + .party = {.NoItemDefaultMoves = gTrainerParty_Jared } }, [TRAINER_ANONYMOUS_10] = @@ -5638,7 +5638,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 4, - .party = gTrainerParty_Anonymous10 + .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous10 } }, [TRAINER_TANNER] = @@ -5652,7 +5652,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Tanner + .party = {.NoItemDefaultMoves = gTrainerParty_Tanner } }, [TRAINER_WILL] = @@ -5666,7 +5666,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Will + .party = {.NoItemDefaultMoves = gTrainerParty_Will } }, [TRAINER_COLIN] = @@ -5680,7 +5680,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Colin + .party = {.NoItemDefaultMoves = gTrainerParty_Colin } }, [TRAINER_ROBERT_1] = @@ -5694,7 +5694,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Robert1 + .party = {.NoItemDefaultMoves = gTrainerParty_Robert1 } }, [TRAINER_BENNY] = @@ -5708,7 +5708,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Benny + .party = {.NoItemDefaultMoves = gTrainerParty_Benny } }, [TRAINER_CHESTER] = @@ -5722,7 +5722,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Chester + .party = {.NoItemDefaultMoves = gTrainerParty_Chester } }, [TRAINER_ROBERT_2] = @@ -5736,7 +5736,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Robert2 + .party = {.NoItemDefaultMoves = gTrainerParty_Robert2 } }, [TRAINER_ROBERT_3] = @@ -5750,7 +5750,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Robert3 + .party = {.NoItemDefaultMoves = gTrainerParty_Robert3 } }, [TRAINER_ROBERT_4] = @@ -5764,7 +5764,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Robert4 + .party = {.NoItemDefaultMoves = gTrainerParty_Robert4 } }, [TRAINER_ROBERT_5] = @@ -5778,7 +5778,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Robert5 + .party = {.NoItemDefaultMoves = gTrainerParty_Robert5 } }, [TRAINER_ALEX] = @@ -5792,7 +5792,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 4, - .party = gTrainerParty_Alex + .party = {.NoItemDefaultMoves = gTrainerParty_Alex } }, [TRAINER_BECK] = @@ -5806,7 +5806,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Beck + .party = {.NoItemDefaultMoves = gTrainerParty_Beck } }, [TRAINER_YASU] = @@ -5820,7 +5820,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x3, .partySize = 1, - .party = gTrainerParty_Yasu + .party = {.NoItemDefaultMoves = gTrainerParty_Yasu } }, [TRAINER_TAKASHI] = @@ -5834,7 +5834,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x3, .partySize = 3, - .party = gTrainerParty_Takashi + .party = {.NoItemDefaultMoves = gTrainerParty_Takashi } }, [TRAINER_MAKOTO] = @@ -5848,7 +5848,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x0, .partySize = 1, - .party = gTrainerParty_Makoto + .party = {.NoItemDefaultMoves = gTrainerParty_Makoto } }, [TRAINER_HIDEO_1] = @@ -5862,7 +5862,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x0, .partySize = 4, - .party = gTrainerParty_Hideo1 + .party = {.NoItemDefaultMoves = gTrainerParty_Hideo1 } }, [TRAINER_LAO_1] = @@ -5876,7 +5876,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x0, .partySize = 4, - .party = gTrainerParty_Lao1 + .party = {.NoItemCustomMoves = gTrainerParty_Lao1 } }, [TRAINER_LUNG] = @@ -5890,7 +5890,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x0, .partySize = 2, - .party = gTrainerParty_Lung + .party = {.NoItemDefaultMoves = gTrainerParty_Lung } }, [TRAINER_LAO_2] = @@ -5904,7 +5904,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x0, .partySize = 4, - .party = gTrainerParty_Lao2 + .party = {.NoItemCustomMoves = gTrainerParty_Lao2 } }, [TRAINER_LAO_3] = @@ -5918,7 +5918,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x0, .partySize = 4, - .party = gTrainerParty_Lao3 + .party = {.NoItemCustomMoves = gTrainerParty_Lao3 } }, [TRAINER_LAO_4] = @@ -5932,7 +5932,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x0, .partySize = 4, - .party = gTrainerParty_Lao4 + .party = {.NoItemCustomMoves = gTrainerParty_Lao4 } }, [TRAINER_LAO_5] = @@ -5946,7 +5946,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x0, .partySize = 4, - .party = gTrainerParty_Lao5 + .party = {.ItemCustomMoves = gTrainerParty_Lao5 } }, [TRAINER_TESSA] = @@ -5960,7 +5960,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Tessa + .party = {.NoItemDefaultMoves = gTrainerParty_Tessa } }, [TRAINER_LAURA] = @@ -5974,7 +5974,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Laura + .party = {.NoItemDefaultMoves = gTrainerParty_Laura } }, [TRAINER_CYNDY_1] = @@ -5988,7 +5988,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Cyndy1 + .party = {.NoItemDefaultMoves = gTrainerParty_Cyndy1 } }, [TRAINER_CORA] = @@ -6002,7 +6002,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Cora + .party = {.NoItemDefaultMoves = gTrainerParty_Cora } }, [TRAINER_JILL] = @@ -6016,7 +6016,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Jill + .party = {.NoItemDefaultMoves = gTrainerParty_Jill } }, [TRAINER_CYNDY_2] = @@ -6030,7 +6030,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Cyndy2 + .party = {.NoItemDefaultMoves = gTrainerParty_Cyndy2 } }, [TRAINER_CYNDY_3] = @@ -6044,7 +6044,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Cyndy3 + .party = {.NoItemDefaultMoves = gTrainerParty_Cyndy3 } }, [TRAINER_CYNDY_4] = @@ -6058,7 +6058,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Cyndy4 + .party = {.NoItemDefaultMoves = gTrainerParty_Cyndy4 } }, [TRAINER_CYNDY_5] = @@ -6072,7 +6072,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Cyndy5 + .party = {.NoItemDefaultMoves = gTrainerParty_Cyndy5 } }, [TRAINER_MADELINE_1] = @@ -6086,7 +6086,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Madeline1 + .party = {.NoItemCustomMoves = gTrainerParty_Madeline1 } }, [TRAINER_CLARISSA] = @@ -6100,7 +6100,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Clarissa + .party = {.NoItemDefaultMoves = gTrainerParty_Clarissa } }, [TRAINER_ANGELICA] = @@ -6114,7 +6114,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Angelica + .party = {.NoItemDefaultMoves = gTrainerParty_Angelica } }, [TRAINER_MADELINE_2] = @@ -6128,7 +6128,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Madeline2 + .party = {.NoItemCustomMoves = gTrainerParty_Madeline2 } }, [TRAINER_MADELINE_3] = @@ -6142,7 +6142,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Madeline3 + .party = {.NoItemCustomMoves = gTrainerParty_Madeline3 } }, [TRAINER_MADELINE_4] = @@ -6156,7 +6156,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Madeline4 + .party = {.NoItemCustomMoves = gTrainerParty_Madeline4 } }, [TRAINER_MADELINE_5] = @@ -6170,7 +6170,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Madeline5 + .party = {.NoItemCustomMoves = gTrainerParty_Madeline5 } }, [TRAINER_BEVERLY] = @@ -6184,7 +6184,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Beverly + .party = {.NoItemDefaultMoves = gTrainerParty_Beverly } }, [TRAINER_DAWN] = @@ -6198,7 +6198,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Dawn + .party = {.NoItemDefaultMoves = gTrainerParty_Dawn } }, [TRAINER_NICOLE] = @@ -6212,7 +6212,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Nicole + .party = {.NoItemDefaultMoves = gTrainerParty_Nicole } }, [TRAINER_DENISE] = @@ -6226,7 +6226,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Denise + .party = {.NoItemDefaultMoves = gTrainerParty_Denise } }, [TRAINER_BETH] = @@ -6240,7 +6240,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Beth + .party = {.NoItemDefaultMoves = gTrainerParty_Beth } }, [TRAINER_TARA] = @@ -6254,7 +6254,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Tara + .party = {.NoItemDefaultMoves = gTrainerParty_Tara } }, [TRAINER_MISSY] = @@ -6268,7 +6268,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 4, - .party = gTrainerParty_Missy + .party = {.NoItemDefaultMoves = gTrainerParty_Missy } }, [TRAINER_ALICE] = @@ -6282,7 +6282,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Alice + .party = {.NoItemDefaultMoves = gTrainerParty_Alice } }, [TRAINER_JENNY_1] = @@ -6296,7 +6296,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Jenny1 + .party = {.NoItemDefaultMoves = gTrainerParty_Jenny1 } }, [TRAINER_GRACE] = @@ -6310,7 +6310,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Grace + .party = {.NoItemDefaultMoves = gTrainerParty_Grace } }, [TRAINER_TANYA] = @@ -6324,7 +6324,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Tanya + .party = {.NoItemDefaultMoves = gTrainerParty_Tanya } }, [TRAINER_SHARON] = @@ -6338,7 +6338,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Sharon + .party = {.NoItemDefaultMoves = gTrainerParty_Sharon } }, [TRAINER_NIKKI] = @@ -6352,7 +6352,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Nikki + .party = {.NoItemDefaultMoves = gTrainerParty_Nikki } }, [TRAINER_BRENDA] = @@ -6366,7 +6366,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Brenda + .party = {.NoItemDefaultMoves = gTrainerParty_Brenda } }, [TRAINER_KATIE] = @@ -6380,7 +6380,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Katie + .party = {.NoItemDefaultMoves = gTrainerParty_Katie } }, [TRAINER_SUSIE] = @@ -6394,7 +6394,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Susie + .party = {.NoItemDefaultMoves = gTrainerParty_Susie } }, [TRAINER_KARA] = @@ -6408,7 +6408,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Kara + .party = {.NoItemDefaultMoves = gTrainerParty_Kara } }, [TRAINER_DANA] = @@ -6422,7 +6422,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Dana + .party = {.NoItemDefaultMoves = gTrainerParty_Dana } }, [TRAINER_ERIN] = @@ -6436,7 +6436,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Erin + .party = {.NoItemDefaultMoves = gTrainerParty_Erin } }, [TRAINER_DEBRA] = @@ -6450,7 +6450,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Debra + .party = {.NoItemDefaultMoves = gTrainerParty_Debra } }, [TRAINER_LINDA] = @@ -6464,7 +6464,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Linda + .party = {.NoItemDefaultMoves = gTrainerParty_Linda } }, [TRAINER_KAYLEE] = @@ -6478,7 +6478,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Kaylee + .party = {.NoItemDefaultMoves = gTrainerParty_Kaylee } }, [TRAINER_LAUREL] = @@ -6492,7 +6492,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Laurel + .party = {.NoItemDefaultMoves = gTrainerParty_Laurel } }, [TRAINER_DARCY] = @@ -6506,7 +6506,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Darcy + .party = {.NoItemDefaultMoves = gTrainerParty_Darcy } }, [TRAINER_JENNY_2] = @@ -6520,7 +6520,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Jenny2 + .party = {.NoItemDefaultMoves = gTrainerParty_Jenny2 } }, [TRAINER_JENNY_3] = @@ -6534,7 +6534,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Jenny3 + .party = {.NoItemDefaultMoves = gTrainerParty_Jenny3 } }, [TRAINER_JENNY_4] = @@ -6548,7 +6548,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Jenny4 + .party = {.NoItemDefaultMoves = gTrainerParty_Jenny4 } }, [TRAINER_JENNY_5] = @@ -6562,7 +6562,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Jenny5 + .party = {.NoItemDefaultMoves = gTrainerParty_Jenny5 } }, [TRAINER_HEIDI] = @@ -6576,7 +6576,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Heidi + .party = {.NoItemCustomMoves = gTrainerParty_Heidi } }, [TRAINER_BECKY] = @@ -6590,7 +6590,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Becky + .party = {.NoItemCustomMoves = gTrainerParty_Becky } }, [TRAINER_CAROL] = @@ -6604,7 +6604,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Carol + .party = {.NoItemDefaultMoves = gTrainerParty_Carol } }, [TRAINER_NANCY] = @@ -6618,7 +6618,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Nancy + .party = {.NoItemDefaultMoves = gTrainerParty_Nancy } }, [TRAINER_MARTHA] = @@ -6632,7 +6632,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Martha + .party = {.NoItemDefaultMoves = gTrainerParty_Martha } }, [TRAINER_DIANA_1] = @@ -6646,7 +6646,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Diana1 + .party = {.NoItemDefaultMoves = gTrainerParty_Diana1 } }, [TRAINER_NINA] = @@ -6660,7 +6660,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Nina + .party = {.NoItemDefaultMoves = gTrainerParty_Nina } }, [TRAINER_IRENE] = @@ -6674,7 +6674,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Irene + .party = {.NoItemDefaultMoves = gTrainerParty_Irene } }, [TRAINER_DIANA_2] = @@ -6688,7 +6688,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Diana2 + .party = {.NoItemDefaultMoves = gTrainerParty_Diana2 } }, [TRAINER_DIANA_3] = @@ -6702,7 +6702,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Diana3 + .party = {.NoItemDefaultMoves = gTrainerParty_Diana3 } }, [TRAINER_DIANA_4] = @@ -6716,7 +6716,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Diana4 + .party = {.NoItemDefaultMoves = gTrainerParty_Diana4 } }, [TRAINER_DIANA_5] = @@ -6730,7 +6730,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Diana5 + .party = {.NoItemDefaultMoves = gTrainerParty_Diana5 } }, [TRAINER_AMY_AND_LIV_1] = @@ -6744,7 +6744,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_AmyAndLiv1 + .party = {.NoItemDefaultMoves = gTrainerParty_AmyAndLiv1 } }, [TRAINER_AMY_AND_LIV_2] = @@ -6758,7 +6758,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_AmyAndLiv2 + .party = {.NoItemDefaultMoves = gTrainerParty_AmyAndLiv2 } }, [TRAINER_GINA_AND_MIA_1] = @@ -6772,7 +6772,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_GinaAndMia1 + .party = {.NoItemDefaultMoves = gTrainerParty_GinaAndMia1 } }, [TRAINER_MIU_AND_YUKI] = @@ -6786,7 +6786,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_MiuAndYuki + .party = {.NoItemDefaultMoves = gTrainerParty_MiuAndYuki } }, [TRAINER_AMY_AND_LIV_3] = @@ -6800,7 +6800,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_AmyAndLiv3 + .party = {.NoItemDefaultMoves = gTrainerParty_AmyAndLiv3 } }, [TRAINER_GINA_AND_MIA_2] = @@ -6814,7 +6814,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_GinaAndMia2 + .party = {.NoItemCustomMoves = gTrainerParty_GinaAndMia2 } }, [TRAINER_AMY_AND_LIV_4] = @@ -6828,7 +6828,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_AmyAndLiv4 + .party = {.NoItemDefaultMoves = gTrainerParty_AmyAndLiv4 } }, [TRAINER_AMY_AND_LIV_5] = @@ -6842,7 +6842,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_AmyAndLiv5 + .party = {.NoItemCustomMoves = gTrainerParty_AmyAndLiv5 } }, [TRAINER_AMY_AND_LIV_6] = @@ -6856,7 +6856,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_AmyAndLiv6 + .party = {.NoItemCustomMoves = gTrainerParty_AmyAndLiv6 } }, [TRAINER_HUEY] = @@ -6870,7 +6870,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Huey + .party = {.NoItemDefaultMoves = gTrainerParty_Huey } }, [TRAINER_EDMOND] = @@ -6884,7 +6884,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Edmond + .party = {.NoItemDefaultMoves = gTrainerParty_Edmond } }, [TRAINER_ERNEST_1] = @@ -6898,7 +6898,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Ernest1 + .party = {.NoItemDefaultMoves = gTrainerParty_Ernest1 } }, [TRAINER_DWAYNE] = @@ -6912,7 +6912,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Dwayne + .party = {.NoItemDefaultMoves = gTrainerParty_Dwayne } }, [TRAINER_PHILLIP] = @@ -6926,7 +6926,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Phillip + .party = {.NoItemDefaultMoves = gTrainerParty_Phillip } }, [TRAINER_LEONARD] = @@ -6940,7 +6940,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Leonard + .party = {.NoItemDefaultMoves = gTrainerParty_Leonard } }, [TRAINER_DUNCAN] = @@ -6954,7 +6954,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Duncan + .party = {.NoItemDefaultMoves = gTrainerParty_Duncan } }, [TRAINER_ERNEST_2] = @@ -6968,7 +6968,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Ernest2 + .party = {.NoItemDefaultMoves = gTrainerParty_Ernest2 } }, [TRAINER_ERNEST_3] = @@ -6982,7 +6982,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Ernest3 + .party = {.NoItemDefaultMoves = gTrainerParty_Ernest3 } }, [TRAINER_ERNEST_4] = @@ -6996,7 +6996,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Ernest4 + .party = {.NoItemDefaultMoves = gTrainerParty_Ernest4 } }, [TRAINER_ERNEST_5] = @@ -7010,7 +7010,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Ernest5 + .party = {.NoItemDefaultMoves = gTrainerParty_Ernest5 } }, [TRAINER_ANONYMOUS_11] = @@ -7024,7 +7024,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Anonymous11 + .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous11 } }, [TRAINER_ANONYMOUS_12] = @@ -7038,7 +7038,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Anonymous12 + .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous12 } }, [TRAINER_ANONYMOUS_13] = @@ -7052,7 +7052,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Anonymous13 + .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous13 } }, [TRAINER_SONNY] = @@ -7066,7 +7066,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Sonny + .party = {.NoItemDefaultMoves = gTrainerParty_Sonny } }, [TRAINER_DONOVAN] = @@ -7080,7 +7080,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Donovan + .party = {.NoItemDefaultMoves = gTrainerParty_Donovan } }, [TRAINER_GERALD] = @@ -7094,7 +7094,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Gerald + .party = {.NoItemDefaultMoves = gTrainerParty_Gerald } }, [TRAINER_KELVIN] = @@ -7108,7 +7108,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Kelvin + .party = {.NoItemDefaultMoves = gTrainerParty_Kelvin } }, [TRAINER_KODY] = @@ -7122,7 +7122,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Kody + .party = {.NoItemDefaultMoves = gTrainerParty_Kody } }, [TRAINER_TEVIN] = @@ -7136,7 +7136,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Tevin + .party = {.NoItemDefaultMoves = gTrainerParty_Tevin } }, [TRAINER_DAMON] = @@ -7150,7 +7150,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Damon + .party = {.NoItemDefaultMoves = gTrainerParty_Damon } }, [TRAINER_PABLO] = @@ -7164,7 +7164,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Pablo + .party = {.NoItemDefaultMoves = gTrainerParty_Pablo } }, [TRAINER_EDWIN_1] = @@ -7178,7 +7178,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Edwin1 + .party = {.NoItemDefaultMoves = gTrainerParty_Edwin1 } }, [TRAINER_HECTOR_1] = @@ -7192,7 +7192,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Hector1 + .party = {.NoItemDefaultMoves = gTrainerParty_Hector1 } }, [TRAINER_HECTOR_2] = @@ -7206,7 +7206,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Hector2 + .party = {.NoItemDefaultMoves = gTrainerParty_Hector2 } }, [TRAINER_EDWIN_2] = @@ -7220,7 +7220,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Edwin2 + .party = {.NoItemDefaultMoves = gTrainerParty_Edwin2 } }, [TRAINER_EDWIN_3] = @@ -7234,7 +7234,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Edwin3 + .party = {.NoItemDefaultMoves = gTrainerParty_Edwin3 } }, [TRAINER_EDWIN_4] = @@ -7248,7 +7248,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Edwin4 + .party = {.NoItemDefaultMoves = gTrainerParty_Edwin4 } }, [TRAINER_EDWIN_5] = @@ -7262,7 +7262,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Edwin5 + .party = {.NoItemDefaultMoves = gTrainerParty_Edwin5 } }, [TRAINER_WALLY_1] = @@ -7276,7 +7276,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 5, - .party = gTrainerParty_Wally1 + .party = {.NoItemCustomMoves = gTrainerParty_Wally1 } }, [TRAINER_BRENDAN_1] = @@ -7290,7 +7290,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 1, - .party = gTrainerParty_Brendan1 + .party = {.NoItemDefaultMoves = gTrainerParty_Brendan1 } }, [TRAINER_BRENDAN_2] = @@ -7304,7 +7304,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Brendan2 + .party = {.NoItemDefaultMoves = gTrainerParty_Brendan2 } }, [TRAINER_BRENDAN_3] = @@ -7318,7 +7318,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Brendan3 + .party = {.NoItemDefaultMoves = gTrainerParty_Brendan3 } }, [TRAINER_BRENDAN_4] = @@ -7332,7 +7332,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0xb, .partySize = 1, - .party = gTrainerParty_Brendan4 + .party = {.NoItemDefaultMoves = gTrainerParty_Brendan4 } }, [TRAINER_BRENDAN_5] = @@ -7346,7 +7346,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Brendan5 + .party = {.NoItemDefaultMoves = gTrainerParty_Brendan5 } }, [TRAINER_BRENDAN_6] = @@ -7360,7 +7360,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Brendan6 + .party = {.NoItemDefaultMoves = gTrainerParty_Brendan6 } }, [TRAINER_BRENDAN_7] = @@ -7374,7 +7374,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 1, - .party = gTrainerParty_Brendan7 + .party = {.NoItemDefaultMoves = gTrainerParty_Brendan7 } }, [TRAINER_BRENDAN_8] = @@ -7388,7 +7388,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Brendan8 + .party = {.NoItemDefaultMoves = gTrainerParty_Brendan8 } }, [TRAINER_BRENDAN_9] = @@ -7402,7 +7402,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Brendan9 + .party = {.NoItemDefaultMoves = gTrainerParty_Brendan9 } }, [TRAINER_MAY_1] = @@ -7416,7 +7416,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 1, - .party = gTrainerParty_May1 + .party = {.NoItemDefaultMoves = gTrainerParty_May1 } }, [TRAINER_MAY_2] = @@ -7430,7 +7430,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_May2 + .party = {.NoItemDefaultMoves = gTrainerParty_May2 } }, [TRAINER_MAY_3] = @@ -7444,7 +7444,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_May3 + .party = {.NoItemDefaultMoves = gTrainerParty_May3 } }, [TRAINER_MAY_4] = @@ -7458,7 +7458,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 1, - .party = gTrainerParty_May4 + .party = {.NoItemDefaultMoves = gTrainerParty_May4 } }, [TRAINER_MAY_5] = @@ -7472,7 +7472,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_May5 + .party = {.NoItemDefaultMoves = gTrainerParty_May5 } }, [TRAINER_MAY_6] = @@ -7486,7 +7486,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_May6 + .party = {.NoItemDefaultMoves = gTrainerParty_May6 } }, [TRAINER_MAY_7] = @@ -7500,7 +7500,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 1, - .party = gTrainerParty_May7 + .party = {.NoItemDefaultMoves = gTrainerParty_May7 } }, [TRAINER_MAY_8] = @@ -7514,7 +7514,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_May8 + .party = {.NoItemDefaultMoves = gTrainerParty_May8 } }, [TRAINER_MAY_9] = @@ -7528,7 +7528,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_May9 + .party = {.NoItemDefaultMoves = gTrainerParty_May9 } }, [TRAINER_ISAAC_1] = @@ -7542,7 +7542,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 6, - .party = gTrainerParty_Isaac1 + .party = {.NoItemDefaultMoves = gTrainerParty_Isaac1 } }, [TRAINER_RILEY] = @@ -7556,7 +7556,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Riley + .party = {.NoItemDefaultMoves = gTrainerParty_Riley } }, [TRAINER_AIDAN] = @@ -7570,7 +7570,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Aidan + .party = {.NoItemDefaultMoves = gTrainerParty_Aidan } }, [TRAINER_ISAAC_2] = @@ -7584,7 +7584,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 6, - .party = gTrainerParty_Isaac2 + .party = {.NoItemDefaultMoves = gTrainerParty_Isaac2 } }, [TRAINER_ISAAC_3] = @@ -7598,7 +7598,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 6, - .party = gTrainerParty_Isaac3 + .party = {.NoItemDefaultMoves = gTrainerParty_Isaac3 } }, [TRAINER_ISAAC_4] = @@ -7612,7 +7612,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 6, - .party = gTrainerParty_Isaac4 + .party = {.NoItemDefaultMoves = gTrainerParty_Isaac4 } }, [TRAINER_ISAAC_5] = @@ -7626,7 +7626,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 6, - .party = gTrainerParty_Isaac5 + .party = {.NoItemDefaultMoves = gTrainerParty_Isaac5 } }, [TRAINER_LYDIA_1] = @@ -7640,7 +7640,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 6, - .party = gTrainerParty_Lydia1 + .party = {.NoItemDefaultMoves = gTrainerParty_Lydia1 } }, [TRAINER_ALEXIA] = @@ -7654,7 +7654,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Alexia + .party = {.NoItemDefaultMoves = gTrainerParty_Alexia } }, [TRAINER_DANIELLE] = @@ -7668,7 +7668,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Danielle + .party = {.NoItemDefaultMoves = gTrainerParty_Danielle } }, [TRAINER_LYDIA_2] = @@ -7682,7 +7682,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 6, - .party = gTrainerParty_Lydia2 + .party = {.NoItemDefaultMoves = gTrainerParty_Lydia2 } }, [TRAINER_LYDIA_3] = @@ -7696,7 +7696,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 6, - .party = gTrainerParty_Lydia3 + .party = {.NoItemDefaultMoves = gTrainerParty_Lydia3 } }, [TRAINER_LYDIA_4] = @@ -7710,7 +7710,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 6, - .party = gTrainerParty_Lydia4 + .party = {.NoItemDefaultMoves = gTrainerParty_Lydia4 } }, [TRAINER_LYDIA_5] = @@ -7724,7 +7724,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 6, - .party = gTrainerParty_Lydia5 + .party = {.NoItemDefaultMoves = gTrainerParty_Lydia5 } }, [TRAINER_JACKSON_1] = @@ -7738,7 +7738,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 1, - .party = gTrainerParty_Jackson1 + .party = {.NoItemDefaultMoves = gTrainerParty_Jackson1 } }, [TRAINER_CARLOS] = @@ -7752,7 +7752,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Carlos + .party = {.NoItemDefaultMoves = gTrainerParty_Carlos } }, [TRAINER_SEBASTIAN] = @@ -7766,7 +7766,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 1, - .party = gTrainerParty_Sebastian + .party = {.NoItemDefaultMoves = gTrainerParty_Sebastian } }, [TRAINER_JACKSON_2] = @@ -7780,7 +7780,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0xb, .partySize = 1, - .party = gTrainerParty_Jackson2 + .party = {.NoItemDefaultMoves = gTrainerParty_Jackson2 } }, [TRAINER_JACKSON_3] = @@ -7794,7 +7794,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 1, - .party = gTrainerParty_Jackson3 + .party = {.NoItemDefaultMoves = gTrainerParty_Jackson3 } }, [TRAINER_JACKSON_4] = @@ -7808,7 +7808,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0xb, .partySize = 1, - .party = gTrainerParty_Jackson4 + .party = {.NoItemDefaultMoves = gTrainerParty_Jackson4 } }, [TRAINER_JACKSON_5] = @@ -7822,7 +7822,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 2, - .party = gTrainerParty_Jackson5 + .party = {.NoItemDefaultMoves = gTrainerParty_Jackson5 } }, [TRAINER_CATHERINE_1] = @@ -7836,7 +7836,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0xb, .partySize = 2, - .party = gTrainerParty_Catherine1 + .party = {.NoItemDefaultMoves = gTrainerParty_Catherine1 } }, [TRAINER_JENNA] = @@ -7850,7 +7850,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0xb, .partySize = 3, - .party = gTrainerParty_Jenna + .party = {.NoItemDefaultMoves = gTrainerParty_Jenna } }, [TRAINER_SOPHIA] = @@ -7864,7 +7864,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 2, - .party = gTrainerParty_Sophia + .party = {.NoItemDefaultMoves = gTrainerParty_Sophia } }, [TRAINER_CATHERINE_2] = @@ -7878,7 +7878,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0xb, .partySize = 2, - .party = gTrainerParty_Catherine2 + .party = {.NoItemDefaultMoves = gTrainerParty_Catherine2 } }, [TRAINER_CATHERINE_3] = @@ -7892,7 +7892,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 2, - .party = gTrainerParty_Catherine3 + .party = {.NoItemDefaultMoves = gTrainerParty_Catherine3 } }, [TRAINER_CATHERINE_4] = @@ -7906,7 +7906,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0xb, .partySize = 2, - .party = gTrainerParty_Catherine4 + .party = {.NoItemDefaultMoves = gTrainerParty_Catherine4 } }, [TRAINER_CATHERINE_5] = @@ -7920,7 +7920,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 2, - .party = gTrainerParty_Catherine5 + .party = {.NoItemDefaultMoves = gTrainerParty_Catherine5 } }, [TRAINER_MAXIE_1] = @@ -7934,7 +7934,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 2, - .party = gTrainerParty_Maxie1 + .party = {.NoItemDefaultMoves = gTrainerParty_Maxie1 } }, [TRAINER_GRUNT_28] = @@ -7948,7 +7948,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Grunt28 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt28 } }, [TRAINER_GRUNT_29] = @@ -7962,7 +7962,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 4, - .party = gTrainerParty_Grunt29 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt29 } }, [TRAINER_GRUNT_30] = @@ -7976,7 +7976,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Grunt30 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt30 } }, [TRAINER_GRUNT_31] = @@ -7990,7 +7990,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Grunt31 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt31 } }, [TRAINER_GRUNT_32] = @@ -8004,7 +8004,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Grunt32 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt32 } }, [TRAINER_GRUNT_33] = @@ -8018,7 +8018,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Grunt33 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt33 } }, [TRAINER_GRUNT_34] = @@ -8032,7 +8032,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Grunt34 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt34 } }, [TRAINER_GRUNT_35] = @@ -8046,7 +8046,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Grunt35 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt35 } }, [TRAINER_GRUNT_36] = @@ -8060,7 +8060,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Grunt36 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt36 } }, [TRAINER_GRUNT_37] = @@ -8074,7 +8074,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Grunt37 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt37 } }, [TRAINER_GRUNT_38] = @@ -8088,7 +8088,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Grunt38 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt38 } }, [TRAINER_GRUNT_39] = @@ -8102,7 +8102,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Grunt39 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt39 } }, [TRAINER_GRUNT_40] = @@ -8116,7 +8116,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Grunt40 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt40 } }, [TRAINER_GRUNT_41] = @@ -8130,7 +8130,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Grunt41 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt41 } }, [TRAINER_GRUNT_42] = @@ -8144,7 +8144,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Grunt42 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt42 } }, [TRAINER_GRUNT_43] = @@ -8158,7 +8158,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Grunt43 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt43 } }, [TRAINER_GRUNT_44] = @@ -8172,7 +8172,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Grunt44 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt44 } }, [TRAINER_GRUNT_45] = @@ -8186,7 +8186,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Grunt45 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt45 } }, [TRAINER_GRUNT_46] = @@ -8200,7 +8200,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Grunt46 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt46 } }, [TRAINER_GRUNT_47] = @@ -8214,7 +8214,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Grunt47 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt47 } }, [TRAINER_GRUNT_48] = @@ -8228,7 +8228,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Grunt48 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt48 } }, [TRAINER_GRUNT_49] = @@ -8242,7 +8242,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Grunt49 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt49 } }, [TRAINER_GRUNT_50] = @@ -8256,7 +8256,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Grunt50 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt50 } }, [TRAINER_GRUNT_51] = @@ -8270,7 +8270,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Grunt51 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt51 } }, [TRAINER_GRUNT_52] = @@ -8284,7 +8284,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Grunt52 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt52 } }, [TRAINER_GRUNT_53] = @@ -8298,7 +8298,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Grunt53 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt53 } }, [TRAINER_GRUNT_54] = @@ -8312,7 +8312,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Grunt54 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt54 } }, [TRAINER_ANONYMOUS_14] = @@ -8326,7 +8326,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 2, - .party = gTrainerParty_Anonymous14 + .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous14 } }, [TRAINER_ANONYMOUS_15] = @@ -8340,7 +8340,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 2, - .party = gTrainerParty_Anonymous15 + .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous15 } }, [TRAINER_TABITHA_1] = @@ -8354,7 +8354,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0xb, .partySize = 3, - .party = gTrainerParty_Tabitha1 + .party = {.NoItemDefaultMoves = gTrainerParty_Tabitha1 } }, [TRAINER_TABITHA_2] = @@ -8368,7 +8368,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Tabitha2 + .party = {.NoItemDefaultMoves = gTrainerParty_Tabitha2 } }, [TRAINER_ANONYMOUS_16] = @@ -8382,7 +8382,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0xb, .partySize = 2, - .party = gTrainerParty_Anonymous16 + .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous16 } }, [TRAINER_COURTNEY_1] = @@ -8396,7 +8396,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 2, - .party = gTrainerParty_Courtney1 + .party = {.NoItemDefaultMoves = gTrainerParty_Courtney1 } }, [TRAINER_COURTNEY_2] = @@ -8410,7 +8410,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0xb, .partySize = 2, - .party = gTrainerParty_Courtney2 + .party = {.NoItemDefaultMoves = gTrainerParty_Courtney2 } }, [TRAINER_MAXIE_2] = @@ -8424,7 +8424,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Maxie2 + .party = {.NoItemDefaultMoves = gTrainerParty_Maxie2 } }, [TRAINER_MAXIE_3] = @@ -8438,7 +8438,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Maxie3 + .party = {.NoItemDefaultMoves = gTrainerParty_Maxie3 } }, [TRAINER_TIANA] = @@ -8452,7 +8452,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Tiana + .party = {.NoItemDefaultMoves = gTrainerParty_Tiana } }, [TRAINER_HALEY_1] = @@ -8466,7 +8466,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Haley1 + .party = {.NoItemDefaultMoves = gTrainerParty_Haley1 } }, [TRAINER_JANICE] = @@ -8480,7 +8480,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Janice + .party = {.NoItemDefaultMoves = gTrainerParty_Janice } }, [TRAINER_VIVI] = @@ -8494,7 +8494,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Vivi + .party = {.NoItemDefaultMoves = gTrainerParty_Vivi } }, [TRAINER_HALEY_2] = @@ -8508,7 +8508,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Haley2 + .party = {.NoItemDefaultMoves = gTrainerParty_Haley2 } }, [TRAINER_HALEY_3] = @@ -8522,7 +8522,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Haley3 + .party = {.NoItemDefaultMoves = gTrainerParty_Haley3 } }, [TRAINER_HALEY_4] = @@ -8536,7 +8536,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Haley4 + .party = {.NoItemDefaultMoves = gTrainerParty_Haley4 } }, [TRAINER_HALEY_5] = @@ -8550,7 +8550,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Haley5 + .party = {.NoItemDefaultMoves = gTrainerParty_Haley5 } }, [TRAINER_SALLY] = @@ -8564,7 +8564,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Sally + .party = {.NoItemDefaultMoves = gTrainerParty_Sally } }, [TRAINER_ROBIN] = @@ -8578,7 +8578,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Robin + .party = {.NoItemDefaultMoves = gTrainerParty_Robin } }, [TRAINER_ANDREA] = @@ -8592,7 +8592,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Andrea + .party = {.NoItemDefaultMoves = gTrainerParty_Andrea } }, [TRAINER_CRISSY] = @@ -8606,7 +8606,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Crissy + .party = {.NoItemDefaultMoves = gTrainerParty_Crissy } }, [TRAINER_RICK] = @@ -8620,7 +8620,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Rick + .party = {.NoItemDefaultMoves = gTrainerParty_Rick } }, [TRAINER_LYLE] = @@ -8634,7 +8634,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 6, - .party = gTrainerParty_Lyle + .party = {.NoItemDefaultMoves = gTrainerParty_Lyle } }, [TRAINER_JOSE] = @@ -8648,7 +8648,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Jose + .party = {.NoItemDefaultMoves = gTrainerParty_Jose } }, [TRAINER_DOUG] = @@ -8662,7 +8662,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Doug + .party = {.NoItemDefaultMoves = gTrainerParty_Doug } }, [TRAINER_GREG] = @@ -8676,7 +8676,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Greg + .party = {.NoItemDefaultMoves = gTrainerParty_Greg } }, [TRAINER_KENT] = @@ -8690,7 +8690,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Kent + .party = {.NoItemDefaultMoves = gTrainerParty_Kent } }, [TRAINER_JAMES_1] = @@ -8704,7 +8704,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_James1 + .party = {.NoItemDefaultMoves = gTrainerParty_James1 } }, [TRAINER_JAMES_2] = @@ -8718,7 +8718,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_James2 + .party = {.NoItemDefaultMoves = gTrainerParty_James2 } }, [TRAINER_JAMES_3] = @@ -8732,7 +8732,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_James3 + .party = {.NoItemDefaultMoves = gTrainerParty_James3 } }, [TRAINER_JAMES_4] = @@ -8746,7 +8746,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_James4 + .party = {.NoItemDefaultMoves = gTrainerParty_James4 } }, [TRAINER_JAMES_5] = @@ -8760,7 +8760,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 4, - .party = gTrainerParty_James5 + .party = {.NoItemDefaultMoves = gTrainerParty_James5 } }, [TRAINER_BRICE] = @@ -8774,7 +8774,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Brice + .party = {.NoItemDefaultMoves = gTrainerParty_Brice } }, [TRAINER_TRENT_1] = @@ -8788,7 +8788,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 4, - .party = gTrainerParty_Trent1 + .party = {.NoItemDefaultMoves = gTrainerParty_Trent1 } }, [TRAINER_LENNY] = @@ -8802,7 +8802,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Lenny + .party = {.NoItemDefaultMoves = gTrainerParty_Lenny } }, [TRAINER_LUCAS_1] = @@ -8816,7 +8816,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Lucas1 + .party = {.NoItemDefaultMoves = gTrainerParty_Lucas1 } }, [TRAINER_ALAN] = @@ -8830,7 +8830,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Alan + .party = {.NoItemDefaultMoves = gTrainerParty_Alan } }, [TRAINER_CLARK] = @@ -8844,7 +8844,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Clark + .party = {.NoItemDefaultMoves = gTrainerParty_Clark } }, [TRAINER_ERIC] = @@ -8858,7 +8858,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Eric + .party = {.NoItemDefaultMoves = gTrainerParty_Eric } }, [TRAINER_LUCAS_2] = @@ -8872,7 +8872,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Lucas2 + .party = {.NoItemCustomMoves = gTrainerParty_Lucas2 } }, [TRAINER_MIKE_1] = @@ -8886,7 +8886,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Mike1 + .party = {.NoItemCustomMoves = gTrainerParty_Mike1 } }, [TRAINER_MIKE_2] = @@ -8900,7 +8900,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Mike2 + .party = {.NoItemDefaultMoves = gTrainerParty_Mike2 } }, [TRAINER_TRENT_2] = @@ -8914,7 +8914,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 4, - .party = gTrainerParty_Trent2 + .party = {.NoItemDefaultMoves = gTrainerParty_Trent2 } }, [TRAINER_TRENT_3] = @@ -8928,7 +8928,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 4, - .party = gTrainerParty_Trent3 + .party = {.NoItemDefaultMoves = gTrainerParty_Trent3 } }, [TRAINER_TRENT_4] = @@ -8942,7 +8942,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 4, - .party = gTrainerParty_Trent4 + .party = {.NoItemDefaultMoves = gTrainerParty_Trent4 } }, [TRAINER_TRENT_5] = @@ -8956,7 +8956,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 4, - .party = gTrainerParty_Trent5 + .party = {.NoItemDefaultMoves = gTrainerParty_Trent5 } }, [TRAINER_DEZ_AND_LUKE] = @@ -8970,7 +8970,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_DezAndLuke + .party = {.NoItemDefaultMoves = gTrainerParty_DezAndLuke } }, [TRAINER_LEA_AND_JED] = @@ -8984,7 +8984,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_LeaAndJed + .party = {.NoItemDefaultMoves = gTrainerParty_LeaAndJed } }, [TRAINER_LOIS_AND_HAL_1] = @@ -8998,7 +8998,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_LoisAndHal1 + .party = {.NoItemDefaultMoves = gTrainerParty_LoisAndHal1 } }, [TRAINER_LOIS_AND_HAL_2] = @@ -9012,7 +9012,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_LoisAndHal2 + .party = {.NoItemDefaultMoves = gTrainerParty_LoisAndHal2 } }, [TRAINER_LOIS_AND_HAL_3] = @@ -9026,7 +9026,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_LoisAndHal3 + .party = {.NoItemDefaultMoves = gTrainerParty_LoisAndHal3 } }, [TRAINER_LOIS_AND_HAL_4] = @@ -9040,7 +9040,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_LoisAndHal4 + .party = {.NoItemDefaultMoves = gTrainerParty_LoisAndHal4 } }, [TRAINER_LOIS_AND_HAL_5] = @@ -9054,7 +9054,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_LoisAndHal5 + .party = {.NoItemDefaultMoves = gTrainerParty_LoisAndHal5 } }, [TRAINER_JOHANNA] = @@ -9068,7 +9068,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Johanna + .party = {.NoItemDefaultMoves = gTrainerParty_Johanna } }, [TRAINER_ZANE] = @@ -9082,7 +9082,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 1, - .party = gTrainerParty_Zane + .party = {.NoItemCustomMoves = gTrainerParty_Zane } }, [TRAINER_VIVIAN] = @@ -9096,7 +9096,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Vivian + .party = {.NoItemCustomMoves = gTrainerParty_Vivian } }, [TRAINER_SADIE] = @@ -9110,7 +9110,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Sadie + .party = {.NoItemCustomMoves = gTrainerParty_Sadie } }, [TRAINER_HIDEO_2] = @@ -9124,7 +9124,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x3, .partySize = 2, - .party = gTrainerParty_Hideo2 + .party = {.NoItemCustomMoves = gTrainerParty_Hideo2 } }, [TRAINER_KEIGO] = @@ -9138,7 +9138,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x3, .partySize = 2, - .party = gTrainerParty_Keigo + .party = {.NoItemCustomMoves = gTrainerParty_Keigo } }, [TRAINER_TSUNAO] = @@ -9152,7 +9152,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x3, .partySize = 3, - .party = gTrainerParty_Tsunao + .party = {.NoItemCustomMoves = gTrainerParty_Tsunao } }, [TRAINER_TERRELL] = @@ -9166,7 +9166,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Terrell + .party = {.NoItemDefaultMoves = gTrainerParty_Terrell } }, [TRAINER_KYLEE] = @@ -9180,7 +9180,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Kylee + .party = {.NoItemDefaultMoves = gTrainerParty_Kylee } }, [TRAINER_WALLY_2] = @@ -9194,7 +9194,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 1, - .party = gTrainerParty_Wally2 + .party = {.NoItemDefaultMoves = gTrainerParty_Wally2 } }, [TRAINER_WALLY_3] = @@ -9208,7 +9208,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 5, - .party = gTrainerParty_Wally3 + .party = {.NoItemCustomMoves = gTrainerParty_Wally3 } }, [TRAINER_WALLY_4] = @@ -9222,7 +9222,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 5, - .party = gTrainerParty_Wally4 + .party = {.NoItemCustomMoves = gTrainerParty_Wally4 } }, [TRAINER_WALLY_5] = @@ -9236,7 +9236,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 5, - .party = gTrainerParty_Wally5 + .party = {.NoItemCustomMoves = gTrainerParty_Wally5 } }, [TRAINER_WALLY_6] = @@ -9250,7 +9250,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 5, - .party = gTrainerParty_Wally6 + .party = {.NoItemCustomMoves = gTrainerParty_Wally6 } }, [TRAINER_BRENDAN_10] = @@ -9264,7 +9264,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 4, - .party = gTrainerParty_Brendan10 + .party = {.NoItemDefaultMoves = gTrainerParty_Brendan10 } }, [TRAINER_BRENDAN_11] = @@ -9278,7 +9278,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 4, - .party = gTrainerParty_Brendan11 + .party = {.NoItemDefaultMoves = gTrainerParty_Brendan11 } }, [TRAINER_BRENDAN_12] = @@ -9292,7 +9292,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 4, - .party = gTrainerParty_Brendan12 + .party = {.NoItemDefaultMoves = gTrainerParty_Brendan12 } }, [TRAINER_MAY_10] = @@ -9306,7 +9306,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 4, - .party = gTrainerParty_May10 + .party = {.NoItemDefaultMoves = gTrainerParty_May10 } }, [TRAINER_MAY_11] = @@ -9320,7 +9320,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 4, - .party = gTrainerParty_May11 + .party = {.NoItemDefaultMoves = gTrainerParty_May11 } }, [TRAINER_MAY_12] = @@ -9334,7 +9334,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 4, - .party = gTrainerParty_May12 + .party = {.NoItemDefaultMoves = gTrainerParty_May12 } }, [TRAINER_JONAH] = @@ -9348,7 +9348,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 4, - .party = gTrainerParty_Jonah + .party = {.NoItemDefaultMoves = gTrainerParty_Jonah } }, [TRAINER_HENRY] = @@ -9362,7 +9362,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Henry + .party = {.NoItemDefaultMoves = gTrainerParty_Henry } }, [TRAINER_ROGER] = @@ -9376,7 +9376,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 4, - .party = gTrainerParty_Roger + .party = {.NoItemDefaultMoves = gTrainerParty_Roger } }, [TRAINER_ALEXA] = @@ -9390,7 +9390,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 2, - .party = gTrainerParty_Alexa + .party = {.NoItemDefaultMoves = gTrainerParty_Alexa } }, [TRAINER_RUBEN] = @@ -9404,7 +9404,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Ruben + .party = {.NoItemDefaultMoves = gTrainerParty_Ruben } }, [TRAINER_KOJI] = @@ -9418,7 +9418,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Koji + .party = {.NoItemDefaultMoves = gTrainerParty_Koji } }, [TRAINER_WAYNE] = @@ -9432,7 +9432,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 4, - .party = gTrainerParty_Wayne + .party = {.NoItemDefaultMoves = gTrainerParty_Wayne } }, [TRAINER_BYRON] = @@ -9446,7 +9446,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Byron + .party = {.NoItemDefaultMoves = gTrainerParty_Byron } }, [TRAINER_REED] = @@ -9460,7 +9460,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 4, - .party = gTrainerParty_Reed + .party = {.NoItemDefaultMoves = gTrainerParty_Reed } }, [TRAINER_TISHA] = @@ -9474,7 +9474,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Tisha + .party = {.NoItemDefaultMoves = gTrainerParty_Tisha } }, [TRAINER_TORI_AND_TIA] = @@ -9488,7 +9488,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_ToriAndTia + .party = {.NoItemDefaultMoves = gTrainerParty_ToriAndTia } }, [TRAINER_KIM_AND_IRIS] = @@ -9502,7 +9502,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_KimAndIris + .party = {.NoItemCustomMoves = gTrainerParty_KimAndIris } }, [TRAINER_TYRA_AND_IVY] = @@ -9516,7 +9516,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_TyraAndIvy + .party = {.NoItemCustomMoves = gTrainerParty_TyraAndIvy } }, [TRAINER_MEL_AND_PAUL] = @@ -9530,7 +9530,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_MelAndPaul + .party = {.NoItemCustomMoves = gTrainerParty_MelAndPaul } }, [TRAINER_JOHN_AND_JAY_1] = @@ -9544,7 +9544,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x7, .partySize = 2, - .party = gTrainerParty_JohnAndJay1 + .party = {.NoItemCustomMoves = gTrainerParty_JohnAndJay1 } }, [TRAINER_JOHN_AND_JAY_2] = @@ -9558,7 +9558,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x7, .partySize = 2, - .party = gTrainerParty_JohnAndJay2 + .party = {.NoItemCustomMoves = gTrainerParty_JohnAndJay2 } }, [TRAINER_JOHN_AND_JAY_3] = @@ -9572,7 +9572,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x7, .partySize = 2, - .party = gTrainerParty_JohnAndJay3 + .party = {.NoItemCustomMoves = gTrainerParty_JohnAndJay3 } }, [TRAINER_JOHN_AND_JAY_4] = @@ -9586,7 +9586,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0xb, .partySize = 2, - .party = gTrainerParty_JohnAndJay4 + .party = {.NoItemCustomMoves = gTrainerParty_JohnAndJay4 } }, [TRAINER_JOHN_AND_JAY_5] = @@ -9600,7 +9600,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x7, .partySize = 2, - .party = gTrainerParty_JohnAndJay5 + .party = {.NoItemCustomMoves = gTrainerParty_JohnAndJay5 } }, [TRAINER_RELI_AND_IAN] = @@ -9614,7 +9614,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_ReliAndIan + .party = {.NoItemDefaultMoves = gTrainerParty_ReliAndIan } }, [TRAINER_RITA_AND_SAM_1] = @@ -9628,7 +9628,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_RitaAndSam1 + .party = {.NoItemDefaultMoves = gTrainerParty_RitaAndSam1 } }, [TRAINER_RITA_AND_SAM_2] = @@ -9642,7 +9642,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_RitaAndSam2 + .party = {.NoItemDefaultMoves = gTrainerParty_RitaAndSam2 } }, [TRAINER_RITA_AND_SAM_3] = @@ -9656,7 +9656,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_RitaAndSam3 + .party = {.NoItemDefaultMoves = gTrainerParty_RitaAndSam3 } }, [TRAINER_RITA_AND_SAM_4] = @@ -9670,7 +9670,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_RitaAndSam4 + .party = {.NoItemDefaultMoves = gTrainerParty_RitaAndSam4 } }, [TRAINER_RITA_AND_SAM_5] = @@ -9684,7 +9684,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_RitaAndSam5 + .party = {.NoItemDefaultMoves = gTrainerParty_RitaAndSam5 } }, [TRAINER_LISA_AND_RAY] = @@ -9698,7 +9698,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_LisaAndRay + .party = {.NoItemDefaultMoves = gTrainerParty_LisaAndRay } }, [TRAINER_EUGENE] = @@ -9712,6 +9712,6 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 4, - .party = gTrainerParty_Eugene - } + .party = {.NoItemDefaultMoves = gTrainerParty_Eugene } + }, }; diff --git a/src/data/trainers_en.h b/src/data/trainers_en.h index 7f522dd93..621945db8 100644 --- a/src/data/trainers_en.h +++ b/src/data/trainers_en.h @@ -10,7 +10,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x0, .partySize = 0, - .party = NULL + .party = {.NoItemDefaultMoves = NULL } }, [TRAINER_ARCHIE_1] = @@ -24,7 +24,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 2, - .party = gTrainerParty_Archie1 + .party = {.NoItemDefaultMoves = gTrainerParty_Archie1 } }, [TRAINER_GRUNT_1] = @@ -38,7 +38,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Grunt1 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt1 } }, [TRAINER_GRUNT_2] = @@ -52,7 +52,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 4, - .party = gTrainerParty_Grunt2 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt2 } }, [TRAINER_GRUNT_3] = @@ -66,7 +66,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Grunt3 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt3 } }, [TRAINER_GRUNT_4] = @@ -80,7 +80,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Grunt4 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt4 } }, [TRAINER_GRUNT_5] = @@ -94,7 +94,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Grunt5 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt5 } }, [TRAINER_GRUNT_6] = @@ -108,7 +108,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Grunt6 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt6 } }, [TRAINER_GRUNT_7] = @@ -122,7 +122,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Grunt7 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt7 } }, [TRAINER_GRUNT_8] = @@ -136,7 +136,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Grunt8 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt8 } }, [TRAINER_GRUNT_9] = @@ -150,7 +150,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Grunt9 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt9 } }, [TRAINER_GRUNT_10] = @@ -164,7 +164,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Grunt10 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt10 } }, [TRAINER_GRUNT_11] = @@ -178,7 +178,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Grunt11 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt11 } }, [TRAINER_GRUNT_12] = @@ -192,7 +192,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Grunt12 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt12 } }, [TRAINER_GRUNT_13] = @@ -206,7 +206,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Grunt13 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt13 } }, [TRAINER_GRUNT_14] = @@ -220,7 +220,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Grunt14 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt14 } }, [TRAINER_GRUNT_15] = @@ -234,7 +234,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Grunt15 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt15 } }, [TRAINER_GRUNT_16] = @@ -248,7 +248,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Grunt16 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt16 } }, [TRAINER_GRUNT_17] = @@ -262,7 +262,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Grunt17 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt17 } }, [TRAINER_GRUNT_18] = @@ -276,7 +276,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Grunt18 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt18 } }, [TRAINER_GRUNT_19] = @@ -290,7 +290,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Grunt19 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt19 } }, [TRAINER_GRUNT_20] = @@ -304,7 +304,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Grunt20 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt20 } }, [TRAINER_GRUNT_21] = @@ -318,7 +318,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Grunt21 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt21 } }, [TRAINER_GRUNT_22] = @@ -332,7 +332,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Grunt22 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt22 } }, [TRAINER_GRUNT_23] = @@ -346,7 +346,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Grunt23 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt23 } }, [TRAINER_GRUNT_24] = @@ -360,7 +360,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Grunt24 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt24 } }, [TRAINER_GRUNT_25] = @@ -374,7 +374,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Grunt25 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt25 } }, [TRAINER_GRUNT_26] = @@ -388,7 +388,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Grunt26 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt26 } }, [TRAINER_GRUNT_27] = @@ -402,7 +402,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Grunt27 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt27 } }, [TRAINER_ANONYMOUS_1] = @@ -416,7 +416,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 2, - .party = gTrainerParty_Anonymous1 + .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous1 } }, [TRAINER_MATT_1] = @@ -430,7 +430,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Matt1 + .party = {.NoItemDefaultMoves = gTrainerParty_Matt1 } }, [TRAINER_MATT_2] = @@ -444,7 +444,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0xb, .partySize = 3, - .party = gTrainerParty_Matt2 + .party = {.NoItemDefaultMoves = gTrainerParty_Matt2 } }, [TRAINER_SHELLY_1] = @@ -458,7 +458,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 2, - .party = gTrainerParty_Shelly1 + .party = {.NoItemDefaultMoves = gTrainerParty_Shelly1 } }, [TRAINER_SHELLY_2] = @@ -472,7 +472,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 2, - .party = gTrainerParty_Shelly2 + .party = {.NoItemDefaultMoves = gTrainerParty_Shelly2 } }, [TRAINER_ARCHIE_2] = @@ -486,7 +486,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Archie2 + .party = {.NoItemDefaultMoves = gTrainerParty_Archie2 } }, [TRAINER_ARCHIE_3] = @@ -500,7 +500,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Archie3 + .party = {.NoItemDefaultMoves = gTrainerParty_Archie3 } }, [TRAINER_DAISY] = @@ -514,7 +514,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Daisy + .party = {.NoItemDefaultMoves = gTrainerParty_Daisy } }, [TRAINER_ROSE_1] = @@ -528,7 +528,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Rose1 + .party = {.NoItemDefaultMoves = gTrainerParty_Rose1 } }, [TRAINER_LILY] = @@ -542,7 +542,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Lily + .party = {.NoItemDefaultMoves = gTrainerParty_Lily } }, [TRAINER_VIOLET] = @@ -556,7 +556,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Violet + .party = {.NoItemDefaultMoves = gTrainerParty_Violet } }, [TRAINER_ROSE_2] = @@ -570,7 +570,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Rose2 + .party = {.NoItemDefaultMoves = gTrainerParty_Rose2 } }, [TRAINER_ROSE_3] = @@ -584,7 +584,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Rose3 + .party = {.NoItemDefaultMoves = gTrainerParty_Rose3 } }, [TRAINER_ROSE_4] = @@ -598,7 +598,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Rose4 + .party = {.NoItemDefaultMoves = gTrainerParty_Rose4 } }, [TRAINER_ROSE_5] = @@ -612,7 +612,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Rose5 + .party = {.NoItemDefaultMoves = gTrainerParty_Rose5 } }, [TRAINER_DUSTY_1] = @@ -626,7 +626,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Dusty1 + .party = {.NoItemCustomMoves = gTrainerParty_Dusty1 } }, [TRAINER_CHIP] = @@ -640,7 +640,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Chip + .party = {.NoItemCustomMoves = gTrainerParty_Chip } }, [TRAINER_FOSTER] = @@ -654,7 +654,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Foster + .party = {.NoItemCustomMoves = gTrainerParty_Foster } }, [TRAINER_DUSTY_2] = @@ -668,7 +668,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Dusty2 + .party = {.NoItemCustomMoves = gTrainerParty_Dusty2 } }, [TRAINER_DUSTY_3] = @@ -682,7 +682,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Dusty3 + .party = {.NoItemCustomMoves = gTrainerParty_Dusty3 } }, [TRAINER_DUSTY_4] = @@ -696,7 +696,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Dusty4 + .party = {.NoItemCustomMoves = gTrainerParty_Dusty4 } }, [TRAINER_DUSTY_5] = @@ -710,7 +710,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Dusty5 + .party = {.NoItemCustomMoves = gTrainerParty_Dusty5 } }, [TRAINER_GABBY_AND_TY_1] = @@ -724,7 +724,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_GabbyAndTy1 + .party = {.NoItemDefaultMoves = gTrainerParty_GabbyAndTy1 } }, [TRAINER_GABBY_AND_TY_2] = @@ -738,7 +738,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_GabbyAndTy2 + .party = {.NoItemDefaultMoves = gTrainerParty_GabbyAndTy2 } }, [TRAINER_GABBY_AND_TY_3] = @@ -752,7 +752,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_GabbyAndTy3 + .party = {.NoItemDefaultMoves = gTrainerParty_GabbyAndTy3 } }, [TRAINER_GABBY_AND_TY_4] = @@ -766,7 +766,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_GabbyAndTy4 + .party = {.NoItemDefaultMoves = gTrainerParty_GabbyAndTy4 } }, [TRAINER_GABBY_AND_TY_5] = @@ -780,7 +780,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_GabbyAndTy5 + .party = {.NoItemDefaultMoves = gTrainerParty_GabbyAndTy5 } }, [TRAINER_GABBY_AND_TY_6] = @@ -794,7 +794,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_GabbyAndTy6 + .party = {.NoItemCustomMoves = gTrainerParty_GabbyAndTy6 } }, [TRAINER_LOLA_1] = @@ -808,7 +808,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Lola1 + .party = {.NoItemDefaultMoves = gTrainerParty_Lola1 } }, [TRAINER_CARMEN] = @@ -822,7 +822,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Carmen + .party = {.NoItemDefaultMoves = gTrainerParty_Carmen } }, [TRAINER_GWEN] = @@ -836,7 +836,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Gwen + .party = {.NoItemDefaultMoves = gTrainerParty_Gwen } }, [TRAINER_LOLA_2] = @@ -850,7 +850,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Lola2 + .party = {.NoItemDefaultMoves = gTrainerParty_Lola2 } }, [TRAINER_LOLA_3] = @@ -864,7 +864,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Lola3 + .party = {.NoItemDefaultMoves = gTrainerParty_Lola3 } }, [TRAINER_LOLA_4] = @@ -878,7 +878,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Lola4 + .party = {.NoItemDefaultMoves = gTrainerParty_Lola4 } }, [TRAINER_LOLA_5] = @@ -892,7 +892,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Lola5 + .party = {.NoItemDefaultMoves = gTrainerParty_Lola5 } }, [TRAINER_RICKY_1] = @@ -906,7 +906,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Ricky1 + .party = {.NoItemCustomMoves = gTrainerParty_Ricky1 } }, [TRAINER_SIMON] = @@ -920,7 +920,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Simon + .party = {.NoItemDefaultMoves = gTrainerParty_Simon } }, [TRAINER_CHARLIE] = @@ -934,7 +934,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Charlie + .party = {.NoItemDefaultMoves = gTrainerParty_Charlie } }, [TRAINER_RICKY_2] = @@ -948,7 +948,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Ricky2 + .party = {.NoItemCustomMoves = gTrainerParty_Ricky2 } }, [TRAINER_RICKY_3] = @@ -962,7 +962,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Ricky3 + .party = {.NoItemCustomMoves = gTrainerParty_Ricky3 } }, [TRAINER_RICKY_4] = @@ -976,7 +976,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Ricky4 + .party = {.NoItemCustomMoves = gTrainerParty_Ricky4 } }, [TRAINER_RICKY_5] = @@ -990,7 +990,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Ricky5 + .party = {.NoItemCustomMoves = gTrainerParty_Ricky5 } }, [TRAINER_RANDALL] = @@ -1004,7 +1004,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 1, - .party = gTrainerParty_Randall + .party = {.NoItemDefaultMoves = gTrainerParty_Randall } }, [TRAINER_PARKER] = @@ -1018,7 +1018,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 1, - .party = gTrainerParty_Parker + .party = {.NoItemDefaultMoves = gTrainerParty_Parker } }, [TRAINER_GEORGE] = @@ -1032,7 +1032,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 1, - .party = gTrainerParty_George + .party = {.NoItemDefaultMoves = gTrainerParty_George } }, [TRAINER_BERKE] = @@ -1046,7 +1046,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 1, - .party = gTrainerParty_Berke + .party = {.NoItemDefaultMoves = gTrainerParty_Berke } }, [TRAINER_CLYDE] = @@ -1060,7 +1060,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 5, - .party = gTrainerParty_Clyde + .party = {.NoItemCustomMoves = gTrainerParty_Clyde } }, [TRAINER_VINCENT] = @@ -1074,7 +1074,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Vincent + .party = {.NoItemDefaultMoves = gTrainerParty_Vincent } }, [TRAINER_LEROY] = @@ -1088,7 +1088,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 2, - .party = gTrainerParty_Leroy + .party = {.NoItemDefaultMoves = gTrainerParty_Leroy } }, [TRAINER_WILTON_1] = @@ -1102,7 +1102,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Wilton1 + .party = {.NoItemDefaultMoves = gTrainerParty_Wilton1 } }, [TRAINER_EDGAR] = @@ -1116,7 +1116,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 1, - .party = gTrainerParty_Edgar + .party = {.NoItemDefaultMoves = gTrainerParty_Edgar } }, [TRAINER_ALBERT] = @@ -1130,7 +1130,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 2, - .party = gTrainerParty_Albert + .party = {.NoItemDefaultMoves = gTrainerParty_Albert } }, [TRAINER_SAMUEL] = @@ -1144,7 +1144,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Samuel + .party = {.NoItemDefaultMoves = gTrainerParty_Samuel } }, [TRAINER_VITO] = @@ -1158,7 +1158,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 4, - .party = gTrainerParty_Vito + .party = {.NoItemDefaultMoves = gTrainerParty_Vito } }, [TRAINER_OWEN] = @@ -1172,7 +1172,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Owen + .party = {.NoItemDefaultMoves = gTrainerParty_Owen } }, [TRAINER_WILTON_2] = @@ -1186,7 +1186,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Wilton2 + .party = {.NoItemDefaultMoves = gTrainerParty_Wilton2 } }, [TRAINER_WILTON_3] = @@ -1200,7 +1200,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Wilton3 + .party = {.NoItemDefaultMoves = gTrainerParty_Wilton3 } }, [TRAINER_WILTON_4] = @@ -1214,7 +1214,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Wilton4 + .party = {.NoItemDefaultMoves = gTrainerParty_Wilton4 } }, [TRAINER_WILTON_5] = @@ -1228,7 +1228,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Wilton5 + .party = {.NoItemDefaultMoves = gTrainerParty_Wilton5 } }, [TRAINER_WARREN] = @@ -1242,7 +1242,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Warren + .party = {.NoItemDefaultMoves = gTrainerParty_Warren } }, [TRAINER_MARY] = @@ -1256,7 +1256,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 1, - .party = gTrainerParty_Mary + .party = {.NoItemDefaultMoves = gTrainerParty_Mary } }, [TRAINER_LORI] = @@ -1270,7 +1270,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 1, - .party = gTrainerParty_Lori + .party = {.NoItemDefaultMoves = gTrainerParty_Lori } }, [TRAINER_JODY] = @@ -1284,7 +1284,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0xb, .partySize = 1, - .party = gTrainerParty_Jody + .party = {.NoItemDefaultMoves = gTrainerParty_Jody } }, [TRAINER_WENDY] = @@ -1298,7 +1298,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0xb, .partySize = 3, - .party = gTrainerParty_Wendy + .party = {.NoItemCustomMoves = gTrainerParty_Wendy } }, [TRAINER_ELAINE] = @@ -1312,7 +1312,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0xb, .partySize = 2, - .party = gTrainerParty_Elaine + .party = {.NoItemDefaultMoves = gTrainerParty_Elaine } }, [TRAINER_BROOKE_1] = @@ -1326,7 +1326,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Brooke1 + .party = {.NoItemDefaultMoves = gTrainerParty_Brooke1 } }, [TRAINER_JENNIFER] = @@ -1340,7 +1340,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 1, - .party = gTrainerParty_Jennifer + .party = {.NoItemDefaultMoves = gTrainerParty_Jennifer } }, [TRAINER_HOPE] = @@ -1354,7 +1354,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 1, - .party = gTrainerParty_Hope + .party = {.NoItemDefaultMoves = gTrainerParty_Hope } }, [TRAINER_SHANNON] = @@ -1368,7 +1368,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 1, - .party = gTrainerParty_Shannon + .party = {.NoItemDefaultMoves = gTrainerParty_Shannon } }, [TRAINER_MICHELLE] = @@ -1382,7 +1382,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Michelle + .party = {.NoItemDefaultMoves = gTrainerParty_Michelle } }, [TRAINER_CAROLINE] = @@ -1396,7 +1396,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 2, - .party = gTrainerParty_Caroline + .party = {.NoItemDefaultMoves = gTrainerParty_Caroline } }, [TRAINER_JULIE] = @@ -1410,7 +1410,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 2, - .party = gTrainerParty_Julie + .party = {.NoItemDefaultMoves = gTrainerParty_Julie } }, [TRAINER_BROOKE_2] = @@ -1424,7 +1424,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Brooke2 + .party = {.NoItemDefaultMoves = gTrainerParty_Brooke2 } }, [TRAINER_BROOKE_3] = @@ -1438,7 +1438,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Brooke3 + .party = {.NoItemDefaultMoves = gTrainerParty_Brooke3 } }, [TRAINER_BROOKE_4] = @@ -1452,7 +1452,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Brooke4 + .party = {.NoItemDefaultMoves = gTrainerParty_Brooke4 } }, [TRAINER_BROOKE_5] = @@ -1466,7 +1466,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Brooke5 + .party = {.NoItemDefaultMoves = gTrainerParty_Brooke5 } }, [TRAINER_PATRICIA] = @@ -1480,7 +1480,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Patricia + .party = {.NoItemDefaultMoves = gTrainerParty_Patricia } }, [TRAINER_KINDRA] = @@ -1494,7 +1494,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Kindra + .party = {.NoItemDefaultMoves = gTrainerParty_Kindra } }, [TRAINER_TAMMY] = @@ -1508,7 +1508,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Tammy + .party = {.NoItemDefaultMoves = gTrainerParty_Tammy } }, [TRAINER_VALERIE_1] = @@ -1522,7 +1522,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Valerie1 + .party = {.NoItemDefaultMoves = gTrainerParty_Valerie1 } }, [TRAINER_TASHA] = @@ -1536,7 +1536,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Tasha + .party = {.NoItemDefaultMoves = gTrainerParty_Tasha } }, [TRAINER_VALERIE_2] = @@ -1550,7 +1550,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Valerie2 + .party = {.NoItemDefaultMoves = gTrainerParty_Valerie2 } }, [TRAINER_VALERIE_3] = @@ -1564,7 +1564,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Valerie3 + .party = {.NoItemDefaultMoves = gTrainerParty_Valerie3 } }, [TRAINER_VALERIE_4] = @@ -1578,7 +1578,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Valerie4 + .party = {.NoItemDefaultMoves = gTrainerParty_Valerie4 } }, [TRAINER_VALERIE_5] = @@ -1592,7 +1592,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Valerie5 + .party = {.NoItemDefaultMoves = gTrainerParty_Valerie5 } }, [TRAINER_CINDY_1] = @@ -1606,7 +1606,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Cindy1 + .party = {.ItemDefaultMoves = gTrainerParty_Cindy1 } }, [TRAINER_ANONYMOUS_2] = @@ -1620,7 +1620,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Anonymous2 + .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous2 } }, [TRAINER_BRIANNA_1] = @@ -1634,7 +1634,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Brianna1 + .party = {.NoItemCustomMoves = gTrainerParty_Brianna1 } }, [TRAINER_CINDY_2] = @@ -1648,7 +1648,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Cindy2 + .party = {.NoItemCustomMoves = gTrainerParty_Cindy2 } }, [TRAINER_BRIANNA_2] = @@ -1662,7 +1662,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Brianna2 + .party = {.ItemDefaultMoves = gTrainerParty_Brianna2 } }, [TRAINER_ANETTE] = @@ -1676,7 +1676,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Anette + .party = {.ItemDefaultMoves = gTrainerParty_Anette } }, [TRAINER_CINDY_3] = @@ -1690,7 +1690,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Cindy3 + .party = {.ItemDefaultMoves = gTrainerParty_Cindy3 } }, [TRAINER_CINDY_4] = @@ -1704,7 +1704,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Cindy4 + .party = {.ItemDefaultMoves = gTrainerParty_Cindy4 } }, [TRAINER_CINDY_5] = @@ -1718,7 +1718,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Cindy5 + .party = {.ItemDefaultMoves = gTrainerParty_Cindy5 } }, [TRAINER_CINDY_6] = @@ -1732,7 +1732,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Cindy6 + .party = {.ItemCustomMoves = gTrainerParty_Cindy6 } }, [TRAINER_MELISSA] = @@ -1746,7 +1746,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Melissa + .party = {.NoItemDefaultMoves = gTrainerParty_Melissa } }, [TRAINER_SHEILA] = @@ -1760,7 +1760,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Sheila + .party = {.NoItemDefaultMoves = gTrainerParty_Sheila } }, [TRAINER_SHIRLEY] = @@ -1774,7 +1774,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Shirley + .party = {.NoItemDefaultMoves = gTrainerParty_Shirley } }, [TRAINER_JESSICA_1] = @@ -1788,7 +1788,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Jessica1 + .party = {.NoItemCustomMoves = gTrainerParty_Jessica1 } }, [TRAINER_CONNIE] = @@ -1802,7 +1802,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Connie + .party = {.NoItemDefaultMoves = gTrainerParty_Connie } }, [TRAINER_BRIDGET] = @@ -1816,7 +1816,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Bridget + .party = {.NoItemDefaultMoves = gTrainerParty_Bridget } }, [TRAINER_OLIVIA] = @@ -1830,7 +1830,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Olivia + .party = {.NoItemCustomMoves = gTrainerParty_Olivia } }, [TRAINER_TIFFANY] = @@ -1844,7 +1844,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Tiffany + .party = {.NoItemDefaultMoves = gTrainerParty_Tiffany } }, [TRAINER_JESSICA_2] = @@ -1858,7 +1858,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Jessica2 + .party = {.NoItemCustomMoves = gTrainerParty_Jessica2 } }, [TRAINER_JESSICA_3] = @@ -1872,7 +1872,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Jessica3 + .party = {.NoItemCustomMoves = gTrainerParty_Jessica3 } }, [TRAINER_JESSICA_4] = @@ -1886,7 +1886,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Jessica4 + .party = {.NoItemCustomMoves = gTrainerParty_Jessica4 } }, [TRAINER_JESSICA_5] = @@ -1900,7 +1900,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Jessica5 + .party = {.NoItemCustomMoves = gTrainerParty_Jessica5 } }, [TRAINER_WINSTON_1] = @@ -1914,7 +1914,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Winston1 + .party = {.ItemDefaultMoves = gTrainerParty_Winston1 } }, [TRAINER_ANONYMOUS_3] = @@ -1928,7 +1928,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Anonymous3 + .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous3 } }, [TRAINER_GARRET] = @@ -1942,7 +1942,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Garret + .party = {.ItemDefaultMoves = gTrainerParty_Garret } }, [TRAINER_WINSTON_2] = @@ -1956,7 +1956,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Winston2 + .party = {.ItemDefaultMoves = gTrainerParty_Winston2 } }, [TRAINER_WINSTON_3] = @@ -1970,7 +1970,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Winston3 + .party = {.ItemDefaultMoves = gTrainerParty_Winston3 } }, [TRAINER_WINSTON_4] = @@ -1984,7 +1984,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Winston4 + .party = {.ItemDefaultMoves = gTrainerParty_Winston4 } }, [TRAINER_WINSTON_5] = @@ -1998,7 +1998,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Winston5 + .party = {.ItemCustomMoves = gTrainerParty_Winston5 } }, [TRAINER_STEVE_1] = @@ -2012,7 +2012,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Steve1 + .party = {.NoItemDefaultMoves = gTrainerParty_Steve1 } }, [TRAINER_CHRIS] = @@ -2026,7 +2026,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Chris + .party = {.NoItemDefaultMoves = gTrainerParty_Chris } }, [TRAINER_MARK] = @@ -2040,7 +2040,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Mark + .party = {.NoItemDefaultMoves = gTrainerParty_Mark } }, [TRAINER_KENN] = @@ -2054,7 +2054,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Kenn + .party = {.NoItemDefaultMoves = gTrainerParty_Kenn } }, [TRAINER_STEVE_2] = @@ -2068,7 +2068,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Steve2 + .party = {.NoItemDefaultMoves = gTrainerParty_Steve2 } }, [TRAINER_STEVE_3] = @@ -2082,7 +2082,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Steve3 + .party = {.NoItemDefaultMoves = gTrainerParty_Steve3 } }, [TRAINER_STEVE_4] = @@ -2096,7 +2096,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Steve4 + .party = {.NoItemDefaultMoves = gTrainerParty_Steve4 } }, [TRAINER_STEVE_5] = @@ -2110,7 +2110,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Steve5 + .party = {.NoItemDefaultMoves = gTrainerParty_Steve5 } }, [TRAINER_LUIS] = @@ -2124,7 +2124,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Luis + .party = {.NoItemDefaultMoves = gTrainerParty_Luis } }, [TRAINER_AUSTIN] = @@ -2138,7 +2138,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Austin + .party = {.NoItemDefaultMoves = gTrainerParty_Austin } }, [TRAINER_DOUGLAS] = @@ -2152,7 +2152,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Douglas + .party = {.NoItemDefaultMoves = gTrainerParty_Douglas } }, [TRAINER_DARRIN] = @@ -2166,7 +2166,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Darrin + .party = {.NoItemDefaultMoves = gTrainerParty_Darrin } }, [TRAINER_TONY_1] = @@ -2180,7 +2180,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Tony1 + .party = {.NoItemDefaultMoves = gTrainerParty_Tony1 } }, [TRAINER_JEROME] = @@ -2194,7 +2194,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Jerome + .party = {.NoItemDefaultMoves = gTrainerParty_Jerome } }, [TRAINER_MATTHEW] = @@ -2208,7 +2208,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Matthew + .party = {.NoItemDefaultMoves = gTrainerParty_Matthew } }, [TRAINER_DAVID] = @@ -2222,7 +2222,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_David + .party = {.NoItemDefaultMoves = gTrainerParty_David } }, [TRAINER_SPENCER] = @@ -2236,7 +2236,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Spencer + .party = {.NoItemDefaultMoves = gTrainerParty_Spencer } }, [TRAINER_ROLAND] = @@ -2250,7 +2250,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Roland + .party = {.NoItemDefaultMoves = gTrainerParty_Roland } }, [TRAINER_CODY] = @@ -2264,7 +2264,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Cody + .party = {.NoItemDefaultMoves = gTrainerParty_Cody } }, [TRAINER_STAN] = @@ -2278,7 +2278,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Stan + .party = {.NoItemDefaultMoves = gTrainerParty_Stan } }, [TRAINER_BARRY] = @@ -2292,7 +2292,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Barry + .party = {.NoItemDefaultMoves = gTrainerParty_Barry } }, [TRAINER_DEAN] = @@ -2306,7 +2306,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Dean + .party = {.NoItemDefaultMoves = gTrainerParty_Dean } }, [TRAINER_RODNEY] = @@ -2320,7 +2320,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Rodney + .party = {.NoItemDefaultMoves = gTrainerParty_Rodney } }, [TRAINER_RICHARD] = @@ -2334,7 +2334,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Richard + .party = {.NoItemDefaultMoves = gTrainerParty_Richard } }, [TRAINER_HERMAN] = @@ -2348,7 +2348,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Herman + .party = {.NoItemDefaultMoves = gTrainerParty_Herman } }, [TRAINER_ANONYMOUS_4] = @@ -2362,7 +2362,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Anonymous4 + .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous4 } }, [TRAINER_GILBERT] = @@ -2376,7 +2376,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Gilbert + .party = {.NoItemDefaultMoves = gTrainerParty_Gilbert } }, [TRAINER_FRANKLIN] = @@ -2390,7 +2390,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Franklin + .party = {.NoItemDefaultMoves = gTrainerParty_Franklin } }, [TRAINER_DANNY] = @@ -2404,7 +2404,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Danny + .party = {.NoItemDefaultMoves = gTrainerParty_Danny } }, [TRAINER_JACK] = @@ -2418,7 +2418,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Jack + .party = {.NoItemDefaultMoves = gTrainerParty_Jack } }, [TRAINER_DUDLEY] = @@ -2432,7 +2432,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Dudley + .party = {.NoItemDefaultMoves = gTrainerParty_Dudley } }, [TRAINER_CHAD] = @@ -2446,7 +2446,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Chad + .party = {.NoItemDefaultMoves = gTrainerParty_Chad } }, [TRAINER_TONY_2] = @@ -2460,7 +2460,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Tony2 + .party = {.NoItemDefaultMoves = gTrainerParty_Tony2 } }, [TRAINER_TONY_3] = @@ -2474,7 +2474,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Tony3 + .party = {.NoItemDefaultMoves = gTrainerParty_Tony3 } }, [TRAINER_TONY_4] = @@ -2488,7 +2488,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Tony4 + .party = {.NoItemDefaultMoves = gTrainerParty_Tony4 } }, [TRAINER_TONY_5] = @@ -2502,7 +2502,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Tony5 + .party = {.NoItemDefaultMoves = gTrainerParty_Tony5 } }, [TRAINER_HIDEKI] = @@ -2516,7 +2516,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Hideki + .party = {.NoItemDefaultMoves = gTrainerParty_Hideki } }, [TRAINER_HITOSHI] = @@ -2530,7 +2530,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Hitoshi + .party = {.NoItemDefaultMoves = gTrainerParty_Hitoshi } }, [TRAINER_KIYO] = @@ -2544,7 +2544,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Kiyo + .party = {.NoItemDefaultMoves = gTrainerParty_Kiyo } }, [TRAINER_KOICHI] = @@ -2558,7 +2558,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Koichi + .party = {.NoItemDefaultMoves = gTrainerParty_Koichi } }, [TRAINER_NOB_1] = @@ -2572,7 +2572,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Nob1 + .party = {.NoItemDefaultMoves = gTrainerParty_Nob1 } }, [TRAINER_NOB_2] = @@ -2586,7 +2586,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Nob2 + .party = {.NoItemDefaultMoves = gTrainerParty_Nob2 } }, [TRAINER_NOB_3] = @@ -2600,7 +2600,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Nob3 + .party = {.NoItemDefaultMoves = gTrainerParty_Nob3 } }, [TRAINER_NOB_4] = @@ -2614,7 +2614,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Nob4 + .party = {.NoItemDefaultMoves = gTrainerParty_Nob4 } }, [TRAINER_NOB_5] = @@ -2628,7 +2628,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 4, - .party = gTrainerParty_Nob5 + .party = {.ItemDefaultMoves = gTrainerParty_Nob5 } }, [TRAINER_YUJI] = @@ -2642,7 +2642,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Yuji + .party = {.NoItemDefaultMoves = gTrainerParty_Yuji } }, [TRAINER_DAISUKE] = @@ -2656,7 +2656,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Daisuke + .party = {.NoItemDefaultMoves = gTrainerParty_Daisuke } }, [TRAINER_ATSUSHI] = @@ -2670,7 +2670,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Atsushi + .party = {.NoItemDefaultMoves = gTrainerParty_Atsushi } }, [TRAINER_KIRK] = @@ -2684,7 +2684,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Kirk + .party = {.NoItemDefaultMoves = gTrainerParty_Kirk } }, [TRAINER_SCOTT] = @@ -2698,7 +2698,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Scott + .party = {.NoItemDefaultMoves = gTrainerParty_Scott } }, [TRAINER_HARVEY] = @@ -2712,7 +2712,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Harvey + .party = {.NoItemDefaultMoves = gTrainerParty_Harvey } }, [TRAINER_SHAWN] = @@ -2726,7 +2726,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Shawn + .party = {.NoItemDefaultMoves = gTrainerParty_Shawn } }, [TRAINER_RANDY] = @@ -2740,7 +2740,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Randy + .party = {.NoItemDefaultMoves = gTrainerParty_Randy } }, [TRAINER_DALTON_1] = @@ -2754,7 +2754,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Dalton1 + .party = {.NoItemDefaultMoves = gTrainerParty_Dalton1 } }, [TRAINER_DALTON_2] = @@ -2768,7 +2768,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Dalton2 + .party = {.NoItemDefaultMoves = gTrainerParty_Dalton2 } }, [TRAINER_DALTON_3] = @@ -2782,7 +2782,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Dalton3 + .party = {.NoItemDefaultMoves = gTrainerParty_Dalton3 } }, [TRAINER_DALTON_4] = @@ -2796,7 +2796,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Dalton4 + .party = {.NoItemDefaultMoves = gTrainerParty_Dalton4 } }, [TRAINER_DALTON_5] = @@ -2810,7 +2810,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Dalton5 + .party = {.NoItemDefaultMoves = gTrainerParty_Dalton5 } }, [TRAINER_COLE] = @@ -2824,7 +2824,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Cole + .party = {.NoItemDefaultMoves = gTrainerParty_Cole } }, [TRAINER_FLINT] = @@ -2838,7 +2838,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Flint + .party = {.NoItemDefaultMoves = gTrainerParty_Flint } }, [TRAINER_AXLE] = @@ -2852,7 +2852,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Axle + .party = {.NoItemDefaultMoves = gTrainerParty_Axle } }, [TRAINER_JAKE] = @@ -2866,7 +2866,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Jake + .party = {.NoItemDefaultMoves = gTrainerParty_Jake } }, [TRAINER_ANDY] = @@ -2880,7 +2880,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Andy + .party = {.NoItemDefaultMoves = gTrainerParty_Andy } }, [TRAINER_BERNIE_1] = @@ -2894,7 +2894,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Bernie1 + .party = {.NoItemDefaultMoves = gTrainerParty_Bernie1 } }, [TRAINER_BERNIE_2] = @@ -2908,7 +2908,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Bernie2 + .party = {.NoItemDefaultMoves = gTrainerParty_Bernie2 } }, [TRAINER_BERNIE_3] = @@ -2922,7 +2922,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Bernie3 + .party = {.NoItemDefaultMoves = gTrainerParty_Bernie3 } }, [TRAINER_BERNIE_4] = @@ -2936,7 +2936,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Bernie4 + .party = {.NoItemDefaultMoves = gTrainerParty_Bernie4 } }, [TRAINER_BERNIE_5] = @@ -2950,7 +2950,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Bernie5 + .party = {.NoItemDefaultMoves = gTrainerParty_Bernie5 } }, [TRAINER_DREW] = @@ -2964,7 +2964,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Drew + .party = {.NoItemCustomMoves = gTrainerParty_Drew } }, [TRAINER_CLIFF] = @@ -2978,7 +2978,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Cliff + .party = {.NoItemCustomMoves = gTrainerParty_Cliff } }, [TRAINER_LARRY] = @@ -2992,7 +2992,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Larry + .party = {.NoItemDefaultMoves = gTrainerParty_Larry } }, [TRAINER_SHANE] = @@ -3006,7 +3006,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Shane + .party = {.NoItemDefaultMoves = gTrainerParty_Shane } }, [TRAINER_JUSTIN] = @@ -3020,7 +3020,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Justin + .party = {.NoItemDefaultMoves = gTrainerParty_Justin } }, [TRAINER_ETHAN_1] = @@ -3034,7 +3034,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Ethan1 + .party = {.NoItemDefaultMoves = gTrainerParty_Ethan1 } }, [TRAINER_JEFF] = @@ -3048,7 +3048,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Jeff + .party = {.NoItemDefaultMoves = gTrainerParty_Jeff } }, [TRAINER_TRAVIS] = @@ -3062,7 +3062,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Travis + .party = {.NoItemDefaultMoves = gTrainerParty_Travis } }, [TRAINER_ETHAN_2] = @@ -3076,7 +3076,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Ethan2 + .party = {.NoItemDefaultMoves = gTrainerParty_Ethan2 } }, [TRAINER_ETHAN_3] = @@ -3090,7 +3090,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Ethan3 + .party = {.NoItemDefaultMoves = gTrainerParty_Ethan3 } }, [TRAINER_ETHAN_4] = @@ -3104,7 +3104,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Ethan4 + .party = {.NoItemDefaultMoves = gTrainerParty_Ethan4 } }, [TRAINER_ETHAN_5] = @@ -3118,7 +3118,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Ethan5 + .party = {.NoItemDefaultMoves = gTrainerParty_Ethan5 } }, [TRAINER_BRENT] = @@ -3132,7 +3132,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Brent + .party = {.NoItemDefaultMoves = gTrainerParty_Brent } }, [TRAINER_DONALD] = @@ -3146,7 +3146,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Donald + .party = {.NoItemDefaultMoves = gTrainerParty_Donald } }, [TRAINER_TAYLOR] = @@ -3160,7 +3160,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Taylor + .party = {.NoItemDefaultMoves = gTrainerParty_Taylor } }, [TRAINER_BRANDON_1] = @@ -3174,7 +3174,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Brandon1 + .party = {.NoItemDefaultMoves = gTrainerParty_Brandon1 } }, [TRAINER_DEREK] = @@ -3188,7 +3188,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Derek + .party = {.NoItemDefaultMoves = gTrainerParty_Derek } }, [TRAINER_BRANDON_2] = @@ -3202,7 +3202,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Brandon2 + .party = {.NoItemDefaultMoves = gTrainerParty_Brandon2 } }, [TRAINER_BRANDON_3] = @@ -3216,7 +3216,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Brandon3 + .party = {.NoItemDefaultMoves = gTrainerParty_Brandon3 } }, [TRAINER_BRANDON_4] = @@ -3230,7 +3230,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 4, - .party = gTrainerParty_Brandon4 + .party = {.NoItemDefaultMoves = gTrainerParty_Brandon4 } }, [TRAINER_BRANDON_5] = @@ -3244,7 +3244,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 5, - .party = gTrainerParty_Brandon5 + .party = {.ItemDefaultMoves = gTrainerParty_Brandon5 } }, [TRAINER_EDWARD] = @@ -3258,7 +3258,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Edward + .party = {.NoItemCustomMoves = gTrainerParty_Edward } }, [TRAINER_PRESTON] = @@ -3272,7 +3272,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Preston + .party = {.NoItemDefaultMoves = gTrainerParty_Preston } }, [TRAINER_VIRGIL] = @@ -3286,7 +3286,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Virgil + .party = {.NoItemDefaultMoves = gTrainerParty_Virgil } }, [TRAINER_FRITZ] = @@ -3300,7 +3300,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Fritz + .party = {.NoItemDefaultMoves = gTrainerParty_Fritz } }, [TRAINER_WILLIAM] = @@ -3314,7 +3314,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_William + .party = {.NoItemDefaultMoves = gTrainerParty_William } }, [TRAINER_JOSHUA] = @@ -3328,7 +3328,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Joshua + .party = {.NoItemDefaultMoves = gTrainerParty_Joshua } }, [TRAINER_CAMERON_1] = @@ -3342,7 +3342,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Cameron1 + .party = {.NoItemDefaultMoves = gTrainerParty_Cameron1 } }, [TRAINER_CAMERON_2] = @@ -3356,7 +3356,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Cameron2 + .party = {.NoItemDefaultMoves = gTrainerParty_Cameron2 } }, [TRAINER_CAMERON_3] = @@ -3370,7 +3370,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Cameron3 + .party = {.NoItemDefaultMoves = gTrainerParty_Cameron3 } }, [TRAINER_CAMERON_4] = @@ -3384,7 +3384,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Cameron4 + .party = {.NoItemDefaultMoves = gTrainerParty_Cameron4 } }, [TRAINER_CAMERON_5] = @@ -3398,7 +3398,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Cameron5 + .party = {.NoItemDefaultMoves = gTrainerParty_Cameron5 } }, [TRAINER_JACLYN] = @@ -3412,7 +3412,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Jaclyn + .party = {.NoItemCustomMoves = gTrainerParty_Jaclyn } }, [TRAINER_HANNAH] = @@ -3426,7 +3426,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Hannah + .party = {.NoItemDefaultMoves = gTrainerParty_Hannah } }, [TRAINER_SAMANTHA] = @@ -3440,7 +3440,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Samantha + .party = {.NoItemDefaultMoves = gTrainerParty_Samantha } }, [TRAINER_MAURA] = @@ -3454,7 +3454,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Maura + .party = {.NoItemDefaultMoves = gTrainerParty_Maura } }, [TRAINER_KAYLA] = @@ -3468,7 +3468,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Kayla + .party = {.NoItemDefaultMoves = gTrainerParty_Kayla } }, [TRAINER_ALEXIS] = @@ -3482,7 +3482,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Alexis + .party = {.NoItemDefaultMoves = gTrainerParty_Alexis } }, [TRAINER_JACKI_1] = @@ -3496,7 +3496,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Jacki1 + .party = {.NoItemDefaultMoves = gTrainerParty_Jacki1 } }, [TRAINER_JACKI_2] = @@ -3510,7 +3510,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Jacki2 + .party = {.NoItemDefaultMoves = gTrainerParty_Jacki2 } }, [TRAINER_JACKI_3] = @@ -3524,7 +3524,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Jacki3 + .party = {.NoItemDefaultMoves = gTrainerParty_Jacki3 } }, [TRAINER_JACKI_4] = @@ -3538,7 +3538,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Jacki4 + .party = {.NoItemDefaultMoves = gTrainerParty_Jacki4 } }, [TRAINER_JACKI_5] = @@ -3552,7 +3552,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Jacki5 + .party = {.NoItemDefaultMoves = gTrainerParty_Jacki5 } }, [TRAINER_WALTER_1] = @@ -3566,7 +3566,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Walter1 + .party = {.NoItemDefaultMoves = gTrainerParty_Walter1 } }, [TRAINER_TUCKER] = @@ -3580,7 +3580,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Tucker + .party = {.NoItemDefaultMoves = gTrainerParty_Tucker } }, [TRAINER_THOMAS] = @@ -3594,7 +3594,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Thomas + .party = {.NoItemDefaultMoves = gTrainerParty_Thomas } }, [TRAINER_WALTER_2] = @@ -3608,7 +3608,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Walter2 + .party = {.NoItemDefaultMoves = gTrainerParty_Walter2 } }, [TRAINER_WALTER_3] = @@ -3622,7 +3622,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Walter3 + .party = {.NoItemCustomMoves = gTrainerParty_Walter3 } }, [TRAINER_WALTER_4] = @@ -3636,7 +3636,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Walter4 + .party = {.NoItemCustomMoves = gTrainerParty_Walter4 } }, [TRAINER_WALTER_5] = @@ -3650,7 +3650,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Walter5 + .party = {.NoItemCustomMoves = gTrainerParty_Walter5 } }, [TRAINER_SIDNEY] = @@ -3664,7 +3664,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 5, - .party = gTrainerParty_Sidney + .party = {.ItemCustomMoves = gTrainerParty_Sidney } }, [TRAINER_PHOEBE] = @@ -3678,7 +3678,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 5, - .party = gTrainerParty_Phoebe + .party = {.ItemCustomMoves = gTrainerParty_Phoebe } }, [TRAINER_GLACIA] = @@ -3692,7 +3692,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 5, - .party = gTrainerParty_Glacia + .party = {.ItemCustomMoves = gTrainerParty_Glacia } }, [TRAINER_DRAKE] = @@ -3706,7 +3706,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 5, - .party = gTrainerParty_Drake + .party = {.ItemCustomMoves = gTrainerParty_Drake } }, [TRAINER_ROXANNE] = @@ -3720,7 +3720,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 2, - .party = gTrainerParty_Roxanne + .party = {.NoItemCustomMoves = gTrainerParty_Roxanne } }, [TRAINER_BRAWLY] = @@ -3734,7 +3734,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 2, - .party = gTrainerParty_Brawly + .party = {.NoItemCustomMoves = gTrainerParty_Brawly } }, [TRAINER_WATTSON] = @@ -3748,7 +3748,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Wattson + .party = {.NoItemCustomMoves = gTrainerParty_Wattson } }, [TRAINER_FLANNERY] = @@ -3762,7 +3762,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Flannery + .party = {.NoItemCustomMoves = gTrainerParty_Flannery } }, [TRAINER_NORMAN] = @@ -3776,7 +3776,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Norman + .party = {.NoItemCustomMoves = gTrainerParty_Norman } }, [TRAINER_WINONA] = @@ -3790,7 +3790,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 4, - .party = gTrainerParty_Winona + .party = {.NoItemCustomMoves = gTrainerParty_Winona } }, [TRAINER_TATE_AND_LIZA] = @@ -3804,7 +3804,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x7, .partySize = 2, - .party = gTrainerParty_TateAndLiza + .party = {.ItemCustomMoves = gTrainerParty_TateAndLiza } }, [TRAINER_WALLACE] = @@ -3818,7 +3818,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 5, - .party = gTrainerParty_Wallace + .party = {.NoItemCustomMoves = gTrainerParty_Wallace } }, [TRAINER_JERRY_1] = @@ -3832,7 +3832,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Jerry1 + .party = {.NoItemDefaultMoves = gTrainerParty_Jerry1 } }, [TRAINER_TED] = @@ -3846,7 +3846,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Ted + .party = {.NoItemDefaultMoves = gTrainerParty_Ted } }, [TRAINER_PAUL] = @@ -3860,7 +3860,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Paul + .party = {.NoItemDefaultMoves = gTrainerParty_Paul } }, [TRAINER_JERRY_2] = @@ -3874,7 +3874,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Jerry2 + .party = {.NoItemDefaultMoves = gTrainerParty_Jerry2 } }, [TRAINER_JERRY_3] = @@ -3888,7 +3888,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Jerry3 + .party = {.NoItemDefaultMoves = gTrainerParty_Jerry3 } }, [TRAINER_JERRY_4] = @@ -3902,7 +3902,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Jerry4 + .party = {.NoItemDefaultMoves = gTrainerParty_Jerry4 } }, [TRAINER_JERRY_5] = @@ -3916,7 +3916,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Jerry5 + .party = {.NoItemDefaultMoves = gTrainerParty_Jerry5 } }, [TRAINER_KAREN_1] = @@ -3930,7 +3930,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Karen1 + .party = {.NoItemDefaultMoves = gTrainerParty_Karen1 } }, [TRAINER_GEORGIA] = @@ -3944,7 +3944,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Georgia + .party = {.NoItemDefaultMoves = gTrainerParty_Georgia } }, [TRAINER_KAREN_2] = @@ -3958,7 +3958,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Karen2 + .party = {.NoItemDefaultMoves = gTrainerParty_Karen2 } }, [TRAINER_KAREN_3] = @@ -3972,7 +3972,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Karen3 + .party = {.NoItemDefaultMoves = gTrainerParty_Karen3 } }, [TRAINER_KAREN_4] = @@ -3986,7 +3986,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Karen4 + .party = {.NoItemDefaultMoves = gTrainerParty_Karen4 } }, [TRAINER_KAREN_5] = @@ -4000,7 +4000,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Karen5 + .party = {.NoItemDefaultMoves = gTrainerParty_Karen5 } }, [TRAINER_KATE_AND_JOY] = @@ -4014,7 +4014,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_KateAndJoy + .party = {.NoItemCustomMoves = gTrainerParty_KateAndJoy } }, [TRAINER_ANNA_AND_MEG_1] = @@ -4028,7 +4028,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_AnnaAndMeg1 + .party = {.NoItemCustomMoves = gTrainerParty_AnnaAndMeg1 } }, [TRAINER_ANNA_AND_MEG_2] = @@ -4042,7 +4042,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_AnnaAndMeg2 + .party = {.NoItemCustomMoves = gTrainerParty_AnnaAndMeg2 } }, [TRAINER_ANNA_AND_MEG_3] = @@ -4056,7 +4056,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_AnnaAndMeg3 + .party = {.NoItemCustomMoves = gTrainerParty_AnnaAndMeg3 } }, [TRAINER_ANNA_AND_MEG_4] = @@ -4070,7 +4070,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_AnnaAndMeg4 + .party = {.NoItemCustomMoves = gTrainerParty_AnnaAndMeg4 } }, [TRAINER_ANNA_AND_MEG_5] = @@ -4084,7 +4084,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_AnnaAndMeg5 + .party = {.NoItemCustomMoves = gTrainerParty_AnnaAndMeg5 } }, [TRAINER_VICTOR] = @@ -4098,7 +4098,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Victor + .party = {.ItemDefaultMoves = gTrainerParty_Victor } }, [TRAINER_MIGUEL_1] = @@ -4112,7 +4112,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Miguel1 + .party = {.ItemDefaultMoves = gTrainerParty_Miguel1 } }, [TRAINER_COLTON] = @@ -4126,7 +4126,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 6, - .party = gTrainerParty_Colton + .party = {.ItemCustomMoves = gTrainerParty_Colton } }, [TRAINER_MIGUEL_2] = @@ -4140,7 +4140,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Miguel2 + .party = {.ItemDefaultMoves = gTrainerParty_Miguel2 } }, [TRAINER_MIGUEL_3] = @@ -4154,7 +4154,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Miguel3 + .party = {.ItemDefaultMoves = gTrainerParty_Miguel3 } }, [TRAINER_MIGUEL_4] = @@ -4168,7 +4168,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Miguel4 + .party = {.ItemDefaultMoves = gTrainerParty_Miguel4 } }, [TRAINER_MIGUEL_5] = @@ -4182,7 +4182,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Miguel5 + .party = {.ItemDefaultMoves = gTrainerParty_Miguel5 } }, [TRAINER_VICTORIA] = @@ -4196,7 +4196,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x3, .partySize = 1, - .party = gTrainerParty_Victoria + .party = {.ItemDefaultMoves = gTrainerParty_Victoria } }, [TRAINER_VANESSA] = @@ -4210,7 +4210,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Vanessa + .party = {.ItemDefaultMoves = gTrainerParty_Vanessa } }, [TRAINER_MARISSA] = @@ -4224,7 +4224,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Marissa + .party = {.ItemDefaultMoves = gTrainerParty_Marissa } }, [TRAINER_ISABEL_1] = @@ -4238,7 +4238,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Isabel1 + .party = {.ItemDefaultMoves = gTrainerParty_Isabel1 } }, [TRAINER_ISABEL_2] = @@ -4252,7 +4252,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Isabel2 + .party = {.ItemDefaultMoves = gTrainerParty_Isabel2 } }, [TRAINER_ISABEL_3] = @@ -4266,7 +4266,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Isabel3 + .party = {.ItemDefaultMoves = gTrainerParty_Isabel3 } }, [TRAINER_ISABEL_4] = @@ -4280,7 +4280,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Isabel4 + .party = {.ItemDefaultMoves = gTrainerParty_Isabel4 } }, [TRAINER_ISABEL_5] = @@ -4294,7 +4294,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Isabel5 + .party = {.ItemDefaultMoves = gTrainerParty_Isabel5 } }, [TRAINER_TIMOTHY_1] = @@ -4308,7 +4308,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 1, - .party = gTrainerParty_Timothy1 + .party = {.NoItemDefaultMoves = gTrainerParty_Timothy1 } }, [TRAINER_TIMOTHY_2] = @@ -4322,7 +4322,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 1, - .party = gTrainerParty_Timothy2 + .party = {.NoItemCustomMoves = gTrainerParty_Timothy2 } }, [TRAINER_TIMOTHY_3] = @@ -4336,7 +4336,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 1, - .party = gTrainerParty_Timothy3 + .party = {.NoItemCustomMoves = gTrainerParty_Timothy3 } }, [TRAINER_TIMOTHY_4] = @@ -4350,7 +4350,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 1, - .party = gTrainerParty_Timothy4 + .party = {.NoItemCustomMoves = gTrainerParty_Timothy4 } }, [TRAINER_TIMOTHY_5] = @@ -4364,7 +4364,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 1, - .party = gTrainerParty_Timothy5 + .party = {.NoItemCustomMoves = gTrainerParty_Timothy5 } }, [TRAINER_VICKY] = @@ -4378,7 +4378,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 1, - .party = gTrainerParty_Vicky + .party = {.NoItemCustomMoves = gTrainerParty_Vicky } }, [TRAINER_SHELBY_1] = @@ -4392,7 +4392,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 2, - .party = gTrainerParty_Shelby1 + .party = {.NoItemDefaultMoves = gTrainerParty_Shelby1 } }, [TRAINER_SHELBY_2] = @@ -4406,7 +4406,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 2, - .party = gTrainerParty_Shelby2 + .party = {.NoItemDefaultMoves = gTrainerParty_Shelby2 } }, [TRAINER_SHELBY_3] = @@ -4420,7 +4420,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 2, - .party = gTrainerParty_Shelby3 + .party = {.NoItemDefaultMoves = gTrainerParty_Shelby3 } }, [TRAINER_SHELBY_4] = @@ -4434,7 +4434,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 2, - .party = gTrainerParty_Shelby4 + .party = {.NoItemDefaultMoves = gTrainerParty_Shelby4 } }, [TRAINER_SHELBY_5] = @@ -4448,7 +4448,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 2, - .party = gTrainerParty_Shelby5 + .party = {.NoItemDefaultMoves = gTrainerParty_Shelby5 } }, [TRAINER_CALVIN_1] = @@ -4462,7 +4462,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Calvin1 + .party = {.NoItemDefaultMoves = gTrainerParty_Calvin1 } }, [TRAINER_BILLY] = @@ -4476,7 +4476,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Billy + .party = {.NoItemDefaultMoves = gTrainerParty_Billy } }, [TRAINER_JOSH] = @@ -4490,7 +4490,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Josh + .party = {.NoItemCustomMoves = gTrainerParty_Josh } }, [TRAINER_TOMMY] = @@ -4504,7 +4504,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Tommy + .party = {.NoItemDefaultMoves = gTrainerParty_Tommy } }, [TRAINER_JOEY] = @@ -4518,7 +4518,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Joey + .party = {.NoItemDefaultMoves = gTrainerParty_Joey } }, [TRAINER_BEN] = @@ -4532,7 +4532,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Ben + .party = {.NoItemCustomMoves = gTrainerParty_Ben } }, [TRAINER_ANONYMOUS_5] = @@ -4546,7 +4546,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Anonymous5 + .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous5 } }, [TRAINER_KEVIN] = @@ -4560,7 +4560,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Kevin + .party = {.NoItemDefaultMoves = gTrainerParty_Kevin } }, [TRAINER_NEAL] = @@ -4574,7 +4574,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Neal + .party = {.NoItemDefaultMoves = gTrainerParty_Neal } }, [TRAINER_DILLON] = @@ -4588,7 +4588,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Dillon + .party = {.NoItemDefaultMoves = gTrainerParty_Dillon } }, [TRAINER_CALVIN_2] = @@ -4602,7 +4602,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Calvin2 + .party = {.NoItemDefaultMoves = gTrainerParty_Calvin2 } }, [TRAINER_CALVIN_3] = @@ -4616,7 +4616,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Calvin3 + .party = {.NoItemDefaultMoves = gTrainerParty_Calvin3 } }, [TRAINER_CALVIN_4] = @@ -4630,7 +4630,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Calvin4 + .party = {.NoItemDefaultMoves = gTrainerParty_Calvin4 } }, [TRAINER_CALVIN_5] = @@ -4644,7 +4644,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Calvin5 + .party = {.NoItemDefaultMoves = gTrainerParty_Calvin5 } }, [TRAINER_EDDIE] = @@ -4658,7 +4658,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Eddie + .party = {.NoItemDefaultMoves = gTrainerParty_Eddie } }, [TRAINER_ALLEN] = @@ -4672,7 +4672,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Allen + .party = {.NoItemDefaultMoves = gTrainerParty_Allen } }, [TRAINER_TIMMY] = @@ -4686,7 +4686,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Timmy + .party = {.NoItemDefaultMoves = gTrainerParty_Timmy } }, [TRAINER_STEVEN] = @@ -4700,7 +4700,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 6, - .party = gTrainerParty_Steven + .party = {.ItemCustomMoves = gTrainerParty_Steven } }, [TRAINER_ANDREW] = @@ -4714,7 +4714,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Andrew + .party = {.NoItemDefaultMoves = gTrainerParty_Andrew } }, [TRAINER_IVAN] = @@ -4728,7 +4728,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Ivan + .party = {.NoItemDefaultMoves = gTrainerParty_Ivan } }, [TRAINER_CLAUDE] = @@ -4742,7 +4742,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 4, - .party = gTrainerParty_Claude + .party = {.NoItemDefaultMoves = gTrainerParty_Claude } }, [TRAINER_ELLIOT_1] = @@ -4756,7 +4756,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Elliot1 + .party = {.NoItemDefaultMoves = gTrainerParty_Elliot1 } }, [TRAINER_NED] = @@ -4770,7 +4770,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Ned + .party = {.NoItemDefaultMoves = gTrainerParty_Ned } }, [TRAINER_DALE] = @@ -4784,7 +4784,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 4, - .party = gTrainerParty_Dale + .party = {.NoItemDefaultMoves = gTrainerParty_Dale } }, [TRAINER_NOLAN] = @@ -4798,7 +4798,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Nolan + .party = {.NoItemDefaultMoves = gTrainerParty_Nolan } }, [TRAINER_BARNY] = @@ -4812,7 +4812,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Barny + .party = {.NoItemDefaultMoves = gTrainerParty_Barny } }, [TRAINER_WADE] = @@ -4826,7 +4826,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Wade + .party = {.NoItemDefaultMoves = gTrainerParty_Wade } }, [TRAINER_CARTER] = @@ -4840,7 +4840,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 4, - .party = gTrainerParty_Carter + .party = {.NoItemDefaultMoves = gTrainerParty_Carter } }, [TRAINER_ELLIOT_2] = @@ -4854,7 +4854,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Elliot2 + .party = {.NoItemDefaultMoves = gTrainerParty_Elliot2 } }, [TRAINER_ELLIOT_3] = @@ -4868,7 +4868,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 4, - .party = gTrainerParty_Elliot3 + .party = {.NoItemDefaultMoves = gTrainerParty_Elliot3 } }, [TRAINER_ELLIOT_4] = @@ -4882,7 +4882,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 4, - .party = gTrainerParty_Elliot4 + .party = {.NoItemDefaultMoves = gTrainerParty_Elliot4 } }, [TRAINER_ELLIOT_5] = @@ -4896,7 +4896,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x3, .partySize = 4, - .party = gTrainerParty_Elliot5 + .party = {.NoItemDefaultMoves = gTrainerParty_Elliot5 } }, [TRAINER_RONALD] = @@ -4910,7 +4910,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 6, - .party = gTrainerParty_Ronald + .party = {.NoItemDefaultMoves = gTrainerParty_Ronald } }, [TRAINER_JACOB] = @@ -4924,7 +4924,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Jacob + .party = {.NoItemDefaultMoves = gTrainerParty_Jacob } }, [TRAINER_ANTHONY] = @@ -4938,7 +4938,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Anthony + .party = {.NoItemDefaultMoves = gTrainerParty_Anthony } }, [TRAINER_BENJAMIN_1] = @@ -4952,7 +4952,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Benjamin1 + .party = {.NoItemDefaultMoves = gTrainerParty_Benjamin1 } }, [TRAINER_BENJAMIN_2] = @@ -4966,7 +4966,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Benjamin2 + .party = {.NoItemDefaultMoves = gTrainerParty_Benjamin2 } }, [TRAINER_BENJAMIN_3] = @@ -4980,7 +4980,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Benjamin3 + .party = {.NoItemDefaultMoves = gTrainerParty_Benjamin3 } }, [TRAINER_BENJAMIN_4] = @@ -4994,7 +4994,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Benjamin4 + .party = {.NoItemDefaultMoves = gTrainerParty_Benjamin4 } }, [TRAINER_BENJAMIN_5] = @@ -5008,7 +5008,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Benjamin5 + .party = {.NoItemDefaultMoves = gTrainerParty_Benjamin5 } }, [TRAINER_ABIGAIL_1] = @@ -5022,7 +5022,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Abigail1 + .party = {.NoItemDefaultMoves = gTrainerParty_Abigail1 } }, [TRAINER_JASMINE] = @@ -5036,7 +5036,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Jasmine + .party = {.NoItemDefaultMoves = gTrainerParty_Jasmine } }, [TRAINER_ABIGAIL_2] = @@ -5050,7 +5050,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Abigail2 + .party = {.NoItemDefaultMoves = gTrainerParty_Abigail2 } }, [TRAINER_ABIGAIL_3] = @@ -5064,7 +5064,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Abigail3 + .party = {.NoItemDefaultMoves = gTrainerParty_Abigail3 } }, [TRAINER_ABIGAIL_4] = @@ -5078,7 +5078,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Abigail4 + .party = {.NoItemDefaultMoves = gTrainerParty_Abigail4 } }, [TRAINER_ABIGAIL_5] = @@ -5092,7 +5092,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Abigail5 + .party = {.NoItemDefaultMoves = gTrainerParty_Abigail5 } }, [TRAINER_DYLAN_1] = @@ -5106,7 +5106,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Dylan1 + .party = {.NoItemDefaultMoves = gTrainerParty_Dylan1 } }, [TRAINER_DYLAN_2] = @@ -5120,7 +5120,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Dylan2 + .party = {.NoItemDefaultMoves = gTrainerParty_Dylan2 } }, [TRAINER_DYLAN_3] = @@ -5134,7 +5134,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Dylan3 + .party = {.NoItemDefaultMoves = gTrainerParty_Dylan3 } }, [TRAINER_DYLAN_4] = @@ -5148,7 +5148,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Dylan4 + .party = {.NoItemDefaultMoves = gTrainerParty_Dylan4 } }, [TRAINER_DYLAN_5] = @@ -5162,7 +5162,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Dylan5 + .party = {.NoItemDefaultMoves = gTrainerParty_Dylan5 } }, [TRAINER_MARIA_1] = @@ -5176,7 +5176,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Maria1 + .party = {.NoItemDefaultMoves = gTrainerParty_Maria1 } }, [TRAINER_MARIA_2] = @@ -5190,7 +5190,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Maria2 + .party = {.NoItemDefaultMoves = gTrainerParty_Maria2 } }, [TRAINER_MARIA_3] = @@ -5204,7 +5204,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Maria3 + .party = {.NoItemDefaultMoves = gTrainerParty_Maria3 } }, [TRAINER_MARIA_4] = @@ -5218,7 +5218,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Maria4 + .party = {.NoItemDefaultMoves = gTrainerParty_Maria4 } }, [TRAINER_MARIA_5] = @@ -5232,7 +5232,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Maria5 + .party = {.NoItemDefaultMoves = gTrainerParty_Maria5 } }, [TRAINER_CALEB] = @@ -5246,7 +5246,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 4, - .party = gTrainerParty_Caleb + .party = {.NoItemDefaultMoves = gTrainerParty_Caleb } }, [TRAINER_ANONYMOUS_6] = @@ -5260,7 +5260,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Anonymous6 + .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous6 } }, [TRAINER_ISAIAH_1] = @@ -5274,7 +5274,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Isaiah1 + .party = {.NoItemDefaultMoves = gTrainerParty_Isaiah1 } }, [TRAINER_ANONYMOUS_7] = @@ -5288,7 +5288,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Anonymous7 + .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous7 } }, [TRAINER_CHASE] = @@ -5302,7 +5302,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Chase + .party = {.NoItemDefaultMoves = gTrainerParty_Chase } }, [TRAINER_ISAIAH_2] = @@ -5316,7 +5316,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Isaiah2 + .party = {.NoItemDefaultMoves = gTrainerParty_Isaiah2 } }, [TRAINER_ISAIAH_3] = @@ -5330,7 +5330,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Isaiah3 + .party = {.NoItemDefaultMoves = gTrainerParty_Isaiah3 } }, [TRAINER_ISAIAH_4] = @@ -5344,7 +5344,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Isaiah4 + .party = {.NoItemDefaultMoves = gTrainerParty_Isaiah4 } }, [TRAINER_ISAIAH_5] = @@ -5358,7 +5358,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Isaiah5 + .party = {.NoItemDefaultMoves = gTrainerParty_Isaiah5 } }, [TRAINER_ANONYMOUS_8] = @@ -5372,7 +5372,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Anonymous8 + .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous8 } }, [TRAINER_CONNOR] = @@ -5386,7 +5386,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 4, - .party = gTrainerParty_Connor + .party = {.NoItemDefaultMoves = gTrainerParty_Connor } }, [TRAINER_ANONYMOUS_9] = @@ -5400,7 +5400,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Anonymous9 + .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous9 } }, [TRAINER_KATELYN_1] = @@ -5414,7 +5414,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Katelyn1 + .party = {.NoItemDefaultMoves = gTrainerParty_Katelyn1 } }, [TRAINER_ALLISON] = @@ -5428,7 +5428,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 4, - .party = gTrainerParty_Allison + .party = {.NoItemDefaultMoves = gTrainerParty_Allison } }, [TRAINER_KATELYN_2] = @@ -5442,7 +5442,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Katelyn2 + .party = {.NoItemDefaultMoves = gTrainerParty_Katelyn2 } }, [TRAINER_KATELYN_3] = @@ -5456,7 +5456,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Katelyn3 + .party = {.NoItemDefaultMoves = gTrainerParty_Katelyn3 } }, [TRAINER_KATELYN_4] = @@ -5470,7 +5470,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Katelyn4 + .party = {.NoItemDefaultMoves = gTrainerParty_Katelyn4 } }, [TRAINER_KATELYN_5] = @@ -5484,7 +5484,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Katelyn5 + .party = {.NoItemDefaultMoves = gTrainerParty_Katelyn5 } }, [TRAINER_NICOLAS_1] = @@ -5498,7 +5498,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Nicolas1 + .party = {.NoItemDefaultMoves = gTrainerParty_Nicolas1 } }, [TRAINER_NICOLAS_2] = @@ -5512,7 +5512,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Nicolas2 + .party = {.NoItemDefaultMoves = gTrainerParty_Nicolas2 } }, [TRAINER_NICOLAS_3] = @@ -5526,7 +5526,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Nicolas3 + .party = {.NoItemDefaultMoves = gTrainerParty_Nicolas3 } }, [TRAINER_NICOLAS_4] = @@ -5540,7 +5540,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Nicolas4 + .party = {.NoItemDefaultMoves = gTrainerParty_Nicolas4 } }, [TRAINER_NICOLAS_5] = @@ -5554,7 +5554,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Nicolas5 + .party = {.ItemDefaultMoves = gTrainerParty_Nicolas5 } }, [TRAINER_AARON] = @@ -5568,7 +5568,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Aaron + .party = {.NoItemDefaultMoves = gTrainerParty_Aaron } }, [TRAINER_PERRY] = @@ -5582,7 +5582,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Perry + .party = {.NoItemDefaultMoves = gTrainerParty_Perry } }, [TRAINER_HUGH] = @@ -5596,7 +5596,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Hugh + .party = {.NoItemDefaultMoves = gTrainerParty_Hugh } }, [TRAINER_PHIL] = @@ -5610,7 +5610,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Phil + .party = {.NoItemDefaultMoves = gTrainerParty_Phil } }, [TRAINER_JARED] = @@ -5624,7 +5624,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Jared + .party = {.NoItemDefaultMoves = gTrainerParty_Jared } }, [TRAINER_ANONYMOUS_10] = @@ -5638,7 +5638,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 4, - .party = gTrainerParty_Anonymous10 + .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous10 } }, [TRAINER_TANNER] = @@ -5652,7 +5652,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Tanner + .party = {.NoItemDefaultMoves = gTrainerParty_Tanner } }, [TRAINER_WILL] = @@ -5666,7 +5666,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Will + .party = {.NoItemDefaultMoves = gTrainerParty_Will } }, [TRAINER_COLIN] = @@ -5680,7 +5680,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Colin + .party = {.NoItemDefaultMoves = gTrainerParty_Colin } }, [TRAINER_ROBERT_1] = @@ -5694,7 +5694,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Robert1 + .party = {.NoItemDefaultMoves = gTrainerParty_Robert1 } }, [TRAINER_BENNY] = @@ -5708,7 +5708,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Benny + .party = {.NoItemDefaultMoves = gTrainerParty_Benny } }, [TRAINER_CHESTER] = @@ -5722,7 +5722,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Chester + .party = {.NoItemDefaultMoves = gTrainerParty_Chester } }, [TRAINER_ROBERT_2] = @@ -5736,7 +5736,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Robert2 + .party = {.NoItemDefaultMoves = gTrainerParty_Robert2 } }, [TRAINER_ROBERT_3] = @@ -5750,7 +5750,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Robert3 + .party = {.NoItemDefaultMoves = gTrainerParty_Robert3 } }, [TRAINER_ROBERT_4] = @@ -5764,7 +5764,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Robert4 + .party = {.NoItemDefaultMoves = gTrainerParty_Robert4 } }, [TRAINER_ROBERT_5] = @@ -5778,7 +5778,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Robert5 + .party = {.NoItemDefaultMoves = gTrainerParty_Robert5 } }, [TRAINER_ALEX] = @@ -5792,7 +5792,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 4, - .party = gTrainerParty_Alex + .party = {.NoItemDefaultMoves = gTrainerParty_Alex } }, [TRAINER_BECK] = @@ -5806,7 +5806,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Beck + .party = {.NoItemDefaultMoves = gTrainerParty_Beck } }, [TRAINER_YASU] = @@ -5820,7 +5820,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x3, .partySize = 1, - .party = gTrainerParty_Yasu + .party = {.NoItemDefaultMoves = gTrainerParty_Yasu } }, [TRAINER_TAKASHI] = @@ -5834,7 +5834,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x3, .partySize = 3, - .party = gTrainerParty_Takashi + .party = {.NoItemDefaultMoves = gTrainerParty_Takashi } }, [TRAINER_MAKOTO] = @@ -5848,7 +5848,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x0, .partySize = 1, - .party = gTrainerParty_Makoto + .party = {.NoItemDefaultMoves = gTrainerParty_Makoto } }, [TRAINER_HIDEO_1] = @@ -5862,7 +5862,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x0, .partySize = 4, - .party = gTrainerParty_Hideo1 + .party = {.NoItemDefaultMoves = gTrainerParty_Hideo1 } }, [TRAINER_LAO_1] = @@ -5876,7 +5876,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x0, .partySize = 4, - .party = gTrainerParty_Lao1 + .party = {.NoItemCustomMoves = gTrainerParty_Lao1 } }, [TRAINER_LUNG] = @@ -5890,7 +5890,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x0, .partySize = 2, - .party = gTrainerParty_Lung + .party = {.NoItemDefaultMoves = gTrainerParty_Lung } }, [TRAINER_LAO_2] = @@ -5904,7 +5904,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x0, .partySize = 4, - .party = gTrainerParty_Lao2 + .party = {.NoItemCustomMoves = gTrainerParty_Lao2 } }, [TRAINER_LAO_3] = @@ -5918,7 +5918,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x0, .partySize = 4, - .party = gTrainerParty_Lao3 + .party = {.NoItemCustomMoves = gTrainerParty_Lao3 } }, [TRAINER_LAO_4] = @@ -5932,7 +5932,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x0, .partySize = 4, - .party = gTrainerParty_Lao4 + .party = {.NoItemCustomMoves = gTrainerParty_Lao4 } }, [TRAINER_LAO_5] = @@ -5946,7 +5946,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x0, .partySize = 4, - .party = gTrainerParty_Lao5 + .party = {.ItemCustomMoves = gTrainerParty_Lao5 } }, [TRAINER_TESSA] = @@ -5960,7 +5960,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Tessa + .party = {.NoItemDefaultMoves = gTrainerParty_Tessa } }, [TRAINER_LAURA] = @@ -5974,7 +5974,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Laura + .party = {.NoItemDefaultMoves = gTrainerParty_Laura } }, [TRAINER_CYNDY_1] = @@ -5988,7 +5988,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Cyndy1 + .party = {.NoItemDefaultMoves = gTrainerParty_Cyndy1 } }, [TRAINER_CORA] = @@ -6002,7 +6002,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Cora + .party = {.NoItemDefaultMoves = gTrainerParty_Cora } }, [TRAINER_JILL] = @@ -6016,7 +6016,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Jill + .party = {.NoItemDefaultMoves = gTrainerParty_Jill } }, [TRAINER_CYNDY_2] = @@ -6030,7 +6030,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Cyndy2 + .party = {.NoItemDefaultMoves = gTrainerParty_Cyndy2 } }, [TRAINER_CYNDY_3] = @@ -6044,7 +6044,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Cyndy3 + .party = {.NoItemDefaultMoves = gTrainerParty_Cyndy3 } }, [TRAINER_CYNDY_4] = @@ -6058,7 +6058,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Cyndy4 + .party = {.NoItemDefaultMoves = gTrainerParty_Cyndy4 } }, [TRAINER_CYNDY_5] = @@ -6072,7 +6072,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Cyndy5 + .party = {.NoItemDefaultMoves = gTrainerParty_Cyndy5 } }, [TRAINER_MADELINE_1] = @@ -6086,7 +6086,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Madeline1 + .party = {.NoItemCustomMoves = gTrainerParty_Madeline1 } }, [TRAINER_CLARISSA] = @@ -6100,7 +6100,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Clarissa + .party = {.NoItemDefaultMoves = gTrainerParty_Clarissa } }, [TRAINER_ANGELICA] = @@ -6114,7 +6114,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Angelica + .party = {.NoItemDefaultMoves = gTrainerParty_Angelica } }, [TRAINER_MADELINE_2] = @@ -6128,7 +6128,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Madeline2 + .party = {.NoItemCustomMoves = gTrainerParty_Madeline2 } }, [TRAINER_MADELINE_3] = @@ -6142,7 +6142,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Madeline3 + .party = {.NoItemCustomMoves = gTrainerParty_Madeline3 } }, [TRAINER_MADELINE_4] = @@ -6156,7 +6156,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Madeline4 + .party = {.NoItemCustomMoves = gTrainerParty_Madeline4 } }, [TRAINER_MADELINE_5] = @@ -6170,7 +6170,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Madeline5 + .party = {.NoItemCustomMoves = gTrainerParty_Madeline5 } }, [TRAINER_BEVERLY] = @@ -6184,7 +6184,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Beverly + .party = {.NoItemDefaultMoves = gTrainerParty_Beverly } }, [TRAINER_DAWN] = @@ -6198,7 +6198,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Dawn + .party = {.NoItemDefaultMoves = gTrainerParty_Dawn } }, [TRAINER_NICOLE] = @@ -6212,7 +6212,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Nicole + .party = {.NoItemDefaultMoves = gTrainerParty_Nicole } }, [TRAINER_DENISE] = @@ -6226,7 +6226,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Denise + .party = {.NoItemDefaultMoves = gTrainerParty_Denise } }, [TRAINER_BETH] = @@ -6240,7 +6240,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Beth + .party = {.NoItemDefaultMoves = gTrainerParty_Beth } }, [TRAINER_TARA] = @@ -6254,7 +6254,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Tara + .party = {.NoItemDefaultMoves = gTrainerParty_Tara } }, [TRAINER_MISSY] = @@ -6268,7 +6268,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 4, - .party = gTrainerParty_Missy + .party = {.NoItemDefaultMoves = gTrainerParty_Missy } }, [TRAINER_ALICE] = @@ -6282,7 +6282,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Alice + .party = {.NoItemDefaultMoves = gTrainerParty_Alice } }, [TRAINER_JENNY_1] = @@ -6296,7 +6296,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Jenny1 + .party = {.NoItemDefaultMoves = gTrainerParty_Jenny1 } }, [TRAINER_GRACE] = @@ -6310,7 +6310,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Grace + .party = {.NoItemDefaultMoves = gTrainerParty_Grace } }, [TRAINER_TANYA] = @@ -6324,7 +6324,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Tanya + .party = {.NoItemDefaultMoves = gTrainerParty_Tanya } }, [TRAINER_SHARON] = @@ -6338,7 +6338,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Sharon + .party = {.NoItemDefaultMoves = gTrainerParty_Sharon } }, [TRAINER_NIKKI] = @@ -6352,7 +6352,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Nikki + .party = {.NoItemDefaultMoves = gTrainerParty_Nikki } }, [TRAINER_BRENDA] = @@ -6366,7 +6366,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Brenda + .party = {.NoItemDefaultMoves = gTrainerParty_Brenda } }, [TRAINER_KATIE] = @@ -6380,7 +6380,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Katie + .party = {.NoItemDefaultMoves = gTrainerParty_Katie } }, [TRAINER_SUSIE] = @@ -6394,7 +6394,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Susie + .party = {.NoItemDefaultMoves = gTrainerParty_Susie } }, [TRAINER_KARA] = @@ -6408,7 +6408,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Kara + .party = {.NoItemDefaultMoves = gTrainerParty_Kara } }, [TRAINER_DANA] = @@ -6422,7 +6422,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Dana + .party = {.NoItemDefaultMoves = gTrainerParty_Dana } }, [TRAINER_ERIN] = @@ -6436,7 +6436,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Erin + .party = {.NoItemDefaultMoves = gTrainerParty_Erin } }, [TRAINER_DEBRA] = @@ -6450,7 +6450,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Debra + .party = {.NoItemDefaultMoves = gTrainerParty_Debra } }, [TRAINER_LINDA] = @@ -6464,7 +6464,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Linda + .party = {.NoItemDefaultMoves = gTrainerParty_Linda } }, [TRAINER_KAYLEE] = @@ -6478,7 +6478,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Kaylee + .party = {.NoItemDefaultMoves = gTrainerParty_Kaylee } }, [TRAINER_LAUREL] = @@ -6492,7 +6492,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Laurel + .party = {.NoItemDefaultMoves = gTrainerParty_Laurel } }, [TRAINER_DARCY] = @@ -6506,7 +6506,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Darcy + .party = {.NoItemDefaultMoves = gTrainerParty_Darcy } }, [TRAINER_JENNY_2] = @@ -6520,7 +6520,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Jenny2 + .party = {.NoItemDefaultMoves = gTrainerParty_Jenny2 } }, [TRAINER_JENNY_3] = @@ -6534,7 +6534,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Jenny3 + .party = {.NoItemDefaultMoves = gTrainerParty_Jenny3 } }, [TRAINER_JENNY_4] = @@ -6548,7 +6548,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Jenny4 + .party = {.NoItemDefaultMoves = gTrainerParty_Jenny4 } }, [TRAINER_JENNY_5] = @@ -6562,7 +6562,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Jenny5 + .party = {.NoItemDefaultMoves = gTrainerParty_Jenny5 } }, [TRAINER_HEIDI] = @@ -6576,7 +6576,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Heidi + .party = {.NoItemCustomMoves = gTrainerParty_Heidi } }, [TRAINER_BECKY] = @@ -6590,7 +6590,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Becky + .party = {.NoItemCustomMoves = gTrainerParty_Becky } }, [TRAINER_CAROL] = @@ -6604,7 +6604,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Carol + .party = {.NoItemDefaultMoves = gTrainerParty_Carol } }, [TRAINER_NANCY] = @@ -6618,7 +6618,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Nancy + .party = {.NoItemDefaultMoves = gTrainerParty_Nancy } }, [TRAINER_MARTHA] = @@ -6632,7 +6632,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Martha + .party = {.NoItemDefaultMoves = gTrainerParty_Martha } }, [TRAINER_DIANA_1] = @@ -6646,7 +6646,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Diana1 + .party = {.NoItemDefaultMoves = gTrainerParty_Diana1 } }, [TRAINER_NINA] = @@ -6660,7 +6660,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Nina + .party = {.NoItemDefaultMoves = gTrainerParty_Nina } }, [TRAINER_IRENE] = @@ -6674,7 +6674,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Irene + .party = {.NoItemDefaultMoves = gTrainerParty_Irene } }, [TRAINER_DIANA_2] = @@ -6688,7 +6688,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Diana2 + .party = {.NoItemDefaultMoves = gTrainerParty_Diana2 } }, [TRAINER_DIANA_3] = @@ -6702,7 +6702,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Diana3 + .party = {.NoItemDefaultMoves = gTrainerParty_Diana3 } }, [TRAINER_DIANA_4] = @@ -6716,7 +6716,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Diana4 + .party = {.NoItemDefaultMoves = gTrainerParty_Diana4 } }, [TRAINER_DIANA_5] = @@ -6730,7 +6730,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Diana5 + .party = {.NoItemDefaultMoves = gTrainerParty_Diana5 } }, [TRAINER_AMY_AND_LIV_1] = @@ -6744,7 +6744,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_AmyAndLiv1 + .party = {.NoItemDefaultMoves = gTrainerParty_AmyAndLiv1 } }, [TRAINER_AMY_AND_LIV_2] = @@ -6758,7 +6758,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_AmyAndLiv2 + .party = {.NoItemDefaultMoves = gTrainerParty_AmyAndLiv2 } }, [TRAINER_GINA_AND_MIA_1] = @@ -6772,7 +6772,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_GinaAndMia1 + .party = {.NoItemDefaultMoves = gTrainerParty_GinaAndMia1 } }, [TRAINER_MIU_AND_YUKI] = @@ -6786,7 +6786,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_MiuAndYuki + .party = {.NoItemDefaultMoves = gTrainerParty_MiuAndYuki } }, [TRAINER_AMY_AND_LIV_3] = @@ -6800,7 +6800,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_AmyAndLiv3 + .party = {.NoItemDefaultMoves = gTrainerParty_AmyAndLiv3 } }, [TRAINER_GINA_AND_MIA_2] = @@ -6814,7 +6814,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_GinaAndMia2 + .party = {.NoItemCustomMoves = gTrainerParty_GinaAndMia2 } }, [TRAINER_AMY_AND_LIV_4] = @@ -6828,7 +6828,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_AmyAndLiv4 + .party = {.NoItemDefaultMoves = gTrainerParty_AmyAndLiv4 } }, [TRAINER_AMY_AND_LIV_5] = @@ -6842,7 +6842,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_AmyAndLiv5 + .party = {.NoItemCustomMoves = gTrainerParty_AmyAndLiv5 } }, [TRAINER_AMY_AND_LIV_6] = @@ -6856,7 +6856,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_AmyAndLiv6 + .party = {.NoItemCustomMoves = gTrainerParty_AmyAndLiv6 } }, [TRAINER_HUEY] = @@ -6870,7 +6870,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Huey + .party = {.NoItemDefaultMoves = gTrainerParty_Huey } }, [TRAINER_EDMOND] = @@ -6884,7 +6884,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Edmond + .party = {.NoItemDefaultMoves = gTrainerParty_Edmond } }, [TRAINER_ERNEST_1] = @@ -6898,7 +6898,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Ernest1 + .party = {.NoItemDefaultMoves = gTrainerParty_Ernest1 } }, [TRAINER_DWAYNE] = @@ -6912,7 +6912,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Dwayne + .party = {.NoItemDefaultMoves = gTrainerParty_Dwayne } }, [TRAINER_PHILLIP] = @@ -6926,7 +6926,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Phillip + .party = {.NoItemDefaultMoves = gTrainerParty_Phillip } }, [TRAINER_LEONARD] = @@ -6940,7 +6940,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Leonard + .party = {.NoItemDefaultMoves = gTrainerParty_Leonard } }, [TRAINER_DUNCAN] = @@ -6954,7 +6954,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Duncan + .party = {.NoItemDefaultMoves = gTrainerParty_Duncan } }, [TRAINER_ERNEST_2] = @@ -6968,7 +6968,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Ernest2 + .party = {.NoItemDefaultMoves = gTrainerParty_Ernest2 } }, [TRAINER_ERNEST_3] = @@ -6982,7 +6982,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Ernest3 + .party = {.NoItemDefaultMoves = gTrainerParty_Ernest3 } }, [TRAINER_ERNEST_4] = @@ -6996,7 +6996,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Ernest4 + .party = {.NoItemDefaultMoves = gTrainerParty_Ernest4 } }, [TRAINER_ERNEST_5] = @@ -7010,7 +7010,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Ernest5 + .party = {.NoItemDefaultMoves = gTrainerParty_Ernest5 } }, [TRAINER_ANONYMOUS_11] = @@ -7024,7 +7024,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Anonymous11 + .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous11 } }, [TRAINER_ANONYMOUS_12] = @@ -7038,7 +7038,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Anonymous12 + .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous12 } }, [TRAINER_ANONYMOUS_13] = @@ -7052,7 +7052,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Anonymous13 + .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous13 } }, [TRAINER_SONNY] = @@ -7066,7 +7066,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Sonny + .party = {.NoItemDefaultMoves = gTrainerParty_Sonny } }, [TRAINER_DONOVAN] = @@ -7080,7 +7080,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Donovan + .party = {.NoItemDefaultMoves = gTrainerParty_Donovan } }, [TRAINER_GERALD] = @@ -7094,7 +7094,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Gerald + .party = {.NoItemDefaultMoves = gTrainerParty_Gerald } }, [TRAINER_KELVIN] = @@ -7108,7 +7108,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Kelvin + .party = {.NoItemDefaultMoves = gTrainerParty_Kelvin } }, [TRAINER_KODY] = @@ -7122,7 +7122,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Kody + .party = {.NoItemDefaultMoves = gTrainerParty_Kody } }, [TRAINER_TEVIN] = @@ -7136,7 +7136,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Tevin + .party = {.NoItemDefaultMoves = gTrainerParty_Tevin } }, [TRAINER_DAMON] = @@ -7150,7 +7150,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Damon + .party = {.NoItemDefaultMoves = gTrainerParty_Damon } }, [TRAINER_PABLO] = @@ -7164,7 +7164,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Pablo + .party = {.NoItemDefaultMoves = gTrainerParty_Pablo } }, [TRAINER_EDWIN_1] = @@ -7178,7 +7178,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Edwin1 + .party = {.NoItemDefaultMoves = gTrainerParty_Edwin1 } }, [TRAINER_HECTOR_1] = @@ -7192,7 +7192,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Hector1 + .party = {.NoItemDefaultMoves = gTrainerParty_Hector1 } }, [TRAINER_HECTOR_2] = @@ -7206,7 +7206,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Hector2 + .party = {.NoItemDefaultMoves = gTrainerParty_Hector2 } }, [TRAINER_EDWIN_2] = @@ -7220,7 +7220,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Edwin2 + .party = {.NoItemDefaultMoves = gTrainerParty_Edwin2 } }, [TRAINER_EDWIN_3] = @@ -7234,7 +7234,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Edwin3 + .party = {.NoItemDefaultMoves = gTrainerParty_Edwin3 } }, [TRAINER_EDWIN_4] = @@ -7248,7 +7248,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Edwin4 + .party = {.NoItemDefaultMoves = gTrainerParty_Edwin4 } }, [TRAINER_EDWIN_5] = @@ -7262,7 +7262,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Edwin5 + .party = {.NoItemDefaultMoves = gTrainerParty_Edwin5 } }, [TRAINER_WALLY_1] = @@ -7276,7 +7276,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 5, - .party = gTrainerParty_Wally1 + .party = {.NoItemCustomMoves = gTrainerParty_Wally1 } }, [TRAINER_BRENDAN_1] = @@ -7290,7 +7290,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 1, - .party = gTrainerParty_Brendan1 + .party = {.NoItemDefaultMoves = gTrainerParty_Brendan1 } }, [TRAINER_BRENDAN_2] = @@ -7304,7 +7304,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Brendan2 + .party = {.NoItemDefaultMoves = gTrainerParty_Brendan2 } }, [TRAINER_BRENDAN_3] = @@ -7318,7 +7318,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Brendan3 + .party = {.NoItemDefaultMoves = gTrainerParty_Brendan3 } }, [TRAINER_BRENDAN_4] = @@ -7332,7 +7332,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0xb, .partySize = 1, - .party = gTrainerParty_Brendan4 + .party = {.NoItemDefaultMoves = gTrainerParty_Brendan4 } }, [TRAINER_BRENDAN_5] = @@ -7346,7 +7346,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Brendan5 + .party = {.NoItemDefaultMoves = gTrainerParty_Brendan5 } }, [TRAINER_BRENDAN_6] = @@ -7360,7 +7360,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Brendan6 + .party = {.NoItemDefaultMoves = gTrainerParty_Brendan6 } }, [TRAINER_BRENDAN_7] = @@ -7374,7 +7374,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 1, - .party = gTrainerParty_Brendan7 + .party = {.NoItemDefaultMoves = gTrainerParty_Brendan7 } }, [TRAINER_BRENDAN_8] = @@ -7388,7 +7388,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Brendan8 + .party = {.NoItemDefaultMoves = gTrainerParty_Brendan8 } }, [TRAINER_BRENDAN_9] = @@ -7402,7 +7402,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Brendan9 + .party = {.NoItemDefaultMoves = gTrainerParty_Brendan9 } }, [TRAINER_MAY_1] = @@ -7416,7 +7416,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 1, - .party = gTrainerParty_May1 + .party = {.NoItemDefaultMoves = gTrainerParty_May1 } }, [TRAINER_MAY_2] = @@ -7430,7 +7430,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_May2 + .party = {.NoItemDefaultMoves = gTrainerParty_May2 } }, [TRAINER_MAY_3] = @@ -7444,7 +7444,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_May3 + .party = {.NoItemDefaultMoves = gTrainerParty_May3 } }, [TRAINER_MAY_4] = @@ -7458,7 +7458,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 1, - .party = gTrainerParty_May4 + .party = {.NoItemDefaultMoves = gTrainerParty_May4 } }, [TRAINER_MAY_5] = @@ -7472,7 +7472,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_May5 + .party = {.NoItemDefaultMoves = gTrainerParty_May5 } }, [TRAINER_MAY_6] = @@ -7486,7 +7486,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_May6 + .party = {.NoItemDefaultMoves = gTrainerParty_May6 } }, [TRAINER_MAY_7] = @@ -7500,7 +7500,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 1, - .party = gTrainerParty_May7 + .party = {.NoItemDefaultMoves = gTrainerParty_May7 } }, [TRAINER_MAY_8] = @@ -7514,7 +7514,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_May8 + .party = {.NoItemDefaultMoves = gTrainerParty_May8 } }, [TRAINER_MAY_9] = @@ -7528,7 +7528,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_May9 + .party = {.NoItemDefaultMoves = gTrainerParty_May9 } }, [TRAINER_ISAAC_1] = @@ -7542,7 +7542,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 6, - .party = gTrainerParty_Isaac1 + .party = {.NoItemDefaultMoves = gTrainerParty_Isaac1 } }, [TRAINER_RILEY] = @@ -7556,7 +7556,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Riley + .party = {.NoItemDefaultMoves = gTrainerParty_Riley } }, [TRAINER_AIDAN] = @@ -7570,7 +7570,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Aidan + .party = {.NoItemDefaultMoves = gTrainerParty_Aidan } }, [TRAINER_ISAAC_2] = @@ -7584,7 +7584,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 6, - .party = gTrainerParty_Isaac2 + .party = {.NoItemDefaultMoves = gTrainerParty_Isaac2 } }, [TRAINER_ISAAC_3] = @@ -7598,7 +7598,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 6, - .party = gTrainerParty_Isaac3 + .party = {.NoItemDefaultMoves = gTrainerParty_Isaac3 } }, [TRAINER_ISAAC_4] = @@ -7612,7 +7612,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 6, - .party = gTrainerParty_Isaac4 + .party = {.NoItemDefaultMoves = gTrainerParty_Isaac4 } }, [TRAINER_ISAAC_5] = @@ -7626,7 +7626,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 6, - .party = gTrainerParty_Isaac5 + .party = {.NoItemDefaultMoves = gTrainerParty_Isaac5 } }, [TRAINER_LYDIA_1] = @@ -7640,7 +7640,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 6, - .party = gTrainerParty_Lydia1 + .party = {.NoItemDefaultMoves = gTrainerParty_Lydia1 } }, [TRAINER_ALEXIA] = @@ -7654,7 +7654,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Alexia + .party = {.NoItemDefaultMoves = gTrainerParty_Alexia } }, [TRAINER_DANIELLE] = @@ -7668,7 +7668,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Danielle + .party = {.NoItemDefaultMoves = gTrainerParty_Danielle } }, [TRAINER_LYDIA_2] = @@ -7682,7 +7682,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 6, - .party = gTrainerParty_Lydia2 + .party = {.NoItemDefaultMoves = gTrainerParty_Lydia2 } }, [TRAINER_LYDIA_3] = @@ -7696,7 +7696,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 6, - .party = gTrainerParty_Lydia3 + .party = {.NoItemDefaultMoves = gTrainerParty_Lydia3 } }, [TRAINER_LYDIA_4] = @@ -7710,7 +7710,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 6, - .party = gTrainerParty_Lydia4 + .party = {.NoItemDefaultMoves = gTrainerParty_Lydia4 } }, [TRAINER_LYDIA_5] = @@ -7724,7 +7724,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 6, - .party = gTrainerParty_Lydia5 + .party = {.NoItemDefaultMoves = gTrainerParty_Lydia5 } }, [TRAINER_JACKSON_1] = @@ -7738,7 +7738,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 1, - .party = gTrainerParty_Jackson1 + .party = {.NoItemDefaultMoves = gTrainerParty_Jackson1 } }, [TRAINER_CARLOS] = @@ -7752,7 +7752,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Carlos + .party = {.NoItemDefaultMoves = gTrainerParty_Carlos } }, [TRAINER_SEBASTIAN] = @@ -7766,7 +7766,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 1, - .party = gTrainerParty_Sebastian + .party = {.NoItemDefaultMoves = gTrainerParty_Sebastian } }, [TRAINER_JACKSON_2] = @@ -7780,7 +7780,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0xb, .partySize = 1, - .party = gTrainerParty_Jackson2 + .party = {.NoItemDefaultMoves = gTrainerParty_Jackson2 } }, [TRAINER_JACKSON_3] = @@ -7794,7 +7794,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 1, - .party = gTrainerParty_Jackson3 + .party = {.NoItemDefaultMoves = gTrainerParty_Jackson3 } }, [TRAINER_JACKSON_4] = @@ -7808,7 +7808,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0xb, .partySize = 1, - .party = gTrainerParty_Jackson4 + .party = {.NoItemDefaultMoves = gTrainerParty_Jackson4 } }, [TRAINER_JACKSON_5] = @@ -7822,7 +7822,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 2, - .party = gTrainerParty_Jackson5 + .party = {.NoItemDefaultMoves = gTrainerParty_Jackson5 } }, [TRAINER_CATHERINE_1] = @@ -7836,7 +7836,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0xb, .partySize = 2, - .party = gTrainerParty_Catherine1 + .party = {.NoItemDefaultMoves = gTrainerParty_Catherine1 } }, [TRAINER_JENNA] = @@ -7850,7 +7850,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0xb, .partySize = 3, - .party = gTrainerParty_Jenna + .party = {.NoItemDefaultMoves = gTrainerParty_Jenna } }, [TRAINER_SOPHIA] = @@ -7864,7 +7864,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 2, - .party = gTrainerParty_Sophia + .party = {.NoItemDefaultMoves = gTrainerParty_Sophia } }, [TRAINER_CATHERINE_2] = @@ -7878,7 +7878,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0xb, .partySize = 2, - .party = gTrainerParty_Catherine2 + .party = {.NoItemDefaultMoves = gTrainerParty_Catherine2 } }, [TRAINER_CATHERINE_3] = @@ -7892,7 +7892,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 2, - .party = gTrainerParty_Catherine3 + .party = {.NoItemDefaultMoves = gTrainerParty_Catherine3 } }, [TRAINER_CATHERINE_4] = @@ -7906,7 +7906,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0xb, .partySize = 2, - .party = gTrainerParty_Catherine4 + .party = {.NoItemDefaultMoves = gTrainerParty_Catherine4 } }, [TRAINER_CATHERINE_5] = @@ -7920,7 +7920,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 2, - .party = gTrainerParty_Catherine5 + .party = {.NoItemDefaultMoves = gTrainerParty_Catherine5 } }, [TRAINER_MAXIE_1] = @@ -7934,7 +7934,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 2, - .party = gTrainerParty_Maxie1 + .party = {.NoItemDefaultMoves = gTrainerParty_Maxie1 } }, [TRAINER_GRUNT_28] = @@ -7948,7 +7948,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Grunt28 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt28 } }, [TRAINER_GRUNT_29] = @@ -7962,7 +7962,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 4, - .party = gTrainerParty_Grunt29 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt29 } }, [TRAINER_GRUNT_30] = @@ -7976,7 +7976,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Grunt30 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt30 } }, [TRAINER_GRUNT_31] = @@ -7990,7 +7990,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Grunt31 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt31 } }, [TRAINER_GRUNT_32] = @@ -8004,7 +8004,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Grunt32 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt32 } }, [TRAINER_GRUNT_33] = @@ -8018,7 +8018,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Grunt33 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt33 } }, [TRAINER_GRUNT_34] = @@ -8032,7 +8032,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Grunt34 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt34 } }, [TRAINER_GRUNT_35] = @@ -8046,7 +8046,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Grunt35 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt35 } }, [TRAINER_GRUNT_36] = @@ -8060,7 +8060,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Grunt36 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt36 } }, [TRAINER_GRUNT_37] = @@ -8074,7 +8074,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Grunt37 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt37 } }, [TRAINER_GRUNT_38] = @@ -8088,7 +8088,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Grunt38 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt38 } }, [TRAINER_GRUNT_39] = @@ -8102,7 +8102,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Grunt39 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt39 } }, [TRAINER_GRUNT_40] = @@ -8116,7 +8116,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Grunt40 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt40 } }, [TRAINER_GRUNT_41] = @@ -8130,7 +8130,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Grunt41 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt41 } }, [TRAINER_GRUNT_42] = @@ -8144,7 +8144,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Grunt42 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt42 } }, [TRAINER_GRUNT_43] = @@ -8158,7 +8158,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Grunt43 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt43 } }, [TRAINER_GRUNT_44] = @@ -8172,7 +8172,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Grunt44 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt44 } }, [TRAINER_GRUNT_45] = @@ -8186,7 +8186,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Grunt45 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt45 } }, [TRAINER_GRUNT_46] = @@ -8200,7 +8200,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Grunt46 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt46 } }, [TRAINER_GRUNT_47] = @@ -8214,7 +8214,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Grunt47 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt47 } }, [TRAINER_GRUNT_48] = @@ -8228,7 +8228,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Grunt48 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt48 } }, [TRAINER_GRUNT_49] = @@ -8242,7 +8242,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Grunt49 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt49 } }, [TRAINER_GRUNT_50] = @@ -8256,7 +8256,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Grunt50 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt50 } }, [TRAINER_GRUNT_51] = @@ -8270,7 +8270,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Grunt51 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt51 } }, [TRAINER_GRUNT_52] = @@ -8284,7 +8284,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Grunt52 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt52 } }, [TRAINER_GRUNT_53] = @@ -8298,7 +8298,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Grunt53 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt53 } }, [TRAINER_GRUNT_54] = @@ -8312,7 +8312,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Grunt54 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt54 } }, [TRAINER_ANONYMOUS_14] = @@ -8326,7 +8326,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 2, - .party = gTrainerParty_Anonymous14 + .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous14 } }, [TRAINER_ANONYMOUS_15] = @@ -8340,7 +8340,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 2, - .party = gTrainerParty_Anonymous15 + .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous15 } }, [TRAINER_TABITHA_1] = @@ -8354,7 +8354,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0xb, .partySize = 3, - .party = gTrainerParty_Tabitha1 + .party = {.NoItemDefaultMoves = gTrainerParty_Tabitha1 } }, [TRAINER_TABITHA_2] = @@ -8368,7 +8368,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Tabitha2 + .party = {.NoItemDefaultMoves = gTrainerParty_Tabitha2 } }, [TRAINER_ANONYMOUS_16] = @@ -8382,7 +8382,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0xb, .partySize = 2, - .party = gTrainerParty_Anonymous16 + .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous16 } }, [TRAINER_COURTNEY_1] = @@ -8396,7 +8396,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 2, - .party = gTrainerParty_Courtney1 + .party = {.NoItemDefaultMoves = gTrainerParty_Courtney1 } }, [TRAINER_COURTNEY_2] = @@ -8410,7 +8410,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0xb, .partySize = 2, - .party = gTrainerParty_Courtney2 + .party = {.NoItemDefaultMoves = gTrainerParty_Courtney2 } }, [TRAINER_MAXIE_2] = @@ -8424,7 +8424,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Maxie2 + .party = {.NoItemDefaultMoves = gTrainerParty_Maxie2 } }, [TRAINER_MAXIE_3] = @@ -8438,7 +8438,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Maxie3 + .party = {.NoItemDefaultMoves = gTrainerParty_Maxie3 } }, [TRAINER_TIANA] = @@ -8452,7 +8452,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Tiana + .party = {.NoItemDefaultMoves = gTrainerParty_Tiana } }, [TRAINER_HALEY_1] = @@ -8466,7 +8466,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Haley1 + .party = {.NoItemDefaultMoves = gTrainerParty_Haley1 } }, [TRAINER_JANICE] = @@ -8480,7 +8480,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Janice + .party = {.NoItemDefaultMoves = gTrainerParty_Janice } }, [TRAINER_VIVI] = @@ -8494,7 +8494,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Vivi + .party = {.NoItemDefaultMoves = gTrainerParty_Vivi } }, [TRAINER_HALEY_2] = @@ -8508,7 +8508,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Haley2 + .party = {.NoItemDefaultMoves = gTrainerParty_Haley2 } }, [TRAINER_HALEY_3] = @@ -8522,7 +8522,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Haley3 + .party = {.NoItemDefaultMoves = gTrainerParty_Haley3 } }, [TRAINER_HALEY_4] = @@ -8536,7 +8536,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Haley4 + .party = {.NoItemDefaultMoves = gTrainerParty_Haley4 } }, [TRAINER_HALEY_5] = @@ -8550,7 +8550,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Haley5 + .party = {.NoItemDefaultMoves = gTrainerParty_Haley5 } }, [TRAINER_SALLY] = @@ -8564,7 +8564,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Sally + .party = {.NoItemDefaultMoves = gTrainerParty_Sally } }, [TRAINER_ROBIN] = @@ -8578,7 +8578,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Robin + .party = {.NoItemDefaultMoves = gTrainerParty_Robin } }, [TRAINER_ANDREA] = @@ -8592,7 +8592,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Andrea + .party = {.NoItemDefaultMoves = gTrainerParty_Andrea } }, [TRAINER_CRISSY] = @@ -8606,7 +8606,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Crissy + .party = {.NoItemDefaultMoves = gTrainerParty_Crissy } }, [TRAINER_RICK] = @@ -8620,7 +8620,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Rick + .party = {.NoItemDefaultMoves = gTrainerParty_Rick } }, [TRAINER_LYLE] = @@ -8634,7 +8634,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 6, - .party = gTrainerParty_Lyle + .party = {.NoItemDefaultMoves = gTrainerParty_Lyle } }, [TRAINER_JOSE] = @@ -8648,7 +8648,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Jose + .party = {.NoItemDefaultMoves = gTrainerParty_Jose } }, [TRAINER_DOUG] = @@ -8662,7 +8662,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Doug + .party = {.NoItemDefaultMoves = gTrainerParty_Doug } }, [TRAINER_GREG] = @@ -8676,7 +8676,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Greg + .party = {.NoItemDefaultMoves = gTrainerParty_Greg } }, [TRAINER_KENT] = @@ -8690,7 +8690,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Kent + .party = {.NoItemDefaultMoves = gTrainerParty_Kent } }, [TRAINER_JAMES_1] = @@ -8704,7 +8704,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_James1 + .party = {.NoItemDefaultMoves = gTrainerParty_James1 } }, [TRAINER_JAMES_2] = @@ -8718,7 +8718,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_James2 + .party = {.NoItemDefaultMoves = gTrainerParty_James2 } }, [TRAINER_JAMES_3] = @@ -8732,7 +8732,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_James3 + .party = {.NoItemDefaultMoves = gTrainerParty_James3 } }, [TRAINER_JAMES_4] = @@ -8746,7 +8746,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_James4 + .party = {.NoItemDefaultMoves = gTrainerParty_James4 } }, [TRAINER_JAMES_5] = @@ -8760,7 +8760,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 4, - .party = gTrainerParty_James5 + .party = {.NoItemDefaultMoves = gTrainerParty_James5 } }, [TRAINER_BRICE] = @@ -8774,7 +8774,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Brice + .party = {.NoItemDefaultMoves = gTrainerParty_Brice } }, [TRAINER_TRENT_1] = @@ -8788,7 +8788,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 4, - .party = gTrainerParty_Trent1 + .party = {.NoItemDefaultMoves = gTrainerParty_Trent1 } }, [TRAINER_LENNY] = @@ -8802,7 +8802,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Lenny + .party = {.NoItemDefaultMoves = gTrainerParty_Lenny } }, [TRAINER_LUCAS_1] = @@ -8816,7 +8816,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Lucas1 + .party = {.NoItemDefaultMoves = gTrainerParty_Lucas1 } }, [TRAINER_ALAN] = @@ -8830,7 +8830,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Alan + .party = {.NoItemDefaultMoves = gTrainerParty_Alan } }, [TRAINER_CLARK] = @@ -8844,7 +8844,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Clark + .party = {.NoItemDefaultMoves = gTrainerParty_Clark } }, [TRAINER_ERIC] = @@ -8858,7 +8858,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Eric + .party = {.NoItemDefaultMoves = gTrainerParty_Eric } }, [TRAINER_LUCAS_2] = @@ -8872,7 +8872,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Lucas2 + .party = {.NoItemCustomMoves = gTrainerParty_Lucas2 } }, [TRAINER_MIKE_1] = @@ -8886,7 +8886,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Mike1 + .party = {.NoItemCustomMoves = gTrainerParty_Mike1 } }, [TRAINER_MIKE_2] = @@ -8900,7 +8900,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Mike2 + .party = {.NoItemDefaultMoves = gTrainerParty_Mike2 } }, [TRAINER_TRENT_2] = @@ -8914,7 +8914,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 4, - .party = gTrainerParty_Trent2 + .party = {.NoItemDefaultMoves = gTrainerParty_Trent2 } }, [TRAINER_TRENT_3] = @@ -8928,7 +8928,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 4, - .party = gTrainerParty_Trent3 + .party = {.NoItemDefaultMoves = gTrainerParty_Trent3 } }, [TRAINER_TRENT_4] = @@ -8942,7 +8942,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 4, - .party = gTrainerParty_Trent4 + .party = {.NoItemDefaultMoves = gTrainerParty_Trent4 } }, [TRAINER_TRENT_5] = @@ -8956,7 +8956,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 4, - .party = gTrainerParty_Trent5 + .party = {.NoItemDefaultMoves = gTrainerParty_Trent5 } }, [TRAINER_DEZ_AND_LUKE] = @@ -8970,7 +8970,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_DezAndLuke + .party = {.NoItemDefaultMoves = gTrainerParty_DezAndLuke } }, [TRAINER_LEA_AND_JED] = @@ -8984,7 +8984,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_LeaAndJed + .party = {.NoItemDefaultMoves = gTrainerParty_LeaAndJed } }, [TRAINER_LOIS_AND_HAL_1] = @@ -8998,7 +8998,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_LoisAndHal1 + .party = {.NoItemDefaultMoves = gTrainerParty_LoisAndHal1 } }, [TRAINER_LOIS_AND_HAL_2] = @@ -9012,7 +9012,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_LoisAndHal2 + .party = {.NoItemDefaultMoves = gTrainerParty_LoisAndHal2 } }, [TRAINER_LOIS_AND_HAL_3] = @@ -9026,7 +9026,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_LoisAndHal3 + .party = {.NoItemDefaultMoves = gTrainerParty_LoisAndHal3 } }, [TRAINER_LOIS_AND_HAL_4] = @@ -9040,7 +9040,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_LoisAndHal4 + .party = {.NoItemDefaultMoves = gTrainerParty_LoisAndHal4 } }, [TRAINER_LOIS_AND_HAL_5] = @@ -9054,7 +9054,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_LoisAndHal5 + .party = {.NoItemDefaultMoves = gTrainerParty_LoisAndHal5 } }, [TRAINER_JOHANNA] = @@ -9068,7 +9068,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Johanna + .party = {.NoItemDefaultMoves = gTrainerParty_Johanna } }, [TRAINER_ZANE] = @@ -9082,7 +9082,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 1, - .party = gTrainerParty_Zane + .party = {.NoItemCustomMoves = gTrainerParty_Zane } }, [TRAINER_VIVIAN] = @@ -9096,7 +9096,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Vivian + .party = {.NoItemCustomMoves = gTrainerParty_Vivian } }, [TRAINER_SADIE] = @@ -9110,7 +9110,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Sadie + .party = {.NoItemCustomMoves = gTrainerParty_Sadie } }, [TRAINER_HIDEO_2] = @@ -9124,7 +9124,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x3, .partySize = 2, - .party = gTrainerParty_Hideo2 + .party = {.NoItemCustomMoves = gTrainerParty_Hideo2 } }, [TRAINER_KEIGO] = @@ -9138,7 +9138,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x3, .partySize = 2, - .party = gTrainerParty_Keigo + .party = {.NoItemCustomMoves = gTrainerParty_Keigo } }, [TRAINER_TSUNAO] = @@ -9152,7 +9152,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x3, .partySize = 3, - .party = gTrainerParty_Tsunao + .party = {.NoItemCustomMoves = gTrainerParty_Tsunao } }, [TRAINER_TERRELL] = @@ -9166,7 +9166,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Terrell + .party = {.NoItemDefaultMoves = gTrainerParty_Terrell } }, [TRAINER_KYLEE] = @@ -9180,7 +9180,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Kylee + .party = {.NoItemDefaultMoves = gTrainerParty_Kylee } }, [TRAINER_WALLY_2] = @@ -9194,7 +9194,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 1, - .party = gTrainerParty_Wally2 + .party = {.NoItemDefaultMoves = gTrainerParty_Wally2 } }, [TRAINER_WALLY_3] = @@ -9208,7 +9208,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 5, - .party = gTrainerParty_Wally3 + .party = {.NoItemCustomMoves = gTrainerParty_Wally3 } }, [TRAINER_WALLY_4] = @@ -9222,7 +9222,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 5, - .party = gTrainerParty_Wally4 + .party = {.NoItemCustomMoves = gTrainerParty_Wally4 } }, [TRAINER_WALLY_5] = @@ -9236,7 +9236,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 5, - .party = gTrainerParty_Wally5 + .party = {.NoItemCustomMoves = gTrainerParty_Wally5 } }, [TRAINER_WALLY_6] = @@ -9250,7 +9250,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 5, - .party = gTrainerParty_Wally6 + .party = {.NoItemCustomMoves = gTrainerParty_Wally6 } }, [TRAINER_BRENDAN_10] = @@ -9264,7 +9264,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 4, - .party = gTrainerParty_Brendan10 + .party = {.NoItemDefaultMoves = gTrainerParty_Brendan10 } }, [TRAINER_BRENDAN_11] = @@ -9278,7 +9278,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 4, - .party = gTrainerParty_Brendan11 + .party = {.NoItemDefaultMoves = gTrainerParty_Brendan11 } }, [TRAINER_BRENDAN_12] = @@ -9292,7 +9292,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 4, - .party = gTrainerParty_Brendan12 + .party = {.NoItemDefaultMoves = gTrainerParty_Brendan12 } }, [TRAINER_MAY_10] = @@ -9306,7 +9306,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 4, - .party = gTrainerParty_May10 + .party = {.NoItemDefaultMoves = gTrainerParty_May10 } }, [TRAINER_MAY_11] = @@ -9320,7 +9320,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 4, - .party = gTrainerParty_May11 + .party = {.NoItemDefaultMoves = gTrainerParty_May11 } }, [TRAINER_MAY_12] = @@ -9334,7 +9334,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 4, - .party = gTrainerParty_May12 + .party = {.NoItemDefaultMoves = gTrainerParty_May12 } }, [TRAINER_JONAH] = @@ -9348,7 +9348,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 4, - .party = gTrainerParty_Jonah + .party = {.NoItemDefaultMoves = gTrainerParty_Jonah } }, [TRAINER_HENRY] = @@ -9362,7 +9362,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Henry + .party = {.NoItemDefaultMoves = gTrainerParty_Henry } }, [TRAINER_ROGER] = @@ -9376,7 +9376,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 4, - .party = gTrainerParty_Roger + .party = {.NoItemDefaultMoves = gTrainerParty_Roger } }, [TRAINER_ALEXA] = @@ -9390,7 +9390,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 2, - .party = gTrainerParty_Alexa + .party = {.NoItemDefaultMoves = gTrainerParty_Alexa } }, [TRAINER_RUBEN] = @@ -9404,7 +9404,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Ruben + .party = {.NoItemDefaultMoves = gTrainerParty_Ruben } }, [TRAINER_KOJI] = @@ -9418,7 +9418,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Koji + .party = {.NoItemDefaultMoves = gTrainerParty_Koji } }, [TRAINER_WAYNE] = @@ -9432,7 +9432,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 4, - .party = gTrainerParty_Wayne + .party = {.NoItemDefaultMoves = gTrainerParty_Wayne } }, [TRAINER_BYRON] = @@ -9446,7 +9446,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Byron + .party = {.NoItemDefaultMoves = gTrainerParty_Byron } }, [TRAINER_REED] = @@ -9460,7 +9460,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 4, - .party = gTrainerParty_Reed + .party = {.NoItemDefaultMoves = gTrainerParty_Reed } }, [TRAINER_TISHA] = @@ -9474,7 +9474,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Tisha + .party = {.NoItemDefaultMoves = gTrainerParty_Tisha } }, [TRAINER_TORI_AND_TIA] = @@ -9488,7 +9488,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_ToriAndTia + .party = {.NoItemDefaultMoves = gTrainerParty_ToriAndTia } }, [TRAINER_KIM_AND_IRIS] = @@ -9502,7 +9502,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_KimAndIris + .party = {.NoItemCustomMoves = gTrainerParty_KimAndIris } }, [TRAINER_TYRA_AND_IVY] = @@ -9516,7 +9516,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_TyraAndIvy + .party = {.NoItemCustomMoves = gTrainerParty_TyraAndIvy } }, [TRAINER_MEL_AND_PAUL] = @@ -9530,7 +9530,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_MelAndPaul + .party = {.NoItemCustomMoves = gTrainerParty_MelAndPaul } }, [TRAINER_JOHN_AND_JAY_1] = @@ -9544,7 +9544,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x7, .partySize = 2, - .party = gTrainerParty_JohnAndJay1 + .party = {.NoItemCustomMoves = gTrainerParty_JohnAndJay1 } }, [TRAINER_JOHN_AND_JAY_2] = @@ -9558,7 +9558,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x7, .partySize = 2, - .party = gTrainerParty_JohnAndJay2 + .party = {.NoItemCustomMoves = gTrainerParty_JohnAndJay2 } }, [TRAINER_JOHN_AND_JAY_3] = @@ -9572,7 +9572,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x7, .partySize = 2, - .party = gTrainerParty_JohnAndJay3 + .party = {.NoItemCustomMoves = gTrainerParty_JohnAndJay3 } }, [TRAINER_JOHN_AND_JAY_4] = @@ -9586,7 +9586,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0xb, .partySize = 2, - .party = gTrainerParty_JohnAndJay4 + .party = {.NoItemCustomMoves = gTrainerParty_JohnAndJay4 } }, [TRAINER_JOHN_AND_JAY_5] = @@ -9600,7 +9600,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x7, .partySize = 2, - .party = gTrainerParty_JohnAndJay5 + .party = {.NoItemCustomMoves = gTrainerParty_JohnAndJay5 } }, [TRAINER_RELI_AND_IAN] = @@ -9614,7 +9614,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_ReliAndIan + .party = {.NoItemDefaultMoves = gTrainerParty_ReliAndIan } }, [TRAINER_RITA_AND_SAM_1] = @@ -9628,7 +9628,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_RitaAndSam1 + .party = {.NoItemDefaultMoves = gTrainerParty_RitaAndSam1 } }, [TRAINER_RITA_AND_SAM_2] = @@ -9642,7 +9642,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_RitaAndSam2 + .party = {.NoItemDefaultMoves = gTrainerParty_RitaAndSam2 } }, [TRAINER_RITA_AND_SAM_3] = @@ -9656,7 +9656,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_RitaAndSam3 + .party = {.NoItemDefaultMoves = gTrainerParty_RitaAndSam3 } }, [TRAINER_RITA_AND_SAM_4] = @@ -9670,7 +9670,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_RitaAndSam4 + .party = {.NoItemDefaultMoves = gTrainerParty_RitaAndSam4 } }, [TRAINER_RITA_AND_SAM_5] = @@ -9684,7 +9684,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_RitaAndSam5 + .party = {.NoItemDefaultMoves = gTrainerParty_RitaAndSam5 } }, [TRAINER_LISA_AND_RAY] = @@ -9698,7 +9698,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_LisaAndRay + .party = {.NoItemDefaultMoves = gTrainerParty_LisaAndRay } }, [TRAINER_EUGENE] = @@ -9712,6 +9712,6 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 4, - .party = gTrainerParty_Eugene + .party = {.NoItemDefaultMoves = gTrainerParty_Eugene } }, }; -- cgit v1.2.3 From ff5bf7804ecee60f26457651395937f7184d7991 Mon Sep 17 00:00:00 2001 From: vblm12 Date: Sat, 21 Jul 2018 16:40:05 -0500 Subject: Change OPPONENT to TRAINER in taya_debug_window.c --- src/debug/taya_debug_window.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/debug/taya_debug_window.c b/src/debug/taya_debug_window.c index c5f6fc0ec..6b30fe5fe 100644 --- a/src/debug/taya_debug_window.c +++ b/src/debug/taya_debug_window.c @@ -707,19 +707,19 @@ bool8 TayaDebugMenu_Trainer(void) for (i = 0; i < ARRAY_COUNT(gTrainerEyeTrainers); i++) SetTrainerFlag(gTrainerEyeTrainers[i].opponentIDs[0]); - SetTrainerFlag(OPPONENT_ROXANNE); - SetTrainerFlag(OPPONENT_BRAWLY); - SetTrainerFlag(OPPONENT_WATTSON); - SetTrainerFlag(OPPONENT_FLANNERY); - SetTrainerFlag(OPPONENT_NORMAN); - SetTrainerFlag(OPPONENT_WINONA); - SetTrainerFlag(OPPONENT_TATE_AND_LIZA); - SetTrainerFlag(OPPONENT_WALLACE); - SetTrainerFlag(OPPONENT_SIDNEY); - SetTrainerFlag(OPPONENT_PHOEBE); - SetTrainerFlag(OPPONENT_GLACIA); - SetTrainerFlag(OPPONENT_DRAKE); - SetTrainerFlag(OPPONENT_STEVEN); + SetTrainerFlag(TRAINER_ROXANNE); + SetTrainerFlag(TRAINER_BRAWLY); + SetTrainerFlag(TRAINER_WATTSON); + SetTrainerFlag(TRAINER_FLANNERY); + SetTrainerFlag(TRAINER_NORMAN); + SetTrainerFlag(TRAINER_WINONA); + SetTrainerFlag(TRAINER_TATE_AND_LIZA); + SetTrainerFlag(TRAINER_WALLACE); + SetTrainerFlag(TRAINER_SIDNEY); + SetTrainerFlag(TRAINER_PHOEBE); + SetTrainerFlag(TRAINER_GLACIA); + SetTrainerFlag(TRAINER_DRAKE); + SetTrainerFlag(TRAINER_STEVEN); CloseMenu(); return TRUE; } -- cgit v1.2.3 From 74d273002c3e2b6e37d704bf00fdb258a874e207 Mon Sep 17 00:00:00 2001 From: vblm12 Date: Sat, 21 Jul 2018 17:18:59 -0500 Subject: Change OPPONENT to TRAINER in data-de. --- data-de/event_scripts.s | 78 ++++++++++++++++++++++++------------------------- 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/data-de/event_scripts.s b/data-de/event_scripts.s index a10c2ddb0..9b27d25a1 100644 --- a/data-de/event_scripts.s +++ b/data-de/event_scripts.s @@ -1941,66 +1941,66 @@ SootopolisCity_Gym_1F_EventScript_1A01C0:: @ 81A01C0 end DewfordTown_Gym_EventScript_1A021E:: @ 81A021E - settrainerflag OPPONENT_JOSH - settrainerflag OPPONENT_TOMMY + settrainerflag TRAINER_JOSH + settrainerflag TRAINER_TOMMY return DewfordTown_Gym_EventScript_1A0225:: @ 81A0225 - settrainerflag OPPONENT_HIDEKI - settrainerflag OPPONENT_TESSA - settrainerflag OPPONENT_LAURA + settrainerflag TRAINER_HIDEKI + settrainerflag TRAINER_TESSA + settrainerflag TRAINER_LAURA return DewfordTown_Gym_EventScript_1A022F:: @ 81A022F - settrainerflag OPPONENT_KIRK - settrainerflag OPPONENT_SHAWN - settrainerflag OPPONENT_BEN - settrainerflag OPPONENT_VIVIAN + settrainerflag TRAINER_KIRK + settrainerflag TRAINER_SHAWN + settrainerflag TRAINER_BEN + settrainerflag TRAINER_VIVIAN return DewfordTown_Gym_EventScript_1A023C:: @ 81A023C - settrainerflag OPPONENT_COLE - settrainerflag OPPONENT_AXLE - settrainerflag OPPONENT_ANDY - settrainerflag OPPONENT_ZANE - settrainerflag OPPONENT_SADIE + settrainerflag TRAINER_COLE + settrainerflag TRAINER_AXLE + settrainerflag TRAINER_ANDY + settrainerflag TRAINER_ZANE + settrainerflag TRAINER_SADIE return DewfordTown_Gym_EventScript_1A024C:: @ 81A024C - settrainerflag OPPONENT_RANDALL - settrainerflag OPPONENT_PARKER - settrainerflag OPPONENT_GEORGE - settrainerflag OPPONENT_BERKE - settrainerflag OPPONENT_MARY - settrainerflag OPPONENT_LORI - settrainerflag OPPONENT_JODY + settrainerflag TRAINER_RANDALL + settrainerflag TRAINER_PARKER + settrainerflag TRAINER_GEORGE + settrainerflag TRAINER_BERKE + settrainerflag TRAINER_MARY + settrainerflag TRAINER_LORI + settrainerflag TRAINER_JODY return DewfordTown_Gym_EventScript_1A0262:: @ 81A0262 - settrainerflag OPPONENT_JARED - settrainerflag OPPONENT_TERRELL - settrainerflag OPPONENT_KYLEE - settrainerflag OPPONENT_WILL + settrainerflag TRAINER_JARED + settrainerflag TRAINER_TERRELL + settrainerflag TRAINER_KYLEE + settrainerflag TRAINER_WILL return DewfordTown_Gym_EventScript_1A026F:: @ 81A026F - settrainerflag OPPONENT_PRESTON - settrainerflag OPPONENT_VIRGIL - settrainerflag OPPONENT_FRITZ - settrainerflag OPPONENT_HANNAH - settrainerflag OPPONENT_SAMANTHA - settrainerflag OPPONENT_MAURA + settrainerflag TRAINER_PRESTON + settrainerflag TRAINER_VIRGIL + settrainerflag TRAINER_FRITZ + settrainerflag TRAINER_HANNAH + settrainerflag TRAINER_SAMANTHA + settrainerflag TRAINER_MAURA return DewfordTown_Gym_EventScript_1A0282:: @ 81A0282 - settrainerflag OPPONENT_ANDREA - settrainerflag OPPONENT_CRISSY - settrainerflag OPPONENT_BRIANNA_2 - settrainerflag OPPONENT_CONNIE - settrainerflag OPPONENT_BRIDGET - settrainerflag OPPONENT_OLIVIA - settrainerflag OPPONENT_TIFFANY - settrainerflag OPPONENT_MARISSA + settrainerflag TRAINER_ANDREA + settrainerflag TRAINER_CRISSY + settrainerflag TRAINER_BRIANNA_2 + settrainerflag TRAINER_CONNIE + settrainerflag TRAINER_BRIDGET + settrainerflag TRAINER_OLIVIA + settrainerflag TRAINER_TIFFANY + settrainerflag TRAINER_MARISSA return DewfordTown_Gym_EventScript_1A029B:: @ 81A029B -- cgit v1.2.3 From 354b82fce64c1f798c1a6c143b82269514562f91 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sun, 22 Jul 2018 10:40:00 -0500 Subject: Decompile more of contest_effects.s --- asm/contest_painting_effects.s | 1362 +--------------------------------------- src/contest_painting_effects.c | 599 +++++++++++++++++- 2 files changed, 595 insertions(+), 1366 deletions(-) diff --git a/asm/contest_painting_effects.s b/asm/contest_painting_effects.s index bc72a6ef5..0c403c093 100644 --- a/asm/contest_painting_effects.s +++ b/asm/contest_painting_effects.s @@ -5,1366 +5,6 @@ .text - thumb_func_start sub_80FCB5C -sub_80FCB5C: @ 80FCB5C - push {r4-r7,lr} - mov r7, r8 - push {r7} - sub sp, 0x8 - movs r2, 0 - ldr r0, _080FCC00 @ =gUnknown_03005DF8 - ldrb r0, [r0] - cmp r2, r0 - bcs _080FCBF2 - ldr r0, _080FCC04 @ =gUnknown_03005DEC - mov r8, r0 - ldr r3, _080FCC08 @ =gUnknown_03005E04 -_080FCB74: - ldr r0, _080FCC0C @ =gUnknown_03005DFC - ldrb r1, [r0] - ldrb r0, [r3] - muls r0, r1 - lsls r0, 1 - mov r4, r8 - ldr r1, [r4] - adds r1, r0 - ldr r0, _080FCC10 @ =gUnknown_03005DE8 - ldrb r0, [r0] - adds r0, r2 - lsls r0, 1 - adds r4, r1, r0 - ldrh r1, [r4] - mov r0, sp - strh r1, [r0] - movs r5, 0x1 - ldrb r0, [r3] - lsls r0, 1 - adds r4, r0 - ldr r0, _080FCC14 @ =gUnknown_03005DF0 - ldrb r0, [r0] - subs r0, 0x1 - adds r7, r2, 0x1 - cmp r5, r0 - bge _080FCBE6 - ldr r6, _080FCC08 @ =gUnknown_03005E04 -_080FCBAA: - ldrh r0, [r4] - movs r2, 0x80 - lsls r2, 8 - adds r1, r2, 0 - ands r0, r1 - cmp r0, 0 - bne _080FCBD0 - ldrb r2, [r6] - lsls r2, 1 - adds r2, r4, r2 - mov r0, sp - adds r1, r4, 0 - str r3, [sp, 0x4] - bl sub_80FD68C - strh r0, [r4] - mov r1, sp - strh r0, [r1] - ldr r3, [sp, 0x4] -_080FCBD0: - adds r0, r5, 0x1 - lsls r0, 24 - lsrs r5, r0, 24 - ldrb r0, [r6] - lsls r0, 1 - adds r4, r0 - ldr r0, _080FCC14 @ =gUnknown_03005DF0 - ldrb r0, [r0] - subs r0, 0x1 - cmp r5, r0 - blt _080FCBAA -_080FCBE6: - lsls r0, r7, 24 - lsrs r2, r0, 24 - ldr r0, _080FCC00 @ =gUnknown_03005DF8 - ldrb r0, [r0] - cmp r2, r0 - bcc _080FCB74 -_080FCBF2: - add sp, 0x8 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080FCC00: .4byte gUnknown_03005DF8 -_080FCC04: .4byte gUnknown_03005DEC -_080FCC08: .4byte gUnknown_03005E04 -_080FCC0C: .4byte gUnknown_03005DFC -_080FCC10: .4byte gUnknown_03005DE8 -_080FCC14: .4byte gUnknown_03005DF0 - thumb_func_end sub_80FCB5C - - thumb_func_start sub_80FCC18 -sub_80FCC18: @ 80FCC18 - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - sub sp, 0x4 - lsls r0, 24 - lsrs r0, 24 - mov r8, r0 - movs r2, 0 - ldr r0, _080FCCA4 @ =gUnknown_03005DF0 - ldrb r0, [r0] - cmp r2, r0 - bcs _080FCC94 - ldr r0, _080FCCA8 @ =gUnknown_03005DEC - mov r9, r0 - ldr r3, _080FCCAC @ =gUnknown_03005DF8 -_080FCC38: - ldr r0, _080FCCB0 @ =gUnknown_03005DFC - ldrb r1, [r0] - adds r1, r2 - ldr r0, _080FCCB4 @ =gUnknown_03005E04 - ldrb r0, [r0] - muls r0, r1 - lsls r0, 1 - mov r4, r9 - ldr r1, [r4] - adds r1, r0 - ldr r0, _080FCCB8 @ =gUnknown_03005DE8 - ldrb r0, [r0] - lsls r0, 1 - adds r4, r1, r0 - movs r5, 0 - adds r6, r2, 0x1 - ldrb r0, [r3] - cmp r5, r0 - bcs _080FCC88 - movs r0, 0x80 - lsls r0, 8 - adds r7, r0, 0 -_080FCC64: - ldrh r0, [r4] - ands r0, r7 - cmp r0, 0 - bne _080FCC7A - adds r0, r4, 0 - mov r1, r8 - str r3, [sp] - bl sub_80FD3D0 - strh r0, [r4] - ldr r3, [sp] -_080FCC7A: - adds r0, r5, 0x1 - lsls r0, 24 - lsrs r5, r0, 24 - adds r4, 0x2 - ldrb r0, [r3] - cmp r5, r0 - bcc _080FCC64 -_080FCC88: - lsls r0, r6, 24 - lsrs r2, r0, 24 - ldr r0, _080FCCA4 @ =gUnknown_03005DF0 - ldrb r0, [r0] - cmp r2, r0 - bcc _080FCC38 -_080FCC94: - add sp, 0x4 - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080FCCA4: .4byte gUnknown_03005DF0 -_080FCCA8: .4byte gUnknown_03005DEC -_080FCCAC: .4byte gUnknown_03005DF8 -_080FCCB0: .4byte gUnknown_03005DFC -_080FCCB4: .4byte gUnknown_03005E04 -_080FCCB8: .4byte gUnknown_03005DE8 - thumb_func_end sub_80FCC18 - - thumb_func_start sub_80FCCBC -sub_80FCCBC: @ 80FCCBC - push {r4-r7,lr} - mov r7, r8 - push {r7} - sub sp, 0x4 - movs r2, 0 - ldr r0, _080FCD3C @ =gUnknown_03005DF0 - ldrb r0, [r0] - cmp r2, r0 - bcs _080FCD2E - ldr r0, _080FCD40 @ =gUnknown_03005DEC - mov r8, r0 - ldr r3, _080FCD44 @ =gUnknown_03005DF8 -_080FCCD4: - ldr r0, _080FCD48 @ =gUnknown_03005DFC - ldrb r1, [r0] - adds r1, r2 - ldr r0, _080FCD4C @ =gUnknown_03005E04 - ldrb r0, [r0] - muls r0, r1 - lsls r0, 1 - mov r4, r8 - ldr r1, [r4] - adds r1, r0 - ldr r0, _080FCD50 @ =gUnknown_03005DE8 - ldrb r0, [r0] - lsls r0, 1 - adds r4, r1, r0 - movs r5, 0 - adds r6, r2, 0x1 - ldrb r0, [r3] - cmp r5, r0 - bcs _080FCD22 - movs r0, 0x80 - lsls r0, 8 - adds r7, r0, 0 -_080FCD00: - ldrh r0, [r4] - ands r0, r7 - cmp r0, 0 - bne _080FCD14 - adds r0, r4, 0 - str r3, [sp] - bl sub_80FD4DC - strh r0, [r4] - ldr r3, [sp] -_080FCD14: - adds r0, r5, 0x1 - lsls r0, 24 - lsrs r5, r0, 24 - adds r4, 0x2 - ldrb r0, [r3] - cmp r5, r0 - bcc _080FCD00 -_080FCD22: - lsls r0, r6, 24 - lsrs r2, r0, 24 - ldr r0, _080FCD3C @ =gUnknown_03005DF0 - ldrb r0, [r0] - cmp r2, r0 - bcc _080FCCD4 -_080FCD2E: - add sp, 0x4 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080FCD3C: .4byte gUnknown_03005DF0 -_080FCD40: .4byte gUnknown_03005DEC -_080FCD44: .4byte gUnknown_03005DF8 -_080FCD48: .4byte gUnknown_03005DFC -_080FCD4C: .4byte gUnknown_03005E04 -_080FCD50: .4byte gUnknown_03005DE8 - thumb_func_end sub_80FCCBC - - thumb_func_start sub_80FCD54 -sub_80FCD54: @ 80FCD54 - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - movs r7, 0 - ldr r0, _080FCE8C @ =gUnknown_03005DF0 - ldrb r0, [r0] - cmp r7, r0 - bcs _080FCDE0 - ldr r0, _080FCE90 @ =gUnknown_03005DEC - mov r8, r0 -_080FCD6A: - ldr r0, _080FCE94 @ =gUnknown_03005DFC - ldrb r1, [r0] - adds r1, r7 - ldr r0, _080FCE98 @ =gUnknown_03005E04 - ldrb r0, [r0] - muls r0, r1 - lsls r0, 1 - mov r2, r8 - ldr r1, [r2] - adds r1, r0 - ldr r0, _080FCE9C @ =gUnknown_03005DE8 - ldrb r0, [r0] - lsls r0, 1 - adds r5, r1, r0 - adds r4, r5, 0x2 - adds r0, r5, 0 - adds r1, r4, 0 - bl sub_80FD50C - strh r0, [r5] - movs r6, 0x1 - adds r5, r4, 0 - ldr r0, _080FCEA0 @ =gUnknown_03005DF8 - ldrb r0, [r0] - subs r0, 0x1 - adds r7, 0x1 - cmp r6, r0 - bge _080FCDCA -_080FCDA2: - adds r4, r5, 0x2 - adds r0, r5, 0 - adds r1, r4, 0 - bl sub_80FD50C - strh r0, [r5] - subs r1, r5, 0x2 - adds r0, r5, 0 - bl sub_80FD50C - strh r0, [r5] - adds r0, r6, 0x1 - lsls r0, 24 - lsrs r6, r0, 24 - adds r5, r4, 0 - ldr r0, _080FCEA0 @ =gUnknown_03005DF8 - ldrb r0, [r0] - subs r0, 0x1 - cmp r6, r0 - blt _080FCDA2 -_080FCDCA: - subs r1, r5, 0x2 - adds r0, r5, 0 - bl sub_80FD50C - strh r0, [r5] - lsls r0, r7, 24 - lsrs r7, r0, 24 - ldr r0, _080FCE8C @ =gUnknown_03005DF0 - ldrb r0, [r0] - cmp r7, r0 - bcc _080FCD6A -_080FCDE0: - movs r6, 0 - ldr r0, _080FCEA0 @ =gUnknown_03005DF8 - ldrb r0, [r0] - cmp r6, r0 - bcs _080FCE80 - ldr r3, _080FCE90 @ =gUnknown_03005DEC - mov r9, r3 - ldr r0, _080FCE98 @ =gUnknown_03005E04 - mov r8, r0 -_080FCDF2: - ldr r0, _080FCE94 @ =gUnknown_03005DFC - ldrb r0, [r0] - mov r2, r8 - ldrb r1, [r2] - muls r0, r1 - lsls r0, 1 - mov r3, r9 - ldr r2, [r3] - adds r2, r0 - ldr r0, _080FCE9C @ =gUnknown_03005DE8 - ldrb r0, [r0] - adds r0, r6 - lsls r0, 1 - adds r5, r2, r0 - lsls r1, 1 - adds r1, r5, r1 - adds r0, r5, 0 - bl sub_80FD50C - strh r0, [r5] - movs r7, 0x1 - mov r1, r8 - ldrb r0, [r1] - lsls r0, 1 - adds r5, r0 - ldr r0, _080FCE8C @ =gUnknown_03005DF0 - ldrb r0, [r0] - subs r0, 0x1 - adds r6, 0x1 - cmp r7, r0 - bge _080FCE64 - ldr r4, _080FCE98 @ =gUnknown_03005E04 -_080FCE32: - ldrb r1, [r4] - lsls r1, 1 - adds r1, r5, r1 - adds r0, r5, 0 - bl sub_80FD50C - strh r0, [r5] - ldrb r1, [r4] - lsls r1, 1 - subs r1, r5, r1 - adds r0, r5, 0 - bl sub_80FD50C - strh r0, [r5] - adds r0, r7, 0x1 - lsls r0, 24 - lsrs r7, r0, 24 - ldrb r0, [r4] - lsls r0, 1 - adds r5, r0 - ldr r0, _080FCE8C @ =gUnknown_03005DF0 - ldrb r0, [r0] - subs r0, 0x1 - cmp r7, r0 - blt _080FCE32 -_080FCE64: - mov r2, r8 - ldrb r1, [r2] - lsls r1, 1 - subs r1, r5, r1 - adds r0, r5, 0 - bl sub_80FD50C - strh r0, [r5] - lsls r0, r6, 24 - lsrs r6, r0, 24 - ldr r0, _080FCEA0 @ =gUnknown_03005DF8 - ldrb r0, [r0] - cmp r6, r0 - bcc _080FCDF2 -_080FCE80: - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080FCE8C: .4byte gUnknown_03005DF0 -_080FCE90: .4byte gUnknown_03005DEC -_080FCE94: .4byte gUnknown_03005DFC -_080FCE98: .4byte gUnknown_03005E04 -_080FCE9C: .4byte gUnknown_03005DE8 -_080FCEA0: .4byte gUnknown_03005DF8 - thumb_func_end sub_80FCD54 - - thumb_func_start sub_80FCEA4 -sub_80FCEA4: @ 80FCEA4 - push {r4-r7,lr} - mov r7, r8 - push {r7} - sub sp, 0x4 - movs r2, 0 - ldr r0, _080FCF24 @ =gUnknown_03005DF0 - ldrb r0, [r0] - cmp r2, r0 - bcs _080FCF16 - ldr r0, _080FCF28 @ =gUnknown_03005DEC - mov r8, r0 - ldr r3, _080FCF2C @ =gUnknown_03005DF8 -_080FCEBC: - ldr r0, _080FCF30 @ =gUnknown_03005DFC - ldrb r1, [r0] - adds r1, r2 - ldr r0, _080FCF34 @ =gUnknown_03005E04 - ldrb r0, [r0] - muls r0, r1 - lsls r0, 1 - mov r4, r8 - ldr r1, [r4] - adds r1, r0 - ldr r0, _080FCF38 @ =gUnknown_03005DE8 - ldrb r0, [r0] - lsls r0, 1 - adds r4, r1, r0 - movs r5, 0 - adds r6, r2, 0x1 - ldrb r0, [r3] - cmp r5, r0 - bcs _080FCF0A - movs r0, 0x80 - lsls r0, 8 - adds r7, r0, 0 -_080FCEE8: - ldrh r0, [r4] - ands r0, r7 - cmp r0, 0 - bne _080FCEFC - adds r0, r4, 0 - str r3, [sp] - bl sub_80FD53C - strh r0, [r4] - ldr r3, [sp] -_080FCEFC: - adds r0, r5, 0x1 - lsls r0, 24 - lsrs r5, r0, 24 - adds r4, 0x2 - ldrb r0, [r3] - cmp r5, r0 - bcc _080FCEE8 -_080FCF0A: - lsls r0, r6, 24 - lsrs r2, r0, 24 - ldr r0, _080FCF24 @ =gUnknown_03005DF0 - ldrb r0, [r0] - cmp r2, r0 - bcc _080FCEBC -_080FCF16: - add sp, 0x4 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080FCF24: .4byte gUnknown_03005DF0 -_080FCF28: .4byte gUnknown_03005DEC -_080FCF2C: .4byte gUnknown_03005DF8 -_080FCF30: .4byte gUnknown_03005DFC -_080FCF34: .4byte gUnknown_03005E04 -_080FCF38: .4byte gUnknown_03005DE8 - thumb_func_end sub_80FCEA4 - - thumb_func_start sub_80FCF3C -sub_80FCF3C: @ 80FCF3C - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x8 - ldr r0, _080FD068 @ =gUnknown_03005DEC - ldr r4, [r0] - movs r6, 0 - movs r0, 0x80 - lsls r0, 8 - adds r5, r0, 0 -_080FCF54: - movs r7, 0 -_080FCF56: - ldrh r0, [r4] - ands r0, r5 - cmp r0, 0 - bne _080FCF66 - adds r0, r4, 0 - bl sub_80FD53C - strh r0, [r4] -_080FCF66: - adds r0, r7, 0x1 - lsls r0, 24 - lsrs r7, r0, 24 - adds r4, 0x2 - cmp r7, 0x3F - bls _080FCF56 - adds r0, r6, 0x1 - lsls r0, 24 - lsrs r6, r0, 24 - cmp r6, 0x3F - bls _080FCF54 - movs r7, 0 - ldr r1, _080FD068 @ =gUnknown_03005DEC - mov r10, r1 - mov r3, sp - movs r2, 0x80 - lsls r2, 8 - mov r9, r2 -_080FCF8A: - lsls r0, r7, 1 - mov r2, r10 - ldr r1, [r2] - adds r4, r1, r0 - ldrh r1, [r4] - strh r1, [r3] - mov r1, r9 - strh r1, [r4] - movs r6, 0x1 - adds r4, 0x80 - adds r5, r0, 0 -_080FCFA0: - ldrh r0, [r4] - movs r2, 0x80 - lsls r2, 8 - ands r0, r2 - cmp r0, 0 - bne _080FCFC0 - adds r2, r4, 0 - adds r2, 0x80 - mov r0, sp - adds r1, r4, 0 - str r3, [sp, 0x4] - bl sub_80FD7AC - strh r0, [r4] - ldr r3, [sp, 0x4] - strh r0, [r3] -_080FCFC0: - adds r0, r6, 0x1 - lsls r0, 24 - lsrs r6, r0, 24 - adds r4, 0x80 - cmp r6, 0x3E - bls _080FCFA0 - mov r0, r9 - strh r0, [r4] - mov r1, r10 - ldr r0, [r1] - adds r4, r0, r5 - ldrh r0, [r4] - strh r0, [r3] - mov r2, r9 - strh r2, [r4] - movs r6, 0x1 - adds r4, 0x80 - movs r0, 0x80 - lsls r0, 8 - mov r8, r0 -_080FCFE8: - ldrh r0, [r4] - mov r1, r8 - ands r0, r1 - adds r5, r4, 0 - adds r5, 0x80 - cmp r0, 0 - bne _080FD008 - mov r0, sp - adds r1, r4, 0 - adds r2, r5, 0 - str r3, [sp, 0x4] - bl sub_80FD7AC - strh r0, [r4] - ldr r3, [sp, 0x4] - strh r0, [r3] -_080FD008: - adds r0, r6, 0x1 - lsls r0, 24 - lsrs r6, r0, 24 - adds r4, r5, 0 - cmp r6, 0x3E - bls _080FCFE8 - mov r2, r9 - strh r2, [r4] - adds r0, r7, 0x1 - lsls r0, 24 - lsrs r7, r0, 24 - cmp r7, 0x3F - bls _080FCF8A - ldr r0, _080FD068 @ =gUnknown_03005DEC - ldr r4, [r0] - movs r6, 0 - movs r0, 0x80 - lsls r0, 8 - mov r8, r0 -_080FD02E: - movs r7, 0 - adds r5, r6, 0x1 -_080FD032: - ldrh r0, [r4] - mov r1, r8 - ands r0, r1 - cmp r0, 0 - bne _080FD044 - adds r0, r4, 0 - bl sub_80FD53C - strh r0, [r4] -_080FD044: - adds r0, r7, 0x1 - lsls r0, 24 - lsrs r7, r0, 24 - adds r4, 0x2 - cmp r7, 0x3F - bls _080FD032 - lsls r0, r5, 24 - lsrs r6, r0, 24 - cmp r6, 0x3F - bls _080FD02E - add sp, 0x8 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080FD068: .4byte gUnknown_03005DEC - thumb_func_end sub_80FCF3C - - thumb_func_start sub_80FD06C -sub_80FD06C: @ 80FD06C - push {r4-r7,lr} - mov r7, r8 - push {r7} - sub sp, 0x4 - movs r2, 0 - ldr r0, _080FD0FC @ =gUnknown_03005DF0 - ldrb r0, [r0] - cmp r2, r0 - bcs _080FD0EE - ldr r0, _080FD100 @ =gUnknown_03005DEC - mov r8, r0 -_080FD082: - ldr r0, _080FD104 @ =gUnknown_03005DFC - ldrb r1, [r0] - adds r1, r2 - ldr r0, _080FD108 @ =gUnknown_03005E04 - ldrb r0, [r0] - muls r0, r1 - lsls r0, 1 - mov r3, r8 - ldr r1, [r3] - adds r1, r0 - ldr r0, _080FD10C @ =gUnknown_03005DE8 - ldrb r0, [r0] - lsls r0, 1 - adds r4, r1, r0 - ldrh r1, [r4] - mov r0, sp - strh r1, [r0] - movs r5, 0x1 - adds r4, 0x2 - ldr r0, _080FD110 @ =gUnknown_03005DF8 - ldrb r0, [r0] - subs r0, 0x1 - adds r6, r2, 0x1 - cmp r5, r0 - bge _080FD0E2 - movs r0, 0x80 - lsls r0, 8 - adds r7, r0, 0 -_080FD0BA: - ldrh r0, [r4] - ands r0, r7 - cmp r0, 0 - bne _080FD0D0 - mov r0, sp - adds r1, r4, 0 - bl sub_80FD568 - strh r0, [r4] - mov r1, sp - strh r0, [r1] -_080FD0D0: - adds r0, r5, 0x1 - lsls r0, 24 - lsrs r5, r0, 24 - adds r4, 0x2 - ldr r0, _080FD110 @ =gUnknown_03005DF8 - ldrb r0, [r0] - subs r0, 0x1 - cmp r5, r0 - blt _080FD0BA -_080FD0E2: - lsls r0, r6, 24 - lsrs r2, r0, 24 - ldr r0, _080FD0FC @ =gUnknown_03005DF0 - ldrb r0, [r0] - cmp r2, r0 - bcc _080FD082 -_080FD0EE: - add sp, 0x4 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080FD0FC: .4byte gUnknown_03005DF0 -_080FD100: .4byte gUnknown_03005DEC -_080FD104: .4byte gUnknown_03005DFC -_080FD108: .4byte gUnknown_03005E04 -_080FD10C: .4byte gUnknown_03005DE8 -_080FD110: .4byte gUnknown_03005DF8 - thumb_func_end sub_80FD06C - - thumb_func_start sub_80FD114 -sub_80FD114: @ 80FD114 - push {r4-r7,lr} - mov r7, r8 - push {r7} - sub sp, 0x8 - movs r2, 0 - ldr r0, _080FD1B0 @ =gUnknown_03005DF8 - ldrb r0, [r0] - cmp r2, r0 - bcs _080FD1A2 - ldr r0, _080FD1B4 @ =gUnknown_03005DEC - mov r8, r0 - ldr r7, _080FD1B8 @ =gUnknown_03005E04 -_080FD12C: - ldr r0, _080FD1BC @ =gUnknown_03005DFC - ldrb r1, [r0] - ldrb r0, [r7] - muls r0, r1 - lsls r0, 1 - mov r3, r8 - ldr r1, [r3] - adds r1, r0 - ldr r0, _080FD1C0 @ =gUnknown_03005DE8 - ldrb r0, [r0] - adds r0, r2 - lsls r0, 1 - adds r4, r1, r0 - ldrh r1, [r4] - mov r0, sp - strh r1, [r0] - movs r5, 0x1 - ldrb r0, [r7] - lsls r0, 1 - adds r4, r0 - ldr r0, _080FD1C4 @ =gUnknown_03005DF0 - ldrb r0, [r0] - subs r0, 0x1 - adds r6, r2, 0x1 - cmp r5, r0 - bge _080FD196 - movs r0, 0x80 - lsls r0, 8 - adds r2, r0, 0 -_080FD166: - ldrh r0, [r4] - ands r0, r2 - cmp r0, 0 - bne _080FD180 - mov r0, sp - adds r1, r4, 0 - str r2, [sp, 0x4] - bl sub_80FD568 - strh r0, [r4] - mov r1, sp - strh r0, [r1] - ldr r2, [sp, 0x4] -_080FD180: - adds r0, r5, 0x1 - lsls r0, 24 - lsrs r5, r0, 24 - ldrb r0, [r7] - lsls r0, 1 - adds r4, r0 - ldr r0, _080FD1C4 @ =gUnknown_03005DF0 - ldrb r0, [r0] - subs r0, 0x1 - cmp r5, r0 - blt _080FD166 -_080FD196: - lsls r0, r6, 24 - lsrs r2, r0, 24 - ldr r0, _080FD1B0 @ =gUnknown_03005DF8 - ldrb r0, [r0] - cmp r2, r0 - bcc _080FD12C -_080FD1A2: - add sp, 0x8 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080FD1B0: .4byte gUnknown_03005DF8 -_080FD1B4: .4byte gUnknown_03005DEC -_080FD1B8: .4byte gUnknown_03005E04 -_080FD1BC: .4byte gUnknown_03005DFC -_080FD1C0: .4byte gUnknown_03005DE8 -_080FD1C4: .4byte gUnknown_03005DF0 - thumb_func_end sub_80FD114 - - thumb_func_start sub_80FD1C8 -sub_80FD1C8: @ 80FD1C8 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x20 - lsls r0, 16 - lsrs r0, 16 - mov r10, r0 - mov r2, sp - ldr r3, _080FD234 @ =gUnknown_083E7A50 - lsls r1, r0, 1 - add r1, r10 - adds r0, r1, r3 - ldrb r0, [r0] - strb r0, [r2] - adds r0, r3, 0x1 - adds r0, r1, r0 - ldrb r0, [r0] - strb r0, [r2, 0x1] - mov r5, sp - adds r0, r3, 0x2 - adds r1, r0 - ldrb r4, [r1] - lsls r2, r4, 24 - lsrs r1, r2, 27 - movs r0, 0x7 - ands r1, r0 - strh r1, [r5, 0x2] - lsrs r2, 25 - mov r9, r2 - movs r0, 0x3 - ands r2, r0 - mov r9, r2 - movs r5, 0x1 - ands r5, r4 - movs r4, 0x1 - mov r8, r4 - cmp r8, r1 - bcs _080FD27A - mov r3, sp -_080FD21A: - cmp r5, 0 - bne _080FD238 - mov r0, r8 - lsls r2, r0, 2 - mov r4, sp - adds r1, r4, r2 - ldrb r0, [r3] - mov r4, r8 - subs r0, r4 - strb r0, [r1] - ldrb r0, [r3, 0x1] - add r0, r8 - b _080FD24A - .align 2, 0 -_080FD234: .4byte gUnknown_083E7A50 -_080FD238: - mov r0, r8 - lsls r2, r0, 2 - mov r4, sp - adds r1, r4, r2 - ldrb r0, [r3] - adds r0, 0x1 - strb r0, [r1] - ldrb r0, [r3, 0x1] - subs r0, 0x1 -_080FD24A: - strb r0, [r1, 0x1] - add r2, sp - ldrb r0, [r2] - cmp r0, 0x3F - bhi _080FD25A - ldrb r0, [r2, 0x1] - cmp r0, 0x3F - bls _080FD262 -_080FD25A: - mov r0, r8 - subs r0, 0x1 - strh r0, [r3, 0x2] - b _080FD27A -_080FD262: - ldrh r0, [r3, 0x2] - mov r1, r8 - subs r0, r1 - strh r0, [r2, 0x2] - mov r0, r8 - adds r0, 0x1 - lsls r0, 24 - lsrs r0, 24 - mov r8, r0 - ldrh r0, [r3, 0x2] - cmp r8, r0 - bcc _080FD21A -_080FD27A: - movs r2, 0 - mov r8, r2 - mov r0, sp - ldrh r0, [r0, 0x2] - cmp r8, r0 - bcc _080FD288 - b _080FD38A -_080FD288: - movs r3, 0x1F -_080FD28A: - ldr r1, _080FD2E8 @ =gUnknown_03005DEC - mov r4, r8 - lsls r0, r4, 2 - mov r2, sp - adds r6, r2, r0 - ldrb r0, [r6, 0x1] - lsls r0, 7 - ldr r1, [r1] - adds r1, r0 - ldrb r0, [r6] - lsls r0, 1 - adds r2, r1, r0 - ldrh r1, [r2] - movs r4, 0x80 - lsls r4, 8 - adds r0, r4, 0 - ands r0, r1 - cmp r0, 0 - bne _080FD376 - movs r7, 0x1F - ands r7, r1 - lsls r0, r1, 16 - lsrs r5, r0, 21 - ands r5, r3 - lsrs r4, r0, 26 - ands r4, r3 - mov r0, r9 - cmp r0, 0 - blt _080FD36C - cmp r0, 0x1 - ble _080FD2EC - cmp r0, 0x3 - bgt _080FD36C - ldrh r0, [r6, 0x2] - adds r1, r7, r0 - lsls r1, 16 - lsrs r7, r1, 16 - adds r1, r5, r0 - lsls r1, 16 - lsrs r5, r1, 16 - adds r0, r4, r0 - lsls r0, 16 - lsrs r4, r0, 16 - cmp r7, 0x1F - bls _080FD360 - movs r7, 0x1F - b _080FD360 - .align 2, 0 -_080FD2E8: .4byte gUnknown_03005DEC -_080FD2EC: - mov r1, r10 - lsls r0, r1, 1 - add r0, r10 - ldr r1, _080FD320 @ =gUnknown_083E7A50 - adds r1, 0x2 - adds r0, r1 - ldrb r0, [r0] - lsrs r0, 3 - movs r1, 0x7 - ands r0, r1 - movs r1, 0x3 - str r2, [sp, 0x18] - str r3, [sp, 0x1C] - bl __umodsi3 - lsls r0, 24 - lsrs r0, 24 - ldr r2, [sp, 0x18] - ldr r3, [sp, 0x1C] - cmp r0, 0x1 - beq _080FD33C - cmp r0, 0x1 - bgt _080FD324 - cmp r0, 0 - beq _080FD32A - b _080FD36C - .align 2, 0 -_080FD320: .4byte gUnknown_083E7A50 -_080FD324: - cmp r0, 0x2 - beq _080FD34E - b _080FD36C -_080FD32A: - ldrh r0, [r6, 0x2] - cmp r7, r0 - bcc _080FD338 - subs r0, r7, r0 - lsls r0, 16 - lsrs r7, r0, 16 - b _080FD36C -_080FD338: - movs r7, 0 - b _080FD36C -_080FD33C: - ldrh r0, [r6, 0x2] - cmp r5, r0 - bcc _080FD34A - subs r0, r5, r0 - lsls r0, 16 - lsrs r5, r0, 16 - b _080FD36C -_080FD34A: - movs r5, 0 - b _080FD36C -_080FD34E: - ldrh r0, [r6, 0x2] - cmp r4, r0 - bcc _080FD35C - subs r0, r4, r0 - lsls r0, 16 - lsrs r4, r0, 16 - b _080FD36C -_080FD35C: - movs r4, 0 - b _080FD36C -_080FD360: - cmp r5, 0x1F - bls _080FD366 - movs r5, 0x1F -_080FD366: - cmp r4, 0x1F - bls _080FD36C - movs r4, 0x1F -_080FD36C: - lsls r0, r4, 10 - lsls r1, r5, 5 - orrs r0, r1 - orrs r7, r0 - strh r7, [r2] -_080FD376: - mov r0, r8 - adds r0, 0x1 - lsls r0, 24 - lsrs r0, 24 - mov r8, r0 - mov r0, sp - ldrh r0, [r0, 0x2] - cmp r8, r0 - bcs _080FD38A - b _080FD28A -_080FD38A: - add sp, 0x20 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_80FD1C8 - - thumb_func_start sub_80FD39C -sub_80FD39C: @ 80FD39C - push {lr} - ldrh r1, [r0] - movs r3, 0x1F - movs r0, 0x1F - ands r0, r1 - lsls r1, 16 - lsrs r2, r1, 21 - ands r2, r3 - lsrs r1, 26 - ands r1, r3 - adds r0, r2 - adds r0, r1 - movs r1, 0x3 - bl __divsi3 - adds r1, r0, 0 - lsls r1, 16 - lsrs r1, 16 - lsls r0, r1, 10 - lsls r2, r1, 5 - orrs r0, r2 - orrs r0, r1 - lsls r0, 16 - lsrs r0, 16 - pop {r1} - bx r1 - thumb_func_end sub_80FD39C - - thumb_func_start sub_80FD3D0 -sub_80FD3D0: @ 80FD3D0 - push {r4,lr} - lsls r1, 24 - lsrs r4, r1, 24 - ldrh r0, [r0] - movs r2, 0x1F - movs r1, 0x1F - ands r1, r0 - lsls r0, 16 - lsrs r3, r0, 21 - ands r3, r2 - lsrs r0, 26 - ands r0, r2 - cmp r1, 0x10 - bhi _080FD400 - cmp r3, 0x10 - bhi _080FD400 - cmp r0, 0x10 - bhi _080FD400 - adds r0, r4, 0 - bl sub_80FD40C - lsls r0, 16 - lsrs r0, 16 - b _080FD402 -_080FD400: - ldr r0, _080FD408 @ =0x00007fff -_080FD402: - pop {r4} - pop {r1} - bx r1 - .align 2, 0 -_080FD408: .4byte 0x00007fff - thumb_func_end sub_80FD3D0 - - thumb_func_start sub_80FD40C -sub_80FD40C: @ 80FD40C - push {r4-r7,lr} - mov r7, r8 - push {r7} - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - movs r0, 0 - mov r8, r0 - movs r6, 0 - movs r7, 0 - adds r0, r4, 0 - movs r1, 0x6 - bl __udivsi3 - lsls r0, 24 - lsrs r0, 24 - movs r1, 0x3 - bl __umodsi3 - lsls r0, 24 - lsrs r5, r0, 24 - adds r0, r4, 0 - movs r1, 0x6 - bl __umodsi3 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x5 - bhi _080FD4C4 - lsls r0, 2 - ldr r1, _080FD450 @ =_080FD454 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_080FD450: .4byte _080FD454 - .align 2, 0 -_080FD454: - .4byte _080FD46C - .4byte _080FD47C - .4byte _080FD48C - .4byte _080FD49A - .4byte _080FD4A8 - .4byte _080FD4B6 -_080FD46C: - movs r0, 0x15 - subs r0, r5 - lsls r0, 16 - lsrs r6, r0, 16 - adds r7, r6, 0 - movs r1, 0 - mov r8, r1 - b _080FD4C4 -_080FD47C: - movs r7, 0 - movs r0, 0x15 - subs r0, r5 - lsls r0, 16 - lsrs r0, 16 - mov r8, r0 - mov r6, r8 - b _080FD4C4 -_080FD48C: - movs r0, 0x15 - subs r0, r5 - lsls r0, 16 - lsrs r7, r0, 16 - movs r6, 0 - mov r8, r7 - b _080FD4C4 -_080FD49A: - movs r7, 0 - movs r6, 0 - movs r0, 0x17 - subs r0, r5 - lsls r0, 16 - lsrs r0, 16 - b _080FD4C2 -_080FD4A8: - movs r0, 0x17 - subs r0, r5 - lsls r0, 16 - lsrs r7, r0, 16 - movs r6, 0 - mov r8, r6 - b _080FD4C4 -_080FD4B6: - movs r7, 0 - movs r0, 0x17 - subs r0, r5 - lsls r0, 16 - lsrs r6, r0, 16 - movs r0, 0 -_080FD4C2: - mov r8, r0 -_080FD4C4: - lsls r0, r7, 10 - lsls r1, r6, 5 - orrs r0, r1 - mov r1, r8 - orrs r1, r0 - lsls r0, r1, 16 - lsrs r0, 16 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end sub_80FD40C - - thumb_func_start sub_80FD4DC -sub_80FD4DC: @ 80FD4DC - push {lr} - ldrh r0, [r0] - movs r2, 0x1F - movs r1, 0x1F - ands r1, r0 - lsls r0, 16 - lsrs r3, r0, 21 - ands r3, r2 - lsrs r0, 26 - ands r0, r2 - cmp r1, 0x10 - bhi _080FD500 - cmp r3, 0x10 - bhi _080FD500 - cmp r0, 0x10 - bhi _080FD500 - movs r0, 0 - b _080FD502 -_080FD500: - ldr r0, _080FD508 @ =0x00007fff -_080FD502: - pop {r1} - bx r1 - .align 2, 0 -_080FD508: .4byte 0x00007fff - thumb_func_end sub_80FD4DC - - thumb_func_start sub_80FD50C -sub_80FD50C: @ 80FD50C - push {r4,lr} - adds r4, r0, 0 - ldrh r3, [r4] - cmp r3, 0 - beq _080FD534 - movs r2, 0x80 - lsls r2, 8 - adds r0, r2, 0 - ands r0, r3 - cmp r0, 0 - beq _080FD526 - adds r0, r2, 0 - b _080FD536 -_080FD526: - ldrh r1, [r1] - adds r0, r2, 0 - ands r0, r1 - cmp r0, 0 - bne _080FD534 - ldrh r0, [r4] - b _080FD536 -_080FD534: - movs r0, 0 -_080FD536: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_80FD50C - - thumb_func_start sub_80FD53C -sub_80FD53C: @ 80FD53C - push {r4,lr} - ldrh r1, [r0] - movs r0, 0x1F - movs r3, 0x1F - ands r3, r1 - lsls r1, 16 - lsrs r2, r1, 21 - lsrs r1, 26 - subs r3, r0, r3 - adds r4, r0, 0 - bics r4, r2 - adds r2, r4, 0 - bics r0, r1 - lsls r0, 10 - lsls r2, 5 - orrs r0, r2 - orrs r0, r3 - lsls r0, 16 - lsrs r0, 16 - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_80FD53C - thumb_func_start sub_80FD568 sub_80FD568: @ 80FD568 push {r4-r7,lr} @@ -2479,7 +1119,7 @@ _080FDDD8: .4byte gUnknown_03005DF8 _080FDDDC: .4byte gUnknown_03005E0C _080FDDE0: adds r0, r4, 0 - bl sub_80FD4DC + bl ConvertToBlackOrWhite lsls r0, 16 cmp r0, 0 bne _080FDDF2 diff --git a/src/contest_painting_effects.c b/src/contest_painting_effects.c index b07319048..ae89df88e 100644 --- a/src/contest_painting_effects.c +++ b/src/contest_painting_effects.c @@ -3,6 +3,7 @@ #include "contest_painting.h" extern u16 (*gUnknown_03005DEC)[][32]; +extern u8 gUnknown_083E7A50[][3]; extern u8 gUnknown_03005E00; extern u8 gUnknown_03005DFC; extern u8 gUnknown_03005DF8; @@ -26,8 +27,15 @@ void sub_80FCC18(u8); void sub_80FC92C(u8); void sub_80FC9E4(u8); void sub_80FD1C8(u16); -u16 sub_80FD39C(u16*); +u16 ConvertColorToGrayscale(u16*); u16 sub_80FD68C(u16*, u16*, u16*); +u16 ConvertCoolColor(u16*, u8); +u16 ConvertToBlackOrWhite(u16*); +u16 sub_80FD50C(u16*, u16*); +u16 InvertColor(u16*); +u16 sub_80FD7AC(u16*, u16*, u16*); +u16 sub_80FD568(u16*, u16*); +u16 GetCoolColorFromPersonality(u8); void sub_80FC7A0(struct Unk03005E20* info) { @@ -152,13 +160,594 @@ void sub_80FCAC4(void) for (i = 0; i < gUnknown_03005DF0; i++) { u16* var2 = &(*gUnknown_03005DEC)[0][(gUnknown_03005DFC + i) * gUnknown_03005E04]; - u16* pal = &var2[gUnknown_03005DE8]; - for (j = 0; j < gUnknown_03005DF8; j++, pal++) + u16* color = &var2[gUnknown_03005DE8]; + for (j = 0; j < gUnknown_03005DF8; j++, color++) { - if (!(0x8000 & *pal)) + if (!(0x8000 & *color)) + { + *color = ConvertColorToGrayscale(color); + } + } + } +} + +void sub_80FCB5C(void) +{ + u8 i, j; + for (i = 0; i < gUnknown_03005DF8; i++) + { + u16* var0 = &(*gUnknown_03005DEC)[0][gUnknown_03005DFC * gUnknown_03005E04]; + u16* palette = &var0[gUnknown_03005DE8 + i]; + u16 color = *palette; + j = 1; + palette += gUnknown_03005E04; + while (j < gUnknown_03005DF0 - 1) + { + if (!(0x8000 & *palette)) + { + *palette = sub_80FD68C(&color, palette, palette + gUnknown_03005E04); + color = *palette; + } + + j++; + palette += gUnknown_03005E04; + } + } +} + +void sub_80FCC18(u8 arg0) +{ + u8 i, j; + for (i = 0; i < gUnknown_03005DF0; i++) + { + u16* var0 = &(*gUnknown_03005DEC)[0][(gUnknown_03005DFC + i) * gUnknown_03005E04]; + u16* color = &var0[gUnknown_03005DE8]; + for (j = 0; j < gUnknown_03005DF8; j++, color++) + { + if (!(0x8000 & *color)) + { + *color = ConvertCoolColor(color, arg0); + } + } + } +} + +void sub_80FCCBC(void) +{ + u8 i, j; + for (i = 0; i < gUnknown_03005DF0; i++) + { + u16* var0 = &(*gUnknown_03005DEC)[0][(gUnknown_03005DFC + i) * gUnknown_03005E04]; + u16* color = &var0[gUnknown_03005DE8]; + for (j = 0; j < gUnknown_03005DF8; j++, color++) + { + if (!(0x8000 & *color)) + { + *color = ConvertToBlackOrWhite(color); + } + } + } +} + +void sub_80FCD54(void) +{ + u8 i, j; + u16 *palette; + + for (i = 0; i < gUnknown_03005DF0; i++) + { + u16* var0 = &(*gUnknown_03005DEC)[0][(gUnknown_03005DFC + i) * gUnknown_03005E04]; + palette = &var0[gUnknown_03005DE8]; + *palette = sub_80FD50C(palette, palette + 1); + for (j = 1, palette = palette + 1; j < gUnknown_03005DF8 - 1; j++, palette++) + { + *palette = sub_80FD50C(palette, palette + 1); + *palette = sub_80FD50C(palette, palette - 1); + } + + *palette = sub_80FD50C(palette, palette - 1); + } + + for (j = 0; j < gUnknown_03005DF8; j++) + { + u16* var0 = &(*gUnknown_03005DEC)[0][gUnknown_03005DFC * gUnknown_03005E04]; + palette = &var0[gUnknown_03005DE8 + j]; + *palette = sub_80FD50C(palette, palette + gUnknown_03005E04); + for (i = 1, palette = palette + gUnknown_03005E04; i < gUnknown_03005DF0 - 1; i++, palette += gUnknown_03005E04) + { + *palette = sub_80FD50C(palette, palette + gUnknown_03005E04); + *palette = sub_80FD50C(palette, palette - gUnknown_03005E04); + } + + *palette = sub_80FD50C(palette, palette - gUnknown_03005E04); + } +} + +void sub_80FCEA4(void) +{ + u8 i, j; + for (i = 0; i < gUnknown_03005DF0; i++) + { + u16* var0 = &(*gUnknown_03005DEC)[0][(gUnknown_03005DFC + i) * gUnknown_03005E04]; + u16* color = &var0[gUnknown_03005DE8]; + for (j = 0; j < gUnknown_03005DF8; j++, color++) + { + if (!(0x8000 & *color)) + { + *color = InvertColor(color); + } + } + } +} + +void sub_80FCF3C(void) +{ + u8 i, j; + u16 *palette; + u16 color; + + palette = (*gUnknown_03005DEC)[0]; + for (i = 0; i < 64; i++) + { + for (j = 0; j < 64; j++, palette++) + { + if (!(0x8000 & *palette)) + { + *palette = InvertColor(palette); + } + } + } + + for (j = 0; j < 64; j++) + { + palette = &(*gUnknown_03005DEC)[0][j]; + color = *palette; + *palette = 0x8000; + for (i = 1, palette += 64; i < 63; i++, palette += 64) + { + if (!(0x8000 & *palette)) + { + *palette = sub_80FD7AC(&color, palette, palette + 64); + color = *palette; + } + } + + *palette = 0x8000; + palette = &(*gUnknown_03005DEC)[0][j]; + color = *palette; + *palette = 0x8000; + for (i = 1, palette += 64; i < 63; i++, palette += 64) + { + if (!(0x8000 & *palette)) + { + *palette = sub_80FD7AC(&color, palette, palette + 64); + color = *palette; + } + } + + *palette = 0x8000; + } + + palette = (*gUnknown_03005DEC)[0]; + for (i = 0; i < 64; i++) + { + for (j = 0; j < 64; j++, palette++) + { + if (!(0x8000 & *palette)) + { + *palette = InvertColor(palette); + } + } + } +} + +void sub_80FD06C(void) +{ + u8 i, j; + for (i = 0; i < gUnknown_03005DF0; i++) + { + u16* var0 = &(*gUnknown_03005DEC)[0][(gUnknown_03005DFC + i) * gUnknown_03005E04]; + u16* palette = &var0[gUnknown_03005DE8]; + u16 color = *palette; + for (j = 1, palette++; j < gUnknown_03005DF8 - 1; j++, palette++) + { + if (!(0x8000 & *palette)) + { + *palette = sub_80FD568(&color, palette); + color = *palette; + } + } + } +} + +void sub_80FD114(void) +{ + u8 i, j; + for (i = 0; i < gUnknown_03005DF8; i++) + { + u16* var0 = &(*gUnknown_03005DEC)[0][gUnknown_03005DFC * gUnknown_03005E04]; + u16* palette = &var0[gUnknown_03005DE8 + i]; + u16 color = *palette; + for (j = 1, palette += gUnknown_03005E04; j < gUnknown_03005DF0 - 1; j++, palette += gUnknown_03005E04) + { + if (!(0x8000 & *palette)) { - *pal = sub_80FD39C(pal); + *palette = sub_80FD568(&color, palette); + color = *palette; } } } } + +NAKED +void sub_80FD1C8(u16 arg0) +{ + asm(".syntax unified\n\ + push {r4-r7,lr}\n\ + mov r7, r10\n\ + mov r6, r9\n\ + mov r5, r8\n\ + push {r5-r7}\n\ + sub sp, 0x20\n\ + lsls r0, 16\n\ + lsrs r0, 16\n\ + mov r10, r0\n\ + mov r2, sp\n\ + ldr r3, _080FD234 @ =gUnknown_083E7A50\n\ + lsls r1, r0, 1\n\ + add r1, r10\n\ + adds r0, r1, r3\n\ + ldrb r0, [r0]\n\ + strb r0, [r2]\n\ + adds r0, r3, 0x1\n\ + adds r0, r1, r0\n\ + ldrb r0, [r0]\n\ + strb r0, [r2, 0x1]\n\ + mov r5, sp\n\ + adds r0, r3, 0x2\n\ + adds r1, r0\n\ + ldrb r4, [r1]\n\ + lsls r2, r4, 24\n\ + lsrs r1, r2, 27\n\ + movs r0, 0x7\n\ + ands r1, r0\n\ + strh r1, [r5, 0x2]\n\ + lsrs r2, 25\n\ + mov r9, r2\n\ + movs r0, 0x3\n\ + ands r2, r0\n\ + mov r9, r2\n\ + movs r5, 0x1\n\ + ands r5, r4\n\ + movs r4, 0x1\n\ + mov r8, r4\n\ + cmp r8, r1\n\ + bcs _080FD27A\n\ + mov r3, sp\n\ +_080FD21A:\n\ + cmp r5, 0\n\ + bne _080FD238\n\ + mov r0, r8\n\ + lsls r2, r0, 2\n\ + mov r4, sp\n\ + adds r1, r4, r2\n\ + ldrb r0, [r3]\n\ + mov r4, r8\n\ + subs r0, r4\n\ + strb r0, [r1]\n\ + ldrb r0, [r3, 0x1]\n\ + add r0, r8\n\ + b _080FD24A\n\ + .align 2, 0\n\ +_080FD234: .4byte gUnknown_083E7A50\n\ +_080FD238:\n\ + mov r0, r8\n\ + lsls r2, r0, 2\n\ + mov r4, sp\n\ + adds r1, r4, r2\n\ + ldrb r0, [r3]\n\ + adds r0, 0x1\n\ + strb r0, [r1]\n\ + ldrb r0, [r3, 0x1]\n\ + subs r0, 0x1\n\ +_080FD24A:\n\ + strb r0, [r1, 0x1]\n\ + add r2, sp\n\ + ldrb r0, [r2]\n\ + cmp r0, 0x3F\n\ + bhi _080FD25A\n\ + ldrb r0, [r2, 0x1]\n\ + cmp r0, 0x3F\n\ + bls _080FD262\n\ +_080FD25A:\n\ + mov r0, r8\n\ + subs r0, 0x1\n\ + strh r0, [r3, 0x2]\n\ + b _080FD27A\n\ +_080FD262:\n\ + ldrh r0, [r3, 0x2]\n\ + mov r1, r8\n\ + subs r0, r1\n\ + strh r0, [r2, 0x2]\n\ + mov r0, r8\n\ + adds r0, 0x1\n\ + lsls r0, 24\n\ + lsrs r0, 24\n\ + mov r8, r0\n\ + ldrh r0, [r3, 0x2]\n\ + cmp r8, r0\n\ + bcc _080FD21A\n\ +_080FD27A:\n\ + movs r2, 0\n\ + mov r8, r2\n\ + mov r0, sp\n\ + ldrh r0, [r0, 0x2]\n\ + cmp r8, r0\n\ + bcc _080FD288\n\ + b _080FD38A\n\ +_080FD288:\n\ + movs r3, 0x1F\n\ +_080FD28A:\n\ + ldr r1, _080FD2E8 @ =gUnknown_03005DEC\n\ + mov r4, r8\n\ + lsls r0, r4, 2\n\ + mov r2, sp\n\ + adds r6, r2, r0\n\ + ldrb r0, [r6, 0x1]\n\ + lsls r0, 7\n\ + ldr r1, [r1]\n\ + adds r1, r0\n\ + ldrb r0, [r6]\n\ + lsls r0, 1\n\ + adds r2, r1, r0\n\ + ldrh r1, [r2]\n\ + movs r4, 0x80\n\ + lsls r4, 8\n\ + adds r0, r4, 0\n\ + ands r0, r1\n\ + cmp r0, 0\n\ + bne _080FD376\n\ + movs r7, 0x1F\n\ + ands r7, r1\n\ + lsls r0, r1, 16\n\ + lsrs r5, r0, 21\n\ + ands r5, r3\n\ + lsrs r4, r0, 26\n\ + ands r4, r3\n\ + mov r0, r9\n\ + cmp r0, 0\n\ + blt _080FD36C\n\ + cmp r0, 0x1\n\ + ble _080FD2EC\n\ + cmp r0, 0x3\n\ + bgt _080FD36C\n\ + ldrh r0, [r6, 0x2]\n\ + adds r1, r7, r0\n\ + lsls r1, 16\n\ + lsrs r7, r1, 16\n\ + adds r1, r5, r0\n\ + lsls r1, 16\n\ + lsrs r5, r1, 16\n\ + adds r0, r4, r0\n\ + lsls r0, 16\n\ + lsrs r4, r0, 16\n\ + cmp r7, 0x1F\n\ + bls _080FD360\n\ + movs r7, 0x1F\n\ + b _080FD360\n\ + .align 2, 0\n\ +_080FD2E8: .4byte gUnknown_03005DEC\n\ +_080FD2EC:\n\ + mov r1, r10\n\ + lsls r0, r1, 1\n\ + add r0, r10\n\ + ldr r1, _080FD320 @ =gUnknown_083E7A50\n\ + adds r1, 0x2\n\ + adds r0, r1\n\ + ldrb r0, [r0]\n\ + lsrs r0, 3\n\ + movs r1, 0x7\n\ + ands r0, r1\n\ + movs r1, 0x3\n\ + str r2, [sp, 0x18]\n\ + str r3, [sp, 0x1C]\n\ + bl __umodsi3\n\ + lsls r0, 24\n\ + lsrs r0, 24\n\ + ldr r2, [sp, 0x18]\n\ + ldr r3, [sp, 0x1C]\n\ + cmp r0, 0x1\n\ + beq _080FD33C\n\ + cmp r0, 0x1\n\ + bgt _080FD324\n\ + cmp r0, 0\n\ + beq _080FD32A\n\ + b _080FD36C\n\ + .align 2, 0\n\ +_080FD320: .4byte gUnknown_083E7A50\n\ +_080FD324:\n\ + cmp r0, 0x2\n\ + beq _080FD34E\n\ + b _080FD36C\n\ +_080FD32A:\n\ + ldrh r0, [r6, 0x2]\n\ + cmp r7, r0\n\ + bcc _080FD338\n\ + subs r0, r7, r0\n\ + lsls r0, 16\n\ + lsrs r7, r0, 16\n\ + b _080FD36C\n\ +_080FD338:\n\ + movs r7, 0\n\ + b _080FD36C\n\ +_080FD33C:\n\ + ldrh r0, [r6, 0x2]\n\ + cmp r5, r0\n\ + bcc _080FD34A\n\ + subs r0, r5, r0\n\ + lsls r0, 16\n\ + lsrs r5, r0, 16\n\ + b _080FD36C\n\ +_080FD34A:\n\ + movs r5, 0\n\ + b _080FD36C\n\ +_080FD34E:\n\ + ldrh r0, [r6, 0x2]\n\ + cmp r4, r0\n\ + bcc _080FD35C\n\ + subs r0, r4, r0\n\ + lsls r0, 16\n\ + lsrs r4, r0, 16\n\ + b _080FD36C\n\ +_080FD35C:\n\ + movs r4, 0\n\ + b _080FD36C\n\ +_080FD360:\n\ + cmp r5, 0x1F\n\ + bls _080FD366\n\ + movs r5, 0x1F\n\ +_080FD366:\n\ + cmp r4, 0x1F\n\ + bls _080FD36C\n\ + movs r4, 0x1F\n\ +_080FD36C:\n\ + lsls r0, r4, 10\n\ + lsls r1, r5, 5\n\ + orrs r0, r1\n\ + orrs r7, r0\n\ + strh r7, [r2]\n\ +_080FD376:\n\ + mov r0, r8\n\ + adds r0, 0x1\n\ + lsls r0, 24\n\ + lsrs r0, 24\n\ + mov r8, r0\n\ + mov r0, sp\n\ + ldrh r0, [r0, 0x2]\n\ + cmp r8, r0\n\ + bcs _080FD38A\n\ + b _080FD28A\n\ +_080FD38A:\n\ + add sp, 0x20\n\ + pop {r3-r5}\n\ + mov r8, r3\n\ + mov r9, r4\n\ + mov r10, r5\n\ + pop {r4-r7}\n\ + pop {r0}\n\ + bx r0\n\ + .syntax divided\n"); +} + +u16 ConvertColorToGrayscale(u16 *color) +{ + u16 red = *color & 0x1F; + u16 green = (*color >> 5) & 0x1F; + u16 blue = (*color >> 10) & 0x1F; + u16 average = (red + green + blue) / 3; + return RGB2(average, average, average); +} + +// The dark colors are the colored edges of the Cool painting effect. +// Everything else is white. +u16 ConvertCoolColor(u16 *color, u8 personality) +{ + u16 red = *color & 0x1F; + u16 green = (*color >> 5) & 0x1F; + u16 blue = (*color >> 10) & 0x1F; + if (red < 17 && green < 17 && blue < 17) + return GetCoolColorFromPersonality(personality); + else + return RGB2(31, 31, 31); +} + +// Based on the given value, which comes from the first 8 bits of +// the mon's personality value, return a color. +u16 GetCoolColorFromPersonality(u8 personality) +{ + u16 red = 0; + u16 green = 0; + u16 blue = 0; + u8 strength = (personality / 6) % 3; + u8 colorType = personality % 6; + + switch (colorType) + { + case 0: + // Teal color + green = 21 - strength; + blue = green; + red = 0; + break; + case 1: + // Yellow color + blue = 0; + red = 21 - strength; + green = red; + break; + case 2: + // Purple color + blue = 21 - strength; + green = 0; + red = blue; + break; + case 3: + // Red color + blue = 0; + green = 0; + red = 23 - strength; + break; + case 4: + // Blue color + blue = 23 - strength; + green = 0; + red = 0; + break; + case 5: + // Green color + blue = 0; + green = 23 - strength; + red = 0; + break; + } + + return RGB2(red, green, blue); +} + +u16 ConvertToBlackOrWhite(u16 *color) +{ + u16 red = *color & 0x1F; + u16 green = (*color >> 5) & 0x1F; + u16 blue = (*color >> 10) & 0x1F; + if (red < 17 && green < 17 && blue < 17) + return RGB2(0, 0, 0); + else + return RGB2(31, 31, 31); +} + +u16 sub_80FD50C(u16 *colorA, u16 *colorB) +{ + if (*colorA) + { + if (*colorA & 0x8000) + return 0x8000; + if (*colorB & 0x8000) + return RGB2(0, 0, 0); + + return *colorA; + } + + return RGB2(0, 0, 0); +} + +u16 InvertColor(u16 *color) +{ + u16 red = *color & 0x1F; + u16 green = (*color >> 5) & 0x1F; + u16 blue = (*color >> 10) & 0x1F; + red = 31 - red; + green = 31 - green; + blue = 31 - blue; + + return RGB2(red, green, blue); +} -- cgit v1.2.3 From 8ca8d353ee520be31ca35aae1aae2ea2b9b4ffd8 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Tue, 24 Jul 2018 17:34:12 -0500 Subject: Decompile the rest of pokemon_storage_system --- asm/pokemon_storage_system.s | 1485 -------------------------------------- include/pokemon_storage_system.h | 36 +- ld_script.txt | 1 - src/pokemon_storage_system_2.c | 4 +- src/pokemon_storage_system_5.c | 775 +++++++++++++++++++- src/pokenav_before.c | 2 +- 6 files changed, 797 insertions(+), 1506 deletions(-) delete mode 100644 asm/pokemon_storage_system.s diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s deleted file mode 100644 index 67655e63f..000000000 --- a/asm/pokemon_storage_system.s +++ /dev/null @@ -1,1485 +0,0 @@ - .include "constants/gba_constants.inc" - .include "include/macros.inc" - - .syntax unified - - .text - - thumb_func_start sub_809C85C -@ u8 sub_809C85C(void) -sub_809C85C: @ 809C85C - push {r4-r6,lr} - ldr r0, _0809C894 @ =gPokemonStorageSystemPtr - ldr r2, [r0] - ldr r1, _0809C898 @ =0x000011df - adds r0, r2, r1 - movs r1, 0 - strb r1, [r0] - ldr r3, _0809C89C @ =0x000011de - adds r0, r2, r3 - strb r1, [r0] - ldr r0, _0809C8A0 @ =0x000011e3 - adds r2, r0 - strb r1, [r2] - ldr r1, _0809C8A4 @ =gMain - ldrh r3, [r1, 0x30] - movs r0, 0x40 - ands r0, r3 - cmp r0, 0 - bne _0809C91A - movs r0, 0x80 - ands r0, r3 - cmp r0, 0 - beq _0809C8A8 - movs r4, 0x1 - movs r0, 0 - movs r5, 0x2 - b _0809C922 - .align 2, 0 -_0809C894: .4byte gPokemonStorageSystemPtr -_0809C898: .4byte 0x000011df -_0809C89C: .4byte 0x000011de -_0809C8A0: .4byte 0x000011e3 -_0809C8A4: .4byte gMain -_0809C8A8: - ldrh r2, [r1, 0x2C] - movs r0, 0x20 - ands r0, r2 - cmp r0, 0 - bne _0809C8CC - movs r0, 0x10 - ands r0, r2 - cmp r0, 0 - bne _0809C8DE - ldr r0, _0809C8D0 @ =gSaveBlock2 - ldrb r0, [r0, 0x13] - cmp r0, 0x1 - bne _0809C8E2 - movs r0, 0x80 - lsls r0, 2 - ands r0, r2 - cmp r0, 0 - beq _0809C8D4 -_0809C8CC: - movs r0, 0xA - b _0809C93E - .align 2, 0 -_0809C8D0: .4byte gSaveBlock2 -_0809C8D4: - movs r0, 0x80 - lsls r0, 1 - ands r0, r2 - cmp r0, 0 - beq _0809C8E2 -_0809C8DE: - movs r0, 0x9 - b _0809C93E -_0809C8E2: - ldrh r1, [r1, 0x2E] - movs r0, 0x1 - ands r0, r1 - cmp r0, 0 - beq _0809C8FA - movs r0, 0 - bl sub_809A860 - bl sub_809CA8C - movs r0, 0x7 - b _0809C93E -_0809C8FA: - movs r0, 0x2 - ands r0, r1 - cmp r0, 0 - beq _0809C906 - movs r0, 0x10 - b _0809C93E -_0809C906: - movs r0, 0x4 - ands r0, r1 - cmp r0, 0 - beq _0809C916 - bl sub_809CD88 - movs r0, 0 - b _0809C93E -_0809C916: - movs r4, 0 - b _0809C93C -_0809C91A: - movs r4, 0x1 - movs r0, 0x3 - movs r5, 0 - strb r4, [r2] -_0809C922: - cmp r4, 0 - beq _0809C93C - lsls r6, r0, 24 - cmp r0, 0x2 - beq _0809C932 - movs r0, 0 - bl sub_809A860 -_0809C932: - lsrs r0, r6, 24 - lsls r1, r5, 24 - lsrs r1, 24 - bl sub_809AF18 -_0809C93C: - adds r0, r4, 0 -_0809C93E: - pop {r4-r6} - pop {r1} - bx r1 - thumb_func_end sub_809C85C - - thumb_func_start sub_809C944 -@ u8 sub_809C944(void) -sub_809C944: @ 809C944 - push {r4-r7,lr} - ldr r0, _0809C988 @ =gUnknown_020384E4 - ldrb r0, [r0] - mov r12, r0 - ldr r7, _0809C98C @ =gUnknown_020384E5 - ldrb r3, [r7] - ldr r0, _0809C990 @ =gPokemonStorageSystemPtr - ldr r1, [r0] - ldr r0, _0809C994 @ =0x000011df - adds r5, r1, r0 - movs r0, 0 - strb r0, [r5] - ldr r2, _0809C998 @ =0x000011de - adds r4, r1, r2 - strb r0, [r4] - adds r2, 0x5 - adds r1, r2 - strb r0, [r1] - ldr r6, _0809C99C @ =gMain - ldrh r2, [r6, 0x30] - movs r0, 0x40 - ands r0, r2 - cmp r0, 0 - bne _0809CA14 - movs r0, 0x88 - ands r0, r2 - cmp r0, 0 - beq _0809C9A0 - movs r6, 0x1 - movs r0, 0x2 - mov r12, r0 - movs r3, 0 - b _0809CA2A - .align 2, 0 -_0809C988: .4byte gUnknown_020384E4 -_0809C98C: .4byte gUnknown_020384E5 -_0809C990: .4byte gPokemonStorageSystemPtr -_0809C994: .4byte 0x000011df -_0809C998: .4byte 0x000011de -_0809C99C: .4byte gMain -_0809C9A0: - movs r0, 0x20 - ands r0, r2 - cmp r0, 0 - beq _0809C9C0 - movs r6, 0x1 - lsls r0, r3, 24 - movs r1, 0xFF - lsls r1, 24 - adds r0, r1 - lsrs r3, r0, 24 - cmp r0, 0 - bge _0809CA2C - movs r0, 0xFF - strb r0, [r5] - movs r3, 0x1 - b _0809CA2C -_0809C9C0: - movs r0, 0x10 - ands r0, r2 - cmp r0, 0 - beq _0809C9E0 - movs r6, 0x1 - lsls r0, r3, 24 - movs r2, 0x80 - lsls r2, 17 - adds r0, r2 - lsrs r3, r0, 24 - asrs r0, 24 - cmp r0, 0x1 - ble _0809CA2C - strb r6, [r5] - movs r3, 0 - b _0809CA2C -_0809C9E0: - ldrh r1, [r6, 0x2E] - movs r0, 0x1 - ands r0, r1 - cmp r0, 0 - beq _0809C9F4 - movs r0, 0x4 - cmp r3, 0 - bne _0809CA3A - movs r0, 0x5 - b _0809CA3A -_0809C9F4: - movs r0, 0x2 - ands r0, r1 - cmp r0, 0 - beq _0809CA00 - movs r0, 0x10 - b _0809CA3A -_0809CA00: - movs r0, 0x4 - ands r0, r1 - cmp r0, 0 - beq _0809CA10 - bl sub_809CD88 - movs r0, 0 - b _0809CA3A -_0809CA10: - movs r6, 0 - b _0809CA38 -_0809CA14: - movs r6, 0x1 - movs r0, 0 - mov r12, r0 - movs r0, 0xFF - strb r0, [r4] - movs r0, 0 - ldrsb r0, [r7, r0] - movs r3, 0x1D - cmp r0, 0 - bne _0809CA2A - movs r3, 0x18 -_0809CA2A: - strb r6, [r1] -_0809CA2C: - cmp r6, 0 - beq _0809CA38 - mov r0, r12 - adds r1, r3, 0 - bl sub_809AF18 -_0809CA38: - adds r0, r6, 0 -_0809CA3A: - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end sub_809C944 - - thumb_func_start sub_809CA40 -sub_809CA40: @ 809CA40 - push {r4,r5,lr} - movs r3, 0 - ldr r0, _0809CA6C @ =gUnknown_083BBBD4 - ldr r1, [r0] - adds r4, r0, 0 - cmp r1, 0 - beq _0809CA84 - ldr r5, _0809CA70 @ =gUnknown_020384E4 -_0809CA50: - lsls r0, r3, 3 - adds r2, r0, r4 - movs r1, 0x4 - ldrsb r1, [r2, r1] - movs r0, 0 - ldrsb r0, [r5, r0] - cmp r1, r0 - bne _0809CA74 - ldr r0, [r2] - bl _call_via_r0 - lsls r0, 24 - lsrs r0, 24 - b _0809CA86 - .align 2, 0 -_0809CA6C: .4byte gUnknown_083BBBD4 -_0809CA70: .4byte gUnknown_020384E4 -_0809CA74: - adds r0, r3, 0x1 - lsls r0, 16 - lsrs r3, r0, 16 - lsls r0, r3, 3 - adds r0, r4 - ldr r0, [r0] - cmp r0, 0 - bne _0809CA50 -_0809CA84: - movs r0, 0 -_0809CA86: - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_809CA40 - - thumb_func_start sub_809CA8C -sub_809CA8C: @ 809CA8C - push {lr} - bl sub_809CDCC - movs r0, 0x9 - bl sub_809CDEC - movs r0, 0xA - bl sub_809CDEC - movs r0, 0xB - bl sub_809CDEC - movs r0, 0 - bl sub_809CDEC - pop {r0} - bx r0 - thumb_func_end sub_809CA8C - -.if DEBUG - thumb_func_start debug_sub_80AA40C -debug_sub_80AA40C: -.syntax divided - push {lr} - bl sub_809AB8C - lsl r0, r0, #0x10 - cmp r0, #0 - beq ._2084 @cond_branch - bl sub_809CDCC - mov r0, #0x20 - bl sub_809CDEC - mov r0, #0x6 - bl sub_809CDEC - mov r0, #0x1 - b ._2085 -._2084: - mov r0, #0x0 -._2085: - pop {r1} - bx r1 -.syntax unified - thumb_func_end debug_sub_80AA40C -.endif - -.if DEBUG - thumb_func_start sub_809CAB0 -sub_809CAB0: -.syntax divided - push {lr} - ldr r0, ._2088 @ unk_2038790 - ldrb r0, [r0] - cmp r0, #0 - beq ._2086 @cond_branch - bl debug_sub_80AA40C - lsl r0, r0, #0x18 - lsr r0, r0, #0x18 - b ._2110 -._2089: - .align 2, 0 -._2088: - .word unk_2038790 -._2086: - bl sub_809CDCC - bl sub_809AB8C - lsl r0, r0, #0x10 - lsr r1, r0, #0x10 - ldr r0, ._2094 @ gPokemonStorageSystemPtr - ldr r0, [r0] - ldrb r0, [r0, #0x5] - cmp r0, #0x1 - beq ._2090 @cond_branch - cmp r0, #0x1 - bgt ._2091 @cond_branch - cmp r0, #0 - beq ._2092 @cond_branch - b ._2108 -._2095: - .align 2, 0 -._2094: - .word gPokemonStorageSystemPtr -._2091: - cmp r0, #0x2 - beq ._2096 @cond_branch - b ._2108 -._2090: - cmp r1, #0 - beq ._2108 @cond_branch - mov r0, #0x1 - bl sub_809CDEC - b ._2109 -._2092: - cmp r1, #0 - beq ._2108 @cond_branch - mov r0, #0x2 - bl sub_809CDEC - b ._2109 -._2096: - ldr r0, ._2105 @ gUnknown_020384E6 - ldrb r0, [r0] - cmp r0, #0 - beq ._2102 @cond_branch - cmp r1, #0 - beq ._2103 @cond_branch - mov r0, #0x4 - bl sub_809CDEC - b ._2109 -._2106: - .align 2, 0 -._2105: - .word gUnknown_020384E6 -._2103: - mov r0, #0x5 - bl sub_809CDEC - b ._2109 -._2102: - cmp r1, #0 - beq ._2108 @cond_branch - mov r0, #0x3 - bl sub_809CDEC - b ._2109 -._2108: - mov r0, #0x0 - b ._2110 -._2109: - mov r0, #0x6 - bl sub_809CDEC - ldr r0, ._2114 @ gPokemonStorageSystemPtr - ldr r0, [r0] - ldrb r0, [r0, #0x5] - cmp r0, #0x2 - bne ._2113 @cond_branch - ldr r0, ._2114 + 4 @ gUnknown_020384E4 - ldrb r0, [r0] - lsl r0, r0, #0x18 - asr r0, r0, #0x18 - cmp r0, #0 - bne ._2112 @cond_branch - mov r0, #0x2 - bl sub_809CDEC - b ._2113 -._2115: - .align 2, 0 -._2114: - .word gPokemonStorageSystemPtr - .word gUnknown_020384E4 -._2112: - mov r0, #0x1 - bl sub_809CDEC -._2113: - mov r0, #0x8 - bl sub_809CDEC - mov r0, #0x7 - bl sub_809CDEC - mov r0, #0x0 - bl sub_809CDEC - mov r0, #0x1 -._2110: - pop {r1} - bx r1 -.syntax unified - thumb_func_end sub_809CAB0 -.else - thumb_func_start sub_809CAB0 -sub_809CAB0: @ 809CAB0 - push {lr} - bl sub_809CDCC - bl sub_809AB8C - lsls r0, 16 - lsrs r1, r0, 16 - ldr r0, _0809CAD4 @ =gPokemonStorageSystemPtr - ldr r0, [r0] - ldrb r0, [r0, 0x5] - cmp r0, 0x1 - beq _0809CADE - cmp r0, 0x1 - bgt _0809CAD8 - cmp r0, 0 - beq _0809CAEA - b _0809CB24 - .align 2, 0 -_0809CAD4: .4byte gPokemonStorageSystemPtr -_0809CAD8: - cmp r0, 0x2 - beq _0809CAF6 - b _0809CB24 -_0809CADE: - cmp r1, 0 - beq _0809CB24 - movs r0, 0x1 - bl sub_809CDEC - b _0809CB28 -_0809CAEA: - cmp r1, 0 - beq _0809CB24 - movs r0, 0x2 - bl sub_809CDEC - b _0809CB28 -_0809CAF6: - ldr r0, _0809CB0C @ =gUnknown_020384E6 - ldrb r0, [r0] - cmp r0, 0 - beq _0809CB18 - cmp r1, 0 - beq _0809CB10 - movs r0, 0x4 - bl sub_809CDEC - b _0809CB28 - .align 2, 0 -_0809CB0C: .4byte gUnknown_020384E6 -_0809CB10: - movs r0, 0x5 - bl sub_809CDEC - b _0809CB28 -_0809CB18: - cmp r1, 0 - beq _0809CB24 - movs r0, 0x3 - bl sub_809CDEC - b _0809CB28 -_0809CB24: - movs r0, 0 - b _0809CB6E -_0809CB28: - movs r0, 0x6 - bl sub_809CDEC - ldr r0, _0809CB4C @ =gPokemonStorageSystemPtr - ldr r0, [r0] - ldrb r0, [r0, 0x5] - cmp r0, 0x2 - bne _0809CB5A - ldr r0, _0809CB50 @ =gUnknown_020384E4 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - cmp r0, 0 - bne _0809CB54 - movs r0, 0x2 - bl sub_809CDEC - b _0809CB5A - .align 2, 0 -_0809CB4C: .4byte gPokemonStorageSystemPtr -_0809CB50: .4byte gUnknown_020384E4 -_0809CB54: - movs r0, 0x1 - bl sub_809CDEC -_0809CB5A: - movs r0, 0x8 - bl sub_809CDEC - movs r0, 0x7 - bl sub_809CDEC - movs r0, 0 - bl sub_809CDEC - movs r0, 0x1 -_0809CB6E: - pop {r1} - bx r1 - thumb_func_end sub_809CAB0 -.endif - - thumb_func_start sub_809CB74 -sub_809CB74: @ 809CB74 - ldr r1, _0809CB90 @ =gPokemonStorageSystemPtr - ldr r1, [r1] - movs r2, 0x8E - lsls r2, 5 - adds r1, r2 - ldr r2, [r1] - ldrh r2, [r2, 0x20] - strh r2, [r0, 0x20] - ldr r1, [r1] - ldrh r1, [r1, 0x22] - adds r1, 0x14 - strh r1, [r0, 0x22] - bx lr - .align 2, 0 -_0809CB90: .4byte gPokemonStorageSystemPtr - thumb_func_end sub_809CB74 - - thumb_func_start debug_sub_809CB94 -debug_sub_809CB94: @ 809CB94 - push {r4,lr} - adds r4, r0, 0 - ldr r0, _0809CBBC @ =gUnknown_020384E4 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - cmp r0, 0x1 - bne _0809CBC8 - ldr r2, _0809CBC0 @ =gPlayerParty - ldr r0, _0809CBC4 @ =gUnknown_020384E5 - movs r1, 0 - ldrsb r1, [r0, r1] - movs r0, 0x64 - muls r1, r0 - adds r1, r2 - adds r0, r4, 0 - movs r2, 0x50 - bl memcpy - b _0809CBF6 - .align 2, 0 -_0809CBBC: .4byte gUnknown_020384E4 -_0809CBC0: .4byte gPlayerParty -_0809CBC4: .4byte gUnknown_020384E5 -_0809CBC8: - bl get_preferred_box - lsls r0, 24 - lsrs r0, 24 - ldr r3, _0809CBFC @ =gPokemonStorage - ldr r1, _0809CC00 @ =gUnknown_020384E5 - movs r2, 0 - ldrsb r2, [r1, r2] - lsls r1, r2, 2 - adds r1, r2 - lsls r1, 4 - lsls r2, r0, 2 - adds r2, r0 - lsls r0, r2, 4 - subs r0, r2 - lsls r0, 5 - adds r1, r0 - adds r1, r3 - adds r1, 0x4 - adds r0, r4, 0 - movs r2, 0x50 - bl memcpy -_0809CBF6: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_0809CBFC: .4byte gPokemonStorage -_0809CC00: .4byte gUnknown_020384E5 - thumb_func_end debug_sub_809CB94 - - thumb_func_start sub_809CC04 -sub_809CC04: @ 809CC04 - push {r4-r7,lr} - sub sp, 0x34 - mov r1, sp - ldr r0, _0809CCB0 @ =gHandCursorSpriteSheets - ldm r0!, {r2-r4} - stm r1!, {r2-r4} - ldm r0!, {r2,r3,r5} - stm r1!, {r2,r3,r5} - add r4, sp, 0x18 - adds r1, r4, 0 - ldr r0, _0809CCB4 @ =gHandCursorSpritePalettes - ldm r0!, {r2,r3,r5} - stm r1!, {r2,r3,r5} - ldm r0!, {r2,r3,r5} - stm r1!, {r2,r3,r5} - mov r0, sp - bl LoadSpriteSheets - adds r0, r4, 0 - bl LoadSpritePalettes - ldr r0, _0809CCB8 @ =0x0000dac6 - bl IndexOfSpritePaletteTag - ldr r1, _0809CCBC @ =gPokemonStorageSystemPtr - ldr r6, [r1] - ldr r4, _0809CCC0 @ =0x000011e4 - adds r7, r6, r4 - strb r0, [r7] - ldr r0, _0809CCC4 @ =0x0000dad1 - bl IndexOfSpritePaletteTag - ldr r5, _0809CCC8 @ =0x000011e5 - adds r1, r6, r5 - strb r0, [r1] - ldr r0, _0809CCCC @ =gUnknown_020384E4 - ldrb r0, [r0] - ldr r1, _0809CCD0 @ =gUnknown_020384E5 - ldrb r1, [r1] - add r4, sp, 0x30 - mov r5, sp - adds r5, 0x32 - adds r2, r4, 0 - adds r3, r5, 0 - bl sub_809AACC - ldr r0, _0809CCD4 @ =gSpriteTemplate_83BBC70 - movs r2, 0 - ldrsh r1, [r4, r2] - movs r3, 0 - ldrsh r2, [r5, r3] - movs r3, 0x6 - bl CreateSprite - lsls r0, 24 - lsrs r2, r0, 24 - cmp r2, 0x40 - beq _0809CCE4 - movs r5, 0x8E - lsls r5, 5 - adds r4, r6, r5 - lsls r1, r2, 4 - adds r1, r2 - lsls r1, 2 - ldr r0, _0809CCD8 @ =gSprites - adds r1, r0 - str r1, [r4] - ldr r0, _0809CCDC @ =gUnknown_020384E9 - ldrb r0, [r0] - adds r0, r7, r0 - ldrb r2, [r0] - lsls r2, 4 - ldrb r3, [r1, 0x5] - movs r0, 0xF - ands r0, r3 - orrs r0, r2 - strb r0, [r1, 0x5] - ldr r0, _0809CCE0 @ =gUnknown_020384E6 - ldrb r0, [r0] - cmp r0, 0 - beq _0809CCEE - ldr r0, [r4] - movs r1, 0x3 - bl StartSpriteAnim - b _0809CCEE - .align 2, 0 -_0809CCB0: .4byte gHandCursorSpriteSheets -_0809CCB4: .4byte gHandCursorSpritePalettes -_0809CCB8: .4byte 0x0000dac6 -_0809CCBC: .4byte gPokemonStorageSystemPtr -_0809CCC0: .4byte 0x000011e4 -_0809CCC4: .4byte 0x0000dad1 -_0809CCC8: .4byte 0x000011e5 -_0809CCCC: .4byte gUnknown_020384E4 -_0809CCD0: .4byte gUnknown_020384E5 -_0809CCD4: .4byte gSpriteTemplate_83BBC70 -_0809CCD8: .4byte gSprites -_0809CCDC: .4byte gUnknown_020384E9 -_0809CCE0: .4byte gUnknown_020384E6 -_0809CCE4: - movs r0, 0x8E - lsls r0, 5 - adds r1, r6, r0 - movs r0, 0 - str r0, [r1] -_0809CCEE: - ldr r0, _0809CD00 @ =gUnknown_020384E4 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - cmp r0, 0x1 - bne _0809CD04 - movs r3, 0xC - movs r5, 0x1 - b _0809CD08 - .align 2, 0 -_0809CD00: .4byte gUnknown_020384E4 -_0809CD04: - movs r3, 0x14 - movs r5, 0x2 -_0809CD08: - ldr r0, _0809CD58 @ =gSpriteTemplate_83BBC88 - movs r1, 0 - movs r2, 0 - bl CreateSprite - lsls r0, 24 - lsrs r2, r0, 24 - cmp r2, 0x40 - beq _0809CD6C - ldr r0, _0809CD5C @ =gPokemonStorageSystemPtr - ldr r0, [r0] - ldr r1, _0809CD60 @ =0x000011c4 - adds r4, r0, r1 - lsls r1, r2, 4 - adds r1, r2 - lsls r1, 2 - ldr r0, _0809CD64 @ =gSprites - adds r1, r0 - str r1, [r4] - lsls r3, r5, 2 - ldrb r2, [r1, 0x5] - movs r0, 0xD - negs r0, r0 - ands r0, r2 - orrs r0, r3 - strb r0, [r1, 0x5] - ldr r0, _0809CD68 @ =gUnknown_020384E4 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - cmp r0, 0 - beq _0809CD78 - ldr r0, [r4] - adds r0, 0x3E - ldrb r1, [r0] - movs r2, 0x4 - orrs r1, r2 - strb r1, [r0] - b _0809CD78 - .align 2, 0 -_0809CD58: .4byte gSpriteTemplate_83BBC88 -_0809CD5C: .4byte gPokemonStorageSystemPtr -_0809CD60: .4byte 0x000011c4 -_0809CD64: .4byte gSprites -_0809CD68: .4byte gUnknown_020384E4 -_0809CD6C: - ldr r0, _0809CD80 @ =gPokemonStorageSystemPtr - ldr r0, [r0] - ldr r2, _0809CD84 @ =0x000011c4 - adds r0, r2 - movs r1, 0 - str r1, [r0] -_0809CD78: - add sp, 0x34 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_0809CD80: .4byte gPokemonStorageSystemPtr -_0809CD84: .4byte 0x000011c4 - thumb_func_end sub_809CC04 - - thumb_func_start sub_809CD88 -sub_809CD88: @ 809CD88 - push {lr} - ldr r2, _0809CDC0 @ =gUnknown_020384E9 - movs r1, 0 - ldrb r0, [r2] - cmp r0, 0 - bne _0809CD96 - movs r1, 0x1 -_0809CD96: - strb r1, [r2] - ldr r0, _0809CDC4 @ =gPokemonStorageSystemPtr - ldr r0, [r0] - movs r3, 0x8E - lsls r3, 5 - adds r1, r0, r3 - ldr r3, [r1] - ldr r1, _0809CDC8 @ =0x000011e4 - adds r0, r1 - ldrb r2, [r2] - adds r0, r2 - ldrb r1, [r0] - lsls r1, 4 - ldrb r2, [r3, 0x5] - movs r0, 0xF - ands r0, r2 - orrs r0, r1 - strb r0, [r3, 0x5] - pop {r0} - bx r0 - .align 2, 0 -_0809CDC0: .4byte gUnknown_020384E9 -_0809CDC4: .4byte gPokemonStorageSystemPtr -_0809CDC8: .4byte 0x000011e4 - thumb_func_end sub_809CD88 - -// file boundary here - - thumb_func_start sub_809CDCC -sub_809CDCC: @ 809CDCC - ldr r0, _0809CDE0 @ =gPokemonStorageSystemPtr - ldr r0, [r0] - ldr r2, _0809CDE4 @ =0x000011b8 - adds r1, r0, r2 - movs r2, 0 - strb r2, [r1] - ldr r1, _0809CDE8 @ =0x000011b9 - adds r0, r1 - strb r2, [r0] - bx lr - .align 2, 0 -_0809CDE0: .4byte gPokemonStorageSystemPtr -_0809CDE4: .4byte 0x000011b8 -_0809CDE8: .4byte 0x000011b9 - thumb_func_end sub_809CDCC - - thumb_func_start sub_809CDEC -sub_809CDEC: @ 809CDEC - push {r4,r5,lr} - lsls r0, 24 - lsrs r3, r0, 24 - ldr r0, _0809CE3C @ =gPokemonStorageSystemPtr - ldr r5, [r0] - ldr r0, _0809CE40 @ =0x000011b8 - adds r4, r5, r0 - ldrb r0, [r4] - cmp r0, 0x6 - bhi _0809CE36 - adds r1, r0, 0 - lsls r1, 3 - movs r2, 0x8C - lsls r2, 5 - adds r1, r2 - adds r1, r5, r1 - ldr r2, _0809CE44 @ =gUnknown_083BBCA0 - lsls r0, r3, 2 - adds r0, r2 - ldr r0, [r0] - str r0, [r1] - str r3, [r1, 0x4] - bl GetStringWidthInMenuWindow - lsls r0, 24 - lsrs r0, 24 - adds r1, r0, 0x7 - lsrs r1, 3 - ldr r2, _0809CE48 @ =0x000011b9 - adds r0, r5, r2 - ldrb r2, [r0] - cmp r1, r2 - bls _0809CE30 - strb r1, [r0] -_0809CE30: - ldrb r0, [r4] - adds r0, 0x1 - strb r0, [r4] -_0809CE36: - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_0809CE3C: .4byte gPokemonStorageSystemPtr -_0809CE40: .4byte 0x000011b8 -_0809CE44: .4byte gUnknown_083BBCA0 -_0809CE48: .4byte 0x000011b9 - thumb_func_end sub_809CDEC - - thumb_func_start sub_809CE4C -sub_809CE4C: @ 809CE4C - push {lr} - lsls r0, 24 - lsrs r2, r0, 24 - ldr r0, _0809CE70 @ =gPokemonStorageSystemPtr - ldr r1, [r0] - ldr r3, _0809CE74 @ =0x000011b8 - adds r0, r1, r3 - ldrb r0, [r0] - cmp r2, r0 - bcs _0809CE7C - lsls r0, r2, 3 - ldr r2, _0809CE78 @ =0x00001184 - adds r1, r2 - adds r1, r0 - movs r0, 0 - ldrsb r0, [r1, r0] - b _0809CE80 - .align 2, 0 -_0809CE70: .4byte gPokemonStorageSystemPtr -_0809CE74: .4byte 0x000011b8 -_0809CE78: .4byte 0x00001184 -_0809CE7C: - movs r0, 0x1 - negs r0, r0 -_0809CE80: - pop {r1} - bx r1 - thumb_func_end sub_809CE4C - - thumb_func_start sub_809CE84 -sub_809CE84: @ 809CE84 - push {r4-r6,lr} - mov r6, r10 - mov r5, r9 - mov r4, r8 - push {r4-r6} - sub sp, 0x8 - ldr r0, _0809CF20 @ =gPokemonStorageSystemPtr - ldr r4, [r0] - ldr r0, _0809CF24 @ =0x000011b8 - adds r0, r4 - mov r8, r0 - ldrb r0, [r0] - lsls r0, 1 - movs r1, 0xE - subs r1, r0 - ldr r3, _0809CF28 @ =0x000011bc - adds r6, r4, r3 - movs r0, 0 - mov r10, r0 - strh r1, [r6] - ldr r1, _0809CF2C @ =0x000011b9 - adds r1, r4 - mov r9, r1 - ldrb r1, [r1] - movs r0, 0x1C - subs r0, r1 - subs r3, 0x2 - adds r5, r4, r3 - strh r0, [r5] - lsls r0, 24 - lsrs r0, 24 - ldrb r1, [r6] - movs r2, 0x1D - movs r3, 0xF - bl Menu_DrawStdWindowFrame - ldrb r0, [r5] - adds r0, 0x1 - lsls r0, 24 - lsrs r0, 24 - ldrb r1, [r6] - adds r1, 0x1 - lsls r1, 24 - lsrs r1, 24 - mov r3, r8 - ldrb r2, [r3] - movs r3, 0x8C - lsls r3, 5 - adds r4, r3 - adds r3, r4, 0 - bl Menu_PrintItems - ldrb r1, [r5] - adds r1, 0x1 - lsls r1, 24 - lsrs r1, 24 - ldrb r2, [r6] - adds r2, 0x1 - lsls r2, 24 - lsrs r2, 24 - mov r4, r8 - ldrb r3, [r4] - mov r0, r10 - str r0, [sp] - mov r4, r9 - ldrb r0, [r4] - str r0, [sp, 0x4] - movs r0, 0 - bl InitMenu - add sp, 0x8 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_0809CF20: .4byte gPokemonStorageSystemPtr -_0809CF24: .4byte 0x000011b8 -_0809CF28: .4byte 0x000011bc -_0809CF2C: .4byte 0x000011b9 - thumb_func_end sub_809CE84 - - thumb_func_start sub_809CF30 -sub_809CF30: @ 809CF30 - push {r4,r5,lr} - movs r5, 0x2 - negs r5, r5 - ldr r4, _0809CF6C @ =gMain - ldrh r1, [r4, 0x2E] - movs r0, 0x1 - ands r0, r1 - cmp r0, 0 - bne _0809CF86 - movs r0, 0x2 - ands r0, r1 - cmp r0, 0 - beq _0809CF52 - movs r0, 0x5 - bl PlaySE - adds r5, 0x1 -_0809CF52: - ldrh r1, [r4, 0x2E] - movs r0, 0x40 - ands r0, r1 - cmp r0, 0 - beq _0809CF70 - movs r0, 0x5 - bl PlaySE - movs r0, 0x1 - negs r0, r0 - bl Menu_MoveCursor - b _0809CF8E - .align 2, 0 -_0809CF6C: .4byte gMain -_0809CF70: - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - beq _0809CF8E - movs r0, 0x5 - bl PlaySE - movs r0, 0x1 - bl Menu_MoveCursor - b _0809CF8E -_0809CF86: - bl Menu_GetCursorPos - lsls r0, 24 - lsrs r5, r0, 24 -_0809CF8E: - movs r0, 0x2 - negs r0, r0 - cmp r5, r0 - beq _0809CFB2 - bl Menu_DestroyCursor - ldr r0, _0809CFD0 @ =gPokemonStorageSystemPtr - ldr r1, [r0] - ldr r2, _0809CFD4 @ =0x000011ba - adds r0, r1, r2 - ldrb r0, [r0] - adds r2, 0x2 - adds r1, r2 - ldrb r1, [r1] - movs r2, 0x1D - movs r3, 0xF - bl Menu_EraseWindowRect -_0809CFB2: - cmp r5, 0 - blt _0809CFC4 - ldr r0, _0809CFD0 @ =gPokemonStorageSystemPtr - ldr r0, [r0] - lsls r1, r5, 3 - ldr r2, _0809CFD8 @ =0x00001184 - adds r0, r2 - adds r0, r1 - ldr r5, [r0] -_0809CFC4: - lsls r0, r5, 16 - asrs r0, 16 - pop {r4,r5} - pop {r1} - bx r1 - .align 2, 0 -_0809CFD0: .4byte gPokemonStorageSystemPtr -_0809CFD4: .4byte 0x000011ba -_0809CFD8: .4byte 0x00001184 - thumb_func_end sub_809CF30 - - thumb_func_start sub_809CFDC -sub_809CFDC: @ 809CFDC - ldr r3, _0809CFEC @ =gUnknown_020384EC - str r0, [r3] - str r1, [r0] - movs r1, 0 - strb r2, [r0, 0x5] - strb r1, [r0, 0x4] - bx lr - .align 2, 0 -_0809CFEC: .4byte gUnknown_020384EC - thumb_func_end sub_809CFDC - - thumb_func_start sub_809CFF0 -sub_809CFF0: @ 809CFF0 - push {r4,r5,lr} - ldr r2, _0809D030 @ =gUnknown_020384EC - ldr r1, [r2] - ldrb r0, [r1, 0x4] - cmp r0, 0 - beq _0809D02A - movs r4, 0 - ldrb r1, [r1, 0x4] - cmp r4, r1 - bcs _0809D022 - adds r5, r2, 0 -_0809D006: - ldr r0, [r5] - lsls r1, r4, 4 - ldr r0, [r0] - adds r0, r1 - ldr r1, [r0, 0xC] - bl _call_via_r1 - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 - ldr r0, [r5] - ldrb r0, [r0, 0x4] - cmp r4, r0 - bcc _0809D006 -_0809D022: - ldr r0, _0809D030 @ =gUnknown_020384EC - ldr r1, [r0] - movs r0, 0 - strb r0, [r1, 0x4] -_0809D02A: - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_0809D030: .4byte gUnknown_020384EC - thumb_func_end sub_809CFF0 - - thumb_func_start sub_809D034 -sub_809D034: @ 809D034 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - mov r8, r0 - mov r9, r3 - ldr r0, [sp, 0x20] - ldr r3, [sp, 0x24] - ldr r4, [sp, 0x28] - ldr r5, [sp, 0x2C] - lsls r1, 16 - lsrs r1, 16 - mov r10, r1 - lsls r2, 16 - lsrs r6, r2, 16 - lsls r0, 16 - lsrs r0, 16 - mov r12, r0 - lsls r3, 16 - lsrs r3, 16 - lsls r4, 16 - lsrs r4, 16 - lsls r5, 16 - lsrs r5, 16 - ldr r0, _0809D0A4 @ =gUnknown_020384EC - ldr r2, [r0] - ldrb r0, [r2, 0x4] - adds r1, r0, 0 - ldrb r7, [r2, 0x5] - cmp r1, r7 - bcs _0809D0AC - adds r0, 0x1 - strb r0, [r2, 0x4] - lsls r0, r1, 4 - ldr r2, [r2] - adds r2, r0 - lsls r0, r4, 1 - strh r0, [r2, 0x8] - lsls r0, r6, 6 - add r0, r8 - mov r4, r10 - lsls r1, r4, 1 - adds r0, r1 - str r0, [r2, 0x4] - lsls r0, r3, 6 - add r0, r9 - mov r7, r12 - lsls r1, r7, 1 - adds r0, r1 - str r0, [r2] - strh r5, [r2, 0xA] - ldr r0, _0809D0A8 @ =sub_809D0BC - str r0, [r2, 0xC] - movs r0, 0x1 - b _0809D0AE - .align 2, 0 -_0809D0A4: .4byte gUnknown_020384EC -_0809D0A8: .4byte sub_809D0BC -_0809D0AC: - movs r0, 0 -_0809D0AE: - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end sub_809D034 - - thumb_func_start sub_809D0BC -sub_809D0BC: @ 809D0BC - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - ldr r6, [r0] - ldr r5, [r0, 0x4] - ldrh r7, [r0, 0xA] - ldrh r2, [r0, 0x8] - movs r4, 0 - cmp r4, r7 - bcs _0809D0F2 - lsrs r2, 1 - mov r8, r2 - ldr r0, _0809D100 @ =0x001fffff - mov r9, r0 -_0809D0DA: - adds r0, r6, 0 - adds r1, r5, 0 - mov r2, r8 - mov r3, r9 - ands r2, r3 - bl CpuSet - adds r5, 0x40 - adds r6, 0x40 - adds r4, 0x1 - cmp r4, r7 - bcc _0809D0DA -_0809D0F2: - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_0809D100: .4byte 0x001fffff - thumb_func_end sub_809D0BC - - thumb_func_start sub_809D104 -sub_809D104: @ 809D104 - push {r4-r7,lr} - mov r7, r8 - push {r7} - ldr r5, [sp, 0x18] - ldr r4, [sp, 0x1C] - ldr r6, [sp, 0x20] - mov r8, r6 - ldr r6, [sp, 0x24] - lsls r1, 16 - lsls r2, 16 - lsrs r2, 16 - lsls r5, 16 - lsls r4, 16 - mov r7, r8 - lsls r7, 16 - lsls r6, 16 - lsrs r6, 16 - lsrs r4, 10 - adds r3, r4 - lsrs r5, 15 - adds r5, r3, r5 - lsls r3, r2, 6 - adds r3, r0, r3 - lsrs r1, 15 - adds r4, r3, r1 - adds r2, r6 - lsls r2, 6 - adds r6, r0, r2 - lsrs r2, r7, 15 - cmp r4, r6 - bcs _0809D15C - lsrs r7, r2, 1 - ldr r0, _0809D168 @ =0x001fffff - mov r8, r0 -_0809D148: - adds r0, r5, 0 - adds r1, r4, 0 - mov r2, r8 - ands r2, r7 - bl CpuSet - adds r4, 0x40 - adds r5, 0x40 - cmp r4, r6 - bcc _0809D148 -_0809D15C: - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_0809D168: .4byte 0x001fffff - thumb_func_end sub_809D104 - - thumb_func_start sub_809D16C -sub_809D16C: @ 809D16C - push {r4-r7,lr} - mov r12, r0 - ldr r0, [sp, 0x14] - lsls r1, 16 - lsrs r6, r1, 16 - lsls r2, 16 - lsrs r4, r2, 16 - lsls r3, 16 - lsrs r3, 16 - lsls r0, 16 - lsrs r5, r0, 16 - ldr r0, _0809D1B4 @ =gUnknown_020384EC - ldr r1, [r0] - ldrb r0, [r1, 0x4] - adds r2, r0, 0 - ldrb r7, [r1, 0x5] - cmp r2, r7 - bcs _0809D1BC - adds r0, 0x1 - strb r0, [r1, 0x4] - lsls r0, r2, 4 - ldr r1, [r1] - adds r1, r0 - lsls r0, r3, 1 - strh r0, [r1, 0x8] - lsls r0, r4, 5 - adds r0, r6 - lsls r0, 1 - add r0, r12 - str r0, [r1, 0x4] - strh r5, [r1, 0xA] - ldr r0, _0809D1B8 @ =sub_809D1C4 - str r0, [r1, 0xC] - movs r0, 0x1 - b _0809D1BE - .align 2, 0 -_0809D1B4: .4byte gUnknown_020384EC -_0809D1B8: .4byte sub_809D1C4 -_0809D1BC: - movs r0, 0 -_0809D1BE: - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end sub_809D16C - - thumb_func_start sub_809D1C4 -sub_809D1C4: @ 809D1C4 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x4 - adds r6, r0, 0 - movs r0, 0 - ldrh r1, [r6, 0xA] - cmp r0, r1 - bcs _0809D252 - movs r7, 0x80 - lsls r7, 5 - mov r5, sp - ldr r2, _0809D210 @ =0x040000d4 - mov r8, r2 - movs r1, 0x81 - lsls r1, 24 - mov r10, r1 -_0809D1EA: - ldr r2, [r6, 0x4] - ldrh r3, [r6, 0x8] - mov r12, r2 - adds r0, 0x1 - mov r9, r0 - cmp r3, r7 - bhi _0809D214 - movs r0, 0 - strh r0, [r5] - mov r2, sp - mov r0, r8 - str r2, [r0] - mov r1, r12 - str r1, [r0, 0x4] - lsrs r0, r3, 1 - mov r2, r10 - orrs r0, r2 - mov r1, r8 - b _0809D23C - .align 2, 0 -_0809D210: .4byte 0x040000d4 -_0809D214: - movs r4, 0 - strh r4, [r5] - ldr r1, _0809D264 @ =0x040000d4 - mov r0, sp - str r0, [r1] - str r2, [r1, 0x4] - ldr r0, _0809D268 @ =0x81000800 - str r0, [r1, 0x8] - ldr r0, [r1, 0x8] - adds r2, r7 - subs r3, r7 - cmp r3, r7 - bhi _0809D214 - strh r4, [r5] - mov r0, sp - str r0, [r1] - str r2, [r1, 0x4] - lsrs r0, r3, 1 - mov r2, r10 - orrs r0, r2 -_0809D23C: - str r0, [r1, 0x8] - ldr r0, [r1, 0x8] - mov r0, r12 - adds r0, 0x40 - str r0, [r6, 0x4] - mov r1, r9 - lsls r0, r1, 16 - lsrs r0, 16 - ldrh r2, [r6, 0xA] - cmp r0, r2 - bcc _0809D1EA -_0809D252: - add sp, 0x4 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_0809D264: .4byte 0x040000d4 -_0809D268: .4byte 0x81000800 - thumb_func_end sub_809D1C4 - - .align 2, 0 @ Don't pad with nop. diff --git a/include/pokemon_storage_system.h b/include/pokemon_storage_system.h index 9c8fbdc13..735b7f4f9 100644 --- a/include/pokemon_storage_system.h +++ b/include/pokemon_storage_system.h @@ -40,19 +40,30 @@ enum { PC_TEXT_FMT_MON_NAME_AFTER_EXCL_MARK }; +struct PokemonStorageSystemFunc +{ + u8 (*func)(void); + s8 unk4; +}; + struct StorageAction { const u8 *text; u8 format; }; +struct StorageText { + const u8 *text; + int textId; +}; + struct PSS_MenuStringPtrs { const u8 *text; const u8 *desc; }; struct UnkStruct_2000028 { - void *unk_00; - void *unk_04; + const u8 *unk_00; + u8 *unk_04; u16 unk_08; u16 unk_0a; void (*unk_0c)(struct UnkStruct_2000028 *data); @@ -88,7 +99,7 @@ struct PokemonStorageSystemData { struct PCScreenEffectStruct unk_000c; struct UnkStruct_2000020 unk_0020; struct UnkStruct_2000028 unk_0028[8]; - u16 unk_00a8[0x400]; + u8 unk_00a8[0x800]; u16 unk_08a8; u16 unk_08aa; u8 unk_08ac; @@ -142,7 +153,14 @@ struct PokemonStorageSystemData { s8 unk_117b; u8 unk_117c; u8 unk_117d; - u8 filler_117e[0x42]; + u8 filler_117e[2]; + struct StorageText unk_1180[6]; + u8 filler_11b0[8]; + u8 unk_11b8; + u8 unk_11b9; + u16 unk_11ba; + u16 unk_11bc; + u8 filler_11be; struct Sprite *unk_11c0; struct Sprite *unk_11c4; s32 unk_11c8; @@ -158,7 +176,7 @@ struct PokemonStorageSystemData { u8 unk_11e1; u8 unk_11e2; u8 unk_11e3; - u8 filler_11e4[4]; + u8 unk_11e4[4]; const u8 *unk_11e8; u32 unk_11ec; u16 unk_11f0; @@ -213,7 +231,7 @@ struct PokemonStorageSystemData { u8 unk_4784[0x800]; }; -extern u16 gUnknown_02039760[0x600]; +extern u8 gUnknown_02039760[0xC00]; extern struct UnkPSSStruct_2002370 *gUnknown_02038478; extern struct PokemonStorageSystemData *const gPokemonStorageSystemPtr; extern u8 *const gUnknown_083B6DB8; @@ -295,9 +313,9 @@ void sub_809CE84(void); s16 sub_809CF30(void); void sub_809CFDC(struct UnkStruct_2000020 *a0, struct UnkStruct_2000028 *a1, u8 a2); void sub_809CFF0(void); -void sub_809D034(void *dest, u16 dLeft, u16 dTop, const void *src, u16 sLeft, u16 sTop, u16 width, u16 height); -void sub_809D104(void *dest, u16 dLeft, u16 dTop, const void *src, u16 sLeft, u16 sTop, u16 width, u16 height); -void sub_809D16C(void *dest, u16 dLeft, u16 dTop, u16 width, u16 height); +bool8 sub_809D034(u8 *dest, u16 dLeft, u16 dTop, const u8 *src, u16 sLeft, u16 sTop, u16 width, u16 height); +void sub_809D104(u8 *dest, u16 dLeft, u16 dTop, const u8 *src, u16 sLeft, u16 sTop, u16 width, u16 height); +bool8 sub_809D16C(void *dest, u16 dLeft, u16 dTop, u16 width, u16 height); void ShowPokemonStorageSystem(void); void debug_sub_80A433C(struct Pokemon *pokemon, void (*func)(void)); diff --git a/ld_script.txt b/ld_script.txt index cf238d12c..914a546b1 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -134,7 +134,6 @@ SECTIONS { src/pokemon_storage_system_3.o(.text); src/pokemon_storage_system_4.o(.text); src/pokemon_storage_system_5.o(.text); - asm/pokemon_storage_system.o(.text); src/pokemon_icon.o(.text); src/pokemon_summary_screen.o(.text); src/script_movement.o(.text); diff --git a/src/pokemon_storage_system_2.c b/src/pokemon_storage_system_2.c index 2cd1a59c6..6ebb8ff8a 100644 --- a/src/pokemon_storage_system_2.c +++ b/src/pokemon_storage_system_2.c @@ -337,7 +337,7 @@ void debug_sub_80A4300(void) extern void (*unk_2038794)(void); extern struct Pokemon * unk_2038798; -extern void debug_sub_809CB94(struct Pokemon *); +extern void sub_809CB94(struct Pokemon *); void debug_sub_80A433C(struct Pokemon * a, void (*b)(void)) { @@ -351,7 +351,7 @@ void debug_sub_80A435C(void) switch (gPokemonStorageSystemPtr->unk_0004) { case 0: - debug_sub_809CB94(unk_2038798); + sub_809CB94(unk_2038798); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gPokemonStorageSystemPtr->unk_0004++; break; diff --git a/src/pokemon_storage_system_5.c b/src/pokemon_storage_system_5.c index b7c3d42f5..8848800ab 100644 --- a/src/pokemon_storage_system_5.c +++ b/src/pokemon_storage_system_5.c @@ -1,16 +1,775 @@ - -// Includes #include "global.h" +#include "main.h" +#include "menu.h" #include "pokemon_storage_system.h" +#include "sound.h" + +EWRAM_DATA struct UnkStruct_2000020 *gUnknown_020384EC = NULL; -// Static type declarations +extern s8 gUnknown_020384E4; +extern s8 gUnknown_020384E5; +extern bool8 gUnknown_020384E6; +extern u8 gUnknown_020384E9; -// Static RAM declarations +#if DEBUG +extern u8 unk_2038790; +#endif -EWRAM_DATA struct UnkStruct_2000020 *gUnknown_020384EC = NULL; +extern const struct SpriteSheet gHandCursorSpriteSheets[3]; +extern const struct SpritePalette gHandCursorSpritePalettes[3]; +extern const struct SpriteTemplate gSpriteTemplate_83BBC70; +extern const struct SpriteTemplate gSpriteTemplate_83BBC88; +extern const u8 *const gUnknown_083BBCA0[]; + +extern struct PokemonStorageSystemFunc gUnknown_083BBBD4[]; + +void sub_809AF18(u8 a0, u8 a1); +void sub_809CA8C(void); +void sub_809CD88(void); +u16 sub_809AB8C(void); +void sub_809AACC(u8 a0, u8 a1, u16 *a2, u16 *a3); +void sub_809D0BC(struct UnkStruct_2000028*); +void sub_809D1C4(struct UnkStruct_2000028*); + +u8 sub_809C85C(void) +{ + u8 retVal; + s8 var0; + register s8 var1 asm("r5"); // FAKEMATCHING: r5 and r6 become swapped without this register hack + + gPokemonStorageSystemPtr->unk_11df = 0; + gPokemonStorageSystemPtr->unk_11de = 0; + gPokemonStorageSystemPtr->unk_11e3 = 0; + + if (!(gMain.newAndRepeatedKeys & DPAD_UP)) + { + if (gMain.newAndRepeatedKeys & DPAD_DOWN) + { + retVal = 1; + var0 = 0; + var1 = 2; + } + else + { + if (gMain.heldKeys & DPAD_LEFT) + return 10; + if (gMain.heldKeys & DPAD_RIGHT) + return 9; + if (gSaveBlock2.optionsButtonMode == OPTIONS_BUTTON_MODE_LR) + { + if (gMain.heldKeys & L_BUTTON) + return 10; + if (gMain.heldKeys & R_BUTTON) + return 9; + } + + if (gMain.newKeys & A_BUTTON) + { + sub_809A860(0); + sub_809CA8C(); + return 7; + } + + if (gMain.newKeys & B_BUTTON) + return 16; + + if (gMain.newKeys & SELECT_BUTTON) + { + sub_809CD88(); + return 0; + } + + retVal = 0; + } + } + else + { + retVal = 1; + var0 = 3; + var1 = 0; + gPokemonStorageSystemPtr->unk_11e3 = 1; + } + + if (retVal) + { + if (var0 != 2) + sub_809A860(0); + sub_809AF18(var0, var1); + return retVal; + } + + return retVal; +} + +#ifdef NONMATCHING +u8 sub_809C944(void) +{ + u8 r6; + s8 var0 = gUnknown_020384E4; + s8 var1 = gUnknown_020384E5; + + gPokemonStorageSystemPtr->unk_11df = 0; + gPokemonStorageSystemPtr->unk_11de = 0; + gPokemonStorageSystemPtr->unk_11e3 = 0; + + if (!(gMain.newAndRepeatedKeys & DPAD_UP)) + { + if (gMain.newAndRepeatedKeys & (DPAD_DOWN | START_BUTTON)) + { + r6 = 1; + var0 = 2; + var1 = 0; + gPokemonStorageSystemPtr->unk_11e3 = 1; + } + else if (gMain.newAndRepeatedKeys & DPAD_LEFT) + { + r6 = 1; + var1 -= 1; + if (var1 < 0) + { + gPokemonStorageSystemPtr->unk_11df = -1; + var1 = 1; + } + } + else if (gMain.newAndRepeatedKeys & DPAD_RIGHT) + { + r6 = 1; + var1 += 1; + if (var1 > 1) + { + gPokemonStorageSystemPtr->unk_11df = 1; + var1 = 0; + } + } + else if (gMain.newKeys & A_BUTTON) + { + return var1 == 0 ? 5 : 4; + } + else if (gMain.newKeys & B_BUTTON) + { + return 16; + } + else if (gMain.newKeys & SELECT_BUTTON) + { + sub_809CD88(); + return 0; + } + else + { + r6 = 0; + } + } + else + { + r6 = 1; + var0 = 0; + gPokemonStorageSystemPtr->unk_11de = -1; + var1 = !gUnknown_020384E5 ? 24 : 29; + gPokemonStorageSystemPtr->unk_11e3 = 1; + } + + if (r6) + { + sub_809AF18(var0, var1); + } + + return r6; +} +#else +NAKED +u8 sub_809C944(void) +{ + asm(".syntax unified\n\ + push {r4-r7,lr}\n\ + ldr r0, _0809C988 @ =gUnknown_020384E4\n\ + ldrb r0, [r0]\n\ + mov r12, r0\n\ + ldr r7, _0809C98C @ =gUnknown_020384E5\n\ + ldrb r3, [r7]\n\ + ldr r0, _0809C990 @ =gPokemonStorageSystemPtr\n\ + ldr r1, [r0]\n\ + ldr r0, _0809C994 @ =0x000011df\n\ + adds r5, r1, r0\n\ + movs r0, 0\n\ + strb r0, [r5]\n\ + ldr r2, _0809C998 @ =0x000011de\n\ + adds r4, r1, r2\n\ + strb r0, [r4]\n\ + adds r2, 0x5\n\ + adds r1, r2\n\ + strb r0, [r1]\n\ + ldr r6, _0809C99C @ =gMain\n\ + ldrh r2, [r6, 0x30]\n\ + movs r0, 0x40\n\ + ands r0, r2\n\ + cmp r0, 0\n\ + bne _0809CA14\n\ + movs r0, 0x88\n\ + ands r0, r2\n\ + cmp r0, 0\n\ + beq _0809C9A0\n\ + movs r6, 0x1\n\ + movs r0, 0x2\n\ + mov r12, r0\n\ + movs r3, 0\n\ + b _0809CA2A\n\ + .align 2, 0\n\ +_0809C988: .4byte gUnknown_020384E4\n\ +_0809C98C: .4byte gUnknown_020384E5\n\ +_0809C990: .4byte gPokemonStorageSystemPtr\n\ +_0809C994: .4byte 0x000011df\n\ +_0809C998: .4byte 0x000011de\n\ +_0809C99C: .4byte gMain\n\ +_0809C9A0:\n\ + movs r0, 0x20\n\ + ands r0, r2\n\ + cmp r0, 0\n\ + beq _0809C9C0\n\ + movs r6, 0x1\n\ + lsls r0, r3, 24\n\ + movs r1, 0xFF\n\ + lsls r1, 24\n\ + adds r0, r1\n\ + lsrs r3, r0, 24\n\ + cmp r0, 0\n\ + bge _0809CA2C\n\ + movs r0, 0xFF\n\ + strb r0, [r5]\n\ + movs r3, 0x1\n\ + b _0809CA2C\n\ +_0809C9C0:\n\ + movs r0, 0x10\n\ + ands r0, r2\n\ + cmp r0, 0\n\ + beq _0809C9E0\n\ + movs r6, 0x1\n\ + lsls r0, r3, 24\n\ + movs r2, 0x80\n\ + lsls r2, 17\n\ + adds r0, r2\n\ + lsrs r3, r0, 24\n\ + asrs r0, 24\n\ + cmp r0, 0x1\n\ + ble _0809CA2C\n\ + strb r6, [r5]\n\ + movs r3, 0\n\ + b _0809CA2C\n\ +_0809C9E0:\n\ + ldrh r1, [r6, 0x2E]\n\ + movs r0, 0x1\n\ + ands r0, r1\n\ + cmp r0, 0\n\ + beq _0809C9F4\n\ + movs r0, 0x4\n\ + cmp r3, 0\n\ + bne _0809CA3A\n\ + movs r0, 0x5\n\ + b _0809CA3A\n\ +_0809C9F4:\n\ + movs r0, 0x2\n\ + ands r0, r1\n\ + cmp r0, 0\n\ + beq _0809CA00\n\ + movs r0, 0x10\n\ + b _0809CA3A\n\ +_0809CA00:\n\ + movs r0, 0x4\n\ + ands r0, r1\n\ + cmp r0, 0\n\ + beq _0809CA10\n\ + bl sub_809CD88\n\ + movs r0, 0\n\ + b _0809CA3A\n\ +_0809CA10:\n\ + movs r6, 0\n\ + b _0809CA38\n\ +_0809CA14:\n\ + movs r6, 0x1\n\ + movs r0, 0\n\ + mov r12, r0\n\ + movs r0, 0xFF\n\ + strb r0, [r4]\n\ + movs r0, 0\n\ + ldrsb r0, [r7, r0]\n\ + movs r3, 0x1D\n\ + cmp r0, 0\n\ + bne _0809CA2A\n\ + movs r3, 0x18\n\ +_0809CA2A:\n\ + strb r6, [r1]\n\ +_0809CA2C:\n\ + cmp r6, 0\n\ + beq _0809CA38\n\ + mov r0, r12\n\ + adds r1, r3, 0\n\ + bl sub_809AF18\n\ +_0809CA38:\n\ + adds r0, r6, 0\n\ +_0809CA3A:\n\ + pop {r4-r7}\n\ + pop {r1}\n\ + bx r1\n\ + .syntax divided\n"); +} +#endif // NONMATCHING + +u8 sub_809CA40(void) +{ + u16 i = 0; + while (gUnknown_083BBBD4[i].func != NULL) + { + if (gUnknown_083BBBD4[i].unk4 == gUnknown_020384E4) + return gUnknown_083BBBD4[i].func(); + i++; + } + + return 0; +} + +void sub_809CA8C(void) +{ + sub_809CDCC(); + sub_809CDEC(9); + sub_809CDEC(10); + sub_809CDEC(11); + sub_809CDEC(0); +} + +#if DEBUG +u8 debug_sub_80AA40C(void) +{ + if (sub_809AB8C()) + { + sub_809CDCC(); + sub_809CDEC(32); + sub_809CDEC(6); + return 1; + } + + return 0; +} +#endif + +bool8 sub_809CAB0(void) +{ + u16 var0; + +#if DEBUG + if (unk_2038790) + return debug_sub_80AA40C(); +#endif + + sub_809CDCC(); + var0 = sub_809AB8C(); + + switch (gPokemonStorageSystemPtr->unk_0005) + { + case 1: + if (var0) + sub_809CDEC(1); + else + return 0; + break; + case 0: + if (var0) + sub_809CDEC(2); + else + return 0; + break; + case 2: + if (gUnknown_020384E6) + { + if (var0) + sub_809CDEC(4); + else + sub_809CDEC(5); + } + else + { + if (var0) + sub_809CDEC(3); + else + return 0; + } + break; + default: + return 0; + } + + sub_809CDEC(6); + if (gPokemonStorageSystemPtr->unk_0005 == 2) + { + if (!gUnknown_020384E4) + sub_809CDEC(2); + else + sub_809CDEC(1); + } + + sub_809CDEC(8); + sub_809CDEC(7); + sub_809CDEC(0); + return 1; +} + +void sub_809CB74(struct Sprite *sprite) +{ + sprite->pos1.x = gPokemonStorageSystemPtr->unk_11c0->pos1.x; + sprite->pos1.y = gPokemonStorageSystemPtr->unk_11c0->pos1.y + 20; +} + +void sub_809CB94(struct Pokemon *mon) +{ + if (gUnknown_020384E4 == 1) + { + mon->box = gPlayerParty[gUnknown_020384E5].box; + } + else + { + u8 boxId = get_preferred_box(); + mon->box = gPokemonStorage.boxes[boxId][gUnknown_020384E5]; + } +} + +void sub_809CC04(void) +{ + u16 x, y; + u8 spriteId; + int priority, subpriority; + struct SpriteSheet spriteSheets[3]; + struct SpritePalette spritePalettes[3]; + + memcpy(spriteSheets, gHandCursorSpriteSheets, 24); + memcpy(spritePalettes, gHandCursorSpritePalettes, 24); + LoadSpriteSheets(spriteSheets); + LoadSpritePalettes(spritePalettes); + gPokemonStorageSystemPtr->unk_11e4[0] = IndexOfSpritePaletteTag(0xDAC6); + gPokemonStorageSystemPtr->unk_11e4[1] = IndexOfSpritePaletteTag(0xDAD1); + + sub_809AACC(gUnknown_020384E4, gUnknown_020384E5, &x, &y); + spriteId = CreateSprite(&gSpriteTemplate_83BBC70, x, y, 6); + if (spriteId != MAX_SPRITES) + { + gPokemonStorageSystemPtr->unk_11c0 = &gSprites[spriteId]; + gPokemonStorageSystemPtr->unk_11c0->oam.paletteNum = gPokemonStorageSystemPtr->unk_11e4[gUnknown_020384E9]; + if (gUnknown_020384E6) + StartSpriteAnim(gPokemonStorageSystemPtr->unk_11c0, 3); + } + else + { + gPokemonStorageSystemPtr->unk_11c0 = NULL; + } + + if (gUnknown_020384E4 == 1) + { + subpriority = 12; + priority = 1; + } + else + { + subpriority = 20; + priority = 2; + } + + spriteId = CreateSprite(&gSpriteTemplate_83BBC88, 0, 0, subpriority); + if (spriteId != MAX_SPRITES) + { + gPokemonStorageSystemPtr->unk_11c4 = &gSprites[spriteId]; + gPokemonStorageSystemPtr->unk_11c4->oam.priority = priority; + if (gUnknown_020384E4) + gPokemonStorageSystemPtr->unk_11c4->invisible = 1; + } + else + { + gPokemonStorageSystemPtr->unk_11c4 = NULL; + } +} + +void sub_809CD88(void) +{ + gUnknown_020384E9 = !gUnknown_020384E9; + gPokemonStorageSystemPtr->unk_11c0->oam.paletteNum = gPokemonStorageSystemPtr->unk_11e4[gUnknown_020384E9]; +} + +void sub_809CDCC(void) +{ + gPokemonStorageSystemPtr->unk_11b8 = 0; + gPokemonStorageSystemPtr->unk_11b9 = 0; +} + +void sub_809CDEC(u8 arg0) +{ + u8 width; + u8 var0; + + if (gPokemonStorageSystemPtr->unk_11b8 < 7) + { + struct StorageText *storageText = &gPokemonStorageSystemPtr->unk_1180[gPokemonStorageSystemPtr->unk_11b8]; + storageText->text = gUnknown_083BBCA0[arg0]; + storageText->textId = arg0; + width = GetStringWidthInMenuWindow(storageText->text); + var0 = (width + 7) / 8; + if (var0 > gPokemonStorageSystemPtr->unk_11b9) + gPokemonStorageSystemPtr->unk_11b9 = var0; + + gPokemonStorageSystemPtr->unk_11b8++; + } +} + +s8 sub_809CE4C(u8 arg0) +{ + if (arg0 >= gPokemonStorageSystemPtr->unk_11b8) + return -1; + else + return gPokemonStorageSystemPtr->unk_1180[arg0].textId; +} + +void sub_809CE84(void) +{ + gPokemonStorageSystemPtr->unk_11bc = 14 - gPokemonStorageSystemPtr->unk_11b8 * 2; + gPokemonStorageSystemPtr->unk_11ba = 28 - gPokemonStorageSystemPtr->unk_11b9; + Menu_DrawStdWindowFrame(gPokemonStorageSystemPtr->unk_11ba, gPokemonStorageSystemPtr->unk_11bc, 29, 15); + Menu_PrintItems( + gPokemonStorageSystemPtr->unk_11ba + 1, + gPokemonStorageSystemPtr->unk_11bc + 1, + gPokemonStorageSystemPtr->unk_11b8, + gPokemonStorageSystemPtr->unk_1180); + InitMenu( + 0, + gPokemonStorageSystemPtr->unk_11ba + 1, + gPokemonStorageSystemPtr->unk_11bc + 1, + gPokemonStorageSystemPtr->unk_11b8, + 0, + gPokemonStorageSystemPtr->unk_11b9); +} + +#ifdef NONMATCHING // r4 and r5 are swapped throughout the entire function. +s16 sub_809CF30(void) +{ + int textId = -2; + + if (!(gMain.newKeys & A_BUTTON)) + { + if (gMain.newKeys & B_BUTTON) + { + PlaySE(5); + textId++; + } + + if (gMain.newKeys & DPAD_UP) + { + PlaySE(5); + Menu_MoveCursor(-1); + } + else if (gMain.newKeys & DPAD_DOWN) + { + PlaySE(5); + Menu_MoveCursor(1); + } + } + else + { + textId = Menu_GetCursorPos(); + } + + if (textId != -2) + { + Menu_DestroyCursor(); + Menu_EraseWindowRect( + gPokemonStorageSystemPtr->unk_11ba, + gPokemonStorageSystemPtr->unk_11bc, + 29, + 15); + } + + if (textId >= 0) + { + textId = gPokemonStorageSystemPtr->unk_1180[textId].textId; + } + + return textId; +} +#else +NAKED +s16 sub_809CF30(void) +{ + asm(".syntax unified\n\ + push {r4,r5,lr}\n\ + movs r5, 0x2\n\ + negs r5, r5\n\ + ldr r4, _0809CF6C @ =gMain\n\ + ldrh r1, [r4, 0x2E]\n\ + movs r0, 0x1\n\ + ands r0, r1\n\ + cmp r0, 0\n\ + bne _0809CF86\n\ + movs r0, 0x2\n\ + ands r0, r1\n\ + cmp r0, 0\n\ + beq _0809CF52\n\ + movs r0, 0x5\n\ + bl PlaySE\n\ + adds r5, 0x1\n\ +_0809CF52:\n\ + ldrh r1, [r4, 0x2E]\n\ + movs r0, 0x40\n\ + ands r0, r1\n\ + cmp r0, 0\n\ + beq _0809CF70\n\ + movs r0, 0x5\n\ + bl PlaySE\n\ + movs r0, 0x1\n\ + negs r0, r0\n\ + bl Menu_MoveCursor\n\ + b _0809CF8E\n\ + .align 2, 0\n\ +_0809CF6C: .4byte gMain\n\ +_0809CF70:\n\ + movs r0, 0x80\n\ + ands r0, r1\n\ + cmp r0, 0\n\ + beq _0809CF8E\n\ + movs r0, 0x5\n\ + bl PlaySE\n\ + movs r0, 0x1\n\ + bl Menu_MoveCursor\n\ + b _0809CF8E\n\ +_0809CF86:\n\ + bl Menu_GetCursorPos\n\ + lsls r0, 24\n\ + lsrs r5, r0, 24\n\ +_0809CF8E:\n\ + movs r0, 0x2\n\ + negs r0, r0\n\ + cmp r5, r0\n\ + beq _0809CFB2\n\ + bl Menu_DestroyCursor\n\ + ldr r0, _0809CFD0 @ =gPokemonStorageSystemPtr\n\ + ldr r1, [r0]\n\ + ldr r2, _0809CFD4 @ =0x000011ba\n\ + adds r0, r1, r2\n\ + ldrb r0, [r0]\n\ + adds r2, 0x2\n\ + adds r1, r2\n\ + ldrb r1, [r1]\n\ + movs r2, 0x1D\n\ + movs r3, 0xF\n\ + bl Menu_EraseWindowRect\n\ +_0809CFB2:\n\ + cmp r5, 0\n\ + blt _0809CFC4\n\ + ldr r0, _0809CFD0 @ =gPokemonStorageSystemPtr\n\ + ldr r0, [r0]\n\ + lsls r1, r5, 3\n\ + ldr r2, _0809CFD8 @ =0x00001184\n\ + adds r0, r2\n\ + adds r0, r1\n\ + ldr r5, [r0]\n\ +_0809CFC4:\n\ + lsls r0, r5, 16\n\ + asrs r0, 16\n\ + pop {r4,r5}\n\ + pop {r1}\n\ + bx r1\n\ + .align 2, 0\n\ +_0809CFD0: .4byte gPokemonStorageSystemPtr\n\ +_0809CFD4: .4byte 0x000011ba\n\ +_0809CFD8: .4byte 0x00001184\n\ + .syntax divided\n"); +} +#endif // NONMATCHING + +void sub_809CFDC(struct UnkStruct_2000020 *arg0, struct UnkStruct_2000028 *arg1, u8 arg2) +{ + gUnknown_020384EC = arg0; + arg0->unk_00 = arg1; + arg0->unk_05 = arg2; + arg0->unk_04 = 0; +} + +void sub_809CFF0(void) +{ + u16 i; + struct UnkStruct_2000028 *unkStruct; + + if (gUnknown_020384EC->unk_04) + { + for (i = 0; i < gUnknown_020384EC->unk_04; i++) + { + unkStruct = &gUnknown_020384EC->unk_00[i]; + unkStruct->unk_0c(unkStruct); + } + + gUnknown_020384EC->unk_04 = 0; + } +} + +bool8 sub_809D034(u8 *dest, u16 dLeft, u16 dTop, const u8 *src, u16 sLeft, u16 sTop, u16 width, u16 height) +{ + struct UnkStruct_2000028 *unkStruct; + + if (gUnknown_020384EC->unk_04 >= gUnknown_020384EC->unk_05) + return FALSE; + + unkStruct = &gUnknown_020384EC->unk_00[gUnknown_020384EC->unk_04++]; + unkStruct->unk_08 = width * 2; + unkStruct->unk_04 = dest + (dTop * 64) + (dLeft * 2); + unkStruct->unk_00 = src + (sTop * 64) + (sLeft * 2); + unkStruct->unk_0a = height; + unkStruct->unk_0c = sub_809D0BC; + return TRUE; +} + +void sub_809D0BC(struct UnkStruct_2000028 *unkStruct) +{ + u32 i; + const u8 *src = unkStruct->unk_00; + u8 *dest = unkStruct->unk_04; + int height = unkStruct->unk_0a; + int width = unkStruct->unk_08; + for (i = 0; i < height; i++) + { + CpuSet(src, dest, (width / 2) & 0x1FFFFF); + dest += 64; + src += 64; + } +} + +void sub_809D104(u8 *dest, u16 dLeft, u16 dTop, const u8 *src, u16 sLeft, u16 sTop, u16 width, u16 height) +{ + const u8 *from = src + (sTop * 64) + (sLeft * 2); + u8 *to = dest + (dTop * 64) + (dLeft * 2); + u8 *end = dest + (dTop + height) * 64; + int width2 = width * 2; + while (to < end) + { + CpuSet(from, to, (width2 / 2) & 0x1FFFFF); + to += 64; + from += 64; + } +} + +bool8 sub_809D16C(void *dest, u16 dLeft, u16 dTop, u16 width, u16 height) +{ + struct UnkStruct_2000028 *unkStruct; + + if (gUnknown_020384EC->unk_04 >= gUnknown_020384EC->unk_05) + return FALSE; -// Static ROM declarations + unkStruct = &gUnknown_020384EC->unk_00[gUnknown_020384EC->unk_04++]; + unkStruct->unk_08 = width * 2; + unkStruct->unk_04 = dest + ((dTop * 32) + dLeft) * 2; + unkStruct->unk_0a = height; + unkStruct->unk_0c = sub_809D1C4; + return TRUE; +} -// .rodata +void sub_809D1C4(struct UnkStruct_2000028 *unkStruct) +{ + u16 i; -// .text + for (i = 0; i < unkStruct->unk_0a; i++) + { + Dma3FillLarge_(0, unkStruct->unk_04, unkStruct->unk_08, 16); + unkStruct->unk_04 += 64; + } +} diff --git a/src/pokenav_before.c b/src/pokenav_before.c index 49df4863e..21394f348 100644 --- a/src/pokenav_before.c +++ b/src/pokenav_before.c @@ -19,6 +19,7 @@ #include "task.h" #include "text.h" #include "scanline_effect.h" +#include "pokemon_storage_system.h" struct UnknownPokenav0 { @@ -189,7 +190,6 @@ extern void sub_80EFC3C(void); extern void sub_80EF624(const u16 *, const u16 *, u8, u8, u16 *); extern void sub_80EF7D4(void); extern void sub_80EF54C(u8); -extern void sub_809D104(u16 *, u16, u16, const u8 *, u16, u16, u16, u16); extern void sub_80EF58C(u8); extern void sub_80F6FFC(); extern void sub_80F3294(); -- cgit v1.2.3 From e76b56b000739b418f04d286764652b101bbd8a8 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Tue, 24 Jul 2018 17:34:20 -0500 Subject: Merge pokemon_storage_system 4 and 5 --- ld_script.txt | 2 - src/pokemon_storage_system_3.c | 61 ++-- src/pokemon_storage_system_4.c | 755 +++++++++++++++++++++++++++++++++++++++ src/pokemon_storage_system_5.c | 775 ----------------------------------------- 4 files changed, 785 insertions(+), 808 deletions(-) delete mode 100644 src/pokemon_storage_system_5.c diff --git a/ld_script.txt b/ld_script.txt index 914a546b1..364cd4469 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -133,7 +133,6 @@ SECTIONS { src/pokemon_storage_system_2.o(.text); src/pokemon_storage_system_3.o(.text); src/pokemon_storage_system_4.o(.text); - src/pokemon_storage_system_5.o(.text); src/pokemon_icon.o(.text); src/pokemon_summary_screen.o(.text); src/script_movement.o(.text); @@ -557,7 +556,6 @@ SECTIONS { src/pokemon_storage_system_2.o(.rodata); src/pokemon_storage_system_3.o(.rodata); src/pokemon_storage_system_4.o(.rodata); - src/pokemon_storage_system_5.o(.rodata); data/pokemon_storage_system.o(.rodata); src/pokemon_icon.o(.rodata); src/pokemon_summary_screen.o(.rodata); diff --git a/src/pokemon_storage_system_3.c b/src/pokemon_storage_system_3.c index da26c6fc5..cbac7a504 100644 --- a/src/pokemon_storage_system_3.c +++ b/src/pokemon_storage_system_3.c @@ -23,6 +23,35 @@ static void PSS_DestroyMonIconSprite(struct Sprite *sprite); // .rodata const struct OamData gOamData_83B6F2C; +const struct SpriteTemplate gSpriteTemplate_83B6F14 = { + 0x000f, + 0xdac0, + &gOamData_83B6F2C, + gDummySpriteAnimTable, + NULL, + gDummySpriteAffineAnimTable, + SpriteCallbackDummy +}; + +const struct OamData gOamData_83B6F2C = { + .size = 2 +}; + +const union AffineAnimCmd gSpriteAffineAnim_83B6F34[] = { + AFFINEANIMCMD_FRAME(-2, -2, 0, 120), + AFFINEANIMCMD_END +}; + +const union AffineAnimCmd gSpriteAffineAnim_83B6F44[] = { + AFFINEANIMCMD_FRAME(16, 16, 0, 0), + AFFINEANIMCMD_FRAME(16, 16, 0, 15), + AFFINEANIMCMD_END +}; + +const union AffineAnimCmd *const gSpriteAffineAnimTable_83B6F5C[] = { + gSpriteAffineAnim_83B6F34, + gSpriteAffineAnim_83B6F44 +}; // .text @@ -481,8 +510,6 @@ bool8 sub_809971C(void) return TRUE; } -const union AffineAnimCmd *const gSpriteAffineAnimTable_83B6F5C[]; - void sub_809981C(u8 mode, u8 idx) { switch (mode) @@ -599,15 +626,7 @@ static void PSS_ForgetSpeciesIcon(u16 a0) static struct Sprite *PSS_SpawnMonIconSprite(u16 species, u32 personality, s16 x, s16 y, u8 priority, u8 subpriority) { - struct SpriteTemplate template = { - 0x000f, - 0xdac0, - &gOamData_83B6F2C, - gDummySpriteAnimTable, - NULL, - gDummySpriteAffineAnimTable, - SpriteCallbackDummy - }; + struct SpriteTemplate template = gSpriteTemplate_83B6F14; u16 tileNum; u8 spriteId; @@ -633,23 +652,3 @@ static void PSS_DestroyMonIconSprite(struct Sprite *sprite) PSS_ForgetSpeciesIcon(sprite->data[0]); DestroySprite(sprite); } - -const struct OamData gOamData_83B6F2C = { - .size = 2 -}; - -const union AffineAnimCmd gSpriteAffineAnim_83B6F34[] = { - AFFINEANIMCMD_FRAME(-2, -2, 0, 120), - AFFINEANIMCMD_END -}; - -const union AffineAnimCmd gSpriteAffineAnim_83B6F44[] = { - AFFINEANIMCMD_FRAME(16, 16, 0, 0), - AFFINEANIMCMD_FRAME(16, 16, 0, 15), - AFFINEANIMCMD_END -}; - -const union AffineAnimCmd *const gSpriteAffineAnimTable_83B6F5C[] = { - gSpriteAffineAnim_83B6F34, - gSpriteAffineAnim_83B6F44 -}; diff --git a/src/pokemon_storage_system_4.c b/src/pokemon_storage_system_4.c index 2d156c159..43aef277a 100644 --- a/src/pokemon_storage_system_4.c +++ b/src/pokemon_storage_system_4.c @@ -37,6 +37,7 @@ EWRAM_DATA u8 gUnknown_020384E7 = 0; EWRAM_DATA u8 gUnknown_020384E8 = 0; EWRAM_DATA u8 gUnknown_020384E9 = 0; EWRAM_DATA u8 gUnknown_020384EA = 0; +EWRAM_DATA struct UnkStruct_2000020 *gUnknown_020384EC = NULL; // Static ROM declarations @@ -76,6 +77,9 @@ bool8 sub_809CAB0(void); void sub_809CC04(void); void sub_809CD88(void); s8 sub_809CE4C(u8 a0); +void sub_809CA8C(void); +void sub_809D0BC(struct UnkStruct_2000028*); +void sub_809D1C4(struct UnkStruct_2000028*); // .rodata @@ -325,6 +329,14 @@ bool8 (*const gUnknown_083BBBC8[])(void) = { sub_809B1D8, sub_809B24C }; + +extern const struct SpriteSheet gHandCursorSpriteSheets[3]; +extern const struct SpritePalette gHandCursorSpritePalettes[3]; +extern const struct SpriteTemplate gSpriteTemplate_83BBC70; +extern const struct SpriteTemplate gSpriteTemplate_83BBC88; +extern const u8 *const gUnknown_083BBCA0[]; +extern struct PokemonStorageSystemFunc gUnknown_083BBBD4[]; + // .text void sub_8099BF8(u8 boxId) @@ -2847,3 +2859,746 @@ NAKED u8 sub_809C664(void) "\tbx r1"); } #endif + +u8 sub_809C85C(void) +{ + u8 retVal; + s8 var0; + register s8 var1 asm("r5"); // FAKEMATCHING: r5 and r6 become swapped without this register hack + + gPokemonStorageSystemPtr->unk_11df = 0; + gPokemonStorageSystemPtr->unk_11de = 0; + gPokemonStorageSystemPtr->unk_11e3 = 0; + + if (!(gMain.newAndRepeatedKeys & DPAD_UP)) + { + if (gMain.newAndRepeatedKeys & DPAD_DOWN) + { + retVal = 1; + var0 = 0; + var1 = 2; + } + else + { + if (gMain.heldKeys & DPAD_LEFT) + return 10; + if (gMain.heldKeys & DPAD_RIGHT) + return 9; + if (gSaveBlock2.optionsButtonMode == OPTIONS_BUTTON_MODE_LR) + { + if (gMain.heldKeys & L_BUTTON) + return 10; + if (gMain.heldKeys & R_BUTTON) + return 9; + } + + if (gMain.newKeys & A_BUTTON) + { + sub_809A860(0); + sub_809CA8C(); + return 7; + } + + if (gMain.newKeys & B_BUTTON) + return 16; + + if (gMain.newKeys & SELECT_BUTTON) + { + sub_809CD88(); + return 0; + } + + retVal = 0; + } + } + else + { + retVal = 1; + var0 = 3; + var1 = 0; + gPokemonStorageSystemPtr->unk_11e3 = 1; + } + + if (retVal) + { + if (var0 != 2) + sub_809A860(0); + sub_809AF18(var0, var1); + return retVal; + } + + return retVal; +} + +#ifdef NONMATCHING +u8 sub_809C944(void) +{ + u8 r6; + s8 var0 = gUnknown_020384E4; + s8 var1 = gUnknown_020384E5; + + gPokemonStorageSystemPtr->unk_11df = 0; + gPokemonStorageSystemPtr->unk_11de = 0; + gPokemonStorageSystemPtr->unk_11e3 = 0; + + if (!(gMain.newAndRepeatedKeys & DPAD_UP)) + { + if (gMain.newAndRepeatedKeys & (DPAD_DOWN | START_BUTTON)) + { + r6 = 1; + var0 = 2; + var1 = 0; + gPokemonStorageSystemPtr->unk_11e3 = 1; + } + else if (gMain.newAndRepeatedKeys & DPAD_LEFT) + { + r6 = 1; + var1 -= 1; + if (var1 < 0) + { + gPokemonStorageSystemPtr->unk_11df = -1; + var1 = 1; + } + } + else if (gMain.newAndRepeatedKeys & DPAD_RIGHT) + { + r6 = 1; + var1 += 1; + if (var1 > 1) + { + gPokemonStorageSystemPtr->unk_11df = 1; + var1 = 0; + } + } + else if (gMain.newKeys & A_BUTTON) + { + return var1 == 0 ? 5 : 4; + } + else if (gMain.newKeys & B_BUTTON) + { + return 16; + } + else if (gMain.newKeys & SELECT_BUTTON) + { + sub_809CD88(); + return 0; + } + else + { + r6 = 0; + } + } + else + { + r6 = 1; + var0 = 0; + gPokemonStorageSystemPtr->unk_11de = -1; + var1 = !gUnknown_020384E5 ? 24 : 29; + gPokemonStorageSystemPtr->unk_11e3 = 1; + } + + if (r6) + { + sub_809AF18(var0, var1); + } + + return r6; +} +#else +NAKED +u8 sub_809C944(void) +{ + asm(".syntax unified\n\ + push {r4-r7,lr}\n\ + ldr r0, _0809C988 @ =gUnknown_020384E4\n\ + ldrb r0, [r0]\n\ + mov r12, r0\n\ + ldr r7, _0809C98C @ =gUnknown_020384E5\n\ + ldrb r3, [r7]\n\ + ldr r0, _0809C990 @ =gPokemonStorageSystemPtr\n\ + ldr r1, [r0]\n\ + ldr r0, _0809C994 @ =0x000011df\n\ + adds r5, r1, r0\n\ + movs r0, 0\n\ + strb r0, [r5]\n\ + ldr r2, _0809C998 @ =0x000011de\n\ + adds r4, r1, r2\n\ + strb r0, [r4]\n\ + adds r2, 0x5\n\ + adds r1, r2\n\ + strb r0, [r1]\n\ + ldr r6, _0809C99C @ =gMain\n\ + ldrh r2, [r6, 0x30]\n\ + movs r0, 0x40\n\ + ands r0, r2\n\ + cmp r0, 0\n\ + bne _0809CA14\n\ + movs r0, 0x88\n\ + ands r0, r2\n\ + cmp r0, 0\n\ + beq _0809C9A0\n\ + movs r6, 0x1\n\ + movs r0, 0x2\n\ + mov r12, r0\n\ + movs r3, 0\n\ + b _0809CA2A\n\ + .align 2, 0\n\ +_0809C988: .4byte gUnknown_020384E4\n\ +_0809C98C: .4byte gUnknown_020384E5\n\ +_0809C990: .4byte gPokemonStorageSystemPtr\n\ +_0809C994: .4byte 0x000011df\n\ +_0809C998: .4byte 0x000011de\n\ +_0809C99C: .4byte gMain\n\ +_0809C9A0:\n\ + movs r0, 0x20\n\ + ands r0, r2\n\ + cmp r0, 0\n\ + beq _0809C9C0\n\ + movs r6, 0x1\n\ + lsls r0, r3, 24\n\ + movs r1, 0xFF\n\ + lsls r1, 24\n\ + adds r0, r1\n\ + lsrs r3, r0, 24\n\ + cmp r0, 0\n\ + bge _0809CA2C\n\ + movs r0, 0xFF\n\ + strb r0, [r5]\n\ + movs r3, 0x1\n\ + b _0809CA2C\n\ +_0809C9C0:\n\ + movs r0, 0x10\n\ + ands r0, r2\n\ + cmp r0, 0\n\ + beq _0809C9E0\n\ + movs r6, 0x1\n\ + lsls r0, r3, 24\n\ + movs r2, 0x80\n\ + lsls r2, 17\n\ + adds r0, r2\n\ + lsrs r3, r0, 24\n\ + asrs r0, 24\n\ + cmp r0, 0x1\n\ + ble _0809CA2C\n\ + strb r6, [r5]\n\ + movs r3, 0\n\ + b _0809CA2C\n\ +_0809C9E0:\n\ + ldrh r1, [r6, 0x2E]\n\ + movs r0, 0x1\n\ + ands r0, r1\n\ + cmp r0, 0\n\ + beq _0809C9F4\n\ + movs r0, 0x4\n\ + cmp r3, 0\n\ + bne _0809CA3A\n\ + movs r0, 0x5\n\ + b _0809CA3A\n\ +_0809C9F4:\n\ + movs r0, 0x2\n\ + ands r0, r1\n\ + cmp r0, 0\n\ + beq _0809CA00\n\ + movs r0, 0x10\n\ + b _0809CA3A\n\ +_0809CA00:\n\ + movs r0, 0x4\n\ + ands r0, r1\n\ + cmp r0, 0\n\ + beq _0809CA10\n\ + bl sub_809CD88\n\ + movs r0, 0\n\ + b _0809CA3A\n\ +_0809CA10:\n\ + movs r6, 0\n\ + b _0809CA38\n\ +_0809CA14:\n\ + movs r6, 0x1\n\ + movs r0, 0\n\ + mov r12, r0\n\ + movs r0, 0xFF\n\ + strb r0, [r4]\n\ + movs r0, 0\n\ + ldrsb r0, [r7, r0]\n\ + movs r3, 0x1D\n\ + cmp r0, 0\n\ + bne _0809CA2A\n\ + movs r3, 0x18\n\ +_0809CA2A:\n\ + strb r6, [r1]\n\ +_0809CA2C:\n\ + cmp r6, 0\n\ + beq _0809CA38\n\ + mov r0, r12\n\ + adds r1, r3, 0\n\ + bl sub_809AF18\n\ +_0809CA38:\n\ + adds r0, r6, 0\n\ +_0809CA3A:\n\ + pop {r4-r7}\n\ + pop {r1}\n\ + bx r1\n\ + .syntax divided\n"); +} +#endif // NONMATCHING + +u8 sub_809CA40(void) +{ + u16 i = 0; + while (gUnknown_083BBBD4[i].func != NULL) + { + if (gUnknown_083BBBD4[i].unk4 == gUnknown_020384E4) + return gUnknown_083BBBD4[i].func(); + i++; + } + + return 0; +} + +void sub_809CA8C(void) +{ + sub_809CDCC(); + sub_809CDEC(9); + sub_809CDEC(10); + sub_809CDEC(11); + sub_809CDEC(0); +} + +#if DEBUG +u8 debug_sub_80AA40C(void) +{ + if (sub_809AB8C()) + { + sub_809CDCC(); + sub_809CDEC(32); + sub_809CDEC(6); + return 1; + } + + return 0; +} +#endif + +bool8 sub_809CAB0(void) +{ + u16 var0; + +#if DEBUG + if (unk_2038790) + return debug_sub_80AA40C(); +#endif + + sub_809CDCC(); + var0 = sub_809AB8C(); + + switch (gPokemonStorageSystemPtr->unk_0005) + { + case 1: + if (var0) + sub_809CDEC(1); + else + return 0; + break; + case 0: + if (var0) + sub_809CDEC(2); + else + return 0; + break; + case 2: + if (gUnknown_020384E6) + { + if (var0) + sub_809CDEC(4); + else + sub_809CDEC(5); + } + else + { + if (var0) + sub_809CDEC(3); + else + return 0; + } + break; + default: + return 0; + } + + sub_809CDEC(6); + if (gPokemonStorageSystemPtr->unk_0005 == 2) + { + if (!gUnknown_020384E4) + sub_809CDEC(2); + else + sub_809CDEC(1); + } + + sub_809CDEC(8); + sub_809CDEC(7); + sub_809CDEC(0); + return 1; +} + +void sub_809CB74(struct Sprite *sprite) +{ + sprite->pos1.x = gPokemonStorageSystemPtr->unk_11c0->pos1.x; + sprite->pos1.y = gPokemonStorageSystemPtr->unk_11c0->pos1.y + 20; +} + +void sub_809CB94(struct Pokemon *mon) +{ + if (gUnknown_020384E4 == 1) + { + mon->box = gPlayerParty[gUnknown_020384E5].box; + } + else + { + u8 boxId = get_preferred_box(); + mon->box = gPokemonStorage.boxes[boxId][gUnknown_020384E5]; + } +} + +void sub_809CC04(void) +{ + u16 x, y; + u8 spriteId; + int priority, subpriority; + struct SpriteSheet spriteSheets[3]; + struct SpritePalette spritePalettes[3]; + + memcpy(spriteSheets, gHandCursorSpriteSheets, 24); + memcpy(spritePalettes, gHandCursorSpritePalettes, 24); + LoadSpriteSheets(spriteSheets); + LoadSpritePalettes(spritePalettes); + gPokemonStorageSystemPtr->unk_11e4[0] = IndexOfSpritePaletteTag(0xDAC6); + gPokemonStorageSystemPtr->unk_11e4[1] = IndexOfSpritePaletteTag(0xDAD1); + + sub_809AACC(gUnknown_020384E4, gUnknown_020384E5, &x, &y); + spriteId = CreateSprite(&gSpriteTemplate_83BBC70, x, y, 6); + if (spriteId != MAX_SPRITES) + { + gPokemonStorageSystemPtr->unk_11c0 = &gSprites[spriteId]; + gPokemonStorageSystemPtr->unk_11c0->oam.paletteNum = gPokemonStorageSystemPtr->unk_11e4[gUnknown_020384E9]; + if (gUnknown_020384E6) + StartSpriteAnim(gPokemonStorageSystemPtr->unk_11c0, 3); + } + else + { + gPokemonStorageSystemPtr->unk_11c0 = NULL; + } + + if (gUnknown_020384E4 == 1) + { + subpriority = 12; + priority = 1; + } + else + { + subpriority = 20; + priority = 2; + } + + spriteId = CreateSprite(&gSpriteTemplate_83BBC88, 0, 0, subpriority); + if (spriteId != MAX_SPRITES) + { + gPokemonStorageSystemPtr->unk_11c4 = &gSprites[spriteId]; + gPokemonStorageSystemPtr->unk_11c4->oam.priority = priority; + if (gUnknown_020384E4) + gPokemonStorageSystemPtr->unk_11c4->invisible = 1; + } + else + { + gPokemonStorageSystemPtr->unk_11c4 = NULL; + } +} + +void sub_809CD88(void) +{ + gUnknown_020384E9 = !gUnknown_020384E9; + gPokemonStorageSystemPtr->unk_11c0->oam.paletteNum = gPokemonStorageSystemPtr->unk_11e4[gUnknown_020384E9]; +} + +void sub_809CDCC(void) +{ + gPokemonStorageSystemPtr->unk_11b8 = 0; + gPokemonStorageSystemPtr->unk_11b9 = 0; +} + +void sub_809CDEC(u8 arg0) +{ + u8 width; + u8 var0; + + if (gPokemonStorageSystemPtr->unk_11b8 < 7) + { + struct StorageText *storageText = &gPokemonStorageSystemPtr->unk_1180[gPokemonStorageSystemPtr->unk_11b8]; + storageText->text = gUnknown_083BBCA0[arg0]; + storageText->textId = arg0; + width = GetStringWidthInMenuWindow(storageText->text); + var0 = (width + 7) / 8; + if (var0 > gPokemonStorageSystemPtr->unk_11b9) + gPokemonStorageSystemPtr->unk_11b9 = var0; + + gPokemonStorageSystemPtr->unk_11b8++; + } +} + +s8 sub_809CE4C(u8 arg0) +{ + if (arg0 >= gPokemonStorageSystemPtr->unk_11b8) + return -1; + else + return gPokemonStorageSystemPtr->unk_1180[arg0].textId; +} + +void sub_809CE84(void) +{ + gPokemonStorageSystemPtr->unk_11bc = 14 - gPokemonStorageSystemPtr->unk_11b8 * 2; + gPokemonStorageSystemPtr->unk_11ba = 28 - gPokemonStorageSystemPtr->unk_11b9; + Menu_DrawStdWindowFrame(gPokemonStorageSystemPtr->unk_11ba, gPokemonStorageSystemPtr->unk_11bc, 29, 15); + Menu_PrintItems( + gPokemonStorageSystemPtr->unk_11ba + 1, + gPokemonStorageSystemPtr->unk_11bc + 1, + gPokemonStorageSystemPtr->unk_11b8, + gPokemonStorageSystemPtr->unk_1180); + InitMenu( + 0, + gPokemonStorageSystemPtr->unk_11ba + 1, + gPokemonStorageSystemPtr->unk_11bc + 1, + gPokemonStorageSystemPtr->unk_11b8, + 0, + gPokemonStorageSystemPtr->unk_11b9); +} + +#ifdef NONMATCHING // r4 and r5 are swapped throughout the entire function. +s16 sub_809CF30(void) +{ + int textId = -2; + + if (!(gMain.newKeys & A_BUTTON)) + { + if (gMain.newKeys & B_BUTTON) + { + PlaySE(5); + textId++; + } + + if (gMain.newKeys & DPAD_UP) + { + PlaySE(5); + Menu_MoveCursor(-1); + } + else if (gMain.newKeys & DPAD_DOWN) + { + PlaySE(5); + Menu_MoveCursor(1); + } + } + else + { + textId = Menu_GetCursorPos(); + } + + if (textId != -2) + { + Menu_DestroyCursor(); + Menu_EraseWindowRect( + gPokemonStorageSystemPtr->unk_11ba, + gPokemonStorageSystemPtr->unk_11bc, + 29, + 15); + } + + if (textId >= 0) + { + textId = gPokemonStorageSystemPtr->unk_1180[textId].textId; + } + + return textId; +} +#else +NAKED +s16 sub_809CF30(void) +{ + asm(".syntax unified\n\ + push {r4,r5,lr}\n\ + movs r5, 0x2\n\ + negs r5, r5\n\ + ldr r4, _0809CF6C @ =gMain\n\ + ldrh r1, [r4, 0x2E]\n\ + movs r0, 0x1\n\ + ands r0, r1\n\ + cmp r0, 0\n\ + bne _0809CF86\n\ + movs r0, 0x2\n\ + ands r0, r1\n\ + cmp r0, 0\n\ + beq _0809CF52\n\ + movs r0, 0x5\n\ + bl PlaySE\n\ + adds r5, 0x1\n\ +_0809CF52:\n\ + ldrh r1, [r4, 0x2E]\n\ + movs r0, 0x40\n\ + ands r0, r1\n\ + cmp r0, 0\n\ + beq _0809CF70\n\ + movs r0, 0x5\n\ + bl PlaySE\n\ + movs r0, 0x1\n\ + negs r0, r0\n\ + bl Menu_MoveCursor\n\ + b _0809CF8E\n\ + .align 2, 0\n\ +_0809CF6C: .4byte gMain\n\ +_0809CF70:\n\ + movs r0, 0x80\n\ + ands r0, r1\n\ + cmp r0, 0\n\ + beq _0809CF8E\n\ + movs r0, 0x5\n\ + bl PlaySE\n\ + movs r0, 0x1\n\ + bl Menu_MoveCursor\n\ + b _0809CF8E\n\ +_0809CF86:\n\ + bl Menu_GetCursorPos\n\ + lsls r0, 24\n\ + lsrs r5, r0, 24\n\ +_0809CF8E:\n\ + movs r0, 0x2\n\ + negs r0, r0\n\ + cmp r5, r0\n\ + beq _0809CFB2\n\ + bl Menu_DestroyCursor\n\ + ldr r0, _0809CFD0 @ =gPokemonStorageSystemPtr\n\ + ldr r1, [r0]\n\ + ldr r2, _0809CFD4 @ =0x000011ba\n\ + adds r0, r1, r2\n\ + ldrb r0, [r0]\n\ + adds r2, 0x2\n\ + adds r1, r2\n\ + ldrb r1, [r1]\n\ + movs r2, 0x1D\n\ + movs r3, 0xF\n\ + bl Menu_EraseWindowRect\n\ +_0809CFB2:\n\ + cmp r5, 0\n\ + blt _0809CFC4\n\ + ldr r0, _0809CFD0 @ =gPokemonStorageSystemPtr\n\ + ldr r0, [r0]\n\ + lsls r1, r5, 3\n\ + ldr r2, _0809CFD8 @ =0x00001184\n\ + adds r0, r2\n\ + adds r0, r1\n\ + ldr r5, [r0]\n\ +_0809CFC4:\n\ + lsls r0, r5, 16\n\ + asrs r0, 16\n\ + pop {r4,r5}\n\ + pop {r1}\n\ + bx r1\n\ + .align 2, 0\n\ +_0809CFD0: .4byte gPokemonStorageSystemPtr\n\ +_0809CFD4: .4byte 0x000011ba\n\ +_0809CFD8: .4byte 0x00001184\n\ + .syntax divided\n"); +} +#endif // NONMATCHING + +void sub_809CFDC(struct UnkStruct_2000020 *arg0, struct UnkStruct_2000028 *arg1, u8 arg2) +{ + gUnknown_020384EC = arg0; + arg0->unk_00 = arg1; + arg0->unk_05 = arg2; + arg0->unk_04 = 0; +} + +void sub_809CFF0(void) +{ + u16 i; + struct UnkStruct_2000028 *unkStruct; + + if (gUnknown_020384EC->unk_04) + { + for (i = 0; i < gUnknown_020384EC->unk_04; i++) + { + unkStruct = &gUnknown_020384EC->unk_00[i]; + unkStruct->unk_0c(unkStruct); + } + + gUnknown_020384EC->unk_04 = 0; + } +} + +bool8 sub_809D034(u8 *dest, u16 dLeft, u16 dTop, const u8 *src, u16 sLeft, u16 sTop, u16 width, u16 height) +{ + struct UnkStruct_2000028 *unkStruct; + + if (gUnknown_020384EC->unk_04 >= gUnknown_020384EC->unk_05) + return FALSE; + + unkStruct = &gUnknown_020384EC->unk_00[gUnknown_020384EC->unk_04++]; + unkStruct->unk_08 = width * 2; + unkStruct->unk_04 = dest + (dTop * 64) + (dLeft * 2); + unkStruct->unk_00 = src + (sTop * 64) + (sLeft * 2); + unkStruct->unk_0a = height; + unkStruct->unk_0c = sub_809D0BC; + return TRUE; +} + +void sub_809D0BC(struct UnkStruct_2000028 *unkStruct) +{ + u32 i; + const u8 *src = unkStruct->unk_00; + u8 *dest = unkStruct->unk_04; + int height = unkStruct->unk_0a; + int width = unkStruct->unk_08; + for (i = 0; i < height; i++) + { + CpuSet(src, dest, (width / 2) & 0x1FFFFF); + dest += 64; + src += 64; + } +} + +void sub_809D104(u8 *dest, u16 dLeft, u16 dTop, const u8 *src, u16 sLeft, u16 sTop, u16 width, u16 height) +{ + const u8 *from = src + (sTop * 64) + (sLeft * 2); + u8 *to = dest + (dTop * 64) + (dLeft * 2); + u8 *end = dest + (dTop + height) * 64; + int width2 = width * 2; + while (to < end) + { + CpuSet(from, to, (width2 / 2) & 0x1FFFFF); + to += 64; + from += 64; + } +} + +bool8 sub_809D16C(void *dest, u16 dLeft, u16 dTop, u16 width, u16 height) +{ + struct UnkStruct_2000028 *unkStruct; + + if (gUnknown_020384EC->unk_04 >= gUnknown_020384EC->unk_05) + return FALSE; + + unkStruct = &gUnknown_020384EC->unk_00[gUnknown_020384EC->unk_04++]; + unkStruct->unk_08 = width * 2; + unkStruct->unk_04 = dest + ((dTop * 32) + dLeft) * 2; + unkStruct->unk_0a = height; + unkStruct->unk_0c = sub_809D1C4; + return TRUE; +} + +void sub_809D1C4(struct UnkStruct_2000028 *unkStruct) +{ + u16 i; + + for (i = 0; i < unkStruct->unk_0a; i++) + { + Dma3FillLarge_(0, unkStruct->unk_04, unkStruct->unk_08, 16); + unkStruct->unk_04 += 64; + } +} diff --git a/src/pokemon_storage_system_5.c b/src/pokemon_storage_system_5.c deleted file mode 100644 index 8848800ab..000000000 --- a/src/pokemon_storage_system_5.c +++ /dev/null @@ -1,775 +0,0 @@ -#include "global.h" -#include "main.h" -#include "menu.h" -#include "pokemon_storage_system.h" -#include "sound.h" - -EWRAM_DATA struct UnkStruct_2000020 *gUnknown_020384EC = NULL; - -extern s8 gUnknown_020384E4; -extern s8 gUnknown_020384E5; -extern bool8 gUnknown_020384E6; -extern u8 gUnknown_020384E9; - -#if DEBUG -extern u8 unk_2038790; -#endif - -extern const struct SpriteSheet gHandCursorSpriteSheets[3]; -extern const struct SpritePalette gHandCursorSpritePalettes[3]; -extern const struct SpriteTemplate gSpriteTemplate_83BBC70; -extern const struct SpriteTemplate gSpriteTemplate_83BBC88; -extern const u8 *const gUnknown_083BBCA0[]; - -extern struct PokemonStorageSystemFunc gUnknown_083BBBD4[]; - -void sub_809AF18(u8 a0, u8 a1); -void sub_809CA8C(void); -void sub_809CD88(void); -u16 sub_809AB8C(void); -void sub_809AACC(u8 a0, u8 a1, u16 *a2, u16 *a3); -void sub_809D0BC(struct UnkStruct_2000028*); -void sub_809D1C4(struct UnkStruct_2000028*); - -u8 sub_809C85C(void) -{ - u8 retVal; - s8 var0; - register s8 var1 asm("r5"); // FAKEMATCHING: r5 and r6 become swapped without this register hack - - gPokemonStorageSystemPtr->unk_11df = 0; - gPokemonStorageSystemPtr->unk_11de = 0; - gPokemonStorageSystemPtr->unk_11e3 = 0; - - if (!(gMain.newAndRepeatedKeys & DPAD_UP)) - { - if (gMain.newAndRepeatedKeys & DPAD_DOWN) - { - retVal = 1; - var0 = 0; - var1 = 2; - } - else - { - if (gMain.heldKeys & DPAD_LEFT) - return 10; - if (gMain.heldKeys & DPAD_RIGHT) - return 9; - if (gSaveBlock2.optionsButtonMode == OPTIONS_BUTTON_MODE_LR) - { - if (gMain.heldKeys & L_BUTTON) - return 10; - if (gMain.heldKeys & R_BUTTON) - return 9; - } - - if (gMain.newKeys & A_BUTTON) - { - sub_809A860(0); - sub_809CA8C(); - return 7; - } - - if (gMain.newKeys & B_BUTTON) - return 16; - - if (gMain.newKeys & SELECT_BUTTON) - { - sub_809CD88(); - return 0; - } - - retVal = 0; - } - } - else - { - retVal = 1; - var0 = 3; - var1 = 0; - gPokemonStorageSystemPtr->unk_11e3 = 1; - } - - if (retVal) - { - if (var0 != 2) - sub_809A860(0); - sub_809AF18(var0, var1); - return retVal; - } - - return retVal; -} - -#ifdef NONMATCHING -u8 sub_809C944(void) -{ - u8 r6; - s8 var0 = gUnknown_020384E4; - s8 var1 = gUnknown_020384E5; - - gPokemonStorageSystemPtr->unk_11df = 0; - gPokemonStorageSystemPtr->unk_11de = 0; - gPokemonStorageSystemPtr->unk_11e3 = 0; - - if (!(gMain.newAndRepeatedKeys & DPAD_UP)) - { - if (gMain.newAndRepeatedKeys & (DPAD_DOWN | START_BUTTON)) - { - r6 = 1; - var0 = 2; - var1 = 0; - gPokemonStorageSystemPtr->unk_11e3 = 1; - } - else if (gMain.newAndRepeatedKeys & DPAD_LEFT) - { - r6 = 1; - var1 -= 1; - if (var1 < 0) - { - gPokemonStorageSystemPtr->unk_11df = -1; - var1 = 1; - } - } - else if (gMain.newAndRepeatedKeys & DPAD_RIGHT) - { - r6 = 1; - var1 += 1; - if (var1 > 1) - { - gPokemonStorageSystemPtr->unk_11df = 1; - var1 = 0; - } - } - else if (gMain.newKeys & A_BUTTON) - { - return var1 == 0 ? 5 : 4; - } - else if (gMain.newKeys & B_BUTTON) - { - return 16; - } - else if (gMain.newKeys & SELECT_BUTTON) - { - sub_809CD88(); - return 0; - } - else - { - r6 = 0; - } - } - else - { - r6 = 1; - var0 = 0; - gPokemonStorageSystemPtr->unk_11de = -1; - var1 = !gUnknown_020384E5 ? 24 : 29; - gPokemonStorageSystemPtr->unk_11e3 = 1; - } - - if (r6) - { - sub_809AF18(var0, var1); - } - - return r6; -} -#else -NAKED -u8 sub_809C944(void) -{ - asm(".syntax unified\n\ - push {r4-r7,lr}\n\ - ldr r0, _0809C988 @ =gUnknown_020384E4\n\ - ldrb r0, [r0]\n\ - mov r12, r0\n\ - ldr r7, _0809C98C @ =gUnknown_020384E5\n\ - ldrb r3, [r7]\n\ - ldr r0, _0809C990 @ =gPokemonStorageSystemPtr\n\ - ldr r1, [r0]\n\ - ldr r0, _0809C994 @ =0x000011df\n\ - adds r5, r1, r0\n\ - movs r0, 0\n\ - strb r0, [r5]\n\ - ldr r2, _0809C998 @ =0x000011de\n\ - adds r4, r1, r2\n\ - strb r0, [r4]\n\ - adds r2, 0x5\n\ - adds r1, r2\n\ - strb r0, [r1]\n\ - ldr r6, _0809C99C @ =gMain\n\ - ldrh r2, [r6, 0x30]\n\ - movs r0, 0x40\n\ - ands r0, r2\n\ - cmp r0, 0\n\ - bne _0809CA14\n\ - movs r0, 0x88\n\ - ands r0, r2\n\ - cmp r0, 0\n\ - beq _0809C9A0\n\ - movs r6, 0x1\n\ - movs r0, 0x2\n\ - mov r12, r0\n\ - movs r3, 0\n\ - b _0809CA2A\n\ - .align 2, 0\n\ -_0809C988: .4byte gUnknown_020384E4\n\ -_0809C98C: .4byte gUnknown_020384E5\n\ -_0809C990: .4byte gPokemonStorageSystemPtr\n\ -_0809C994: .4byte 0x000011df\n\ -_0809C998: .4byte 0x000011de\n\ -_0809C99C: .4byte gMain\n\ -_0809C9A0:\n\ - movs r0, 0x20\n\ - ands r0, r2\n\ - cmp r0, 0\n\ - beq _0809C9C0\n\ - movs r6, 0x1\n\ - lsls r0, r3, 24\n\ - movs r1, 0xFF\n\ - lsls r1, 24\n\ - adds r0, r1\n\ - lsrs r3, r0, 24\n\ - cmp r0, 0\n\ - bge _0809CA2C\n\ - movs r0, 0xFF\n\ - strb r0, [r5]\n\ - movs r3, 0x1\n\ - b _0809CA2C\n\ -_0809C9C0:\n\ - movs r0, 0x10\n\ - ands r0, r2\n\ - cmp r0, 0\n\ - beq _0809C9E0\n\ - movs r6, 0x1\n\ - lsls r0, r3, 24\n\ - movs r2, 0x80\n\ - lsls r2, 17\n\ - adds r0, r2\n\ - lsrs r3, r0, 24\n\ - asrs r0, 24\n\ - cmp r0, 0x1\n\ - ble _0809CA2C\n\ - strb r6, [r5]\n\ - movs r3, 0\n\ - b _0809CA2C\n\ -_0809C9E0:\n\ - ldrh r1, [r6, 0x2E]\n\ - movs r0, 0x1\n\ - ands r0, r1\n\ - cmp r0, 0\n\ - beq _0809C9F4\n\ - movs r0, 0x4\n\ - cmp r3, 0\n\ - bne _0809CA3A\n\ - movs r0, 0x5\n\ - b _0809CA3A\n\ -_0809C9F4:\n\ - movs r0, 0x2\n\ - ands r0, r1\n\ - cmp r0, 0\n\ - beq _0809CA00\n\ - movs r0, 0x10\n\ - b _0809CA3A\n\ -_0809CA00:\n\ - movs r0, 0x4\n\ - ands r0, r1\n\ - cmp r0, 0\n\ - beq _0809CA10\n\ - bl sub_809CD88\n\ - movs r0, 0\n\ - b _0809CA3A\n\ -_0809CA10:\n\ - movs r6, 0\n\ - b _0809CA38\n\ -_0809CA14:\n\ - movs r6, 0x1\n\ - movs r0, 0\n\ - mov r12, r0\n\ - movs r0, 0xFF\n\ - strb r0, [r4]\n\ - movs r0, 0\n\ - ldrsb r0, [r7, r0]\n\ - movs r3, 0x1D\n\ - cmp r0, 0\n\ - bne _0809CA2A\n\ - movs r3, 0x18\n\ -_0809CA2A:\n\ - strb r6, [r1]\n\ -_0809CA2C:\n\ - cmp r6, 0\n\ - beq _0809CA38\n\ - mov r0, r12\n\ - adds r1, r3, 0\n\ - bl sub_809AF18\n\ -_0809CA38:\n\ - adds r0, r6, 0\n\ -_0809CA3A:\n\ - pop {r4-r7}\n\ - pop {r1}\n\ - bx r1\n\ - .syntax divided\n"); -} -#endif // NONMATCHING - -u8 sub_809CA40(void) -{ - u16 i = 0; - while (gUnknown_083BBBD4[i].func != NULL) - { - if (gUnknown_083BBBD4[i].unk4 == gUnknown_020384E4) - return gUnknown_083BBBD4[i].func(); - i++; - } - - return 0; -} - -void sub_809CA8C(void) -{ - sub_809CDCC(); - sub_809CDEC(9); - sub_809CDEC(10); - sub_809CDEC(11); - sub_809CDEC(0); -} - -#if DEBUG -u8 debug_sub_80AA40C(void) -{ - if (sub_809AB8C()) - { - sub_809CDCC(); - sub_809CDEC(32); - sub_809CDEC(6); - return 1; - } - - return 0; -} -#endif - -bool8 sub_809CAB0(void) -{ - u16 var0; - -#if DEBUG - if (unk_2038790) - return debug_sub_80AA40C(); -#endif - - sub_809CDCC(); - var0 = sub_809AB8C(); - - switch (gPokemonStorageSystemPtr->unk_0005) - { - case 1: - if (var0) - sub_809CDEC(1); - else - return 0; - break; - case 0: - if (var0) - sub_809CDEC(2); - else - return 0; - break; - case 2: - if (gUnknown_020384E6) - { - if (var0) - sub_809CDEC(4); - else - sub_809CDEC(5); - } - else - { - if (var0) - sub_809CDEC(3); - else - return 0; - } - break; - default: - return 0; - } - - sub_809CDEC(6); - if (gPokemonStorageSystemPtr->unk_0005 == 2) - { - if (!gUnknown_020384E4) - sub_809CDEC(2); - else - sub_809CDEC(1); - } - - sub_809CDEC(8); - sub_809CDEC(7); - sub_809CDEC(0); - return 1; -} - -void sub_809CB74(struct Sprite *sprite) -{ - sprite->pos1.x = gPokemonStorageSystemPtr->unk_11c0->pos1.x; - sprite->pos1.y = gPokemonStorageSystemPtr->unk_11c0->pos1.y + 20; -} - -void sub_809CB94(struct Pokemon *mon) -{ - if (gUnknown_020384E4 == 1) - { - mon->box = gPlayerParty[gUnknown_020384E5].box; - } - else - { - u8 boxId = get_preferred_box(); - mon->box = gPokemonStorage.boxes[boxId][gUnknown_020384E5]; - } -} - -void sub_809CC04(void) -{ - u16 x, y; - u8 spriteId; - int priority, subpriority; - struct SpriteSheet spriteSheets[3]; - struct SpritePalette spritePalettes[3]; - - memcpy(spriteSheets, gHandCursorSpriteSheets, 24); - memcpy(spritePalettes, gHandCursorSpritePalettes, 24); - LoadSpriteSheets(spriteSheets); - LoadSpritePalettes(spritePalettes); - gPokemonStorageSystemPtr->unk_11e4[0] = IndexOfSpritePaletteTag(0xDAC6); - gPokemonStorageSystemPtr->unk_11e4[1] = IndexOfSpritePaletteTag(0xDAD1); - - sub_809AACC(gUnknown_020384E4, gUnknown_020384E5, &x, &y); - spriteId = CreateSprite(&gSpriteTemplate_83BBC70, x, y, 6); - if (spriteId != MAX_SPRITES) - { - gPokemonStorageSystemPtr->unk_11c0 = &gSprites[spriteId]; - gPokemonStorageSystemPtr->unk_11c0->oam.paletteNum = gPokemonStorageSystemPtr->unk_11e4[gUnknown_020384E9]; - if (gUnknown_020384E6) - StartSpriteAnim(gPokemonStorageSystemPtr->unk_11c0, 3); - } - else - { - gPokemonStorageSystemPtr->unk_11c0 = NULL; - } - - if (gUnknown_020384E4 == 1) - { - subpriority = 12; - priority = 1; - } - else - { - subpriority = 20; - priority = 2; - } - - spriteId = CreateSprite(&gSpriteTemplate_83BBC88, 0, 0, subpriority); - if (spriteId != MAX_SPRITES) - { - gPokemonStorageSystemPtr->unk_11c4 = &gSprites[spriteId]; - gPokemonStorageSystemPtr->unk_11c4->oam.priority = priority; - if (gUnknown_020384E4) - gPokemonStorageSystemPtr->unk_11c4->invisible = 1; - } - else - { - gPokemonStorageSystemPtr->unk_11c4 = NULL; - } -} - -void sub_809CD88(void) -{ - gUnknown_020384E9 = !gUnknown_020384E9; - gPokemonStorageSystemPtr->unk_11c0->oam.paletteNum = gPokemonStorageSystemPtr->unk_11e4[gUnknown_020384E9]; -} - -void sub_809CDCC(void) -{ - gPokemonStorageSystemPtr->unk_11b8 = 0; - gPokemonStorageSystemPtr->unk_11b9 = 0; -} - -void sub_809CDEC(u8 arg0) -{ - u8 width; - u8 var0; - - if (gPokemonStorageSystemPtr->unk_11b8 < 7) - { - struct StorageText *storageText = &gPokemonStorageSystemPtr->unk_1180[gPokemonStorageSystemPtr->unk_11b8]; - storageText->text = gUnknown_083BBCA0[arg0]; - storageText->textId = arg0; - width = GetStringWidthInMenuWindow(storageText->text); - var0 = (width + 7) / 8; - if (var0 > gPokemonStorageSystemPtr->unk_11b9) - gPokemonStorageSystemPtr->unk_11b9 = var0; - - gPokemonStorageSystemPtr->unk_11b8++; - } -} - -s8 sub_809CE4C(u8 arg0) -{ - if (arg0 >= gPokemonStorageSystemPtr->unk_11b8) - return -1; - else - return gPokemonStorageSystemPtr->unk_1180[arg0].textId; -} - -void sub_809CE84(void) -{ - gPokemonStorageSystemPtr->unk_11bc = 14 - gPokemonStorageSystemPtr->unk_11b8 * 2; - gPokemonStorageSystemPtr->unk_11ba = 28 - gPokemonStorageSystemPtr->unk_11b9; - Menu_DrawStdWindowFrame(gPokemonStorageSystemPtr->unk_11ba, gPokemonStorageSystemPtr->unk_11bc, 29, 15); - Menu_PrintItems( - gPokemonStorageSystemPtr->unk_11ba + 1, - gPokemonStorageSystemPtr->unk_11bc + 1, - gPokemonStorageSystemPtr->unk_11b8, - gPokemonStorageSystemPtr->unk_1180); - InitMenu( - 0, - gPokemonStorageSystemPtr->unk_11ba + 1, - gPokemonStorageSystemPtr->unk_11bc + 1, - gPokemonStorageSystemPtr->unk_11b8, - 0, - gPokemonStorageSystemPtr->unk_11b9); -} - -#ifdef NONMATCHING // r4 and r5 are swapped throughout the entire function. -s16 sub_809CF30(void) -{ - int textId = -2; - - if (!(gMain.newKeys & A_BUTTON)) - { - if (gMain.newKeys & B_BUTTON) - { - PlaySE(5); - textId++; - } - - if (gMain.newKeys & DPAD_UP) - { - PlaySE(5); - Menu_MoveCursor(-1); - } - else if (gMain.newKeys & DPAD_DOWN) - { - PlaySE(5); - Menu_MoveCursor(1); - } - } - else - { - textId = Menu_GetCursorPos(); - } - - if (textId != -2) - { - Menu_DestroyCursor(); - Menu_EraseWindowRect( - gPokemonStorageSystemPtr->unk_11ba, - gPokemonStorageSystemPtr->unk_11bc, - 29, - 15); - } - - if (textId >= 0) - { - textId = gPokemonStorageSystemPtr->unk_1180[textId].textId; - } - - return textId; -} -#else -NAKED -s16 sub_809CF30(void) -{ - asm(".syntax unified\n\ - push {r4,r5,lr}\n\ - movs r5, 0x2\n\ - negs r5, r5\n\ - ldr r4, _0809CF6C @ =gMain\n\ - ldrh r1, [r4, 0x2E]\n\ - movs r0, 0x1\n\ - ands r0, r1\n\ - cmp r0, 0\n\ - bne _0809CF86\n\ - movs r0, 0x2\n\ - ands r0, r1\n\ - cmp r0, 0\n\ - beq _0809CF52\n\ - movs r0, 0x5\n\ - bl PlaySE\n\ - adds r5, 0x1\n\ -_0809CF52:\n\ - ldrh r1, [r4, 0x2E]\n\ - movs r0, 0x40\n\ - ands r0, r1\n\ - cmp r0, 0\n\ - beq _0809CF70\n\ - movs r0, 0x5\n\ - bl PlaySE\n\ - movs r0, 0x1\n\ - negs r0, r0\n\ - bl Menu_MoveCursor\n\ - b _0809CF8E\n\ - .align 2, 0\n\ -_0809CF6C: .4byte gMain\n\ -_0809CF70:\n\ - movs r0, 0x80\n\ - ands r0, r1\n\ - cmp r0, 0\n\ - beq _0809CF8E\n\ - movs r0, 0x5\n\ - bl PlaySE\n\ - movs r0, 0x1\n\ - bl Menu_MoveCursor\n\ - b _0809CF8E\n\ -_0809CF86:\n\ - bl Menu_GetCursorPos\n\ - lsls r0, 24\n\ - lsrs r5, r0, 24\n\ -_0809CF8E:\n\ - movs r0, 0x2\n\ - negs r0, r0\n\ - cmp r5, r0\n\ - beq _0809CFB2\n\ - bl Menu_DestroyCursor\n\ - ldr r0, _0809CFD0 @ =gPokemonStorageSystemPtr\n\ - ldr r1, [r0]\n\ - ldr r2, _0809CFD4 @ =0x000011ba\n\ - adds r0, r1, r2\n\ - ldrb r0, [r0]\n\ - adds r2, 0x2\n\ - adds r1, r2\n\ - ldrb r1, [r1]\n\ - movs r2, 0x1D\n\ - movs r3, 0xF\n\ - bl Menu_EraseWindowRect\n\ -_0809CFB2:\n\ - cmp r5, 0\n\ - blt _0809CFC4\n\ - ldr r0, _0809CFD0 @ =gPokemonStorageSystemPtr\n\ - ldr r0, [r0]\n\ - lsls r1, r5, 3\n\ - ldr r2, _0809CFD8 @ =0x00001184\n\ - adds r0, r2\n\ - adds r0, r1\n\ - ldr r5, [r0]\n\ -_0809CFC4:\n\ - lsls r0, r5, 16\n\ - asrs r0, 16\n\ - pop {r4,r5}\n\ - pop {r1}\n\ - bx r1\n\ - .align 2, 0\n\ -_0809CFD0: .4byte gPokemonStorageSystemPtr\n\ -_0809CFD4: .4byte 0x000011ba\n\ -_0809CFD8: .4byte 0x00001184\n\ - .syntax divided\n"); -} -#endif // NONMATCHING - -void sub_809CFDC(struct UnkStruct_2000020 *arg0, struct UnkStruct_2000028 *arg1, u8 arg2) -{ - gUnknown_020384EC = arg0; - arg0->unk_00 = arg1; - arg0->unk_05 = arg2; - arg0->unk_04 = 0; -} - -void sub_809CFF0(void) -{ - u16 i; - struct UnkStruct_2000028 *unkStruct; - - if (gUnknown_020384EC->unk_04) - { - for (i = 0; i < gUnknown_020384EC->unk_04; i++) - { - unkStruct = &gUnknown_020384EC->unk_00[i]; - unkStruct->unk_0c(unkStruct); - } - - gUnknown_020384EC->unk_04 = 0; - } -} - -bool8 sub_809D034(u8 *dest, u16 dLeft, u16 dTop, const u8 *src, u16 sLeft, u16 sTop, u16 width, u16 height) -{ - struct UnkStruct_2000028 *unkStruct; - - if (gUnknown_020384EC->unk_04 >= gUnknown_020384EC->unk_05) - return FALSE; - - unkStruct = &gUnknown_020384EC->unk_00[gUnknown_020384EC->unk_04++]; - unkStruct->unk_08 = width * 2; - unkStruct->unk_04 = dest + (dTop * 64) + (dLeft * 2); - unkStruct->unk_00 = src + (sTop * 64) + (sLeft * 2); - unkStruct->unk_0a = height; - unkStruct->unk_0c = sub_809D0BC; - return TRUE; -} - -void sub_809D0BC(struct UnkStruct_2000028 *unkStruct) -{ - u32 i; - const u8 *src = unkStruct->unk_00; - u8 *dest = unkStruct->unk_04; - int height = unkStruct->unk_0a; - int width = unkStruct->unk_08; - for (i = 0; i < height; i++) - { - CpuSet(src, dest, (width / 2) & 0x1FFFFF); - dest += 64; - src += 64; - } -} - -void sub_809D104(u8 *dest, u16 dLeft, u16 dTop, const u8 *src, u16 sLeft, u16 sTop, u16 width, u16 height) -{ - const u8 *from = src + (sTop * 64) + (sLeft * 2); - u8 *to = dest + (dTop * 64) + (dLeft * 2); - u8 *end = dest + (dTop + height) * 64; - int width2 = width * 2; - while (to < end) - { - CpuSet(from, to, (width2 / 2) & 0x1FFFFF); - to += 64; - from += 64; - } -} - -bool8 sub_809D16C(void *dest, u16 dLeft, u16 dTop, u16 width, u16 height) -{ - struct UnkStruct_2000028 *unkStruct; - - if (gUnknown_020384EC->unk_04 >= gUnknown_020384EC->unk_05) - return FALSE; - - unkStruct = &gUnknown_020384EC->unk_00[gUnknown_020384EC->unk_04++]; - unkStruct->unk_08 = width * 2; - unkStruct->unk_04 = dest + ((dTop * 32) + dLeft) * 2; - unkStruct->unk_0a = height; - unkStruct->unk_0c = sub_809D1C4; - return TRUE; -} - -void sub_809D1C4(struct UnkStruct_2000028 *unkStruct) -{ - u16 i; - - for (i = 0; i < unkStruct->unk_0a; i++) - { - Dma3FillLarge_(0, unkStruct->unk_04, unkStruct->unk_08, 16); - unkStruct->unk_04 += 64; - } -} -- cgit v1.2.3 From cba70d36059d01175a0fcb77dde33eaab30df3c2 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Tue, 24 Jul 2018 17:49:10 -0500 Subject: Fix debug build --- src/pokemon_storage_system_4.c | 16 +++++++--------- sym_ewram.txt | 1 - 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/src/pokemon_storage_system_4.c b/src/pokemon_storage_system_4.c index 43aef277a..fff545492 100644 --- a/src/pokemon_storage_system_4.c +++ b/src/pokemon_storage_system_4.c @@ -26,7 +26,7 @@ struct WallpaperTable { EWRAM_DATA struct Pokemon gUnknown_02038480 = {}; #if DEBUG -EWRAM_DATA u32 unk_2038790 = 0; +EWRAM_DATA u8 unk_2038790 = 0; EWRAM_DATA u32 unk_2038794 = 0; EWRAM_DATA u32 unk_2038798 = 0; #endif @@ -3167,15 +3167,13 @@ void sub_809CA8C(void) #if DEBUG u8 debug_sub_80AA40C(void) { - if (sub_809AB8C()) - { - sub_809CDCC(); - sub_809CDEC(32); - sub_809CDEC(6); - return 1; - } + if (!sub_809AB8C()) + return 0; - return 0; + sub_809CDCC(); + sub_809CDEC(32); + sub_809CDEC(6); + return 1; } #endif diff --git a/sym_ewram.txt b/sym_ewram.txt index de0d1b1aa..20a845653 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -339,7 +339,6 @@ gBattleMonForms = .; /* 2024E84 */ . = ALIGN(4); src/pokemon_storage_system_2.o(ewram_data); . = ALIGN(4); src/pokemon_storage_system_3.o(ewram_data); . = ALIGN(4); src/pokemon_storage_system_4.o(ewram_data); -. = ALIGN(4); src/pokemon_storage_system_5.o(ewram_data); . = ALIGN(4); src/pokemon_summary_screen.o(ewram_data); . = ALIGN(4); src/script_movement.o(ewram_data); . = ALIGN(4); src/map_name_popup.o(ewram_data); -- cgit v1.2.3 From 7f9c6df3744d40ab1a10ea7a1558ef56dc9d1ae1 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Thu, 26 Jul 2018 08:51:06 -0500 Subject: Fix nonmatching ChooseNextBattleTowerTrainer() --- data/maps/BattleTower_BattleRoom/scripts.inc | 2 +- data/specials.inc | 2 +- include/global.h | 2 +- src/battle_tower.c | 406 +++++---------------------- 4 files changed, 74 insertions(+), 338 deletions(-) diff --git a/data/maps/BattleTower_BattleRoom/scripts.inc b/data/maps/BattleTower_BattleRoom/scripts.inc index 22529962a..ea80ae58b 100644 --- a/data/maps/BattleTower_BattleRoom/scripts.inc +++ b/data/maps/BattleTower_BattleRoom/scripts.inc @@ -12,7 +12,7 @@ BattleTower_BattleRoom_EventScript_1608EB:: @ 81608EB waitmovement 0 BattleTower_BattleRoom_EventScript_1608FA:: @ 81608FA - special sub_81347F8 + special ChooseNextBattleTowerTrainer addobject 1 applymovement 1, BattleTower_BattleRoom_Movement_160AC0 waitmovement 0 diff --git a/data/specials.inc b/data/specials.inc index 7983c71af..07bd7ca76 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -240,7 +240,7 @@ gSpecials:: def_special UpdateCyclingRoadState def_special GetLeadMonFriendshipScore def_special sub_8134548 - def_special sub_81347F8 + def_special ChooseNextBattleTowerTrainer def_special CheckPartyBattleTowerBanlist def_special PrintBattleTowerTrainerGreeting def_special PrintEReaderTrainerGreeting diff --git a/include/global.h b/include/global.h index 3c0169606..830f7704a 100644 --- a/include/global.h +++ b/include/global.h @@ -808,7 +808,7 @@ struct BattleTowerData /*0x04BC, 0x0564*/ u8 battleTowerTrainerId; // index for gBattleTowerTrainers table /*0x04BD, 0x0565*/ u8 selectedPartyMons[0x3]; // indices of the 3 selected player party mons. /*0x04C0, 0x0568*/ u16 prizeItem; - /*0x04C2, 0x056A*/ u8 filler_4C2[0x6]; + /*0x04C2, 0x056A*/ u8 battledTrainerIds[6]; /*0x04C8, 0x0570*/ u16 totalBattleTowerWins; /*0x04CA, 0x0572*/ u16 bestBattleTowerWinStreak; /*0x04CC, 0x0574*/ u16 currentWinStreaks[2]; diff --git a/src/battle_tower.c b/src/battle_tower.c index 4de8eba1f..7adfc6f7c 100644 --- a/src/battle_tower.c +++ b/src/battle_tower.c @@ -380,7 +380,9 @@ bool8 ShouldBattleEReaderTrainer(u8 levelType, u16 winStreak) return (numValid == 3); } -bool8 sub_81346F4(void) +// Tries to choose an E-Reader or record-mixing trainer for the next Battle +// Tower trainer opponent. +bool8 ChooseSpecialBattleTowerTrainer(void) { s32 recordIndex, i; u8 battleTowerLevelType; @@ -437,344 +439,78 @@ bool8 sub_81346F4(void) return retVal; } -// void sub_81347F8(void) -// { -// bool8 levelType = gSaveBlock2.battleTower.battleTowerLevelType; -// if (sub_81346F4()) -// { -// SetBattleTowerTrainerGfxId(gSaveBlock2.battleTower.battleTowerTrainerId); -// gSaveBlock2.battleTower.var_4C1[gSaveBlock2.battleTower.curChallengeBattleNum[levelType]] = gSaveBlock2.battleTower.battleTowerTrainerId; -// } -// else -// { -// u16 var1; - -// if (gSaveBlock2.battleTower.curStreakChallengesNum[levelType] > 7) -// { -// while (1) -// { -// s32 i; -// u32 temp = ((Random() & 0xFF) * 30) >> 8; -// var1 = temp + 70; -// for (i = 0; i < gSaveBlock2.battleTower.curChallengeBattleNum[levelType] - 1 && var1 != gSaveBlock2.battleTower.var_4C1[i]; i++) // TODO: [i + 1]??? -// { } +// Chooses the next battle tower trainer id opponent. It keeps track of the +// trainer who have already been battled in the current 7-battle challenge +// to ensure no duplicates are fought. +void ChooseNextBattleTowerTrainer(void) +{ + int i; + u16 trainerId; + bool8 levelType; -// if (i == gSaveBlock2.battleTower.curChallengeBattleNum[levelType] - 1) -// { -// break; -// } -// } -// } -// else -// { -// if (gSaveBlock2.battleTower.curChallengeBattleNum[levelType] == 7) -// { -// while (1) -// { -// s32 i; -// u32 temp = ((Random() & 0xFF) * 5); -// u32 temp2 = (((gSaveBlock2.battleTower.curStreakChallengesNum[levelType] - 1) * 10) + 20); -// var1 = temp / 128 + temp2; -// for (i = 0; i < gSaveBlock2.battleTower.curChallengeBattleNum[levelType] - 1 && gSaveBlock2.battleTower.var_4C1[i] != var1; i++) // TODO: [i + 1]???? -// { } - -// if (i == gSaveBlock2.battleTower.curChallengeBattleNum[levelType] - 1) -// { -// break; -// } -// } -// } -// else -// { -// while (1) -// { -// s32 i; -// u32 temp = ((Random() & 0xFF) * 320); -// u32 temp2 = ((gSaveBlock2.battleTower.curStreakChallengesNum[levelType] - 1) * 10); -// var1 = temp + temp2; -// for (i = 0; i < gSaveBlock2.battleTower.curChallengeBattleNum[levelType] - 1 && gSaveBlock2.battleTower.var_4C1[i] != var1; i++) -// { } - -// if (i == gSaveBlock2.battleTower.curChallengeBattleNum[levelType] - 1) -// { -// break; -// } -// } -// } -// } + levelType = gSaveBlock2.battleTower.battleTowerLevelType; + if (ChooseSpecialBattleTowerTrainer()) + { + SetBattleTowerTrainerGfxId(gSaveBlock2.battleTower.battleTowerTrainerId); + gSaveBlock2.battleTower.battledTrainerIds[gSaveBlock2.battleTower.curChallengeBattleNum[levelType] - 1] = gSaveBlock2.battleTower.battleTowerTrainerId; + return; + } -// gSaveBlock2.battleTower.battleTowerTrainerId = var1; -// SetBattleTowerTrainerGfxId(gSaveBlock2.battleTower.battleTowerTrainerId); + if (gSaveBlock2.battleTower.curStreakChallengesNum[levelType] <= 7) + { + if (gSaveBlock2.battleTower.curChallengeBattleNum[levelType] == 7) + { + while (1) + { + trainerId = ((Random() & 0xFF) * 5) >> 7; + trainerId += (gSaveBlock2.battleTower.curStreakChallengesNum[levelType] - 1) * 10 + 20; + + // Ensure trainer wasn't previously fought in this challenge. + for (i = 0; i < gSaveBlock2.battleTower.curChallengeBattleNum[levelType] - 1 && gSaveBlock2.battleTower.battledTrainerIds[i] != trainerId; i++); + if (i == gSaveBlock2.battleTower.curChallengeBattleNum[levelType] - 1) + { + gSaveBlock2.battleTower.battleTowerTrainerId = trainerId; + break; + } + } + } + else + { + while (1) + { + trainerId = (((Random() & 0xFF) * 5) >> 6); + trainerId += (gSaveBlock2.battleTower.curStreakChallengesNum[levelType] - 1) * 10; + + // Ensure trainer wasn't previously fought in this challenge. + for (i = 0; i < gSaveBlock2.battleTower.curChallengeBattleNum[levelType] - 1 && gSaveBlock2.battleTower.battledTrainerIds[i] != trainerId; i++); + if (i == gSaveBlock2.battleTower.curChallengeBattleNum[levelType] - 1) + { + gSaveBlock2.battleTower.battleTowerTrainerId = trainerId; + break; + } + } + } + } + else + { + while (1) + { + trainerId = (((Random() & 0xFF) * 30) >> 8) + 70; -// if (gSaveBlock2.battleTower.curChallengeBattleNum[levelType] < 7) -// { -// gSaveBlock2.battleTower.var_4C1[gSaveBlock2.battleTower.curChallengeBattleNum[levelType]] = gSaveBlock2.battleTower.battleTowerTrainerId; -// } -// } -// } + // Ensure trainer wasn't previously fought in this challenge. + for (i = 0; i < gSaveBlock2.battleTower.curChallengeBattleNum[levelType] - 1 && gSaveBlock2.battleTower.battledTrainerIds[i] != trainerId; i++); + if (i == gSaveBlock2.battleTower.curChallengeBattleNum[levelType] - 1) + { + gSaveBlock2.battleTower.battleTowerTrainerId = trainerId; + break; + } + } + } -NAKED -void sub_81347F8(void) -{ - asm(".syntax unified\n\ - push {r4-r7,lr}\n\ - mov r7, r10\n\ - mov r6, r9\n\ - mov r5, r8\n\ - push {r5-r7}\n\ - ldr r5, _08134838 @ =gSaveBlock2\n\ - ldr r1, _0813483C @ =0x00000554\n\ - adds r0, r5, r1\n\ - ldrb r0, [r0]\n\ - lsls r0, 31\n\ - lsrs r6, r0, 31\n\ - bl sub_81346F4\n\ - lsls r0, 24\n\ - cmp r0, 0\n\ - beq _08134848\n\ - ldr r2, _08134840 @ =0x00000564\n\ - adds r4, r5, r2\n\ - ldrb r0, [r4]\n\ - bl SetBattleTowerTrainerGfxId\n\ - lsls r0, r6, 1\n\ - movs r3, 0xAB\n\ - lsls r3, 3\n\ - adds r1, r5, r3\n\ - adds r0, r1\n\ - ldrh r0, [r0]\n\ - adds r0, r5, r0\n\ - ldr r1, _08134844 @ =0x00000569\n\ - adds r0, r1\n\ - ldrb r1, [r4]\n\ - b _081349DC\n\ - .align 2, 0\n\ -_08134838: .4byte gSaveBlock2\n\ -_0813483C: .4byte 0x00000554\n\ -_08134840: .4byte 0x00000564\n\ -_08134844: .4byte 0x00000569\n\ -_08134848:\n\ - lsls r0, r6, 1\n\ - ldr r2, _081348D8 @ =0x0000055c\n\ - adds r1, r5, r2\n\ - adds r1, r0, r1\n\ - ldrh r1, [r1]\n\ - adds r7, r0, 0\n\ - cmp r1, 0x7\n\ - bls _0813485A\n\ - b _0813495C\n\ -_0813485A:\n\ - movs r3, 0xAB\n\ - lsls r3, 3\n\ - adds r0, r5, r3\n\ - adds r1, r7, r0\n\ - ldrh r0, [r1]\n\ - cmp r0, 0x7\n\ - bne _081348E4\n\ - adds r6, r5, 0\n\ - mov r9, r7\n\ - adds r5, r1, 0\n\ - ldr r0, _081348DC @ =0x0000056a\n\ - adds r0, r6\n\ - mov r10, r0\n\ - mov r8, r5\n\ -_08134876:\n\ - bl Random\n\ - movs r1, 0xFF\n\ - ands r1, r0\n\ - lsls r2, r1, 2\n\ - adds r2, r1\n\ - ldr r1, _081348D8 @ =0x0000055c\n\ - adds r4, r6, r1\n\ - mov r3, r9\n\ - adds r0, r3, r4\n\ - ldrh r1, [r0]\n\ - subs r1, 0x1\n\ - lsls r0, r1, 2\n\ - adds r0, r1\n\ - lsls r0, 1\n\ - adds r0, 0x14\n\ - lsrs r2, 7\n\ - adds r2, r0\n\ - lsls r2, 16\n\ - lsrs r2, 16\n\ - movs r1, 0\n\ - ldrh r0, [r5]\n\ - subs r0, 0x1\n\ - cmp r1, r0\n\ - bge _081348C8\n\ - mov r3, r10\n\ - ldrb r0, [r3]\n\ - cmp r0, r2\n\ - beq _081348C8\n\ - subs r0, r4, 0x4\n\ - adds r0, r7, r0\n\ - ldrh r0, [r0]\n\ - subs r3, r0, 0x1\n\ - adds r4, 0xE\n\ -_081348BA:\n\ - adds r1, 0x1\n\ - cmp r1, r3\n\ - bge _081348C8\n\ - adds r0, r1, r4\n\ - ldrb r0, [r0]\n\ - cmp r0, r2\n\ - bne _081348BA\n\ -_081348C8:\n\ - mov r3, r8\n\ - ldrh r0, [r3]\n\ - subs r0, 0x1\n\ - ldr r4, _081348E0 @ =gSaveBlock2\n\ - cmp r1, r0\n\ - bne _08134876\n\ - b _081349B6\n\ - .align 2, 0\n\ -_081348D8: .4byte 0x0000055c\n\ -_081348DC: .4byte 0x0000056a\n\ -_081348E0: .4byte gSaveBlock2\n\ -_081348E4:\n\ - adds r6, r5, 0\n\ - mov r9, r7\n\ - adds r5, r1, 0\n\ - ldr r2, _08134950 @ =0x0000056a\n\ - adds r2, r6\n\ - mov r10, r2\n\ - mov r8, r5\n\ -_081348F2:\n\ - bl Random\n\ - movs r1, 0xFF\n\ - ands r1, r0\n\ - lsls r0, r1, 2\n\ - adds r0, r1\n\ - lsrs r2, r0, 6\n\ - ldr r3, _08134954 @ =0x0000055c\n\ - adds r4, r6, r3\n\ - mov r1, r9\n\ - adds r0, r1, r4\n\ - ldrh r1, [r0]\n\ - subs r1, 0x1\n\ - lsls r0, r1, 2\n\ - adds r0, r1\n\ - lsls r0, 1\n\ - adds r0, r2, r0\n\ - lsls r0, 16\n\ - lsrs r2, r0, 16\n\ - movs r1, 0\n\ - ldrh r0, [r5]\n\ - subs r0, 0x1\n\ - cmp r1, r0\n\ - bge _08134942\n\ - mov r3, r10\n\ - ldrb r0, [r3]\n\ - cmp r0, r2\n\ - beq _08134942\n\ - subs r0, r4, 0x4\n\ - adds r0, r7, r0\n\ - ldrh r0, [r0]\n\ - subs r3, r0, 0x1\n\ - adds r4, 0xE\n\ -_08134934:\n\ - adds r1, 0x1\n\ - cmp r1, r3\n\ - bge _08134942\n\ - adds r0, r1, r4\n\ - ldrb r0, [r0]\n\ - cmp r0, r2\n\ - bne _08134934\n\ -_08134942:\n\ - mov r3, r8\n\ - ldrh r0, [r3]\n\ - subs r0, 0x1\n\ - ldr r4, _08134958 @ =gSaveBlock2\n\ - cmp r1, r0\n\ - bne _081348F2\n\ - b _081349B6\n\ - .align 2, 0\n\ -_08134950: .4byte 0x0000056a\n\ -_08134954: .4byte 0x0000055c\n\ -_08134958: .4byte gSaveBlock2\n\ -_0813495C:\n\ - movs r2, 0xAB\n\ - lsls r2, 3\n\ - adds r0, r5, r2\n\ - adds r6, r7, r0\n\ - ldr r3, _081349EC @ =0x0000056a\n\ - adds r3, r5\n\ - mov r8, r3\n\ - adds r5, r6, 0\n\ -_0813496C:\n\ - bl Random\n\ - movs r1, 0xFF\n\ - ands r1, r0\n\ - lsls r0, r1, 4\n\ - subs r0, r1\n\ - lsls r0, 1\n\ - asrs r0, 8\n\ - adds r0, 0x46\n\ - lsls r0, 16\n\ - lsrs r2, r0, 16\n\ - movs r1, 0\n\ - ldrh r0, [r6]\n\ - subs r0, 0x1\n\ - cmp r1, r0\n\ - bge _081349AC\n\ - mov r3, r8\n\ - ldrb r0, [r3]\n\ - ldr r4, _081349F0 @ =gSaveBlock2\n\ - cmp r0, r2\n\ - beq _081349AC\n\ - ldrh r0, [r5]\n\ - subs r3, r0, 0x1\n\ - ldr r0, _081349EC @ =0x0000056a\n\ - adds r4, r0\n\ -_0813499E:\n\ - adds r1, 0x1\n\ - cmp r1, r3\n\ - bge _081349AC\n\ - adds r0, r1, r4\n\ - ldrb r0, [r0]\n\ - cmp r0, r2\n\ - bne _0813499E\n\ -_081349AC:\n\ - ldrh r0, [r6]\n\ - subs r0, 0x1\n\ - ldr r4, _081349F0 @ =gSaveBlock2\n\ - cmp r1, r0\n\ - bne _0813496C\n\ -_081349B6:\n\ - ldr r1, _081349F4 @ =0x00000564\n\ - adds r0, r4, r1\n\ - strb r2, [r0]\n\ - ldr r2, _081349F4 @ =0x00000564\n\ - adds r5, r4, r2\n\ - ldrb r0, [r5]\n\ - bl SetBattleTowerTrainerGfxId\n\ - movs r3, 0xAB\n\ - lsls r3, 3\n\ - adds r0, r4, r3\n\ - adds r1, r7, r0\n\ - ldrh r0, [r1]\n\ - cmp r0, 0x6\n\ - bhi _081349DE\n\ - adds r0, r4, r0\n\ - ldr r1, _081349F8 @ =0x00000569\n\ - adds r0, r1\n\ - ldrb r1, [r5]\n\ -_081349DC:\n\ - strb r1, [r0]\n\ -_081349DE:\n\ - pop {r3-r5}\n\ - mov r8, r3\n\ - mov r9, r4\n\ - mov r10, r5\n\ - pop {r4-r7}\n\ - pop {r0}\n\ - bx r0\n\ - .align 2, 0\n\ -_081349EC: .4byte 0x0000056a\n\ -_081349F0: .4byte gSaveBlock2\n\ -_081349F4: .4byte 0x00000564\n\ -_081349F8: .4byte 0x00000569\n\ -.syntax divided\n"); + SetBattleTowerTrainerGfxId(gSaveBlock2.battleTower.battleTowerTrainerId); + // Don't bother saving this trainer, since it's the last one in the challenge. + if (gSaveBlock2.battleTower.curChallengeBattleNum[levelType] < 7) + gSaveBlock2.battleTower.battledTrainerIds[gSaveBlock2.battleTower.curChallengeBattleNum[levelType] - 1] = gSaveBlock2.battleTower.battleTowerTrainerId; } void SetBattleTowerTrainerGfxId(u8 trainerIndex) -- cgit v1.2.3 From 016e0e6da31b8a8f7d2f30a48127721ed6187b19 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Thu, 26 Jul 2018 08:51:15 -0500 Subject: Fix nonmatching DaycareMonReceivedMail_() --- data/scripts/day_care.inc | 2 +- data/specials.inc | 2 +- src/egg_hatch.c | 96 ++++++++++------------------------------------- src/record_mixing.c | 18 ++++----- 4 files changed, 30 insertions(+), 88 deletions(-) diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc index 56ed0d9ab..34ba18f08 100644 --- a/data/scripts/day_care.inc +++ b/data/scripts/day_care.inc @@ -47,7 +47,7 @@ Route117_EventScript_1B22B2:: @ 81B22B2 end Route117_EventScript_1B22CD:: @ 81B22CD - specialvar RESULT, sub_8042B4C + specialvar RESULT, DaycareMonReceivedMail compare RESULT, 1 call_if_eq Route117_EventScript_1B22DE return diff --git a/data/specials.inc b/data/specials.inc index 07bd7ca76..db77f74a9 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -203,7 +203,7 @@ gSpecials:: def_special TakePokemonFromDaycare def_special ScriptHatchMon def_special EggHatch - def_special sub_8042B4C + def_special DaycareMonReceivedMail def_special ShowLinkBattleRecords def_special HasEnoughMoneyFor def_special PayMoneyFor diff --git a/src/egg_hatch.c b/src/egg_hatch.c index 580ec6886..6dc55ef28 100644 --- a/src/egg_hatch.c +++ b/src/egg_hatch.c @@ -7,6 +7,7 @@ #include "constants/items.h" #include "main.h" #include "menu.h" +#include "name_string_util.h" #include "naming_screen.h" #include "overworld.h" #include "palette.h" @@ -310,88 +311,29 @@ void ScriptHatchMon(void) AddHatchedMonToParty(gSpecialVar_0x8004); } -#ifdef NONMATCHING -static bool8 sub_8042ABC(void* a, u8 b) +static bool8 DaycareMonReceivedMail_(struct DayCare *daycare, u8 slot) { + u8 monNickname[32]; + GetBoxMonNick(&daycare->mons[slot], monNickname); + if (daycare->misc.mail[slot].message.itemId != ITEM_NONE) + { + if (StringCompareWithoutExtCtrlCodes(monNickname, daycare->misc.mail[slot].names + 8) + || StringCompareWithoutExtCtrlCodes(gSaveBlock2.playerName, daycare->misc.mail[slot].names)) + { + StringCopy(gStringVar1, monNickname); + StringCopy(gStringVar2, daycare->misc.mail[slot].names); + StringCopy(gStringVar3, daycare->misc.mail[slot].names + 8); + SanitizeNameString(gStringVar2); + return TRUE; + } + } + return FALSE; } -#else -NAKED -static bool8 sub_8042ABC(void* a, u8 b) -{ - asm(".syntax unified\n\ - push {r4-r6,lr}\n\ - sub sp, 0x20\n\ - adds r5, r0, 0\n\ - lsls r4, r1, 24\n\ - lsrs r4, 24\n\ - lsls r0, r4, 2\n\ - adds r0, r4\n\ - lsls r0, 4\n\ - adds r0, r5, r0\n\ - mov r1, sp\n\ - bl GetBoxMonNick\n\ - lsls r0, r4, 3\n\ - subs r0, r4\n\ - lsls r1, r0, 3\n\ - adds r0, r5, r1\n\ - adds r0, 0xC0\n\ - ldrh r0, [r0]\n\ - cmp r0, 0\n\ - beq _08042B40\n\ - adds r0, r1, 0\n\ - adds r0, 0xA0\n\ - adds r5, r0\n\ - adds r6, r5, 0\n\ - adds r6, 0x2C\n\ - mov r0, sp\n\ - adds r1, r6, 0\n\ - bl StringCompareWithoutExtCtrlCodes\n\ - cmp r0, 0\n\ - bne _08042B08\n\ - ldr r0, _08042B30 @ =gSaveBlock2\n\ - adds r1, r5, 0\n\ - adds r1, 0x24\n\ - bl StringCompareWithoutExtCtrlCodes\n\ - cmp r0, 0\n\ - beq _08042B40\n\ -_08042B08:\n\ - ldr r0, _08042B34 @ =gStringVar1\n\ - mov r1, sp\n\ - bl StringCopy\n\ - ldr r4, _08042B38 @ =gStringVar2\n\ - adds r1, r5, 0\n\ - adds r1, 0x24\n\ - adds r0, r4, 0\n\ - bl StringCopy\n\ - ldr r0, _08042B3C @ =gStringVar3\n\ - adds r1, r6, 0\n\ - bl StringCopy\n\ - adds r0, r4, 0\n\ - bl SanitizeNameString\n\ - movs r0, 0x1\n\ - b _08042B42\n\ - .align 2, 0\n\ -_08042B30: .4byte gSaveBlock2\n\ -_08042B34: .4byte gStringVar1\n\ -_08042B38: .4byte gStringVar2\n\ -_08042B3C: .4byte gStringVar3\n\ -_08042B40:\n\ - movs r0, 0\n\ -_08042B42:\n\ - add sp, 0x20\n\ - pop {r4-r6}\n\ - pop {r1}\n\ - bx r1\n\ - .syntax divided"); -} - -#endif // NONMATCHING - -bool8 sub_8042B4C(void) +bool8 DaycareMonReceivedMail(void) { - return sub_8042ABC(&gSaveBlock1.daycare, gSpecialVar_0x8004); + return DaycareMonReceivedMail_(&gSaveBlock1.daycare, gSpecialVar_0x8004); } static u8 EggHatchCreateMonSprite(u8 a0, u8 switchID, u8 pokeID) diff --git a/src/record_mixing.c b/src/record_mixing.c index 0eb13899e..69a4984b2 100644 --- a/src/record_mixing.c +++ b/src/record_mixing.c @@ -26,7 +26,7 @@ #include "tv.h" #include "ewram.h" -EWRAM_DATA struct RecordMixingDayCareMail gUnknown_02038738 = {0}; +EWRAM_DATA struct RecordMixingDayCareMail gDayCareMailRecord = {0}; extern u16 gSpecialVar_0x8005; u32 gUnknown_03005D2C; @@ -39,8 +39,8 @@ void *recordMixingTvShows = &gSaveBlock1.tvShows; void *gUnknown_083D0274 = &gSaveBlock1.pokeNews; void *gUnknown_083D0278 = &gSaveBlock1.mauvilleMan; void *recordMixingEasyChatPairs = &gSaveBlock1.easyChatPairs; -struct RecordMixingDayCareMail *gUnknown_083D0280 = &gUnknown_02038738; -void *gBattleTowerPlayerRecord = &gSaveBlock2.battleTower.playerRecord; +struct RecordMixingDayCareMail *gDayCareMailPlayerRecord = &gDayCareMailRecord; +struct BattleTowerRecord *gBattleTowerPlayerRecord = &gSaveBlock2.battleTower.playerRecord; #define BUFFER_CHUNK_SIZE 200 @@ -56,7 +56,7 @@ struct PlayerRecords u8 filler1004[0x40]; u8 filler1044[0x40]; struct EasyChatPair easyChatPairs[5]; - struct RecordMixingDayCareMail filler10AC; + struct RecordMixingDayCareMail daycareMailRecord; struct BattleTowerRecord battleTowerRecord; u16 filler11C8[0x34]; }; @@ -71,10 +71,10 @@ void RecordMixing_PrepareExchangePacket(void) memcpy(ewram_2018000.filler1004, gUnknown_083D0274, sizeof(ewram_2008000.filler1004)); memcpy(ewram_2018000.filler1044, gUnknown_083D0278, sizeof(ewram_2008000.filler1044)); memcpy(ewram_2018000.easyChatPairs, recordMixingEasyChatPairs, sizeof(ewram_2018000.easyChatPairs)); - gUnknown_02038738.mail[0] = gSaveBlock1.daycare.misc.mail[0]; - gUnknown_02038738.mail[1] = gSaveBlock1.daycare.misc.mail[1]; - InitDaycareMailRecordMixing(gSaveBlock1.daycare.mons, &gUnknown_02038738); - memcpy(&ewram_2018000.filler10AC, gUnknown_083D0280, sizeof(struct RecordMixingDayCareMail)); + gDayCareMailRecord.mail[0] = gSaveBlock1.daycare.misc.mail[0]; + gDayCareMailRecord.mail[1] = gSaveBlock1.daycare.misc.mail[1]; + InitDaycareMailRecordMixing(gSaveBlock1.daycare.mons, &gDayCareMailRecord); + memcpy(&ewram_2018000.daycareMailRecord, gDayCareMailPlayerRecord, sizeof(struct RecordMixingDayCareMail)); memcpy(&ewram_2018000.battleTowerRecord, gBattleTowerPlayerRecord, sizeof(struct BattleTowerRecord)); if (GetMultiplayerId() == 0) @@ -88,7 +88,7 @@ void RecordMixing_ReceiveExchangePacket(u32 a) sub_80C0514(ewram_2008000.filler1004, sizeof(struct PlayerRecords), a); sub_80B9B1C(ewram_2008000.filler1044, sizeof(struct PlayerRecords), a); sub_80FA4E4(ewram_2008000.easyChatPairs, sizeof(struct PlayerRecords), a); - sub_80B9C6C((u8 *)&ewram_2008000.filler10AC, sizeof(struct PlayerRecords), a, ewram_2008000.tvShows); + sub_80B9C6C((u8 *)&ewram_2008000.daycareMailRecord, sizeof(struct PlayerRecords), a, ewram_2008000.tvShows); sub_80B9B70(&ewram_2008000.battleTowerRecord, sizeof(struct PlayerRecords), a); sub_80B9F3C(ewram_2008000.filler11C8, a); } -- cgit v1.2.3 From 1a378c07c6f95a6805d96852e55e3847e32c03b5 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Thu, 26 Jul 2018 08:51:21 -0500 Subject: Fix nonmatching SetPlayerSecretBaseRecordMixingParty() --- include/global.h | 2 +- include/secret_base.h | 2 +- src/record_mixing.c | 2 +- src/secret_base.c | 209 +++++++------------------------------------------- 4 files changed, 30 insertions(+), 185 deletions(-) diff --git a/include/global.h b/include/global.h index 830f7704a..36e1db978 100644 --- a/include/global.h +++ b/include/global.h @@ -176,7 +176,7 @@ struct SecretBaseRecord /*0x1A19*/ u8 sbr_field_11; /*0x1A1A*/ u8 decorations[16]; /*0x1A2A*/ u8 decorationPos[16]; - /*0x1A3A*/ u32 partyPersonality[6]; + /*0x1A3C*/ u32 partyPersonality[6]; /*0x1A54*/ u16 partyMoves[6 * 4]; /*0x1A84*/ u16 partySpecies[6]; /*0x1A90*/ u16 partyHeldItems[6]; diff --git a/include/secret_base.h b/include/secret_base.h index 4748c83d7..a9a205bc4 100644 --- a/include/secret_base.h +++ b/include/secret_base.h @@ -15,7 +15,7 @@ void SetCurrentSecretBaseFromPosition(struct MapPosition *, struct MapEvents *); void sub_80BC038(struct MapPosition *, struct MapEvents *); u8 sub_80BC050(); u8 *GetSecretBaseMapName(u8 *dest); -void sub_80BC300(); +void SetPlayerSecretBaseRecordMixingParty(); u8 sub_80BCCA4(u8 secretBaseIndex); const u8 *GetSecretBaseTrainerLoseText(void); void sub_80BCF1C(u8 taskId); diff --git a/src/record_mixing.c b/src/record_mixing.c index 69a4984b2..50ef21139 100644 --- a/src/record_mixing.c +++ b/src/record_mixing.c @@ -63,7 +63,7 @@ struct PlayerRecords void RecordMixing_PrepareExchangePacket(void) { - sub_80BC300(); + SetPlayerSecretBaseRecordMixingParty(); sub_80C045C(); memcpy(ewram_2018000.secretBases, recordMixingSecretBases, sizeof(ewram_2018000.secretBases)); diff --git a/src/secret_base.c b/src/secret_base.c index ca5f0c31f..0892016d9 100644 --- a/src/secret_base.c +++ b/src/secret_base.c @@ -653,7 +653,7 @@ bool8 sub_80BC268(u8 i) return FALSE; } -u8 sub_80BC298(struct Pokemon *mon) +static u8 CalculateMonAverageEVs(struct Pokemon *mon) { u16 evsum = GetMonData(mon, MON_DATA_HP_EV); evsum += GetMonData(mon, MON_DATA_ATK_EV); @@ -664,192 +664,37 @@ u8 sub_80BC298(struct Pokemon *mon) return (u8)(evsum / 6); } -#ifdef NONMATCHING -// So much is wrong with this function. -// The compiler likes to store pointers in temp variables. That's not what it's supposed to do. -void sub_80BC300(void) +void SetPlayerSecretBaseRecordMixingParty(void) { - u16 partyidx; - u16 moveidx; - u16 sbpartyidx = 0; - for (partyidx=0; partyidxpartyMoves[i * 4 + j] = MOVE_NONE; + + record->partySpecies[i] = SPECIES_NONE; + record->partyHeldItems[i] = ITEM_NONE; + record->partyLevels[i] = 0; + record->partyPersonality[i] = 0; + record->partyEVs[i] = 0; + + if (GetMonData(&gPlayerParty[i], MON_DATA_SPECIES) != SPECIES_NONE && !GetMonData(&gPlayerParty[i], MON_DATA_IS_EGG)) + { + for (j = 0; j < 4; j++) + record->partyMoves[secretBasePartyIndex * 4 + j] = GetMonData(&gPlayerParty[i], MON_DATA_MOVE1 + j); + + record->partySpecies[secretBasePartyIndex] = GetMonData(&(gPlayerParty[i]), MON_DATA_SPECIES); + record->partyHeldItems[secretBasePartyIndex] = GetMonData(&gPlayerParty[i], MON_DATA_HELD_ITEM); + record->partyLevels[secretBasePartyIndex] = GetMonData(&gPlayerParty[i], MON_DATA_LEVEL); + record->partyPersonality[secretBasePartyIndex] = GetMonData(&gPlayerParty[i], MON_DATA_PERSONALITY); + record->partyEVs[secretBasePartyIndex] = CalculateMonAverageEVs(&gPlayerParty[i]); + secretBasePartyIndex++; } } } -#else -NAKED -void sub_80BC300(void) -{ - asm(".syntax unified\n\ - push {r4-r7,lr}\n\ - mov r7, r10\n\ - mov r6, r9\n\ - mov r5, r8\n\ - push {r5-r7}\n\ - sub sp, 0xC\n\ - movs r0, 0\n\ - mov r10, r0\n\ - movs r6, 0\n\ - mov r9, r6\n\ -_080BC314:\n\ - movs r4, 0\n\ - lsls r3, r6, 2\n\ - lsls r2, r6, 1\n\ - ldr r7, _080BC424 @ =gPlayerParty\n\ - adds r1, r6, 0x1\n\ - str r1, [sp]\n\ - adds r1, r3, 0\n\ -_080BC322:\n\ - adds r0, r1, r4\n\ - lsls r0, 1\n\ - ldr r5, _080BC428 @ =gSaveBlock1 + 0x1A54\n\ - adds r0, r5, r0\n\ - mov r5, r9\n\ - strh r5, [r0]\n\ - adds r0, r4, 0x1\n\ - lsls r0, 16\n\ - lsrs r4, r0, 16\n\ - cmp r4, 0x3\n\ - bls _080BC322\n\ - ldr r1, _080BC42C @ =gSaveBlock1 + 0x1A84\n\ - adds r0, r1, r2\n\ - strh r5, [r0]\n\ - ldr r5, _080BC430 @ =gSaveBlock1 + 0x1A90\n\ - adds r0, r5, r2\n\ - mov r1, r9\n\ - strh r1, [r0]\n\ - ldr r2, _080BC434 @ =gSaveBlock1 + 0x1A9C\n\ - adds r0, r2, r6\n\ - mov r5, r9\n\ - strb r5, [r0]\n\ - ldr r1, _080BC438 @ =gSaveBlock1 + 0x1A3C\n\ - adds r0, r1, r3\n\ - mov r2, r9\n\ - str r2, [r0]\n\ - ldr r3, _080BC43C @ =gSaveBlock1 + 0x1AA2\n\ - adds r0, r3, r6\n\ - strb r2, [r0]\n\ - movs r0, 0x64\n\ - adds r5, r6, 0\n\ - muls r5, r0\n\ - adds r4, r5, r7\n\ - adds r0, r4, 0\n\ - movs r1, 0xB\n\ - bl GetMonData\n\ - cmp r0, 0\n\ - beq _080BC408\n\ - adds r0, r4, 0\n\ - movs r1, 0x2D\n\ - bl GetMonData\n\ - cmp r0, 0\n\ - bne _080BC408\n\ - movs r4, 0\n\ - mov r0, r10\n\ - lsls r0, 2\n\ - mov r8, r0\n\ - mov r1, r10\n\ - lsls r7, r1, 1\n\ - adds r1, 0x1\n\ - str r1, [sp, 0x4]\n\ - ldr r2, _080BC424 @ =gPlayerParty\n\ -_080BC38E:\n\ - adds r1, r4, 0\n\ - adds r1, 0xD\n\ - adds r0, r5, r2\n\ - str r2, [sp, 0x8]\n\ - bl GetMonData\n\ - mov r3, r8\n\ - adds r1, r3, r4\n\ - lsls r1, 1\n\ - ldr r3, _080BC428 @ =gSaveBlock1 + 0x1A54\n\ - adds r1, r3, r1\n\ - strh r0, [r1]\n\ - adds r0, r4, 0x1\n\ - lsls r0, 16\n\ - lsrs r4, r0, 16\n\ - ldr r2, [sp, 0x8]\n\ - cmp r4, 0x3\n\ - bls _080BC38E\n\ - movs r0, 0x64\n\ - adds r4, r6, 0\n\ - muls r4, r0\n\ - ldr r0, _080BC424 @ =gPlayerParty\n\ - adds r4, r0\n\ - adds r0, r4, 0\n\ - movs r1, 0xB\n\ - bl GetMonData\n\ - ldr r5, _080BC42C @ =gSaveBlock1 + 0x1A84\n\ - adds r1, r5, r7\n\ - strh r0, [r1]\n\ - adds r0, r4, 0\n\ - movs r1, 0xC\n\ - bl GetMonData\n\ - ldr r2, _080BC430 @ =gSaveBlock1 + 0x1A90\n\ - adds r1, r2, r7\n\ - strh r0, [r1]\n\ - adds r0, r4, 0\n\ - movs r1, 0x38\n\ - bl GetMonData\n\ - ldr r1, _080BC434 @ =gSaveBlock1 + 0x1A9C\n\ - add r1, r10\n\ - strb r0, [r1]\n\ - adds r0, r4, 0\n\ - movs r1, 0\n\ - bl GetMonData\n\ - ldr r1, _080BC438 @ =gSaveBlock1 + 0x1A3C\n\ - add r1, r8\n\ - str r0, [r1]\n\ - adds r0, r4, 0\n\ - bl sub_80BC298\n\ - ldr r1, _080BC43C @ =gSaveBlock1 + 0x1AA2\n\ - add r1, r10\n\ - strb r0, [r1]\n\ - ldr r3, [sp, 0x4]\n\ - lsls r0, r3, 16\n\ - lsrs r0, 16\n\ - mov r10, r0\n\ -_080BC408:\n\ - ldr r5, [sp]\n\ - lsls r0, r5, 16\n\ - lsrs r6, r0, 16\n\ - cmp r6, 0x5\n\ - bls _080BC314\n\ - add sp, 0xC\n\ - pop {r3-r5}\n\ - mov r8, r3\n\ - mov r9, r4\n\ - mov r10, r5\n\ - pop {r4-r7}\n\ - pop {r0}\n\ - bx r0\n\ - .align 2, 0\n\ -_080BC424: .4byte gPlayerParty\n\ -_080BC428: .4byte gSaveBlock1 + 0x1A54\n\ -_080BC42C: .4byte gSaveBlock1 + 0x1A84\n\ -_080BC430: .4byte gSaveBlock1 + 0x1A90\n\ -_080BC434: .4byte gSaveBlock1 + 0x1A9C\n\ -_080BC438: .4byte gSaveBlock1 + 0x1A3C\n\ -_080BC43C: .4byte gSaveBlock1 + 0x1AA2\n\ -.syntax divided\n"); -} -#endif void sub_80BC440(void) { -- cgit v1.2.3 From ca5a41700d0404c391bcdba8bebb7d862938a3c7 Mon Sep 17 00:00:00 2001 From: Jo Ruby P Date: Sat, 28 Jul 2018 16:36:17 +0100 Subject: gUnknown_08E77004 is now gBagScreen_Tilemap and corresponding unknown_E77004.bin is now bag_screen.bin and moved into interface --- data/graphics.s | 4 ++-- graphics/interface/bag_screen.bin | Bin 0 -> 2048 bytes graphics/unknown/unknown_E77004.bin | Bin 2048 -> 0 bytes include/graphics.h | 2 +- src/item_menu.c | 4 ++-- 5 files changed, 5 insertions(+), 5 deletions(-) create mode 100644 graphics/interface/bag_screen.bin delete mode 100644 graphics/unknown/unknown_E77004.bin diff --git a/data/graphics.s b/data/graphics.s index 7970dc904..f48723501 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -3225,8 +3225,8 @@ gBagScreenMale_Pal:: @ 8E76F94 gBagScreenFemale_Pal:: @ 8E76FCC .incbin "graphics/interface/bag_screen_female.gbapal.lz" -gUnknown_08E77004:: @ 8E77004 - .incbin "graphics/unknown/unknown_E77004.bin" +gBagScreen_Tilemap:: @ 8E77004 + .incbin "graphics/interface/bag_screen.bin" .align 2 gBuyMenuFrame_Gfx:: @ 8E77804 diff --git a/graphics/interface/bag_screen.bin b/graphics/interface/bag_screen.bin new file mode 100644 index 000000000..0342aac39 Binary files /dev/null and b/graphics/interface/bag_screen.bin differ diff --git a/graphics/unknown/unknown_E77004.bin b/graphics/unknown/unknown_E77004.bin deleted file mode 100644 index 0342aac39..000000000 Binary files a/graphics/unknown/unknown_E77004.bin and /dev/null differ diff --git a/include/graphics.h b/include/graphics.h index 8e8e0c97e..d9390e1b6 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -2472,7 +2472,7 @@ extern const u8 gBagPalette[]; extern const u8 gBagScreen_Gfx[]; extern const u8 gBagScreenMale_Pal[]; extern const u8 gBagScreenFemale_Pal[]; -extern const u16 gUnknown_08E77004[]; +extern const u16 gBagScreen_Tilemap[]; extern const u8 gBuyMenuFrame_Gfx[]; extern const u8 gMenuMoneyPal[]; extern const u8 gBuyMenuFrame_Tilemap[]; diff --git a/src/item_menu.c b/src/item_menu.c index 71516c0a4..915aa5183 100644 --- a/src/item_menu.c +++ b/src/item_menu.c @@ -538,7 +538,7 @@ static bool8 LoadBagGraphicsMultistep(void) ewramBagSetupStep++; break; case 1: - CpuCopy16(gUnknown_08E77004, gBGTilemapBuffers[2], 0x800); + CpuCopy16(gBagScreen_Tilemap, gBGTilemapBuffers[2], 0x800); ewramBagSetupStep++; break; case 2: @@ -742,7 +742,7 @@ static void sub_80A37F8(u8 taskId) static void sub_80A3954(u16 *a) { - CpuCopy16(gUnknown_08E77004, a, 0x800); + CpuCopy16(gBagScreen_Tilemap, a, 0x800); } static void sub_80A396C(u16 *a, u8 b, u8 c, u8 d) -- cgit v1.2.3 From c77da88c92ca9f5f35f15a8556baa78ce3be5631 Mon Sep 17 00:00:00 2001 From: Jo Ruby P Date: Sun, 29 Jul 2018 00:27:39 +0100 Subject: typo --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 1eac920ad..c8af3dff1 100644 --- a/Makefile +++ b/Makefile @@ -64,7 +64,7 @@ LD_SCRIPT := $(BUILD_DIR)/ld_script.ld #### Main Rules #### -ALL_BUILDS := ruby ruby_rev1 ruby_rev1 sapphire sapphire_rev1 sapphire_rev2 ruby_de sapphire_de ruby_de_debug +ALL_BUILDS := ruby ruby_rev1 ruby_rev2 sapphire sapphire_rev1 sapphire_rev2 ruby_de sapphire_de ruby_de_debug # Available targets .PHONY: all clean tidy tools $(ALL_BUILDS) -- cgit v1.2.3 From 3c149d42bca0e30274f9b6ee05b1a88adf3510f0 Mon Sep 17 00:00:00 2001 From: Jo Ruby P Date: Tue, 31 Jul 2018 04:26:57 +0100 Subject: gUnknown_08E96EC8 is now gBagScreenLabels_Tilemap and corresponding unknown_E96EC8.bin is now bag_screen_labels.bin and moved into interface. --- data/graphics.s | 4 ++-- graphics/interface/bag_screen_labels.bin | Bin 0 -> 2048 bytes graphics/unknown/unknown_E96EC8.bin | Bin 2048 -> 0 bytes include/graphics.h | 2 +- src/item_menu.c | 10 +++++----- 5 files changed, 8 insertions(+), 8 deletions(-) create mode 100644 graphics/interface/bag_screen_labels.bin delete mode 100644 graphics/unknown/unknown_E96EC8.bin diff --git a/data/graphics.s b/data/graphics.s index f48723501..587be6df0 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -4039,8 +4039,8 @@ gUnknown_08E96D2C:: @ 8E96D2C .incbin "graphics/unknown/unknown_E96D2C.bin.lz" .align 2 -gUnknown_08E96EC8:: @ 8E96EC8 - .incbin "graphics/unknown/unknown_E96EC8.bin" +gBagScreenLabels_Tilemap:: @ 8E96EC8 + .incbin "graphics/interface/bag_screen_labels.bin" .align 2 gSlotMachineSpritePalette0:: @ 8E976C8 diff --git a/graphics/interface/bag_screen_labels.bin b/graphics/interface/bag_screen_labels.bin new file mode 100644 index 000000000..eaaed586e Binary files /dev/null and b/graphics/interface/bag_screen_labels.bin differ diff --git a/graphics/unknown/unknown_E96EC8.bin b/graphics/unknown/unknown_E96EC8.bin deleted file mode 100644 index eaaed586e..000000000 Binary files a/graphics/unknown/unknown_E96EC8.bin and /dev/null differ diff --git a/include/graphics.h b/include/graphics.h index d9390e1b6..f242e3752 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -2615,7 +2615,7 @@ extern const u8 gMailTilemap_Dream[]; extern const u8 gMailTilemap_Fab[]; extern const u8 gMailTilemap_Retro[]; -extern const u8 gUnknown_08E96EC8[]; +extern const u8 gBagScreenLabels_Tilemap[]; extern const u8 gMenuTrainerCard_Gfx[]; extern const u16 gMenuTrainerCard0Star_Pal[]; diff --git a/src/item_menu.c b/src/item_menu.c index 915aa5183..414440a65 100644 --- a/src/item_menu.c +++ b/src/item_menu.c @@ -762,7 +762,7 @@ static void sub_80A39B8(u16 *a, u8 b) { u8 var = b * 2; - sub_809D104(a, 4, 10, gUnknown_08E96EC8, 0, var, 8, 2); + sub_809D104(a, 4, 10, gBagScreenLabels_Tilemap, 0, var, 8, 2); } static void sub_80A39E4(u16 *a, u8 b, u8 c, s8 d) @@ -776,8 +776,8 @@ static void sub_80A39E4(u16 *a, u8 b, u8 c, s8 d) if (b == 5) r7 = 2; - sub_809D104(a, 4, 10, gUnknown_08E96EC8, 8 - c, r2, c, 2); - sub_809D104(a, c + 4, 10, gUnknown_08E96EC8, 0, r7, 8 - c, 2); + sub_809D104(a, 4, 10, gBagScreenLabels_Tilemap, 8 - c, r2, c, 2); + sub_809D104(a, c + 4, 10, gBagScreenLabels_Tilemap, 0, r7, 8 - c, 2); } else if (d == 1) { @@ -785,8 +785,8 @@ static void sub_80A39E4(u16 *a, u8 b, u8 c, s8 d) if (b == 1) r7 = 10; - sub_809D104(a, 4, 10, gUnknown_08E96EC8, c, r7, 8 - c, 2); - sub_809D104(a, 12 - c, 10, gUnknown_08E96EC8, 0, r2, c, 2); + sub_809D104(a, 4, 10, gBagScreenLabels_Tilemap, c, r7, 8 - c, 2); + sub_809D104(a, 12 - c, 10, gBagScreenLabels_Tilemap, 0, r2, c, 2); } } -- cgit v1.2.3 From 79b9d0f826c1003365f9cf75cfd94f9fb64c93bf Mon Sep 17 00:00:00 2001 From: Jo Ruby P Date: Mon, 6 Aug 2018 07:01:34 +0100 Subject: gSpriteImage_83C172C named and moved into interface gSpriteImage_83C172C is now gBagSpinner and corresponding 83C172C.png is now bag_spinner.png and moved into interface. --- graphics/interface/bag_spinner.png | Bin 0 -> 108 bytes graphics/unknown_sprites/83C172C.png | Bin 108 -> 0 bytes src/item_menu.c | 4 ++-- 3 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 graphics/interface/bag_spinner.png delete mode 100644 graphics/unknown_sprites/83C172C.png diff --git a/graphics/interface/bag_spinner.png b/graphics/interface/bag_spinner.png new file mode 100644 index 000000000..a05d86c79 Binary files /dev/null and b/graphics/interface/bag_spinner.png differ diff --git a/graphics/unknown_sprites/83C172C.png b/graphics/unknown_sprites/83C172C.png deleted file mode 100644 index a05d86c79..000000000 Binary files a/graphics/unknown_sprites/83C172C.png and /dev/null differ diff --git a/src/item_menu.c b/src/item_menu.c index 414440a65..12d02ebd8 100644 --- a/src/item_menu.c +++ b/src/item_menu.c @@ -4024,7 +4024,7 @@ static int sub_80A7988(void) } static const u16 gPalette_83C170C[] = INCBIN_U16("graphics/unknown/83C170C.gbapal"); -static const u8 gSpriteImage_83C172C[] = INCBIN_U8("graphics/unknown_sprites/83C172C.4bpp"); +static const u8 gSpriteImage_BagSpinner[] = INCBIN_U8("graphics/interface/bag_spinner.4bpp"); const u8 gSpriteImage_UnusedCherry[] = INCBIN_U8("graphics/unused/cherry.4bpp"); const u16 gSpritePalette_UnusedCherry[] = INCBIN_U16("graphics/unused/cherry.gbapal"); @@ -4258,7 +4258,7 @@ static const union AffineAnimCmd *const gSpriteAffineAnimTable_83C1D20[] = static const struct SpriteFrameImage gSpriteImageTable_83C1D28[] = { - {gSpriteImage_83C172C, sizeof(gSpriteImage_83C172C)}, + {gSpriteImage_BagSpinner, sizeof(gSpriteImage_BagSpinner)}, }; static const struct SpritePalette sPokeballSpritePalette = {gPalette_83C170C, 8}; -- cgit v1.2.3 From 3940d36755da01324850b179c674fb36522ed71e Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Mon, 6 Aug 2018 12:02:20 -0500 Subject: Label ball animations --- data/battle_anim_813F0F4.s | 88 +++++--------- include/battle_anim_813F0F4.h | 2 +- include/pokeball.h | 4 +- src/battle/battle_anim_813F0F4.c | 140 ++++++++++----------- src/battle/battle_controller_linkopponent.c | 4 +- src/battle/battle_controller_linkpartner.c | 4 +- src/battle/battle_controller_opponent.c | 4 +- src/battle/battle_controller_player.c | 4 +- src/battle/battle_controller_wally.c | 4 +- src/battle/pokeball.c | 181 +++++++++++++++------------- src/pokemon_summary_screen.c | 2 +- 11 files changed, 213 insertions(+), 224 deletions(-) diff --git a/data/battle_anim_813F0F4.s b/data/battle_anim_813F0F4.s index fd24d95b6..b043929c3 100644 --- a/data/battle_anim_813F0F4.s +++ b/data/battle_anim_813F0F4.s @@ -4,7 +4,7 @@ .section .rodata .align 2 -gUnknown_0840B258:: @ 840B258 +gBallOpenParticleSpritesheets:: @ 840B258 obj_tiles gBattleAnimSpriteSheet_Particles, 0x100, 55020 obj_tiles gBattleAnimSpriteSheet_Particles, 0x100, 55021 obj_tiles gBattleAnimSpriteSheet_Particles, 0x100, 55022 @@ -19,7 +19,7 @@ gUnknown_0840B258:: @ 840B258 obj_tiles gBattleAnimSpriteSheet_Particles, 0x100, 55031 .align 2 -gUnknown_0840B2B8:: @ 840B2B8 +gBallOpenParticlePalettes:: @ 840B2B8 obj_pal gBattleAnimSpritePalette_136, 55020 obj_pal gBattleAnimSpritePalette_136, 55021 obj_pal gBattleAnimSpritePalette_136, 55022 @@ -78,70 +78,48 @@ gSpriteAnimTable_840B360:: @ 840B360 .4byte gSpriteAnim_840B34C .4byte gSpriteAnim_840B358 -gUnknown_0840B378:: @ 840B378 - .byte 0, 0, 0, 5, 1, 2, 2, 3, 5, 5, 4, 4 - - .align 2 -gUnknown_0840B384:: @ 840B384 - .4byte sub_8140930 - .4byte sub_8140DC4 - .4byte sub_8140C14 - .4byte sub_8140CE8 - .4byte sub_8141058 - .4byte sub_8140C14 - .4byte sub_8140B3C - .4byte sub_8140CE8 - .4byte sub_8140F24 - .4byte sub_8140A64 - .4byte sub_8140DC4 - .4byte sub_8141164 - - .align 2 -gSpriteTemplate_840B3B4:: @ 840B3B4 +gBallOpenParticleAnimNums:: @ 840B378 + .byte 0 + .byte 0 + .byte 0 + .byte 5 + .byte 1 + .byte 2 + .byte 2 + .byte 3 + .byte 5 + .byte 5 + .byte 4 + .byte 4 + + .align 2 +gBallOpenParticleAnimationFuncs:: @ 840B384 + .4byte PokeBallOpenParticleAnimation + .4byte GreatBallOpenParticleAnimation + .4byte SafariBallOpenParticleAnimation + .4byte UltraBallOpenParticleAnimation + .4byte MasterBallOpenParticleAnimation + .4byte SafariBallOpenParticleAnimation + .4byte DiveBallOpenParticleAnimation + .4byte UltraBallOpenParticleAnimation + .4byte RepeatBallOpenParticleAnimation + .4byte TimerBallOpenParticleAnimation + .4byte GreatBallOpenParticleAnimation + .4byte PremierBallOpenParticleAnimation + + .align 2 +gSpriteTemplates_840B3B4:: @ 840B3B4 spr_template 55020, 55020, gOamData_837DF24, gSpriteAnimTable_840B360, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gSpriteTemplate_840B3CC:: @ 840B3CC spr_template 55021, 55021, gOamData_837DF24, gSpriteAnimTable_840B360, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gSpriteTemplate_840B3E4:: @ 840B3E4 spr_template 55022, 55022, gOamData_837DF24, gSpriteAnimTable_840B360, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gSpriteTemplate_840B3FC:: @ 840B3FC spr_template 55023, 55023, gOamData_837DF24, gSpriteAnimTable_840B360, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gSpriteTemplate_840B414:: @ 840B414 spr_template 55024, 55024, gOamData_837DF24, gSpriteAnimTable_840B360, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gSpriteTemplate_840B42C:: @ 840B42C spr_template 55025, 55025, gOamData_837DF24, gSpriteAnimTable_840B360, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gSpriteTemplate_840B444:: @ 840B444 spr_template 55026, 55026, gOamData_837DF24, gSpriteAnimTable_840B360, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gSpriteTemplate_840B45C:: @ 840B45C spr_template 55027, 55027, gOamData_837DF24, gSpriteAnimTable_840B360, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gSpriteTemplate_840B474:: @ 840B474 spr_template 55028, 55028, gOamData_837DF24, gSpriteAnimTable_840B360, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gSpriteTemplate_840B48C:: @ 840B48C spr_template 55029, 55029, gOamData_837DF24, gSpriteAnimTable_840B360, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gSpriteTemplate_840B4A4:: @ 840B4A4 spr_template 55030, 55030, gOamData_837DF24, gSpriteAnimTable_840B360, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gSpriteTemplate_840B4BC:: @ 840B4BC spr_template 55031, 55031, gOamData_837DF24, gSpriteAnimTable_840B360, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy .align 1 diff --git a/include/battle_anim_813F0F4.h b/include/battle_anim_813F0F4.h index 9916f2fe6..fea5d186d 100644 --- a/include/battle_anim_813F0F4.h +++ b/include/battle_anim_813F0F4.h @@ -3,7 +3,7 @@ void sub_8141828(u8, struct Pokemon *); u8 ball_number_to_ball_processing_index(u16); -u8 sub_814086C(u8, u8, u8, u8, u8); +u8 AnimateBallOpenParticles(u8, u8, u8, u8, u8); u8 sub_8141314(u8, u8, u32, u8); #endif // GUARD_BATTLE_ANIM_813F0F4_H diff --git a/include/pokeball.h b/include/pokeball.h index 0a709c869..e814718c0 100644 --- a/include/pokeball.h +++ b/include/pokeball.h @@ -5,8 +5,8 @@ extern const struct SpriteTemplate gBallSpriteTemplates[]; void CreatePokeballSprite(u8 r0, u8 r1, u8 r2, u8 r3, u8 s1, u8 s2, u8 s3, u32 s4); void sub_804777C(u8); -void sub_80478DC(u8); -void sub_804794C(u8); +void LoadBallGraphics(u8); +void FreeBallGraphics(u8); u8 sub_8047580(u8, u8, u8, u8, u8, u8, u8, u32); #endif // GUARD_POKEBALL_H diff --git a/src/battle/battle_anim_813F0F4.c b/src/battle/battle_anim_813F0F4.c index 219395baf..f112c59aa 100755 --- a/src/battle/battle_anim_813F0F4.c +++ b/src/battle/battle_anim_813F0F4.c @@ -36,13 +36,13 @@ extern u8 gEffectBank; extern const u8 gUnknown_08D2EE48[]; extern const u8 gUnknown_08D2EDFC[]; extern const u16 gUnknown_08D2E150[]; -extern const struct CompressedSpritePalette gUnknown_0840B2B8[]; -extern const struct SpriteTemplate gSpriteTemplate_840B3B4[]; +extern const struct CompressedSpritePalette gBallOpenParticlePalettes[]; +extern const struct SpriteTemplate gSpriteTemplates_840B3B4[]; extern const struct SpriteTemplate gSpriteTemplate_8402500; extern const struct SpriteTemplate gBattleAnimSpriteTemplate_84024E8; -extern const u8 gUnknown_0840B378[]; -extern const struct CompressedSpriteSheet gUnknown_0840B258[]; -extern const TaskFunc gUnknown_0840B384[]; +extern const u8 gBallOpenParticleAnimNums[]; +extern const struct CompressedSpriteSheet gBallOpenParticleSpritesheets[]; +extern const TaskFunc gBallOpenParticleAnimationFuncs[]; extern const u16 gUnknown_0840B4D4[]; extern const struct CompressedSpriteSheet gBattleAnimPicTable[]; extern const struct CompressedSpritePalette gBattleAnimPaletteTable[]; @@ -69,12 +69,12 @@ static void sub_81404E4(struct Sprite *sprite); static void sub_81405C8(struct Sprite *sprite); static void sub_81406BC(struct Sprite *sprite); static void sub_81407F4(struct Sprite *sprite); -static void sub_8140A08(struct Sprite *sprite); -static void sub_8140A28(struct Sprite *sprite); -static void sub_8141294(struct Sprite *sprite); -static void sub_8140ECC(struct Sprite *sprite); -static void sub_8140FF8(struct Sprite *sprite); -static void sub_8141230(struct Sprite *sprite); +static void PokeBallOpenParticleAnimation_Step1(struct Sprite *sprite); +static void PokeBallOpenParticleAnimation_Step2(struct Sprite *sprite); +static void DestroyBallOpenAnimationParticle(struct Sprite *sprite); +static void FanOutBallOpenParticles_Step1(struct Sprite *sprite); +static void RepeatBallOpenParticleAnimation_Step1(struct Sprite *sprite); +static void PremierBallOpenParticleAnimation_Step1(struct Sprite *sprite); static void sub_81413DC(u8 taskId); static void sub_814146C(u8 taskId); static void sub_81414BC(u8 taskId); @@ -338,7 +338,7 @@ void sub_813F844(u8 taskId) y = GetBattlerSpriteCoord(gAnimBankAttacker, 1); priority = gSprites[spriteId].oam.priority; subpriority = gSprites[spriteId].subpriority; - gTasks[taskId].data[10] = sub_814086C(x, y + 32, priority, subpriority, ballIndex); + gTasks[taskId].data[10] = AnimateBallOpenParticles(x, y + 32, priority, subpriority, ballIndex); selectedPalettes = sub_80791A8(1, 0, 0, 0, 0, 0, 0); gTasks[taskId].data[11] = sub_8141314(0, gAnimBankAttacker, selectedPalettes, ballIndex); gTasks[taskId].data[0]++; @@ -353,14 +353,14 @@ void sub_813F844(u8 taskId) void sub_813F990(u8 taskId) { u8 ballIndex = ball_number_to_ball_processing_index(gLastUsedItem); - sub_80478DC(ballIndex); + LoadBallGraphics(ballIndex); DestroyAnimVisualTask(taskId); } void sub_813F9B8(u8 taskId) { u8 ballIndex = ball_number_to_ball_processing_index(gLastUsedItem); - sub_804794C(ballIndex); + FreeBallGraphics(ballIndex); DestroyAnimVisualTask(taskId); } @@ -526,7 +526,7 @@ static void sub_813FDC0(struct Sprite *sprite) if (ballIndex2 < 0) return; - sub_814086C(sprite->pos1.x, sprite->pos1.y - 5, 1, 28, ballIndex); + AnimateBallOpenParticles(sprite->pos1.x, sprite->pos1.y - 5, 1, 28, ballIndex); sub_8141314(0, gAnimBankTarget, 14, ballIndex); } } @@ -946,7 +946,7 @@ static void sub_81405F4(struct Sprite *sprite) if (ballIndex2 < 0) goto LABEL; - sub_814086C(sprite->pos1.x, sprite->pos1.y - 5, 1, 28, ballIndex); + AnimateBallOpenParticles(sprite->pos1.x, sprite->pos1.y - 5, 1, 28, ballIndex); sub_8141314(1, gAnimBankTarget, 14, ballIndex); LABEL: @@ -1090,17 +1090,17 @@ _08140868: .4byte gDoingBattleAnim\n\ } #endif // NONMATCHING -u8 sub_814086C(u8 x, u8 y, u8 priority, u8 subpriority, u8 ballIndex) +u8 AnimateBallOpenParticles(u8 x, u8 y, u8 priority, u8 subpriority, u8 ballIndex) { u8 taskId; - if (GetSpriteTileStartByTag(gUnknown_0840B258[ballIndex].tag) == 0xFFFF) + if (GetSpriteTileStartByTag(gBallOpenParticleSpritesheets[ballIndex].tag) == 0xFFFF) { - LoadCompressedObjectPic(&gUnknown_0840B258[ballIndex]); - LoadCompressedObjectPalette(&gUnknown_0840B2B8[ballIndex]); + LoadCompressedObjectPic(&gBallOpenParticleSpritesheets[ballIndex]); + LoadCompressedObjectPalette(&gBallOpenParticlePalettes[ballIndex]); } - taskId = CreateTask(gUnknown_0840B384[ballIndex], 5); + taskId = CreateTask(gBallOpenParticleAnimationFuncs[ballIndex], 5); gTasks[taskId].data[1] = x; gTasks[taskId].data[2] = y; gTasks[taskId].data[3] = priority; @@ -1113,7 +1113,7 @@ u8 sub_814086C(u8 x, u8 y, u8 priority, u8 subpriority, u8 ballIndex) return taskId; } -void sub_8140930(u8 taskId) +void PokeBallOpenParticleAnimation(u8 taskId) { u8 spriteId; u8 x, y; @@ -1129,9 +1129,9 @@ void sub_8140930(u8 taskId) priority = gTasks[taskId].data[3]; subpriority = gTasks[taskId].data[4]; - spriteId = CreateSprite(&gSpriteTemplate_840B3B4[ballIndex], x, y, subpriority); - StartSpriteAnim(&gSprites[spriteId], gUnknown_0840B378[ballIndex]); - gSprites[spriteId].callback = sub_8140A08; + spriteId = CreateSprite(&gSpriteTemplates_840B3B4[ballIndex], x, y, subpriority); + StartSpriteAnim(&gSprites[spriteId], gBallOpenParticleAnimNums[ballIndex]); + gSprites[spriteId].callback = PokeBallOpenParticleAnimation_Step1; gSprites[spriteId].oam.priority = priority; var0 = (u8)gTasks[taskId].data[0]; @@ -1150,24 +1150,24 @@ void sub_8140930(u8 taskId) gTasks[taskId].data[0]++; } -static void sub_8140A08(struct Sprite *sprite) +static void PokeBallOpenParticleAnimation_Step1(struct Sprite *sprite) { if (sprite->data[1] == 0) - sprite->callback = sub_8140A28; + sprite->callback = PokeBallOpenParticleAnimation_Step2; else sprite->data[1]--; } -static void sub_8140A28(struct Sprite *sprite) +static void PokeBallOpenParticleAnimation_Step2(struct Sprite *sprite) { sprite->pos2.x = Sin(sprite->data[0], sprite->data[1]); sprite->pos2.y = Cos(sprite->data[0], sprite->data[1]); sprite->data[1] += 2; if (sprite->data[1] == 50) - sub_8141294(sprite); + DestroyBallOpenAnimationParticle(sprite); } -void sub_8140A64(u8 taskId) +void TimerBallOpenParticleAnimation(u8 taskId) { u8 i; u8 x, y, priority, subpriority, ballIndex; @@ -1181,9 +1181,9 @@ void sub_8140A64(u8 taskId) for (i = 0; i < 8; i++) { - spriteId = CreateSprite(&gSpriteTemplate_840B3B4[ballIndex], x, y, subpriority); - StartSpriteAnim(&gSprites[spriteId], gUnknown_0840B378[ballIndex]); - gSprites[spriteId].callback = sub_8140ECC; + spriteId = CreateSprite(&gSpriteTemplates_840B3B4[ballIndex], x, y, subpriority); + StartSpriteAnim(&gSprites[spriteId], gBallOpenParticleAnimNums[ballIndex]); + gSprites[spriteId].callback = FanOutBallOpenParticles_Step1; gSprites[spriteId].oam.priority = priority; gSprites[spriteId].data[0] = i * 32; gSprites[spriteId].data[4] = 10; @@ -1195,7 +1195,7 @@ void sub_8140A64(u8 taskId) DestroyTask(taskId); } -void sub_8140B3C(u8 taskId) +void DiveBallOpenParticleAnimation(u8 taskId) { u8 i; u8 x, y, priority, subpriority, ballIndex; @@ -1209,9 +1209,9 @@ void sub_8140B3C(u8 taskId) for (i = 0; i < 8; i++) { - spriteId = CreateSprite(&gSpriteTemplate_840B3B4[ballIndex], x, y, subpriority); - StartSpriteAnim(&gSprites[spriteId], gUnknown_0840B378[ballIndex]); - gSprites[spriteId].callback = sub_8140ECC; + spriteId = CreateSprite(&gSpriteTemplates_840B3B4[ballIndex], x, y, subpriority); + StartSpriteAnim(&gSprites[spriteId], gBallOpenParticleAnimNums[ballIndex]); + gSprites[spriteId].callback = FanOutBallOpenParticles_Step1; gSprites[spriteId].oam.priority = priority; gSprites[spriteId].data[0] = i * 32; gSprites[spriteId].data[4] = 10; @@ -1223,7 +1223,7 @@ void sub_8140B3C(u8 taskId) DestroyTask(taskId); } -void sub_8140C14(u8 taskId) +void SafariBallOpenParticleAnimation(u8 taskId) { u8 i; u8 x, y, priority, subpriority, ballIndex; @@ -1237,9 +1237,9 @@ void sub_8140C14(u8 taskId) for (i = 0; i < 8; i++) { - spriteId = CreateSprite(&gSpriteTemplate_840B3B4[ballIndex], x, y, subpriority); - StartSpriteAnim(&gSprites[spriteId], gUnknown_0840B378[ballIndex]); - gSprites[spriteId].callback = sub_8140ECC; + spriteId = CreateSprite(&gSpriteTemplates_840B3B4[ballIndex], x, y, subpriority); + StartSpriteAnim(&gSprites[spriteId], gBallOpenParticleAnimNums[ballIndex]); + gSprites[spriteId].callback = FanOutBallOpenParticles_Step1; gSprites[spriteId].oam.priority = priority; gSprites[spriteId].data[0] = i * 32; gSprites[spriteId].data[4] = 4; @@ -1251,7 +1251,7 @@ void sub_8140C14(u8 taskId) DestroyTask(taskId); } -void sub_8140CE8(u8 taskId) +void UltraBallOpenParticleAnimation(u8 taskId) { u8 i; u8 x, y, priority, subpriority, ballIndex; @@ -1265,9 +1265,9 @@ void sub_8140CE8(u8 taskId) for (i = 0; i < 10; i++) { - spriteId = CreateSprite(&gSpriteTemplate_840B3B4[ballIndex], x, y, subpriority); - StartSpriteAnim(&gSprites[spriteId], gUnknown_0840B378[ballIndex]); - gSprites[spriteId].callback = sub_8140ECC; + spriteId = CreateSprite(&gSpriteTemplates_840B3B4[ballIndex], x, y, subpriority); + StartSpriteAnim(&gSprites[spriteId], gBallOpenParticleAnimNums[ballIndex]); + gSprites[spriteId].callback = FanOutBallOpenParticles_Step1; gSprites[spriteId].oam.priority = priority; gSprites[spriteId].data[0] = i * 25; gSprites[spriteId].data[4] = 5; @@ -1279,7 +1279,7 @@ void sub_8140CE8(u8 taskId) DestroyTask(taskId); } -void sub_8140DC4(u8 taskId) +void GreatBallOpenParticleAnimation(u8 taskId) { u8 i; u8 x, y, priority, subpriority, ballIndex; @@ -1299,9 +1299,9 @@ void sub_8140DC4(u8 taskId) for (i = 0; i < 8; i++) { - spriteId = CreateSprite(&gSpriteTemplate_840B3B4[ballIndex], x, y, subpriority); - StartSpriteAnim(&gSprites[spriteId], gUnknown_0840B378[ballIndex]); - gSprites[spriteId].callback = sub_8140ECC; + spriteId = CreateSprite(&gSpriteTemplates_840B3B4[ballIndex], x, y, subpriority); + StartSpriteAnim(&gSprites[spriteId], gBallOpenParticleAnimNums[ballIndex]); + gSprites[spriteId].callback = FanOutBallOpenParticles_Step1; gSprites[spriteId].oam.priority = priority; gSprites[spriteId].data[0] = i * 32; gSprites[spriteId].data[4] = 8; @@ -1318,7 +1318,7 @@ void sub_8140DC4(u8 taskId) } } -static void sub_8140ECC(struct Sprite *sprite) +static void FanOutBallOpenParticles_Step1(struct Sprite *sprite) { sprite->pos2.x = Sin(sprite->data[0], sprite->data[1]); sprite->pos2.y = Cos(sprite->data[0], sprite->data[2]); @@ -1326,10 +1326,10 @@ static void sub_8140ECC(struct Sprite *sprite) sprite->data[1] += sprite->data[5]; sprite->data[2] += sprite->data[6]; if (++sprite->data[3] == 51) - sub_8141294(sprite); + DestroyBallOpenAnimationParticle(sprite); } -void sub_8140F24(u8 taskId) +void RepeatBallOpenParticleAnimation(u8 taskId) { u8 i; u8 x, y, priority, subpriority, ballIndex; @@ -1343,9 +1343,9 @@ void sub_8140F24(u8 taskId) for (i = 0; i < 12; i++) { - spriteId = CreateSprite(&gSpriteTemplate_840B3B4[ballIndex], x, y, subpriority); - StartSpriteAnim(&gSprites[spriteId], gUnknown_0840B378[ballIndex]); - gSprites[spriteId].callback = sub_8140FF8; + spriteId = CreateSprite(&gSpriteTemplates_840B3B4[ballIndex], x, y, subpriority); + StartSpriteAnim(&gSprites[spriteId], gBallOpenParticleAnimNums[ballIndex]); + gSprites[spriteId].callback = RepeatBallOpenParticleAnimation_Step1; gSprites[spriteId].oam.priority = priority; gSprites[spriteId].data[0] = i * 21; } @@ -1354,7 +1354,7 @@ void sub_8140F24(u8 taskId) DestroyTask(taskId); } -static void sub_8140FF8(struct Sprite *sprite) +static void RepeatBallOpenParticleAnimation_Step1(struct Sprite *sprite) { sprite->pos2.x = Sin(sprite->data[0], sprite->data[1]); sprite->pos2.y = Cos(sprite->data[0], Sin(sprite->data[0], sprite->data[2])); @@ -1362,10 +1362,10 @@ static void sub_8140FF8(struct Sprite *sprite) sprite->data[1]++; sprite->data[2]++; if (++sprite->data[3] == 51) - sub_8141294(sprite); + DestroyBallOpenAnimationParticle(sprite); } -void sub_8141058(u8 taskId) +void MasterBallOpenParticleAnimation(u8 taskId) { u8 i, j; u8 x, y, priority, subpriority, ballIndex; @@ -1381,9 +1381,9 @@ void sub_8141058(u8 taskId) { for (i = 0; i < 8; i++) { - spriteId = CreateSprite(&gSpriteTemplate_840B3B4[ballIndex], x, y, subpriority); - StartSpriteAnim(&gSprites[spriteId], gUnknown_0840B378[ballIndex]); - gSprites[spriteId].callback = sub_8140ECC; + spriteId = CreateSprite(&gSpriteTemplates_840B3B4[ballIndex], x, y, subpriority); + StartSpriteAnim(&gSprites[spriteId], gBallOpenParticleAnimNums[ballIndex]); + gSprites[spriteId].callback = FanOutBallOpenParticles_Step1; gSprites[spriteId].oam.priority = priority; gSprites[spriteId].data[0] = i * 32; gSprites[spriteId].data[4] = 8; @@ -1405,7 +1405,7 @@ void sub_8141058(u8 taskId) DestroyTask(taskId); } -void sub_8141164(u8 taskId) +void PremierBallOpenParticleAnimation(u8 taskId) { u8 i; u8 x, y, priority, subpriority, ballIndex; @@ -1419,9 +1419,9 @@ void sub_8141164(u8 taskId) for (i = 0; i < 8; i++) { - spriteId = CreateSprite(&gSpriteTemplate_840B3B4[ballIndex], x, y, subpriority); - StartSpriteAnim(&gSprites[spriteId], gUnknown_0840B378[ballIndex]); - gSprites[spriteId].callback = sub_8141230; + spriteId = CreateSprite(&gSpriteTemplates_840B3B4[ballIndex], x, y, subpriority); + StartSpriteAnim(&gSprites[spriteId], gBallOpenParticleAnimNums[ballIndex]); + gSprites[spriteId].callback = PremierBallOpenParticleAnimation_Step1; gSprites[spriteId].oam.priority = priority; gSprites[spriteId].data[0] = i * 32; } @@ -1430,7 +1430,7 @@ void sub_8141164(u8 taskId) DestroyTask(taskId); } -static void sub_8141230(struct Sprite *sprite) +static void PremierBallOpenParticleAnimation_Step1(struct Sprite *sprite) { sprite->pos2.x = Sin(sprite->data[0], sprite->data[1]); sprite->pos2.y = Cos(sprite->data[0], Sin(sprite->data[0] & 0x3F, sprite->data[2])); @@ -1438,10 +1438,10 @@ static void sub_8141230(struct Sprite *sprite) sprite->data[1]++; sprite->data[2]++; if (++sprite->data[3] == 51) - sub_8141294(sprite); + DestroyBallOpenAnimationParticle(sprite); } -static void sub_8141294(struct Sprite *sprite) +static void DestroyBallOpenAnimationParticle(struct Sprite *sprite) { int i; int temp; @@ -1460,8 +1460,8 @@ static void sub_8141294(struct Sprite *sprite) { for (i = 0; i < 12; i++) { - FreeSpriteTilesByTag(gUnknown_0840B258[i].tag); - FreeSpritePaletteByTag(gUnknown_0840B2B8[i].tag); + FreeSpriteTilesByTag(gBallOpenParticleSpritesheets[i].tag); + FreeSpritePaletteByTag(gBallOpenParticlePalettes[i].tag); } DestroySprite(sprite); diff --git a/src/battle/battle_controller_linkopponent.c b/src/battle/battle_controller_linkopponent.c index 8ca3d160a..f9c8fe7d1 100644 --- a/src/battle/battle_controller_linkopponent.c +++ b/src/battle/battle_controller_linkopponent.c @@ -62,7 +62,7 @@ extern void sub_8037A74(void); extern void sub_8032984(u8, u16); extern void sub_8037E30(void); extern void sub_80312F0(struct Sprite *); -extern u8 sub_8046400(); +extern u8 StartSendOutMonAnimation(); extern void sub_8032A08(); extern void sub_8043DB0(); extern void sub_8037BBC(void); @@ -1195,7 +1195,7 @@ void sub_8039430(u8 a, u8 b) StartSpriteAnim(&gSprites[gBankSpriteIds[a]], gBattleMonForms[a]); gSprites[gBankSpriteIds[a]].invisible = TRUE; gSprites[gBankSpriteIds[a]].callback = SpriteCallbackDummy; - gSprites[gUnknown_0300434C[a]].data[0] = sub_8046400(0, 0xFE); + gSprites[gUnknown_0300434C[a]].data[0] = StartSendOutMonAnimation(0, 0xFE); } void LinkOpponentHandleReturnPokeToBall(void) diff --git a/src/battle/battle_controller_linkpartner.c b/src/battle/battle_controller_linkpartner.c index dff4edfc1..38514bfb5 100644 --- a/src/battle/battle_controller_linkpartner.c +++ b/src/battle/battle_controller_linkpartner.c @@ -79,7 +79,7 @@ extern void sub_80105EC(struct Sprite *); extern s32 sub_803FC34(u16); extern void LoadPlayerTrainerBankSprite(); extern void sub_80313A0(struct Sprite *); -extern u8 sub_8046400(); +extern u8 StartSendOutMonAnimation(); extern void sub_80312F0(struct Sprite *); extern u8 CreateInvisibleSpriteWithCallback(); extern void BattleLoadPlayerMonSprite(); @@ -1143,7 +1143,7 @@ void sub_811F864(u8 a, u8 b) StartSpriteAnim(&gSprites[gBankSpriteIds[a]], gBattleMonForms[a]); gSprites[gBankSpriteIds[a]].invisible = TRUE; gSprites[gBankSpriteIds[a]].callback = SpriteCallbackDummy; - gSprites[gUnknown_0300434C[a]].data[0] = sub_8046400(0, 0xFF); + gSprites[gUnknown_0300434C[a]].data[0] = StartSendOutMonAnimation(0, 0xFF); } void LinkPartnerHandleReturnPokeToBall(void) diff --git a/src/battle/battle_controller_opponent.c b/src/battle/battle_controller_opponent.c index ee313c098..a7e99900b 100644 --- a/src/battle/battle_controller_opponent.c +++ b/src/battle/battle_controller_opponent.c @@ -74,7 +74,7 @@ extern u8 GetBattlerPosition(u8); extern void sub_8032984(u8, u16); extern void sub_80333D4(void); extern void sub_80312F0(struct Sprite *); -extern u8 sub_8046400(); +extern u8 StartSendOutMonAnimation(); extern void sub_8032A08(); extern void sub_8043DB0(); extern void sub_8033160(void); @@ -1168,7 +1168,7 @@ void sub_803495C(u8 a, u8 b) StartSpriteAnim(&gSprites[gBankSpriteIds[a]], gBattleMonForms[a]); gSprites[gBankSpriteIds[a]].invisible = TRUE; gSprites[gBankSpriteIds[a]].callback = SpriteCallbackDummy; - gSprites[gUnknown_0300434C[a]].data[0] = sub_8046400(0, 0xFE); + gSprites[gUnknown_0300434C[a]].data[0] = StartSendOutMonAnimation(0, 0xFE); } void OpponentHandleReturnPokeToBall(void) diff --git a/src/battle/battle_controller_player.c b/src/battle/battle_controller_player.c index 654a2c195..de8b1579b 100644 --- a/src/battle/battle_controller_player.c +++ b/src/battle/battle_controller_player.c @@ -126,7 +126,7 @@ extern void sub_802DEAC(void); extern void sub_80312F0(struct Sprite *); extern u8 GetBattlerSpriteCoord(); extern u8 sub_8077F68(); -extern u8 sub_8046400(); +extern u8 StartSendOutMonAnimation(); extern void sub_802D798(void); extern void bx_0802E404(void); extern u8 gActiveBattler; @@ -2523,7 +2523,7 @@ void sub_802F934(u8 bank, u8 b) StartSpriteAnim(&gSprites[gBankSpriteIds[bank]], gBattleMonForms[bank]); gSprites[gBankSpriteIds[bank]].invisible = TRUE; gSprites[gBankSpriteIds[bank]].callback = SpriteCallbackDummy; - gSprites[gUnknown_0300434C[bank]].data[0] = sub_8046400(0, 0xFF); + gSprites[gUnknown_0300434C[bank]].data[0] = StartSendOutMonAnimation(0, 0xFF); } void PlayerHandleReturnPokeToBall(void) diff --git a/src/battle/battle_controller_wally.c b/src/battle/battle_controller_wally.c index 312ef9d12..a7ce7d27d 100644 --- a/src/battle/battle_controller_wally.c +++ b/src/battle/battle_controller_wally.c @@ -88,7 +88,7 @@ extern void oamt_add_pos2_onto_pos1(); extern void StartAnimLinearTranslation(struct Sprite *); extern void sub_8030E38(struct Sprite *); extern void StoreSpriteCallbackInData(); -extern u8 sub_8046400(); +extern u8 StartSendOutMonAnimation(); extern u8 GetBattlerSpriteCoord(); extern u8 sub_8077F68(); extern u8 sub_8079E90(); @@ -1518,7 +1518,7 @@ void sub_81398BC(u8 bank) StartSpriteAnim(&gSprites[gBankSpriteIds[bank]], gBattleMonForms[bank]); gSprites[gBankSpriteIds[bank]].invisible = TRUE; gSprites[gBankSpriteIds[bank]].callback = SpriteCallbackDummy; - gSprites[gUnknown_0300434C[bank]].data[0] = sub_8046400(0, 0xFF); + gSprites[gUnknown_0300434C[bank]].data[0] = StartSendOutMonAnimation(0, 0xFF); } void sub_8139A2C(u8 taskId) diff --git a/src/battle/pokeball.c b/src/battle/pokeball.c index ac15246d6..abfdf2c3d 100644 --- a/src/battle/pokeball.c +++ b/src/battle/pokeball.c @@ -300,7 +300,7 @@ const struct SpriteTemplate gBallSpriteTemplates[] = extern void InitAnimArcTranslation(); extern bool8 TranslateAnimArc(struct Sprite *); -static void sub_8046464(u8); +static void SendOutMonAnimation(u8); static void sub_80466E8(struct Sprite *); static void sub_80466F4(struct Sprite *); static void sub_8046760(struct Sprite *); @@ -312,10 +312,10 @@ static void sub_8046C78(struct Sprite *); static void sub_8046E7C(struct Sprite *); static void sub_8046E9C(struct Sprite *); static void sub_8046FBC(struct Sprite *); -static void sub_8047074(struct Sprite *); -static void sub_80470C4(struct Sprite *); -static void sub_8047230(struct Sprite *); -static void sub_8047254(struct Sprite *); +static void SendOutPlayerMonAnimation_Step0(struct Sprite *); +static void SendOutPlayerMonAnimation_Step1(struct Sprite *); +static void SendOutMonAnimation_Delay(struct Sprite *); +static void SendOutOpponentMonAnimation_Step0(struct Sprite *); static void sub_80473D0(struct Sprite *); static void sub_804748C(struct Sprite *); static void sub_8047638(struct Sprite *); @@ -324,28 +324,28 @@ static void sub_8047754(struct Sprite *); static void sub_804780C(struct Sprite *); static void sub_8047830(struct Sprite *); static void oamc_804BEB4(struct Sprite *); -static u16 sub_8047978(u8); +static u16 GetBattlerBall(u8); -u8 sub_8046400(u16 a, u8 b) +u8 StartSendOutMonAnimation(u16 a, u8 side) { u8 taskId; gDoingBattleAnim = 1; ewram17810[gActiveBattler].unk0_3 = 1; - taskId = CreateTask(sub_8046464, 5); + taskId = CreateTask(SendOutMonAnimation, 5); gTasks[taskId].data[1] = a; - gTasks[taskId].data[2] = b; + gTasks[taskId].data[2] = side; gTasks[taskId].data[3] = gActiveBattler; return 0; } -static void sub_8046464(u8 taskId) +static void SendOutMonAnimation(u8 taskId) { - bool8 sp0 = FALSE; - u16 r8; - u8 r5; + bool8 debug = FALSE; + u16 side; + u8 battler; u16 ball; - u8 r4; + u8 ballIndex; u8 spriteId; if (gTasks[taskId].data[0] == 0) @@ -353,44 +353,49 @@ static void sub_8046464(u8 taskId) gTasks[taskId].data[0]++; return; } - r8 = gTasks[taskId].data[2]; - r5 = gTasks[taskId].data[3]; - if (GetBattlerSide(r5) != 0) - ball = GetMonData(&gEnemyParty[gBattlerPartyIndexes[r5]], MON_DATA_POKEBALL); + + side = gTasks[taskId].data[2]; + battler = gTasks[taskId].data[3]; + if (GetBattlerSide(battler) != B_SIDE_PLAYER) + ball = GetMonData(&gEnemyParty[gBattlerPartyIndexes[battler]], MON_DATA_POKEBALL); else - ball = GetMonData(&gPlayerParty[gBattlerPartyIndexes[r5]], MON_DATA_POKEBALL); - r4 = ball_number_to_ball_processing_index(ball); - sub_80478DC(r4); - spriteId = CreateSprite(&gBallSpriteTemplates[r4], 32, 80, 0x1D); + ball = GetMonData(&gPlayerParty[gBattlerPartyIndexes[battler]], MON_DATA_POKEBALL); + + ballIndex = ball_number_to_ball_processing_index(ball); + LoadBallGraphics(ballIndex); + spriteId = CreateSprite(&gBallSpriteTemplates[ballIndex], 32, 80, 29); gSprites[spriteId].data[0] = 0x80; gSprites[spriteId].data[1] = 0; - gSprites[spriteId].data[7] = r8; - switch (r8) + gSprites[spriteId].data[7] = side; + + switch (side) { - case 0xFF: - gBankTarget = r5; + case 0xFF: // Player's side + gBankTarget = battler; gSprites[spriteId].pos1.x = 24; gSprites[spriteId].pos1.y = 68; - gSprites[spriteId].callback = sub_8047074; + gSprites[spriteId].callback = SendOutPlayerMonAnimation_Step0; break; - case 0xFE: - gSprites[spriteId].pos1.x = GetBattlerSpriteCoord(r5, 0); - gSprites[spriteId].pos1.y = GetBattlerSpriteCoord(r5, 1) + 24; - gBankTarget = r5; + case 0xFE: // Opponent's side + gSprites[spriteId].pos1.x = GetBattlerSpriteCoord(battler, 0); + gSprites[spriteId].pos1.y = GetBattlerSpriteCoord(battler, 1) + 24; + gBankTarget = battler; gSprites[spriteId].data[0] = 0; - gSprites[spriteId].callback = sub_8047254; + gSprites[spriteId].callback = SendOutOpponentMonAnimation_Step0; break; default: gBankTarget = GetBattlerAtPosition(1); - sp0 = TRUE; + debug = TRUE; break; } + gSprites[spriteId].data[6] = gBankTarget; - if (!sp0) + if (!debug) { DestroyTask(taskId); return; } + gSprites[spriteId].data[0] = 0x22; gSprites[spriteId].data[2] = GetBattlerSpriteCoord(gBankTarget, 0); gSprites[spriteId].data[4] = GetBattlerSpriteCoord(gBankTarget, 1) - 16; @@ -418,8 +423,8 @@ static void objc_0804ABD4(struct Sprite *sprite) sprite->pos2.x = 0; sprite->pos2.y = 0; sprite->data[5] = 0; - r4 = ball_number_to_ball_processing_index(sub_8047978(r5)); - sub_814086C(sprite->pos1.x, sprite->pos1.y - 5, 1, 0x1C, r4); + r4 = ball_number_to_ball_processing_index(GetBattlerBall(r5)); + AnimateBallOpenParticles(sprite->pos1.x, sprite->pos1.y - 5, 1, 0x1C, r4); sprite->data[0] = sub_8141314(0, r5, 14, r4); sprite->data[6] = r5; sprite->data[7] = r8; @@ -693,34 +698,35 @@ static void sub_8046AD0(u8 taskId) static void sub_8046C78(struct Sprite *sprite) { - u8 r5 = sprite->data[6]; - u32 r4; // not sure of this type + int ballIndex; + u8 battler = sprite->data[6]; StartSpriteAnim(sprite, 1); - r4 = ball_number_to_ball_processing_index(sub_8047978(r5)); - sub_814086C(sprite->pos1.x, sprite->pos1.y - 5, 1, 0x1C, r4); - sprite->data[0] = sub_8141314(1, sprite->data[6], 14, r4); + ballIndex = ball_number_to_ball_processing_index(GetBattlerBall(battler)); + AnimateBallOpenParticles(sprite->pos1.x, sprite->pos1.y - 5, 1, 28, ballIndex); + sprite->data[0] = sub_8141314(1, sprite->data[6], 14, ballIndex); sprite->callback = sub_8046E9C; if (gMain.inBattle) { - struct Pokemon *pkmn; + struct Pokemon *mon; u16 species; - s8 r8; - u16 r4_2; + s8 cryPanning; + u16 cryBehavior; u8 taskId; - if (GetBattlerSide(r5) != 0) + if (GetBattlerSide(battler) != 0) { - pkmn = &gEnemyParty[gBattlerPartyIndexes[r5]]; - r8 = 25; + mon = &gEnemyParty[gBattlerPartyIndexes[battler]]; + cryPanning = 25; } else { - pkmn = &gPlayerParty[gBattlerPartyIndexes[r5]]; - r8 = -25; + mon = &gPlayerParty[gBattlerPartyIndexes[battler]]; + cryPanning = -25; } - species = GetMonData(pkmn, MON_DATA_SPECIES); - if ((r5 == GetBattlerAtPosition(0) || r5 == GetBattlerAtPosition(1)) + + species = GetMonData(mon, MON_DATA_SPECIES); + if ((battler == GetBattlerAtPosition(0) || battler == GetBattlerAtPosition(1)) && IsDoubleBattle() && ewram17840.unk9_0) { if (gBattleTypeFlags & BATTLE_TYPE_MULTI) @@ -733,18 +739,21 @@ static void sub_8046C78(struct Sprite *sprite) m4aMPlayVolumeControl(&gMPlay_BGM, 0xFFFF, 128); } } + if (!IsDoubleBattle() || !ewram17840.unk9_0) - r4_2 = 0; - else if (r5 == GetBattlerAtPosition(0) || r5 == GetBattlerAtPosition(1)) - r4_2 = 1; + cryBehavior = 0; + else if (battler == GetBattlerAtPosition(0) || battler == GetBattlerAtPosition(1)) + cryBehavior = 1; else - r4_2 = 2; + cryBehavior = 2; + taskId = CreateTask(sub_8046AD0, 3); gTasks[taskId].data[0] = species; - gTasks[taskId].data[1] = r8; - gTasks[taskId].data[2] = r4_2; + gTasks[taskId].data[1] = cryPanning; + gTasks[taskId].data[2] = cryBehavior; gTasks[taskId].data[15] = 0; } + StartSpriteAffineAnim(&gSprites[gBankSpriteIds[sprite->data[6]]], 1); AnimateSprite(&gSprites[gBankSpriteIds[sprite->data[6]]]); gSprites[gBankSpriteIds[sprite->data[6]]].data[1] = 0x1000; @@ -795,7 +804,7 @@ static void sub_8046E9C(struct Sprite *sprite) if (r3 == 4) { for (i = 0; i < 12; i++) - sub_804794C(i); + FreeBallGraphics(i); } } } @@ -825,7 +834,7 @@ static void sub_8046FBC(struct Sprite *sprite) } } -static void sub_8047074(struct Sprite *sprite) +static void SendOutPlayerMonAnimation_Step0(struct Sprite *sprite) { sprite->data[0] = 25; sprite->data[2] = GetBattlerSpriteCoord(sprite->data[6], 2); @@ -833,12 +842,12 @@ static void sub_8047074(struct Sprite *sprite) sprite->data[5] = -30; sprite->oam.affineParam = sprite->data[6]; InitAnimArcTranslation(sprite); - sprite->callback = sub_80470C4; + sprite->callback = SendOutPlayerMonAnimation_Step1; } #define HIBYTE(x) (((x) >> 8) & 0xFF) -static void sub_80470C4(struct Sprite *sprite) +static void SendOutPlayerMonAnimation_Step1(struct Sprite *sprite) { u32 r6; u32 r7; @@ -855,6 +864,7 @@ static void sub_80470C4(struct Sprite *sprite) sprite->data[2] = ((sprite->data[2] / 3) & ~1) | r7; StartSpriteAffineAnim(sprite, 4); } + r4 = sprite->data[0]; TranslateAnimLinear(sprite); sprite->data[7] += sprite->data[6] / 3; @@ -864,6 +874,7 @@ static void sub_80470C4(struct Sprite *sprite) sprite->data[0] = r4; else sprite->data[0] = r4 - 1; + if (HIBYTE(sprite->data[7]) >= 80) { r6 = sprite->data[1] & 1; @@ -882,17 +893,17 @@ static void sub_80470C4(struct Sprite *sprite) sprite->pos2.x = 0; sprite->data[6] = sprite->oam.affineParam & 0xFF; sprite->data[0] = 0; - if (IsDoubleBattle() && ewram17840.unk9_0 - && sprite->data[6] == GetBattlerAtPosition(2)) - sprite->callback = sub_8047230; + if (IsDoubleBattle() && ewram17840.unk9_0 && sprite->data[6] == GetBattlerAtPosition(2)) + sprite->callback = SendOutMonAnimation_Delay; else sprite->callback = sub_8046C78; + StartSpriteAffineAnim(sprite, 0); } } } -static void sub_8047230(struct Sprite *sprite) +static void SendOutMonAnimation_Delay(struct Sprite *sprite) { if (sprite->data[0]++ > 24) { @@ -901,15 +912,14 @@ static void sub_8047230(struct Sprite *sprite) } } -static void sub_8047254(struct Sprite *sprite) +static void SendOutOpponentMonAnimation_Step0(struct Sprite *sprite) { sprite->data[0]++; if (sprite->data[0] > 15) { sprite->data[0] = 0; - if (IsDoubleBattle() && ewram17840.unk9_0 - && sprite->data[6] == GetBattlerAtPosition(3)) - sprite->callback = sub_8047230; + if (IsDoubleBattle() && ewram17840.unk9_0 && sprite->data[6] == GetBattlerAtPosition(3)) + sprite->callback = SendOutMonAnimation_Delay; else sprite->callback = sub_8046C78; } @@ -917,7 +927,7 @@ static void sub_8047254(struct Sprite *sprite) static u8 sub_80472B0(u8 a, u8 b, u8 c, u8 d) { - return sub_814086C(a, b, c, d, 0); + return AnimateBallOpenParticles(a, b, c, d, 0); } static u8 sub_80472D8(u8 a, u8 b, u32 c) @@ -1155,38 +1165,39 @@ static void oamc_804BEB4(struct Sprite *sprite) } } -void sub_80478DC(u8 a) +void LoadBallGraphics(u8 ballIndex) { - u16 var; + u16 tileStart; - if (GetSpriteTileStartByTag(sBallSpriteSheets[a].tag) == 0xFFFF) + if (GetSpriteTileStartByTag(sBallSpriteSheets[ballIndex].tag) == 0xFFFF) { - LoadCompressedObjectPic(&sBallSpriteSheets[a]); - LoadCompressedObjectPalette(&sBallSpritePalettes[a]); + LoadCompressedObjectPic(&sBallSpriteSheets[ballIndex]); + LoadCompressedObjectPalette(&sBallSpritePalettes[ballIndex]); } - switch (a) + + switch (ballIndex) { case 6: case 10: case 11: break; default: - var = GetSpriteTileStartByTag(sBallSpriteSheets[a].tag); - LZDecompressVram(gUnknown_08D030D0, (void *)(VRAM + 0x10100 + var * 32)); + tileStart = GetSpriteTileStartByTag(sBallSpriteSheets[ballIndex].tag); + LZDecompressVram(gUnknown_08D030D0, (void *)(VRAM + 0x10100 + tileStart * 32)); break; } } -void sub_804794C(u8 a) +void FreeBallGraphics(u8 ballIndex) { - FreeSpriteTilesByTag(sBallSpriteSheets[a].tag); - FreeSpritePaletteByTag(sBallSpritePalettes[a].tag); + FreeSpriteTilesByTag(sBallSpriteSheets[ballIndex].tag); + FreeSpritePaletteByTag(sBallSpritePalettes[ballIndex].tag); } -static u16 sub_8047978(u8 a) +static u16 GetBattlerBall(u8 battler) { - if (GetBattlerSide(a) == 0) - return GetMonData(&gPlayerParty[gBattlerPartyIndexes[a]], MON_DATA_POKEBALL); + if (GetBattlerSide(battler) == B_SIDE_PLAYER) + return GetMonData(&gPlayerParty[gBattlerPartyIndexes[battler]], MON_DATA_POKEBALL); else - return GetMonData(&gEnemyParty[gBattlerPartyIndexes[a]], MON_DATA_POKEBALL); + return GetMonData(&gEnemyParty[gBattlerPartyIndexes[battler]], MON_DATA_POKEBALL); } diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c index 2fd7cb1ca..fe908de03 100644 --- a/src/pokemon_summary_screen.c +++ b/src/pokemon_summary_screen.c @@ -4778,7 +4778,7 @@ static void sub_80A1DCC(struct Pokemon *mon) static void sub_80A1DE8(struct Pokemon *mon) { u8 ball = ball_number_to_ball_processing_index(GetMonData(mon, MON_DATA_POKEBALL)); - sub_80478DC(ball); + LoadBallGraphics(ball); pssData.ballSpriteId = CreateSprite(&gBallSpriteTemplates[ball], 6, 136, 0); gSprites[pssData.ballSpriteId].callback = SpriteCallbackDummy; -- cgit v1.2.3 From 96063d86d6634ac6fb580a1ed1af1c91351800ba Mon Sep 17 00:00:00 2001 From: garak Date: Fri, 10 Aug 2018 00:56:13 -0400 Subject: use heal location constants --- data/event_scripts.s | 1 + data/maps/DewfordTown_PokemonCenter_1F/scripts.inc | 2 +- data/maps/EverGrandeCity_HallOfFame/scripts.inc | 4 +- .../EverGrandeCity_PokemonCenter_1F/scripts.inc | 2 +- data/maps/EverGrandeCity_PokemonLeague/scripts.inc | 2 +- .../FallarborTown_PokemonCenter_1F/scripts.inc | 2 +- data/maps/FortreeCity_PokemonCenter_1F/scripts.inc | 2 +- data/maps/InsideOfTruck/scripts.inc | 4 +- .../LavaridgeTown_PokemonCenter_1F/scripts.inc | 2 +- .../maps/LilycoveCity_PokemonCenter_1F/scripts.inc | 2 +- .../maps/MauvilleCity_PokemonCenter_1F/scripts.inc | 2 +- .../maps/MossdeepCity_PokemonCenter_1F/scripts.inc | 2 +- data/maps/OldaleTown_PokemonCenter_1F/scripts.inc | 2 +- .../PacifidlogTown_PokemonCenter_1F/scripts.inc | 2 +- .../PetalburgCity_PokemonCenter_1F/scripts.inc | 2 +- .../maps/RustboroCity_PokemonCenter_1F/scripts.inc | 2 +- data/maps/SSTidalCorridor/scripts.inc | 4 +- .../SlateportCity_PokemonCenter_1F/scripts.inc | 2 +- .../SootopolisCity_PokemonCenter_1F/scripts.inc | 2 +- .../VerdanturfTown_PokemonCenter_1F/scripts.inc | 2 +- include/constants/heal_locations.h | 27 +++++ include/heal_location.h | 2 - src/battle/post_battle_event_funcs.c | 5 +- src/data/heal_locations.h | 25 +++++ src/heal_location.c | 27 +---- src/region_map.c | 116 +++++++++++---------- 26 files changed, 139 insertions(+), 108 deletions(-) create mode 100644 include/constants/heal_locations.h create mode 100644 src/data/heal_locations.h diff --git a/data/event_scripts.s b/data/event_scripts.s index 3ce319397..eef08bb79 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -10,6 +10,7 @@ #include "constants/songs.h" #include "constants/species.h" #include "constants/weather.h" +#include "constants/heal_locations.h" #include "constants/vars.h" .include "include/macros.inc" .include "include/macros/event.inc" diff --git a/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc b/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc index 33d14e770..38f242eab 100644 --- a/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc @@ -3,7 +3,7 @@ DewfordTown_PokemonCenter_1F_MapScripts:: @ 8153014 .byte 0 DewfordTown_PokemonCenter_1F_MapScript1_15301A:: @ 815301A - setrespawn 15 + setrespawn HEAL_LOCATION_DEWFORD_TOWN call DewfordTown_PokemonCenter_1F_EventScript_19FD1B end diff --git a/data/maps/EverGrandeCity_HallOfFame/scripts.inc b/data/maps/EverGrandeCity_HallOfFame/scripts.inc index 6cfc5ae27..4b54204d3 100644 --- a/data/maps/EverGrandeCity_HallOfFame/scripts.inc +++ b/data/maps/EverGrandeCity_HallOfFame/scripts.inc @@ -51,7 +51,7 @@ EverGrandeCity_HallOfFame_EventScript_15BBA8:: @ 815BBA8 end EverGrandeCity_HallOfFame_EventScript_15BC41:: @ 815BC41 - setrespawn 1 + setrespawn HEAL_LOCATION_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F fadescreenspeed 1, 24 special GameClear waitstate @@ -59,7 +59,7 @@ EverGrandeCity_HallOfFame_EventScript_15BC41:: @ 815BC41 end EverGrandeCity_HallOfFame_EventScript_15BC4D:: @ 815BC4D - setrespawn 2 + setrespawn HEAL_LOCATION_LITTLEROOT_TOWN_MAYS_HOUSE_2F fadescreenspeed 1, 24 special GameClear waitstate diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc index 374ef9472..3c0ad3732 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc @@ -3,7 +3,7 @@ EverGrandeCity_PokemonCenter_1F_MapScripts:: @ 815BC66 .byte 0 EverGrandeCity_PokemonCenter_1F_MapScript1_15BC6C:: @ 815BC6C - setrespawn 11 + setrespawn HEAL_LOCATION_EVER_GRANDE_CITY_1 end EverGrandeCity_PokemonCenter_1F_EventScript_15BC70:: @ 815BC70 diff --git a/data/maps/EverGrandeCity_PokemonLeague/scripts.inc b/data/maps/EverGrandeCity_PokemonLeague/scripts.inc index a48cf278e..6da717d06 100644 --- a/data/maps/EverGrandeCity_PokemonLeague/scripts.inc +++ b/data/maps/EverGrandeCity_PokemonLeague/scripts.inc @@ -3,7 +3,7 @@ EverGrandeCity_PokemonLeague_MapScripts:: @ 815BA75 .byte 0 EverGrandeCity_PokemonLeague_MapScript1_15BA7B:: @ 815BA7B - setrespawn 20 + setrespawn HEAL_LOCATION_EVER_GRANDE_CITY_2 setflag FLAG_SYS_POKEMON_LEAGUE_FLY call_if_unset FLAG_ENTERED_ELITE_FOUR, EverGrandeCity_PokemonLeague_EventScript_15BA8B end diff --git a/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc b/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc index 6ae897ec8..801f704e3 100644 --- a/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc @@ -3,7 +3,7 @@ FallarborTown_PokemonCenter_1F_MapScripts:: @ 8153AF3 .byte 0 FallarborTown_PokemonCenter_1F_MapScript1_153AF9:: @ 8153AF9 - setrespawn 17 + setrespawn HEAL_LOCATION_FALLARBOR_TOWN call FallarborTown_PokemonCenter_1F_EventScript_19FD1B end diff --git a/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc b/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc index 6d847d7cc..999541b31 100644 --- a/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc @@ -3,7 +3,7 @@ FortreeCity_PokemonCenter_1F_MapScripts:: @ 8158011 .byte 0 FortreeCity_PokemonCenter_1F_MapScript1_158017:: @ 8158017 - setrespawn 7 + setrespawn HEAL_LOCATION_FORTREE_CITY end FortreeCity_PokemonCenter_1F_EventScript_15801B:: @ 815801B diff --git a/data/maps/InsideOfTruck/scripts.inc b/data/maps/InsideOfTruck/scripts.inc index 37fa85041..b2617c8f7 100644 --- a/data/maps/InsideOfTruck/scripts.inc +++ b/data/maps/InsideOfTruck/scripts.inc @@ -24,7 +24,7 @@ InsideOfTruck_EventScript_15FC29:: @ 815FC29 end InsideOfTruck_EventScript_15FC45:: @ 815FC45 - setrespawn 1 + setrespawn HEAL_LOCATION_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F setvar VAR_LITTLEROOT_INTRO_STATE, 1 setflag FLAG_HIDE_MAY_MOM_DOWNSTAIRS setflag FLAG_HIDE_MOVING_TRUCK_MAY @@ -36,7 +36,7 @@ InsideOfTruck_EventScript_15FC45:: @ 815FC45 end InsideOfTruck_EventScript_15FC68:: @ 815FC68 - setrespawn 2 + setrespawn HEAL_LOCATION_LITTLEROOT_TOWN_MAYS_HOUSE_2F setvar VAR_LITTLEROOT_INTRO_STATE, 2 setflag FLAG_HIDE_BRENDAN_MOM_DOWNSTAIRS setflag FLAG_HIDE_MOVING_TRUCK_BRENDAN diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc b/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc index 4e9c51380..611ced28f 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc @@ -3,7 +3,7 @@ LavaridgeTown_PokemonCenter_1F_MapScripts:: @ 815390C .byte 0 LavaridgeTown_PokemonCenter_1F_MapScript1_153912:: @ 8153912 - setrespawn 16 + setrespawn HEAL_LOCATION_LAVARIDGE_TOWN call LavaridgeTown_PokemonCenter_1F_EventScript_19FD1B end diff --git a/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc b/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc index cff88caf0..508f5fab8 100644 --- a/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc @@ -3,7 +3,7 @@ LilycoveCity_PokemonCenter_1F_MapScripts:: @ 8159327 .byte 0 LilycoveCity_PokemonCenter_1F_MapScript1_15932D:: @ 815932D - setrespawn 8 + setrespawn HEAL_LOCATION_LILYCOVE_CITY end LilycoveCity_PokemonCenter_1F_EventScript_159331:: @ 8159331 diff --git a/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc b/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc index 85590f9c2..817679cec 100644 --- a/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc @@ -3,7 +3,7 @@ MauvilleCity_PokemonCenter_1F_MapScripts:: @ 8157351 .byte 0 MauvilleCity_PokemonCenter_1F_MapScript1_157357:: @ 8157357 - setrespawn 5 + setrespawn HEAL_LOCATION_MAUVILLE_CITY call MauvilleCity_PokemonCenter_1F_EventScript_19FD1B goto MauvilleCity_PokemonCenter_1F_EventScript_157365 end diff --git a/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc b/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc index a722e666b..906cf8e83 100644 --- a/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc @@ -3,7 +3,7 @@ MossdeepCity_PokemonCenter_1F_MapScripts:: @ 815A8D0 .byte 0 MossdeepCity_PokemonCenter_1F_MapScript1_15A8D6:: @ 815A8D6 - setrespawn 9 + setrespawn HEAL_LOCATION_MOSSDEEP_CITY end MossdeepCity_PokemonCenter_1F_EventScript_15A8DA:: @ 815A8DA diff --git a/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc b/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc index c993807c6..16e11d6a2 100644 --- a/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc @@ -3,7 +3,7 @@ OldaleTown_PokemonCenter_1F_MapScripts:: @ 8152F08 .byte 0 OldaleTown_PokemonCenter_1F_MapScript1_152F0E:: @ 8152F0E - setrespawn 14 + setrespawn HEAL_LOCATION_OLDALE_TOWN call OldaleTown_PokemonCenter_1F_EventScript_19FD1B end diff --git a/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc b/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc index 557b6497e..ea7a8e056 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc @@ -3,7 +3,7 @@ PacifidlogTown_PokemonCenter_1F_MapScripts:: @ 81540FF .byte 0 PacifidlogTown_PokemonCenter_1F_MapScript1_154105:: @ 8154105 - setrespawn 19 + setrespawn HEAL_LOCATION_PACIFIDLOG_TOWN end @ 8154109 diff --git a/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc b/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc index 136cc11c5..6753865e0 100644 --- a/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc @@ -3,7 +3,7 @@ PetalburgCity_PokemonCenter_1F_MapScripts:: @ 8155204 .byte 0 PetalburgCity_PokemonCenter_1F_MapScript1_15520A:: @ 815520A - setrespawn 3 + setrespawn HEAL_LOCATION_PETALBURG_CITY call PetalburgCity_PokemonCenter_1F_EventScript_19FD1B end diff --git a/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc b/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc index 653cceb25..c0bb5c2dd 100644 --- a/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc @@ -3,7 +3,7 @@ RustboroCity_PokemonCenter_1F_MapScripts:: @ 8157B79 .byte 0 RustboroCity_PokemonCenter_1F_MapScript1_157B7F:: @ 8157B7F - setrespawn 6 + setrespawn HEAL_LOCATION_RUSTBORO_CITY call RustboroCity_PokemonCenter_1F_EventScript_19FD1B end diff --git a/data/maps/SSTidalCorridor/scripts.inc b/data/maps/SSTidalCorridor/scripts.inc index 57872a66a..0f2028476 100644 --- a/data/maps/SSTidalCorridor/scripts.inc +++ b/data/maps/SSTidalCorridor/scripts.inc @@ -122,7 +122,7 @@ SSTidalCorridor_EventScript_15FDD6:: @ 815FDD6 end SSTidalCorridor_EventScript_15FDF8:: @ 815FDF8 - setrespawn 8 + setrespawn HEAL_LOCATION_LILYCOVE_CITY msgbox SSTidalCorridor_Text_1991F4, 4 call_if_set FLAG_RECEIVED_TM49, SSTidalCorridor_EventScript_15FE36 warp MAP_LILYCOVE_CITY_HARBOR, 255, 8, 11 @@ -131,7 +131,7 @@ SSTidalCorridor_EventScript_15FDF8:: @ 815FDF8 end SSTidalCorridor_EventScript_15FE17:: @ 815FE17 - setrespawn 4 + setrespawn HEAL_LOCATION_SLATEPORT_CITY msgbox SSTidalCorridor_Text_1991F4, 4 call_if_set FLAG_RECEIVED_TM49, SSTidalCorridor_EventScript_15FE36 warp MAP_SLATEPORT_CITY_HARBOR, 255, 8, 11 diff --git a/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc b/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc index 37b2b95ab..1164e96d6 100644 --- a/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc @@ -3,7 +3,7 @@ SlateportCity_PokemonCenter_1F_MapScripts:: @ 81563BF .byte 0 SlateportCity_PokemonCenter_1F_MapScript1_1563C5:: @ 81563C5 - setrespawn 4 + setrespawn HEAL_LOCATION_SLATEPORT_CITY call SlateportCity_PokemonCenter_1F_EventScript_19FD1B end diff --git a/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc b/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc index 820dd4858..ebfaf4e23 100644 --- a/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc @@ -3,7 +3,7 @@ SootopolisCity_PokemonCenter_1F_MapScripts:: @ 815B190 .byte 0 SootopolisCity_PokemonCenter_1F_MapScript1_15B196:: @ 815B196 - setrespawn 10 + setrespawn HEAL_LOCATION_SOOTOPOLIS_CITY end @ 815B19A diff --git a/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc b/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc index 956a28ac5..de2f770d6 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc @@ -3,7 +3,7 @@ VerdanturfTown_PokemonCenter_1F_MapScripts:: @ 8153F09 .byte 0 VerdanturfTown_PokemonCenter_1F_MapScript1_153F0F:: @ 8153F0F - setrespawn 18 + setrespawn HEAL_LOCATION_VERDANTURF_TOWN call VerdanturfTown_PokemonCenter_1F_EventScript_19FD1B end diff --git a/include/constants/heal_locations.h b/include/constants/heal_locations.h new file mode 100644 index 000000000..721bc5a3c --- /dev/null +++ b/include/constants/heal_locations.h @@ -0,0 +1,27 @@ +#ifndef GUARD_CONSTANTS_HEAL_LOCATIONS_H +#define GUARD_CONSTANTS_HEAL_LOCATIONS_H + +#define HEAL_LOCATION_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F 1 +#define HEAL_LOCATION_LITTLEROOT_TOWN_MAYS_HOUSE_2F 2 +#define HEAL_LOCATION_PETALBURG_CITY 3 +#define HEAL_LOCATION_SLATEPORT_CITY 4 +#define HEAL_LOCATION_MAUVILLE_CITY 5 +#define HEAL_LOCATION_RUSTBORO_CITY 6 +#define HEAL_LOCATION_FORTREE_CITY 7 +#define HEAL_LOCATION_LILYCOVE_CITY 8 +#define HEAL_LOCATION_MOSSDEEP_CITY 9 +#define HEAL_LOCATION_SOOTOPOLIS_CITY 10 +#define HEAL_LOCATION_EVER_GRANDE_CITY_1 11 +#define HEAL_LOCATION_LITTLEROOT_TOWN_1 12 +#define HEAL_LOCATION_LITTLEROOT_TOWN_2 13 +#define HEAL_LOCATION_OLDALE_TOWN 14 +#define HEAL_LOCATION_DEWFORD_TOWN 15 +#define HEAL_LOCATION_LAVARIDGE_TOWN 16 +#define HEAL_LOCATION_FALLARBOR_TOWN 17 +#define HEAL_LOCATION_VERDANTURF_TOWN 18 +#define HEAL_LOCATION_PACIFIDLOG_TOWN 19 +#define HEAL_LOCATION_EVER_GRANDE_CITY_2 20 +#define HEAL_LOCATION_BATTLE_TOWER_OUTSIDE 21 +#define HEAL_LOCATION_SOUTHERN_ISLAND_EXTERIOR 22 + +#endif // GUARD_CONSTANTS_HEAL_LOCATIONS_H diff --git a/include/heal_location.h b/include/heal_location.h index 94dac2417..46f0d785a 100644 --- a/include/heal_location.h +++ b/include/heal_location.h @@ -1,8 +1,6 @@ #ifndef GUARD_HEAL_LOCATION_H #define GUARD_HEAL_LOCATION_H -#include "sprite.h" - struct HealLocation { s8 group; diff --git a/src/battle/post_battle_event_funcs.c b/src/battle/post_battle_event_funcs.c index a44cf028b..d0fbbec85 100644 --- a/src/battle/post_battle_event_funcs.c +++ b/src/battle/post_battle_event_funcs.c @@ -6,6 +6,7 @@ #include "pokemon.h" #include "overworld.h" #include "script_pokemon_80C4.h" +#include "constants/heal_locations.h" extern u8 gUnknown_02039324; @@ -32,9 +33,9 @@ int GameClear(void) SetSecretBase2Field_9(); if (gSaveBlock2.playerGender == MALE) - sub_80537CC(1); + sub_80537CC(HEAL_LOCATION_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F); else - sub_80537CC(2); + sub_80537CC(HEAL_LOCATION_LITTLEROOT_TOWN_MAYS_HOUSE_2F); ribbonGet = FALSE; diff --git a/src/data/heal_locations.h b/src/data/heal_locations.h new file mode 100644 index 000000000..f764981bf --- /dev/null +++ b/src/data/heal_locations.h @@ -0,0 +1,25 @@ +static const struct HealLocation sHealLocations[] = +{ + {MAP_GROUP(LITTLEROOT_TOWN_BRENDANS_HOUSE_2F), MAP_NUM(LITTLEROOT_TOWN_BRENDANS_HOUSE_2F), 4, 2}, + {MAP_GROUP(LITTLEROOT_TOWN_MAYS_HOUSE_2F), MAP_NUM(LITTLEROOT_TOWN_MAYS_HOUSE_2F), 4, 2}, + {MAP_GROUP(PETALBURG_CITY), MAP_NUM(PETALBURG_CITY), 20, 17}, + {MAP_GROUP(SLATEPORT_CITY), MAP_NUM(SLATEPORT_CITY), 19, 20}, + {MAP_GROUP(MAUVILLE_CITY), MAP_NUM(MAUVILLE_CITY), 22, 6}, + {MAP_GROUP(RUSTBORO_CITY), MAP_NUM(RUSTBORO_CITY), 16, 39}, + {MAP_GROUP(FORTREE_CITY), MAP_NUM(FORTREE_CITY), 5, 7}, + {MAP_GROUP(LILYCOVE_CITY), MAP_NUM(LILYCOVE_CITY), 24, 15}, + {MAP_GROUP(MOSSDEEP_CITY), MAP_NUM(MOSSDEEP_CITY), 28, 17}, + {MAP_GROUP(SOOTOPOLIS_CITY), MAP_NUM(SOOTOPOLIS_CITY), 43, 32}, + {MAP_GROUP(EVER_GRANDE_CITY), MAP_NUM(EVER_GRANDE_CITY), 27, 49}, + {MAP_GROUP(LITTLEROOT_TOWN), MAP_NUM(LITTLEROOT_TOWN), 5, 9}, + {MAP_GROUP(LITTLEROOT_TOWN), MAP_NUM(LITTLEROOT_TOWN), 14, 9}, + {MAP_GROUP(OLDALE_TOWN), MAP_NUM(OLDALE_TOWN), 6, 17}, + {MAP_GROUP(DEWFORD_TOWN), MAP_NUM(DEWFORD_TOWN), 2, 11}, + {MAP_GROUP(LAVARIDGE_TOWN), MAP_NUM(LAVARIDGE_TOWN), 9, 7}, + {MAP_GROUP(FALLARBOR_TOWN), MAP_NUM(FALLARBOR_TOWN), 14, 8}, + {MAP_GROUP(VERDANTURF_TOWN), MAP_NUM(VERDANTURF_TOWN), 16, 4}, + {MAP_GROUP(PACIFIDLOG_TOWN), MAP_NUM(PACIFIDLOG_TOWN), 8, 16}, + {MAP_GROUP(EVER_GRANDE_CITY), MAP_NUM(EVER_GRANDE_CITY), 18, 6}, + {MAP_GROUP(BATTLE_TOWER_OUTSIDE), MAP_NUM(BATTLE_TOWER_OUTSIDE), 14, 9}, + {MAP_GROUP(SOUTHERN_ISLAND_EXTERIOR), MAP_NUM(SOUTHERN_ISLAND_EXTERIOR), 15, 20}, +}; diff --git a/src/heal_location.c b/src/heal_location.c index 4c78f5921..3bb24e1a1 100644 --- a/src/heal_location.c +++ b/src/heal_location.c @@ -1,32 +1,7 @@ #include "global.h" #include "heal_location.h" #include "constants/maps.h" - -static const struct HealLocation sHealLocations[] = -{ - {MAP_GROUP(LITTLEROOT_TOWN_BRENDANS_HOUSE_2F), MAP_NUM(LITTLEROOT_TOWN_BRENDANS_HOUSE_2F), 4, 2}, - {MAP_GROUP(LITTLEROOT_TOWN_MAYS_HOUSE_2F), MAP_NUM(LITTLEROOT_TOWN_MAYS_HOUSE_2F), 4, 2}, - {MAP_GROUP(PETALBURG_CITY), MAP_NUM(PETALBURG_CITY), 20, 17}, - {MAP_GROUP(SLATEPORT_CITY), MAP_NUM(SLATEPORT_CITY), 19, 20}, - {MAP_GROUP(MAUVILLE_CITY), MAP_NUM(MAUVILLE_CITY), 22, 6}, - {MAP_GROUP(RUSTBORO_CITY), MAP_NUM(RUSTBORO_CITY), 16, 39}, - {MAP_GROUP(FORTREE_CITY), MAP_NUM(FORTREE_CITY), 5, 7}, - {MAP_GROUP(LILYCOVE_CITY), MAP_NUM(LILYCOVE_CITY), 24, 15}, - {MAP_GROUP(MOSSDEEP_CITY), MAP_NUM(MOSSDEEP_CITY), 28, 17}, - {MAP_GROUP(SOOTOPOLIS_CITY), MAP_NUM(SOOTOPOLIS_CITY), 43, 32}, - {MAP_GROUP(EVER_GRANDE_CITY), MAP_NUM(EVER_GRANDE_CITY), 27, 49}, - {MAP_GROUP(LITTLEROOT_TOWN), MAP_NUM(LITTLEROOT_TOWN), 5, 9}, - {MAP_GROUP(LITTLEROOT_TOWN), MAP_NUM(LITTLEROOT_TOWN), 14, 9}, - {MAP_GROUP(OLDALE_TOWN), MAP_NUM(OLDALE_TOWN), 6, 17}, - {MAP_GROUP(DEWFORD_TOWN), MAP_NUM(DEWFORD_TOWN), 2, 11}, - {MAP_GROUP(LAVARIDGE_TOWN), MAP_NUM(LAVARIDGE_TOWN), 9, 7}, - {MAP_GROUP(FALLARBOR_TOWN), MAP_NUM(FALLARBOR_TOWN), 14, 8}, - {MAP_GROUP(VERDANTURF_TOWN), MAP_NUM(VERDANTURF_TOWN), 16, 4}, - {MAP_GROUP(PACIFIDLOG_TOWN), MAP_NUM(PACIFIDLOG_TOWN), 8, 16}, - {MAP_GROUP(EVER_GRANDE_CITY), MAP_NUM(EVER_GRANDE_CITY), 18, 6}, - {MAP_GROUP(BATTLE_TOWER_OUTSIDE), MAP_NUM(BATTLE_TOWER_OUTSIDE), 14, 9}, - {MAP_GROUP(SOUTHERN_ISLAND_EXTERIOR), MAP_NUM(SOUTHERN_ISLAND_EXTERIOR), 15, 20}, -}; +#include "data/heal_locations.h" u32 GetHealLocationIndexByMap(u16 mapGroup, u16 mapNum) { diff --git a/src/region_map.c b/src/region_map.c index 74062f435..b5a16fa09 100644 --- a/src/region_map.c +++ b/src/region_map.c @@ -19,6 +19,8 @@ #include "text.h" #include "trig.h" #include "ewram.h" +#include "heal_location.h" +#include "constants/heal_locations.h" #define MAP_WIDTH 28 #define MAP_HEIGHT 15 @@ -1260,58 +1262,59 @@ static const u8 sFlyRegionMapFrame_TilemapLZ[] = INCBIN_U8("graphics/pokenav/map static const u16 sFlyTargetIcons_Pal[] = INCBIN_U16("graphics/pokenav/fly_target_icons.gbapal"); static const u8 sFlyTargetIcons_ImageLZ[] = INCBIN_U8("graphics/pokenav/fly_target_icons.4bpp.lz"); -static const u8 sUnknown_083E7920[][3] = -{ - {0, 9, 1}, - {0, 10, 14}, - {0, 11, 15}, - {0, 12, 16}, - {0, 13, 17}, - {0, 14, 18}, - {0, 15, 19}, - {0, 0, 3}, - {0, 1, 4}, - {0, 2, 5}, - {0, 3, 6}, - {0, 4, 7}, - {0, 5, 8}, - {0, 6, 9}, - {0, 7, 10}, - {0, 8, 11}, - {0, 16, 0}, - {0, 17, 0}, - {0, 18, 0}, - {0, 19, 0}, - {0, 20, 0}, - {0, 21, 0}, - {0, 22, 0}, - {0, 23, 0}, - {0, 24, 0}, - {0, 25, 0}, - {0, 26, 0}, - {0, 27, 0}, - {0, 28, 0}, - {0, 29, 0}, - {0, 30, 0}, - {0, 31, 0}, - {0, 32, 0}, - {0, 33, 0}, - {0, 34, 0}, - {0, 35, 0}, - {0, 36, 0}, - {0, 37, 0}, - {0, 38, 0}, - {0, 39, 0}, - {0, 40, 0}, - {0, 41, 0}, - {0, 42, 0}, - {0, 43, 0}, - {0, 44, 0}, - {0, 45, 0}, - {0, 46, 0}, - {0, 47, 0}, - {0, 48, 0}, - {0, 49, 0}, +// MAP_GROUP, MAP_NUM, HEAL_LOCATION +static const u8 sMapHealLocationIndexes[][3] = +{ +/* MAPSEC_LITTLEROOT_TOWN */ {0, 9, HEAL_LOCATION_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F}, +/* MAPSEC_OLDALE_TOWN */ {0, 10, HEAL_LOCATION_OLDALE_TOWN}, +/* MAPSEC_DEWFORD_TOWN */ {0, 11, HEAL_LOCATION_DEWFORD_TOWN}, +/* MAPSEC_LAVARIDGE_TOWN */ {0, 12, HEAL_LOCATION_LAVARIDGE_TOWN}, +/* MAPSEC_FALLARBOR_TOWN */ {0, 13, HEAL_LOCATION_FALLARBOR_TOWN}, +/* MAPSEC_VERDANTURF_TOWN */ {0, 14, HEAL_LOCATION_VERDANTURF_TOWN}, +/* MAPSEC_PACIFIDLOG_TOWN */ {0, 15, HEAL_LOCATION_PACIFIDLOG_TOWN}, +/* MAPSEC_PETALBURG_CITY */ {0, 0, HEAL_LOCATION_PETALBURG_CITY}, +/* MAPSEC_SLATEPORT_CITY */ {0, 1, HEAL_LOCATION_SLATEPORT_CITY}, +/* MAPSEC_MAUVILLE_CITY */ {0, 2, HEAL_LOCATION_MAUVILLE_CITY}, +/* MAPSEC_RUSTBORO_CITY */ {0, 3, HEAL_LOCATION_RUSTBORO_CITY}, +/* MAPSEC_FORTREE_CITY */ {0, 4, HEAL_LOCATION_FORTREE_CITY}, +/* MAPSEC_LILYCOVE_CITY */ {0, 5, HEAL_LOCATION_LILYCOVE_CITY}, +/* MAPSEC_MOSSDEEP_CITY */ {0, 6, HEAL_LOCATION_MOSSDEEP_CITY}, +/* MAPSEC_SOOTOPOLIS_CITY */ {0, 7, HEAL_LOCATION_SOOTOPOLIS_CITY}, +/* MAPSEC_EVER_GRANDE_CITY */ {0, 8, HEAL_LOCATION_EVER_GRANDE_CITY_1}, +/* MAPSEC_ROUTE_101 */ {0, 16, 0}, +/* MAPSEC_ROUTE_102 */ {0, 17, 0}, +/* MAPSEC_ROUTE_103 */ {0, 18, 0}, +/* MAPSEC_ROUTE_104 */ {0, 19, 0}, +/* MAPSEC_ROUTE_105 */ {0, 20, 0}, +/* MAPSEC_ROUTE_106 */ {0, 21, 0}, +/* MAPSEC_ROUTE_107 */ {0, 22, 0}, +/* MAPSEC_ROUTE_108 */ {0, 23, 0}, +/* MAPSEC_ROUTE_109 */ {0, 24, 0}, +/* MAPSEC_ROUTE_110 */ {0, 25, 0}, +/* MAPSEC_ROUTE_111 */ {0, 26, 0}, +/* MAPSEC_ROUTE_112 */ {0, 27, 0}, +/* MAPSEC_ROUTE_113 */ {0, 28, 0}, +/* MAPSEC_ROUTE_114 */ {0, 29, 0}, +/* MAPSEC_ROUTE_115 */ {0, 30, 0}, +/* MAPSEC_ROUTE_116 */ {0, 31, 0}, +/* MAPSEC_ROUTE_117 */ {0, 32, 0}, +/* MAPSEC_ROUTE_118 */ {0, 33, 0}, +/* MAPSEC_ROUTE_119 */ {0, 34, 0}, +/* MAPSEC_ROUTE_120 */ {0, 35, 0}, +/* MAPSEC_ROUTE_121 */ {0, 36, 0}, +/* MAPSEC_ROUTE_122 */ {0, 37, 0}, +/* MAPSEC_ROUTE_123 */ {0, 38, 0}, +/* MAPSEC_ROUTE_124 */ {0, 39, 0}, +/* MAPSEC_ROUTE_125 */ {0, 40, 0}, +/* MAPSEC_ROUTE_126 */ {0, 41, 0}, +/* MAPSEC_ROUTE_127 */ {0, 42, 0}, +/* MAPSEC_ROUTE_128 */ {0, 43, 0}, +/* MAPSEC_ROUTE_129 */ {0, 44, 0}, +/* MAPSEC_ROUTE_130 */ {0, 45, 0}, +/* MAPSEC_ROUTE_131 */ {0, 46, 0}, +/* MAPSEC_ROUTE_132 */ {0, 47, 0}, +/* MAPSEC_ROUTE_133 */ {0, 48, 0}, +/* MAPSEC_ROUTE_134 */ {0, 49, 0}, }; static const u8 *const sEverGrandeCityAreaNames[] = @@ -1333,6 +1336,7 @@ static const struct MultiPartMapSection sMultiPartMapSections[1] = {sEverGrandeCityAreaNames, MAPSEC_EVER_GRANDE_CITY, FLAG_SYS_POKEMON_LEAGUE_FLY}, }; +// what in the hell is this? static struct UnknownStruct3 *const sFlyDataPtr = (struct UnknownStruct3 *)gSharedMem; static const struct SpritePalette sFlyTargetIconSpritePalette = {sFlyTargetIcons_Pal, 2}; @@ -1717,16 +1721,16 @@ void sub_80FC69C(void) switch (sFlyDataPtr->regionMap.mapSectionId) { case MAPSEC_SOUTHERN_ISLAND: - sub_8053538(22); + sub_8053538(HEAL_LOCATION_SOUTHERN_ISLAND_EXTERIOR); break; case MAPSEC_BATTLE_TOWER: - sub_8053538(21); + sub_8053538(HEAL_LOCATION_BATTLE_TOWER_OUTSIDE); break; case MAPSEC_LITTLEROOT_TOWN: - sub_8053538((gSaveBlock2.playerGender == MALE) ? 12 : 13); + sub_8053538((gSaveBlock2.playerGender == MALE) ? HEAL_LOCATION_LITTLEROOT_TOWN_1 : HEAL_LOCATION_LITTLEROOT_TOWN_2); break; case MAPSEC_EVER_GRANDE_CITY: - sub_8053538((FlagGet(FLAG_SYS_POKEMON_LEAGUE_FLY) && sFlyDataPtr->regionMap.everGrandeCityArea == 0) ? 20 : 11); + sub_8053538((FlagGet(FLAG_SYS_POKEMON_LEAGUE_FLY) && sFlyDataPtr->regionMap.everGrandeCityArea == 0) ? HEAL_LOCATION_EVER_GRANDE_CITY_2 : HEAL_LOCATION_EVER_GRANDE_CITY_1); break; default: if (sUnknown_083E7920[sFlyDataPtr->regionMap.mapSectionId][2] != 0) -- cgit v1.2.3 From 27e451e307d16bdd20d5a333a37dc61158f94789 Mon Sep 17 00:00:00 2001 From: garak Date: Fri, 10 Aug 2018 01:08:39 -0400 Subject: forgot to rename array --- src/region_map.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/region_map.c b/src/region_map.c index b5a16fa09..c669776e3 100644 --- a/src/region_map.c +++ b/src/region_map.c @@ -1733,10 +1733,10 @@ void sub_80FC69C(void) sub_8053538((FlagGet(FLAG_SYS_POKEMON_LEAGUE_FLY) && sFlyDataPtr->regionMap.everGrandeCityArea == 0) ? HEAL_LOCATION_EVER_GRANDE_CITY_2 : HEAL_LOCATION_EVER_GRANDE_CITY_1); break; default: - if (sUnknown_083E7920[sFlyDataPtr->regionMap.mapSectionId][2] != 0) - sub_8053538(sUnknown_083E7920[sFlyDataPtr->regionMap.mapSectionId][2]); + if (sMapHealLocationIndexes[sFlyDataPtr->regionMap.mapSectionId][2] != 0) + sub_8053538(sMapHealLocationIndexes[sFlyDataPtr->regionMap.mapSectionId][2]); else - warp1_set_2(sUnknown_083E7920[sFlyDataPtr->regionMap.mapSectionId][0], sUnknown_083E7920[sFlyDataPtr->regionMap.mapSectionId][1], -1); + warp1_set_2(sMapHealLocationIndexes[sFlyDataPtr->regionMap.mapSectionId][0], sMapHealLocationIndexes[sFlyDataPtr->regionMap.mapSectionId][1], -1); break; } sub_80865BC(); -- cgit v1.2.3 From 9220c202b071619ac2857ef45582905ca52d98af Mon Sep 17 00:00:00 2001 From: garak Date: Fri, 10 Aug 2018 01:17:23 -0400 Subject: fix german build --- data-de/event_scripts.s | 1 + 1 file changed, 1 insertion(+) diff --git a/data-de/event_scripts.s b/data-de/event_scripts.s index 9b27d25a1..2e79200cb 100644 --- a/data-de/event_scripts.s +++ b/data-de/event_scripts.s @@ -10,6 +10,7 @@ #include "constants/songs.h" #include "constants/species.h" #include "constants/weather.h" +#include "constants/heal_locations.h" #include "constants/vars.h" .include "include/macros.inc" .include "include/macros/event.inc" -- cgit v1.2.3 From 4b58ba2445dd3d4ba5c5ae1035431bcee54bcdce Mon Sep 17 00:00:00 2001 From: garak Date: Fri, 10 Aug 2018 17:08:21 -0400 Subject: MAP_GROUP/NUM constants; remove erroneous comment --- src/region_map.c | 112 +++++++++++++++++++++++++++---------------------------- 1 file changed, 55 insertions(+), 57 deletions(-) diff --git a/src/region_map.c b/src/region_map.c index c669776e3..4bd89dd18 100644 --- a/src/region_map.c +++ b/src/region_map.c @@ -1262,59 +1262,58 @@ static const u8 sFlyRegionMapFrame_TilemapLZ[] = INCBIN_U8("graphics/pokenav/map static const u16 sFlyTargetIcons_Pal[] = INCBIN_U16("graphics/pokenav/fly_target_icons.gbapal"); static const u8 sFlyTargetIcons_ImageLZ[] = INCBIN_U8("graphics/pokenav/fly_target_icons.4bpp.lz"); -// MAP_GROUP, MAP_NUM, HEAL_LOCATION -static const u8 sMapHealLocationIndexes[][3] = -{ -/* MAPSEC_LITTLEROOT_TOWN */ {0, 9, HEAL_LOCATION_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F}, -/* MAPSEC_OLDALE_TOWN */ {0, 10, HEAL_LOCATION_OLDALE_TOWN}, -/* MAPSEC_DEWFORD_TOWN */ {0, 11, HEAL_LOCATION_DEWFORD_TOWN}, -/* MAPSEC_LAVARIDGE_TOWN */ {0, 12, HEAL_LOCATION_LAVARIDGE_TOWN}, -/* MAPSEC_FALLARBOR_TOWN */ {0, 13, HEAL_LOCATION_FALLARBOR_TOWN}, -/* MAPSEC_VERDANTURF_TOWN */ {0, 14, HEAL_LOCATION_VERDANTURF_TOWN}, -/* MAPSEC_PACIFIDLOG_TOWN */ {0, 15, HEAL_LOCATION_PACIFIDLOG_TOWN}, -/* MAPSEC_PETALBURG_CITY */ {0, 0, HEAL_LOCATION_PETALBURG_CITY}, -/* MAPSEC_SLATEPORT_CITY */ {0, 1, HEAL_LOCATION_SLATEPORT_CITY}, -/* MAPSEC_MAUVILLE_CITY */ {0, 2, HEAL_LOCATION_MAUVILLE_CITY}, -/* MAPSEC_RUSTBORO_CITY */ {0, 3, HEAL_LOCATION_RUSTBORO_CITY}, -/* MAPSEC_FORTREE_CITY */ {0, 4, HEAL_LOCATION_FORTREE_CITY}, -/* MAPSEC_LILYCOVE_CITY */ {0, 5, HEAL_LOCATION_LILYCOVE_CITY}, -/* MAPSEC_MOSSDEEP_CITY */ {0, 6, HEAL_LOCATION_MOSSDEEP_CITY}, -/* MAPSEC_SOOTOPOLIS_CITY */ {0, 7, HEAL_LOCATION_SOOTOPOLIS_CITY}, -/* MAPSEC_EVER_GRANDE_CITY */ {0, 8, HEAL_LOCATION_EVER_GRANDE_CITY_1}, -/* MAPSEC_ROUTE_101 */ {0, 16, 0}, -/* MAPSEC_ROUTE_102 */ {0, 17, 0}, -/* MAPSEC_ROUTE_103 */ {0, 18, 0}, -/* MAPSEC_ROUTE_104 */ {0, 19, 0}, -/* MAPSEC_ROUTE_105 */ {0, 20, 0}, -/* MAPSEC_ROUTE_106 */ {0, 21, 0}, -/* MAPSEC_ROUTE_107 */ {0, 22, 0}, -/* MAPSEC_ROUTE_108 */ {0, 23, 0}, -/* MAPSEC_ROUTE_109 */ {0, 24, 0}, -/* MAPSEC_ROUTE_110 */ {0, 25, 0}, -/* MAPSEC_ROUTE_111 */ {0, 26, 0}, -/* MAPSEC_ROUTE_112 */ {0, 27, 0}, -/* MAPSEC_ROUTE_113 */ {0, 28, 0}, -/* MAPSEC_ROUTE_114 */ {0, 29, 0}, -/* MAPSEC_ROUTE_115 */ {0, 30, 0}, -/* MAPSEC_ROUTE_116 */ {0, 31, 0}, -/* MAPSEC_ROUTE_117 */ {0, 32, 0}, -/* MAPSEC_ROUTE_118 */ {0, 33, 0}, -/* MAPSEC_ROUTE_119 */ {0, 34, 0}, -/* MAPSEC_ROUTE_120 */ {0, 35, 0}, -/* MAPSEC_ROUTE_121 */ {0, 36, 0}, -/* MAPSEC_ROUTE_122 */ {0, 37, 0}, -/* MAPSEC_ROUTE_123 */ {0, 38, 0}, -/* MAPSEC_ROUTE_124 */ {0, 39, 0}, -/* MAPSEC_ROUTE_125 */ {0, 40, 0}, -/* MAPSEC_ROUTE_126 */ {0, 41, 0}, -/* MAPSEC_ROUTE_127 */ {0, 42, 0}, -/* MAPSEC_ROUTE_128 */ {0, 43, 0}, -/* MAPSEC_ROUTE_129 */ {0, 44, 0}, -/* MAPSEC_ROUTE_130 */ {0, 45, 0}, -/* MAPSEC_ROUTE_131 */ {0, 46, 0}, -/* MAPSEC_ROUTE_132 */ {0, 47, 0}, -/* MAPSEC_ROUTE_133 */ {0, 48, 0}, -/* MAPSEC_ROUTE_134 */ {0, 49, 0}, +static const u8 sMapHealLocations[][3] = +{ +/* MAPSEC_LITTLEROOT_TOWN */ {MAP_GROUP(LITTLEROOT_TOWN), MAP_NUM(LITTLEROOT_TOWN), HEAL_LOCATION_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F}, +/* MAPSEC_OLDALE_TOWN */ {MAP_GROUP(OLDALE_TOWN), MAP_NUM(OLDALE_TOWN), HEAL_LOCATION_OLDALE_TOWN}, +/* MAPSEC_DEWFORD_TOWN */ {MAP_GROUP(DEWFORD_TOWN), MAP_NUM(DEWFORD_TOWN), HEAL_LOCATION_DEWFORD_TOWN}, +/* MAPSEC_LAVARIDGE_TOWN */ {MAP_GROUP(LAVARIDGE_TOWN), MAP_NUM(LAVARIDGE_TOWN), HEAL_LOCATION_LAVARIDGE_TOWN}, +/* MAPSEC_FALLARBOR_TOWN */ {MAP_GROUP(FALLARBOR_TOWN), MAP_NUM(FALLARBOR_TOWN), HEAL_LOCATION_FALLARBOR_TOWN}, +/* MAPSEC_VERDANTURF_TOWN */ {MAP_GROUP(VERDANTURF_TOWN), MAP_NUM(VERDANTURF_TOWN), HEAL_LOCATION_VERDANTURF_TOWN}, +/* MAPSEC_PACIFIDLOG_TOWN */ {MAP_GROUP(PACIFIDLOG_TOWN), MAP_NUM(PACIFIDLOG_TOWN), HEAL_LOCATION_PACIFIDLOG_TOWN}, +/* MAPSEC_PETALBURG_CITY */ {MAP_GROUP(PETALBURG_CITY), MAP_NUM(PETALBURG_CITY), HEAL_LOCATION_PETALBURG_CITY}, +/* MAPSEC_SLATEPORT_CITY */ {MAP_GROUP(SLATEPORT_CITY), MAP_NUM(SLATEPORT_CITY), HEAL_LOCATION_SLATEPORT_CITY}, +/* MAPSEC_MAUVILLE_CITY */ {MAP_GROUP(MAUVILLE_CITY), MAP_NUM(MAUVILLE_CITY), HEAL_LOCATION_MAUVILLE_CITY}, +/* MAPSEC_RUSTBORO_CITY */ {MAP_GROUP(RUSTBORO_CITY), MAP_NUM(RUSTBORO_CITY), HEAL_LOCATION_RUSTBORO_CITY}, +/* MAPSEC_FORTREE_CITY */ {MAP_GROUP(FORTREE_CITY), MAP_NUM(FORTREE_CITY), HEAL_LOCATION_FORTREE_CITY}, +/* MAPSEC_LILYCOVE_CITY */ {MAP_GROUP(LILYCOVE_CITY), MAP_NUM(LILYCOVE_CITY), HEAL_LOCATION_LILYCOVE_CITY}, +/* MAPSEC_MOSSDEEP_CITY */ {MAP_GROUP(MOSSDEEP_CITY), MAP_NUM(MOSSDEEP_CITY), HEAL_LOCATION_MOSSDEEP_CITY}, +/* MAPSEC_SOOTOPOLIS_CITY */ {MAP_GROUP(SOOTOPOLIS_CITY), MAP_NUM(SOOTOPOLIS_CITY), HEAL_LOCATION_SOOTOPOLIS_CITY}, +/* MAPSEC_EVER_GRANDE_CITY */ {MAP_GROUP(EVER_GRANDE_CITY), MAP_NUM(EVER_GRANDE_CITY), HEAL_LOCATION_EVER_GRANDE_CITY_1}, +/* MAPSEC_ROUTE_101 */ {MAP_GROUP(ROUTE101), MAP_NUM(ROUTE101), 0}, +/* MAPSEC_ROUTE_102 */ {MAP_GROUP(ROUTE102), MAP_NUM(ROUTE102), 0}, +/* MAPSEC_ROUTE_103 */ {MAP_GROUP(ROUTE103), MAP_NUM(ROUTE103), 0}, +/* MAPSEC_ROUTE_104 */ {MAP_GROUP(ROUTE104), MAP_NUM(ROUTE104), 0}, +/* MAPSEC_ROUTE_105 */ {MAP_GROUP(ROUTE105), MAP_NUM(ROUTE105), 0}, +/* MAPSEC_ROUTE_106 */ {MAP_GROUP(ROUTE106), MAP_NUM(ROUTE106), 0}, +/* MAPSEC_ROUTE_107 */ {MAP_GROUP(ROUTE107), MAP_NUM(ROUTE107), 0}, +/* MAPSEC_ROUTE_108 */ {MAP_GROUP(ROUTE108), MAP_NUM(ROUTE108), 0}, +/* MAPSEC_ROUTE_109 */ {MAP_GROUP(ROUTE109), MAP_NUM(ROUTE109), 0}, +/* MAPSEC_ROUTE_110 */ {MAP_GROUP(ROUTE110), MAP_NUM(ROUTE110), 0}, +/* MAPSEC_ROUTE_111 */ {MAP_GROUP(ROUTE111), MAP_NUM(ROUTE111), 0}, +/* MAPSEC_ROUTE_112 */ {MAP_GROUP(ROUTE112), MAP_NUM(ROUTE112), 0}, +/* MAPSEC_ROUTE_113 */ {MAP_GROUP(ROUTE113), MAP_NUM(ROUTE113), 0}, +/* MAPSEC_ROUTE_114 */ {MAP_GROUP(ROUTE114), MAP_NUM(ROUTE114), 0}, +/* MAPSEC_ROUTE_115 */ {MAP_GROUP(ROUTE115), MAP_NUM(ROUTE115), 0}, +/* MAPSEC_ROUTE_116 */ {MAP_GROUP(ROUTE116), MAP_NUM(ROUTE116), 0}, +/* MAPSEC_ROUTE_117 */ {MAP_GROUP(ROUTE117), MAP_NUM(ROUTE117), 0}, +/* MAPSEC_ROUTE_118 */ {MAP_GROUP(ROUTE118), MAP_NUM(ROUTE118), 0}, +/* MAPSEC_ROUTE_119 */ {MAP_GROUP(ROUTE119), MAP_NUM(ROUTE119), 0}, +/* MAPSEC_ROUTE_120 */ {MAP_GROUP(ROUTE120), MAP_NUM(ROUTE120), 0}, +/* MAPSEC_ROUTE_121 */ {MAP_GROUP(ROUTE121), MAP_NUM(ROUTE121), 0}, +/* MAPSEC_ROUTE_122 */ {MAP_GROUP(ROUTE122), MAP_NUM(ROUTE122), 0}, +/* MAPSEC_ROUTE_123 */ {MAP_GROUP(ROUTE123), MAP_NUM(ROUTE123), 0}, +/* MAPSEC_ROUTE_124 */ {MAP_GROUP(ROUTE124), MAP_NUM(ROUTE124), 0}, +/* MAPSEC_ROUTE_125 */ {MAP_GROUP(ROUTE125), MAP_NUM(ROUTE125), 0}, +/* MAPSEC_ROUTE_126 */ {MAP_GROUP(ROUTE126), MAP_NUM(ROUTE126), 0}, +/* MAPSEC_ROUTE_127 */ {MAP_GROUP(ROUTE127), MAP_NUM(ROUTE127), 0}, +/* MAPSEC_ROUTE_128 */ {MAP_GROUP(ROUTE128), MAP_NUM(ROUTE128), 0}, +/* MAPSEC_ROUTE_129 */ {MAP_GROUP(ROUTE129), MAP_NUM(ROUTE129), 0}, +/* MAPSEC_ROUTE_130 */ {MAP_GROUP(ROUTE130), MAP_NUM(ROUTE130), 0}, +/* MAPSEC_ROUTE_131 */ {MAP_GROUP(ROUTE131), MAP_NUM(ROUTE131), 0}, +/* MAPSEC_ROUTE_132 */ {MAP_GROUP(ROUTE132), MAP_NUM(ROUTE132), 0}, +/* MAPSEC_ROUTE_133 */ {MAP_GROUP(ROUTE133), MAP_NUM(ROUTE133), 0}, +/* MAPSEC_ROUTE_134 */ {MAP_GROUP(ROUTE134), MAP_NUM(ROUTE134), 0}, }; static const u8 *const sEverGrandeCityAreaNames[] = @@ -1336,7 +1335,6 @@ static const struct MultiPartMapSection sMultiPartMapSections[1] = {sEverGrandeCityAreaNames, MAPSEC_EVER_GRANDE_CITY, FLAG_SYS_POKEMON_LEAGUE_FLY}, }; -// what in the hell is this? static struct UnknownStruct3 *const sFlyDataPtr = (struct UnknownStruct3 *)gSharedMem; static const struct SpritePalette sFlyTargetIconSpritePalette = {sFlyTargetIcons_Pal, 2}; @@ -1733,10 +1731,10 @@ void sub_80FC69C(void) sub_8053538((FlagGet(FLAG_SYS_POKEMON_LEAGUE_FLY) && sFlyDataPtr->regionMap.everGrandeCityArea == 0) ? HEAL_LOCATION_EVER_GRANDE_CITY_2 : HEAL_LOCATION_EVER_GRANDE_CITY_1); break; default: - if (sMapHealLocationIndexes[sFlyDataPtr->regionMap.mapSectionId][2] != 0) - sub_8053538(sMapHealLocationIndexes[sFlyDataPtr->regionMap.mapSectionId][2]); + if (sMapHealLocations[sFlyDataPtr->regionMap.mapSectionId][2] != 0) + sub_8053538(sMapHealLocations[sFlyDataPtr->regionMap.mapSectionId][2]); else - warp1_set_2(sMapHealLocationIndexes[sFlyDataPtr->regionMap.mapSectionId][0], sMapHealLocationIndexes[sFlyDataPtr->regionMap.mapSectionId][1], -1); + warp1_set_2(sMapHealLocations[sFlyDataPtr->regionMap.mapSectionId][0], sMapHealLocations[sFlyDataPtr->regionMap.mapSectionId][1], -1); break; } sub_80865BC(); -- cgit v1.2.3 From ac4a3357755d79505c6ef2daafe7f0d8535a7279 Mon Sep 17 00:00:00 2001 From: Garak Date: Fri, 10 Aug 2018 17:52:52 -0400 Subject: Update region_map.c --- src/region_map.c | 100 +++++++++++++++++++++++++++---------------------------- 1 file changed, 50 insertions(+), 50 deletions(-) diff --git a/src/region_map.c b/src/region_map.c index 4bd89dd18..e9ae4599a 100644 --- a/src/region_map.c +++ b/src/region_map.c @@ -1264,56 +1264,56 @@ static const u8 sFlyTargetIcons_ImageLZ[] = INCBIN_U8("graphics/pokenav/fly_targ static const u8 sMapHealLocations[][3] = { -/* MAPSEC_LITTLEROOT_TOWN */ {MAP_GROUP(LITTLEROOT_TOWN), MAP_NUM(LITTLEROOT_TOWN), HEAL_LOCATION_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F}, -/* MAPSEC_OLDALE_TOWN */ {MAP_GROUP(OLDALE_TOWN), MAP_NUM(OLDALE_TOWN), HEAL_LOCATION_OLDALE_TOWN}, -/* MAPSEC_DEWFORD_TOWN */ {MAP_GROUP(DEWFORD_TOWN), MAP_NUM(DEWFORD_TOWN), HEAL_LOCATION_DEWFORD_TOWN}, -/* MAPSEC_LAVARIDGE_TOWN */ {MAP_GROUP(LAVARIDGE_TOWN), MAP_NUM(LAVARIDGE_TOWN), HEAL_LOCATION_LAVARIDGE_TOWN}, -/* MAPSEC_FALLARBOR_TOWN */ {MAP_GROUP(FALLARBOR_TOWN), MAP_NUM(FALLARBOR_TOWN), HEAL_LOCATION_FALLARBOR_TOWN}, -/* MAPSEC_VERDANTURF_TOWN */ {MAP_GROUP(VERDANTURF_TOWN), MAP_NUM(VERDANTURF_TOWN), HEAL_LOCATION_VERDANTURF_TOWN}, -/* MAPSEC_PACIFIDLOG_TOWN */ {MAP_GROUP(PACIFIDLOG_TOWN), MAP_NUM(PACIFIDLOG_TOWN), HEAL_LOCATION_PACIFIDLOG_TOWN}, -/* MAPSEC_PETALBURG_CITY */ {MAP_GROUP(PETALBURG_CITY), MAP_NUM(PETALBURG_CITY), HEAL_LOCATION_PETALBURG_CITY}, -/* MAPSEC_SLATEPORT_CITY */ {MAP_GROUP(SLATEPORT_CITY), MAP_NUM(SLATEPORT_CITY), HEAL_LOCATION_SLATEPORT_CITY}, -/* MAPSEC_MAUVILLE_CITY */ {MAP_GROUP(MAUVILLE_CITY), MAP_NUM(MAUVILLE_CITY), HEAL_LOCATION_MAUVILLE_CITY}, -/* MAPSEC_RUSTBORO_CITY */ {MAP_GROUP(RUSTBORO_CITY), MAP_NUM(RUSTBORO_CITY), HEAL_LOCATION_RUSTBORO_CITY}, -/* MAPSEC_FORTREE_CITY */ {MAP_GROUP(FORTREE_CITY), MAP_NUM(FORTREE_CITY), HEAL_LOCATION_FORTREE_CITY}, -/* MAPSEC_LILYCOVE_CITY */ {MAP_GROUP(LILYCOVE_CITY), MAP_NUM(LILYCOVE_CITY), HEAL_LOCATION_LILYCOVE_CITY}, -/* MAPSEC_MOSSDEEP_CITY */ {MAP_GROUP(MOSSDEEP_CITY), MAP_NUM(MOSSDEEP_CITY), HEAL_LOCATION_MOSSDEEP_CITY}, -/* MAPSEC_SOOTOPOLIS_CITY */ {MAP_GROUP(SOOTOPOLIS_CITY), MAP_NUM(SOOTOPOLIS_CITY), HEAL_LOCATION_SOOTOPOLIS_CITY}, -/* MAPSEC_EVER_GRANDE_CITY */ {MAP_GROUP(EVER_GRANDE_CITY), MAP_NUM(EVER_GRANDE_CITY), HEAL_LOCATION_EVER_GRANDE_CITY_1}, -/* MAPSEC_ROUTE_101 */ {MAP_GROUP(ROUTE101), MAP_NUM(ROUTE101), 0}, -/* MAPSEC_ROUTE_102 */ {MAP_GROUP(ROUTE102), MAP_NUM(ROUTE102), 0}, -/* MAPSEC_ROUTE_103 */ {MAP_GROUP(ROUTE103), MAP_NUM(ROUTE103), 0}, -/* MAPSEC_ROUTE_104 */ {MAP_GROUP(ROUTE104), MAP_NUM(ROUTE104), 0}, -/* MAPSEC_ROUTE_105 */ {MAP_GROUP(ROUTE105), MAP_NUM(ROUTE105), 0}, -/* MAPSEC_ROUTE_106 */ {MAP_GROUP(ROUTE106), MAP_NUM(ROUTE106), 0}, -/* MAPSEC_ROUTE_107 */ {MAP_GROUP(ROUTE107), MAP_NUM(ROUTE107), 0}, -/* MAPSEC_ROUTE_108 */ {MAP_GROUP(ROUTE108), MAP_NUM(ROUTE108), 0}, -/* MAPSEC_ROUTE_109 */ {MAP_GROUP(ROUTE109), MAP_NUM(ROUTE109), 0}, -/* MAPSEC_ROUTE_110 */ {MAP_GROUP(ROUTE110), MAP_NUM(ROUTE110), 0}, -/* MAPSEC_ROUTE_111 */ {MAP_GROUP(ROUTE111), MAP_NUM(ROUTE111), 0}, -/* MAPSEC_ROUTE_112 */ {MAP_GROUP(ROUTE112), MAP_NUM(ROUTE112), 0}, -/* MAPSEC_ROUTE_113 */ {MAP_GROUP(ROUTE113), MAP_NUM(ROUTE113), 0}, -/* MAPSEC_ROUTE_114 */ {MAP_GROUP(ROUTE114), MAP_NUM(ROUTE114), 0}, -/* MAPSEC_ROUTE_115 */ {MAP_GROUP(ROUTE115), MAP_NUM(ROUTE115), 0}, -/* MAPSEC_ROUTE_116 */ {MAP_GROUP(ROUTE116), MAP_NUM(ROUTE116), 0}, -/* MAPSEC_ROUTE_117 */ {MAP_GROUP(ROUTE117), MAP_NUM(ROUTE117), 0}, -/* MAPSEC_ROUTE_118 */ {MAP_GROUP(ROUTE118), MAP_NUM(ROUTE118), 0}, -/* MAPSEC_ROUTE_119 */ {MAP_GROUP(ROUTE119), MAP_NUM(ROUTE119), 0}, -/* MAPSEC_ROUTE_120 */ {MAP_GROUP(ROUTE120), MAP_NUM(ROUTE120), 0}, -/* MAPSEC_ROUTE_121 */ {MAP_GROUP(ROUTE121), MAP_NUM(ROUTE121), 0}, -/* MAPSEC_ROUTE_122 */ {MAP_GROUP(ROUTE122), MAP_NUM(ROUTE122), 0}, -/* MAPSEC_ROUTE_123 */ {MAP_GROUP(ROUTE123), MAP_NUM(ROUTE123), 0}, -/* MAPSEC_ROUTE_124 */ {MAP_GROUP(ROUTE124), MAP_NUM(ROUTE124), 0}, -/* MAPSEC_ROUTE_125 */ {MAP_GROUP(ROUTE125), MAP_NUM(ROUTE125), 0}, -/* MAPSEC_ROUTE_126 */ {MAP_GROUP(ROUTE126), MAP_NUM(ROUTE126), 0}, -/* MAPSEC_ROUTE_127 */ {MAP_GROUP(ROUTE127), MAP_NUM(ROUTE127), 0}, -/* MAPSEC_ROUTE_128 */ {MAP_GROUP(ROUTE128), MAP_NUM(ROUTE128), 0}, -/* MAPSEC_ROUTE_129 */ {MAP_GROUP(ROUTE129), MAP_NUM(ROUTE129), 0}, -/* MAPSEC_ROUTE_130 */ {MAP_GROUP(ROUTE130), MAP_NUM(ROUTE130), 0}, -/* MAPSEC_ROUTE_131 */ {MAP_GROUP(ROUTE131), MAP_NUM(ROUTE131), 0}, -/* MAPSEC_ROUTE_132 */ {MAP_GROUP(ROUTE132), MAP_NUM(ROUTE132), 0}, -/* MAPSEC_ROUTE_133 */ {MAP_GROUP(ROUTE133), MAP_NUM(ROUTE133), 0}, -/* MAPSEC_ROUTE_134 */ {MAP_GROUP(ROUTE134), MAP_NUM(ROUTE134), 0}, + {MAP_GROUP(LITTLEROOT_TOWN), MAP_NUM(LITTLEROOT_TOWN), HEAL_LOCATION_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F}, + {MAP_GROUP(OLDALE_TOWN), MAP_NUM(OLDALE_TOWN), HEAL_LOCATION_OLDALE_TOWN}, + {MAP_GROUP(DEWFORD_TOWN), MAP_NUM(DEWFORD_TOWN), HEAL_LOCATION_DEWFORD_TOWN}, + {MAP_GROUP(LAVARIDGE_TOWN), MAP_NUM(LAVARIDGE_TOWN), HEAL_LOCATION_LAVARIDGE_TOWN}, + {MAP_GROUP(FALLARBOR_TOWN), MAP_NUM(FALLARBOR_TOWN), HEAL_LOCATION_FALLARBOR_TOWN}, + {MAP_GROUP(VERDANTURF_TOWN), MAP_NUM(VERDANTURF_TOWN), HEAL_LOCATION_VERDANTURF_TOWN}, + {MAP_GROUP(PACIFIDLOG_TOWN), MAP_NUM(PACIFIDLOG_TOWN), HEAL_LOCATION_PACIFIDLOG_TOWN}, + {MAP_GROUP(PETALBURG_CITY), MAP_NUM(PETALBURG_CITY), HEAL_LOCATION_PETALBURG_CITY}, + {MAP_GROUP(SLATEPORT_CITY), MAP_NUM(SLATEPORT_CITY), HEAL_LOCATION_SLATEPORT_CITY}, + {MAP_GROUP(MAUVILLE_CITY), MAP_NUM(MAUVILLE_CITY), HEAL_LOCATION_MAUVILLE_CITY}, + {MAP_GROUP(RUSTBORO_CITY), MAP_NUM(RUSTBORO_CITY), HEAL_LOCATION_RUSTBORO_CITY}, + {MAP_GROUP(FORTREE_CITY), MAP_NUM(FORTREE_CITY), HEAL_LOCATION_FORTREE_CITY}, + {MAP_GROUP(LILYCOVE_CITY), MAP_NUM(LILYCOVE_CITY), HEAL_LOCATION_LILYCOVE_CITY}, + {MAP_GROUP(MOSSDEEP_CITY), MAP_NUM(MOSSDEEP_CITY), HEAL_LOCATION_MOSSDEEP_CITY}, + {MAP_GROUP(SOOTOPOLIS_CITY), MAP_NUM(SOOTOPOLIS_CITY), HEAL_LOCATION_SOOTOPOLIS_CITY}, + {MAP_GROUP(EVER_GRANDE_CITY), MAP_NUM(EVER_GRANDE_CITY), HEAL_LOCATION_EVER_GRANDE_CITY_1}, + {MAP_GROUP(ROUTE101), MAP_NUM(ROUTE101), 0}, + {MAP_GROUP(ROUTE102), MAP_NUM(ROUTE102), 0}, + {MAP_GROUP(ROUTE103), MAP_NUM(ROUTE103), 0}, + {MAP_GROUP(ROUTE104), MAP_NUM(ROUTE104), 0}, + {MAP_GROUP(ROUTE105), MAP_NUM(ROUTE105), 0}, + {MAP_GROUP(ROUTE106), MAP_NUM(ROUTE106), 0}, + {MAP_GROUP(ROUTE107), MAP_NUM(ROUTE107), 0}, + {MAP_GROUP(ROUTE108), MAP_NUM(ROUTE108), 0}, + {MAP_GROUP(ROUTE109), MAP_NUM(ROUTE109), 0}, + {MAP_GROUP(ROUTE110), MAP_NUM(ROUTE110), 0}, + {MAP_GROUP(ROUTE111), MAP_NUM(ROUTE111), 0}, + {MAP_GROUP(ROUTE112), MAP_NUM(ROUTE112), 0}, + {MAP_GROUP(ROUTE113), MAP_NUM(ROUTE113), 0}, + {MAP_GROUP(ROUTE114), MAP_NUM(ROUTE114), 0}, + {MAP_GROUP(ROUTE115), MAP_NUM(ROUTE115), 0}, + {MAP_GROUP(ROUTE116), MAP_NUM(ROUTE116), 0}, + {MAP_GROUP(ROUTE117), MAP_NUM(ROUTE117), 0}, + {MAP_GROUP(ROUTE118), MAP_NUM(ROUTE118), 0}, + {MAP_GROUP(ROUTE119), MAP_NUM(ROUTE119), 0}, + {MAP_GROUP(ROUTE120), MAP_NUM(ROUTE120), 0}, + {MAP_GROUP(ROUTE121), MAP_NUM(ROUTE121), 0}, + {MAP_GROUP(ROUTE122), MAP_NUM(ROUTE122), 0}, + {MAP_GROUP(ROUTE123), MAP_NUM(ROUTE123), 0}, + {MAP_GROUP(ROUTE124), MAP_NUM(ROUTE124), 0}, + {MAP_GROUP(ROUTE125), MAP_NUM(ROUTE125), 0}, + {MAP_GROUP(ROUTE126), MAP_NUM(ROUTE126), 0}, + {MAP_GROUP(ROUTE127), MAP_NUM(ROUTE127), 0}, + {MAP_GROUP(ROUTE128), MAP_NUM(ROUTE128), 0}, + {MAP_GROUP(ROUTE129), MAP_NUM(ROUTE129), 0}, + {MAP_GROUP(ROUTE130), MAP_NUM(ROUTE130), 0}, + {MAP_GROUP(ROUTE131), MAP_NUM(ROUTE131), 0}, + {MAP_GROUP(ROUTE132), MAP_NUM(ROUTE132), 0}, + {MAP_GROUP(ROUTE133), MAP_NUM(ROUTE133), 0}, + {MAP_GROUP(ROUTE134), MAP_NUM(ROUTE134), 0}, }; static const u8 *const sEverGrandeCityAreaNames[] = -- cgit v1.2.3 From 1ace1836679da5058213388ef825292eabbd6776 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sun, 12 Aug 2018 20:32:27 -0500 Subject: Decompile more of battle_anim_812C144.s --- asm/battle_anim_812C144.s | 4783 -------------------------------------- src/battle/battle_anim_812C144.c | 1589 ++++++++++++- src/contest_effect.c | 26 +- 3 files changed, 1602 insertions(+), 4796 deletions(-) diff --git a/asm/battle_anim_812C144.s b/asm/battle_anim_812C144.s index 4fea7049b..8a062e352 100644 --- a/asm/battle_anim_812C144.s +++ b/asm/battle_anim_812C144.s @@ -5,4789 +5,6 @@ .text - thumb_func_start sub_812F474 -sub_812F474: @ 812F474 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x14 - lsls r0, 24 - lsrs r4, r0, 24 - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 3 - ldr r1, _0812F4A8 @ =gTasks - adds r6, r0, r1 - ldrb r0, [r6, 0x12] - bl GetBattlerPosition_permutated - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bne _0812F4B4 - ldr r0, _0812F4AC @ =gBattle_BG1_X - ldrh r0, [r0] - str r0, [sp, 0x4] - ldr r0, _0812F4B0 @ =gBattle_BG1_Y - b _0812F4BC - .align 2, 0 -_0812F4A8: .4byte gTasks -_0812F4AC: .4byte gBattle_BG1_X -_0812F4B0: .4byte gBattle_BG1_Y -_0812F4B4: - ldr r0, _0812F4D4 @ =gBattle_BG2_X - ldrh r0, [r0] - str r0, [sp, 0x4] - ldr r0, _0812F4D8 @ =gBattle_BG2_Y -_0812F4BC: - ldrh r0, [r0] - str r0, [sp, 0x8] - movs r1, 0x8 - ldrsh r0, [r6, r1] - cmp r0, 0x1 - bne _0812F4CA - b _0812F6A6 -_0812F4CA: - cmp r0, 0x1 - bgt _0812F4DC - cmp r0, 0 - beq _0812F4EA - b _0812F712 - .align 2, 0 -_0812F4D4: .4byte gBattle_BG2_X -_0812F4D8: .4byte gBattle_BG2_Y -_0812F4DC: - cmp r0, 0x2 - bne _0812F4E2 - b _0812F6C4 -_0812F4E2: - cmp r0, 0x3 - bne _0812F4E8 - b _0812F70C -_0812F4E8: - b _0812F712 -_0812F4EA: - movs r2, 0x24 - ldrsh r0, [r6, r2] - lsls r0, 17 - lsrs r5, r0, 16 - movs r3, 0 - str r3, [sp] - mov r9, r3 - movs r4, 0 - ldrh r0, [r6, 0xA] - adds r0, 0x2 - movs r1, 0xFF - ands r0, r1 - strh r0, [r6, 0xA] - ldrh r7, [r6, 0xA] - mov r8, r7 - movs r0, 0x14 - ldrsh r1, [r6, r0] - movs r0, 0xFC - lsls r0, 3 - bl __divsi3 - strh r0, [r6, 0x1A] - movs r1, 0x16 - ldrsh r0, [r6, r1] - lsls r0, 1 - movs r2, 0x1A - ldrsh r1, [r6, r2] - bl __divsi3 - negs r0, r0 - strh r0, [r6, 0x1C] - ldrh r0, [r6, 0x16] - strh r0, [r6, 0x1E] - lsls r0, 16 - asrs r0, 21 - lsls r0, 16 - lsrs r7, r0, 16 - strh r7, [r6, 0x20] - ldrh r2, [r6, 0x24] - lsls r3, r2, 16 - mov r12, r3 - asrs r1, r3, 16 - movs r3, 0x22 - ldrsh r0, [r6, r3] - cmp r1, r0 - ble _0812F60A - ldr r0, _0812F660 @ =gScanlineEffect - mov r10, r0 - ldr r1, [sp, 0x4] - lsls r0, r1, 16 - asrs r0, 16 - str r0, [sp, 0x10] - ldr r2, [sp, 0x8] - lsls r0, r2, 16 - asrs r0, 16 - str r0, [sp, 0xC] -_0812F55A: - lsls r5, 16 - asrs r5, 16 - adds r2, r5, 0x1 - lsls r2, 1 - mov r3, r10 - ldrb r1, [r3, 0x14] - lsls r0, r1, 4 - subs r0, r1 - lsls r0, 7 - adds r2, r0 - ldr r0, _0812F664 @ =gScanlineEffectRegBuffers - adds r2, r0 - lsls r4, 16 - asrs r4, 16 - mov r1, r9 - lsls r0, r1, 16 - asrs r0, 16 - subs r0, r4, r0 - ldr r3, [sp, 0xC] - adds r0, r3, r0 - strh r0, [r2] - lsls r3, r5, 1 - mov r0, r10 - ldrb r1, [r0, 0x14] - lsls r0, r1, 4 - subs r0, r1 - lsls r0, 7 - adds r3, r0 - ldr r1, _0812F664 @ =gScanlineEffectRegBuffers - adds r3, r1 - lsls r1, r7, 16 - asrs r1, 16 - ldr r2, [sp, 0x10] - adds r1, r2, r1 - mov r7, r8 - lsls r2, r7, 16 - asrs r2, 16 - lsls r0, r2, 1 - ldr r7, _0812F668 @ =gSineTable - adds r0, r7 - ldrh r0, [r0] - lsls r0, 16 - asrs r0, 21 - adds r1, r0 - strh r1, [r3] - adds r2, 0xA - mov r8, r2 - movs r0, 0xFF - mov r1, r8 - ands r1, r0 - mov r8, r1 - ldrh r0, [r6, 0x1C] - ldrh r2, [r6, 0x1E] - adds r0, r2 - strh r0, [r6, 0x1E] - lsls r0, 16 - asrs r0, 21 - lsls r0, 16 - lsrs r7, r0, 16 - strh r7, [r6, 0x20] - adds r4, 0x1 - lsls r4, 16 - lsrs r4, 16 - subs r5, 0x2 - lsls r5, 16 - lsrs r5, 16 - ldr r3, [sp] - lsls r0, r3, 16 - asrs r0, 16 - ldrh r1, [r6, 0x14] - adds r0, r1 - lsls r0, 16 - lsrs r2, r0, 16 - str r2, [sp] - asrs r0, 21 - lsls r0, 16 - lsrs r0, 16 - mov r9, r0 - ldr r0, _0812F66C @ =0xffff0000 - add r0, r12 - lsrs r2, r0, 16 - lsls r3, r2, 16 - mov r12, r3 - asrs r1, r3, 16 - movs r3, 0x22 - ldrsh r0, [r6, r3] - cmp r1, r0 - bgt _0812F55A -_0812F60A: - lsls r1, r2, 17 - cmp r1, 0 - blt _0812F636 - ldr r4, _0812F664 @ =gScanlineEffectRegBuffers - ldr r7, [sp, 0x4] - lsls r0, r7, 16 - asrs r0, 16 - adds r3, r0, 0 - adds r3, 0xF0 - movs r0, 0xF0 - lsls r0, 3 - adds r5, r4, r0 -_0812F622: - asrs r2, r1, 16 - lsls r1, r2, 1 - adds r0, r1, r4 - strh r3, [r0] - adds r1, r5 - strh r3, [r1] - subs r2, 0x2 - lsls r1, r2, 16 - cmp r1, 0 - bge _0812F622 -_0812F636: - ldrh r0, [r6, 0x14] - adds r0, 0x1 - strh r0, [r6, 0x14] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x3F - ble _0812F69C - movs r0, 0x40 - strh r0, [r6, 0x14] - ldrh r0, [r6, 0xC] - adds r0, 0x1 - strh r0, [r6, 0xC] - movs r1, 0x1 - ands r0, r1 - cmp r0, 0 - beq _0812F670 - ldrh r0, [r6, 0xE] - subs r0, 0x1 - strh r0, [r6, 0xE] - b _0812F676 - .align 2, 0 -_0812F660: .4byte gScanlineEffect -_0812F664: .4byte gScanlineEffectRegBuffers -_0812F668: .4byte gSineTable -_0812F66C: .4byte 0xffff0000 -_0812F670: - ldrh r0, [r6, 0x10] - adds r0, 0x1 - strh r0, [r6, 0x10] -_0812F676: - ldr r0, _0812F698 @ =REG_BLDALPHA - ldrh r1, [r6, 0x10] - lsls r1, 8 - ldrh r2, [r6, 0xE] - orrs r1, r2 - strh r1, [r0] - movs r2, 0xE - ldrsh r1, [r6, r2] - cmp r1, 0 - bne _0812F712 - movs r3, 0x10 - ldrsh r0, [r6, r3] - cmp r0, 0x10 - bne _0812F712 - strh r1, [r6, 0xC] - strh r1, [r6, 0xE] - b _0812F700 - .align 2, 0 -_0812F698: .4byte REG_BLDALPHA -_0812F69C: - ldrh r0, [r6, 0x18] - ldrh r7, [r6, 0x16] - adds r0, r7 - strh r0, [r6, 0x16] - b _0812F712 -_0812F6A6: - ldrh r0, [r6, 0xC] - adds r0, 0x1 - strh r0, [r6, 0xC] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0xC - ble _0812F712 - ldr r1, _0812F6C0 @ =gScanlineEffect - movs r0, 0x3 - strb r0, [r1, 0x15] - movs r0, 0 - strh r0, [r6, 0xC] - b _0812F700 - .align 2, 0 -_0812F6C0: .4byte gScanlineEffect -_0812F6C4: - ldrh r0, [r6, 0xC] - adds r0, 0x1 - strh r0, [r6, 0xC] - movs r1, 0x1 - ands r0, r1 - cmp r0, 0 - beq _0812F6DA - ldrh r0, [r6, 0xE] - adds r0, 0x1 - strh r0, [r6, 0xE] - b _0812F6E0 -_0812F6DA: - ldrh r0, [r6, 0x10] - subs r0, 0x1 - strh r0, [r6, 0x10] -_0812F6E0: - ldr r2, _0812F708 @ =REG_BLDALPHA - ldrh r0, [r6, 0x10] - lsls r0, 8 - ldrh r1, [r6, 0xE] - orrs r0, r1 - strh r0, [r2] - movs r1, 0xE - ldrsh r0, [r6, r1] - cmp r0, 0x10 - bne _0812F712 - movs r2, 0x10 - ldrsh r0, [r6, r2] - cmp r0, 0 - bne _0812F712 - strh r0, [r6, 0xC] - strh r0, [r6, 0xE] -_0812F700: - ldrh r0, [r6, 0x8] - adds r0, 0x1 - strh r0, [r6, 0x8] - b _0812F712 - .align 2, 0 -_0812F708: .4byte REG_BLDALPHA -_0812F70C: - adds r0, r4, 0 - bl DestroyAnimVisualTask -_0812F712: - add sp, 0x14 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_812F474 - - thumb_func_start sub_812F724 -sub_812F724: @ 812F724 - push {r4,lr} - lsls r0, 24 - lsrs r0, 24 - lsls r4, r0, 2 - adds r4, r0 - lsls r4, 3 - ldr r0, _0812F75C @ =gTasks - adds r4, r0 - movs r0, 0 - strh r0, [r4, 0x8] - ldr r0, _0812F760 @ =gBattleAnimArgs - ldrb r0, [r0] - bl GetAnimBattlerSpriteId - adds r1, r0, 0 - lsls r1, 24 - lsrs r1, 24 - strh r1, [r4, 0x26] - ldr r2, _0812F764 @ =gUnknown_08402750 - adds r0, r4, 0 - bl sub_80798F4 - ldr r0, _0812F768 @ =sub_812F76C - str r0, [r4] - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_0812F75C: .4byte gTasks -_0812F760: .4byte gBattleAnimArgs -_0812F764: .4byte gUnknown_08402750 -_0812F768: .4byte sub_812F76C - thumb_func_end sub_812F724 - - thumb_func_start sub_812F76C -sub_812F76C: @ 812F76C - push {r4-r6,lr} - lsls r0, 24 - lsrs r4, r0, 24 - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 3 - ldr r2, _0812F7C4 @ =gTasks - adds r3, r0, r2 - ldrh r0, [r3, 0x8] - adds r1, r0, 0x1 - movs r5, 0 - strh r1, [r3, 0x8] - subs r0, 0x14 - lsls r0, 16 - lsrs r0, 16 - adds r6, r2, 0 - cmp r0, 0x16 - bhi _0812F7D0 - ldrh r0, [r3, 0xA] - adds r0, 0x1 - strh r0, [r3, 0xA] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x1 - ble _0812F7E0 - strh r5, [r3, 0xA] - ldrh r0, [r3, 0xC] - adds r0, 0x1 - strh r0, [r3, 0xC] - movs r5, 0x1 - ands r0, r5 - cmp r0, 0 - bne _0812F7D0 - ldr r2, _0812F7C8 @ =gSprites - movs r0, 0x26 - ldrsh r1, [r3, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - ldr r1, _0812F7CC @ =0x0000ffff - strh r1, [r0, 0x24] - b _0812F7E0 - .align 2, 0 -_0812F7C4: .4byte gTasks -_0812F7C8: .4byte gSprites -_0812F7CC: .4byte 0x0000ffff -_0812F7D0: - ldr r2, _0812F800 @ =gSprites - movs r0, 0x26 - ldrsh r1, [r3, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - strh r5, [r0, 0x24] -_0812F7E0: - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 3 - adds r0, r6 - bl sub_807992C - lsls r0, 24 - cmp r0, 0 - bne _0812F7F8 - adds r0, r4, 0 - bl DestroyAnimVisualTask -_0812F7F8: - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_0812F800: .4byte gSprites - thumb_func_end sub_812F76C - - thumb_func_start sub_812F804 -sub_812F804: @ 812F804 - push {r4-r6,lr} - mov r6, r8 - push {r6} - mov r8, r0 - adds r5, r2, 0 - adds r0, r3, 0 - ldr r4, [sp, 0x14] - ldr r6, [sp, 0x18] - lsls r1, 16 - lsrs r1, 16 - lsls r5, 16 - lsrs r5, 16 - lsls r4, 16 - lsrs r4, 16 - lsls r6, 16 - lsrs r6, 16 - mov r2, r8 - strh r1, [r2, 0x20] - strh r5, [r2, 0x22] - lsls r1, 16 - asrs r1, 16 - lsls r2, r1, 4 - mov r3, r8 - strh r2, [r3, 0x36] - lsls r5, 16 - asrs r5, 16 - lsls r2, r5, 4 - strh r2, [r3, 0x38] - lsls r0, 16 - asrs r0, 16 - subs r0, r1 - lsls r0, 4 - adds r1, r6, 0 - bl __divsi3 - mov r1, r8 - strh r0, [r1, 0x3A] - lsls r4, 16 - asrs r4, 16 - subs r4, r5 - lsls r4, 4 - adds r0, r4, 0 - adds r1, r6, 0 - bl __divsi3 - mov r2, r8 - strh r0, [r2, 0x3C] - pop {r3} - mov r8, r3 - pop {r4-r6} - pop {r0} - bx r0 - thumb_func_end sub_812F804 - - thumb_func_start sub_812F86C -sub_812F86C: @ 812F86C - ldrh r1, [r0, 0x3A] - ldrh r2, [r0, 0x36] - adds r1, r2 - strh r1, [r0, 0x36] - ldrh r2, [r0, 0x3C] - ldrh r3, [r0, 0x38] - adds r2, r3 - strh r2, [r0, 0x38] - lsls r1, 16 - asrs r1, 20 - strh r1, [r0, 0x20] - lsls r2, 16 - asrs r2, 20 - strh r2, [r0, 0x22] - bx lr - thumb_func_end sub_812F86C - - thumb_func_start sub_812F88C -sub_812F88C: @ 812F88C - push {r4-r6,lr} - sub sp, 0x8 - adds r4, r0, 0 - ldrh r6, [r4, 0x20] - ldrh r5, [r4, 0x22] - bl sub_8078650 - ldr r0, _0812F8D4 @ =gBattleAnimArgs - ldrb r1, [r0] - adds r0, r4, 0 - bl StartSpriteAffineAnim - movs r0, 0x20 - ldrsh r1, [r4, r0] - movs r0, 0x22 - ldrsh r2, [r4, r0] - lsls r6, 16 - asrs r6, 16 - lsls r5, 16 - asrs r5, 16 - str r5, [sp] - movs r0, 0x40 - str r0, [sp, 0x4] - adds r0, r4, 0 - adds r3, r6, 0 - bl sub_812F804 - movs r0, 0 - strh r0, [r4, 0x2E] - ldr r0, _0812F8D8 @ =sub_812F8DC - str r0, [r4, 0x1C] - add sp, 0x8 - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_0812F8D4: .4byte gBattleAnimArgs -_0812F8D8: .4byte sub_812F8DC - thumb_func_end sub_812F88C - - thumb_func_start sub_812F8DC -sub_812F8DC: @ 812F8DC - push {r4,r5,lr} - adds r5, r0, 0 - ldrh r0, [r5, 0x2E] - adds r0, 0x1 - strh r0, [r5, 0x2E] - movs r0, 0x2E - ldrsh r4, [r5, r0] - lsls r4, 3 - movs r0, 0xFF - ands r4, r0 - adds r0, r5, 0 - bl sub_812F86C - adds r0, r4, 0 - movs r1, 0x8 - bl Sin - strh r0, [r5, 0x26] - movs r1, 0x2E - ldrsh r0, [r5, r1] - cmp r0, 0x3A - ble _0812F942 - ldrh r0, [r5, 0x30] - adds r0, 0x1 - strh r0, [r5, 0x30] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x1 - ble _0812F942 - movs r0, 0 - strh r0, [r5, 0x30] - ldrh r1, [r5, 0x32] - adds r1, 0x1 - strh r1, [r5, 0x32] - movs r0, 0x1 - ands r1, r0 - adds r3, r5, 0 - adds r3, 0x3E - lsls r1, 2 - ldrb r2, [r3] - subs r0, 0x6 - ands r0, r2 - orrs r0, r1 - strb r0, [r3] - movs r1, 0x32 - ldrsh r0, [r5, r1] - cmp r0, 0x3 - ble _0812F942 - adds r0, r5, 0 - bl move_anim_8074EE0 -_0812F942: - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end sub_812F8DC - - thumb_func_start sub_812F948 -sub_812F948: @ 812F948 - push {r4-r6,lr} - adds r5, r0, 0 - ldr r6, _0812F9A0 @ =gBattleAnimArgs - ldrh r0, [r6, 0x6] - strh r0, [r5, 0x2E] - ldrb r1, [r6] - adds r0, r5, 0 - bl StartSpriteAffineAnim - ldr r0, _0812F9A4 @ =gAnimBankTarget - ldrb r0, [r0] - bl GetBattlerSide - lsls r0, 24 - cmp r0, 0 - beq _0812F96E - ldrh r0, [r6, 0x2] - negs r0, r0 - strh r0, [r6, 0x2] -_0812F96E: - ldr r4, _0812F9A8 @ =gAnimBankAttacker - ldrb r0, [r4] - movs r1, 0x2 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - ldrh r1, [r6, 0x2] - adds r0, r1 - strh r0, [r5, 0x20] - ldrb r0, [r4] - movs r1, 0x3 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - ldrh r6, [r6, 0x4] - adds r0, r6 - strh r0, [r5, 0x22] - ldr r0, _0812F9AC @ =sub_80DA48C - str r0, [r5, 0x1C] - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_0812F9A0: .4byte gBattleAnimArgs -_0812F9A4: .4byte gAnimBankTarget -_0812F9A8: .4byte gAnimBankAttacker -_0812F9AC: .4byte sub_80DA48C - thumb_func_end sub_812F948 - - thumb_func_start sub_812F9B0 -sub_812F9B0: @ 812F9B0 - push {r4-r7,lr} - mov r7, r8 - push {r7} - lsls r0, 24 - lsrs r5, r0, 24 - movs r7, 0 - ldr r2, _0812FA00 @ =gTasks - lsls r0, r5, 2 - adds r0, r5 - lsls r0, 3 - adds r3, r0, r2 - ldrh r0, [r3, 0x8] - subs r0, 0x1 - strh r0, [r3, 0x8] - movs r1, 0x14 - ldrsh r0, [r3, r1] - movs r1, 0x80 - lsls r1, 8 - ands r0, r1 - mov r8, r2 - cmp r0, 0 - beq _0812FA32 - ldrh r0, [r3, 0xA] - subs r0, 0x1 - strh r0, [r3, 0xA] - lsls r0, 16 - asrs r0, 16 - movs r1, 0x1 - negs r1, r1 - cmp r0, r1 - bne _0812FA32 - movs r2, 0x1A - ldrsh r0, [r3, r2] - cmp r0, 0 - bne _0812FA04 - ldrh r0, [r3, 0x10] - strh r0, [r3, 0x1A] - negs r0, r0 - strh r0, [r3, 0x10] - b _0812FA06 - .align 2, 0 -_0812FA00: .4byte gTasks -_0812FA04: - strh r7, [r3, 0x1A] -_0812FA06: - lsls r0, r5, 2 - adds r0, r5 - lsls r0, 3 - mov r2, r8 - adds r1, r0, r2 - movs r2, 0x1C - ldrsh r0, [r1, r2] - cmp r0, 0 - bne _0812FA22 - ldrh r0, [r1, 0x12] - strh r0, [r1, 0x1C] - negs r0, r0 - strh r0, [r1, 0x12] - b _0812FA26 -_0812FA22: - movs r0, 0 - strh r0, [r1, 0x1C] -_0812FA26: - lsls r0, r5, 2 - adds r0, r5 - lsls r0, 3 - add r0, r8 - ldrh r1, [r0, 0x22] - strh r1, [r0, 0xA] -_0812FA32: - lsls r2, r5, 2 - adds r0, r2, r5 - lsls r0, 3 - mov r1, r8 - adds r4, r0, r1 - ldrh r6, [r4, 0x16] - ldrh r7, [r4, 0x18] - movs r1, 0xC - ldrsh r0, [r4, r1] - movs r1, 0x80 - lsls r1, 8 - ands r0, r1 - mov r12, r2 - cmp r0, 0 - beq _0812FA70 - ldr r3, _0812FA6C @ =gSprites - movs r2, 0x26 - ldrsh r0, [r4, r2] - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - adds r1, r3 - lsrs r2, r6, 8 - ldrh r0, [r4, 0x1A] - subs r0, r2 - strh r0, [r1, 0x24] - adds r2, r3, 0 - b _0812FA86 - .align 2, 0 -_0812FA6C: .4byte gSprites -_0812FA70: - ldr r2, _0812FAB4 @ =gSprites - movs r0, 0x26 - ldrsh r1, [r4, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - lsrs r1, r6, 8 - ldrh r4, [r4, 0x1A] - adds r1, r4 - strh r1, [r0, 0x24] -_0812FA86: - mov r1, r12 - adds r0, r1, r5 - lsls r0, 3 - mov r1, r8 - adds r4, r0, r1 - movs r1, 0xE - ldrsh r0, [r4, r1] - movs r1, 0x80 - lsls r1, 8 - ands r0, r1 - cmp r0, 0 - beq _0812FAB8 - movs r1, 0x26 - ldrsh r0, [r4, r1] - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - adds r1, r2 - lsrs r2, r7, 8 - ldrh r0, [r4, 0x1C] - subs r0, r2 - b _0812FACA - .align 2, 0 -_0812FAB4: .4byte gSprites -_0812FAB8: - movs r1, 0x26 - ldrsh r0, [r4, r1] - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - adds r1, r2 - lsrs r0, r7, 8 - ldrh r4, [r4, 0x1C] - adds r0, r4 -_0812FACA: - strh r0, [r1, 0x26] - mov r2, r12 - adds r0, r2, r5 - lsls r0, 3 - add r0, r8 - movs r1, 0x8 - ldrsh r0, [r0, r1] - cmp r0, 0 - bgt _0812FAEA - adds r0, r5, 0 - bl DestroyTask - ldr r1, _0812FAF4 @ =gAnimVisualTaskCount - ldrb r0, [r1] - subs r0, 0x1 - strb r0, [r1] -_0812FAEA: - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_0812FAF4: .4byte gAnimVisualTaskCount - thumb_func_end sub_812F9B0 - - thumb_func_start sub_812FAF8 -sub_812FAF8: @ 812FAF8 - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - lsls r0, 24 - lsrs r6, r0, 24 - movs r7, 0 - ldr r2, _0812FB4C @ =gTasks - lsls r0, r6, 2 - adds r0, r6 - lsls r0, 3 - adds r3, r0, r2 - ldrh r0, [r3, 0x8] - subs r0, 0x1 - strh r0, [r3, 0x8] - movs r1, 0x14 - ldrsh r0, [r3, r1] - movs r1, 0x80 - lsls r1, 8 - ands r0, r1 - mov r8, r2 - cmp r0, 0 - beq _0812FB7E - ldrh r0, [r3, 0xA] - subs r0, 0x1 - strh r0, [r3, 0xA] - lsls r0, 16 - asrs r0, 16 - movs r1, 0x1 - negs r1, r1 - cmp r0, r1 - bne _0812FB7E - movs r2, 0x1A - ldrsh r0, [r3, r2] - cmp r0, 0 - bne _0812FB50 - ldrh r0, [r3, 0x10] - strh r0, [r3, 0x1A] - negs r0, r0 - strh r0, [r3, 0x10] - b _0812FB52 - .align 2, 0 -_0812FB4C: .4byte gTasks -_0812FB50: - strh r7, [r3, 0x1A] -_0812FB52: - lsls r0, r6, 2 - adds r0, r6 - lsls r0, 3 - mov r2, r8 - adds r1, r0, r2 - movs r2, 0x1C - ldrsh r0, [r1, r2] - cmp r0, 0 - bne _0812FB6E - ldrh r0, [r1, 0x12] - strh r0, [r1, 0x1C] - negs r0, r0 - strh r0, [r1, 0x12] - b _0812FB72 -_0812FB6E: - movs r0, 0 - strh r0, [r1, 0x1C] -_0812FB72: - lsls r0, r6, 2 - adds r0, r6 - lsls r0, 3 - add r0, r8 - ldrh r1, [r0, 0x22] - strh r1, [r0, 0xA] -_0812FB7E: - lsls r3, r6, 2 - adds r0, r3, r6 - lsls r0, 3 - mov r1, r8 - adds r4, r0, r1 - ldrh r2, [r4, 0xC] - ldr r1, _0812FBD0 @ =0x00007fff - adds r0, r1, 0 - ands r0, r2 - ldrh r2, [r4, 0x16] - adds r0, r2 - lsls r5, r0, 16 - lsrs r0, r5, 16 - mov r9, r0 - ldrh r0, [r4, 0xE] - ands r1, r0 - ldrh r2, [r4, 0x18] - adds r1, r2 - lsls r1, 16 - lsrs r7, r1, 16 - movs r1, 0xC - ldrsh r0, [r4, r1] - movs r1, 0x80 - lsls r1, 8 - ands r0, r1 - mov r12, r3 - cmp r0, 0 - beq _0812FBD8 - ldr r3, _0812FBD4 @ =gSprites - movs r2, 0x26 - ldrsh r0, [r4, r2] - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - adds r1, r3 - lsrs r2, r5, 24 - ldrh r0, [r4, 0x1A] - subs r0, r2 - strh r0, [r1, 0x24] - adds r2, r3, 0 - b _0812FBEE - .align 2, 0 -_0812FBD0: .4byte 0x00007fff -_0812FBD4: .4byte gSprites -_0812FBD8: - ldr r2, _0812FC1C @ =gSprites - movs r0, 0x26 - ldrsh r1, [r4, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - lsrs r1, r5, 24 - ldrh r4, [r4, 0x1A] - adds r1, r4 - strh r1, [r0, 0x24] -_0812FBEE: - mov r1, r12 - adds r0, r1, r6 - lsls r0, 3 - mov r1, r8 - adds r4, r0, r1 - movs r1, 0xE - ldrsh r0, [r4, r1] - movs r1, 0x80 - lsls r1, 8 - ands r0, r1 - cmp r0, 0 - beq _0812FC20 - movs r1, 0x26 - ldrsh r0, [r4, r1] - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - adds r1, r2 - lsrs r2, r7, 8 - ldrh r0, [r4, 0x1C] - subs r0, r2 - b _0812FC32 - .align 2, 0 -_0812FC1C: .4byte gSprites -_0812FC20: - movs r1, 0x26 - ldrsh r0, [r4, r1] - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - adds r1, r2 - lsrs r0, r7, 8 - ldrh r4, [r4, 0x1C] - adds r0, r4 -_0812FC32: - strh r0, [r1, 0x26] - mov r2, r12 - adds r0, r2, r6 - lsls r0, 3 - mov r1, r8 - adds r2, r0, r1 - mov r0, r9 - strh r0, [r2, 0x16] - strh r7, [r2, 0x18] - movs r1, 0x8 - ldrsh r0, [r2, r1] - cmp r0, 0 - bgt _0812FC58 - movs r0, 0x1E - strh r0, [r2, 0x8] - movs r0, 0 - strh r0, [r2, 0x22] - ldr r0, _0812FC64 @ =sub_812F9B0 - str r0, [r2] -_0812FC58: - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_0812FC64: .4byte sub_812F9B0 - thumb_func_end sub_812FAF8 - - thumb_func_start sub_812FC68 -sub_812FC68: @ 812FC68 - push {r4-r7,lr} - mov r7, r8 - push {r7} - lsls r0, 24 - lsrs r6, r0, 24 - ldr r0, _0812FCC8 @ =gTasks - mov r8, r0 - lsls r7, r6, 2 - adds r0, r7, r6 - lsls r0, 3 - mov r1, r8 - adds r4, r0, r1 - ldr r1, _0812FCCC @ =gBankSpriteIds - ldr r2, _0812FCD0 @ =gAnimBankAttacker - ldrb r0, [r2] - adds r0, r1 - ldrb r0, [r0] - strh r0, [r4, 0x26] - ldr r5, _0812FCD4 @ =gBattleAnimArgs - ldrh r0, [r5] - strh r0, [r4, 0x24] - ldrh r0, [r5] - strh r0, [r4, 0x8] - ldrh r0, [r5, 0xC] - strh r0, [r4, 0x22] - movs r3, 0x6 - ldrsh r0, [r5, r3] - cmp r0, 0 - beq _0812FCAC - ldrh r0, [r4, 0x14] - ldr r3, _0812FCD8 @ =0xffff8000 - adds r1, r3, 0 - orrs r0, r1 - strh r0, [r4, 0x14] -_0812FCAC: - ldrb r0, [r2] - bl GetBattlerSide - lsls r0, 24 - cmp r0, 0 - beq _0812FCDC - ldrh r0, [r5, 0x2] - strh r0, [r4, 0xC] - ldrh r0, [r5, 0x4] - strh r0, [r4, 0xE] - mov r3, r8 - adds r4, r7, 0 - b _0812FD4C - .align 2, 0 -_0812FCC8: .4byte gTasks -_0812FCCC: .4byte gBankSpriteIds -_0812FCD0: .4byte gAnimBankAttacker -_0812FCD4: .4byte gBattleAnimArgs -_0812FCD8: .4byte 0xffff8000 -_0812FCDC: - movs r7, 0x2 - ldrsh r0, [r5, r7] - movs r1, 0x80 - lsls r1, 8 - ands r0, r1 - cmp r0, 0 - beq _0812FCF8 - ldrh r1, [r5, 0x2] - ldr r0, _0812FCF4 @ =0x00007fff - ands r0, r1 - b _0812FD00 - .align 2, 0 -_0812FCF4: .4byte 0x00007fff -_0812FCF8: - ldrh r0, [r5, 0x2] - ldr r2, _0812FD28 @ =0xffff8000 - adds r1, r2, 0 - orrs r0, r1 -_0812FD00: - strh r0, [r4, 0xC] - ldr r0, _0812FD2C @ =gBattleAnimArgs - movs r3, 0x4 - ldrsh r1, [r0, r3] - movs r2, 0x80 - lsls r2, 8 - ands r1, r2 - adds r5, r0, 0 - cmp r1, 0 - beq _0812FD38 - ldr r3, _0812FD30 @ =gTasks - lsls r4, r6, 2 - adds r1, r4, r6 - lsls r1, 3 - adds r1, r3 - ldrh r2, [r5, 0x4] - ldr r0, _0812FD34 @ =0x00007fff - ands r0, r2 - b _0812FD4A - .align 2, 0 -_0812FD28: .4byte 0xffff8000 -_0812FD2C: .4byte gBattleAnimArgs -_0812FD30: .4byte gTasks -_0812FD34: .4byte 0x00007fff -_0812FD38: - ldr r3, _0812FD70 @ =gTasks - lsls r4, r6, 2 - adds r1, r4, r6 - lsls r1, 3 - adds r1, r3 - ldrh r2, [r5, 0x4] - ldr r7, _0812FD74 @ =0xffff8000 - adds r0, r7, 0 - orrs r0, r2 -_0812FD4A: - strh r0, [r1, 0xE] -_0812FD4C: - adds r0, r4, r6 - lsls r0, 3 - adds r0, r3 - movs r1, 0 - strh r1, [r0, 0x18] - strh r1, [r0, 0x16] - ldrh r1, [r5, 0x8] - strh r1, [r0, 0x10] - ldrh r1, [r5, 0xA] - strh r1, [r0, 0x12] - ldr r1, _0812FD78 @ =sub_812FAF8 - str r1, [r0] - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_0812FD70: .4byte gTasks -_0812FD74: .4byte 0xffff8000 -_0812FD78: .4byte sub_812FAF8 - thumb_func_end sub_812FC68 - - thumb_func_start sub_812FD7C -sub_812FD7C: @ 812FD7C - push {r4,r5,lr} - lsls r0, 24 - lsrs r2, r0, 24 - lsls r0, r2, 2 - adds r0, r2 - lsls r0, 3 - ldr r1, _0812FDB4 @ =gTasks - adds r5, r0, r1 - ldr r4, _0812FDB8 @ =gBattleAnimArgs - movs r1, 0x2 - ldrsh r0, [r4, r1] - cmp r0, 0 - bne _0812FD9C - adds r0, r2, 0 - bl DestroyAnimVisualTask -_0812FD9C: - movs r0, 0 - strh r0, [r5, 0x8] - strh r0, [r5, 0xA] - strh r0, [r5, 0xC] - ldrh r0, [r4, 0x2] - strh r0, [r5, 0xE] - movs r1, 0 - ldrsh r0, [r4, r1] - cmp r0, 0 - bne _0812FDC0 - ldr r0, _0812FDBC @ =gAnimBankAttacker - b _0812FDC2 - .align 2, 0 -_0812FDB4: .4byte gTasks -_0812FDB8: .4byte gBattleAnimArgs -_0812FDBC: .4byte gAnimBankAttacker -_0812FDC0: - ldr r0, _0812FE10 @ =gAnimBankTarget -_0812FDC2: - ldrb r4, [r0] - adds r0, r4, 0 - movs r1, 0 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - strh r0, [r5, 0x10] - adds r0, r4, 0 - movs r1, 0x1 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - strh r0, [r5, 0x12] - adds r0, r4, 0 - bl sub_8079E90 - lsls r0, 24 - lsrs r0, 24 - strh r0, [r5, 0x14] - ldr r0, _0812FE14 @ =gBattleAnimArgs - ldrb r0, [r0] - bl GetAnimBattlerSpriteId - adds r1, r0, 0 - lsls r1, 24 - lsrs r1, 24 - strh r1, [r5, 0x26] - ldr r2, _0812FE18 @ =gUnknown_084028AC - adds r0, r5, 0 - bl sub_80798F4 - ldr r0, _0812FE1C @ =sub_812FE20 - str r0, [r5] - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_0812FE10: .4byte gAnimBankTarget -_0812FE14: .4byte gBattleAnimArgs -_0812FE18: .4byte gUnknown_084028AC -_0812FE1C: .4byte sub_812FE20 - thumb_func_end sub_812FD7C - - thumb_func_start sub_812FE20 -sub_812FE20: @ 812FE20 - push {r4,r5,lr} - lsls r0, 24 - lsrs r5, r0, 24 - lsls r0, r5, 2 - adds r0, r5 - lsls r0, 3 - ldr r1, _0812FE40 @ =gTasks - adds r4, r0, r1 - movs r1, 0x8 - ldrsh r0, [r4, r1] - cmp r0, 0 - beq _0812FE44 - cmp r0, 0x1 - beq _0812FEA4 - b _0812FEB2 - .align 2, 0 -_0812FE40: .4byte gTasks -_0812FE44: - ldrh r0, [r4, 0xA] - adds r0, 0x1 - strh r0, [r4, 0xA] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x6 - bne _0812FE5A - adds r0, r5, 0 - movs r1, 0x1 - bl sub_812FEB8 -_0812FE5A: - movs r1, 0xA - ldrsh r0, [r4, r1] - cmp r0, 0x12 - bne _0812FE6A - adds r0, r5, 0 - movs r1, 0 - bl sub_812FEB8 -_0812FE6A: - adds r0, r4, 0 - bl sub_807992C - lsls r0, 24 - lsrs r1, r0, 24 - cmp r1, 0 - bne _0812FEB2 - ldrh r0, [r4, 0xE] - subs r0, 0x1 - strh r0, [r4, 0xE] - lsls r0, 16 - cmp r0, 0 - bne _0812FE8C - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] - b _0812FEB2 -_0812FE8C: - strh r1, [r4, 0xA] - ldrh r1, [r4, 0x26] - lsls r1, 24 - lsrs r1, 24 - ldr r2, _0812FEA0 @ =gUnknown_084028AC - adds r0, r4, 0 - bl sub_80798F4 - b _0812FEB2 - .align 2, 0 -_0812FEA0: .4byte gUnknown_084028AC -_0812FEA4: - movs r1, 0xC - ldrsh r0, [r4, r1] - cmp r0, 0 - bne _0812FEB2 - adds r0, r5, 0 - bl DestroyAnimVisualTask -_0812FEB2: - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end sub_812FE20 - - thumb_func_start sub_812FEB8 -sub_812FEB8: @ 812FEB8 - push {r4-r7,lr} - mov r7, r8 - push {r7} - sub sp, 0xC - lsls r0, 24 - lsrs r6, r0, 24 - lsls r1, 24 - lsls r0, r6, 2 - adds r0, r6 - lsls r0, 3 - ldr r2, _0812FEDC @ =gTasks - adds r4, r0, r2 - cmp r1, 0 - bne _0812FEE0 - movs r1, 0x12 - movs r3, 0xEC - b _0812FEE4 - .align 2, 0 -_0812FEDC: .4byte gTasks -_0812FEE0: - movs r1, 0x1E - movs r3, 0x14 -_0812FEE4: - mov r2, sp - ldrh r0, [r4, 0x10] - subs r0, r1 - strh r0, [r2] - ldrh r0, [r4, 0x10] - subs r0, r1 - subs r0, 0x4 - strh r0, [r2, 0x2] - ldrh r0, [r4, 0x10] - adds r0, r1 - strh r0, [r2, 0x4] - ldrh r0, [r4, 0x10] - adds r0, r1 - adds r0, 0x4 - strh r0, [r2, 0x6] - add r2, sp, 0x8 - lsls r1, r3, 24 - asrs r1, 24 - ldrh r0, [r4, 0x12] - adds r0, r1 - strh r0, [r2] - ldrh r0, [r4, 0x12] - adds r0, r1 - adds r0, 0x6 - strh r0, [r2, 0x2] - movs r5, 0 - mov r8, r2 - ldr r7, _0812FF88 @ =gSprites -_0812FF1C: - lsls r0, r5, 1 - add r0, sp - movs r2, 0 - ldrsh r1, [r0, r2] - movs r0, 0x1 - ands r0, r5 - lsls r0, 1 - add r0, r8 - movs r3, 0 - ldrsh r2, [r0, r3] - ldrb r3, [r4, 0x14] - subs r3, 0x5 - lsls r3, 24 - lsrs r3, 24 - ldr r0, _0812FF8C @ =gSpriteTemplate_84028CC - bl CreateSprite - lsls r0, 24 - lsrs r1, r0, 24 - cmp r1, 0x40 - beq _0812FF70 - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r1, r0, r7 - movs r0, 0 - strh r0, [r1, 0x2E] - movs r0, 0x2 - cmp r5, 0x1 - bhi _0812FF5E - movs r2, 0x2 - negs r2, r2 - adds r0, r2, 0 -_0812FF5E: - strh r0, [r1, 0x30] - ldr r0, _0812FF90 @ =0x0000ffff - strh r0, [r1, 0x32] - strh r6, [r1, 0x34] - movs r0, 0x2 - strh r0, [r1, 0x36] - ldrh r0, [r4, 0xC] - adds r0, 0x1 - strh r0, [r4, 0xC] -_0812FF70: - adds r0, r5, 0x1 - lsls r0, 24 - lsrs r5, r0, 24 - cmp r5, 0x3 - bls _0812FF1C - add sp, 0xC - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_0812FF88: .4byte gSprites -_0812FF8C: .4byte gSpriteTemplate_84028CC -_0812FF90: .4byte 0x0000ffff - thumb_func_end sub_812FEB8 - - thumb_func_start sub_812FF94 -sub_812FF94: @ 812FF94 - push {r4,lr} - adds r4, r0, 0 - ldrh r0, [r4, 0x30] - ldrh r1, [r4, 0x20] - adds r0, r1 - strh r0, [r4, 0x20] - ldrh r0, [r4, 0x32] - ldrh r1, [r4, 0x22] - adds r0, r1 - strh r0, [r4, 0x22] - ldrh r0, [r4, 0x2E] - adds r0, 0x1 - strh r0, [r4, 0x2E] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x6 - ble _0812FFDA - ldr r3, _0812FFE0 @ =gTasks - movs r0, 0x36 - ldrsh r1, [r4, r0] - lsls r1, 1 - movs r0, 0x34 - ldrsh r2, [r4, r0] - lsls r0, r2, 2 - adds r0, r2 - lsls r0, 3 - adds r1, r0 - adds r3, 0x8 - adds r1, r3 - ldrh r0, [r1] - subs r0, 0x1 - strh r0, [r1] - adds r0, r4, 0 - bl DestroySprite -_0812FFDA: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_0812FFE0: .4byte gTasks - thumb_func_end sub_812FF94 - - thumb_func_start sub_812FFE4 -sub_812FFE4: @ 812FFE4 - push {r4,lr} - lsls r0, 24 - lsrs r0, 24 - ldr r1, _0813002C @ =gTasks - lsls r4, r0, 2 - adds r4, r0 - lsls r4, 3 - adds r4, r1 - movs r0, 0 - strh r0, [r4, 0x8] - ldr r1, _08130030 @ =gBattleAnimArgs - ldrh r0, [r1, 0x2] - strh r0, [r4, 0xA] - ldrb r0, [r1] - bl GetAnimBattlerSpriteId - lsls r0, 24 - lsrs r0, 24 - ldr r2, _08130034 @ =gSprites - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - adds r1, r2 - ldrb r0, [r1, 0x5] - lsrs r0, 4 - lsls r0, 4 - movs r2, 0x80 - lsls r2, 1 - adds r1, r2, 0 - adds r0, r1 - strh r0, [r4, 0xC] - ldr r0, _08130038 @ =sub_813003C - str r0, [r4] - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_0813002C: .4byte gTasks -_08130030: .4byte gBattleAnimArgs -_08130034: .4byte gSprites -_08130038: .4byte sub_813003C - thumb_func_end sub_812FFE4 - - thumb_func_start sub_813003C -sub_813003C: @ 813003C - push {r4,r5,lr} - lsls r0, 24 - lsrs r5, r0, 24 - ldr r1, _08130084 @ =gTasks - lsls r0, r5, 2 - adds r0, r5 - lsls r0, 3 - adds r4, r0, r1 - movs r1, 0xA - ldrsh r0, [r4, r1] - cmp r0, 0 - beq _0813008C - ldrh r0, [r4, 0xC] - ldr r2, _08130088 @ =gUnknown_084028E4 - movs r3, 0x8 - ldrsh r1, [r4, r3] - lsls r1, 1 - adds r1, r2 - ldrh r3, [r1] - movs r1, 0x10 - movs r2, 0x8 - bl BlendPalette - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x17 - ble _0813007C - movs r0, 0 - strh r0, [r4, 0x8] -_0813007C: - ldrh r0, [r4, 0xA] - subs r0, 0x1 - strh r0, [r4, 0xA] - b _0813009E - .align 2, 0 -_08130084: .4byte gTasks -_08130088: .4byte gUnknown_084028E4 -_0813008C: - ldrh r0, [r4, 0xC] - movs r1, 0x10 - movs r2, 0 - movs r3, 0 - bl BlendPalette - adds r0, r5, 0 - bl DestroyAnimVisualTask -_0813009E: - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end sub_813003C - - thumb_func_start sub_81300A4 -sub_81300A4: @ 81300A4 - push {lr} - sub sp, 0x1C - lsls r0, 24 - lsrs r0, 24 - movs r2, 0xD0 - lsls r2, 1 - ldr r1, _081300E0 @ =gAnimBankAttacker - ldrb r3, [r1] - ldr r1, _081300E4 @ =gBattleAnimArgs - ldrb r1, [r1] - str r1, [sp] - movs r1, 0xA - str r1, [sp, 0x4] - movs r1, 0x2 - str r1, [sp, 0x8] - movs r1, 0x1E - str r1, [sp, 0xC] - ldr r1, _081300E8 @ =gUnknown_08D2E014 - str r1, [sp, 0x10] - ldr r1, _081300EC @ =gUnknown_08D2E170 - str r1, [sp, 0x14] - ldr r1, _081300F0 @ =gUnknown_08D2E150 - str r1, [sp, 0x18] - movs r1, 0 - bl sub_80E3C4C - add sp, 0x1C - pop {r0} - bx r0 - .align 2, 0 -_081300E0: .4byte gAnimBankAttacker -_081300E4: .4byte gBattleAnimArgs -_081300E8: .4byte gUnknown_08D2E014 -_081300EC: .4byte gUnknown_08D2E170 -_081300F0: .4byte gUnknown_08D2E150 - thumb_func_end sub_81300A4 - - thumb_func_start sub_81300F4 -sub_81300F4: @ 81300F4 - push {r4-r6,lr} - adds r5, r0, 0 - ldr r6, _0813014C @ =gAnimBankAttacker - ldrb r0, [r6] - bl GetBattlerSide - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bne _08130110 - ldr r1, _08130150 @ =gBattleAnimArgs - ldrh r0, [r1] - negs r0, r0 - strh r0, [r1] -_08130110: - ldrb r0, [r6] - movs r1, 0 - bl GetBattlerSpriteCoord - lsls r0, 24 - ldr r4, _08130150 @ =gBattleAnimArgs - lsrs r0, 24 - ldrh r1, [r4] - adds r0, r1 - strh r0, [r5, 0x20] - ldrb r0, [r6] - movs r1, 0x1 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - ldrh r1, [r4, 0x2] - adds r0, r1 - strh r0, [r5, 0x22] - movs r1, 0x4 - ldrsh r0, [r4, r1] - cmp r0, 0 - bne _08130158 - movs r0, 0xA0 - lsls r0, 2 - strh r0, [r5, 0x2E] - ldr r0, _08130154 @ =0x0000fd80 - strh r0, [r5, 0x30] - b _08130180 - .align 2, 0 -_0813014C: .4byte gAnimBankAttacker -_08130150: .4byte gBattleAnimArgs -_08130154: .4byte 0x0000fd80 -_08130158: - cmp r0, 0x1 - bne _08130172 - adds r2, r5, 0 - adds r2, 0x3F - ldrb r0, [r2] - movs r1, 0x2 - orrs r0, r1 - strb r0, [r2] - movs r0, 0xA0 - lsls r0, 2 - strh r0, [r5, 0x2E] - strh r0, [r5, 0x30] - b _08130180 -_08130172: - adds r0, r5, 0 - movs r1, 0x1 - bl StartSpriteAnim - movs r0, 0xA0 - lsls r0, 2 - strh r0, [r5, 0x2E] -_08130180: - ldr r0, _081301AC @ =gAnimBankAttacker - ldrb r0, [r0] - bl GetBattlerSide - lsls r0, 24 - cmp r0, 0 - beq _081301A0 - ldrh r0, [r5, 0x2E] - negs r0, r0 - strh r0, [r5, 0x2E] - adds r2, r5, 0 - adds r2, 0x3F - ldrb r0, [r2] - movs r1, 0x1 - orrs r0, r1 - strb r0, [r2] -_081301A0: - ldr r0, _081301B0 @ =sub_81301B4 - str r0, [r5, 0x1C] - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_081301AC: .4byte gAnimBankAttacker -_081301B0: .4byte sub_81301B4 - thumb_func_end sub_81300F4 - - thumb_func_start sub_81301B4 -sub_81301B4: @ 81301B4 - push {lr} - adds r2, r0, 0 - ldrh r0, [r2, 0x2E] - ldrh r1, [r2, 0x3A] - adds r0, r1 - strh r0, [r2, 0x3A] - ldrh r1, [r2, 0x30] - ldrh r3, [r2, 0x3C] - adds r1, r3 - strh r1, [r2, 0x3C] - lsls r0, 16 - asrs r0, 24 - strh r0, [r2, 0x24] - lsls r1, 16 - asrs r1, 24 - strh r1, [r2, 0x26] - ldrh r0, [r2, 0x38] - adds r0, 0x1 - strh r0, [r2, 0x38] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0xE - bne _081301E8 - adds r0, r2, 0 - bl DestroyAnimSprite -_081301E8: - pop {r0} - bx r0 - thumb_func_end sub_81301B4 - - thumb_func_start sub_81301EC -sub_81301EC: @ 81301EC - push {r4-r6,lr} - lsls r0, 24 - lsrs r0, 24 - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - ldr r0, _08130218 @ =gTasks - adds r6, r1, r0 - bl IsContest - lsls r0, 24 - lsrs r1, r0, 24 - cmp r1, 0 - beq _0813021C - movs r0, 0x8 - strh r0, [r6, 0x12] - movs r0, 0x3 - strh r0, [r6, 0x14] - movs r0, 0x1 - strh r0, [r6, 0x16] - b _08130226 - .align 2, 0 -_08130218: .4byte gTasks -_0813021C: - movs r0, 0xC - strh r0, [r6, 0x12] - movs r0, 0x3 - strh r0, [r6, 0x14] - strh r1, [r6, 0x16] -_08130226: - ldr r5, _0813025C @ =gAnimBankAttacker - ldrb r0, [r5] - bl GetBattlerSide - lsls r0, 24 - cmp r0, 0 - bne _08130260 - ldrb r0, [r5] - movs r1, 0x2 - bl GetBattlerSpriteCoord - adds r4, r0, 0 - ldrb r0, [r5] - movs r1, 0 - bl sub_807A100 - lsls r4, 24 - lsrs r4, 24 - lsls r0, 16 - asrs r0, 16 - cmp r0, 0 - bge _08130254 - adds r0, 0x3 -_08130254: - asrs r0, 2 - adds r0, r4, r0 - b _08130284 - .align 2, 0 -_0813025C: .4byte gAnimBankAttacker -_08130260: - ldrb r0, [r5] - movs r1, 0x2 - bl GetBattlerSpriteCoord - adds r4, r0, 0 - ldrb r0, [r5] - movs r1, 0 - bl sub_807A100 - lsls r4, 24 - lsrs r4, 24 - lsls r0, 16 - asrs r0, 16 - cmp r0, 0 - bge _08130280 - adds r0, 0x3 -_08130280: - asrs r0, 2 - subs r0, r4, r0 -_08130284: - strh r0, [r6, 0x1E] - ldr r5, _081302D8 @ =gAnimBankAttacker - ldrb r0, [r5] - movs r1, 0x3 - bl GetBattlerSpriteCoord - adds r4, r0, 0 - ldrb r0, [r5] - movs r1, 0 - bl sub_807A100 - lsls r4, 24 - lsrs r4, 24 - lsls r0, 16 - asrs r0, 16 - cmp r0, 0 - bge _081302A8 - adds r0, 0x3 -_081302A8: - asrs r0, 2 - subs r0, r4, r0 - strh r0, [r6, 0x20] - ldr r4, _081302DC @ =gAnimBankTarget - ldrb r0, [r4] - movs r1, 0x2 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - strh r0, [r6, 0x22] - ldrb r0, [r4] - movs r1, 0x3 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - strh r0, [r6, 0x24] - ldr r0, _081302E0 @ =sub_81302E4 - str r0, [r6] - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_081302D8: .4byte gAnimBankAttacker -_081302DC: .4byte gAnimBankTarget -_081302E0: .4byte sub_81302E4 - thumb_func_end sub_81301EC - - thumb_func_start sub_81302E4 -sub_81302E4: @ 81302E4 - push {r4-r7,lr} - mov r7, r8 - push {r7} - sub sp, 0x14 - lsls r0, 24 - lsrs r7, r0, 24 - lsls r0, r7, 2 - adds r0, r7 - lsls r0, 3 - ldr r1, _0813030C @ =gTasks - adds r5, r0, r1 - movs r0, 0x8 - ldrsh r1, [r5, r0] - cmp r1, 0 - beq _08130310 - cmp r1, 0x1 - bne _08130308 - b _08130408 -_08130308: - b _08130416 - .align 2, 0 -_0813030C: .4byte gTasks -_08130310: - ldrh r0, [r5, 0xA] - adds r0, 0x1 - strh r0, [r5, 0xA] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x3 - ble _08130416 - strh r1, [r5, 0xA] - movs r1, 0x1E - ldrsh r0, [r5, r1] - movs r2, 0x20 - ldrsh r1, [r5, r2] - movs r3, 0x22 - ldrsh r2, [r5, r3] - movs r4, 0x24 - ldrsh r3, [r5, r4] - ldrb r4, [r5, 0x12] - str r4, [sp] - ldrb r4, [r5, 0xC] - str r4, [sp, 0x4] - add r4, sp, 0x10 - str r4, [sp, 0x8] - adds r4, 0x2 - str r4, [sp, 0xC] - bl sub_8130424 - movs r6, 0 - mov r8, r4 - ldr r4, _08130384 @ =gSprites -_0813034A: - add r0, sp, 0x10 - movs r2, 0 - ldrsh r1, [r0, r2] - mov r3, r8 - movs r0, 0 - ldrsh r2, [r3, r0] - ldr r0, _08130388 @ =gSpriteTemplate_840294C - movs r3, 0x23 - bl CreateSprite - lsls r0, 24 - lsrs r3, r0, 24 - cmp r3, 0x40 - beq _081303DE - movs r1, 0x16 - ldrsh r0, [r5, r1] - cmp r0, 0 - bne _0813039E - cmp r6, 0 - bne _0813038C - lsls r2, r3, 4 - adds r1, r2, r3 - lsls r1, 2 - adds r1, r4 - ldrh r0, [r5, 0x14] - negs r0, r0 - strh r0, [r1, 0x26] - strh r0, [r1, 0x24] - b _081303C6 - .align 2, 0 -_08130384: .4byte gSprites -_08130388: .4byte gSpriteTemplate_840294C -_0813038C: - lsls r2, r3, 4 - adds r1, r2, r3 - lsls r1, 2 - adds r1, r4 - ldrh r0, [r5, 0x14] - strh r0, [r1, 0x26] - ldrh r0, [r5, 0x14] - strh r0, [r1, 0x24] - b _081303C6 -_0813039E: - cmp r6, 0 - bne _081303B4 - lsls r2, r3, 4 - adds r1, r2, r3 - lsls r1, 2 - adds r1, r4 - ldrh r0, [r5, 0x14] - negs r0, r0 - strh r0, [r1, 0x24] - ldrh r0, [r5, 0x14] - b _081303C4 -_081303B4: - lsls r2, r3, 4 - adds r1, r2, r3 - lsls r1, 2 - adds r1, r4 - ldrh r0, [r5, 0x14] - strh r0, [r1, 0x24] - ldrh r0, [r5, 0x14] - negs r0, r0 -_081303C4: - strh r0, [r1, 0x26] -_081303C6: - ldr r1, _08130404 @ =gSprites - adds r0, r2, r3 - lsls r0, 2 - adds r0, r1 - movs r1, 0 - strh r1, [r0, 0x2E] - strh r7, [r0, 0x30] - movs r1, 0xA - strh r1, [r0, 0x32] - ldrh r0, [r5, 0x1C] - adds r0, 0x1 - strh r0, [r5, 0x1C] -_081303DE: - adds r0, r6, 0x1 - lsls r0, 24 - lsrs r6, r0, 24 - cmp r6, 0x1 - bls _0813034A - ldrh r2, [r5, 0xC] - movs r3, 0xC - ldrsh r1, [r5, r3] - movs r4, 0x12 - ldrsh r0, [r5, r4] - cmp r1, r0 - bne _081303FC - ldrh r0, [r5, 0x8] - adds r0, 0x1 - strh r0, [r5, 0x8] -_081303FC: - adds r0, r2, 0x1 - strh r0, [r5, 0xC] - b _08130416 - .align 2, 0 -_08130404: .4byte gSprites -_08130408: - movs r1, 0x1C - ldrsh r0, [r5, r1] - cmp r0, 0 - bne _08130416 - adds r0, r7, 0 - bl DestroyAnimVisualTask -_08130416: - add sp, 0x14 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_81302E4 - - thumb_func_start sub_8130424 -sub_8130424: @ 8130424 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x8 - ldr r4, [sp, 0x28] - ldr r5, [sp, 0x2C] - ldr r6, [sp, 0x30] - mov r9, r6 - ldr r6, [sp, 0x34] - mov r10, r6 - lsls r0, 16 - lsrs r0, 16 - mov r12, r0 - lsls r1, 16 - lsrs r1, 16 - str r1, [sp] - lsls r2, 16 - lsrs r2, 16 - adds r7, r2, 0 - lsls r3, 16 - lsrs r3, 16 - str r3, [sp, 0x4] - lsls r4, 24 - lsrs r6, r4, 24 - lsls r5, 24 - lsrs r5, 24 - mov r8, r5 - cmp r5, 0 - bne _0813046C - mov r2, r9 - strh r0, [r2] - mov r6, r10 - strh r1, [r6] - b _081304CA -_0813046C: - cmp r5, r6 - bcc _0813047A - mov r0, r9 - strh r2, [r0] - mov r1, r10 - strh r3, [r1] - b _081304CA -_0813047A: - subs r0, r6, 0x1 - lsls r0, 24 - lsrs r6, r0, 24 - mov r2, r12 - lsls r1, r2, 16 - asrs r1, 16 - lsls r5, r1, 8 - lsls r0, r7, 16 - asrs r0, 16 - subs r0, r1 - lsls r0, 8 - adds r1, r6, 0 - bl __divsi3 - mov r1, r8 - muls r1, r0 - adds r0, r1, 0 - adds r5, r0 - ldr r2, [sp] - lsls r1, r2, 16 - asrs r1, 16 - lsls r4, r1, 8 - ldr r2, [sp, 0x4] - lsls r0, r2, 16 - asrs r0, 16 - subs r0, r1 - lsls r0, 8 - adds r1, r6, 0 - bl __divsi3 - mov r6, r8 - muls r6, r0 - adds r0, r6, 0 - adds r4, r0 - asrs r5, 8 - mov r0, r9 - strh r5, [r0] - asrs r4, 8 - mov r1, r10 - strh r4, [r1] -_081304CA: - add sp, 0x8 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_8130424 - - thumb_func_start sub_81304DC -sub_81304DC: @ 81304DC - push {r4,lr} - adds r4, r0, 0 - ldrh r0, [r4, 0x2E] - adds r0, 0x1 - strh r0, [r4, 0x2E] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x24 - ble _08130512 - ldr r3, _08130518 @ =gTasks - movs r0, 0x32 - ldrsh r1, [r4, r0] - lsls r1, 1 - movs r0, 0x30 - ldrsh r2, [r4, r0] - lsls r0, r2, 2 - adds r0, r2 - lsls r0, 3 - adds r1, r0 - adds r3, 0x8 - adds r1, r3 - ldrh r0, [r1] - subs r0, 0x1 - strh r0, [r1] - adds r0, r4, 0 - bl DestroySprite -_08130512: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08130518: .4byte gTasks - thumb_func_end sub_81304DC - - thumb_func_start sub_813051C -sub_813051C: @ 813051C - push {r4,lr} - adds r4, r0, 0 - ldr r1, _08130548 @ =gBattleAnimArgs - ldrh r0, [r1] - strh r0, [r4, 0x20] - ldrh r0, [r1, 0x2] - strh r0, [r4, 0x22] - ldrh r0, [r1, 0x4] - strh r0, [r4, 0x32] - ldrh r0, [r1, 0x6] - strh r0, [r4, 0x36] - ldrh r0, [r1, 0x8] - strh r0, [r4, 0x2E] - ldr r1, _0813054C @ =DestroyAnimSprite - adds r0, r4, 0 - bl StoreSpriteCallbackInData - ldr r0, _08130550 @ =sub_8078CC0 - str r0, [r4, 0x1C] - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08130548: .4byte gBattleAnimArgs -_0813054C: .4byte DestroyAnimSprite -_08130550: .4byte sub_8078CC0 - thumb_func_end sub_813051C - - thumb_func_start sub_8130554 -sub_8130554: @ 8130554 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - lsls r0, 24 - lsrs r0, 24 - mov r9, r0 - lsls r0, 2 - add r0, r9 - lsls r0, 3 - ldr r1, _08130674 @ =gTasks - adds r7, r0, r1 - ldr r0, _08130678 @ =gAnimBankAttacker - mov r10, r0 - ldrb r0, [r0] - movs r1, 0x2 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - strh r0, [r7, 0x1E] - mov r1, r10 - ldrb r0, [r1] - movs r1, 0x3 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - strh r0, [r7, 0x20] - ldr r0, _0813067C @ =gAnimBankTarget - mov r8, r0 - ldrb r0, [r0] - movs r1, 0x2 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - strh r0, [r7, 0x22] - mov r1, r8 - ldrb r0, [r1] - movs r1, 0x3 - bl GetBattlerSpriteCoord - adds r4, r0, 0 - mov r1, r8 - ldrb r0, [r1] - movs r1, 0 - bl sub_807A100 - lsls r4, 24 - lsrs r4, 24 - lsls r0, 16 - asrs r0, 16 - cmp r0, 0 - bge _081305C6 - adds r0, 0x3 -_081305C6: - asrs r0, 2 - adds r0, r4, r0 - strh r0, [r7, 0x24] - ldr r4, _08130680 @ =gSpriteTemplate_84029AC - movs r0, 0x1E - ldrsh r5, [r7, r0] - movs r1, 0x20 - ldrsh r6, [r7, r1] - mov r1, r8 - ldrb r0, [r1] - bl sub_8079E90 - adds r3, r0, 0 - subs r3, 0x5 - lsls r3, 24 - lsrs r3, 24 - adds r0, r4, 0 - adds r1, r5, 0 - adds r2, r6, 0 - bl CreateSprite - lsls r0, 24 - lsrs r0, 24 - strh r0, [r7, 0x26] - cmp r0, 0x40 - beq _08130690 - ldr r4, _08130684 @ =gSprites - movs r0, 0x26 - ldrsh r1, [r7, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r4 - movs r1, 0x10 - strh r1, [r0, 0x2E] - movs r0, 0x26 - ldrsh r1, [r7, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r4 - ldrh r1, [r7, 0x22] - strh r1, [r0, 0x32] - movs r0, 0x26 - ldrsh r1, [r7, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r4 - ldrh r1, [r7, 0x24] - strh r1, [r0, 0x36] - movs r0, 0x26 - ldrsh r1, [r7, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r4 - ldr r1, _08130688 @ =0x0000ffe0 - strh r1, [r0, 0x38] - movs r0, 0x26 - ldrsh r1, [r7, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r4 - bl InitAnimArcTranslation - mov r1, r10 - ldrb r0, [r1] - bl GetBattlerSide - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bne _0813066E - movs r0, 0x26 - ldrsh r1, [r7, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r4 - movs r1, 0x1 - bl StartSpriteAffineAnim -_0813066E: - ldr r0, _0813068C @ =sub_81306A4 - str r0, [r7] - b _08130696 - .align 2, 0 -_08130674: .4byte gTasks -_08130678: .4byte gAnimBankAttacker -_0813067C: .4byte gAnimBankTarget -_08130680: .4byte gSpriteTemplate_84029AC -_08130684: .4byte gSprites -_08130688: .4byte 0x0000ffe0 -_0813068C: .4byte sub_81306A4 -_08130690: - mov r0, r9 - bl DestroyAnimVisualTask -_08130696: - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_8130554 - - thumb_func_start sub_81306A4 -sub_81306A4: @ 81306A4 - push {r4,r5,lr} - lsls r0, 24 - lsrs r2, r0, 24 - lsls r0, r2, 2 - adds r0, r2 - lsls r0, 3 - ldr r1, _081306C8 @ =gTasks - adds r4, r0, r1 - movs r0, 0x8 - ldrsh r1, [r4, r0] - cmp r1, 0x1 - beq _0813070C - cmp r1, 0x1 - bgt _081306CC - cmp r1, 0 - beq _081306D6 - b _081307AA - .align 2, 0 -_081306C8: .4byte gTasks -_081306CC: - cmp r1, 0x2 - beq _08130730 - cmp r1, 0x3 - beq _081307A4 - b _081307AA -_081306D6: - ldrh r0, [r4, 0xA] - adds r0, 0x1 - strh r0, [r4, 0xA] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x1 - ble _081307AA - strh r1, [r4, 0xA] - movs r0, 0x26 - ldrsh r1, [r4, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - ldr r1, _08130708 @ =gSprites - adds r0, r1 - bl TranslateAnimArc - ldrh r0, [r4, 0xC] - adds r0, 0x1 - strh r0, [r4, 0xC] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x7 - ble _081307AA - b _08130796 - .align 2, 0 -_08130708: .4byte gSprites -_0813070C: - movs r0, 0x26 - ldrsh r1, [r4, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - ldr r1, _0813072C @ =gSprites - adds r0, r1 - bl TranslateAnimArc - lsls r0, 24 - cmp r0, 0 - beq _081307AA - movs r0, 0 - strh r0, [r4, 0xA] - strh r0, [r4, 0xC] - b _08130796 - .align 2, 0 -_0813072C: .4byte gSprites -_08130730: - ldrh r0, [r4, 0xA] - adds r0, 0x1 - strh r0, [r4, 0xA] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x1 - ble _081307AA - movs r0, 0 - strh r0, [r4, 0xA] - ldrh r2, [r4, 0xC] - adds r2, 0x1 - strh r2, [r4, 0xC] - ldr r5, _081307A0 @ =gSprites - movs r1, 0x26 - ldrsh r0, [r4, r1] - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - adds r1, r5 - movs r0, 0x1 - ands r2, r0 - adds r1, 0x3E - lsls r2, 2 - ldrb r3, [r1] - subs r0, 0x6 - ands r0, r3 - orrs r0, r2 - strb r0, [r1] - movs r1, 0xC - ldrsh r0, [r4, r1] - cmp r0, 0x10 - bne _081307AA - movs r0, 0x26 - ldrsh r1, [r4, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r5 - ldrb r0, [r0, 0x3] - lsls r0, 26 - lsrs r0, 27 - bl FreeOamMatrix - movs r0, 0x26 - ldrsh r1, [r4, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r5 - bl DestroySprite -_08130796: - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] - b _081307AA - .align 2, 0 -_081307A0: .4byte gSprites -_081307A4: - adds r0, r2, 0 - bl DestroyAnimVisualTask -_081307AA: - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end sub_81306A4 - - thumb_func_start sub_81307B0 -sub_81307B0: @ 81307B0 - push {r4-r6,lr} - adds r4, r0, 0 - ldr r0, _081307C4 @ =gBattleAnimArgs - movs r2, 0 - ldrsh r1, [r0, r2] - adds r6, r0, 0 - cmp r1, 0 - bne _081307CC - ldr r0, _081307C8 @ =gAnimBankAttacker - b _081307CE - .align 2, 0 -_081307C4: .4byte gBattleAnimArgs -_081307C8: .4byte gAnimBankAttacker -_081307CC: - ldr r0, _08130834 @ =gAnimBankTarget -_081307CE: - ldrb r5, [r0] - ldrh r2, [r4, 0x4] - lsls r1, r2, 22 - lsrs r1, 22 - adds r1, 0x10 - ldr r3, _08130838 @ =0x000003ff - adds r0, r3, 0 - ands r1, r0 - ldr r0, _0813083C @ =0xfffffc00 - ands r0, r2 - orrs r0, r1 - strh r0, [r4, 0x4] - adds r1, r6, 0 - ldrh r0, [r1, 0x4] - strh r0, [r4, 0x3A] - movs r2, 0x2 - ldrsh r0, [r1, r2] - movs r1, 0x1 - cmp r0, 0 - bne _081307FC - movs r3, 0x1 - negs r3, r3 - adds r1, r3, 0 -_081307FC: - strh r1, [r4, 0x3C] - adds r0, r5, 0 - movs r1, 0x3 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - strh r0, [r4, 0x22] - movs r1, 0x2 - ldrsh r0, [r6, r1] - cmp r0, 0 - bne _08130840 - ldrb r2, [r4, 0x3] - lsls r1, r2, 26 - lsrs r1, 27 - movs r0, 0x8 - orrs r1, r0 - lsls r1, 1 - subs r0, 0x47 - ands r0, r2 - orrs r0, r1 - strb r0, [r4, 0x3] - adds r0, r5, 0 - movs r1, 0x4 - bl sub_807A100 - subs r0, 0x8 - b _0813084A - .align 2, 0 -_08130834: .4byte gAnimBankTarget -_08130838: .4byte 0x000003ff -_0813083C: .4byte 0xfffffc00 -_08130840: - adds r0, r5, 0 - movs r1, 0x5 - bl sub_807A100 - adds r0, 0x8 -_0813084A: - strh r0, [r4, 0x20] - ldr r0, _08130858 @ =sub_813085C - str r0, [r4, 0x1C] - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_08130858: .4byte sub_813085C - thumb_func_end sub_81307B0 - - thumb_func_start sub_813085C -sub_813085C: @ 813085C - push {lr} - adds r2, r0, 0 - movs r0, 0x2E - ldrsh r1, [r2, r0] - cmp r1, 0x1 - beq _081308A4 - cmp r1, 0x1 - bgt _08130872 - cmp r1, 0 - beq _0813087C - b _08130914 -_08130872: - cmp r1, 0x2 - beq _081308B4 - cmp r1, 0x3 - beq _081308DA - b _08130914 -_0813087C: - ldrh r0, [r2, 0x30] - adds r0, 0x1 - strh r0, [r2, 0x30] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x1 - ble _08130914 - strh r1, [r2, 0x30] - ldrh r0, [r2, 0x3C] - ldrh r1, [r2, 0x24] - adds r0, r1 - strh r0, [r2, 0x24] - ldrh r0, [r2, 0x32] - adds r0, 0x1 - strh r0, [r2, 0x32] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0xC - bne _08130914 - b _081308D2 -_081308A4: - ldrh r0, [r2, 0x30] - adds r0, 0x1 - strh r0, [r2, 0x30] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x8 - bne _08130914 - b _081308CE -_081308B4: - movs r0, 0x3C - ldrsh r1, [r2, r0] - lsls r1, 2 - ldrh r0, [r2, 0x24] - subs r0, r1 - strh r0, [r2, 0x24] - ldrh r0, [r2, 0x30] - adds r0, 0x1 - strh r0, [r2, 0x30] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x6 - bne _08130914 -_081308CE: - movs r0, 0 - strh r0, [r2, 0x30] -_081308D2: - ldrh r0, [r2, 0x2E] - adds r0, 0x1 - strh r0, [r2, 0x2E] - b _08130914 -_081308DA: - movs r0, 0x3C - ldrsh r1, [r2, r0] - lsls r0, r1, 1 - adds r0, r1 - ldrh r1, [r2, 0x24] - adds r0, r1 - strh r0, [r2, 0x24] - ldrh r0, [r2, 0x30] - adds r0, 0x1 - strh r0, [r2, 0x30] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x8 - bne _08130914 - ldrh r0, [r2, 0x3A] - subs r0, 0x1 - strh r0, [r2, 0x3A] - lsls r0, 16 - cmp r0, 0 - beq _0813090E - movs r0, 0 - strh r0, [r2, 0x30] - ldrh r0, [r2, 0x2E] - subs r0, 0x1 - strh r0, [r2, 0x2E] - b _08130914 -_0813090E: - adds r0, r2, 0 - bl DestroyAnimSprite -_08130914: - pop {r0} - bx r0 - thumb_func_end sub_813085C - - thumb_func_start sub_8130918 -sub_8130918: @ 8130918 - push {r4,lr} - lsls r0, 24 - lsrs r1, r0, 24 - ldr r2, _08130930 @ =gBattleAnimArgs - movs r3, 0 - ldrsh r0, [r2, r3] - cmp r0, 0 - bne _08130934 - adds r0, r1, 0 - bl DestroyAnimVisualTask - b _0813095C - .align 2, 0 -_08130930: .4byte gBattleAnimArgs -_08130934: - ldr r0, _08130964 @ =gTasks - lsls r4, r1, 2 - adds r4, r1 - lsls r4, 3 - adds r4, r0 - ldrh r0, [r2, 0x2] - strh r0, [r4, 0x8] - ldrb r0, [r2] - bl GetAnimBattlerSpriteId - adds r1, r0, 0 - lsls r1, 24 - lsrs r1, 24 - strh r1, [r4, 0x26] - ldr r2, _08130968 @ =gUnknown_084029DC - adds r0, r4, 0 - bl sub_80798F4 - ldr r0, _0813096C @ =sub_8130970 - str r0, [r4] -_0813095C: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08130964: .4byte gTasks -_08130968: .4byte gUnknown_084029DC -_0813096C: .4byte sub_8130970 - thumb_func_end sub_8130918 - - thumb_func_start sub_8130970 -sub_8130970: @ 8130970 - push {r4-r6,lr} - lsls r0, 24 - lsrs r6, r0, 24 - lsls r0, r6, 2 - adds r0, r6 - lsls r0, 3 - ldr r1, _081309B0 @ =gTasks - adds r4, r0, r1 - ldrh r0, [r4, 0xA] - adds r0, 0x1 - strh r0, [r4, 0xA] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x1 - ble _081309CA - movs r0, 0 - strh r0, [r4, 0xA] - ldrh r1, [r4, 0xC] - movs r0, 0x1 - ands r0, r1 - cmp r0, 0 - bne _081309B8 - ldr r2, _081309B4 @ =gSprites - movs r0, 0x26 - ldrsh r1, [r4, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - movs r1, 0x2 - b _081309C8 - .align 2, 0 -_081309B0: .4byte gTasks -_081309B4: .4byte gSprites -_081309B8: - ldr r2, _08130A10 @ =gSprites - movs r0, 0x26 - ldrsh r1, [r4, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - ldr r1, _08130A14 @ =0x0000fffe -_081309C8: - strh r1, [r0, 0x24] -_081309CA: - adds r0, r4, 0 - bl sub_807992C - lsls r0, 24 - lsrs r5, r0, 24 - cmp r5, 0 - bne _08130A26 - ldr r2, _08130A10 @ =gSprites - movs r0, 0x26 - ldrsh r1, [r4, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - strh r5, [r0, 0x24] - ldrh r0, [r4, 0x8] - subs r0, 0x1 - strh r0, [r4, 0x8] - lsls r0, 16 - cmp r0, 0 - beq _08130A20 - lsls r0, r6, 2 - adds r0, r6 - lsls r0, 3 - ldr r1, _08130A18 @ =gTasks - adds r0, r1 - ldrh r1, [r0, 0x26] - lsls r1, 24 - lsrs r1, 24 - ldr r2, _08130A1C @ =gUnknown_084029DC - bl sub_80798F4 - strh r5, [r4, 0xA] - strh r5, [r4, 0xC] - b _08130A26 - .align 2, 0 -_08130A10: .4byte gSprites -_08130A14: .4byte 0x0000fffe -_08130A18: .4byte gTasks -_08130A1C: .4byte gUnknown_084029DC -_08130A20: - adds r0, r6, 0 - bl DestroyAnimVisualTask -_08130A26: - pop {r4-r6} - pop {r0} - bx r0 - thumb_func_end sub_8130970 - - thumb_func_start sub_8130A2C -sub_8130A2C: @ 8130A2C - push {r4,r5,lr} - adds r5, r0, 0 - ldr r0, _08130A40 @ =gBattleAnimArgs - movs r1, 0 - ldrsh r0, [r0, r1] - cmp r0, 0 - bne _08130A48 - ldr r4, _08130A44 @ =gAnimBankAttacker - b _08130A4A - .align 2, 0 -_08130A40: .4byte gBattleAnimArgs -_08130A44: .4byte gAnimBankAttacker -_08130A48: - ldr r4, _08130A88 @ =gAnimBankTarget -_08130A4A: - ldrb r0, [r4] - movs r1, 0x2 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - strh r0, [r5, 0x20] - ldrb r0, [r4] - movs r1, 0x2 - bl sub_807A100 - strh r0, [r5, 0x22] - movs r1, 0x22 - ldrsh r0, [r5, r1] - cmp r0, 0x7 - bgt _08130A6E - movs r0, 0x8 - strh r0, [r5, 0x22] -_08130A6E: - movs r2, 0 - strh r2, [r5, 0x2E] - ldr r1, _08130A8C @ =gBattleAnimArgs - ldrh r0, [r1, 0x2] - strh r0, [r5, 0x30] - strh r2, [r5, 0x32] - ldrh r0, [r1, 0x4] - strh r0, [r5, 0x34] - ldr r0, _08130A90 @ =sub_8130A94 - str r0, [r5, 0x1C] - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_08130A88: .4byte gAnimBankTarget -_08130A8C: .4byte gBattleAnimArgs -_08130A90: .4byte sub_8130A94 - thumb_func_end sub_8130A2C - - thumb_func_start sub_8130A94 -sub_8130A94: @ 8130A94 - push {lr} - adds r3, r0, 0 - ldrh r0, [r3, 0x2E] - adds r0, 0x1 - strh r0, [r3, 0x2E] - lsls r0, 16 - asrs r0, 16 - movs r2, 0x30 - ldrsh r1, [r3, r2] - cmp r0, r1 - blt _08130AE8 - movs r0, 0 - strh r0, [r3, 0x2E] - ldrh r1, [r3, 0x32] - adds r1, 0x1 - movs r0, 0x1 - ands r1, r0 - strh r1, [r3, 0x32] - movs r0, 0x3E - adds r0, r3 - mov r12, r0 - lsls r1, 2 - ldrb r2, [r0] - movs r0, 0x5 - negs r0, r0 - ands r0, r2 - orrs r0, r1 - mov r1, r12 - strb r0, [r1] - movs r2, 0x32 - ldrsh r0, [r3, r2] - cmp r0, 0 - beq _08130AE8 - ldrh r0, [r3, 0x34] - subs r0, 0x1 - strh r0, [r3, 0x34] - lsls r0, 16 - cmp r0, 0 - bne _08130AE8 - adds r0, r3, 0 - bl DestroyAnimSprite -_08130AE8: - pop {r0} - bx r0 - thumb_func_end sub_8130A94 - - thumb_func_start sub_8130AEC -sub_8130AEC: @ 8130AEC - push {lr} - adds r3, r0, 0 - ldr r0, _08130B18 @ =gBattleAnimArgs - movs r1, 0 - ldrsh r0, [r0, r1] - cmp r0, 0 - bne _08130B1C - ldrb r2, [r3, 0x3] - lsls r1, r2, 26 - lsrs r1, 27 - movs r0, 0x8 - orrs r1, r0 - lsls r1, 1 - subs r0, 0x47 - ands r0, r2 - orrs r0, r1 - strb r0, [r3, 0x3] - movs r0, 0x64 - strh r0, [r3, 0x20] - movs r0, 0x1 - b _08130B22 - .align 2, 0 -_08130B18: .4byte gBattleAnimArgs -_08130B1C: - movs r0, 0x8C - strh r0, [r3, 0x20] - ldr r0, _08130B30 @ =0x0000ffff -_08130B22: - strh r0, [r3, 0x3C] - movs r0, 0x38 - strh r0, [r3, 0x22] - ldr r0, _08130B34 @ =sub_8130B38 - str r0, [r3, 0x1C] - pop {r0} - bx r0 - .align 2, 0 -_08130B30: .4byte 0x0000ffff -_08130B34: .4byte sub_8130B38 - thumb_func_end sub_8130AEC - - thumb_func_start sub_8130B38 -sub_8130B38: @ 8130B38 - push {r4,lr} - adds r4, r0, 0 - movs r1, 0x2E - ldrsh r0, [r4, r1] - cmp r0, 0x8 - bls _08130B46 - b _08130D18 -_08130B46: - lsls r0, 2 - ldr r1, _08130B50 @ =_08130B54 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_08130B50: .4byte _08130B54 - .align 2, 0 -_08130B54: - .4byte _08130B78 - .4byte _08130BAA - .4byte _08130BBC - .4byte _08130BFC - .4byte _08130C0E - .4byte _08130C4C - .4byte _08130CB0 - .4byte _08130CD0 - .4byte _08130CF6 -_08130B78: - movs r3, 0x3C - ldrsh r0, [r4, r3] - lsls r0, 1 - ldrh r1, [r4, 0x22] - subs r1, r0 - strh r1, [r4, 0x22] - ldrh r2, [r4, 0x30] - movs r0, 0x1 - ands r0, r2 - cmp r0, 0 - beq _08130B9A - movs r0, 0x3C - ldrsh r1, [r4, r0] - lsls r1, 1 - ldrh r0, [r4, 0x20] - subs r0, r1 - strh r0, [r4, 0x20] -_08130B9A: - adds r0, r2, 0x1 - strh r0, [r4, 0x30] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x9 - beq _08130BA8 - b _08130D18 -_08130BA8: - b _08130CEA -_08130BAA: - ldrh r0, [r4, 0x30] - adds r0, 0x1 - strh r0, [r4, 0x30] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x4 - beq _08130BBA - b _08130D18 -_08130BBA: - b _08130CEA -_08130BBC: - ldrh r2, [r4, 0x30] - adds r2, 0x1 - strh r2, [r4, 0x30] - movs r3, 0x3C - ldrsh r1, [r4, r3] - lsls r0, r1, 1 - adds r0, r1 - ldrh r1, [r4, 0x22] - adds r0, r1 - strh r0, [r4, 0x22] - ldr r3, _08130BF8 @ =gSineTable - movs r0, 0x30 - ldrsh r1, [r4, r0] - lsls r0, r1, 2 - adds r0, r1 - lsls r0, 2 - adds r0, r3 - ldrh r0, [r0] - lsls r0, 16 - asrs r0, 19 - ldrh r1, [r4, 0x3C] - muls r0, r1 - strh r0, [r4, 0x24] - lsls r2, 16 - asrs r2, 16 - cmp r2, 0xC - beq _08130BF4 - b _08130D18 -_08130BF4: - b _08130CEA - .align 2, 0 -_08130BF8: .4byte gSineTable -_08130BFC: - ldrh r0, [r4, 0x30] - adds r0, 0x1 - strh r0, [r4, 0x30] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x2 - beq _08130C0C - b _08130D18 -_08130C0C: - b _08130CEA -_08130C0E: - ldrh r2, [r4, 0x30] - adds r2, 0x1 - strh r2, [r4, 0x30] - movs r1, 0x3C - ldrsh r0, [r4, r1] - lsls r1, r0, 1 - adds r1, r0 - ldrh r0, [r4, 0x22] - subs r0, r1 - strh r0, [r4, 0x22] - ldr r3, _08130C48 @ =gSineTable - movs r0, 0x30 - ldrsh r1, [r4, r0] - lsls r0, r1, 2 - adds r0, r1 - lsls r0, 2 - adds r0, r3 - ldrh r0, [r0] - lsls r0, 16 - asrs r0, 19 - ldrh r1, [r4, 0x3C] - muls r0, r1 - strh r0, [r4, 0x24] - lsls r2, 16 - asrs r2, 16 - cmp r2, 0xC - bne _08130D18 - b _08130CEE - .align 2, 0 -_08130C48: .4byte gSineTable -_08130C4C: - ldrh r2, [r4, 0x30] - adds r2, 0x1 - strh r2, [r4, 0x30] - movs r3, 0x3C - ldrsh r1, [r4, r3] - lsls r0, r1, 1 - adds r0, r1 - ldrh r1, [r4, 0x22] - adds r0, r1 - strh r0, [r4, 0x22] - ldr r3, _08130CA4 @ =gSineTable - movs r0, 0x30 - ldrsh r1, [r4, r0] - lsls r0, r1, 2 - adds r0, r1 - lsls r0, 2 - adds r0, r3 - ldrh r0, [r0] - lsls r0, 16 - asrs r0, 19 - ldrh r1, [r4, 0x3C] - muls r0, r1 - strh r0, [r4, 0x24] - lsls r2, 16 - asrs r2, 16 - cmp r2, 0xF - bne _08130C98 - ldrh r2, [r4, 0x4] - lsls r1, r2, 22 - lsrs r1, 22 - adds r1, 0x10 - ldr r3, _08130CA8 @ =0x000003ff - adds r0, r3, 0 - ands r1, r0 - ldr r0, _08130CAC @ =0xfffffc00 - ands r0, r2 - orrs r0, r1 - strh r0, [r4, 0x4] -_08130C98: - movs r1, 0x30 - ldrsh r0, [r4, r1] - cmp r0, 0x12 - bne _08130D18 - b _08130CEA - .align 2, 0 -_08130CA4: .4byte gSineTable -_08130CA8: .4byte 0x000003ff -_08130CAC: .4byte 0xfffffc00 -_08130CB0: - movs r3, 0x3C - ldrsh r0, [r4, r3] - lsls r1, r0, 1 - adds r1, r0 - lsls r1, 1 - ldrh r0, [r4, 0x20] - adds r1, r0 - strh r1, [r4, 0x20] - ldrh r0, [r4, 0x30] - adds r0, 0x1 - strh r0, [r4, 0x30] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x9 - bne _08130D18 - b _08130CEA -_08130CD0: - movs r1, 0x3C - ldrsh r0, [r4, r1] - lsls r0, 1 - ldrh r3, [r4, 0x20] - adds r0, r3 - strh r0, [r4, 0x20] - ldrh r0, [r4, 0x30] - adds r0, 0x1 - strh r0, [r4, 0x30] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x1 - bne _08130D18 -_08130CEA: - movs r0, 0 - strh r0, [r4, 0x30] -_08130CEE: - ldrh r0, [r4, 0x2E] - adds r0, 0x1 - strh r0, [r4, 0x2E] - b _08130D18 -_08130CF6: - movs r1, 0x3C - ldrsh r0, [r4, r1] - lsls r1, r0, 1 - adds r1, r0 - ldrh r0, [r4, 0x20] - subs r0, r1 - strh r0, [r4, 0x20] - ldrh r0, [r4, 0x30] - adds r0, 0x1 - strh r0, [r4, 0x30] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x5 - bne _08130D18 - adds r0, r4, 0 - bl DestroyAnimSprite -_08130D18: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_8130B38 - - thumb_func_start sub_8130D20 -sub_8130D20: @ 8130D20 - push {r4-r7,lr} - lsls r0, 24 - lsrs r0, 24 - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - ldr r0, _08130D7C @ =gTasks - adds r6, r1, r0 - movs r0, 0 - bl GetAnimBattlerSpriteId - lsls r0, 24 - lsrs r0, 24 - strh r0, [r6, 0x26] - bl IsContest - lsls r0, 24 - cmp r0, 0 - bne _08130DA8 - bl IsDoubleBattle - lsls r0, 24 - lsrs r7, r0, 24 - cmp r7, 0x1 - bne _08130D8C - ldr r5, _08130D80 @ =gAnimBankAttacker - ldrb r0, [r5] - movs r1, 0 - bl GetBattlerSpriteCoord - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - ldrb r1, [r5] - movs r0, 0x2 - eors r0, r1 - movs r1, 0 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - cmp r4, r0 - ble _08130D84 - strh r7, [r6, 0x24] - b _08130DAC - .align 2, 0 -_08130D7C: .4byte gTasks -_08130D80: .4byte gAnimBankAttacker -_08130D84: - ldr r0, _08130D88 @ =0x0000ffff - b _08130DAA - .align 2, 0 -_08130D88: .4byte 0x0000ffff -_08130D8C: - ldr r0, _08130DA0 @ =gAnimBankAttacker - ldrb r0, [r0] - bl GetBattlerSide - lsls r0, 24 - cmp r0, 0 - bne _08130DA8 - ldr r0, _08130DA4 @ =0x0000ffff - b _08130DAA - .align 2, 0 -_08130DA0: .4byte gAnimBankAttacker -_08130DA4: .4byte 0x0000ffff -_08130DA8: - movs r0, 0x1 -_08130DAA: - strh r0, [r6, 0x24] -_08130DAC: - ldr r0, _08130DB8 @ =sub_8130DBC - str r0, [r6] - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_08130DB8: .4byte sub_8130DBC - thumb_func_end sub_8130D20 - - thumb_func_start sub_8130DBC -sub_8130DBC: @ 8130DBC - push {r4,lr} - lsls r0, 24 - lsrs r4, r0, 24 - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 3 - ldr r1, _08130DE0 @ =gTasks - adds r3, r0, r1 - movs r1, 0x8 - ldrsh r0, [r3, r1] - cmp r0, 0x8 - bls _08130DD6 - b _08130F50 -_08130DD6: - lsls r0, 2 - ldr r1, _08130DE4 @ =_08130DE8 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_08130DE0: .4byte gTasks -_08130DE4: .4byte _08130DE8 - .align 2, 0 -_08130DE8: - .4byte _08130E0C - .4byte _08130E1E - .4byte _08130E50 - .4byte _08130E80 - .4byte _08130EA6 - .4byte _08130ED0 - .4byte _08130EE0 - .4byte _08130F00 - .4byte _08130F38 -_08130E0C: - ldrh r0, [r3, 0xA] - adds r0, 0x1 - strh r0, [r3, 0xA] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0xD - beq _08130E1C - b _08130F50 -_08130E1C: - b _08130F28 -_08130E1E: - ldr r2, _08130E4C @ =gSprites - movs r1, 0x26 - ldrsh r0, [r3, r1] - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - adds r1, r2 - movs r2, 0x24 - ldrsh r0, [r3, r2] - lsls r2, r0, 1 - adds r2, r0 - ldrh r0, [r1, 0x24] - subs r0, r2 - strh r0, [r1, 0x24] - ldrh r0, [r3, 0xA] - adds r0, 0x1 - strh r0, [r3, 0xA] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x6 - beq _08130E4A - b _08130F50 -_08130E4A: - b _08130F28 - .align 2, 0 -_08130E4C: .4byte gSprites -_08130E50: - ldr r2, _08130E7C @ =gSprites - movs r1, 0x26 - ldrsh r0, [r3, r1] - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - adds r1, r2 - movs r0, 0x24 - ldrsh r2, [r3, r0] - lsls r0, r2, 1 - adds r0, r2 - ldrh r2, [r1, 0x24] - adds r0, r2 - strh r0, [r1, 0x24] - ldrh r0, [r3, 0xA] - adds r0, 0x1 - strh r0, [r3, 0xA] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x6 - bne _08130F50 - b _08130F28 - .align 2, 0 -_08130E7C: .4byte gSprites -_08130E80: - ldrh r0, [r3, 0xA] - adds r0, 0x1 - strh r0, [r3, 0xA] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x2 - bne _08130F50 - movs r0, 0 - strh r0, [r3, 0xA] - ldrh r1, [r3, 0xC] - movs r2, 0xC - ldrsh r0, [r3, r2] - cmp r0, 0 - bne _08130F2C - adds r0, r1, 0x1 - strh r0, [r3, 0xC] - movs r0, 0x1 - strh r0, [r3, 0x8] - b _08130F50 -_08130EA6: - ldr r2, _08130ECC @ =gSprites - movs r0, 0x26 - ldrsh r1, [r3, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - ldrh r1, [r3, 0x24] - ldrh r2, [r0, 0x24] - adds r1, r2 - strh r1, [r0, 0x24] - ldrh r0, [r3, 0xA] - adds r0, 0x1 - strh r0, [r3, 0xA] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x3 - bne _08130F50 - b _08130F28 - .align 2, 0 -_08130ECC: .4byte gSprites -_08130ED0: - ldrh r0, [r3, 0xA] - adds r0, 0x1 - strh r0, [r3, 0xA] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x6 - bne _08130F50 - b _08130F28 -_08130EE0: - ldr r2, _08130EFC @ =gSprites - movs r1, 0x26 - ldrsh r0, [r3, r1] - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - adds r1, r2 - movs r0, 0x24 - ldrsh r2, [r3, r0] - lsls r2, 2 - ldrh r0, [r1, 0x24] - subs r0, r2 - b _08130F18 - .align 2, 0 -_08130EFC: .4byte gSprites -_08130F00: - ldr r2, _08130F34 @ =gSprites - movs r1, 0x26 - ldrsh r0, [r3, r1] - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - adds r1, r2 - movs r2, 0x24 - ldrsh r0, [r3, r2] - lsls r0, 2 - ldrh r2, [r1, 0x24] - adds r0, r2 -_08130F18: - strh r0, [r1, 0x24] - ldrh r0, [r3, 0xA] - adds r0, 0x1 - strh r0, [r3, 0xA] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x5 - bne _08130F50 -_08130F28: - movs r0, 0 - strh r0, [r3, 0xA] -_08130F2C: - ldrh r0, [r3, 0x8] - adds r0, 0x1 - strh r0, [r3, 0x8] - b _08130F50 - .align 2, 0 -_08130F34: .4byte gSprites -_08130F38: - ldr r2, _08130F58 @ =gSprites - movs r0, 0x26 - ldrsh r1, [r3, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - movs r1, 0 - strh r1, [r0, 0x24] - adds r0, r4, 0 - bl DestroyAnimVisualTask -_08130F50: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08130F58: .4byte gSprites - thumb_func_end sub_8130DBC - - thumb_func_start sub_8130F5C -sub_8130F5C: @ 8130F5C - push {r4,lr} - adds r4, r0, 0 - ldr r0, _08130F78 @ =gBattleAnimArgs - movs r1, 0 - ldrsh r0, [r0, r1] - cmp r0, 0 - bne _08130F80 - adds r0, r4, 0 - movs r1, 0x1 - bl InitAnimSpritePos - ldr r0, _08130F7C @ =gAnimBankAttacker - b _08130F82 - .align 2, 0 -_08130F78: .4byte gBattleAnimArgs -_08130F7C: .4byte gAnimBankAttacker -_08130F80: - ldr r0, _08130FD8 @ =gAnimBankTarget -_08130F82: - ldrb r0, [r0] - strh r0, [r4, 0x3C] - ldrh r0, [r4, 0x3C] - lsls r0, 24 - lsrs r0, 24 - bl GetBattlerSide - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bne _08130FA6 - ldrb r0, [r4, 0x3] - movs r1, 0x3F - negs r1, r1 - ands r1, r0 - movs r0, 0x10 - orrs r1, r0 - strb r1, [r4, 0x3] -_08130FA6: - ldrh r0, [r4, 0x3C] - lsls r0, 24 - lsrs r0, 24 - bl sub_8079ED4 - movs r2, 0x3 - ands r2, r0 - lsls r2, 2 - ldrb r3, [r4, 0x5] - movs r1, 0xD - negs r1, r1 - adds r0, r1, 0 - ands r0, r3 - orrs r0, r2 - strb r0, [r4, 0x5] - ldrb r0, [r4, 0x1] - ands r1, r0 - movs r0, 0x4 - orrs r1, r0 - strb r1, [r4, 0x1] - ldr r0, _08130FDC @ =sub_8130FE0 - str r0, [r4, 0x1C] - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08130FD8: .4byte gAnimBankTarget -_08130FDC: .4byte sub_8130FE0 - thumb_func_end sub_8130F5C - - thumb_func_start sub_8130FE0 -sub_8130FE0: @ 8130FE0 - push {r4,r5,lr} - adds r4, r0, 0 - movs r1, 0x38 - ldrsh r0, [r4, r1] - cmp r0, 0x4 - bls _08130FEE - b _081311DE -_08130FEE: - lsls r0, 2 - ldr r1, _08130FF8 @ =_08130FFC - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_08130FF8: .4byte _08130FFC - .align 2, 0 -_08130FFC: - .4byte _08131010 - .4byte _08131110 - .4byte _08131178 - .4byte _0813118C - .4byte _081311D8 -_08131010: - movs r2, 0x3A - ldrsh r0, [r4, r2] - cmp r0, 0x5 - bhi _08131040 - lsls r0, 2 - ldr r1, _08131024 @ =_08131028 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_08131024: .4byte _08131028 - .align 2, 0 -_08131028: - .4byte _08131044 - .4byte _08131060 - .4byte _08131082 - .4byte _0813109E - .4byte _08131044 - .4byte _081310C4 -_08131040: - movs r0, 0 - strh r0, [r4, 0x3A] -_08131044: - ldrh r0, [r4, 0x3C] - lsls r0, 24 - lsrs r0, 24 - movs r1, 0x5 - bl sub_807A100 - subs r0, 0x4 - lsls r0, 16 - lsrs r5, r0, 16 - ldrh r0, [r4, 0x3C] - lsls r0, 24 - lsrs r0, 24 - movs r1, 0x3 - b _081310B8 -_08131060: - ldrh r0, [r4, 0x3C] - lsls r0, 24 - lsrs r0, 24 - movs r1, 0x5 - bl sub_807A100 - subs r0, 0x4 - lsls r0, 16 - lsrs r5, r0, 16 - ldrh r0, [r4, 0x3C] - lsls r0, 24 - lsrs r0, 24 - movs r1, 0x2 - bl sub_807A100 - adds r0, 0x4 - b _081310BE -_08131082: - ldrh r0, [r4, 0x3C] - lsls r0, 24 - lsrs r0, 24 - movs r1, 0x4 - bl sub_807A100 - adds r0, 0x4 - lsls r0, 16 - lsrs r5, r0, 16 - ldrh r0, [r4, 0x3C] - lsls r0, 24 - lsrs r0, 24 - movs r1, 0x3 - b _081310B8 -_0813109E: - ldrh r0, [r4, 0x3C] - lsls r0, 24 - lsrs r0, 24 - movs r1, 0x4 - bl sub_807A100 - adds r0, 0x4 - lsls r0, 16 - lsrs r5, r0, 16 - ldrh r0, [r4, 0x3C] - lsls r0, 24 - lsrs r0, 24 - movs r1, 0x2 -_081310B8: - bl sub_807A100 - subs r0, 0x4 -_081310BE: - lsls r0, 16 - lsrs r1, r0, 16 - b _081310E4 -_081310C4: - ldrh r0, [r4, 0x3C] - lsls r0, 24 - lsrs r0, 24 - movs r1, 0x2 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r5, r0, 24 - ldrh r0, [r4, 0x3C] - lsls r0, 24 - lsrs r0, 24 - movs r1, 0x3 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r1, r0, 24 -_081310E4: - movs r2, 0x3A - ldrsh r0, [r4, r2] - cmp r0, 0x4 - bne _081310F0 - movs r0, 0x18 - b _081310FA -_081310F0: - cmp r0, 0x5 - bne _081310F8 - movs r0, 0x6 - b _081310FA -_081310F8: - movs r0, 0xC -_081310FA: - strh r0, [r4, 0x2E] - ldrh r0, [r4, 0x20] - strh r0, [r4, 0x30] - strh r5, [r4, 0x32] - ldrh r0, [r4, 0x22] - strh r0, [r4, 0x34] - strh r1, [r4, 0x36] - adds r0, r4, 0 - bl InitAnimLinearTranslation - b _081311CA -_08131110: - adds r0, r4, 0 - bl TranslateAnimLinear - lsls r0, 24 - cmp r0, 0 - beq _081311DE - movs r1, 0x3A - ldrsh r0, [r4, r1] - cmp r0, 0x4 - beq _08131148 - cmp r0, 0x5 - beq _08131168 - ldrh r0, [r4, 0x24] - ldrh r2, [r4, 0x20] - adds r0, r2 - movs r1, 0 - strh r0, [r4, 0x20] - ldrh r0, [r4, 0x26] - ldrh r2, [r4, 0x22] - adds r0, r2 - strh r0, [r4, 0x22] - strh r1, [r4, 0x26] - strh r1, [r4, 0x24] - strh r1, [r4, 0x2E] - ldrh r0, [r4, 0x38] - adds r0, 0x1 - strh r0, [r4, 0x38] - b _08131160 -_08131148: - ldrh r0, [r4, 0x24] - ldrh r1, [r4, 0x20] - adds r0, r1 - movs r1, 0 - strh r0, [r4, 0x20] - ldrh r0, [r4, 0x26] - ldrh r2, [r4, 0x22] - adds r0, r2 - strh r0, [r4, 0x22] - strh r1, [r4, 0x26] - strh r1, [r4, 0x24] - strh r1, [r4, 0x38] -_08131160: - ldrh r0, [r4, 0x3A] - adds r0, 0x1 - strh r0, [r4, 0x3A] - b _081311DE -_08131168: - movs r0, 0 - strh r0, [r4, 0x2E] - movs r1, 0x10 - strh r1, [r4, 0x30] - strh r0, [r4, 0x32] - movs r0, 0x3 - strh r0, [r4, 0x38] - b _081311DE -_08131178: - ldrh r0, [r4, 0x2E] - adds r0, 0x1 - strh r0, [r4, 0x2E] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x4 - bne _081311DE - movs r0, 0 - strh r0, [r4, 0x38] - b _081311DE -_0813118C: - ldrh r1, [r4, 0x2E] - movs r0, 0x1 - ands r0, r1 - cmp r0, 0 - bne _0813119E - ldrh r0, [r4, 0x30] - subs r0, 0x1 - strh r0, [r4, 0x30] - b _081311A4 -_0813119E: - ldrh r0, [r4, 0x32] - adds r0, 0x1 - strh r0, [r4, 0x32] -_081311A4: - ldr r2, _081311D4 @ =REG_BLDALPHA - ldrh r0, [r4, 0x32] - lsls r0, 8 - ldrh r1, [r4, 0x30] - orrs r0, r1 - strh r0, [r2] - ldrh r0, [r4, 0x2E] - adds r0, 0x1 - strh r0, [r4, 0x2E] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x20 - bne _081311DE - adds r2, r4, 0 - adds r2, 0x3E - ldrb r0, [r2] - movs r1, 0x4 - orrs r0, r1 - strb r0, [r2] -_081311CA: - ldrh r0, [r4, 0x38] - adds r0, 0x1 - strh r0, [r4, 0x38] - b _081311DE - .align 2, 0 -_081311D4: .4byte REG_BLDALPHA -_081311D8: - adds r0, r4, 0 - bl DestroyAnimSprite -_081311DE: - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end sub_8130FE0 - - thumb_func_start sub_81311E4 -sub_81311E4: @ 81311E4 - push {r4,r5,lr} - adds r4, r0, 0 - movs r1, 0x32 - ldrsh r0, [r4, r1] - movs r2, 0x2E - ldrsh r1, [r4, r2] - subs r0, r1 - movs r2, 0x38 - ldrsh r1, [r4, r2] - muls r0, r1 - movs r2, 0x36 - ldrsh r1, [r4, r2] - bl __divsi3 - adds r5, r0, 0 - strh r5, [r4, 0x24] - movs r1, 0x34 - ldrsh r0, [r4, r1] - movs r2, 0x30 - ldrsh r1, [r4, r2] - subs r0, r1 - movs r2, 0x38 - ldrsh r1, [r4, r2] - muls r0, r1 - movs r2, 0x36 - ldrsh r1, [r4, r2] - bl __divsi3 - adds r3, r0, 0 - strh r3, [r4, 0x26] - ldrh r1, [r4, 0x38] - movs r0, 0x1 - ands r0, r1 - cmp r0, 0 - bne _08131242 - ldr r0, _08131260 @ =gSpriteTemplate_8402500 - ldrh r1, [r4, 0x20] - adds r1, r5 - lsls r1, 16 - asrs r1, 16 - ldrh r2, [r4, 0x22] - adds r2, r3 - lsls r2, 16 - asrs r2, 16 - movs r3, 0x5 - bl CreateSprite -_08131242: - movs r0, 0x38 - ldrsh r1, [r4, r0] - movs r2, 0x36 - ldrsh r0, [r4, r2] - cmp r1, r0 - bne _08131254 - adds r0, r4, 0 - bl DestroyAnimSprite -_08131254: - ldrh r0, [r4, 0x38] - adds r0, 0x1 - strh r0, [r4, 0x38] - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_08131260: .4byte gSpriteTemplate_8402500 - thumb_func_end sub_81311E4 - - thumb_func_start sub_8131264 -sub_8131264: @ 8131264 - push {r4,r5,lr} - adds r5, r0, 0 - ldr r4, _081312A0 @ =gAnimBankTarget - ldrb r0, [r4] - movs r1, 0x2 - bl GetBattlerSpriteCoord - ldrb r0, [r4] - movs r1, 0x3 - bl GetBattlerSpriteCoord - ldrb r0, [r4] - bl GetBattlerSide - lsls r0, 24 - cmp r0, 0 - beq _08131290 - bl IsContest - lsls r0, 24 - cmp r0, 0 - beq _081312A8 -_08131290: - ldr r2, _081312A4 @ =gBattleAnimArgs - ldrh r1, [r5, 0x20] - ldrh r0, [r2] - subs r0, r1, r0 - strh r0, [r5, 0x2E] - ldrh r0, [r2, 0x4] - subs r1, r0 - b _081312B6 - .align 2, 0 -_081312A0: .4byte gAnimBankTarget -_081312A4: .4byte gBattleAnimArgs -_081312A8: - ldr r2, _081312DC @ =gBattleAnimArgs - ldrh r1, [r5, 0x20] - ldrh r0, [r2] - adds r0, r1, r0 - strh r0, [r5, 0x2E] - ldrh r0, [r2, 0x4] - adds r1, r0 -_081312B6: - strh r1, [r5, 0x32] - adds r3, r2, 0 - ldrh r1, [r5, 0x22] - ldrh r2, [r3, 0x2] - adds r2, r1, r2 - strh r2, [r5, 0x30] - ldrh r0, [r3, 0x6] - adds r1, r0 - strh r1, [r5, 0x34] - ldrh r0, [r3, 0x8] - strh r0, [r5, 0x36] - ldrh r0, [r5, 0x2E] - strh r0, [r5, 0x20] - strh r2, [r5, 0x22] - ldr r0, _081312E0 @ =sub_81311E4 - str r0, [r5, 0x1C] - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_081312DC: .4byte gBattleAnimArgs -_081312E0: .4byte sub_81311E4 - thumb_func_end sub_8131264 - - thumb_func_start sub_81312E4 -sub_81312E4: @ 81312E4 - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - lsls r0, 24 - lsrs r6, r0, 24 - movs r0, 0 - bl GetAnimBattlerSpriteId - lsls r0, 24 - lsrs r5, r0, 24 - adds r2, r5, 0 - ldr r0, _08131328 @ =gTasks - mov r9, r0 - lsls r7, r6, 2 - adds r0, r7, r6 - lsls r0, 3 - mov r8, r0 - mov r4, r8 - add r4, r9 - movs r1, 0x8 - ldrsh r0, [r4, r1] - cmp r0, 0 - bne _0813132C - adds r0, r5, 0 - movs r1, 0 - bl sub_8078E70 - movs r0, 0x80 - lsls r0, 1 - strh r0, [r4, 0xA] - strh r0, [r4, 0xC] - b _08131378 - .align 2, 0 -_08131328: .4byte gTasks -_0813132C: - cmp r0, 0x1 - bne _08131384 - ldrh r0, [r4, 0xA] - adds r0, 0x60 - strh r0, [r4, 0xA] - ldrh r0, [r4, 0xC] - subs r0, 0xD - strh r0, [r4, 0xC] - movs r2, 0xA - ldrsh r1, [r4, r2] - movs r0, 0xC - ldrsh r2, [r4, r0] - adds r0, r5, 0 - movs r3, 0 - bl obj_id_set_rotscale - ldrh r0, [r4, 0xE] - adds r0, 0x1 - strh r0, [r4, 0xE] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x9 - bne _081313E8 - movs r0, 0 - strh r0, [r4, 0xE] - adds r0, r5, 0 - bl sub_8078F40 - ldr r1, _08131380 @ =gSprites - lsls r0, r5, 4 - adds r0, r5 - lsls r0, 2 - adds r0, r1 - adds r0, 0x3E - ldrb r1, [r0] - movs r2, 0x4 - orrs r1, r2 - strb r1, [r0] -_08131378: - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] - b _081313E8 - .align 2, 0 -_08131380: .4byte gSprites -_08131384: - ldr r4, _081313F4 @ =gAnimBankAttacker - ldrb r0, [r4] - movs r1, 0 - bl refresh_graphics_maybe - bl IsContest - lsls r0, 24 - cmp r0, 0 - beq _081313C6 - ldr r3, _081313F8 @ =gSprites - ldr r2, _081313FC @ =gBankSpriteIds - ldrb r0, [r4] - adds r0, r2 - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r1, r3, 0 - adds r1, 0x10 - adds r0, r1 - ldr r1, _08131400 @ =gSpriteAffineAnimTable_81E7C18 - str r1, [r0] - ldrb r0, [r4] - adds r0, r2 - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r3 - movs r1, 0 - bl StartSpriteAffineAnim -_081313C6: - mov r4, r9 - adds r3, r7, 0 - ldr r5, _08131404 @ =sub_8131408 - movs r1, 0xF - mov r2, r8 - adds r0, r4, r2 - adds r0, 0x26 - movs r2, 0 -_081313D6: - strh r2, [r0] - subs r0, 0x2 - subs r1, 0x1 - cmp r1, 0 - bge _081313D6 - adds r0, r3, r6 - lsls r0, 3 - adds r0, r4 - str r5, [r0] -_081313E8: - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_081313F4: .4byte gAnimBankAttacker -_081313F8: .4byte gSprites -_081313FC: .4byte gBankSpriteIds -_08131400: .4byte gSpriteAffineAnimTable_81E7C18 -_08131404: .4byte sub_8131408 - thumb_func_end sub_81312E4 - - thumb_func_start sub_8131408 -sub_8131408: @ 8131408 - push {r4-r6,lr} - lsls r0, 24 - lsrs r6, r0, 24 - movs r0, 0 - bl GetAnimBattlerSpriteId - lsls r0, 24 - lsrs r3, r0, 24 - ldr r1, _08131434 @ =gTasks - lsls r0, r6, 2 - adds r0, r6 - lsls r0, 3 - adds r4, r0, r1 - movs r0, 0x8 - ldrsh r5, [r4, r0] - cmp r5, 0x1 - beq _0813146C - cmp r5, 0x1 - bgt _08131438 - cmp r5, 0 - beq _08131442 - b _0813155A - .align 2, 0 -_08131434: .4byte gTasks -_08131438: - cmp r5, 0x2 - beq _081314D8 - cmp r5, 0x3 - beq _08131514 - b _0813155A -_08131442: - ldr r0, _08131464 @ =gSprites - lsls r1, r3, 4 - adds r1, r3 - lsls r1, 2 - adds r1, r0 - ldr r0, _08131468 @ =0x0000ff38 - strh r0, [r1, 0x26] - movs r0, 0xC8 - strh r0, [r1, 0x24] - adds r1, 0x3E - ldrb r2, [r1] - subs r0, 0xCD - ands r0, r2 - strb r0, [r1] - strh r5, [r4, 0x1C] - b _08131506 - .align 2, 0 -_08131464: .4byte gSprites -_08131468: .4byte 0x0000ff38 -_0813146C: - ldrh r1, [r4, 0x1C] - adds r1, 0x70 - movs r5, 0 - strh r1, [r4, 0x1C] - ldr r2, _081314D0 @ =gSprites - lsls r0, r3, 4 - adds r0, r3 - lsls r0, 2 - adds r2, r0, r2 - lsls r1, 16 - asrs r1, 24 - ldrh r3, [r2, 0x26] - adds r1, r3 - strh r1, [r2, 0x26] - movs r1, 0x22 - ldrsh r0, [r2, r1] - movs r3, 0x26 - ldrsh r1, [r2, r3] - adds r0, r1 - movs r1, 0x20 - negs r1, r1 - cmp r0, r1 - blt _0813149C - strh r5, [r2, 0x24] -_0813149C: - movs r1, 0x26 - ldrsh r0, [r2, r1] - cmp r0, 0 - ble _081314A6 - strh r5, [r2, 0x26] -_081314A6: - movs r3, 0x26 - ldrsh r0, [r2, r3] - cmp r0, 0 - bne _0813155A - movs r0, 0x40 - negs r0, r0 - bl BattleAnimAdjustPanning - adds r1, r0, 0 - lsls r1, 24 - asrs r1, 24 - movs r0, 0x7D - bl PlaySE12WithPanning - ldr r1, _081314D4 @ =0xfffff800 - adds r0, r1, 0 - ldrh r2, [r4, 0x1C] - adds r0, r2 - strh r0, [r4, 0x1C] - b _08131506 - .align 2, 0 -_081314D0: .4byte gSprites -_081314D4: .4byte 0xfffff800 -_081314D8: - ldrh r0, [r4, 0x1C] - subs r0, 0x70 - strh r0, [r4, 0x1C] - lsls r0, 16 - cmp r0, 0 - bge _081314E8 - movs r0, 0 - strh r0, [r4, 0x1C] -_081314E8: - ldr r0, _08131510 @ =gSprites - lsls r1, r3, 4 - adds r1, r3 - lsls r1, 2 - adds r1, r0 - ldrh r2, [r4, 0x1C] - lsls r2, 16 - asrs r2, 24 - ldrh r0, [r1, 0x26] - subs r0, r2 - strh r0, [r1, 0x26] - movs r3, 0x1C - ldrsh r0, [r4, r3] - cmp r0, 0 - bne _0813155A -_08131506: - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] - b _0813155A - .align 2, 0 -_08131510: .4byte gSprites -_08131514: - ldrh r0, [r4, 0x1C] - adds r0, 0x70 - strh r0, [r4, 0x1C] - ldr r2, _08131560 @ =gSprites - lsls r1, r3, 4 - adds r1, r3 - lsls r1, 2 - adds r1, r2 - lsls r0, 16 - asrs r0, 24 - ldrh r2, [r1, 0x26] - adds r0, r2 - strh r0, [r1, 0x26] - lsls r0, 16 - cmp r0, 0 - ble _08131538 - movs r0, 0 - strh r0, [r1, 0x26] -_08131538: - movs r3, 0x26 - ldrsh r0, [r1, r3] - cmp r0, 0 - bne _0813155A - movs r0, 0x40 - negs r0, r0 - bl BattleAnimAdjustPanning - adds r1, r0, 0 - lsls r1, 24 - asrs r1, 24 - movs r0, 0x7D - bl PlaySE12WithPanning - adds r0, r6, 0 - bl DestroyAnimVisualTask -_0813155A: - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_08131560: .4byte gSprites - thumb_func_end sub_8131408 - - thumb_func_start sub_8131564 -sub_8131564: @ 8131564 - push {r4,r5,lr} - adds r5, r0, 0 - ldr r4, _08131588 @ =gAnimBankTarget - ldrb r0, [r4] - bl GetBattlerSide - lsls r0, 24 - cmp r0, 0 - bne _08131590 - ldrb r0, [r4] - bl sub_8079E90 - subs r0, 0x2 - adds r1, r5, 0 - adds r1, 0x43 - strb r0, [r1] - ldr r4, _0813158C @ =0x0000ff70 - b _081315A0 - .align 2, 0 -_08131588: .4byte gAnimBankTarget -_0813158C: .4byte 0x0000ff70 -_08131590: - ldrb r0, [r4] - bl sub_8079E90 - adds r0, 0x2 - adds r1, r5, 0 - adds r1, 0x43 - strb r0, [r1] - ldr r4, _081315BC @ =0x0000ffa0 -_081315A0: - ldr r0, _081315C0 @ =gAnimBankTarget - ldrb r0, [r0] - movs r1, 0x3 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - strh r0, [r5, 0x22] - strh r4, [r5, 0x26] - ldr r0, _081315C4 @ =sub_81315C8 - str r0, [r5, 0x1C] - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_081315BC: .4byte 0x0000ffa0 -_081315C0: .4byte gAnimBankTarget -_081315C4: .4byte sub_81315C8 - thumb_func_end sub_8131564 - - thumb_func_start sub_81315C8 -sub_81315C8: @ 81315C8 - push {r4,r5,lr} - adds r4, r0, 0 - movs r1, 0x2E - ldrsh r0, [r4, r1] - cmp r0, 0x4 - bls _081315D6 - b _081316F2 -_081315D6: - lsls r0, 2 - ldr r1, _081315E0 @ =_081315E4 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_081315E0: .4byte _081315E4 - .align 2, 0 -_081315E4: - .4byte _081315F8 - .4byte _0813161C - .4byte _0813165C - .4byte _0813168C - .4byte _081316B8 -_081315F8: - ldrh r0, [r4, 0x26] - adds r0, 0xA - strh r0, [r4, 0x26] - lsls r0, 16 - cmp r0, 0 - blt _081316F2 - movs r0, 0x3F - bl BattleAnimAdjustPanning - adds r1, r0, 0 - lsls r1, 24 - asrs r1, 24 - movs r0, 0xCD - bl PlaySE12WithPanning - movs r0, 0 - strh r0, [r4, 0x26] - b _081316B0 -_0813161C: - ldrh r1, [r4, 0x30] - adds r1, 0x4 - movs r5, 0 - strh r1, [r4, 0x30] - ldr r2, _08131658 @ =gSineTable - movs r3, 0x30 - ldrsh r0, [r4, r3] - lsls r0, 1 - adds r0, r2 - ldrh r0, [r0] - lsls r0, 16 - asrs r0, 19 - negs r0, r0 - strh r0, [r4, 0x26] - lsls r1, 16 - asrs r1, 16 - cmp r1, 0x7F - ble _081316F2 - movs r0, 0x3F - bl BattleAnimAdjustPanning - adds r1, r0, 0 - lsls r1, 24 - asrs r1, 24 - movs r0, 0xCD - bl PlaySE12WithPanning - strh r5, [r4, 0x30] - strh r5, [r4, 0x26] - b _081316B0 - .align 2, 0 -_08131658: .4byte gSineTable -_0813165C: - ldrh r1, [r4, 0x30] - adds r1, 0x6 - movs r3, 0 - strh r1, [r4, 0x30] - ldr r2, _08131688 @ =gSineTable - movs r5, 0x30 - ldrsh r0, [r4, r5] - lsls r0, 1 - adds r0, r2 - ldrh r0, [r0] - lsls r0, 16 - asrs r0, 20 - negs r0, r0 - strh r0, [r4, 0x26] - lsls r1, 16 - asrs r1, 16 - cmp r1, 0x7F - ble _081316F2 - strh r3, [r4, 0x30] - strh r3, [r4, 0x26] - b _081316B0 - .align 2, 0 -_08131688: .4byte gSineTable -_0813168C: - ldrh r0, [r4, 0x30] - adds r0, 0x1 - strh r0, [r4, 0x30] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x8 - ble _081316F2 - movs r0, 0x3F - bl BattleAnimAdjustPanning - adds r1, r0, 0 - lsls r1, 24 - asrs r1, 24 - movs r0, 0xC0 - bl PlaySE12WithPanning - movs r0, 0 - strh r0, [r4, 0x30] -_081316B0: - ldrh r0, [r4, 0x2E] - adds r0, 0x1 - strh r0, [r4, 0x2E] - b _081316F2 -_081316B8: - ldrh r0, [r4, 0x30] - adds r0, 0x1 - strh r0, [r4, 0x30] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x8 - ble _081316F2 - movs r0, 0 - strh r0, [r4, 0x30] - ldrh r1, [r4, 0x32] - adds r1, 0x1 - strh r1, [r4, 0x32] - movs r0, 0x1 - ands r1, r0 - adds r3, r4, 0 - adds r3, 0x3E - lsls r1, 2 - ldrb r2, [r3] - subs r0, 0x6 - ands r0, r2 - orrs r0, r1 - strb r0, [r3] - movs r1, 0x32 - ldrsh r0, [r4, r1] - cmp r0, 0x7 - bne _081316F2 - adds r0, r4, 0 - bl DestroyAnimSprite -_081316F2: - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end sub_81315C8 - - thumb_func_start sub_81316F8 -sub_81316F8: @ 81316F8 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - lsls r0, 24 - lsrs r4, r0, 24 - mov r10, r4 - bl IsContest - lsls r0, 24 - lsrs r5, r0, 24 - cmp r5, 0 - bne _0813173E - movs r0, 0x1 - bl duplicate_obj_of_side_rel2move_in_transparent_mode - lsls r0, 16 - asrs r7, r0, 16 - cmp r7, 0 - blt _0813173E - movs r0, 0x1 - bl duplicate_obj_of_side_rel2move_in_transparent_mode - lsls r0, 16 - asrs r0, 16 - cmp r0, 0 - bge _0813174C - lsls r0, r7, 4 - adds r0, r7 - lsls r0, 2 - ldr r1, _08131748 @ =gSprites - adds r0, r1 - bl obj_delete_but_dont_free_vram -_0813173E: - adds r0, r4, 0 - bl DestroyAnimVisualTask - b _081317EE - .align 2, 0 -_08131748: .4byte gSprites -_0813174C: - ldr r1, _081317FC @ =gSprites - mov r9, r1 - lsls r1, r0, 4 - mov r8, r1 - add r8, r0 - mov r0, r8 - lsls r0, 2 - mov r8, r0 - mov r4, r8 - add r4, r9 - ldrh r0, [r4, 0x24] - adds r0, 0x18 - strh r0, [r4, 0x24] - lsls r6, r7, 4 - adds r6, r7 - lsls r6, 2 - mov r1, r9 - adds r2, r6, r1 - ldrh r0, [r2, 0x24] - subs r0, 0x18 - strh r0, [r2, 0x24] - strh r5, [r4, 0x2E] - strh r5, [r2, 0x2E] - strh r5, [r4, 0x30] - strh r5, [r2, 0x30] - strh r5, [r4, 0x32] - strh r5, [r2, 0x32] - movs r0, 0x10 - strh r0, [r4, 0x34] - ldr r0, _08131800 @ =0x0000fff0 - strh r0, [r2, 0x34] - strh r5, [r4, 0x36] - movs r0, 0x80 - strh r0, [r2, 0x36] - movs r0, 0x18 - strh r0, [r4, 0x38] - strh r0, [r2, 0x38] - mov r0, r10 - strh r0, [r4, 0x3A] - strh r0, [r2, 0x3A] - strh r5, [r4, 0x3C] - strh r5, [r2, 0x3C] - ldr r0, _08131804 @ =gTasks - mov r1, r10 - lsls r3, r1, 2 - add r3, r10 - lsls r3, 3 - adds r3, r0 - movs r0, 0x2 - strh r0, [r3, 0x8] - adds r5, r4, 0 - adds r5, 0x3E - ldrb r1, [r5] - subs r0, 0x7 - ands r0, r1 - strb r0, [r5] - adds r5, r2, 0 - adds r5, 0x3E - ldrb r0, [r5] - movs r1, 0x4 - orrs r0, r1 - strb r0, [r5] - ldrb r5, [r4, 0x1] - movs r1, 0xD - negs r1, r1 - adds r0, r1, 0 - ands r0, r5 - strb r0, [r4, 0x1] - ldrb r0, [r2, 0x1] - ands r1, r0 - strb r1, [r2, 0x1] - movs r0, 0x1C - add r9, r0 - add r8, r9 - ldr r0, _08131808 @ =sub_8131838 - mov r1, r8 - str r0, [r1] - add r6, r9 - str r0, [r6] - ldr r0, _0813180C @ =sub_8131810 - str r0, [r3] -_081317EE: - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_081317FC: .4byte gSprites -_08131800: .4byte 0x0000fff0 -_08131804: .4byte gTasks -_08131808: .4byte sub_8131838 -_0813180C: .4byte sub_8131810 - thumb_func_end sub_81316F8 - - thumb_func_start sub_8131810 -sub_8131810: @ 8131810 - push {lr} - lsls r0, 24 - lsrs r2, r0, 24 - ldr r1, _08131834 @ =gTasks - lsls r0, r2, 2 - adds r0, r2 - lsls r0, 3 - adds r0, r1 - movs r1, 0x8 - ldrsh r0, [r0, r1] - cmp r0, 0 - bne _0813182E - adds r0, r2, 0 - bl DestroyAnimVisualTask -_0813182E: - pop {r0} - bx r0 - .align 2, 0 -_08131834: .4byte gTasks - thumb_func_end sub_8131810 - - thumb_func_start sub_8131838 -sub_8131838: @ 8131838 - push {r4,r5,lr} - adds r4, r0, 0 - ldrh r0, [r4, 0x30] - adds r0, 0x1 - movs r5, 0 - strh r0, [r4, 0x30] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x1 - ble _08131868 - strh r5, [r4, 0x30] - adds r3, r4, 0 - adds r3, 0x3E - ldrb r2, [r3] - lsls r0, r2, 29 - lsrs r0, 31 - movs r1, 0x1 - eors r1, r0 - lsls r1, 2 - movs r0, 0x5 - negs r0, r0 - ands r0, r2 - orrs r0, r1 - strb r0, [r3] -_08131868: - ldrh r0, [r4, 0x34] - ldrh r1, [r4, 0x36] - adds r0, r1 - movs r1, 0xFF - ands r0, r1 - strh r0, [r4, 0x36] - movs r2, 0x36 - ldrsh r0, [r4, r2] - movs r2, 0x38 - ldrsh r1, [r4, r2] - bl Cos - strh r0, [r4, 0x24] - movs r1, 0x2E - ldrsh r0, [r4, r1] - cmp r0, 0 - beq _08131890 - cmp r0, 0x1 - beq _081318A8 - b _081318E6 -_08131890: - ldrh r0, [r4, 0x32] - adds r0, 0x1 - strh r0, [r4, 0x32] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x3C - bne _081318E6 - strh r5, [r4, 0x32] - ldrh r0, [r4, 0x2E] - adds r0, 0x1 - strh r0, [r4, 0x2E] - b _081318E6 -_081318A8: - ldrh r0, [r4, 0x32] - adds r0, 0x1 - strh r0, [r4, 0x32] - lsls r0, 16 - cmp r0, 0 - ble _081318E6 - strh r5, [r4, 0x32] - ldrh r0, [r4, 0x38] - subs r0, 0x2 - strh r0, [r4, 0x38] - lsls r0, 16 - cmp r0, 0 - bge _081318E6 - ldr r3, _081318EC @ =gTasks - movs r2, 0x3C - ldrsh r1, [r4, r2] - lsls r1, 1 - movs r0, 0x3A - ldrsh r2, [r4, r0] - lsls r0, r2, 2 - adds r0, r2 - lsls r0, 3 - adds r1, r0 - adds r3, 0x8 - adds r1, r3 - ldrh r0, [r1] - subs r0, 0x1 - strh r0, [r1] - adds r0, r4, 0 - bl obj_delete_but_dont_free_vram -_081318E6: - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_081318EC: .4byte gTasks - thumb_func_end sub_8131838 - thumb_func_start sub_81318F0 sub_81318F0: @ 81318F0 push {r4,lr} diff --git a/src/battle/battle_anim_812C144.c b/src/battle/battle_anim_812C144.c index 0e9c45023..6edc56549 100644 --- a/src/battle/battle_anim_812C144.c +++ b/src/battle/battle_anim_812C144.c @@ -1,6 +1,7 @@ #include "global.h" #include "battle.h" #include "battle_anim.h" +#include "blend_palette.h" #include "contest.h" #include "data2.h" #include "decompress.h" @@ -18,6 +19,7 @@ extern s16 gBattleAnimArgs[]; extern u8 gAnimBankAttacker; extern u8 gAnimBankTarget; extern u8 gAnimVisualTaskCount; +extern u8 gAnimFriendship; extern s32 gAnimMoveDmg; extern u16 gBattle_WIN0H; extern u16 gBattle_WIN0V; @@ -30,6 +32,9 @@ extern u16 gBattle_BG2_Y; extern const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7220; extern const struct SpriteTemplate gSpriteTemplate_8402500; +extern const struct SpriteTemplate gSpriteTemplate_84028CC; +extern const struct SpriteTemplate gSpriteTemplate_840294C; +extern const struct SpriteTemplate gSpriteTemplate_84029AC; extern const union AffineAnimCmd *const gSpriteAffineAnimTable_81E7C18[]; extern const union AffineAnimCmd *const gSpriteAffineAnimTable_81E7BEC[]; extern const union AffineAnimCmd gUnknown_08402400[]; @@ -38,6 +43,9 @@ extern const union AffineAnimCmd gUnknown_08402518[]; extern const union AffineAnimCmd gUnknown_08402540[]; extern const union AffineAnimCmd gUnknown_08402590[]; extern const union AffineAnimCmd gUnknown_08402610[]; +extern const union AffineAnimCmd gUnknown_08402750[]; +extern const union AffineAnimCmd gUnknown_084028AC[]; +extern const union AffineAnimCmd gUnknown_084029DC[]; extern const u32 gUnknown_08D2AA98[]; extern const u32 gUnknown_08D2A9E0[]; extern const u16 gUnknown_08D2AA80[]; @@ -45,11 +53,17 @@ extern const s8 gUnknown_084025C0[]; extern const s8 gUnknown_08402604[]; extern const u8 gUnknown_08402608[]; extern const struct SpriteTemplate gBattleAnimSpriteTemplate_84025EC; +extern const u8 gUnknown_08D2E014[]; +extern const u8 gUnknown_08D2E170[]; +extern const u16 gUnknown_08D2E150[]; extern u8 gBattleMonForms[]; extern u8 gBankSpriteIds[]; extern u16 gBattlerPartyIndexes[]; +extern s16 gUnknown_084028E4[]; extern u8 sub_8046234(s16 x, s16 y, u8 a3); +extern void sub_80DA48C(struct Sprite *); +extern void sub_80E3C4C(u8 taskId, int unused, u16 arg2, u8 battler1, u8 arg4, u8 arg5, u8 arg6, u8 arg7, const u8 *arg8, const u8 *arg9, const u16 *palette); static void sub_812C184(struct Sprite *sprite); static void sub_812C268(struct Sprite *sprite); @@ -82,7 +96,26 @@ static void sub_812EE00(struct Sprite *sprite); static void sub_812EEEC(struct Sprite *sprite); /*static*/ void sub_812F238(u8 taskId); static void sub_812F290(u8 taskId); -void sub_812F474(u8 taskId); +static void sub_812F474(u8 taskId); +static void sub_812F76C(u8 taskId); +static void sub_812F8DC(struct Sprite *sprite); +static void sub_812FE20(u8 taskId); +static void sub_812FEB8(u8, bool8); +static void sub_813003C(u8 taskId); +static void sub_81301B4(struct Sprite *sprite); +static void sub_81302E4(u8 taskId); +static void sub_8130424(s16, s16, s16, s16, u8, u8, s16*, s16*); +static void sub_81306A4(u8 taskId); +static void sub_813085C(struct Sprite *sprite); +static void sub_8130970(u8 taskId); +static void sub_8130A94(struct Sprite *sprite); +static void sub_8130B38(struct Sprite *sprite); +static void sub_8130DBC(u8 taskId); +static void sub_8130FE0(struct Sprite *sprite); +static void sub_8131408(u8 taskId); +static void sub_81315C8(struct Sprite *sprite); +static void sub_8131810(u8 taskId); +static void sub_8131838(struct Sprite *sprite); void sub_812C144(struct Sprite *sprite) @@ -2553,3 +2586,1557 @@ void sub_812F314(u8 taskId) ScanlineEffect_SetParams(scanlineParams); task->func = sub_812F474; } + +static void sub_812F474(u8 taskId) +{ + struct Task *task; + s16 var1; + s16 var2; + s16 bgX, bgY; + s16 offset; + s16 var0; + s16 i; + s16 sineIndex; + s16 var3; + + task = &gTasks[taskId]; + if (GetBattlerPosition_permutated(task->data[5]) == 1) + { + bgX = gBattle_BG1_X; + bgY = gBattle_BG1_Y; + } + else + { + bgX = gBattle_BG2_X; + bgY = gBattle_BG2_Y; + } + + switch (task->data[0]) + { + case 0: + offset = task->data[14] * 2; + var1 = 0; + var2 = 0; + i = 0; + task->data[1] = (task->data[1] + 2) & 0xFF; + sineIndex = task->data[1]; + task->data[9] = 0x7E0 / task->data[6]; + task->data[10] = -((task->data[7] * 2) / task->data[9]); + task->data[11] = task->data[7]; + var3 = task->data[11] >> 5; + task->data[12] = var3; + var0 = task->data[14]; + while (var0 > task->data[13]) + { + gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer][offset + 1] = (i - var2) + bgY; + gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer][offset] = bgX + var3 + (gSineTable[sineIndex] >> 5); + sineIndex = (sineIndex + 10) & 0xFF; + task->data[11] += task->data[10]; + var3 = task->data[11] >> 5; + task->data[12] = var3; + + i++; + offset -= 2; + var1 += task->data[6]; + var2 = var1 >> 5; + var0--; + } + + var0 *= 2; + while (var0 >= 0) + { + gScanlineEffectRegBuffers[0][var0] = bgX + 240; + gScanlineEffectRegBuffers[1][var0] = bgX + 240; + var0 -= 2; + } + + if (++task->data[6] > 63) + { + task->data[6] = 64; + task->data[2]++; + if (task->data[2] & 1) + task->data[3]--; + else + task->data[4]++; + + REG_BLDALPHA = (task->data[4] << 8) | task->data[3]; + if (task->data[3] == 0 && task->data[4] == 16) + { + task->data[2] = 0; + task->data[3] = 0; + task->data[0]++; + } + } + else + { + task->data[7] += task->data[8]; + } + break; + case 1: + if (++task->data[2] > 12) + { + gScanlineEffect.state = 3; + task->data[2] = 0; + task->data[0]++; + } + break; + case 2: + task->data[2]++; + if (task->data[2] & 1) + task->data[3]++; + else + task->data[4]--; + + REG_BLDALPHA = (task->data[4] << 8) | task->data[3]; + if (task->data[3] == 16 && task->data[4] == 0) + { + task->data[2] = 0; + task->data[3] = 0; + task->data[0]++; + } + break; + case 3: + DestroyAnimVisualTask(taskId); + break; + } +} + +void sub_812F724(u8 taskId) +{ + struct Task *task = &gTasks[taskId]; + task->data[0] = 0; + task->data[15] = GetAnimBattlerSpriteId(gBattleAnimArgs[0]); + sub_80798F4(&gTasks[taskId], task->data[15], &gUnknown_08402750); + task->func = sub_812F76C; +} + +static void sub_812F76C(u8 taskId) +{ + u16 var0; + + struct Task *task = &gTasks[taskId]; + var0 = task->data[0]; + task->data[0]++; + var0 -= 20; + if (var0 < 23) + { + if (++task->data[1] > 1) + { + task->data[1] = 0; + task->data[2]++; + if (task->data[2] & 1) + gSprites[task->data[15]].pos2.x = 1; + else + gSprites[task->data[15]].pos2.x = -1; + } + } + else + { + gSprites[task->data[15]].pos2.x = 0; + } + + if (!sub_807992C(&gTasks[taskId])) + DestroyAnimVisualTask(taskId); +} + +static void sub_812F804(struct Sprite *sprite, s16 b, s16 c, s16 d, s16 e, u16 f) +{ + sprite->pos1.x = b; + sprite->pos1.y = c; + sprite->data[4] = b << 4; + sprite->data[5] = c << 4; + sprite->data[6] = ((d - b) << 4) / f; + sprite->data[7] = ((e - c) << 4) / f; +} + +void sub_812F86C(struct Sprite *sprite) +{ + sprite->data[4] += sprite->data[6]; + sprite->data[5] += sprite->data[7]; + sprite->pos1.x = sprite->data[4] >> 4; + sprite->pos1.y = sprite->data[5] >> 4; +} + +void sub_812F88C(struct Sprite *sprite) +{ + s16 x = sprite->pos1.x; + s16 y = sprite->pos1.y; + + sub_8078650(sprite); + StartSpriteAffineAnim(sprite, gBattleAnimArgs[0]); + sub_812F804(sprite, sprite->pos1.x, sprite->pos1.y, x, y, 64); + sprite->data[0] = 0; + sprite->callback = sub_812F8DC; +} + +static void sub_812F8DC(struct Sprite *sprite) +{ + int index; + + sprite->data[0]++; + index = (sprite->data[0] * 8) & 0xFF; + sub_812F86C(sprite); + sprite->pos2.y = Sin(index, 8); + if (sprite->data[0] > 58) + { + if (++sprite->data[1] > 1) + { + sprite->data[1] = 0; + sprite->data[2]++; + sprite->invisible = sprite->data[2] & 1; + if (sprite->data[2] > 3) + move_anim_8074EE0(sprite); + } + } +} + +void sub_812F948(struct Sprite *sprite) +{ + sprite->data[0] = gBattleAnimArgs[3]; + StartSpriteAffineAnim(sprite, gBattleAnimArgs[0]); + if (GetBattlerSide(gAnimBankTarget) != B_SIDE_PLAYER) + gBattleAnimArgs[1] = -gBattleAnimArgs[1]; + + sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2) + gBattleAnimArgs[1]; + sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3) + gBattleAnimArgs[2]; + sprite->callback = sub_80DA48C; +} + +static void sub_812F9B0(u8 taskId) +{ + u16 var0 = 0; + u16 var1 = 0; + + gTasks[taskId].data[0]--; + if ((gTasks[taskId].data[6] & 0x8000) && (--gTasks[taskId].data[1] == -1)) + { + if (gTasks[taskId].data[9] == 0) + { + gTasks[taskId].data[9] = gTasks[taskId].data[4]; + gTasks[taskId].data[4] = -gTasks[taskId].data[4]; + } + else + { + gTasks[taskId].data[9] = 0; + } + + if (gTasks[taskId].data[10] == 0) + { + gTasks[taskId].data[10] = gTasks[taskId].data[5]; + gTasks[taskId].data[5] = -gTasks[taskId].data[5]; + } + else + { + gTasks[taskId].data[10] = 0; + } + + gTasks[taskId].data[1] = gTasks[taskId].data[13]; + } + + var0 = gTasks[taskId].data[7]; + var1 = gTasks[taskId].data[8]; + if (gTasks[taskId].data[2] & 0x8000) + gSprites[gTasks[taskId].data[15]].pos2.x = gTasks[taskId].data[9] - (var0 >> 8); + else + gSprites[gTasks[taskId].data[15]].pos2.x = gTasks[taskId].data[9] + (var0 >> 8); + + if (gTasks[taskId].data[3] & 0x8000) + gSprites[gTasks[taskId].data[15]].pos2.y = gTasks[taskId].data[10] - (var1 >> 8); + else + gSprites[gTasks[taskId].data[15]].pos2.y = gTasks[taskId].data[10] + (var1 >> 8); + + if (gTasks[taskId].data[0] < 1) + { + DestroyTask(taskId); + gAnimVisualTaskCount--; + } +} + +static void sub_812FAF8(u8 taskId) +{ + u16 var0 = 0; + u16 var1 = 0; + + gTasks[taskId].data[0]--; + if ((gTasks[taskId].data[6] & 0x8000) && (--gTasks[taskId].data[1] == -1)) + { + if (gTasks[taskId].data[9] == 0) + { + gTasks[taskId].data[9] = gTasks[taskId].data[4]; + gTasks[taskId].data[4] = -gTasks[taskId].data[4]; + } + else + { + gTasks[taskId].data[9] = var0; + } + + if (gTasks[taskId].data[10] == 0) + { + gTasks[taskId].data[10] = gTasks[taskId].data[5]; + gTasks[taskId].data[5] = -gTasks[taskId].data[5]; + } + else + { + gTasks[taskId].data[10] = 0; + } + + gTasks[taskId].data[1] = gTasks[taskId].data[13]; + } + + var0 = (gTasks[taskId].data[2] & 0x7FFF) + gTasks[taskId].data[7]; + var1 = (gTasks[taskId].data[3] & 0x7FFF) + gTasks[taskId].data[8]; + if (gTasks[taskId].data[2] & 0x8000) + gSprites[gTasks[taskId].data[15]].pos2.x = gTasks[taskId].data[9] - (var0 >> 8); + else + gSprites[gTasks[taskId].data[15]].pos2.x = gTasks[taskId].data[9] + (var0 >> 8); + + if (gTasks[taskId].data[3] & 0x8000) + gSprites[gTasks[taskId].data[15]].pos2.y = gTasks[taskId].data[10] - (var1 >> 8); + else + gSprites[gTasks[taskId].data[15]].pos2.y = gTasks[taskId].data[10] + (var1 >> 8); + + gTasks[taskId].data[7] = var0; + gTasks[taskId].data[8] = var1; + if (gTasks[taskId].data[0] < 1) + { + gTasks[taskId].data[0] = 30; + gTasks[taskId].data[13] = 0; + gTasks[taskId].func = sub_812F9B0; + } +} + +void sub_812FC68(u8 taskId) +{ + gTasks[taskId].data[15] = gBankSpriteIds[gAnimBankAttacker]; + gTasks[taskId].data[14] = gBattleAnimArgs[0]; + gTasks[taskId].data[0] = gBattleAnimArgs[0]; + gTasks[taskId].data[13] = gBattleAnimArgs[6]; + if (gBattleAnimArgs[3]) + gTasks[taskId].data[6] = gTasks[taskId].data[6] | -0x8000; + + if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER) + { + gTasks[taskId].data[2] = gBattleAnimArgs[1]; + gTasks[taskId].data[3] = gBattleAnimArgs[2]; + } + else + { + if (gBattleAnimArgs[1] & 0x8000) + gTasks[taskId].data[2] = gBattleAnimArgs[1] & 0x7FFF; + else + gTasks[taskId].data[2] = gBattleAnimArgs[1] | -0x8000; + + if (gBattleAnimArgs[2] & 0x8000) + gTasks[taskId].data[3] = gBattleAnimArgs[2] & 0x7FFF; + else + gTasks[taskId].data[3] = gBattleAnimArgs[2] | -0x8000; + } + + gTasks[taskId].data[8] = 0; + gTasks[taskId].data[7] = 0; + gTasks[taskId].data[4] = gBattleAnimArgs[4]; + gTasks[taskId].data[5] = gBattleAnimArgs[5]; + gTasks[taskId].func = sub_812FAF8; +} + +void sub_812FD7C(u8 taskId) +{ + u8 battler; + struct Task *task = &gTasks[taskId]; + + if (gBattleAnimArgs[1] == 0) + DestroyAnimVisualTask(taskId); + + task->data[0] = 0; + task->data[1] = 0; + task->data[2] = 0; + task->data[3] = gBattleAnimArgs[1]; + if (gBattleAnimArgs[0] == 0) + battler = gAnimBankAttacker; + else + battler = gAnimBankTarget; + + task->data[4] = GetBattlerSpriteCoord(battler, 0); + task->data[5] = GetBattlerSpriteCoord(battler, 1); + task->data[6] = sub_8079E90(battler); + task->data[15] = GetAnimBattlerSpriteId(gBattleAnimArgs[0]); + sub_80798F4(task, task->data[15], &gUnknown_084028AC); + task->func = sub_812FE20; +} + +static void sub_812FE20(u8 taskId) +{ + struct Task *task = &gTasks[taskId]; + + switch (task->data[0]) + { + case 0: + if (++task->data[1] == 6) + sub_812FEB8(taskId, TRUE); + + if (task->data[1] == 18) + sub_812FEB8(taskId, FALSE); + + if (!sub_807992C(task)) + { + if (--task->data[3] == 0) + { + task->data[0]++; + } + else + { + task->data[1] = 0; + sub_80798F4(task, task->data[15], &gUnknown_084028AC); + } + } + break; + case 1: + if (task->data[2] == 0) + DestroyAnimVisualTask(taskId); + break; + } +} + +static void sub_812FEB8(u8 taskId, bool8 arg1) +{ + u8 i; + s8 xOffset, yOffset; + struct Task *task; + s16 xCoords[4]; + s16 yCoords[2]; + + task = &gTasks[taskId]; + if (!arg1) + { + xOffset = 18; + yOffset = -20; + } + else + { + xOffset = 30; + yOffset = 20; + } + + xCoords[0] = task->data[4] - xOffset; + xCoords[1] = task->data[4] - xOffset - 4; + xCoords[2] = task->data[4] + xOffset; + xCoords[3] = task->data[4] + xOffset + 4; + yCoords[0] = task->data[5] + yOffset; + yCoords[1] = task->data[5] + yOffset + 6; + + for (i = 0; i < 4; i++) + { + u8 spriteId = CreateSprite(&gSpriteTemplate_84028CC, xCoords[i], yCoords[i & 1], task->data[6] - 5); + if (spriteId != MAX_SPRITES) + { + gSprites[spriteId].data[0] = 0; + gSprites[spriteId].data[1] = i < 2 ? -2 : 2; + gSprites[spriteId].data[2] = -1; + gSprites[spriteId].data[3] = taskId; + gSprites[spriteId].data[4] = 2; + task->data[2]++; + } + } +} + +void sub_812FF94(struct Sprite *sprite) +{ + sprite->pos1.x += sprite->data[1]; + sprite->pos1.y += sprite->data[2]; + if (++sprite->data[0] > 6) + { + gTasks[sprite->data[3]].data[sprite->data[4]]--; + DestroySprite(sprite); + } +} + +void sub_812FFE4(u8 taskId) +{ + u8 spriteId; + + gTasks[taskId].data[0] = 0; + gTasks[taskId].data[1] = gBattleAnimArgs[1]; + spriteId = GetAnimBattlerSpriteId(gBattleAnimArgs[0]); + gTasks[taskId].data[2] = 0x100 + gSprites[spriteId].oam.paletteNum * 16; + gTasks[taskId].func = sub_813003C; +} + +static void sub_813003C(u8 taskId) +{ + if (gTasks[taskId].data[1]) + { + BlendPalette(gTasks[taskId].data[2], 16, 8, gUnknown_084028E4[gTasks[taskId].data[0]]); + if (++gTasks[taskId].data[0] > 23) + gTasks[taskId].data[0] = 0; + + gTasks[taskId].data[1]--; + } + else + { + BlendPalette(gTasks[taskId].data[2], 16, 0, RGB(0, 0, 0)); + DestroyAnimVisualTask(taskId); + } +} + +void sub_81300A4(u8 taskId) +{ + sub_80E3C4C( + taskId, + 0, + 0x1A0, + gAnimBankAttacker, + gBattleAnimArgs[0], + 10, + 2, + 30, + gUnknown_08D2E014, + gUnknown_08D2E170, + gUnknown_08D2E150); +} + +void sub_81300F4(struct Sprite *sprite) +{ + if (GetBattlerSide(gAnimBankAttacker) == B_SIDE_OPPONENT) + gBattleAnimArgs[0] = -gBattleAnimArgs[0]; + + sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 0) + gBattleAnimArgs[0]; + sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 1) + gBattleAnimArgs[1]; + if (gBattleAnimArgs[2] == 0) + { + sprite->data[0] = 640; + sprite->data[1] = -640; + } + else if (gBattleAnimArgs[2] == 1) + { + sprite->vFlip = 1; + sprite->data[0] = 640; + sprite->data[1] = 640; + } + else + { + StartSpriteAnim(sprite, 1); + sprite->data[0] = 640; + } + + if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER) + { + sprite->data[0] = -sprite->data[0]; + sprite->hFlip = 1; + } + + sprite->callback = sub_81301B4; +} + +static void sub_81301B4(struct Sprite *sprite) +{ + sprite->data[6] += sprite->data[0]; + sprite->data[7] += sprite->data[1]; + sprite->pos2.x = sprite->data[6] >> 8; + sprite->pos2.y = sprite->data[7] >> 8; + if (++sprite->data[5] == 14) + DestroyAnimSprite(sprite); +} + +void sub_81301EC(u8 taskId) +{ + struct Task *task = &gTasks[taskId]; + + if (IsContest()) + { + task->data[5] = 8; + task->data[6] = 3; + task->data[7] = 1; + } + else + { + task->data[5] = 12; + task->data[6] = 3; + task->data[7] = 0; + } + + if (GetBattlerSide(gAnimBankAttacker) == B_SIDE_PLAYER) + task->data[11] = GetBattlerSpriteCoord(gAnimBankAttacker, 2) + sub_807A100(gAnimBankAttacker, 0) / 4; + else + task->data[11] = GetBattlerSpriteCoord(gAnimBankAttacker, 2) - sub_807A100(gAnimBankAttacker, 0) / 4; + + task->data[12] = GetBattlerSpriteCoord(gAnimBankAttacker, 3) - sub_807A100(gAnimBankAttacker, 0) / 4; + task->data[13] = GetBattlerSpriteCoord(gAnimBankTarget, 2); + task->data[14] = GetBattlerSpriteCoord(gAnimBankTarget, 3); + task->func = sub_81302E4; +} + +static void sub_81302E4(u8 taskId) +{ + u8 i; + s16 x, y; + struct Task *task = &gTasks[taskId]; + + switch (task->data[0]) + { + case 0: + if (++task->data[1] > 3) + { + task->data[1] = 0; + sub_8130424( + task->data[11], + task->data[12], + task->data[13], + task->data[14], + task->data[5], + task->data[2], + &x, + &y); + + for (i = 0; i < 2; i++) + { + u8 spriteId = CreateSprite(&gSpriteTemplate_840294C, x, y, 35); + if (spriteId != MAX_SPRITES) + { + if (task->data[7] == 0) + { + if (i == 0) + gSprites[spriteId].pos2.x = gSprites[spriteId].pos2.y = -task->data[6]; + else + gSprites[spriteId].pos2.x = gSprites[spriteId].pos2.y = task->data[6]; + } + else + { + if (i == 0) + { + gSprites[spriteId].pos2.x = -task->data[6]; + gSprites[spriteId].pos2.y = task->data[6]; + } + else + { + gSprites[spriteId].pos2.x = task->data[6]; + gSprites[spriteId].pos2.y = -task->data[6]; + } + } + + gSprites[spriteId].data[0] = 0; + gSprites[spriteId].data[1] = taskId; + gSprites[spriteId].data[2] = 10; + task->data[10]++; + } + } + + if (task->data[2] == task->data[5]) + task->data[0]++; + + task->data[2]++; + } + break; + case 1: + if (task->data[10] == 0) + DestroyAnimVisualTask(taskId); + break; + } +} + +static void sub_8130424(s16 arg0, s16 arg1, s16 arg2, s16 arg3, u8 arg4, u8 arg5, s16 *x, s16 *y) +{ + int x2; + int y2; + + if (arg5 == 0) + { + *x = arg0; + *y = arg1; + return; + } + + if (arg5 >= arg4) + { + *x = arg2; + *y = arg3; + return; + } + + arg4--; + x2 = (arg0 << 8) + arg5 * (((arg2 - arg0) << 8) / arg4); + y2 = (arg1 << 8) + arg5 * (((arg3 - arg1) << 8) / arg4); + *x = x2 >> 8; + *y = y2 >> 8; +} + +void sub_81304DC(struct Sprite *sprite) +{ + if (++sprite->data[0] > 36) + { + gTasks[sprite->data[1]].data[sprite->data[2]]--; + DestroySprite(sprite); + } +} + +void sub_813051C(struct Sprite *sprite) +{ + sprite->pos1.x = gBattleAnimArgs[0]; + sprite->pos1.y = gBattleAnimArgs[1]; + sprite->data[2] = gBattleAnimArgs[2]; + sprite->data[4] = gBattleAnimArgs[3]; + sprite->data[0] = gBattleAnimArgs[4]; + StoreSpriteCallbackInData(sprite, DestroyAnimSprite); + sprite->callback = sub_8078CC0; +} + +void sub_8130554(u8 taskId) +{ + struct Task *task = &gTasks[taskId]; + + task->data[11] = GetBattlerSpriteCoord(gAnimBankAttacker, 2); + task->data[12] = GetBattlerSpriteCoord(gAnimBankAttacker, 3); + task->data[13] = GetBattlerSpriteCoord(gAnimBankTarget, 2); + task->data[14] = GetBattlerSpriteCoord(gAnimBankTarget, 3) + sub_807A100(gAnimBankTarget, 0) / 4; + task->data[15] = CreateSprite(&gSpriteTemplate_84029AC, task->data[11], task->data[12], sub_8079E90(gAnimBankTarget) - 5); + if (task->data[15] != MAX_SPRITES) + { + gSprites[task->data[15]].data[0] = 16; + gSprites[task->data[15]].data[2] = task->data[13]; + gSprites[task->data[15]].data[4] = task->data[14]; + gSprites[task->data[15]].data[5] = -32; + InitAnimArcTranslation(&gSprites[task->data[15]]); + if (GetBattlerSide(gAnimBankAttacker) == B_SIDE_OPPONENT) + StartSpriteAffineAnim(&gSprites[task->data[15]], 1); + + task->func = sub_81306A4; + } + else + { + DestroyAnimVisualTask(taskId); + } +} + +static void sub_81306A4(u8 taskId) +{ + struct Task *task = &gTasks[taskId]; + + switch (task->data[0]) + { + case 0: + if (++task->data[1] > 1) + { + task->data[1] = 0; + TranslateAnimArc(&gSprites[task->data[15]]); + if (++task->data[2] > 7) + task->data[0]++; + } + break; + case 1: + if (TranslateAnimArc(&gSprites[task->data[15]])) + { + task->data[1] = 0; + task->data[2] = 0; + task->data[0]++; + } + break; + case 2: + if (++task->data[1] > 1) + { + task->data[1] = 0; + task->data[2]++; + gSprites[task->data[15]].invisible = task->data[2] & 1; + if (task->data[2] == 16) + { + FreeOamMatrix(gSprites[task->data[15]].oam.matrixNum); + DestroySprite(&gSprites[task->data[15]]); + task->data[0]++; + } + } + break; + case 3: + DestroyAnimVisualTask(taskId); + break; + } +} + +void sub_81307B0(struct Sprite *sprite) +{ + u8 battler; + + if (gBattleAnimArgs[0] == 0) + battler = gAnimBankAttacker; + else + battler = gAnimBankTarget; + + sprite->oam.tileNum += 16; + sprite->data[6] = gBattleAnimArgs[2]; + sprite->data[7] = gBattleAnimArgs[1] == 0 ? -1 : 1; + sprite->pos1.y = GetBattlerSpriteCoord(battler, 3); + if (gBattleAnimArgs[1] == 0) + { + sprite->oam.matrixNum |= 0x8; + sprite->pos1.x = sub_807A100(battler, 4) - 8; + } + else + { + sprite->pos1.x = sub_807A100(battler, 5) + 8; + } + + sprite->callback = sub_813085C; +} + +static void sub_813085C(struct Sprite *sprite) +{ + switch (sprite->data[0]) + { + case 0: + if (++sprite->data[1] > 1) + { + sprite->data[1] = 0; + sprite->pos2.x += sprite->data[7]; + if (++sprite->data[2] == 12) + sprite->data[0]++; + } + break; + case 1: + if (++sprite->data[1] == 8) + { + sprite->data[1] = 0; + sprite->data[0]++; + } + break; + case 2: + sprite->pos2.x -= sprite->data[7] * 4; + if (++sprite->data[1] == 6) + { + sprite->data[1] = 0; + sprite->data[0]++; + } + break; + case 3: + sprite->pos2.x += sprite->data[7] * 3; + if (++sprite->data[1] == 8) + { + if (--sprite->data[6]) + { + sprite->data[1] = 0; + sprite->data[0]--; + } + else + { + DestroyAnimSprite(sprite); + } + } + break; + } +} + +void sub_8130918(u8 taskId) +{ + if (gBattleAnimArgs[0] == 0) + { + DestroyAnimVisualTask(taskId); + } + else + { + gTasks[taskId].data[0] = gBattleAnimArgs[1]; + gTasks[taskId].data[15] = GetAnimBattlerSpriteId(gBattleAnimArgs[0]); + sub_80798F4(&gTasks[taskId], gTasks[taskId].data[15], &gUnknown_084029DC); + gTasks[taskId].func = sub_8130970; + } +} + +static void sub_8130970(u8 taskId) +{ + struct Task *task = &gTasks[taskId]; + + if (++task->data[1] > 1) + { + task->data[1] = 0; + if (!(task->data[2] & 1)) + gSprites[task->data[15]].pos2.x = 2; + else + gSprites[task->data[15]].pos2.x = -2; + } + + if (!sub_807992C(task)) + { + gSprites[task->data[15]].pos2.x = 0; + if (--task->data[0]) + { + sub_80798F4(&gTasks[taskId], gTasks[taskId].data[15], &gUnknown_084029DC); + task->data[1] = 0; + task->data[2] = 0; + } + else + { + DestroyAnimVisualTask(taskId); + } + } +} + +void sub_8130A2C(struct Sprite *sprite) +{ + if (gBattleAnimArgs[0] == 0) + { + sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2); + sprite->pos1.y = sub_807A100(gAnimBankAttacker, 2); + } + else + { + sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankTarget, 2); + sprite->pos1.y = sub_807A100(gAnimBankTarget, 2); + } + + if (sprite->pos1.y < 8) + sprite->pos1.y = 8; + + sprite->data[0] = 0; + sprite->data[1] = gBattleAnimArgs[1]; + sprite->data[2] = 0; + sprite->data[3] = gBattleAnimArgs[2]; + sprite->callback = sub_8130A94; +} + +static void sub_8130A94(struct Sprite *sprite) +{ + if (++sprite->data[0] >= sprite->data[1]) + { + sprite->data[0] = 0; + sprite->data[2] = (sprite->data[2] + 1) & 1; + sprite->invisible = sprite->data[2]; + if (sprite->data[2] && --sprite->data[3] == 0) + DestroyAnimSprite(sprite); + } +} + +void sub_8130AEC(struct Sprite *sprite) +{ + if (gBattleAnimArgs[0] == 0) + { + sprite->oam.matrixNum |= 0x8; + sprite->pos1.x = 100; + sprite->data[7] = 1; + } + else + { + sprite->pos1.x = 140; + sprite->data[7] = -1; + } + + sprite->pos1.y = 56; + sprite->callback = sub_8130B38; +} + +static void sub_8130B38(struct Sprite *sprite) +{ + switch (sprite->data[0]) + { + case 0: + sprite->pos1.y -= sprite->data[7] * 2; + if (sprite->data[1] & 1) + sprite->pos1.x -= sprite->data[7] * 2; + + if (++sprite->data[1] == 9) + { + sprite->data[1] = 0; + sprite->data[0]++; + } + break; + case 1: + if (++sprite->data[1] == 4) + { + sprite->data[1] = 0; + sprite->data[0]++; + } + break; + case 2: + sprite->data[1]++; + sprite->pos1.y += sprite->data[7] * 3; + sprite->pos2.x = sprite->data[7] * (gSineTable[sprite->data[1] * 10] >> 3); + if (sprite->data[1] == 12) + { + sprite->data[1] = 0; + sprite->data[0]++; + } + break; + case 3: + if (++sprite->data[1] == 2) + { + sprite->data[1] = 0; + sprite->data[0]++; + } + break; + case 4: + sprite->data[1]++; + sprite->pos1.y -= sprite->data[7] * 3; + sprite->pos2.x = sprite->data[7] * (gSineTable[sprite->data[1] * 10] >> 3); + if (sprite->data[1] == 12) + sprite->data[0]++; + break; + case 5: + sprite->data[1]++; + sprite->pos1.y += sprite->data[7] * 3; + sprite->pos2.x = sprite->data[7] * (gSineTable[sprite->data[1] * 10] >> 3); + if (sprite->data[1] == 15) + sprite->oam.tileNum += 16; + + if (sprite->data[1] == 18) + { + sprite->data[1] = 0; + sprite->data[0]++; + } + break; + case 6: + sprite->pos1.x += sprite->data[7] * 6; + if (++sprite->data[1] == 9) + { + sprite->data[1] = 0; + sprite->data[0]++; + } + break; + case 7: + sprite->pos1.x += sprite->data[7] * 2; + if (++sprite->data[1] == 1) + { + sprite->data[1] = 0; + sprite->data[0]++; + } + break; + case 8: + sprite->pos1.x -= sprite->data[7] * 3; + if (++sprite->data[1] == 5) + DestroyAnimSprite(sprite); + break; + } +} + +void sub_8130D20(u8 taskId) +{ + struct Task *task = &gTasks[taskId]; + + task->data[15] = GetAnimBattlerSpriteId(0); + if (!IsContest()) + { + if (IsDoubleBattle() == TRUE) + { + int x = GetBattlerSpriteCoord(gAnimBankAttacker, 0); + int y = GetBattlerSpriteCoord(gAnimBankAttacker ^ 2, 0); + if (x > y) + task->data[14] = 1; + else + task->data[14] = -1; + } + else + { + if (GetBattlerSide(gAnimBankAttacker) == B_SIDE_PLAYER) + task->data[14] = -1; + else + task->data[14] = 1; + } + } + else + { + task->data[14] = 1; + } + + task->func = sub_8130DBC; +} + +static void sub_8130DBC(u8 taskId) +{ + struct Task *task = &gTasks[taskId]; + + switch (task->data[0]) + { + case 0: + if (++task->data[1] == 13) + { + task->data[1] = 0; + task->data[0]++; + } + break; + case 1: + gSprites[task->data[15]].pos2.x -= task->data[14] * 3; + if (++task->data[1] == 6) + { + task->data[1] = 0; + task->data[0]++; + } + break; + case 2: + gSprites[task->data[15]].pos2.x += task->data[14] * 3; + if (++task->data[1] == 6) + { + task->data[1] = 0; + task->data[0]++; + } + break; + case 3: + if (++task->data[1] == 2) + { + task->data[1] = 0; + if (task->data[2] == 0) + { + task->data[2]++; + task->data[0] = 1; + } + else + { + task->data[0]++; + } + } + break; + case 4: + gSprites[task->data[15]].pos2.x += task->data[14]; + if (++task->data[1] == 3) + { + task->data[1] = 0; + task->data[0]++; + } + break; + case 5: + if (++task->data[1] == 6) + { + task->data[1] = 0; + task->data[0]++; + } + break; + case 6: + gSprites[task->data[15]].pos2.x -= task->data[14] * 4; + if (++task->data[1] == 5) + { + task->data[1] = 0; + task->data[0]++; + } + break; + case 7: + gSprites[task->data[15]].pos2.x += task->data[14] * 4; + if (++task->data[1] == 5) + { + task->data[1] = 0; + task->data[0]++; + } + break; + case 8: + gSprites[task->data[15]].pos2.x = 0; + DestroyAnimVisualTask(taskId); + break; + } +} + +void sub_8130F5C(struct Sprite *sprite) +{ + if (gBattleAnimArgs[0] == 0) + { + InitAnimSpritePos(sprite, 1); + sprite->data[7] = gAnimBankAttacker; + } + else + { + sprite->data[7] = gAnimBankTarget; + } + + if (GetBattlerSide(sprite->data[7]) == B_SIDE_OPPONENT) + sprite->oam.matrixNum = 8; + + sprite->oam.priority = sub_8079ED4(sprite->data[7]); + sprite->oam.objMode = ST_OAM_OBJ_BLEND; + sprite->callback = sub_8130FE0; +} + +static void sub_8130FE0(struct Sprite *sprite) +{ + u16 x, y; + + switch (sprite->data[5]) + { + case 0: + switch (sprite->data[6]) + { + default: + sprite->data[6] = 0; + case 0: + case 4: + x = sub_807A100(sprite->data[7], 5) - 4; + y = sub_807A100(sprite->data[7], 3) - 4; + break; + case 1: + x = sub_807A100(sprite->data[7], 5) - 4; + y = sub_807A100(sprite->data[7], 2) + 4; + break; + case 2: + x = sub_807A100(sprite->data[7], 4) + 4; + y = sub_807A100(sprite->data[7], 3) - 4; + break; + case 3: + x = sub_807A100(sprite->data[7], 4) + 4; + y = sub_807A100(sprite->data[7], 2) - 4; + break; + case 5: + x = GetBattlerSpriteCoord(sprite->data[7], 2); + y = GetBattlerSpriteCoord(sprite->data[7], 3); + break; + } + + if (sprite->data[6] == 4) + sprite->data[0] = 24; + else if (sprite->data[6] == 5) + sprite->data[0] = 6; + else + sprite->data[0] = 12; + + sprite->data[1] = sprite->pos1.x; + sprite->data[2] = x; + sprite->data[3] = sprite->pos1.y; + sprite->data[4] = y; + InitAnimLinearTranslation(sprite); + sprite->data[5]++; + break; + case 1: + if (TranslateAnimLinear(sprite)) + { + switch (sprite->data[6]) + { + default: + sprite->pos1.x += sprite->pos2.x; + sprite->pos1.y += sprite->pos2.y; + sprite->pos2.y = 0; + sprite->pos2.x = 0; + sprite->data[0] = 0; + sprite->data[5]++; + sprite->data[6]++; + break; + case 4: + sprite->pos1.x += sprite->pos2.x; + sprite->pos1.y += sprite->pos2.y; + sprite->pos2.y = 0; + sprite->pos2.x = 0; + sprite->data[5] = 0; + sprite->data[6]++; + break; + case 5: + sprite->data[0] = 0; + sprite->data[1] = 16; + sprite->data[2] = 0; + sprite->data[5] = 3; + break; + } + } + break; + case 2: + if (++sprite->data[0] == 4) + sprite->data[5] = 0; + break; + case 3: + if (!(sprite->data[0] & 1)) + sprite->data[1]--; + else + sprite->data[2]++; + + REG_BLDALPHA = (sprite->data[2] << 8) | sprite->data[1]; + if (++sprite->data[0] == 32) + { + sprite->invisible = 1; + sprite->data[5]++; + } + break; + case 4: + DestroyAnimSprite(sprite); + break; + } +} + +static void sub_81311E4(struct Sprite *sprite) +{ + sprite->pos2.x = ((sprite->data[2] - sprite->data[0]) * sprite->data[5]) / sprite->data[4]; + sprite->pos2.y = ((sprite->data[3] - sprite->data[1]) * sprite->data[5]) / sprite->data[4]; + if (!(sprite->data[5] & 1)) + { + CreateSprite( + &gSpriteTemplate_8402500, + sprite->pos1.x + sprite->pos2.x, + sprite->pos1.y + sprite->pos2.y, 5); + } + + if (sprite->data[5] == sprite->data[4]) + DestroyAnimSprite(sprite); + + sprite->data[5]++; +} + +void sub_8131264(struct Sprite *sprite) +{ + GetBattlerSpriteCoord(gAnimBankTarget, 2); // unused local variable + GetBattlerSpriteCoord(gAnimBankTarget, 3); // unused local variable + + if (GetBattlerSide(gAnimBankTarget) == B_SIDE_PLAYER || IsContest()) + { + sprite->data[0] = sprite->pos1.x - gBattleAnimArgs[0]; + sprite->data[2] = sprite->pos1.x - gBattleAnimArgs[2]; + } + else + { + sprite->data[0] = sprite->pos1.x + gBattleAnimArgs[0]; + sprite->data[2] = sprite->pos1.x + gBattleAnimArgs[2]; + } + + sprite->data[1] = sprite->pos1.y + gBattleAnimArgs[1]; + sprite->data[3] = sprite->pos1.y + gBattleAnimArgs[3]; + sprite->data[4] = gBattleAnimArgs[4]; + sprite->pos1.x = sprite->data[0]; + sprite->pos1.y = sprite->data[1]; + sprite->callback = sub_81311E4; +} + +void sub_81312E4(u8 taskId) +{ + int i; + u8 spriteId = GetAnimBattlerSpriteId(0); + + if (gTasks[taskId].data[0] == 0) + { + sub_8078E70(spriteId, 0); + gTasks[taskId].data[1] = 0x100; + gTasks[taskId].data[2] = 0x100; + gTasks[taskId].data[0]++; + } + else if (gTasks[taskId].data[0] == 1) + { + gTasks[taskId].data[1] += 0x60; + gTasks[taskId].data[2] -= 0xD; + obj_id_set_rotscale(spriteId, gTasks[taskId].data[1], gTasks[taskId].data[2], 0); + if (++gTasks[taskId].data[3] == 9) + { + gTasks[taskId].data[3] = 0; + sub_8078F40(spriteId); + gSprites[spriteId].invisible = 1; + gTasks[taskId].data[0]++; + } + } + else + { + refresh_graphics_maybe(gAnimBankAttacker, 0, spriteId); + if (IsContest()) + { + gSprites[gBankSpriteIds[gAnimBankAttacker]].affineAnims = gSpriteAffineAnimTable_81E7C18; + StartSpriteAffineAnim(&gSprites[gBankSpriteIds[gAnimBankAttacker]], 0); + } + + for (i = 0; i < 16; i++) + gTasks[taskId].data[i] = 0; + + gTasks[taskId].func = sub_8131408; + } +} + +static void sub_8131408(u8 taskId) +{ + u8 spriteId = GetAnimBattlerSpriteId(0); + + switch (gTasks[taskId].data[0]) + { + case 0: + gSprites[spriteId].pos2.y = -200; + gSprites[spriteId].pos2.x = 200; + gSprites[spriteId].invisible = 0; + gTasks[taskId].data[10] = 0; + gTasks[taskId].data[0]++; + break; + case 1: + gTasks[taskId].data[10] += 112; + gSprites[spriteId].pos2.y += gTasks[taskId].data[10] >> 8; + if (gSprites[spriteId].pos1.y + gSprites[spriteId].pos2.y >= -32) + gSprites[spriteId].pos2.x = 0; + + if (gSprites[spriteId].pos2.y > 0) + gSprites[spriteId].pos2.y = 0; + + if (gSprites[spriteId].pos2.y == 0) + { + PlaySE12WithPanning(SE_W145B, BattleAnimAdjustPanning(-64)); + gTasks[taskId].data[10] -= 0x800; + gTasks[taskId].data[0]++; + } + break; + case 2: + gTasks[taskId].data[10] -= 112; + if (gTasks[taskId].data[10] < 0) + gTasks[taskId].data[10] = 0; + + gSprites[spriteId].pos2.y -= gTasks[taskId].data[10] >> 8; + if (gTasks[taskId].data[10] == 0) + gTasks[taskId].data[0]++; + break; + case 3: + gTasks[taskId].data[10] += 112; + gSprites[spriteId].pos2.y += gTasks[taskId].data[10] >> 8; + if (gSprites[spriteId].pos2.y > 0) + gSprites[spriteId].pos2.y = 0; + + if (gSprites[spriteId].pos2.y == 0) + { + PlaySE12WithPanning(SE_W145B, BattleAnimAdjustPanning(-64)); + DestroyAnimVisualTask(taskId); + } + break; + } +} + +void sub_8131564(struct Sprite *sprite) +{ + s16 y2; + + if (GetBattlerSide(gAnimBankTarget) == B_SIDE_PLAYER) + { + sprite->subpriority = sub_8079E90(gAnimBankTarget) - 2; + y2 = -144; + } + else + { + sprite->subpriority = sub_8079E90(gAnimBankTarget) + 2; + y2 = -96; + } + + sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankTarget, 3); + sprite->pos2.y = y2; + sprite->callback = sub_81315C8; +} + +static void sub_81315C8(struct Sprite *sprite) +{ + switch (sprite->data[0]) + { + case 0: + sprite->pos2.y += 10; + if (sprite->pos2.y >= 0) + { + PlaySE12WithPanning(SE_W166, BattleAnimAdjustPanning(63)); + sprite->pos2.y = 0; + sprite->data[0]++; + } + break; + case 1: + sprite->data[1] += 4; + sprite->pos2.y = -(gSineTable[sprite->data[1]] >> 3); + if (sprite->data[1] > 127) + { + PlaySE12WithPanning(SE_W166, BattleAnimAdjustPanning(63)); + sprite->data[1] = 0; + sprite->pos2.y = 0; + sprite->data[0]++; + } + break; + case 2: + sprite->data[1] += 6; + sprite->pos2.y = -(gSineTable[sprite->data[1]] >> 4); + if (sprite->data[1] > 127) + { + sprite->data[1] = 0; + sprite->pos2.y = 0; + sprite->data[0]++; + } + break; + case 3: + if (++sprite->data[1] > 8) + { + PlaySE12WithPanning(SE_W043, BattleAnimAdjustPanning(63)); + sprite->data[1] = 0; + sprite->data[0]++; + } + break; + case 4: + if (++sprite->data[1] > 8) + { + sprite->data[1] = 0; + sprite->data[2]++; + sprite->invisible = sprite->data[2] & 1; + if (sprite->data[2] == 7) + DestroyAnimSprite(sprite); + } + break; + } +} + +void sub_81316F8(u8 taskId) +{ + s16 spriteId1, spriteId2; + + if (IsContest()) + { + DestroyAnimVisualTask(taskId); + return; + } + + spriteId1 = duplicate_obj_of_side_rel2move_in_transparent_mode(1); + if (spriteId1 < 0) + { + DestroyAnimVisualTask(taskId); + return; + } + + spriteId2 = duplicate_obj_of_side_rel2move_in_transparent_mode(1); + if (spriteId2 < 0) + { + obj_delete_but_dont_free_vram(&gSprites[spriteId1]); + DestroyAnimVisualTask(taskId); + return; + } + + gSprites[spriteId2].pos2.x += 24; + gSprites[spriteId1].pos2.x -= 24; + gSprites[spriteId2].data[0] = 0; + gSprites[spriteId1].data[0] = 0; + gSprites[spriteId2].data[1] = 0; + gSprites[spriteId1].data[1] = 0; + gSprites[spriteId2].data[2] = 0; + gSprites[spriteId1].data[2] = 0; + gSprites[spriteId2].data[3] = 16; + gSprites[spriteId1].data[3] = -16; + gSprites[spriteId2].data[4] = 0; + gSprites[spriteId1].data[4] = 128; + gSprites[spriteId2].data[5] = 24; + gSprites[spriteId1].data[5] = 24; + gSprites[spriteId2].data[6] = taskId; + gSprites[spriteId1].data[6] = taskId; + gSprites[spriteId2].data[7] = 0; + gSprites[spriteId1].data[7] = 0; + gTasks[taskId].data[0] = 2; + gSprites[spriteId2].invisible = 0; + gSprites[spriteId1].invisible = 1; + gSprites[spriteId2].oam.objMode = ST_OAM_OBJ_NORMAL; + gSprites[spriteId1].oam.objMode = ST_OAM_OBJ_NORMAL; + gSprites[spriteId2].callback = sub_8131838; + gSprites[spriteId1].callback = sub_8131838; + gTasks[taskId].func = sub_8131810; +} + +static void sub_8131810(u8 taskId) +{ + if (gTasks[taskId].data[0] == 0) + DestroyAnimVisualTask(taskId); +} + +static void sub_8131838(struct Sprite *sprite) +{ + if (++sprite->data[1] > 1) + { + sprite->data[1] = 0; + sprite->invisible ^= 1; + } + + sprite->data[4] = (sprite->data[4] + sprite->data[3]) & 0xFF; + sprite->pos2.x = Cos(sprite->data[4], sprite->data[5]); + switch (sprite->data[0]) + { + case 0: + if (++sprite->data[2] == 60) + { + sprite->data[2] = 0; + sprite->data[0]++; + } + break; + case 1: + if (++sprite->data[2] > 0) + { + sprite->data[2] = 0; + sprite->data[5] -= 2; + if (sprite->data[5] < 0) + { + gTasks[sprite->data[6]].data[sprite->data[7]]--; + obj_delete_but_dont_free_vram(sprite); + } + } + break; + } +} diff --git a/src/contest_effect.c b/src/contest_effect.c index a5615851f..d97f38138 100644 --- a/src/contest_effect.c +++ b/src/contest_effect.c @@ -158,10 +158,8 @@ static void ContestEffect_StartlePrevMons(void) u8 a = shared192D0.contestant; if (shared192D0.turnOrder[a] != 0) { - int i; - int j = 0; - - for (i = 0; i < 4; i++) + int i, j; + for (i = 0, j = 0; i < 4; i++) if (shared192D0.turnOrder[a] > shared192D0.turnOrder[i]) shared192D0.jamQueue[j++] = i; shared192D0.jamQueue[j] = 0xFF; @@ -1113,16 +1111,20 @@ static bool8 WasAtLeastOneOpponentJammed(void) shared192D0.jam2 = 10; SetContestantEffectStringID(contestant, CONTEST_STRING_LITTLE_DISTRACTED); } - else if ((shared192D0.jam2 -= sContestantStatus[contestant].jamReduction) <= 0) - { - shared192D0.jam2 = 0; - SetContestantEffectStringID(contestant, CONTEST_STRING_NOT_FAZED); - } else { - JamContestant(contestant, shared192D0.jam2); - SetStartledString(contestant, shared192D0.jam2); - jamBuffer[contestant] = shared192D0.jam2; + shared192D0.jam2 -= sContestantStatus[contestant].jamReduction; + if (shared192D0.jam2 <= 0) + { + shared192D0.jam2 = 0; + SetContestantEffectStringID(contestant, CONTEST_STRING_NOT_FAZED); + } + else + { + JamContestant(contestant, shared192D0.jam2); + SetStartledString(contestant, shared192D0.jam2); + jamBuffer[contestant] = shared192D0.jam2; + } } } } -- cgit v1.2.3 From 6b153b3a0d8bee97e13c395c1228b7465738f64c Mon Sep 17 00:00:00 2001 From: Jo Ruby P Date: Wed, 15 Aug 2018 13:37:13 +0100 Subject: load_save.c uses constants defined in global.h --- include/global.h | 3 ++- include/pokemon.h | 1 - src/load_save.c | 32 ++++++++++++++++---------------- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/include/global.h b/include/global.h index 36e1db978..4dc23e12f 100644 --- a/include/global.h +++ b/include/global.h @@ -96,7 +96,8 @@ enum LanguageId // capacities of various saveblock objects #define DAYCARE_MON_COUNT 2 #define POKEBLOCKS_COUNT 40 -#define EVENT_OBJECTS_COUNT 16 +#define PARTY_SIZE 6 +#define EVENT_OBJECTS_COUNT 16 #define BERRY_TREES_COUNT 128 #define FLAGS_COUNT 288 #define VARS_COUNT 256 diff --git a/include/pokemon.h b/include/pokemon.h index 783263aad..67ce267ab 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -137,7 +137,6 @@ #define STATUS_PRIMARY_POKERUS 0x6 #define STATUS_PRIMARY_FAINTED 0x7 -#define PARTY_SIZE 6 #define MAX_TOTAL_EVS 510 #define NUM_STATS 6 #define UNOWN_FORM_COUNT 28 diff --git a/src/load_save.c b/src/load_save.c index 7960a42eb..a1ca7ce76 100644 --- a/src/load_save.c +++ b/src/load_save.c @@ -67,7 +67,7 @@ void SavePlayerParty(void) gSaveBlock1.playerPartyCount = gPlayerPartyCount; - for (i = 0; i < 6; i++) + for (i = 0; i < PARTY_SIZE; i++) gSaveBlock1.playerParty[i] = gPlayerParty[i]; } @@ -77,7 +77,7 @@ void LoadPlayerParty(void) gPlayerPartyCount = gSaveBlock1.playerPartyCount; - for (i = 0; i < 6; i++) + for (i = 0; i < PARTY_SIZE; i++) gPlayerParty[i] = gSaveBlock1.playerParty[i]; } @@ -85,7 +85,7 @@ static void SaveEventObjects(void) { int i; - for (i = 0; i < 16; i++) + for (i = 0; i < EVENT_OBJECTS_COUNT; i++) gSaveBlock1.eventObjects[i] = gEventObjects[i]; } @@ -93,7 +93,7 @@ static void LoadEventObjects(void) { int i; - for (i = 0; i < 16; i++) + for (i = 0; i < EVENT_OBJECTS_COUNT; i++) gEventObjects[i] = gSaveBlock1.eventObjects[i]; } @@ -114,27 +114,27 @@ void LoadPlayerBag(void) int i; // load player items. - for (i = 0; i < 20; i++) + for (i = 0; i < BAG_ITEMS_COUNT; i++) gLoadedSaveData.items[i] = gSaveBlock1.bagPocket_Items[i]; // load player key items. - for (i = 0; i < 20; i++) + for (i = 0; i < BAG_KEYITEMS_COUNT; i++) gLoadedSaveData.keyItems[i] = gSaveBlock1.bagPocket_KeyItems[i]; // load player pokeballs. - for (i = 0; i < 16; i++) + for (i = 0; i < BAG_POKEBALLS_COUNT; i++) gLoadedSaveData.pokeBalls[i] = gSaveBlock1.bagPocket_PokeBalls[i]; // load player TMs and HMs. - for (i = 0; i < 64; i++) + for (i = 0; i < BAG_TMHM_COUNT; i++) gLoadedSaveData.TMsHMs[i] = gSaveBlock1.bagPocket_TMHM[i]; // load player berries. - for (i = 0; i < 46; i++) + for (i = 0; i < BAG_BERRIES_COUNT; i++) gLoadedSaveData.berries[i] = gSaveBlock1.bagPocket_Berries[i]; // load mail. - for (i = 0; i < 16; i++) + for (i = 0; i < MAIL_COUNT; i++) gLoadedSaveData.mail[i] = gSaveBlock1.mail[i]; } @@ -143,26 +143,26 @@ void SavePlayerBag(void) int i; // save player items. - for (i = 0; i < 20; i++) + for (i = 0; i < BAG_ITEMS_COUNT; i++) gSaveBlock1.bagPocket_Items[i] = gLoadedSaveData.items[i]; // save player key items. - for (i = 0; i < 20; i++) + for (i = 0; i < BAG_KEYITEMS_COUNT; i++) gSaveBlock1.bagPocket_KeyItems[i] = gLoadedSaveData.keyItems[i]; // save player pokeballs. - for (i = 0; i < 16; i++) + for (i = 0; i < BAG_POKEBALLS_COUNT; i++) gSaveBlock1.bagPocket_PokeBalls[i] = gLoadedSaveData.pokeBalls[i]; // save player TMs and HMs. - for (i = 0; i < 64; i++) + for (i = 0; i < BAG_TMHM_COUNT; i++) gSaveBlock1.bagPocket_TMHM[i] = gLoadedSaveData.TMsHMs[i]; // save player berries. - for (i = 0; i < 46; i++) + for (i = 0; i < BAG_BERRIES_COUNT; i++) gSaveBlock1.bagPocket_Berries[i] = gLoadedSaveData.berries[i]; // save mail. - for (i = 0; i < 16; i++) + for (i = 0; i < MAIL_COUNT; i++) gSaveBlock1.mail[i] = gLoadedSaveData.mail[i]; } -- cgit v1.2.3 From ae4d91ce501864fef180155927912c32d931e14e Mon Sep 17 00:00:00 2001 From: Jo Ruby P Date: Wed, 15 Aug 2018 15:27:58 +0100 Subject: Label unknowns and fillers, add constants to global.h, use constants in record_mixing.c and tv.c --- include/global.h | 6 ++++-- src/record_mixing.c | 22 +++++++++++----------- src/tv.c | 48 ++++++++++++++++++++++++------------------------ 3 files changed, 39 insertions(+), 37 deletions(-) diff --git a/include/global.h b/include/global.h index 4dc23e12f..374701930 100644 --- a/include/global.h +++ b/include/global.h @@ -103,6 +103,8 @@ enum LanguageId #define VARS_COUNT 256 #define MAIL_COUNT 16 #define SECRET_BASES_COUNT 20 +#define TV_SHOWS_COUNT 25 +#define POKE_NEWS_COUNT 16 #define PC_ITEMS_COUNT 50 #define BAG_ITEMS_COUNT 20 #define BAG_KEYITEMS_COUNT 20 @@ -687,8 +689,8 @@ struct SaveBlock1 /* 0x02025734 */ /*0x2704*/ u8 decorDoll[40]; /*0x272C*/ u8 decorCushion[10]; /*0x2736*/ u8 padding_2736[2]; - /*0x2738*/ TVShow tvShows[25]; - /*0x2ABC*/ struct PokeNews pokeNews[16]; + /*0x2738*/ TVShow tvShows[TV_SHOWS_COUNT]; + /*0x2ABC*/ struct PokeNews pokeNews[POKE_NEWS_COUNT]; /*0x2AFC*/ u16 outbreakPokemonSpecies; /*0x2AFE*/ u8 outbreakLocationMapNum; /*0x2AFF*/ u8 outbreakLocationMapGroup; diff --git a/src/record_mixing.c b/src/record_mixing.c index 50ef21139..374e73d2e 100644 --- a/src/record_mixing.c +++ b/src/record_mixing.c @@ -36,8 +36,8 @@ static u8 gUnknown_0300071C[4]; void *recordMixingSecretBases = &gSaveBlock1.secretBases; void *recordMixingTvShows = &gSaveBlock1.tvShows; -void *gUnknown_083D0274 = &gSaveBlock1.pokeNews; -void *gUnknown_083D0278 = &gSaveBlock1.mauvilleMan; +void *recordMixingPokeNews = &gSaveBlock1.pokeNews; +void *recordMixingMauvilleMan = &gSaveBlock1.mauvilleMan; void *recordMixingEasyChatPairs = &gSaveBlock1.easyChatPairs; struct RecordMixingDayCareMail *gDayCareMailPlayerRecord = &gDayCareMailRecord; struct BattleTowerRecord *gBattleTowerPlayerRecord = &gSaveBlock2.battleTower.playerRecord; @@ -51,10 +51,10 @@ void sub_80B929C(void) struct PlayerRecords { - struct SecretBaseRecord secretBases[20]; - TVShow tvShows[25]; - u8 filler1004[0x40]; - u8 filler1044[0x40]; + struct SecretBaseRecord secretBases[SECRET_BASES_COUNT]; + TVShow tvShows[TV_SHOWS_COUNT]; + struct PokeNews pokeNews[POKE_NEWS_COUNT]; + union MauvilleMan mauvilleMan; struct EasyChatPair easyChatPairs[5]; struct RecordMixingDayCareMail daycareMailRecord; struct BattleTowerRecord battleTowerRecord; @@ -68,8 +68,8 @@ void RecordMixing_PrepareExchangePacket(void) memcpy(ewram_2018000.secretBases, recordMixingSecretBases, sizeof(ewram_2018000.secretBases)); memcpy(ewram_2018000.tvShows, recordMixingTvShows, sizeof(ewram_2018000.tvShows)); - memcpy(ewram_2018000.filler1004, gUnknown_083D0274, sizeof(ewram_2008000.filler1004)); - memcpy(ewram_2018000.filler1044, gUnknown_083D0278, sizeof(ewram_2008000.filler1044)); + memcpy(ewram_2018000.pokeNews, recordMixingPokeNews, sizeof(ewram_2008000.pokeNews)); + memcpy(&ewram_2018000.mauvilleMan, recordMixingMauvilleMan, sizeof(ewram_2008000.mauvilleMan)); memcpy(ewram_2018000.easyChatPairs, recordMixingEasyChatPairs, sizeof(ewram_2018000.easyChatPairs)); gDayCareMailRecord.mail[0] = gSaveBlock1.daycare.misc.mail[0]; gDayCareMailRecord.mail[1] = gSaveBlock1.daycare.misc.mail[1]; @@ -85,8 +85,8 @@ void RecordMixing_ReceiveExchangePacket(u32 a) { sub_80BD674(ewram_2008000.secretBases, sizeof(struct PlayerRecords), a); sub_80BFD44((u8 *)ewram_2008000.tvShows, sizeof(struct PlayerRecords), a); - sub_80C0514(ewram_2008000.filler1004, sizeof(struct PlayerRecords), a); - sub_80B9B1C(ewram_2008000.filler1044, sizeof(struct PlayerRecords), a); + sub_80C0514(ewram_2008000.pokeNews, sizeof(struct PlayerRecords), a); + sub_80B9B1C((u8 *)&ewram_2008000.mauvilleMan, sizeof(struct PlayerRecords), a); sub_80FA4E4(ewram_2008000.easyChatPairs, sizeof(struct PlayerRecords), a); sub_80B9C6C((u8 *)&ewram_2008000.daycareMailRecord, sizeof(struct PlayerRecords), a, ewram_2008000.tvShows); sub_80B9B70(&ewram_2008000.battleTowerRecord, sizeof(struct PlayerRecords), a); @@ -439,7 +439,7 @@ void sub_80B9B1C(u8 *a, size_t size, u8 index) sub_80B9A88(arr); //Probably not how it was originally written, but this matches. - memcpy(a + index * size, (ptr = gUnknown_083D0278), 0x40); + memcpy(a + index * size, (ptr = recordMixingMauvilleMan), 0x40); memcpy(ptr, a + arr[index] * size, 0x40); sub_80F7F30(); } diff --git a/src/tv.c b/src/tv.c index fd6b7c62f..68694c058 100644 --- a/src/tv.c +++ b/src/tv.c @@ -432,7 +432,7 @@ void ClearTVShowData(void) { u8 showidx; u8 extradataidx; - for (showidx=0; showidx<25; showidx++) { + for (showidx=0; showidxkind == 0) return FALSE; - for (i = 0; i < 16; i++) + for (i = 0; i < POKE_NEWS_COUNT; i++) { if (arg0[i].kind == arg1->kind) return FALSE; @@ -2779,7 +2779,7 @@ void sub_80C0750(void) { u8 i; - for (i = 0; i < 16; i++) + for (i = 0; i < POKE_NEWS_COUNT; i++) { if (gSaveBlock1.pokeNews[i].kind > 3) sub_80BEC10(i); @@ -2793,7 +2793,7 @@ void sub_80C0788(void) if (FlagGet(FLAG_SYS_GAME_CLEAR) != 1) { - for (i = 0; i < 16; i++) + for (i = 0; i < POKE_NEWS_COUNT; i++) gSaveBlock1.pokeNews[i].state = 0; } } -- cgit v1.2.3 From e6dff5b317a7e269388fcc301ec53e9a0b554a0e Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Sun, 12 Aug 2018 17:49:12 -0300 Subject: Add the .sgm file format to .gitignore This format represents VisualBoyAdvance's "save game" files. Since it's currently not being filtered out by .gitignore, this kind of files could be sent to a GitHub Repository via git push accidentally, which is why I suggest this change. --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index cfb969f5c..67a81bb9f 100644 --- a/.gitignore +++ b/.gitignore @@ -34,6 +34,7 @@ types_*.taghl *.s.old2 *.dump *.sa* +*.sgm Thumbs.db build/ .idea/ -- cgit v1.2.3 From c4162d997dd0ca440fe95ac4fbe54f1d85c365f3 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Wed, 15 Aug 2018 20:35:41 -0500 Subject: Decompile more of pokenav --- asm/pokenav.s | 1993 +------------------------------------------------- data/pokenav.s | 2 +- include/pokenav.h | 52 +- src/contest_effect.c | 154 +--- src/pokenav_before.c | 1291 ++++++++++++++++++++++---------- src/use_pokeblock.c | 4 +- 6 files changed, 953 insertions(+), 2543 deletions(-) diff --git a/asm/pokenav.s b/asm/pokenav.s index 7fc2348f5..1e3c6fe5c 100644 --- a/asm/pokenav.s +++ b/asm/pokenav.s @@ -5,1991 +5,6 @@ .text - thumb_func_start sub_80F063C -sub_80F063C: @ 80F063C - push {r4-r7,lr} - lsls r0, 16 - ldr r3, _080F0664 @ =gUnknown_083DFEC4 - ldr r2, [r3] - lsrs r5, r0, 16 - asrs r4, r0, 16 - lsls r1, r4, 4 - ldr r6, _080F0668 @ =0x0000877c - adds r0, r2, r6 - strh r1, [r0] - adds r7, r3, 0 - cmp r4, 0x1 - beq _080F065E - movs r0, 0x1 - negs r0, r0 - cmp r4, r0 - bne _080F066C -_080F065E: - movs r1, 0x4 - b _080F066E - .align 2, 0 -_080F0664: .4byte gUnknown_083DFEC4 -_080F0668: .4byte 0x0000877c -_080F066C: - movs r1, 0x8 -_080F066E: - ldr r3, _080F06C0 @ =0x0000877a - adds r0, r2, r3 - strh r1, [r0] - lsls r0, r5, 16 - asrs r3, r0, 16 - cmp r3, 0 - bge _080F06CC - ldr r4, [r7] - ldr r6, _080F06C0 @ =0x0000877a - adds r1, r4, r6 - movs r2, 0 - ldrsh r0, [r1, r2] - negs r0, r0 - strh r0, [r1] - subs r6, 0x2 - adds r1, r4, r6 - lsls r0, r3, 1 - ldrh r1, [r1] - adds r0, r1 - lsls r0, 16 - lsrs r6, r0, 16 - ldr r1, _080F06C4 @ =0x00008770 - adds r0, r4, r1 - ldrh r0, [r0] - adds r0, r3, r0 - lsls r0, 16 - lsrs r2, r0, 16 - asrs r0, 16 - cmp r0, 0 - bge _080F06B8 - ldr r2, _080F06C8 @ =0x00008774 - adds r1, r4, r2 - adds r0, 0x1 - ldrh r1, [r1] - adds r0, r1 - lsls r0, 16 - lsrs r2, r0, 16 -_080F06B8: - negs r0, r3 - lsls r0, 16 - lsrs r5, r0, 16 - b _080F06E6 - .align 2, 0 -_080F06C0: .4byte 0x0000877a -_080F06C4: .4byte 0x00008770 -_080F06C8: .4byte 0x00008774 -_080F06CC: - ldr r1, [r7] - ldr r3, _080F070C @ =0x00008778 - adds r0, r1, r3 - ldrh r0, [r0] - adds r0, 0x10 - lsls r0, 16 - lsrs r6, r0, 16 - ldr r0, _080F0710 @ =0x00008772 - adds r1, r0 - ldrh r0, [r1] - adds r0, 0x1 - lsls r0, 16 - lsrs r2, r0, 16 -_080F06E6: - ldr r0, [r7] - ldr r1, _080F0714 @ =0x00008774 - adds r0, r1 - lsls r1, r2, 16 - asrs r1, 16 - movs r3, 0 - ldrsh r0, [r0, r3] - cmp r1, r0 - ble _080F06FA - movs r2, 0 -_080F06FA: - movs r1, 0x1F - adds r0, r2, 0 - ands r1, r6 - adds r2, r5, 0 - bl sub_80F0954 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080F070C: .4byte 0x00008778 -_080F0710: .4byte 0x00008772 -_080F0714: .4byte 0x00008774 - thumb_func_end sub_80F063C - - thumb_func_start sub_80F0718 -sub_80F0718: @ 80F0718 - push {r4,r5,lr} - bl sub_80F098C - lsls r0, 24 - cmp r0, 0 - bne _080F0790 - ldr r0, _080F073C @ =gUnknown_083DFEC4 - ldr r4, [r0] - ldr r0, _080F0740 @ =0x0000877c - adds r3, r4, r0 - ldrh r2, [r3] - movs r1, 0 - ldrsh r0, [r3, r1] - cmp r0, 0 - bne _080F0744 - movs r0, 0 - b _080F0792 - .align 2, 0 -_080F073C: .4byte gUnknown_083DFEC4 -_080F0740: .4byte 0x0000877c -_080F0744: - ldr r0, _080F0780 @ =0x0000877a - adds r1, r4, r0 - ldrh r0, [r1] - subs r0, r2, r0 - strh r0, [r3] - ldr r0, _080F0784 @ =0x00008776 - adds r2, r4, r0 - ldrh r0, [r1] - ldrh r1, [r2] - adds r0, r1 - movs r5, 0xFF - ands r0, r5 - strh r0, [r2] - ldr r1, _080F0788 @ =REG_BG3VOFS - strh r0, [r1] - movs r1, 0 - ldrsh r0, [r3, r1] - cmp r0, 0 - bne _080F0790 - movs r1, 0 - ldrsh r0, [r2, r1] - adds r0, 0x8 - ands r0, r5 - asrs r1, r0, 3 - ldr r2, _080F078C @ =0x00008778 - adds r0, r4, r2 - strh r1, [r0] - movs r0, 0 - b _080F0792 - .align 2, 0 -_080F0780: .4byte 0x0000877a -_080F0784: .4byte 0x00008776 -_080F0788: .4byte REG_BG3VOFS -_080F078C: .4byte 0x00008778 -_080F0790: - movs r0, 0x1 -_080F0792: - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_80F0718 - - thumb_func_start ShowMapNamePopUpWindow -ShowMapNamePopUpWindow: @ 80F0798 - push {lr} - ldr r0, _080F07B0 @ =gUnknown_083DFEC4 - ldr r2, [r0] - ldr r1, _080F07B4 @ =0x000087ca - adds r0, r2, r1 - ldrb r0, [r0] - cmp r0, 0 - beq _080F07B8 - cmp r0, 0x1 - beq _080F07E0 - b _080F080A - .align 2, 0 -_080F07B0: .4byte gUnknown_083DFEC4 -_080F07B4: .4byte 0x000087ca -_080F07B8: - ldr r3, _080F07D8 @ =0x00008788 - adds r0, r2, r3 - subs r3, 0x1A - adds r1, r2, r3 - movs r3, 0 - ldrsh r1, [r1, r3] - lsls r1, 2 - adds r1, r2, r1 - ldr r2, _080F07DC @ =0x0000893e - adds r1, r2 - ldrh r1, [r1] - lsls r1, 18 - lsrs r1, 23 - bl sub_80F443C - b _080F07F4 - .align 2, 0 -_080F07D8: .4byte 0x00008788 -_080F07DC: .4byte 0x0000893e -_080F07E0: - ldr r3, _080F0810 @ =0x00008788 - adds r0, r2, r3 - subs r3, 0x1A - adds r1, r2, r3 - ldrh r1, [r1] - adds r1, 0x1 - lsls r1, 16 - lsrs r1, 16 - bl sub_80F445C -_080F07F4: - ldr r0, _080F0814 @ =gWindowTemplate_81E710C - bl BasicInitMenuWindow - ldr r0, _080F0818 @ =gUnknown_083DFEC4 - ldr r0, [r0] - ldr r1, _080F0810 @ =0x00008788 - adds r0, r1 - movs r1, 0x1 - movs r2, 0x6 - bl Menu_PrintText -_080F080A: - pop {r0} - bx r0 - .align 2, 0 -_080F0810: .4byte 0x00008788 -_080F0814: .4byte gWindowTemplate_81E710C -_080F0818: .4byte gUnknown_083DFEC4 - thumb_func_end ShowMapNamePopUpWindow - - thumb_func_start sub_80F081C -sub_80F081C: @ 80F081C - push {r4,r5,lr} - lsls r0, 24 - lsrs r5, r0, 24 - ldr r0, _080F0838 @ =gWindowTemplate_81E710C - bl BasicInitMenuWindow - cmp r5, 0x4 - bhi _080F08C6 - lsls r0, r5, 2 - ldr r1, _080F083C @ =_080F0840 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_080F0838: .4byte gWindowTemplate_81E710C -_080F083C: .4byte _080F0840 - .align 2, 0 -_080F0840: - .4byte _080F0854 - .4byte _080F0854 - .4byte _080F0862 - .4byte _080F088C - .4byte _080F089A -_080F0854: - ldr r0, _080F08CC @ =gOtherText_NumberRegistered - movs r1, 0xA - movs r2, 0x9 - bl MenuPrint_RightAligned - cmp r5, 0 - bne _080F08C6 -_080F0862: - ldr r0, _080F08D0 @ =gUnknown_083DFEC4 - ldr r0, [r0] - ldr r1, _080F08D4 @ =0x00008788 - adds r4, r0, r1 - ldr r2, _080F08D8 @ =0x00008774 - adds r0, r2 - movs r2, 0 - ldrsh r1, [r0, r2] - adds r1, 0x1 - adds r0, r4, 0 - movs r2, 0x1 - movs r3, 0x5 - bl ConvertIntToDecimalStringN - adds r0, r4, 0 - movs r1, 0xA - movs r2, 0xB - bl MenuPrint_RightAligned - cmp r5, 0 - bne _080F08C6 -_080F088C: - ldr r0, _080F08DC @ =gOtherText_NumberBattles - movs r1, 0xA - movs r2, 0xD - bl MenuPrint_RightAligned - cmp r5, 0 - bne _080F08C6 -_080F089A: - movs r0, 0x9 - bl GetGameStat - adds r1, r0, 0 - ldr r0, _080F08E0 @ =0x0001869f - cmp r1, r0 - bls _080F08AA - adds r1, r0, 0 -_080F08AA: - ldr r0, _080F08D0 @ =gUnknown_083DFEC4 - ldr r4, [r0] - ldr r0, _080F08D4 @ =0x00008788 - adds r4, r0 - adds r0, r4, 0 - movs r2, 0x1 - movs r3, 0x5 - bl ConvertIntToDecimalStringN - adds r0, r4, 0 - movs r1, 0xA - movs r2, 0xF - bl MenuPrint_RightAligned -_080F08C6: - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080F08CC: .4byte gOtherText_NumberRegistered -_080F08D0: .4byte gUnknown_083DFEC4 -_080F08D4: .4byte 0x00008788 -_080F08D8: .4byte 0x00008774 -_080F08DC: .4byte gOtherText_NumberBattles -_080F08E0: .4byte 0x0001869f - thumb_func_end sub_80F081C - - thumb_func_start sub_80F08E4 -sub_80F08E4: @ 80F08E4 - push {lr} - ldr r0, _080F08FC @ =gWindowTemplate_81E710C - bl BasicInitMenuWindow - movs r0, 0 - movs r1, 0x9 - movs r2, 0xB - movs r3, 0x10 - bl Menu_EraseWindowRect - pop {r0} - bx r0 - .align 2, 0 -_080F08FC: .4byte gWindowTemplate_81E710C - thumb_func_end sub_80F08E4 - - thumb_func_start sub_80F0900 -sub_80F0900: @ 80F0900 - push {r4,r5,lr} - ldr r0, _080F093C @ =gUnknown_083DFEC4 - ldr r0, [r0] - ldr r2, _080F0940 @ =0x00008772 - adds r1, r0, r2 - subs r2, 0x2 - adds r5, r0, r2 - ldrh r0, [r1] - ldrh r1, [r5] - subs r0, r1 - adds r0, 0x1 - lsls r4, r0, 16 - asrs r0, r4, 16 - cmp r0, 0x7 - bgt _080F092A - movs r0, 0xC - movs r1, 0x1 - movs r2, 0x1F - movs r3, 0xF - bl Menu_EraseWindowRect -_080F092A: - ldrh r0, [r5] - lsrs r2, r4, 16 - movs r1, 0 - bl sub_80F0954 - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080F093C: .4byte gUnknown_083DFEC4 -_080F0940: .4byte 0x00008772 - thumb_func_end sub_80F0900 - - thumb_func_start sub_80F0944 -sub_80F0944: @ 80F0944 - push {lr} - bl sub_80F098C - lsls r0, 24 - lsrs r0, 24 - pop {r1} - bx r1 - thumb_func_end sub_80F0944 - - thumb_func_start sub_80F0954 -sub_80F0954: @ 80F0954 - push {r4,r5,lr} - ldr r3, _080F097C @ =gUnknown_083DFEC4 - ldr r3, [r3] - ldr r5, _080F0980 @ =0x0000877e - adds r4, r3, r5 - movs r5, 0 - strh r0, [r4] - ldr r4, _080F0984 @ =0x00008780 - adds r0, r3, r4 - strh r1, [r0] - ldr r1, _080F0988 @ =0x00008784 - adds r0, r3, r1 - strh r2, [r0] - adds r4, 0x6 - adds r3, r4 - strh r5, [r3] - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080F097C: .4byte gUnknown_083DFEC4 -_080F0980: .4byte 0x0000877e -_080F0984: .4byte 0x00008780 -_080F0988: .4byte 0x00008784 - thumb_func_end sub_80F0954 - - thumb_func_start sub_80F098C -sub_80F098C: @ 80F098C - push {r4-r7,lr} - mov r7, r8 - push {r7} - ldr r0, _080F09A4 @ =gUnknown_083DFEC4 - ldr r6, [r0] - ldr r0, _080F09A8 @ =0x00008784 - adds r7, r6, r0 - ldrh r0, [r7] - cmp r0, 0 - bne _080F09AC -_080F09A0: - movs r0, 0 - b _080F0A02 - .align 2, 0 -_080F09A4: .4byte gUnknown_083DFEC4 -_080F09A8: .4byte 0x00008784 -_080F09AC: - movs r1, 0 - mov r8, r1 - ldr r1, _080F0A0C @ =gUnknown_083E3270 - ldr r2, _080F0A10 @ =0x000087ca - adds r0, r6, r2 - ldrb r2, [r0] - lsls r2, 2 - adds r2, r1 - ldr r0, _080F0A14 @ =0x0000877e - adds r4, r6, r0 - ldrh r0, [r4] - ldr r1, _080F0A18 @ =0x00008780 - adds r5, r6, r1 - ldrh r1, [r5] - ldr r2, [r2] - bl _call_via_r2 - ldrh r0, [r7] - subs r0, 0x1 - strh r0, [r7] - ldr r2, _080F0A1C @ =0x0000ffff - adds r1, r2, 0 - lsls r0, 16 - cmp r0, 0 - beq _080F09A0 - ldrh r0, [r4] - adds r0, 0x1 - strh r0, [r4] - ands r0, r1 - ldr r2, _080F0A20 @ =0x00008774 - adds r1, r6, r2 - movs r2, 0 - ldrsh r1, [r1, r2] - cmp r0, r1 - ble _080F09F6 - mov r0, r8 - strh r0, [r4] -_080F09F6: - ldrh r0, [r5] - adds r0, 0x2 - movs r1, 0x1F - ands r0, r1 - strh r0, [r5] - movs r0, 0x1 -_080F0A02: - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r1} - bx r1 - .align 2, 0 -_080F0A0C: .4byte gUnknown_083E3270 -_080F0A10: .4byte 0x000087ca -_080F0A14: .4byte 0x0000877e -_080F0A18: .4byte 0x00008780 -_080F0A1C: .4byte 0x0000ffff -_080F0A20: .4byte 0x00008774 - thumb_func_end sub_80F098C - - thumb_func_start sub_80F0A24 -sub_80F0A24: @ 80F0A24 - push {r4,r5,lr} - lsls r0, 16 - lsrs r3, r0, 16 - lsls r1, 16 - lsrs r5, r1, 16 - ldr r0, _080F0A64 @ =gUnknown_083DFEC4 - ldr r4, [r0] - ldr r1, _080F0A68 @ =0x000087c8 - adds r0, r4, r1 - ldrb r0, [r0] - movs r2, 0x1 - cmp r0, 0 - bne _080F0A40 - movs r2, 0x2 -_080F0A40: - ldr r0, _080F0A6C @ =0x00008788 - adds r4, r0 - adds r0, r4, 0 - adds r1, r3, 0 - bl sub_80F4428 - ldr r0, _080F0A70 @ =gWindowTemplate_81E70D4 - bl BasicInitMenuWindow - lsls r2, r5, 24 - lsrs r2, 24 - adds r0, r4, 0 - movs r1, 0xD - bl Menu_PrintText - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080F0A64: .4byte gUnknown_083DFEC4 -_080F0A68: .4byte 0x000087c8 -_080F0A6C: .4byte 0x00008788 -_080F0A70: .4byte gWindowTemplate_81E70D4 - thumb_func_end sub_80F0A24 - - thumb_func_start sub_80F0A74 -sub_80F0A74: @ 80F0A74 - push {r4-r7,lr} - sub sp, 0x14 - lsls r0, 16 - lsrs r6, r0, 16 - lsls r1, 16 - lsrs r7, r1, 16 - ldr r0, _080F0ADC @ =gUnknown_083DFEC4 - ldr r5, [r0] - ldr r0, _080F0AE0 @ =0x00008788 - adds r4, r5, r0 - adds r0, r4, 0 - adds r1, r6, 0 - bl sub_80F700C - movs r0, 0x1F - ands r7, r0 - ldr r0, _080F0AE4 @ =gWindowTemplate_81E70D4 - bl BasicInitMenuWindow - lsls r2, r7, 3 - adds r0, r4, 0 - movs r1, 0x61 - movs r3, 0 - bl Menu_PrintTextPixelCoords - ldr r1, _080F0AE8 @ =0x0000d158 - adds r0, r5, r1 - ldrh r0, [r0] - cmp r6, r0 - bcs _080F0AF8 - lsls r0, r6, 3 - adds r0, r5, r0 - ldr r1, _080F0AEC @ =0x0000ceed - adds r0, r1 - ldrb r0, [r0] - cmp r0, 0 - beq _080F0AF8 - ldr r0, _080F0AF0 @ =0x0600f000 - ldr r3, _080F0AF4 @ =gUnknown_083E039C - movs r1, 0 - str r1, [sp] - str r1, [sp, 0x4] - movs r2, 0x1 - str r2, [sp, 0x8] - movs r1, 0x2 - str r1, [sp, 0xC] - str r2, [sp, 0x10] - movs r1, 0x1D - adds r2, r7, 0 - bl sub_8095C8C - b _080F0B14 - .align 2, 0 -_080F0ADC: .4byte gUnknown_083DFEC4 -_080F0AE0: .4byte 0x00008788 -_080F0AE4: .4byte gWindowTemplate_81E70D4 -_080F0AE8: .4byte 0x0000d158 -_080F0AEC: .4byte 0x0000ceed -_080F0AF0: .4byte 0x0600f000 -_080F0AF4: .4byte gUnknown_083E039C -_080F0AF8: - ldr r0, _080F0B1C @ =0x0600f000 - ldr r3, _080F0B20 @ =gUnknown_083E03A0 - movs r1, 0 - str r1, [sp] - str r1, [sp, 0x4] - movs r2, 0x1 - str r2, [sp, 0x8] - movs r1, 0x2 - str r1, [sp, 0xC] - str r2, [sp, 0x10] - movs r1, 0x1D - adds r2, r7, 0 - bl sub_8095C8C -_080F0B14: - add sp, 0x14 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080F0B1C: .4byte 0x0600f000 -_080F0B20: .4byte gUnknown_083E03A0 - thumb_func_end sub_80F0A74 - - thumb_func_start sub_80F0B24 -sub_80F0B24: @ 80F0B24 - ldr r0, _080F0B38 @ =gUnknown_083DFEC4 - ldr r0, [r0] - ldr r2, _080F0B3C @ =0x0000d15c - adds r1, r0, r2 - movs r2, 0 - strh r2, [r1] - ldr r1, _080F0B40 @ =0x00000306 - adds r0, r1 - strh r2, [r0] - bx lr - .align 2, 0 -_080F0B38: .4byte gUnknown_083DFEC4 -_080F0B3C: .4byte 0x0000d15c -_080F0B40: .4byte 0x00000306 - thumb_func_end sub_80F0B24 - - thumb_func_start sub_80F0B44 -sub_80F0B44: @ 80F0B44 - push {r4-r6,lr} - ldr r0, _080F0B58 @ =gUnknown_083DFEC4 - ldr r5, [r0] - ldr r0, _080F0B5C @ =0x0000d15c - adds r6, r5, r0 - ldrh r0, [r6] - cmp r0, 0x8 - bls _080F0B60 - movs r0, 0 - b _080F0C22 - .align 2, 0 -_080F0B58: .4byte gUnknown_083DFEC4 -_080F0B5C: .4byte 0x0000d15c -_080F0B60: - ldr r0, _080F0BBC @ =0x00000306 - adds r1, r5, r0 - ldrh r0, [r1] - adds r0, 0x1 - strh r0, [r1] - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0x1 - bls _080F0C20 - movs r0, 0 - strh r0, [r1] - ldrh r0, [r6] - cmp r0, 0x7 - bhi _080F0BCC - ldr r0, _080F0BC0 @ =0x00008778 - adds r1, r5, r0 - ldrh r2, [r6] - lsls r0, r2, 1 - ldrh r1, [r1] - adds r4, r0, r1 - movs r0, 0x1F - ands r4, r0 - ldr r1, _080F0BC4 @ =0x0000876c - adds r0, r5, r1 - movs r1, 0 - ldrsh r0, [r0, r1] - cmp r2, r0 - beq _080F0BAA - ldr r0, _080F0BC8 @ =gWindowTemplate_81E70D4 - bl BasicInitMenuWindow - adds r1, r4, 0 - adds r3, r1, 0x1 - movs r0, 0xC - movs r2, 0x1F - bl Menu_EraseWindowRect -_080F0BAA: - ldrh r0, [r6] - cmp r0, 0 - bne _080F0BB4 - bl sub_80F08E4 -_080F0BB4: - ldrh r0, [r6] - adds r0, 0x1 - strh r0, [r6] - b _080F0C20 - .align 2, 0 -_080F0BBC: .4byte 0x00000306 -_080F0BC0: .4byte 0x00008778 -_080F0BC4: .4byte 0x0000876c -_080F0BC8: .4byte gWindowTemplate_81E70D4 -_080F0BCC: - ldr r0, _080F0C10 @ =gWindowTemplate_81E70D4 - bl BasicInitMenuWindow - ldr r1, _080F0C14 @ =0x00008778 - adds r0, r5, r1 - ldrh r0, [r0] - adds r4, r0, 0 - adds r4, 0x10 - movs r0, 0x1F - ands r4, r0 - movs r5, 0 -_080F0BE2: - adds r3, r4, 0x1 - movs r0, 0xC - adds r1, r4, 0 - movs r2, 0x1F - bl Menu_EraseWindowRect - adds r4, 0x2 - movs r0, 0x1F - ands r4, r0 - adds r0, r5, 0x1 - lsls r0, 16 - lsrs r5, r0, 16 - cmp r5, 0x7 - bls _080F0BE2 - ldr r0, _080F0C18 @ =gUnknown_083DFEC4 - ldr r1, [r0] - ldr r0, _080F0C1C @ =0x0000d15c - adds r1, r0 - ldrh r0, [r1] - adds r0, 0x1 - strh r0, [r1] - movs r0, 0 - b _080F0C22 - .align 2, 0 -_080F0C10: .4byte gWindowTemplate_81E70D4 -_080F0C14: .4byte 0x00008778 -_080F0C18: .4byte gUnknown_083DFEC4 -_080F0C1C: .4byte 0x0000d15c -_080F0C20: - movs r0, 0x1 -_080F0C22: - pop {r4-r6} - pop {r1} - bx r1 - thumb_func_end sub_80F0B44 - - thumb_func_start sub_80F0C28 -sub_80F0C28: @ 80F0C28 - ldr r0, _080F0C3C @ =gUnknown_083DFEC4 - ldr r0, [r0] - ldr r2, _080F0C40 @ =0x0000d15c - adds r1, r0, r2 - movs r2, 0 - strh r2, [r1] - ldr r1, _080F0C44 @ =0x00000306 - adds r0, r1 - strh r2, [r0] - bx lr - .align 2, 0 -_080F0C3C: .4byte gUnknown_083DFEC4 -_080F0C40: .4byte 0x0000d15c -_080F0C44: .4byte 0x00000306 - thumb_func_end sub_80F0C28 - - thumb_func_start sub_80F0C48 -sub_80F0C48: @ 80F0C48 - push {r4-r6,lr} - ldr r0, _080F0C5C @ =gUnknown_083DFEC4 - ldr r4, [r0] - ldr r0, _080F0C60 @ =0x0000d15c - adds r5, r4, r0 - ldrh r0, [r5] - cmp r0, 0x7 - bls _080F0C64 - movs r0, 0 - b _080F0CD2 - .align 2, 0 -_080F0C5C: .4byte gUnknown_083DFEC4 -_080F0C60: .4byte 0x0000d15c -_080F0C64: - ldr r2, _080F0CBC @ =0x00000306 - adds r1, r4, r2 - ldrh r0, [r1] - adds r0, 0x1 - strh r0, [r1] - ldr r2, _080F0CC0 @ =0x0000ffff - adds r6, r2, 0 - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0x1 - bls _080F0CD0 - movs r0, 0 - strh r0, [r1] - ldr r0, _080F0CC4 @ =gWindowTemplate_81E70D4 - bl BasicInitMenuWindow - ldr r0, _080F0CC8 @ =0x00008770 - adds r1, r4, r0 - ldrh r0, [r5] - ldrh r1, [r1] - adds r0, r1 - lsls r0, 16 - lsrs r0, 16 - ldr r1, _080F0CCC @ =0x00008778 - adds r2, r4, r1 - ldrh r1, [r5] - lsls r1, 1 - ldrh r2, [r2] - adds r1, r2 - lsls r1, 16 - lsrs r1, 16 - bl sub_80F0A74 - ldrh r0, [r5] - adds r0, 0x1 - strh r0, [r5] - ands r0, r6 - cmp r0, 0x7 - bls _080F0CD0 - movs r0, 0 - bl sub_80F081C - movs r0, 0 - b _080F0CD2 - .align 2, 0 -_080F0CBC: .4byte 0x00000306 -_080F0CC0: .4byte 0x0000ffff -_080F0CC4: .4byte gWindowTemplate_81E70D4 -_080F0CC8: .4byte 0x00008770 -_080F0CCC: .4byte 0x00008778 -_080F0CD0: - movs r0, 0x1 -_080F0CD2: - pop {r4-r6} - pop {r1} - bx r1 - thumb_func_end sub_80F0C48 - - thumb_func_start sub_80F0CD8 -sub_80F0CD8: @ 80F0CD8 - push {r4,r5,lr} - ldr r4, _080F0D40 @ =gUnknown_083DFEC4 - ldr r1, [r4] - ldr r2, _080F0D44 @ =0x00000306 - adds r0, r1, r2 - movs r2, 0 - strh r2, [r0] - ldr r3, _080F0D48 @ =0x0000d15c - adds r0, r1, r3 - strh r2, [r0] - ldr r2, _080F0D4C @ =0x0000876e - adds r0, r1, r2 - movs r3, 0 - ldrsh r0, [r0, r3] - lsls r0, 3 - adds r0, r1, r0 - ldr r2, _080F0D50 @ =0x0000ceec - adds r0, r2 - ldrb r0, [r0] - ldr r3, _080F0D54 @ =0x0000d110 - adds r1, r3 - ldr r2, _080F0D58 @ =gTrainerEyeDescriptions - lsls r0, 2 - adds r0, r2 - ldr r0, [r0] - str r0, [r1] - adds r2, r0, 0 - movs r1, 0 - adds r5, r4, 0 - adds r4, r3, 0 -_080F0D14: - ldrb r0, [r2] - adds r3, r1, 0x1 - cmp r0, 0xFF - beq _080F0D24 -_080F0D1C: - adds r2, 0x1 - ldrb r0, [r2] - cmp r0, 0xFF - bne _080F0D1C -_080F0D24: - ldr r0, [r5] - lsls r1, r3, 2 - adds r0, r4 - adds r0, r1 - adds r2, 0x1 - str r2, [r0] - lsls r0, r3, 16 - lsrs r1, r0, 16 - cmp r1, 0x2 - bls _080F0D14 - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080F0D40: .4byte gUnknown_083DFEC4 -_080F0D44: .4byte 0x00000306 -_080F0D48: .4byte 0x0000d15c -_080F0D4C: .4byte 0x0000876e -_080F0D50: .4byte 0x0000ceec -_080F0D54: .4byte 0x0000d110 -_080F0D58: .4byte gTrainerEyeDescriptions - thumb_func_end sub_80F0CD8 - - thumb_func_start sub_80F0D5C -sub_80F0D5C: @ 80F0D5C - push {r4,r5,lr} - ldr r0, _080F0D70 @ =gUnknown_083DFEC4 - ldr r4, [r0] - ldr r0, _080F0D74 @ =0x0000d15c - adds r5, r4, r0 - ldrh r0, [r5] - cmp r0, 0x7 - bne _080F0D78 -_080F0D6C: - movs r0, 0 - b _080F0EB0 - .align 2, 0 -_080F0D70: .4byte gUnknown_083DFEC4 -_080F0D74: .4byte 0x0000d15c -_080F0D78: - ldr r0, _080F0DB8 @ =0x00000306 - adds r1, r4, r0 - ldrh r0, [r1] - adds r0, 0x1 - strh r0, [r1] - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0x1 - bhi _080F0D8C - b _080F0EAE -_080F0D8C: - movs r0, 0 - strh r0, [r1] - ldr r0, _080F0DBC @ =gWindowTemplate_81E70D4 - bl BasicInitMenuWindow - ldr r0, _080F0DC0 @ =0x00008778 - adds r1, r4, r0 - ldrh r3, [r5] - lsls r0, r3, 1 - adds r0, 0x2 - ldrh r1, [r1] - adds r5, r0, r1 - movs r0, 0x1F - ands r5, r0 - cmp r3, 0x6 - bhi _080F0D6C - lsls r0, r3, 2 - ldr r1, _080F0DC4 @ =_080F0DC8 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_080F0DB8: .4byte 0x00000306 -_080F0DBC: .4byte gWindowTemplate_81E70D4 -_080F0DC0: .4byte 0x00008778 -_080F0DC4: .4byte _080F0DC8 - .align 2, 0 -_080F0DC8: - .4byte _080F0DE4 - .4byte _080F0DF0 - .4byte _080F0E08 - .4byte _080F0E14 - .4byte _080F0E2C - .4byte _080F0E38 - .4byte _080F0E6C -_080F0DE4: - ldr r0, _080F0DEC @ =gOtherText_Strategy - lsls r2, r5, 3 - b _080F0E54 - .align 2, 0 -_080F0DEC: .4byte gOtherText_Strategy -_080F0DF0: - ldr r0, _080F0DFC @ =gUnknown_083DFEC4 - ldr r0, [r0] - ldr r1, _080F0E00 @ =0x00008788 - adds r4, r0, r1 - ldr r1, _080F0E04 @ =0x0000d110 - b _080F0E42 - .align 2, 0 -_080F0DFC: .4byte gUnknown_083DFEC4 -_080F0E00: .4byte 0x00008788 -_080F0E04: .4byte 0x0000d110 -_080F0E08: - ldr r0, _080F0E10 @ =gOtherText_TrainersPokemon - lsls r2, r5, 3 - b _080F0E54 - .align 2, 0 -_080F0E10: .4byte gOtherText_TrainersPokemon -_080F0E14: - ldr r0, _080F0E20 @ =gUnknown_083DFEC4 - ldr r0, [r0] - ldr r1, _080F0E24 @ =0x00008788 - adds r4, r0, r1 - ldr r1, _080F0E28 @ =0x0000d114 - b _080F0E42 - .align 2, 0 -_080F0E20: .4byte gUnknown_083DFEC4 -_080F0E24: .4byte 0x00008788 -_080F0E28: .4byte 0x0000d114 -_080F0E2C: - ldr r0, _080F0E34 @ =gOtherText_SelfIntroduction - lsls r2, r5, 3 - b _080F0E54 - .align 2, 0 -_080F0E34: .4byte gOtherText_SelfIntroduction -_080F0E38: - ldr r0, _080F0E60 @ =gUnknown_083DFEC4 - ldr r0, [r0] - ldr r1, _080F0E64 @ =0x00008788 - adds r4, r0, r1 - ldr r1, _080F0E68 @ =0x0000d118 -_080F0E42: - adds r0, r1 - ldr r1, [r0] - adds r0, r4, 0 - movs r2, 0x88 - movs r3, 0 - bl AlignStringInMenuWindow - lsls r2, r5, 3 - adds r0, r4, 0 -_080F0E54: - movs r1, 0x61 - movs r3, 0 - bl Menu_PrintTextPixelCoords - b _080F0EA0 - .align 2, 0 -_080F0E60: .4byte gUnknown_083DFEC4 -_080F0E64: .4byte 0x00008788 -_080F0E68: .4byte 0x0000d118 -_080F0E6C: - ldr r0, _080F0E94 @ =gUnknown_083DFEC4 - ldr r0, [r0] - ldr r1, _080F0E98 @ =0x00008788 - adds r4, r0, r1 - ldr r1, _080F0E9C @ =0x0000d11c - adds r0, r1 - ldr r1, [r0] - adds r0, r4, 0 - movs r2, 0x88 - movs r3, 0 - bl AlignStringInMenuWindow - lsls r2, r5, 3 - adds r0, r4, 0 - movs r1, 0x61 - movs r3, 0 - bl Menu_PrintTextPixelCoords - b _080F0D6C - .align 2, 0 -_080F0E94: .4byte gUnknown_083DFEC4 -_080F0E98: .4byte 0x00008788 -_080F0E9C: .4byte 0x0000d11c -_080F0EA0: - ldr r0, _080F0EB8 @ =gUnknown_083DFEC4 - ldr r1, [r0] - ldr r0, _080F0EBC @ =0x0000d15c - adds r1, r0 - ldrh r0, [r1] - adds r0, 0x1 - strh r0, [r1] -_080F0EAE: - movs r0, 0x1 -_080F0EB0: - pop {r4,r5} - pop {r1} - bx r1 - .align 2, 0 -_080F0EB8: .4byte gUnknown_083DFEC4 -_080F0EBC: .4byte 0x0000d15c - thumb_func_end sub_80F0D5C - - thumb_func_start sub_80F0EC0 -sub_80F0EC0: @ 80F0EC0 - push {lr} - ldr r0, _080F0EE4 @ =gUnknown_083DFEC4 - ldr r0, [r0] - ldr r2, _080F0EE8 @ =0x00000306 - adds r1, r0, r2 - movs r2, 0 - strh r2, [r1] - ldr r3, _080F0EEC @ =0x0000d15c - adds r1, r0, r3 - strh r2, [r1] - ldr r1, _080F0EF0 @ =0x00008788 - adds r0, r1 - movs r1, 0 - movs r2, 0x10 - bl StringFill - pop {r0} - bx r0 - .align 2, 0 -_080F0EE4: .4byte gUnknown_083DFEC4 -_080F0EE8: .4byte 0x00000306 -_080F0EEC: .4byte 0x0000d15c -_080F0EF0: .4byte 0x00008788 - thumb_func_end sub_80F0EC0 - - thumb_func_start sub_80F0EF4 -sub_80F0EF4: @ 80F0EF4 - push {r4,r5,lr} - ldr r0, _080F0F08 @ =gUnknown_083DFEC4 - ldr r2, [r0] - ldr r0, _080F0F0C @ =0x0000d15c - adds r5, r2, r0 - ldrh r0, [r5] - cmp r0, 0x6 - bls _080F0F10 - movs r0, 0 - b _080F0F52 - .align 2, 0 -_080F0F08: .4byte gUnknown_083DFEC4 -_080F0F0C: .4byte 0x0000d15c -_080F0F10: - ldr r0, _080F0F58 @ =0x00000306 - adds r1, r2, r0 - ldrh r0, [r1] - adds r0, 0x1 - strh r0, [r1] - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0x1 - bls _080F0F50 - movs r0, 0 - strh r0, [r1] - ldr r1, _080F0F5C @ =0x00008778 - adds r0, r2, r1 - ldrh r4, [r5] - lsls r4, 1 - adds r4, 0x2 - ldrh r0, [r0] - adds r4, r0 - movs r0, 0x1F - ands r4, r0 - ldr r0, _080F0F60 @ =gWindowTemplate_81E70D4 - bl BasicInitMenuWindow - adds r3, r4, 0x1 - movs r0, 0xC - adds r1, r4, 0 - movs r2, 0x1F - bl Menu_EraseWindowRect - ldrh r0, [r5] - adds r0, 0x1 - strh r0, [r5] -_080F0F50: - movs r0, 0x1 -_080F0F52: - pop {r4,r5} - pop {r1} - bx r1 - .align 2, 0 -_080F0F58: .4byte 0x00000306 -_080F0F5C: .4byte 0x00008778 -_080F0F60: .4byte gWindowTemplate_81E70D4 - thumb_func_end sub_80F0EF4 - - thumb_func_start sub_80F0F64 -sub_80F0F64: @ 80F0F64 - push {r4,lr} - ldr r0, _080F0F90 @ =gUnknown_083DFEC4 - ldr r3, [r0] - ldr r1, _080F0F94 @ =0x0000876c - adds r0, r3, r1 - movs r4, 0 - ldrsh r2, [r0, r4] - lsls r1, r2, 4 - ldr r4, _080F0F98 @ =0x0000877c - adds r0, r3, r4 - strh r1, [r0] - movs r1, 0x8 - cmp r2, 0x1 - bne _080F0F82 - movs r1, 0x4 -_080F0F82: - ldr r2, _080F0F9C @ =0x0000877a - adds r0, r3, r2 - strh r1, [r0] - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080F0F90: .4byte gUnknown_083DFEC4 -_080F0F94: .4byte 0x0000876c -_080F0F98: .4byte 0x0000877c -_080F0F9C: .4byte 0x0000877a - thumb_func_end sub_80F0F64 - - thumb_func_start sub_80F0FA0 -sub_80F0FA0: @ 80F0FA0 - push {r4,lr} - ldr r0, _080F0FDC @ =gUnknown_083DFEC4 - ldr r3, [r0] - ldr r1, _080F0FE0 @ =0x0000876c - adds r0, r3, r1 - movs r4, 0 - ldrsh r0, [r0, r4] - negs r0, r0 - lsls r0, 16 - asrs r0, 16 - lsls r2, r0, 4 - ldr r4, _080F0FE4 @ =0x0000877c - adds r1, r3, r4 - strh r2, [r1] - movs r1, 0x1 - negs r1, r1 - movs r4, 0x8 - negs r4, r4 - adds r2, r4, 0 - cmp r0, r1 - bne _080F0FD0 - movs r0, 0x4 - negs r0, r0 - adds r2, r0, 0 -_080F0FD0: - ldr r1, _080F0FE8 @ =0x0000877a - adds r0, r3, r1 - strh r2, [r0] - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080F0FDC: .4byte gUnknown_083DFEC4 -_080F0FE0: .4byte 0x0000876c -_080F0FE4: .4byte 0x0000877c -_080F0FE8: .4byte 0x0000877a - thumb_func_end sub_80F0FA0 - - thumb_func_start sub_80F0FEC -sub_80F0FEC: @ 80F0FEC - push {lr} - bl sub_80F0718 - lsls r0, 24 - lsrs r0, 24 - pop {r1} - bx r1 - thumb_func_end sub_80F0FEC - - thumb_func_start sub_80F0FFC -sub_80F0FFC: @ 80F0FFC - push {r4,r5,lr} - lsls r0, 24 - ldr r1, _080F1048 @ =gUnknown_083DFEC4 - ldr r4, [r1] - ldr r1, _080F104C @ =0x00008788 - adds r5, r4, r1 - lsrs r0, 21 - adds r0, r4, r0 - ldr r1, _080F1050 @ =0x0000ceea - adds r0, r1 - ldrh r1, [r0] - adds r0, r5, 0 - movs r2, 0 - bl GetMapSectionName - ldr r0, _080F1054 @ =gWindowTemplate_81E710C - bl BasicInitMenuWindow - adds r0, r5, 0 - bl sub_80F19DC - ldr r0, _080F1058 @ =0x0000d138 - adds r4, r0 - adds r0, r4, 0 - adds r1, r5, 0 - movs r2, 0x58 - movs r3, 0x2 - bl AlignStringInMenuWindow - adds r0, r4, 0 - movs r1, 0 - movs r2, 0x5 - bl Menu_PrintText - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080F1048: .4byte gUnknown_083DFEC4 -_080F104C: .4byte 0x00008788 -_080F1050: .4byte 0x0000ceea -_080F1054: .4byte gWindowTemplate_81E710C -_080F1058: .4byte 0x0000d138 - thumb_func_end sub_80F0FFC - - thumb_func_start sub_80F105C -sub_80F105C: @ 80F105C - push {lr} - ldr r0, _080F1078 @ =gUnknown_083DFEC4 - ldr r1, [r0] - ldr r2, _080F107C @ =0x0000876e - adds r0, r1, r2 - ldrh r0, [r0] - adds r2, 0xA - adds r1, r2 - ldrh r1, [r1] - bl sub_80F0A74 - pop {r0} - bx r0 - .align 2, 0 -_080F1078: .4byte gUnknown_083DFEC4 -_080F107C: .4byte 0x0000876e - thumb_func_end sub_80F105C - - thumb_func_start sub_80F1080 -sub_80F1080: @ 80F1080 - push {r4,lr} - ldr r1, _080F10A0 @ =gUnknown_083DFEC4 - ldr r0, [r1] - ldr r2, _080F10A4 @ =0x0000d160 - adds r0, r2 - ldrh r0, [r0] - adds r2, r1, 0 - cmp r0, 0xE - bls _080F1094 - b _080F1204 -_080F1094: - lsls r0, 2 - ldr r1, _080F10A8 @ =_080F10AC - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_080F10A0: .4byte gUnknown_083DFEC4 -_080F10A4: .4byte 0x0000d160 -_080F10A8: .4byte _080F10AC - .align 2, 0 -_080F10AC: - .4byte _080F10E8 - .4byte _080F1104 - .4byte _080F1110 - .4byte _080F111C - .4byte _080F1128 - .4byte _080F112E - .4byte _080F1134 - .4byte _080F1142 - .4byte _080F1160 - .4byte _080F1166 - .4byte _080F116C - .4byte _080F1180 - .4byte _080F1194 - .4byte _080F11DC - .4byte _080F11E2 -_080F10E8: - bl sub_80EEDE8 - ldr r0, _080F10FC @ =gUnknown_083DFEC4 - ldr r0, [r0] - ldr r3, _080F1100 @ =0x0000d162 - adds r0, r3 - movs r1, 0xB - strb r1, [r0] - b _080F1218 - .align 2, 0 -_080F10FC: .4byte gUnknown_083DFEC4 -_080F1100: .4byte 0x0000d162 -_080F1104: - ldr r0, _080F110C @ =gWindowTemplate_81E70B8 - bl Text_LoadWindowTemplate - b _080F1218 - .align 2, 0 -_080F110C: .4byte gWindowTemplate_81E70B8 -_080F1110: - ldr r0, _080F1118 @ =gWindowTemplate_81E70B8 - bl MultistepInitMenuWindowBegin - b _080F1218 - .align 2, 0 -_080F1118: .4byte gWindowTemplate_81E70B8 -_080F111C: - bl MultistepInitMenuWindowContinue - cmp r0, 0 - beq _080F1126 - b _080F1218 -_080F1126: - b _080F1226 -_080F1128: - bl Menu_EraseScreen - b _080F1218 -_080F112E: - bl sub_80F1614 - b _080F1218 -_080F1134: - movs r0, 0x1 - bl sub_80F162C - lsls r0, 24 - cmp r0, 0 - beq _080F1218 - b _080F1226 -_080F1142: - ldr r0, _080F1154 @ =gUnknown_08E9FBA0 - ldr r1, _080F1158 @ =gUnknown_083DFEC4 - ldr r1, [r1] - ldr r2, _080F115C @ =0x0000934c - adds r1, r2 - bl LZ77UnCompWram - b _080F1218 - .align 2, 0 -_080F1154: .4byte gUnknown_08E9FBA0 -_080F1158: .4byte gUnknown_083DFEC4 -_080F115C: .4byte 0x0000934c -_080F1160: - bl sub_80F1238 - b _080F1218 -_080F1166: - bl sub_80F13FC - b _080F1218 -_080F116C: - ldr r0, _080F1178 @ =gPokenavRibbonView_Gfx - ldr r1, _080F117C @ =0x06008000 - bl LZ77UnCompVram - b _080F1218 - .align 2, 0 -_080F1178: .4byte gPokenavRibbonView_Gfx -_080F117C: .4byte 0x06008000 -_080F1180: - ldr r0, _080F118C @ =gUnknown_083E040C - ldr r1, _080F1190 @ =0x06008200 - bl LZ77UnCompVram - b _080F1218 - .align 2, 0 -_080F118C: .4byte gUnknown_083E040C -_080F1190: .4byte 0x06008200 -_080F1194: - ldr r0, _080F11CC @ =gPokenavRibbonView_Pal - movs r1, 0x20 - movs r2, 0x20 - bl LoadPalette - ldr r4, _080F11D0 @ =gUnknown_083E03A8 - adds r0, r4, 0 - movs r1, 0xF0 - movs r2, 0x20 - bl LoadPalette - ldr r0, _080F11D4 @ =gUnknown_083E3C60 - movs r1, 0x30 - movs r2, 0xA0 - bl LoadPalette - ldr r0, _080F11D8 @ =gUnknownPalette_81E6692 - movs r1, 0xB0 - movs r2, 0x20 - bl LoadPalette - adds r4, 0x1E - adds r0, r4, 0 - movs r1, 0xBF - movs r2, 0x2 - bl LoadPalette - b _080F1218 - .align 2, 0 -_080F11CC: .4byte gPokenavRibbonView_Pal -_080F11D0: .4byte gUnknown_083E03A8 -_080F11D4: .4byte gUnknown_083E3C60 -_080F11D8: .4byte gUnknownPalette_81E6692 -_080F11DC: - bl sub_80F1438 - b _080F1218 -_080F11E2: - ldr r1, _080F1208 @ =REG_BG2CNT - ldr r3, _080F120C @ =0x00001e02 - adds r0, r3, 0 - strh r0, [r1] - adds r1, 0x2 - ldr r3, _080F1210 @ =0x0000170b - adds r0, r3, 0 - strh r0, [r1] - adds r1, 0x42 - movs r0, 0 - strh r0, [r1] - ldr r1, [r2] - ldr r0, _080F1214 @ =0x0000d160 - adds r1, r0 - ldrh r0, [r1] - adds r0, 0x1 - strh r0, [r1] -_080F1204: - movs r0, 0 - b _080F1228 - .align 2, 0 -_080F1208: .4byte REG_BG2CNT -_080F120C: .4byte 0x00001e02 -_080F1210: .4byte 0x0000170b -_080F1214: .4byte 0x0000d160 -_080F1218: - ldr r0, _080F1230 @ =gUnknown_083DFEC4 - ldr r1, [r0] - ldr r2, _080F1234 @ =0x0000d160 - adds r1, r2 - ldrh r0, [r1] - adds r0, 0x1 - strh r0, [r1] -_080F1226: - movs r0, 0x1 -_080F1228: - pop {r4} - pop {r1} - bx r1 - .align 2, 0 -_080F1230: .4byte gUnknown_083DFEC4 -_080F1234: .4byte 0x0000d160 - thumb_func_end sub_80F1080 - - thumb_func_start sub_80F1238 -sub_80F1238: @ 80F1238 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x8 - movs r6, 0x8B - ldr r0, _080F1318 @ =gUnknown_083DFEC4 - ldr r2, [r0] - ldr r1, _080F131C @ =0x0000bc8e - adds r0, r2, r1 - ldr r3, _080F1320 @ =0x0000bc8f - adds r1, r2, r3 - ldrb r0, [r0] - ldrb r1, [r1] - subs r0, r1 - lsls r0, 24 - lsrs r0, 24 - str r0, [sp, 0x4] - movs r7, 0 - mov r5, sp - adds r4, r2, 0 -_080F1264: - movs r1, 0x80 - lsls r1, 6 - adds r0, r1, 0 - strh r0, [r5] - lsls r1, r7, 5 - adds r1, r6, r1 - lsls r1, 1 - ldr r2, _080F1324 @ =0x0000934c - adds r1, r2 - adds r1, r4, r1 - mov r0, sp - ldr r2, _080F1328 @ =0x01000012 - bl CpuSet - adds r0, r7, 0x1 - lsls r0, 16 - lsrs r7, r0, 16 - cmp r7, 0x7 - bls _080F1264 - ldr r3, [sp, 0x4] - lsls r0, r3, 16 - movs r7, 0 - mov r9, r0 - cmp r0, 0 - beq _080F1342 - ldr r0, _080F1318 @ =gUnknown_083DFEC4 - ldr r0, [r0] - mov r8, r0 - ldr r1, _080F132C @ =gUnknown_083E4698 - mov r10, r1 - ldr r5, _080F1324 @ =0x0000934c - add r5, r8 -_080F12A4: - ldr r0, _080F1330 @ =0x0000bc4c - add r0, r8 - adds r0, r7 - ldrb r1, [r0] - lsls r1, 2 - mov r0, r10 - adds r0, 0x2 - adds r0, r1, r0 - ldrb r2, [r0] - adds r2, 0x3 - lsls r2, 24 - add r1, r10 - ldrh r0, [r1] - lsls r0, 25 - movs r3, 0x80 - lsls r3, 21 - adds r0, r3 - lsrs r4, r0, 24 - lsls r1, r6, 1 - adds r1, r5, r1 - lsrs r2, 12 - adds r0, r2, 0 - orrs r0, r4 - strh r0, [r1] - adds r1, r6, 0x1 - lsls r1, 1 - adds r1, r5, r1 - movs r3, 0x80 - lsls r3, 3 - adds r0, r3, 0 - adds r3, r2, 0 - orrs r3, r0 - adds r0, r3, 0 - orrs r0, r4 - strh r0, [r1] - adds r0, r6, 0 - adds r0, 0x20 - lsls r0, 1 - adds r0, r5, r0 - adds r1, r4, 0x1 - orrs r2, r1 - strh r2, [r0] - adds r0, r6, 0 - adds r0, 0x21 - lsls r0, 1 - adds r0, r5, r0 - orrs r3, r1 - strh r3, [r0] - adds r4, r7, 0x1 - adds r0, r4, 0 - movs r1, 0x9 - bl __modsi3 - cmp r0, 0 - bne _080F1334 - adds r0, r6, 0 - adds r0, 0x30 - b _080F1336 - .align 2, 0 -_080F1318: .4byte gUnknown_083DFEC4 -_080F131C: .4byte 0x0000bc8e -_080F1320: .4byte 0x0000bc8f -_080F1324: .4byte 0x0000934c -_080F1328: .4byte 0x01000012 -_080F132C: .4byte gUnknown_083E4698 -_080F1330: .4byte 0x0000bc4c -_080F1334: - adds r0, r6, 0x2 -_080F1336: - lsls r0, 16 - lsrs r6, r0, 16 - lsls r0, r4, 16 - lsrs r7, r0, 16 - cmp r0, r9 - bcc _080F12A4 -_080F1342: - ldr r6, _080F13E8 @ =0x0000014b - movs r7, 0 - ldr r1, _080F13EC @ =gUnknown_083DFEC4 - ldr r0, [r1] - ldr r2, _080F13F0 @ =0x0000bc8f - adds r1, r0, r2 - ldrb r3, [r1] - cmp r7, r3 - bcs _080F13D8 - subs r2, 0x43 - adds r2, r0 - mov r10, r2 - ldr r3, _080F13F4 @ =gUnknown_083E4698 - mov r8, r3 - ldr r2, _080F13F8 @ =0x0000934c - adds r5, r0, r2 - mov r9, r1 -_080F1364: - ldr r3, [sp, 0x4] - adds r0, r3, r7 - add r0, r10 - ldrb r1, [r0] - lsls r1, 2 - mov r0, r8 - adds r0, 0x2 - adds r0, r1, r0 - ldrb r2, [r0] - adds r2, 0x3 - lsls r2, 24 - add r1, r8 - ldrh r0, [r1] - lsls r0, 25 - movs r1, 0x80 - lsls r1, 21 - adds r0, r1 - lsrs r4, r0, 24 - lsls r1, r6, 1 - adds r1, r5, r1 - lsrs r2, 12 - adds r0, r2, 0 - orrs r0, r4 - strh r0, [r1] - adds r1, r6, 0x1 - lsls r1, 1 - adds r1, r5, r1 - movs r3, 0x80 - lsls r3, 3 - adds r0, r3, 0 - adds r3, r2, 0 - orrs r3, r0 - adds r0, r3, 0 - orrs r0, r4 - strh r0, [r1] - adds r0, r6, 0 - adds r0, 0x20 - lsls r0, 1 - adds r0, r5, r0 - adds r1, r4, 0x1 - orrs r2, r1 - strh r2, [r0] - adds r0, r6, 0 - adds r0, 0x21 - lsls r0, 1 - adds r0, r5, r0 - orrs r3, r1 - strh r3, [r0] - adds r0, r6, 0x2 - lsls r0, 16 - lsrs r6, r0, 16 - adds r0, r7, 0x1 - lsls r0, 16 - lsrs r7, r0, 16 - mov r0, r9 - ldrb r0, [r0] - cmp r7, r0 - bcc _080F1364 -_080F13D8: - add sp, 0x8 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080F13E8: .4byte 0x0000014b -_080F13EC: .4byte gUnknown_083DFEC4 -_080F13F0: .4byte 0x0000bc8f -_080F13F4: .4byte gUnknown_083E4698 -_080F13F8: .4byte 0x0000934c - thumb_func_end sub_80F1238 - - thumb_func_start sub_80F13FC -sub_80F13FC: @ 80F13FC - ldr r0, _080F141C @ =gUnknown_083DFEC4 - ldr r0, [r0] - ldr r1, _080F1420 @ =0x0000934c - adds r0, r1 - ldr r2, _080F1424 @ =0x0600b800 - ldr r1, _080F1428 @ =0x040000d4 - str r0, [r1] - str r2, [r1, 0x4] - ldr r0, _080F142C @ =0x84000140 - str r0, [r1, 0x8] - ldr r0, [r1, 0x8] - ldr r1, _080F1430 @ =gPlttBufferUnfaded - ldr r0, _080F1434 @ =gPokenavRibbonView_Pal + 0x1C - ldrh r0, [r0] - strh r0, [r1] - bx lr - .align 2, 0 -_080F141C: .4byte gUnknown_083DFEC4 -_080F1420: .4byte 0x0000934c -_080F1424: .4byte 0x0600b800 -_080F1428: .4byte 0x040000d4 -_080F142C: .4byte 0x84000140 -_080F1430: .4byte gPlttBufferUnfaded -_080F1434: .4byte gPokenavRibbonView_Pal + 0x1C - thumb_func_end sub_80F13FC - - thumb_func_start sub_80F1438 -sub_80F1438: @ 80F1438 - push {r4,r5,lr} - ldr r0, _080F1470 @ =gUnknown_083DFEC4 - ldr r4, [r0] - ldr r1, _080F1474 @ =0x00008829 - adds r0, r4, r1 - movs r1, 0xD - movs r2, 0x1 - bl Menu_PrintText - ldr r0, _080F1478 @ =0x00008788 - adds r5, r4, r0 - ldr r1, _080F147C @ =0x0000876e - adds r4, r1 - ldrh r1, [r4] - adds r1, 0x1 - lsls r1, 16 - lsrs r1, 16 - adds r0, r5, 0 - bl sub_80F445C - adds r0, r5, 0 - movs r1, 0x1 - movs r2, 0x5 - bl Menu_PrintText - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080F1470: .4byte gUnknown_083DFEC4 -_080F1474: .4byte 0x00008829 -_080F1478: .4byte 0x00008788 -_080F147C: .4byte 0x0000876e - thumb_func_end sub_80F1438 - - thumb_func_start sub_80F1480 -sub_80F1480: @ 80F1480 - push {lr} - movs r0, 0xC - movs r1, 0xD - movs r2, 0x1B - movs r3, 0x10 - bl Menu_EraseWindowRect - pop {r0} - bx r0 - thumb_func_end sub_80F1480 - - thumb_func_start sub_80F1494 -sub_80F1494: @ 80F1494 - push {r4-r7,lr} - ldr r0, _080F14D4 @ =gUnknown_083DFEC8 - ldr r0, [r0] - movs r1, 0x80 - lsls r1, 4 - adds r6, r0, r1 - ldr r2, _080F14D8 @ =0x00000a98 - adds r7, r0, r2 - ldr r0, _080F14DC @ =gUnknown_083DFEC4 - ldr r3, [r0] - ldr r4, _080F14E0 @ =0x0000bc91 - adds r1, r3, r4 - ldrb r0, [r1] - cmp r0, 0x2 - bhi _080F14F0 - ldr r5, _080F14E4 @ =gUnknown_020388B4 - adds r1, r0, 0 - lsls r0, r1, 3 - subs r4, 0x1 - adds r2, r3, r4 - adds r0, r1 - ldrb r2, [r2] - adds r0, r2 - strh r0, [r5] - ldr r1, _080F14E8 @ =0x0000bc4c - adds r0, r3, r1 - ldrh r2, [r5] - adds r0, r2 - ldrb r0, [r0] - strh r0, [r5] - ldr r4, _080F14EC @ =gRibbonDescriptions - b _080F152E - .align 2, 0 -_080F14D4: .4byte gUnknown_083DFEC8 -_080F14D8: .4byte 0x00000a98 -_080F14DC: .4byte gUnknown_083DFEC4 -_080F14E0: .4byte 0x0000bc91 -_080F14E4: .4byte gUnknown_020388B4 -_080F14E8: .4byte 0x0000bc4c -_080F14EC: .4byte gRibbonDescriptions -_080F14F0: - ldr r5, _080F1558 @ =gUnknown_020388B4 - ldr r4, _080F155C @ =0x0000bc8e - adds r0, r3, r4 - ldrb r0, [r0] - ldr r2, _080F1560 @ =0x0000bc8f - adds r1, r3, r2 - ldrb r1, [r1] - subs r0, r1 - strh r0, [r5] - ldrh r1, [r5] - adds r4, 0x2 - adds r0, r3, r4 - ldrb r0, [r0] - adds r1, r0 - subs r2, 0x43 - adds r0, r3, r2 - adds r0, r1 - ldrb r0, [r0] - strh r0, [r5] - ldr r0, _080F1564 @ =gSaveBlock1 - ldrh r1, [r5] - adds r0, r1 - ldr r4, _080F1568 @ =0x000030f7 - adds r0, r4 - ldrb r0, [r0] - strh r0, [r5] - cmp r0, 0 - beq _080F1570 - subs r0, 0x1 - strh r0, [r5] - ldr r4, _080F156C @ =gGiftRibbonDescriptions -_080F152E: - ldrh r0, [r5] - lsls r0, 3 - adds r0, r4 - ldr r1, [r0] - adds r0, r6, 0 - movs r2, 0x80 - movs r3, 0 - bl AlignStringInMenuWindow - ldrh r0, [r5] - lsls r0, 3 - adds r4, 0x4 - adds r0, r4 - ldr r1, [r0] - adds r0, r7, 0 - movs r2, 0x80 - movs r3, 0 - bl AlignStringInMenuWindow - b _080F158A - .align 2, 0 -_080F1558: .4byte gUnknown_020388B4 -_080F155C: .4byte 0x0000bc8e -_080F1560: .4byte 0x0000bc8f -_080F1564: .4byte gSaveBlock1 -_080F1568: .4byte 0x000030f7 -_080F156C: .4byte gGiftRibbonDescriptions -_080F1570: - ldr r4, _080F15A4 @ =gEmptyString_81E72B0 - adds r0, r6, 0 - adds r1, r4, 0 - movs r2, 0x80 - movs r3, 0 - bl AlignStringInMenuWindow - adds r0, r7, 0 - adds r1, r4, 0 - movs r2, 0x80 - movs r3, 0 - bl AlignStringInMenuWindow -_080F158A: - adds r0, r6, 0 - movs r1, 0xC - movs r2, 0xD - bl Menu_PrintText - adds r0, r7, 0 - movs r1, 0xC - movs r2, 0xF - bl Menu_PrintText - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080F15A4: .4byte gEmptyString_81E72B0 - thumb_func_end sub_80F1494 - - thumb_func_start sub_80F15A8 -sub_80F15A8: @ 80F15A8 - push {r4,r5,lr} - movs r0, 0xC - movs r1, 0xD - movs r2, 0x1B - movs r3, 0x10 - bl Menu_EraseWindowRect - ldr r0, _080F1600 @ =gUnknown_083DFEC4 - ldr r4, [r0] - ldr r0, _080F1604 @ =0x00008788 - adds r5, r4, r0 - ldr r1, _080F1608 @ =gOtherText_Ribbons - adds r0, r5, 0 - bl StringCopy - adds r2, r0, 0 - movs r0, 0 - strb r0, [r2] - adds r2, 0x1 - ldr r1, _080F160C @ =0x000087dc - adds r0, r4, r1 - movs r1, 0 - ldrsh r0, [r0, r1] - lsls r0, 2 - adds r4, r0 - ldr r0, _080F1610 @ =0x0000893c - adds r4, r0 - ldrb r1, [r4] - adds r0, r2, 0 - movs r2, 0 - movs r3, 0x2 - bl ConvertIntToDecimalStringN - adds r2, r0, 0 - movs r0, 0xFF - strb r0, [r2] - adds r0, r5, 0 - movs r1, 0xC - movs r2, 0xD - bl Menu_PrintText - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080F1600: .4byte gUnknown_083DFEC4 -_080F1604: .4byte 0x00008788 -_080F1608: .4byte gOtherText_Ribbons -_080F160C: .4byte 0x000087dc -_080F1610: .4byte 0x0000893c - thumb_func_end sub_80F15A8 - - thumb_func_start sub_80F1614 -sub_80F1614: @ 80F1614 - ldr r0, _080F1624 @ =gUnknown_083DFEC4 - ldr r0, [r0] - ldr r1, _080F1628 @ =0x00008764 - adds r0, r1 - movs r1, 0 - strh r1, [r0] - bx lr - .align 2, 0 -_080F1624: .4byte gUnknown_083DFEC4 -_080F1628: .4byte 0x00008764 - thumb_func_end sub_80F1614 - thumb_func_start sub_80F162C sub_80F162C: @ 80F162C push {lr} @@ -6702,7 +4717,7 @@ _080F3A78: ldm r0!, {r3,r6,r7} stm r1!, {r3,r6,r7} mov r3, sp - ldr r1, _080F3AE4 @ =gUnknown_083E4698 + ldr r1, _080F3AE4 @ =gPokenavRibbonsIconGfx lsls r2, 2 adds r0, r2, r1 ldrh r0, [r0] @@ -6738,7 +4753,7 @@ _080F3AD4: .4byte 0x0000bc8e _080F3AD8: .4byte 0x0000bc8f _080F3ADC: .4byte 0x0000bc4c _080F3AE0: .4byte gSpriteTemplate_83E476C -_080F3AE4: .4byte gUnknown_083E4698 +_080F3AE4: .4byte gPokenavRibbonsIconGfx _080F3AE8: lsls r0, r1, 4 adds r0, r1 @@ -12998,7 +11013,7 @@ _080F6B54: bl sub_80F66E0 b _080F6BC6 _080F6B6E: - bl sub_80F1238 + bl DrawMonRibbonIcons ldr r0, _080F6B7C @ =gUnknown_083DFEC4 ldr r1, [r0] ldr r2, _080F6B80 @ =0x000087de @@ -13715,7 +11730,7 @@ _080F7194: .4byte 0x00008788 _080F7198: .4byte 0x0000876e _080F719C: .4byte 0x000087de _080F71A0: - bl sub_80F0CD8 + bl LoadTrainerEyesDescriptionLines ldr r0, _080F71D4 @ =gUnknown_083DFEC4 ldr r1, [r0] ldr r0, _080F71D8 @ =0x0000bc95 diff --git a/data/pokenav.s b/data/pokenav.s index cb0e98472..485568157 100644 --- a/data/pokenav.s +++ b/data/pokenav.s @@ -700,7 +700,7 @@ gUnknown_083E4678:: @ 83E4678 .incbin "graphics/pokenav/83E4678.gbapal" .align 2 -gUnknown_083E4698:: @ 83E4698 +gPokenavRibbonsIconGfx:: @ 83E4698 .2byte 0, 0 .2byte 1, 0 .2byte 2, 0 diff --git a/include/pokenav.h b/include/pokenav.h index f77f93e2d..0abed5c63 100644 --- a/include/pokenav.h +++ b/include/pokenav.h @@ -5,7 +5,9 @@ struct UnkPokenavStruct_Sub { /*0x0*/ u16 unk0; - /*0x2*/ u8 filler2[6]; + /*0x2*/ u16 unk2; + /*0x4*/ u8 unk4; + /*0x5*/ u8 unk5; }; struct UnkPokenavStruct_Sub1 { @@ -37,9 +39,10 @@ struct UnkPokenavStruct_Sub3 { }; struct UnkUsePokeblockSub { - /*0*/ u8 fil0[2]; - /*2*/ u8 partyIdx:5; - /*2*/ u16 unk2:9; + /*0x0*/ u8 unk0; + /*0x1*/ u8 filler1[1]; + /*0x2*/ u8 partyIdx:5; + /*0x2*/ u16 unk2:9; }; struct UnkPokenavStruct { @@ -65,14 +68,23 @@ struct UnkPokenavStruct { /*0x769E*/ u8 unk769E; /*0x769F*/ u8 filler769F[0xB]; /*0x76AA*/ u8 unk76AA; - /*0x76AB*/ u8 filler76AB[0x10bd]; + /*0x76AB*/ u8 filler76AB[0x10b9]; + /*0x8764*/ u16 unk8764; /*0x8768*/ struct UnkPokenavStruct_Sub2 *unk8768; - /*0x876C*/ u8 filler876C[0x2]; - /*0x876E*/ u8 unk876E; - /*0x876F*/ u8 filler876F[0x7]; - /*0x8776*/ u16 unk8776; + /*0x876C*/ s16 unk876C; + /*0x876E*/ s16 unk876E; + /*0x8770*/ s16 unk8770; + /*0x8772*/ s16 unk8772; + /*0x8774*/ s16 unk8774; + /*0x8776*/ s16 unk8776; /*0x8778*/ u16 unk8778; - /*0x877A*/ u8 filler877A[0xE]; + /*0x877A*/ s16 unk877A; + /*0x877C*/ s16 unk877C; + /*0x877E*/ u16 unk877E; + /*0x8780*/ u16 unk8780; + /*0x8782*/ u8 filler8782[0x2]; + /*0x8784*/ u16 unk8784; + /*0x8786*/ u16 unk8786; /*0x8788*/ u8 unk8788[0x40]; /*0x87C8*/ u8 unk87C8; /*0x87C9*/ u8 filler87C9; @@ -96,7 +108,14 @@ struct UnkPokenavStruct { /*0x9004*/ u8 unk9004[3][20]; /*0x9040*/ u8 unk9040[0x304]; /*0x9344*/ u8 unk9344; - /*0x9345*/ u8 filler9345[0x2955]; + /*0x9345*/ u8 filler9345[7]; + /*0x934C*/ u16 unk934C[0x1480]; + /*0xBC4C*/ u8 unkBC4C[0x42]; + /*0xBC8E*/ u8 unkBC8E; + /*0xBC8F*/ u8 unkBC8F; + /*0xBC90*/ u8 unkBC90; + /*0xBC91*/ u8 unkBC91; + /*0xBC92*/ u8 fillerBC92[0x8]; /*0xBC9A*/ u8 unkBC9A; /*0xBC9B*/ u8 unkBC9B; /*0xBC9C*/ u8 unkBC9C[22][200]; @@ -106,11 +125,16 @@ struct UnkPokenavStruct { /*0xCE50*/ u16 unkCE50; /*0xCE52*/ u16 palettesCE52[30]; /*0xCE8E*/ u16 palettesCE8E[0x2D]; - /*0xCEE8*/ struct UnkPokenavStruct_Sub unkCEE8[78]; + /*0xCEE8*/ struct UnkPokenavStruct_Sub unkCEE8[69]; + /*0xD110*/ const u8 *trainerEyeDescriptionLines[4]; + /*0xD120*/ u8 fillerD114[0x18]; + /*0xD138*/ u8 unkD138[0x20]; /*0xD158*/ u16 unkD158; - /*0xD15A*/ u8 fillerD15A[6]; + /*0xD15A*/ u8 fillerD15A[2]; + /*0xD15C*/ u16 unkD15C; + /*0xD15E*/ u8 fillerD15E[2]; /*0xD160*/ u16 unkD160; - /*0xD162*/ u8 unkD162[2]; + /*0xD162*/ u8 unkD162; /*0xD164*/ struct UnkPokenavStruct_Sub1 unkD164; }; diff --git a/src/contest_effect.c b/src/contest_effect.c index d97f38138..17779a0c6 100644 --- a/src/contest_effect.c +++ b/src/contest_effect.c @@ -615,150 +615,40 @@ static void ContestEffect_QualityDependsOnTiming(void) sContestantStatus[shared192D0.contestant].appeal2 = appeal; } -#ifdef NONMATCHING -// Not even close, send help -// Works well if it’s the same type as the one before. static void ContestEffect_BetterIfSameType(void) { - s8 r4; - s8 r2; + s8 turnOrder = shared192D0.turnOrder[shared192D0.contestant]; + s8 i = turnOrder - 1, j; + u16 move; - for (r4 = shared192D0.turnOrder[shared192D0.contestant]; r4 > 0; r4--) + if (turnOrder == 0) + return; + + while (1) { - for (r2 = 0; r2 < 4; r2++) + for (j = 0; j < 4; j++) { - if (shared192D0.turnOrder[r2] == r4 - 1) + if (shared192D0.turnOrder[j] == i) break; } - if (!(sContestantStatus[r2].noMoreTurns || sContestantStatus[r2].nervous || sContestantStatus[r2].numTurnsSkipped)) + if (sContestantStatus[j].noMoreTurns || sContestantStatus[j].nervous || sContestantStatus[j].numTurnsSkipped) + { + if (--i < 0) + return; + } + else { - u16 move = sContestantStatus[shared192D0.contestant].currMove; - - if (gContestMoves[move].contestCategory == gContestMoves[sContestantStatus[r2].currMove].contestCategory) - { - sContestantStatus[shared192D0.contestant].appeal2 += gContestEffects[gContestMoves[move].effect].appeal * 2; - SetContestantEffectStringID(shared192D0.contestant, CONTEST_STRING_SAME_TYPE_GOOD); - } break; } } + + move = sContestantStatus[shared192D0.contestant].currMove; + if (gContestMoves[move].contestCategory == gContestMoves[sContestantStatus[j].currMove].contestCategory) + { + sContestantStatus[shared192D0.contestant].appeal2 += gContestEffects[gContestMoves[move].effect].appeal * 2; + SetContestantEffectStringID(shared192D0.contestant, CONTEST_STRING_SAME_TYPE_GOOD); + } } -#else -NAKED void ContestEffect_BetterIfSameType(void) -{ - asm_unified("\tpush {r4-r7,lr}\n" - "\tldr r1, _080B8940 @ =gSharedMem + 0x192D0\n" - "\tldrb r0, [r1, 0x11]\n" - "\tadds r0, r1\n" - "\tmovs r2, 0\n" - "\tldrsb r2, [r0, r2]\n" - "\tsubs r0, r2, 0x1\n" - "\tlsls r0, 24\n" - "\tlsrs r4, r0, 24\n" - "\tmov r12, r1\n" - "\tcmp r2, 0\n" - "\tbeq _080B8994\n" - "\tldrb r5, [r1]\n" - "\tmov r6, r12\n" - "\tsubs r6, 0x70\n" - "_080B88EA:\n" - "\tmovs r2, 0\n" - "\tlsls r0, r4, 24\n" - "\tasrs r1, r0, 24\n" - "\tadds r4, r0, 0\n" - "\tcmp r5, r1\n" - "\tbeq _080B8910\n" - "\tldr r3, _080B8940 @ =gSharedMem + 0x192D0\n" - "_080B88F8:\n" - "\tlsls r0, r2, 24\n" - "\tmovs r2, 0x80\n" - "\tlsls r2, 17\n" - "\tadds r0, r2\n" - "\tlsrs r2, r0, 24\n" - "\tasrs r0, 24\n" - "\tcmp r0, 0x3\n" - "\tbgt _080B8910\n" - "\tadds r0, r3\n" - "\tldrb r0, [r0]\n" - "\tcmp r0, r1\n" - "\tbne _080B88F8\n" - "_080B8910:\n" - "\tlsls r2, 24\n" - "\tasrs r1, r2, 24\n" - "\tlsls r0, r1, 3\n" - "\tsubs r0, r1\n" - "\tlsls r0, 2\n" - "\tadds r3, r0, r6\n" - "\tldrb r1, [r3, 0xB]\n" - "\tmovs r0, 0x80\n" - "\tands r0, r1\n" - "\tadds r7, r2, 0\n" - "\tcmp r0, 0\n" - "\tbne _080B8932\n" - "\tldrb r1, [r3, 0xC]\n" - "\tmovs r0, 0x7\n" - "\tands r0, r1\n" - "\tcmp r0, 0\n" - "\tbeq _080B8944\n" - "_080B8932:\n" - "\tmovs r1, 0xFF\n" - "\tlsls r1, 24\n" - "\tadds r0, r4, r1\n" - "\tlsrs r4, r0, 24\n" - "\tcmp r0, 0\n" - "\tblt _080B8994\n" - "\tb _080B88EA\n" - "\t.align 2, 0\n" - "_080B8940: .4byte gSharedMem + 0x192D0\n" - "_080B8944:\n" - "\tmov r2, r12\n" - "\tldrb r1, [r2, 0x11]\n" - "\tlsls r0, r1, 3\n" - "\tsubs r0, r1\n" - "\tlsls r0, 2\n" - "\tmov r3, r12\n" - "\tsubs r3, 0x70\n" - "\tadds r5, r0, r3\n" - "\tldrh r0, [r5, 0x6]\n" - "\tldr r4, _080B899C @ =gContestMoves\n" - "\tlsls r0, 3\n" - "\tadds r6, r0, r4\n" - "\tldrb r2, [r6, 0x1]\n" - "\tlsls r2, 29\n" - "\tasrs r1, r7, 24\n" - "\tlsls r0, r1, 3\n" - "\tsubs r0, r1\n" - "\tlsls r0, 2\n" - "\tadds r0, r3\n" - "\tldrh r0, [r0, 0x6]\n" - "\tlsls r0, 3\n" - "\tadds r0, r4\n" - "\tldrb r0, [r0, 0x1]\n" - "\tlsls r0, 29\n" - "\tcmp r2, r0\n" - "\tbne _080B8994\n" - "\tldr r1, _080B89A0 @ =gContestEffects\n" - "\tldrb r0, [r6]\n" - "\tlsls r0, 2\n" - "\tadds r0, r1\n" - "\tldrb r0, [r0, 0x1]\n" - "\tlsls r0, 1\n" - "\tldrh r1, [r5, 0x2]\n" - "\tadds r0, r1\n" - "\tstrh r0, [r5, 0x2]\n" - "\tmov r2, r12\n" - "\tldrb r0, [r2, 0x11]\n" - "\tmovs r1, 0x1F\n" - "\tbl SetContestantEffectStringID\n" - "_080B8994:\n" - "\tpop {r4-r7}\n" - "\tpop {r0}\n" - "\tbx r0\n" - "\t.align 2, 0\n" - "_080B899C: .4byte gContestMoves\n" - "_080B89A0: .4byte gContestEffects"); -} -#endif // Works well if different in type than the one before. static void ContestEffect_BetterIfDiffType(void) diff --git a/src/pokenav_before.c b/src/pokenav_before.c index 21394f348..b33fa588c 100644 --- a/src/pokenav_before.c +++ b/src/pokenav_before.c @@ -15,11 +15,13 @@ #include "region_map.h" #include "constants/songs.h" #include "string_util.h" +#include "strings.h" #include "sound.h" #include "task.h" #include "text.h" #include "scanline_effect.h" #include "pokemon_storage_system.h" +#include "constants/game_stat.h" struct UnknownPokenav0 { @@ -87,6 +89,11 @@ struct UnknownPokenav0_1 { s8 var6dae; }; +struct PokenavRibbonIconGfx { + u16 baseTile; + u8 paletteNum; +}; + IWRAM_DATA void (*gUnknown_03000744)(void); extern const u8 gUnknown_083E0314[]; @@ -129,6 +136,22 @@ extern const u8 gPokenavHoennMapMisc_Gfx[]; extern const u8 gUnknown_08E99FB0[]; extern const u8 gUnknown_08E9A100[]; extern const u16 gPokenavHoennMap1_Pal[]; +extern void (*const gUnknown_083E3270[])(u16, u16); +extern const u8 gUnknown_083E039C[]; +extern const u8 gUnknown_083E03A0[]; +extern const u8 *const gTrainerEyeDescriptions[]; +extern const u8 gUnknown_08E9FBA0[]; +extern const u8 gPokenavRibbonView_Gfx[]; +extern const u8 gUnknown_083E040C[]; +extern const u16 gPokenavRibbonView_Pal[]; +extern const u16 gUnknown_083E03A8[]; +extern const u16 gUnknown_083E3C60[]; +extern const u16 gPokenavRibbonsIconGfx[][2]; +extern const u8 *const gRibbonDescriptions[][2]; +extern const u8 *const gGiftRibbonDescriptions[][2]; + +extern u16 gUnknown_020388B4; + // TODO: decompile the debug code so the compiler doesn't complain about // unused static functions @@ -171,15 +194,40 @@ static void sub_80EE58C(); static void sub_80EE658(); static void sub_80EE8F4(); static void sub_80EEDC4(); +static void ShowMapNamePopUpWindow(void); +static void sub_80F0954(u16, u16, u16); +static bool8 sub_80F098C(void); +void sub_80F445C(u8*, u16); +static void sub_80F081C(u8); +bool8 sub_80F0944(void); +u8 *sub_80F4428(u8*, u16, u8); +void sub_80F700C(u8*, u16); +static void sub_80F0B24(void); +static bool8 sub_80F0B44(void); +static void sub_80F0C28(void); +static bool8 sub_80F0C48(void); +void LoadTrainerEyesDescriptionLines(void); +bool8 sub_80F0D5C(void); +static void sub_80F0EC0(void); +static bool8 sub_80F0EF4(void); +static void sub_80F0F64(void); +static void sub_80F0FA0(void); +static bool8 sub_80F0FEC(void); +static bool8 sub_80F0718(void); +void sub_80F0FFC(u8); +void sub_80F19DC(u8*); +static bool8 sub_80F1080(void); +void sub_80F1614(void); +void DrawMonRibbonIcons(void); +void sub_80F13FC(void); +void sub_80F1438(void); +static void sub_80F1494(void); -extern bool8 sub_80F0944(void); -extern void sub_80F081C(); extern void sub_80F0900(void); extern void sub_80F443C(u8 *, u16); extern bool8 sub_80F162C(u8); extern void sub_80F01E0(u16); extern void sub_80F01A4(void); -extern void sub_80F1614(void); extern void sub_80EFD3C(void); extern void sub_8095C8C(); extern void sub_80EFDA0(void); @@ -193,41 +241,26 @@ extern void sub_80EF54C(u8); extern void sub_80EF58C(u8); extern void sub_80F6FFC(); extern void sub_80F3294(); -extern void sub_80F0B24(); -extern bool8 sub_80F0B44(); -extern void sub_80F0F64(); -extern bool8 sub_80F0FEC(); extern void sub_80F6FB8(); extern void sub_80F6DB8(); -extern void sub_80F0CD8(); extern bool8 sub_80F6E9C(); -extern bool8 sub_80F0D5C(); extern bool8 sub_80F6ED4(); -extern bool8 sub_80F0EF4(); extern void sub_80F2FB0(); -extern void sub_80F0FA0(); -extern void sub_80F0C28(); -extern bool8 sub_80F0C48(); extern bool8 sub_80F70FC(); extern void sub_80F708C(u32); extern void sub_80F4394(); -extern void sub_80F0EC0(); -extern void sub_80F700C(); extern void sub_80F42C4(); -extern void sub_80F0FFC(); extern void sub_80F6F10(); extern void sub_80F3C2C(); -extern void sub_80F15A8(); +static extern void sub_80F15A8(void); extern void sub_80F6A4C(); extern bool8 sub_80F6AF0(); extern void sub_80F3B00(); extern bool8 sub_80F3B58(); -extern void sub_80F1494(); extern u8 sub_80F68E8(); extern void sub_80F3B94(); extern bool8 sub_80F3BD4(); extern void sub_80F66E0(); -extern bool8 sub_80F1080(); extern void sub_80F38B8(); extern bool8 sub_80F38EC(); extern void sub_80F638C(); @@ -238,8 +271,6 @@ extern bool8 sub_80EFF68(); extern void sub_80F35B4(); extern void sub_80F6134(); extern u8 sub_80F5DD4(); -extern void ShowMapNamePopUpWindow(); -extern bool8 sub_80F0718(); extern bool8 sub_80F3264(); extern void sub_80F4D44(); extern bool8 sub_80F4D88(); @@ -3131,7 +3162,7 @@ void sub_80EE658() ewram0_10.var304++; break; case 6: - sub_80F0CD8(); + LoadTrainerEyesDescriptionLines(); ewram0_10.var304++; case 7: if (!sub_80F6E9C() && !sub_80F0D5C()) @@ -4484,7 +4515,7 @@ bool8 sub_80EFF68(void) { case 0: sub_80EEDE8(); - gUnknown_083DFEC4->unkD162[0] = 11; + gUnknown_083DFEC4->unkD162 = 11; break; case 1: Text_LoadWindowTemplate(&gWindowTemplate_81E7080); @@ -4587,7 +4618,6 @@ void sub_80F0264(u8 a) } } -#ifdef NONMATCHING // small nonmatching part is in the third else clause in case 7. bool8 sub_80F02A0(void) { const u16 *pointer; @@ -4598,7 +4628,7 @@ bool8 sub_80F02A0(void) sub_80EEDE8(); gUnknown_083DFEC4->unk87C8 = gUnknown_083DFEC4->unk87CA == 1; - gUnknown_083DFEC4->unkD162[0] = 11; + gUnknown_083DFEC4->unkD162 = 11; break; case 1: Text_LoadWindowTemplate(&gWindowTemplate_81E70D4); @@ -4647,8 +4677,7 @@ bool8 sub_80F02A0(void) else { LoadPalette(gUnknown_08E9F9E8, 0x30, 0x20); - pointer = &gUnknown_08E9F9E8[5]; - gPlttBufferUnfaded[0] = gUnknown_08E9F9E8[5]; + gPlttBufferUnfaded[0] = *(pointer = &gUnknown_08E9F9E8[5]); LoadPalette(gUnknown_083E0314, 0x50, 0x20); LoadPalette(&gUnknown_083E02B4[1], 0xB1, 0x2); LoadPalette(&gUnknown_083E02B4[8], 0xB5, 0x2); @@ -4690,7 +4719,7 @@ bool8 sub_80F02A0(void) else { sub_80F081C(0); - sub_80F0FFC(gUnknown_083DFEC4->unk876E); + sub_80F0FFC((u8)gUnknown_083DFEC4->unk876E); } break; case 14: @@ -4712,414 +4741,866 @@ bool8 sub_80F02A0(void) gUnknown_083DFEC4->unk306++; return TRUE; } + +void sub_80F063C(s16 arg0) +{ + s16 var0; + s16 var1; + s16 var2; + + gUnknown_083DFEC4->unk877C = arg0 * 16; + gUnknown_083DFEC4->unk877A = (arg0 == 1 || arg0 == -1) ? 4 : 8; + if (arg0 < 0) + { + gUnknown_083DFEC4->unk877A *= -1; + var0 = arg0 * 2 + gUnknown_083DFEC4->unk8778; + var1 = arg0 + gUnknown_083DFEC4->unk8770; + if (var1 < 0) + var1 += gUnknown_083DFEC4->unk8774 + 1; + + arg0 *= -1; + } + else + { + var0 = gUnknown_083DFEC4->unk8778 + 16; + var1 = gUnknown_083DFEC4->unk8772 + 1; + } + + if (var1 > gUnknown_083DFEC4->unk8774) + var1 = 0; + + var2 = var0 & 0x1F; + sub_80F0954(var1, var2, arg0); +} + +static bool8 sub_80F0718(void) +{ + if (!sub_80F098C()) + { + if (gUnknown_083DFEC4->unk877C == 0) + return FALSE; + + gUnknown_083DFEC4->unk877C -= gUnknown_083DFEC4->unk877A; + gUnknown_083DFEC4->unk8776 += gUnknown_083DFEC4->unk877A; + gUnknown_083DFEC4->unk8776 &= 0xFF; + REG_BG3VOFS = gUnknown_083DFEC4->unk8776; + if (gUnknown_083DFEC4->unk877C == 0) + { + gUnknown_083DFEC4->unk8778 = ((8 + gUnknown_083DFEC4->unk8776) & 0xFF) / 8; + return FALSE; + } + } + + return TRUE; +} + +static void ShowMapNamePopUpWindow(void) +{ + switch (gUnknown_083DFEC4->unk87CA) + { + case 0: + sub_80F443C(gUnknown_083DFEC4->unk8788, gUnknown_083DFEC4->unk893c[gUnknown_083DFEC4->unk876E].unk2); + break; + case 1: + sub_80F445C(gUnknown_083DFEC4->unk8788, gUnknown_083DFEC4->unk876E + 1); + break; + default: + return; + } + + BasicInitMenuWindow(&gWindowTemplate_81E710C); + Menu_PrintText(gUnknown_083DFEC4->unk8788, 1, 6); +} + +void sub_80F081C(u8 arg0) +{ + u32 numTrainerBattles; + + BasicInitMenuWindow(&gWindowTemplate_81E710C); + switch (arg0) + { + case 0: + case 1: + MenuPrint_RightAligned(gOtherText_NumberRegistered, 10, 9); + if (arg0 != 0) + break; + // fall through + case 2: + ConvertIntToDecimalStringN( + gUnknown_083DFEC4->unk8788, + gUnknown_083DFEC4->unk8774 + 1, + STR_CONV_MODE_RIGHT_ALIGN, + 5); + MenuPrint_RightAligned(gUnknown_083DFEC4->unk8788, 10, 11); + if (arg0 != 0) + break; + // fall through + case 3: + MenuPrint_RightAligned(gOtherText_NumberBattles, 10, 13); + if (arg0 != 0) + break; + // fall through + case 4: + numTrainerBattles = GetGameStat(GAME_STAT_TRAINER_BATTLES); + if (numTrainerBattles > 99999) + numTrainerBattles = 99999; + + ConvertIntToDecimalStringN( + gUnknown_083DFEC4->unk8788, + numTrainerBattles, + STR_CONV_MODE_RIGHT_ALIGN, + 5); + MenuPrint_RightAligned(gUnknown_083DFEC4->unk8788, 10, 15); + break; + } +} + +static void sub_80F08E4(void) +{ + BasicInitMenuWindow(&gWindowTemplate_81E710C); + Menu_EraseWindowRect(0, 9, 11, 16); +} + +void sub_80F0900(void) +{ + s16 var0 = (gUnknown_083DFEC4->unk8772 - gUnknown_083DFEC4->unk8770) + 1; + if (var0 < 8) + Menu_EraseWindowRect(12, 1, 31, 15); + + sub_80F0954(gUnknown_083DFEC4->unk8770, 0, var0); +} + +bool8 sub_80F0944(void) +{ + return sub_80F098C(); +} + +static void sub_80F0954(u16 arg0, u16 arg1, u16 arg2) +{ + gUnknown_083DFEC4->unk877E = arg0; + gUnknown_083DFEC4->unk8780 = arg1; + gUnknown_083DFEC4->unk8784 = arg2; + gUnknown_083DFEC4->unk8786 = 0; +} + +#ifdef NONMATCHING +static bool8 sub_80F098C(void) +{ + register u16 zero asm("r8"); + if (!gUnknown_083DFEC4->unk8784) + { + DONE: + return FALSE; + } + + zero = 0; + gUnknown_083E3270[gUnknown_083DFEC4->unk87CA](gUnknown_083DFEC4->unk877E, gUnknown_083DFEC4->unk8780); + if (!--gUnknown_083DFEC4->unk8784) + goto DONE; + + if ((++gUnknown_083DFEC4->unk877E & 0xFFFF) > gUnknown_083DFEC4->unk8774) + gUnknown_083DFEC4->unk877E = zero; + + gUnknown_083DFEC4->unk8780 += 2; + gUnknown_083DFEC4->unk8780 &= 0x1F; + return TRUE; +} #else NAKED -bool8 sub_80F02A0(void) +static bool8 sub_80F098C(void) { asm(".syntax unified\n\ - push {r4-r6,lr}\n\ - mov r6, r8\n\ - push {r6}\n\ - sub sp, 0x18\n\ - ldr r1, _080F02C4 @ =gUnknown_083DFEC4\n\ - ldr r0, [r1]\n\ - ldr r2, _080F02C8 @ =0x00000306\n\ - adds r0, r2\n\ - ldrh r0, [r0]\n\ - adds r2, r1, 0\n\ - cmp r0, 0xE\n\ - bls _080F02BA\n\ - b _080F05FA\n\ -_080F02BA:\n\ - lsls r0, 2\n\ - ldr r1, _080F02CC @ =_080F02D0\n\ + push {r4-r7,lr}\n\ + mov r7, r8\n\ + push {r7}\n\ + ldr r0, _080F09A4 @ =gUnknown_083DFEC4\n\ + ldr r6, [r0]\n\ + ldr r0, _080F09A8 @ =0x00008784\n\ + adds r7, r6, r0\n\ + ldrh r0, [r7]\n\ + cmp r0, 0\n\ + bne _080F09AC\n\ +_080F09A0:\n\ + movs r0, 0\n\ + b _080F0A02\n\ + .align 2, 0\n\ +_080F09A4: .4byte gUnknown_083DFEC4\n\ +_080F09A8: .4byte 0x00008784\n\ +_080F09AC:\n\ + movs r1, 0\n\ + mov r8, r1\n\ + ldr r1, _080F0A0C @ =gUnknown_083E3270\n\ + ldr r2, _080F0A10 @ =0x000087ca\n\ + adds r0, r6, r2\n\ + ldrb r2, [r0]\n\ + lsls r2, 2\n\ + adds r2, r1\n\ + ldr r0, _080F0A14 @ =0x0000877e\n\ + adds r4, r6, r0\n\ + ldrh r0, [r4]\n\ + ldr r1, _080F0A18 @ =0x00008780\n\ + adds r5, r6, r1\n\ + ldrh r1, [r5]\n\ + ldr r2, [r2]\n\ + bl _call_via_r2\n\ + ldrh r0, [r7]\n\ + subs r0, 0x1\n\ + strh r0, [r7]\n\ + ldr r2, _080F0A1C @ =0x0000ffff\n\ + adds r1, r2, 0\n\ + lsls r0, 16\n\ + cmp r0, 0\n\ + beq _080F09A0\n\ + ldrh r0, [r4]\n\ + adds r0, 0x1\n\ + strh r0, [r4]\n\ + ands r0, r1\n\ + ldr r2, _080F0A20 @ =0x00008774\n\ + adds r1, r6, r2\n\ + movs r2, 0\n\ + ldrsh r1, [r1, r2]\n\ + cmp r0, r1\n\ + ble _080F09F6\n\ + mov r0, r8\n\ + strh r0, [r4]\n\ +_080F09F6:\n\ + ldrh r0, [r5]\n\ + adds r0, 0x2\n\ + movs r1, 0x1F\n\ + ands r0, r1\n\ + strh r0, [r5]\n\ + movs r0, 0x1\n\ +_080F0A02:\n\ + pop {r3}\n\ + mov r8, r3\n\ + pop {r4-r7}\n\ + pop {r1}\n\ + bx r1\n\ + .align 2, 0\n\ +_080F0A0C: .4byte gUnknown_083E3270\n\ +_080F0A10: .4byte 0x000087ca\n\ +_080F0A14: .4byte 0x0000877e\n\ +_080F0A18: .4byte 0x00008780\n\ +_080F0A1C: .4byte 0x0000ffff\n\ +_080F0A20: .4byte 0x00008774\n\ + .syntax divided\n"); +} +#endif // NONMATCHING + +void sub_80F0A24(u16 arg0, u16 arg1) +{ + u8 var0 = gUnknown_083DFEC4->unk87C8 == 0 ? 2 : 1; + sub_80F4428(gUnknown_083DFEC4->unk8788, arg0, var0); + BasicInitMenuWindow(&gWindowTemplate_81E70D4); + Menu_PrintText(gUnknown_083DFEC4->unk8788, 13, arg1); +} + +static void sub_80F0A74(u16 arg0, u16 arg1) +{ + sub_80F700C(gUnknown_083DFEC4->unk8788, arg0); + arg1 &= 0x1F; + BasicInitMenuWindow(&gWindowTemplate_81E70D4); + Menu_PrintTextPixelCoords(gUnknown_083DFEC4->unk8788, 97, arg1 * 8, 0); + if (arg0 < gUnknown_083DFEC4->unkD158 && gUnknown_083DFEC4->unkCEE8[arg0].unk5) + sub_8095C8C((void *)VRAM + 0xF000, 29, arg1, gUnknown_083E039C, 0, 0, 1, 2, 1); + else + sub_8095C8C((void *)VRAM + 0xF000, 29, arg1, gUnknown_083E03A0, 0, 0, 1, 2, 1); +} + +static void sub_80F0B24(void) +{ + gUnknown_083DFEC4->unkD15C = 0; + gUnknown_083DFEC4->unk306 = 0; +} + +static bool8 sub_80F0B44(void) +{ + int top; + if (gUnknown_083DFEC4->unkD15C > 8) + { + return FALSE; + } + + if (++gUnknown_083DFEC4->unk306 > 1) + { + gUnknown_083DFEC4->unk306 = 0; + if (gUnknown_083DFEC4->unkD15C < 8) + { + top = (gUnknown_083DFEC4->unk8778 + (gUnknown_083DFEC4->unkD15C * 2)) & 0x1F; + if (gUnknown_083DFEC4->unkD15C != gUnknown_083DFEC4->unk876C) + { + BasicInitMenuWindow(&gWindowTemplate_81E70D4); + Menu_EraseWindowRect(12, top, 31, top + 1); + } + + if (!gUnknown_083DFEC4->unkD15C) + sub_80F08E4(); + + gUnknown_083DFEC4->unkD15C++; + return TRUE; + } + else + { + u16 i; + BasicInitMenuWindow(&gWindowTemplate_81E70D4); + top = (gUnknown_083DFEC4->unk8778 + 16) & 0x1F; + for (i = 0; i < 8; i++) + { + Menu_EraseWindowRect(12, top, 31, top + 1); + top = (top + 2) & 0x1F; + } + + gUnknown_083DFEC4->unkD15C++; + return FALSE; + } + } + else + { + return TRUE; + } +} + +static void sub_80F0C28(void) +{ + gUnknown_083DFEC4->unkD15C = 0; + gUnknown_083DFEC4->unk306 = 0; +} + +static bool8 sub_80F0C48(void) +{ + if (gUnknown_083DFEC4->unkD15C > 7) + return FALSE; + + if (++gUnknown_083DFEC4->unk306 > 1) + { + gUnknown_083DFEC4->unk306 = 0; + BasicInitMenuWindow(&gWindowTemplate_81E70D4); + sub_80F0A74(gUnknown_083DFEC4->unk8770 + gUnknown_083DFEC4->unkD15C, + gUnknown_083DFEC4->unk8778 + gUnknown_083DFEC4->unkD15C * 2); + + if ((++gUnknown_083DFEC4->unkD15C) > 7) + { + sub_80F081C(0); + return FALSE; + } + } + + return TRUE; +} + +void LoadTrainerEyesDescriptionLines(void) +{ + u16 i; + int trainerEyesId; + const u8 *curChar; + + gUnknown_083DFEC4->unk306 = 0; + gUnknown_083DFEC4->unkD15C = 0; + trainerEyesId = gUnknown_083DFEC4->unkCEE8[gUnknown_083DFEC4->unk876E].unk4; + gUnknown_083DFEC4->trainerEyeDescriptionLines[0] = gTrainerEyeDescriptions[trainerEyesId]; + + // Find the start of the 3 other lines in the Trainer's Eyes description. + curChar = gUnknown_083DFEC4->trainerEyeDescriptionLines[0]; + for (i = 0; i < 3; i++) + { + while (*curChar != EOS) + curChar++; + gUnknown_083DFEC4->trainerEyeDescriptionLines[i + 1] = ++curChar; + } +} + +#ifdef NONMATCHING +// small register mismatch (r2/r3) on the line where var0 is set. +bool8 sub_80F0D5C(void) +{ + int var0; + if (gUnknown_083DFEC4->unkD15C == 7) + return FALSE; + + if (++gUnknown_083DFEC4->unk306 > 1) + { + gUnknown_083DFEC4->unk306 = 0; + BasicInitMenuWindow(&gWindowTemplate_81E70D4); + var0 = (gUnknown_083DFEC4->unk8778 + 2 + gUnknown_083DFEC4->unkD15C * 2) & 0x1F; + switch (gUnknown_083DFEC4->unkD15C) + { + case 0: + Menu_PrintTextPixelCoords(gOtherText_Strategy, 97, var0 * 8, 0); + break; + case 1: + AlignStringInMenuWindow( + gUnknown_083DFEC4->unk8788, + gUnknown_083DFEC4->trainerEyeDescriptionLines[0], + 136, + 0); + Menu_PrintTextPixelCoords(gUnknown_083DFEC4->unk8788, 97, var0 * 8, 0); + break; + case 2: + Menu_PrintTextPixelCoords(gOtherText_TrainersPokemon, 97, var0 * 8, 0); + break; + case 3: + AlignStringInMenuWindow( + gUnknown_083DFEC4->unk8788, + gUnknown_083DFEC4->trainerEyeDescriptionLines[1], + 136, + 0); + Menu_PrintTextPixelCoords(gUnknown_083DFEC4->unk8788, 97, var0 * 8, 0); + break; + case 4: + Menu_PrintTextPixelCoords(gOtherText_SelfIntroduction, 97, var0 * 8, 0); + break; + case 5: + AlignStringInMenuWindow( + gUnknown_083DFEC4->unk8788, + gUnknown_083DFEC4->trainerEyeDescriptionLines[2], + 136, + 0); + Menu_PrintTextPixelCoords(gUnknown_083DFEC4->unk8788, 97, var0 * 8, 0); + break; + case 6: + AlignStringInMenuWindow( + gUnknown_083DFEC4->unk8788, + gUnknown_083DFEC4->trainerEyeDescriptionLines[3], + 136, + 0); + Menu_PrintTextPixelCoords(gUnknown_083DFEC4->unk8788, 97, var0 * 8, 0); + default: + return FALSE; + } + + gUnknown_083DFEC4->unkD15C++; + return TRUE; + } + else + { + return TRUE; + } +} +#else +NAKED +bool8 sub_80F0D5C(void) +{ + asm(".syntax unified\n\ + push {r4,r5,lr}\n\ + ldr r0, _080F0D70 @ =gUnknown_083DFEC4\n\ + ldr r4, [r0]\n\ + ldr r0, _080F0D74 @ =0x0000d15c\n\ + adds r5, r4, r0\n\ + ldrh r0, [r5]\n\ + cmp r0, 0x7\n\ + bne _080F0D78\n\ +_080F0D6C:\n\ + movs r0, 0\n\ + b _080F0EB0\n\ + .align 2, 0\n\ +_080F0D70: .4byte gUnknown_083DFEC4\n\ +_080F0D74: .4byte 0x0000d15c\n\ +_080F0D78:\n\ + ldr r0, _080F0DB8 @ =0x00000306\n\ + adds r1, r4, r0\n\ + ldrh r0, [r1]\n\ + adds r0, 0x1\n\ + strh r0, [r1]\n\ + lsls r0, 16\n\ + lsrs r0, 16\n\ + cmp r0, 0x1\n\ + bhi _080F0D8C\n\ + b _080F0EAE\n\ +_080F0D8C:\n\ + movs r0, 0\n\ + strh r0, [r1]\n\ + ldr r0, _080F0DBC @ =gWindowTemplate_81E70D4\n\ + bl BasicInitMenuWindow\n\ + ldr r0, _080F0DC0 @ =0x00008778\n\ + adds r1, r4, r0\n\ + ldrh r3, [r5]\n\ + lsls r0, r3, 1\n\ + adds r0, 0x2\n\ + ldrh r1, [r1]\n\ + adds r5, r0, r1\n\ + movs r0, 0x1F\n\ + ands r5, r0\n\ + cmp r3, 0x6\n\ + bhi _080F0D6C\n\ + lsls r0, r3, 2\n\ + ldr r1, _080F0DC4 @ =_080F0DC8\n\ adds r0, r1\n\ ldr r0, [r0]\n\ mov pc, r0\n\ .align 2, 0\n\ -_080F02C4: .4byte gUnknown_083DFEC4\n\ -_080F02C8: .4byte 0x00000306\n\ -_080F02CC: .4byte _080F02D0\n\ +_080F0DB8: .4byte 0x00000306\n\ +_080F0DBC: .4byte gWindowTemplate_81E70D4\n\ +_080F0DC0: .4byte 0x00008778\n\ +_080F0DC4: .4byte _080F0DC8\n\ .align 2, 0\n\ -_080F02D0:\n\ - .4byte _080F030C\n\ - .4byte _080F0344\n\ - .4byte _080F0350\n\ - .4byte _080F035C\n\ - .4byte _080F0368\n\ - .4byte _080F036E\n\ - .4byte _080F0380\n\ - .4byte _080F0394\n\ - .4byte _080F04BC\n\ - .4byte _080F053C\n\ - .4byte _080F0550\n\ - .4byte _080F0574\n\ - .4byte _080F057A\n\ - .4byte _080F0586\n\ - .4byte _080F05BC\n\ -_080F030C:\n\ - bl sub_80EEDE8\n\ - ldr r0, _080F0334 @ =gUnknown_083DFEC4\n\ - ldr r1, [r0]\n\ - movs r2, 0\n\ - ldr r3, _080F0338 @ =0x000087ca\n\ - adds r0, r1, r3\n\ - ldrb r0, [r0]\n\ - cmp r0, 0x1\n\ - bne _080F0322\n\ - movs r2, 0x1\n\ -_080F0322:\n\ - ldr r3, _080F033C @ =0x000087c8\n\ - adds r0, r1, r3\n\ - strb r2, [r0]\n\ - ldr r0, _080F0340 @ =0x0000d162\n\ - adds r1, r0\n\ - movs r0, 0xB\n\ - strb r0, [r1]\n\ - b _080F0618\n\ +_080F0DC8:\n\ + .4byte _080F0DE4\n\ + .4byte _080F0DF0\n\ + .4byte _080F0E08\n\ + .4byte _080F0E14\n\ + .4byte _080F0E2C\n\ + .4byte _080F0E38\n\ + .4byte _080F0E6C\n\ +_080F0DE4:\n\ + ldr r0, _080F0DEC @ =gOtherText_Strategy\n\ + lsls r2, r5, 3\n\ + b _080F0E54\n\ .align 2, 0\n\ -_080F0334: .4byte gUnknown_083DFEC4\n\ -_080F0338: .4byte 0x000087ca\n\ -_080F033C: .4byte 0x000087c8\n\ -_080F0340: .4byte 0x0000d162\n\ -_080F0344:\n\ - ldr r0, _080F034C @ =gWindowTemplate_81E70D4\n\ - bl Text_LoadWindowTemplate\n\ - b _080F0618\n\ +_080F0DEC: .4byte gOtherText_Strategy\n\ +_080F0DF0:\n\ + ldr r0, _080F0DFC @ =gUnknown_083DFEC4\n\ + ldr r0, [r0]\n\ + ldr r1, _080F0E00 @ =0x00008788\n\ + adds r4, r0, r1\n\ + ldr r1, _080F0E04 @ =0x0000d110\n\ + b _080F0E42\n\ .align 2, 0\n\ -_080F034C: .4byte gWindowTemplate_81E70D4\n\ -_080F0350:\n\ - ldr r0, _080F0358 @ =gWindowTemplate_81E70D4\n\ - bl MultistepInitMenuWindowBegin\n\ - b _080F0618\n\ +_080F0DFC: .4byte gUnknown_083DFEC4\n\ +_080F0E00: .4byte 0x00008788\n\ +_080F0E04: .4byte 0x0000d110\n\ +_080F0E08:\n\ + ldr r0, _080F0E10 @ =gOtherText_TrainersPokemon\n\ + lsls r2, r5, 3\n\ + b _080F0E54\n\ .align 2, 0\n\ -_080F0358: .4byte gWindowTemplate_81E70D4\n\ -_080F035C:\n\ - bl MultistepInitMenuWindowContinue\n\ - cmp r0, 0\n\ - beq _080F0366\n\ - b _080F0618\n\ -_080F0366:\n\ - b _080F0626\n\ -_080F0368:\n\ - bl Menu_EraseScreen\n\ - b _080F0618\n\ -_080F036E:\n\ - ldr r0, _080F0378 @ =gUnknown_08E9FC64\n\ - ldr r1, _080F037C @ =0x0600e800\n\ - bl LZ77UnCompVram\n\ - b _080F0618\n\ +_080F0E10: .4byte gOtherText_TrainersPokemon\n\ +_080F0E14:\n\ + ldr r0, _080F0E20 @ =gUnknown_083DFEC4\n\ + ldr r0, [r0]\n\ + ldr r1, _080F0E24 @ =0x00008788\n\ + adds r4, r0, r1\n\ + ldr r1, _080F0E28 @ =0x0000d114\n\ + b _080F0E42\n\ .align 2, 0\n\ -_080F0378: .4byte gUnknown_08E9FC64\n\ -_080F037C: .4byte 0x0600e800\n\ -_080F0380:\n\ - ldr r0, _080F038C @ =gPokenavConditionSearch2_Gfx\n\ - ldr r1, _080F0390 @ =0x06008000\n\ - bl LZ77UnCompVram\n\ - b _080F0618\n\ +_080F0E20: .4byte gUnknown_083DFEC4\n\ +_080F0E24: .4byte 0x00008788\n\ +_080F0E28: .4byte 0x0000d114\n\ +_080F0E2C:\n\ + ldr r0, _080F0E34 @ =gOtherText_SelfIntroduction\n\ + lsls r2, r5, 3\n\ + b _080F0E54\n\ .align 2, 0\n\ -_080F038C: .4byte gPokenavConditionSearch2_Gfx\n\ -_080F0390: .4byte 0x06008000\n\ -_080F0394:\n\ - ldr r6, _080F03FC @ =gUnknown_083E02B4\n\ - adds r0, r6, 0\n\ - movs r1, 0xB0\n\ - movs r2, 0x20\n\ - bl LoadPalette\n\ - adds r0, r6, 0\n\ - movs r1, 0xF0\n\ - movs r2, 0x20\n\ - bl LoadPalette\n\ - ldr r0, _080F0400 @ =gUnknown_083E0334\n\ - movs r1, 0x40\n\ - movs r2, 0x20\n\ - bl LoadPalette\n\ - ldr r0, _080F0404 @ =gUnknown_083DFEC4\n\ +_080F0E34: .4byte gOtherText_SelfIntroduction\n\ +_080F0E38:\n\ + ldr r0, _080F0E60 @ =gUnknown_083DFEC4\n\ ldr r0, [r0]\n\ - ldr r1, _080F0408 @ =0x000087ca\n\ + ldr r1, _080F0E64 @ =0x00008788\n\ + adds r4, r0, r1\n\ + ldr r1, _080F0E68 @ =0x0000d118\n\ +_080F0E42:\n\ adds r0, r1\n\ - ldrb r0, [r0]\n\ - cmp r0, 0\n\ - bne _080F0418\n\ - ldr r4, _080F040C @ =gPokenavConditionSearch2_Pal\n\ + ldr r1, [r0]\n\ adds r0, r4, 0\n\ - movs r1, 0x30\n\ - movs r2, 0x20\n\ - bl LoadPalette\n\ - ldr r1, _080F0410 @ =gPlttBufferUnfaded\n\ - ldrh r0, [r4, 0xA]\n\ - strh r0, [r1]\n\ - ldr r0, _080F0414 @ =gUnknownPalette_81E6692\n\ - movs r1, 0xB0\n\ - movs r2, 0x20\n\ - bl LoadPalette\n\ - adds r0, r6, 0x2\n\ - movs r1, 0xB1\n\ - movs r2, 0x2\n\ - bl LoadPalette\n\ - adds r0, r6, 0\n\ - adds r0, 0x10\n\ - movs r1, 0xB5\n\ - movs r2, 0x2\n\ - bl LoadPalette\n\ - adds r4, 0xA\n\ + movs r2, 0x88\n\ + movs r3, 0\n\ + bl AlignStringInMenuWindow\n\ + lsls r2, r5, 3\n\ adds r0, r4, 0\n\ - movs r1, 0xBF\n\ - b _080F04A8\n\ +_080F0E54:\n\ + movs r1, 0x61\n\ + movs r3, 0\n\ + bl Menu_PrintTextPixelCoords\n\ + b _080F0EA0\n\ .align 2, 0\n\ -_080F03FC: .4byte gUnknown_083E02B4\n\ -_080F0400: .4byte gUnknown_083E0334\n\ -_080F0404: .4byte gUnknown_083DFEC4\n\ -_080F0408: .4byte 0x000087ca\n\ -_080F040C: .4byte gPokenavConditionSearch2_Pal\n\ -_080F0410: .4byte gPlttBufferUnfaded\n\ -_080F0414: .4byte gUnknownPalette_81E6692\n\ -_080F0418:\n\ - cmp r0, 0x1\n\ - bne _080F0464\n\ - ldr r4, _080F0458 @ =gUnknown_083E0274\n\ - adds r0, r4, 0\n\ - movs r1, 0x30\n\ - movs r2, 0x20\n\ - bl LoadPalette\n\ - ldr r1, _080F045C @ =gPlttBufferUnfaded\n\ - ldrh r0, [r4, 0xA]\n\ - strh r0, [r1]\n\ - ldr r0, _080F0460 @ =gUnknownPalette_81E6692\n\ - movs r1, 0xB0\n\ - movs r2, 0x20\n\ - bl LoadPalette\n\ - adds r0, r6, 0x2\n\ - movs r1, 0xB1\n\ - movs r2, 0x2\n\ - bl LoadPalette\n\ - adds r0, r6, 0\n\ - adds r0, 0x10\n\ - movs r1, 0xB5\n\ - movs r2, 0x2\n\ - bl LoadPalette\n\ - adds r4, 0xA\n\ +_080F0E60: .4byte gUnknown_083DFEC4\n\ +_080F0E64: .4byte 0x00008788\n\ +_080F0E68: .4byte 0x0000d118\n\ +_080F0E6C:\n\ + ldr r0, _080F0E94 @ =gUnknown_083DFEC4\n\ + ldr r0, [r0]\n\ + ldr r1, _080F0E98 @ =0x00008788\n\ + adds r4, r0, r1\n\ + ldr r1, _080F0E9C @ =0x0000d11c\n\ + adds r0, r1\n\ + ldr r1, [r0]\n\ adds r0, r4, 0\n\ - movs r1, 0xBF\n\ - b _080F04A8\n\ - .align 2, 0\n\ -_080F0458: .4byte gUnknown_083E0274\n\ -_080F045C: .4byte gPlttBufferUnfaded\n\ -_080F0460: .4byte gUnknownPalette_81E6692\n\ -_080F0464:\n\ - ldr r4, _080F04B0 @ =gUnknown_08E9F9E8\n\ + movs r2, 0x88\n\ + movs r3, 0\n\ + bl AlignStringInMenuWindow\n\ + lsls r2, r5, 3\n\ adds r0, r4, 0\n\ - movs r1, 0x30\n\ - movs r2, 0x20\n\ - bl LoadPalette\n\ - ldr r1, _080F04B4 @ =gPlttBufferUnfaded\n\ - adds r5, r4, 0\n\ - adds r5, 0xA\n\ - ldrh r0, [r4, 0xA]\n\ - strh r0, [r1]\n\ - ldr r0, _080F04B8 @ =gUnknown_083E0314\n\ - movs r1, 0x50\n\ - movs r2, 0x20\n\ - bl LoadPalette\n\ - adds r0, r6, 0x2\n\ - movs r1, 0xB1\n\ - movs r2, 0x2\n\ - bl LoadPalette\n\ - adds r0, r6, 0\n\ - adds r0, 0x10\n\ - movs r1, 0xB5\n\ - movs r2, 0x2\n\ - bl LoadPalette\n\ - adds r0, r5, 0\n\ - movs r1, 0xBF\n\ - movs r2, 0x2\n\ - bl LoadPalette\n\ - adds r0, r5, 0\n\ - movs r1, 0x5F\n\ -_080F04A8:\n\ - movs r2, 0x2\n\ - bl LoadPalette\n\ - b _080F0618\n\ - .align 2, 0\n\ -_080F04B0: .4byte gUnknown_08E9F9E8\n\ -_080F04B4: .4byte gPlttBufferUnfaded\n\ -_080F04B8: .4byte gUnknown_083E0314\n\ -_080F04BC:\n\ - ldr r0, _080F04E8 @ =gUnknown_083DFEC4\n\ - ldr r0, [r0]\n\ - ldr r2, _080F04EC @ =0x000087ca\n\ - adds r0, r2\n\ - ldrb r0, [r0]\n\ - cmp r0, 0x2\n\ - beq _080F04F8\n\ - ldr r0, _080F04F0 @ =0x0600e800\n\ - ldr r3, _080F04F4 @ =gUnknown_08E9FD1C\n\ - movs r1, 0\n\ - str r1, [sp]\n\ - str r1, [sp, 0x4]\n\ - movs r2, 0x9\n\ - str r2, [sp, 0x8]\n\ - movs r1, 0x4\n\ - str r1, [sp, 0xC]\n\ - str r2, [sp, 0x10]\n\ - movs r1, 0\n\ - movs r2, 0x5\n\ - bl sub_8095C8C\n\ - b _080F0618\n\ - .align 2, 0\n\ -_080F04E8: .4byte gUnknown_083DFEC4\n\ -_080F04EC: .4byte 0x000087ca\n\ -_080F04F0: .4byte 0x0600e800\n\ -_080F04F4: .4byte gUnknown_08E9FD1C\n\ -_080F04F8:\n\ - ldr r3, _080F0530 @ =0x0600e800\n\ - mov r8, r3\n\ - ldr r3, _080F0534 @ =gUnknown_08E9FE54\n\ - movs r4, 0\n\ - str r4, [sp]\n\ - str r4, [sp, 0x4]\n\ - movs r5, 0xC\n\ - str r5, [sp, 0x8]\n\ - movs r6, 0xA\n\ - str r6, [sp, 0xC]\n\ - str r5, [sp, 0x10]\n\ - mov r0, r8\n\ - movs r1, 0\n\ - movs r2, 0x4\n\ - bl sub_8095C8C\n\ - ldr r3, _080F0538 @ =gUnknown_08E9FD64\n\ - str r4, [sp]\n\ - str r4, [sp, 0x4]\n\ - str r5, [sp, 0x8]\n\ - str r6, [sp, 0xC]\n\ - str r5, [sp, 0x10]\n\ - mov r0, r8\n\ - movs r1, 0\n\ - movs r2, 0x8\n\ - bl sub_8095C8C\n\ - b _080F0618\n\ - .align 2, 0\n\ -_080F0530: .4byte 0x0600e800\n\ -_080F0534: .4byte gUnknown_08E9FE54\n\ -_080F0538: .4byte gUnknown_08E9FD64\n\ -_080F053C:\n\ - ldr r0, _080F0548 @ =gUnknown_083E0354\n\ - ldr r1, _080F054C @ =0x06005000\n\ - bl LZ77UnCompVram\n\ - b _080F0618\n\ - .align 2, 0\n\ -_080F0548: .4byte gUnknown_083E0354\n\ -_080F054C: .4byte 0x06005000\n\ -_080F0550:\n\ - ldr r2, _080F0568 @ =0x0600f800\n\ - add r1, sp, 0x14\n\ - movs r0, 0\n\ - strh r0, [r1]\n\ - ldr r0, _080F056C @ =0x040000d4\n\ - str r1, [r0]\n\ - str r2, [r0, 0x4]\n\ - ldr r1, _080F0570 @ =0x81000400\n\ - str r1, [r0, 0x8]\n\ - ldr r0, [r0, 0x8]\n\ - b _080F0618\n\ - .align 2, 0\n\ -_080F0568: .4byte 0x0600f800\n\ -_080F056C: .4byte 0x040000d4\n\ -_080F0570: .4byte 0x81000400\n\ -_080F0574:\n\ - bl sub_80F0900\n\ - b _080F0618\n\ -_080F057A:\n\ - bl sub_80F0944\n\ - lsls r0, 24\n\ - cmp r0, 0\n\ - beq _080F0618\n\ - b _080F0626\n\ -_080F0586:\n\ - ldr r0, _080F059C @ =gUnknown_083DFEC4\n\ - ldr r4, [r0]\n\ - ldr r1, _080F05A0 @ =0x000087ca\n\ - adds r0, r4, r1\n\ - ldrb r0, [r0]\n\ - cmp r0, 0x2\n\ - beq _080F05A4\n\ - bl ShowMapNamePopUpWindow\n\ - b _080F0618\n\ - .align 2, 0\n\ -_080F059C: .4byte gUnknown_083DFEC4\n\ -_080F05A0: .4byte 0x000087ca\n\ -_080F05A4:\n\ - movs r0, 0\n\ - bl sub_80F081C\n\ - ldr r2, _080F05B8 @ =0x0000876e\n\ - adds r0, r4, r2\n\ - ldrb r0, [r0]\n\ - bl sub_80F0FFC\n\ - b _080F0618\n\ - .align 2, 0\n\ -_080F05B8: .4byte 0x0000876e\n\ -_080F05BC:\n\ - ldr r1, _080F0600 @ =REG_BG2CNT\n\ - ldr r3, _080F0604 @ =0x00001d0a\n\ - adds r0, r3, 0\n\ - strh r0, [r1]\n\ - adds r1, 0x2\n\ - adds r3, 0xF9\n\ - adds r0, r3, 0\n\ - strh r0, [r1]\n\ - subs r1, 0x6\n\ - adds r3, 0xFE\n\ - adds r0, r3, 0\n\ - strh r0, [r1]\n\ - adds r1, 0x16\n\ - movs r0, 0xF8\n\ - strh r0, [r1]\n\ - ldr r1, [r2]\n\ - ldr r0, _080F0608 @ =0x00008776\n\ - adds r2, r1, r0\n\ + movs r1, 0x61\n\ movs r3, 0\n\ - movs r0, 0xF8\n\ - strh r0, [r2]\n\ - ldr r2, _080F060C @ =0x00008778\n\ - adds r0, r1, r2\n\ - strh r3, [r0]\n\ - ldr r0, _080F0610 @ =REG_BLDCNT\n\ - strh r3, [r0]\n\ - ldr r3, _080F0614 @ =0x0000d160\n\ - adds r1, r3\n\ - ldrh r0, [r1]\n\ - adds r0, 0x1\n\ - strh r0, [r1]\n\ -_080F05FA:\n\ - movs r0, 0\n\ - b _080F0628\n\ + bl Menu_PrintTextPixelCoords\n\ + b _080F0D6C\n\ .align 2, 0\n\ -_080F0600: .4byte REG_BG2CNT\n\ -_080F0604: .4byte 0x00001d0a\n\ -_080F0608: .4byte 0x00008776\n\ -_080F060C: .4byte 0x00008778\n\ -_080F0610: .4byte REG_BLDCNT\n\ -_080F0614: .4byte 0x0000d160\n\ -_080F0618:\n\ - ldr r0, _080F0634 @ =gUnknown_083DFEC4\n\ +_080F0E94: .4byte gUnknown_083DFEC4\n\ +_080F0E98: .4byte 0x00008788\n\ +_080F0E9C: .4byte 0x0000d11c\n\ +_080F0EA0:\n\ + ldr r0, _080F0EB8 @ =gUnknown_083DFEC4\n\ ldr r1, [r0]\n\ - ldr r0, _080F0638 @ =0x00000306\n\ + ldr r0, _080F0EBC @ =0x0000d15c\n\ adds r1, r0\n\ ldrh r0, [r1]\n\ adds r0, 0x1\n\ strh r0, [r1]\n\ -_080F0626:\n\ +_080F0EAE:\n\ movs r0, 0x1\n\ -_080F0628:\n\ - add sp, 0x18\n\ - pop {r3}\n\ - mov r8, r3\n\ - pop {r4-r6}\n\ +_080F0EB0:\n\ + pop {r4,r5}\n\ pop {r1}\n\ bx r1\n\ .align 2, 0\n\ -_080F0634: .4byte gUnknown_083DFEC4\n\ -_080F0638: .4byte 0x00000306\n\ +_080F0EB8: .4byte gUnknown_083DFEC4\n\ +_080F0EBC: .4byte 0x0000d15c\n\ .syntax divided\n"); } -#endif // NONMATCHING +#endif + +static void sub_80F0EC0(void) +{ + gUnknown_083DFEC4->unk306 = 0; + gUnknown_083DFEC4->unkD15C = 0; + StringFill(gUnknown_083DFEC4->unk8788, CHAR_SPACE, 16); +} + +static bool8 sub_80F0EF4(void) +{ + int top; + if (gUnknown_083DFEC4->unkD15C > 6) + return FALSE; + + if (++gUnknown_083DFEC4->unk306 > 1) + { + gUnknown_083DFEC4->unk306 = 0; + top = (gUnknown_083DFEC4->unk8778 + 2 + gUnknown_083DFEC4->unkD15C * 2) & 0x1F; + BasicInitMenuWindow(&gWindowTemplate_81E70D4); + Menu_EraseWindowRect(12, top, 31, top + 1); + gUnknown_083DFEC4->unkD15C++; + } + + return TRUE; +} + +static void sub_80F0F64(void) +{ + s16 var0 = gUnknown_083DFEC4->unk876C; + gUnknown_083DFEC4->unk877C = var0 * 16; + gUnknown_083DFEC4->unk877A = var0 == 1 ? 4 : 8; +} + +static void sub_80F0FA0(void) +{ + s16 var0 = gUnknown_083DFEC4->unk876C * -1; + gUnknown_083DFEC4->unk877C = var0 * 16; + gUnknown_083DFEC4->unk877A = var0 == -1 ? -4 : -8; +} + +static bool8 sub_80F0FEC(void) +{ + return sub_80F0718(); +} + +void sub_80F0FFC(u8 arg0) +{ + GetMapSectionName(gUnknown_083DFEC4->unk8788, gUnknown_083DFEC4->unkCEE8[arg0].unk2, 0); + BasicInitMenuWindow(&gWindowTemplate_81E710C); + sub_80F19DC(gUnknown_083DFEC4->unk8788); + AlignStringInMenuWindow(gUnknown_083DFEC4->unkD138, gUnknown_083DFEC4->unk8788, 88, 2); + Menu_PrintText(gUnknown_083DFEC4->unkD138, 0, 5); +} + +void sub_80F105C(void) +{ + sub_80F0A74(gUnknown_083DFEC4->unk876E, gUnknown_083DFEC4->unk8778); +} + +static bool8 sub_80F1080(void) +{ + switch (gUnknown_083DFEC4->unkD160) + { + case 0: + sub_80EEDE8(); + gUnknown_083DFEC4->unkD162 = 11; + break; + case 1: + Text_LoadWindowTemplate(&gWindowTemplate_81E70B8); + break; + case 2: + MultistepInitMenuWindowBegin(&gWindowTemplate_81E70B8); + break; + case 3: + if (!MultistepInitMenuWindowContinue()) + return TRUE; + break; + case 4: + Menu_EraseScreen(); + break; + case 5: + sub_80F1614(); + break; + case 6: + if (sub_80F162C(1)) + return TRUE; + break; + case 7: + LZ77UnCompWram(gUnknown_08E9FBA0, gUnknown_083DFEC4->unk934C); + break; + case 8: + DrawMonRibbonIcons(); + break; + case 9: + sub_80F13FC(); + break; + case 10: + LZ77UnCompVram(gPokenavRibbonView_Gfx, (void *)(VRAM + 0x8000)); + break; + case 11: + LZ77UnCompVram(gUnknown_083E040C, (void *)(VRAM + 0x8200)); + break; + case 12: + LoadPalette(gPokenavRibbonView_Pal, 0x20, 0x20); + LoadPalette(gUnknown_083E03A8, 0xF0, 0x20); + LoadPalette(gUnknown_083E3C60, 0x30, 0xA0); + LoadPalette(gUnknownPalette_81E6692, 0xB0, 0x20); + LoadPalette(gUnknown_083E03A8 + 0xF, 0xBF, 0x2); + break; + case 13: + sub_80F1438(); + break; + case 14: + REG_BG2CNT = 0x1E02; + REG_BG3CNT = 0x170B; + REG_BLDCNT = 0; + gUnknown_083DFEC4->unkD160++; + return FALSE; + default: + return FALSE; + } + + gUnknown_083DFEC4->unkD160++; + return TRUE; +} + +void DrawMonRibbonIcons(void) +{ + u16 i; + u16 offset; + u8 index, palette, tile; + u8 var0; + + offset = 0x8B; + var0 = gUnknown_083DFEC4->unkBC8E - gUnknown_083DFEC4->unkBC8F; + + for (i = 0; i < 8; i++) + CpuFill16(0x2000, &gUnknown_083DFEC4->unk934C[offset + i * 32], 0x24); + + for (i = 0; i < var0; i++) + { + index = gUnknown_083DFEC4->unkBC4C[i]; + palette = gPokenavRibbonsIconGfx[index][1] + 3; + tile = gPokenavRibbonsIconGfx[index][0] * 2 + 0x10; + gUnknown_083DFEC4->unk934C[offset] = (palette << 12) | tile; + gUnknown_083DFEC4->unk934C[offset + 1] = ((palette << 12) | 0x400) | tile; + gUnknown_083DFEC4->unk934C[offset + 0x20] = (palette << 12) | (tile + 1); + gUnknown_083DFEC4->unk934C[offset + 0x21] = (palette << 12) | 0x400 | (tile + 1); + + if ((i + 1) % 9 == 0) + offset += 0x30; + else + offset += 2; + } + + offset = 0x14B; + for (i = 0; i < gUnknown_083DFEC4->unkBC8F; i++) + { + index = gUnknown_083DFEC4->unkBC4C[var0 + i]; + palette = gPokenavRibbonsIconGfx[index][1] + 3; + tile = gPokenavRibbonsIconGfx[index][0] * 2 + 0x10; + gUnknown_083DFEC4->unk934C[offset] = (palette << 12) | tile; + gUnknown_083DFEC4->unk934C[offset + 1] = ((palette << 12) | 0x400) | tile; + gUnknown_083DFEC4->unk934C[offset + 0x20] = (palette << 12) | (tile + 1); + gUnknown_083DFEC4->unk934C[offset + 0x21] = (palette << 12) | 0x400 | (tile + 1); + + offset += 2; + } +} + +void sub_80F13FC(void) +{ + u16 *src = gUnknown_083DFEC4->unk934C; + u16 *dest = (u16 *)(VRAM + 0xB800); + DmaCopy32(3, src, dest, 0x500); + gPlttBufferUnfaded[0] = *(gPokenavRibbonView_Pal + 14); +} + +void sub_80F1438(void) +{ + Menu_PrintText(gUnknown_083DFEC4->unk8829[0], 13, 1); + sub_80F445C(gUnknown_083DFEC4->unk8788, gUnknown_083DFEC4->unk876E + 1); + Menu_PrintText(gUnknown_083DFEC4->unk8788, 1, 5); +} + +void sub_80F1480(void) +{ + Menu_EraseWindowRect(12, 13, 27, 16); +} + +// This is a fakematching function, due to a hardcoded access of gSaveBlock1. +// Due to this hardcoded address access, gift ribbons do not properly display +// their descriptions, since the hardcoded access is inside of the LinkBattleRecords +// save data, rather than the giftRibbons array, which is almost certainly what the +// intended access is. +static void sub_80F1494(void) +{ + u8 *arr; + u8 *tileBuffer1 = &gUnknown_083DFEC8[0x800]; + u8 *tileBuffer2 = &gUnknown_083DFEC8[0xA98]; + + if (gUnknown_083DFEC4->unkBC91 < 3) + { + gUnknown_020388B4 = gUnknown_083DFEC4->unkBC91 * 9 + gUnknown_083DFEC4->unkBC90; + gUnknown_020388B4 = gUnknown_083DFEC4->unkBC4C[gUnknown_020388B4]; + AlignStringInMenuWindow(tileBuffer1, gRibbonDescriptions[gUnknown_020388B4][0], 128, 0); + AlignStringInMenuWindow(tileBuffer2, gRibbonDescriptions[gUnknown_020388B4][1], 128, 0); + } + else + { + gUnknown_020388B4 = gUnknown_083DFEC4->unkBC8E - gUnknown_083DFEC4->unkBC8F; + gUnknown_020388B4 = gUnknown_083DFEC4->unkBC4C[gUnknown_020388B4 + gUnknown_083DFEC4->unkBC90]; + + // FIXME! + arr = ((u8*)&gSaveBlock1); + asm("ldrh r1, [r5]\n\ + add r0, r0, r1"); + gUnknown_020388B4 = arr[0x30F7]; + // The bug fix for this code is the following: + // gUnknown_020388B4 = gSaveBlock1.externalReservedData.giftRibbons[gUnknown_020388B4]; + if (gUnknown_020388B4) + { + gUnknown_020388B4--; + AlignStringInMenuWindow(tileBuffer1, gGiftRibbonDescriptions[gUnknown_020388B4][0], 128, 0); + AlignStringInMenuWindow(tileBuffer2, gGiftRibbonDescriptions[gUnknown_020388B4][1], 128, 0); + } + else + { + AlignStringInMenuWindow(tileBuffer1, gEmptyString_81E72B0, 128, 0); + AlignStringInMenuWindow(tileBuffer2, gEmptyString_81E72B0, 128, 0); + } + } + + Menu_PrintText(tileBuffer1, 12, 13); + Menu_PrintText(tileBuffer2, 12, 15); +} + +static void sub_80F15A8(void) +{ + u8 *buffer; + Menu_EraseWindowRect(12, 13, 27, 16); + buffer = StringCopy(gUnknown_083DFEC4->unk8788, gOtherText_Ribbons); + buffer[0] = CHAR_SPACE; + buffer++; + buffer = ConvertIntToDecimalStringN( + buffer, + gUnknown_083DFEC4->unk893c[gUnknown_083DFEC4->unk87DC].unk0, + STR_CONV_MODE_LEFT_ALIGN, + 2); + buffer[0] = EOS; + Menu_PrintText(gUnknown_083DFEC4->unk8788, 12, 13); +} + +void sub_80F1614(void) +{ + gUnknown_083DFEC4->unk8764 = 0; +} diff --git a/src/use_pokeblock.c b/src/use_pokeblock.c index bdf6f4a44..bcfeed672 100644 --- a/src/use_pokeblock.c +++ b/src/use_pokeblock.c @@ -141,7 +141,7 @@ void sub_8136130(struct Pokeblock *pokeblock, MainCallback callback) gUnknown_02039304 = &gUnknown_083DFEC4->unkD164; gUnknown_02039304->pokeblock = pokeblock; gUnknown_02039304->callback = callback; - gUnknown_083DFEC4->unkD162[0] = 2; + gUnknown_083DFEC4->unkD162 = 2; launch_c3_walk_stairs_and_run_once(sub_8136294); SetMainCallback2(sub_8136244); } @@ -152,7 +152,7 @@ static void sub_8136174(void) gUnknown_02039304->callback = gUnknown_02039308; gPokeblockMonID = sub_81370E4(gPokeblockMonID); gUnknown_02039304->unk56 = gPokeblockMonID < 4 ? 0 : 1; - gUnknown_083DFEC4->unkD162[0] = 2; + gUnknown_083DFEC4->unkD162 = 2; launch_c3_walk_stairs_and_run_once(sub_8136294); SetMainCallback2(sub_81361E4); } -- cgit v1.2.3 From 01d44429a35584b44d820a14751ba03734e63701 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Thu, 16 Aug 2018 20:42:30 -0500 Subject: Decompile even more pokenav --- asm/pokenav.s | 3478 ----------------------------------------------- include/pokenav.h | 67 +- include/region_map.h | 1 + include/use_pokeblock.h | 1 + src/pokenav_before.c | 1549 ++++++++++++++++++++- src/use_pokeblock.c | 4 +- 6 files changed, 1563 insertions(+), 3537 deletions(-) diff --git a/asm/pokenav.s b/asm/pokenav.s index 1e3c6fe5c..cac79bbcb 100644 --- a/asm/pokenav.s +++ b/asm/pokenav.s @@ -5,3484 +5,6 @@ .text - thumb_func_start sub_80F162C -sub_80F162C: @ 80F162C - push {lr} - lsls r0, 24 - lsrs r1, r0, 24 - ldr r0, _080F164C @ =gUnknown_083DFEC4 - ldr r0, [r0] - ldr r2, _080F1650 @ =0x00008764 - adds r0, r2 - ldrh r0, [r0] - cmp r0, 0x1 - beq _080F165E - cmp r0, 0x1 - bgt _080F1654 - cmp r0, 0 - beq _080F16F0 - b _080F16D0 - .align 2, 0 -_080F164C: .4byte gUnknown_083DFEC4 -_080F1650: .4byte 0x00008764 -_080F1654: - cmp r0, 0x2 - beq _080F1670 - cmp r0, 0x3 - beq _080F1694 - b _080F16D0 -_080F165E: - ldr r0, _080F1668 @ =gUnknown_08E9FF58 - ldr r1, _080F166C @ =0x0600e800 - bl LZ77UnCompVram - b _080F16F0 - .align 2, 0 -_080F1668: .4byte gUnknown_08E9FF58 -_080F166C: .4byte 0x0600e800 -_080F1670: - ldr r1, _080F1684 @ =gPokenavRibbonPokeView_Gfx - ldr r2, _080F1688 @ =0x0600e000 - ldr r0, _080F168C @ =0x040000d4 - str r1, [r0] - str r2, [r0, 0x4] - ldr r1, _080F1690 @ =0x80000070 - str r1, [r0, 0x8] - ldr r0, [r0, 0x8] - b _080F16F0 - .align 2, 0 -_080F1684: .4byte gPokenavRibbonPokeView_Gfx -_080F1688: .4byte 0x0600e000 -_080F168C: .4byte 0x040000d4 -_080F1690: .4byte 0x80000070 -_080F1694: - cmp r1, 0 - bne _080F16A8 - ldr r0, _080F16A4 @ =gUnknown_083E0124 - movs r1, 0xD0 - movs r2, 0x20 - bl LoadPalette - b _080F16B2 - .align 2, 0 -_080F16A4: .4byte gUnknown_083E0124 -_080F16A8: - ldr r0, _080F16D4 @ =gUnknown_083E0144 - movs r1, 0xD0 - movs r2, 0x20 - bl LoadPalette -_080F16B2: - ldr r0, _080F16D8 @ =gUnknown_083DFEC4 - ldr r1, [r0] - ldr r3, _080F16DC @ =0x00008766 - adds r2, r1, r3 - ldr r0, _080F16E0 @ =0x0000ffb0 - strh r0, [r2] - ldr r2, _080F16E4 @ =REG_BG0CNT - ldr r3, _080F16E8 @ =0x00001d0d - adds r0, r3, 0 - strh r0, [r2] - ldr r0, _080F16EC @ =0x00008764 - adds r1, r0 - ldrh r0, [r1] - adds r0, 0x1 - strh r0, [r1] -_080F16D0: - movs r0, 0 - b _080F1700 - .align 2, 0 -_080F16D4: .4byte gUnknown_083E0144 -_080F16D8: .4byte gUnknown_083DFEC4 -_080F16DC: .4byte 0x00008766 -_080F16E0: .4byte 0x0000ffb0 -_080F16E4: .4byte REG_BG0CNT -_080F16E8: .4byte 0x00001d0d -_080F16EC: .4byte 0x00008764 -_080F16F0: - ldr r0, _080F1704 @ =gUnknown_083DFEC4 - ldr r1, [r0] - ldr r2, _080F1708 @ =0x00008764 - adds r1, r2 - ldrh r0, [r1] - adds r0, 0x1 - strh r0, [r1] - movs r0, 0x1 -_080F1700: - pop {r1} - bx r1 - .align 2, 0 -_080F1704: .4byte gUnknown_083DFEC4 -_080F1708: .4byte 0x00008764 - thumb_func_end sub_80F162C - - thumb_func_start sub_80F170C -sub_80F170C: @ 80F170C - push {lr} - ldr r0, _080F1734 @ =gUnknown_083DFEC4 - ldr r0, [r0] - ldr r2, _080F1738 @ =0x00008766 - adds r1, r0, r2 - ldrh r0, [r1] - adds r0, 0x10 - strh r0, [r1] - lsls r0, 16 - cmp r0, 0 - ble _080F1726 - movs r0, 0 - strh r0, [r1] -_080F1726: - movs r0, 0 - ldrsh r1, [r1, r0] - negs r0, r1 - orrs r0, r1 - lsrs r0, 31 - pop {r1} - bx r1 - .align 2, 0 -_080F1734: .4byte gUnknown_083DFEC4 -_080F1738: .4byte 0x00008766 - thumb_func_end sub_80F170C - - thumb_func_start sub_80F173C -sub_80F173C: @ 80F173C - push {lr} - ldr r0, _080F176C @ =gUnknown_083DFEC4 - ldr r0, [r0] - ldr r2, _080F1770 @ =0x00008766 - adds r1, r0, r2 - ldrh r0, [r1] - subs r0, 0x10 - strh r0, [r1] - lsls r0, 16 - asrs r0, 16 - movs r2, 0x50 - negs r2, r2 - cmp r0, r2 - bge _080F175C - ldr r0, _080F1774 @ =0x0000ffb0 - strh r0, [r1] -_080F175C: - movs r0, 0 - ldrsh r1, [r1, r0] - eors r1, r2 - negs r0, r1 - orrs r0, r1 - lsrs r0, 31 - pop {r1} - bx r1 - .align 2, 0 -_080F176C: .4byte gUnknown_083DFEC4 -_080F1770: .4byte 0x00008766 -_080F1774: .4byte 0x0000ffb0 - thumb_func_end sub_80F173C - - thumb_func_start sub_80F1778 -sub_80F1778: @ 80F1778 - push {r4,lr} - sub sp, 0x14 - ldr r0, _080F1798 @ =gUnknown_083DFEC4 - ldr r0, [r0] - ldr r1, _080F179C @ =0x0000d160 - adds r0, r1 - ldrh r0, [r0] - cmp r0, 0x9 - bls _080F178C - b _080F1910 -_080F178C: - lsls r0, 2 - ldr r1, _080F17A0 @ =_080F17A4 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_080F1798: .4byte gUnknown_083DFEC4 -_080F179C: .4byte 0x0000d160 -_080F17A0: .4byte _080F17A4 - .align 2, 0 -_080F17A4: - .4byte _080F17CC - .4byte _080F17E8 - .4byte _080F17EE - .4byte _080F17FE - .4byte _080F1810 - .4byte _080F1830 - .4byte _080F1858 - .4byte _080F186C - .4byte _080F18B8 - .4byte _080F18D8 -_080F17CC: - bl sub_80EEDE8 - ldr r0, _080F17E0 @ =gUnknown_083DFEC4 - ldr r0, [r0] - ldr r2, _080F17E4 @ =0x0000d162 - adds r0, r2 - movs r1, 0x2 - strb r1, [r0] - b _080F1914 - .align 2, 0 -_080F17E0: .4byte gUnknown_083DFEC4 -_080F17E4: .4byte 0x0000d162 -_080F17E8: - bl sub_80F1614 - b _080F1914 -_080F17EE: - movs r0, 0 - bl sub_80F162C - lsls r0, 24 - cmp r0, 0 - bne _080F17FC - b _080F1914 -_080F17FC: - b _080F1922 -_080F17FE: - ldr r0, _080F1808 @ =gPokenavConditionView_Gfx - ldr r1, _080F180C @ =0x06005000 - bl LZ77UnCompVram - b _080F1914 - .align 2, 0 -_080F1808: .4byte gPokenavConditionView_Gfx -_080F180C: .4byte 0x06005000 -_080F1810: - ldr r0, _080F1824 @ =gUnknown_08E9AC4C - ldr r1, _080F1828 @ =0x0600f000 - bl LZ77UnCompVram - ldr r0, _080F182C @ =gPokenavConditionMenu2_Pal - movs r1, 0x20 - movs r2, 0x20 - bl LoadPalette - b _080F1914 - .align 2, 0 -_080F1824: .4byte gUnknown_08E9AC4C -_080F1828: .4byte 0x0600f000 -_080F182C: .4byte gPokenavConditionMenu2_Pal -_080F1830: - ldr r0, _080F1850 @ =0x0600f000 - ldr r3, _080F1854 @ =gUnknown_083E01F4 - movs r1, 0 - str r1, [sp] - str r1, [sp, 0x4] - movs r2, 0xC - str r2, [sp, 0x8] - movs r1, 0x4 - str r1, [sp, 0xC] - str r2, [sp, 0x10] - movs r1, 0 - movs r2, 0xD - bl sub_8095C8C - b _080F1914 - .align 2, 0 -_080F1850: .4byte 0x0600f000 -_080F1854: .4byte gUnknown_083E01F4 -_080F1858: - ldr r0, _080F1864 @ =gUnknown_08E9FEB4 - ldr r1, _080F1868 @ =0x0600b800 - bl LZ77UnCompVram - b _080F1914 - .align 2, 0 -_080F1864: .4byte gUnknown_08E9FEB4 -_080F1868: .4byte 0x0600b800 -_080F186C: - ldr r0, _080F18AC @ =gUnknown_083E0254 - movs r1, 0x30 - movs r2, 0x20 - bl LoadPalette - ldr r0, _080F18B0 @ =gUnknownPalette_81E6692 - movs r1, 0xB0 - movs r2, 0x20 - bl LoadPalette - ldr r4, _080F18B4 @ =gPokenavConditionMenu2_Pal + 0x2 - adds r0, r4, 0 - movs r1, 0xB1 - movs r2, 0x2 - bl LoadPalette - adds r0, r4, 0 - adds r0, 0xE - movs r1, 0xB5 - movs r2, 0x2 - bl LoadPalette - adds r4, 0x1C - adds r0, r4, 0 - movs r1, 0xBF - movs r2, 0x2 - bl LoadPalette - bl sub_80F01A4 - b _080F1914 - .align 2, 0 -_080F18AC: .4byte gUnknown_083E0254 -_080F18B0: .4byte gUnknownPalette_81E6692 -_080F18B4: .4byte gPokenavConditionMenu2_Pal + 0x2 -_080F18B8: - ldr r0, _080F18D0 @ =gUnknown_083DFEC4 - ldr r0, [r0] - ldr r1, _080F18D4 @ =0x00008fe9 - adds r0, r1 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - lsls r0, 16 - lsrs r0, 16 - bl sub_80F01E0 - b _080F1914 - .align 2, 0 -_080F18D0: .4byte gUnknown_083DFEC4 -_080F18D4: .4byte 0x00008fe9 -_080F18D8: - ldr r1, _080F18FC @ =REG_BG3CNT - ldr r2, _080F1900 @ =0x00001e03 - adds r0, r2, 0 - strh r0, [r1] - subs r1, 0x2 - ldr r2, _080F1904 @ =0x00001702 - adds r0, r2, 0 - strh r0, [r1] - adds r1, 0x44 - ldr r2, _080F1908 @ =0x00000844 - adds r0, r2, 0 - strh r0, [r1] - adds r1, 0x2 - ldr r2, _080F190C @ =0x0000040b - adds r0, r2, 0 - strh r0, [r1] - b _080F1914 - .align 2, 0 -_080F18FC: .4byte REG_BG3CNT -_080F1900: .4byte 0x00001e03 -_080F1904: .4byte 0x00001702 -_080F1908: .4byte 0x00000844 -_080F190C: .4byte 0x0000040b -_080F1910: - movs r0, 0 - b _080F1924 -_080F1914: - ldr r0, _080F192C @ =gUnknown_083DFEC4 - ldr r1, [r0] - ldr r0, _080F1930 @ =0x0000d160 - adds r1, r0 - ldrh r0, [r1] - adds r0, 0x1 - strh r0, [r1] -_080F1922: - movs r0, 0x1 -_080F1924: - add sp, 0x14 - pop {r4} - pop {r1} - bx r1 - .align 2, 0 -_080F192C: .4byte gUnknown_083DFEC4 -_080F1930: .4byte 0x0000d160 - thumb_func_end sub_80F1778 - - thumb_func_start sub_80F1934 -sub_80F1934: @ 80F1934 - push {r4,r5,lr} - ldr r0, _080F1990 @ =gUnknown_083DFEC4 - ldr r1, [r0] - ldr r0, _080F1994 @ =0x00008788 - adds r5, r1, r0 - ldr r3, _080F1998 @ =0x000087dc - adds r2, r1, r3 - movs r3, 0 - ldrsh r0, [r2, r3] - lsls r0, 2 - adds r1, r0 - ldr r0, _080F199C @ =0x0000893f - adds r1, r0 - ldrb r0, [r1] - lsls r0, 25 - cmp r0, 0 - bge _080F19AC - ldrb r0, [r2] - bl sub_8137124 - lsls r0, 24 - lsrs r0, 24 - movs r1, 0x64 - muls r0, r1 - ldr r1, _080F19A0 @ =gPlayerParty - adds r0, r1 - bl GetNature - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - ldr r1, _080F19A4 @ =gOtherText_Nature2 - adds r0, r5, 0 - bl StringCopy - adds r5, r0, 0 - ldr r0, _080F19A8 @ =gNatureNames - lsls r4, 2 - adds r4, r0 - ldr r1, [r4] - adds r0, r5, 0 - movs r2, 0x57 - movs r3, 0 - bl AlignStringInMenuWindow - b _080F19B8 - .align 2, 0 -_080F1990: .4byte gUnknown_083DFEC4 -_080F1994: .4byte 0x00008788 -_080F1998: .4byte 0x000087dc -_080F199C: .4byte 0x0000893f -_080F19A0: .4byte gPlayerParty -_080F19A4: .4byte gOtherText_Nature2 -_080F19A8: .4byte gNatureNames -_080F19AC: - ldr r1, _080F19D0 @ =gEmptyString_81E72B0 - adds r0, r5, 0 - movs r2, 0x57 - movs r3, 0 - bl AlignStringInMenuWindow -_080F19B8: - ldr r0, _080F19D4 @ =gUnknown_083DFEC4 - ldr r0, [r0] - ldr r1, _080F19D8 @ =0x00008788 - adds r0, r1 - movs r1, 0x1 - movs r2, 0x70 - movs r3, 0x1 - bl Menu_PrintTextPixelCoords - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080F19D0: .4byte gEmptyString_81E72B0 -_080F19D4: .4byte gUnknown_083DFEC4 -_080F19D8: .4byte 0x00008788 - thumb_func_end sub_80F1934 - - thumb_func_start sub_80F19DC -sub_80F19DC: @ 80F19DC - push {lr} - adds r1, r0, 0 - b _080F19E4 -_080F19E2: - adds r1, 0x1 -_080F19E4: - ldrb r0, [r1] - cmp r0, 0xFF - beq _080F19F8 - cmp r0, 0xFC - bne _080F19E2 - ldrb r0, [r1, 0x1] - cmp r0, 0 - bne _080F19E2 - movs r0, 0xFF - strb r0, [r1] -_080F19F8: - pop {r0} - bx r0 - thumb_func_end sub_80F19DC - - thumb_func_start sub_80F19FC -sub_80F19FC: @ 80F19FC - push {r4,r5,lr} - sub sp, 0x4 - ldr r5, _080F1A68 @ =gUnknown_020388B0 - ldrb r4, [r5] - cmp r4, 0x1 - bne _080F1A60 - ldr r0, _080F1A6C @ =gUnknown_083DFEC4 - ldr r1, [r0] - ldr r2, _080F1A70 @ =0x00006e2c - adds r0, r1, r2 - ldrb r0, [r0] - adds r2, 0x3 - adds r1, r2 - ldrb r1, [r1] - ldrb r2, [r5, 0x1] - bl GetLandmarkName - cmp r0, 0 - beq _080F1A46 - ldrb r2, [r5, 0x1] - lsls r2, 20 - movs r1, 0xC0 - lsls r1, 14 - adds r2, r1 - lsrs r2, 16 - str r4, [sp] - movs r1, 0x70 - movs r3, 0x78 - bl sub_8072A18 - ldrb r0, [r5, 0x1] - adds r0, 0x1 - strb r0, [r5, 0x1] - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x4 - bne _080F1A60 -_080F1A46: - ldrb r1, [r5, 0x1] - lsls r1, 25 - movs r2, 0xC0 - lsls r2, 19 - adds r1, r2 - lsrs r1, 24 - movs r0, 0xE - movs r2, 0x1C - movs r3, 0xF - bl Menu_BlankWindowRect - movs r0, 0 - strb r0, [r5] -_080F1A60: - add sp, 0x4 - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080F1A68: .4byte gUnknown_020388B0 -_080F1A6C: .4byte gUnknown_083DFEC4 -_080F1A70: .4byte 0x00006e2c - thumb_func_end sub_80F19FC - - thumb_func_start sub_80F1A74 -sub_80F1A74: @ 80F1A74 - ldr r1, _080F1A7C @ =gUnknown_020388B0 - movs r0, 0 - strb r0, [r1] - bx lr - .align 2, 0 -_080F1A7C: .4byte gUnknown_020388B0 - thumb_func_end sub_80F1A74 - - thumb_func_start sub_80F1A80 -sub_80F1A80: @ 80F1A80 - ldr r0, _080F1A8C @ =gUnknown_020388B0 - movs r2, 0 - movs r1, 0x1 - strb r1, [r0] - strb r2, [r0, 0x1] - bx lr - .align 2, 0 -_080F1A8C: .4byte gUnknown_020388B0 - thumb_func_end sub_80F1A80 - - thumb_func_start sub_80F1A90 -sub_80F1A90: @ 80F1A90 - push {lr} - ldr r0, _080F1AB8 @ =gUnknown_083DFEC4 - ldr r0, [r0] - ldr r1, _080F1ABC @ =0x00000306 - adds r2, r0, r1 - movs r1, 0 - strh r1, [r2] - ldr r1, _080F1AC0 @ =0x00006dac - adds r0, r1 - ldrb r0, [r0] - cmp r0, 0 - bne _080F1AB2 -_080F1AA8: - bl sub_80F1AC4 - lsls r0, 24 - cmp r0, 0 - bne _080F1AA8 -_080F1AB2: - pop {r0} - bx r0 - .align 2, 0 -_080F1AB8: .4byte gUnknown_083DFEC4 -_080F1ABC: .4byte 0x00000306 -_080F1AC0: .4byte 0x00006dac - thumb_func_end sub_80F1A90 - - thumb_func_start sub_80F1AC4 -sub_80F1AC4: @ 80F1AC4 - push {r4,r5,lr} - ldr r0, _080F1AE0 @ =gUnknown_083DFEC4 - ldr r1, [r0] - ldr r2, _080F1AE4 @ =0x00000306 - adds r0, r1, r2 - ldrh r0, [r0] - cmp r0, 0x1 - beq _080F1B34 - cmp r0, 0x1 - bgt _080F1AE8 - cmp r0, 0 - beq _080F1AF2 - b _080F1B6C - .align 2, 0 -_080F1AE0: .4byte gUnknown_083DFEC4 -_080F1AE4: .4byte 0x00000306 -_080F1AE8: - cmp r0, 0x2 - beq _080F1B40 - cmp r0, 0x3 - beq _080F1B54 - b _080F1B6C -_080F1AF2: - movs r0, 0 - movs r2, 0xC8 - lsls r2, 2 - adds r4, r1, r2 - movs r5, 0 -_080F1AFC: - movs r2, 0 - adds r1, r0, 0x1 - lsls r3, r0, 4 -_080F1B02: - lsls r0, r2, 2 - adds r0, r3 - adds r0, r4, r0 - str r5, [r0] - adds r0, r2, 0x1 - lsls r0, 16 - lsrs r2, r0, 16 - cmp r2, 0x3 - bls _080F1B02 - lsls r0, r1, 16 - lsrs r0, 16 - cmp r0, 0x5 - bls _080F1AFC - ldr r0, _080F1B2C @ =gUnknown_083DFEC4 - ldr r0, [r0] - ldr r1, _080F1B30 @ =0x00000311 - adds r0, r1 - movs r1, 0 - strb r1, [r0] - b _080F1B6C - .align 2, 0 -_080F1B2C: .4byte gUnknown_083DFEC4 -_080F1B30: .4byte 0x00000311 -_080F1B34: - ldr r0, _080F1B3C @ =gPokenavMenuOptions_Gfx - movs r2, 0xE2 - lsls r2, 2 - b _080F1B44 - .align 2, 0 -_080F1B3C: .4byte gPokenavMenuOptions_Gfx -_080F1B40: - ldr r0, _080F1B4C @ =gPokenavConditionMenu_Gfx - ldr r2, _080F1B50 @ =0x00001788 -_080F1B44: - adds r1, r2 - bl LZ77UnCompWram - b _080F1B6C - .align 2, 0 -_080F1B4C: .4byte gPokenavConditionMenu_Gfx -_080F1B50: .4byte 0x00001788 -_080F1B54: - ldr r0, _080F1B64 @ =gPokenavConditionSearch_Gfx - ldr r2, _080F1B68 @ =0x00002388 - adds r1, r2 - bl LZ77UnCompWram - movs r0, 0 - b _080F1B7C - .align 2, 0 -_080F1B64: .4byte gPokenavConditionSearch_Gfx -_080F1B68: .4byte 0x00002388 -_080F1B6C: - ldr r0, _080F1B84 @ =gUnknown_083DFEC4 - ldr r1, [r0] - ldr r0, _080F1B88 @ =0x00000306 - adds r1, r0 - ldrh r0, [r1] - adds r0, 0x1 - strh r0, [r1] - movs r0, 0x1 -_080F1B7C: - pop {r4,r5} - pop {r1} - bx r1 - .align 2, 0 -_080F1B84: .4byte gUnknown_083DFEC4 -_080F1B88: .4byte 0x00000306 - thumb_func_end sub_80F1AC4 - - thumb_func_start sub_80F1B8C -sub_80F1B8C: @ 80F1B8C - push {r4,lr} - lsls r0, 24 - lsrs r4, r0, 24 - ldr r0, _080F1BBC @ =gUnknown_083DFEC4 - ldr r0, [r0] - ldr r1, _080F1BC0 @ =0x00000306 - adds r2, r0, r1 - movs r1, 0 - strh r1, [r2] - ldr r1, _080F1BC4 @ =0x00006dac - adds r0, r1 - ldrb r0, [r0] - cmp r0, 0 - bne _080F1BB4 -_080F1BA8: - adds r0, r4, 0 - bl sub_80F1BC8 - lsls r0, 24 - cmp r0, 0 - bne _080F1BA8 -_080F1BB4: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080F1BBC: .4byte gUnknown_083DFEC4 -_080F1BC0: .4byte 0x00000306 -_080F1BC4: .4byte 0x00006dac - thumb_func_end sub_80F1B8C - - thumb_func_start sub_80F1BC8 -sub_80F1BC8: @ 80F1BC8 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0xC - lsls r0, 24 - lsrs r0, 24 - mov r9, r0 - ldr r1, _080F1BF4 @ =gUnknown_083DFEC4 - ldr r2, [r1] - ldr r3, _080F1BF8 @ =0x00000306 - adds r0, r2, r3 - ldrh r0, [r0] - adds r3, r1, 0 - cmp r0, 0x1 - beq _080F1C0A - cmp r0, 0x1 - bgt _080F1BFC - cmp r0, 0 - beq _080F1C02 - b _080F1DC4 - .align 2, 0 -_080F1BF4: .4byte gUnknown_083DFEC4 -_080F1BF8: .4byte 0x00000306 -_080F1BFC: - cmp r0, 0x2 - beq _080F1C12 - b _080F1DC4 -_080F1C02: - mov r0, r9 - bl sub_80F2458 - b _080F1DC8 -_080F1C0A: - mov r0, r9 - bl sub_80F2514 - b _080F1DC8 -_080F1C12: - mov r4, r9 - cmp r4, 0x1 - beq _080F1C40 - cmp r4, 0x1 - bgt _080F1C22 - cmp r4, 0 - beq _080F1C2A - b _080F1DC4 -_080F1C22: - mov r5, r9 - cmp r5, 0x2 - beq _080F1C54 - b _080F1DC4 -_080F1C2A: - movs r0, 0x2A - str r0, [sp, 0x4] - movs r1, 0x14 - str r1, [sp, 0x8] - ldr r4, _080F1C3C @ =0x0000030e - adds r1, r2, r4 - movs r0, 0x5 - b _080F1C62 - .align 2, 0 -_080F1C3C: .4byte 0x0000030e -_080F1C40: - movs r5, 0x38 - str r5, [sp, 0x4] - movs r0, 0x14 - str r0, [sp, 0x8] - ldr r4, _080F1C50 @ =0x0000030e - adds r1, r2, r4 - movs r0, 0x3 - b _080F1C62 - .align 2, 0 -_080F1C50: .4byte 0x0000030e -_080F1C54: - movs r5, 0x28 - str r5, [sp, 0x4] - movs r0, 0x10 - str r0, [sp, 0x8] - ldr r4, _080F1CDC @ =0x0000030e - adds r1, r2, r4 - movs r0, 0x6 -_080F1C62: - strb r0, [r1] - movs r5, 0 - str r5, [sp] - mov r8, r5 - adds r1, r3, 0 - ldr r0, [r1] - ldr r2, _080F1CDC @ =0x0000030e - adds r0, r2 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - cmp r8, r0 - blt _080F1C7E - b _080F1DC8 -_080F1C7E: - ldr r4, [sp, 0x8] - mov r3, r8 - muls r3, r4 - ldr r5, [sp, 0x4] - adds r0, r5, r3 - subs r0, 0x8 - lsls r0, 16 - lsrs r0, 16 - ldr r4, [r1] - mov r2, r8 - lsls r1, r2, 1 - movs r5, 0xC5 - lsls r5, 2 - adds r2, r4, r5 - adds r2, r1 - lsls r1, r0, 8 - adds r0, 0x11 - orrs r1, r0 - strh r1, [r2] - mov r0, r9 - cmp r0, 0 - bne _080F1CF2 - ldr r1, _080F1CE0 @ =0x00006db2 - adds r0, r4, r1 - mov r2, r8 - adds r1, r0, r2 - ldrb r0, [r1] - cmp r0, 0 - bne _080F1CE8 - movs r5, 0 - ldr r0, _080F1CE4 @ =gUnknown_083DFEC4 - ldr r0, [r0] - lsls r2, 4 - movs r3, 0xC8 - lsls r3, 2 - adds r1, r0, r3 - movs r3, 0 -_080F1CC8: - lsls r0, r5, 2 - adds r0, r2 - adds r0, r1, r0 - str r3, [r0] - adds r0, r5, 0x1 - lsls r0, 16 - lsrs r5, r0, 16 - cmp r5, 0x3 - bls _080F1CC8 - b _080F1D92 - .align 2, 0 -_080F1CDC: .4byte 0x0000030e -_080F1CE0: .4byte 0x00006db2 -_080F1CE4: .4byte gUnknown_083DFEC4 -_080F1CE8: - ldrb r0, [r1] - subs r0, 0x1 - lsls r0, 18 - lsrs r0, 16 - str r0, [sp] -_080F1CF2: - movs r5, 0 - ldr r4, [sp, 0x4] - adds r0, r4, r3 - lsls r0, 16 - mov r10, r0 -_080F1CFC: - lsls r6, r5, 5 - movs r0, 0x80 - lsls r0, 1 - adds r7, r6, r0 - lsls r1, r7, 16 - asrs r1, 16 - ldr r0, _080F1DB4 @ =gSpriteTemplate_83E4454 - mov r3, r10 - asrs r2, r3, 16 - movs r3, 0 - bl CreateSprite - lsls r0, 24 - lsrs r3, r0, 24 - cmp r3, 0x40 - beq _080F1DC4 - ldr r0, _080F1DB8 @ =gUnknown_083DFEC4 - ldr r2, [r0] - lsls r1, r5, 2 - mov r4, r8 - lsls r0, r4, 4 - adds r1, r0 - movs r0, 0xC8 - lsls r0, 2 - adds r2, r0 - adds r4, r2, r1 - lsls r0, r3, 4 - adds r0, r3 - lsls r0, 2 - ldr r1, _080F1DBC @ =gSprites - adds r0, r1 - str r0, [r4] - mov r1, r8 - strh r1, [r0, 0x2E] - ldr r0, [r4] - strh r5, [r0, 0x30] - ldr r1, [r4] - adds r0, r6, 0 - adds r0, 0x98 - strh r0, [r1, 0x32] - ldr r0, [r4] - strh r7, [r0, 0x34] - ldr r0, [r4] - ldr r1, [sp] - adds r2, r1, 0x1 - lsls r2, 16 - lsrs r2, 16 - str r2, [sp] - lsls r1, 24 - lsrs r1, 24 - bl StartSpriteAnim - mov r2, r9 - cmp r2, 0x2 - beq _080F1D6E - cmp r2, 0 - bne _080F1D88 -_080F1D6E: - mov r3, r8 - cmp r3, 0x2 - bls _080F1D88 - movs r0, 0x1 - bl IndexOfSpritePaletteTag - ldr r3, [r4] - lsls r0, 4 - ldrb r2, [r3, 0x5] - movs r1, 0xF - ands r1, r2 - orrs r1, r0 - strb r1, [r3, 0x5] -_080F1D88: - adds r0, r5, 0x1 - lsls r0, 16 - lsrs r5, r0, 16 - cmp r5, 0x3 - bls _080F1CFC -_080F1D92: - mov r0, r8 - adds r0, 0x1 - lsls r0, 16 - lsrs r0, 16 - mov r8, r0 - ldr r1, _080F1DB8 @ =gUnknown_083DFEC4 - ldr r0, [r1] - ldr r4, _080F1DC0 @ =0x0000030e - adds r0, r4 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - cmp r8, r0 - bge _080F1DB0 - b _080F1C7E -_080F1DB0: - b _080F1DC8 - .align 2, 0 -_080F1DB4: .4byte gSpriteTemplate_83E4454 -_080F1DB8: .4byte gUnknown_083DFEC4 -_080F1DBC: .4byte gSprites -_080F1DC0: .4byte 0x0000030e -_080F1DC4: - movs r0, 0 - b _080F1DD8 -_080F1DC8: - ldr r0, _080F1DE8 @ =gUnknown_083DFEC4 - ldr r1, [r0] - ldr r5, _080F1DEC @ =0x00000306 - adds r1, r5 - ldrh r0, [r1] - adds r0, 0x1 - strh r0, [r1] - movs r0, 0x1 -_080F1DD8: - add sp, 0xC - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r1} - bx r1 - .align 2, 0 -_080F1DE8: .4byte gUnknown_083DFEC4 -_080F1DEC: .4byte 0x00000306 - thumb_func_end sub_80F1BC8 - - thumb_func_start sub_80F1DF0 -sub_80F1DF0: @ 80F1DF0 - push {r4-r6,lr} - movs r2, 0 - ldr r0, _080F1E44 @ =gUnknown_083DFEC4 - ldr r3, [r0] - ldr r0, _080F1E48 @ =0x0000030e - adds r1, r3, r0 - movs r0, 0 - ldrsb r0, [r1, r0] - cmp r2, r0 - bge _080F1E38 - movs r0, 0xC8 - lsls r0, 2 - adds r4, r3, r0 - adds r6, r1, 0 - ldr r5, _080F1E4C @ =sub_80F2218 -_080F1E0E: - movs r1, 0 - adds r3, r2, 0x1 - lsls r2, 4 -_080F1E14: - lsls r0, r1, 2 - adds r0, r2 - adds r0, r4, r0 - ldr r0, [r0] - cmp r0, 0 - beq _080F1E22 - str r5, [r0, 0x1C] -_080F1E22: - adds r0, r1, 0x1 - lsls r0, 16 - lsrs r1, r0, 16 - cmp r1, 0x3 - bls _080F1E14 - lsls r0, r3, 16 - lsrs r2, r0, 16 - movs r0, 0 - ldrsb r0, [r6, r0] - cmp r2, r0 - blt _080F1E0E -_080F1E38: - movs r0, 0x6 - bl PlaySE - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_080F1E44: .4byte gUnknown_083DFEC4 -_080F1E48: .4byte 0x0000030e -_080F1E4C: .4byte sub_80F2218 - thumb_func_end sub_80F1DF0 - - thumb_func_start sub_80F1E50 -sub_80F1E50: @ 80F1E50 - push {lr} - bl sub_80F22F8 - lsls r0, 24 - cmp r0, 0 - bne _080F1E60 - movs r0, 0x1 - b _080F1E66 -_080F1E60: - bl sub_80F2108 - movs r0, 0 -_080F1E66: - pop {r1} - bx r1 - thumb_func_end sub_80F1E50 - - thumb_func_start sub_80F1E6C -sub_80F1E6C: @ 80F1E6C - push {lr} - bl sub_80F22F8 - movs r1, 0 - lsls r0, 24 - cmp r0, 0 - bne _080F1E7C - movs r1, 0x1 -_080F1E7C: - adds r0, r1, 0 - pop {r1} - bx r1 - thumb_func_end sub_80F1E6C - - thumb_func_start sub_80F1E84 -sub_80F1E84: @ 80F1E84 - push {r4-r7,lr} - mov r7, r8 - push {r7} - ldr r5, _080F1EFC @ =gUnknown_083DFEC4 - ldr r4, [r5] - ldr r1, _080F1F00 @ =0x0000030f - adds r0, r4, r1 - movs r1, 0 - strb r1, [r0] - bl sub_80F2148 - movs r2, 0 - ldr r3, _080F1F04 @ =0x0000030e - adds r1, r4, r3 - movs r0, 0 - ldrsb r0, [r1, r0] - cmp r2, r0 - bge _080F1EF2 - ldr r0, _080F1F08 @ =0x00006dad - adds r7, r4, r0 - adds r6, r1, 0 - mov r8, r5 - ldr r1, _080F1F0C @ =sub_80F2240 - mov r12, r1 -_080F1EB4: - movs r0, 0 - ldrsb r0, [r7, r0] - adds r5, r2, 0x1 - cmp r2, r0 - beq _080F1EE6 - movs r1, 0 - mov r3, r8 - ldr r0, [r3] - lsls r3, r2, 4 - movs r4, 0xC8 - lsls r4, 2 - adds r2, r0, r4 - mov r4, r12 -_080F1ECE: - lsls r0, r1, 2 - adds r0, r3 - adds r0, r2, r0 - ldr r0, [r0] - cmp r0, 0 - beq _080F1EDC - str r4, [r0, 0x1C] -_080F1EDC: - adds r0, r1, 0x1 - lsls r0, 16 - lsrs r1, r0, 16 - cmp r1, 0x3 - bls _080F1ECE -_080F1EE6: - lsls r0, r5, 16 - lsrs r2, r0, 16 - movs r0, 0 - ldrsb r0, [r6, r0] - cmp r2, r0 - blt _080F1EB4 -_080F1EF2: - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080F1EFC: .4byte gUnknown_083DFEC4 -_080F1F00: .4byte 0x0000030f -_080F1F04: .4byte 0x0000030e -_080F1F08: .4byte 0x00006dad -_080F1F0C: .4byte sub_80F2240 - thumb_func_end sub_80F1E84 - - thumb_func_start sub_80F1F10 -sub_80F1F10: @ 80F1F10 - push {r4-r7,lr} - mov r7, r8 - push {r7} - ldr r0, _080F1F2C @ =gUnknown_083DFEC4 - ldr r4, [r0] - ldr r1, _080F1F30 @ =0x0000030f - adds r0, r4, r1 - ldrb r0, [r0] - cmp r0, 0 - beq _080F1F34 - cmp r0, 0x1 - beq _080F1FC0 - b _080F1FE4 - .align 2, 0 -_080F1F2C: .4byte gUnknown_083DFEC4 -_080F1F30: .4byte 0x0000030f -_080F1F34: - bl sub_80F2360 - lsls r0, 24 - cmp r0, 0 - beq _080F1FE4 - movs r6, 0 - adds r7, r4, 0 - movs r0, 0xC8 - lsls r0, 2 - adds r0, r7 - mov r8, r0 -_080F1F4A: - lsls r5, r6, 2 - ldr r1, _080F1FAC @ =0x00006dad - adds r0, r7, r1 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - lsls r0, 4 - adds r0, r5, r0 - add r0, r8 - ldr r4, [r0] - ldrb r0, [r4, 0x1] - movs r1, 0x3 - orrs r0, r1 - strb r0, [r4, 0x1] - ldr r0, _080F1FB0 @ =gSpriteAffineAnimTable_83E4450 - str r0, [r4, 0x10] - adds r0, r4, 0 - bl InitSpriteAffineAnim - subs r5, 0x6 - strh r5, [r4, 0x36] - movs r1, 0x36 - ldrsh r0, [r4, r1] - lsrs r1, r0, 31 - adds r0, r1 - asrs r0, 1 - strh r0, [r4, 0x36] - movs r1, 0x36 - ldrsh r0, [r4, r1] - lsls r0, 3 - strh r0, [r4, 0x38] - ldr r0, _080F1FB4 @ =sub_80F2240 - str r0, [r4, 0x1C] - adds r0, r6, 0x1 - lsls r0, 16 - lsrs r6, r0, 16 - cmp r6, 0x3 - bls _080F1F4A - bl sub_80F2170 - ldr r0, _080F1FB8 @ =gUnknown_083DFEC4 - ldr r1, [r0] - ldr r0, _080F1FBC @ =0x0000030f - adds r1, r0 - ldrb r0, [r1] - adds r0, 0x1 - strb r0, [r1] - b _080F1FE4 - .align 2, 0 -_080F1FAC: .4byte 0x00006dad -_080F1FB0: .4byte gSpriteAffineAnimTable_83E4450 -_080F1FB4: .4byte sub_80F2240 -_080F1FB8: .4byte gUnknown_083DFEC4 -_080F1FBC: .4byte 0x0000030f -_080F1FC0: - bl sub_80F23C8 - lsls r0, 24 - cmp r0, 0 - beq _080F1FE4 - bl sub_80F21F8 - movs r0, 0 - bl FreeSpriteTilesByTag - movs r0, 0 - bl FreeSpritePaletteByTag - movs r0, 0x1 - bl FreeSpritePaletteByTag - movs r0, 0 - b _080F1FE6 -_080F1FE4: - movs r0, 0x1 -_080F1FE6: - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end sub_80F1F10 - - thumb_func_start sub_80F1FF0 -sub_80F1FF0: @ 80F1FF0 - push {r4,lr} - ldr r0, _080F203C @ =gUnknown_083DFEC4 - ldr r4, [r0] - ldr r1, _080F2040 @ =0x00000311 - adds r0, r4, r1 - ldrb r0, [r0] - cmp r0, 0x1 - bne _080F2058 - ldr r2, _080F2044 @ =REG_WIN0V - ldr r3, _080F2048 @ =0x00006dad - adds r0, r4, r3 - movs r1, 0 - ldrsb r1, [r0, r1] - lsls r1, 1 - movs r3, 0xC5 - lsls r3, 2 - adds r0, r4, r3 - adds r0, r1 - ldrh r0, [r0] - strh r0, [r2] - ldr r3, _080F204C @ =REG_BLDY - ldr r1, _080F2050 @ =gSineTable - ldr r0, _080F2054 @ =0x00000312 - adds r2, r4, r0 - ldrh r0, [r2] - lsls r0, 1 - adds r0, r1 - ldrh r0, [r0] - lsls r0, 16 - asrs r0, 21 - strh r0, [r3] - ldrh r0, [r2] - adds r0, 0x3 - movs r1, 0x7F - ands r0, r1 - strh r0, [r2] - b _080F2078 - .align 2, 0 -_080F203C: .4byte gUnknown_083DFEC4 -_080F2040: .4byte 0x00000311 -_080F2044: .4byte REG_WIN0V -_080F2048: .4byte 0x00006dad -_080F204C: .4byte REG_BLDY -_080F2050: .4byte gSineTable -_080F2054: .4byte 0x00000312 -_080F2058: - cmp r0, 0x2 - bne _080F2078 - ldr r2, _080F2080 @ =REG_BLDALPHA - ldr r1, _080F2084 @ =gUnknown_083E42F8 - ldr r0, _080F2088 @ =0x00000312 - adds r3, r4, r0 - ldrh r0, [r3] - lsls r0, 1 - adds r0, r1 - ldrh r0, [r0] - strh r0, [r2] - ldrh r0, [r3] - cmp r0, 0xE - bhi _080F2078 - adds r0, 0x1 - strh r0, [r3] -_080F2078: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080F2080: .4byte REG_BLDALPHA -_080F2084: .4byte gUnknown_083E42F8 -_080F2088: .4byte 0x00000312 - thumb_func_end sub_80F1FF0 - - thumb_func_start sub_80F208C -sub_80F208C: @ 80F208C - push {lr} - bl sub_80F2148 - pop {r0} - bx r0 - thumb_func_end sub_80F208C - - thumb_func_start sub_80F2098 -sub_80F2098: @ 80F2098 - ldr r1, _080F20DC @ =REG_WIN0H - ldr r2, _080F20E0 @ =0x000077f0 - adds r0, r2, 0 - strh r0, [r1] - ldr r2, _080F20E4 @ =REG_WIN0V - ldr r0, _080F20E8 @ =gUnknown_083DFEC4 - ldr r1, [r0] - ldr r3, _080F20EC @ =0x00006dad - adds r0, r1, r3 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - lsls r0, 1 - movs r3, 0xC5 - lsls r3, 2 - adds r1, r3 - adds r1, r0 - ldrh r0, [r1] - strh r0, [r2] - ldr r1, _080F20F0 @ =REG_WININ - movs r0, 0x3F - strh r0, [r1] - adds r1, 0x2 - movs r0, 0x1F - strh r0, [r1] - subs r2, 0x44 - ldrh r0, [r2] - movs r3, 0x80 - lsls r3, 6 - adds r1, r3, 0 - orrs r0, r1 - strh r0, [r2] - bx lr - .align 2, 0 -_080F20DC: .4byte REG_WIN0H -_080F20E0: .4byte 0x000077f0 -_080F20E4: .4byte REG_WIN0V -_080F20E8: .4byte gUnknown_083DFEC4 -_080F20EC: .4byte 0x00006dad -_080F20F0: .4byte REG_WININ - thumb_func_end sub_80F2098 - - thumb_func_start sub_80F20F4 -sub_80F20F4: @ 80F20F4 - movs r2, 0x80 - lsls r2, 19 - ldrh r1, [r2] - ldr r0, _080F2104 @ =0x0000dfff - ands r0, r1 - strh r0, [r2] - bx lr - .align 2, 0 -_080F2104: .4byte 0x0000dfff - thumb_func_end sub_80F20F4 - - thumb_func_start sub_80F2108 -sub_80F2108: @ 80F2108 - push {lr} - ldr r0, _080F2134 @ =gUnknown_083DFEC4 - ldr r3, [r0] - ldr r0, _080F2138 @ =0x00000311 - adds r1, r3, r0 - ldrb r2, [r1] - cmp r2, 0 - bne _080F2130 - movs r0, 0x1 - strb r0, [r1] - ldr r1, _080F213C @ =0x00000312 - adds r0, r3, r1 - strh r2, [r0] - ldr r1, _080F2140 @ =REG_BLDCNT - movs r0, 0x90 - strh r0, [r1] - ldr r0, _080F2144 @ =REG_BLDY - strh r2, [r0] - bl sub_80F2098 -_080F2130: - pop {r0} - bx r0 - .align 2, 0 -_080F2134: .4byte gUnknown_083DFEC4 -_080F2138: .4byte 0x00000311 -_080F213C: .4byte 0x00000312 -_080F2140: .4byte REG_BLDCNT -_080F2144: .4byte REG_BLDY - thumb_func_end sub_80F2108 - - thumb_func_start sub_80F2148 -sub_80F2148: @ 80F2148 - push {lr} - ldr r0, _080F2164 @ =gUnknown_083DFEC4 - ldr r0, [r0] - ldr r1, _080F2168 @ =0x00000311 - adds r0, r1 - movs r1, 0 - strb r1, [r0] - ldr r0, _080F216C @ =REG_BLDCNT - strh r1, [r0] - bl sub_80F20F4 - pop {r0} - bx r0 - .align 2, 0 -_080F2164: .4byte gUnknown_083DFEC4 -_080F2168: .4byte 0x00000311 -_080F216C: .4byte REG_BLDCNT - thumb_func_end sub_80F2148 - - thumb_func_start sub_80F2170 -sub_80F2170: @ 80F2170 - push {r4-r7,lr} - ldr r7, _080F21E4 @ =gUnknown_083DFEC4 - ldr r4, [r7] - ldr r1, _080F21E8 @ =0x00000311 - adds r0, r4, r1 - ldrb r0, [r0] - cmp r0, 0 - bne _080F21DC - bl sub_80F20F4 - movs r3, 0 - ldr r2, _080F21EC @ =0x00006dad - adds r5, r4, r2 - movs r0, 0xC8 - lsls r0, 2 - adds r4, r0 - movs r1, 0xD - negs r1, r1 - mov r12, r1 - movs r6, 0x4 -_080F2198: - lsls r1, r3, 2 - movs r0, 0 - ldrsb r0, [r5, r0] - lsls r0, 4 - adds r1, r0 - adds r1, r4, r1 - ldr r2, [r1] - ldrb r1, [r2, 0x1] - mov r0, r12 - ands r0, r1 - orrs r0, r6 - strb r0, [r2, 0x1] - adds r0, r3, 0x1 - lsls r0, 16 - lsrs r3, r0, 16 - cmp r3, 0x3 - bls _080F2198 - ldr r1, [r7] - ldr r0, _080F21E8 @ =0x00000311 - adds r2, r1, r0 - movs r3, 0 - movs r0, 0x2 - strb r0, [r2] - ldr r2, _080F21F0 @ =0x00000312 - adds r1, r2 - strh r3, [r1] - ldr r1, _080F21F4 @ =REG_BLDCNT - movs r2, 0xFD - lsls r2, 6 - adds r0, r2, 0 - strh r0, [r1] - adds r1, 0x2 - movs r0, 0x10 - strh r0, [r1] -_080F21DC: - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080F21E4: .4byte gUnknown_083DFEC4 -_080F21E8: .4byte 0x00000311 -_080F21EC: .4byte 0x00006dad -_080F21F0: .4byte 0x00000312 -_080F21F4: .4byte REG_BLDCNT - thumb_func_end sub_80F2170 - - thumb_func_start sub_80F21F8 -sub_80F21F8: @ 80F21F8 - ldr r0, _080F220C @ =gUnknown_083DFEC4 - ldr r0, [r0] - ldr r1, _080F2210 @ =0x00000311 - adds r0, r1 - movs r1, 0 - strb r1, [r0] - ldr r0, _080F2214 @ =REG_BLDCNT - strh r1, [r0] - bx lr - .align 2, 0 -_080F220C: .4byte gUnknown_083DFEC4 -_080F2210: .4byte 0x00000311 -_080F2214: .4byte REG_BLDCNT - thumb_func_end sub_80F21F8 - - thumb_func_start sub_80F2218 -sub_80F2218: @ 80F2218 - push {r4,lr} - adds r2, r0, 0 - ldrh r0, [r2, 0x20] - subs r0, 0x8 - strh r0, [r2, 0x20] - lsls r0, 16 - asrs r0, 16 - ldrh r3, [r2, 0x32] - movs r4, 0x32 - ldrsh r1, [r2, r4] - cmp r0, r1 - bgt _080F2236 - strh r3, [r2, 0x20] - ldr r0, _080F223C @ =sub_80F22B0 - str r0, [r2, 0x1C] -_080F2236: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080F223C: .4byte sub_80F22B0 - thumb_func_end sub_80F2218 - - thumb_func_start sub_80F2240 -sub_80F2240: @ 80F2240 - push {r4,lr} - adds r2, r0, 0 - ldr r0, _080F2288 @ =gUnknown_083DFEC4 - ldr r0, [r0] - ldr r1, _080F228C @ =0x00006dad - adds r0, r1 - movs r3, 0x2E - ldrsh r1, [r2, r3] - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - cmp r1, r0 - bne _080F2290 - ldrh r3, [r2, 0x38] - movs r4, 0x38 - ldrsh r0, [r2, r4] - cmp r0, 0 - beq _080F2270 - ldrh r0, [r2, 0x36] - ldrh r4, [r2, 0x20] - adds r1, r0, r4 - strh r1, [r2, 0x20] - subs r0, r3, r0 - strh r0, [r2, 0x38] -_080F2270: - adds r0, r2, 0 - adds r0, 0x3F - ldrb r1, [r0] - movs r0, 0x20 - ands r0, r1 - cmp r0, 0 - beq _080F22A8 - adds r0, r2, 0 - bl sub_80F240C - b _080F22A8 - .align 2, 0 -_080F2288: .4byte gUnknown_083DFEC4 -_080F228C: .4byte 0x00006dad -_080F2290: - ldrh r0, [r2, 0x20] - adds r0, 0x8 - strh r0, [r2, 0x20] - lsls r0, 16 - asrs r0, 16 - movs r3, 0x34 - ldrsh r1, [r2, r3] - cmp r0, r1 - blt _080F22A8 - adds r0, r2, 0 - bl sub_80F240C -_080F22A8: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_80F2240 - - thumb_func_start sub_80F22B0 -sub_80F22B0: @ 80F22B0 - push {lr} - adds r2, r0, 0 - ldr r0, _080F22DC @ =gUnknown_083DFEC4 - ldr r0, [r0] - ldr r1, _080F22E0 @ =0x00006dad - adds r0, r1 - movs r3, 0x2E - ldrsh r1, [r2, r3] - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - cmp r1, r0 - bne _080F22E4 - ldrh r3, [r2, 0x24] - movs r0, 0x24 - ldrsh r1, [r2, r0] - movs r0, 0x10 - negs r0, r0 - cmp r1, r0 - ble _080F22F2 - subs r0, r3, 0x4 - b _080F22F0 - .align 2, 0 -_080F22DC: .4byte gUnknown_083DFEC4 -_080F22E0: .4byte 0x00006dad -_080F22E4: - ldrh r1, [r2, 0x24] - movs r3, 0x24 - ldrsh r0, [r2, r3] - cmp r0, 0 - bge _080F22F2 - adds r0, r1, 0x4 -_080F22F0: - strh r0, [r2, 0x24] -_080F22F2: - pop {r0} - bx r0 - thumb_func_end sub_80F22B0 - - thumb_func_start sub_80F22F8 -sub_80F22F8: @ 80F22F8 - push {r4-r7,lr} - movs r3, 0 - ldr r0, _080F233C @ =gUnknown_083DFEC4 - ldr r1, [r0] - ldr r2, _080F2340 @ =0x00006dae - adds r0, r1, r2 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - cmp r3, r0 - bge _080F2358 - movs r7, 0xC8 - lsls r7, 2 - adds r4, r1, r7 - movs r5, 0x10 - negs r5, r5 - adds r6, r0, 0 -_080F231A: - movs r1, 0 - lsls r2, r3, 4 -_080F231E: - lsls r0, r1, 2 - adds r0, r2 - adds r0, r4, r0 - ldr r0, [r0] - cmp r0, 0 - beq _080F2358 - movs r7, 0x24 - ldrsh r0, [r0, r7] - cmp r0, 0 - beq _080F2344 - cmp r0, r5 - beq _080F2344 - movs r0, 0 - b _080F235A - .align 2, 0 -_080F233C: .4byte gUnknown_083DFEC4 -_080F2340: .4byte 0x00006dae -_080F2344: - adds r0, r1, 0x1 - lsls r0, 16 - lsrs r1, r0, 16 - cmp r1, 0x3 - bls _080F231E - adds r0, r3, 0x1 - lsls r0, 16 - lsrs r3, r0, 16 - cmp r3, r6 - blt _080F231A -_080F2358: - movs r0, 0x1 -_080F235A: - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end sub_80F22F8 - - thumb_func_start sub_80F2360 -sub_80F2360: @ 80F2360 - push {r4-r7,lr} - movs r4, 0 - ldr r0, _080F23A0 @ =gUnknown_083DFEC4 - ldr r2, [r0] - ldr r1, _080F23A4 @ =0x0000030e - adds r0, r2, r1 - movs r1, 0 - ldrsb r1, [r0, r1] - cmp r4, r1 - bge _080F23C0 - ldr r3, _080F23A8 @ =0x00006dad - adds r0, r2, r3 - movs r6, 0 - ldrsb r6, [r0, r6] - adds r5, r1, 0 -_080F237E: - cmp r4, r6 - beq _080F23B6 - movs r1, 0 - ldr r0, _080F23A0 @ =gUnknown_083DFEC4 - ldr r0, [r0] - lsls r3, r4, 4 - movs r7, 0xC8 - lsls r7, 2 - adds r2, r0, r7 -_080F2390: - lsls r0, r1, 2 - adds r0, r3 - adds r0, r2, r0 - ldr r0, [r0] - cmp r0, 0 - beq _080F23AC - movs r0, 0 - b _080F23C2 - .align 2, 0 -_080F23A0: .4byte gUnknown_083DFEC4 -_080F23A4: .4byte 0x0000030e -_080F23A8: .4byte 0x00006dad -_080F23AC: - adds r0, r1, 0x1 - lsls r0, 16 - lsrs r1, r0, 16 - cmp r1, 0x3 - bls _080F2390 -_080F23B6: - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 - cmp r4, r5 - blt _080F237E -_080F23C0: - movs r0, 0x1 -_080F23C2: - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end sub_80F2360 - - thumb_func_start sub_80F23C8 -sub_80F23C8: @ 80F23C8 - push {lr} - movs r2, 0 - ldr r0, _080F23F4 @ =gUnknown_083DFEC4 - ldr r1, [r0] - ldr r3, _080F23F8 @ =0x00006dad - adds r0, r1, r3 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - lsls r3, r0, 4 - movs r0, 0xC8 - lsls r0, 2 - adds r1, r0 -_080F23E2: - lsls r0, r2, 2 - adds r0, r3 - adds r0, r1, r0 - ldr r0, [r0] - cmp r0, 0 - beq _080F23FC - movs r0, 0 - b _080F2408 - .align 2, 0 -_080F23F4: .4byte gUnknown_083DFEC4 -_080F23F8: .4byte 0x00006dad -_080F23FC: - adds r0, r2, 0x1 - lsls r0, 16 - lsrs r2, r0, 16 - cmp r2, 0x3 - bls _080F23E2 - movs r0, 0x1 -_080F2408: - pop {r1} - bx r1 - thumb_func_end sub_80F23C8 - - thumb_func_start sub_80F240C -sub_80F240C: @ 80F240C - push {r4,lr} - adds r4, r0, 0 - ldr r0, _080F2454 @ =gUnknown_083DFEC4 - ldr r2, [r0] - movs r0, 0x30 - ldrsh r1, [r4, r0] - lsls r1, 2 - movs r3, 0x2E - ldrsh r0, [r4, r3] - lsls r0, 4 - adds r1, r0 - movs r0, 0xC8 - lsls r0, 2 - adds r2, r0 - adds r2, r1 - movs r0, 0 - str r0, [r2] - adds r0, r4, 0 - adds r0, 0x3F - ldrb r1, [r0] - movs r0, 0x20 - ands r0, r1 - cmp r0, 0 - beq _080F2446 - ldrb r0, [r4, 0x3] - lsls r0, 26 - lsrs r0, 27 - bl FreeOamMatrix -_080F2446: - adds r0, r4, 0 - bl DestroySprite - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080F2454: .4byte gUnknown_083DFEC4 - thumb_func_end sub_80F240C - - thumb_func_start sub_80F2458 -sub_80F2458: @ 80F2458 - push {r4,r5,lr} - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0x1 - beq _080F24A0 - cmp r4, 0x1 - bgt _080F246C - cmp r4, 0 - beq _080F2472 - b _080F2502 -_080F246C: - cmp r4, 0x2 - beq _080F24D0 - b _080F2502 -_080F2472: - ldr r2, _080F2498 @ =gUnknown_083DFEC4 - ldr r3, [r2] - movs r0, 0xE0 - lsls r0, 2 - adds r1, r3, r0 - movs r5, 0xE2 - lsls r5, 2 - adds r0, r3, r5 - str r0, [r1] - movs r0, 0xE1 - lsls r0, 2 - adds r1, r3, r0 - movs r0, 0xA0 - lsls r0, 5 - strh r0, [r1] - ldr r1, _080F249C @ =0x00000386 - adds r0, r3, r1 - strh r4, [r0] - b _080F24F6 - .align 2, 0 -_080F2498: .4byte gUnknown_083DFEC4 -_080F249C: .4byte 0x00000386 -_080F24A0: - ldr r4, _080F24C4 @ =gUnknown_083DFEC4 - ldr r1, [r4] - movs r3, 0xE0 - lsls r3, 2 - adds r2, r1, r3 - ldr r5, _080F24C8 @ =0x00001788 - adds r0, r1, r5 - str r0, [r2] - movs r0, 0xE1 - lsls r0, 2 - adds r2, r1, r0 - movs r3, 0 - movs r0, 0xC0 - lsls r0, 4 - strh r0, [r2] - ldr r5, _080F24CC @ =0x00000386 - adds r1, r5 - b _080F24F2 - .align 2, 0 -_080F24C4: .4byte gUnknown_083DFEC4 -_080F24C8: .4byte 0x00001788 -_080F24CC: .4byte 0x00000386 -_080F24D0: - ldr r4, _080F2508 @ =gUnknown_083DFEC4 - ldr r1, [r4] - movs r0, 0xE0 - lsls r0, 2 - adds r2, r1, r0 - ldr r3, _080F250C @ =0x00002388 - adds r0, r1, r3 - str r0, [r2] - movs r5, 0xE1 - lsls r5, 2 - adds r2, r1, r5 - movs r3, 0 - movs r0, 0xC0 - lsls r0, 5 - strh r0, [r2] - ldr r0, _080F2510 @ =0x00000386 - adds r1, r0 -_080F24F2: - strh r3, [r1] - adds r2, r4, 0 -_080F24F6: - ldr r0, [r2] - movs r1, 0xE0 - lsls r1, 2 - adds r0, r1 - bl LoadSpriteSheet -_080F2502: - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080F2508: .4byte gUnknown_083DFEC4 -_080F250C: .4byte 0x00002388 -_080F2510: .4byte 0x00000386 - thumb_func_end sub_80F2458 - - thumb_func_start sub_80F2514 -sub_80F2514: @ 80F2514 - push {r4,lr} - sub sp, 0x8 - lsls r0, 24 - lsrs r0, 24 - adds r1, r0, 0 - cmp r0, 0x1 - beq _080F2558 - cmp r0, 0x1 - bgt _080F252C - cmp r0, 0 - beq _080F2532 - b _080F2586 -_080F252C: - cmp r1, 0x2 - beq _080F2568 - b _080F2586 -_080F2532: - ldr r0, _080F254C @ =gPokenavMenuOptions1_Pal - str r0, [sp] - ldr r1, _080F2550 @ =0xffff0000 - mov r4, sp - ldr r0, [sp, 0x4] - ands r0, r1 - str r0, [sp, 0x4] - mov r0, sp - bl LoadSpritePalette - ldr r0, _080F2554 @ =gPokenavMenuOptions2_Pal - b _080F257A - .align 2, 0 -_080F254C: .4byte gPokenavMenuOptions1_Pal -_080F2550: .4byte 0xffff0000 -_080F2554: .4byte gPokenavMenuOptions2_Pal -_080F2558: - ldr r0, _080F2564 @ =gPokenavConditionMenu_Pal - str r0, [sp] - mov r1, sp - movs r0, 0 - strh r0, [r1, 0x4] - b _080F2580 - .align 2, 0 -_080F2564: .4byte gPokenavConditionMenu_Pal -_080F2568: - ldr r0, _080F2590 @ =gPokenavCondition6_Pal - str r0, [sp] - mov r4, sp - movs r0, 0 - strh r0, [r4, 0x4] - mov r0, sp - bl LoadSpritePalette - ldr r0, _080F2594 @ =gPokenavCondition7_Pal -_080F257A: - str r0, [sp] - movs r0, 0x1 - strh r0, [r4, 0x4] -_080F2580: - mov r0, sp - bl LoadSpritePalette -_080F2586: - add sp, 0x8 - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080F2590: .4byte gPokenavCondition6_Pal -_080F2594: .4byte gPokenavCondition7_Pal - thumb_func_end sub_80F2514 - - thumb_func_start sub_80F2598 -sub_80F2598: @ 80F2598 - push {r4,lr} - ldr r0, _080F25F0 @ =gUnknown_083DFEC4 - ldr r0, [r0] - ldr r1, _080F25F4 @ =0x00006d9c - adds r4, r0, r1 - movs r0, 0 - str r0, [r4] - ldr r1, _080F25F8 @ =gSaveBlock1 - movs r0, 0x4 - ldrsb r0, [r1, r0] - lsls r0, 16 - lsrs r0, 16 - ldrb r1, [r1, 0x5] - lsls r1, 24 - asrs r1, 24 - lsls r1, 16 - lsrs r1, 16 - bl DoesSomeoneWantRematchIn - cmp r0, 0x1 - bne _080F2618 - ldr r0, _080F25FC @ =gSpriteSheet_PokenavBlueLight - bl LoadSpriteSheet - ldr r0, _080F2600 @ =gSpritePalette_PokenavBlueLight - bl LoadSpritePalette - ldr r0, _080F2604 @ =gSpriteTemplate_83E4484 - movs r1, 0xC - movs r2, 0x60 - movs r3, 0 - bl CreateSprite - lsls r0, 24 - lsrs r1, r0, 24 - cmp r1, 0x40 - beq _080F260C - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - ldr r1, _080F2608 @ =gSprites - adds r0, r1 - str r0, [r4] - b _080F2618 - .align 2, 0 -_080F25F0: .4byte gUnknown_083DFEC4 -_080F25F4: .4byte 0x00006d9c -_080F25F8: .4byte gSaveBlock1 -_080F25FC: .4byte gSpriteSheet_PokenavBlueLight -_080F2600: .4byte gSpritePalette_PokenavBlueLight -_080F2604: .4byte gSpriteTemplate_83E4484 -_080F2608: .4byte gSprites -_080F260C: - movs r0, 0x19 - bl FreeSpriteTilesByTag - movs r0, 0x11 - bl FreeSpritePaletteByTag -_080F2618: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_80F2598 - - thumb_func_start sub_80F2620 -sub_80F2620: @ 80F2620 - push {r4,lr} - ldr r0, _080F264C @ =gUnknown_083DFEC4 - ldr r0, [r0] - ldr r1, _080F2650 @ =0x00006d9c - adds r4, r0, r1 - ldr r0, [r4] - cmp r0, 0 - beq _080F2644 - bl DestroySprite - movs r0, 0x19 - bl FreeSpriteTilesByTag - movs r0, 0x11 - bl FreeSpritePaletteByTag - movs r0, 0 - str r0, [r4] -_080F2644: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080F264C: .4byte gUnknown_083DFEC4 -_080F2650: .4byte 0x00006d9c - thumb_func_end sub_80F2620 - - thumb_func_start sub_80F2654 -sub_80F2654: @ 80F2654 - push {lr} - adds r3, r0, 0 - ldrh r0, [r3, 0x2E] - adds r0, 0x1 - strh r0, [r3, 0x2E] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x6 - ble _080F2682 - movs r0, 0 - strh r0, [r3, 0x2E] - adds r3, 0x3E - ldrb r2, [r3] - lsrs r1, r2, 2 - movs r0, 0x1 - eors r1, r0 - ands r1, r0 - lsls r1, 2 - movs r0, 0x5 - negs r0, r0 - ands r0, r2 - orrs r0, r1 - strb r0, [r3] -_080F2682: - pop {r0} - bx r0 - thumb_func_end sub_80F2654 - - thumb_func_start sub_80F2688 -sub_80F2688: @ 80F2688 - push {lr} - ldr r0, _080F26B0 @ =gUnknown_083DFEC4 - ldr r0, [r0] - ldr r1, _080F26B4 @ =0x00000306 - adds r2, r0, r1 - movs r1, 0 - strh r1, [r2] - ldr r1, _080F26B8 @ =0x00006dac - adds r0, r1 - ldrb r0, [r0] - cmp r0, 0 - bne _080F26AA -_080F26A0: - bl sub_80F26BC - lsls r0, 24 - cmp r0, 0 - bne _080F26A0 -_080F26AA: - pop {r0} - bx r0 - .align 2, 0 -_080F26B0: .4byte gUnknown_083DFEC4 -_080F26B4: .4byte 0x00000306 -_080F26B8: .4byte 0x00006dac - thumb_func_end sub_80F2688 - - thumb_func_start sub_80F26BC -sub_80F26BC: @ 80F26BC - push {lr} - ldr r0, _080F26D8 @ =gUnknown_083DFEC4 - ldr r0, [r0] - ldr r1, _080F26DC @ =0x00000306 - adds r0, r1 - ldrh r0, [r0] - cmp r0, 0x7 - bls _080F26CE - b _080F27BC -_080F26CE: - lsls r0, 2 - ldr r1, _080F26E0 @ =_080F26E4 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_080F26D8: .4byte gUnknown_083DFEC4 -_080F26DC: .4byte 0x00000306 -_080F26E0: .4byte _080F26E4 - .align 2, 0 -_080F26E4: - .4byte _080F2704 - .4byte _080F271C - .4byte _080F2734 - .4byte _080F274C - .4byte _080F2764 - .4byte _080F277C - .4byte _080F2794 - .4byte _080F27B0 -_080F2704: - ldr r0, _080F2710 @ =gPokenavMainMenu_Gfx - ldr r1, _080F2714 @ =gUnknown_083DFEC4 - ldr r1, [r1] - ldr r2, _080F2718 @ =0x00003b98 - b _080F279C - .align 2, 0 -_080F2710: .4byte gPokenavMainMenu_Gfx -_080F2714: .4byte gUnknown_083DFEC4 -_080F2718: .4byte 0x00003b98 -_080F271C: - ldr r0, _080F2728 @ =gPokenavConditionMenuHeader_Gfx - ldr r1, _080F272C @ =gUnknown_083DFEC4 - ldr r1, [r1] - ldr r2, _080F2730 @ =0x00004198 - b _080F279C - .align 2, 0 -_080F2728: .4byte gPokenavConditionMenuHeader_Gfx -_080F272C: .4byte gUnknown_083DFEC4 -_080F2730: .4byte 0x00004198 -_080F2734: - ldr r0, _080F2740 @ =gPokenavRibbonsHeader_Gfx - ldr r1, _080F2744 @ =gUnknown_083DFEC4 - ldr r1, [r1] - ldr r2, _080F2748 @ =0x00004d98 - b _080F279C - .align 2, 0 -_080F2740: .4byte gPokenavRibbonsHeader_Gfx -_080F2744: .4byte gUnknown_083DFEC4 -_080F2748: .4byte 0x00004d98 -_080F274C: - ldr r0, _080F2758 @ =gPokenavHoennMapHeader_Gfx - ldr r1, _080F275C @ =gUnknown_083DFEC4 - ldr r1, [r1] - ldr r2, _080F2760 @ =0x00005398 - b _080F279C - .align 2, 0 -_080F2758: .4byte gPokenavHoennMapHeader_Gfx -_080F275C: .4byte gUnknown_083DFEC4 -_080F2760: .4byte 0x00005398 -_080F2764: - ldr r0, _080F2770 @ =gPokenavConditionMenuOptions_Gfx - ldr r1, _080F2774 @ =gUnknown_083DFEC4 - ldr r1, [r1] - ldr r2, _080F2778 @ =0x00005f98 - b _080F279C - .align 2, 0 -_080F2770: .4byte gPokenavConditionMenuOptions_Gfx -_080F2774: .4byte gUnknown_083DFEC4 -_080F2778: .4byte 0x00005f98 -_080F277C: - ldr r0, _080F2788 @ =gPokenavConditionMenuOptions2_Gfx - ldr r1, _080F278C @ =gUnknown_083DFEC4 - ldr r1, [r1] - ldr r2, _080F2790 @ =0x00006798 - b _080F279C - .align 2, 0 -_080F2788: .4byte gPokenavConditionMenuOptions2_Gfx -_080F278C: .4byte gUnknown_083DFEC4 -_080F2790: .4byte 0x00006798 -_080F2794: - ldr r0, _080F27A4 @ =gPokenavTrainersEyesHeader_Gfx - ldr r1, _080F27A8 @ =gUnknown_083DFEC4 - ldr r1, [r1] - ldr r2, _080F27AC @ =0x00004798 -_080F279C: - adds r1, r2 - bl LZ77UnCompWram - b _080F27C0 - .align 2, 0 -_080F27A4: .4byte gPokenavTrainersEyesHeader_Gfx -_080F27A8: .4byte gUnknown_083DFEC4 -_080F27AC: .4byte 0x00004798 -_080F27B0: - ldr r0, _080F27B8 @ =gUnknown_083E449C - bl LoadSpritePalettes - b _080F27C0 - .align 2, 0 -_080F27B8: .4byte gUnknown_083E449C -_080F27BC: - movs r0, 0 - b _080F27D0 -_080F27C0: - ldr r0, _080F27D4 @ =gUnknown_083DFEC4 - ldr r1, [r0] - ldr r0, _080F27D8 @ =0x00000306 - adds r1, r0 - ldrh r0, [r1] - adds r0, 0x1 - strh r0, [r1] - movs r0, 0x1 -_080F27D0: - pop {r1} - bx r1 - .align 2, 0 -_080F27D4: .4byte gUnknown_083DFEC4 -_080F27D8: .4byte 0x00000306 - thumb_func_end sub_80F26BC - - thumb_func_start sub_80F27DC -sub_80F27DC: @ 80F27DC - push {lr} - sub sp, 0x8 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0xB - bls _080F27EA - b _080F29A0 -_080F27EA: - lsls r0, 2 - ldr r1, _080F27F4 @ =_080F27F8 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_080F27F4: .4byte _080F27F8 - .align 2, 0 -_080F27F8: - .4byte _080F2828 - .4byte _080F2858 - .4byte _080F28B8 - .4byte _080F2888 - .4byte _080F28E8 - .4byte _080F2918 - .4byte _080F2928 - .4byte _080F2978 - .4byte _080F2938 - .4byte _080F2948 - .4byte _080F2968 - .4byte _080F2958 -_080F2828: - ldr r0, _080F2848 @ =gUnknown_083DFEC4 - ldr r0, [r0] - ldr r1, _080F284C @ =0x00003b98 - adds r0, r1 - str r0, [sp] - ldr r1, _080F2850 @ =0xffff0000 - ldr r0, [sp, 0x4] - ands r0, r1 - movs r1, 0xC0 - lsls r1, 3 - orrs r0, r1 - ldr r1, _080F2854 @ =0x0000ffff - ands r0, r1 - adds r1, 0x1 - b _080F2996 - .align 2, 0 -_080F2848: .4byte gUnknown_083DFEC4 -_080F284C: .4byte 0x00003b98 -_080F2850: .4byte 0xffff0000 -_080F2854: .4byte 0x0000ffff -_080F2858: - ldr r0, _080F2878 @ =gUnknown_083DFEC4 - ldr r0, [r0] - ldr r1, _080F287C @ =0x00004198 - adds r0, r1 - str r0, [sp] - ldr r1, _080F2880 @ =0xffff0000 - ldr r0, [sp, 0x4] - ands r0, r1 - movs r1, 0xC0 - lsls r1, 3 - orrs r0, r1 - ldr r1, _080F2884 @ =0x0000ffff - ands r0, r1 - adds r1, 0x1 - b _080F2996 - .align 2, 0 -_080F2878: .4byte gUnknown_083DFEC4 -_080F287C: .4byte 0x00004198 -_080F2880: .4byte 0xffff0000 -_080F2884: .4byte 0x0000ffff -_080F2888: - ldr r0, _080F28A8 @ =gUnknown_083DFEC4 - ldr r0, [r0] - ldr r1, _080F28AC @ =0x00004798 - adds r0, r1 - str r0, [sp] - ldr r1, _080F28B0 @ =0xffff0000 - ldr r0, [sp, 0x4] - ands r0, r1 - movs r1, 0xC0 - lsls r1, 3 - orrs r0, r1 - ldr r1, _080F28B4 @ =0x0000ffff - ands r0, r1 - adds r1, 0x1 - b _080F2996 - .align 2, 0 -_080F28A8: .4byte gUnknown_083DFEC4 -_080F28AC: .4byte 0x00004798 -_080F28B0: .4byte 0xffff0000 -_080F28B4: .4byte 0x0000ffff -_080F28B8: - ldr r0, _080F28D8 @ =gUnknown_083DFEC4 - ldr r0, [r0] - ldr r1, _080F28DC @ =0x00004d98 - adds r0, r1 - str r0, [sp] - ldr r1, _080F28E0 @ =0xffff0000 - ldr r0, [sp, 0x4] - ands r0, r1 - movs r1, 0xC0 - lsls r1, 3 - orrs r0, r1 - ldr r1, _080F28E4 @ =0x0000ffff - ands r0, r1 - adds r1, 0x1 - b _080F2996 - .align 2, 0 -_080F28D8: .4byte gUnknown_083DFEC4 -_080F28DC: .4byte 0x00004d98 -_080F28E0: .4byte 0xffff0000 -_080F28E4: .4byte 0x0000ffff -_080F28E8: - ldr r0, _080F2908 @ =gUnknown_083DFEC4 - ldr r0, [r0] - ldr r1, _080F290C @ =0x00005398 - adds r0, r1 - str r0, [sp] - ldr r1, _080F2910 @ =0xffff0000 - ldr r0, [sp, 0x4] - ands r0, r1 - movs r1, 0xC0 - lsls r1, 4 - orrs r0, r1 - ldr r1, _080F2914 @ =0x0000ffff - ands r0, r1 - adds r1, 0x1 - b _080F2996 - .align 2, 0 -_080F2908: .4byte gUnknown_083DFEC4 -_080F290C: .4byte 0x00005398 -_080F2910: .4byte 0xffff0000 -_080F2914: .4byte 0x0000ffff -_080F2918: - ldr r0, _080F2920 @ =gUnknown_083DFEC4 - ldr r0, [r0] - ldr r1, _080F2924 @ =0x00005f98 - b _080F297E - .align 2, 0 -_080F2920: .4byte gUnknown_083DFEC4 -_080F2924: .4byte 0x00005f98 -_080F2928: - ldr r0, _080F2930 @ =gUnknown_083DFEC4 - ldr r0, [r0] - ldr r1, _080F2934 @ =0x00006198 - b _080F297E - .align 2, 0 -_080F2930: .4byte gUnknown_083DFEC4 -_080F2934: .4byte 0x00006198 -_080F2938: - ldr r0, _080F2940 @ =gUnknown_083DFEC4 - ldr r0, [r0] - ldr r1, _080F2944 @ =0x00006398 - b _080F297E - .align 2, 0 -_080F2940: .4byte gUnknown_083DFEC4 -_080F2944: .4byte 0x00006398 -_080F2948: - ldr r0, _080F2950 @ =gUnknown_083DFEC4 - ldr r0, [r0] - ldr r1, _080F2954 @ =0x00006598 - b _080F297E - .align 2, 0 -_080F2950: .4byte gUnknown_083DFEC4 -_080F2954: .4byte 0x00006598 -_080F2958: - ldr r0, _080F2960 @ =gUnknown_083DFEC4 - ldr r0, [r0] - ldr r1, _080F2964 @ =0x00006998 - b _080F297E - .align 2, 0 -_080F2960: .4byte gUnknown_083DFEC4 -_080F2964: .4byte 0x00006998 -_080F2968: - ldr r0, _080F2970 @ =gUnknown_083DFEC4 - ldr r0, [r0] - ldr r1, _080F2974 @ =0x00006798 - b _080F297E - .align 2, 0 -_080F2970: .4byte gUnknown_083DFEC4 -_080F2974: .4byte 0x00006798 -_080F2978: - ldr r0, _080F29A8 @ =gUnknown_083DFEC4 - ldr r0, [r0] - ldr r1, _080F29AC @ =0x00006b98 -_080F297E: - adds r0, r1 - str r0, [sp] - ldr r1, _080F29B0 @ =0xffff0000 - ldr r0, [sp, 0x4] - ands r0, r1 - movs r1, 0x80 - lsls r1, 2 - orrs r0, r1 - ldr r1, _080F29B4 @ =0x0000ffff - ands r0, r1 - movs r1, 0x80 - lsls r1, 10 -_080F2996: - orrs r0, r1 - str r0, [sp, 0x4] - mov r0, sp - bl LoadSpriteSheet -_080F29A0: - add sp, 0x8 - pop {r0} - bx r0 - .align 2, 0 -_080F29A8: .4byte gUnknown_083DFEC4 -_080F29AC: .4byte 0x00006b98 -_080F29B0: .4byte 0xffff0000 -_080F29B4: .4byte 0x0000ffff - thumb_func_end sub_80F27DC - - thumb_func_start sub_80F29B8 -sub_80F29B8: @ 80F29B8 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x14 - lsls r0, 24 - lsrs r7, r0, 24 - movs r0, 0 - mov r8, r0 - cmp r7, 0xB - bls _080F29D2 - b _080F2BA6 -_080F29D2: - lsls r0, r7, 2 - ldr r1, _080F29DC @ =_080F29E0 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_080F29DC: .4byte _080F29E0 - .align 2, 0 -_080F29E0: - .4byte _080F2A10 - .4byte _080F2A10 - .4byte _080F2A10 - .4byte _080F2A10 - .4byte _080F2A58 - .4byte _080F2A94 - .4byte _080F2A94 - .4byte _080F2A98 - .4byte _080F2A94 - .4byte _080F2A94 - .4byte _080F2A98 - .4byte _080F2A98 -_080F2A10: - ldr r3, _080F2A44 @ =0x0000ffa0 - ldr r0, _080F2A48 @ =gUnknown_083DFEC4 - ldr r2, [r0] - movs r1, 0xC3 - lsls r1, 2 - adds r0, r2, r1 - ldrh r1, [r0] - movs r0, 0x31 - subs r0, r1 - lsls r0, 16 - lsrs r0, 16 - movs r4, 0x8 - str r4, [sp] - movs r1, 0x20 - str r1, [sp, 0x4] - movs r1, 0x40 - ldr r4, _080F2A4C @ =0x00003b88 - adds r4, r2 - mov r9, r4 - ldr r2, _080F2A50 @ =gSpriteTemplate_83E44F8 - mov r8, r2 - cmp r7, 0x3 - beq _080F2AC8 - ldr r4, _080F2A54 @ =gSpriteTemplate_83E44E0 - mov r8, r4 - b _080F2AC8 - .align 2, 0 -_080F2A44: .4byte 0x0000ffa0 -_080F2A48: .4byte gUnknown_083DFEC4 -_080F2A4C: .4byte 0x00003b88 -_080F2A50: .4byte gSpriteTemplate_83E44F8 -_080F2A54: .4byte gSpriteTemplate_83E44E0 -_080F2A58: - movs r3, 0x88 - lsls r3, 1 - ldr r0, _080F2A84 @ =gUnknown_083DFEC4 - ldr r2, [r0] - movs r1, 0xC3 - lsls r1, 2 - adds r0, r2, r1 - ldrh r1, [r0] - movs r0, 0x31 - subs r0, r1 - lsls r0, 16 - lsrs r0, 16 - ldr r4, _080F2A88 @ =0x0000fff8 - str r4, [sp] - movs r1, 0x98 - str r1, [sp, 0x4] - movs r1, 0x40 - ldr r4, _080F2A8C @ =gSpriteTemplate_83E44E0 - mov r8, r4 - ldr r4, _080F2A90 @ =0x00003b88 - b _080F2AC4 - .align 2, 0 -_080F2A84: .4byte gUnknown_083DFEC4 -_080F2A88: .4byte 0x0000fff8 -_080F2A8C: .4byte gSpriteTemplate_83E44E0 -_080F2A90: .4byte 0x00003b88 -_080F2A94: - ldr r0, _080F2B40 @ =gSpriteTemplate_83E4530 - mov r8, r0 -_080F2A98: - mov r1, r8 - cmp r1, 0 - bne _080F2AA2 - ldr r2, _080F2B44 @ =gSpriteTemplate_83E4548 - mov r8, r2 -_080F2AA2: - ldr r3, _080F2B48 @ =0x0000ffa0 - ldr r0, _080F2B4C @ =gUnknown_083DFEC4 - ldr r2, [r0] - movs r4, 0xC3 - lsls r4, 2 - adds r0, r2, r4 - ldrh r1, [r0] - movs r0, 0x44 - subs r0, r1 - lsls r0, 16 - lsrs r0, 16 - movs r1, 0x8 - str r1, [sp] - movs r4, 0x10 - str r4, [sp, 0x4] - movs r1, 0x20 - ldr r4, _080F2B50 @ =0x00003b90 -_080F2AC4: - adds r4, r2 - mov r9, r4 -_080F2AC8: - movs r6, 0 - lsls r1, 16 - str r1, [sp, 0x10] - lsls r3, 16 - str r3, [sp, 0x8] - lsls r0, 16 - str r0, [sp, 0xC] - ldr r0, _080F2B54 @ =gSprites - mov r10, r0 -_080F2ADA: - ldr r1, [sp, 0x10] - asrs r0, r1, 16 - adds r5, r6, 0 - muls r5, r0 - ldr r2, [sp, 0x8] - asrs r1, r2, 16 - adds r1, r5 - lsls r1, 16 - asrs r1, 16 - mov r0, r8 - ldr r3, [sp, 0xC] - asrs r2, r3, 16 - movs r3, 0 - bl CreateSprite - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0x40 - beq _080F2B9C - lsls r0, r4, 4 - adds r1, r0, r4 - lsls r1, 2 - mov r2, r10 - adds r3, r1, r2 - mov r1, sp - ldrh r1, [r1] - strh r1, [r3, 0x2E] - ldr r2, [sp, 0x4] - adds r1, r2, r5 - strh r1, [r3, 0x30] - strh r6, [r3, 0x32] - strh r7, [r3, 0x34] - adds r5, r0, 0 - cmp r7, 0x4 - bne _080F2B5C - cmp r6, 0x1 - bne _080F2B5C - ldr r0, _080F2B4C @ =gUnknown_083DFEC4 - ldr r0, [r0] - ldr r1, _080F2B58 @ =0x00006e90 - adds r0, r1 - ldrb r0, [r0] - movs r1, 0x2 - cmp r0, 0 - bne _080F2B36 - movs r1, 0x1 -_080F2B36: - adds r0, r3, 0 - bl StartSpriteAnim - b _080F2B6A - .align 2, 0 -_080F2B40: .4byte gSpriteTemplate_83E4530 -_080F2B44: .4byte gSpriteTemplate_83E4548 -_080F2B48: .4byte 0x0000ffa0 -_080F2B4C: .4byte gUnknown_083DFEC4 -_080F2B50: .4byte 0x00003b90 -_080F2B54: .4byte gSprites -_080F2B58: .4byte 0x00006e90 -_080F2B5C: - adds r0, r5, r4 - lsls r0, 2 - add r0, r10 - lsls r1, r6, 24 - lsrs r1, 24 - bl StartSpriteAnim -_080F2B6A: - ldr r2, _080F2BB8 @ =gSprites - mov r12, r2 - cmp r7, 0x3 - bhi _080F2B90 - cmp r6, 0x1 - bne _080F2B90 - adds r2, r5, r4 - lsls r2, 2 - add r2, r10 - ldrb r3, [r2, 0x1] - movs r1, 0x3F - adds r0, r1, 0 - ands r0, r3 - strb r0, [r2, 0x1] - ldrb r0, [r2, 0x3] - ands r1, r0 - movs r0, 0x80 - orrs r1, r0 - strb r1, [r2, 0x3] -_080F2B90: - lsls r1, r6, 2 - add r1, r9 - adds r0, r5, r4 - lsls r0, 2 - add r0, r12 - str r0, [r1] -_080F2B9C: - adds r0, r6, 0x1 - lsls r0, 16 - lsrs r6, r0, 16 - cmp r6, 0x1 - bls _080F2ADA -_080F2BA6: - add sp, 0x14 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080F2BB8: .4byte gSprites - thumb_func_end sub_80F29B8 - - thumb_func_start sub_80F2BBC -sub_80F2BBC: @ 80F2BBC - push {r4,lr} - adds r2, r0, 0 - ldrh r0, [r2, 0x20] - ldrh r1, [r2, 0x2E] - adds r3, r0, r1 - strh r3, [r2, 0x20] - lsls r0, 16 - asrs r4, r0, 16 - movs r0, 0x30 - ldrsh r1, [r2, r0] - cmp r4, r1 - bgt _080F2BE0 - lsls r0, r3, 16 - asrs r0, 16 - cmp r0, r1 - bge _080F2BE8 - cmp r4, r1 - blt _080F2C08 -_080F2BE0: - lsls r0, r3, 16 - asrs r0, 16 - cmp r0, r1 - bgt _080F2C08 -_080F2BE8: - ldrh r0, [r2, 0x30] - strh r0, [r2, 0x20] - movs r1, 0x34 - ldrsh r0, [r2, r1] - cmp r0, 0x4 - bne _080F2C04 - movs r1, 0x32 - ldrsh r0, [r2, r1] - cmp r0, 0x1 - bne _080F2C04 - ldr r0, _080F2C00 @ =sub_80F2C58 - b _080F2C06 - .align 2, 0 -_080F2C00: .4byte sub_80F2C58 -_080F2C04: - ldr r0, _080F2C10 @ =SpriteCallbackDummy -_080F2C06: - str r0, [r2, 0x1C] -_080F2C08: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080F2C10: .4byte SpriteCallbackDummy - thumb_func_end sub_80F2BBC - - thumb_func_start sub_80F2C14 -sub_80F2C14: @ 80F2C14 - push {r4,lr} - adds r4, r0, 0 - ldrh r0, [r4, 0x20] - ldrh r1, [r4, 0x2E] - subs r0, r1 - strh r0, [r4, 0x20] - adds r0, 0x20 - lsls r0, 16 - movs r1, 0x98 - lsls r1, 17 - cmp r0, r1 - bls _080F2C50 - movs r1, 0x32 - ldrsh r0, [r4, r1] - cmp r0, 0x1 - bne _080F2C4A - movs r1, 0x34 - ldrsh r0, [r4, r1] - cmp r0, 0x4 - bgt _080F2C44 - movs r0, 0x1 - bl FreeSpriteTilesByTag - b _080F2C4A -_080F2C44: - movs r0, 0x2 - bl FreeSpriteTilesByTag -_080F2C4A: - adds r0, r4, 0 - bl DestroySprite -_080F2C50: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_80F2C14 - - thumb_func_start sub_80F2C58 -sub_80F2C58: @ 80F2C58 - push {lr} - adds r2, r0, 0 - ldr r0, _080F2C78 @ =gUnknown_083DFEC4 - ldr r0, [r0] - ldr r1, _080F2C7C @ =0x00006e90 - adds r0, r1 - ldrb r0, [r0] - movs r1, 0x2 - cmp r0, 0 - bne _080F2C6E - movs r1, 0x1 -_080F2C6E: - adds r0, r2, 0 - bl StartSpriteAnim - pop {r0} - bx r0 - .align 2, 0 -_080F2C78: .4byte gUnknown_083DFEC4 -_080F2C7C: .4byte 0x00006e90 - thumb_func_end sub_80F2C58 - - thumb_func_start sub_80F2C80 -sub_80F2C80: @ 80F2C80 - push {r4,lr} - lsls r0, 24 - lsrs r4, r0, 24 - ldr r0, _080F2CB0 @ =gUnknown_083DFEC4 - ldr r0, [r0] - ldr r1, _080F2CB4 @ =0x00000306 - adds r2, r0, r1 - movs r1, 0 - strh r1, [r2] - ldr r1, _080F2CB8 @ =0x00006dac - adds r0, r1 - ldrb r0, [r0] - cmp r0, 0 - bne _080F2CA8 -_080F2C9C: - adds r0, r4, 0 - bl sub_80F2CBC - lsls r0, 24 - cmp r0, 0 - bne _080F2C9C -_080F2CA8: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080F2CB0: .4byte gUnknown_083DFEC4 -_080F2CB4: .4byte 0x00000306 -_080F2CB8: .4byte 0x00006dac - thumb_func_end sub_80F2C80 - - thumb_func_start sub_80F2CBC -sub_80F2CBC: @ 80F2CBC - push {r4,lr} - lsls r0, 24 - lsrs r1, r0, 24 - ldr r0, _080F2CD8 @ =gUnknown_083DFEC4 - ldr r0, [r0] - ldr r2, _080F2CDC @ =0x00000306 - adds r4, r0, r2 - ldrh r0, [r4] - cmp r0, 0 - beq _080F2CE0 - cmp r0, 0x1 - beq _080F2CF0 - b _080F2CFC - .align 2, 0 -_080F2CD8: .4byte gUnknown_083DFEC4 -_080F2CDC: .4byte 0x00000306 -_080F2CE0: - adds r0, r1, 0 - bl sub_80F27DC - ldrh r0, [r4] - adds r0, 0x1 - strh r0, [r4] - movs r0, 0x1 - b _080F2CFE -_080F2CF0: - adds r0, r1, 0 - bl sub_80F29B8 - ldrh r0, [r4] - adds r0, 0x1 - strh r0, [r4] -_080F2CFC: - movs r0, 0 -_080F2CFE: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_80F2CBC - - thumb_func_start sub_80F2D04 -sub_80F2D04: @ 80F2D04 - push {lr} - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x4 - bhi _080F2D3C - movs r1, 0 - ldr r0, _080F2D30 @ =gUnknown_083DFEC4 - ldr r0, [r0] - ldr r3, _080F2D34 @ =0x00003b88 - adds r2, r0, r3 - ldr r3, _080F2D38 @ =sub_80F2C14 -_080F2D1A: - lsls r0, r1, 2 - adds r0, r2, r0 - ldr r0, [r0] - str r3, [r0, 0x1C] - adds r0, r1, 0x1 - lsls r0, 16 - lsrs r1, r0, 16 - cmp r1, 0x1 - bls _080F2D1A - b _080F2D5A - .align 2, 0 -_080F2D30: .4byte gUnknown_083DFEC4 -_080F2D34: .4byte 0x00003b88 -_080F2D38: .4byte sub_80F2C14 -_080F2D3C: - movs r1, 0 - ldr r0, _080F2D60 @ =gUnknown_083DFEC4 - ldr r0, [r0] - ldr r3, _080F2D64 @ =0x00003b90 - adds r2, r0, r3 - ldr r3, _080F2D68 @ =sub_80F2C14 -_080F2D48: - lsls r0, r1, 2 - adds r0, r2, r0 - ldr r0, [r0] - str r3, [r0, 0x1C] - adds r0, r1, 0x1 - lsls r0, 16 - lsrs r1, r0, 16 - cmp r1, 0x1 - bls _080F2D48 -_080F2D5A: - pop {r0} - bx r0 - .align 2, 0 -_080F2D60: .4byte gUnknown_083DFEC4 -_080F2D64: .4byte 0x00003b90 -_080F2D68: .4byte sub_80F2C14 - thumb_func_end sub_80F2D04 - - thumb_func_start sub_80F2D6C -sub_80F2D6C: @ 80F2D6C - push {r4,r5,lr} - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x4 - bhi _080F2DA4 - movs r0, 0x1 - bl FreeSpriteTilesByTag - movs r4, 0 - ldr r0, _080F2D9C @ =gUnknown_083DFEC4 - ldr r0, [r0] - ldr r1, _080F2DA0 @ =0x00003b88 - adds r5, r0, r1 -_080F2D86: - lsls r0, r4, 2 - adds r0, r5, r0 - ldr r0, [r0] - bl DestroySprite - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 - cmp r4, 0x1 - bls _080F2D86 - b _080F2DC8 - .align 2, 0 -_080F2D9C: .4byte gUnknown_083DFEC4 -_080F2DA0: .4byte 0x00003b88 -_080F2DA4: - movs r0, 0x2 - bl FreeSpriteTilesByTag - movs r4, 0 - ldr r0, _080F2DD0 @ =gUnknown_083DFEC4 - ldr r0, [r0] - ldr r1, _080F2DD4 @ =0x00003b90 - adds r5, r0, r1 -_080F2DB4: - lsls r0, r4, 2 - adds r0, r5, r0 - ldr r0, [r0] - bl DestroySprite - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 - cmp r4, 0x1 - bls _080F2DB4 -_080F2DC8: - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080F2DD0: .4byte gUnknown_083DFEC4 -_080F2DD4: .4byte 0x00003b90 - thumb_func_end sub_80F2D6C - - thumb_func_start sub_80F2DD8 -sub_80F2DD8: @ 80F2DD8 - push {lr} - movs r0, 0x7 - movs r1, 0x7 - bl CreateRegionMapCursor - movs r0, 0x8 - movs r1, 0x8 - bl CreateRegionMapPlayerIcon - bl sub_80FBF94 - pop {r0} - bx r0 - thumb_func_end sub_80F2DD8 - - thumb_func_start sub_80F2DF4 -sub_80F2DF4: @ 80F2DF4 - push {lr} - bl FreeRegionMapIconResources - pop {r0} - bx r0 - thumb_func_end sub_80F2DF4 - - thumb_func_start sub_80F2E00 -sub_80F2E00: @ 80F2E00 - ldr r1, _080F2E10 @ =gUnknown_083DFEC4 - ldr r1, [r1] - ldr r2, _080F2E14 @ =0x00008766 - adds r1, r2 - ldrh r1, [r1] - adds r1, 0x26 - strh r1, [r0, 0x20] - bx lr - .align 2, 0 -_080F2E10: .4byte gUnknown_083DFEC4 -_080F2E14: .4byte 0x00008766 - thumb_func_end sub_80F2E00 - - thumb_func_start sub_80F2E18 -sub_80F2E18: @ 80F2E18 - push {r4-r7,lr} - mov r7, r8 - push {r7} - sub sp, 0x28 - lsls r0, 24 - lsrs r3, r0, 24 - ldr r0, _080F2EA8 @ =gUnknown_083DFEC4 - ldr r4, [r0] - ldr r0, _080F2EAC @ =0x00008768 - adds r7, r4, r0 - ldr r1, [r7] - mov r8, r1 - cmp r1, 0 - bne _080F2EFC - ldr r0, _080F2EB0 @ =gUnknown_083E4568 - ldr r1, [r0, 0x4] - ldr r0, [r0] - str r0, [sp, 0x20] - str r1, [sp, 0x24] - mov r1, sp - ldr r0, _080F2EB4 @ =gSpriteTemplate_83E4570 - ldm r0!, {r2,r5,r6} - stm r1!, {r2,r5,r6} - ldm r0!, {r2,r5,r6} - stm r1!, {r2,r5,r6} - ldr r0, _080F2EB8 @ =gUnknown_083E4588 - ldr r1, [r0, 0x4] - ldr r0, [r0] - str r0, [sp, 0x18] - str r1, [sp, 0x1C] - lsls r0, r3, 13 - ldr r1, _080F2EBC @ =0x0000d1e4 - adds r0, r1 - adds r0, r4, r0 - str r0, [sp, 0x20] - lsls r0, r3, 7 - adds r0, r4, r0 - str r0, [sp, 0x18] - add r0, sp, 0x18 - bl LoadSpritePalette - lsls r0, 24 - lsrs r0, 24 - ldr r2, _080F2EC0 @ =0x0000d1dc - adds r5, r4, r2 - strh r0, [r5] - add r0, sp, 0x20 - bl LoadSpriteSheet - ldr r1, _080F2EC4 @ =0x0000d1de - adds r6, r4, r1 - strh r0, [r6] - mov r0, sp - movs r1, 0x26 - movs r2, 0x68 - movs r3, 0 - bl CreateSprite - lsls r0, 24 - lsrs r1, r0, 24 - cmp r1, 0x40 - bne _080F2EC8 - movs r0, 0x6 - bl FreeSpriteTilesByTag - movs r0, 0x6 - bl FreeSpritePaletteByTag - mov r2, r8 - str r2, [r7] - b _080F2F26 - .align 2, 0 -_080F2EA8: .4byte gUnknown_083DFEC4 -_080F2EAC: .4byte 0x00008768 -_080F2EB0: .4byte gUnknown_083E4568 -_080F2EB4: .4byte gSpriteTemplate_83E4570 -_080F2EB8: .4byte gUnknown_083E4588 -_080F2EBC: .4byte 0x0000d1e4 -_080F2EC0: .4byte 0x0000d1dc -_080F2EC4: .4byte 0x0000d1de -_080F2EC8: - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - ldr r1, _080F2EF0 @ =gSprites - adds r0, r1 - str r0, [r7] - ldr r0, _080F2EF4 @ =0x0000d1e0 - adds r1, r4, r0 - ldrh r0, [r6] - lsls r0, 5 - ldr r2, _080F2EF8 @ =0x06010000 - adds r0, r2 - str r0, [r1] - ldrh r0, [r5] - lsls r0, 4 - movs r6, 0x80 - lsls r6, 1 - adds r0, r6 - strh r0, [r5] - b _080F2F26 - .align 2, 0 -_080F2EF0: .4byte gSprites -_080F2EF4: .4byte 0x0000d1e0 -_080F2EF8: .4byte 0x06010000 -_080F2EFC: - lsls r0, r3, 13 - ldr r1, _080F2F34 @ =0x0000d1e4 - adds r0, r1 - adds r0, r4, r0 - ldr r2, _080F2F38 @ =0x0000d1e0 - adds r1, r4, r2 - ldr r2, [r1] - ldr r1, _080F2F3C @ =0x040000d4 - str r0, [r1] - str r2, [r1, 0x4] - ldr r0, _080F2F40 @ =0x80000400 - str r0, [r1, 0x8] - ldr r0, [r1, 0x8] - lsls r0, r3, 7 - adds r0, r4, r0 - ldr r5, _080F2F44 @ =0x0000d1dc - adds r1, r4, r5 - ldrh r1, [r1] - movs r2, 0x20 - bl LoadPalette -_080F2F26: - add sp, 0x28 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080F2F34: .4byte 0x0000d1e4 -_080F2F38: .4byte 0x0000d1e0 -_080F2F3C: .4byte 0x040000d4 -_080F2F40: .4byte 0x80000400 -_080F2F44: .4byte 0x0000d1dc - thumb_func_end sub_80F2E18 - - thumb_func_start sub_80F2F48 -sub_80F2F48: @ 80F2F48 - push {r4,lr} - ldr r0, _080F2F74 @ =gUnknown_083DFEC4 - ldr r0, [r0] - ldr r1, _080F2F78 @ =0x00008768 - adds r4, r0, r1 - ldr r0, [r4] - cmp r0, 0 - beq _080F2F6C - bl DestroySprite - movs r0, 0x6 - bl FreeSpriteTilesByTag - movs r0, 0x6 - bl FreeSpritePaletteByTag - movs r0, 0 - str r0, [r4] -_080F2F6C: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080F2F74: .4byte gUnknown_083DFEC4 -_080F2F78: .4byte 0x00008768 - thumb_func_end sub_80F2F48 - - thumb_func_start sub_80F2F7C -sub_80F2F7C: @ 80F2F7C - push {lr} - lsls r0, 24 - lsrs r0, 24 - bl sub_80F2E18 - ldr r0, _080F2FA0 @ =gUnknown_083DFEC4 - ldr r0, [r0] - ldr r1, _080F2FA4 @ =0x0000ced0 - adds r2, r0, r1 - ldr r1, _080F2FA8 @ =0x00008768 - adds r0, r1 - ldr r1, [r0] - str r1, [r2] - ldr r0, _080F2FAC @ =sub_80F2FEC - str r0, [r1, 0x1C] - pop {r0} - bx r0 - .align 2, 0 -_080F2FA0: .4byte gUnknown_083DFEC4 -_080F2FA4: .4byte 0x0000ced0 -_080F2FA8: .4byte 0x00008768 -_080F2FAC: .4byte sub_80F2FEC - thumb_func_end sub_80F2F7C - - thumb_func_start sub_80F2FB0 -sub_80F2FB0: @ 80F2FB0 - push {r4,r5,lr} - ldr r0, _080F2FE0 @ =gUnknown_083DFEC4 - ldr r5, [r0] - ldr r0, _080F2FE4 @ =0x0000ced0 - adds r4, r5, r0 - ldr r0, [r4] - cmp r0, 0 - beq _080F2FDA - bl DestroySprite - movs r0, 0x6 - bl FreeSpriteTilesByTag - movs r0, 0x6 - bl FreeSpritePaletteByTag - movs r1, 0 - str r1, [r4] - ldr r2, _080F2FE8 @ =0x00008768 - adds r0, r5, r2 - str r1, [r0] -_080F2FDA: - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080F2FE0: .4byte gUnknown_083DFEC4 -_080F2FE4: .4byte 0x0000ced0 -_080F2FE8: .4byte 0x00008768 - thumb_func_end sub_80F2FB0 - - thumb_func_start sub_80F2FEC -sub_80F2FEC: @ 80F2FEC - ldr r1, _080F3000 @ =gUnknown_083DFEC4 - ldr r1, [r1] - ldr r2, _080F3004 @ =0x0000d15a - adds r1, r2 - ldrh r1, [r1] - adds r1, 0x28 - strh r1, [r0, 0x20] - movs r1, 0x68 - strh r1, [r0, 0x22] - bx lr - .align 2, 0 -_080F3000: .4byte gUnknown_083DFEC4 -_080F3004: .4byte 0x0000d15a - thumb_func_end sub_80F2FEC - - thumb_func_start sub_80F3008 -sub_80F3008: @ 80F3008 - push {r4,r5,lr} - sub sp, 0x20 - lsls r0, 24 - lsrs r2, r0, 24 - mov r1, sp - ldr r0, _080F3060 @ =gUnknown_083E4590 - ldm r0!, {r3-r5} - stm r1!, {r3-r5} - ldm r0!, {r3-r5} - stm r1!, {r3-r5} - ldr r0, _080F3064 @ =gUnknown_083E45A8 - ldr r1, [r0, 0x4] - ldr r0, [r0] - str r0, [sp, 0x18] - str r1, [sp, 0x1C] - cmp r2, 0x2 - bgt _080F3032 - cmp r2, 0x1 - blt _080F3032 - ldr r0, _080F3068 @ =gUnknown_08E9F988 - str r0, [sp, 0x18] -_080F3032: - mov r0, sp - bl LoadSpriteSheets - add r0, sp, 0x18 - bl LoadSpritePalette - ldr r0, _080F306C @ =gSpriteTemplate_83E45B8 - movs r1, 0x5F - movs r2, 0 - movs r3, 0 - bl CreateSprite - lsls r0, 24 - lsrs r1, r0, 24 - cmp r1, 0x40 - bne _080F3078 - ldr r0, _080F3070 @ =gUnknown_083DFEC4 - ldr r0, [r0] - ldr r1, _080F3074 @ =0x000087cc - adds r0, r1 - movs r1, 0 - str r1, [r0] - b _080F3120 - .align 2, 0 -_080F3060: .4byte gUnknown_083E4590 -_080F3064: .4byte gUnknown_083E45A8 -_080F3068: .4byte gUnknown_08E9F988 -_080F306C: .4byte gSpriteTemplate_83E45B8 -_080F3070: .4byte gUnknown_083DFEC4 -_080F3074: .4byte 0x000087cc -_080F3078: - ldr r0, _080F30F4 @ =gUnknown_083DFEC4 - ldr r2, [r0] - ldr r3, _080F30F8 @ =0x000087cc - adds r2, r3 - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - ldr r1, _080F30FC @ =gSprites - adds r0, r1 - str r0, [r2] - movs r4, 0 - movs r5, 0 -_080F3090: - lsls r2, r4, 7 - adds r2, 0x8 - lsls r2, 16 - asrs r2, 16 - ldr r0, _080F3100 @ =gSpriteTemplate_83E45F0 - movs r1, 0xA8 - movs r3, 0 - bl CreateSprite - lsls r0, 24 - lsrs r1, r0, 24 - cmp r1, 0x40 - beq _080F3108 - ldr r0, _080F30F4 @ =gUnknown_083DFEC4 - ldr r2, [r0] - lsls r0, r4, 2 - ldr r3, _080F3104 @ =0x000087d0 - adds r2, r3 - adds r2, r0 - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - ldr r1, _080F30FC @ =gSprites - adds r3, r0, r1 - str r3, [r2] - adds r2, r3, 0 - adds r2, 0x3E - ldrb r0, [r2] - movs r1, 0x4 - orrs r0, r1 - strb r0, [r2] - strh r5, [r3, 0x2E] - strh r5, [r3, 0x30] - movs r0, 0x1 - cmp r4, 0 - bne _080F30DE - movs r1, 0x1 - negs r1, r1 - adds r0, r1, 0 -_080F30DE: - strh r0, [r3, 0x32] - strh r4, [r3, 0x34] - movs r0, 0x1 - strh r0, [r3, 0x36] - lsls r1, r4, 24 - lsrs r1, 24 - adds r0, r3, 0 - bl StartSpriteAnim - b _080F3116 - .align 2, 0 -_080F30F4: .4byte gUnknown_083DFEC4 -_080F30F8: .4byte 0x000087cc -_080F30FC: .4byte gSprites -_080F3100: .4byte gSpriteTemplate_83E45F0 -_080F3104: .4byte 0x000087d0 -_080F3108: - ldr r0, _080F3128 @ =gUnknown_083DFEC4 - ldr r0, [r0] - lsls r1, r4, 2 - ldr r2, _080F312C @ =0x000087d0 - adds r0, r2 - adds r0, r1 - str r5, [r0] -_080F3116: - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 - cmp r4, 0x1 - bls _080F3090 -_080F3120: - add sp, 0x20 - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080F3128: .4byte gUnknown_083DFEC4 -_080F312C: .4byte 0x000087d0 - thumb_func_end sub_80F3008 - thumb_func_start sub_80F3130 sub_80F3130: @ 80F3130 push {r4-r6,lr} diff --git a/include/pokenav.h b/include/pokenav.h index 0abed5c63..22fa0ac0c 100644 --- a/include/pokenav.h +++ b/include/pokenav.h @@ -29,37 +29,60 @@ struct UnkPokenavStruct_Sub1 { /*0x66*/ s16 unk66[5]; }; -struct UnkPokenavStruct_Sub2 { - /*0x00*/ u8 filler_00[0x26]; - /*0x26*/ u16 unk26; -}; - struct UnkPokenavStruct_Sub3 { /*0x00*/s16 unk0; }; struct UnkUsePokeblockSub { /*0x0*/ u8 unk0; - /*0x1*/ u8 filler1[1]; + /*0x1*/ u8 unk1; /*0x2*/ u8 partyIdx:5; /*0x2*/ u16 unk2:9; + /*0x3*/ u8 unk4:1; }; struct UnkPokenavStruct { - /*0x0000*/ u8 filler0000[0x306]; + /*0x0000*/ u16 unk0[6][0x40]; + /*0x0300*/ u8 filler0300[0x6]; /*0x0306*/ u16 unk306; /*0x0306*/ u8 filler0308[0x4]; - /*0x030C*/ union { // TODO: what? - u16 val; - struct UnkPokenavStruct_Sub3 unk030C; - } unk030C; - /*0x0310*/ u8 filler030E[0x6a90]; + /*0x030C*/ s16 unk030C; + /*0x030E*/ s8 unk30E; + /*0x030F*/ u8 unk30F; + /*0x0310*/ u8 filler0310[0x1]; + /*0x0311*/ u8 unk311; + /*0x0312*/ u16 unk312; + /*0x0314*/ u16 unk314[6]; + /*0x0320*/ struct Sprite *unk320[6][4]; + /*0x0380*/ struct SpriteSheet unk380; + /*0x0388*/ u8 unk388[0x1400]; + /*0x1788*/ u8 unk1788[0xC00]; + /*0x2388*/ u8 unk2388[0x1800]; + /*0x3B88*/ struct Sprite *unk3B88[2]; + /*0x3B90*/ struct Sprite *unk3B90[2]; + /*0x3B98*/ u8 unk3B98[0x600]; + /*0x4198*/ u8 unk4198[0x600]; + /*0x4798*/ u8 unk4798[0x600]; + /*0x4D98*/ u8 unk4D98[0x600]; + /*0x5398*/ u8 unk5398[0xC00]; + /*0x5F98*/ u8 unk5F98[0x200]; + /*0x6198*/ u8 unk6198[0x200]; + /*0x6398*/ u8 unk6398[0x200]; + /*0x6598*/ u8 unk6598[0x200]; + /*0x6798*/ u8 unk6798[0x200]; + /*0x6998*/ u8 unk6998[0x200]; + /*0x6B98*/ u8 unk6B98[0x200]; + /*0x6D98*/ u8 filler6B98[0x4]; + /*0x6D9C*/ struct Sprite *unk6D9C; /*0x6DA0*/ u16 unk6DA0; /*0x6DA2*/ u16 unk6DA2; /*0x6DA4*/ u16 taskId6DA4; /*0x6DA6*/ u8 filler6DA6[0x6]; /*0x6DAC*/ u8 unk6DAC; - /*0x6DAD*/ u8 filler6DAD[0x6B]; + /*0x6DAD*/ s8 unk6DAD; + /*0x6DAE*/ s8 unk6DAE; + /*0x6DAF*/ u8 filler6DAF[0x3]; + /*0x6DB2*/ u8 unk6DB2[0x66]; /*0x6E18*/ struct RegionMap regionMap; /*0x7698*/ u16 unk7698; /*0x769A*/ u16 unk769A; @@ -70,7 +93,8 @@ struct UnkPokenavStruct { /*0x76AA*/ u8 unk76AA; /*0x76AB*/ u8 filler76AB[0x10b9]; /*0x8764*/ u16 unk8764; - /*0x8768*/ struct UnkPokenavStruct_Sub2 *unk8768; + /*0x8766*/ s16 unk8766; + /*0x8768*/ struct Sprite *unk8768; /*0x876C*/ s16 unk876C; /*0x876E*/ s16 unk876E; /*0x8770*/ s16 unk8770; @@ -89,7 +113,9 @@ struct UnkPokenavStruct { /*0x87C8*/ u8 unk87C8; /*0x87C9*/ u8 filler87C9; /*0x87CA*/ u8 unk87CA; - /*0x87CB*/ u8 filler87CB[0xF]; + /*0x87CC*/ struct Sprite *unk87CC; + /*0x87D0*/ struct Sprite *unk87D0[2]; + /*0x87D8*/ u8 filler87D8[0x2]; /*0x87DA*/ s16 unk87DA; /*0x87DC*/ s16 unk87DC; /*0x87DE*/ s16 unk87DE; @@ -124,18 +150,25 @@ struct UnkPokenavStruct { /*0xCE4E*/ u16 unkCE4E; /*0xCE50*/ u16 unkCE50; /*0xCE52*/ u16 palettesCE52[30]; - /*0xCE8E*/ u16 palettesCE8E[0x2D]; + /*0xCE8E*/ u16 palettesCE8E[0x21]; + /*0xCED0*/ struct Sprite *unkCED0; + /*0xCED4*/ u8 fillerCED4[0x14]; /*0xCEE8*/ struct UnkPokenavStruct_Sub unkCEE8[69]; /*0xD110*/ const u8 *trainerEyeDescriptionLines[4]; /*0xD120*/ u8 fillerD114[0x18]; /*0xD138*/ u8 unkD138[0x20]; /*0xD158*/ u16 unkD158; - /*0xD15A*/ u8 fillerD15A[2]; + /*0xD15A*/ u16 unkD15A; /*0xD15C*/ u16 unkD15C; /*0xD15E*/ u8 fillerD15E[2]; /*0xD160*/ u16 unkD160; /*0xD162*/ u8 unkD162; /*0xD164*/ struct UnkPokenavStruct_Sub1 unkD164; + /*0xD1D4*/ u8 fillerD1D4[0x8]; + /*0xD1DC*/ u16 unkD1DC; + /*0xD1DE*/ u16 unkD1DE; + /*0xD1E0*/ u8 *unkD1E0; + /*0xD1E4*/ u8 unkD1E4[2][0x2000]; }; extern struct UnkPokenavStruct *const gUnknown_083DFEC4; diff --git a/include/region_map.h b/include/region_map.h index 4c10d84cb..7ded72e49 100644 --- a/include/region_map.h +++ b/include/region_map.h @@ -78,6 +78,7 @@ const u8 *CopyLocationName(u8 *dest, u16 b); void CB2_InitFlyRegionMap(void); void debug_sub_8110F28(void); u16 GetRegionMapSectionAt_(u16 x, u16 y); +void sub_80FBF94(void); extern const struct RegionMapLocation gRegionMapLocations[]; diff --git a/include/use_pokeblock.h b/include/use_pokeblock.h index 978476d89..025a135a4 100644 --- a/include/use_pokeblock.h +++ b/include/use_pokeblock.h @@ -9,5 +9,6 @@ extern void *gUnknown_02030400; extern s16 gUnknown_02039312; void sub_8136130(struct Pokeblock *, MainCallback); +u8 sub_8137124(u8); #endif //POKERUBY_USE_POKEBLOCK_H diff --git a/src/pokenav_before.c b/src/pokenav_before.c index b33fa588c..0ce246ebd 100644 --- a/src/pokenav_before.c +++ b/src/pokenav_before.c @@ -19,8 +19,11 @@ #include "sound.h" #include "task.h" #include "text.h" +#include "trig.h" #include "scanline_effect.h" #include "pokemon_storage_system.h" +#include "pokemon_summary_screen.h" +#include "use_pokeblock.h" #include "constants/game_stat.h" struct UnknownPokenav0 @@ -139,6 +142,7 @@ extern const u16 gPokenavHoennMap1_Pal[]; extern void (*const gUnknown_083E3270[])(u16, u16); extern const u8 gUnknown_083E039C[]; extern const u8 gUnknown_083E03A0[]; +extern const u8 gUnknown_083E01F4[]; extern const u8 *const gTrainerEyeDescriptions[]; extern const u8 gUnknown_08E9FBA0[]; extern const u8 gPokenavRibbonView_Gfx[]; @@ -149,8 +153,47 @@ extern const u16 gUnknown_083E3C60[]; extern const u16 gPokenavRibbonsIconGfx[][2]; extern const u8 *const gRibbonDescriptions[][2]; extern const u8 *const gGiftRibbonDescriptions[][2]; +extern const u8 gUnknown_08E9FF58[]; +extern const u8 gPokenavRibbonPokeView_Gfx[]; +extern const u16 gUnknown_083E0124[]; +extern const u16 gUnknown_083E0144[]; +extern const u8 gPokenavMenuOptions_Gfx[]; +extern const u8 gPokenavConditionMenu_Gfx[]; +extern const u8 gPokenavConditionSearch_Gfx[]; +extern const struct SpriteTemplate gSpriteTemplate_83E4454; +extern const union AffineAnimCmd *const gSpriteAffineAnimTable_83E4450[]; +extern const u16 gUnknown_083E42F8[]; +extern const u16 gPokenavMenuOptions1_Pal[]; +extern const u16 gPokenavMenuOptions2_Pal[]; +extern const u16 gPokenavConditionMenu_Pal[]; +extern const u16 gPokenavCondition6_Pal[]; +extern const u16 gPokenavCondition7_Pal[]; +extern const struct SpriteSheet gSpriteSheet_PokenavBlueLight; +extern const struct SpritePalette gSpritePalette_PokenavBlueLight; +extern const struct SpriteTemplate gSpriteTemplate_83E4484; +extern const u8 gPokenavMainMenu_Gfx[]; +extern const u8 gPokenavConditionMenuHeader_Gfx[]; +extern const u8 gPokenavRibbonsHeader_Gfx[]; +extern const u8 gPokenavHoennMapHeader_Gfx[]; +extern const u8 gPokenavConditionMenuOptions_Gfx[]; +extern const u8 gPokenavConditionMenuOptions2_Gfx[]; +extern const u8 gPokenavTrainersEyesHeader_Gfx[]; +extern const struct SpritePalette gUnknown_083E449C[]; +extern const struct SpriteTemplate gSpriteTemplate_83E4530; +extern const struct SpriteTemplate gSpriteTemplate_83E4548; +extern const struct SpriteTemplate gSpriteTemplate_83E44E0; +extern const struct SpriteTemplate gSpriteTemplate_83E44F8; +extern const struct SpriteSheet gUnknown_083E4568; +extern const struct SpriteTemplate gSpriteTemplate_83E4570; +extern const struct SpritePalette gUnknown_083E4588; +extern const struct SpriteSheet gUnknown_083E4590[3]; +extern const struct SpritePalette gUnknown_083E45A8; +extern const u16 gUnknown_08E9F988[]; +extern const struct SpriteTemplate gSpriteTemplate_83E45B8; +extern const struct SpriteTemplate gSpriteTemplate_83E45F0; extern u16 gUnknown_020388B4; +extern u8 gUnknown_020388B0[]; // TODO: decompile the debug code so the compiler doesn't complain about @@ -215,24 +258,61 @@ static void sub_80F0FA0(void); static bool8 sub_80F0FEC(void); static bool8 sub_80F0718(void); void sub_80F0FFC(u8); -void sub_80F19DC(u8*); +static void sub_80F19DC(u8*); static bool8 sub_80F1080(void); void sub_80F1614(void); void DrawMonRibbonIcons(void); void sub_80F13FC(void); void sub_80F1438(void); static void sub_80F1494(void); +bool8 sub_80F162C(u8); +void sub_80F01E0(u16); +static void sub_80F19FC(void); +static void sub_80F1A74(void); +static void sub_80F1A80(void); +static void sub_80F1A90(void); +static bool8 sub_80F1AC4(void); +static void sub_80F1B8C(u8); +static bool8 sub_80F1BC8(u8); +static void sub_80F2458(u8); +static void sub_80F2514(u8); +static void sub_80F1DF0(void); +static void sub_80F2218(struct Sprite *sprite); +static bool8 sub_80F1E50(void); +static bool8 sub_80F22F8(void); +static void sub_80F2108(void); +static bool8 sub_80F1E6C(void); +static void sub_80F1E84(void); +static void sub_80F2148(void); +static void sub_80F2240(struct Sprite *sprite); +static bool8 sub_80F1F10(void); +static bool8 sub_80F2360(void); +static void sub_80F2170(void); +static bool8 sub_80F23C8(void); +static void sub_80F21F8(void); +static void sub_80F1FF0(void); +static void sub_80F208C(void); +static void sub_80F22B0(struct Sprite *sprite); +static void sub_80F240C(struct Sprite *sprite); +static void sub_80F2598(void); +static void sub_80F2620(void); +static bool8 sub_80F26BC(void); +static void sub_80F2C58(struct Sprite *sprite); +static void sub_80F2D04(u8); +static void sub_80F2D6C(u8); +static void sub_80F2DD8(void); +static void sub_80F2DF4(void); +static void sub_80F2FEC(struct Sprite *sprite); +static void sub_80F2FB0(void); +static void sub_80F3008(u8); extern void sub_80F0900(void); extern void sub_80F443C(u8 *, u16); -extern bool8 sub_80F162C(u8); -extern void sub_80F01E0(u16); extern void sub_80F01A4(void); extern void sub_80EFD3C(void); extern void sub_8095C8C(); extern void sub_80EFDA0(void); extern void sub_80EFD74(void); -extern void sub_80F1A80(void); extern bool8 sub_80EFC64(void); extern void sub_80EFC3C(void); extern void sub_80EF624(const u16 *, const u16 *, u8, u8, u16 *); @@ -245,7 +325,6 @@ extern void sub_80F6FB8(); extern void sub_80F6DB8(); extern bool8 sub_80F6E9C(); extern bool8 sub_80F6ED4(); -extern void sub_80F2FB0(); extern bool8 sub_80F70FC(); extern void sub_80F708C(u32); extern void sub_80F4394(); @@ -276,56 +355,35 @@ extern void sub_80F4D44(); extern bool8 sub_80F4D88(); extern void sub_80F0264(u8); extern bool8 sub_80F02A0(); -extern void sub_80F3008(); extern void sub_80F3130(); -extern void sub_80F2D6C(u32); -extern bool8 sub_80F1E6C(); extern void sub_80EF9F8(void); extern bool8 sub_80EFBDC(bool8); extern void sub_80EFBB0(void); -extern void sub_80F2DF4(); -extern void sub_80F1E84(); -extern bool8 sub_80F1F10(); extern void sub_80EEFBC(u8); -extern void sub_80F2620(); extern void sub_80EF814(void); extern void sub_80EF840(void); extern bool8 sub_80EF874(void); -extern void sub_80F2DD8(); extern bool8 sub_80F6250(); extern void sub_80F6208(); -extern void sub_80F208C(); extern void sub_80F6C20(); extern void sub_80F3FF0(); extern bool8 sub_80F4024(); -extern void sub_80F2598(); extern void sub_80EF248(u8); extern bool8 sub_80EF284(u8); -extern void sub_80F1B8C(); -extern bool8 sub_80F1BC8(u32 unk); -extern void sub_80F1DF0(); -extern bool8 sub_80F1E50(); extern void sub_80EF428(u8, u8); extern bool8 sub_80EEF78(); -extern void sub_80F1A90(); -extern void sub_80F2D04(u32); -extern bool8 sub_80F1AC4(); extern void sub_80F36F0(); extern bool8 sub_80F3724(); extern void sub_80EBC10(); extern void sub_80EBDBC(void (*func)(void)); extern void sub_80EBBE8(); -extern bool8 sub_80F26BC(void); extern void sub_80EBDD8(); extern void sub_80EBD90(); extern void sub_80EBD18(); -extern void sub_80F1A74(); -extern void sub_80F1FF0(); extern void sub_80FB260(); extern void sub_80EFE7C(void); extern void sub_80F5BF0(); extern void sub_80F6F64(); -extern void sub_80F19FC(); extern u16 gKeyRepeatStartDelay; @@ -1225,11 +1283,11 @@ void sub_80ECD80() ewram0_10.var304++; break; case 9: - sub_80F1B8C(0x2); + sub_80F1B8C(2); ewram0_10.var304++; // fall through case 10: - if (!sub_80F1BC8(0x2)) + if (!sub_80F1BC8(2)) ewram0_10.var304++; break; case 11: @@ -3693,7 +3751,7 @@ bool8 sub_80EEE54(void) sub_80EF58C(2); break; case 4: - gUnknown_083DFEC4->unk030C.unk030C.unk0 = 0; + gUnknown_083DFEC4->unk030C = 0; REG_BG1HOFS = 0; REG_BG1VOFS = 0; REG_BG1CNT = 0x1B0C; @@ -3709,17 +3767,17 @@ bool8 sub_80EEF34(void) { bool8 retVal = TRUE; - if (gUnknown_083DFEC4->unk030C.unk030C.unk0 == 32) + if (gUnknown_083DFEC4->unk030C == 32) return FALSE; - gUnknown_083DFEC4->unk030C.unk030C.unk0 += 2; - if (gUnknown_083DFEC4->unk030C.unk030C.unk0 > 31) + gUnknown_083DFEC4->unk030C += 2; + if (gUnknown_083DFEC4->unk030C > 31) { - gUnknown_083DFEC4->unk030C.unk030C.unk0 = 32; + gUnknown_083DFEC4->unk030C = 32; retVal = FALSE; } - REG_BG1VOFS = gUnknown_083DFEC4->unk030C.unk030C.unk0; + REG_BG1VOFS = gUnknown_083DFEC4->unk030C; return retVal; } @@ -3727,17 +3785,17 @@ bool8 sub_80EEF78(void) { bool8 retVal = TRUE; - if (gUnknown_083DFEC4->unk030C.unk030C.unk0 == 0) + if (gUnknown_083DFEC4->unk030C == 0) return FALSE; - gUnknown_083DFEC4->unk030C.unk030C.unk0 -= 2; - if (gUnknown_083DFEC4->unk030C.unk030C.unk0 <= 0) + gUnknown_083DFEC4->unk030C -= 2; + if (gUnknown_083DFEC4->unk030C <= 0) { - gUnknown_083DFEC4->unk030C.unk030C.unk0 = 0; + gUnknown_083DFEC4->unk030C = 0; retVal = FALSE; } - REG_BG1VOFS = gUnknown_083DFEC4->unk030C.unk030C.unk0; + REG_BG1VOFS = gUnknown_083DFEC4->unk030C; return retVal; } @@ -4560,7 +4618,7 @@ bool8 sub_80EFF68(void) sub_80F01A4(); break; case 12: - sub_80F01E0((u16)gUnknown_083DFEC4->unk8fe9); + sub_80F01E0(gUnknown_083DFEC4->unk8fe9); break; case 13: REG_BG3CNT = 0x1E03; @@ -5604,3 +5662,1414 @@ void sub_80F1614(void) { gUnknown_083DFEC4->unk8764 = 0; } + +bool8 sub_80F162C(u8 arg0) +{ + switch (gUnknown_083DFEC4->unk8764) + { + case 0: + break; + case 1: + LZ77UnCompVram(gUnknown_08E9FF58, (void *)(VRAM + 0xE800)); + break; + case 2: + DmaCopy16Defvars(3, gPokenavRibbonPokeView_Gfx, (void *)(VRAM + 0xE000), 0xE0); + break; + case 3: + if (!arg0) + LoadPalette(gUnknown_083E0124, 0xD0, 0x20); + else + LoadPalette(gUnknown_083E0144, 0xD0, 0x20); + + gUnknown_083DFEC4->unk8766 = -80; + REG_BG0CNT = 0x1D0D; + gUnknown_083DFEC4->unk8764++; + return FALSE; + default: + return FALSE; + } + + gUnknown_083DFEC4->unk8764++; + return TRUE; +} + +bool8 sub_80F170C(void) +{ + gUnknown_083DFEC4->unk8766 += 0x10; + if (gUnknown_083DFEC4->unk8766 > 0) + gUnknown_083DFEC4->unk8766 = 0; + + return gUnknown_083DFEC4->unk8766 != 0; +} + +bool8 sub_80F173C(void) +{ + gUnknown_083DFEC4->unk8766 -= 0x10; + if (gUnknown_083DFEC4->unk8766 < -0x50) + gUnknown_083DFEC4->unk8766 = -0x50; + + return gUnknown_083DFEC4->unk8766 != -0x50; +} + +bool8 sub_80F1778(void) +{ + switch (gUnknown_083DFEC4->unkD160) + { + case 0: + sub_80EEDE8(); + gUnknown_083DFEC4->unkD162 = 2; + break; + case 1: + sub_80F1614(); + break; + case 2: + if (sub_80F162C(0)) + return TRUE; + break; + case 3: + LZ77UnCompVram(gPokenavConditionView_Gfx, (void *)(VRAM + 0x5000)); + break; + case 4: + LZ77UnCompVram(gUnknown_08E9AC4C, (void *)(VRAM + 0xF000)); + LoadPalette(gPokenavConditionMenu2_Pal, 0x20, 0x20); + break; + case 5: + sub_8095C8C((void *)VRAM + 0xF000, 0, 13, gUnknown_083E01F4, 0, 0, 12, 4, 12); + break; + case 6: + LZ77UnCompVram(gUnknown_08E9FEB4, (void *)(VRAM + 0xB800)); + break; + case 7: + LoadPalette(gUnknown_083E0254, 0x30, 0x20); + LoadPalette(gUnknownPalette_81E6692, 0xB0, 0x20); + LoadPalette(&gPokenavConditionMenu2_Pal[2], 0xB1, 0x2); + LoadPalette(&gPokenavConditionMenu2_Pal[16], 0xB5, 0x2); + LoadPalette(&gPokenavConditionMenu2_Pal[30], 0xBF, 0x2); + sub_80F01A4(); + break; + case 8: + sub_80F01E0(gUnknown_083DFEC4->unk8fe9); + break; + case 9: + REG_BG3CNT = 0x1E03; + REG_BG2CNT = 0x1702; + REG_BLDCNT = 0x844; + REG_BLDALPHA = 0x40B; + break; + default: + return FALSE; + } + + gUnknown_083DFEC4->unkD160++; + return TRUE; +} + +void sub_80F1934(void) +{ + u8 *buffer = gUnknown_083DFEC4->unk8788; + if (gUnknown_083DFEC4->unk893c[gUnknown_083DFEC4->unk87DC].unk4) + { + u8 nature = GetNature(&gPlayerParty[sub_8137124(gUnknown_083DFEC4->unk87DC)]); + buffer = StringCopy(buffer, gOtherText_Nature2); + AlignStringInMenuWindow(buffer, gNatureNames[nature], 87, 0); + } + else + { + AlignStringInMenuWindow(buffer, gEmptyString_81E72B0, 87, 0); + } + + Menu_PrintTextPixelCoords(gUnknown_083DFEC4->unk8788, 1, 112, 1); +} + +static void sub_80F19DC(u8 *text) +{ + while (text[0] != EOS) + { + if (text[0] == EXT_CTRL_CODE_BEGIN && text[1] == CHAR_SPACE) + { + text[0] = EOS; + break; + } + + text++; + } +} + +static void sub_80F19FC(void) +{ + // FIXME r4/r5 swapped + register u8 *ptr asm("r5") = gUnknown_020388B0; + if (ptr[0] == 1) + { + const u8 *landmarkName = GetLandmarkName( + gUnknown_083DFEC4->regionMap.mapSectionId, + gUnknown_083DFEC4->regionMap.everGrandeCityArea, + ptr[1]); + + if (landmarkName) + { + sub_8072A18(landmarkName, 0x70, 4 * (ptr[1] * 4 + 12), 0x78, 1); + if (++ptr[1] != 4) + return; + } + + Menu_BlankWindowRect(14, ptr[1] * 2 + 6, 28, 15); + ptr[0] = 0; + } +} + +static void sub_80F1A74(void) +{ + gUnknown_020388B0[0] = 0; +} + +static void sub_80F1A80(void) +{ + gUnknown_020388B0[0] = 1; + gUnknown_020388B0[1] = 0; +} + +static void sub_80F1A90(void) +{ + gUnknown_083DFEC4->unk306 = 0; + if (gUnknown_083DFEC4->unk6DAC == 0) + while (sub_80F1AC4()); +} + +static bool8 sub_80F1AC4(void) +{ + u16 i, j; + + switch (gUnknown_083DFEC4->unk306) + { + case 0: + for (i = 0; i < 6; i++) + { + for (j = 0; j < 4; j++) + gUnknown_083DFEC4->unk320[i][j] = NULL; + } + + gUnknown_083DFEC4->unk311 = 0; + break; + case 1: + LZ77UnCompWram(gPokenavMenuOptions_Gfx, gUnknown_083DFEC4->unk388); + break; + case 2: + LZ77UnCompWram(gPokenavConditionMenu_Gfx, gUnknown_083DFEC4->unk1788); + break; + case 3: + LZ77UnCompWram(gPokenavConditionSearch_Gfx, gUnknown_083DFEC4->unk2388); + return FALSE; + } + + gUnknown_083DFEC4->unk306++; + return TRUE; +} + +static void sub_80F1B8C(u8 arg0) +{ + gUnknown_083DFEC4->unk306 = 0; + if (gUnknown_083DFEC4->unk6DAC == 0) + while (sub_80F1BC8(arg0)); +} + +#ifdef NONMATCHING +// very close, but for some reason, (i + 1) is being stored in sp[0x10] +static bool8 sub_80F1BC8(u8 arg0) +{ + u16 i, j; + u16 animNum; + u16 topOffset; + u16 height; + u16 middle; + u8 spriteId; + + switch (gUnknown_083DFEC4->unk306) + { + case 0: + sub_80F2458(arg0); + break; + case 1: + sub_80F2514(arg0); + break; + case 2: + switch (arg0) + { + case 0: + topOffset = 42; + height = 20; + gUnknown_083DFEC4->unk30E = 5; + break; + case 1: + topOffset = 56; + height = 20; + gUnknown_083DFEC4->unk30E = 3; + break; + case 2: + topOffset = 40; + height = 16; + gUnknown_083DFEC4->unk30E = 6; + break; + default: + return FALSE; + } + + animNum = 0; + for (i = 0; i < gUnknown_083DFEC4->unk30E; i++) + { + middle = (height * i) + topOffset - 8; + gUnknown_083DFEC4->unk314[i] = (middle << 8) | (middle + 0x11); + if (!arg0) + { + if (gUnknown_083DFEC4->unk6DB2[i] == 0) + { + for (j = 0; j < 4; j++) + gUnknown_083DFEC4->unk320[i][j] = NULL; + continue; + } + else + { + animNum = (gUnknown_083DFEC4->unk6DB2[i] - 1) * 4; + } + } + + for (j = 0; j < 4; j++) + { + spriteId = CreateSprite(&gSpriteTemplate_83E4454, j * 32 + 256, (height * i) + topOffset, 0); + if (spriteId != MAX_SPRITES) + { + gUnknown_083DFEC4->unk320[i][j] = &gSprites[spriteId]; + gUnknown_083DFEC4->unk320[i][j]->data[0] = i; + gUnknown_083DFEC4->unk320[i][j]->data[1] = j; + gUnknown_083DFEC4->unk320[i][j]->data[2] = j * 32 + 152; + gUnknown_083DFEC4->unk320[i][j]->data[3] = j * 32 + 256; + StartSpriteAnim(gUnknown_083DFEC4->unk320[i][j], animNum++); + + if ((arg0 == 2 || arg0 == 0) && i > 2) + gUnknown_083DFEC4->unk320[i][j]->oam.paletteNum = IndexOfSpritePaletteTag(0x1); + } + } + } + break; + default: + return FALSE; + } + + gUnknown_083DFEC4->unk306++; + return TRUE; +} +#else +NAKED +static bool8 sub_80F1BC8(u8 arg0) +{ + asm(".syntax unified\n\ + push {r4-r7,lr}\n\ + mov r7, r10\n\ + mov r6, r9\n\ + mov r5, r8\n\ + push {r5-r7}\n\ + sub sp, 0xC\n\ + lsls r0, 24\n\ + lsrs r0, 24\n\ + mov r9, r0\n\ + ldr r1, _080F1BF4 @ =gUnknown_083DFEC4\n\ + ldr r2, [r1]\n\ + ldr r3, _080F1BF8 @ =0x00000306\n\ + adds r0, r2, r3\n\ + ldrh r0, [r0]\n\ + adds r3, r1, 0\n\ + cmp r0, 0x1\n\ + beq _080F1C0A\n\ + cmp r0, 0x1\n\ + bgt _080F1BFC\n\ + cmp r0, 0\n\ + beq _080F1C02\n\ + b _080F1DC4\n\ + .align 2, 0\n\ +_080F1BF4: .4byte gUnknown_083DFEC4\n\ +_080F1BF8: .4byte 0x00000306\n\ +_080F1BFC:\n\ + cmp r0, 0x2\n\ + beq _080F1C12\n\ + b _080F1DC4\n\ +_080F1C02:\n\ + mov r0, r9\n\ + bl sub_80F2458\n\ + b _080F1DC8\n\ +_080F1C0A:\n\ + mov r0, r9\n\ + bl sub_80F2514\n\ + b _080F1DC8\n\ +_080F1C12:\n\ + mov r4, r9\n\ + cmp r4, 0x1\n\ + beq _080F1C40\n\ + cmp r4, 0x1\n\ + bgt _080F1C22\n\ + cmp r4, 0\n\ + beq _080F1C2A\n\ + b _080F1DC4\n\ +_080F1C22:\n\ + mov r5, r9\n\ + cmp r5, 0x2\n\ + beq _080F1C54\n\ + b _080F1DC4\n\ +_080F1C2A:\n\ + movs r0, 0x2A\n\ + str r0, [sp, 0x4]\n\ + movs r1, 0x14\n\ + str r1, [sp, 0x8]\n\ + ldr r4, _080F1C3C @ =0x0000030e\n\ + adds r1, r2, r4\n\ + movs r0, 0x5\n\ + b _080F1C62\n\ + .align 2, 0\n\ +_080F1C3C: .4byte 0x0000030e\n\ +_080F1C40:\n\ + movs r5, 0x38\n\ + str r5, [sp, 0x4]\n\ + movs r0, 0x14\n\ + str r0, [sp, 0x8]\n\ + ldr r4, _080F1C50 @ =0x0000030e\n\ + adds r1, r2, r4\n\ + movs r0, 0x3\n\ + b _080F1C62\n\ + .align 2, 0\n\ +_080F1C50: .4byte 0x0000030e\n\ +_080F1C54:\n\ + movs r5, 0x28\n\ + str r5, [sp, 0x4]\n\ + movs r0, 0x10\n\ + str r0, [sp, 0x8]\n\ + ldr r4, _080F1CDC @ =0x0000030e\n\ + adds r1, r2, r4\n\ + movs r0, 0x6\n\ +_080F1C62:\n\ + strb r0, [r1]\n\ + movs r5, 0\n\ + str r5, [sp]\n\ + mov r8, r5\n\ + adds r1, r3, 0\n\ + ldr r0, [r1]\n\ + ldr r2, _080F1CDC @ =0x0000030e\n\ + adds r0, r2\n\ + ldrb r0, [r0]\n\ + lsls r0, 24\n\ + asrs r0, 24\n\ + cmp r8, r0\n\ + blt _080F1C7E\n\ + b _080F1DC8\n\ +_080F1C7E:\n\ + ldr r4, [sp, 0x8]\n\ + mov r3, r8\n\ + muls r3, r4\n\ + ldr r5, [sp, 0x4]\n\ + adds r0, r5, r3\n\ + subs r0, 0x8\n\ + lsls r0, 16\n\ + lsrs r0, 16\n\ + ldr r4, [r1]\n\ + mov r2, r8\n\ + lsls r1, r2, 1\n\ + movs r5, 0xC5\n\ + lsls r5, 2\n\ + adds r2, r4, r5\n\ + adds r2, r1\n\ + lsls r1, r0, 8\n\ + adds r0, 0x11\n\ + orrs r1, r0\n\ + strh r1, [r2]\n\ + mov r0, r9\n\ + cmp r0, 0\n\ + bne _080F1CF2\n\ + ldr r1, _080F1CE0 @ =0x00006db2\n\ + adds r0, r4, r1\n\ + mov r2, r8\n\ + adds r1, r0, r2\n\ + ldrb r0, [r1]\n\ + cmp r0, 0\n\ + bne _080F1CE8\n\ + movs r5, 0\n\ + ldr r0, _080F1CE4 @ =gUnknown_083DFEC4\n\ + ldr r0, [r0]\n\ + lsls r2, 4\n\ + movs r3, 0xC8\n\ + lsls r3, 2\n\ + adds r1, r0, r3\n\ + movs r3, 0\n\ +_080F1CC8:\n\ + lsls r0, r5, 2\n\ + adds r0, r2\n\ + adds r0, r1, r0\n\ + str r3, [r0]\n\ + adds r0, r5, 0x1\n\ + lsls r0, 16\n\ + lsrs r5, r0, 16\n\ + cmp r5, 0x3\n\ + bls _080F1CC8\n\ + b _080F1D92\n\ + .align 2, 0\n\ +_080F1CDC: .4byte 0x0000030e\n\ +_080F1CE0: .4byte 0x00006db2\n\ +_080F1CE4: .4byte gUnknown_083DFEC4\n\ +_080F1CE8:\n\ + ldrb r0, [r1]\n\ + subs r0, 0x1\n\ + lsls r0, 18\n\ + lsrs r0, 16\n\ + str r0, [sp]\n\ +_080F1CF2:\n\ + movs r5, 0\n\ + ldr r4, [sp, 0x4]\n\ + adds r0, r4, r3\n\ + lsls r0, 16\n\ + mov r10, r0\n\ +_080F1CFC:\n\ + lsls r6, r5, 5\n\ + movs r0, 0x80\n\ + lsls r0, 1\n\ + adds r7, r6, r0\n\ + lsls r1, r7, 16\n\ + asrs r1, 16\n\ + ldr r0, _080F1DB4 @ =gSpriteTemplate_83E4454\n\ + mov r3, r10\n\ + asrs r2, r3, 16\n\ + movs r3, 0\n\ + bl CreateSprite\n\ + lsls r0, 24\n\ + lsrs r3, r0, 24\n\ + cmp r3, 0x40\n\ + beq _080F1DC4\n\ + ldr r0, _080F1DB8 @ =gUnknown_083DFEC4\n\ + ldr r2, [r0]\n\ + lsls r1, r5, 2\n\ + mov r4, r8\n\ + lsls r0, r4, 4\n\ + adds r1, r0\n\ + movs r0, 0xC8\n\ + lsls r0, 2\n\ + adds r2, r0\n\ + adds r4, r2, r1\n\ + lsls r0, r3, 4\n\ + adds r0, r3\n\ + lsls r0, 2\n\ + ldr r1, _080F1DBC @ =gSprites\n\ + adds r0, r1\n\ + str r0, [r4]\n\ + mov r1, r8\n\ + strh r1, [r0, 0x2E]\n\ + ldr r0, [r4]\n\ + strh r5, [r0, 0x30]\n\ + ldr r1, [r4]\n\ + adds r0, r6, 0\n\ + adds r0, 0x98\n\ + strh r0, [r1, 0x32]\n\ + ldr r0, [r4]\n\ + strh r7, [r0, 0x34]\n\ + ldr r0, [r4]\n\ + ldr r1, [sp]\n\ + adds r2, r1, 0x1\n\ + lsls r2, 16\n\ + lsrs r2, 16\n\ + str r2, [sp]\n\ + lsls r1, 24\n\ + lsrs r1, 24\n\ + bl StartSpriteAnim\n\ + mov r2, r9\n\ + cmp r2, 0x2\n\ + beq _080F1D6E\n\ + cmp r2, 0\n\ + bne _080F1D88\n\ +_080F1D6E:\n\ + mov r3, r8\n\ + cmp r3, 0x2\n\ + bls _080F1D88\n\ + movs r0, 0x1\n\ + bl IndexOfSpritePaletteTag\n\ + ldr r3, [r4]\n\ + lsls r0, 4\n\ + ldrb r2, [r3, 0x5]\n\ + movs r1, 0xF\n\ + ands r1, r2\n\ + orrs r1, r0\n\ + strb r1, [r3, 0x5]\n\ +_080F1D88:\n\ + adds r0, r5, 0x1\n\ + lsls r0, 16\n\ + lsrs r5, r0, 16\n\ + cmp r5, 0x3\n\ + bls _080F1CFC\n\ +_080F1D92:\n\ + mov r0, r8\n\ + adds r0, 0x1\n\ + lsls r0, 16\n\ + lsrs r0, 16\n\ + mov r8, r0\n\ + ldr r1, _080F1DB8 @ =gUnknown_083DFEC4\n\ + ldr r0, [r1]\n\ + ldr r4, _080F1DC0 @ =0x0000030e\n\ + adds r0, r4\n\ + ldrb r0, [r0]\n\ + lsls r0, 24\n\ + asrs r0, 24\n\ + cmp r8, r0\n\ + bge _080F1DB0\n\ + b _080F1C7E\n\ +_080F1DB0:\n\ + b _080F1DC8\n\ + .align 2, 0\n\ +_080F1DB4: .4byte gSpriteTemplate_83E4454\n\ +_080F1DB8: .4byte gUnknown_083DFEC4\n\ +_080F1DBC: .4byte gSprites\n\ +_080F1DC0: .4byte 0x0000030e\n\ +_080F1DC4:\n\ + movs r0, 0\n\ + b _080F1DD8\n\ +_080F1DC8:\n\ + ldr r0, _080F1DE8 @ =gUnknown_083DFEC4\n\ + ldr r1, [r0]\n\ + ldr r5, _080F1DEC @ =0x00000306\n\ + adds r1, r5\n\ + ldrh r0, [r1]\n\ + adds r0, 0x1\n\ + strh r0, [r1]\n\ + movs r0, 0x1\n\ +_080F1DD8:\n\ + add sp, 0xC\n\ + pop {r3-r5}\n\ + mov r8, r3\n\ + mov r9, r4\n\ + mov r10, r5\n\ + pop {r4-r7}\n\ + pop {r1}\n\ + bx r1\n\ + .align 2, 0\n\ +_080F1DE8: .4byte gUnknown_083DFEC4\n\ +_080F1DEC: .4byte 0x00000306\n\ + .syntax divided\n"); +} +#endif // NONMATCHING + +static void sub_80F1DF0(void) +{ + u16 i, j; + for (i = 0; i < gUnknown_083DFEC4->unk30E; i++) + { + for (j = 0; j < 4; j++) + { + if (gUnknown_083DFEC4->unk320[i][j]) + gUnknown_083DFEC4->unk320[i][j]->callback = sub_80F2218; + } + } + + PlaySE(SE_WIN_OPEN); +} + +static bool8 sub_80F1E50(void) +{ + if (sub_80F22F8()) + { + sub_80F2108(); + return FALSE; + } + else + { + return TRUE; + } +} + +static bool8 sub_80F1E6C(void) +{ + return !sub_80F22F8(); +} + +static void sub_80F1E84(void) +{ + u16 i, j; + + gUnknown_083DFEC4->unk30F = 0; + sub_80F2148(); + for (i = 0; i < gUnknown_083DFEC4->unk30E; i++) + { + if (i != gUnknown_083DFEC4->unk6DAD) + { + for (j = 0; j < 4; j++) + { + if (gUnknown_083DFEC4->unk320[i][j]) + gUnknown_083DFEC4->unk320[i][j]->callback = sub_80F2240; + } + } + } +} + +static bool8 sub_80F1F10(void) +{ + u16 j; + + switch (gUnknown_083DFEC4->unk30F) + { + case 0: + if (sub_80F2360()) + { + for (j = 0; j < 4; j++) + { + struct Sprite *sprite = gUnknown_083DFEC4->unk320[gUnknown_083DFEC4->unk6DAD][j]; + sprite->oam.affineMode = ST_OAM_AFFINE_DOUBLE; + sprite->affineAnims = gSpriteAffineAnimTable_83E4450; + InitSpriteAffineAnim(sprite); + sprite->data[4] = j * 4 - 6; + sprite->data[4] /= 2; + sprite->data[5] = sprite->data[4] * 8; + sprite->callback = sub_80F2240; + } + + sub_80F2170(); + gUnknown_083DFEC4->unk30F++; + } + break; + case 1: + if (sub_80F23C8()) + { + sub_80F21F8(); + FreeSpriteTilesByTag(0x0); + FreeSpritePaletteByTag(0x0); + FreeSpritePaletteByTag(0x1); + return FALSE; + } + break; + } + + return TRUE; +} + +static void sub_80F1FF0(void) +{ + if (gUnknown_083DFEC4->unk311 == 1) + { + REG_WIN0V = gUnknown_083DFEC4->unk314[gUnknown_083DFEC4->unk6DAD]; + REG_BLDY = gSineTable[gUnknown_083DFEC4->unk312] >> 5; + gUnknown_083DFEC4->unk312 += 3; + gUnknown_083DFEC4->unk312 &= 0x7F; + } + else if (gUnknown_083DFEC4->unk311 == 2) + { + REG_BLDALPHA = gUnknown_083E42F8[gUnknown_083DFEC4->unk312]; + if (gUnknown_083DFEC4->unk312 < 15) + gUnknown_083DFEC4->unk312++; + } +} + +static void sub_80F208C(void) +{ + sub_80F2148(); +} + +static void sub_80F2098(void) +{ + REG_WIN0H = 0x77F0; + REG_WIN0V = gUnknown_083DFEC4->unk314[gUnknown_083DFEC4->unk6DAD]; + REG_WININ = 0x3F; + REG_WINOUT = 0x1F; + REG_DISPCNT |= DISPCNT_WIN0_ON; +} + +static void sub_80F20F4(void) +{ + REG_DISPCNT &= ~DISPCNT_WIN0_ON; +} + +static void sub_80F2108(void) +{ + if (!gUnknown_083DFEC4->unk311) + { + gUnknown_083DFEC4->unk311 = 1; + gUnknown_083DFEC4->unk312 = 0; + REG_BLDCNT = 0x90; + REG_BLDY = 0; + sub_80F2098(); + } +} + +static void sub_80F2148(void) +{ + gUnknown_083DFEC4->unk311 = 0; + REG_BLDCNT = 0; + sub_80F20F4(); +} + +static void sub_80F2170(void) +{ + u16 j; + + if (!gUnknown_083DFEC4->unk311) + { + sub_80F20F4(); + for (j = 0; j < 4; j++) + { + struct Sprite *sprite = gUnknown_083DFEC4->unk320[gUnknown_083DFEC4->unk6DAD][j]; + sprite->oam.objMode = ST_OAM_OBJ_BLEND; + } + + gUnknown_083DFEC4->unk311 = 2; + gUnknown_083DFEC4->unk312 = 0; + REG_BLDCNT = 0x3F40; + REG_BLDALPHA = 0x10; + } +} + +static void sub_80F21F8() +{ + gUnknown_083DFEC4->unk311 = 0; + REG_BLDCNT = 0; +} + +static void sub_80F2218(struct Sprite *sprite) +{ + sprite->pos1.x -= 8; + if (sprite->pos1.x <= sprite->data[2]) + { + sprite->pos1.x = sprite->data[2]; + sprite->callback = sub_80F22B0; + } +} + +static void sub_80F2240(struct Sprite *sprite) +{ + if (sprite->data[0] == gUnknown_083DFEC4->unk6DAD) + { + if (sprite->data[5]) + { + sprite->pos1.x += sprite->data[4]; + sprite->data[5] -= sprite->data[4]; + } + + if (sprite->affineAnimEnded) + sub_80F240C(sprite); + } + else + { + sprite->pos1.x += 8; + if (sprite->pos1.x >= sprite->data[3]) + sub_80F240C(sprite); + } +} + +static void sub_80F22B0(struct Sprite *sprite) +{ + if (sprite->data[0] == gUnknown_083DFEC4->unk6DAD) + { + if (sprite->pos2.x > -16) + sprite->pos2.x -= 4; + } + else + { + if (sprite->pos2.x < 0) + sprite->pos2.x += 4; + } +} + +static bool8 sub_80F22F8(void) +{ + u16 i, j; + + for (i = 0; i < gUnknown_083DFEC4->unk6DAE; i++) + { + for (j = 0; j < 4; j++) + { + struct Sprite *sprite = gUnknown_083DFEC4->unk320[i][j]; + if (!sprite) + return TRUE; + + if (sprite->pos2.x != 0 && sprite->pos2.x != -16) + return FALSE; + } + } + + return TRUE; +} + +static bool8 sub_80F2360(void) +{ + u16 i, j; + + for (i = 0; i < gUnknown_083DFEC4->unk30E; i++) + { + if (i != gUnknown_083DFEC4->unk6DAD) + { + for (j = 0; j < 4; j++) + { + struct Sprite *sprite = gUnknown_083DFEC4->unk320[i][j]; + if (sprite) + return FALSE; + } + } + } + + return TRUE; +} + +static bool8 sub_80F23C8(void) +{ + u16 j; + + for (j = 0; j < 4; j++) + { + struct Sprite *sprite = gUnknown_083DFEC4->unk320[gUnknown_083DFEC4->unk6DAD][j]; + if (sprite) + return FALSE; + } + + return TRUE; +} + +static void sub_80F240C(struct Sprite *sprite) +{ + gUnknown_083DFEC4->unk320[sprite->data[0]][sprite->data[1]] = NULL; + if (sprite->affineAnimEnded) + FreeOamMatrix(sprite->oam.matrixNum); + + DestroySprite(sprite); +} + +static void sub_80F2458(u8 arg0) +{ + switch (arg0) + { + case 0: + gUnknown_083DFEC4->unk380.data = gUnknown_083DFEC4->unk388; + gUnknown_083DFEC4->unk380.size = sizeof(gUnknown_083DFEC4->unk388); + gUnknown_083DFEC4->unk380.tag = 0x0; + break; + case 1: + gUnknown_083DFEC4->unk380.data = gUnknown_083DFEC4->unk1788; + gUnknown_083DFEC4->unk380.size = sizeof(gUnknown_083DFEC4->unk1788); + gUnknown_083DFEC4->unk380.tag = 0x0; + break; + case 2: + gUnknown_083DFEC4->unk380.data = gUnknown_083DFEC4->unk2388; + gUnknown_083DFEC4->unk380.size = sizeof(gUnknown_083DFEC4->unk2388); + gUnknown_083DFEC4->unk380.tag = 0x0; + break; + default: + return; + } + + LoadSpriteSheet(&gUnknown_083DFEC4->unk380); +} + +static void sub_80F2514(u8 arg0) +{ + struct SpritePalette spritePalette; + + switch (arg0) + { + case 0: + spritePalette.data = gPokenavMenuOptions1_Pal; + spritePalette.tag = 0; + LoadSpritePalette(&spritePalette); + spritePalette.data = gPokenavMenuOptions2_Pal; + spritePalette.tag = 0x1; + break; + case 1: + spritePalette.data = gPokenavConditionMenu_Pal; + spritePalette.tag = 0x0; + break; + case 2: + spritePalette.data = gPokenavCondition6_Pal; + spritePalette.tag = 0; + LoadSpritePalette(&spritePalette); + spritePalette.data = gPokenavCondition7_Pal; + spritePalette.tag = 0x1; + break; + default: + return; + } + + LoadSpritePalette(&spritePalette); +} + +static void sub_80F2598(void) +{ + u8 spriteId; + + gUnknown_083DFEC4->unk6D9C = NULL; + if (DoesSomeoneWantRematchIn(gSaveBlock1.location.mapGroup, gSaveBlock1.location.mapNum) == TRUE) + { + LoadSpriteSheet(&gSpriteSheet_PokenavBlueLight); + LoadSpritePalette(&gSpritePalette_PokenavBlueLight); + spriteId = CreateSprite(&gSpriteTemplate_83E4484, 12, 96, 0); + if (spriteId != MAX_SPRITES) + { + gUnknown_083DFEC4->unk6D9C = &gSprites[spriteId]; + } + else + { + FreeSpriteTilesByTag(0x19); + FreeSpritePaletteByTag(0x11); + } + } +} + +static void sub_80F2620(void) +{ + if (gUnknown_083DFEC4->unk6D9C) + { + DestroySprite(gUnknown_083DFEC4->unk6D9C); + FreeSpriteTilesByTag(0x19); + FreeSpritePaletteByTag(0x11); + gUnknown_083DFEC4->unk6D9C = NULL; + } +} + +void sub_80F2654(struct Sprite *sprite) +{ + if (++sprite->data[0] > 6) + { + sprite->data[0] = 0; + sprite->invisible = !sprite->invisible; + } +} + +void sub_80F2688(void) +{ + gUnknown_083DFEC4->unk306 = 0; + if (!gUnknown_083DFEC4->unk6DAC) + while(sub_80F26BC()); +} + +static bool8 sub_80F26BC(void) +{ + switch (gUnknown_083DFEC4->unk306) + { + case 0: + LZ77UnCompWram(gPokenavMainMenu_Gfx, gUnknown_083DFEC4->unk3B98); + break; + case 1: + LZ77UnCompWram(gPokenavConditionMenuHeader_Gfx, gUnknown_083DFEC4->unk4198); + break; + case 2: + LZ77UnCompWram(gPokenavRibbonsHeader_Gfx, gUnknown_083DFEC4->unk4D98); + break; + case 3: + LZ77UnCompWram(gPokenavHoennMapHeader_Gfx, gUnknown_083DFEC4->unk5398); + break; + case 4: + LZ77UnCompWram(gPokenavConditionMenuOptions_Gfx, gUnknown_083DFEC4->unk5F98); + break; + case 5: + LZ77UnCompWram(gPokenavConditionMenuOptions2_Gfx, gUnknown_083DFEC4->unk6798); + break; + case 6: + LZ77UnCompWram(gPokenavTrainersEyesHeader_Gfx, gUnknown_083DFEC4->unk4798); + break; + case 7: + LoadSpritePalettes(gUnknown_083E449C); + break; + default: + return FALSE; + } + + gUnknown_083DFEC4->unk306++; + return TRUE; +} + +static void sub_80F27DC(u8 arg0) +{ + struct SpriteSheet spriteSheet; + + switch (arg0) + { + case 0: + spriteSheet.data = gUnknown_083DFEC4->unk3B98; + spriteSheet.size = sizeof(gUnknown_083DFEC4->unk3B98); + spriteSheet.tag = 0x1; + break; + case 1: + spriteSheet.data = gUnknown_083DFEC4->unk4198; + spriteSheet.size = sizeof(gUnknown_083DFEC4->unk4198); + spriteSheet.tag = 0x1; + break; + case 3: + spriteSheet.data = gUnknown_083DFEC4->unk4798; + spriteSheet.size = sizeof(gUnknown_083DFEC4->unk4798); + spriteSheet.tag = 0x1; + break; + case 2: + spriteSheet.data = gUnknown_083DFEC4->unk4D98; + spriteSheet.size = sizeof(gUnknown_083DFEC4->unk4D98); + spriteSheet.tag = 0x1; + break; + case 4: + spriteSheet.data = gUnknown_083DFEC4->unk5398; + spriteSheet.size = sizeof(gUnknown_083DFEC4->unk5398); + spriteSheet.tag = 0x1; + break; + case 5: + spriteSheet.data = gUnknown_083DFEC4->unk5F98; + spriteSheet.size = sizeof(gUnknown_083DFEC4->unk5F98); + spriteSheet.tag = 0x2; + break; + case 6: + spriteSheet.data = gUnknown_083DFEC4->unk6198; + spriteSheet.size = sizeof(gUnknown_083DFEC4->unk6198); + spriteSheet.tag = 0x2; + break; + case 8: + spriteSheet.data = gUnknown_083DFEC4->unk6398; + spriteSheet.size = sizeof(gUnknown_083DFEC4->unk6398); + spriteSheet.tag = 0x2; + break; + case 9: + spriteSheet.data = gUnknown_083DFEC4->unk6598; + spriteSheet.size = sizeof(gUnknown_083DFEC4->unk6598); + spriteSheet.tag = 0x2; + break; + case 11: + spriteSheet.data = gUnknown_083DFEC4->unk6998; + spriteSheet.size = sizeof(gUnknown_083DFEC4->unk6998); + spriteSheet.tag = 0x2; + break; + case 10: + spriteSheet.data = gUnknown_083DFEC4->unk6798; + spriteSheet.size = sizeof(gUnknown_083DFEC4->unk6798); + spriteSheet.tag = 0x2; + break; + case 7: + spriteSheet.data = gUnknown_083DFEC4->unk6B98; + spriteSheet.size = sizeof(gUnknown_083DFEC4->unk6B98); + spriteSheet.tag = 0x2; + break; + default: + return; + } + + LoadSpriteSheet(&spriteSheet); +} + +void sub_80F29B8(u8 arg0) +{ + u16 i; + s16 deltaX, endX, initialX; + u16 y; + s16 width; + struct Sprite **sprites; + const struct SpriteTemplate *spriteTemplate; + u8 spriteId; + + spriteTemplate = NULL; + switch (arg0) + { + case 0: + case 1: + case 2: + case 3: + initialX = -96; + y = 49 - gUnknown_083DFEC4->unk030C; + deltaX = 8; + endX = 32; + width = 64; + sprites = gUnknown_083DFEC4->unk3B88; + spriteTemplate = arg0 != 3 ? &gSpriteTemplate_83E44E0 : &gSpriteTemplate_83E44F8; + break; + case 4: + initialX = 272; + y = 49 - gUnknown_083DFEC4->unk030C; + deltaX = -8; + endX = 152; + width = 64; + spriteTemplate = &gSpriteTemplate_83E44E0; + sprites = gUnknown_083DFEC4->unk3B88; + break; + case 5: + case 6: + case 8: + case 9: + spriteTemplate = &gSpriteTemplate_83E4530; + // fall through + case 7: + case 10: + case 11: + if (spriteTemplate == NULL) + spriteTemplate = &gSpriteTemplate_83E4548; + + initialX = -96; + y = 68 - gUnknown_083DFEC4->unk030C; + deltaX = 8; + endX = 16; + width = 32; + sprites = gUnknown_083DFEC4->unk3B90; + break; + default: + return; + } + + for (i = 0; i < 2; i++) + { + spriteId = CreateSprite(spriteTemplate, i * width + initialX, y, 0); + if (spriteId != MAX_SPRITES) + { + gSprites[spriteId].data[0] = deltaX; + gSprites[spriteId].data[1] = endX + i * width; + gSprites[spriteId].data[2] = i; + gSprites[spriteId].data[3] = arg0; + if (arg0 == 4 && i == 1) + { + int anim = !gUnknown_083DFEC4->regionMap.zoomed ? 1 : 2; + StartSpriteAnim(&gSprites[spriteId], anim); + } + else + { + StartSpriteAnim(&gSprites[spriteId], i); + } + + if (arg0 < 4 && i == 1) + { + gSprites[spriteId].oam.shape = ST_OAM_SQUARE; + gSprites[spriteId].oam.size = 2; + } + + sprites[i] = &gSprites[spriteId]; + } + } +} + +#define sEndX sprite->data[1] +void sub_80F2BBC(struct Sprite *sprite) +{ + s16 x = sprite->pos1.x; + sprite->pos1.x += sprite->data[0]; + if ((x <= sEndX && sprite->pos1.x >= sEndX) || (x >= sEndX && sprite->pos1.x <= sEndX)) + { + sprite->pos1.x = sEndX; + if (sprite->data[3] == 4 && sprite->data[2] == 1) + sprite->callback = sub_80F2C58; + else + sprite->callback = SpriteCallbackDummy; + } +} +#undef sEndX + +static void sub_80F2C14(struct Sprite *sprite) +{ + u16 right; + + sprite->pos1.x -= sprite->data[0]; + right = sprite->pos1.x + 32; + if (right > 304) + { + if (sprite->data[2] == 1) + { + if (sprite->data[3] < 5) + FreeSpriteTilesByTag(0x1); + else + FreeSpriteTilesByTag(0x2); + } + + DestroySprite(sprite); + } +} + +static void sub_80F2C58(struct Sprite *sprite) +{ + int anim = !gUnknown_083DFEC4->regionMap.zoomed ? 1 : 2; + StartSpriteAnim(sprite, anim); +} + +void sub_80F2C80(u8 arg0) +{ + gUnknown_083DFEC4->unk306 = 0; + if (!gUnknown_083DFEC4->unk6DAC) + while (sub_80F2CBC(arg0)); +} + +bool8 sub_80F2CBC(u8 arg0) +{ + switch (gUnknown_083DFEC4->unk306) + { + case 0: + sub_80F27DC(arg0); + gUnknown_083DFEC4->unk306++; + return TRUE; + case 1: + sub_80F29B8(arg0); + gUnknown_083DFEC4->unk306++; + return FALSE; + default: + return FALSE; + } +} + +static void sub_80F2D04(u8 arg0) +{ + u16 i; + + if (arg0 < 5) + { + for (i = 0; i < 2; i++) + gUnknown_083DFEC4->unk3B88[i]->callback = sub_80F2C14; + } + else + { + for (i = 0; i < 2; i++) + gUnknown_083DFEC4->unk3B90[i]->callback = sub_80F2C14; + } +} + +static void sub_80F2D6C(u8 arg0) +{ + u16 i; + + if (arg0 < 5) + { + FreeSpriteTilesByTag(0x1); + for (i = 0; i < 2; i++) + DestroySprite(gUnknown_083DFEC4->unk3B88[i]); + } + else + { + FreeSpriteTilesByTag(0x2); + for (i = 0; i < 2; i++) + DestroySprite(gUnknown_083DFEC4->unk3B90[i]); + } +} + +static void sub_80F2DD8(void) +{ + CreateRegionMapCursor(7, 7); + CreateRegionMapPlayerIcon(8, 8); + sub_80FBF94(); +} + +static void sub_80F2DF4(void) +{ + FreeRegionMapIconResources(); +} + +void sub_80F2E00(struct Sprite *sprite) +{ + sprite->pos1.x = gUnknown_083DFEC4->unk8766 + 38; +} + +static void sub_80F2E18(u8 arg0) +{ + u8 spriteId; + struct SpriteTemplate spriteTemplate; + struct SpritePalette spritePalette; + struct SpriteSheet spriteSheet; + + if (!gUnknown_083DFEC4->unk8768) + { + spriteSheet = gUnknown_083E4568; + spriteTemplate = gSpriteTemplate_83E4570; + spritePalette = gUnknown_083E4588; + + spriteSheet.data = gUnknown_083DFEC4->unkD1E4[arg0]; + spritePalette.data = gUnknown_083DFEC4->unk0[arg0]; + gUnknown_083DFEC4->unkD1DC = LoadSpritePalette(&spritePalette); + gUnknown_083DFEC4->unkD1DE = LoadSpriteSheet(&spriteSheet); + + spriteId = CreateSprite(&spriteTemplate, 38, 104, 0); + if (spriteId == MAX_SPRITES) + { + FreeSpriteTilesByTag(0x6); + FreeSpritePaletteByTag(0x6); + gUnknown_083DFEC4->unk8768 = NULL; + } + else + { + gUnknown_083DFEC4->unk8768 = &gSprites[spriteId]; + gUnknown_083DFEC4->unkD1E0 = (void *)(VRAM + 0x10000) + gUnknown_083DFEC4->unkD1DE * 32; + gUnknown_083DFEC4->unkD1DC = gUnknown_083DFEC4->unkD1DC * 16 + 0x100; + } + } + else + { + DmaCopy16Defvars(3, gUnknown_083DFEC4->unkD1E4[arg0], gUnknown_083DFEC4->unkD1E0, 0x800); + LoadPalette(gUnknown_083DFEC4->unk0[arg0], gUnknown_083DFEC4->unkD1DC, 0x20); + } +} + +void sub_80F2F48(void) +{ + if (gUnknown_083DFEC4->unk8768) + { + DestroySprite(gUnknown_083DFEC4->unk8768); + FreeSpriteTilesByTag(0x6); + FreeSpritePaletteByTag(0x6); + gUnknown_083DFEC4->unk8768 = NULL; + } +} + +void sub_80F2F7C(u8 arg0) +{ + sub_80F2E18(arg0); + gUnknown_083DFEC4->unkCED0 = gUnknown_083DFEC4->unk8768; + gUnknown_083DFEC4->unkCED0->callback = sub_80F2FEC; +} + +static void sub_80F2FB0(void) +{ + if (gUnknown_083DFEC4->unkCED0) + { + DestroySprite(gUnknown_083DFEC4->unkCED0); + FreeSpriteTilesByTag(0x6); + FreeSpritePaletteByTag(0x6); + gUnknown_083DFEC4->unkCED0 = NULL; + gUnknown_083DFEC4->unk8768 = NULL; + } +} + +static void sub_80F2FEC(struct Sprite *sprite) +{ + sprite->pos1.x = gUnknown_083DFEC4->unkD15A + 40; + sprite->pos1.y = 104; +} + +static void sub_80F3008(u8 arg0) +{ + u16 i; + u8 spriteId; + struct SpritePalette spritePalette; + struct SpriteSheet spriteSheets[3]; + + memcpy(spriteSheets, gUnknown_083E4590, sizeof(gUnknown_083E4590)); + spritePalette = gUnknown_083E45A8; + switch (arg0) + { + case 1: + case 2: + spritePalette.data = gUnknown_08E9F988; + break; + } + + LoadSpriteSheets(spriteSheets); + LoadSpritePalette(&spritePalette); + spriteId = CreateSprite(&gSpriteTemplate_83E45B8, 95, 0, 0); + if (spriteId == MAX_SPRITES) + { + gUnknown_083DFEC4->unk87CC = NULL; + } + else + { + gUnknown_083DFEC4->unk87CC = &gSprites[spriteId]; + for (i = 0; i < 2; i++) + { + spriteId = CreateSprite(&gSpriteTemplate_83E45F0, 168, i * 128 + 8, 0); + if (spriteId != MAX_SPRITES) + { + gUnknown_083DFEC4->unk87D0[i] = &gSprites[spriteId]; + gSprites[spriteId].invisible = 1; + gSprites[spriteId].data[0] = 0; + gSprites[spriteId].data[1] = 0; + gSprites[spriteId].data[2] = i == 0 ? -1 : 1; + gSprites[spriteId].data[3] = i; + gSprites[spriteId].data[4] = 1; + StartSpriteAnim(&gSprites[spriteId], i); + } + else + { + gUnknown_083DFEC4->unk87D0[i] = NULL; + } + } + } +} diff --git a/src/use_pokeblock.c b/src/use_pokeblock.c index bcfeed672..dd28bd148 100644 --- a/src/use_pokeblock.c +++ b/src/use_pokeblock.c @@ -243,7 +243,7 @@ static void sub_8136294(void) case 6: gUnknown_083DFEC4->unk76AA = 0; gUnknown_083DFEC4->unk87E0 = NULL; - gUnknown_083DFEC4->unk030C.val = 0x20; + gUnknown_083DFEC4->unk030C = 0x20; gUnknown_02039304->unk50++; break; case 7: @@ -285,7 +285,7 @@ static void sub_8136294(void) break; case 13: sub_80F2E18(0); - gUnknown_083DFEC4->unk8768->unk26 = 0xffd8; + gUnknown_083DFEC4->unk8768->pos2.y = 0xffd8; gUnknown_02039304->unk50++; break; case 14: -- cgit v1.2.3 From ee775fea6d627f6f1652d0ff6c7e690a5a06fd69 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Fri, 17 Aug 2018 18:06:02 -0500 Subject: Decompile more pokenav --- asm/pokenav.s | 866 --------------------------------------------------- include/pokenav.h | 19 +- src/pokenav_before.c | 276 +++++++++++++++- 3 files changed, 283 insertions(+), 878 deletions(-) diff --git a/asm/pokenav.s b/asm/pokenav.s index cac79bbcb..a0f60c553 100644 --- a/asm/pokenav.s +++ b/asm/pokenav.s @@ -5,872 +5,6 @@ .text - thumb_func_start sub_80F3130 -sub_80F3130: @ 80F3130 - push {r4-r6,lr} - ldr r0, _080F3184 @ =gUnknown_083DFEC4 - ldr r6, [r0] - ldr r0, _080F3188 @ =0x000087cc - adds r4, r6, r0 - ldr r0, [r4] - cmp r0, 0 - beq _080F3154 - bl DestroySprite - movs r0, 0x9 - bl FreeSpriteTilesByTag - movs r0, 0x9 - bl FreeSpritePaletteByTag - movs r0, 0 - str r0, [r4] -_080F3154: - movs r5, 0 - ldr r0, _080F318C @ =0x000087d0 - adds r6, r0 -_080F315A: - lsls r0, r5, 2 - adds r4, r6, r0 - ldr r0, [r4] - cmp r0, 0 - beq _080F316C - bl DestroySprite - movs r0, 0 - str r0, [r4] -_080F316C: - adds r0, r5, 0x1 - lsls r0, 16 - lsrs r5, r0, 16 - cmp r5, 0x1 - bls _080F315A - movs r0, 0xA - bl FreeSpriteTilesByTag - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_080F3184: .4byte gUnknown_083DFEC4 -_080F3188: .4byte 0x000087cc -_080F318C: .4byte 0x000087d0 - thumb_func_end sub_80F3130 - - thumb_func_start sub_80F3190 -sub_80F3190: @ 80F3190 - ldr r1, _080F31A4 @ =gUnknown_083DFEC4 - ldr r1, [r1] - ldr r2, _080F31A8 @ =0x0000876c - adds r1, r2 - movs r2, 0 - ldrsh r1, [r1, r2] - lsls r1, 4 - adds r1, 0x10 - strh r1, [r0, 0x22] - bx lr - .align 2, 0 -_080F31A4: .4byte gUnknown_083DFEC4 -_080F31A8: .4byte 0x0000876c - thumb_func_end sub_80F3190 - - thumb_func_start sub_80F31AC -sub_80F31AC: @ 80F31AC - push {r4,r5,lr} - adds r3, r0, 0 - ldr r0, _080F31E8 @ =gUnknown_083DFEC4 - ldr r1, [r0] - ldr r2, _080F31EC @ =0x000087c9 - adds r0, r1, r2 - ldrb r0, [r0] - cmp r0, 0 - beq _080F325C - movs r4, 0x36 - ldrsh r0, [r3, r4] - cmp r0, 0 - beq _080F3226 - movs r5, 0x34 - ldrsh r0, [r3, r5] - cmp r0, 0 - bne _080F31F4 - movs r2, 0 - ldr r4, _080F31F0 @ =0x00008770 - adds r0, r1, r4 - movs r5, 0 - ldrsh r0, [r0, r5] - cmp r0, 0 - bne _080F31DE - movs r2, 0x1 -_080F31DE: - movs r0, 0x3E - adds r0, r3 - mov r12, r0 - lsls r2, 2 - b _080F3214 - .align 2, 0 -_080F31E8: .4byte gUnknown_083DFEC4 -_080F31EC: .4byte 0x000087c9 -_080F31F0: .4byte 0x00008770 -_080F31F4: - movs r4, 0 - ldr r2, _080F3250 @ =0x00008772 - adds r0, r1, r2 - ldr r5, _080F3254 @ =0x00008774 - adds r1, r5 - movs r5, 0 - ldrsh r2, [r0, r5] - movs r5, 0 - ldrsh r0, [r1, r5] - cmp r2, r0 - bne _080F320C - movs r4, 0x1 -_080F320C: - movs r0, 0x3E - adds r0, r3 - mov r12, r0 - lsls r2, r4, 2 -_080F3214: - ldrb r1, [r0] - movs r0, 0x5 - negs r0, r0 - ands r0, r1 - orrs r0, r2 - mov r1, r12 - strb r0, [r1] - movs r0, 0 - strh r0, [r3, 0x36] -_080F3226: - ldrh r0, [r3, 0x2E] - adds r0, 0x1 - movs r1, 0 - strh r0, [r3, 0x2E] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x4 - ble _080F325C - strh r1, [r3, 0x2E] - ldrh r0, [r3, 0x30] - adds r0, 0x1 - strh r0, [r3, 0x30] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x4 - bgt _080F3258 - ldrh r0, [r3, 0x32] - ldrh r2, [r3, 0x26] - adds r0, r2 - strh r0, [r3, 0x26] - b _080F325C - .align 2, 0 -_080F3250: .4byte 0x00008772 -_080F3254: .4byte 0x00008774 -_080F3258: - strh r1, [r3, 0x30] - strh r1, [r3, 0x26] -_080F325C: - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end sub_80F31AC - - thumb_func_start sub_80F3264 -sub_80F3264: @ 80F3264 - push {lr} - movs r1, 0 - ldr r0, _080F328C @ =gUnknown_083DFEC4 - ldr r0, [r0] - ldr r3, _080F3290 @ =0x000087d0 - adds r2, r0, r3 - movs r3, 0x1 -_080F3272: - lsls r0, r1, 2 - adds r0, r2, r0 - ldr r0, [r0] - cmp r0, 0 - beq _080F327E - strh r3, [r0, 0x36] -_080F327E: - adds r0, r1, 0x1 - lsls r0, 16 - lsrs r1, r0, 16 - cmp r1, 0x1 - bls _080F3272 - pop {r0} - bx r0 - .align 2, 0 -_080F328C: .4byte gUnknown_083DFEC4 -_080F3290: .4byte 0x000087d0 - thumb_func_end sub_80F3264 - - thumb_func_start sub_80F3294 -sub_80F3294: @ 80F3294 - push {r4-r6,lr} - lsls r0, 24 - lsrs r6, r0, 24 - ldr r0, _080F32F4 @ =gUnknown_083DFEC4 - ldr r4, [r0] - ldr r1, _080F32F8 @ =0x000087cc - adds r0, r4, r1 - ldr r2, [r0] - adds r2, 0x3E - movs r0, 0x1 - adds r1, r6, 0 - ands r1, r0 - lsls r1, 2 - ldrb r3, [r2] - movs r5, 0x5 - negs r5, r5 - adds r0, r5, 0 - ands r0, r3 - orrs r0, r1 - strb r0, [r2] - ldr r2, _080F32FC @ =0x000087c9 - adds r0, r4, r2 - ldrb r0, [r0] - cmp r0, 0 - beq _080F331A - cmp r6, 0x1 - bne _080F3308 - ldr r1, _080F3300 @ =0x000087d0 - adds r0, r4, r1 - ldr r1, [r0] - adds r1, 0x3E - ldrb r2, [r1] - adds r0, r5, 0 - ands r0, r2 - movs r3, 0x4 - orrs r0, r3 - strb r0, [r1] - ldr r2, _080F3304 @ =0x000087d4 - adds r0, r4, r2 - ldr r1, [r0] - adds r1, 0x3E - ldrb r2, [r1] - adds r0, r5, 0 - ands r0, r2 - orrs r0, r3 - strb r0, [r1] - b _080F331A - .align 2, 0 -_080F32F4: .4byte gUnknown_083DFEC4 -_080F32F8: .4byte 0x000087cc -_080F32FC: .4byte 0x000087c9 -_080F3300: .4byte 0x000087d0 -_080F3304: .4byte 0x000087d4 -_080F3308: - ldr r1, _080F3320 @ =0x000087d0 - adds r0, r4, r1 - ldr r0, [r0] - movs r1, 0x1 - strh r1, [r0, 0x36] - ldr r2, _080F3324 @ =0x000087d4 - adds r0, r4, r2 - ldr r0, [r0] - strh r1, [r0, 0x36] -_080F331A: - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_080F3320: .4byte 0x000087d0 -_080F3324: .4byte 0x000087d4 - thumb_func_end sub_80F3294 - - thumb_func_start sub_80F3328 -sub_80F3328: @ 80F3328 - push {lr} - adds r2, r0, 0 - ldr r0, _080F334C @ =gUnknown_083DFEC4 - ldr r0, [r0] - ldr r1, _080F3350 @ =0x000087dc - adds r0, r1 - movs r3, 0x2E - ldrsh r1, [r2, r3] - movs r3, 0 - ldrsh r0, [r0, r3] - cmp r1, r0 - bne _080F3354 - adds r0, r2, 0 - movs r1, 0 - bl StartSpriteAnim - b _080F335C - .align 2, 0 -_080F334C: .4byte gUnknown_083DFEC4 -_080F3350: .4byte 0x000087dc -_080F3354: - adds r0, r2, 0 - movs r1, 0x1 - bl StartSpriteAnim -_080F335C: - pop {r0} - bx r0 - thumb_func_end sub_80F3328 - - thumb_func_start sub_80F3360 -sub_80F3360: @ 80F3360 - push {r4,lr} - adds r4, r0, 0 - ldr r0, _080F3384 @ =gUnknown_083DFEC4 - ldr r0, [r0] - ldr r2, _080F3388 @ =0x000087dc - adds r1, r0, r2 - movs r2, 0 - ldrsh r1, [r1, r2] - ldr r2, _080F338C @ =0x000087da - adds r0, r2 - movs r2, 0 - ldrsh r0, [r0, r2] - subs r0, 0x1 - cmp r1, r0 - bne _080F3390 - movs r0, 0x4 - b _080F3392 - .align 2, 0 -_080F3384: .4byte gUnknown_083DFEC4 -_080F3388: .4byte 0x000087dc -_080F338C: .4byte 0x000087da -_080F3390: - movs r0, 0x5 -_080F3392: - bl IndexOfSpritePaletteTag - lsls r0, 4 - ldrb r2, [r4, 0x5] - movs r1, 0xF - ands r1, r2 - orrs r1, r0 - strb r1, [r4, 0x5] - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_80F3360 - - thumb_func_start sub_80F33A8 -sub_80F33A8: @ 80F33A8 - push {r4-r7,lr} - mov r7, r8 - push {r7} - sub sp, 0x50 - mov r1, sp - ldr r0, _080F3440 @ =gUnknown_083E4628 - ldm r0!, {r2-r4} - stm r1!, {r2-r4} - ldm r0!, {r2,r5,r6} - stm r1!, {r2,r5,r6} - ldm r0!, {r3,r4} - stm r1!, {r3,r4} - add r4, sp, 0x20 - adds r1, r4, 0 - ldr r0, _080F3444 @ =gUnknown_083E4648 - ldm r0!, {r2,r5,r6} - stm r1!, {r2,r5,r6} - ldm r0!, {r3,r5,r6} - stm r1!, {r3,r5,r6} - add r5, sp, 0x38 - adds r1, r5, 0 - ldr r0, _080F3448 @ =gSpriteTemplate_83E4660 - ldm r0!, {r2,r3,r6} - stm r1!, {r2,r3,r6} - ldm r0!, {r2,r3,r6} - stm r1!, {r2,r3,r6} - mov r0, sp - bl LoadSpriteSheets - adds r0, r4, 0 - bl LoadSpritePalettes - movs r6, 0 - ldr r2, _080F344C @ =gUnknown_083DFEC4 - ldr r1, [r2] - ldr r3, _080F3450 @ =0x000087da - adds r0, r1, r3 - movs r4, 0 - ldrsh r0, [r0, r4] - subs r0, 0x1 - adds r7, r5, 0 - cmp r6, r0 - bge _080F347A - adds r5, r2, 0 - adds r0, r3, 0 - adds r0, r1 - mov r8, r0 -_080F3406: - lsls r4, r6, 2 - adds r2, r4, r6 - lsls r2, 18 - movs r1, 0x80 - lsls r1, 12 - adds r2, r1 - asrs r2, 16 - adds r0, r7, 0 - movs r1, 0xE2 - movs r3, 0 - bl CreateSprite - lsls r0, 24 - lsrs r3, r0, 24 - cmp r3, 0x40 - beq _080F345C - ldr r0, [r5] - ldr r2, _080F3454 @ =0x000087e4 - adds r0, r2 - adds r0, r4 - lsls r1, r3, 4 - adds r1, r3 - lsls r1, 2 - ldr r2, _080F3458 @ =gSprites - adds r1, r2 - str r1, [r0] - strh r6, [r1, 0x2E] - b _080F3468 - .align 2, 0 -_080F3440: .4byte gUnknown_083E4628 -_080F3444: .4byte gUnknown_083E4648 -_080F3448: .4byte gSpriteTemplate_83E4660 -_080F344C: .4byte gUnknown_083DFEC4 -_080F3450: .4byte 0x000087da -_080F3454: .4byte 0x000087e4 -_080F3458: .4byte gSprites -_080F345C: - ldr r0, [r5] - ldr r3, _080F34C8 @ =0x000087e4 - adds r0, r3 - adds r0, r4 - movs r1, 0 - str r1, [r0] -_080F3468: - adds r0, r6, 0x1 - lsls r0, 16 - lsrs r6, r0, 16 - mov r4, r8 - movs r1, 0 - ldrsh r0, [r4, r1] - subs r0, 0x1 - cmp r6, r0 - blt _080F3406 -_080F347A: - movs r0, 0x4 - strh r0, [r7] - ldr r0, _080F34CC @ =SpriteCallbackDummy - str r0, [r7, 0x14] - cmp r6, 0x5 - bhi _080F34EE - ldr r5, _080F34D0 @ =gUnknown_083DFEC4 -_080F3488: - lsls r4, r6, 2 - adds r2, r4, r6 - lsls r2, 18 - movs r3, 0x80 - lsls r3, 12 - adds r2, r3 - asrs r2, 16 - adds r0, r7, 0 - movs r1, 0xE6 - movs r3, 0 - bl CreateSprite - lsls r0, 24 - lsrs r3, r0, 24 - cmp r3, 0x40 - beq _080F34D8 - ldr r2, [r5] - ldr r0, _080F34C8 @ =0x000087e4 - adds r2, r0 - adds r2, r4 - lsls r1, r3, 4 - adds r1, r3 - lsls r1, 2 - ldr r0, _080F34D4 @ =gSprites - adds r1, r0 - str r1, [r2] - ldrb r2, [r1, 0x3] - movs r0, 0x3F - ands r0, r2 - strb r0, [r1, 0x3] - b _080F34E4 - .align 2, 0 -_080F34C8: .4byte 0x000087e4 -_080F34CC: .4byte SpriteCallbackDummy -_080F34D0: .4byte gUnknown_083DFEC4 -_080F34D4: .4byte gSprites -_080F34D8: - ldr r0, [r5] - ldr r1, _080F3548 @ =0x000087e4 - adds r0, r1 - adds r0, r4 - movs r1, 0 - str r1, [r0] -_080F34E4: - adds r0, r6, 0x1 - lsls r0, 16 - lsrs r6, r0, 16 - cmp r6, 0x5 - bls _080F3488 -_080F34EE: - movs r0, 0x5 - strh r0, [r7] - ldr r0, _080F354C @ =sub_80F3360 - str r0, [r7, 0x14] - lsls r5, r6, 2 - adds r2, r5, r6 - lsls r2, 18 - movs r3, 0x80 - lsls r3, 12 - adds r2, r3 - asrs r2, 16 - adds r0, r7, 0 - movs r1, 0xDE - movs r3, 0 - bl CreateSprite - lsls r0, 24 - lsrs r3, r0, 24 - cmp r3, 0x40 - beq _080F3558 - ldr r0, _080F3550 @ =gUnknown_083DFEC4 - ldr r4, [r0] - ldr r6, _080F3548 @ =0x000087e4 - adds r4, r6 - adds r4, r5 - lsls r1, r3, 4 - adds r1, r3 - lsls r1, 2 - ldr r0, _080F3554 @ =gSprites - adds r1, r0 - str r1, [r4] - ldrb r3, [r1, 0x1] - movs r2, 0x3F - adds r0, r2, 0 - ands r0, r3 - movs r3, 0x40 - orrs r0, r3 - strb r0, [r1, 0x1] - ldr r1, [r4] - ldrb r0, [r1, 0x3] - ands r2, r0 - movs r0, 0x80 - orrs r2, r0 - strb r2, [r1, 0x3] - b _080F3566 - .align 2, 0 -_080F3548: .4byte 0x000087e4 -_080F354C: .4byte sub_80F3360 -_080F3550: .4byte gUnknown_083DFEC4 -_080F3554: .4byte gSprites -_080F3558: - ldr r0, _080F3574 @ =gUnknown_083DFEC4 - ldr r0, [r0] - ldr r1, _080F3578 @ =0x000087e4 - adds r0, r1 - adds r0, r5 - movs r1, 0 - str r1, [r0] -_080F3566: - add sp, 0x50 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080F3574: .4byte gUnknown_083DFEC4 -_080F3578: .4byte 0x000087e4 - thumb_func_end sub_80F33A8 - - thumb_func_start sub_80F357C -sub_80F357C: @ 80F357C - push {r4-r6,lr} - movs r5, 0 - ldr r0, _080F35AC @ =gUnknown_083DFEC4 - ldr r0, [r0] - ldr r1, _080F35B0 @ =0x000087e4 - adds r6, r0, r1 -_080F3588: - lsls r0, r5, 2 - adds r4, r6, r0 - ldr r0, [r4] - cmp r0, 0 - beq _080F359A - bl DestroySprite - movs r0, 0 - str r0, [r4] -_080F359A: - adds r0, r5, 0x1 - lsls r0, 16 - lsrs r5, r0, 16 - cmp r5, 0x6 - bls _080F3588 - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_080F35AC: .4byte gUnknown_083DFEC4 -_080F35B0: .4byte 0x000087e4 - thumb_func_end sub_80F357C - - thumb_func_start sub_80F35B4 -sub_80F35B4: @ 80F35B4 - push {r4,lr} - ldr r0, _080F35FC @ =gUnknown_083DFEC4 - ldr r4, [r0] - ldr r1, _080F3600 @ =0x000076b0 - adds r0, r4, r1 - movs r1, 0x1C - strh r1, [r0] - ldr r1, _080F3604 @ =0x000076b2 - adds r2, r4, r1 - movs r1, 0x13 - strh r1, [r2] - bl sub_80F727C - bl sub_80F7404 - ldr r2, _080F3608 @ =gUnknown_083E4678 - movs r0, 0x1B - movs r1, 0x15 - bl sub_80F7920 - ldrb r1, [r0, 0x5] - movs r2, 0xC - orrs r1, r2 - strb r1, [r0, 0x5] - movs r1, 0xC0 - strh r1, [r0, 0x20] - movs r1, 0x20 - strh r1, [r0, 0x22] - ldr r1, _080F360C @ =sub_80F363C - str r1, [r0, 0x1C] - ldr r1, _080F3610 @ =0x000076ac - adds r4, r1 - str r0, [r4] - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080F35FC: .4byte gUnknown_083DFEC4 -_080F3600: .4byte 0x000076b0 -_080F3604: .4byte 0x000076b2 -_080F3608: .4byte gUnknown_083E4678 -_080F360C: .4byte sub_80F363C -_080F3610: .4byte 0x000076ac - thumb_func_end sub_80F35B4 - - thumb_func_start sub_80F3614 -sub_80F3614: @ 80F3614 - push {lr} - ldr r0, _080F3634 @ =gUnknown_083DFEC4 - ldr r0, [r0] - ldr r1, _080F3638 @ =0x000076ac - adds r0, r1 - ldr r0, [r0] - bl DestroySprite - movs r0, 0x1B - bl FreeSpriteTilesByTag - movs r0, 0x15 - bl FreeSpritePaletteByTag - pop {r0} - bx r0 - .align 2, 0 -_080F3634: .4byte gUnknown_083DFEC4 -_080F3638: .4byte 0x000076ac - thumb_func_end sub_80F3614 - - thumb_func_start sub_80F363C -sub_80F363C: @ 80F363C - push {lr} - ldr r1, _080F365C @ =gUnknown_083DFEC4 - ldr r1, [r1] - ldr r3, _080F3660 @ =0x00008fe9 - adds r2, r1, r3 - ldrb r2, [r2] - lsls r2, 24 - asrs r2, 24 - ldr r3, _080F3664 @ =0x00008934 - adds r1, r3 - adds r1, r2 - ldrb r1, [r1] - bl StartSpriteAnim - pop {r0} - bx r0 - .align 2, 0 -_080F365C: .4byte gUnknown_083DFEC4 -_080F3660: .4byte 0x00008fe9 -_080F3664: .4byte 0x00008934 - thumb_func_end sub_80F363C - - thumb_func_start sub_80F3668 -sub_80F3668: @ 80F3668 - push {lr} - ldr r0, _080F368C @ =gUnknown_083DFEC4 - ldr r0, [r0] - ldr r2, _080F3690 @ =0x00008fe9 - adds r1, r0, r2 - ldrb r1, [r1] - lsls r1, 24 - asrs r1, 24 - ldr r2, _080F3694 @ =0x00008934 - adds r0, r2 - adds r0, r1 - ldrb r0, [r0] - movs r1, 0xB0 - movs r2, 0x20 - bl sub_80F7418 - pop {r0} - bx r0 - .align 2, 0 -_080F368C: .4byte gUnknown_083DFEC4 -_080F3690: .4byte 0x00008fe9 -_080F3694: .4byte 0x00008934 - thumb_func_end sub_80F3668 - - thumb_func_start sub_80F3698 -sub_80F3698: @ 80F3698 - push {r4,lr} - ldr r0, _080F36DC @ =gUnknown_083DFEC4 - ldr r3, [r0] - ldr r1, _080F36E0 @ =0x000087dc - adds r0, r3, r1 - movs r2, 0 - ldrsh r1, [r0, r2] - lsls r1, 2 - ldr r4, _080F36E4 @ =0x0000893c - adds r1, r4 - adds r1, r3, r1 - ldr r2, _080F36E8 @ =0x00008fe9 - adds r0, r3, r2 - movs r2, 0 - ldrsb r2, [r0, r2] - subs r4, 0x8 - adds r0, r3, r4 - adds r0, r2 - ldr r2, _080F36EC @ =0x000076b4 - adds r3, r2 - ldrb r2, [r3] - strb r2, [r0] - ldrb r0, [r1, 0x1] - ldr r1, [r1] - lsls r1, 11 - lsrs r1, 27 - ldrb r2, [r3] - bl sub_80F4548 - bl sub_80F7470 - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080F36DC: .4byte gUnknown_083DFEC4 -_080F36E0: .4byte 0x000087dc -_080F36E4: .4byte 0x0000893c -_080F36E8: .4byte 0x00008fe9 -_080F36EC: .4byte 0x000076b4 - thumb_func_end sub_80F3698 - - thumb_func_start sub_80F36F0 -sub_80F36F0: @ 80F36F0 - push {lr} - ldr r0, _080F3718 @ =gUnknown_083DFEC4 - ldr r0, [r0] - ldr r1, _080F371C @ =0x00000306 - adds r2, r0, r1 - movs r1, 0 - strh r1, [r2] - ldr r1, _080F3720 @ =0x00006dac - adds r0, r1 - ldrb r0, [r0] - cmp r0, 0 - bne _080F3712 -_080F3708: - bl sub_80F3724 - lsls r0, 24 - cmp r0, 0 - bne _080F3708 -_080F3712: - pop {r0} - bx r0 - .align 2, 0 -_080F3718: .4byte gUnknown_083DFEC4 -_080F371C: .4byte 0x00000306 -_080F3720: .4byte 0x00006dac - thumb_func_end sub_80F36F0 - - thumb_func_start sub_80F3724 -sub_80F3724: @ 80F3724 - push {r4,lr} - ldr r0, _080F3740 @ =gUnknown_083DFEC4 - ldr r1, [r0] - ldr r0, _080F3744 @ =0x00000306 - adds r4, r1, r0 - ldrh r0, [r4] - cmp r0, 0x1 - beq _080F3764 - cmp r0, 0x1 - bgt _080F3748 - cmp r0, 0 - beq _080F374E - b _080F377A - .align 2, 0 -_080F3740: .4byte gUnknown_083DFEC4 -_080F3744: .4byte 0x00000306 -_080F3748: - cmp r0, 0x2 - beq _080F376E - b _080F377A -_080F374E: - ldr r0, _080F375C @ =gUnknown_083E3D00 - ldr r2, _080F3760 @ =0x0000984c - adds r1, r2 - bl LZ77UnCompWram - b _080F377E - .align 2, 0 -_080F375C: .4byte gUnknown_083E3D00 -_080F3760: .4byte 0x0000984c -_080F3764: - bl sub_80F379C - ldrh r0, [r4] - adds r0, 0x1 - strh r0, [r4] -_080F376E: - bl sub_80F37D0 - lsls r0, 24 - cmp r0, 0 - beq _080F377E - b _080F378C -_080F377A: - movs r0, 0 - b _080F378E -_080F377E: - ldr r0, _080F3794 @ =gUnknown_083DFEC4 - ldr r1, [r0] - ldr r0, _080F3798 @ =0x00000306 - adds r1, r0 - ldrh r0, [r1] - adds r0, 0x1 - strh r0, [r1] -_080F378C: - movs r0, 0x1 -_080F378E: - pop {r4} - pop {r1} - bx r1 - .align 2, 0 -_080F3794: .4byte gUnknown_083DFEC4 -_080F3798: .4byte 0x00000306 - thumb_func_end sub_80F3724 - - thumb_func_start sub_80F379C -sub_80F379C: @ 80F379C - push {lr} - ldr r0, _080F37C4 @ =gUnknown_083DFEC4 - ldr r0, [r0] - ldr r1, _080F37C8 @ =0x0000bc93 - adds r2, r0, r1 - movs r1, 0 - strb r1, [r2] - ldr r1, _080F37CC @ =0x00006dac - adds r0, r1 - ldrb r0, [r0] - cmp r0, 0 - bne _080F37BE -_080F37B4: - bl sub_80F37D0 - lsls r0, 24 - cmp r0, 0 - bne _080F37B4 -_080F37BE: - pop {r0} - bx r0 - .align 2, 0 -_080F37C4: .4byte gUnknown_083DFEC4 -_080F37C8: .4byte 0x0000bc93 -_080F37CC: .4byte 0x00006dac - thumb_func_end sub_80F379C - thumb_func_start sub_80F37D0 sub_80F37D0: @ 80F37D0 push {r4-r7,lr} diff --git a/include/pokenav.h b/include/pokenav.h index 22fa0ac0c..22bda9104 100644 --- a/include/pokenav.h +++ b/include/pokenav.h @@ -2,6 +2,7 @@ #define GUARD_POKENAV_H #include "region_map.h" +#include "mon_markings.h" struct UnkPokenavStruct_Sub { /*0x0*/ u16 unk0; @@ -91,7 +92,8 @@ struct UnkPokenavStruct { /*0x769E*/ u8 unk769E; /*0x769F*/ u8 filler769F[0xB]; /*0x76AA*/ u8 unk76AA; - /*0x76AB*/ u8 filler76AB[0x10b9]; + /*0x76AC*/ struct Sprite *unk76AC; + /*0x76B0*/ struct PokemonMarkMenu unk76B0; /*0x8764*/ u16 unk8764; /*0x8766*/ s16 unk8766; /*0x8768*/ struct Sprite *unk8768; @@ -111,7 +113,7 @@ struct UnkPokenavStruct { /*0x8786*/ u16 unk8786; /*0x8788*/ u8 unk8788[0x40]; /*0x87C8*/ u8 unk87C8; - /*0x87C9*/ u8 filler87C9; + /*0x87C9*/ u8 unk87C9; /*0x87CA*/ u8 unk87CA; /*0x87CC*/ struct Sprite *unk87CC; /*0x87D0*/ struct Sprite *unk87D0[2]; @@ -120,11 +122,13 @@ struct UnkPokenavStruct { /*0x87DC*/ s16 unk87DC; /*0x87DE*/ s16 unk87DE; /*0x87E0*/ void *unk87E0; - /*0x87E4*/ u8 filler87E4[0x44]; + /*0x87E4*/ struct Sprite *unk87E4[7]; + /*0x8800*/ u8 filler8800[0x28]; /*0x8828*/ u8 unk8828; /*0x8829*/ u8 unk8829[3][64]; /*0x88E9*/ u8 unk88E9[3][24]; - /*0x8931*/ u8 unk8931[11]; + /*0x8931*/ u8 unk8931[3]; + /*0x8934*/ u8 unk8934[8]; /*0x893C*/ struct UnkUsePokeblockSub unk893c[0x1ab]; /*0x8fe8*/ u8 fil8fe8[1]; /*0x8fe9*/ s8 unk8fe9; @@ -135,13 +139,16 @@ struct UnkPokenavStruct { /*0x9040*/ u8 unk9040[0x304]; /*0x9344*/ u8 unk9344; /*0x9345*/ u8 filler9345[7]; - /*0x934C*/ u16 unk934C[0x1480]; + /*0x934C*/ u16 unk934C[0x280]; + /*0x984C*/ u8 unk984C[0x2400]; /*0xBC4C*/ u8 unkBC4C[0x42]; /*0xBC8E*/ u8 unkBC8E; /*0xBC8F*/ u8 unkBC8F; /*0xBC90*/ u8 unkBC90; /*0xBC91*/ u8 unkBC91; - /*0xBC92*/ u8 fillerBC92[0x8]; + /*0xBC92*/ u8 fillerBC92[0x1]; + /*0xBC93*/ u8 unkBC93; + /*0xBC94*/ u8 fillerBC94[0x6]; /*0xBC9A*/ u8 unkBC9A; /*0xBC9B*/ u8 unkBC9B; /*0xBC9C*/ u8 unkBC9C[22][200]; diff --git a/src/pokenav_before.c b/src/pokenav_before.c index 0ce246ebd..28b3c685f 100644 --- a/src/pokenav_before.c +++ b/src/pokenav_before.c @@ -191,6 +191,11 @@ extern const struct SpritePalette gUnknown_083E45A8; extern const u16 gUnknown_08E9F988[]; extern const struct SpriteTemplate gSpriteTemplate_83E45B8; extern const struct SpriteTemplate gSpriteTemplate_83E45F0; +extern const struct SpriteSheet gUnknown_083E4628[4]; +extern const struct SpritePalette gUnknown_083E4648[3]; +extern const struct SpriteTemplate gSpriteTemplate_83E4660; +extern const u16 gUnknown_083E4678[]; +extern const u8 gUnknown_083E3D00[]; extern u16 gUnknown_020388B4; extern u8 gUnknown_020388B0[]; @@ -305,6 +310,16 @@ static void sub_80F2DF4(void); static void sub_80F2FEC(struct Sprite *sprite); static void sub_80F2FB0(void); static void sub_80F3008(u8); +static void sub_80F3130(void); +static void sub_80F3264(void); +static void sub_80F3294(u8); +static void sub_80F35B4(void); +static void sub_80F363C(struct Sprite *sprite); +void sub_80F4548(u16, u16, u8); +static void sub_80F36F0(void); +static bool8 sub_80F3724(void); +static void sub_80F379C(void); +bool8 sub_80F37D0(void); extern void sub_80F0900(void); extern void sub_80F443C(u8 *, u16); @@ -320,7 +335,6 @@ extern void sub_80EF7D4(void); extern void sub_80EF54C(u8); extern void sub_80EF58C(u8); extern void sub_80F6FFC(); -extern void sub_80F3294(); extern void sub_80F6FB8(); extern void sub_80F6DB8(); extern bool8 sub_80F6E9C(); @@ -347,15 +361,12 @@ extern bool8 sub_80F63D0(); extern void sub_80F4CF0(); extern void sub_80EFF34(); extern bool8 sub_80EFF68(); -extern void sub_80F35B4(); extern void sub_80F6134(); extern u8 sub_80F5DD4(); -extern bool8 sub_80F3264(); extern void sub_80F4D44(); extern bool8 sub_80F4D88(); extern void sub_80F0264(u8); extern bool8 sub_80F02A0(); -extern void sub_80F3130(); extern void sub_80EF9F8(void); extern bool8 sub_80EFBDC(bool8); extern void sub_80EFBB0(void); @@ -372,8 +383,6 @@ extern void sub_80EF248(u8); extern bool8 sub_80EF284(u8); extern void sub_80EF428(u8, u8); extern bool8 sub_80EEF78(); -extern void sub_80F36F0(); -extern bool8 sub_80F3724(); extern void sub_80EBC10(); extern void sub_80EBDBC(void (*func)(void)); extern void sub_80EBBE8(); @@ -7073,3 +7082,258 @@ static void sub_80F3008(u8 arg0) } } } + +static void sub_80F3130(void) +{ + u16 i; + + if (gUnknown_083DFEC4->unk87CC) + { + DestroySprite(gUnknown_083DFEC4->unk87CC); + FreeSpriteTilesByTag(0x9); + FreeSpritePaletteByTag(0x9); + gUnknown_083DFEC4->unk87CC = NULL; + } + + for (i = 0; i < 2; i++) + { + if (gUnknown_083DFEC4->unk87D0[i]) + { + DestroySprite(gUnknown_083DFEC4->unk87D0[i]); + gUnknown_083DFEC4->unk87D0[i] = NULL; + } + } + + FreeSpriteTilesByTag(0xA); +} + +void sub_80F3190(struct Sprite *sprite) +{ + sprite->pos1.y = gUnknown_083DFEC4->unk876C * 16 + 16; +} + +void sub_80F31AC(struct Sprite *sprite) +{ + if (gUnknown_083DFEC4->unk87C9) + { + if (sprite->data[4]) + { + if (!sprite->data[3]) + sprite->invisible = gUnknown_083DFEC4->unk8770 == 0; + else + sprite->invisible = gUnknown_083DFEC4->unk8772 == gUnknown_083DFEC4->unk8774; + + sprite->data[4] = 0; + } + + if (++sprite->data[0] > 4) + { + sprite->data[0] = 0; + if (++sprite->data[1] < 5) + { + sprite->pos2.y += sprite->data[2]; + } + else + { + sprite->data[1] = 0; + sprite->pos2.y = 0; + } + } + } +} + +static void sub_80F3264(void) +{ + u16 i; + + for (i = 0; i < 2; i++) + { + if (gUnknown_083DFEC4->unk87D0[i]) + gUnknown_083DFEC4->unk87D0[i]->data[4] = 1; + } +} + +static void sub_80F3294(u8 arg0) +{ + gUnknown_083DFEC4->unk87CC->invisible = arg0; + if (gUnknown_083DFEC4->unk87C9) + { + if (arg0 == 1) + { + gUnknown_083DFEC4->unk87D0[0]->invisible = arg0; + gUnknown_083DFEC4->unk87D0[1]->invisible = arg0; + } + else + { + gUnknown_083DFEC4->unk87D0[0]->data[4] = 1; + gUnknown_083DFEC4->unk87D0[1]->data[4] = 1; + } + } +} + +void sub_80F3328(struct Sprite *sprite) +{ + if (sprite->data[0] == gUnknown_083DFEC4->unk87DC) + StartSpriteAnim(sprite, 0); + else + StartSpriteAnim(sprite, 1); +} + +static void sub_80F3360(struct Sprite *sprite) +{ + if (gUnknown_083DFEC4->unk87DC == gUnknown_083DFEC4->unk87DA - 1) + sprite->oam.paletteNum = IndexOfSpritePaletteTag(0x4); + else + sprite->oam.paletteNum = IndexOfSpritePaletteTag(0x5); +} + +void sub_80F33A8(void) +{ + u16 i; + u8 spriteId; + struct SpriteSheet spriteSheets[4]; + struct SpritePalette spritePalettes[3]; + struct SpriteTemplate spriteTemplate; + + memcpy(spriteSheets, gUnknown_083E4628, sizeof(gUnknown_083E4628)); + memcpy(spritePalettes, gUnknown_083E4648, sizeof(gUnknown_083E4648)); + spriteTemplate = gSpriteTemplate_83E4660; + LoadSpriteSheets(spriteSheets); + LoadSpritePalettes(spritePalettes); + + for (i = 0; i < gUnknown_083DFEC4->unk87DA - 1; i++) + { + spriteId = CreateSprite(&spriteTemplate, 226, i * 20 + 8, 0); + if (spriteId != MAX_SPRITES) + { + gUnknown_083DFEC4->unk87E4[i] = &gSprites[spriteId]; + gUnknown_083DFEC4->unk87E4[i]->data[0] = i; + } + else + { + gUnknown_083DFEC4->unk87E4[i] = NULL; + } + } + + spriteTemplate.tileTag = 0x4; + spriteTemplate.callback = SpriteCallbackDummy; + for (; i < 6; i++) + { + spriteId = CreateSprite(&spriteTemplate, 230, i * 20 + 8, 0); + if (spriteId != MAX_SPRITES) + { + gUnknown_083DFEC4->unk87E4[i] = &gSprites[spriteId]; + gUnknown_083DFEC4->unk87E4[i]->oam.size = 0; + } + else + { + gUnknown_083DFEC4->unk87E4[i] = NULL; + } + } + + spriteTemplate.tileTag = 0x5; + spriteTemplate.callback = sub_80F3360; + spriteId = CreateSprite(&spriteTemplate, 222, i * 20 + 8, 0); + if (spriteId != MAX_SPRITES) + { + gUnknown_083DFEC4->unk87E4[i] = &gSprites[spriteId]; + gUnknown_083DFEC4->unk87E4[i]->oam.shape = ST_OAM_H_RECTANGLE; + gUnknown_083DFEC4->unk87E4[i]->oam.size = 2; + } + else + { + gUnknown_083DFEC4->unk87E4[i] = NULL; + } +} + +void sub_80F357C(void) +{ + u16 i; + + for (i = 0; i < 7; i++) + { + if (gUnknown_083DFEC4->unk87E4[i]) + { + DestroySprite(gUnknown_083DFEC4->unk87E4[i]); + gUnknown_083DFEC4->unk87E4[i] = NULL; + } + } +} + +static void sub_80F35B4(void) +{ + struct Sprite *sprite; + + gUnknown_083DFEC4->unk76B0.baseTileTag = 0x1C; + gUnknown_083DFEC4->unk76B0.basePaletteTag = 0x13; + sub_80F727C(&gUnknown_083DFEC4->unk76B0); + sub_80F7404(); + sprite = sub_80F7920(27, 21, gUnknown_083E4678); + sprite->oam.priority = 3; + sprite->pos1.x = 192; + sprite->pos1.y = 32; + sprite->callback = sub_80F363C; + gUnknown_083DFEC4->unk76AC = sprite; +} + +void sub_80F3614(void) +{ + DestroySprite(gUnknown_083DFEC4->unk76AC); + FreeSpriteTilesByTag(0x1B); + FreeSpritePaletteByTag(0x15); +} + +static void sub_80F363C(struct Sprite *sprite) +{ + StartSpriteAnim(sprite, gUnknown_083DFEC4->unk8934[gUnknown_083DFEC4->unk8fe9]); +} + +void sub_80F3668(void) +{ + sub_80F7418(gUnknown_083DFEC4->unk8934[gUnknown_083DFEC4->unk8fe9], 176, 32); +} + +void sub_80F3698(void) +{ + struct UnkUsePokeblockSub *var0 = &gUnknown_083DFEC4->unk893c[gUnknown_083DFEC4->unk87DC]; + gUnknown_083DFEC4->unk8934[gUnknown_083DFEC4->unk8fe9] = gUnknown_083DFEC4->unk76B0.markings; + sub_80F4548(var0->unk1, var0->partyIdx, gUnknown_083DFEC4->unk76B0.markings); + sub_80F7470(); +} + +static void sub_80F36F0(void) +{ + gUnknown_083DFEC4->unk306 = 0; + if (!gUnknown_083DFEC4->unk6DAC) + while (sub_80F3724()); +} + +static bool8 sub_80F3724(void) +{ + switch (gUnknown_083DFEC4->unk306) + { + case 0: + LZ77UnCompWram(gUnknown_083E3D00, gUnknown_083DFEC4->unk984C); + break; + case 1: + sub_80F379C(); + gUnknown_083DFEC4->unk306++; + // fall through + case 2: + if (sub_80F37D0()) + return TRUE; + break; + default: + return FALSE; + } + + gUnknown_083DFEC4->unk306++; + return TRUE; +} + +static void sub_80F379C(void) +{ + gUnknown_083DFEC4->unkBC93 = 0; + if (!gUnknown_083DFEC4->unk6DAC) + while (sub_80F37D0()); +} -- cgit v1.2.3 From 8e79b6961dd0294c34e68eef7768411110589ec1 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sat, 18 Aug 2018 13:49:01 -0500 Subject: Decompile more pokenav --- asm/pokenav.s | 906 --------------------------------------------------- include/pokenav.h | 10 +- src/pokenav_before.c | 344 ++++++++++++++++++- 3 files changed, 340 insertions(+), 920 deletions(-) diff --git a/asm/pokenav.s b/asm/pokenav.s index a0f60c553..de906a926 100644 --- a/asm/pokenav.s +++ b/asm/pokenav.s @@ -5,912 +5,6 @@ .text - thumb_func_start sub_80F37D0 -sub_80F37D0: @ 80F37D0 - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - ldr r0, _080F3898 @ =gUnknown_083DFEC4 - ldr r1, [r0] - ldr r2, _080F389C @ =0x0000bc93 - adds r1, r2 - ldrb r1, [r1] - adds r2, r0, 0 - cmp r1, 0xB - bhi _080F38A8 - movs r3, 0 - mov r8, r3 - movs r7, 0xF - mov r9, r7 -_080F37F0: - ldr r2, [r2] - ldr r1, _080F389C @ =0x0000bc93 - adds r0, r2, r1 - ldrb r1, [r0] - lsls r0, r1, 8 - ldr r3, _080F38A0 @ =0x0000984c - adds r0, r3 - adds r4, r2, r0 - lsls r1, 9 - ldr r7, _080F38A4 @ =0x0000a44c - adds r1, r7 - adds r5, r2, r1 - movs r6, 0 -_080F380A: - adds r0, r4, 0 - adds r1, r5, 0 - movs r2, 0x10 - bl CpuFastSet - adds r5, 0x40 - adds r4, 0x20 - movs r1, 0 - adds r6, 0x1 - mov r12, r6 -_080F381E: - movs r0, 0 - adds r6, r1, 0x1 -_080F3822: - adds r4, 0x4 - movs r2, 0 - adds r3, r0, 0x1 -_080F3828: - subs r4, 0x1 - ldrb r0, [r4] - lsls r1, r0, 4 - lsrs r0, 4 - mov r7, r9 - ands r0, r7 - orrs r1, r0 - strb r1, [r5] - adds r5, 0x1 - adds r0, r2, 0x1 - lsls r0, 24 - lsrs r2, r0, 24 - cmp r2, 0x3 - bls _080F3828 - adds r4, 0x4 - lsls r0, r3, 24 - lsrs r0, 24 - cmp r0, 0x7 - bls _080F3822 - subs r4, 0x40 - lsls r0, r6, 24 - lsrs r1, r0, 24 - cmp r1, 0x1 - bls _080F381E - adds r4, 0x60 - mov r1, r12 - lsls r0, r1, 24 - lsrs r6, r0, 24 - cmp r6, 0x3 - bls _080F380A - ldr r2, _080F3898 @ =gUnknown_083DFEC4 - ldr r3, [r2] - ldr r7, _080F389C @ =0x0000bc93 - adds r1, r3, r7 - ldrb r0, [r1] - adds r0, 0x1 - strb r0, [r1] - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0xB - bhi _080F38A8 - mov r0, r8 - adds r0, 0x1 - lsls r0, 16 - lsrs r0, 16 - mov r8, r0 - cmp r0, 0x1 - bls _080F37F0 - adds r1, r7, 0 - adds r0, r3, r1 - ldrb r0, [r0] - cmp r0, 0xB - bhi _080F38A8 - movs r0, 0x1 - b _080F38AA - .align 2, 0 -_080F3898: .4byte gUnknown_083DFEC4 -_080F389C: .4byte 0x0000bc93 -_080F38A0: .4byte 0x0000984c -_080F38A4: .4byte 0x0000a44c -_080F38A8: - movs r0, 0 -_080F38AA: - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end sub_80F37D0 - - thumb_func_start sub_80F38B8 -sub_80F38B8: @ 80F38B8 - push {lr} - ldr r0, _080F38E0 @ =gUnknown_083DFEC4 - ldr r0, [r0] - ldr r1, _080F38E4 @ =0x00000306 - adds r2, r0, r1 - movs r1, 0 - strh r1, [r2] - ldr r1, _080F38E8 @ =0x00006dac - adds r0, r1 - ldrb r0, [r0] - cmp r0, 0 - bne _080F38DA -_080F38D0: - bl sub_80F38EC - lsls r0, 24 - cmp r0, 0 - bne _080F38D0 -_080F38DA: - pop {r0} - bx r0 - .align 2, 0 -_080F38E0: .4byte gUnknown_083DFEC4 -_080F38E4: .4byte 0x00000306 -_080F38E8: .4byte 0x00006dac - thumb_func_end sub_80F38B8 - - thumb_func_start sub_80F38EC -sub_80F38EC: @ 80F38EC - push {r4,lr} - ldr r0, _080F3908 @ =gUnknown_083DFEC4 - ldr r2, [r0] - ldr r0, _080F390C @ =0x00000306 - adds r4, r2, r0 - ldrh r1, [r4] - cmp r1, 0x1 - beq _080F3930 - cmp r1, 0x1 - bgt _080F3910 - cmp r1, 0 - beq _080F391A - b _080F394E - .align 2, 0 -_080F3908: .4byte gUnknown_083DFEC4 -_080F390C: .4byte 0x00000306 -_080F3910: - cmp r1, 0x2 - beq _080F3938 - cmp r1, 0x3 - beq _080F3942 - b _080F394E -_080F391A: - ldr r3, _080F3928 @ =0x00009348 - adds r0, r2, r3 - str r1, [r0] - ldr r3, _080F392C @ =0x0000bc92 - adds r0, r2, r3 - strb r1, [r0] - b _080F3952 - .align 2, 0 -_080F3928: .4byte 0x00009348 -_080F392C: .4byte 0x0000bc92 -_080F3930: - movs r0, 0 - bl sub_80F2E18 - b _080F3952 -_080F3938: - bl sub_80F3970 - ldrh r0, [r4] - adds r0, 0x1 - strh r0, [r4] -_080F3942: - bl sub_80F39A4 - lsls r0, 24 - cmp r0, 0 - beq _080F3952 - b _080F3960 -_080F394E: - movs r0, 0 - b _080F3962 -_080F3952: - ldr r0, _080F3968 @ =gUnknown_083DFEC4 - ldr r1, [r0] - ldr r0, _080F396C @ =0x00000306 - adds r1, r0 - ldrh r0, [r1] - adds r0, 0x1 - strh r0, [r1] -_080F3960: - movs r0, 0x1 -_080F3962: - pop {r4} - pop {r1} - bx r1 - .align 2, 0 -_080F3968: .4byte gUnknown_083DFEC4 -_080F396C: .4byte 0x00000306 - thumb_func_end sub_80F38EC - - thumb_func_start sub_80F3970 -sub_80F3970: @ 80F3970 - push {lr} - ldr r0, _080F3998 @ =gUnknown_083DFEC4 - ldr r0, [r0] - ldr r1, _080F399C @ =0x0000bc93 - adds r2, r0, r1 - movs r1, 0 - strb r1, [r2] - ldr r1, _080F39A0 @ =0x00006dac - adds r0, r1 - ldrb r0, [r0] - cmp r0, 0 - bne _080F3992 -_080F3988: - bl sub_80F39A4 - lsls r0, 24 - cmp r0, 0 - bne _080F3988 -_080F3992: - pop {r0} - bx r0 - .align 2, 0 -_080F3998: .4byte gUnknown_083DFEC4 -_080F399C: .4byte 0x0000bc93 -_080F39A0: .4byte 0x00006dac - thumb_func_end sub_80F3970 - - thumb_func_start sub_80F39A4 -sub_80F39A4: @ 80F39A4 - push {r4,r5,lr} - sub sp, 0x10 - ldr r0, _080F3A18 @ =gUnknown_083DFEC4 - ldr r1, [r0] - ldr r0, _080F3A1C @ =0x0000bc93 - adds r4, r1, r0 - ldrb r0, [r4] - cmp r0, 0xB - bhi _080F3A30 - ldrb r0, [r4] - lsls r0, 9 - ldr r2, _080F3A20 @ =0x0000a44c - adds r0, r2 - adds r0, r1, r0 - str r0, [sp] - ldr r5, _080F3A24 @ =0xffff0000 - ldr r2, [sp, 0x4] - ands r2, r5 - movs r0, 0x80 - lsls r0, 2 - orrs r2, r0 - str r2, [sp, 0x4] - ldrb r1, [r4] - adds r1, 0xB - lsls r1, 16 - ldr r0, _080F3A28 @ =0x0000ffff - ands r0, r2 - orrs r0, r1 - str r0, [sp, 0x4] - mov r0, sp - bl LoadSpriteSheet - ldrb r0, [r4] - cmp r0, 0x4 - bhi _080F3A04 - lsls r0, 5 - ldr r1, _080F3A2C @ =gUnknown_083E3C60 - adds r0, r1 - str r0, [sp, 0x8] - ldrb r2, [r4] - adds r2, 0xA - add r0, sp, 0x8 - ldr r1, [r0, 0x4] - ands r1, r5 - orrs r1, r2 - str r1, [r0, 0x4] - bl LoadSpritePalette -_080F3A04: - ldrb r0, [r4] - adds r0, 0x1 - strb r0, [r4] - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0xB - bhi _080F3A30 - movs r0, 0x1 - b _080F3A32 - .align 2, 0 -_080F3A18: .4byte gUnknown_083DFEC4 -_080F3A1C: .4byte 0x0000bc93 -_080F3A20: .4byte 0x0000a44c -_080F3A24: .4byte 0xffff0000 -_080F3A28: .4byte 0x0000ffff -_080F3A2C: .4byte gUnknown_083E3C60 -_080F3A30: - movs r0, 0 -_080F3A32: - add sp, 0x10 - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_80F39A4 - - thumb_func_start sub_80F3A3C -sub_80F3A3C: @ 80F3A3C - push {r4-r7,lr} - sub sp, 0x18 - lsls r0, 16 - lsrs r5, r0, 16 - lsls r1, 16 - lsrs r4, r1, 16 - cmp r4, 0x2 - bhi _080F3A60 - lsls r0, r4, 3 - adds r0, r4 - adds r0, r5, r0 - lsls r0, 16 - lsrs r1, r0, 16 - ldr r2, _080F3A5C @ =gUnknown_083DFEC4 - b _080F3A78 - .align 2, 0 -_080F3A5C: .4byte gUnknown_083DFEC4 -_080F3A60: - ldr r2, _080F3AD0 @ =gUnknown_083DFEC4 - ldr r1, [r2] - ldr r3, _080F3AD4 @ =0x0000bc8e - adds r0, r1, r3 - ldrb r0, [r0] - ldr r6, _080F3AD8 @ =0x0000bc8f - adds r1, r6 - ldrb r1, [r1] - subs r0, r1 - adds r0, r5, r0 - lsls r0, 16 - lsrs r1, r0, 16 -_080F3A78: - ldr r0, [r2] - ldr r7, _080F3ADC @ =0x0000bc4c - adds r0, r7 - adds r0, r1 - ldrb r2, [r0] - mov r1, sp - ldr r0, _080F3AE0 @ =gSpriteTemplate_83E476C - ldm r0!, {r3,r6,r7} - stm r1!, {r3,r6,r7} - ldm r0!, {r3,r6,r7} - stm r1!, {r3,r6,r7} - mov r3, sp - ldr r1, _080F3AE4 @ =gPokenavRibbonsIconGfx - lsls r2, 2 - adds r0, r2, r1 - ldrh r0, [r0] - adds r0, 0xB - strh r0, [r3] - adds r1, 0x2 - adds r2, r1 - ldrh r0, [r2] - adds r0, 0xA - strh r0, [r3, 0x2] - lsls r1, r5, 20 - movs r0, 0xC0 - lsls r0, 15 - adds r1, r0 - asrs r1, 16 - lsls r2, r4, 20 - movs r3, 0xA0 - lsls r3, 14 - adds r2, r3 - asrs r2, 16 - mov r0, sp - movs r3, 0x2 - bl CreateSprite - lsls r0, 24 - lsrs r1, r0, 24 - cmp r1, 0x40 - bne _080F3AE8 - movs r0, 0 - b _080F3AF2 - .align 2, 0 -_080F3AD0: .4byte gUnknown_083DFEC4 -_080F3AD4: .4byte 0x0000bc8e -_080F3AD8: .4byte 0x0000bc8f -_080F3ADC: .4byte 0x0000bc4c -_080F3AE0: .4byte gSpriteTemplate_83E476C -_080F3AE4: .4byte gPokenavRibbonsIconGfx -_080F3AE8: - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - ldr r1, _080F3AFC @ =gSprites - adds r0, r1 -_080F3AF2: - add sp, 0x18 - pop {r4-r7} - pop {r1} - bx r1 - .align 2, 0 -_080F3AFC: .4byte gSprites - thumb_func_end sub_80F3A3C - - thumb_func_start sub_80F3B00 -sub_80F3B00: @ 80F3B00 - push {r4,lr} - ldr r0, _080F3B34 @ =gUnknown_083DFEC4 - ldr r4, [r0] - ldr r1, _080F3B38 @ =0x0000bc90 - adds r0, r4, r1 - ldrb r0, [r0] - ldr r2, _080F3B3C @ =0x0000bc91 - adds r1, r4, r2 - ldrb r1, [r1] - bl sub_80F3A3C - adds r2, r0, 0 - ldr r1, _080F3B40 @ =0x00009348 - adds r0, r4, r1 - str r2, [r0] - cmp r2, 0 - beq _080F3B48 - adds r0, r2, 0 - movs r1, 0x1 - bl StartSpriteAffineAnim - ldr r2, _080F3B44 @ =0x0000bc92 - adds r1, r4, r2 - movs r0, 0x1 - strb r0, [r1] - b _080F3B4E - .align 2, 0 -_080F3B34: .4byte gUnknown_083DFEC4 -_080F3B38: .4byte 0x0000bc90 -_080F3B3C: .4byte 0x0000bc91 -_080F3B40: .4byte 0x00009348 -_080F3B44: .4byte 0x0000bc92 -_080F3B48: - ldr r1, _080F3B54 @ =0x0000bc92 - adds r0, r4, r1 - strb r2, [r0] -_080F3B4E: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080F3B54: .4byte 0x0000bc92 - thumb_func_end sub_80F3B00 - - thumb_func_start sub_80F3B58 -sub_80F3B58: @ 80F3B58 - push {lr} - ldr r0, _080F3B6C @ =gUnknown_083DFEC4 - ldr r1, [r0] - ldr r0, _080F3B70 @ =0x0000bc92 - adds r2, r1, r0 - ldrb r0, [r2] - cmp r0, 0 - bne _080F3B74 - movs r0, 0 - b _080F3B8A - .align 2, 0 -_080F3B6C: .4byte gUnknown_083DFEC4 -_080F3B70: .4byte 0x0000bc92 -_080F3B74: - ldr r3, _080F3B90 @ =0x00009348 - adds r0, r1, r3 - ldr r0, [r0] - adds r0, 0x3F - ldrb r0, [r0] - lsrs r0, 5 - movs r1, 0x1 - eors r0, r1 - ands r0, r1 - strb r0, [r2] - ldrb r0, [r2] -_080F3B8A: - pop {r1} - bx r1 - .align 2, 0 -_080F3B90: .4byte 0x00009348 - thumb_func_end sub_80F3B58 - - thumb_func_start sub_80F3B94 -sub_80F3B94: @ 80F3B94 - push {r4,lr} - ldr r0, _080F3BB8 @ =gUnknown_083DFEC4 - ldr r4, [r0] - ldr r1, _080F3BBC @ =0x00009348 - adds r0, r4, r1 - ldr r2, [r0] - cmp r2, 0 - beq _080F3BC4 - adds r0, r2, 0 - movs r1, 0x2 - bl StartSpriteAffineAnim - ldr r0, _080F3BC0 @ =0x0000bc92 - adds r1, r4, r0 - movs r0, 0x1 - strb r0, [r1] - b _080F3BCA - .align 2, 0 -_080F3BB8: .4byte gUnknown_083DFEC4 -_080F3BBC: .4byte 0x00009348 -_080F3BC0: .4byte 0x0000bc92 -_080F3BC4: - ldr r1, _080F3BD0 @ =0x0000bc92 - adds r0, r4, r1 - strb r2, [r0] -_080F3BCA: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080F3BD0: .4byte 0x0000bc92 - thumb_func_end sub_80F3B94 - - thumb_func_start sub_80F3BD4 -sub_80F3BD4: @ 80F3BD4 - push {r4-r6,lr} - ldr r0, _080F3C18 @ =gUnknown_083DFEC4 - ldr r1, [r0] - ldr r0, _080F3C1C @ =0x0000bc92 - adds r5, r1, r0 - ldrb r0, [r5] - cmp r0, 0 - beq _080F3C24 - ldr r0, _080F3C20 @ =0x00009348 - adds r4, r1, r0 - ldr r0, [r4] - adds r0, 0x3F - ldrb r0, [r0] - lsrs r0, 5 - movs r1, 0x1 - eors r0, r1 - ands r0, r1 - strb r0, [r5] - adds r6, r0, 0 - cmp r6, 0 - bne _080F3C12 - ldr r0, [r4] - ldrb r0, [r0, 0x3] - lsls r0, 26 - lsrs r0, 27 - bl FreeOamMatrix - ldr r0, [r4] - bl DestroySprite - str r6, [r4] -_080F3C12: - ldrb r0, [r5] - b _080F3C26 - .align 2, 0 -_080F3C18: .4byte gUnknown_083DFEC4 -_080F3C1C: .4byte 0x0000bc92 -_080F3C20: .4byte 0x00009348 -_080F3C24: - movs r0, 0 -_080F3C26: - pop {r4-r6} - pop {r1} - bx r1 - thumb_func_end sub_80F3BD4 - - thumb_func_start sub_80F3C2C -sub_80F3C2C: @ 80F3C2C - push {r4,lr} - ldr r0, _080F3C8C @ =gUnknown_083DFEC4 - ldr r0, [r0] - ldr r1, _080F3C90 @ =0x00009348 - adds r4, r0, r1 - ldr r0, [r4] - cmp r0, 0 - beq _080F3C50 - ldrb r0, [r0, 0x3] - lsls r0, 26 - lsrs r0, 27 - bl FreeOamMatrix - ldr r0, [r4] - bl DestroySprite - movs r0, 0 - str r0, [r4] -_080F3C50: - movs r4, 0 -_080F3C52: - adds r0, r4, 0 - adds r0, 0xB - lsls r0, 16 - lsrs r0, 16 - bl FreeSpriteTilesByTag - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 - cmp r4, 0xB - bls _080F3C52 - movs r4, 0 -_080F3C6A: - adds r0, r4, 0 - adds r0, 0xA - lsls r0, 16 - lsrs r0, 16 - bl FreeSpritePaletteByTag - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 - cmp r4, 0x4 - bls _080F3C6A - bl sub_80F2F48 - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080F3C8C: .4byte gUnknown_083DFEC4 -_080F3C90: .4byte 0x00009348 - thumb_func_end sub_80F3C2C - - thumb_func_start sub_80F3C94 -sub_80F3C94: @ 80F3C94 - push {lr} - sub sp, 0x10 - ldr r0, _080F3CDC @ =gUnknown_083E4784 - ldr r1, [r0, 0x4] - ldr r0, [r0] - str r0, [sp] - str r1, [sp, 0x4] - ldr r0, _080F3CE0 @ =gUnknown_083E478C - ldr r1, [r0, 0x4] - ldr r0, [r0] - str r0, [sp, 0x8] - str r1, [sp, 0xC] - mov r0, sp - bl LoadSpriteSheet - add r0, sp, 0x8 - bl LoadSpritePalette - movs r1, 0 - ldr r0, _080F3CE4 @ =gUnknown_083DFEC4 - ldr r0, [r0] - movs r3, 0x88 - lsls r3, 8 - adds r2, r0, r3 - movs r3, 0 -_080F3CC6: - lsls r0, r1, 2 - adds r0, r2, r0 - str r3, [r0] - adds r0, r1, 0x1 - lsls r0, 16 - lsrs r1, r0, 16 - cmp r1, 0x9 - bls _080F3CC6 - add sp, 0x10 - pop {r0} - bx r0 - .align 2, 0 -_080F3CDC: .4byte gUnknown_083E4784 -_080F3CE0: .4byte gUnknown_083E478C -_080F3CE4: .4byte gUnknown_083DFEC4 - thumb_func_end sub_80F3C94 - - thumb_func_start sub_80F3CE8 -sub_80F3CE8: @ 80F3CE8 - push {lr} - bl move_anim_execute - movs r0, 0x17 - bl FreeSpriteTilesByTag - movs r0, 0xF - bl FreeSpritePaletteByTag - pop {r0} - bx r0 - thumb_func_end sub_80F3CE8 - - thumb_func_start sub_80F3D00 -sub_80F3D00: @ 80F3D00 - push {r4,r5,lr} - ldr r0, _080F3D34 @ =gUnknown_083DFEC4 - ldr r2, [r0] - ldr r1, _080F3D38 @ =0x000087dc - adds r0, r2, r1 - movs r3, 0 - ldrsh r0, [r0, r3] - lsls r0, 2 - ldr r1, _080F3D3C @ =0x0000893c - adds r0, r1 - adds r0, r2, r0 - ldrb r1, [r0, 0x3] - movs r0, 0x40 - ands r0, r1 - cmp r0, 0 - beq _080F3D94 - ldr r3, _080F3D40 @ =0x00008fe9 - adds r0, r2, r3 - movs r1, 0 - ldrsb r1, [r0, r1] - ldr r3, _080F3D44 @ =0x00008931 - adds r0, r2, r3 - adds r0, r1 - ldrb r5, [r0] - movs r4, 0 - b _080F3D86 - .align 2, 0 -_080F3D34: .4byte gUnknown_083DFEC4 -_080F3D38: .4byte 0x000087dc -_080F3D3C: .4byte 0x0000893c -_080F3D40: .4byte 0x00008fe9 -_080F3D44: .4byte 0x00008931 -_080F3D48: - ldr r0, _080F3D9C @ =gSpriteTemplate_83E4800 - movs r1, 0 - movs r2, 0 - movs r3, 0 - bl CreateSprite - lsls r0, 24 - lsrs r1, r0, 24 - cmp r1, 0x40 - beq _080F3D8C - ldr r0, _080F3DA0 @ =gUnknown_083DFEC4 - ldr r2, [r0] - lsls r0, r4, 2 - movs r3, 0x88 - lsls r3, 8 - adds r2, r3 - adds r2, r0 - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - ldr r1, _080F3DA4 @ =gSprites - adds r0, r1 - str r0, [r2] - adds r0, 0x3E - ldrb r1, [r0] - movs r2, 0x4 - orrs r1, r2 - strb r1, [r0] - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 -_080F3D86: - adds r0, r5, 0x1 - cmp r4, r0 - blt _080F3D48 -_080F3D8C: - adds r0, r5, 0 - movs r1, 0x1 - bl sub_80F3F20 -_080F3D94: - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080F3D9C: .4byte gSpriteTemplate_83E4800 -_080F3DA0: .4byte gUnknown_083DFEC4 -_080F3DA4: .4byte gSprites - thumb_func_end sub_80F3D00 - - thumb_func_start move_anim_execute -move_anim_execute: @ 80F3DA8 - push {r4-r6,lr} - movs r5, 0 - ldr r0, _080F3DD8 @ =gUnknown_083DFEC4 - ldr r0, [r0] - movs r1, 0x88 - lsls r1, 8 - adds r6, r0, r1 -_080F3DB6: - lsls r0, r5, 2 - adds r4, r6, r0 - ldr r0, [r4] - cmp r0, 0 - beq _080F3DD2 - bl DestroySprite - movs r0, 0 - str r0, [r4] - adds r0, r5, 0x1 - lsls r0, 16 - lsrs r5, r0, 16 - cmp r5, 0x9 - bls _080F3DB6 -_080F3DD2: - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_080F3DD8: .4byte gUnknown_083DFEC4 - thumb_func_end move_anim_execute - - thumb_func_start sub_80F3DDC -sub_80F3DDC: @ 80F3DDC - push {lr} - adds r1, r0, 0 - ldrh r0, [r1, 0x30] - adds r0, 0x1 - strh r0, [r1, 0x30] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x3C - ble _080F3DFE - movs r0, 0 - strh r0, [r1, 0x30] - ldrh r0, [r1, 0x32] - lsls r0, 24 - lsrs r0, 24 - movs r1, 0 - bl sub_80F3F20 -_080F3DFE: - pop {r0} - bx r0 - thumb_func_end sub_80F3DDC - - thumb_func_start sub_80F3E04 -sub_80F3E04: @ 80F3E04 - push {lr} - adds r2, r0, 0 - adds r0, 0x3F - ldrb r1, [r0] - movs r0, 0x10 - ands r0, r1 - cmp r0, 0 - beq _080F3E1C - movs r0, 0 - strh r0, [r2, 0x30] - ldr r0, _080F3E20 @ =sub_80F3DDC - str r0, [r2, 0x1C] -_080F3E1C: - pop {r0} - bx r0 - .align 2, 0 -_080F3E20: .4byte sub_80F3DDC - thumb_func_end sub_80F3E04 - - thumb_func_start sub_80F3E24 -sub_80F3E24: @ 80F3E24 - push {r4,r5,lr} - adds r3, r0, 0 - ldr r0, _080F3E64 @ =gUnknown_083DFEC4 - ldr r0, [r0] - ldr r1, _080F3E68 @ =0x00008768 - adds r4, r0, r1 - ldr r0, [r4] - cmp r0, 0 - beq _080F3E70 - ldrh r1, [r0, 0x24] - ldrh r0, [r0, 0x20] - adds r1, r0 - ldr r2, _080F3E6C @ =gUnknown_083E4794 - movs r5, 0x2E - ldrsh r0, [r3, r5] - lsls r0, 2 - adds r0, r2 - ldrh r0, [r0] - adds r0, r1 - strh r0, [r3, 0x20] - ldr r0, [r4] - ldrh r1, [r0, 0x26] - ldrh r0, [r0, 0x22] - adds r1, r0 - movs r4, 0x2E - ldrsh r0, [r3, r4] - lsls r0, 2 - adds r2, 0x2 - adds r0, r2 - ldrh r0, [r0] - adds r0, r1 - b _080F3E8E - .align 2, 0 -_080F3E64: .4byte gUnknown_083DFEC4 -_080F3E68: .4byte 0x00008768 -_080F3E6C: .4byte gUnknown_083E4794 -_080F3E70: - ldr r1, _080F3E98 @ =gUnknown_083E4794 - movs r5, 0x2E - ldrsh r0, [r3, r5] - lsls r0, 2 - adds r0, r1 - ldrh r0, [r0] - adds r0, 0x28 - strh r0, [r3, 0x20] - movs r2, 0x2E - ldrsh r0, [r3, r2] - lsls r0, 2 - adds r1, 0x2 - adds r0, r1 - ldrh r0, [r0] - adds r0, 0x68 -_080F3E8E: - strh r0, [r3, 0x22] - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080F3E98: .4byte gUnknown_083E4794 - thumb_func_end sub_80F3E24 - thumb_func_start sub_80F3E9C sub_80F3E9C: @ 80F3E9C push {r4,lr} diff --git a/include/pokenav.h b/include/pokenav.h index 22bda9104..cf7b3f679 100644 --- a/include/pokenav.h +++ b/include/pokenav.h @@ -123,7 +123,7 @@ struct UnkPokenavStruct { /*0x87DE*/ s16 unk87DE; /*0x87E0*/ void *unk87E0; /*0x87E4*/ struct Sprite *unk87E4[7]; - /*0x8800*/ u8 filler8800[0x28]; + /*0x8800*/ struct Sprite *unk8800[10]; /*0x8828*/ u8 unk8828; /*0x8829*/ u8 unk8829[3][64]; /*0x88E9*/ u8 unk88E9[3][24]; @@ -138,15 +138,17 @@ struct UnkPokenavStruct { /*0x9004*/ u8 unk9004[3][20]; /*0x9040*/ u8 unk9040[0x304]; /*0x9344*/ u8 unk9344; - /*0x9345*/ u8 filler9345[7]; + /*0x9345*/ u8 filler9345[3]; + /*0x9348*/ struct Sprite *unk9348; /*0x934C*/ u16 unk934C[0x280]; - /*0x984C*/ u8 unk984C[0x2400]; + /*0x984C*/ u8 unk984C[0xC][0x100]; + /*0xA44C*/ u8 unkA44C[0xC][0x200]; /*0xBC4C*/ u8 unkBC4C[0x42]; /*0xBC8E*/ u8 unkBC8E; /*0xBC8F*/ u8 unkBC8F; /*0xBC90*/ u8 unkBC90; /*0xBC91*/ u8 unkBC91; - /*0xBC92*/ u8 fillerBC92[0x1]; + /*0xBC92*/ u8 unkBC92; /*0xBC93*/ u8 unkBC93; /*0xBC94*/ u8 fillerBC94[0x6]; /*0xBC9A*/ u8 unkBC9A; diff --git a/src/pokenav_before.c b/src/pokenav_before.c index 28b3c685f..882177a5b 100644 --- a/src/pokenav_before.c +++ b/src/pokenav_before.c @@ -149,7 +149,7 @@ extern const u8 gPokenavRibbonView_Gfx[]; extern const u8 gUnknown_083E040C[]; extern const u16 gPokenavRibbonView_Pal[]; extern const u16 gUnknown_083E03A8[]; -extern const u16 gUnknown_083E3C60[]; +extern const u16 gUnknown_083E3C60[][16]; extern const u16 gPokenavRibbonsIconGfx[][2]; extern const u8 *const gRibbonDescriptions[][2]; extern const u8 *const gGiftRibbonDescriptions[][2]; @@ -196,6 +196,12 @@ extern const struct SpritePalette gUnknown_083E4648[3]; extern const struct SpriteTemplate gSpriteTemplate_83E4660; extern const u16 gUnknown_083E4678[]; extern const u8 gUnknown_083E3D00[]; +extern const struct SpriteTemplate gSpriteTemplate_83E476C; +extern const struct SpriteSheet gUnknown_083E4784; +extern const struct SpritePalette gUnknown_083E478C; +extern const struct SpriteTemplate gSpriteTemplate_83E4800; +extern const s16 gUnknown_083E4794[][2]; + extern u16 gUnknown_020388B4; extern u8 gUnknown_020388B0[]; @@ -319,7 +325,17 @@ void sub_80F4548(u16, u16, u8); static void sub_80F36F0(void); static bool8 sub_80F3724(void); static void sub_80F379C(void); -bool8 sub_80F37D0(void); +static bool8 sub_80F37D0(void); +static void sub_80F38B8(void); +static bool8 sub_80F38EC(void); +static void sub_80F3970(void); +static bool8 sub_80F39A4(void); +static void sub_80F3B00(void); +static bool8 sub_80F3B58(void); +static void sub_80F3B94(void); +static bool8 sub_80F3BD4(void); +static void sub_80F3C2C(void); +void sub_80F3F20(u8, u8); extern void sub_80F0900(void); extern void sub_80F443C(u8 *, u16); @@ -344,18 +360,11 @@ extern void sub_80F708C(u32); extern void sub_80F4394(); extern void sub_80F42C4(); extern void sub_80F6F10(); -extern void sub_80F3C2C(); static extern void sub_80F15A8(void); extern void sub_80F6A4C(); extern bool8 sub_80F6AF0(); -extern void sub_80F3B00(); -extern bool8 sub_80F3B58(); extern u8 sub_80F68E8(); -extern void sub_80F3B94(); -extern bool8 sub_80F3BD4(); extern void sub_80F66E0(); -extern void sub_80F38B8(); -extern bool8 sub_80F38EC(); extern void sub_80F638C(); extern bool8 sub_80F63D0(); extern void sub_80F4CF0(); @@ -5519,7 +5528,7 @@ static bool8 sub_80F1080(void) case 12: LoadPalette(gPokenavRibbonView_Pal, 0x20, 0x20); LoadPalette(gUnknown_083E03A8, 0xF0, 0x20); - LoadPalette(gUnknown_083E3C60, 0x30, 0xA0); + LoadPalette(gUnknown_083E3C60[0], 0x30, 0xA0); LoadPalette(gUnknownPalette_81E6692, 0xB0, 0x20); LoadPalette(gUnknown_083E03A8 + 0xF, 0xBF, 0x2); break; @@ -7337,3 +7346,318 @@ static void sub_80F379C(void) if (!gUnknown_083DFEC4->unk6DAC) while (sub_80F37D0()); } + +static bool8 sub_80F37D0(void) +{ + u16 i; + u8 j, k, l, m; + + if (gUnknown_083DFEC4->unkBC93 > 11) + return FALSE; + + for (i = 0; i < 2; i++) + { + u8 *r4 = &gUnknown_083DFEC4->unk984C[gUnknown_083DFEC4->unkBC93][0]; + u8 *r5 = &gUnknown_083DFEC4->unkA44C[gUnknown_083DFEC4->unkBC93][0]; + for (j = 0; j < 4; j++) + { + CpuFastSet(r4, r5, 0x10); + r5 += 0x40; + r4 += 0x20; + for (k = 0; k < 2; k++) + { + for (l = 0; l < 8; l++) + { + r4 += 4; + for (m = 0; m < 4; m++) + { + r4 -= 1; + *r5 = (*r4 << 4) | ((*r4 >> 4) & 0xF); + r5++; + } + + r4 += 4; + } + + r4 -= 0x40; + } + + r4 += 0x60; + } + + if (++gUnknown_083DFEC4->unkBC93 > 11) + return FALSE; + } + + if (gUnknown_083DFEC4->unkBC93 > 11) + return FALSE; + + return TRUE; +} + +static void sub_80F38B8(void) +{ + gUnknown_083DFEC4->unk306 = 0; + if (!gUnknown_083DFEC4->unk6DAC) + while (sub_80F38EC()); +} + +static bool8 sub_80F38EC(void) +{ + switch (gUnknown_083DFEC4->unk306) + { + case 0: + gUnknown_083DFEC4->unk9348 = NULL; + gUnknown_083DFEC4->unkBC92 = 0; + break; + case 1: + sub_80F2E18(0); + break; + case 2: + sub_80F3970(); + gUnknown_083DFEC4->unk306++; + // fall through + case 3: + if (sub_80F39A4()) + return TRUE; + break; + default: + return FALSE; + } + + gUnknown_083DFEC4->unk306++; + return TRUE; +} + +static void sub_80F3970(void) +{ + gUnknown_083DFEC4->unkBC93 = 0; + if (!gUnknown_083DFEC4->unk6DAC) + while (sub_80F39A4()); +} + +static bool8 sub_80F39A4(void) +{ + struct SpriteSheet spriteSheet; + struct SpritePalette spritePalette; + if (gUnknown_083DFEC4->unkBC93 > 11) + return FALSE; + + spriteSheet.data = &gUnknown_083DFEC4->unkA44C[gUnknown_083DFEC4->unkBC93][0]; + spriteSheet.size = 0x200; + spriteSheet.tag = gUnknown_083DFEC4->unkBC93 + 11; + LoadSpriteSheet(&spriteSheet); + if (gUnknown_083DFEC4->unkBC93 < 5) + { + spritePalette.data = gUnknown_083E3C60[gUnknown_083DFEC4->unkBC93]; + spritePalette.tag = gUnknown_083DFEC4->unkBC93 + 10; + LoadSpritePalette(&spritePalette); + } + + if (++gUnknown_083DFEC4->unkBC93 > 11) + return FALSE; + + return TRUE; +} + +static struct Sprite *sub_80F3A3C(u16 arg0, u16 arg1) +{ + struct SpriteTemplate spriteTemplate; + u16 var0; + u8 ribbon; + u8 spriteId; + + if (arg1 < 3) + var0 = arg0 + arg1 * 9; + else + var0 = arg0 + (gUnknown_083DFEC4->unkBC8E - gUnknown_083DFEC4->unkBC8F); + + ribbon = gUnknown_083DFEC4->unkBC4C[var0]; + spriteTemplate = gSpriteTemplate_83E476C; + spriteTemplate.tileTag = gPokenavRibbonsIconGfx[ribbon][0] + 11; + spriteTemplate.paletteTag = gPokenavRibbonsIconGfx[ribbon][1] + 10; + spriteId = CreateSprite(&spriteTemplate, arg0 * 16 + 96, arg1 * 16 + 40, 2); + if (spriteId != MAX_SPRITES) + return &gSprites[spriteId]; + else + return NULL; +} + +static void sub_80F3B00(void) +{ + gUnknown_083DFEC4->unk9348 = sub_80F3A3C(gUnknown_083DFEC4->unkBC90, gUnknown_083DFEC4->unkBC91); + if (gUnknown_083DFEC4->unk9348) + { + StartSpriteAffineAnim(gUnknown_083DFEC4->unk9348, 1); + gUnknown_083DFEC4->unkBC92 = 1; + } + else + { + gUnknown_083DFEC4->unkBC92 = 0; + } +} + +static bool8 sub_80F3B58(void) +{ + if (gUnknown_083DFEC4->unkBC92) + { + gUnknown_083DFEC4->unkBC92 = !gUnknown_083DFEC4->unk9348->affineAnimEnded; + return gUnknown_083DFEC4->unkBC92; + } + else + { + return FALSE; + } +} + +static void sub_80F3B94(void) +{ + if (gUnknown_083DFEC4->unk9348) + { + StartSpriteAffineAnim(gUnknown_083DFEC4->unk9348, 2); + gUnknown_083DFEC4->unkBC92 = 1; + } + else + { + gUnknown_083DFEC4->unkBC92 = 0; + } +} + +static bool8 sub_80F3BD4(void) +{ + if (gUnknown_083DFEC4->unkBC92) + { + gUnknown_083DFEC4->unkBC92 = !gUnknown_083DFEC4->unk9348->affineAnimEnded; + if (!gUnknown_083DFEC4->unkBC92) + { + FreeOamMatrix(gUnknown_083DFEC4->unk9348->oam.matrixNum); + DestroySprite(gUnknown_083DFEC4->unk9348); + gUnknown_083DFEC4->unk9348 = NULL; + } + + return gUnknown_083DFEC4->unkBC92; + } + else + { + return FALSE; + } +} + +static void sub_80F3C2C(void) +{ + u16 i; + + if (gUnknown_083DFEC4->unk9348) + { + FreeOamMatrix(gUnknown_083DFEC4->unk9348->oam.matrixNum); + DestroySprite(gUnknown_083DFEC4->unk9348); + gUnknown_083DFEC4->unk9348 = NULL; + } + + for (i = 0; i < 12; i++) + FreeSpriteTilesByTag(i + 0xB); + + for (i = 0; i < 5; i++) + FreeSpritePaletteByTag(i + 0xA); + + sub_80F2F48(); +} + +void sub_80F3C94(void) +{ + u16 i; + struct SpriteSheet spriteSheet; + struct SpritePalette spritePalette; + + spriteSheet = gUnknown_083E4784; + spritePalette = gUnknown_083E478C; + LoadSpriteSheet(&spriteSheet); + LoadSpritePalette(&spritePalette); + for (i = 0; i < 10; i++) + gUnknown_083DFEC4->unk8800[i] = NULL; +} + +void sub_80F3CE8(void) +{ + move_anim_execute(); + FreeSpriteTilesByTag(0x17); + FreeSpritePaletteByTag(0xF); +} + +void sub_80F3D00(void) +{ + u8 spriteId; + u16 i; + u8 var1; + struct UnkUsePokeblockSub *var0 = &gUnknown_083DFEC4->unk893c[gUnknown_083DFEC4->unk87DC]; + + if (!var0->unk4) + return; + + var1 = gUnknown_083DFEC4->unk8931[gUnknown_083DFEC4->unk8fe9]; + for (i = 0; i < var1 + 1; i++) + { + spriteId = CreateSprite(&gSpriteTemplate_83E4800, 0, 0, 0); + if (spriteId != MAX_SPRITES) + { + gUnknown_083DFEC4->unk8800[i] = &gSprites[spriteId]; + gUnknown_083DFEC4->unk8800[i]->invisible = 1; + } + else + { + break; + } + } + + sub_80F3F20(var1, 1); +} + +void move_anim_execute(void) +{ + u16 i; + + for (i = 0; i < 10; i++) + { + if (!gUnknown_083DFEC4->unk8800[i]) + return; + + DestroySprite(gUnknown_083DFEC4->unk8800[i]); + gUnknown_083DFEC4->unk8800[i] = NULL; + } +} + +void sub_80F3DDC(struct Sprite *sprite) +{ + if (++sprite->data[1] > 60) + { + sprite->data[1] = 0; + sub_80F3F20(sprite->data[2], 0); + } +} + +void sub_80F3E04(struct Sprite *sprite) +{ + if (sprite->animEnded) + { + sprite->data[1] = 0; + sprite->callback = sub_80F3DDC; + } +} + +void sub_80F3E24(struct Sprite *sprite) +{ + if (gUnknown_083DFEC4->unk8768) + { + sprite->pos1.x = gUnknown_083DFEC4->unk8768->pos1.x + + gUnknown_083DFEC4->unk8768->pos2.x + + gUnknown_083E4794[sprite->data[0]][0]; + sprite->pos1.y = gUnknown_083DFEC4->unk8768->pos1.y + + gUnknown_083DFEC4->unk8768->pos2.y + + gUnknown_083E4794[sprite->data[0]][1]; + } + else + { + sprite->pos1.x = gUnknown_083E4794[sprite->data[0]][0] + 40; + sprite->pos1.y = gUnknown_083E4794[sprite->data[0]][1] + 104; + } +} -- cgit v1.2.3 From c2218920d57c883dc83078c2d1d7cf3af82babbb Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sun, 19 Aug 2018 12:41:57 -0500 Subject: Decompile more pokenav --- asm/pokenav.s | 1022 -------------------------------------------------- include/pokenav.h | 12 +- src/pokenav_after.c | 5 +- src/pokenav_before.c | 513 ++++++++++++++++++++++++- 4 files changed, 510 insertions(+), 1042 deletions(-) diff --git a/asm/pokenav.s b/asm/pokenav.s index de906a926..331c2e8f1 100644 --- a/asm/pokenav.s +++ b/asm/pokenav.s @@ -5,1028 +5,6 @@ .text - thumb_func_start sub_80F3E9C -sub_80F3E9C: @ 80F3E9C - push {r4,lr} - adds r4, r0, 0 - ldrh r1, [r4, 0x30] - movs r2, 0x30 - ldrsh r0, [r4, r2] - cmp r0, 0 - beq _080F3ECA - subs r0, r1, 0x1 - strh r0, [r4, 0x30] - lsls r0, 16 - cmp r0, 0 - bne _080F3F14 - adds r0, r4, 0 - movs r1, 0 - bl SeekSpriteAnim - adds r2, r4, 0 - adds r2, 0x3E - ldrb r1, [r2] - movs r0, 0x5 - negs r0, r0 - ands r0, r1 - strb r0, [r2] -_080F3ECA: - adds r0, r4, 0 - bl sub_80F3E24 - adds r0, r4, 0 - adds r0, 0x3F - ldrb r1, [r0] - movs r0, 0x10 - ands r0, r1 - cmp r0, 0 - beq _080F3F14 - adds r2, r4, 0 - adds r2, 0x3E - ldrb r0, [r2] - movs r1, 0x4 - orrs r0, r1 - strb r0, [r2] - movs r0, 0x34 - ldrsh r1, [r4, r0] - movs r2, 0x32 - ldrsh r0, [r4, r2] - cmp r1, r0 - bne _080F3F10 - cmp r1, 0x9 - bne _080F3F08 - bl sub_80F3FAC - ldr r0, _080F3F04 @ =sub_80F3E04 - b _080F3F12 - .align 2, 0 -_080F3F04: .4byte sub_80F3E04 -_080F3F08: - ldr r0, _080F3F0C @ =sub_80F3DDC - b _080F3F12 - .align 2, 0 -_080F3F0C: .4byte sub_80F3DDC -_080F3F10: - ldr r0, _080F3F1C @ =SpriteCallbackDummy -_080F3F12: - str r0, [r4, 0x1C] -_080F3F14: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080F3F1C: .4byte SpriteCallbackDummy - thumb_func_end sub_80F3E9C - - thumb_func_start sub_80F3F20 -sub_80F3F20: @ 80F3F20 - push {r4-r7,lr} - mov r7, r8 - push {r7} - lsls r0, 24 - lsrs r6, r0, 24 - lsls r1, 24 - lsrs r1, 24 - mov r8, r1 - movs r5, 0 - ldr r0, _080F3F6C @ =gUnknown_083DFEC4 - ldr r0, [r0] - movs r1, 0x88 - lsls r1, 8 - adds r7, r0, r1 -_080F3F3C: - lsls r0, r5, 2 - adds r4, r7, r0 - ldr r0, [r4] - cmp r0, 0 - beq _080F3F92 - strh r5, [r0, 0x2E] - ldr r1, [r4] - lsls r0, r5, 4 - adds r0, 0x1 - strh r0, [r1, 0x30] - ldr r0, [r4] - strh r6, [r0, 0x32] - ldr r0, [r4] - strh r5, [r0, 0x34] - mov r3, r8 - cmp r3, 0 - beq _080F3F62 - cmp r6, 0x9 - beq _080F3F74 -_080F3F62: - ldr r1, [r4] - ldr r0, _080F3F70 @ =sub_80F3E9C - str r0, [r1, 0x1C] - b _080F3F92 - .align 2, 0 -_080F3F6C: .4byte gUnknown_083DFEC4 -_080F3F70: .4byte sub_80F3E9C -_080F3F74: - ldr r0, [r4] - bl sub_80F3E24 - bl sub_80F3FAC - ldr r2, [r4] - ldr r0, _080F3FA8 @ =sub_80F3E04 - str r0, [r2, 0x1C] - adds r2, 0x3E - ldrb r0, [r2] - movs r3, 0x5 - negs r3, r3 - adds r1, r3, 0 - ands r0, r1 - strb r0, [r2] -_080F3F92: - adds r0, r5, 0x1 - lsls r0, 16 - lsrs r5, r0, 16 - cmp r5, 0x9 - bls _080F3F3C - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080F3FA8: .4byte sub_80F3E04 - thumb_func_end sub_80F3F20 - - thumb_func_start sub_80F3FAC -sub_80F3FAC: @ 80F3FAC - push {r4-r7,lr} - movs r5, 0 - ldr r0, _080F3FEC @ =gUnknown_083DFEC4 - ldr r0, [r0] - movs r1, 0x88 - lsls r1, 8 - adds r6, r0, r1 - movs r0, 0x5 - negs r0, r0 - adds r7, r0, 0 -_080F3FC0: - lsls r0, r5, 2 - adds r4, r6, r0 - ldr r0, [r4] - cmp r0, 0 - beq _080F3FDA - movs r1, 0 - bl SeekSpriteAnim - ldr r1, [r4] - adds r1, 0x3E - ldrb r0, [r1] - ands r0, r7 - strb r0, [r1] -_080F3FDA: - adds r0, r5, 0x1 - lsls r0, 16 - lsrs r5, r0, 16 - cmp r5, 0x9 - bls _080F3FC0 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080F3FEC: .4byte gUnknown_083DFEC4 - thumb_func_end sub_80F3FAC - - thumb_func_start sub_80F3FF0 -sub_80F3FF0: @ 80F3FF0 - push {lr} - ldr r0, _080F4018 @ =gUnknown_083DFEC4 - ldr r0, [r0] - ldr r1, _080F401C @ =0x00000306 - adds r2, r0, r1 - movs r1, 0 - strh r1, [r2] - ldr r1, _080F4020 @ =0x00006dac - adds r0, r1 - ldrb r0, [r0] - cmp r0, 0 - bne _080F4012 -_080F4008: - bl sub_80F4024 - lsls r0, 24 - cmp r0, 0 - bne _080F4008 -_080F4012: - pop {r0} - bx r0 - .align 2, 0 -_080F4018: .4byte gUnknown_083DFEC4 -_080F401C: .4byte 0x00000306 -_080F4020: .4byte 0x00006dac - thumb_func_end sub_80F3FF0 - - thumb_func_start sub_80F4024 -sub_80F4024: @ 80F4024 - push {r4,lr} - sub sp, 0x10 - ldr r0, _080F4040 @ =gUnknown_083DFEC4 - ldr r4, [r0] - ldr r1, _080F4044 @ =0x00000306 - adds r0, r4, r1 - ldrh r0, [r0] - cmp r0, 0x1 - beq _080F4068 - cmp r0, 0x1 - bgt _080F4048 - cmp r0, 0 - beq _080F4052 - b _080F4106 - .align 2, 0 -_080F4040: .4byte gUnknown_083DFEC4 -_080F4044: .4byte 0x00000306 -_080F4048: - cmp r0, 0x2 - beq _080F4084 - cmp r0, 0x3 - beq _080F40B8 - b _080F4106 -_080F4052: - ldr r0, _080F4060 @ =gUnknown_083E329C - ldr r2, _080F4064 @ =0x000131e4 - adds r1, r4, r2 - bl LZ77UnCompWram - b _080F4118 - .align 2, 0 -_080F4060: .4byte gUnknown_083E329C -_080F4064: .4byte 0x000131e4 -_080F4068: - ldr r1, _080F407C @ =0x000131e4 - adds r0, r4, r1 - str r0, [sp] - ldr r0, _080F4080 @ =0x00181000 - str r0, [sp, 0x4] - mov r0, sp - bl LoadSpriteSheet - b _080F4118 - .align 2, 0 -_080F407C: .4byte 0x000131e4 -_080F4080: .4byte 0x00181000 -_080F4084: - ldr r0, _080F40B4 @ =gUnknown_083E4818 - ldr r1, [r0, 0x4] - ldr r0, [r0] - str r0, [sp, 0x8] - str r1, [sp, 0xC] - add r0, sp, 0x8 - bl LoadSpritePalette - movs r0, 0x10 - bl IndexOfSpritePaletteTag - lsls r0, 24 - lsrs r0, 24 - movs r1, 0xC2 - lsls r1, 2 - adds r2, r4, r1 - adds r0, 0x10 - movs r1, 0x1 - lsls r1, r0 - movs r0, 0x3 - negs r0, r0 - bics r0, r1 - str r0, [r2] - b _080F4118 - .align 2, 0 -_080F40B4: .4byte gUnknown_083E4818 -_080F40B8: - ldr r0, _080F40E4 @ =gSpriteTemplate_83E4850 - movs r1, 0xDA - movs r2, 0xE - movs r3, 0 - bl CreateSprite - lsls r0, 24 - lsrs r1, r0, 24 - cmp r1, 0x40 - beq _080F40F0 - ldr r0, _080F40E8 @ =0x00006d98 - adds r2, r4, r0 - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - ldr r1, _080F40EC @ =gSprites - adds r0, r1 - str r0, [r2] - movs r1, 0 - strh r1, [r0, 0x2E] - b _080F40F8 - .align 2, 0 -_080F40E4: .4byte gSpriteTemplate_83E4850 -_080F40E8: .4byte 0x00006d98 -_080F40EC: .4byte gSprites -_080F40F0: - ldr r2, _080F410C @ =0x00006d98 - adds r1, r4, r2 - movs r0, 0 - str r0, [r1] -_080F40F8: - ldr r0, _080F4110 @ =gUnknown_083DFEC4 - ldr r1, [r0] - ldr r0, _080F4114 @ =0x00000306 - adds r1, r0 - ldrh r0, [r1] - adds r0, 0x1 - strh r0, [r1] -_080F4106: - movs r0, 0 - b _080F4128 - .align 2, 0 -_080F410C: .4byte 0x00006d98 -_080F4110: .4byte gUnknown_083DFEC4 -_080F4114: .4byte 0x00000306 -_080F4118: - ldr r0, _080F4130 @ =gUnknown_083DFEC4 - ldr r1, [r0] - ldr r2, _080F4134 @ =0x00000306 - adds r1, r2 - ldrh r0, [r1] - adds r0, 0x1 - strh r0, [r1] - movs r0, 0x1 -_080F4128: - add sp, 0x10 - pop {r4} - pop {r1} - bx r1 - .align 2, 0 -_080F4130: .4byte gUnknown_083DFEC4 -_080F4134: .4byte 0x00000306 - thumb_func_end sub_80F4024 - - thumb_func_start sub_80F4138 -sub_80F4138: @ 80F4138 - push {lr} - adds r2, r0, 0 - ldr r0, _080F4170 @ =gUnknown_083DFEC4 - ldr r0, [r0] - movs r1, 0xC3 - lsls r1, 2 - adds r0, r1 - ldrh r0, [r0] - negs r0, r0 - strh r0, [r2, 0x26] - lsls r0, 16 - asrs r0, 16 - movs r1, 0x20 - negs r1, r1 - cmp r0, r1 - bgt _080F4174 - movs r1, 0x2E - ldrsh r0, [r2, r1] - cmp r0, 0 - bne _080F418E - adds r3, r2, 0 - adds r3, 0x3E - ldrb r0, [r3] - movs r1, 0x4 - orrs r0, r1 - strb r0, [r3] - movs r0, 0x1 - b _080F418C - .align 2, 0 -_080F4170: .4byte gUnknown_083DFEC4 -_080F4174: - movs r1, 0x2E - ldrsh r0, [r2, r1] - cmp r0, 0x1 - bne _080F418E - adds r3, r2, 0 - adds r3, 0x3E - ldrb r0, [r3] - movs r1, 0x5 - negs r1, r1 - ands r1, r0 - strb r1, [r3] - movs r0, 0 -_080F418C: - strh r0, [r2, 0x2E] -_080F418E: - pop {r0} - bx r0 - thumb_func_end sub_80F4138 - - thumb_func_start sub_80F4194 -sub_80F4194: @ 80F4194 - push {r4-r7,lr} - sub sp, 0x4 - adds r7, r0, 0 - adds r2, r1, 0 - ldr r0, _080F42A4 @ =gUnknown_083DFEC8 - ldr r6, [r0] - mov r0, sp - ldr r1, _080F42A8 @ =0x00001111 - adds r5, r1, 0 - strh r5, [r0] - ldr r4, _080F42AC @ =0x040000d4 - str r0, [r4] - str r6, [r4, 0x4] - ldr r3, _080F42B0 @ =0x81000140 - str r3, [r4, 0x8] - ldr r0, [r4, 0x8] - movs r0, 0x80 - lsls r0, 3 - adds r1, r6, r0 - mov r0, sp - strh r5, [r0] - str r0, [r4] - str r1, [r4, 0x4] - str r3, [r4, 0x8] - ldr r0, [r4, 0x8] - ldr r0, _080F42B4 @ =gWindowTemplate_81E70F0 - adds r1, r6, 0 - bl Text_InitWindow8004E3C - movs r3, 0x88 - lsls r3, 2 - adds r1, r6, r3 - mov r0, sp - movs r3, 0 - strh r3, [r0] - str r0, [r4] - str r1, [r4, 0x4] - ldr r2, _080F42B8 @ =0x81000030 - str r2, [r4, 0x8] - ldr r0, [r4, 0x8] - movs r0, 0xC4 - lsls r0, 3 - adds r1, r6, r0 - mov r0, sp - strh r3, [r0] - str r0, [r4] - str r1, [r4, 0x4] - str r2, [r4, 0x8] - ldr r0, [r4, 0x8] - movs r1, 0x80 - lsls r1, 2 - adds r2, r6, r1 - ldr r0, [r2] - ldr r1, _080F42BC @ =0x0fffffff - ands r0, r1 - str r0, [r2] - ldr r0, [r2, 0x4] - ands r0, r1 - str r0, [r2, 0x4] - ldr r0, [r2, 0x8] - ands r0, r1 - str r0, [r2, 0x8] - ldr r0, [r2, 0xC] - ands r0, r1 - str r0, [r2, 0xC] - ldr r0, [r2, 0x10] - ands r0, r1 - str r0, [r2, 0x10] - ldr r0, [r2, 0x14] - ands r0, r1 - str r0, [r2, 0x14] - ldr r0, [r2, 0x18] - ands r0, r1 - str r0, [r2, 0x18] - ldr r0, [r2, 0x1C] - ands r0, r1 - str r0, [r2, 0x1C] - movs r3, 0xC0 - lsls r3, 3 - adds r2, r6, r3 - ldr r0, [r2] - ands r0, r1 - str r0, [r2] - ldr r0, [r2, 0x4] - ands r0, r1 - str r0, [r2, 0x4] - ldr r0, [r2, 0x8] - ands r0, r1 - str r0, [r2, 0x8] - ldr r0, [r2, 0xC] - ands r0, r1 - str r0, [r2, 0xC] - ldr r0, [r2, 0x10] - ands r0, r1 - str r0, [r2, 0x10] - ldr r0, [r2, 0x14] - ands r0, r1 - str r0, [r2, 0x14] - ldr r0, [r2, 0x18] - ands r0, r1 - str r0, [r2, 0x18] - ldr r0, [r2, 0x1C] - ands r0, r1 - str r0, [r2, 0x1C] - movs r1, 0 - ldr r2, _080F42C0 @ =0x80000040 -_080F4268: - lsls r0, r1, 7 - adds r0, r6, r0 - str r0, [r4] - lsls r0, r1, 8 - adds r0, r7, r0 - str r0, [r4, 0x4] - str r2, [r4, 0x8] - ldr r0, [r4, 0x8] - lsls r0, r1, 7 - movs r3, 0x80 - lsls r3, 3 - adds r0, r3 - adds r0, r6, r0 - str r0, [r4] - lsls r0, r1, 3 - adds r0, 0x4 - lsls r0, 5 - adds r0, r7, r0 - str r0, [r4, 0x4] - str r2, [r4, 0x8] - ldr r0, [r4, 0x8] - adds r0, r1, 0x1 - lsls r0, 24 - lsrs r1, r0, 24 - cmp r1, 0x4 - bls _080F4268 - add sp, 0x4 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080F42A4: .4byte gUnknown_083DFEC8 -_080F42A8: .4byte 0x00001111 -_080F42AC: .4byte 0x040000d4 -_080F42B0: .4byte 0x81000140 -_080F42B4: .4byte gWindowTemplate_81E70F0 -_080F42B8: .4byte 0x81000030 -_080F42BC: .4byte 0x0fffffff -_080F42C0: .4byte 0x80000040 - thumb_func_end sub_80F4194 - - thumb_func_start sub_80F42C4 -sub_80F42C4: @ 80F42C4 - push {r4-r7,lr} - sub sp, 0x8 - adds r1, r0, 0 - ldr r0, _080F433C @ =gUnknown_083DFEC4 - ldr r0, [r0] - ldr r2, _080F4340 @ =0x0000d1e4 - adds r0, r2 - str r0, [sp] - ldr r2, _080F4344 @ =0x001a0500 - str r2, [sp, 0x4] - bl sub_80F4194 - mov r0, sp - bl LoadSpriteSheet - ldr r0, _080F4348 @ =gUnknown_083E4868 - bl LoadSpritePalette - movs r5, 0 - movs r4, 0 - ldr r6, _080F434C @ =gSprites -_080F42EE: - lsls r1, r4, 21 - movs r7, 0xE2 - lsls r7, 15 - adds r1, r7 - asrs r1, 16 - ldr r0, _080F4350 @ =gSpriteTemplate_83E4878 - movs r2, 0x10 - movs r3, 0 - bl CreateSprite - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x40 - beq _080F4360 - lsls r3, r0, 4 - adds r3, r0 - lsls r3, 2 - adds r3, r6 - ldrh r2, [r3, 0x4] - lsls r0, r2, 22 - lsrs r0, 22 - adds r0, r5, r0 - ldr r7, _080F4354 @ =0x000003ff - adds r1, r7, 0 - ands r0, r1 - ldr r7, _080F4358 @ =0xfffffc00 - adds r1, r7, 0 - ands r2, r1 - orrs r2, r0 - strh r2, [r3, 0x4] - ldr r0, _080F433C @ =gUnknown_083DFEC4 - ldr r0, [r0] - lsls r1, r4, 2 - ldr r2, _080F435C @ =0x0000ced4 - adds r0, r2 - adds r0, r1 - str r3, [r0] - b _080F4370 - .align 2, 0 -_080F433C: .4byte gUnknown_083DFEC4 -_080F4340: .4byte 0x0000d1e4 -_080F4344: .4byte 0x001a0500 -_080F4348: .4byte gUnknown_083E4868 -_080F434C: .4byte gSprites -_080F4350: .4byte gSpriteTemplate_83E4878 -_080F4354: .4byte 0x000003ff -_080F4358: .4byte 0xfffffc00 -_080F435C: .4byte 0x0000ced4 -_080F4360: - ldr r0, _080F438C @ =gUnknown_083DFEC4 - ldr r1, [r0] - lsls r0, r4, 2 - ldr r7, _080F4390 @ =0x0000ced4 - adds r1, r7 - adds r1, r0 - movs r0, 0 - str r0, [r1] -_080F4370: - adds r0, r5, 0 - adds r0, 0x8 - lsls r0, 16 - lsrs r5, r0, 16 - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 - cmp r4, 0x4 - bls _080F42EE - add sp, 0x8 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080F438C: .4byte gUnknown_083DFEC4 -_080F4390: .4byte 0x0000ced4 - thumb_func_end sub_80F42C4 - - thumb_func_start sub_80F4394 -sub_80F4394: @ 80F4394 - push {r4,r5,lr} - movs r4, 0 - ldr r0, _080F43CC @ =gUnknown_083DFEC4 - ldr r0, [r0] - ldr r1, _080F43D0 @ =0x0000ced4 - adds r5, r0, r1 -_080F43A0: - lsls r0, r4, 2 - adds r0, r5, r0 - ldr r0, [r0] - cmp r0, 0 - beq _080F43AE - bl DestroySprite -_080F43AE: - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 - cmp r4, 0x4 - bls _080F43A0 - movs r0, 0x1A - bl FreeSpriteTilesByTag - movs r0, 0x12 - bl FreeSpritePaletteByTag - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080F43CC: .4byte gUnknown_083DFEC4 -_080F43D0: .4byte 0x0000ced4 - thumb_func_end sub_80F4394 - - thumb_func_start sub_80F43D4 -sub_80F43D4: @ 80F43D4 - push {r4,lr} - adds r1, r0, 0 - ldr r0, _080F4410 @ =gUnknown_083DFEC4 - ldr r0, [r0] - ldr r2, _080F4414 @ =0x0000d1e4 - adds r4, r0, r2 - adds r0, r4, 0 - bl sub_80F4194 - movs r0, 0x1A - bl GetSpriteTileStartByTag - lsls r0, 16 - lsrs r1, r0, 16 - ldr r0, _080F4418 @ =0x0000ffff - cmp r1, r0 - beq _080F4408 - lsls r0, r1, 5 - ldr r1, _080F441C @ =0x06010000 - adds r0, r1 - ldr r1, _080F4420 @ =0x040000d4 - str r4, [r1] - str r0, [r1, 0x4] - ldr r0, _080F4424 @ =0x84000140 - str r0, [r1, 0x8] - ldr r0, [r1, 0x8] -_080F4408: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080F4410: .4byte gUnknown_083DFEC4 -_080F4414: .4byte 0x0000d1e4 -_080F4418: .4byte 0x0000ffff -_080F441C: .4byte 0x06010000 -_080F4420: .4byte 0x040000d4 -_080F4424: .4byte 0x84000140 - thumb_func_end sub_80F43D4 - - thumb_func_start sub_80F4428 -sub_80F4428: @ 80F4428 - push {lr} - lsls r1, 16 - lsrs r1, 16 - lsls r2, 24 - lsrs r2, 24 - bl sub_80F6514 - pop {r1} - bx r1 - thumb_func_end sub_80F4428 - - thumb_func_start sub_80F443C -sub_80F443C: @ 80F443C - push {r4,lr} - lsls r4, r1, 16 - lsrs r4, 16 - ldr r1, _080F4458 @ =gOtherText_Number - bl StringCopy - adds r1, r4, 0 - movs r2, 0x38 - movs r3, 0x1 - bl AlignInt1InMenuWindow - pop {r4} - pop {r1} - bx r1 - .align 2, 0 -_080F4458: .4byte gOtherText_Number - thumb_func_end sub_80F443C - - thumb_func_start sub_80F445C -sub_80F445C: @ 80F445C - push {r4,lr} - lsls r1, 16 - lsrs r1, 16 - movs r2, 0x17 - movs r3, 0x1 - bl AlignInt1InMenuWindow - adds r4, r0, 0 - movs r3, 0xFC - strb r3, [r4] - movs r2, 0x11 - strb r2, [r4, 0x1] - movs r1, 0x1 - strb r1, [r4, 0x2] - adds r4, 0x3 - movs r0, 0xBA - strb r0, [r4] - adds r4, 0x1 - strb r3, [r4] - strb r2, [r4, 0x1] - strb r1, [r4, 0x2] - adds r4, 0x3 - ldr r0, _080F44A8 @ =gUnknown_083DFEC4 - ldr r0, [r0] - ldr r1, _080F44AC @ =0x00008774 - adds r0, r1 - movs r2, 0 - ldrsh r1, [r0, r2] - adds r1, 0x1 - adds r0, r4, 0 - movs r2, 0x32 - movs r3, 0x1 - bl AlignInt1InMenuWindow - adds r4, r0, 0 - pop {r4} - pop {r1} - bx r1 - .align 2, 0 -_080F44A8: .4byte gUnknown_083DFEC4 -_080F44AC: .4byte 0x00008774 - thumb_func_end sub_80F445C - - thumb_func_start sub_80F44B0 -sub_80F44B0: @ 80F44B0 - push {r4,lr} - adds r4, r2, 0 - lsls r0, 16 - lsrs r0, 16 - lsls r1, 16 - lsrs r2, r1, 16 - cmp r0, 0xE - bne _080F44F4 - cmp r4, 0x2 - beq _080F44C8 - cmp r4, 0x7 - bne _080F44E0 -_080F44C8: - movs r0, 0x64 - muls r0, r2 - ldr r1, _080F44DC @ =gPlayerParty - adds r0, r1 - adds r1, r4, 0 - adds r2, r3, 0 - bl GetMonData - b _080F453C - .align 2, 0 -_080F44DC: .4byte gPlayerParty -_080F44E0: - movs r0, 0x64 - muls r0, r2 - ldr r1, _080F44F0 @ =gPlayerParty - adds r0, r1 - adds r1, r4, 0 - bl GetMonData - b _080F453C - .align 2, 0 -_080F44F0: .4byte gPlayerParty -_080F44F4: - cmp r4, 0x2 - beq _080F44FC - cmp r4, 0x7 - bne _080F4520 -_080F44FC: - lsls r1, r0, 2 - adds r1, r0 - lsls r0, r1, 4 - subs r0, r1 - lsls r0, 5 - lsls r1, r2, 2 - adds r1, r2 - lsls r1, 4 - ldr r2, _080F451C @ =gPokemonStorage + 0x4 - adds r1, r2 - adds r0, r1 - adds r1, r4, 0 - adds r2, r3, 0 - bl GetBoxMonData - b _080F453C - .align 2, 0 -_080F451C: .4byte gPokemonStorage + 0x4 -_080F4520: - lsls r1, r0, 2 - adds r1, r0 - lsls r0, r1, 4 - subs r0, r1 - lsls r0, 5 - lsls r1, r2, 2 - adds r1, r2 - lsls r1, 4 - ldr r2, _080F4544 @ =gPokemonStorage + 0x4 - adds r1, r2 - adds r0, r1 - adds r1, r4, 0 - bl GetBoxMonData -_080F453C: - pop {r4} - pop {r1} - bx r1 - .align 2, 0 -_080F4544: .4byte gPokemonStorage + 0x4 - thumb_func_end sub_80F44B0 - - thumb_func_start sub_80F4548 -sub_80F4548: @ 80F4548 - push {r4,lr} - sub sp, 0x4 - lsls r0, 16 - lsrs r3, r0, 16 - lsls r1, 16 - lsrs r4, r1, 16 - mov r0, sp - strb r2, [r0] - cmp r3, 0xE - bne _080F4574 - movs r0, 0x64 - muls r0, r4 - ldr r1, _080F4570 @ =gPlayerParty - adds r0, r1 - movs r1, 0x8 - mov r2, sp - bl SetMonData - b _080F4592 - .align 2, 0 -_080F4570: .4byte gPlayerParty -_080F4574: - lsls r1, r3, 2 - adds r1, r3 - lsls r0, r1, 4 - subs r0, r1 - lsls r0, 5 - lsls r1, r4, 2 - adds r1, r4 - lsls r1, 4 - ldr r2, _080F459C @ =gPokemonStorage + 0x4 - adds r1, r2 - adds r0, r1 - movs r1, 0x8 - mov r2, sp - bl SetBoxMonData -_080F4592: - add sp, 0x4 - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080F459C: .4byte gPokemonStorage + 0x4 - thumb_func_end sub_80F4548 - - thumb_func_start sub_80F45A0 -sub_80F45A0: @ 80F45A0 - push {r4-r7,lr} - lsls r1, 24 - lsrs r6, r1, 24 - ldr r1, _080F45F0 @ =gUnknown_083DFEC4 - ldr r5, [r1] - lsls r1, r0, 16 - asrs r0, r1, 14 - adds r4, r5, r0 - ldr r2, _080F45F4 @ =0x0000893f - adds r0, r4, r2 - ldrb r0, [r0] - lsls r0, 25 - lsrs r7, r0, 31 - cmp r7, 0 - beq _080F4644 - lsls r0, r6, 6 - ldr r2, _080F45F8 @ =0x00008829 - adds r0, r2 - adds r0, r5, r0 - lsrs r1, 16 - movs r2, 0 - bl sub_80F4428 - ldr r1, _080F45FC @ =0x0000893d - adds r0, r4, r1 - ldrb r2, [r0] - cmp r2, 0xE - bne _080F4608 - lsls r0, r6, 1 - adds r0, r6 - lsls r0, 3 - ldr r2, _080F4600 @ =0x000088e9 - adds r0, r2 - adds r0, r5, r0 - ldr r1, _080F4604 @ =gOtherText_InParty - movs r2, 0x40 - movs r3, 0 - bl AlignStringInMenuWindow - b _080F4624 - .align 2, 0 -_080F45F0: .4byte gUnknown_083DFEC4 -_080F45F4: .4byte 0x0000893f -_080F45F8: .4byte 0x00008829 -_080F45FC: .4byte 0x0000893d -_080F4600: .4byte 0x000088e9 -_080F4604: .4byte gOtherText_InParty -_080F4608: - lsls r0, r6, 1 - adds r0, r6 - lsls r0, 3 - ldr r1, _080F4634 @ =0x000088e9 - adds r0, r1 - adds r0, r5, r0 - lsls r1, r2, 3 - adds r1, r2 - ldr r2, _080F4638 @ =gPokemonStorage + 0x8344 - adds r1, r2 - movs r2, 0x40 - movs r3, 0 - bl AlignStringInMenuWindow -_080F4624: - ldr r0, _080F463C @ =gUnknown_083DFEC4 - ldr r0, [r0] - ldr r2, _080F4640 @ =0x00008937 - adds r0, r2 - adds r0, r6 - movs r1, 0x1 - strb r1, [r0] - b _080F4676 - .align 2, 0 -_080F4634: .4byte 0x000088e9 -_080F4638: .4byte gPokemonStorage + 0x8344 -_080F463C: .4byte gUnknown_083DFEC4 -_080F4640: .4byte 0x00008937 -_080F4644: - lsls r0, r6, 6 - ldr r1, _080F467C @ =0x00008829 - adds r0, r1 - adds r0, r5, r0 - ldr r4, _080F4680 @ =gEmptyString_81E72B0 - adds r1, r4, 0 - movs r2, 0x68 - movs r3, 0 - bl AlignStringInMenuWindow - lsls r0, r6, 1 - adds r0, r6 - lsls r0, 3 - ldr r2, _080F4684 @ =0x000088e9 - adds r0, r2 - adds r0, r5, r0 - adds r1, r4, 0 - movs r2, 0x40 - movs r3, 0 - bl AlignStringInMenuWindow - ldr r1, _080F4688 @ =0x00008937 - adds r0, r5, r1 - adds r0, r6 - strb r7, [r0] -_080F4676: - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080F467C: .4byte 0x00008829 -_080F4680: .4byte gEmptyString_81E72B0 -_080F4684: .4byte 0x000088e9 -_080F4688: .4byte 0x00008937 - thumb_func_end sub_80F45A0 - thumb_func_start sub_80F468C sub_80F468C: @ 80F468C push {r4-r7,lr} diff --git a/include/pokenav.h b/include/pokenav.h index cf7b3f679..57cd1552e 100644 --- a/include/pokenav.h +++ b/include/pokenav.h @@ -46,7 +46,7 @@ struct UnkPokenavStruct { /*0x0000*/ u16 unk0[6][0x40]; /*0x0300*/ u8 filler0300[0x6]; /*0x0306*/ u16 unk306; - /*0x0306*/ u8 filler0308[0x4]; + /*0x0306*/ int unk308; /*0x030C*/ s16 unk030C; /*0x030E*/ s8 unk30E; /*0x030F*/ u8 unk30F; @@ -73,7 +73,7 @@ struct UnkPokenavStruct { /*0x6798*/ u8 unk6798[0x200]; /*0x6998*/ u8 unk6998[0x200]; /*0x6B98*/ u8 unk6B98[0x200]; - /*0x6D98*/ u8 filler6B98[0x4]; + /*0x6D98*/ struct Sprite *unk6D98; /*0x6D9C*/ struct Sprite *unk6D9C; /*0x6DA0*/ u16 unk6DA0; /*0x6DA2*/ u16 unk6DA2; @@ -128,7 +128,8 @@ struct UnkPokenavStruct { /*0x8829*/ u8 unk8829[3][64]; /*0x88E9*/ u8 unk88E9[3][24]; /*0x8931*/ u8 unk8931[3]; - /*0x8934*/ u8 unk8934[8]; + /*0x8934*/ u8 unk8934[3]; + /*0x8937*/ u8 unk8937[5]; /*0x893C*/ struct UnkUsePokeblockSub unk893c[0x1ab]; /*0x8fe8*/ u8 fil8fe8[1]; /*0x8fe9*/ s8 unk8fe9; @@ -161,7 +162,7 @@ struct UnkPokenavStruct { /*0xCE52*/ u16 palettesCE52[30]; /*0xCE8E*/ u16 palettesCE8E[0x21]; /*0xCED0*/ struct Sprite *unkCED0; - /*0xCED4*/ u8 fillerCED4[0x14]; + /*0xCED4*/ struct Sprite *unkCED4[5]; /*0xCEE8*/ struct UnkPokenavStruct_Sub unkCEE8[69]; /*0xD110*/ const u8 *trainerEyeDescriptionLines[4]; /*0xD120*/ u8 fillerD114[0x18]; @@ -177,7 +178,8 @@ struct UnkPokenavStruct { /*0xD1DC*/ u16 unkD1DC; /*0xD1DE*/ u16 unkD1DE; /*0xD1E0*/ u8 *unkD1E0; - /*0xD1E4*/ u8 unkD1E4[2][0x2000]; + /*0xD1E4*/ u8 unkD1E4[3][0x2000]; + /*0x131E4*/ u8 unk131E4[0x1000]; }; extern struct UnkPokenavStruct *const gUnknown_083DFEC4; diff --git a/src/pokenav_after.c b/src/pokenav_after.c index 330305ea3..7619577cc 100644 --- a/src/pokenav_after.c +++ b/src/pokenav_after.c @@ -3,6 +3,7 @@ #include "pokenav.h" #include "battle.h" #include "data2.h" +#include "text.h" #include "de_rom_8040FE0.h" #include "string_util.h" @@ -20,14 +21,14 @@ void sub_80F700C(u8 *arg0, u16 arg1) ptr = StringCopy(ptr, de_sub_8041024(0, gUnknown_083DFEC4->unkCEE8[arg1].unk0)); #endif - ptr[0] = 0xFC; + ptr[0] = EXT_CTRL_CODE_BEGIN; ptr[1] = 0x13; ptr[2] = 0x4B; ptr += 3; ptr = StringCopy(ptr, trainer->trainerName); } - ptr[0] = 0xFC; + ptr[0] = EXT_CTRL_CODE_BEGIN; ptr[1] = 0x13; ptr[2] = 0x80; ptr[3] = 0xFF; diff --git a/src/pokenav_before.c b/src/pokenav_before.c index 882177a5b..8ae582222 100644 --- a/src/pokenav_before.c +++ b/src/pokenav_before.c @@ -201,7 +201,11 @@ extern const struct SpriteSheet gUnknown_083E4784; extern const struct SpritePalette gUnknown_083E478C; extern const struct SpriteTemplate gSpriteTemplate_83E4800; extern const s16 gUnknown_083E4794[][2]; - +extern const u8 gUnknown_083E329C[]; +extern const struct SpritePalette gUnknown_083E4818; +extern const struct SpriteTemplate gSpriteTemplate_83E4850; +extern const struct SpritePalette gUnknown_083E4868; +extern const struct SpriteTemplate gSpriteTemplate_83E4878; extern u16 gUnknown_020388B4; extern u8 gUnknown_020388B0[]; @@ -251,10 +255,10 @@ static void sub_80EEDC4(); static void ShowMapNamePopUpWindow(void); static void sub_80F0954(u16, u16, u16); static bool8 sub_80F098C(void); -void sub_80F445C(u8*, u16); +static u8 *sub_80F445C(u8*, u16); static void sub_80F081C(u8); bool8 sub_80F0944(void); -u8 *sub_80F4428(u8*, u16, u8); +static u8 *sub_80F4428(u8*, u16, u8); void sub_80F700C(u8*, u16); static void sub_80F0B24(void); static bool8 sub_80F0B44(void); @@ -321,7 +325,7 @@ static void sub_80F3264(void); static void sub_80F3294(u8); static void sub_80F35B4(void); static void sub_80F363C(struct Sprite *sprite); -void sub_80F4548(u16, u16, u8); +static void SetMonMarkings(u16, u16, u8); static void sub_80F36F0(void); static bool8 sub_80F3724(void); static void sub_80F379C(void); @@ -335,10 +339,16 @@ static bool8 sub_80F3B58(void); static void sub_80F3B94(void); static bool8 sub_80F3BD4(void); static void sub_80F3C2C(void); -void sub_80F3F20(u8, u8); +static void sub_80F3F20(u8, u8); +static void sub_80F3FAC(void); +static void sub_80F3FF0(void); +static bool8 sub_80F4024(void); +static void sub_80F42C4(u8*); +static void sub_80F4394(void); +u8 *sub_80F6514(u8*, u16, u8); +static u8 *sub_80F443C(u8 *, u16); extern void sub_80F0900(void); -extern void sub_80F443C(u8 *, u16); extern void sub_80F01A4(void); extern void sub_80EFD3C(void); extern void sub_8095C8C(); @@ -357,8 +367,6 @@ extern bool8 sub_80F6E9C(); extern bool8 sub_80F6ED4(); extern bool8 sub_80F70FC(); extern void sub_80F708C(u32); -extern void sub_80F4394(); -extern void sub_80F42C4(); extern void sub_80F6F10(); static extern void sub_80F15A8(void); extern void sub_80F6A4C(); @@ -386,8 +394,6 @@ extern bool8 sub_80EF874(void); extern bool8 sub_80F6250(); extern void sub_80F6208(); extern void sub_80F6C20(); -extern void sub_80F3FF0(); -extern bool8 sub_80F4024(); extern void sub_80EF248(u8); extern bool8 sub_80EF284(u8); extern void sub_80EF428(u8, u8); @@ -7306,7 +7312,7 @@ void sub_80F3698(void) { struct UnkUsePokeblockSub *var0 = &gUnknown_083DFEC4->unk893c[gUnknown_083DFEC4->unk87DC]; gUnknown_083DFEC4->unk8934[gUnknown_083DFEC4->unk8fe9] = gUnknown_083DFEC4->unk76B0.markings; - sub_80F4548(var0->unk1, var0->partyIdx, gUnknown_083DFEC4->unk76B0.markings); + SetMonMarkings(var0->unk1, var0->partyIdx, gUnknown_083DFEC4->unk76B0.markings); sub_80F7470(); } @@ -7635,7 +7641,7 @@ void sub_80F3DDC(struct Sprite *sprite) } } -void sub_80F3E04(struct Sprite *sprite) +static void sub_80F3E04(struct Sprite *sprite) { if (sprite->animEnded) { @@ -7644,7 +7650,7 @@ void sub_80F3E04(struct Sprite *sprite) } } -void sub_80F3E24(struct Sprite *sprite) +static void sub_80F3E24(struct Sprite *sprite) { if (gUnknown_083DFEC4->unk8768) { @@ -7661,3 +7667,484 @@ void sub_80F3E24(struct Sprite *sprite) sprite->pos1.y = gUnknown_083E4794[sprite->data[0]][1] + 104; } } + +static void sub_80F3E9C(struct Sprite *sprite) +{ + if (sprite->data[1]) + { + if (--sprite->data[1]) + return; + + SeekSpriteAnim(sprite, 0); + sprite->invisible = 0; + } + + sub_80F3E24(sprite); + if (sprite->animEnded) + { + sprite->invisible = 1; + if (sprite->data[3] == sprite->data[2]) + { + if (sprite->data[3] == 9) + { + sub_80F3FAC(); + sprite->callback = sub_80F3E04; + } + else + { + sprite->callback = sub_80F3DDC; + } + } + else + { + sprite->callback = SpriteCallbackDummy; + } + } +} + +static void sub_80F3F20(u8 arg0, u8 arg1) +{ + u16 i; + + for (i = 0; i < 10; i++) + { + if (gUnknown_083DFEC4->unk8800[i]) + { + gUnknown_083DFEC4->unk8800[i]->data[0] = i; + gUnknown_083DFEC4->unk8800[i]->data[1] = i * 16 + 1; + gUnknown_083DFEC4->unk8800[i]->data[2] = arg0; + gUnknown_083DFEC4->unk8800[i]->data[3] = i; + + if (!arg1 || arg0 != 9) + { + gUnknown_083DFEC4->unk8800[i]->callback = sub_80F3E9C; + } + else + { + sub_80F3E24(gUnknown_083DFEC4->unk8800[i]); + sub_80F3FAC(); + gUnknown_083DFEC4->unk8800[i]->callback = sub_80F3E04; + gUnknown_083DFEC4->unk8800[i]->invisible = 0; + } + } + } +} + +static void sub_80F3FAC(void) +{ + u16 i; + + for (i = 0; i < 10; i++) + { + if (gUnknown_083DFEC4->unk8800[i]) + { + SeekSpriteAnim(gUnknown_083DFEC4->unk8800[i], 0); + gUnknown_083DFEC4->unk8800[i]->invisible = 0; + } + } +} + +static void sub_80F3FF0(void) +{ + gUnknown_083DFEC4->unk306 = 0; + if (!gUnknown_083DFEC4->unk6DAC) + while (sub_80F4024()); +} + +static bool8 sub_80F4024(void) +{ + u8 paletteIndex; + u8 spriteId; + struct SpritePalette spritePalette; + + switch (gUnknown_083DFEC4->unk306) + { + case 0: + LZ77UnCompWram(gUnknown_083E329C, gUnknown_083DFEC4->unk131E4); + break; + case 1: + { + struct SpriteSheet spriteSheet = { + .data = gUnknown_083DFEC4->unk131E4, + .size = sizeof(gUnknown_083DFEC4->unk131E4), + .tag = 0x18, + }; + LoadSpriteSheet(&spriteSheet); + break; + } + case 2: + spritePalette = gUnknown_083E4818; + LoadSpritePalette(&spritePalette); + paletteIndex = IndexOfSpritePaletteTag(0x10); + gUnknown_083DFEC4->unk308 = -3 & ~(1 << (paletteIndex + 0x10)); + break; + case 3: + spriteId = CreateSprite(&gSpriteTemplate_83E4850, 218, 14, 0); + if (spriteId != MAX_SPRITES) + { + gUnknown_083DFEC4->unk6D98 = &gSprites[spriteId]; + gUnknown_083DFEC4->unk6D98->data[0] = 0; + } + else + { + gUnknown_083DFEC4->unk6D98 = NULL; + } + + gUnknown_083DFEC4->unk306++; + return FALSE; + default: + return FALSE; + } + + gUnknown_083DFEC4->unk306++; + return TRUE; +} + +void sub_80F4138(struct Sprite *sprite) +{ + sprite->pos2.y = -gUnknown_083DFEC4->unk030C; + if (sprite->pos2.y <= -32) + { + if (sprite->data[0] == 0) + { + sprite->invisible = 1; + sprite->data[0] = 1; + } + } + else + { + if (sprite->data[0] == 1) + { + sprite->invisible = 0; + sprite->data[0] = 0; + } + } +} + +#ifdef NONMATCHING +// close, but the last DmaCopy16 is sharing the 0x400 value from the beginning of the function. +void sub_80F4194(u8 *arg0, u8 *text) +{ + u8 i; + u8 *tileBuffer; + u32 *tileBuf2; + + tileBuffer = gUnknown_083DFEC8; + DmaFill16(3, 0x1111, tileBuffer, 0x280); + DmaFill16Defvars(3, 0x1111, 0x400 + tileBuffer, 0x280); + Text_InitWindow8004E3C(&gWindowTemplate_81E70F0, tileBuffer, text); + + DmaClear16(3, tileBuffer + 0x220, 0x60); + DmaClear16(3, tileBuffer + 0x620, 0x60); + + tileBuf2 = (int *)tileBuffer + 0x80; + tileBuf2[0] &= 0x0FFFFFFF; + tileBuf2[1] &= 0x0FFFFFFF; + tileBuf2[2] &= 0x0FFFFFFF; + tileBuf2[3] &= 0x0FFFFFFF; + tileBuf2[4] &= 0x0FFFFFFF; + tileBuf2[5] &= 0x0FFFFFFF; + tileBuf2[6] &= 0x0FFFFFFF; + tileBuf2[7] &= 0x0FFFFFFF; + + tileBuf2 = (int *)tileBuffer + 0x180; + tileBuf2[0] &= 0x0FFFFFFF; + tileBuf2[1] &= 0x0FFFFFFF; + tileBuf2[2] &= 0x0FFFFFFF; + tileBuf2[3] &= 0x0FFFFFFF; + tileBuf2[4] &= 0x0FFFFFFF; + tileBuf2[5] &= 0x0FFFFFFF; + tileBuf2[6] &= 0x0FFFFFFF; + tileBuf2[7] &= 0x0FFFFFFF; + + for (i = 0; i < 5; i++) + { + DmaCopy16(3, &tileBuffer[128 * i], &arg0[i * 256], 128); + DmaCopy16(3, &tileBuffer[128 * i + 0x400], &arg0[32 * ((i * 8) + 4)], 128); + } +} +#else +NAKED +void sub_80F4194(u8 *arg0, u8 *text) +{ + asm(".syntax unified\n\ + push {r4-r7,lr}\n\ + sub sp, 0x4\n\ + adds r7, r0, 0\n\ + adds r2, r1, 0\n\ + ldr r0, _080F42A4 @ =gUnknown_083DFEC8\n\ + ldr r6, [r0] @ r6 = tileBuffer\n\ + mov r0, sp \n\ + ldr r1, _080F42A8 @ =0x00001111\n\ + adds r5, r1, 0\n\ + strh r5, [r0]\n\ + ldr r4, _080F42AC @ =0x040000d4\n\ + str r0, [r4]\n\ + str r6, [r4, 0x4]\n\ + ldr r3, _080F42B0 @ =0x81000140\n\ + str r3, [r4, 0x8]\n\ + ldr r0, [r4, 0x8]\n\ + movs r0, 0x80\n\ + lsls r0, 3\n\ + adds r1, r6, r0\n\ + mov r0, sp\n\ + strh r5, [r0]\n\ + str r0, [r4]\n\ + str r1, [r4, 0x4]\n\ + str r3, [r4, 0x8]\n\ + ldr r0, [r4, 0x8]\n\ + ldr r0, _080F42B4 @ =gWindowTemplate_81E70F0\n\ + adds r1, r6, 0\n\ + bl Text_InitWindow8004E3C\n\ + movs r3, 0x88\n\ + lsls r3, 2\n\ + adds r1, r6, r3\n\ + mov r0, sp\n\ + movs r3, 0\n\ + strh r3, [r0]\n\ + str r0, [r4]\n\ + str r1, [r4, 0x4]\n\ + ldr r2, _080F42B8 @ =0x81000030\n\ + str r2, [r4, 0x8]\n\ + ldr r0, [r4, 0x8]\n\ + movs r0, 0xC4\n\ + lsls r0, 3\n\ + adds r1, r6, r0\n\ + mov r0, sp\n\ + strh r3, [r0]\n\ + str r0, [r4]\n\ + str r1, [r4, 0x4]\n\ + str r2, [r4, 0x8]\n\ + ldr r0, [r4, 0x8]\n\ + movs r1, 0x80\n\ + lsls r1, 2\n\ + adds r2, r6, r1\n\ + ldr r0, [r2]\n\ + ldr r1, _080F42BC @ =0x0fffffff\n\ + ands r0, r1\n\ + str r0, [r2]\n\ + ldr r0, [r2, 0x4]\n\ + ands r0, r1\n\ + str r0, [r2, 0x4]\n\ + ldr r0, [r2, 0x8]\n\ + ands r0, r1\n\ + str r0, [r2, 0x8]\n\ + ldr r0, [r2, 0xC]\n\ + ands r0, r1\n\ + str r0, [r2, 0xC]\n\ + ldr r0, [r2, 0x10]\n\ + ands r0, r1\n\ + str r0, [r2, 0x10]\n\ + ldr r0, [r2, 0x14]\n\ + ands r0, r1\n\ + str r0, [r2, 0x14]\n\ + ldr r0, [r2, 0x18]\n\ + ands r0, r1\n\ + str r0, [r2, 0x18]\n\ + ldr r0, [r2, 0x1C]\n\ + ands r0, r1\n\ + str r0, [r2, 0x1C]\n\ + movs r3, 0xC0\n\ + lsls r3, 3\n\ + adds r2, r6, r3\n\ + ldr r0, [r2]\n\ + ands r0, r1\n\ + str r0, [r2]\n\ + ldr r0, [r2, 0x4]\n\ + ands r0, r1\n\ + str r0, [r2, 0x4]\n\ + ldr r0, [r2, 0x8]\n\ + ands r0, r1\n\ + str r0, [r2, 0x8]\n\ + ldr r0, [r2, 0xC]\n\ + ands r0, r1\n\ + str r0, [r2, 0xC]\n\ + ldr r0, [r2, 0x10]\n\ + ands r0, r1\n\ + str r0, [r2, 0x10]\n\ + ldr r0, [r2, 0x14]\n\ + ands r0, r1\n\ + str r0, [r2, 0x14]\n\ + ldr r0, [r2, 0x18]\n\ + ands r0, r1\n\ + str r0, [r2, 0x18]\n\ + ldr r0, [r2, 0x1C]\n\ + ands r0, r1\n\ + str r0, [r2, 0x1C]\n\ + movs r1, 0\n\ + ldr r2, _080F42C0 @ =0x80000040\n\ +_080F4268:\n\ + lsls r0, r1, 7\n\ + adds r0, r6, r0\n\ + str r0, [r4]\n\ + lsls r0, r1, 8\n\ + adds r0, r7, r0\n\ + str r0, [r4, 0x4]\n\ + str r2, [r4, 0x8]\n\ + ldr r0, [r4, 0x8]\n\ + lsls r0, r1, 7\n\ + movs r3, 0x80\n\ + lsls r3, 3\n\ + adds r0, r3\n\ + adds r0, r6, r0\n\ + str r0, [r4]\n\ + lsls r0, r1, 3\n\ + adds r0, 0x4\n\ + lsls r0, 5\n\ + adds r0, r7, r0\n\ + str r0, [r4, 0x4]\n\ + str r2, [r4, 0x8]\n\ + ldr r0, [r4, 0x8]\n\ + adds r0, r1, 0x1\n\ + lsls r0, 24\n\ + lsrs r1, r0, 24\n\ + cmp r1, 0x4\n\ + bls _080F4268\n\ + add sp, 0x4\n\ + pop {r4-r7}\n\ + pop {r0}\n\ + bx r0\n\ + .align 2, 0\n\ +_080F42A4: .4byte gUnknown_083DFEC8\n\ +_080F42A8: .4byte 0x00001111\n\ +_080F42AC: .4byte 0x040000d4\n\ +_080F42B0: .4byte 0x81000140\n\ +_080F42B4: .4byte gWindowTemplate_81E70F0\n\ +_080F42B8: .4byte 0x81000030\n\ +_080F42BC: .4byte 0x0fffffff\n\ +_080F42C0: .4byte 0x80000040\n\ + .syntax divided\n"); +} +#endif // NONMATCHING + +static void sub_80F42C4(u8 *arg0) +{ + u16 i, tileOffset; + u8 spriteId; + struct SpriteSheet spriteSheet = { + .data = gUnknown_083DFEC4->unkD1E4[0], + .size = 0x500, + .tag = 0x1A, + }; + + sub_80F4194(gUnknown_083DFEC4->unkD1E4[0], arg0); + LoadSpriteSheet(&spriteSheet); + LoadSpritePalette(&gUnknown_083E4868); + + tileOffset = 0; + for (i = 0; i < 5; i++) + { + spriteId = CreateSprite(&gSpriteTemplate_83E4878, i * 32 + 113, 16, 0); + if (spriteId != MAX_SPRITES) + { + gSprites[spriteId].oam.tileNum += tileOffset; + gUnknown_083DFEC4->unkCED4[i] = &gSprites[spriteId]; + } + else + { + gUnknown_083DFEC4->unkCED4[i] = NULL; + } + + tileOffset += 8; + } +} + +static void sub_80F4394(void) +{ + u16 i; + + for (i = 0; i < 5; i++) + { + if (gUnknown_083DFEC4->unkCED4[i]) + DestroySprite(gUnknown_083DFEC4->unkCED4[i]); + } + + FreeSpriteTilesByTag(0x1A); + FreeSpritePaletteByTag(0x12); +} + +void sub_80F43D4(u8 *arg0) +{ + u16 tile; + + sub_80F4194(gUnknown_083DFEC4->unkD1E4[0], arg0); + tile = GetSpriteTileStartByTag(0x1A); + if (tile != 0xFFFF) + DmaCopy32Defvars(3, gUnknown_083DFEC4->unkD1E4[0], (void *)(VRAM + 0x10000 + (tile * 32)), 0x500); +} + +static u8 *sub_80F4428(u8 *arg0, u16 arg1, u8 arg2) +{ + return sub_80F6514(arg0, arg1, arg2); +} + +static u8 *sub_80F443C(u8 *arg0, u16 arg1) +{ + return AlignInt1InMenuWindow(StringCopy(arg0, gOtherText_Number), arg1, 56, 1); +} + +static u8 *sub_80F445C(u8 *arg0, u16 arg1) +{ + u8 *buffer = AlignInt1InMenuWindow(arg0, arg1, 23, 1); + buffer[0] = EXT_CTRL_CODE_BEGIN; + buffer[1] = 0x11; + buffer[2] = 1; + buffer += 3; + buffer[0] = CHAR_SLASH; + buffer += 1; + buffer[0] = EXT_CTRL_CODE_BEGIN; + buffer[1] = 0x11; + buffer[2] = 1; + buffer += 3; + buffer = AlignInt1InMenuWindow(buffer, gUnknown_083DFEC4->unk8774 + 1, 50, 1); + return buffer; +} + +int sub_80F44B0(u16 box, u16 monIndex, int monDataField, int *text) +{ + if (box == 14) + { + if (monDataField == MON_DATA_NICKNAME || monDataField == MON_DATA_OT_NAME) + return GetMonData(&gPlayerParty[monIndex], monDataField, text); + else + return GetMonData(&gPlayerParty[monIndex], monDataField); + } + else + { + if (monDataField == MON_DATA_NICKNAME || monDataField == MON_DATA_OT_NAME) + return GetBoxMonData(&gPokemonStorage.boxes[box][monIndex], monDataField, text); + else + return GetBoxMonData(&gPokemonStorage.boxes[box][monIndex], monDataField); + } +} + +static void SetMonMarkings(u16 box, u16 monIndex, u8 markings) +{ + if (box == 14) + SetMonData(&gPlayerParty[monIndex], MON_DATA_MARKINGS, &markings); + else + SetBoxMonData(&gPokemonStorage.boxes[box][monIndex], MON_DATA_MARKINGS, &markings); +} + +void sub_80F45A0(s16 arg0, u8 arg1) +{ + u8 box; + u8 var0 = gUnknown_083DFEC4->unk893c[arg0].unk4; + if (var0) + { + sub_80F4428(gUnknown_083DFEC4->unk8829[arg1], arg0, 0); + box = gUnknown_083DFEC4->unk893c[arg0].unk1; + if (box == 14) + AlignStringInMenuWindow(gUnknown_083DFEC4->unk88E9[arg1], gOtherText_InParty, 64, 0); + else + AlignStringInMenuWindow(gUnknown_083DFEC4->unk88E9[arg1], gPokemonStorage.boxNames[box], 64, 0); + + gUnknown_083DFEC4->unk8937[arg1] = 1; + } + else + { + AlignStringInMenuWindow(gUnknown_083DFEC4->unk8829[arg1], gEmptyString_81E72B0, 104, 0); + AlignStringInMenuWindow(gUnknown_083DFEC4->unk88E9[arg1], gEmptyString_81E72B0, 64, 0); + gUnknown_083DFEC4->unk8937[arg1] = var0; + } +} -- cgit v1.2.3